From e1f3e320f15003282ca5b5ea707471cfcd1b6354 Mon Sep 17 00:00:00 2001
From: Rahul Kothari <rahul.kothari.201@gmail.com>
Date: Mon, 29 Apr 2024 22:40:56 +0400
Subject: [PATCH 01/42] chore(docs): fix migration notes (#6083)

---
 docs/docs/misc/migration_notes.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/docs/misc/migration_notes.md b/docs/docs/misc/migration_notes.md
index 9848ff58b557..6a93becce8c1 100644
--- a/docs/docs/misc/migration_notes.md
+++ b/docs/docs/misc/migration_notes.md
@@ -8,13 +8,13 @@ Aztec is in full-speed development. Literally every version breaks compatibility
 
 ## 0.36.0
 
-## `FieldNote` removed
+### `FieldNote` removed
 
 `FieldNote` only existed for testing purposes, and was not a note type that should be used in any real application. Its name unfortunately led users to think that it was a note type suitable to store a `Field` value, which it wasn't.
 
 If using `FieldNote`, you most likely want to use `ValueNote` instead, which has both randomness for privacy and an owner for proper nullification.
 
-## `SlowUpdatesTree` replaced for `SharedMutable`
+### `SlowUpdatesTree` replaced for `SharedMutable`
 
 The old `SlowUpdatesTree` contract and libraries have been removed from the codebase, use the new `SharedMutable` library instead. This will require that you add a global variable specifying a delay in blocks for updates, and replace the slow updates tree state variable with `SharedMutable` variables.
 
@@ -36,7 +36,7 @@ Reading from `SharedMutable` is much simpler, all that's required is to call `ge
 
 Finally, you can remove all capsule usage on the client code or tests, since those are no longer required when working with `SharedMutable`.
 
-## [Aztec.nr & js] Portal addresses
+### [Aztec.nr & js] Portal addresses
 
 Deployments have been modified. No longer are portal addresses treated as a special class, being immutably set on creation of a contract. They are no longer passed in differently compared to the other variables and instead should be implemented using usual storage by those who require it. One should use the storage that matches the usecase - likely shared storage to support private and public.
 

From 6065a6c4157a2d356964f4c5476425da55e09728 Mon Sep 17 00:00:00 2001
From: Lasse Herskind <16536249+LHerskind@users.noreply.github.com>
Date: Mon, 29 Apr 2024 23:14:09 +0100
Subject: [PATCH 02/42] test: refactor public cross chain tests for speed
 (#6082)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixing #6055, time goes from 400 seconds -> 150 seconds.

Minor issues when dealing with the snapshots across instances as the
cross chain harness is taking the pxe and node as args for its
constructor so if going directly from snapshot could run into issue
where it is connected to a different instance or the like.

Also ran into a deserialization issue for the aztec address, unclear why
as it seems like it have been registered 🤷
---
 .../token_portal/typescript_glue_code.md      |   2 +-
 .../blacklist_token_contract_test.ts          |   2 -
 .../e2e_public_cross_chain_messaging.test.ts  | 412 ------------------
 .../deposits.test.ts                          | 161 +++++++
 .../failure_cases.test.ts                     |  68 +++
 .../l1_to_l2.test.ts                          | 122 ++++++
 .../l2_to_l1.test.ts                          | 116 +++++
 ...lic_cross_chain_messaging_contract_test.ts | 225 ++++++++++
 8 files changed, 693 insertions(+), 415 deletions(-)
 delete mode 100644 yarn-project/end-to-end/src/e2e_public_cross_chain_messaging.test.ts
 create mode 100644 yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/deposits.test.ts
 create mode 100644 yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/failure_cases.test.ts
 create mode 100644 yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/l1_to_l2.test.ts
 create mode 100644 yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/l2_to_l1.test.ts
 create mode 100644 yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/public_cross_chain_messaging_contract_test.ts

diff --git a/docs/docs/developers/tutorials/token_portal/typescript_glue_code.md b/docs/docs/developers/tutorials/token_portal/typescript_glue_code.md
index a81c58e1a590..592ca263f2f7 100644
--- a/docs/docs/developers/tutorials/token_portal/typescript_glue_code.md
+++ b/docs/docs/developers/tutorials/token_portal/typescript_glue_code.md
@@ -109,7 +109,7 @@ This fetches the wallets from the sandbox and deploys our cross chain harness on
 
 ## Public flow test
 
-#include_code e2e_public_cross_chain /yarn-project/end-to-end/src/e2e_public_cross_chain_messaging.test.ts typescript
+#include_code e2e_public_cross_chain /yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/deposits.test.ts typescript
 
 ## Running the test
 
diff --git a/yarn-project/end-to-end/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts b/yarn-project/end-to-end/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts
index c0872969c69c..afbb66309f82 100644
--- a/yarn-project/end-to-end/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts
+++ b/yarn-project/end-to-end/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts
@@ -89,10 +89,8 @@ export class BlacklistTokenContractTest {
       this.admin = this.wallets[0];
       this.other = this.wallets[1];
       this.blacklisted = this.wallets[2];
-      // this.accounts = this.wallets.map(a => a.getCompleteAddress());
       this.accounts = await pxe.getRegisteredAccounts();
       this.wallets.forEach((w, i) => this.logger.verbose(`Wallet ${i} address: ${w.getAddress()}`));
-      this.accounts.forEach((w, i) => this.logger.verbose(`Account ${i} address: ${w.address}`));
     });
 
     await this.snapshotManager.snapshot(
diff --git a/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging.test.ts b/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging.test.ts
deleted file mode 100644
index 3edfd40cc7b0..000000000000
--- a/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging.test.ts
+++ /dev/null
@@ -1,412 +0,0 @@
-import {
-  type AccountWallet,
-  type AztecAddress,
-  type AztecNode,
-  type DebugLogger,
-  type DeployL1Contracts,
-  EthAddress,
-  type EthAddressLike,
-  type FieldLike,
-  Fr,
-  L1Actor,
-  L1ToL2Message,
-  L2Actor,
-  type PXE,
-  computeAuthWitMessageHash,
-  computeSecretHash,
-} from '@aztec/aztec.js';
-import { sha256ToField } from '@aztec/foundation/crypto';
-import { InboxAbi, OutboxAbi } from '@aztec/l1-artifacts';
-import { TestContract } from '@aztec/noir-contracts.js';
-import { type TokenContract } from '@aztec/noir-contracts.js/Token';
-import { type TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
-
-import { type Chain, type GetContractReturnType, type Hex, type HttpTransport, type PublicClient } from 'viem';
-import { decodeEventLog, toFunctionSelector } from 'viem/utils';
-
-import { publicDeployAccounts, setup } from './fixtures/utils.js';
-import { CrossChainTestHarness } from './shared/cross_chain_test_harness.js';
-
-describe('e2e_public_cross_chain_messaging', () => {
-  let aztecNode: AztecNode;
-  let pxe: PXE;
-  let deployL1ContractsValues: DeployL1Contracts;
-  let logger: DebugLogger;
-  let teardown: () => Promise<void>;
-  let wallets: AccountWallet[];
-
-  let user1Wallet: AccountWallet;
-  let user2Wallet: AccountWallet;
-  let ethAccount: EthAddress;
-  let ownerAddress: AztecAddress;
-
-  let crossChainTestHarness: CrossChainTestHarness;
-  let l2Token: TokenContract;
-  let l2Bridge: TokenBridgeContract;
-  let inbox: GetContractReturnType<typeof InboxAbi, PublicClient<HttpTransport, Chain>>;
-  let outbox: GetContractReturnType<typeof OutboxAbi, PublicClient<HttpTransport, Chain>>;
-
-  beforeAll(async () => {
-    ({ aztecNode, pxe, deployL1ContractsValues, wallets, logger, teardown } = await setup(2));
-    user1Wallet = wallets[0];
-    user2Wallet = wallets[1];
-    await publicDeployAccounts(wallets[0], wallets.slice(0, 2));
-  }, 45_000);
-
-  beforeEach(async () => {
-    crossChainTestHarness = await CrossChainTestHarness.new(
-      aztecNode,
-      pxe,
-      deployL1ContractsValues.publicClient,
-      deployL1ContractsValues.walletClient,
-      wallets[0],
-      logger,
-    );
-    l2Token = crossChainTestHarness.l2Token;
-    l2Bridge = crossChainTestHarness.l2Bridge;
-    ethAccount = crossChainTestHarness.ethAccount;
-    ownerAddress = crossChainTestHarness.ownerAddress;
-    inbox = crossChainTestHarness.inbox;
-    outbox = crossChainTestHarness.outbox;
-
-    logger.info('Successfully deployed contracts and initialized portal');
-  }, 100_000);
-
-  afterAll(async () => {
-    await teardown();
-  });
-
-  // docs:start:e2e_public_cross_chain
-  it('Publicly deposit funds from L1 -> L2 and withdraw back to L1', async () => {
-    // Generate a claim secret using pedersen
-    const l1TokenBalance = 1000000n;
-    const bridgeAmount = 100n;
-
-    const [secret, secretHash] = crossChainTestHarness.generateClaimSecret();
-
-    // 1. Mint tokens on L1
-    await crossChainTestHarness.mintTokensOnL1(l1TokenBalance);
-
-    // 2. Deposit tokens to the TokenPortal
-    const msgHash = await crossChainTestHarness.sendTokensToPortalPublic(bridgeAmount, secretHash);
-    expect(await crossChainTestHarness.getL1BalanceOf(ethAccount)).toBe(l1TokenBalance - bridgeAmount);
-
-    // Wait for the message to be available for consumption
-    await crossChainTestHarness.makeMessageConsumable(msgHash);
-
-    // Get message leaf index, needed for claiming in public
-    const maybeIndexAndPath = await aztecNode.getL1ToL2MessageMembershipWitness('latest', msgHash, 0n);
-    expect(maybeIndexAndPath).toBeDefined();
-    const messageLeafIndex = maybeIndexAndPath![0];
-
-    // 3. Consume L1 -> L2 message and mint public tokens on L2
-    await crossChainTestHarness.consumeMessageOnAztecAndMintPublicly(bridgeAmount, secret, messageLeafIndex);
-    await crossChainTestHarness.expectPublicBalanceOnL2(ownerAddress, bridgeAmount);
-    const afterBalance = bridgeAmount;
-
-    // time to withdraw the funds again!
-    logger.info('Withdrawing funds from L2');
-
-    // 4. Give approval to bridge to burn owner's funds:
-    const withdrawAmount = 9n;
-    const nonce = Fr.random();
-    const burnMessageHash = computeAuthWitMessageHash(
-      l2Bridge.address,
-      wallets[0].getChainId(),
-      wallets[0].getVersion(),
-      l2Token.methods.burn_public(ownerAddress, withdrawAmount, nonce).request(),
-    );
-    await user1Wallet.setPublicAuthWit(burnMessageHash, true).send().wait();
-
-    // 5. Withdraw owner's funds from L2 to L1
-    const l2ToL1Message = crossChainTestHarness.getL2ToL1MessageLeaf(withdrawAmount);
-    const l2TxReceipt = await crossChainTestHarness.withdrawPublicFromAztecToL1(withdrawAmount, nonce);
-    await crossChainTestHarness.expectPublicBalanceOnL2(ownerAddress, afterBalance - withdrawAmount);
-
-    // Check balance before and after exit.
-    expect(await crossChainTestHarness.getL1BalanceOf(ethAccount)).toBe(l1TokenBalance - bridgeAmount);
-
-    const [l2ToL1MessageIndex, siblingPath] = await aztecNode.getL2ToL1MessageMembershipWitness(
-      l2TxReceipt.blockNumber!,
-      l2ToL1Message,
-    );
-
-    await crossChainTestHarness.withdrawFundsFromBridgeOnL1(
-      withdrawAmount,
-      l2TxReceipt.blockNumber!,
-      l2ToL1MessageIndex,
-      siblingPath,
-    );
-    expect(await crossChainTestHarness.getL1BalanceOf(ethAccount)).toBe(l1TokenBalance - bridgeAmount + withdrawAmount);
-  }, 120_000);
-  // docs:end:e2e_public_cross_chain
-
-  // Unit tests for TokenBridge's public methods.
-
-  it('Someone else can mint funds to me on my behalf (publicly)', async () => {
-    // Generate a claim secret using pedersen
-    const l1TokenBalance = 1000000n;
-    const bridgeAmount = 100n;
-
-    const [secret, secretHash] = crossChainTestHarness.generateClaimSecret();
-
-    await crossChainTestHarness.mintTokensOnL1(l1TokenBalance);
-    const msgHash = await crossChainTestHarness.sendTokensToPortalPublic(bridgeAmount, secretHash);
-    expect(await crossChainTestHarness.getL1BalanceOf(ethAccount)).toBe(l1TokenBalance - bridgeAmount);
-
-    await crossChainTestHarness.makeMessageConsumable(msgHash);
-
-    const content = sha256ToField([
-      Buffer.from(toFunctionSelector('mint_public(bytes32,uint256)').substring(2), 'hex'),
-      user2Wallet.getAddress(),
-      new Fr(bridgeAmount),
-    ]);
-    const wrongMessage = new L1ToL2Message(
-      new L1Actor(crossChainTestHarness.tokenPortalAddress, crossChainTestHarness.publicClient.chain.id),
-      new L2Actor(l2Bridge.address, 1),
-      content,
-      secretHash,
-    );
-
-    // get message leaf index, needed for claiming in public
-    const maybeIndexAndPath = await aztecNode.getL1ToL2MessageMembershipWitness('latest', msgHash, 0n);
-    expect(maybeIndexAndPath).toBeDefined();
-    const messageLeafIndex = maybeIndexAndPath![0];
-
-    // user2 tries to consume this message and minting to itself -> should fail since the message is intended to be consumed only by owner.
-    await expect(
-      l2Bridge
-        .withWallet(user2Wallet)
-        .methods.claim_public(user2Wallet.getAddress(), bridgeAmount, secret, messageLeafIndex)
-        .prove(),
-    ).rejects.toThrow(`No non-nullified L1 to L2 message found for message hash ${wrongMessage.hash().toString()}`);
-
-    // user2 consumes owner's L1-> L2 message on bridge contract and mints public tokens on L2
-    logger.info("user2 consumes owner's message on L2 Publicly");
-    await l2Bridge
-      .withWallet(user2Wallet)
-      .methods.claim_public(ownerAddress, bridgeAmount, secret, messageLeafIndex)
-      .send()
-      .wait();
-    // ensure funds are gone to owner and not user2.
-    await crossChainTestHarness.expectPublicBalanceOnL2(ownerAddress, bridgeAmount);
-    await crossChainTestHarness.expectPublicBalanceOnL2(user2Wallet.getAddress(), 0n);
-  }, 90_000);
-
-  it("Bridge can't withdraw my funds if I don't give approval", async () => {
-    const mintAmountToOwner = 100n;
-    await crossChainTestHarness.mintTokensPublicOnL2(mintAmountToOwner);
-
-    const withdrawAmount = 9n;
-    const nonce = Fr.random();
-    // Should fail as owner has not given approval to bridge burn their funds.
-    await expect(
-      l2Bridge
-        .withWallet(user1Wallet)
-        .methods.exit_to_l1_public(ethAccount, withdrawAmount, EthAddress.ZERO, nonce)
-        .prove(),
-    ).rejects.toThrow('Assertion failed: Message not authorized by account');
-  }, 60_000);
-
-  it("can't claim funds privately which were intended for public deposit from the token portal", async () => {
-    const bridgeAmount = 100n;
-    const [secret, secretHash] = crossChainTestHarness.generateClaimSecret();
-
-    await crossChainTestHarness.mintTokensOnL1(bridgeAmount);
-    const msgHash = await crossChainTestHarness.sendTokensToPortalPublic(bridgeAmount, secretHash);
-    expect(await crossChainTestHarness.getL1BalanceOf(ethAccount)).toBe(0n);
-
-    await crossChainTestHarness.makeMessageConsumable(msgHash);
-
-    // Wrong message hash
-    const content = sha256ToField([
-      Buffer.from(toFunctionSelector('mint_private(bytes32,uint256)').substring(2), 'hex'),
-      secretHash,
-      new Fr(bridgeAmount),
-    ]);
-    const wrongMessage = new L1ToL2Message(
-      new L1Actor(crossChainTestHarness.tokenPortalAddress, crossChainTestHarness.publicClient.chain.id),
-      new L2Actor(l2Bridge.address, 1),
-      content,
-      secretHash,
-    );
-
-    await expect(
-      l2Bridge.withWallet(user2Wallet).methods.claim_private(secretHash, bridgeAmount, secret).prove(),
-    ).rejects.toThrow(`No non-nullified L1 to L2 message found for message hash ${wrongMessage.hash().toString()}`);
-  }, 60_000);
-
-  // Note: We register one portal address when deploying contract but that address is no-longer the only address
-  // allowed to receive messages from the given contract. In the following test we'll test that it's really the case.
-  it.each([true, false])(
-    'can send an L2 -> L1 message to a non-registered portal address from private or public',
-    async (isPrivate: boolean) => {
-      const testContract = await TestContract.deploy(user1Wallet).send().deployed();
-
-      const content = Fr.random();
-      const recipient = crossChainTestHarness.ethAccount;
-
-      let l2TxReceipt;
-
-      // We create the L2 -> L1 message using the test contract
-      if (isPrivate) {
-        l2TxReceipt = await testContract.methods
-          .create_l2_to_l1_message_arbitrary_recipient_private(content, recipient)
-          .send()
-          .wait();
-      } else {
-        l2TxReceipt = await testContract.methods
-          .create_l2_to_l1_message_arbitrary_recipient_public(content, recipient)
-          .send()
-          .wait();
-      }
-
-      const l2ToL1Message = {
-        sender: { actor: testContract.address.toString() as Hex, version: 1n },
-        recipient: {
-          actor: recipient.toString() as Hex,
-          chainId: BigInt(crossChainTestHarness.publicClient.chain.id),
-        },
-        content: content.toString() as Hex,
-      };
-
-      const leaf = sha256ToField([
-        testContract.address,
-        new Fr(1), // aztec version
-        recipient.toBuffer32(),
-        new Fr(crossChainTestHarness.publicClient.chain.id), // chain id
-        content,
-      ]);
-
-      const [l2MessageIndex, siblingPath] = await aztecNode.getL2ToL1MessageMembershipWitness(
-        l2TxReceipt.blockNumber!,
-        leaf,
-      );
-
-      const txHash = await outbox.write.consume(
-        [
-          l2ToL1Message,
-          BigInt(l2TxReceipt.blockNumber!),
-          BigInt(l2MessageIndex),
-          siblingPath.toBufferArray().map((buf: Buffer) => `0x${buf.toString('hex')}`) as readonly `0x${string}`[],
-        ],
-        {} as any,
-      );
-
-      const txReceipt = await crossChainTestHarness.publicClient.waitForTransactionReceipt({
-        hash: txHash,
-      });
-
-      // Exactly 1 event should be emitted in the transaction
-      expect(txReceipt.logs.length).toBe(1);
-
-      // We decode the event log before checking it
-      const txLog = txReceipt.logs[0];
-      const topics = decodeEventLog({
-        abi: OutboxAbi,
-        data: txLog.data,
-        topics: txLog.topics,
-      }) as {
-        eventName: 'MessageConsumed';
-        args: {
-          l2BlockNumber: bigint;
-          root: `0x${string}`;
-          messageHash: `0x${string}`;
-          leafIndex: bigint;
-        };
-      };
-
-      // We check that MessageConsumed event was emitted with the expected message hash and leaf index
-      expect(topics.args.messageHash).toStrictEqual(leaf.toString());
-      expect(topics.args.leafIndex).toStrictEqual(BigInt(0));
-    },
-    60_000,
-  );
-
-  // Note: We register one portal address when deploying contract but that address is no-longer the only address
-  // allowed to send messages to the given contract. In the following test we'll test that it's really the case.
-  it.each([true, false])(
-    'can send an L1 -> L2 message from a non-registered portal address consumed from private or public and then sends and claims exactly the same message again',
-    async (isPrivate: boolean) => {
-      const testContract = await TestContract.deploy(user1Wallet).send().deployed();
-
-      const consumeMethod = isPrivate
-        ? (content: FieldLike, secret: FieldLike, sender: EthAddressLike, _leafIndex: FieldLike) =>
-            testContract.methods.consume_message_from_arbitrary_sender_private(content, secret, sender)
-        : testContract.methods.consume_message_from_arbitrary_sender_public;
-
-      const secret = Fr.random();
-
-      const message = new L1ToL2Message(
-        new L1Actor(crossChainTestHarness.ethAccount, crossChainTestHarness.publicClient.chain.id),
-        new L2Actor(testContract.address, 1),
-        Fr.random(), // content
-        computeSecretHash(secret), // secretHash
-      );
-
-      await sendL2Message(message);
-
-      const [message1Index, _1] = (await aztecNode.getL1ToL2MessageMembershipWitness('latest', message.hash(), 0n))!;
-
-      // Finally, we consume the L1 -> L2 message using the test contract either from private or public
-      await consumeMethod(message.content, secret, message.sender.sender, message1Index).send().wait();
-
-      // We send and consume the exact same message the second time to test that oracles correctly return the new
-      // non-nullified message
-      await sendL2Message(message);
-
-      // We check that the duplicate message was correctly inserted by checking that its message index is defined and
-      // larger than the previous message index
-      const [message2Index, _2] = (await aztecNode.getL1ToL2MessageMembershipWitness(
-        'latest',
-        message.hash(),
-        message1Index + 1n,
-      ))!;
-
-      expect(message2Index).toBeDefined();
-      expect(message2Index).toBeGreaterThan(message1Index);
-
-      // Now we consume the message again. Everything should pass because oracle should return the duplicate message
-      // which is not nullified
-      await consumeMethod(message.content, secret, message.sender.sender, message2Index).send().wait();
-    },
-    120_000,
-  );
-
-  const sendL2Message = async (message: L1ToL2Message) => {
-    // We inject the message to Inbox
-    const txHash = await inbox.write.sendL2Message(
-      [
-        { actor: message.recipient.recipient.toString() as Hex, version: 1n },
-        message.content.toString() as Hex,
-        message.secretHash.toString() as Hex,
-      ] as const,
-      {} as any,
-    );
-
-    // We check that the message was correctly injected by checking the emitted event
-    const msgHash = message.hash();
-    {
-      const txReceipt = await crossChainTestHarness.publicClient.waitForTransactionReceipt({
-        hash: txHash,
-      });
-
-      // Exactly 1 event should be emitted in the transaction
-      expect(txReceipt.logs.length).toBe(1);
-
-      // We decode the event and get leaf out of it
-      const txLog = txReceipt.logs[0];
-      const topics = decodeEventLog({
-        abi: InboxAbi,
-        data: txLog.data,
-        topics: txLog.topics,
-      });
-      const receivedMsgHash = topics.args.hash;
-
-      // We check that the leaf inserted into the subtree matches the expected message hash
-      expect(receivedMsgHash).toBe(msgHash.toString());
-    }
-
-    await crossChainTestHarness.makeMessageConsumable(msgHash);
-  };
-});
diff --git a/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/deposits.test.ts b/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/deposits.test.ts
new file mode 100644
index 000000000000..566118a99cc1
--- /dev/null
+++ b/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/deposits.test.ts
@@ -0,0 +1,161 @@
+import { Fr, L1Actor, L1ToL2Message, L2Actor, computeAuthWitMessageHash } from '@aztec/aztec.js';
+import { sha256ToField } from '@aztec/foundation/crypto';
+
+import { toFunctionSelector } from 'viem';
+
+import { PublicCrossChainMessagingContractTest } from './public_cross_chain_messaging_contract_test.js';
+
+describe('e2e_public_cross_chain_messaging deposits', () => {
+  const t = new PublicCrossChainMessagingContractTest('deposits');
+
+  let {
+    wallets,
+    crossChainTestHarness,
+    ethAccount,
+    aztecNode,
+    logger,
+    ownerAddress,
+    l2Bridge,
+    l2Token,
+    user1Wallet,
+    user2Wallet,
+  } = t;
+
+  beforeEach(async () => {
+    await t.applyBaseSnapshots();
+    await t.setup();
+    // Have to destructure again to ensure we have latest refs.
+    ({ wallets, crossChainTestHarness, user1Wallet, user2Wallet } = t);
+
+    ethAccount = crossChainTestHarness.ethAccount;
+    aztecNode = crossChainTestHarness.aztecNode;
+    logger = crossChainTestHarness.logger;
+    ownerAddress = crossChainTestHarness.ownerAddress;
+    l2Bridge = crossChainTestHarness.l2Bridge;
+    l2Token = crossChainTestHarness.l2Token;
+  }, 200_000);
+
+  afterEach(async () => {
+    await t.teardown();
+  });
+
+  // docs:start:e2e_public_cross_chain
+  it('Publicly deposit funds from L1 -> L2 and withdraw back to L1', async () => {
+    // Generate a claim secret using pedersen
+    const l1TokenBalance = 1000000n;
+    const bridgeAmount = 100n;
+
+    const [secret, secretHash] = crossChainTestHarness.generateClaimSecret();
+
+    // 1. Mint tokens on L1
+    logger.verbose(`1. Mint tokens on L1`);
+    await crossChainTestHarness.mintTokensOnL1(l1TokenBalance);
+
+    // 2. Deposit tokens to the TokenPortal
+    logger.verbose(`2. Deposit tokens to the TokenPortal`);
+    const msgHash = await crossChainTestHarness.sendTokensToPortalPublic(bridgeAmount, secretHash);
+    expect(await crossChainTestHarness.getL1BalanceOf(ethAccount)).toBe(l1TokenBalance - bridgeAmount);
+
+    // Wait for the message to be available for consumption
+    logger.verbose(`Wait for the message to be available for consumption`);
+    await crossChainTestHarness.makeMessageConsumable(msgHash);
+
+    // Get message leaf index, needed for claiming in public
+    const maybeIndexAndPath = await aztecNode.getL1ToL2MessageMembershipWitness('latest', msgHash, 0n);
+    expect(maybeIndexAndPath).toBeDefined();
+    const messageLeafIndex = maybeIndexAndPath![0];
+
+    // 3. Consume L1 -> L2 message and mint public tokens on L2
+    logger.verbose('3. Consume L1 -> L2 message and mint public tokens on L2');
+    await crossChainTestHarness.consumeMessageOnAztecAndMintPublicly(bridgeAmount, secret, messageLeafIndex);
+    await crossChainTestHarness.expectPublicBalanceOnL2(ownerAddress, bridgeAmount);
+    const afterBalance = bridgeAmount;
+
+    // time to withdraw the funds again!
+    logger.info('Withdrawing funds from L2');
+
+    // 4. Give approval to bridge to burn owner's funds:
+    const withdrawAmount = 9n;
+    const nonce = Fr.random();
+    const burnMessageHash = computeAuthWitMessageHash(
+      l2Bridge.address,
+      wallets[0].getChainId(),
+      wallets[0].getVersion(),
+      l2Token.methods.burn_public(ownerAddress, withdrawAmount, nonce).request(),
+    );
+    await user1Wallet.setPublicAuthWit(burnMessageHash, true).send().wait();
+
+    // 5. Withdraw owner's funds from L2 to L1
+    logger.verbose('5. Withdraw owner funds from L2 to L1');
+    const l2ToL1Message = crossChainTestHarness.getL2ToL1MessageLeaf(withdrawAmount);
+    const l2TxReceipt = await crossChainTestHarness.withdrawPublicFromAztecToL1(withdrawAmount, nonce);
+    await crossChainTestHarness.expectPublicBalanceOnL2(ownerAddress, afterBalance - withdrawAmount);
+
+    // Check balance before and after exit.
+    expect(await crossChainTestHarness.getL1BalanceOf(ethAccount)).toBe(l1TokenBalance - bridgeAmount);
+
+    const [l2ToL1MessageIndex, siblingPath] = await aztecNode.getL2ToL1MessageMembershipWitness(
+      l2TxReceipt.blockNumber!,
+      l2ToL1Message,
+    );
+
+    await crossChainTestHarness.withdrawFundsFromBridgeOnL1(
+      withdrawAmount,
+      l2TxReceipt.blockNumber!,
+      l2ToL1MessageIndex,
+      siblingPath,
+    );
+    expect(await crossChainTestHarness.getL1BalanceOf(ethAccount)).toBe(l1TokenBalance - bridgeAmount + withdrawAmount);
+  }, 120_000);
+  // docs:end:e2e_public_cross_chain
+
+  it('Someone else can mint funds to me on my behalf (publicly)', async () => {
+    // Generate a claim secret using pedersen
+    const l1TokenBalance = 1000000n;
+    const bridgeAmount = 100n;
+
+    const [secret, secretHash] = crossChainTestHarness.generateClaimSecret();
+
+    await crossChainTestHarness.mintTokensOnL1(l1TokenBalance);
+    const msgHash = await crossChainTestHarness.sendTokensToPortalPublic(bridgeAmount, secretHash);
+    expect(await crossChainTestHarness.getL1BalanceOf(ethAccount)).toBe(l1TokenBalance - bridgeAmount);
+
+    await crossChainTestHarness.makeMessageConsumable(msgHash);
+
+    const content = sha256ToField([
+      Buffer.from(toFunctionSelector('mint_public(bytes32,uint256)').substring(2), 'hex'),
+      user2Wallet.getAddress(),
+      new Fr(bridgeAmount),
+    ]);
+    const wrongMessage = new L1ToL2Message(
+      new L1Actor(crossChainTestHarness.tokenPortalAddress, crossChainTestHarness.publicClient.chain.id),
+      new L2Actor(l2Bridge.address, 1),
+      content,
+      secretHash,
+    );
+
+    // get message leaf index, needed for claiming in public
+    const maybeIndexAndPath = await aztecNode.getL1ToL2MessageMembershipWitness('latest', msgHash, 0n);
+    expect(maybeIndexAndPath).toBeDefined();
+    const messageLeafIndex = maybeIndexAndPath![0];
+
+    // user2 tries to consume this message and minting to itself -> should fail since the message is intended to be consumed only by owner.
+    await expect(
+      l2Bridge
+        .withWallet(user2Wallet)
+        .methods.claim_public(user2Wallet.getAddress(), bridgeAmount, secret, messageLeafIndex)
+        .prove(),
+    ).rejects.toThrow(`No non-nullified L1 to L2 message found for message hash ${wrongMessage.hash().toString()}`);
+
+    // user2 consumes owner's L1-> L2 message on bridge contract and mints public tokens on L2
+    logger.info("user2 consumes owner's message on L2 Publicly");
+    await l2Bridge
+      .withWallet(user2Wallet)
+      .methods.claim_public(ownerAddress, bridgeAmount, secret, messageLeafIndex)
+      .send()
+      .wait();
+    // ensure funds are gone to owner and not user2.
+    await crossChainTestHarness.expectPublicBalanceOnL2(ownerAddress, bridgeAmount);
+    await crossChainTestHarness.expectPublicBalanceOnL2(user2Wallet.getAddress(), 0n);
+  }, 90_000);
+});
diff --git a/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/failure_cases.test.ts b/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/failure_cases.test.ts
new file mode 100644
index 000000000000..8e8bb4f1bb98
--- /dev/null
+++ b/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/failure_cases.test.ts
@@ -0,0 +1,68 @@
+import { EthAddress, Fr, L1Actor, L1ToL2Message, L2Actor } from '@aztec/aztec.js';
+import { sha256ToField } from '@aztec/foundation/crypto';
+
+import { toFunctionSelector } from 'viem';
+
+import { PublicCrossChainMessagingContractTest } from './public_cross_chain_messaging_contract_test.js';
+
+describe('e2e_public_cross_chain_messaging failures', () => {
+  const t = new PublicCrossChainMessagingContractTest('failures');
+
+  let { crossChainTestHarness, ethAccount, l2Bridge, user1Wallet, user2Wallet } = t;
+
+  beforeAll(async () => {
+    await t.applyBaseSnapshots();
+    await t.setup();
+    // Have to destructure again to ensure we have latest refs.
+    ({ crossChainTestHarness, user1Wallet, user2Wallet } = t);
+    ethAccount = crossChainTestHarness.ethAccount;
+    l2Bridge = crossChainTestHarness.l2Bridge;
+  }, 200_000);
+
+  afterAll(async () => {
+    await t.teardown();
+  });
+
+  it("Bridge can't withdraw my funds if I don't give approval", async () => {
+    const mintAmountToOwner = 100n;
+    await crossChainTestHarness.mintTokensPublicOnL2(mintAmountToOwner);
+
+    const withdrawAmount = 9n;
+    const nonce = Fr.random();
+    // Should fail as owner has not given approval to bridge burn their funds.
+    await expect(
+      l2Bridge
+        .withWallet(user1Wallet)
+        .methods.exit_to_l1_public(ethAccount, withdrawAmount, EthAddress.ZERO, nonce)
+        .prove(),
+    ).rejects.toThrow('Assertion failed: Message not authorized by account');
+  }, 60_000);
+
+  it("can't claim funds privately which were intended for public deposit from the token portal", async () => {
+    const bridgeAmount = 100n;
+    const [secret, secretHash] = crossChainTestHarness.generateClaimSecret();
+
+    await crossChainTestHarness.mintTokensOnL1(bridgeAmount);
+    const msgHash = await crossChainTestHarness.sendTokensToPortalPublic(bridgeAmount, secretHash);
+    expect(await crossChainTestHarness.getL1BalanceOf(ethAccount)).toBe(0n);
+
+    await crossChainTestHarness.makeMessageConsumable(msgHash);
+
+    // Wrong message hash
+    const content = sha256ToField([
+      Buffer.from(toFunctionSelector('mint_private(bytes32,uint256)').substring(2), 'hex'),
+      secretHash,
+      new Fr(bridgeAmount),
+    ]);
+    const wrongMessage = new L1ToL2Message(
+      new L1Actor(crossChainTestHarness.tokenPortalAddress, crossChainTestHarness.publicClient.chain.id),
+      new L2Actor(l2Bridge.address, 1),
+      content,
+      secretHash,
+    );
+
+    await expect(
+      l2Bridge.withWallet(user2Wallet).methods.claim_private(secretHash, bridgeAmount, secret).prove(),
+    ).rejects.toThrow(`No non-nullified L1 to L2 message found for message hash ${wrongMessage.hash().toString()}`);
+  }, 60_000);
+});
diff --git a/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/l1_to_l2.test.ts b/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/l1_to_l2.test.ts
new file mode 100644
index 000000000000..9285a56a36d6
--- /dev/null
+++ b/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/l1_to_l2.test.ts
@@ -0,0 +1,122 @@
+import {
+  type EthAddressLike,
+  type FieldLike,
+  Fr,
+  L1Actor,
+  L1ToL2Message,
+  L2Actor,
+  computeSecretHash,
+} from '@aztec/aztec.js';
+import { InboxAbi } from '@aztec/l1-artifacts';
+import { TestContract } from '@aztec/noir-contracts.js';
+
+import { type Hex, decodeEventLog } from 'viem';
+
+import { PublicCrossChainMessagingContractTest } from './public_cross_chain_messaging_contract_test.js';
+
+describe('e2e_public_cross_chain_messaging l1_to_l2', () => {
+  const t = new PublicCrossChainMessagingContractTest('l1_to_l2');
+
+  let { crossChainTestHarness, aztecNode, user1Wallet, inbox } = t;
+
+  beforeAll(async () => {
+    await t.applyBaseSnapshots();
+    await t.setup();
+    // Have to destructure again to ensure we have latest refs.
+    ({ crossChainTestHarness, user1Wallet } = t);
+
+    aztecNode = crossChainTestHarness.aztecNode;
+    inbox = crossChainTestHarness.inbox;
+  }, 200_000);
+
+  afterAll(async () => {
+    await t.teardown();
+  });
+
+  // Note: We register one portal address when deploying contract but that address is no-longer the only address
+  // allowed to send messages to the given contract. In the following test we'll test that it's really the case.
+  it.each([true, false])(
+    'can send an L1 -> L2 message from a non-registered portal address consumed from private or public and then sends and claims exactly the same message again',
+    async (isPrivate: boolean) => {
+      const testContract = await TestContract.deploy(user1Wallet).send().deployed();
+
+      const consumeMethod = isPrivate
+        ? (content: FieldLike, secret: FieldLike, sender: EthAddressLike, _leafIndex: FieldLike) =>
+            testContract.methods.consume_message_from_arbitrary_sender_private(content, secret, sender)
+        : testContract.methods.consume_message_from_arbitrary_sender_public;
+
+      const secret = Fr.random();
+
+      const message = new L1ToL2Message(
+        new L1Actor(crossChainTestHarness.ethAccount, crossChainTestHarness.publicClient.chain.id),
+        new L2Actor(testContract.address, 1),
+        Fr.random(), // content
+        computeSecretHash(secret), // secretHash
+      );
+
+      await sendL2Message(message);
+
+      const [message1Index, _1] = (await aztecNode.getL1ToL2MessageMembershipWitness('latest', message.hash(), 0n))!;
+
+      // Finally, we consume the L1 -> L2 message using the test contract either from private or public
+      await consumeMethod(message.content, secret, message.sender.sender, message1Index).send().wait();
+
+      // We send and consume the exact same message the second time to test that oracles correctly return the new
+      // non-nullified message
+      await sendL2Message(message);
+
+      // We check that the duplicate message was correctly inserted by checking that its message index is defined and
+      // larger than the previous message index
+      const [message2Index, _2] = (await aztecNode.getL1ToL2MessageMembershipWitness(
+        'latest',
+        message.hash(),
+        message1Index + 1n,
+      ))!;
+
+      expect(message2Index).toBeDefined();
+      expect(message2Index).toBeGreaterThan(message1Index);
+
+      // Now we consume the message again. Everything should pass because oracle should return the duplicate message
+      // which is not nullified
+      await consumeMethod(message.content, secret, message.sender.sender, message2Index).send().wait();
+    },
+    120_000,
+  );
+
+  const sendL2Message = async (message: L1ToL2Message) => {
+    // We inject the message to Inbox
+    const txHash = await inbox.write.sendL2Message(
+      [
+        { actor: message.recipient.recipient.toString() as Hex, version: 1n },
+        message.content.toString() as Hex,
+        message.secretHash.toString() as Hex,
+      ] as const,
+      {} as any,
+    );
+
+    // We check that the message was correctly injected by checking the emitted event
+    const msgHash = message.hash();
+    {
+      const txReceipt = await crossChainTestHarness.publicClient.waitForTransactionReceipt({
+        hash: txHash,
+      });
+
+      // Exactly 1 event should be emitted in the transaction
+      expect(txReceipt.logs.length).toBe(1);
+
+      // We decode the event and get leaf out of it
+      const txLog = txReceipt.logs[0];
+      const topics = decodeEventLog({
+        abi: InboxAbi,
+        data: txLog.data,
+        topics: txLog.topics,
+      });
+      const receivedMsgHash = topics.args.hash;
+
+      // We check that the leaf inserted into the subtree matches the expected message hash
+      expect(receivedMsgHash).toBe(msgHash.toString());
+    }
+
+    await crossChainTestHarness.makeMessageConsumable(msgHash);
+  };
+});
diff --git a/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/l2_to_l1.test.ts b/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/l2_to_l1.test.ts
new file mode 100644
index 000000000000..b43333c5edf7
--- /dev/null
+++ b/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/l2_to_l1.test.ts
@@ -0,0 +1,116 @@
+import { Fr } from '@aztec/aztec.js';
+import { sha256ToField } from '@aztec/foundation/crypto';
+import { OutboxAbi } from '@aztec/l1-artifacts';
+import { TestContract } from '@aztec/noir-contracts.js';
+
+import { type Hex, decodeEventLog } from 'viem';
+
+import { PublicCrossChainMessagingContractTest } from './public_cross_chain_messaging_contract_test.js';
+
+describe('e2e_public_cross_chain_messaging l2_to_l1', () => {
+  const t = new PublicCrossChainMessagingContractTest('l2_to_l1');
+
+  let { crossChainTestHarness, aztecNode, user1Wallet, outbox } = t;
+
+  beforeAll(async () => {
+    await t.applyBaseSnapshots();
+    await t.setup();
+    // Have to destructure again to ensure we have latest refs.
+    ({ crossChainTestHarness, user1Wallet } = t);
+
+    aztecNode = crossChainTestHarness.aztecNode;
+
+    outbox = crossChainTestHarness.outbox;
+  }, 200_000);
+
+  afterAll(async () => {
+    await t.teardown();
+  });
+
+  // Note: We register one portal address when deploying contract but that address is no-longer the only address
+  // allowed to receive messages from the given contract. In the following test we'll test that it's really the case.
+  it.each([[true], [false]])(
+    `can send an L2 -> L1 message to a non-registered portal address from public or private`,
+    async (isPrivate: boolean) => {
+      const testContract = await TestContract.deploy(user1Wallet).send().deployed();
+
+      const content = Fr.random();
+      const recipient = crossChainTestHarness.ethAccount;
+
+      let l2TxReceipt;
+
+      // We create the L2 -> L1 message using the test contract
+      if (isPrivate) {
+        l2TxReceipt = await testContract.methods
+          .create_l2_to_l1_message_arbitrary_recipient_private(content, recipient)
+          .send()
+          .wait();
+      } else {
+        l2TxReceipt = await testContract.methods
+          .create_l2_to_l1_message_arbitrary_recipient_public(content, recipient)
+          .send()
+          .wait();
+      }
+
+      const l2ToL1Message = {
+        sender: { actor: testContract.address.toString() as Hex, version: 1n },
+        recipient: {
+          actor: recipient.toString() as Hex,
+          chainId: BigInt(crossChainTestHarness.publicClient.chain.id),
+        },
+        content: content.toString() as Hex,
+      };
+
+      const leaf = sha256ToField([
+        testContract.address,
+        new Fr(1), // aztec version
+        recipient.toBuffer32(),
+        new Fr(crossChainTestHarness.publicClient.chain.id), // chain id
+        content,
+      ]);
+
+      const [l2MessageIndex, siblingPath] = await aztecNode.getL2ToL1MessageMembershipWitness(
+        l2TxReceipt.blockNumber!,
+        leaf,
+      );
+
+      const txHash = await outbox.write.consume(
+        [
+          l2ToL1Message,
+          BigInt(l2TxReceipt.blockNumber!),
+          BigInt(l2MessageIndex),
+          siblingPath.toBufferArray().map((buf: Buffer) => `0x${buf.toString('hex')}`) as readonly `0x${string}`[],
+        ],
+        {} as any,
+      );
+
+      const txReceipt = await crossChainTestHarness.publicClient.waitForTransactionReceipt({
+        hash: txHash,
+      });
+
+      // Exactly 1 event should be emitted in the transaction
+      expect(txReceipt.logs.length).toBe(1);
+
+      // We decode the event log before checking it
+      const txLog = txReceipt.logs[0];
+      const topics = decodeEventLog({
+        abi: OutboxAbi,
+        data: txLog.data,
+        topics: txLog.topics,
+      }) as {
+        eventName: 'MessageConsumed';
+        args: {
+          l2BlockNumber: bigint;
+          root: `0x${string}`;
+          messageHash: `0x${string}`;
+          leafIndex: bigint;
+        };
+      };
+
+      // We check that MessageConsumed event was emitted with the expected message hash and leaf index
+      expect(topics.args.messageHash).toStrictEqual(leaf.toString());
+      expect(topics.args.leafIndex).toStrictEqual(BigInt(0));
+    },
+    60_000,
+  );
+});
diff --git a/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/public_cross_chain_messaging_contract_test.ts b/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/public_cross_chain_messaging_contract_test.ts
new file mode 100644
index 000000000000..38add3ebc8a4
--- /dev/null
+++ b/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging/public_cross_chain_messaging_contract_test.ts
@@ -0,0 +1,225 @@
+import { getSchnorrAccount } from '@aztec/accounts/schnorr';
+import { type AztecNodeConfig } from '@aztec/aztec-node';
+import {
+  type AccountWallet,
+  AztecAddress,
+  type AztecNode,
+  type CompleteAddress,
+  type DebugLogger,
+  EthAddress,
+  type PXE,
+  createDebugLogger,
+} from '@aztec/aztec.js';
+import { InboxAbi, OutboxAbi, PortalERC20Abi, TokenPortalAbi } from '@aztec/l1-artifacts';
+import { TokenBridgeContract, TokenContract } from '@aztec/noir-contracts.js';
+
+import {
+  type Chain,
+  type HttpTransport,
+  type PublicClient,
+  createPublicClient,
+  createWalletClient,
+  getContract,
+  http,
+} from 'viem';
+import { mnemonicToAccount } from 'viem/accounts';
+import { foundry } from 'viem/chains';
+
+import { MNEMONIC } from '../fixtures/fixtures.js';
+import {
+  SnapshotManager,
+  type SubsystemsContext,
+  addAccounts,
+  publicDeployAccounts,
+} from '../fixtures/snapshot_manager.js';
+import { CrossChainTestHarness } from '../shared/cross_chain_test_harness.js';
+
+const { E2E_DATA_PATH: dataPath } = process.env;
+
+export class PublicCrossChainMessagingContractTest {
+  private snapshotManager: SnapshotManager;
+  logger: DebugLogger;
+  wallets: AccountWallet[] = [];
+  accounts: CompleteAddress[] = [];
+  aztecNode!: AztecNode;
+  pxe!: PXE;
+  aztecNodeConfig!: AztecNodeConfig;
+
+  publicClient!: PublicClient<HttpTransport, Chain> | undefined;
+
+  user1Wallet!: AccountWallet;
+  user2Wallet!: AccountWallet;
+  crossChainTestHarness!: CrossChainTestHarness;
+  ethAccount!: EthAddress;
+  ownerAddress!: AztecAddress;
+  l2Token!: TokenContract;
+  l2Bridge!: TokenBridgeContract;
+
+  inbox!: any; // GetContractReturnType<typeof InboxAbi> | undefined;
+  outbox!: any; // GetContractReturnType<typeof OutboxAbi> | undefined;
+
+  constructor(testName: string) {
+    this.logger = createDebugLogger(`aztec:e2e_public_cross_chain_messaging:${testName}`);
+    this.snapshotManager = new SnapshotManager(`e2e_public_cross_chain_messaging/${testName}`, dataPath);
+  }
+
+  async setup() {
+    const { aztecNode, pxe, aztecNodeConfig } = await this.snapshotManager.setup();
+    this.aztecNode = aztecNode;
+    this.pxe = pxe;
+    this.aztecNodeConfig = aztecNodeConfig;
+  }
+
+  snapshot = <T>(
+    name: string,
+    apply: (context: SubsystemsContext) => Promise<T>,
+    restore: (snapshotData: T, context: SubsystemsContext) => Promise<void> = () => Promise.resolve(),
+  ): Promise<void> => this.snapshotManager.snapshot(name, apply, restore);
+
+  async teardown() {
+    await this.snapshotManager.teardown();
+  }
+
+  viemStuff(rpcUrl: string) {
+    const hdAccount = mnemonicToAccount(MNEMONIC);
+
+    const walletClient = createWalletClient({
+      account: hdAccount,
+      chain: foundry,
+      transport: http(rpcUrl),
+    });
+    const publicClient = createPublicClient({
+      chain: foundry,
+      transport: http(rpcUrl),
+    });
+
+    return { walletClient, publicClient };
+  }
+
+  async applyBaseSnapshots() {
+    // Note that we are using the same `pxe`, `aztecNodeConfig` and `aztecNode` across all snapshots.
+    // This is to not have issues with different networks.
+
+    await this.snapshotManager.snapshot(
+      '3_accounts',
+      addAccounts(3, this.logger),
+      async ({ accountKeys }, { pxe, aztecNodeConfig, aztecNode }) => {
+        const accountManagers = accountKeys.map(ak => getSchnorrAccount(pxe, ak[0], ak[1], 1));
+        this.wallets = await Promise.all(accountManagers.map(a => a.getWallet()));
+        this.wallets.forEach((w, i) => this.logger.verbose(`Wallet ${i} address: ${w.getAddress()}`));
+        this.accounts = await pxe.getRegisteredAccounts();
+
+        this.user1Wallet = this.wallets[0];
+        this.user2Wallet = this.wallets[1];
+
+        this.pxe = pxe;
+        this.aztecNode = aztecNode;
+        this.aztecNodeConfig = aztecNodeConfig;
+      },
+    );
+
+    await this.snapshotManager.snapshot(
+      'e2e_public_cross_chain_messaging',
+      async () => {
+        // Create the token contract state.
+        // Move this account thing to addAccounts above?
+        this.logger.verbose(`Public deploy accounts...`);
+        await publicDeployAccounts(this.wallets[0], this.accounts.slice(0, 3));
+
+        const { publicClient, walletClient } = this.viemStuff(this.aztecNodeConfig.rpcUrl);
+
+        this.logger.verbose(`Setting up cross chain harness...`);
+        this.crossChainTestHarness = await CrossChainTestHarness.new(
+          this.aztecNode,
+          this.pxe,
+          publicClient,
+          walletClient,
+          this.wallets[0],
+          this.logger,
+        );
+
+        this.logger.verbose(`L2 token deployed to: ${this.crossChainTestHarness.l2Token.address}`);
+
+        return this.toCrossChainContext();
+      },
+      async crossChainContext => {
+        this.l2Token = await TokenContract.at(crossChainContext.l2Token, this.user1Wallet);
+        this.l2Bridge = await TokenBridgeContract.at(crossChainContext.l2Bridge, this.user1Wallet);
+
+        // There is an issue with the reviver so we are getting strings sometimes. Working around it here.
+        this.ethAccount = EthAddress.fromString(crossChainContext.ethAccount.toString());
+        this.ownerAddress = AztecAddress.fromString(crossChainContext.ownerAddress.toString());
+        const tokenPortalAddress = EthAddress.fromString(crossChainContext.tokenPortal.toString());
+
+        const { publicClient, walletClient } = this.viemStuff(this.aztecNodeConfig.rpcUrl);
+
+        const inbox = getContract({
+          address: this.aztecNodeConfig.l1Contracts.inboxAddress.toString(),
+          abi: InboxAbi,
+          client: walletClient,
+        });
+        const outbox = getContract({
+          address: this.aztecNodeConfig.l1Contracts.outboxAddress.toString(),
+          abi: OutboxAbi,
+          client: walletClient,
+        });
+
+        const tokenPortal = getContract({
+          address: tokenPortalAddress.toString(),
+          abi: TokenPortalAbi,
+          client: walletClient,
+        });
+        const underlyingERC20 = getContract({
+          address: crossChainContext.underlying.toString(),
+          abi: PortalERC20Abi,
+          client: walletClient,
+        });
+
+        this.crossChainTestHarness = new CrossChainTestHarness(
+          this.aztecNode,
+          this.pxe,
+          this.logger,
+          this.l2Token,
+          this.l2Bridge,
+          this.ethAccount,
+          tokenPortalAddress,
+          tokenPortal,
+          underlyingERC20,
+          inbox,
+          outbox,
+          publicClient,
+          walletClient,
+          this.ownerAddress,
+        );
+
+        this.publicClient = publicClient;
+        this.inbox = inbox;
+        this.outbox = outbox;
+      },
+    );
+  }
+
+  toCrossChainContext(): CrossChainContext {
+    return {
+      l2Token: this.crossChainTestHarness.l2Token.address,
+      l2Bridge: this.crossChainTestHarness.l2Bridge.address,
+      tokenPortal: this.crossChainTestHarness.tokenPortal.address,
+      underlying: EthAddress.fromString(this.crossChainTestHarness.underlyingERC20.address),
+      ethAccount: this.crossChainTestHarness.ethAccount,
+      ownerAddress: this.crossChainTestHarness.ownerAddress,
+      inbox: EthAddress.fromString(this.crossChainTestHarness.inbox.address),
+      outbox: EthAddress.fromString(this.crossChainTestHarness.outbox.address),
+    };
+  }
+}
+
+type CrossChainContext = {
+  l2Token: AztecAddress;
+  l2Bridge: AztecAddress;
+  tokenPortal: EthAddress;
+  underlying: EthAddress;
+  ethAccount: EthAddress;
+  ownerAddress: AztecAddress;
+  inbox: EthAddress;
+  outbox: EthAddress;
+};

From 1449c338ca79f8d72b71484546aa46ddebb21779 Mon Sep 17 00:00:00 2001
From: ledwards2225 <98505400+ledwards2225@users.noreply.github.com>
Date: Mon, 29 Apr 2024 16:28:03 -0700
Subject: [PATCH 03/42] fix: fix relation skipping for sumcheck (#6092)

Due to a bad merge (or something?), the relation skipping for Sumcheck
was not activated in the original PR. This fix corrects the syntax of
the skipping check which turns on the skipping for Sumcheck only (full
proof construction / decider).

Branch (ultra honk bench)
```
---------------------------------------------------------------------------------------
Benchmark                                             Time             CPU   Iterations
---------------------------------------------------------------------------------------
construct_proof_ultrahonk/sha256                    324 ms          270 ms            3
construct_proof_ultrahonk/keccak                   1235 ms         1023 ms            1
construct_proof_ultrahonk/ecdsa_verification       2402 ms         1996 ms            1
construct_proof_ultrahonk/merkle_membership         188 ms          156 ms            4
construct_proof_ultrahonk_power_of_2/15             200 ms          185 ms            4
construct_proof_ultrahonk_power_of_2/16             362 ms          335 ms            2
construct_proof_ultrahonk_power_of_2/17             684 ms          632 ms            1
construct_proof_ultrahonk_power_of_2/18            1350 ms         1248 ms            1
construct_proof_ultrahonk_power_of_2/19            2698 ms         2481 ms            1
construct_proof_ultrahonk_power_of_2/20            5176 ms         4784 ms            1
```

Master (ultra honk bench)
```
---------------------------------------------------------------------------------------
Benchmark                                             Time             CPU   Iterations
---------------------------------------------------------------------------------------
construct_proof_ultrahonk/sha256                    423 ms          395 ms            2
construct_proof_ultrahonk/keccak                   1628 ms         1515 ms            1
construct_proof_ultrahonk/ecdsa_verification       2971 ms         2764 ms            1
construct_proof_ultrahonk/merkle_membership         236 ms          218 ms            3
construct_proof_ultrahonk_power_of_2/15             248 ms          231 ms            3
construct_proof_ultrahonk_power_of_2/16             459 ms          430 ms            2
construct_proof_ultrahonk_power_of_2/17             872 ms          820 ms            1
construct_proof_ultrahonk_power_of_2/18            1773 ms         1656 ms            1
construct_proof_ultrahonk_power_of_2/19            3342 ms         3133 ms            1
construct_proof_ultrahonk_power_of_2/20            6694 ms         6289 ms            1

```

Branch (client IVC)
```
--------------------------------------------------------------------------------
Benchmark                      Time             CPU   Iterations UserCounters...
--------------------------------------------------------------------------------
ClientIVCBench/Full/6      21234 ms        16030 ms            1
function                                        ms     % sum
construct_circuits(t)                         4537    21.52%
ProverInstance(Circuit&)(t)                   1912     9.07%
ProtogalaxyProver::fold_instances(t)         11102    52.64%
Decider::construct_proof(t)                    577     2.73%
ECCVMProver(CircuitBuilder&)(t)                129     0.61%
ECCVMProver::construct_proof(t)               1765     8.37%
GoblinTranslatorProver::construct_proof(t)     930     4.41%
Goblin::merge(t)                               137     0.65%
```

Master (client IVC)
```
--------------------------------------------------------------------------------
Benchmark                      Time             CPU   Iterations UserCounters...
--------------------------------------------------------------------------------
ClientIVCBench/Full/6      21385 ms        16321 ms            1
function                                        ms     % sum
construct_circuits(t)                         4544    21.40%
ProverInstance(Circuit&)(t)                   1919     9.03%
ProtogalaxyProver::fold_instances(t)         11055    52.05%
Decider::construct_proof(t)                    728     3.43%
ECCVMProver(CircuitBuilder&)(t)                132     0.62%
ECCVMProver::construct_proof(t)               1757     8.27%
GoblinTranslatorProver::construct_proof(t)     965     4.55%
Goblin::merge(t)                               138     0.65%
```
---
 barretenberg/cpp/src/barretenberg/relations/relation_types.hpp | 2 +-
 barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_round.hpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/barretenberg/cpp/src/barretenberg/relations/relation_types.hpp b/barretenberg/cpp/src/barretenberg/relations/relation_types.hpp
index aa4ba8820b7c..e134c4e03413 100644
--- a/barretenberg/cpp/src/barretenberg/relations/relation_types.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/relation_types.hpp
@@ -122,7 +122,7 @@ consteval std::array<size_t, NUM_SUBRELATIONS> compute_composed_subrelation_part
 template <typename Relation, typename AllEntities>
 concept isSkippable = requires(const AllEntities& input) {
                           {
-                              Relation::is_active(input)
+                              Relation::skip(input)
                               } -> std::same_as<bool>;
                       };
 
diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_round.hpp b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_round.hpp
index de237e915de3..c1ac763379ab 100644
--- a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_round.hpp
+++ b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_round.hpp
@@ -245,7 +245,7 @@ template <typename Flavor> class SumcheckProverRound {
                 std::get<relation_idx>(univariate_accumulators), extended_edges, relation_parameters, scaling_factor);
         } else {
             // If so, only compute the contribution if the relation is active
-            if (!Relation::skip(extended_edges, relation_parameters)) {
+            if (!Relation::skip(extended_edges)) {
                 Relation::accumulate(std::get<relation_idx>(univariate_accumulators),
                                      extended_edges,
                                      relation_parameters,

From 99fbb74f48f7ceb2cc88d1e5bf9b91b8d61d0493 Mon Sep 17 00:00:00 2001
From: AztecBot <tech@aztecprotocol.com>
Date: Tue, 30 Apr 2024 02:09:40 +0000
Subject: [PATCH 04/42] git subrepo push --branch=master barretenberg

subrepo:
  subdir:   "barretenberg"
  merged:   "31ec60891"
upstream:
  origin:   "https://github.com/AztecProtocol/barretenberg"
  branch:   "master"
  commit:   "31ec60891"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???" [skip ci]
---
 barretenberg/.gitrepo | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/barretenberg/.gitrepo b/barretenberg/.gitrepo
index 3232d03252c3..ee434d12668a 100644
--- a/barretenberg/.gitrepo
+++ b/barretenberg/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/AztecProtocol/barretenberg
 	branch = master
-	commit = 795c999a3b7fe8d85af05ffc09ddfd349c00e5a4
-	parent = 0a64279ba1b2b3bb6627c675b8a0b116be17f579
+	commit = 31ec6089135e12bf85240d50bc8bac066918dfa0
+	parent = 1449c338ca79f8d72b71484546aa46ddebb21779
 	method = merge
 	cmdver = 0.4.6

From b723534db2fcbd3399aca722354df7c45ee8a84f Mon Sep 17 00:00:00 2001
From: AztecBot <tech@aztecprotocol.com>
Date: Tue, 30 Apr 2024 02:10:07 +0000
Subject: [PATCH 05/42] chore: replace relative paths to noir-protocol-circuits

---
 noir-projects/aztec-nr/aztec/Nargo.toml | 2 +-
 noir-projects/aztec-nr/tests/Nargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/noir-projects/aztec-nr/aztec/Nargo.toml b/noir-projects/aztec-nr/aztec/Nargo.toml
index 7a1f1af58631..2cbb43ab2787 100644
--- a/noir-projects/aztec-nr/aztec/Nargo.toml
+++ b/noir-projects/aztec-nr/aztec/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = ">=0.18.0"
 type = "lib"
 
 [dependencies]
-protocol_types = { path = "../../noir-protocol-circuits/crates/types" }
+protocol_types = { git="https://github.com/AztecProtocol/aztec-packages", tag="aztec-packages-v0.35.1", directory="noir-projects/noir-protocol-circuits/crates/types" }
diff --git a/noir-projects/aztec-nr/tests/Nargo.toml b/noir-projects/aztec-nr/tests/Nargo.toml
index 13404b373243..dfed895aad0c 100644
--- a/noir-projects/aztec-nr/tests/Nargo.toml
+++ b/noir-projects/aztec-nr/tests/Nargo.toml
@@ -6,4 +6,4 @@ type = "lib"
 
 [dependencies]
 aztec = { path = "../aztec" }
-protocol_types = { path = "../../noir-protocol-circuits/crates/types" }
+protocol_types = { git="https://github.com/AztecProtocol/aztec-packages", tag="aztec-packages-v0.35.1", directory="noir-projects/noir-protocol-circuits/crates/types" }

From 655bb8f87242b0cab45961b86825ab1db202d705 Mon Sep 17 00:00:00 2001
From: AztecBot <tech@aztecprotocol.com>
Date: Tue, 30 Apr 2024 02:10:07 +0000
Subject: [PATCH 06/42] git_subrepo.sh: Fix parent in .gitrepo file. [skip ci]

---
 noir-projects/aztec-nr/.gitrepo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/noir-projects/aztec-nr/.gitrepo b/noir-projects/aztec-nr/.gitrepo
index 6d9c9a29f805..425f564cc489 100644
--- a/noir-projects/aztec-nr/.gitrepo
+++ b/noir-projects/aztec-nr/.gitrepo
@@ -9,4 +9,4 @@
 	commit = 071b146a0fa3951fdd05b2a2732bac331bc79f73
 	method = merge
 	cmdver = 0.4.6
-	parent = 2a14f3b48f79177094fc77fd3cc22bf779515ad0
+	parent = 8e7d592b42004e060186f87e40504804532c9b22

From 4a2a3c8462ae42bd4972e87151d22a360c141fb2 Mon Sep 17 00:00:00 2001
From: AztecBot <tech@aztecprotocol.com>
Date: Tue, 30 Apr 2024 02:10:10 +0000
Subject: [PATCH 07/42] git subrepo push --branch=master noir-projects/aztec-nr

subrepo:
  subdir:   "noir-projects/aztec-nr"
  merged:   "a27226a76"
upstream:
  origin:   "https://github.com/AztecProtocol/aztec-nr"
  branch:   "master"
  commit:   "a27226a76"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???" [skip ci]
---
 noir-projects/aztec-nr/.gitrepo         | 4 ++--
 noir-projects/aztec-nr/aztec/Nargo.toml | 2 +-
 noir-projects/aztec-nr/tests/Nargo.toml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/noir-projects/aztec-nr/.gitrepo b/noir-projects/aztec-nr/.gitrepo
index 425f564cc489..08320c53a994 100644
--- a/noir-projects/aztec-nr/.gitrepo
+++ b/noir-projects/aztec-nr/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/AztecProtocol/aztec-nr
 	branch = master
-	commit = 071b146a0fa3951fdd05b2a2732bac331bc79f73
+	commit = a27226a7655c81f7b9f3bc2457eb860100eed9cc
 	method = merge
 	cmdver = 0.4.6
-	parent = 8e7d592b42004e060186f87e40504804532c9b22
+	parent = bc2e3073176f2fe7f254e83ac082c2fad5e491f0
diff --git a/noir-projects/aztec-nr/aztec/Nargo.toml b/noir-projects/aztec-nr/aztec/Nargo.toml
index 2cbb43ab2787..7a1f1af58631 100644
--- a/noir-projects/aztec-nr/aztec/Nargo.toml
+++ b/noir-projects/aztec-nr/aztec/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = ">=0.18.0"
 type = "lib"
 
 [dependencies]
-protocol_types = { git="https://github.com/AztecProtocol/aztec-packages", tag="aztec-packages-v0.35.1", directory="noir-projects/noir-protocol-circuits/crates/types" }
+protocol_types = { path = "../../noir-protocol-circuits/crates/types" }
diff --git a/noir-projects/aztec-nr/tests/Nargo.toml b/noir-projects/aztec-nr/tests/Nargo.toml
index dfed895aad0c..13404b373243 100644
--- a/noir-projects/aztec-nr/tests/Nargo.toml
+++ b/noir-projects/aztec-nr/tests/Nargo.toml
@@ -6,4 +6,4 @@ type = "lib"
 
 [dependencies]
 aztec = { path = "../aztec" }
-protocol_types = { git="https://github.com/AztecProtocol/aztec-packages", tag="aztec-packages-v0.35.1", directory="noir-projects/noir-protocol-circuits/crates/types" }
+protocol_types = { path = "../../noir-protocol-circuits/crates/types" }

From 81142fe799338e6ed73b30eeac4468c1345f6fab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Bene=C5=A1?= <janbenes1234@gmail.com>
Date: Tue, 30 Apr 2024 13:52:23 +0200
Subject: [PATCH 08/42] feat: `variable_base_scalar_mul` blackbox func (#6039)

---
 .../dsl/acir_format/acir_format.cpp           |   5 +
 .../dsl/acir_format/acir_format.hpp           |   3 +
 .../dsl/acir_format/acir_format.test.cpp      |   6 +
 .../acir_format/acir_to_constraint_buf.hpp    |   9 +
 .../acir_format/bigint_constraint.test.cpp    |   5 +
 .../dsl/acir_format/block_constraint.test.cpp |   1 +
 .../dsl/acir_format/ec_operations.test.cpp    |   1 +
 .../dsl/acir_format/ecdsa_secp256k1.test.cpp  |   3 +
 .../dsl/acir_format/ecdsa_secp256r1.test.cpp  |   4 +
 .../acir_format/poseidon2_constraint.test.cpp |   1 +
 .../acir_format/recursion_constraint.test.cpp |   2 +
 .../dsl/acir_format/serde/acir.hpp            | 163 ++++++++++++++++++
 .../acir_format/sha256_constraint.test.cpp    |   1 +
 .../acir_format/variable_base_scalar_mul.cpp  |  38 ++++
 .../acir_format/variable_base_scalar_mul.hpp  |  23 +++
 .../crates/types/src/grumpkin_point.nr        |   1 +
 noir/noir-repo/acvm-repo/acir/README.md       |   9 +
 .../noir-repo/acvm-repo/acir/codegen/acir.cpp | 128 +++++++++++++-
 .../acir/src/circuit/black_box_functions.rs   |   6 +-
 .../opcodes/black_box_function_call.rs        |  18 ++
 .../acir/tests/test_program_serialization.rs  |  32 ++++
 .../src/pwg/blackbox/fixed_base_scalar_mul.rs |  24 +++
 .../acvm-repo/acvm/src/pwg/blackbox/mod.rs    |  17 +-
 .../test/browser/execute_circuit.test.ts      |  10 ++
 .../acvm_js/test/node/execute_circuit.test.ts |  10 ++
 .../test/shared/variable_base_scalar_mul.ts   |  21 +++
 .../src/curve_specific_solver.rs              |  16 ++
 .../src/fixed_base_scalar_mul.rs              | 106 +++++++++---
 .../bn254_blackbox_solver/src/lib.rs          |  14 +-
 .../acvm-repo/brillig/src/black_box.rs        |   8 +
 .../acvm-repo/brillig_vm/src/black_box.rs     |  14 ++
 .../brillig/brillig_gen/brillig_black_box.rs  |  21 ++-
 .../noirc_evaluator/src/brillig/brillig_ir.rs |  10 ++
 .../src/brillig/brillig_ir/debug_show.rs      |  17 ++
 .../ssa/acir_gen/acir_ir/generated_acir.rs    |  15 +-
 .../src/ssa/ir/instruction/call.rs            |   1 +
 .../cryptographic_primitives/scalar.mdx       |  30 +++-
 .../noir_stdlib/src/grumpkin_scalar_mul.nr    |   5 +-
 noir/noir-repo/noir_stdlib/src/scalar_mul.nr  |  23 ++-
 .../Nargo.toml                                |   2 +-
 .../Prover.toml                               |   0
 .../src/main.nr                               |   0
 .../variable_base_scalar_mul/Nargo.toml       |   6 +
 .../variable_base_scalar_mul/Prover.toml      |   4 +
 .../variable_base_scalar_mul/src/main.nr      |  33 ++++
 noir/noir-repo/tooling/lsp/src/solver.rs      |  10 ++
 .../end-to-end/src/e2e_state_vars.test.ts     |   2 +-
 47 files changed, 835 insertions(+), 43 deletions(-)
 create mode 100644 barretenberg/cpp/src/barretenberg/dsl/acir_format/variable_base_scalar_mul.cpp
 create mode 100644 barretenberg/cpp/src/barretenberg/dsl/acir_format/variable_base_scalar_mul.hpp
 create mode 100644 noir/noir-repo/acvm-repo/acvm_js/test/shared/variable_base_scalar_mul.ts
 rename noir/noir-repo/test_programs/execution_success/{scalar_mul => fixed_base_scalar_mul}/Nargo.toml (63%)
 rename noir/noir-repo/test_programs/execution_success/{scalar_mul => fixed_base_scalar_mul}/Prover.toml (100%)
 rename noir/noir-repo/test_programs/execution_success/{scalar_mul => fixed_base_scalar_mul}/src/main.nr (100%)
 create mode 100644 noir/noir-repo/test_programs/execution_success/variable_base_scalar_mul/Nargo.toml
 create mode 100644 noir/noir-repo/test_programs/execution_success/variable_base_scalar_mul/Prover.toml
 create mode 100644 noir/noir-repo/test_programs/execution_success/variable_base_scalar_mul/src/main.nr

diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp
index 5ece3c031d48..736990478529 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp
@@ -89,6 +89,11 @@ void build_constraints(Builder& builder, AcirFormat const& constraint_system, bo
         create_fixed_base_constraint(builder, constraint);
     }
 
+    // Add variable base scalar mul constraints
+    for (const auto& constraint : constraint_system.variable_base_scalar_mul_constraints) {
+        create_variable_base_constraint(builder, constraint);
+    }
+
     // Add ec add constraints
     for (const auto& constraint : constraint_system.ec_add_constraints) {
         create_ec_add_constraint(builder, constraint, has_valid_witness_assignments);
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.hpp
index ec82362e2d8b..a7f5b4757375 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.hpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.hpp
@@ -17,6 +17,7 @@
 #include "recursion_constraint.hpp"
 #include "schnorr_verify.hpp"
 #include "sha256_constraint.hpp"
+#include "variable_base_scalar_mul.hpp"
 #include <utility>
 
 namespace acir_format {
@@ -48,6 +49,7 @@ struct AcirFormat {
     std::vector<PedersenHashConstraint> pedersen_hash_constraints;
     std::vector<Poseidon2Constraint> poseidon2_constraints;
     std::vector<FixedBaseScalarMul> fixed_base_scalar_mul_constraints;
+    std::vector<VariableBaseScalarMul> variable_base_scalar_mul_constraints;
     std::vector<EcAdd> ec_add_constraints;
     std::vector<RecursionConstraint> recursion_constraints;
     std::vector<BigIntFromLeBytes> bigint_from_le_bytes_constraints;
@@ -82,6 +84,7 @@ struct AcirFormat {
                    pedersen_hash_constraints,
                    poseidon2_constraints,
                    fixed_base_scalar_mul_constraints,
+                   variable_base_scalar_mul_constraints,
                    ec_add_constraints,
                    recursion_constraints,
                    poly_triple_constraints,
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.test.cpp
index c7d44e319413..7de0f847b1f7 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.test.cpp
@@ -48,6 +48,7 @@ TEST_F(AcirFormatTests, TestASingleConstraintNoPubInputs)
         .pedersen_hash_constraints = {},
         .poseidon2_constraints = {},
         .fixed_base_scalar_mul_constraints = {},
+        .variable_base_scalar_mul_constraints = {},
         .ec_add_constraints = {},
         .recursion_constraints = {},
         .bigint_from_le_bytes_constraints = {},
@@ -164,6 +165,7 @@ TEST_F(AcirFormatTests, TestLogicGateFromNoirCircuit)
                                   .pedersen_hash_constraints = {},
                                   .poseidon2_constraints = {},
                                   .fixed_base_scalar_mul_constraints = {},
+                                  .variable_base_scalar_mul_constraints = {},
                                   .ec_add_constraints = {},
                                   .recursion_constraints = {},
                                   .bigint_from_le_bytes_constraints = {},
@@ -232,6 +234,7 @@ TEST_F(AcirFormatTests, TestSchnorrVerifyPass)
                                   .pedersen_hash_constraints = {},
                                   .poseidon2_constraints = {},
                                   .fixed_base_scalar_mul_constraints = {},
+                                  .variable_base_scalar_mul_constraints = {},
                                   .ec_add_constraints = {},
                                   .recursion_constraints = {},
                                   .bigint_from_le_bytes_constraints = {},
@@ -327,6 +330,7 @@ TEST_F(AcirFormatTests, TestSchnorrVerifySmallRange)
         .pedersen_hash_constraints = {},
         .poseidon2_constraints = {},
         .fixed_base_scalar_mul_constraints = {},
+        .variable_base_scalar_mul_constraints = {},
         .ec_add_constraints = {},
         .recursion_constraints = {},
         .bigint_from_le_bytes_constraints = {},
@@ -441,6 +445,7 @@ TEST_F(AcirFormatTests, TestVarKeccak)
         .pedersen_hash_constraints = {},
         .poseidon2_constraints = {},
         .fixed_base_scalar_mul_constraints = {},
+        .variable_base_scalar_mul_constraints = {},
         .ec_add_constraints = {},
         .recursion_constraints = {},
         .bigint_from_le_bytes_constraints = {},
@@ -488,6 +493,7 @@ TEST_F(AcirFormatTests, TestKeccakPermutation)
                                   .pedersen_hash_constraints = {},
                                   .poseidon2_constraints = {},
                                   .fixed_base_scalar_mul_constraints = {},
+                                  .variable_base_scalar_mul_constraints = {},
                                   .ec_add_constraints = {},
                                   .recursion_constraints = {},
                                   .bigint_from_le_bytes_constraints = {},
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.hpp
index 778363f3258c..f31fc73c806a 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.hpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.hpp
@@ -317,6 +317,15 @@ void handle_blackbox_func_call(Program::Opcode::BlackBoxFuncCall const& arg, Aci
                     .pub_key_x = arg.outputs[0].value,
                     .pub_key_y = arg.outputs[1].value,
                 });
+            } else if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::VariableBaseScalarMul>) {
+                af.variable_base_scalar_mul_constraints.push_back(VariableBaseScalarMul{
+                    .point_x = arg.point_x.witness.value,
+                    .point_y = arg.point_y.witness.value,
+                    .scalar_low = arg.scalar_low.witness.value,
+                    .scalar_high = arg.scalar_high.witness.value,
+                    .out_point_x = arg.outputs[0].value,
+                    .out_point_y = arg.outputs[1].value,
+                });
             } else if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::EmbeddedCurveAdd>) {
                 af.ec_add_constraints.push_back(EcAdd{
                     .input1_x = arg.input1_x.witness.value,
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/bigint_constraint.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/bigint_constraint.test.cpp
index 584f7ef62a56..3b32c7f26950 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/bigint_constraint.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/bigint_constraint.test.cpp
@@ -185,6 +185,7 @@ TEST_F(BigIntTests, TestBigIntConstraintMultiple)
         .pedersen_hash_constraints = {},
         .poseidon2_constraints = {},
         .fixed_base_scalar_mul_constraints = {},
+        .variable_base_scalar_mul_constraints = {},
         .ec_add_constraints = {},
         .recursion_constraints = {},
         .bigint_from_le_bytes_constraints = {},
@@ -253,6 +254,7 @@ TEST_F(BigIntTests, TestBigIntConstraintSimple)
         .pedersen_hash_constraints = {},
         .poseidon2_constraints = {},
         .fixed_base_scalar_mul_constraints = {},
+        .variable_base_scalar_mul_constraints = {},
         .ec_add_constraints = {},
         .recursion_constraints = {},
         .bigint_from_le_bytes_constraints = { from_le_bytes_constraint_bigint1 },
@@ -306,6 +308,7 @@ TEST_F(BigIntTests, TestBigIntConstraintReuse)
         .pedersen_hash_constraints = {},
         .poseidon2_constraints = {},
         .fixed_base_scalar_mul_constraints = {},
+        .variable_base_scalar_mul_constraints = {},
         .ec_add_constraints = {},
         .recursion_constraints = {},
         .bigint_from_le_bytes_constraints = {},
@@ -363,6 +366,7 @@ TEST_F(BigIntTests, TestBigIntConstraintReuse2)
         .pedersen_hash_constraints = {},
         .poseidon2_constraints = {},
         .fixed_base_scalar_mul_constraints = {},
+        .variable_base_scalar_mul_constraints = {},
         .ec_add_constraints = {},
         .recursion_constraints = {},
         .bigint_from_le_bytes_constraints = {},
@@ -441,6 +445,7 @@ TEST_F(BigIntTests, TestBigIntDIV)
         .pedersen_hash_constraints = {},
         .poseidon2_constraints = {},
         .fixed_base_scalar_mul_constraints = {},
+        .variable_base_scalar_mul_constraints = {},
         .ec_add_constraints = {},
         .recursion_constraints = {},
         .bigint_from_le_bytes_constraints = { from_le_bytes_constraint_bigint1, from_le_bytes_constraint_bigint2 },
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp
index 20f9e8072bba..75b9150d335c 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp
@@ -127,6 +127,7 @@ TEST_F(UltraPlonkRAM, TestBlockConstraint)
         .pedersen_hash_constraints = {},
         .poseidon2_constraints = {},
         .fixed_base_scalar_mul_constraints = {},
+        .variable_base_scalar_mul_constraints = {},
         .ec_add_constraints = {},
         .recursion_constraints = {},
         .bigint_from_le_bytes_constraints = {},
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/ec_operations.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ec_operations.test.cpp
index 92c76e3d7a37..bdda21409a17 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/ec_operations.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ec_operations.test.cpp
@@ -67,6 +67,7 @@ TEST_F(EcOperations, TestECOperations)
         .pedersen_hash_constraints = {},
         .poseidon2_constraints = {},
         .fixed_base_scalar_mul_constraints = {},
+        .variable_base_scalar_mul_constraints = {},
         .ec_add_constraints = { ec_add_constraint },
         .recursion_constraints = {},
         .bigint_from_le_bytes_constraints = {},
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.test.cpp
index 0a11adb97be2..c494cc13e798 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.test.cpp
@@ -107,6 +107,7 @@ TEST_F(ECDSASecp256k1, TestECDSAConstraintSucceed)
         .pedersen_hash_constraints = {},
         .poseidon2_constraints = {},
         .fixed_base_scalar_mul_constraints = {},
+        .variable_base_scalar_mul_constraints = {},
         .ec_add_constraints = {},
         .recursion_constraints = {},
         .bigint_from_le_bytes_constraints = {},
@@ -156,6 +157,7 @@ TEST_F(ECDSASecp256k1, TestECDSACompilesForVerifier)
         .pedersen_hash_constraints = {},
         .poseidon2_constraints = {},
         .fixed_base_scalar_mul_constraints = {},
+        .variable_base_scalar_mul_constraints = {},
         .ec_add_constraints = {},
         .recursion_constraints = {},
         .bigint_from_le_bytes_constraints = {},
@@ -200,6 +202,7 @@ TEST_F(ECDSASecp256k1, TestECDSAConstraintFail)
         .pedersen_hash_constraints = {},
         .poseidon2_constraints = {},
         .fixed_base_scalar_mul_constraints = {},
+        .variable_base_scalar_mul_constraints = {},
         .ec_add_constraints = {},
         .recursion_constraints = {},
         .bigint_from_le_bytes_constraints = {},
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.test.cpp
index 6cf542bc2d6e..6728445d2371 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.test.cpp
@@ -141,6 +141,7 @@ TEST(ECDSASecp256r1, test_hardcoded)
         .pedersen_hash_constraints = {},
         .poseidon2_constraints = {},
         .fixed_base_scalar_mul_constraints = {},
+        .variable_base_scalar_mul_constraints = {},
         .ec_add_constraints = {},
         .recursion_constraints = {},
         .bigint_from_le_bytes_constraints = {},
@@ -192,6 +193,7 @@ TEST(ECDSASecp256r1, TestECDSAConstraintSucceed)
         .pedersen_hash_constraints = {},
         .poseidon2_constraints = {},
         .fixed_base_scalar_mul_constraints = {},
+        .variable_base_scalar_mul_constraints = {},
         .ec_add_constraints = {},
         .recursion_constraints = {},
         .bigint_from_le_bytes_constraints = {},
@@ -241,6 +243,7 @@ TEST(ECDSASecp256r1, TestECDSACompilesForVerifier)
         .pedersen_hash_constraints = {},
         .poseidon2_constraints = {},
         .fixed_base_scalar_mul_constraints = {},
+        .variable_base_scalar_mul_constraints = {},
         .ec_add_constraints = {},
         .recursion_constraints = {},
         .bigint_from_le_bytes_constraints = {},
@@ -285,6 +288,7 @@ TEST(ECDSASecp256r1, TestECDSAConstraintFail)
         .pedersen_hash_constraints = {},
         .poseidon2_constraints = {},
         .fixed_base_scalar_mul_constraints = {},
+        .variable_base_scalar_mul_constraints = {},
         .ec_add_constraints = {},
         .recursion_constraints = {},
         .bigint_from_le_bytes_constraints = {},
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/poseidon2_constraint.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/poseidon2_constraint.test.cpp
index f509c262782a..f672505b4d70 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/poseidon2_constraint.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/poseidon2_constraint.test.cpp
@@ -47,6 +47,7 @@ TEST_F(Poseidon2Tests, TestPoseidon2Permutation)
                                   .pedersen_hash_constraints = {},
                                   .poseidon2_constraints = { poseidon2_constraint },
                                   .fixed_base_scalar_mul_constraints = {},
+                                  .variable_base_scalar_mul_constraints = {},
                                   .ec_add_constraints = {},
                                   .recursion_constraints = {},
                                   .bigint_from_le_bytes_constraints = {},
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.test.cpp
index bbf7768abc91..97e53d30c627 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.test.cpp
@@ -99,6 +99,7 @@ Builder create_inner_circuit()
                                   .pedersen_hash_constraints = {},
                                   .poseidon2_constraints = {},
                                   .fixed_base_scalar_mul_constraints = {},
+                                  .variable_base_scalar_mul_constraints = {},
                                   .ec_add_constraints = {},
                                   .recursion_constraints = {},
                                   .bigint_from_le_bytes_constraints = {},
@@ -256,6 +257,7 @@ Builder create_outer_circuit(std::vector<Builder>& inner_circuits)
                                   .pedersen_hash_constraints = {},
                                   .poseidon2_constraints = {},
                                   .fixed_base_scalar_mul_constraints = {},
+                                  .variable_base_scalar_mul_constraints = {},
                                   .ec_add_constraints = {},
                                   .recursion_constraints = recursion_constraints,
                                   .bigint_from_le_bytes_constraints = {},
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp
index e2c9d020d6bc..bdfb6605ad24 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp
@@ -145,6 +145,18 @@ struct BlackBoxFuncCall {
         static FixedBaseScalarMul bincodeDeserialize(std::vector<uint8_t>);
     };
 
+    struct VariableBaseScalarMul {
+        Program::FunctionInput point_x;
+        Program::FunctionInput point_y;
+        Program::FunctionInput scalar_low;
+        Program::FunctionInput scalar_high;
+        std::array<Program::Witness, 2> outputs;
+
+        friend bool operator==(const VariableBaseScalarMul&, const VariableBaseScalarMul&);
+        std::vector<uint8_t> bincodeSerialize() const;
+        static VariableBaseScalarMul bincodeDeserialize(std::vector<uint8_t>);
+    };
+
     struct EmbeddedCurveAdd {
         Program::FunctionInput input1_x;
         Program::FunctionInput input1_y;
@@ -278,6 +290,7 @@ struct BlackBoxFuncCall {
                  EcdsaSecp256k1,
                  EcdsaSecp256r1,
                  FixedBaseScalarMul,
+                 VariableBaseScalarMul,
                  EmbeddedCurveAdd,
                  Keccak256,
                  Keccakf1600,
@@ -753,6 +766,18 @@ struct BlackBoxOp {
         static FixedBaseScalarMul bincodeDeserialize(std::vector<uint8_t>);
     };
 
+    struct VariableBaseScalarMul {
+        Program::MemoryAddress point_x;
+        Program::MemoryAddress point_y;
+        Program::MemoryAddress scalar_low;
+        Program::MemoryAddress scalar_high;
+        Program::HeapArray result;
+
+        friend bool operator==(const VariableBaseScalarMul&, const VariableBaseScalarMul&);
+        std::vector<uint8_t> bincodeSerialize() const;
+        static VariableBaseScalarMul bincodeDeserialize(std::vector<uint8_t>);
+    };
+
     struct EmbeddedCurveAdd {
         Program::MemoryAddress input1_x;
         Program::MemoryAddress input1_y;
@@ -855,6 +880,7 @@ struct BlackBoxOp {
                  PedersenCommitment,
                  PedersenHash,
                  FixedBaseScalarMul,
+                 VariableBaseScalarMul,
                  EmbeddedCurveAdd,
                  BigIntAdd,
                  BigIntSub,
@@ -3068,6 +3094,75 @@ Program::BlackBoxFuncCall::FixedBaseScalarMul serde::Deserializable<
 
 namespace Program {
 
+inline bool operator==(const BlackBoxFuncCall::VariableBaseScalarMul& lhs,
+                       const BlackBoxFuncCall::VariableBaseScalarMul& rhs)
+{
+    if (!(lhs.point_x == rhs.point_x)) {
+        return false;
+    }
+    if (!(lhs.point_y == rhs.point_y)) {
+        return false;
+    }
+    if (!(lhs.scalar_low == rhs.scalar_low)) {
+        return false;
+    }
+    if (!(lhs.scalar_high == rhs.scalar_high)) {
+        return false;
+    }
+    if (!(lhs.outputs == rhs.outputs)) {
+        return false;
+    }
+    return true;
+}
+
+inline std::vector<uint8_t> BlackBoxFuncCall::VariableBaseScalarMul::bincodeSerialize() const
+{
+    auto serializer = serde::BincodeSerializer();
+    serde::Serializable<BlackBoxFuncCall::VariableBaseScalarMul>::serialize(*this, serializer);
+    return std::move(serializer).bytes();
+}
+
+inline BlackBoxFuncCall::VariableBaseScalarMul BlackBoxFuncCall::VariableBaseScalarMul::bincodeDeserialize(
+    std::vector<uint8_t> input)
+{
+    auto deserializer = serde::BincodeDeserializer(input);
+    auto value = serde::Deserializable<BlackBoxFuncCall::VariableBaseScalarMul>::deserialize(deserializer);
+    if (deserializer.get_buffer_offset() < input.size()) {
+        throw_or_abort("Some input bytes were not read");
+    }
+    return value;
+}
+
+} // end of namespace Program
+
+template <>
+template <typename Serializer>
+void serde::Serializable<Program::BlackBoxFuncCall::VariableBaseScalarMul>::serialize(
+    const Program::BlackBoxFuncCall::VariableBaseScalarMul& obj, Serializer& serializer)
+{
+    serde::Serializable<decltype(obj.point_x)>::serialize(obj.point_x, serializer);
+    serde::Serializable<decltype(obj.point_y)>::serialize(obj.point_y, serializer);
+    serde::Serializable<decltype(obj.scalar_low)>::serialize(obj.scalar_low, serializer);
+    serde::Serializable<decltype(obj.scalar_high)>::serialize(obj.scalar_high, serializer);
+    serde::Serializable<decltype(obj.outputs)>::serialize(obj.outputs, serializer);
+}
+
+template <>
+template <typename Deserializer>
+Program::BlackBoxFuncCall::VariableBaseScalarMul serde::Deserializable<
+    Program::BlackBoxFuncCall::VariableBaseScalarMul>::deserialize(Deserializer& deserializer)
+{
+    Program::BlackBoxFuncCall::VariableBaseScalarMul obj;
+    obj.point_x = serde::Deserializable<decltype(obj.point_x)>::deserialize(deserializer);
+    obj.point_y = serde::Deserializable<decltype(obj.point_y)>::deserialize(deserializer);
+    obj.scalar_low = serde::Deserializable<decltype(obj.scalar_low)>::deserialize(deserializer);
+    obj.scalar_high = serde::Deserializable<decltype(obj.scalar_high)>::deserialize(deserializer);
+    obj.outputs = serde::Deserializable<decltype(obj.outputs)>::deserialize(deserializer);
+    return obj;
+}
+
+namespace Program {
+
 inline bool operator==(const BlackBoxFuncCall::EmbeddedCurveAdd& lhs, const BlackBoxFuncCall::EmbeddedCurveAdd& rhs)
 {
     if (!(lhs.input1_x == rhs.input1_x)) {
@@ -4444,6 +4539,74 @@ Program::BlackBoxOp::FixedBaseScalarMul serde::Deserializable<Program::BlackBoxO
 
 namespace Program {
 
+inline bool operator==(const BlackBoxOp::VariableBaseScalarMul& lhs, const BlackBoxOp::VariableBaseScalarMul& rhs)
+{
+    if (!(lhs.point_x == rhs.point_x)) {
+        return false;
+    }
+    if (!(lhs.point_y == rhs.point_y)) {
+        return false;
+    }
+    if (!(lhs.scalar_low == rhs.scalar_low)) {
+        return false;
+    }
+    if (!(lhs.scalar_high == rhs.scalar_high)) {
+        return false;
+    }
+    if (!(lhs.result == rhs.result)) {
+        return false;
+    }
+    return true;
+}
+
+inline std::vector<uint8_t> BlackBoxOp::VariableBaseScalarMul::bincodeSerialize() const
+{
+    auto serializer = serde::BincodeSerializer();
+    serde::Serializable<BlackBoxOp::VariableBaseScalarMul>::serialize(*this, serializer);
+    return std::move(serializer).bytes();
+}
+
+inline BlackBoxOp::VariableBaseScalarMul BlackBoxOp::VariableBaseScalarMul::bincodeDeserialize(
+    std::vector<uint8_t> input)
+{
+    auto deserializer = serde::BincodeDeserializer(input);
+    auto value = serde::Deserializable<BlackBoxOp::VariableBaseScalarMul>::deserialize(deserializer);
+    if (deserializer.get_buffer_offset() < input.size()) {
+        throw_or_abort("Some input bytes were not read");
+    }
+    return value;
+}
+
+} // end of namespace Program
+
+template <>
+template <typename Serializer>
+void serde::Serializable<Program::BlackBoxOp::VariableBaseScalarMul>::serialize(
+    const Program::BlackBoxOp::VariableBaseScalarMul& obj, Serializer& serializer)
+{
+    serde::Serializable<decltype(obj.point_x)>::serialize(obj.point_x, serializer);
+    serde::Serializable<decltype(obj.point_y)>::serialize(obj.point_y, serializer);
+    serde::Serializable<decltype(obj.scalar_low)>::serialize(obj.scalar_low, serializer);
+    serde::Serializable<decltype(obj.scalar_high)>::serialize(obj.scalar_high, serializer);
+    serde::Serializable<decltype(obj.result)>::serialize(obj.result, serializer);
+}
+
+template <>
+template <typename Deserializer>
+Program::BlackBoxOp::VariableBaseScalarMul serde::Deserializable<
+    Program::BlackBoxOp::VariableBaseScalarMul>::deserialize(Deserializer& deserializer)
+{
+    Program::BlackBoxOp::VariableBaseScalarMul obj;
+    obj.point_x = serde::Deserializable<decltype(obj.point_x)>::deserialize(deserializer);
+    obj.point_y = serde::Deserializable<decltype(obj.point_y)>::deserialize(deserializer);
+    obj.scalar_low = serde::Deserializable<decltype(obj.scalar_low)>::deserialize(deserializer);
+    obj.scalar_high = serde::Deserializable<decltype(obj.scalar_high)>::deserialize(deserializer);
+    obj.result = serde::Deserializable<decltype(obj.result)>::deserialize(deserializer);
+    return obj;
+}
+
+namespace Program {
+
 inline bool operator==(const BlackBoxOp::EmbeddedCurveAdd& lhs, const BlackBoxOp::EmbeddedCurveAdd& rhs)
 {
     if (!(lhs.input1_x == rhs.input1_x)) {
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.test.cpp
index 6266253ee552..aa520806b2b7 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.test.cpp
@@ -49,6 +49,7 @@ TEST_F(Sha256Tests, TestSha256Compression)
                                   .pedersen_hash_constraints = {},
                                   .poseidon2_constraints = {},
                                   .fixed_base_scalar_mul_constraints = {},
+                                  .variable_base_scalar_mul_constraints = {},
                                   .ec_add_constraints = {},
                                   .recursion_constraints = {},
                                   .bigint_from_le_bytes_constraints = {},
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/variable_base_scalar_mul.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/variable_base_scalar_mul.cpp
new file mode 100644
index 000000000000..6446b68158c4
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/variable_base_scalar_mul.cpp
@@ -0,0 +1,38 @@
+#include "variable_base_scalar_mul.hpp"
+#include "barretenberg/dsl/types.hpp"
+#include "barretenberg/ecc/curves/bn254/fr.hpp"
+#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
+#include "barretenberg/plonk_honk_shared/arithmetization/gate_data.hpp"
+
+namespace acir_format {
+
+template <typename Builder> void create_variable_base_constraint(Builder& builder, const VariableBaseScalarMul& input)
+{
+    using cycle_group_ct = bb::stdlib::cycle_group<Builder>;
+    using cycle_scalar_ct = typename bb::stdlib::cycle_group<Builder>::cycle_scalar;
+    using field_ct = bb::stdlib::field_t<Builder>;
+
+    // We instantiate the input point/variable base as `cycle_group_ct`
+    auto point_x = field_ct::from_witness_index(&builder, input.point_x);
+    auto point_y = field_ct::from_witness_index(&builder, input.point_y);
+    cycle_group_ct input_point(point_x, point_y, false);
+
+    // We reconstruct the scalar from the low and high limbs
+    field_ct scalar_low_as_field = field_ct::from_witness_index(&builder, input.scalar_low);
+    field_ct scalar_high_as_field = field_ct::from_witness_index(&builder, input.scalar_high);
+    cycle_scalar_ct scalar(scalar_low_as_field, scalar_high_as_field);
+
+    // We multiply the scalar with input point/variable base to get the result
+    auto result = input_point * scalar;
+
+    // Finally we add the constraints
+    builder.assert_equal(result.x.get_witness_index(), input.out_point_x);
+    builder.assert_equal(result.y.get_witness_index(), input.out_point_y);
+}
+
+template void create_variable_base_constraint<UltraCircuitBuilder>(UltraCircuitBuilder& builder,
+                                                                   const VariableBaseScalarMul& input);
+template void create_variable_base_constraint<GoblinUltraCircuitBuilder>(GoblinUltraCircuitBuilder& builder,
+                                                                         const VariableBaseScalarMul& input);
+
+} // namespace acir_format
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/variable_base_scalar_mul.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/variable_base_scalar_mul.hpp
new file mode 100644
index 000000000000..d903df2cb322
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/variable_base_scalar_mul.hpp
@@ -0,0 +1,23 @@
+#pragma once
+#include "barretenberg/dsl/types.hpp"
+#include "barretenberg/serialize/msgpack.hpp"
+#include <cstdint>
+
+namespace acir_format {
+
+struct VariableBaseScalarMul {
+    uint32_t point_x;
+    uint32_t point_y;
+    uint32_t scalar_low;
+    uint32_t scalar_high;
+    uint32_t out_point_x;
+    uint32_t out_point_y;
+
+    // for serialization, update with any new fields
+    MSGPACK_FIELDS(point_x, point_y, scalar_low, scalar_high, out_point_x, out_point_y);
+    friend bool operator==(VariableBaseScalarMul const& lhs, VariableBaseScalarMul const& rhs) = default;
+};
+
+template <typename Builder> void create_variable_base_constraint(Builder& builder, const VariableBaseScalarMul& input);
+
+} // namespace acir_format
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/grumpkin_point.nr b/noir-projects/noir-protocol-circuits/crates/types/src/grumpkin_point.nr
index 965654ac144e..ec334d78b50f 100644
--- a/noir-projects/noir-protocol-circuits/crates/types/src/grumpkin_point.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/grumpkin_point.nr
@@ -3,6 +3,7 @@ use dep::std::cmp::Eq;
 
 global GRUMPKIN_POINT_SERIALIZED_LEN: Field = 2;
 
+// TODO(https://github.com/noir-lang/noir/issues/4931)
 struct GrumpkinPoint {
     x: Field,
     y: Field,
diff --git a/noir/noir-repo/acvm-repo/acir/README.md b/noir/noir-repo/acvm-repo/acir/README.md
index 801aeac1140a..e72f7ea178d8 100644
--- a/noir/noir-repo/acvm-repo/acir/README.md
+++ b/noir/noir-repo/acvm-repo/acir/README.md
@@ -146,6 +146,15 @@ Inputs and outputs are similar to SchnorrVerify, except that because we use a di
 Because the Grumpkin scalar field is bigger than the ACIR field, we provide 2 ACIR fields representing the low and high parts of the Grumpkin scalar $a$:
 $a=low+high*2^{128},$ with $low, high < 2^{128}$
 
+**VariableBaseScalarMul**: scalar multiplication with a variable base/input point (P) of the embedded curve
+- input:
+    point_x, point_y representing x and y coordinates of input point P
+    scalar_low, scalar_high are 2 (field , 254), representing the low and high part of the input scalar. For Barretenberg, they must both be less than 128 bits.
+- output: x and y coordinates of $low*P+high*2^{128}*P$, where P is the input point P
+
+Because the Grumpkin scalar field is bigger than the ACIR field, we provide 2 ACIR fields representing the low and high parts of the Grumpkin scalar $a$:
+$a=low+high*2^{128},$ with $low, high < 2^{128}$
+
 **Keccak256**: Computes the Keccak-256 (Ethereum version) of the inputs.
 - inputs: Vector of bytes (FieldElement, 8)
 - outputs: Vector of 32 bytes (FieldElement, 8)
diff --git a/noir/noir-repo/acvm-repo/acir/codegen/acir.cpp b/noir/noir-repo/acvm-repo/acir/codegen/acir.cpp
index 0ad193fedf65..1e5207c01cbb 100644
--- a/noir/noir-repo/acvm-repo/acir/codegen/acir.cpp
+++ b/noir/noir-repo/acvm-repo/acir/codegen/acir.cpp
@@ -145,6 +145,18 @@ namespace Program {
             static FixedBaseScalarMul bincodeDeserialize(std::vector<uint8_t>);
         };
 
+        struct VariableBaseScalarMul {
+            Program::FunctionInput point_x;
+            Program::FunctionInput point_y;
+            Program::FunctionInput scalar_low;
+            Program::FunctionInput scalar_high;
+            std::array<Program::Witness, 2> outputs;
+
+            friend bool operator==(const VariableBaseScalarMul&, const VariableBaseScalarMul&);
+            std::vector<uint8_t> bincodeSerialize() const;
+            static VariableBaseScalarMul bincodeDeserialize(std::vector<uint8_t>);
+        };
+
         struct EmbeddedCurveAdd {
             Program::FunctionInput input1_x;
             Program::FunctionInput input1_y;
@@ -266,7 +278,7 @@ namespace Program {
             static Sha256Compression bincodeDeserialize(std::vector<uint8_t>);
         };
 
-        std::variant<AND, XOR, RANGE, SHA256, Blake2s, Blake3, SchnorrVerify, PedersenCommitment, PedersenHash, EcdsaSecp256k1, EcdsaSecp256r1, FixedBaseScalarMul, EmbeddedCurveAdd, Keccak256, Keccakf1600, RecursiveAggregation, BigIntAdd, BigIntSub, BigIntMul, BigIntDiv, BigIntFromLeBytes, BigIntToLeBytes, Poseidon2Permutation, Sha256Compression> value;
+        std::variant<AND, XOR, RANGE, SHA256, Blake2s, Blake3, SchnorrVerify, PedersenCommitment, PedersenHash, EcdsaSecp256k1, EcdsaSecp256r1, FixedBaseScalarMul, VariableBaseScalarMul, EmbeddedCurveAdd, Keccak256, Keccakf1600, RecursiveAggregation, BigIntAdd, BigIntSub, BigIntMul, BigIntDiv, BigIntFromLeBytes, BigIntToLeBytes, Poseidon2Permutation, Sha256Compression> value;
 
         friend bool operator==(const BlackBoxFuncCall&, const BlackBoxFuncCall&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -729,6 +741,18 @@ namespace Program {
             static FixedBaseScalarMul bincodeDeserialize(std::vector<uint8_t>);
         };
 
+        struct VariableBaseScalarMul {
+            Program::MemoryAddress point_x;
+            Program::MemoryAddress point_y;
+            Program::MemoryAddress scalar_low;
+            Program::MemoryAddress scalar_high;
+            Program::HeapArray result;
+
+            friend bool operator==(const VariableBaseScalarMul&, const VariableBaseScalarMul&);
+            std::vector<uint8_t> bincodeSerialize() const;
+            static VariableBaseScalarMul bincodeDeserialize(std::vector<uint8_t>);
+        };
+
         struct EmbeddedCurveAdd {
             Program::MemoryAddress input1_x;
             Program::MemoryAddress input1_y;
@@ -820,7 +844,7 @@ namespace Program {
             static Sha256Compression bincodeDeserialize(std::vector<uint8_t>);
         };
 
-        std::variant<Sha256, Blake2s, Blake3, Keccak256, Keccakf1600, EcdsaSecp256k1, EcdsaSecp256r1, SchnorrVerify, PedersenCommitment, PedersenHash, FixedBaseScalarMul, EmbeddedCurveAdd, BigIntAdd, BigIntSub, BigIntMul, BigIntDiv, BigIntFromLeBytes, BigIntToLeBytes, Poseidon2Permutation, Sha256Compression> value;
+        std::variant<Sha256, Blake2s, Blake3, Keccak256, Keccakf1600, EcdsaSecp256k1, EcdsaSecp256r1, SchnorrVerify, PedersenCommitment, PedersenHash, FixedBaseScalarMul, VariableBaseScalarMul, EmbeddedCurveAdd, BigIntAdd, BigIntSub, BigIntMul, BigIntDiv, BigIntFromLeBytes, BigIntToLeBytes, Poseidon2Permutation, Sha256Compression> value;
 
         friend bool operator==(const BlackBoxOp&, const BlackBoxOp&);
         std::vector<uint8_t> bincodeSerialize() const;
@@ -2690,6 +2714,56 @@ Program::BlackBoxFuncCall::FixedBaseScalarMul serde::Deserializable<Program::Bla
     return obj;
 }
 
+namespace Program {
+
+    inline bool operator==(const BlackBoxFuncCall::VariableBaseScalarMul &lhs, const BlackBoxFuncCall::VariableBaseScalarMul &rhs) {
+        if (!(lhs.point_x == rhs.point_x)) { return false; }
+        if (!(lhs.point_y == rhs.point_y)) { return false; }
+        if (!(lhs.scalar_low == rhs.scalar_low)) { return false; }
+        if (!(lhs.scalar_high == rhs.scalar_high)) { return false; }
+        if (!(lhs.outputs == rhs.outputs)) { return false; }
+        return true;
+    }
+
+    inline std::vector<uint8_t> BlackBoxFuncCall::VariableBaseScalarMul::bincodeSerialize() const {
+        auto serializer = serde::BincodeSerializer();
+        serde::Serializable<BlackBoxFuncCall::VariableBaseScalarMul>::serialize(*this, serializer);
+        return std::move(serializer).bytes();
+    }
+
+    inline BlackBoxFuncCall::VariableBaseScalarMul BlackBoxFuncCall::VariableBaseScalarMul::bincodeDeserialize(std::vector<uint8_t> input) {
+        auto deserializer = serde::BincodeDeserializer(input);
+        auto value = serde::Deserializable<BlackBoxFuncCall::VariableBaseScalarMul>::deserialize(deserializer);
+        if (deserializer.get_buffer_offset() < input.size()) {
+            throw serde::deserialization_error("Some input bytes were not read");
+        }
+        return value;
+    }
+
+} // end of namespace Program
+
+template <>
+template <typename Serializer>
+void serde::Serializable<Program::BlackBoxFuncCall::VariableBaseScalarMul>::serialize(const Program::BlackBoxFuncCall::VariableBaseScalarMul &obj, Serializer &serializer) {
+    serde::Serializable<decltype(obj.point_x)>::serialize(obj.point_x, serializer);
+    serde::Serializable<decltype(obj.point_y)>::serialize(obj.point_y, serializer);
+    serde::Serializable<decltype(obj.scalar_low)>::serialize(obj.scalar_low, serializer);
+    serde::Serializable<decltype(obj.scalar_high)>::serialize(obj.scalar_high, serializer);
+    serde::Serializable<decltype(obj.outputs)>::serialize(obj.outputs, serializer);
+}
+
+template <>
+template <typename Deserializer>
+Program::BlackBoxFuncCall::VariableBaseScalarMul serde::Deserializable<Program::BlackBoxFuncCall::VariableBaseScalarMul>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxFuncCall::VariableBaseScalarMul obj;
+    obj.point_x = serde::Deserializable<decltype(obj.point_x)>::deserialize(deserializer);
+    obj.point_y = serde::Deserializable<decltype(obj.point_y)>::deserialize(deserializer);
+    obj.scalar_low = serde::Deserializable<decltype(obj.scalar_low)>::deserialize(deserializer);
+    obj.scalar_high = serde::Deserializable<decltype(obj.scalar_high)>::deserialize(deserializer);
+    obj.outputs = serde::Deserializable<decltype(obj.outputs)>::deserialize(deserializer);
+    return obj;
+}
+
 namespace Program {
 
     inline bool operator==(const BlackBoxFuncCall::EmbeddedCurveAdd &lhs, const BlackBoxFuncCall::EmbeddedCurveAdd &rhs) {
@@ -3750,6 +3824,56 @@ Program::BlackBoxOp::FixedBaseScalarMul serde::Deserializable<Program::BlackBoxO
     return obj;
 }
 
+namespace Program {
+
+    inline bool operator==(const BlackBoxOp::VariableBaseScalarMul &lhs, const BlackBoxOp::VariableBaseScalarMul &rhs) {
+        if (!(lhs.point_x == rhs.point_x)) { return false; }
+        if (!(lhs.point_y == rhs.point_y)) { return false; }
+        if (!(lhs.scalar_low == rhs.scalar_low)) { return false; }
+        if (!(lhs.scalar_high == rhs.scalar_high)) { return false; }
+        if (!(lhs.result == rhs.result)) { return false; }
+        return true;
+    }
+
+    inline std::vector<uint8_t> BlackBoxOp::VariableBaseScalarMul::bincodeSerialize() const {
+        auto serializer = serde::BincodeSerializer();
+        serde::Serializable<BlackBoxOp::VariableBaseScalarMul>::serialize(*this, serializer);
+        return std::move(serializer).bytes();
+    }
+
+    inline BlackBoxOp::VariableBaseScalarMul BlackBoxOp::VariableBaseScalarMul::bincodeDeserialize(std::vector<uint8_t> input) {
+        auto deserializer = serde::BincodeDeserializer(input);
+        auto value = serde::Deserializable<BlackBoxOp::VariableBaseScalarMul>::deserialize(deserializer);
+        if (deserializer.get_buffer_offset() < input.size()) {
+            throw serde::deserialization_error("Some input bytes were not read");
+        }
+        return value;
+    }
+
+} // end of namespace Program
+
+template <>
+template <typename Serializer>
+void serde::Serializable<Program::BlackBoxOp::VariableBaseScalarMul>::serialize(const Program::BlackBoxOp::VariableBaseScalarMul &obj, Serializer &serializer) {
+    serde::Serializable<decltype(obj.point_x)>::serialize(obj.point_x, serializer);
+    serde::Serializable<decltype(obj.point_y)>::serialize(obj.point_y, serializer);
+    serde::Serializable<decltype(obj.scalar_low)>::serialize(obj.scalar_low, serializer);
+    serde::Serializable<decltype(obj.scalar_high)>::serialize(obj.scalar_high, serializer);
+    serde::Serializable<decltype(obj.result)>::serialize(obj.result, serializer);
+}
+
+template <>
+template <typename Deserializer>
+Program::BlackBoxOp::VariableBaseScalarMul serde::Deserializable<Program::BlackBoxOp::VariableBaseScalarMul>::deserialize(Deserializer &deserializer) {
+    Program::BlackBoxOp::VariableBaseScalarMul obj;
+    obj.point_x = serde::Deserializable<decltype(obj.point_x)>::deserialize(deserializer);
+    obj.point_y = serde::Deserializable<decltype(obj.point_y)>::deserialize(deserializer);
+    obj.scalar_low = serde::Deserializable<decltype(obj.scalar_low)>::deserialize(deserializer);
+    obj.scalar_high = serde::Deserializable<decltype(obj.scalar_high)>::deserialize(deserializer);
+    obj.result = serde::Deserializable<decltype(obj.result)>::deserialize(deserializer);
+    return obj;
+}
+
 namespace Program {
 
     inline bool operator==(const BlackBoxOp::EmbeddedCurveAdd &lhs, const BlackBoxOp::EmbeddedCurveAdd &rhs) {
diff --git a/noir/noir-repo/acvm-repo/acir/src/circuit/black_box_functions.rs b/noir/noir-repo/acvm-repo/acir/src/circuit/black_box_functions.rs
index 0a7ee244a5ee..9a43702a408c 100644
--- a/noir/noir-repo/acvm-repo/acir/src/circuit/black_box_functions.rs
+++ b/noir/noir-repo/acvm-repo/acir/src/circuit/black_box_functions.rs
@@ -36,8 +36,10 @@ pub enum BlackBoxFunc {
     EcdsaSecp256k1,
     /// Verifies a ECDSA signature over the secp256r1 curve.
     EcdsaSecp256r1,
-    /// Performs scalar multiplication over the embedded curve on which [`FieldElement`][acir_field::FieldElement] is defined.
+    /// Performs scalar multiplication over the embedded curve on which [`FieldElement`][acir_field::FieldElement] is defined and a fixed base/generator point G1.
     FixedBaseScalarMul,
+    /// Performs scalar multiplication over the embedded curve on which [`FieldElement`][acir_field::FieldElement] is defined and a variable base/input point P.
+    VariableBaseScalarMul,
     /// Calculates the Keccak256 hash of the inputs.
     Keccak256,
     /// Keccak Permutation function of 1600 width
@@ -82,6 +84,7 @@ impl BlackBoxFunc {
             BlackBoxFunc::PedersenHash => "pedersen_hash",
             BlackBoxFunc::EcdsaSecp256k1 => "ecdsa_secp256k1",
             BlackBoxFunc::FixedBaseScalarMul => "fixed_base_scalar_mul",
+            BlackBoxFunc::VariableBaseScalarMul => "variable_base_scalar_mul",
             BlackBoxFunc::EmbeddedCurveAdd => "embedded_curve_add",
             BlackBoxFunc::AND => "and",
             BlackBoxFunc::XOR => "xor",
@@ -112,6 +115,7 @@ impl BlackBoxFunc {
             "ecdsa_secp256k1" => Some(BlackBoxFunc::EcdsaSecp256k1),
             "ecdsa_secp256r1" => Some(BlackBoxFunc::EcdsaSecp256r1),
             "fixed_base_scalar_mul" => Some(BlackBoxFunc::FixedBaseScalarMul),
+            "variable_base_scalar_mul" => Some(BlackBoxFunc::VariableBaseScalarMul),
             "embedded_curve_add" => Some(BlackBoxFunc::EmbeddedCurveAdd),
             "and" => Some(BlackBoxFunc::AND),
             "xor" => Some(BlackBoxFunc::XOR),
diff --git a/noir/noir-repo/acvm-repo/acir/src/circuit/opcodes/black_box_function_call.rs b/noir/noir-repo/acvm-repo/acir/src/circuit/opcodes/black_box_function_call.rs
index 405cd0cef007..5715019937c2 100644
--- a/noir/noir-repo/acvm-repo/acir/src/circuit/opcodes/black_box_function_call.rs
+++ b/noir/noir-repo/acvm-repo/acir/src/circuit/opcodes/black_box_function_call.rs
@@ -85,6 +85,13 @@ pub enum BlackBoxFuncCall {
         high: FunctionInput,
         outputs: (Witness, Witness),
     },
+    VariableBaseScalarMul {
+        point_x: FunctionInput,
+        point_y: FunctionInput,
+        scalar_low: FunctionInput,
+        scalar_high: FunctionInput,
+        outputs: (Witness, Witness),
+    },
     EmbeddedCurveAdd {
         input1_x: FunctionInput,
         input1_y: FunctionInput,
@@ -189,6 +196,7 @@ impl BlackBoxFuncCall {
             BlackBoxFuncCall::EcdsaSecp256k1 { .. } => BlackBoxFunc::EcdsaSecp256k1,
             BlackBoxFuncCall::EcdsaSecp256r1 { .. } => BlackBoxFunc::EcdsaSecp256r1,
             BlackBoxFuncCall::FixedBaseScalarMul { .. } => BlackBoxFunc::FixedBaseScalarMul,
+            BlackBoxFuncCall::VariableBaseScalarMul { .. } => BlackBoxFunc::VariableBaseScalarMul,
             BlackBoxFuncCall::EmbeddedCurveAdd { .. } => BlackBoxFunc::EmbeddedCurveAdd,
             BlackBoxFuncCall::Keccak256 { .. } => BlackBoxFunc::Keccak256,
             BlackBoxFuncCall::Keccakf1600 { .. } => BlackBoxFunc::Keccakf1600,
@@ -232,6 +240,15 @@ impl BlackBoxFuncCall {
             | BlackBoxFuncCall::BigIntDiv { .. }
             | BlackBoxFuncCall::BigIntToLeBytes { .. } => Vec::new(),
             BlackBoxFuncCall::FixedBaseScalarMul { low, high, .. } => vec![*low, *high],
+            BlackBoxFuncCall::VariableBaseScalarMul {
+                point_x,
+                point_y,
+                scalar_low,
+                scalar_high,
+                ..
+            } => {
+                vec![*point_x, *point_y, *scalar_low, *scalar_high]
+            }
             BlackBoxFuncCall::EmbeddedCurveAdd {
                 input1_x, input1_y, input2_x, input2_y, ..
             } => vec![*input1_x, *input1_y, *input2_x, *input2_y],
@@ -329,6 +346,7 @@ impl BlackBoxFuncCall {
             | BlackBoxFuncCall::PedersenHash { output, .. }
             | BlackBoxFuncCall::EcdsaSecp256r1 { output, .. } => vec![*output],
             BlackBoxFuncCall::FixedBaseScalarMul { outputs, .. }
+            | BlackBoxFuncCall::VariableBaseScalarMul { outputs, .. }
             | BlackBoxFuncCall::PedersenCommitment { outputs, .. }
             | BlackBoxFuncCall::EmbeddedCurveAdd { outputs, .. } => vec![outputs.0, outputs.1],
             BlackBoxFuncCall::RANGE { .. }
diff --git a/noir/noir-repo/acvm-repo/acir/tests/test_program_serialization.rs b/noir/noir-repo/acvm-repo/acir/tests/test_program_serialization.rs
index c5912b61cf15..2ad082410a1b 100644
--- a/noir/noir-repo/acvm-repo/acir/tests/test_program_serialization.rs
+++ b/noir/noir-repo/acvm-repo/acir/tests/test_program_serialization.rs
@@ -85,6 +85,38 @@ fn fixed_base_scalar_mul_circuit() {
     assert_eq!(bytes, expected_serialization)
 }
 
+#[test]
+fn variable_base_scalar_mul_circuit() {
+    let variable_base_scalar_mul =
+        Opcode::BlackBoxFuncCall(BlackBoxFuncCall::VariableBaseScalarMul {
+            point_x: FunctionInput { witness: Witness(1), num_bits: 128 },
+            point_y: FunctionInput { witness: Witness(2), num_bits: 128 },
+            scalar_low: FunctionInput { witness: Witness(3), num_bits: 128 },
+            scalar_high: FunctionInput { witness: Witness(4), num_bits: 128 },
+            outputs: (Witness(5), Witness(6)),
+        });
+
+    let circuit = Circuit {
+        current_witness_index: 7,
+        opcodes: vec![variable_base_scalar_mul],
+        private_parameters: BTreeSet::from([Witness(1), Witness(2), Witness(3), Witness(4)]),
+        return_values: PublicInputs(BTreeSet::from_iter(vec![Witness(5), Witness(6)])),
+        ..Circuit::default()
+    };
+    let program = Program { functions: vec![circuit], unconstrained_functions: vec![] };
+
+    let bytes = Program::serialize_program(&program);
+
+    let expected_serialization: Vec<u8> = vec![
+        31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 93, 139, 65, 10, 0, 32, 8, 4, 213, 172, 46, 61, 186,
+        167, 103, 52, 65, 185, 176, 140, 44, 142, 202, 73, 143, 42, 247, 230, 128, 51, 106, 176,
+        64, 135, 53, 218, 112, 252, 113, 141, 223, 187, 9, 155, 36, 231, 203, 2, 176, 218, 19, 62,
+        137, 0, 0, 0,
+    ];
+
+    assert_eq!(bytes, expected_serialization)
+}
+
 #[test]
 fn pedersen_circuit() {
     let pedersen = Opcode::BlackBoxFuncCall(BlackBoxFuncCall::PedersenCommitment {
diff --git a/noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/fixed_base_scalar_mul.rs b/noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/fixed_base_scalar_mul.rs
index c5bfd1d5646d..79e33ae8de53 100644
--- a/noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/fixed_base_scalar_mul.rs
+++ b/noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/fixed_base_scalar_mul.rs
@@ -1,3 +1,4 @@
+// TODO(https://github.com/noir-lang/noir/issues/4932): rename this file to something more generic
 use acir::{
     circuit::opcodes::FunctionInput,
     native_types::{Witness, WitnessMap},
@@ -24,6 +25,29 @@ pub(super) fn fixed_base_scalar_mul(
     Ok(())
 }
 
+pub(super) fn variable_base_scalar_mul(
+    backend: &impl BlackBoxFunctionSolver,
+    initial_witness: &mut WitnessMap,
+    point_x: FunctionInput,
+    point_y: FunctionInput,
+    scalar_low: FunctionInput,
+    scalar_high: FunctionInput,
+    outputs: (Witness, Witness),
+) -> Result<(), OpcodeResolutionError> {
+    let point_x = witness_to_value(initial_witness, point_x.witness)?;
+    let point_y = witness_to_value(initial_witness, point_y.witness)?;
+    let scalar_low = witness_to_value(initial_witness, scalar_low.witness)?;
+    let scalar_high = witness_to_value(initial_witness, scalar_high.witness)?;
+
+    let (out_point_x, out_point_y) =
+        backend.variable_base_scalar_mul(point_x, point_y, scalar_low, scalar_high)?;
+
+    insert_value(&outputs.0, out_point_x, initial_witness)?;
+    insert_value(&outputs.1, out_point_y, initial_witness)?;
+
+    Ok(())
+}
+
 pub(super) fn embedded_curve_add(
     backend: &impl BlackBoxFunctionSolver,
     initial_witness: &mut WitnessMap,
diff --git a/noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/mod.rs b/noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/mod.rs
index 2753c7baaaa9..2487d511b502 100644
--- a/noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/mod.rs
+++ b/noir/noir-repo/acvm-repo/acvm/src/pwg/blackbox/mod.rs
@@ -20,7 +20,7 @@ mod pedersen;
 mod range;
 mod signature;
 
-use fixed_base_scalar_mul::{embedded_curve_add, fixed_base_scalar_mul};
+use fixed_base_scalar_mul::{embedded_curve_add, fixed_base_scalar_mul, variable_base_scalar_mul};
 // Hash functions should eventually be exposed for external consumers.
 use hash::{solve_generic_256_hash_opcode, solve_sha_256_permutation_opcode};
 use logic::{and, xor};
@@ -158,6 +158,21 @@ pub(crate) fn solve(
         BlackBoxFuncCall::FixedBaseScalarMul { low, high, outputs } => {
             fixed_base_scalar_mul(backend, initial_witness, *low, *high, *outputs)
         }
+        BlackBoxFuncCall::VariableBaseScalarMul {
+            point_x,
+            point_y,
+            scalar_low,
+            scalar_high,
+            outputs,
+        } => variable_base_scalar_mul(
+            backend,
+            initial_witness,
+            *point_x,
+            *point_y,
+            *scalar_low,
+            *scalar_high,
+            *outputs,
+        ),
         BlackBoxFuncCall::EmbeddedCurveAdd { input1_x, input1_y, input2_x, input2_y, outputs } => {
             embedded_curve_add(
                 backend,
diff --git a/noir/noir-repo/acvm-repo/acvm_js/test/browser/execute_circuit.test.ts b/noir/noir-repo/acvm-repo/acvm_js/test/browser/execute_circuit.test.ts
index 259c51ed1c62..f6287c2ae8a1 100644
--- a/noir/noir-repo/acvm-repo/acvm_js/test/browser/execute_circuit.test.ts
+++ b/noir/noir-repo/acvm-repo/acvm_js/test/browser/execute_circuit.test.ts
@@ -103,6 +103,16 @@ it('successfully executes a FixedBaseScalarMul opcode', async () => {
   expect(solvedWitness).to.be.deep.eq(expectedWitnessMap);
 });
 
+it('successfully executes a VariableBaseScalarMul opcode', async () => {
+  const { bytecode, initialWitnessMap, expectedWitnessMap } = await import('../shared/variable_base_scalar_mul');
+
+  const solvedWitness: WitnessMap = await executeCircuit(bytecode, initialWitnessMap, () => {
+    throw Error('unexpected oracle');
+  });
+
+  expect(solvedWitness).to.be.deep.eq(expectedWitnessMap);
+});
+
 it('successfully executes a SchnorrVerify opcode', async () => {
   const { bytecode, initialWitnessMap, expectedWitnessMap } = await import('../shared/schnorr_verify');
 
diff --git a/noir/noir-repo/acvm-repo/acvm_js/test/node/execute_circuit.test.ts b/noir/noir-repo/acvm-repo/acvm_js/test/node/execute_circuit.test.ts
index 32487f8bbbac..f9fd5c10b3ee 100644
--- a/noir/noir-repo/acvm-repo/acvm_js/test/node/execute_circuit.test.ts
+++ b/noir/noir-repo/acvm-repo/acvm_js/test/node/execute_circuit.test.ts
@@ -100,6 +100,16 @@ it('successfully executes a FixedBaseScalarMul opcode', async () => {
   expect(solvedWitness).to.be.deep.eq(expectedWitnessMap);
 });
 
+it('successfully executes a VariableBaseScalarMul opcode', async () => {
+  const { bytecode, initialWitnessMap, expectedWitnessMap } = await import('../shared/variable_base_scalar_mul');
+
+  const solvedWitness: WitnessMap = await executeCircuit(bytecode, initialWitnessMap, () => {
+    throw Error('unexpected oracle');
+  });
+
+  expect(solvedWitness).to.be.deep.eq(expectedWitnessMap);
+});
+
 it('successfully executes a SchnorrVerify opcode', async () => {
   const { bytecode, initialWitnessMap, expectedWitnessMap } = await import('../shared/schnorr_verify');
 
diff --git a/noir/noir-repo/acvm-repo/acvm_js/test/shared/variable_base_scalar_mul.ts b/noir/noir-repo/acvm-repo/acvm_js/test/shared/variable_base_scalar_mul.ts
new file mode 100644
index 000000000000..400f7bf4e614
--- /dev/null
+++ b/noir/noir-repo/acvm-repo/acvm_js/test/shared/variable_base_scalar_mul.ts
@@ -0,0 +1,21 @@
+// See `variable_base_scalar_mul_circuit` integration test in `acir/tests/test_program_serialization.rs`.
+export const bytecode = Uint8Array.from([
+  31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 93, 139, 65, 10, 0, 32, 8, 4, 213, 172, 46, 61, 186, 167, 103, 52, 65, 185, 176,
+  140, 44, 142, 202, 73, 143, 42, 247, 230, 128, 51, 106, 176, 64, 135, 53, 218, 112, 252, 113, 141, 223, 187, 9, 155,
+  36, 231, 203, 2, 176, 218, 19, 62, 137, 0, 0, 0,
+]);
+export const initialWitnessMap = new Map([
+  [1, '0x0000000000000000000000000000000000000000000000000000000000000001'],
+  [2, '0x0000000000000002cf135e7506a45d632d270d45f1181294833fc48d823f272c'],
+  [3, '0x0000000000000000000000000000000000000000000000000000000000000001'],
+  [4, '0x0000000000000000000000000000000000000000000000000000000000000000'],
+]);
+
+export const expectedWitnessMap = new Map([
+  [1, '0x0000000000000000000000000000000000000000000000000000000000000001'],
+  [2, '0x0000000000000002cf135e7506a45d632d270d45f1181294833fc48d823f272c'],
+  [3, '0x0000000000000000000000000000000000000000000000000000000000000001'],
+  [4, '0x0000000000000000000000000000000000000000000000000000000000000000'],
+  [5, '0x0000000000000000000000000000000000000000000000000000000000000001'],
+  [6, '0x0000000000000002cf135e7506a45d632d270d45f1181294833fc48d823f272c'],
+]);
diff --git a/noir/noir-repo/acvm-repo/blackbox_solver/src/curve_specific_solver.rs b/noir/noir-repo/acvm-repo/blackbox_solver/src/curve_specific_solver.rs
index fab67467d9ab..a809e21e2ca9 100644
--- a/noir/noir-repo/acvm-repo/blackbox_solver/src/curve_specific_solver.rs
+++ b/noir/noir-repo/acvm-repo/blackbox_solver/src/curve_specific_solver.rs
@@ -29,6 +29,13 @@ pub trait BlackBoxFunctionSolver {
         low: &FieldElement,
         high: &FieldElement,
     ) -> Result<(FieldElement, FieldElement), BlackBoxResolutionError>;
+    fn variable_base_scalar_mul(
+        &self,
+        point_x: &FieldElement,
+        point_y: &FieldElement,
+        scalar_low: &FieldElement,
+        scalar_high: &FieldElement,
+    ) -> Result<(FieldElement, FieldElement), BlackBoxResolutionError>;
     fn ec_add(
         &self,
         input1_x: &FieldElement,
@@ -85,6 +92,15 @@ impl BlackBoxFunctionSolver for StubbedBlackBoxSolver {
     ) -> Result<(FieldElement, FieldElement), BlackBoxResolutionError> {
         Err(Self::fail(BlackBoxFunc::FixedBaseScalarMul))
     }
+    fn variable_base_scalar_mul(
+        &self,
+        _point_x: &FieldElement,
+        _point_y: &FieldElement,
+        _scalar_low: &FieldElement,
+        _scalar_high: &FieldElement,
+    ) -> Result<(FieldElement, FieldElement), BlackBoxResolutionError> {
+        Err(Self::fail(BlackBoxFunc::VariableBaseScalarMul))
+    }
     fn ec_add(
         &self,
         _input1_x: &FieldElement,
diff --git a/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/fixed_base_scalar_mul.rs b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/fixed_base_scalar_mul.rs
index cd91c290f494..2d7ffe1cf1c8 100644
--- a/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/fixed_base_scalar_mul.rs
+++ b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/fixed_base_scalar_mul.rs
@@ -1,3 +1,4 @@
+// TODO(https://github.com/noir-lang/noir/issues/4932): rename this file to something more generic
 use ark_ec::AffineRepr;
 use ark_ff::MontConfig;
 use num_bigint::BigUint;
@@ -6,40 +7,59 @@ use acir::{BlackBoxFunc, FieldElement};
 
 use crate::BlackBoxResolutionError;
 
+/// Performs fixed-base scalar multiplication using the curve's generator point.
 pub fn fixed_base_scalar_mul(
     low: &FieldElement,
     high: &FieldElement,
 ) -> Result<(FieldElement, FieldElement), BlackBoxResolutionError> {
-    let low: u128 = low.try_into_u128().ok_or_else(|| {
+    let generator = grumpkin::SWAffine::generator();
+    let generator_x = FieldElement::from_repr(*generator.x().unwrap());
+    let generator_y = FieldElement::from_repr(*generator.y().unwrap());
+
+    variable_base_scalar_mul(&generator_x, &generator_y, low, high).map_err(|err| match err {
+        BlackBoxResolutionError::Failed(_, message) => {
+            BlackBoxResolutionError::Failed(BlackBoxFunc::FixedBaseScalarMul, message)
+        }
+    })
+}
+
+pub fn variable_base_scalar_mul(
+    point_x: &FieldElement,
+    point_y: &FieldElement,
+    scalar_low: &FieldElement,
+    scalar_high: &FieldElement,
+) -> Result<(FieldElement, FieldElement), BlackBoxResolutionError> {
+    let point1 = create_point(*point_x, *point_y)
+        .map_err(|e| BlackBoxResolutionError::Failed(BlackBoxFunc::VariableBaseScalarMul, e))?;
+
+    let scalar_low: u128 = scalar_low.try_into_u128().ok_or_else(|| {
         BlackBoxResolutionError::Failed(
-            BlackBoxFunc::FixedBaseScalarMul,
-            format!("Limb {} is not less than 2^128", low.to_hex()),
+            BlackBoxFunc::VariableBaseScalarMul,
+            format!("Limb {} is not less than 2^128", scalar_low.to_hex()),
         )
     })?;
 
-    let high: u128 = high.try_into_u128().ok_or_else(|| {
+    let scalar_high: u128 = scalar_high.try_into_u128().ok_or_else(|| {
         BlackBoxResolutionError::Failed(
-            BlackBoxFunc::FixedBaseScalarMul,
-            format!("Limb {} is not less than 2^128", high.to_hex()),
+            BlackBoxFunc::VariableBaseScalarMul,
+            format!("Limb {} is not less than 2^128", scalar_high.to_hex()),
         )
     })?;
 
-    let mut bytes = high.to_be_bytes().to_vec();
-    bytes.extend_from_slice(&low.to_be_bytes());
+    let mut bytes = scalar_high.to_be_bytes().to_vec();
+    bytes.extend_from_slice(&scalar_low.to_be_bytes());
 
     // Check if this is smaller than the grumpkin modulus
     let grumpkin_integer = BigUint::from_bytes_be(&bytes);
 
     if grumpkin_integer >= grumpkin::FrConfig::MODULUS.into() {
         return Err(BlackBoxResolutionError::Failed(
-            BlackBoxFunc::FixedBaseScalarMul,
+            BlackBoxFunc::VariableBaseScalarMul,
             format!("{} is not a valid grumpkin scalar", grumpkin_integer.to_str_radix(16)),
         ));
     }
 
-    let result = grumpkin::SWAffine::from(
-        grumpkin::SWAffine::generator().mul_bigint(grumpkin_integer.to_u64_digits()),
-    );
+    let result = grumpkin::SWAffine::from(point1.mul_bigint(grumpkin_integer.to_u64_digits()));
     if let Some((res_x, res_y)) = result.xy() {
         Ok((FieldElement::from_repr(*res_x), FieldElement::from_repr(*res_y)))
     } else {
@@ -47,17 +67,6 @@ pub fn fixed_base_scalar_mul(
     }
 }
 
-fn create_point(x: FieldElement, y: FieldElement) -> Result<grumpkin::SWAffine, String> {
-    let point = grumpkin::SWAffine::new_unchecked(x.into_repr(), y.into_repr());
-    if !point.is_on_curve() {
-        return Err(format!("Point ({}, {}) is not on curve", x.to_hex(), y.to_hex()));
-    };
-    if !point.is_in_correct_subgroup_assuming_on_curve() {
-        return Err(format!("Point ({}, {}) is not in correct subgroup", x.to_hex(), y.to_hex()));
-    };
-    Ok(point)
-}
-
 pub fn embedded_curve_add(
     input1_x: FieldElement,
     input1_y: FieldElement,
@@ -79,6 +88,17 @@ pub fn embedded_curve_add(
     }
 }
 
+fn create_point(x: FieldElement, y: FieldElement) -> Result<grumpkin::SWAffine, String> {
+    let point = grumpkin::SWAffine::new_unchecked(x.into_repr(), y.into_repr());
+    if !point.is_on_curve() {
+        return Err(format!("Point ({}, {}) is not on curve", x.to_hex(), y.to_hex()));
+    };
+    if !point.is_in_correct_subgroup_assuming_on_curve() {
+        return Err(format!("Point ({}, {}) is not in correct subgroup", x.to_hex(), y.to_hex()));
+    };
+    Ok(point)
+}
+
 #[cfg(test)]
 mod grumpkin_fixed_base_scalar_mul {
     use ark_ff::BigInteger;
@@ -147,6 +167,46 @@ mod grumpkin_fixed_base_scalar_mul {
         );
     }
 
+    #[test]
+    fn variable_base_matches_fixed_base_for_generator_on_input(
+    ) -> Result<(), BlackBoxResolutionError> {
+        let low = FieldElement::one();
+        let high = FieldElement::from(2u128);
+
+        let generator = grumpkin::SWAffine::generator();
+        let generator_x = FieldElement::from_repr(*generator.x().unwrap());
+        let generator_y = FieldElement::from_repr(*generator.y().unwrap());
+
+        let fixed_res = fixed_base_scalar_mul(&low, &high)?;
+        let variable_res = variable_base_scalar_mul(&generator_x, &generator_y, &low, &high)?;
+
+        assert_eq!(fixed_res, variable_res);
+        Ok(())
+    }
+
+    #[test]
+    fn variable_base_scalar_mul_rejects_invalid_point() {
+        let invalid_point_x = FieldElement::one();
+        let invalid_point_y = FieldElement::one();
+        let valid_scalar_low = FieldElement::zero();
+        let valid_scalar_high = FieldElement::zero();
+
+        let res = variable_base_scalar_mul(
+            &invalid_point_x,
+            &invalid_point_y,
+            &valid_scalar_low,
+            &valid_scalar_high,
+        );
+
+        assert_eq!(
+            res,
+            Err(BlackBoxResolutionError::Failed(
+                BlackBoxFunc::VariableBaseScalarMul,
+                "Point (0000000000000000000000000000000000000000000000000000000000000001, 0000000000000000000000000000000000000000000000000000000000000001) is not on curve".into(),
+            ))
+        );
+    }
+
     #[test]
     fn rejects_addition_of_points_not_in_curve() {
         let x = FieldElement::from(1u128);
diff --git a/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/lib.rs b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/lib.rs
index 25b10252a784..9395260fe36a 100644
--- a/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/lib.rs
+++ b/noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/lib.rs
@@ -9,7 +9,9 @@ mod fixed_base_scalar_mul;
 mod poseidon2;
 mod wasm;
 
-pub use fixed_base_scalar_mul::{embedded_curve_add, fixed_base_scalar_mul};
+pub use fixed_base_scalar_mul::{
+    embedded_curve_add, fixed_base_scalar_mul, variable_base_scalar_mul,
+};
 pub use poseidon2::poseidon2_permutation;
 use wasm::Barretenberg;
 
@@ -97,6 +99,16 @@ impl BlackBoxFunctionSolver for Bn254BlackBoxSolver {
         fixed_base_scalar_mul(low, high)
     }
 
+    fn variable_base_scalar_mul(
+        &self,
+        point_x: &FieldElement,
+        point_y: &FieldElement,
+        low: &FieldElement,
+        high: &FieldElement,
+    ) -> Result<(FieldElement, FieldElement), BlackBoxResolutionError> {
+        variable_base_scalar_mul(point_x, point_y, low, high)
+    }
+
     fn ec_add(
         &self,
         input1_x: &FieldElement,
diff --git a/noir/noir-repo/acvm-repo/brillig/src/black_box.rs b/noir/noir-repo/acvm-repo/brillig/src/black_box.rs
index 29861d0fd841..f31a434c7725 100644
--- a/noir/noir-repo/acvm-repo/brillig/src/black_box.rs
+++ b/noir/noir-repo/acvm-repo/brillig/src/black_box.rs
@@ -72,6 +72,14 @@ pub enum BlackBoxOp {
         high: MemoryAddress,
         result: HeapArray,
     },
+    /// Performs scalar multiplication over the embedded curve with variable base point.
+    VariableBaseScalarMul {
+        point_x: MemoryAddress,
+        point_y: MemoryAddress,
+        scalar_low: MemoryAddress,
+        scalar_high: MemoryAddress,
+        result: HeapArray,
+    },
     /// Performs addition over the embedded curve.
     EmbeddedCurveAdd {
         input1_x: MemoryAddress,
diff --git a/noir/noir-repo/acvm-repo/brillig_vm/src/black_box.rs b/noir/noir-repo/acvm-repo/brillig_vm/src/black_box.rs
index 19407da52dbe..9557cdae7b91 100644
--- a/noir/noir-repo/acvm-repo/brillig_vm/src/black_box.rs
+++ b/noir/noir-repo/acvm-repo/brillig_vm/src/black_box.rs
@@ -143,6 +143,19 @@ pub(crate) fn evaluate_black_box<Solver: BlackBoxFunctionSolver>(
             memory.write_slice(memory.read_ref(result.pointer), &[x.into(), y.into()]);
             Ok(())
         }
+        BlackBoxOp::VariableBaseScalarMul { point_x, point_y, scalar_low, scalar_high, result } => {
+            let point_x = memory.read(*point_x).try_into().unwrap();
+            let point_y = memory.read(*point_y).try_into().unwrap();
+            let scalar_low = memory.read(*scalar_low).try_into().unwrap();
+            let scalar_high = memory.read(*scalar_high).try_into().unwrap();
+            let (out_point_x, out_point_y) =
+                solver.variable_base_scalar_mul(&point_x, &point_y, &scalar_low, &scalar_high)?;
+            memory.write_slice(
+                memory.read_ref(result.pointer),
+                &[out_point_x.into(), out_point_y.into()],
+            );
+            Ok(())
+        }
         BlackBoxOp::EmbeddedCurveAdd { input1_x, input1_y, input2_x, input2_y, result } => {
             let input1_x = memory.read(*input1_x).try_into().unwrap();
             let input1_y = memory.read(*input1_y).try_into().unwrap();
@@ -289,6 +302,7 @@ fn black_box_function_from_op(op: &BlackBoxOp) -> BlackBoxFunc {
         BlackBoxOp::PedersenCommitment { .. } => BlackBoxFunc::PedersenCommitment,
         BlackBoxOp::PedersenHash { .. } => BlackBoxFunc::PedersenHash,
         BlackBoxOp::FixedBaseScalarMul { .. } => BlackBoxFunc::FixedBaseScalarMul,
+        BlackBoxOp::VariableBaseScalarMul { .. } => BlackBoxFunc::VariableBaseScalarMul,
         BlackBoxOp::EmbeddedCurveAdd { .. } => BlackBoxFunc::EmbeddedCurveAdd,
         BlackBoxOp::BigIntAdd { .. } => BlackBoxFunc::BigIntAdd,
         BlackBoxOp::BigIntSub { .. } => BlackBoxFunc::BigIntSub,
diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_black_box.rs b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_black_box.rs
index ee047903743d..210e56b2ecba 100644
--- a/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_black_box.rs
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_black_box.rs
@@ -201,7 +201,26 @@ pub(crate) fn convert_black_box_call(
                 });
             } else {
                 unreachable!(
-                    "ICE: FixedBaseScalarMul expects one register argument and one array result"
+                    "ICE: FixedBaseScalarMul expects two register arguments and one array result"
+                )
+            }
+        }
+        BlackBoxFunc::VariableBaseScalarMul => {
+            if let (
+                [BrilligVariable::SingleAddr(point_x), BrilligVariable::SingleAddr(point_y), BrilligVariable::SingleAddr(scalar_low), BrilligVariable::SingleAddr(scalar_high)],
+                [BrilligVariable::BrilligArray(result_array)],
+            ) = (function_arguments, function_results)
+            {
+                brillig_context.black_box_op_instruction(BlackBoxOp::VariableBaseScalarMul {
+                    point_x: point_x.address,
+                    point_y: point_y.address,
+                    scalar_low: scalar_low.address,
+                    scalar_high: scalar_high.address,
+                    result: result_array.to_heap_array(),
+                });
+            } else {
+                unreachable!(
+                    "ICE: VariableBaseScalarMul expects four register arguments and one array result"
                 )
             }
         }
diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir.rs b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir.rs
index ded41e02bdae..b4ed59de59d9 100644
--- a/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir.rs
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir.rs
@@ -175,6 +175,16 @@ pub(crate) mod tests {
             Ok((4_u128.into(), 5_u128.into()))
         }
 
+        fn variable_base_scalar_mul(
+            &self,
+            _point_x: &FieldElement,
+            _point_y: &FieldElement,
+            _scalar_low: &FieldElement,
+            _scalar_high: &FieldElement,
+        ) -> Result<(FieldElement, FieldElement), BlackBoxResolutionError> {
+            Ok((7_u128.into(), 8_u128.into()))
+        }
+
         fn ec_add(
             &self,
             _input1_x: &FieldElement,
diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/debug_show.rs b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/debug_show.rs
index 5601bbde8772..8b00939b3a71 100644
--- a/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/debug_show.rs
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/debug_show.rs
@@ -324,6 +324,23 @@ impl DebugShow {
                     result
                 );
             }
+            BlackBoxOp::VariableBaseScalarMul {
+                point_x,
+                point_y,
+                scalar_low,
+                scalar_high,
+                result,
+            } => {
+                debug_println!(
+                    self.enable_debug_trace,
+                    "  VARIABLE_BASE_SCALAR_MUL ({} {}) ({} {}) -> {}",
+                    point_x,
+                    point_y,
+                    scalar_low,
+                    scalar_high,
+                    result
+                );
+            }
             BlackBoxOp::EmbeddedCurveAdd { input1_x, input1_y, input2_x, input2_y, result } => {
                 debug_println!(
                     self.enable_debug_trace,
diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/generated_acir.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/generated_acir.rs
index c084ba37fee6..2f4f4f9f6cc7 100644
--- a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/generated_acir.rs
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/generated_acir.rs
@@ -283,6 +283,13 @@ impl GeneratedAcir {
                 high: inputs[1][0],
                 outputs: (outputs[0], outputs[1]),
             },
+            BlackBoxFunc::VariableBaseScalarMul => BlackBoxFuncCall::VariableBaseScalarMul {
+                point_x: inputs[0][0],
+                point_y: inputs[1][0],
+                scalar_low: inputs[2][0],
+                scalar_high: inputs[3][0],
+                outputs: (outputs[0], outputs[1]),
+            },
             BlackBoxFunc::EmbeddedCurveAdd => BlackBoxFuncCall::EmbeddedCurveAdd {
                 input1_x: inputs[0][0],
                 input1_y: inputs[1][0],
@@ -669,6 +676,10 @@ fn black_box_func_expected_input_size(name: BlackBoxFunc) -> Option<usize> {
         // is the low and high limbs of the scalar
         BlackBoxFunc::FixedBaseScalarMul => Some(2),
 
+        // Inputs for variable based scalar multiplication are the x and y coordinates of the base point and low
+        // and high limbs of the scalar
+        BlackBoxFunc::VariableBaseScalarMul => Some(4),
+
         // Recursive aggregation has a variable number of inputs
         BlackBoxFunc::RecursiveAggregation => None,
 
@@ -723,7 +734,9 @@ fn black_box_expected_output_size(name: BlackBoxFunc) -> Option<usize> {
 
         // Output of operations over the embedded curve
         // will be 2 field elements representing the point.
-        BlackBoxFunc::FixedBaseScalarMul | BlackBoxFunc::EmbeddedCurveAdd => Some(2),
+        BlackBoxFunc::FixedBaseScalarMul
+        | BlackBoxFunc::VariableBaseScalarMul
+        | BlackBoxFunc::EmbeddedCurveAdd => Some(2),
 
         // Big integer operations return a big integer
         BlackBoxFunc::BigIntAdd
diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/instruction/call.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/instruction/call.rs
index 1187ea8cb07c..a8365ffef39b 100644
--- a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/instruction/call.rs
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/instruction/call.rs
@@ -453,6 +453,7 @@ fn simplify_black_box_func(
         }
 
         BlackBoxFunc::FixedBaseScalarMul
+        | BlackBoxFunc::VariableBaseScalarMul
         | BlackBoxFunc::SchnorrVerify
         | BlackBoxFunc::PedersenCommitment
         | BlackBoxFunc::PedersenHash
diff --git a/noir/noir-repo/docs/docs/noir/standard_library/cryptographic_primitives/scalar.mdx b/noir/noir-repo/docs/docs/noir/standard_library/cryptographic_primitives/scalar.mdx
index c2946b2b73b3..b835236a03e4 100644
--- a/noir/noir-repo/docs/docs/noir/standard_library/cryptographic_primitives/scalar.mdx
+++ b/noir/noir-repo/docs/docs/noir/standard_library/cryptographic_primitives/scalar.mdx
@@ -1,6 +1,6 @@
 ---
 title: Scalar multiplication
-description: See how you can perform scalar multiplications over a fixed base in Noir
+description: See how you can perform scalar multiplications over a fixed and variable bases in Noir
 keywords: [cryptographic primitives, Noir project, scalar multiplication]
 sidebar_position: 1
 ---
@@ -9,17 +9,35 @@ import BlackBoxInfo from '@site/src/components/Notes/_blackbox.mdx';
 
 ## scalar_mul::fixed_base_embedded_curve
 
-Performs scalar multiplication over the embedded curve whose coordinates are defined by the
-configured noir field. For the BN254 scalar field, this is BabyJubJub or Grumpkin.
+Performs scalar multiplication of a fixed base/generator over the embedded curve whose coordinates are defined
+by the configured noir field. For the BN254 scalar field, this is BabyJubJub or Grumpkin. Suffixes `_low` and
+`_high` denote low and high limbs of the input scalar.
 
 #include_code fixed_base_embedded_curve noir_stdlib/src/scalar_mul.nr rust
 
 example
 
 ```rust
-fn main(x : Field) {
-    let scal = std::scalar_mul::fixed_base_embedded_curve(x);
-    println(scal);
+fn main(scalar_low: Field, scalar_high: Field) {
+    let point = std::scalar_mul::fixed_base_embedded_curve(scalar_low, scalar_high);
+    println(point);
+}
+```
+
+## scalar_mul::variable_base_embedded_curve
+
+Performs scalar multiplication of a variable base/input point over the embedded curve whose coordinates are defined
+by the configured noir field. For the BN254 scalar field, this is BabyJubJub or Grumpkin. Suffixes `_low` and
+`_high` denote low and high limbs of the input scalar.
+
+#include_code variable_base_embedded_curve noir_stdlib/src/scalar_mul.nr rust
+
+example
+
+```rust
+fn main(point_x: Field, point_y: Field, scalar_low: Field, scalar_high: Field) {
+    let resulting_point = std::scalar_mul::fixed_base_embedded_curve(point_x, point_y, scalar_low, scalar_high);
+    println(resulting_point);
 }
 ```
 
diff --git a/noir/noir-repo/noir_stdlib/src/grumpkin_scalar_mul.nr b/noir/noir-repo/noir_stdlib/src/grumpkin_scalar_mul.nr
index 06d30d623321..c1195073ef6d 100644
--- a/noir/noir-repo/noir_stdlib/src/grumpkin_scalar_mul.nr
+++ b/noir/noir-repo/noir_stdlib/src/grumpkin_scalar_mul.nr
@@ -1,7 +1,6 @@
 use crate::grumpkin_scalar::GrumpkinScalar;
-use crate::scalar_mul::fixed_base_embedded_curve;
+use crate::scalar_mul::{fixed_base_embedded_curve, variable_base_embedded_curve};
 
 pub fn grumpkin_fixed_base(scalar: GrumpkinScalar) -> [Field; 2] {
-    // TODO: this should use both the low and high limbs to do the scalar multiplication
     fixed_base_embedded_curve(scalar.low, scalar.high)
-}
+}
\ No newline at end of file
diff --git a/noir/noir-repo/noir_stdlib/src/scalar_mul.nr b/noir/noir-repo/noir_stdlib/src/scalar_mul.nr
index eee7aac39f2e..457b7b7791c8 100644
--- a/noir/noir-repo/noir_stdlib/src/scalar_mul.nr
+++ b/noir/noir-repo/noir_stdlib/src/scalar_mul.nr
@@ -1,5 +1,6 @@
 use crate::ops::Add;
 
+// TODO(https://github.com/noir-lang/noir/issues/4931)
 struct EmbeddedCurvePoint {
     x: Field,
     y: Field,
@@ -26,12 +27,30 @@ impl Add for EmbeddedCurvePoint {
 #[foreign(fixed_base_scalar_mul)]
 // docs:start:fixed_base_embedded_curve
 pub fn fixed_base_embedded_curve(
-    low: Field,
-    high: Field
+    low: Field, // low limb of the scalar
+    high: Field // high limb of the scalar
 ) -> [Field; 2]
 // docs:end:fixed_base_embedded_curve
 {}
 
+// Computes a variable base scalar multiplication over the embedded curve.
+// For bn254, We have Grumpkin and Baby JubJub.
+// For bls12-381, we have JubJub and Bandersnatch.
+//
+// The embedded curve being used is decided by the 
+// underlying proof system.
+// TODO(https://github.com/noir-lang/noir/issues/4931): use a point struct instead of two fields
+#[foreign(variable_base_scalar_mul)]
+// docs:start:variable_base_embedded_curve
+pub fn variable_base_embedded_curve(
+    point_x: Field, // x coordinate of a point to multiply the scalar with
+    point_y: Field, // y coordinate of a point to multiply the scalar with
+    scalar_low: Field, // low limb of the scalar
+    scalar_high: Field // high limb of the scalar
+) -> [Field; 2]
+// docs:end:variable_base_embedded_curve
+{}
+
 // This is a hack as returning an `EmbeddedCurvePoint` from a foreign function in brillig returns a [BrilligVariable::SingleAddr; 2] rather than BrilligVariable::BrilligArray
 // as is defined in the brillig bytecode format. This is a workaround which allows us to fix this without modifying the serialization format.
 fn embedded_curve_add(point1: EmbeddedCurvePoint, point2: EmbeddedCurvePoint) -> EmbeddedCurvePoint {
diff --git a/noir/noir-repo/test_programs/execution_success/scalar_mul/Nargo.toml b/noir/noir-repo/test_programs/execution_success/fixed_base_scalar_mul/Nargo.toml
similarity index 63%
rename from noir/noir-repo/test_programs/execution_success/scalar_mul/Nargo.toml
rename to noir/noir-repo/test_programs/execution_success/fixed_base_scalar_mul/Nargo.toml
index 926114ec3745..a8e45c9b5ade 100644
--- a/noir/noir-repo/test_programs/execution_success/scalar_mul/Nargo.toml
+++ b/noir/noir-repo/test_programs/execution_success/fixed_base_scalar_mul/Nargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "scalar_mul"
+name = "fixed_base_scalar_mul"
 type = "bin"
 authors = [""]
 
diff --git a/noir/noir-repo/test_programs/execution_success/scalar_mul/Prover.toml b/noir/noir-repo/test_programs/execution_success/fixed_base_scalar_mul/Prover.toml
similarity index 100%
rename from noir/noir-repo/test_programs/execution_success/scalar_mul/Prover.toml
rename to noir/noir-repo/test_programs/execution_success/fixed_base_scalar_mul/Prover.toml
diff --git a/noir/noir-repo/test_programs/execution_success/scalar_mul/src/main.nr b/noir/noir-repo/test_programs/execution_success/fixed_base_scalar_mul/src/main.nr
similarity index 100%
rename from noir/noir-repo/test_programs/execution_success/scalar_mul/src/main.nr
rename to noir/noir-repo/test_programs/execution_success/fixed_base_scalar_mul/src/main.nr
diff --git a/noir/noir-repo/test_programs/execution_success/variable_base_scalar_mul/Nargo.toml b/noir/noir-repo/test_programs/execution_success/variable_base_scalar_mul/Nargo.toml
new file mode 100644
index 000000000000..66712ab503cb
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/variable_base_scalar_mul/Nargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "variable_base_scalar_mul"
+type = "bin"
+authors = [""]
+
+[dependencies]
diff --git a/noir/noir-repo/test_programs/execution_success/variable_base_scalar_mul/Prover.toml b/noir/noir-repo/test_programs/execution_success/variable_base_scalar_mul/Prover.toml
new file mode 100644
index 000000000000..51d6fc9b96c5
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/variable_base_scalar_mul/Prover.toml
@@ -0,0 +1,4 @@
+point_x = "0x0000000000000000000000000000000000000000000000000000000000000001"
+point_y = "0x0000000000000002cf135e7506a45d632d270d45f1181294833fc48d823f272c"
+scalar_low = "0x0000000000000000000000000000000000000000000000000000000000000003"
+scalar_high = "0x0000000000000000000000000000000000000000000000000000000000000000"
diff --git a/noir/noir-repo/test_programs/execution_success/variable_base_scalar_mul/src/main.nr b/noir/noir-repo/test_programs/execution_success/variable_base_scalar_mul/src/main.nr
new file mode 100644
index 000000000000..4914ad017771
--- /dev/null
+++ b/noir/noir-repo/test_programs/execution_success/variable_base_scalar_mul/src/main.nr
@@ -0,0 +1,33 @@
+use dep::std;
+
+fn main(point_x: pub Field, point_y: pub Field, scalar_low: pub Field, scalar_high: pub Field) {
+    // We multiply the point by 3 and check it matches result out of embedded_curve_add func
+    let res = std::scalar_mul::variable_base_embedded_curve(point_x, point_y, scalar_low, scalar_high);
+
+    let point = std::scalar_mul::EmbeddedCurvePoint { x: point_x, y: point_y };
+
+    let double = point.double();
+    let triple = point + double;
+
+    assert(triple.x == res[0]);
+    assert(triple.y == res[1]);
+
+    // We test that brillig gives us the same result
+    let brillig_res = get_brillig_result(point_x, point_y, scalar_low, scalar_high);
+    assert(res[0] == brillig_res[0]);
+    assert(res[1] == brillig_res[1]);
+
+    // Multiplying the point by 1 should return the same point
+    let res = std::scalar_mul::variable_base_embedded_curve(point_x, point_y, 1, 0);
+    assert(point_x == res[0]);
+    assert(point_y == res[1]);
+}
+
+unconstrained fn get_brillig_result(
+    point_x: Field,
+    point_y: Field,
+    scalar_low: Field,
+    scalar_high: Field
+) -> [Field; 2] {
+    std::scalar_mul::variable_base_embedded_curve(point_x, point_y, scalar_low, scalar_high)
+}
diff --git a/noir/noir-repo/tooling/lsp/src/solver.rs b/noir/noir-repo/tooling/lsp/src/solver.rs
index 0fea9b16b54a..b47c30af5f68 100644
--- a/noir/noir-repo/tooling/lsp/src/solver.rs
+++ b/noir/noir-repo/tooling/lsp/src/solver.rs
@@ -32,6 +32,16 @@ impl BlackBoxFunctionSolver for WrapperSolver {
         self.0.fixed_base_scalar_mul(low, high)
     }
 
+    fn variable_base_scalar_mul(
+        &self,
+        point_x: &acvm::FieldElement,
+        point_y: &acvm::FieldElement,
+        scalar_low: &acvm::FieldElement,
+        scalar_high: &acvm::FieldElement,
+    ) -> Result<(acvm::FieldElement, acvm::FieldElement), acvm::BlackBoxResolutionError> {
+        self.0.variable_base_scalar_mul(point_x, point_y, scalar_low, scalar_high)
+    }
+
     fn pedersen_hash(
         &self,
         inputs: &[acvm::FieldElement],
diff --git a/yarn-project/end-to-end/src/e2e_state_vars.test.ts b/yarn-project/end-to-end/src/e2e_state_vars.test.ts
index 8a6ed6dc23ea..8d63cafea4f9 100644
--- a/yarn-project/end-to-end/src/e2e_state_vars.test.ts
+++ b/yarn-project/end-to-end/src/e2e_state_vars.test.ts
@@ -22,7 +22,7 @@ describe('e2e_state_vars', () => {
   beforeAll(async () => {
     ({ teardown, wallet, pxe } = await setup(2));
     contract = await DocsExampleContract.deploy(wallet).send().deployed();
-  }, 30_000);
+  }, 60_000);
 
   afterAll(() => teardown());
 

From 1904fa864ff8c546d4d849436c6ca7a7606fb3d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Bene=C5=A1?= <janbenes1234@gmail.com>
Date: Tue, 30 Apr 2024 15:10:43 +0200
Subject: [PATCH 09/42] feat: computing sym key for incoming ciphertext (#6020)

---
 .../src/core/libraries/ConstantsGen.sol       | 14 ++---
 noir-projects/aztec-nr/aztec/src/keys.nr      |  1 +
 .../aztec/src/keys/point_to_symmetric_key.nr  | 34 +++++++++++++
 noir-projects/aztec-nr/aztec/src/lib.nr       |  1 +
 .../crates/types/src/constants.nr             |  1 +
 .../crates/types/src/grumpkin_point.nr        | 11 ++++
 .../l1_note_payload/encrypt_buffer.test.ts    | 48 ++++++++++-------
 .../logs/l1_note_payload/encrypt_buffer.ts    | 51 +++++++++----------
 .../l1_note_payload/l1_note_payload.test.ts   |  8 +--
 .../logs/l1_note_payload/l1_note_payload.ts   | 23 +++------
 .../logs/l1_note_payload/tagged_note.test.ts  |  8 +--
 .../src/logs/l1_note_payload/tagged_note.ts   | 11 ++--
 yarn-project/circuits.js/src/constants.gen.ts | 13 +++--
 .../foundation/src/testing/test_data.ts       |  2 +-
 .../src/note_processor/note_processor.test.ts |  4 +-
 .../pxe/src/note_processor/note_processor.ts  |  4 +-
 .../src/client/client_execution_context.ts    |  6 +--
 .../simulator/src/client/simulator.ts         |  4 --
 18 files changed, 145 insertions(+), 99 deletions(-)
 create mode 100644 noir-projects/aztec-nr/aztec/src/keys.nr
 create mode 100644 noir-projects/aztec-nr/aztec/src/keys/point_to_symmetric_key.nr

diff --git a/l1-contracts/src/core/libraries/ConstantsGen.sol b/l1-contracts/src/core/libraries/ConstantsGen.sol
index b9e22c3eb709..d6a267143885 100644
--- a/l1-contracts/src/core/libraries/ConstantsGen.sol
+++ b/l1-contracts/src/core/libraries/ConstantsGen.sol
@@ -118,8 +118,10 @@ library Constants {
   uint256 internal constant NULLIFIER_KEY_VALIDATION_REQUEST_CONTEXT_LENGTH = 4;
   uint256 internal constant PARTIAL_STATE_REFERENCE_LENGTH = 6;
   uint256 internal constant READ_REQUEST_LENGTH = 2;
+  uint256 internal constant NOTE_HASH_LENGTH = 2;
+  uint256 internal constant NOTE_HASH_CONTEXT_LENGTH = 3;
+  uint256 internal constant NULLIFIER_LENGTH = 3;
   uint256 internal constant SIDE_EFFECT_LENGTH = 2;
-  uint256 internal constant SIDE_EFFECT_LINKED_TO_NOTE_HASH_LENGTH = 3;
   uint256 internal constant STATE_REFERENCE_LENGTH =
     APPEND_ONLY_TREE_SNAPSHOT_LENGTH + PARTIAL_STATE_REFERENCE_LENGTH;
   uint256 internal constant TX_CONTEXT_LENGTH = 2 + GAS_SETTINGS_LENGTH;
@@ -130,9 +132,9 @@ library Constants {
     + MAX_BLOCK_NUMBER_LENGTH + (SIDE_EFFECT_LENGTH * MAX_NOTE_HASH_READ_REQUESTS_PER_CALL)
     + (READ_REQUEST_LENGTH * MAX_NULLIFIER_READ_REQUESTS_PER_CALL)
     + (NULLIFIER_KEY_VALIDATION_REQUEST_LENGTH * MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL)
-    + (SIDE_EFFECT_LENGTH * MAX_NEW_NOTE_HASHES_PER_CALL)
-    + (SIDE_EFFECT_LINKED_TO_NOTE_HASH_LENGTH * MAX_NEW_NULLIFIERS_PER_CALL)
-    + MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL + MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL
+    + (NOTE_HASH_LENGTH * MAX_NEW_NOTE_HASHES_PER_CALL)
+    + (NULLIFIER_LENGTH * MAX_NEW_NULLIFIERS_PER_CALL) + MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL
+    + MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL
     + (L2_TO_L1_MESSAGE_LENGTH * MAX_NEW_L2_TO_L1_MSGS_PER_CALL) + 2
     + (SIDE_EFFECT_LENGTH * MAX_ENCRYPTED_LOGS_PER_CALL)
     + (SIDE_EFFECT_LENGTH * MAX_UNENCRYPTED_LOGS_PER_CALL) + 2 + HEADER_LENGTH + TX_CONTEXT_LENGTH;
@@ -141,8 +143,8 @@ library Constants {
     + (READ_REQUEST_LENGTH * MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL)
     + (CONTRACT_STORAGE_UPDATE_REQUEST_LENGTH * MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL)
     + (CONTRACT_STORAGE_READ_LENGTH * MAX_PUBLIC_DATA_READS_PER_CALL)
-    + MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL + (SIDE_EFFECT_LENGTH * MAX_NEW_NOTE_HASHES_PER_CALL)
-    + (SIDE_EFFECT_LINKED_TO_NOTE_HASH_LENGTH * MAX_NEW_NULLIFIERS_PER_CALL)
+    + MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL + (NOTE_HASH_LENGTH * MAX_NEW_NOTE_HASHES_PER_CALL)
+    + (NULLIFIER_LENGTH * MAX_NEW_NULLIFIERS_PER_CALL)
     + (L2_TO_L1_MESSAGE_LENGTH * MAX_NEW_L2_TO_L1_MSGS_PER_CALL) + 2
     + (SIDE_EFFECT_LENGTH * MAX_UNENCRYPTED_LOGS_PER_CALL) + 1 + HEADER_LENGTH
     + GLOBAL_VARIABLES_LENGTH + AZTEC_ADDRESS_LENGTH /* revert_code */ + 1 + 2 * GAS_LENGTH /* transaction_fee */
diff --git a/noir-projects/aztec-nr/aztec/src/keys.nr b/noir-projects/aztec-nr/aztec/src/keys.nr
new file mode 100644
index 000000000000..20d48201aca0
--- /dev/null
+++ b/noir-projects/aztec-nr/aztec/src/keys.nr
@@ -0,0 +1 @@
+mod point_to_symmetric_key;
\ No newline at end of file
diff --git a/noir-projects/aztec-nr/aztec/src/keys/point_to_symmetric_key.nr b/noir-projects/aztec-nr/aztec/src/keys/point_to_symmetric_key.nr
new file mode 100644
index 000000000000..b708d00e8bc1
--- /dev/null
+++ b/noir-projects/aztec-nr/aztec/src/keys/point_to_symmetric_key.nr
@@ -0,0 +1,34 @@
+use dep::protocol_types::{constants::GENERATOR_INDEX__SYMMETRIC_KEY, grumpkin_point::GrumpkinPoint, utils::arr_copy_slice};
+use dep::std::{hash::sha256, grumpkin_scalar::GrumpkinScalar, scalar_mul::variable_base_embedded_curve};
+
+// TODO(#5726): This function is called deriveAESSecret in TS. I don't like point_to_symmetric_key name much since
+// point is not the only input of the function. Unify naming with TS once we have a better name.
+pub fn point_to_symmetric_key(secret: GrumpkinScalar, point: GrumpkinPoint) -> [u8; 32] {
+    let shared_secret_fields = variable_base_embedded_curve(point.x, point.y, secret.low, secret.high);
+    // TODO(https://github.com/AztecProtocol/aztec-packages/issues/6061): make the func return Point struct directly
+    let shared_secret = GrumpkinPoint::new(shared_secret_fields[0], shared_secret_fields[1]);
+    let mut shared_secret_bytes_with_separator = [0 as u8; 65];
+    shared_secret_bytes_with_separator = arr_copy_slice(shared_secret.to_be_bytes(), shared_secret_bytes_with_separator, 0);
+    shared_secret_bytes_with_separator[64] = GENERATOR_INDEX__SYMMETRIC_KEY;
+    sha256(shared_secret_bytes_with_separator)
+}
+
+#[test]
+fn check_point_to_symmetric_key() {
+    // Value taken from "derive shared secret" test in encrypt_buffer.test.ts
+    let secret = GrumpkinScalar::new(
+        0x00000000000000000000000000000000649e7ca01d9de27b21624098b897babd,
+        0x0000000000000000000000000000000023b3127c127b1f29a7adff5cccf8fb06
+    );
+    let point = GrumpkinPoint::new(
+        0x2688431c705a5ff3e6c6f2573c9e3ba1c1026d2251d0dbbf2d810aa53fd1d186,
+        0x1e96887b117afca01c00468264f4f80b5bb16d94c1808a448595f115556e5c8e
+    );
+
+    let key = point_to_symmetric_key(secret, point);
+    // The following value gets updated when running encrypt_buffer.test.ts with AZTEC_GENERATE_TEST_DATA=1
+    let expected_key = [
+        198, 74, 242, 51, 177, 36, 183, 8, 2, 246, 197, 138, 59, 166, 86, 96, 155, 50, 186, 34, 242, 3, 208, 144, 161, 64, 69, 165, 70, 57, 226, 139
+    ];
+    assert_eq(key, expected_key);
+}
diff --git a/noir-projects/aztec-nr/aztec/src/lib.nr b/noir-projects/aztec-nr/aztec/src/lib.nr
index 81390fb52eb9..67a3c8c55b47 100644
--- a/noir-projects/aztec-nr/aztec/src/lib.nr
+++ b/noir-projects/aztec-nr/aztec/src/lib.nr
@@ -3,6 +3,7 @@ mod deploy;
 mod hash;
 mod history;
 mod initializer;
+mod keys;
 mod log;
 mod messaging;
 mod note;
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr b/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr
index 61924a73f8e8..37c7bc84848c 100644
--- a/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr
@@ -255,3 +255,4 @@ global GENERATOR_INDEX__PUBLIC_KEYS_HASH = 51;
 global GENERATOR_INDEX__NOTE_NULLIFIER = 52;
 global GENERATOR_INDEX__INNER_NOTE_HASH = 53;
 global GENERATOR_INDEX__NOTE_CONTENT_HASH = 54;
+global GENERATOR_INDEX__SYMMETRIC_KEY: u8 = 55;
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/grumpkin_point.nr b/noir-projects/noir-protocol-circuits/crates/types/src/grumpkin_point.nr
index ec334d78b50f..467a022947b3 100644
--- a/noir-projects/noir-protocol-circuits/crates/types/src/grumpkin_point.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/grumpkin_point.nr
@@ -51,4 +51,15 @@ impl GrumpkinPoint {
         assert(self.x == 0);
         assert(self.y == 0);
     }
+
+    pub fn to_be_bytes(self: Self) -> [u8; 64] {
+        let mut result = [0 as u8; 64];
+        let x_bytes = self.x.to_be_bytes(32);
+        let y_bytes = self.y.to_be_bytes(32);
+        for i in 0..32 {
+            result[i] = x_bytes[i];
+            result[i + 32] = y_bytes[i];
+        }
+        result
+    }
 }
diff --git a/yarn-project/circuit-types/src/logs/l1_note_payload/encrypt_buffer.test.ts b/yarn-project/circuit-types/src/logs/l1_note_payload/encrypt_buffer.test.ts
index b34baa4fb01f..d8a0c4b9998f 100644
--- a/yarn-project/circuit-types/src/logs/l1_note_payload/encrypt_buffer.test.ts
+++ b/yarn-project/circuit-types/src/logs/l1_note_payload/encrypt_buffer.test.ts
@@ -1,6 +1,7 @@
-import { GrumpkinScalar } from '@aztec/circuits.js';
+import { Fq, GrumpkinScalar } from '@aztec/circuits.js';
 import { Grumpkin } from '@aztec/circuits.js/barretenberg';
 import { randomBytes } from '@aztec/foundation/crypto';
+import { updateInlineTestData } from '@aztec/foundation/testing';
 
 import { decryptBuffer, deriveAESSecret, encryptBuffer } from './encrypt_buffer.js';
 
@@ -12,38 +13,51 @@ describe('encrypt buffer', () => {
   });
 
   it('derive shared secret', () => {
-    const ownerPrivKey = GrumpkinScalar.random();
-    const ownerPubKey = grumpkin.mul(Grumpkin.generator, ownerPrivKey);
-    const ephPrivKey = GrumpkinScalar.random();
-    const ephPubKey = grumpkin.mul(Grumpkin.generator, ephPrivKey);
+    // The following 2 are arbitrary fixed values - fixed in order to test a match with Noir
+    const ownerSecretKey: GrumpkinScalar = new Fq(0x23b3127c127b1f29a7adff5cccf8fb06649e7ca01d9de27b21624098b897babdn);
+    const ephSecretKey: GrumpkinScalar = new Fq(0x1fdd0dd8c99b21af8e00d2d130bdc263b36dadcbea84ac5ec9293a0660deca01n);
 
-    const secretBySender = deriveAESSecret(ownerPubKey, ephPrivKey, grumpkin);
-    const secretByReceiver = deriveAESSecret(ephPubKey, ownerPrivKey, grumpkin);
+    const ownerPubKey = grumpkin.mul(Grumpkin.generator, ownerSecretKey);
+    const ephPubKey = grumpkin.mul(Grumpkin.generator, ephSecretKey);
+
+    const secretBySender = deriveAESSecret(ephSecretKey, ownerPubKey);
+    const secretByReceiver = deriveAESSecret(ownerSecretKey, ephPubKey);
     expect(secretBySender.toString('hex')).toEqual(secretByReceiver.toString('hex'));
+
+    const byteArrayString = `[${secretBySender
+      .toString('hex')
+      .match(/.{1,2}/g)!
+      .map(byte => parseInt(byte, 16))}]`;
+    // Run with AZTEC_GENERATE_TEST_DATA=1 to update noir test data
+    updateInlineTestData(
+      'noir-projects/aztec-nr/aztec/src/keys/point_to_symmetric_key.nr',
+      'expected_key',
+      byteArrayString,
+    );
   });
 
   it('convert to and from encrypted buffer', () => {
     const data = randomBytes(253);
-    const ownerPrivKey = GrumpkinScalar.random();
-    const ownerPubKey = grumpkin.mul(Grumpkin.generator, ownerPrivKey);
-    const ephPrivKey = GrumpkinScalar.random();
-    const encrypted = encryptBuffer(data, ownerPubKey, ephPrivKey, grumpkin);
-    const decrypted = decryptBuffer(encrypted, ownerPrivKey, grumpkin);
+    const ownerSecretKey = GrumpkinScalar.random();
+    const ownerPubKey = grumpkin.mul(Grumpkin.generator, ownerSecretKey);
+    const ephSecretKey = GrumpkinScalar.random();
+    const encrypted = encryptBuffer(data, ephSecretKey, ownerPubKey);
+    const decrypted = decryptBuffer(encrypted, ownerSecretKey);
     expect(decrypted).not.toBeUndefined();
     expect(decrypted).toEqual(data);
   });
 
   it('decrypting gibberish returns undefined', () => {
     const data = randomBytes(253);
-    const ownerPrivKey = GrumpkinScalar.random();
-    const ephPrivKey = GrumpkinScalar.random();
-    const ownerPubKey = grumpkin.mul(Grumpkin.generator, ownerPrivKey);
-    const encrypted = encryptBuffer(data, ownerPubKey, ephPrivKey, grumpkin);
+    const ownerSecretKey = GrumpkinScalar.random();
+    const ephSecretKey = GrumpkinScalar.random();
+    const ownerPubKey = grumpkin.mul(Grumpkin.generator, ownerSecretKey);
+    const encrypted = encryptBuffer(data, ephSecretKey, ownerPubKey);
 
     // Introduce gibberish.
     const gibberish = Buffer.concat([randomBytes(8), encrypted.subarray(8)]);
 
-    const decrypted = decryptBuffer(gibberish, ownerPrivKey, grumpkin);
+    const decrypted = decryptBuffer(gibberish, ownerSecretKey);
     expect(decrypted).toBeUndefined();
   });
 });
diff --git a/yarn-project/circuit-types/src/logs/l1_note_payload/encrypt_buffer.ts b/yarn-project/circuit-types/src/logs/l1_note_payload/encrypt_buffer.ts
index 314ef0d6c28f..28262ff3ba62 100644
--- a/yarn-project/circuit-types/src/logs/l1_note_payload/encrypt_buffer.ts
+++ b/yarn-project/circuit-types/src/logs/l1_note_payload/encrypt_buffer.ts
@@ -1,5 +1,5 @@
-import { type GrumpkinPrivateKey, type PublicKey } from '@aztec/circuits.js';
-import { type Grumpkin } from '@aztec/circuits.js/barretenberg';
+import { GeneratorIndex, type GrumpkinPrivateKey, type PublicKey } from '@aztec/circuits.js';
+import { Grumpkin } from '@aztec/circuits.js/barretenberg';
 import { sha256 } from '@aztec/foundation/crypto';
 import { Point } from '@aztec/foundation/fields';
 import { numToUInt8 } from '@aztec/foundation/serialize';
@@ -12,14 +12,16 @@ import { createCipheriv, createDecipheriv } from 'browserify-cipher';
  * the shared secret. The shared secret is then hashed using SHA-256 to produce the final
  * AES secret key.
  *
- * @param ecdhPubKey - The ECDH public key represented as a PublicKey object.
- * @param ecdhPrivKey - The ECDH private key represented as a Buffer object.
- * @param grumpkin - The curve to use for curve operations.
- * @returns A Buffer containing the derived AES secret key.
+ * @param secretKey - The secret key used to derive shared secret.
+ * @param publicKey - The public key used to derive shared secret.
+ * @returns A derived AES secret key.
+ * TODO(#5726): This function is called point_to_symmetric_key in Noir. I don't like that name much since point is not
+ * the only input of the function. Unify naming once we have a better name.
  */
-export function deriveAESSecret(ecdhPubKey: PublicKey, ecdhPrivKey: GrumpkinPrivateKey, curve: Grumpkin): Buffer {
-  const sharedSecret = curve.mul(ecdhPubKey, ecdhPrivKey);
-  const secretBuffer = Buffer.concat([sharedSecret.toBuffer(), numToUInt8(1)]);
+export function deriveAESSecret(secretKey: GrumpkinPrivateKey, publicKey: PublicKey): Buffer {
+  const curve = new Grumpkin();
+  const sharedSecret = curve.mul(publicKey, secretKey);
+  const secretBuffer = Buffer.concat([sharedSecret.toBuffer(), numToUInt8(GeneratorIndex.SYMMETRIC_KEY)]);
   const hash = sha256(secretBuffer);
   return hash;
 }
@@ -31,40 +33,37 @@ export function deriveAESSecret(ecdhPubKey: PublicKey, ecdhPrivKey: GrumpkinPriv
  * with the provided curve instance for elliptic curve operations.
  *
  * @param data - The data buffer to be encrypted.
- * @param ownerPubKey - The owner's public key as a PublicKey instance.
- * @param ephPrivKey - The ephemeral private key as a Buffer instance.
- * @param curve - The curve instance used for elliptic curve operations.
+ * @param ephSecretKey - The ephemeral secret key..
+ * @param incomingViewingPublicKey - The note owner's incoming viewing public key.
  * @returns A Buffer containing the encrypted data and the ephemeral public key.
  */
 export function encryptBuffer(
   data: Buffer,
-  ownerPubKey: PublicKey,
-  ephPrivKey: GrumpkinPrivateKey,
-  curve: Grumpkin,
+  ephSecretKey: GrumpkinPrivateKey,
+  incomingViewingPublicKey: PublicKey,
 ): Buffer {
-  const aesSecret = deriveAESSecret(ownerPubKey, ephPrivKey, curve);
+  const aesSecret = deriveAESSecret(ephSecretKey, incomingViewingPublicKey);
   const aesKey = aesSecret.subarray(0, 16);
   const iv = aesSecret.subarray(16, 32);
   const cipher = createCipheriv('aes-128-cbc', aesKey, iv);
   const plaintext = Buffer.concat([iv.subarray(0, 8), data]);
-  const ephPubKey = curve.mul(curve.generator(), ephPrivKey);
+  const curve = new Grumpkin();
+  const ephPubKey = curve.mul(curve.generator(), ephSecretKey);
+
   return Buffer.concat([cipher.update(plaintext), cipher.final(), ephPubKey.toBuffer()]);
 }
 
 /**
- * Decrypts the given encrypted data buffer using the owner's private key and a Grumpkin curve.
- * Extracts the ephemeral public key from the input data, derives the AES secret using
- * the owner's private key, and decrypts the plaintext.
- * If the decryption is successful, returns the decrypted plaintext, otherwise returns undefined.
- *
+ * Decrypts the given encrypted data buffer using the provided secret key.
  * @param data - The encrypted data buffer to be decrypted.
- * @param ownerPrivKey - The private key of the owner used for decryption.
- * @param curve - The curve object used in the decryption process.
+ * @param incomingViewingSecretKey - The secret key used for decryption.
  * @returns The decrypted plaintext as a Buffer or undefined if decryption fails.
  */
-export function decryptBuffer(data: Buffer, ownerPrivKey: GrumpkinPrivateKey, curve: Grumpkin): Buffer | undefined {
+export function decryptBuffer(data: Buffer, incomingViewingSecretKey: GrumpkinPrivateKey): Buffer | undefined {
+  // Extract the ephemeral public key from the end of the data
   const ephPubKey = Point.fromBuffer(data.subarray(-64));
-  const aesSecret = deriveAESSecret(ephPubKey, ownerPrivKey, curve);
+  // Derive the AES secret key using the secret key and the ephemeral public key
+  const aesSecret = deriveAESSecret(incomingViewingSecretKey, ephPubKey);
   const aesKey = aesSecret.subarray(0, 16);
   const iv = aesSecret.subarray(16, 32);
   const cipher = createDecipheriv('aes-128-cbc', aesKey, iv);
diff --git a/yarn-project/circuit-types/src/logs/l1_note_payload/l1_note_payload.test.ts b/yarn-project/circuit-types/src/logs/l1_note_payload/l1_note_payload.test.ts
index d5a909fe7793..288e46db36d2 100644
--- a/yarn-project/circuit-types/src/logs/l1_note_payload/l1_note_payload.test.ts
+++ b/yarn-project/circuit-types/src/logs/l1_note_payload/l1_note_payload.test.ts
@@ -20,8 +20,8 @@ describe('L1 Note Payload', () => {
     const payload = L1NotePayload.random();
     const ownerPrivKey = GrumpkinScalar.random();
     const ownerPubKey = grumpkin.mul(Grumpkin.generator, ownerPrivKey);
-    const encrypted = payload.toEncryptedBuffer(ownerPubKey, grumpkin);
-    const decrypted = L1NotePayload.fromEncryptedBuffer(encrypted, ownerPrivKey, grumpkin);
+    const encrypted = payload.toEncryptedBuffer(ownerPubKey);
+    const decrypted = L1NotePayload.fromEncryptedBuffer(encrypted, ownerPrivKey);
     expect(decrypted).not.toBeUndefined();
     expect(decrypted).toEqual(payload);
   });
@@ -29,9 +29,9 @@ describe('L1 Note Payload', () => {
   it('return undefined if unable to decrypt the encrypted buffer', () => {
     const payload = L1NotePayload.random();
     const ownerPubKey = Point.random();
-    const encrypted = payload.toEncryptedBuffer(ownerPubKey, grumpkin);
+    const encrypted = payload.toEncryptedBuffer(ownerPubKey);
     const randomPrivKey = GrumpkinScalar.random();
-    const decrypted = L1NotePayload.fromEncryptedBuffer(encrypted, randomPrivKey, grumpkin);
+    const decrypted = L1NotePayload.fromEncryptedBuffer(encrypted, randomPrivKey);
     expect(decrypted).toBeUndefined();
   });
 });
diff --git a/yarn-project/circuit-types/src/logs/l1_note_payload/l1_note_payload.ts b/yarn-project/circuit-types/src/logs/l1_note_payload/l1_note_payload.ts
index 8b34dd37b8f3..463512782a70 100644
--- a/yarn-project/circuit-types/src/logs/l1_note_payload/l1_note_payload.ts
+++ b/yarn-project/circuit-types/src/logs/l1_note_payload/l1_note_payload.ts
@@ -1,5 +1,4 @@
 import { AztecAddress, type GrumpkinPrivateKey, type PublicKey } from '@aztec/circuits.js';
-import { type Grumpkin } from '@aztec/circuits.js/barretenberg';
 import { Fr, GrumpkinScalar } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
@@ -56,28 +55,22 @@ export class L1NotePayload {
 
   /**
    * Encrypt the L1NotePayload object using the owner's public key and the ephemeral private key.
-   * @param ownerPubKey - Public key of the owner of the L1NotePayload object.
-   * @param curve - The curve instance to use.
+   * @param incomingViewingPubKey - Public key of the owner of the L1NotePayload object.
    * @returns The encrypted L1NotePayload object.
    */
-  public toEncryptedBuffer(ownerPubKey: PublicKey, curve: Grumpkin): Buffer {
-    const ephPrivKey: GrumpkinPrivateKey = GrumpkinScalar.random();
-    return encryptBuffer(this.toBuffer(), ownerPubKey, ephPrivKey, curve);
+  public toEncryptedBuffer(incomingViewingPubKey: PublicKey): Buffer {
+    const ephSecretKey: GrumpkinPrivateKey = GrumpkinScalar.random();
+    return encryptBuffer(this.toBuffer(), ephSecretKey, incomingViewingPubKey);
   }
 
   /**
-   * Decrypts the L1NotePayload object using the owner's private key.
+   * Decrypts the L1NotePayload object using the owner's incoming viewing secret key.
    * @param data - Encrypted L1NotePayload object.
-   * @param ownerPrivKey - Private key of the owner of the L1NotePayload object.
-   * @param curve - The curve instance to use.
+   * @param incomingViewingSecretKey - Incoming viewing secret key of the owner of the L1NotePayload object.
    * @returns Instance of L1NotePayload if the decryption was successful, undefined otherwise.
    */
-  static fromEncryptedBuffer(
-    data: Buffer,
-    ownerPrivKey: GrumpkinPrivateKey,
-    curve: Grumpkin,
-  ): L1NotePayload | undefined {
-    const buf = decryptBuffer(data, ownerPrivKey, curve);
+  static fromEncryptedBuffer(data: Buffer, incomingViewingSecretKey: GrumpkinPrivateKey): L1NotePayload | undefined {
+    const buf = decryptBuffer(data, incomingViewingSecretKey);
     if (!buf) {
       return;
     }
diff --git a/yarn-project/circuit-types/src/logs/l1_note_payload/tagged_note.test.ts b/yarn-project/circuit-types/src/logs/l1_note_payload/tagged_note.test.ts
index 2eb74ba247a4..bbd171f37020 100644
--- a/yarn-project/circuit-types/src/logs/l1_note_payload/tagged_note.test.ts
+++ b/yarn-project/circuit-types/src/logs/l1_note_payload/tagged_note.test.ts
@@ -23,8 +23,8 @@ describe('L1 Note Payload', () => {
     const taggedNote = new TaggedNote(payload);
     const ownerPrivKey = GrumpkinScalar.random();
     const ownerPubKey = grumpkin.mul(Grumpkin.generator, ownerPrivKey);
-    const encrypted = taggedNote.toEncryptedBuffer(ownerPubKey, grumpkin);
-    const decrypted = TaggedNote.fromEncryptedBuffer(encrypted, ownerPrivKey, grumpkin);
+    const encrypted = taggedNote.toEncryptedBuffer(ownerPubKey);
+    const decrypted = TaggedNote.fromEncryptedBuffer(encrypted, ownerPrivKey);
     expect(decrypted).not.toBeUndefined();
     expect(decrypted?.notePayload).toEqual(payload);
   });
@@ -33,9 +33,9 @@ describe('L1 Note Payload', () => {
     const payload = L1NotePayload.random();
     const taggedNote = new TaggedNote(payload);
     const ownerPubKey = Point.random();
-    const encrypted = taggedNote.toEncryptedBuffer(ownerPubKey, grumpkin);
+    const encrypted = taggedNote.toEncryptedBuffer(ownerPubKey);
     const randomPrivKey = GrumpkinScalar.random();
-    const decrypted = TaggedNote.fromEncryptedBuffer(encrypted, randomPrivKey, grumpkin);
+    const decrypted = TaggedNote.fromEncryptedBuffer(encrypted, randomPrivKey);
     expect(decrypted).toBeUndefined();
   });
 });
diff --git a/yarn-project/circuit-types/src/logs/l1_note_payload/tagged_note.ts b/yarn-project/circuit-types/src/logs/l1_note_payload/tagged_note.ts
index ddc362e46281..4e698e382eb2 100644
--- a/yarn-project/circuit-types/src/logs/l1_note_payload/tagged_note.ts
+++ b/yarn-project/circuit-types/src/logs/l1_note_payload/tagged_note.ts
@@ -1,5 +1,4 @@
 import { type GrumpkinPrivateKey, type PublicKey } from '@aztec/circuits.js';
-import { type Grumpkin } from '@aztec/circuits.js/barretenberg';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
@@ -37,11 +36,10 @@ export class TaggedNote {
   /**
    * Encrypt the L1NotePayload object using the owner's public key and the ephemeral private key, then attach the tag.
    * @param ownerPubKey - Public key of the owner of the TaggedNote object.
-   * @param curve - The curve instance to use.
    * @returns The encrypted TaggedNote object.
    */
-  public toEncryptedBuffer(ownerPubKey: PublicKey, curve: Grumpkin): Buffer {
-    const encryptedL1NotePayload = this.notePayload.toEncryptedBuffer(ownerPubKey, curve);
+  public toEncryptedBuffer(ownerPubKey: PublicKey): Buffer {
+    const encryptedL1NotePayload = this.notePayload.toEncryptedBuffer(ownerPubKey);
     return serializeToBuffer(this.tag, encryptedL1NotePayload);
   }
 
@@ -49,16 +47,15 @@ export class TaggedNote {
    * Decrypts the L1NotePayload object using the owner's private key.
    * @param data - Encrypted TaggedNote object.
    * @param ownerPrivKey - Private key of the owner of the TaggedNote object.
-   * @param curve - The curve instance to use.
    * @returns Instance of TaggedNote if the decryption was successful, undefined otherwise.
    */
-  static fromEncryptedBuffer(data: Buffer, ownerPrivKey: GrumpkinPrivateKey, curve: Grumpkin): TaggedNote | undefined {
+  static fromEncryptedBuffer(data: Buffer, ownerPrivKey: GrumpkinPrivateKey): TaggedNote | undefined {
     const reader = BufferReader.asReader(data);
     const tag = Fr.fromBuffer(reader);
 
     const encryptedL1NotePayload = reader.readToEnd();
 
-    const payload = L1NotePayload.fromEncryptedBuffer(encryptedL1NotePayload, ownerPrivKey, curve);
+    const payload = L1NotePayload.fromEncryptedBuffer(encryptedL1NotePayload, ownerPrivKey);
     if (!payload) {
       return;
     }
diff --git a/yarn-project/circuits.js/src/constants.gen.ts b/yarn-project/circuits.js/src/constants.gen.ts
index 1b98ef98a39c..0e2f73c46d25 100644
--- a/yarn-project/circuits.js/src/constants.gen.ts
+++ b/yarn-project/circuits.js/src/constants.gen.ts
@@ -101,8 +101,10 @@ export const NULLIFIER_KEY_VALIDATION_REQUEST_LENGTH = 3;
 export const NULLIFIER_KEY_VALIDATION_REQUEST_CONTEXT_LENGTH = 4;
 export const PARTIAL_STATE_REFERENCE_LENGTH = 6;
 export const READ_REQUEST_LENGTH = 2;
+export const NOTE_HASH_LENGTH = 2;
+export const NOTE_HASH_CONTEXT_LENGTH = 3;
+export const NULLIFIER_LENGTH = 3;
 export const SIDE_EFFECT_LENGTH = 2;
-export const SIDE_EFFECT_LINKED_TO_NOTE_HASH_LENGTH = 3;
 export const STATE_REFERENCE_LENGTH = APPEND_ONLY_TREE_SNAPSHOT_LENGTH + PARTIAL_STATE_REFERENCE_LENGTH;
 export const TX_CONTEXT_LENGTH = 2 + GAS_SETTINGS_LENGTH;
 export const TX_REQUEST_LENGTH = 2 + TX_CONTEXT_LENGTH + FUNCTION_DATA_LENGTH;
@@ -115,8 +117,8 @@ export const PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH =
   SIDE_EFFECT_LENGTH * MAX_NOTE_HASH_READ_REQUESTS_PER_CALL +
   READ_REQUEST_LENGTH * MAX_NULLIFIER_READ_REQUESTS_PER_CALL +
   NULLIFIER_KEY_VALIDATION_REQUEST_LENGTH * MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL +
-  SIDE_EFFECT_LENGTH * MAX_NEW_NOTE_HASHES_PER_CALL +
-  SIDE_EFFECT_LINKED_TO_NOTE_HASH_LENGTH * MAX_NEW_NULLIFIERS_PER_CALL +
+  NOTE_HASH_LENGTH * MAX_NEW_NOTE_HASHES_PER_CALL +
+  NULLIFIER_LENGTH * MAX_NEW_NULLIFIERS_PER_CALL +
   MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL +
   MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL +
   L2_TO_L1_MESSAGE_LENGTH * MAX_NEW_L2_TO_L1_MSGS_PER_CALL +
@@ -134,8 +136,8 @@ export const PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH =
   CONTRACT_STORAGE_UPDATE_REQUEST_LENGTH * MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL +
   CONTRACT_STORAGE_READ_LENGTH * MAX_PUBLIC_DATA_READS_PER_CALL +
   MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL +
-  SIDE_EFFECT_LENGTH * MAX_NEW_NOTE_HASHES_PER_CALL +
-  SIDE_EFFECT_LINKED_TO_NOTE_HASH_LENGTH * MAX_NEW_NULLIFIERS_PER_CALL +
+  NOTE_HASH_LENGTH * MAX_NEW_NOTE_HASHES_PER_CALL +
+  NULLIFIER_LENGTH * MAX_NEW_NULLIFIERS_PER_CALL +
   L2_TO_L1_MESSAGE_LENGTH * MAX_NEW_L2_TO_L1_MSGS_PER_CALL +
   2 +
   SIDE_EFFECT_LENGTH * MAX_UNENCRYPTED_LOGS_PER_CALL +
@@ -210,4 +212,5 @@ export enum GeneratorIndex {
   NOTE_NULLIFIER = 52,
   INNER_NOTE_HASH = 53,
   NOTE_CONTENT_HASH = 54,
+  SYMMETRIC_KEY = 55,
 }
diff --git a/yarn-project/foundation/src/testing/test_data.ts b/yarn-project/foundation/src/testing/test_data.ts
index a92794e64f6a..dba6932cd5cc 100644
--- a/yarn-project/foundation/src/testing/test_data.ts
+++ b/yarn-project/foundation/src/testing/test_data.ts
@@ -66,7 +66,7 @@ export function updateInlineTestData(targetFileFromRepoRoot: string, itemName: s
   const logger = createConsoleLogger('aztec:testing:test_data');
   const targetFile = getPathToFile(targetFileFromRepoRoot);
   const contents = readFileSync(targetFile, 'utf8').toString();
-  const regex = new RegExp(`let ${itemName} = .*;`, 'g');
+  const regex = new RegExp(`let ${itemName} = [\\s\\S]*?;`, 'g');
   if (!regex.exec(contents)) {
     throw new Error(`Test data marker for ${itemName} not found in ${targetFile}`);
   }
diff --git a/yarn-project/pxe/src/note_processor/note_processor.test.ts b/yarn-project/pxe/src/note_processor/note_processor.test.ts
index b182e5caeb55..1ddd5bd1ce62 100644
--- a/yarn-project/pxe/src/note_processor/note_processor.test.ts
+++ b/yarn-project/pxe/src/note_processor/note_processor.test.ts
@@ -17,7 +17,6 @@ import {
   type PublicKey,
   deriveKeys,
 } from '@aztec/circuits.js';
-import { Grumpkin } from '@aztec/circuits.js/barretenberg';
 import { pedersenHash } from '@aztec/foundation/crypto';
 import { Point } from '@aztec/foundation/fields';
 import { openTmpStore } from '@aztec/kv-store/utils';
@@ -34,7 +33,6 @@ import { NoteProcessor } from './note_processor.js';
 const TXS_PER_BLOCK = 4;
 
 describe('Note Processor', () => {
-  const grumpkin = new Grumpkin();
   let database: PxeDatabase;
   let aztecNode: ReturnType<typeof mock<AztecNode>>;
   let addNotesSpy: any;
@@ -72,7 +70,7 @@ describe('Note Processor', () => {
           ownedL1NotePayloads.push(note.notePayload);
         }
         // const encryptedNote =
-        const log = note.toEncryptedBuffer(publicKey, grumpkin);
+        const log = note.toEncryptedBuffer(publicKey);
         // 1 tx containing 1 function invocation containing 1 log
         logs.push(new EncryptedFunctionL2Logs([new EncryptedL2Log(log)]));
       }
diff --git a/yarn-project/pxe/src/note_processor/note_processor.ts b/yarn-project/pxe/src/note_processor/note_processor.ts
index 0950a427598f..3eaa6b3006d5 100644
--- a/yarn-project/pxe/src/note_processor/note_processor.ts
+++ b/yarn-project/pxe/src/note_processor/note_processor.ts
@@ -8,7 +8,6 @@ import {
 } from '@aztec/circuit-types';
 import { type NoteProcessorStats } from '@aztec/circuit-types/stats';
 import { INITIAL_L2_BLOCK_NUM, MAX_NEW_NOTE_HASHES_PER_TX, type PublicKey } from '@aztec/circuits.js';
-import { Grumpkin } from '@aztec/circuits.js/barretenberg';
 import { type Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
@@ -99,7 +98,6 @@ export class NoteProcessor {
       return;
     }
 
-    const curve = new Grumpkin();
     const blocksAndNotes: ProcessedData[] = [];
     // Keep track of notes that we couldn't process because the contract was not found.
     const deferredNoteDaos: DeferredNoteDao[] = [];
@@ -132,7 +130,7 @@ export class NoteProcessor {
         for (const functionLogs of txFunctionLogs) {
           for (const log of functionLogs.logs) {
             this.stats.seen++;
-            const taggedNote = TaggedNote.fromEncryptedBuffer(log.data, secretKey, curve);
+            const taggedNote = TaggedNote.fromEncryptedBuffer(log.data, secretKey);
             if (taggedNote?.notePayload) {
               const { notePayload: payload } = taggedNote;
               // We have successfully decrypted the data.
diff --git a/yarn-project/simulator/src/client/client_execution_context.ts b/yarn-project/simulator/src/client/client_execution_context.ts
index 57a79776a973..22beba44aa13 100644
--- a/yarn-project/simulator/src/client/client_execution_context.ts
+++ b/yarn-project/simulator/src/client/client_execution_context.ts
@@ -21,7 +21,7 @@ import {
   type SideEffect,
   type TxContext,
 } from '@aztec/circuits.js';
-import { Aes128, type Grumpkin } from '@aztec/circuits.js/barretenberg';
+import { Aes128 } from '@aztec/circuits.js/barretenberg';
 import { computePublicDataTreeLeafSlot, computeUniqueNoteHash, siloNoteHash } from '@aztec/circuits.js/hash';
 import { type FunctionAbi, type FunctionArtifact, countArgumentsSize } from '@aztec/foundation/abi';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
@@ -77,7 +77,6 @@ export class ClientExecutionContext extends ViewDataOracle {
     private readonly packedValuesCache: PackedValuesCache,
     private readonly noteCache: ExecutionNoteCache,
     db: DBOracle,
-    private readonly curve: Grumpkin,
     private node: AztecNode,
     protected sideEffectCounter: number = 0,
     log = createDebugLogger('aztec:simulator:client_execution_context'),
@@ -345,7 +344,7 @@ export class ClientExecutionContext extends ViewDataOracle {
     const note = new Note(log);
     const l1NotePayload = new L1NotePayload(note, contractAddress, storageSlot, noteTypeId);
     const taggedNote = new TaggedNote(l1NotePayload);
-    const encryptedNote = taggedNote.toEncryptedBuffer(publicKey, this.curve);
+    const encryptedNote = taggedNote.toEncryptedBuffer(publicKey);
     const encryptedLog = new EncryptedL2Log(encryptedNote);
     this.encryptedLogs.push(encryptedLog);
     return Fr.fromBuffer(encryptedLog.hash());
@@ -421,7 +420,6 @@ export class ClientExecutionContext extends ViewDataOracle {
       this.packedValuesCache,
       this.noteCache,
       this.db,
-      this.curve,
       this.node,
       sideEffectCounter,
     );
diff --git a/yarn-project/simulator/src/client/simulator.ts b/yarn-project/simulator/src/client/simulator.ts
index a0499982a292..cb767ea4d243 100644
--- a/yarn-project/simulator/src/client/simulator.ts
+++ b/yarn-project/simulator/src/client/simulator.ts
@@ -1,6 +1,5 @@
 import { type AztecNode, type FunctionCall, type Note, type TxExecutionRequest } from '@aztec/circuit-types';
 import { CallContext, FunctionData } from '@aztec/circuits.js';
-import { Grumpkin } from '@aztec/circuits.js/barretenberg';
 import {
   type ArrayType,
   type FunctionArtifactWithDebugMetadata,
@@ -79,8 +78,6 @@ export class AcirSimulator {
       );
     }
 
-    const curve = new Grumpkin();
-
     const header = await this.db.getHeader();
 
     // reserve the first side effect for the tx hash (inserted by the private kernel)
@@ -104,7 +101,6 @@ export class AcirSimulator {
       PackedValuesCache.create(request.argsOfCalls),
       new ExecutionNoteCache(),
       this.db,
-      curve,
       this.node,
       startSideEffectCounter,
     );

From 9f5773353aa0261fa07a81704bcadcee513d42c5 Mon Sep 17 00:00:00 2001
From: Innokentii Sennovskii <isennovskiy@gmail.com>
Date: Tue, 30 Apr 2024 15:49:09 +0100
Subject: [PATCH 10/42] feat: Avoiding redundant computation in PG (#5844)

This PR reduces PG computation time by removing computation on indices
over which accumulated relation values are expected to be zero. This
gives us a speedup of 4-5%. The PR also parallelised pertubator root
construction.
Before:
x86_64:

![image](https://github.com/AztecProtocol/aztec-packages/assets/4798775/80247864-1c1c-4e34-8756-a8bd44bdbab2)
wasm:

![image](https://github.com/AztecProtocol/aztec-packages/assets/4798775/649dfd97-d65c-48a5-8b8c-02fb3fbb9f47)
After:
x86_64:

![image](https://github.com/AztecProtocol/aztec-packages/assets/4798775/d453e026-7a88-4646-8094-b7102916a2af)
wasm:

![image](https://github.com/AztecProtocol/aztec-packages/assets/4798775/549b89a3-d1dd-4058-84a2-92856180d15d)
---
 .../cpp/src/barretenberg/flavor/flavor.hpp    |  15 +-
 .../barretenberg/polynomials/univariate.hpp   | 214 ++++++++++------
 .../protogalaxy/combiner.test.cpp             |  44 ++--
 .../protogalaxy/protogalaxy.test.cpp          |   5 +
 .../protogalaxy/protogalaxy_prover.hpp        | 242 +++++++++++++++---
 .../relations/nested_containers.hpp           |  24 +-
 .../barretenberg/relations/relation_types.hpp |   6 +
 .../goblin_ultra_flavor.hpp                   |  14 +
 .../stdlib_circuit_builders/ultra_flavor.hpp  |  11 +
 .../sumcheck/instance/instances.hpp           |   7 +-
 .../barretenberg/vm/generated/avm_flavor.hpp  |   7 +
 11 files changed, 445 insertions(+), 144 deletions(-)

diff --git a/barretenberg/cpp/src/barretenberg/flavor/flavor.hpp b/barretenberg/cpp/src/barretenberg/flavor/flavor.hpp
index 18eda8ecd0cf..fb30168d58dd 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/flavor.hpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/flavor.hpp
@@ -251,18 +251,23 @@ template <typename Tuple, std::size_t Index = 0> static constexpr size_t compute
  * @details The size of the outer tuple is equal to the number of relations. Each relation contributes an inner tuple of
  * univariates whose size is equal to the number of subrelations of the relation. The length of a univariate in an inner
  * tuple is determined by the corresponding subrelation length and the number of instances to be folded.
+ * @tparam optimised Enable optimised version with skipping some of the computation
  */
-template <typename Tuple, size_t NUM_INSTANCES, size_t Index = 0>
+template <typename Tuple, size_t NUM_INSTANCES, bool optimised = false, size_t Index = 0>
 static constexpr auto create_protogalaxy_tuple_of_tuples_of_univariates()
 {
     if constexpr (Index >= std::tuple_size<Tuple>::value) {
         return std::tuple<>{}; // Return empty when reach end of the tuple
     } else {
         using UnivariateTuple =
-            typename std::tuple_element_t<Index,
-                                          Tuple>::template ProtogalaxyTupleOfUnivariatesOverSubrelations<NUM_INSTANCES>;
-        return std::tuple_cat(std::tuple<UnivariateTuple>{},
-                              create_protogalaxy_tuple_of_tuples_of_univariates<Tuple, NUM_INSTANCES, Index + 1>());
+            std::conditional_t<optimised,
+                               typename std::tuple_element_t<Index, Tuple>::
+                                   template OptimisedProtogalaxyTupleOfUnivariatesOverSubrelations<NUM_INSTANCES>,
+                               typename std::tuple_element_t<Index, Tuple>::
+                                   template ProtogalaxyTupleOfUnivariatesOverSubrelations<NUM_INSTANCES>>;
+        return std::tuple_cat(
+            std::tuple<UnivariateTuple>{},
+            create_protogalaxy_tuple_of_tuples_of_univariates<Tuple, NUM_INSTANCES, optimised, Index + 1>());
     }
 }
 
diff --git a/barretenberg/cpp/src/barretenberg/polynomials/univariate.hpp b/barretenberg/cpp/src/barretenberg/polynomials/univariate.hpp
index aedc13537875..6471ba85b56e 100644
--- a/barretenberg/cpp/src/barretenberg/polynomials/univariate.hpp
+++ b/barretenberg/cpp/src/barretenberg/polynomials/univariate.hpp
@@ -13,17 +13,22 @@ namespace bb {
  * of the data in those univariates. We do that by taking a view of those elements and then, as needed, using this to
  * populate new containers.
  */
-template <class Fr, size_t view_domain_end, size_t view_domain_start> class UnivariateView;
+template <class Fr, size_t view_domain_end, size_t view_domain_start, size_t skip_count> class UnivariateView;
 
 /**
  * @brief A univariate polynomial represented by its values on {domain_start, domain_start + 1,..., domain_end - 1}. For
  * memory efficiency purposes, we store the evaluations in an array starting from 0 and make the mapping to the right
  * domain under the hood.
+ *
+ * @tparam skip_count Skip computing the values of elements [domain_start+1,..,domain_start+skip_count]. Used for
+ * optimising computation in protogalaxy. The value at [domain_start] is the value from the accumulator instance, while
+ * the values in [domain_start+1, ... domain_start + skip_count] in the accumulator should be zero if the original
+ * instances are correct.
  */
-template <class Fr, size_t domain_end, size_t domain_start = 0> class Univariate {
+template <class Fr, size_t domain_end, size_t domain_start = 0, size_t skip_count = 0> class Univariate {
   public:
     static constexpr size_t LENGTH = domain_end - domain_start;
-    using View = UnivariateView<Fr, domain_end, domain_start>;
+    using View = UnivariateView<Fr, domain_end, domain_start, skip_count>;
 
     using value_type = Fr; // used to get the type of the elements consistently with std::array
 
@@ -40,8 +45,27 @@ template <class Fr, size_t domain_end, size_t domain_start = 0> class Univariate
     Univariate(Univariate&& other) noexcept = default;
     Univariate& operator=(const Univariate& other) = default;
     Univariate& operator=(Univariate&& other) noexcept = default;
-    // Construct constant Univariate from scalar which represents the value that all the points in the domain evaluate
-    // to
+
+    /**
+     * @brief Convert from a version with skipped evaluations to one without skipping (with zeroes in previously skipped
+     * locations)
+     *
+     * @return Univariate<Fr, domain_end, domain_start>
+     */
+    Univariate<Fr, domain_end, domain_start> convert() const noexcept
+    {
+        Univariate<Fr, domain_end, domain_start, 0> result;
+        result.evaluations[0] = evaluations[0];
+        for (size_t i = 1; i < skip_count + 1; i++) {
+            result.evaluations[i] = Fr::zero();
+        }
+        for (size_t i = skip_count + 1; i < LENGTH; i++) {
+            result.evaluations[i] = evaluations[i];
+        }
+        return result;
+    }
+    // Construct constant Univariate from scalar which represents the value that all the points in the domain
+    // evaluate to
     explicit Univariate(Fr value)
         : evaluations{}
     {
@@ -50,7 +74,7 @@ template <class Fr, size_t domain_end, size_t domain_start = 0> class Univariate
         }
     }
     // Construct Univariate from UnivariateView
-    explicit Univariate(UnivariateView<Fr, domain_end, domain_start> in)
+    explicit Univariate(UnivariateView<Fr, domain_end, domain_start, skip_count> in)
         : evaluations{}
     {
         for (size_t i = 0; i < in.evaluations.size(); ++i) {
@@ -77,7 +101,7 @@ template <class Fr, size_t domain_end, size_t domain_start = 0> class Univariate
 
     static Univariate get_random()
     {
-        auto output = Univariate<Fr, domain_end, domain_start>();
+        auto output = Univariate<Fr, domain_end, domain_start, skip_count>();
         for (size_t i = 0; i != LENGTH; ++i) {
             output.value_at(i) = Fr::random_element();
         }
@@ -86,7 +110,7 @@ template <class Fr, size_t domain_end, size_t domain_start = 0> class Univariate
 
     static Univariate zero()
     {
-        auto output = Univariate<Fr, domain_end, domain_start>();
+        auto output = Univariate<Fr, domain_end, domain_start, skip_count>();
         for (size_t i = 0; i != LENGTH; ++i) {
             output.value_at(i) = Fr::zero();
         }
@@ -100,21 +124,25 @@ template <class Fr, size_t domain_end, size_t domain_start = 0> class Univariate
 
     Univariate& operator+=(const Univariate& other)
     {
-        for (size_t i = 0; i < LENGTH; ++i) {
+        evaluations[0] += other.evaluations[0];
+        for (size_t i = skip_count + 1; i < LENGTH; ++i) {
             evaluations[i] += other.evaluations[i];
         }
         return *this;
     }
     Univariate& operator-=(const Univariate& other)
     {
-        for (size_t i = 0; i < LENGTH; ++i) {
+        evaluations[0] -= other.evaluations[0];
+        for (size_t i = skip_count + 1; i < LENGTH; ++i) {
+
             evaluations[i] -= other.evaluations[i];
         }
         return *this;
     }
     Univariate& operator*=(const Univariate& other)
     {
-        for (size_t i = 0; i < LENGTH; ++i) {
+        evaluations[0] *= other.evaluations[0];
+        for (size_t i = skip_count + 1; i < LENGTH; ++i) {
             evaluations[i] *= other.evaluations[i];
         }
         return *this;
@@ -135,8 +163,12 @@ template <class Fr, size_t domain_end, size_t domain_start = 0> class Univariate
     Univariate operator-() const
     {
         Univariate res(*this);
+        size_t i = 0;
         for (auto& eval : res.evaluations) {
-            eval = -eval;
+            if (i == 0 || i >= (skip_count + 1)) {
+                eval = -eval;
+            }
+            i++;
         }
         return res;
     }
@@ -151,23 +183,39 @@ template <class Fr, size_t domain_end, size_t domain_start = 0> class Univariate
     // Operations between Univariate and scalar
     Univariate& operator+=(const Fr& scalar)
     {
+        size_t i = 0;
         for (auto& eval : evaluations) {
-            eval += scalar;
+            if (i == 0 || i >= (skip_count + 1)) {
+                eval += scalar;
+            }
+            i++;
         }
         return *this;
     }
 
     Univariate& operator-=(const Fr& scalar)
     {
+        size_t i = 0;
         for (auto& eval : evaluations) {
-            eval -= scalar;
+            // If skip count is zero, will be enabled on every line, otherwise don't compute for [domain_start+1,..,
+            // domain_start + skip_count]
+            if (i == 0 || i >= (skip_count + 1)) {
+                eval -= scalar;
+            }
+            i++;
         }
         return *this;
     }
     Univariate& operator*=(const Fr& scalar)
     {
+        size_t i = 0;
         for (auto& eval : evaluations) {
-            eval *= scalar;
+            // If skip count is zero, will be enabled on every line, otherwise don't compute for [domain_start+1,..,
+            // domain_start + skip_count]
+            if (i == 0 || i >= (skip_count + 1)) {
+                eval *= scalar;
+            }
+            i++;
         }
         return *this;
     }
@@ -194,45 +242,48 @@ template <class Fr, size_t domain_end, size_t domain_start = 0> class Univariate
     }
 
     // Operations between Univariate and UnivariateView
-    Univariate& operator+=(const UnivariateView<Fr, domain_end, domain_start>& view)
+    Univariate& operator+=(const UnivariateView<Fr, domain_end, domain_start, skip_count>& view)
     {
-        for (size_t i = 0; i < LENGTH; ++i) {
+        evaluations[0] += view.evaluations[0];
+        for (size_t i = skip_count + 1; i < LENGTH; ++i) {
             evaluations[i] += view.evaluations[i];
         }
         return *this;
     }
 
-    Univariate& operator-=(const UnivariateView<Fr, domain_end, domain_start>& view)
+    Univariate& operator-=(const UnivariateView<Fr, domain_end, domain_start, skip_count>& view)
     {
-        for (size_t i = 0; i < LENGTH; ++i) {
+        evaluations[0] -= view.evaluations[0];
+        for (size_t i = skip_count + 1; i < LENGTH; ++i) {
             evaluations[i] -= view.evaluations[i];
         }
         return *this;
     }
 
-    Univariate& operator*=(const UnivariateView<Fr, domain_end, domain_start>& view)
+    Univariate& operator*=(const UnivariateView<Fr, domain_end, domain_start, skip_count>& view)
     {
-        for (size_t i = 0; i < LENGTH; ++i) {
+        evaluations[0] *= view.evaluations[0];
+        for (size_t i = skip_count + 1; i < LENGTH; ++i) {
             evaluations[i] *= view.evaluations[i];
         }
         return *this;
     }
 
-    Univariate operator+(const UnivariateView<Fr, domain_end, domain_start>& view) const
+    Univariate operator+(const UnivariateView<Fr, domain_end, domain_start, skip_count>& view) const
     {
         Univariate res(*this);
         res += view;
         return res;
     }
 
-    Univariate operator-(const UnivariateView<Fr, domain_end, domain_start>& view) const
+    Univariate operator-(const UnivariateView<Fr, domain_end, domain_start, skip_count>& view) const
     {
         Univariate res(*this);
         res -= view;
         return res;
     }
 
-    Univariate operator*(const UnivariateView<Fr, domain_end, domain_start>& view) const
+    Univariate operator*(const UnivariateView<Fr, domain_end, domain_start, skip_count>& view) const
     {
         Univariate res(*this);
         res *= view;
@@ -256,39 +307,42 @@ template <class Fr, size_t domain_end, size_t domain_start = 0> class Univariate
     }
 
     /**
-     * @brief Given a univariate f represented by {f(domain_start), ..., f(domain_end - 1)}, compute the evaluations
-     * {f(domain_end),..., f(extended_domain_end -1)} and return the Univariate represented by  {f(domain_start),...,
-     * f(extended_domain_end -1)}
+     * @brief Given a univariate f represented by {f(domain_start), ..., f(domain_end - 1)}, compute the
+     * evaluations {f(domain_end),..., f(extended_domain_end -1)} and return the Univariate represented by
+     * {f(domain_start),..., f(extended_domain_end -1)}
      *
-     * @details Write v_i = f(x_i) on a the domain {x_{domain_start}, ..., x_{domain_end-1}}. To efficiently compute the
-     * needed values of f, we use the barycentric formula
+     * @details Write v_i = f(x_i) on a the domain {x_{domain_start}, ..., x_{domain_end-1}}. To efficiently
+     * compute the needed values of f, we use the barycentric formula
      *      - f(x) = B(x) Σ_{i=domain_start}^{domain_end-1} v_i / (d_i*(x-x_i))
      * where
      *      - B(x) = Π_{i=domain_start}^{domain_end-1} (x-x_i)
-     *      - d_i  = Π_{j ∈ {domain_start, ..., domain_end-1}, j≠i} (x_i-x_j) for i ∈ {domain_start, ..., domain_end-1}
+     *      - d_i  = Π_{j ∈ {domain_start, ..., domain_end-1}, j≠i} (x_i-x_j) for i ∈ {domain_start, ...,
+     * domain_end-1}
      *
-     * When the domain size is two, extending f = v0(1-X) + v1X to a new value involves just one addition and a
-     * subtraction: setting Δ = v1-v0, the values of f(X) are f(0)=v0, f(1)= v0 + Δ, v2 = f(1) + Δ, v3 = f(2) + Δ...
+     * When the domain size is two, extending f = v0(1-X) + v1X to a new value involves just one addition
+     * and a subtraction: setting Δ = v1-v0, the values of f(X) are f(0)=v0, f(1)= v0 + Δ, v2 = f(1) + Δ, v3
+     * = f(2) + Δ...
      *
      */
-    template <size_t EXTENDED_DOMAIN_END> Univariate<Fr, EXTENDED_DOMAIN_END> extend_to() const
+    template <size_t EXTENDED_DOMAIN_END, size_t NUM_SKIPPED_INDICES = 0>
+    Univariate<Fr, EXTENDED_DOMAIN_END, 0, NUM_SKIPPED_INDICES> extend_to() const
     {
         const size_t EXTENDED_LENGTH = EXTENDED_DOMAIN_END - domain_start;
         using Data = BarycentricData<Fr, LENGTH, EXTENDED_LENGTH>;
         static_assert(EXTENDED_LENGTH >= LENGTH);
 
-        Univariate<Fr, EXTENDED_LENGTH> result;
+        Univariate<Fr, EXTENDED_LENGTH, 0, NUM_SKIPPED_INDICES> result;
 
         std::copy(evaluations.begin(), evaluations.end(), result.evaluations.begin());
 
         static constexpr Fr inverse_two = Fr(2).invert();
+        static_assert(NUM_SKIPPED_INDICES < LENGTH);
         if constexpr (LENGTH == 2) {
             Fr delta = value_at(1) - value_at(0);
             static_assert(EXTENDED_LENGTH != 0);
             for (size_t idx = domain_end - 1; idx < EXTENDED_DOMAIN_END - 1; idx++) {
                 result.value_at(idx + 1) = result.value_at(idx) + delta;
             }
-            return result;
         } else if constexpr (LENGTH == 3) {
             // Based off https://hackmd.io/@aztec-network/SyR45cmOq?type=view
             // The technique used here is the same as the length == 3 case below.
@@ -304,7 +358,6 @@ template <class Fr, size_t domain_end, size_t domain_start = 0> class Univariate
                 result.value_at(idx + 1) = result.value_at(idx) + extra;
                 extra += a2;
             }
-            return result;
         } else if constexpr (LENGTH == 4) {
             static constexpr Fr inverse_six = Fr(6).invert(); // computed at compile time for efficiency
 
@@ -315,8 +368,8 @@ template <class Fr, size_t domain_end, size_t domain_start = 0> class Univariate
             //          a*1 + b*1 + c*1 + d = f(1)
             //          a*2^3 + b*2^2 + c*2 + d = f(2)
             //          a*3^3 + b*3^2 + c*3 + d = f(3)
-            // These equations can be rewritten as a matrix equation M * [a, b, c, d] = [f(0), f(1), f(2), f(3)], where
-            // M is:
+            // These equations can be rewritten as a matrix equation M * [a, b, c, d] = [f(0), f(1), f(2),
+            // f(3)], where M is:
             //          0,  0,  0,  1
             //          1,  1,  1,  1
             //          2^3, 2^2, 2,  1
@@ -326,9 +379,9 @@ template <class Fr, size_t domain_end, size_t domain_start = 0> class Univariate
             //      1,	    -5/2,	2,	    -1/2
             //      -11/6,	3,	    -3/2,	1/3
             //      1,	    0,	    0,	    0
-            // To compute these values, we can multiply everything by 6 and multiply by inverse_six at the end for each
-            // coefficient The resulting computation here does 18 field adds, 6 subtracts, 3 muls to compute a, b, c,
-            // and d.
+            // To compute these values, we can multiply everything by 6 and multiply by inverse_six at the
+            // end for each coefficient The resulting computation here does 18 field adds, 6 subtracts, 3
+            // muls to compute a, b, c, and d.
             Fr zero_times_3 = value_at(0) + value_at(0) + value_at(0);
             Fr zero_times_6 = zero_times_3 + zero_times_3;
             Fr zero_times_12 = zero_times_6 + zero_times_6;
@@ -368,7 +421,6 @@ template <class Fr, size_t domain_end, size_t domain_start = 0> class Univariate
 
                 linear_term += three_a_plus_two_b;
             }
-            return result;
         } else {
             for (size_t k = domain_end; k != EXTENDED_DOMAIN_END; ++k) {
                 result.value_at(k) = 0;
@@ -381,8 +433,8 @@ template <class Fr, size_t domain_end, size_t domain_start = 0> class Univariate
                 // scale the sum by the the value of of B(x)
                 result.value_at(k) *= Data::full_numerator_values[k];
             }
-            return result;
         }
+        return result;
     }
 
     /**
@@ -399,8 +451,8 @@ template <class Fr, size_t domain_end, size_t domain_start = 0> class Univariate
             full_numerator_value *= u - i;
         }
 
-        // build set of domain size-many denominator inverses 1/(d_i*(x_k - x_j)). will multiply against each of
-        // these (rather than to divide by something) for each barycentric evaluation
+        // build set of domain size-many denominator inverses 1/(d_i*(x_k - x_j)). will multiply against
+        // each of these (rather than to divide by something) for each barycentric evaluation
         std::array<Fr, LENGTH> denominator_inverses;
         for (size_t i = 0; i != LENGTH; ++i) {
             Fr inv = Data::lagrange_denominators[i];
@@ -443,7 +495,7 @@ inline void write(B& it, Univariate<Fr, domain_end, domain_start> const& univari
     write(it, univariate.evaluations);
 }
 
-template <class Fr, size_t domain_end, size_t domain_start = 0> class UnivariateView {
+template <class Fr, size_t domain_end, size_t domain_start = 0, size_t skip_count = 0> class UnivariateView {
   public:
     static constexpr size_t LENGTH = domain_end - domain_start;
     std::span<const Fr, LENGTH> evaluations;
@@ -453,77 +505,84 @@ template <class Fr, size_t domain_end, size_t domain_start = 0> class Univariate
     const Fr& value_at(size_t i) const { return evaluations[i]; };
 
     template <size_t full_domain_end, size_t full_domain_start = 0>
-    explicit UnivariateView(const Univariate<Fr, full_domain_end, full_domain_start>& univariate_in)
+    explicit UnivariateView(const Univariate<Fr, full_domain_end, full_domain_start, skip_count>& univariate_in)
         : evaluations(std::span<const Fr>(univariate_in.evaluations.data(), LENGTH)){};
 
-    Univariate<Fr, domain_end, domain_start> operator+(const UnivariateView& other) const
+    Univariate<Fr, domain_end, domain_start, skip_count> operator+(const UnivariateView& other) const
     {
-        Univariate<Fr, domain_end, domain_start> res(*this);
+        Univariate<Fr, domain_end, domain_start, skip_count> res(*this);
         res += other;
         return res;
     }
 
-    Univariate<Fr, domain_end, domain_start> operator-(const UnivariateView& other) const
+    Univariate<Fr, domain_end, domain_start, skip_count> operator-(const UnivariateView& other) const
     {
-        Univariate<Fr, domain_end, domain_start> res(*this);
+        Univariate<Fr, domain_end, domain_start, skip_count> res(*this);
         res -= other;
         return res;
     }
 
-    Univariate<Fr, domain_end, domain_start> operator-() const
+    Univariate<Fr, domain_end, domain_start, skip_count> operator-() const
     {
-        Univariate<Fr, domain_end, domain_start> res(*this);
+        Univariate<Fr, domain_end, domain_start, skip_count> res(*this);
+        size_t i = 0;
         for (auto& eval : res.evaluations) {
-            eval = -eval;
+            if (i == 0 || i >= (skip_count + 1)) {
+                eval = -eval;
+            }
+            i++;
         }
         return res;
     }
 
-    Univariate<Fr, domain_end, domain_start> operator*(const UnivariateView& other) const
+    Univariate<Fr, domain_end, domain_start, skip_count> operator*(const UnivariateView& other) const
     {
-        Univariate<Fr, domain_end, domain_start> res(*this);
+        Univariate<Fr, domain_end, domain_start, skip_count> res(*this);
         res *= other;
         return res;
     }
 
-    Univariate<Fr, domain_end, domain_start> operator*(const Univariate<Fr, domain_end, domain_start>& other) const
+    Univariate<Fr, domain_end, domain_start, skip_count> operator*(
+        const Univariate<Fr, domain_end, domain_start, skip_count>& other) const
     {
-        Univariate<Fr, domain_end, domain_start> res(*this);
+        Univariate<Fr, domain_end, domain_start, skip_count> res(*this);
         res *= other;
         return res;
     }
 
-    Univariate<Fr, domain_end, domain_start> operator+(const Univariate<Fr, domain_end, domain_start>& other) const
+    Univariate<Fr, domain_end, domain_start, skip_count> operator+(
+        const Univariate<Fr, domain_end, domain_start, skip_count>& other) const
     {
-        Univariate<Fr, domain_end, domain_start> res(*this);
+        Univariate<Fr, domain_end, domain_start, skip_count> res(*this);
         res += other;
         return res;
     }
 
-    Univariate<Fr, domain_end, domain_start> operator+(const Fr& other) const
+    Univariate<Fr, domain_end, domain_start, skip_count> operator+(const Fr& other) const
     {
-        Univariate<Fr, domain_end, domain_start> res(*this);
+        Univariate<Fr, domain_end, domain_start, skip_count> res(*this);
         res += other;
         return res;
     }
 
-    Univariate<Fr, domain_end, domain_start> operator-(const Fr& other) const
+    Univariate<Fr, domain_end, domain_start, skip_count> operator-(const Fr& other) const
     {
-        Univariate<Fr, domain_end, domain_start> res(*this);
+        Univariate<Fr, domain_end, domain_start, skip_count> res(*this);
         res -= other;
         return res;
     }
 
-    Univariate<Fr, domain_end, domain_start> operator*(const Fr& other) const
+    Univariate<Fr, domain_end, domain_start, skip_count> operator*(const Fr& other) const
     {
-        Univariate<Fr, domain_end, domain_start> res(*this);
+        Univariate<Fr, domain_end, domain_start, skip_count> res(*this);
         res *= other;
         return res;
     }
 
-    Univariate<Fr, domain_end, domain_start> operator-(const Univariate<Fr, domain_end, domain_start>& other) const
+    Univariate<Fr, domain_end, domain_start, skip_count> operator-(
+        const Univariate<Fr, domain_end, domain_start, skip_count>& other) const
     {
-        Univariate<Fr, domain_end, domain_start> res(*this);
+        Univariate<Fr, domain_end, domain_start, skip_count> res(*this);
         res -= other;
         return res;
     }
@@ -546,8 +605,8 @@ template <class Fr, size_t domain_end, size_t domain_start = 0> class Univariate
 };
 
 /**
- * @brief Create a sub-array of `elements` at the indices given in the template pack `Is`, converting them to the new
- * type T.
+ * @brief Create a sub-array of `elements` at the indices given in the template pack `Is`, converting them
+ * to the new type T.
  *
  * @tparam T type to convert to
  * @tparam U type to convert from
@@ -555,8 +614,8 @@ template <class Fr, size_t domain_end, size_t domain_start = 0> class Univariate
  * @tparam Is list of indices we want in the returned array. When the second argument is called with
  * `std::make_index_sequence<N>`, these will be `0, 1, ..., N-1`.
  * @param elements array to convert from
- * @return std::array<T, sizeof...(Is)> result array s.t. result[i] = T(elements[Is[i]]). By default, Is[i] = i when
- * called with `std::make_index_sequence<N>`.
+ * @return std::array<T, sizeof...(Is)> result array s.t. result[i] = T(elements[Is[i]]). By default, Is[i]
+ * = i when called with `std::make_index_sequence<N>`.
  */
 template <typename T, typename U, std::size_t N, std::size_t... Is>
 std::array<T, sizeof...(Is)> array_to_array_aux(const std::array<U, N>& elements, std::index_sequence<Is...>)
@@ -568,11 +627,12 @@ std::array<T, sizeof...(Is)> array_to_array_aux(const std::array<U, N>& elements
  * @brief Given an std::array<U,N>, returns an std::array<T,N>, by calling the (explicit) constructor T(U).
  *
  * @details https://stackoverflow.com/a/32175958
- * The main use case is to convert an array of `Univariate` into `UnivariateView`. The main use case would be to let
- * Sumcheck decide the required degree of the relation evaluation, rather than hardcoding it inside the relation. The
- * `_aux` version could also be used to create an array of only the polynomials required by the relation, and it could
- * help us implement the optimization where we extend each edge only up to the maximum degree that is required over all
- * relations (for example, `L_LAST` only needs degree 3).
+ * The main use case is to convert an array of `Univariate` into `UnivariateView`. The main use case would
+ * be to let Sumcheck decide the required degree of the relation evaluation, rather than hardcoding it
+ * inside the relation. The
+ * `_aux` version could also be used to create an array of only the polynomials required by the relation,
+ * and it could help us implement the optimization where we extend each edge only up to the maximum degree
+ * that is required over all relations (for example, `L_LAST` only needs degree 3).
  *
  * @tparam T Output type
  * @tparam U Input type (deduced from `elements`)
diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/combiner.test.cpp b/barretenberg/cpp/src/barretenberg/protogalaxy/combiner.test.cpp
index 72a6fa53233c..4ff7f81cb513 100644
--- a/barretenberg/cpp/src/barretenberg/protogalaxy/combiner.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/protogalaxy/combiner.test.cpp
@@ -44,6 +44,12 @@ TEST(Protogalaxy, CombinerOn2Instances)
                 auto prover_polynomials = get_sequential_prover_polynomials<Flavor>(
                     /*log_circuit_size=*/1, idx * 128);
                 restrict_to_standard_arithmetic_relation(prover_polynomials);
+                // This ensures that the combiner accumulator for second instance = 0
+                // The value is computed by generating the python script values, computing the resulting accumulator and
+                // taking the value at index 1
+                if (idx == NUM_INSTANCES - 1) {
+                    prover_polynomials.q_c[0] -= 13644570;
+                }
                 instance->proving_key.polynomials = std::move(prover_polynomials);
                 instance->proving_key.circuit_size = 2;
                 instance_data[idx] = instance;
@@ -52,22 +58,22 @@ TEST(Protogalaxy, CombinerOn2Instances)
             ProverInstances instances{ instance_data };
             instances.alphas.fill(bb::Univariate<FF, 12>(FF(0))); // focus on the arithmetic relation only
             auto pow_polynomial = PowPolynomial(std::vector<FF>{ 2 });
-            auto result = prover.compute_combiner(instances, pow_polynomial);
-            auto expected_result = Univariate<FF, 12>(std::array<FF, 12>{
-                87706,
-                13644570,
-                76451738,
-                226257946,
-                static_cast<uint64_t>(500811930),
-                static_cast<uint64_t>(937862426),
-                static_cast<uint64_t>(1575158170),
-                static_cast<uint64_t>(2450447898),
-                static_cast<uint64_t>(3601480346),
-                static_cast<uint64_t>(5066004250),
-                static_cast<uint64_t>(6881768346),
-                static_cast<uint64_t>(9086521370),
-            });
+            auto result = prover.compute_combiner</*OptimisationEnabled=*/false>(instances, pow_polynomial);
+            auto optimised_result = prover.compute_combiner(instances, pow_polynomial);
+            auto expected_result = Univariate<FF, 12>(std::array<FF, 12>{ 87706,
+                                                                          0,
+                                                                          0x02ee2966,
+                                                                          0x0b0bd2cc,
+                                                                          0x00001a98fc32,
+                                                                          0x000033d5a598,
+                                                                          0x00005901cefe,
+                                                                          0x00008c5d7864,
+                                                                          0x0000d028a1ca,
+                                                                          0x000126a34b30UL,
+                                                                          0x0001920d7496UL,
+                                                                          0x000214a71dfcUL });
             EXPECT_EQ(result, expected_result);
+            EXPECT_EQ(optimised_result, expected_result);
         } else {
             std::vector<std::shared_ptr<ProverInstance>> instance_data(NUM_INSTANCES);
             ProtoGalaxyProver prover;
@@ -130,11 +136,13 @@ TEST(Protogalaxy, CombinerOn2Instances)
                       0    0    0    0    0    0    0              0    0    6   18   36   60   90      */
 
             auto pow_polynomial = PowPolynomial(std::vector<FF>{ 2 });
-            auto result = prover.compute_combiner(instances, pow_polynomial);
+            auto result = prover.compute_combiner</*OptimisationEnabled=*/false>(instances, pow_polynomial);
+            auto optimised_result = prover.compute_combiner(instances, pow_polynomial);
             auto expected_result =
                 Univariate<FF, 12>(std::array<FF, 12>{ 0, 0, 12, 36, 72, 120, 180, 252, 336, 432, 540, 660 });
 
             EXPECT_EQ(result, expected_result);
+            EXPECT_EQ(optimised_result, expected_result);
         }
     };
     run_test(true);
@@ -181,11 +189,13 @@ TEST(Protogalaxy, CombinerOn4Instances)
         zero_all_selectors(instances[3]->proving_key.polynomials);
 
         auto pow_polynomial = PowPolynomial(std::vector<FF>{ 2 });
-        auto result = prover.compute_combiner(instances, pow_polynomial);
+        auto result = prover.compute_combiner</*OptimisationEnabled=*/false>(instances, pow_polynomial);
+        auto optimised_result = prover.compute_combiner(instances, pow_polynomial);
         std::array<FF, 40> zeroes;
         std::fill(zeroes.begin(), zeroes.end(), 0);
         auto expected_result = Univariate<FF, 40>(zeroes);
         EXPECT_EQ(result, expected_result);
+        EXPECT_EQ(optimised_result, expected_result);
     };
     run_test();
 };
diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy.test.cpp b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy.test.cpp
index 0b51c91f57b4..3148c54cd406 100644
--- a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy.test.cpp
@@ -279,6 +279,11 @@ template <typename Flavor> class ProtoGalaxyTests : public testing::Test {
 
         bb::Univariate<FF, 11> expected_eta{ { 1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21 } };
         EXPECT_EQ(instances.relation_parameters.eta, expected_eta);
+        // Optimised relation parameters are the same, we just don't compute any values for non-used indices when
+        // deriving values from them
+        for (size_t i = 0; i < 11; i++) {
+            EXPECT_EQ(instances.optimised_relation_parameters.eta.evaluations[i], expected_eta.evaluations[i]);
+        }
     }
 
     /**
diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.hpp b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.hpp
index d9cffcca9c70..c03af2e5333e 100644
--- a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.hpp
+++ b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.hpp
@@ -49,15 +49,26 @@ template <class ProverInstances_> class ProtoGalaxyProver_ {
     // The length of ExtendedUnivariate is the largest length (==max_relation_degree + 1) of a univariate polynomial
     // obtained by composing a relation with folded instance + relation parameters .
     using ExtendedUnivariate = Univariate<FF, (Flavor::MAX_TOTAL_RELATION_LENGTH - 1) * (ProverInstances::NUM - 1) + 1>;
+    // Same as ExtendedUnivariate, but uses optimised univariates which skip redundant computation in optimistic cases
+    // (when we know that the evaluation of all relations is 0 on a particular index, for example)
+    using OptimisedExtendedUnivariate =
+        Univariate<FF,
+                   (Flavor::MAX_TOTAL_RELATION_LENGTH - 1) * (ProverInstances::NUM - 1) + 1,
+                   0,
+                   ProverInstances::NUM - 1>;
     // Represents the total length of the combiner univariate, obtained by combining the already folded relations with
     // the folded relation batching challenge.
     using ExtendedUnivariateWithRandomization =
         Univariate<FF,
                    (Flavor::MAX_TOTAL_RELATION_LENGTH - 1 + ProverInstances::NUM - 1) * (ProverInstances::NUM - 1) + 1>;
     using ExtendedUnivariates = typename Flavor::template ProverUnivariates<ExtendedUnivariate::LENGTH>;
+    using OptimisedExtendedUnivariates =
+        typename Flavor::template OptimisedProverUnivariates<ExtendedUnivariate::LENGTH, ProverInstances::NUM - 1>;
 
     using TupleOfTuplesOfUnivariates =
         typename Flavor::template ProtogalaxyTupleOfTuplesOfUnivariates<ProverInstances::NUM>;
+    using OptimisedTupleOfTuplesOfUnivariates =
+        typename Flavor::template OptimisedProtogalaxyTupleOfTuplesOfUnivariates<ProverInstances::NUM>;
     using RelationEvaluations = typename Flavor::TupleOfArraysOfValues;
 
     static constexpr size_t NUM_SUBRELATIONS = ProverInstances::NUM_SUBRELATIONS;
@@ -209,14 +220,20 @@ template <class ProverInstances_> class ProtoGalaxyProver_ {
         auto prev_level_width = prev_level_coeffs.size();
         // we need degree + 1 terms to represent the intermediate polynomials
         std::vector<std::vector<FF>> level_coeffs(prev_level_width >> 1, std::vector<FF>(degree + 1, 0));
-        for (size_t node = 0; node < prev_level_width; node += 2) {
-            auto parent = node >> 1;
-            std::copy(prev_level_coeffs[node].begin(), prev_level_coeffs[node].end(), level_coeffs[parent].begin());
-            for (size_t d = 0; d < degree; d++) {
-                level_coeffs[parent][d] += prev_level_coeffs[node + 1][d] * betas[level];
-                level_coeffs[parent][d + 1] += prev_level_coeffs[node + 1][d] * deltas[level];
-            }
-        }
+        run_loop_in_parallel(
+            prev_level_width >> 1,
+            [&](size_t start, size_t end) {
+                for (size_t node = start << 1; node < end << 1; node += 2) {
+                    auto parent = node >> 1;
+                    std::copy(
+                        prev_level_coeffs[node].begin(), prev_level_coeffs[node].end(), level_coeffs[parent].begin());
+                    for (size_t d = 0; d < degree; d++) {
+                        level_coeffs[parent][d] += prev_level_coeffs[node + 1][d] * betas[level];
+                        level_coeffs[parent][d + 1] += prev_level_coeffs[node + 1][d] * deltas[level];
+                    }
+                }
+            },
+            /*no_multhreading_if_less_or_equal=*/8);
         return construct_coefficients_tree(betas, deltas, level_coeffs, level + 1);
     }
 
@@ -236,11 +253,16 @@ template <class ProverInstances_> class ProtoGalaxyProver_ {
     {
         auto width = full_honk_evaluations.size();
         std::vector<std::vector<FF>> first_level_coeffs(width >> 1, std::vector<FF>(2, 0));
-        for (size_t node = 0; node < width; node += 2) {
-            auto parent = node >> 1;
-            first_level_coeffs[parent][0] = full_honk_evaluations[node] + full_honk_evaluations[node + 1] * betas[0];
-            first_level_coeffs[parent][1] = full_honk_evaluations[node + 1] * deltas[0];
-        }
+        run_loop_in_parallel(width >> 1, [&](size_t start, size_t end) {
+            // Run loop in parallel can divide the domain in such way that the indices are odd, which we can't tolerate
+            // here, so first we divide the width by two, enable parallelism and then reconstruct even start and end
+            for (size_t node = start << 1; node < end << 1; node += 2) {
+                auto parent = node >> 1;
+                first_level_coeffs[parent][0] =
+                    full_honk_evaluations[node] + full_honk_evaluations[node + 1] * betas[0];
+                first_level_coeffs[parent][1] = full_honk_evaluations[node + 1] * deltas[0];
+            }
+        });
         return construct_coefficients_tree(betas, deltas, first_level_coeffs);
     }
 
@@ -262,26 +284,38 @@ template <class ProverInstances_> class ProtoGalaxyProver_ {
         return Polynomial<FF>(coeffs);
     }
 
+    OptimisedTupleOfTuplesOfUnivariates optimised_univariate_accumulators;
     TupleOfTuplesOfUnivariates univariate_accumulators;
 
     /**
      * @brief Prepare a univariate polynomial for relation execution in one step of the main loop in folded instance
      * construction.
-     * @details For a fixed prover polynomial index, extract that polynomial from each instance in Instances. From each
-     * polynomial, extract the value at row_idx. Use these values to create a univariate polynomial, and then extend
-     * (i.e., compute additional evaluations at adjacent domain values) as needed.
+     * @details For a fixed prover polynomial index, extract that polynomial from each instance in Instances. From
+     *each polynomial, extract the value at row_idx. Use these values to create a univariate polynomial, and then
+     *extend (i.e., compute additional evaluations at adjacent domain values) as needed.
      * @todo TODO(https://github.com/AztecProtocol/barretenberg/issues/751) Optimize memory
+     *
+     *
      */
-    void extend_univariates(ExtendedUnivariates& extended_univariates,
-                            const ProverInstances& instances,
-                            const size_t row_idx)
+
+    template <size_t skip_count = 0>
+    void extend_univariates(
+        std::conditional_t<skip_count != 0, OptimisedExtendedUnivariates, ExtendedUnivariates>& extended_univariates,
+        const ProverInstances& instances,
+        const size_t row_idx)
     {
-        auto base_univariates = instances.row_to_univariates(row_idx);
+        auto base_univariates = instances.template row_to_univariates<skip_count>(row_idx);
         for (auto [extended_univariate, base_univariate] : zip_view(extended_univariates.get_all(), base_univariates)) {
-            extended_univariate = base_univariate.template extend_to<ExtendedUnivariate::LENGTH>();
+            extended_univariate = base_univariate.template extend_to<ExtendedUnivariate::LENGTH, skip_count>();
         }
     }
 
+    /**
+     * @brief Add the value of each relation over univariates to an appropriate accumulator
+     *
+     * @tparam Parameters relation parameters type
+     * @tparam relation_idx The index of the relation
+     */
     template <typename Parameters, size_t relation_idx = 0>
     void accumulate_relation_univariates(TupleOfTuplesOfUnivariates& univariate_accumulators,
                                          const ExtendedUnivariates& extended_univariates,
@@ -294,39 +328,73 @@ template <class ProverInstances_> class ProtoGalaxyProver_ {
 
         // Repeat for the next relation.
         if constexpr (relation_idx + 1 < Flavor::NUM_RELATIONS) {
-            accumulate_relation_univariates<Parameters, relation_idx + 1>(
-                univariate_accumulators, extended_univariates, relation_parameters, scaling_factor);
+            accumulate_relation_univariates<
+
+                Parameters,
+                relation_idx + 1>(univariate_accumulators, extended_univariates, relation_parameters, scaling_factor);
         }
     }
 
     /**
-     * @brief Compute the combiner polynomial $G$ in the Protogalaxy paper.
+     * @brief Add the value of each relation over univariates to an appropriate accumulator with index skipping
+     * optimisation
+     *
+     * @tparam Parameters relation parameters type
+     * @tparam relation_idx The index of the relation
+     */
+    template <typename Parameters, size_t relation_idx = 0>
+    void accumulate_relation_univariates(OptimisedTupleOfTuplesOfUnivariates& univariate_accumulators,
+                                         const OptimisedExtendedUnivariates& extended_univariates,
+                                         const Parameters& relation_parameters,
+                                         const FF& scaling_factor)
+    {
+        using Relation = std::tuple_element_t<relation_idx, Relations>;
+        Relation::accumulate(
+            std::get<relation_idx>(univariate_accumulators), extended_univariates, relation_parameters, scaling_factor);
+
+        // Repeat for the next relation.
+        if constexpr (relation_idx + 1 < Flavor::NUM_RELATIONS) {
+            accumulate_relation_univariates<
+
+                Parameters,
+                relation_idx + 1>(univariate_accumulators, extended_univariates, relation_parameters, scaling_factor);
+        }
+    }
+    /**
+     * @brief Compute the combiner polynomial $G$ in the Protogalaxy paper
      *
      */
+    template <bool OptimisationEnabled, std::enable_if_t<!OptimisationEnabled, bool> = true>
     ExtendedUnivariateWithRandomization compute_combiner(const ProverInstances& instances, PowPolynomial<FF>& pow_betas)
     {
-        BB_OP_COUNT_TIME();
         size_t common_instance_size = instances[0]->proving_key.circuit_size;
         pow_betas.compute_values();
         // Determine number of threads for multithreading.
         // Note: Multithreading is "on" for every round but we reduce the number of threads from the max available based
-        // on a specified minimum number of iterations per thread. This eventually leads to the use of a single thread.
-        // For now we use a power of 2 number of threads simply to ensure the round size is evenly divided.
+        // on a specified minimum number of iterations per thread. This eventually leads to the use of a
+        // single thread. For now we use a power of 2 number of threads simply to ensure the round size is evenly
+        // divided.
         size_t max_num_threads = get_num_cpus_pow2(); // number of available threads (power of 2)
         size_t min_iterations_per_thread = 1 << 6; // min number of iterations for which we'll spin up a unique thread
         size_t desired_num_threads = common_instance_size / min_iterations_per_thread;
         size_t num_threads = std::min(desired_num_threads, max_num_threads); // fewer than max if justified
         num_threads = num_threads > 0 ? num_threads : 1;                     // ensure num threads is >= 1
         size_t iterations_per_thread = common_instance_size / num_threads;   // actual iterations per thread
+
+        // Univariates are optimised for usual PG, but we need the unoptimised version for tests (it's a version that
+        // doesn't skip computation), so we need to define types depending on the template instantiation
+        using ThreadAccumulators = TupleOfTuplesOfUnivariates;
+        using ExtendedUnivatiatesType = ExtendedUnivariates;
+
         // Construct univariate accumulator containers; one per thread
-        std::vector<TupleOfTuplesOfUnivariates> thread_univariate_accumulators(num_threads);
+        std::vector<ThreadAccumulators> thread_univariate_accumulators(num_threads);
         for (auto& accum : thread_univariate_accumulators) {
             // just normal relation lengths
             Utils::zero_univariates(accum);
         }
 
         // Construct extended univariates containers; one per thread
-        std::vector<ExtendedUnivariates> extended_univariates;
+        std::vector<ExtendedUnivatiatesType> extended_univariates;
         extended_univariates.resize(num_threads);
 
         // Accumulate the contribution from each sub-relation
@@ -335,14 +403,15 @@ template <class ProverInstances_> class ProtoGalaxyProver_ {
             size_t end = (thread_idx + 1) * iterations_per_thread;
 
             for (size_t idx = start; idx < end; idx++) {
-                // No need to initialise extended_univariates to 0, it's assigned to
+
                 extend_univariates(extended_univariates[thread_idx], instances, idx);
 
                 FF pow_challenge = pow_betas[idx];
 
-                // Accumulate the i-th row's univariate contribution. Note that the relation parameters passed to this
-                // function have already been folded. Moreover, linear-dependent relations that act over the entire
-                // execution trace rather than on rows, will not be multiplied by the pow challenge.
+                // Accumulate the i-th row's univariate contribution. Note that the relation parameters passed to
+                // this function have already been folded. Moreover, linear-dependent relations that act over the
+                // entire execution trace rather than on rows, will not be multiplied by the pow challenge.
+
                 accumulate_relation_univariates(
                     thread_univariate_accumulators[thread_idx],
                     extended_univariates[thread_idx],
@@ -350,19 +419,115 @@ template <class ProverInstances_> class ProtoGalaxyProver_ {
                     pow_challenge);
             }
         });
-
+        Utils::zero_univariates(univariate_accumulators);
         // Accumulate the per-thread univariate accumulators into a single set of accumulators
         for (auto& accumulators : thread_univariate_accumulators) {
             Utils::add_nested_tuples(univariate_accumulators, accumulators);
         }
-        // Batch the univariate contributions from each sub-relation to obtain the round univariate
+
         return batch_over_relations(univariate_accumulators, instances.alphas);
     }
+    /**
+     * @brief Compute the combiner polynomial $G$ in the Protogalaxy paper using indice skippping optimisation
+     *
+     * @todo (https://github.com/AztecProtocol/barretenberg/issues/968) Make combiner tests better
+     *
+     */
+    template <bool OptimisationEnabled = true, std::enable_if_t<OptimisationEnabled, bool> = true>
+    ExtendedUnivariateWithRandomization compute_combiner(const ProverInstances& instances, PowPolynomial<FF>& pow_betas)
+    {
+        BB_OP_COUNT_TIME();
+        size_t common_instance_size = instances[0]->proving_key.circuit_size;
+        pow_betas.compute_values();
+        // Determine number of threads for multithreading.
+        // Note: Multithreading is "on" for every round but we reduce the number of threads from the max available based
+        // on a specified minimum number of iterations per thread. This eventually leads to the use of a
+        // single thread. For now we use a power of 2 number of threads simply to ensure the round size is evenly
+        // divided.
+        size_t max_num_threads = get_num_cpus_pow2(); // number of available threads (power of 2)
+        size_t min_iterations_per_thread = 1 << 6; // min number of iterations for which we'll spin up a unique thread
+        size_t desired_num_threads = common_instance_size / min_iterations_per_thread;
+        size_t num_threads = std::min(desired_num_threads, max_num_threads); // fewer than max if justified
+        num_threads = num_threads > 0 ? num_threads : 1;                     // ensure num threads is >= 1
+        size_t iterations_per_thread = common_instance_size / num_threads;   // actual iterations per thread
+
+        // Univariates are optimised for usual PG, but we need the unoptimised version for tests (it's a version that
+        // doesn't skip computation), so we need to define types depending on the template instantiation
+        using ThreadAccumulators = OptimisedTupleOfTuplesOfUnivariates;
+        using ExtendedUnivatiatesType = OptimisedExtendedUnivariates;
+
+        // Construct univariate accumulator containers; one per thread
+        std::vector<ThreadAccumulators> thread_univariate_accumulators(num_threads);
+        for (auto& accum : thread_univariate_accumulators) {
+            // just normal relation lengths
+            Utils::zero_univariates(accum);
+        }
+
+        // Construct extended univariates containers; one per thread
+        std::vector<ExtendedUnivatiatesType> extended_univariates;
+        extended_univariates.resize(num_threads);
+
+        // Accumulate the contribution from each sub-relation
+        parallel_for(num_threads, [&](size_t thread_idx) {
+            size_t start = thread_idx * iterations_per_thread;
+            size_t end = (thread_idx + 1) * iterations_per_thread;
+
+            for (size_t idx = start; idx < end; idx++) {
+                // No need to initialise extended_univariates to 0, it's assigned to
+                // Instantiate univariates with skipping to ignore computation in those indices (they are still
+                // available for skipping relations, but all derived univariate will ignore those evaluations)
+                extend_univariates</*skip_count=*/ProverInstances::NUM - 1>(
+                    extended_univariates[thread_idx], instances, idx);
+
+                FF pow_challenge = pow_betas[idx];
+
+                // Accumulate the i-th row's univariate contribution. Note that the relation parameters passed to
+                // this function have already been folded. Moreover, linear-dependent relations that act over the
+                // entire execution trace rather than on rows, will not be multiplied by the pow challenge.
+                accumulate_relation_univariates(
+                    thread_univariate_accumulators[thread_idx],
+                    extended_univariates[thread_idx],
+                    instances.optimised_relation_parameters, // these parameters have already been folded
+                    pow_challenge);
+            }
+        });
+        Utils::zero_univariates(optimised_univariate_accumulators);
+        // Accumulate the per-thread univariate accumulators into a single set of accumulators
+        for (auto& accumulators : thread_univariate_accumulators) {
+            Utils::add_nested_tuples(optimised_univariate_accumulators, accumulators);
+        }
+
+        // Convert from optimised version to non-optimised
+        deoptimise_univariates(optimised_univariate_accumulators, univariate_accumulators);
+        //  Batch the univariate contributions from each sub-relation to obtain the round univariate
+        return batch_over_relations(univariate_accumulators, instances.alphas);
+    }
+
+    /**
+     * @brief Convert univariates from optimised form to regular
+     *
+     * @details We need to convert before we batch relations, since optimised versions don't have enough information to
+     * extend the univariates to maximum length
+     *
+     * @param optimised_univariate_accumulators
+     * @param new_univariate_accumulators
+     */
+    static void deoptimise_univariates(const OptimisedTupleOfTuplesOfUnivariates& optimised_univariate_accumulators,
+                                       TupleOfTuplesOfUnivariates& new_univariate_accumulators
+
+    )
+    {
+        auto deoptimise = [&]<size_t outer_idx, size_t inner_idx>(auto& element) {
+            auto& optimised_element = std::get<inner_idx>(std::get<outer_idx>(optimised_univariate_accumulators));
+            element = optimised_element.convert();
+        };
+
+        Utils::template apply_to_tuple_of_tuples<0, 0>(new_univariate_accumulators, deoptimise);
+    }
 
     static ExtendedUnivariateWithRandomization batch_over_relations(TupleOfTuplesOfUnivariates& univariate_accumulators,
                                                                     const CombinedRelationSeparator& alpha)
     {
-
         // First relation does not get multiplied by a batching challenge
         auto result = std::get<0>(std::get<0>(univariate_accumulators))
                           .template extend_to<ProverInstances::BATCHED_EXTENDED_LENGTH>();
@@ -432,7 +597,8 @@ template <class ProverInstances_> class ProtoGalaxyProver_ {
     {
         size_t param_idx = 0;
         auto to_fold = instances.relation_parameters.get_to_fold();
-        for (auto& folded_parameter : to_fold) {
+        auto to_fold_optimised = instances.optimised_relation_parameters.get_to_fold();
+        for (auto [folded_parameter, optimised_folded_parameter] : zip_view(to_fold, to_fold_optimised)) {
             Univariate<FF, ProverInstances::NUM> tmp(0);
             size_t instance_idx = 0;
             for (auto& instance : instances) {
@@ -440,6 +606,8 @@ template <class ProverInstances_> class ProtoGalaxyProver_ {
                 instance_idx++;
             }
             folded_parameter = tmp.template extend_to<ProverInstances::EXTENDED_LENGTH>();
+            optimised_folded_parameter =
+                tmp.template extend_to<ProverInstances::EXTENDED_LENGTH, ProverInstances::NUM - 1>();
             param_idx++;
         }
     }
diff --git a/barretenberg/cpp/src/barretenberg/relations/nested_containers.hpp b/barretenberg/cpp/src/barretenberg/relations/nested_containers.hpp
index 46f2d2463035..36a522eb1618 100644
--- a/barretenberg/cpp/src/barretenberg/relations/nested_containers.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/nested_containers.hpp
@@ -10,30 +10,42 @@ namespace bb {
  *
  * @details Credit: https://stackoverflow.com/a/60440611
  */
-template <template <typename, size_t, size_t> typename InnerContainer,
+template <template <typename, size_t, size_t, size_t> typename InnerContainer,
           typename ValueType,
           auto domain_end,
           size_t domain_start = 0,
+          size_t skip_count = 0,
           typename IS = decltype(std::make_index_sequence<domain_end.size()>())>
 struct TupleOfContainersOverArray;
-template <template <typename, size_t, size_t> typename InnerContainer,
+template <template <typename, size_t, size_t, size_t> typename InnerContainer,
           typename ValueType,
           auto domain_end,
           size_t domain_start,
+          size_t skip_count,
           std::size_t... I>
-struct TupleOfContainersOverArray<InnerContainer, ValueType, domain_end, domain_start, std::index_sequence<I...>> {
-    using type = std::tuple<InnerContainer<ValueType, domain_end[I], domain_start>...>;
+struct TupleOfContainersOverArray<InnerContainer,
+                                  ValueType,
+                                  domain_end,
+                                  domain_start,
+                                  skip_count,
+                                  std::index_sequence<I...>> {
+    using type = std::tuple<InnerContainer<ValueType, domain_end[I], domain_start, skip_count>...>;
 };
 
 // Helpers
-template <typename ValueType, size_t, size_t> using ExtractValueType = ValueType;
+template <typename ValueType, size_t, size_t, size_t> using ExtractValueType = ValueType;
 
 template <typename Tuple>
 using HomogeneousTupleToArray = std::array<std::tuple_element_t<0, Tuple>, std::tuple_size_v<Tuple>>;
 
 // Types needed for sumcheck and folding.
 template <typename FF, auto LENGTHS>
-using TupleOfUnivariates = typename TupleOfContainersOverArray<bb::Univariate, FF, LENGTHS, 0>::type;
+using TupleOfUnivariates = typename TupleOfContainersOverArray<bb::Univariate, FF, LENGTHS, 0, 0>::type;
+
+// Types needed for sumcheck and folding.
+template <typename FF, auto LENGTHS, size_t SKIP_COUNT>
+using OptimisedTupleOfUnivariates =
+    typename TupleOfContainersOverArray<bb::Univariate, FF, LENGTHS, 0, SKIP_COUNT>::type;
 
 template <typename FF, auto LENGTHS>
 using TupleOfValues = typename TupleOfContainersOverArray<ExtractValueType, FF, LENGTHS>::type;
diff --git a/barretenberg/cpp/src/barretenberg/relations/relation_types.hpp b/barretenberg/cpp/src/barretenberg/relations/relation_types.hpp
index e134c4e03413..20e55502c612 100644
--- a/barretenberg/cpp/src/barretenberg/relations/relation_types.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/relation_types.hpp
@@ -149,6 +149,12 @@ template <typename RelationImpl> class Relation : public RelationImpl {
     template <size_t NUM_INSTANCES>
     using ProtogalaxyTupleOfUnivariatesOverSubrelations =
         TupleOfUnivariates<FF, compute_composed_subrelation_partial_lengths<NUM_INSTANCES>(SUBRELATION_TOTAL_LENGTHS)>;
+    template <size_t NUM_INSTANCES>
+    using OptimisedProtogalaxyTupleOfUnivariatesOverSubrelations =
+        OptimisedTupleOfUnivariates<FF,
+                                    compute_composed_subrelation_partial_lengths<NUM_INSTANCES>(
+                                        SUBRELATION_TOTAL_LENGTHS),
+                                    NUM_INSTANCES - 1>;
     using SumcheckTupleOfUnivariatesOverSubrelations =
         TupleOfUnivariates<FF, RelationImpl::SUBRELATION_PARTIAL_LENGTHS>;
     using SumcheckArrayOfValuesOverSubrelations = ArrayOfValues<FF, RelationImpl::SUBRELATION_PARTIAL_LENGTHS>;
diff --git a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/goblin_ultra_flavor.hpp b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/goblin_ultra_flavor.hpp
index 49b0e6791699..7fcfa4d483ef 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/goblin_ultra_flavor.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/goblin_ultra_flavor.hpp
@@ -87,6 +87,12 @@ class GoblinUltraFlavor {
     template <size_t NUM_INSTANCES>
     using ProtogalaxyTupleOfTuplesOfUnivariates =
         decltype(create_protogalaxy_tuple_of_tuples_of_univariates<Relations, NUM_INSTANCES>());
+
+    template <size_t NUM_INSTANCES>
+    using OptimisedProtogalaxyTupleOfTuplesOfUnivariates =
+        decltype(create_protogalaxy_tuple_of_tuples_of_univariates<Relations,
+                                                                   NUM_INSTANCES,
+                                                                   /*optimised=*/true>());
     using SumcheckTupleOfTuplesOfUnivariates = decltype(create_sumcheck_tuple_of_tuples_of_univariates<Relations>());
     using TupleOfArraysOfValues = decltype(create_tuple_of_arrays_of_values<Relations>());
 
@@ -592,6 +598,14 @@ class GoblinUltraFlavor {
      */
     template <size_t LENGTH> using ProverUnivariates = AllEntities<bb::Univariate<FF, LENGTH>>;
 
+    /**
+     * @brief A container for univariates used during Protogalaxy folding and sumcheck with some of the computation
+     * optmistically ignored.
+     * @details During folding and sumcheck, the prover evaluates the relations on these univariates.
+     */
+    template <size_t LENGTH, size_t SKIP_COUNT>
+    using OptimisedProverUnivariates = AllEntities<bb::Univariate<FF, LENGTH, 0, SKIP_COUNT>>;
+
     /**
      * @brief A container for univariates produced during the hot loop in sumcheck.
      */
diff --git a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/ultra_flavor.hpp b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/ultra_flavor.hpp
index 1ceed0af6fbc..74333675a3af 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/ultra_flavor.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/ultra_flavor.hpp
@@ -75,6 +75,11 @@ class UltraFlavor {
     template <size_t NUM_INSTANCES>
     using ProtogalaxyTupleOfTuplesOfUnivariates =
         decltype(create_protogalaxy_tuple_of_tuples_of_univariates<Relations, NUM_INSTANCES>());
+    template <size_t NUM_INSTANCES>
+    using OptimisedProtogalaxyTupleOfTuplesOfUnivariates =
+        decltype(create_protogalaxy_tuple_of_tuples_of_univariates<Relations,
+                                                                   NUM_INSTANCES,
+                                                                   /*optimised=*/true>());
     using SumcheckTupleOfTuplesOfUnivariates = decltype(create_sumcheck_tuple_of_tuples_of_univariates<Relations>());
     using TupleOfArraysOfValues = decltype(create_tuple_of_arrays_of_values<Relations>());
 
@@ -564,6 +569,12 @@ class UltraFlavor {
      * @details During folding and sumcheck, the prover evaluates the relations on these univariates.
      */
     template <size_t LENGTH> using ProverUnivariates = AllEntities<bb::Univariate<FF, LENGTH>>;
+    /**
+     * @brief A container for univariates used during Protogalaxy folding and sumcheck.
+     * @details During folding and sumcheck, the prover evaluates the relations on these univariates.
+     */
+    template <size_t LENGTH, size_t SKIP_COUNT>
+    using OptimisedProverUnivariates = AllEntities<bb::Univariate<FF, LENGTH, 0, SKIP_COUNT>>;
 
     /**
      * @brief A container for univariates produced during the hot loop in sumcheck.
diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/instance/instances.hpp b/barretenberg/cpp/src/barretenberg/sumcheck/instance/instances.hpp
index 50e1848a0a4d..fdffcc15a4d5 100644
--- a/barretenberg/cpp/src/barretenberg/sumcheck/instance/instances.hpp
+++ b/barretenberg/cpp/src/barretenberg/sumcheck/instance/instances.hpp
@@ -18,9 +18,11 @@ template <typename Flavor_, size_t NUM_ = 2> struct ProverInstances_ {
     static constexpr size_t EXTENDED_LENGTH = (Flavor::MAX_TOTAL_RELATION_LENGTH - 1) * (NUM - 1) + 1;
     static constexpr size_t BATCHED_EXTENDED_LENGTH = (Flavor::MAX_TOTAL_RELATION_LENGTH - 1 + NUM - 1) * (NUM - 1) + 1;
     using RelationParameters = bb::RelationParameters<Univariate<FF, EXTENDED_LENGTH>>;
+    using OptimisedRelationParameters = bb::RelationParameters<Univariate<FF, EXTENDED_LENGTH, 0, NUM_ - 1>>;
     using RelationSeparator = std::array<Univariate<FF, BATCHED_EXTENDED_LENGTH>, NUM_SUBRELATIONS - 1>;
     ArrayType _data;
     RelationParameters relation_parameters;
+    OptimisedRelationParameters optimised_relation_parameters;
     RelationSeparator alphas;
     std::vector<FF> next_gate_challenges;
 
@@ -52,12 +54,13 @@ template <typename Flavor_, size_t NUM_ = 2> struct ProverInstances_ {
      * and the function returns the univariates [{a_1, b_1, c_1, d_1}, {a_2, b_2, c_2, d_2}, ...]
      *
      * @param row_idx A fixed row position in several execution traces
+     * @tparam skip_count Construct univariates that skip some of the indices when computing results
      * @return The univariates whose extensions will be used to construct the combiner.
      */
-    auto row_to_univariates(size_t row_idx) const
+    template <size_t skip_count = 0> auto row_to_univariates(size_t row_idx) const
     {
         auto insts_prover_polynomials_views = get_polynomials_views();
-        std::array<Univariate<FF, NUM>, insts_prover_polynomials_views[0].size()> results;
+        std::array<Univariate<FF, NUM, 0, skip_count>, insts_prover_polynomials_views[0].size()> results;
         // Set the size corresponding to the number of rows in the execution trace
         size_t instance_idx = 0;
         // Iterate over the prover polynomials' views corresponding to each instance
diff --git a/barretenberg/cpp/src/barretenberg/vm/generated/avm_flavor.hpp b/barretenberg/cpp/src/barretenberg/vm/generated/avm_flavor.hpp
index fdafe0ffaac9..08c3cffd7832 100644
--- a/barretenberg/cpp/src/barretenberg/vm/generated/avm_flavor.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm/generated/avm_flavor.hpp
@@ -1765,6 +1765,13 @@ class AvmFlavor {
      * @details During folding and sumcheck, the prover evaluates the relations on these univariates.
      */
     template <size_t LENGTH> using ProverUnivariates = AllEntities<bb::Univariate<FF, LENGTH>>;
+    /**
+     * @brief A container for univariates used during Protogalaxy folding and sumcheck with some of the computation
+     * optmistically ignored
+     * @details During folding and sumcheck, the prover evaluates the relations on these univariates.
+     */
+    template <size_t LENGTH, size_t SKIP_COUNT>
+    using OptimisedProverUnivariates = AllEntities<bb::Univariate<FF, LENGTH, 0, SKIP_COUNT>>;
 
     /**
      * @brief A container for univariates produced during the hot loop in sumcheck.

From 86c106f122b3fe0daa5853f7824bb68abadf70d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Venturo?= <nicolas.venturo@gmail.com>
Date: Tue, 30 Apr 2024 11:49:33 -0300
Subject: [PATCH 11/42] docs: shared state (#5963)

This adds documentation for `SharedMutable` and shared state in general.
It also replaces some of the mentions to slow updates that were
temporarily removed in #5884.

Closes #5508.
---
 .../contracts/references/storage/main.md      |   5 +-
 .../references/storage/public_state.md        |  53 +------
 .../references/storage/shared_state.md        | 137 ++++++++++++++++++
 .../resources/common_patterns/main.md         |   7 +-
 docs/docs/learn/concepts/accounts/keys.md     |  10 +-
 docs/docs/learn/concepts/accounts/main.md     |   6 +-
 .../communication/public_private_calls.md     |   8 +-
 docs/docs/misc/roadmap/engineering_roadmap.md | 110 +++++++-------
 docs/sidebars.js                              |   1 +
 .../contracts/auth_contract/src/main.nr       |  13 +-
 .../docs_example_contract/src/main.nr         |   2 -
 11 files changed, 226 insertions(+), 126 deletions(-)
 create mode 100644 docs/docs/developers/contracts/references/storage/shared_state.md

diff --git a/docs/docs/developers/contracts/references/storage/main.md b/docs/docs/developers/contracts/references/storage/main.md
index 439784739f44..0511b5643135 100644
--- a/docs/docs/developers/contracts/references/storage/main.md
+++ b/docs/docs/developers/contracts/references/storage/main.md
@@ -88,8 +88,9 @@ require(minters[msg.sender], "caller is not minter");
 
 ## Further Reading
 
-- Managing [Public State](./public_state.md)
-- Jump to the page on [Private State](./private_state.md)
+- [Public State](./public_state.md)
+- [Private State](./private_state.md)
+- [Shared State](./shared_state.md)
 
 ## Concepts mentioned
 
diff --git a/docs/docs/developers/contracts/references/storage/public_state.md b/docs/docs/developers/contracts/references/storage/public_state.md
index 54b59a6d8588..d67227f1e345 100644
--- a/docs/docs/developers/contracts/references/storage/public_state.md
+++ b/docs/docs/developers/contracts/references/storage/public_state.md
@@ -6,7 +6,7 @@ On this page we will look at how to manage public state in Aztec contracts. We w
 
 For a higher level overview of the state model in Aztec, see the [state model](../../../../learn/concepts/hybrid_state/main.md) page, or jump back to the previous page on [Storage](./main.md).
 
-## Overview
+## `PublicMutable`
 
 The `PublicMutable` (formerly known as `PublicState`) struct is generic over the variable type `T`. The type _must_ implement Serialize and Deserialize traits, as specified here:
 
@@ -17,6 +17,8 @@ The struct contains a `storage_slot` which, similar to Ethereum, is used to figu
 
 You can find the details of `PublicMutable` in the implementation [here](https://github.com/AztecProtocol/aztec-packages/blob/#include_aztec_version/noir-projects/aztec-nr/aztec/src/state_vars/public_mutable.nr).
 
+For a version of `PublicMutable` that can also be read in private, head to [`SharedMutable`](./shared_state.md#sharedmutable).
+
 :::info
 An example using a larger struct can be found in the [lending example](https://github.com/AztecProtocol/aztec-packages/tree/master/noir-projects/noir-contracts/contracts/lending_contract)'s use of an [`Asset`](https://github.com/AztecProtocol/aztec-packages/tree/#include_aztec_version/noir-projects/noir-contracts/contracts/lending_contract/src/asset.nr).
 :::
@@ -67,9 +69,9 @@ We have a `write` method on the `PublicMutable` struct that takes the value to w
 
 ---
 
-## Public Immutable
+## `PublicImmutable`
 
-`PublicImmutable` is a type that can be written once during a contract deployment and read later on from public only.
+`PublicImmutable` is a type that can be written once during a contract deployment and read later on from public only. For a version of `PublicImmutable` that can also be read in private, head to [`SharedImmutable`](./shared_state.md#sharedimmutable).
 
 Just like the `PublicMutable` it is generic over the variable type `T`. The type `MUST` implement Serialize and Deserialize traits.
 
@@ -91,48 +93,3 @@ Is done exactly like the `PublicMutable` struct, but with the `PublicImmutable`
 
 Reading the value is just like `PublicMutable`.
 #include_code read_public_immutable /noir-projects/noir-contracts/contracts/docs_example_contract/src/main.nr rust
-
-## Shared Immutable
-
-`SharedImmutable` (formerly known as `StablePublicState`) is a type which is very similar to `PublicImmutable` but with an addition of a private getter (can be read from private).
-
-Since private execution is based on historical data, the user can pick ANY of its prior values to read from. This is why it `MUST` not be updated after the contract is deployed. The variable should be initialized at the constructor and then never changed.
-
-This makes the immutable public variables useful for stuff that you would usually have in `immutable` values in solidity. For example this can be the name of a token or its number of decimals.
-
-Just like the `PublicMutable` it is generic over the variable type `T`. The type `MUST` implement Serialize and Deserialize traits.
-
-You can find the details of `SharedImmutable` in the implementation [here](https://github.com/AztecProtocol/aztec-packages/blob/#include_aztec_version/noir-projects/aztec-nr/aztec/src/state_vars/shared_immutable.nr).
-
-:::info
-The word `Shared` in Aztec protocol means read/write from public, read only from private.
-:::
-
-### `new`
-
-Is done exactly like the `PublicMutable` struct, but with the `SharedImmutable` struct.
-
-#include_code storage-shared-immutable-declaration /noir-projects/noir-contracts/contracts/docs_example_contract/src/main.nr rust
-
-#include_code storage-shared-immutable /noir-projects/noir-contracts/contracts/docs_example_contract/src/main.nr rust
-
-### `initialize`
-
-#include_code initialize_decimals /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
-
-:::warning Should only be called as part of the deployment.
-If this is called outside the deployment transaction multiple values could be used down the line, potentially breaking the contract.
-
-Currently this is not constrained as we are in the middle of changing deployments.
-:::
-
-### `read_public`
-
-Reading the value is like `PublicMutable`, simply with `read_public` instead of `read`.
-#include_code read_decimals_public /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
-
-### `read_private`
-
-Reading the value is like `PublicMutable`, simply with `read_private` instead of `read`. This part can only be executed in private.
-
-#include_code read_decimals_private /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
diff --git a/docs/docs/developers/contracts/references/storage/shared_state.md b/docs/docs/developers/contracts/references/storage/shared_state.md
new file mode 100644
index 000000000000..2039eaa56b73
--- /dev/null
+++ b/docs/docs/developers/contracts/references/storage/shared_state.md
@@ -0,0 +1,137 @@
+---
+title: Shared State
+---
+
+This page covers an advanced type of state called shared state, which is public state that can also be read in private (and hence _shared_ by both domains). It is highly recommended that you're familiar with both [private](./private_state.md) and [public](./public_state.md) state before reading this page.
+
+## Overview and Motivation
+
+A typical example of shared state is some kind of system configuration, such as a protocol fee or access control permissions. These values are public (known by everyone) and mutable. Reading them in private however is tricky: private execution is always asynchronous and performed over _historical_ state, and hence one cannot easily prove that a given public value is current.
+
+A naive way to solve this is to enqueue a public call that will assert the current public value, but this leaks _which_ public value is being read, severely reducing privacy. Even if the value itself is already public, the fact that we're using it because we're interacting with some related contract is not. For example, we may leak that we're interacting with a certain DeFi protocol by reading its fee.
+
+An alternative approach is to create notes in public that are then nullified in private, but this introduces contention: only a single user may use the note and therefore read the state, since nullifying it will prevent all others from doing the same. In some schemes there's only one account that will read the state anyway (such as when shielding token balances), but this is not the general case.
+
+Shared state works around this by introducing **delays**: while public values are mutable, they cannot change _immediately_. Instead, a value change must be scheduled ahead of time, and some minimum amount of time must pass between the scheduling and the new value taking effect. This means that we can privately prove that a historical public value cannot possibly change before some point in the future (due to the minimum delay), and therefore that our transaction will be valid **as long as it gets included before this future time**.
+
+This results in the following key properties of shared state:
+
+- shared values can only be changed after a certain delay has passed, never immediately
+- the scheduling of value changes is itself public, including both the new value and the time at which the change will take effect
+- transactions that read shared state become invalid after some time if not included in a block
+
+## Privacy Considerations
+
+While shared state variables are much less leaky than the assertion in public approach, they do reveal some information to external observers by setting the `max_block_number` property of the transaction request. The impact of this can be mitigated with proper selection of the delay value and schedule times.
+
+### Choosing Delays
+
+The `max_block_number` transaction property will be set to a value close to the current block number plus the duration of the delay in blocks. The exact value depends on the historical block over which the private proof is constructed. For example, if the current block number is 100 and a shared state variable has a delay of 20 blocks, then transactions that read this value privately will set `max_block_number` to a value close to 120 (clients building proofs on older state will select a lower `max_block_number`). This implicitly leaks the duration of the delay.
+
+Applications using similar delays will therefore be part of the same privacy set. It is expected for social coordination to result in small set of predetermined delays that developers choose from depending on their needs, as an example a viable set might be: 12 hours (for time-sensitive operations, such as emergency mechanisms), 5 days (for middle-of-the-road operations) and 2 weeks (for operations that require lengthy public scrutiny).
+
+:::note
+Shared state delays are currently hardcoded at compilation time and cannot be changed, but there are plans to make this a mutable value.
+:::note
+
+### Choosing Epochs
+
+If a value change is scheduled in the near future, then transactions that access this shared state will be forced to set a lower `max_block_number` right before the value change. For example, if the current block number is 100 and a shared state variable with a delay of 20 blocks has a value change scheduled for block 105, then transactions that read this value privately will set `max_block_number` to 104. Since the blocks at which shared state values change are public, it might be deduced that transactions with a `max_block_number` value close to the current block number are reading some state variable with a changed scheduled at `max_block_number + 1`.
+
+Applications that schedule value changes at the same time will therefore be part of the same privacy set. It is expected for social coordination to result in ways to achieve this, e.g. by scheduling value changes so that they land on blocks that are multiples of some value - we call these epochs.
+
+There is a tradeoff between frequent and infrequent epochs: frequent epochs means more of them, and therefore fewer updates on each, shrinking the privacy set. But infrequent epochs result in the effective delay of value changes being potentially larger than desired - though an application can always choose to do an out-of-epoch update if needed.
+
+:::note
+Shared state variables do not allow selection of the value change block number, but there are plans to make this configurable.
+:::note
+
+Note that wallets can also warn users that a value change will soon take place and that sending a transaction at that time might result in reduced privacy, allowing them to choose to wait until after the epoch.
+
+### Network Cooperation
+
+Even though only transactions that interact with shared state _need_ to set the `max_block_number` property, there is no reason why transactions that do not wouldn't also set this value. If indeed most applications converge on a small set of delays, then wallets could opt to select any of those to populate the `max_block_number` field, as if they were interacting with a shared state variable with that delay.
+
+This prevents the network-wide privacy set from being split between transactions that read shared state and those that don't, which is beneficial to everyone.
+
+## `SharedMutable`
+
+`SharedMutable` is a shared state variable for mutable state. It provides capabilities to read the same state both in private and public, and to schedule value changes after a delay. You can view the implementation [here](https://github.com/AztecProtocol/aztec-packages/blob/#include_aztec_version/noir-projects/aztec-nr/aztec/src/state_vars/shared_mutable/shared_mutable.nr).
+
+Unlike other state variables, `SharedMutable` receives not only a type parameter for the underlying datatype, but also a `DELAY` type parameter with the value change delay as a number of blocks.
+
+#include_code shared_mutable_storage /noir-projects/noir-contracts/contracts/auth_contract/src/main.nr rust
+
+:::note
+`SharedMutable` requires that the underlying type `T` implements both the `ToField` and `FromField` traits, meaning it must fit in a single `Field` value. There are plans to extend support by requiring instead an implementation of the `Serialize` and `Deserialize` traits, therefore allowing for multi-field variables, such as complex structs.
+:::
+
+Since `SharedMutable` lives in public storage, by default its contents are zeroed-out. Intialization is performed by calling `schedule_value_change`, resulting in initialization itself being delayed.
+
+### `schedule_value_change`
+
+This is the means by which a `SharedMutable` variable mutates its contents. It schedules a value change for the variable at a future block after the `DELAY` has elapsed from the current block, at which point the scheduled value becomes the current value automatically and without any further action, both in public and in private. If a pending value change was scheduled but not yet effective (because insufficient blocks had elapsed), then the previous schedule value change is replaced with the new one and eliminated. There can only be one pending value change at a time.
+
+This function can only be called in public, typically after some access control check:
+
+#include_code shared_mutable_schedule /noir-projects/noir-contracts/contracts/auth_contract/src/main.nr rust
+
+If one wishes to schedule a value change from private, simply enqueue a public call to a public `internal` contract function. Recall that **all scheduled value changes, including the new value and scheduled block are public**.
+
+:::warning
+A `SharedMutable`'s storage **must** only be mutated via `schedule_value_change`. Attempting to override this by manually accessing the underlying storage slots breaks all properties of the data structure, rendering it useless.
+:::
+
+### `get_current_value_in_public`
+
+Returns the current value in a public execution context. Once a value change is scheduled via `schedule_value_change` and a number of blocks equal to the delay passes, this automatically returns the new value.
+
+#include_code shared_mutable_get_current_public /noir-projects/noir-contracts/contracts/auth_contract/src/main.nr rust
+
+### `get_current_value_in_private`
+
+Returns the current value in a private execution context. Once a value change is scheduled via `schedule_value_change` and a number of blocks equal to the delay passes, this automatically returns the new value.
+
+Calling this function will set the `max_block_number` property of the transaction request, introducing a new validity condition to the entire transaction: it cannot be included in any block with a block number larger than `max_block_number`. This could [potentially leak some privacy](#privacy-considerations).
+
+#include_code shared_mutable_get_current_private /noir-projects/noir-contracts/contracts/auth_contract/src/main.nr rust
+
+### `get_scheduled_value_in_public`
+
+Returns the last scheduled value change, along with the block number at which the scheduled value becomes the current value. This may either be a pending change, if the block number is in the future, or the last executed scheduled change if the block number is in the past (in which case there are no pending changes).
+
+#include_code shared_mutable_get_scheduled_public /noir-projects/noir-contracts/contracts/auth_contract/src/main.nr rust
+
+It is not possible to call this function in private: doing so would not be very useful at it cannot be asserted that a scheduled value change will not be immediately replaced if `shcedule_value_change` where to be called.
+
+## `SharedImmutable`
+
+`SharedImmutable` (formerly known as `StablePublicState`) is a simplification of the `SharedMutable` case, where the value can only be set once during initialization. Because there's no further mutation, there's no need for delays. These state variables are useful for stuff that you would usually have in `immutable` values in Solidity, e.g. this can be the name of a token or its number of decimals.
+
+Like most state variables, `SharedImmutable` is generic over the variable type `T`. This type `MUST` implement the `Serialize` and `Deserialize` traits.
+
+#include_code storage-shared-immutable-declaration /noir-projects/noir-contracts/contracts/docs_example_contract/src/main.nr rust
+
+You can find the details of `SharedImmutable` in the implementation [here](https://github.com/AztecProtocol/aztec-packages/blob/#include_aztec_version/noir-projects/aztec-nr/aztec/src/state_vars/shared_immutable.nr).
+
+### `initialize`
+
+This function sets the immutable value. It must only be called once during contract construction.
+
+#include_code initialize_decimals /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
+
+:::warning
+A `SharedImmutable`'s storage **must** only be set once via `initialize`. Attempting to override this by manually accessing the underlying storage slots breaks all properties of the data structure, rendering it useless.
+:::
+
+### `read_public`
+
+Returns the stored immutable value in a public execution context.
+
+#include_code read_decimals_public /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
+
+### `read_private`
+
+Returns the stored immutable value in a private execution context.
+
+#include_code read_decimals_private /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
diff --git a/docs/docs/developers/contracts/resources/common_patterns/main.md b/docs/docs/developers/contracts/resources/common_patterns/main.md
index 66c3b9b91383..312eed8552e4 100644
--- a/docs/docs/developers/contracts/resources/common_patterns/main.md
+++ b/docs/docs/developers/contracts/resources/common_patterns/main.md
@@ -38,12 +38,11 @@ Note - you could also create a note and send it to the user. The problem is ther
 
 ### Reading public storage in private
 
-You can't read public storage in private domain. But nevertheless reading public storage is desirable. This is the naive way:
+You can't read public storage in private domain. But nevertheless reading public storage is desirable. There are two ways to achieve the desired effect:
 
-<!-- TODO https://github.com/AztecProtocol/aztec-packages/issues/5508: mention SharedMutable as an alternative
--->
+1. For public values that change infrequently, you can use [shared state](../../references/storage/shared_state.md).
 
-- You pass the data as a parameter to your private method and later assert in public that the data is correct. E.g.:
+1. You pass the data as a parameter to your private method and later assert in public that the data is correct. E.g.:
 
 ```rust
 struct Storage {
diff --git a/docs/docs/learn/concepts/accounts/keys.md b/docs/docs/learn/concepts/accounts/keys.md
index 5864abdc028e..1cf42aa37552 100644
--- a/docs/docs/learn/concepts/accounts/keys.md
+++ b/docs/docs/learn/concepts/accounts/keys.md
@@ -27,15 +27,9 @@ Storing the signing public key in a private note makes it accessible from the en
 
 Similar to using a private note, but using an immutable private note removes the need to nullify the note on every read. This generates less nullifiers and commitments per transaction, and does not enforce an order across transactions. However, it does not allow the user to rotate their key should they lose it.
 
-<!--TODO https://github.com/AztecProtocol/aztec-packages/issues/5508
-mention Shared Mutable, add links, explain limitations (delays)
+### Using shared state
 
-this is the old text:
-
-### Using the slow updates tree
-
-A compromise between the two solutions above is to use the slow updates tree. This would not generate additional nullifiers and commitments for each transaction while allowing the user to rotate their key. However, this causes every transaction to now have a time-to-live determined by the frequency of the slow updates tree.
--->
+A compromise between the two solutions above is to use [shared state](../../../developers/contracts/references/storage/shared_state.md). This would not generate additional nullifiers and commitments for each transaction while allowing the user to rotate their key. However, this causes every transaction to now have a time-to-live determined by the frequency of the mutable shared state, as well as imposing restrictions on how fast keys can be rotated due to minimum delays.
 
 ### Reusing the privacy master key
 
diff --git a/docs/docs/learn/concepts/accounts/main.md b/docs/docs/learn/concepts/accounts/main.md
index deac366c16c4..55746cc15247 100644
--- a/docs/docs/learn/concepts/accounts/main.md
+++ b/docs/docs/learn/concepts/accounts/main.md
@@ -129,11 +129,7 @@ These two patterns combined allow an account contract to answer whether an actio
 
 Aztec requires users to define [encryption and nullifying keys](./keys.md) that are needed for receiving and spending private notes. Unlike transaction signing, encryption and nullifying is enshrined at the protocol. This means that there is a single scheme used for encryption and nullifying. These keys are derived from a master public key. This master public key, in turn, is used when deterministically deriving the account's address.
 
-A side effect of committing to a master public key as part of the address is that _this key cannot be rotated_. While an account contract implementation could include methods for rotating the signing key, this is unfortunately not possible for encryption and nullifying keys (note that rotating nullifying keys also creates other challenges such as preventing double spends). 
-
-<!-- TODO https://github.com/AztecProtocol/aztec-packages/issues/5508: mention shared mutable
-We are exploring usage of sharedmutable[link] to enable rotating these keys.
--->
+A side effect of committing to a master public key as part of the address is that _this key cannot be rotated_. While an account contract implementation could include methods for rotating the signing key, this is unfortunately not possible for encryption and nullifying keys (note that rotating nullifying keys also creates other challenges such as preventing double spends). We are exploring usage of [`SharedMutable`](../../../developers/contracts/references/storage/shared_state.md#sharedmutable) to enable rotating these keys.
 
 NOTE: While we entertained the idea of abstracting note encryption, where account contracts would define an `encrypt` method that would use a user-defined scheme, there are two main reasons we decided against this. First is that this entailed that, in order to receive funds, a user had to first deploy their account contract, which is a major UX issue. Second, users could define malicious `encrypt` methods that failed in certain circumstances, breaking application flows that required them to receive a private note. While this issue already exists in Ethereum when transferring ETH (see the [king of the hill](https://coinsbench.com/27-king-ethernaut-da5021cd4aa6)), its impact is made worse in Aztec since any execution failure in a private function makes the entire transaction unprovable (ie it is not possible to catch errors in calls to other private functions), and furthermore because encryption is required for any private state (not just for transferring ETH). Nevertheless, both of these problems are solvable. Initialization can be worked around by embedding a commitment to the bytecode in the address and removing the need for actually deploying contracts before interacting with them, and the king of the hill issue can be mitigated by introducing a full private VM that allows catching reverts. As such, we may be able to abstract encryption in the future as well.
 
diff --git a/docs/docs/learn/concepts/communication/public_private_calls.md b/docs/docs/learn/concepts/communication/public_private_calls.md
index 2bd3d02e0373..67ff389bfc61 100644
--- a/docs/docs/learn/concepts/communication/public_private_calls.md
+++ b/docs/docs/learn/concepts/communication/public_private_calls.md
@@ -78,10 +78,12 @@ Theoretically the builder has all the state trees after the public function has
 
 From the above, we should have a decent idea about what private and public functions can do inside the L2, and how they might interact.
 
-<!-- TODO https://github.com/AztecProtocol/aztec-packages/issues/5508: mention SharedMutable
 ## A note on L2 access control
 
 Many applications rely on some form of access control to function well. USDC have a blacklist, where only parties not on the list should be able to transfer. And other systems such as Aave have limits such that only the pool contract is able to mint debt tokens and transfers held funds.
 
-Access control like this cannot easily be enforced in the private domain, as reading is also nullifying(to ensure data is up to date). However, as it is possible to read historical public state, one can combine private and public functions to get the desired effect.
--->
+Access control like this cannot easily be enforced in the private domain, as reading is also nullifying (to ensure data is up to date). However, as it is possible to read historical public state, one can combine private and public functions to get the desired effect.
+
+This concept is known as [shared state](../../../developers/contracts/references/storage/shared_state.md), and relies on using delays when changing public data so that it can also be read in private with currentness guarantees. Since values cannot be immediately modified but instead require delays to elapse, it is possible to privately prove that an application is using the current value _as long as the transaction gets included before some time in the future_, which would be the earliest the value could possibly change.
+
+If the public state is only changed infrequently, and it is acceptable to have delays when doing so, then shared state is a good solution to this problem.
diff --git a/docs/docs/misc/roadmap/engineering_roadmap.md b/docs/docs/misc/roadmap/engineering_roadmap.md
index 51e49405774b..61c5073f0229 100644
--- a/docs/docs/misc/roadmap/engineering_roadmap.md
+++ b/docs/docs/misc/roadmap/engineering_roadmap.md
@@ -21,13 +21,13 @@ The engineering roadmap is long. There are no timings assigned here. In a loose
 - Recommended Aztec smart contract coding patterns
 - Access Control (whitelists/blacklists) - probably needs the Shared Mutable.
 - Basic _example_ private tokens
-    - Including recursive calls to 'get_notes'.
+  - Including recursive calls to 'get_notes'.
 - Compliant private tokens
 - Private NFTs
 - Public tokens
 - Depositing and withdrawing tokens
-    - L1<\>L2
-    - public<\>private
+  - L1<\>L2
+  - public<\>private
 - The Aztec Connect bridging pattern
 - Using Keys (the fully-featured version of keys that we want to build)
 - Plume nullifiers
@@ -38,21 +38,23 @@ The engineering roadmap is long. There are no timings assigned here. In a loose
 ## Polishing what we have
 
 - Refactoring sprints.
-    - Reduce tech debt.
-    - More tests.
+  - Reduce tech debt.
+  - More tests.
 
 ## Enforcing correct ordering Public & Private State Transitions
 
 ## Enforcing correct ordering of other 'side effects'
+
 - Log ordering
 - Enqueued public function calls
 
 ## What data actually needs to be submitted on-chain?
+
 - For Public Functions:
-    - Just emit the initially-enqueued public function request data? (The 'inputs' of the tx);
-        - I.e. contract address, function selector, args, call_context.
-    - OR, Just emit the final state transitions? (The 'outputs' of the tx)
-        - I.e. the leaf indices and new values of the public data tree; and the new note hashes/nullifiers of the note hash tree; and logs; and l2->L1 messages.
+  - Just emit the initially-enqueued public function request data? (The 'inputs' of the tx);
+    - I.e. contract address, function selector, args, call_context.
+  - OR, Just emit the final state transitions? (The 'outputs' of the tx)
+    - I.e. the leaf indices and new values of the public data tree; and the new note hashes/nullifiers of the note hash tree; and logs; and l2->L1 messages.
 
 ## Proper specs
 
@@ -86,16 +88,16 @@ CI takes up a significant amount of time. It gets its own section here, so we re
 ## Fees
 
 - Design the Protocol
-    - Interdependence on the Sequencer & Upgradeability protocols.
-    - Pay fees in 1 currency, or fee abstraction?
-    - Escrowing fees
-    - Rebates
-    - L1->L2 message fees.
-    - L2->L1 fees
-    - Etc.
+  - Interdependence on the Sequencer & Upgradeability protocols.
+  - Pay fees in 1 currency, or fee abstraction?
+  - Escrowing fees
+  - Rebates
+  - L1->L2 message fees.
+  - L2->L1 fees
+  - Etc.
 - Build it.
-    - Gas metering
-    - Etc.
+  - Gas metering
+  - Etc.
 
 ## Note Discovery
 
@@ -119,14 +121,14 @@ CI takes up a significant amount of time. It gets its own section here, so we re
 
 ## Shared Mutable State
 
-We _need_ a way to read mutable public data from a private function. We are moving away from the old Slow Updates Tree in favor of Shared Mutable.
-<!-- TODO https://github.com/AztecProtocol/aztec-packages/issues/5508: add links -->
+We _need_ a way to read mutable public data from a private function. We are moving away from the old Slow Updates Tree in favor of [Shared Mutable](../../developers/contracts/references/storage/shared_state.md).
 
 ## Contract classes and instances?
 
 - There's a suggestion to introduce contract classes.
 
 ## Delegatecalls vs SetCode
+
 - Which? (if at all)
 
 ## Remove the contracts tree? 🤯
@@ -134,18 +136,18 @@ We _need_ a way to read mutable public data from a private function. We are movi
 - There's a suggestion to remove the notion of a contracts tree. What do we actually need the tree for? To check that a vk hash exists for a particular contract address?
 - If the contract address contains the function tree, and it also contains data about the constructor args to that contract, then perhaps we don't need the contract tree to exist.
 - We might still need the notion of a 'deployment':
-    -  to broadcast a contract's bytecode;
-    -  to 'reserve' a contract address;
-    -  and possibly to prevent a constructor from being executed twice (although an app could do this ("constructor abstraction")).
+  - to broadcast a contract's bytecode;
+  - to 'reserve' a contract address;
+  - and possibly to prevent a constructor from being executed twice (although an app could do this ("constructor abstraction")).
 
 ## Cryptography review checkpoint
 
 - Once we have specs (see above), we should review the rigour and secureness to our protocol.
-    - Choice of hashes
-    - Domain separation
-    - Choice of encryption scheme
-    - Keys
-    - A security review of the protocol as a whole
+  - Choice of hashes
+  - Domain separation
+  - Choice of encryption scheme
+  - Keys
+  - A security review of the protocol as a whole
 
 ## Testing UX team
 
@@ -153,46 +155,49 @@ A team focussed on testing and debugging UX.
 This team should have free rein to design and add any features they see fit.
 
 Some example features:
+
 - Writing contract tests in Noir.
-    - Mocking oracles.
+  - Mocking oracles.
 - Taking inspiration from other testing frameworks.
 - Much more detailed logging if things go wrong.
 - Errors which only spit out opaque 254-bit hex numbers are bad.
-    - Ensure all circuits are fed the human-readable information underlying all of these hex numbers.
-    - If tree root comparisons (expected vs actual) fail, human-readable details about the leaves in trees should be provided.
+  - Ensure all circuits are fed the human-readable information underlying all of these hex numbers.
+  - If tree root comparisons (expected vs actual) fail, human-readable details about the leaves in trees should be provided.
 
 ## Tooling
 
 ## Proper Circuits
 
 ### Redesign
+
 - The Bus
-    - The bus will have an impact on the way we design the circuit logic.
-    - We can hopefully avoid hashing in circuit 1 and unpacking that hash in circuit 2.
-    - Understand the 'bus' and how we can use it to pass variable amounts of data between recursive circuit iterations.
-    - Redesign all circuit logic to allow for the variable-sized arrays that the 'bus' enables.
+  - The bus will have an impact on the way we design the circuit logic.
+  - We can hopefully avoid hashing in circuit 1 and unpacking that hash in circuit 2.
+  - Understand the 'bus' and how we can use it to pass variable amounts of data between recursive circuit iterations.
+  - Redesign all circuit logic to allow for the variable-sized arrays that the 'bus' enables.
 - Enable 'dynamic/variable-sized **loops**'
-    - allow each `for` loop (eg read requests, insertions, commitment squashing, call stack processing, bip32 key derivation, etc.) to vary in size, by deferring each loop to its own final circuit. This would require complex folding stuff.
-    - This would give much more flexibility over the sizes of various arrays that a circuit can output. Without it, if one array of an app circuit needs to be size 2000, but other arrays aren't used, we'd use a kernel where every array is size 2048, meaning a huge amount of unnecessary loops of computation for those empty arrays.
+  - allow each `for` loop (eg read requests, insertions, commitment squashing, call stack processing, bip32 key derivation, etc.) to vary in size, by deferring each loop to its own final circuit. This would require complex folding stuff.
+  - This would give much more flexibility over the sizes of various arrays that a circuit can output. Without it, if one array of an app circuit needs to be size 2000, but other arrays aren't used, we'd use a kernel where every array is size 2048, meaning a huge amount of unnecessary loops of computation for those empty arrays.
 - Improvements
-    - We can definitely change how call stacks are processed within a kernel, to reduce hashing.
-    - Squash pending note hashes/nullifiers in every kernel iteration, to enable a deeper nested call depth.
+  - We can definitely change how call stacks are processed within a kernel, to reduce hashing.
+  - Squash pending note hashes/nullifiers in every kernel iteration, to enable a deeper nested call depth.
 - Topology of a rollup
-    - Revisit the current topology:
-        - We can make the rollup trees 'wonky' (rather than balanced), meaning a sequencer doesn't need to prove a load of pointless 'padding' proofs?
-            - This would also enable new txs (entering the tx pool) to be added to a rollup block 'on-the-fly' (mid way through a rollup being proven) - but of course, the sequencer selection protocol might require an up-front commitment, so this might not be possible for that reason (sad face).
-        - We can definitely redesign the public kernel circuit to be a '2x2' topology (i.e. a tree of public kernel proofs), to get a logarithmic speed-up (parallelism). The question is, with folding schemes, do we need that optimization?
+  - Revisit the current topology:
+    - We can make the rollup trees 'wonky' (rather than balanced), meaning a sequencer doesn't need to prove a load of pointless 'padding' proofs?
+      - This would also enable new txs (entering the tx pool) to be added to a rollup block 'on-the-fly' (mid way through a rollup being proven) - but of course, the sequencer selection protocol might require an up-front commitment, so this might not be possible for that reason (sad face).
+    - We can definitely redesign the public kernel circuit to be a '2x2' topology (i.e. a tree of public kernel proofs), to get a logarithmic speed-up (parallelism). The question is, with folding schemes, do we need that optimization?
 
 #### Refactor of packing & unpacking data in circuits
 
 We often pack data in circuit A, and then unpack it again in circuit B.
+
 - args_hash
 - return_values_hash
 - call stacks
 - read requests
 - etc.
 
-Also, for logs in particular, we allow arbitrary-sized logs. But this requires sha256 packing inside an app circuit (which is slow) (and sha256 unpacking in Solidity (which is relatively cheap)). Perhaps we also use the bus ideas for logs, to give _some_ variability in log length, but up to an upper bound. 
+Also, for logs in particular, we allow arbitrary-sized logs. But this requires sha256 packing inside an app circuit (which is slow) (and sha256 unpacking in Solidity (which is relatively cheap)). Perhaps we also use the bus ideas for logs, to give _some_ variability in log length, but up to an upper bound.
 
 Also, we do a lot of sha256-compressing in our kernel and rollup circuits for data which must be checked on-chain, but grows exponentially with every round of iteration. E.g.: new contract deployment data, new nullifiers, new note hashes, public state transition data, etc. This might be unavoidable. Maybe all we can do is use polynomial commitments when the EIP-4844 work is done. But maybe we can use the bus for this stuff too.
 
@@ -214,9 +219,11 @@ Also, we do a lot of sha256-compressing in our kernel and rollup circuits for da
 ### Ultra -> Standard Squisher Circuit
 
 ## Authentication: access to private data
+
 - Private data must not be returned to an app, unless the user authorizes it.
 
 ## Validation: preventing execution of malicious bytecode
+
 - A node should check that the bytecode provided by an application for a given app matches the leaf in the contract tree to ensure that user doesn't execute unplanned code which might access their notes.
 
 ## Fuzz Testing
@@ -235,22 +242,24 @@ An investigation into how formal verification techniques might improve the secur
 - Poseidon hashing in barretenberg.
 
 ## Tree epochs
+
 - Nullifier tree epochs
 - Maybe other tree epochs.
 
 ## Chaining txs
+
 - We have the ability to spend pending notes (which haven't-yet been added to the tree) _within the context of a single tx_.
 - We need the ability to spend pending notes (which haven't yet been added to the tree) across different txs, within the context of a single rollup.
-    - This happens if Alice generates two txs X & Y, where tx Y spends notes from tx X. If we want Alice to be able to generate these txs in parallel (without interacting with the network at all), we need a way for tx Y to spend notes before they've been added to the tree. The 'chaining tx' concepts from Aztec Connect can enable this.
+  - This happens if Alice generates two txs X & Y, where tx Y spends notes from tx X. If we want Alice to be able to generate these txs in parallel (without interacting with the network at all), we need a way for tx Y to spend notes before they've been added to the tree. The 'chaining tx' concepts from Aztec Connect can enable this.
 - This added _a lot_ of complexity to Aztec Connect. Especially around fees, iirc. Caution needed.
 
 ## EIP-4844
 
 - Understand it. Spec it. Build it.
 - Includes:
-    - Smart Contract changes
-    - Circuit changes
-    - A circuit to prove equivalence vs a BLS12-381 polynomial commitment.
+  - Smart Contract changes
+  - Circuit changes
+  - A circuit to prove equivalence vs a BLS12-381 polynomial commitment.
 
 ## Make it all work in a browser
 
@@ -259,8 +268,3 @@ An investigation into how formal verification techniques might improve the secur
 ## Internal Audit
 
 ## External Audits
-
-
-
-
-
diff --git a/docs/sidebars.js b/docs/sidebars.js
index b0b43724a2f6..9c522947d5de 100644
--- a/docs/sidebars.js
+++ b/docs/sidebars.js
@@ -437,6 +437,7 @@ const sidebars = {
               items: [
                 "developers/contracts/references/storage/private_state",
                 "developers/contracts/references/storage/public_state",
+                "developers/contracts/references/storage/shared_state",
               ],
             },
             {
diff --git a/noir-projects/noir-contracts/contracts/auth_contract/src/main.nr b/noir-projects/noir-contracts/contracts/auth_contract/src/main.nr
index 04385202409e..836e01bb41d9 100644
--- a/noir-projects/noir-contracts/contracts/auth_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/auth_contract/src/main.nr
@@ -11,7 +11,9 @@ contract Auth {
     struct Storage {
         // Admin can change the value of the authorized address via set_authorized()
         admin: PublicImmutable<AztecAddress>,
+        // docs:start:shared_mutable_storage
         authorized: SharedMutable<AztecAddress, CHANGE_AUTHORIZED_DELAY_BLOCKS>, 
+        // docs:end:shared_mutable_storage
     }
 
     #[aztec(public)]
@@ -23,20 +25,27 @@ contract Auth {
         // value of 0 and block of change 0, meaning it is effectively autoinitialized at the zero address.
     }
 
+    // docs:start:shared_mutable_schedule
     #[aztec(public)]
     fn set_authorized(authorized: AztecAddress) {
         assert_eq(storage.admin.read(), context.msg_sender(), "caller is not admin");
         storage.authorized.schedule_value_change(authorized);
+        // docs:end:shared_mutable_schedule
     }
 
     #[aztec(public)]
     fn get_authorized() -> AztecAddress {
+        // docs:start:shared_mutable_get_current_public
         storage.authorized.get_current_value_in_public()
+        // docs:end:shared_mutable_get_current_public
     }
 
     #[aztec(public)]
     fn get_scheduled_authorized() -> AztecAddress {
-        storage.authorized.get_scheduled_value_in_public().0
+        // docs:start:shared_mutable_get_scheduled_public
+        let (scheduled_value, _block_of_change): (AztecAddress, u32) = storage.authorized.get_scheduled_value_in_public();
+        // docs:end:shared_mutable_get_scheduled_public
+        scheduled_value
     }
 
     #[aztec(private)]
@@ -44,7 +53,9 @@ contract Auth {
         // Reading a value from authorized in private automatically adds an extra validity condition: the base rollup
         // circuit will reject this tx if included in a block past the block horizon, which is as far as the circuit can
         // guarantee the value will not change from some historical value (due to CHANGE_AUTHORIZED_DELAY_BLOCKS).
+        // docs:start:shared_mutable_get_current_private
         let authorized = storage.authorized.get_current_value_in_private();
+        // docs:end:shared_mutable_get_current_private
         assert_eq(authorized, context.msg_sender(), "caller is not authorized");
     }
 }
diff --git a/noir-projects/noir-contracts/contracts/docs_example_contract/src/main.nr b/noir-projects/noir-contracts/contracts/docs_example_contract/src/main.nr
index 4c4eb170e98b..da0b4587bb66 100644
--- a/noir-projects/noir-contracts/contracts/docs_example_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/docs_example_contract/src/main.nr
@@ -76,9 +76,7 @@ contract DocsExample {
                 set: PrivateSet::new(context, 5),
                 // docs:end:storage-set-init
                 private_immutable: PrivateImmutable::new(context, 6),
-                // docs:start:storage-shared-immutable
                 shared_immutable: SharedImmutable::new(context, 7),
-                // docs:end:storage-shared-immutable
                 // docs:start:storage-minters-init
                 minters: Map::new(
                     context,

From 0032a3a55dea5e4c9051dbc36607288f8ca1be4a Mon Sep 17 00:00:00 2001
From: Cody Gunton <codygunton@gmail.com>
Date: Tue, 30 Apr 2024 11:41:13 -0400
Subject: [PATCH 12/42] feat: circuit simulator for Ultra and GoblinUltra
 verifiers (#1195)

This PR introduces the `CircuitSimulator` repurposed specifically to
simulate native verifiers via the recursive verifiers, currently
specialised for bn254. Currently the simulator is able to simulate the
`UltraVerifier` and `GoblinUltraVerifier`.

Resolves https://github.com/AztecProtocol/barretenberg/issues/944.
---------
Co-authored-by: maramihali <mara@aztecprotocol.com>
---
 .../src/barretenberg/benchmark/CMakeLists.txt |   1 +
 .../benchmark/simulator_bench/CMakeLists.txt  |   1 +
 .../simulator_bench/simulator.bench.cpp       | 134 +++++++++++
 .../circuit_checker/circuit_checker.hpp       |   5 +-
 .../src/barretenberg/crypto/ecdsa/ecdsa.hpp   |   1 +
 .../cpp/src/barretenberg/flavor/flavor.hpp    |  10 +-
 .../types/merkle_hash_type.hpp                |   4 +-
 .../types/pedersen_commitment_type.hpp        |   4 +-
 .../stdlib/hash/keccak/keccak.cpp             |  12 +-
 .../stdlib/hash/keccak/keccak.test.cpp        |  22 +-
 .../verifier/ultra_recursive_verifier.cpp     |   2 +
 .../honk_recursion/verifier/verifier.test.cpp |  10 +-
 .../plonk_recursion/transcript/transcript.hpp |   4 +-
 .../verification_key/verification_key.hpp     |   4 +-
 .../plonk_recursion/verifier/verifier.hpp     |   2 +-
 .../stdlib/primitives/address/address.hpp     |   1 +
 .../primitives/bigfield/bigfield.test.cpp     |   9 +-
 .../primitives/bigfield/bigfield_impl.hpp     |  95 +++++---
 .../primitives/biggroup/biggroup.test.cpp     |   3 +-
 .../primitives/biggroup/biggroup_impl.hpp     |  93 +++----
 .../primitives/biggroup/biggroup_nafs.hpp     |  18 +-
 .../stdlib/primitives/bit_array/bit_array.cpp |   1 +
 .../primitives/bit_array/bit_array.test.cpp   |  11 +-
 .../stdlib/primitives/bool/bool.cpp           |   5 +-
 .../stdlib/primitives/bool/bool.test.cpp      |   8 +-
 .../primitives/byte_array/byte_array.cpp      |   5 +-
 .../primitives/byte_array/byte_array.test.cpp |   2 +-
 .../circuit_builders/circuit_builders.hpp     |   4 +
 .../circuit_builders/circuit_builders_fwd.hpp |   3 +-
 .../stdlib/primitives/field/array.hpp         |   3 +-
 .../stdlib/primitives/field/array.test.cpp    |  22 +-
 .../stdlib/primitives/field/field.cpp         | 165 ++++++++-----
 .../stdlib/primitives/field/field.hpp         |  10 +-
 .../stdlib/primitives/field/field.test.cpp    | 226 +++++++++++-------
 .../stdlib/primitives/logic/logic.cpp         | 130 +++++-----
 .../stdlib/primitives/logic/logic.test.cpp    |   5 +-
 .../packed_byte_array/packed_byte_array.cpp   |   1 +
 .../packed_byte_array.test.cpp                |   2 +-
 .../stdlib/primitives/plookup/plookup.cpp     |   1 +
 .../primitives/plookup/plookup.test.cpp       |   2 +-
 .../stdlib/primitives/safe_uint/safe_uint.cpp |  19 +-
 .../stdlib/primitives/safe_uint/safe_uint.hpp |   2 +-
 .../primitives/safe_uint/safe_uint.test.cpp   |  22 +-
 .../stdlib/primitives/uint/arithmetic.cpp     |   1 +
 .../primitives/uint/plookup/arithmetic.cpp    |  93 +++----
 .../primitives/uint/plookup/comparison.cpp    |   4 +
 .../stdlib/primitives/uint/plookup/logic.cpp  |   4 +
 .../stdlib/primitives/uint/plookup/uint.cpp   |  22 +-
 .../stdlib/primitives/uint/uint.cpp           |  16 +-
 .../stdlib/primitives/uint/uint.hpp           |  20 +-
 .../stdlib/primitives/uint/uint.test.cpp      |  94 ++++----
 .../stdlib/primitives/witness/witness.hpp     |  27 ++-
 .../circuit_simulator.hpp                     | 195 +++++++++++++++
 53 files changed, 1077 insertions(+), 483 deletions(-)
 create mode 100644 barretenberg/cpp/src/barretenberg/benchmark/simulator_bench/CMakeLists.txt
 create mode 100644 barretenberg/cpp/src/barretenberg/benchmark/simulator_bench/simulator.bench.cpp
 create mode 100644 barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/circuit_simulator.hpp

diff --git a/barretenberg/cpp/src/barretenberg/benchmark/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/benchmark/CMakeLists.txt
index 1fce39f3e92c..0ada6b922c3b 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/CMakeLists.txt
+++ b/barretenberg/cpp/src/barretenberg/benchmark/CMakeLists.txt
@@ -5,6 +5,7 @@ add_subdirectory(ipa_bench)
 add_subdirectory(client_ivc_bench)
 add_subdirectory(pippenger_bench)
 add_subdirectory(plonk_bench)
+add_subdirectory(simulator_bench)
 add_subdirectory(protogalaxy_bench)
 add_subdirectory(protogalaxy_rounds_bench)
 add_subdirectory(relations_bench)
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/simulator_bench/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/benchmark/simulator_bench/CMakeLists.txt
new file mode 100644
index 000000000000..9f91d3093e08
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/benchmark/simulator_bench/CMakeLists.txt
@@ -0,0 +1 @@
+ barretenberg_module(simulator_bench stdlib_honk_recursion stdlib_sha256 crypto_merkle_tree) 
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/simulator_bench/simulator.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/simulator_bench/simulator.bench.cpp
new file mode 100644
index 000000000000..a8aee11c099a
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/benchmark/simulator_bench/simulator.bench.cpp
@@ -0,0 +1,134 @@
+#include "barretenberg/goblin/goblin.hpp"
+#include "barretenberg/goblin/mock_circuits.hpp"
+#include "barretenberg/stdlib_circuit_builders/ultra_circuit_builder.hpp"
+#include <benchmark/benchmark.h>
+
+using namespace benchmark;
+using namespace bb;
+
+namespace {
+template <typename RecursiveFlavor> class SimulatorFixture : public benchmark::Fixture {
+
+  public:
+    using Flavor = typename RecursiveFlavor::NativeFlavor;
+    using ProverInstance = ProverInstance_<Flavor>;
+    using Builder = typename Flavor::CircuitBuilder;
+    using VerificationKey = typename Flavor::VerificationKey;
+    using CircuitSimulator = typename RecursiveFlavor::CircuitBuilder;
+    using SimulatingVerifier = stdlib::recursion::honk::UltraRecursiveVerifier_<RecursiveFlavor>;
+
+    struct VerifierInput {
+        HonkProof proof;
+        std::shared_ptr<VerificationKey> verification_key;
+    };
+
+    void SetUp([[maybe_unused]] const ::benchmark::State& state) override
+    {
+        bb::srs::init_crs_factory("../srs_db/ignition");
+    }
+
+    /**
+     * @brief Create a Honk proof (either Ultra or GoblinUltra) for a non-trivial circuit.
+     *
+     * @param large determines whether the circuit is 2^17 or 2^19
+     */
+    static VerifierInput create_proof(bool large = false)
+    {
+
+        auto builder = construct_mock_function_circuit(large);
+        auto instance = std::make_shared<ProverInstance>(builder);
+        UltraProver_<Flavor> prover(instance);
+        auto ultra_proof = prover.construct_proof();
+        auto verification_key = std::make_shared<VerificationKey>(instance->proving_key);
+        return { ultra_proof, verification_key };
+    }
+
+    /**
+     * @brief Populate the builder with non-trivial operations that mock a circuit encountered in practice.
+     *
+     * @param large determines whether the circuit is 2^17 or 2^19
+     */
+    static Builder construct_mock_function_circuit(bool large = false)
+    {
+        using InnerCurve = bb::stdlib::bn254<Builder>;
+        using fr_ct = InnerCurve::ScalarField;
+        using point_ct = InnerCurve::AffineElement;
+        using fr = typename InnerCurve::ScalarFieldNative;
+        using point = typename InnerCurve::GroupNative::affine_element;
+        Builder builder;
+
+        // Perform a batch mul which will add some arbitrary goblin-style ECC op gates if the circuit arithmetic is
+        // goblinisied otherwise it will add the conventional nonnative gates
+        size_t num_points = 5;
+        std::vector<point_ct> circuit_points;
+        std::vector<fr_ct> circuit_scalars;
+        for (size_t i = 0; i < num_points; ++i) {
+            circuit_points.push_back(point_ct::from_witness(&builder, point::random_element()));
+            circuit_scalars.push_back(fr_ct::from_witness(&builder, fr::random_element()));
+        }
+        point_ct::batch_mul(circuit_points, circuit_scalars);
+
+        // Determine number of times to execute the below operations that constitute the mock circuit logic. Note
+        // that the circuit size does not scale linearly with number of iterations due to e.g. amortization of lookup
+
+        const size_t NUM_ITERATIONS_LARGE = 12; // results in circuit size 2^19 (502238 gates)
+        const size_t NUM_ITERATIONS_MEDIUM = 3; // results in circuit size 2^17 (124843 gates)
+        const size_t NUM_ITERATIONS = large ? NUM_ITERATIONS_LARGE : NUM_ITERATIONS_MEDIUM;
+
+        stdlib::generate_sha256_test_circuit(builder, NUM_ITERATIONS);             // min gates: ~39k
+        stdlib::generate_ecdsa_verification_test_circuit(builder, NUM_ITERATIONS); // min gates: ~41k
+        stdlib::generate_merkle_membership_test_circuit(builder, NUM_ITERATIONS);  // min gates: ~29k
+
+        return builder;
+    }
+};
+
+BENCHMARK_TEMPLATE_F(SimulatorFixture, GoblinNative, bb::GoblinUltraRecursiveFlavor_<bb::CircuitSimulatorBN254>)
+(benchmark::State& state)
+{
+    auto verifier_input = SimulatorFixture::create_proof();
+    for (auto _ : state) {
+        UltraVerifier_<Flavor> ultra_verifier{ verifier_input.verification_key };
+        ultra_verifier.verify_proof((verifier_input.proof));
+    }
+}
+
+BENCHMARK_TEMPLATE_F(SimulatorFixture, GoblinSimulated, bb::GoblinUltraRecursiveFlavor_<bb::CircuitSimulatorBN254>)
+(benchmark::State& state)
+{
+    auto verifier_input = SimulatorFixture::create_proof();
+    for (auto _ : state) {
+        CircuitSimulator simulator;
+        SimulatingVerifier ultra_verifier{ &simulator, verifier_input.verification_key };
+        ultra_verifier.verify_proof((verifier_input.proof));
+    }
+}
+
+BENCHMARK_TEMPLATE_F(SimulatorFixture, UltraNative, bb::UltraRecursiveFlavor_<bb::CircuitSimulatorBN254>)
+(benchmark::State& state)
+{
+    auto verifier_input = SimulatorFixture::create_proof();
+    for (auto _ : state) {
+        UltraVerifier_<typename SimulatorFixture::Flavor> ultra_verifier{ verifier_input.verification_key };
+        ultra_verifier.verify_proof((verifier_input.proof));
+    }
+}
+
+BENCHMARK_TEMPLATE_F(SimulatorFixture, UltraSimulated, bb::UltraRecursiveFlavor_<bb::CircuitSimulatorBN254>)
+(benchmark::State& state)
+{
+    auto verifier_input = SimulatorFixture::create_proof();
+    for (auto _ : state) {
+        CircuitSimulator simulator;
+        SimulatingVerifier ultra_verifier{ &simulator, verifier_input.verification_key };
+        ultra_verifier.verify_proof((verifier_input.proof));
+    }
+}
+
+BENCHMARK_REGISTER_F(SimulatorFixture, GoblinSimulated)->Unit(benchmark::kMillisecond);
+BENCHMARK_REGISTER_F(SimulatorFixture, UltraSimulated)->Unit(benchmark::kMillisecond);
+BENCHMARK_REGISTER_F(SimulatorFixture, GoblinNative)->Unit(benchmark::kMillisecond);
+BENCHMARK_REGISTER_F(SimulatorFixture, UltraNative)->Unit(benchmark::kMillisecond);
+
+} // namespace
+BENCHMARK_MAIN();
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/circuit_checker/circuit_checker.hpp b/barretenberg/cpp/src/barretenberg/circuit_checker/circuit_checker.hpp
index ec6ceed7e6d9..8d232e75f3c9 100644
--- a/barretenberg/cpp/src/barretenberg/circuit_checker/circuit_checker.hpp
+++ b/barretenberg/cpp/src/barretenberg/circuit_checker/circuit_checker.hpp
@@ -12,7 +12,8 @@ concept IsCheckable = bb::IsAnyOf<T,
                                   StandardCircuitBuilder_<bb::fr>,
                                   StandardCircuitBuilder_<bb::fq>,
                                   UltraCircuitBuilder,
-                                  GoblinUltraCircuitBuilder>;
+                                  GoblinUltraCircuitBuilder,
+                                  CircuitSimulatorBN254>;
 
 /**
  * @brief The unified interface for check circuit functionality implemented in the specialized CircuitChecker classes
@@ -28,6 +29,8 @@ class CircuitChecker {
             return UltraCircuitChecker::check(builder);
         } else if constexpr (IsStandardBuilder<Builder>) {
             return StandardCircuitChecker::check(builder);
+        } else if constexpr (IsSimulator<Builder>) {
+            return SimulatorCircuitChecker::check(builder);
         } else {
             return false;
         }
diff --git a/barretenberg/cpp/src/barretenberg/crypto/ecdsa/ecdsa.hpp b/barretenberg/cpp/src/barretenberg/crypto/ecdsa/ecdsa.hpp
index dabd63747208..d537a18decac 100644
--- a/barretenberg/cpp/src/barretenberg/crypto/ecdsa/ecdsa.hpp
+++ b/barretenberg/cpp/src/barretenberg/crypto/ecdsa/ecdsa.hpp
@@ -30,6 +30,7 @@ ecdsa_signature ecdsa_construct_signature(const std::string& message, const ecds
 template <typename Hash, typename Fq, typename Fr, typename G1>
 typename G1::affine_element ecdsa_recover_public_key(const std::string& message, const ecdsa_signature& sig);
 
+// TODO(https://github.com/AztecProtocol/barretenberg/issues/659)
 template <typename Hash, typename Fq, typename Fr, typename G1>
 bool ecdsa_verify_signature(const std::string& message,
                             const typename G1::affine_element& public_key,
diff --git a/barretenberg/cpp/src/barretenberg/flavor/flavor.hpp b/barretenberg/cpp/src/barretenberg/flavor/flavor.hpp
index fb30168d58dd..368384861000 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/flavor.hpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/flavor.hpp
@@ -348,13 +348,16 @@ concept IsUltraFlavor = IsAnyOf<T, UltraFlavor, GoblinUltraFlavor>;
 template <typename T> 
 concept IsGoblinFlavor = IsAnyOf<T, GoblinUltraFlavor,
                                     GoblinUltraRecursiveFlavor_<UltraCircuitBuilder>,
-                                    GoblinUltraRecursiveFlavor_<GoblinUltraCircuitBuilder>>;
+                                    GoblinUltraRecursiveFlavor_<GoblinUltraCircuitBuilder>, GoblinUltraRecursiveFlavor_<CircuitSimulatorBN254>>;
 
 template <typename T> 
 concept IsRecursiveFlavor = IsAnyOf<T, UltraRecursiveFlavor_<UltraCircuitBuilder>, 
                                        UltraRecursiveFlavor_<GoblinUltraCircuitBuilder>, 
+                                       UltraRecursiveFlavor_<CircuitSimulatorBN254>,
                                        GoblinUltraRecursiveFlavor_<UltraCircuitBuilder>,
-                                       GoblinUltraRecursiveFlavor_<GoblinUltraCircuitBuilder>>;
+                                       GoblinUltraRecursiveFlavor_<GoblinUltraCircuitBuilder>
+,GoblinUltraRecursiveFlavor_<CircuitSimulatorBN254>>;
+
 
 template <typename T> concept IsGrumpkinFlavor = IsAnyOf<T, ECCVMFlavor>;
 
@@ -362,8 +365,9 @@ template <typename T> concept IsFoldingFlavor = IsAnyOf<T, UltraFlavor,
                                                            GoblinUltraFlavor, 
                                                            UltraRecursiveFlavor_<UltraCircuitBuilder>, 
                                                            UltraRecursiveFlavor_<GoblinUltraCircuitBuilder>, 
+                                                           UltraRecursiveFlavor_<CircuitSimulatorBN254>,
                                                            GoblinUltraRecursiveFlavor_<UltraCircuitBuilder>, 
-                                                           GoblinUltraRecursiveFlavor_<GoblinUltraCircuitBuilder>>;
+                                                           GoblinUltraRecursiveFlavor_<GoblinUltraCircuitBuilder>, GoblinUltraRecursiveFlavor_<CircuitSimulatorBN254>>;
 
 template <typename Container, typename Element>
 inline std::string flavor_get_label(Container&& container, const Element& element) {
diff --git a/barretenberg/cpp/src/barretenberg/plonk_honk_shared/types/merkle_hash_type.hpp b/barretenberg/cpp/src/barretenberg/plonk_honk_shared/types/merkle_hash_type.hpp
index 33adbd44e66a..d7d3fe027bd9 100644
--- a/barretenberg/cpp/src/barretenberg/plonk_honk_shared/types/merkle_hash_type.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk_honk_shared/types/merkle_hash_type.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
 namespace bb::merkle {
-// TODO(Cody) Get rid of this?
+// TODO(https://github.com/AztecProtocol/barretenberg/issues/426)
 enum HashType { FIXED_BASE_PEDERSEN, LOOKUP_PEDERSEN };
-} // namespace bb::merkle
\ No newline at end of file
+} // namespace bb::merkle
diff --git a/barretenberg/cpp/src/barretenberg/plonk_honk_shared/types/pedersen_commitment_type.hpp b/barretenberg/cpp/src/barretenberg/plonk_honk_shared/types/pedersen_commitment_type.hpp
index 0976ebee71f2..8e72d71d6bc0 100644
--- a/barretenberg/cpp/src/barretenberg/plonk_honk_shared/types/pedersen_commitment_type.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk_honk_shared/types/pedersen_commitment_type.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
 namespace bb::pedersen {
-// TODO(Cody) Get rid of this?
+// TODO(https://github.com/AztecProtocol/barretenberg/issues/426)
 enum CommitmentType { FIXED_BASE_PEDERSEN, LOOKUP_PEDERSEN };
-} // namespace bb::pedersen
\ No newline at end of file
+} // namespace bb::pedersen
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.cpp
index 9543603660f8..a9ce1ab4eb07 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.cpp
@@ -814,14 +814,21 @@ stdlib::byte_array<Builder> keccak<Builder>::hash(byte_array_ct& input, const ui
 
     ASSERT(uint256_t(num_bytes.get_value()) <= input.size());
 
-    if (ctx == nullptr) {
-        // if buffer is constant compute hash and return w/o creating constraints
+    const auto constant_case = [&] { // if buffer is constant, compute hash and return w/o creating constraints
         byte_array_ct output(nullptr, 32);
         const std::vector<uint8_t> result = hash_native(input.get_value());
         for (size_t i = 0; i < 32; ++i) {
             output.set_byte(i, result[i]);
         }
         return output;
+    };
+
+    if constexpr (IsSimulator<Builder>) {
+        return constant_case();
+    }
+
+    if (ctx == nullptr) {
+        return constant_case();
     }
 
     // convert the input byte array into 64-bit keccak lanes (+ apply padding)
@@ -906,6 +913,7 @@ template <typename Builder> void generate_keccak_test_circuit(Builder& builder,
     }
 }
 
+template class keccak<bb::CircuitSimulatorBN254>;
 template class keccak<bb::UltraCircuitBuilder>;
 template class keccak<bb::GoblinUltraCircuitBuilder>;
 template void generate_keccak_test_circuit(bb::UltraCircuitBuilder&, size_t);
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp
index cdb5e6fdf6eb..9efb1679b66a 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp
@@ -7,12 +7,12 @@
 
 using namespace bb;
 
-typedef UltraCircuitBuilder Builder;
-typedef stdlib::byte_array<Builder> byte_array;
-typedef stdlib::public_witness_t<Builder> public_witness_t;
-typedef stdlib::field_t<Builder> field_ct;
-typedef stdlib::witness_t<Builder> witness_ct;
-typedef stdlib::uint32<Builder> uint32_ct;
+using Builder = UltraCircuitBuilder;
+using byte_array = stdlib::byte_array<Builder>;
+using public_witness_t = stdlib::public_witness_t<Builder>;
+using field_ct = stdlib::field_t<Builder>;
+using witness_ct = stdlib::witness_t<Builder>;
+using uint32_ct = stdlib::uint32<Builder>;
 
 namespace {
 auto& engine = numeric::get_debug_randomness();
@@ -66,6 +66,8 @@ TEST(stdlib_keccak, keccak_theta_output_table)
 
 TEST(stdlib_keccak, keccak_rho_output_table)
 {
+    // TODO(https://github.com/AztecProtocol/barretenberg/issues/662)
+    GTEST_SKIP() << "Bug in constant case?";
     Builder builder = Builder();
 
     constexpr_for<0, 25, 1>([&]<size_t i> {
@@ -137,6 +139,9 @@ TEST(stdlib_keccak, keccak_chi_output_table)
 
 TEST(stdlib_keccak, test_format_input_lanes)
 {
+    // TODO(https://github.com/AztecProtocol/barretenberg/issues/662)
+    GTEST_SKIP() << "Unneeded?";
+
     Builder builder = Builder();
 
     for (size_t i = 543; i < 544; ++i) {
@@ -196,6 +201,9 @@ TEST(stdlib_keccak, test_single_block)
 
 TEST(stdlib_keccak, test_double_block)
 {
+
+    GTEST_SKIP() << "Bug in constant case?";
+
     Builder builder = Builder();
     std::string input = "";
     for (size_t i = 0; i < 200; ++i) {
@@ -218,6 +226,8 @@ TEST(stdlib_keccak, test_double_block)
 
 TEST(stdlib_keccak, test_double_block_variable_length)
 {
+    GTEST_SKIP() << "Bug in constant case?";
+
     Builder builder = Builder();
     std::string input = "";
     for (size_t i = 0; i < 200; ++i) {
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.cpp b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.cpp
index 51ae5b06b0a6..538c7376bac9 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.cpp
@@ -136,4 +136,6 @@ template class UltraRecursiveVerifier_<bb::UltraRecursiveFlavor_<UltraCircuitBui
 template class UltraRecursiveVerifier_<bb::UltraRecursiveFlavor_<GoblinUltraCircuitBuilder>>;
 template class UltraRecursiveVerifier_<bb::GoblinUltraRecursiveFlavor_<UltraCircuitBuilder>>;
 template class UltraRecursiveVerifier_<bb::GoblinUltraRecursiveFlavor_<GoblinUltraCircuitBuilder>>;
+template class UltraRecursiveVerifier_<bb::UltraRecursiveFlavor_<CircuitSimulatorBN254>>;
+template class UltraRecursiveVerifier_<bb::GoblinUltraRecursiveFlavor_<CircuitSimulatorBN254>>;
 } // namespace bb::stdlib::recursion::honk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/verifier.test.cpp
index 8fe40431d422..90233b9dcb35 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/verifier.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/verifier.test.cpp
@@ -197,7 +197,11 @@ template <typename RecursiveFlavor> class RecursiveVerifierTest : public testing
         }
 
         // Check 3: Construct and verify a proof of the recursive verifier circuit
-        {
+        if constexpr (!IsSimulator<OuterBuilder>) {
+            using OuterFlavor = std::conditional_t<IsGoblinBuilder<OuterBuilder>, GoblinUltraFlavor, UltraFlavor>;
+            using OuterProver = UltraProver_<OuterFlavor>;
+            using OuterVerifier = UltraVerifier_<OuterFlavor>;
+            using OuterProverInstance = ProverInstance_<OuterFlavor>;
             auto instance = std::make_shared<OuterProverInstance>(outer_circuit);
             OuterProver prover(instance);
             auto verification_key = std::make_shared<typename OuterFlavor::VerificationKey>(instance->proving_key);
@@ -248,7 +252,9 @@ template <typename RecursiveFlavor> class RecursiveVerifierTest : public testing
 using Flavors = testing::Types<GoblinUltraRecursiveFlavor_<GoblinUltraCircuitBuilder>,
                                GoblinUltraRecursiveFlavor_<UltraCircuitBuilder>,
                                UltraRecursiveFlavor_<UltraCircuitBuilder>,
-                               UltraRecursiveFlavor_<GoblinUltraCircuitBuilder>>;
+                               UltraRecursiveFlavor_<GoblinUltraCircuitBuilder>,
+                               UltraRecursiveFlavor_<CircuitSimulatorBN254>,
+                               GoblinUltraRecursiveFlavor_<CircuitSimulatorBN254>>;
 
 TYPED_TEST_SUITE(RecursiveVerifierTest, Flavors);
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/transcript/transcript.hpp b/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/transcript/transcript.hpp
index 1da50427daf1..6a3df08bf301 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/transcript/transcript.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/transcript/transcript.hpp
@@ -254,7 +254,9 @@ template <typename Builder> class Transcript {
             field_pt borrow = field_pt::from_witness(context, need_borrow);
 
             // directly call `create_new_range_constraint` to avoid creating an arithmetic gate
-            if constexpr (HasPlookup<Builder>) {
+            if constexpr (IsSimulator<Builder>) {
+                context->create_range_constraint(borrow.get_value(), 1, "borrow");
+            } else if constexpr (HasPlookup<Builder>) {
                 context->create_new_range_constraint(borrow.get_witness_index(), 1, "borrow");
             } else {
                 context->create_range_constraint(borrow.get_witness_index(), 1, "borrow");
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/verification_key/verification_key.hpp b/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/verification_key/verification_key.hpp
index 67b630e95744..8acfb11a38e0 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/verification_key/verification_key.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/verification_key/verification_key.hpp
@@ -149,7 +149,9 @@ template <class Builder, size_t bits_per_element = 248> struct PedersenPreimageB
             field_pt borrow = field_pt::from_witness(context, need_borrow);
 
             // directly call `create_new_range_constraint` to avoid creating an arithmetic gate
-            if constexpr (HasPlookup<Builder>) {
+            if constexpr (IsSimulator<Builder>) {
+                context->create_range_constraint(borrow.get_value(), 1, "borrow");
+            } else if constexpr (HasPlookup<Builder>) {
                 context->create_new_range_constraint(borrow.get_witness_index(), 1, "borrow");
             } else {
                 context->create_range_constraint(borrow.get_witness_index(), 1, "borrow");
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/verifier/verifier.hpp b/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/verifier/verifier.hpp
index 61b509eaedea..9e01f077b880 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/verifier/verifier.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/verifier/verifier.hpp
@@ -386,7 +386,7 @@ aggregation_state<Curve> verify_proof_(typename Curve::Builder* context,
 
     rhs = (-rhs) - PI_Z;
 
-    // TODO(zac: remove this once a3-packages has migrated to calling `assign_object_to_proof_outputs`)
+    // TODO(zac): remove this once a3-packages has migrated to calling `assign_object_to_proof_outputs`)
     std::vector<uint32_t> proof_witness_indices = {
         opening_result.x.binary_basis_limbs[0].element.normalize().witness_index,
         opening_result.x.binary_basis_limbs[1].element.normalize().witness_index,
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/address/address.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/address/address.hpp
index e156591067ec..ea7cdbc88924 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/address/address.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/address/address.hpp
@@ -6,6 +6,7 @@
 #include "barretenberg/stdlib/primitives/group/cycle_group.hpp"
 #include "barretenberg/stdlib/primitives/witness/witness.hpp"
 
+// TODO(https://github.com/AztecProtocol/barretenberg/issues/376): Establish whether this type should be here at all.
 namespace bb::stdlib {
 
 // Native type
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp
index 3aa7f6090ce2..695fe17ce16f 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp
@@ -1,5 +1,4 @@
-#include <gtest/gtest.h>
-
+#include "barretenberg/stdlib/primitives/bigfield/bigfield.hpp"
 #include "barretenberg/numeric/random/engine.hpp"
 
 #include "barretenberg/ecc/curves/bn254/fq.hpp"
@@ -12,8 +11,7 @@
 #include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp"
 #include "barretenberg/stdlib/primitives/curves/bn254.hpp"
-
-#include "barretenberg/polynomials/polynomial_arithmetic.hpp"
+#include <gtest/gtest.h>
 #include <memory>
 #include <utility>
 
@@ -514,6 +512,7 @@ template <typename Builder> class stdlib_bigfield : public testing::Test {
                                fr(uint256_t(inputs[3]).slice(fq_ct::NUM_LIMB_BITS * 2, fq_ct::NUM_LIMB_BITS * 4))));
             fq_ct e = (a - b) * (c - d);
             fq expected = (inputs[0] - inputs[1]) * (inputs[2] - inputs[3]);
+
             expected = expected.from_montgomery_form();
             uint512_t result = e.get_value();
 
@@ -844,7 +843,7 @@ template <typename Builder> class stdlib_bigfield : public testing::Test {
 };
 
 // Define types for which the above tests will be constructed.
-typedef testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder> CircuitTypes;
+using CircuitTypes = testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder, bb::CircuitSimulatorBN254>;
 // Define the suite of tests.
 TYPED_TEST_SUITE(stdlib_bigfield, CircuitTypes);
 TYPED_TEST(stdlib_bigfield, badmul)
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp
index 3e6fc79a9941..e6358fd9551d 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp
@@ -74,8 +74,11 @@ bigfield<Builder, T>::bigfield(const field_t<Builder>& low_bits_in,
             low_accumulator = context->decompose_into_base4_accumulators(
                 low_bits_in.witness_index, static_cast<size_t>(NUM_LIMB_BITS * 2), "bigfield: low_bits_in too large.");
             mid_index = static_cast<size_t>((NUM_LIMB_BITS / 2) - 1);
-            // Range constraint returns an array of partial sums, midpoint will happen to hold the big limb value
-            limb_1.witness_index = low_accumulator[mid_index];
+            // Range constraint returns an array of partial sums, midpoint will happen to hold the big limb
+            // value
+            if constexpr (!IsSimulator<Builder>) {
+                limb_1.witness_index = low_accumulator[mid_index];
+            }
             // We can get the first half bits of low_bits_in from the variables we already created
             limb_0 = (low_bits_in - (limb_1 * shift_1));
         }
@@ -112,7 +115,10 @@ bigfield<Builder, T>::bigfield(const field_t<Builder>& low_bits_in,
             high_accumulator = context->decompose_into_base4_accumulators(high_bits_in.witness_index,
                                                                           static_cast<size_t>(num_high_limb_bits),
                                                                           "bigfield: high_bits_in too large.");
-            limb_3.witness_index = high_accumulator[static_cast<size_t>((num_last_limb_bits / 2) - 1)];
+
+            if constexpr (!IsSimulator<Builder>) {
+                limb_3.witness_index = high_accumulator[static_cast<size_t>((num_last_limb_bits / 2) - 1)];
+            }
             limb_2 = (high_bits_in - (limb_3 * shift_1));
         }
     } else {
@@ -1676,9 +1682,18 @@ template <typename Builder, typename T> void bigfield<Builder, T>::assert_less_t
     // TODO(kesha): Merge this with assert_is_in_field
     // Warning: this assumes we have run circuit construction at least once in debug mode where large non reduced
     // constants are allowed via ASSERT
+    if constexpr (IsSimulator<Builder>) {
+        if (get_value() >= static_cast<uint512_t>(upper_limit)) {
+            context->failure("Bigfield assert_less_than failed in simulation.");
+        }
+        return;
+    }
+
     if (is_constant()) {
+        ASSERT(get_value() < static_cast<uint512_t>(upper_limit));
         return;
     }
+
     ASSERT(upper_limit != 0);
     // The circuit checks that limit - this >= 0, so if we are doing a less_than comparison, we need to subtract 1 from
     // the limit
@@ -1743,44 +1758,50 @@ template <typename Builder, typename T> void bigfield<Builder, T>::assert_equal(
 {
     Builder* ctx = this->context ? this->context : other.context;
 
-    if (is_constant() && other.is_constant()) {
-        std::cerr << "bigfield: calling assert equal on 2 CONSTANT bigfield elements...is this intended?" << std::endl;
-        return;
-    } else if (other.is_constant()) {
-        // evaluate a strict equality - make sure *this is reduced first, or an honest prover
-        // might not be able to satisfy these constraints.
-        field_t<Builder> t0 = (binary_basis_limbs[0].element - other.binary_basis_limbs[0].element);
-        field_t<Builder> t1 = (binary_basis_limbs[1].element - other.binary_basis_limbs[1].element);
-        field_t<Builder> t2 = (binary_basis_limbs[2].element - other.binary_basis_limbs[2].element);
-        field_t<Builder> t3 = (binary_basis_limbs[3].element - other.binary_basis_limbs[3].element);
-        field_t<Builder> t4 = (prime_basis_limb - other.prime_basis_limb);
-        t0.assert_is_zero();
-        t1.assert_is_zero();
-        t2.assert_is_zero();
-        t3.assert_is_zero();
-        t4.assert_is_zero();
+    if constexpr (IsSimulator<Builder>) {
+        // TODO(https://github.com/AztecProtocol/barretenberg/issues/677)
         return;
-    } else if (is_constant()) {
-        other.assert_equal(*this);
-        return;
-    }
+    } else {
+        if (is_constant() && other.is_constant()) {
+            std::cerr << "bigfield: calling assert equal on 2 CONSTANT bigfield elements...is this intended?"
+                      << std::endl;
+            return;
+        } else if (other.is_constant()) {
+            // evaluate a strict equality - make sure *this is reduced first, or an honest prover
+            // might not be able to satisfy these constraints.
+            field_t<Builder> t0 = (binary_basis_limbs[0].element - other.binary_basis_limbs[0].element);
+            field_t<Builder> t1 = (binary_basis_limbs[1].element - other.binary_basis_limbs[1].element);
+            field_t<Builder> t2 = (binary_basis_limbs[2].element - other.binary_basis_limbs[2].element);
+            field_t<Builder> t3 = (binary_basis_limbs[3].element - other.binary_basis_limbs[3].element);
+            field_t<Builder> t4 = (prime_basis_limb - other.prime_basis_limb);
+            t0.assert_is_zero();
+            t1.assert_is_zero();
+            t2.assert_is_zero();
+            t3.assert_is_zero();
+            t4.assert_is_zero();
+            return;
+        } else if (is_constant()) {
+            other.assert_equal(*this);
+            return;
+        }
 
-    bigfield diff = *this - other;
-    const uint512_t diff_val = diff.get_value();
-    const uint512_t modulus(target_basis.modulus);
+        bigfield diff = *this - other;
+        const uint512_t diff_val = diff.get_value();
+        const uint512_t modulus(target_basis.modulus);
 
-    const auto [quotient_512, remainder_512] = (diff_val).divmod(modulus);
-    if (remainder_512 != 0)
-        std::cerr << "bigfield: remainder not zero!" << std::endl;
-    ASSERT(remainder_512 == 0);
-    bigfield quotient;
+        const auto [quotient_512, remainder_512] = (diff_val).divmod(modulus);
+        if (remainder_512 != 0)
+            std::cerr << "bigfield: remainder not zero!" << std::endl;
+        ASSERT(remainder_512 == 0);
+        bigfield quotient;
 
-    const size_t num_quotient_bits = get_quotient_max_bits({ 0 });
-    quotient = bigfield(witness_t(ctx, fr(quotient_512.slice(0, NUM_LIMB_BITS * 2).lo)),
-                        witness_t(ctx, fr(quotient_512.slice(NUM_LIMB_BITS * 2, NUM_LIMB_BITS * 4).lo)),
-                        false,
-                        num_quotient_bits);
-    unsafe_evaluate_multiply_add(diff, { one() }, {}, quotient, { zero() });
+        const size_t num_quotient_bits = get_quotient_max_bits({ 0 });
+        quotient = bigfield(witness_t(ctx, fr(quotient_512.slice(0, NUM_LIMB_BITS * 2).lo)),
+                            witness_t(ctx, fr(quotient_512.slice(NUM_LIMB_BITS * 2, NUM_LIMB_BITS * 4).lo)),
+                            false,
+                            num_quotient_bits);
+        unsafe_evaluate_multiply_add(diff, { one() }, {}, quotient, { zero() });
+    }
 }
 
 // construct a proof that points are different mod p, when they are different mod r
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp
index 44201423b282..b8d8e7a76301 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp
@@ -821,7 +821,8 @@ template <typename TestType> class stdlib_biggroup : public testing::Test {
 enum UseBigfield { No, Yes };
 using TestTypes = testing::Types<TestType<stdlib::bn254<bb::StandardCircuitBuilder>, UseBigfield::No>,
                                  TestType<stdlib::bn254<bb::UltraCircuitBuilder>, UseBigfield::Yes>,
-                                 TestType<stdlib::bn254<bb::GoblinUltraCircuitBuilder>, UseBigfield::No>>;
+                                 TestType<stdlib::bn254<bb::GoblinUltraCircuitBuilder>, UseBigfield::No>,
+                                 TestType<stdlib::bn254<bb::CircuitSimulatorBN254>, UseBigfield::No>>;
 
 TYPED_TEST_SUITE(stdlib_biggroup, TestTypes);
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_impl.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_impl.hpp
index 35b1c477d722..e1557f4b5f99 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_impl.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_impl.hpp
@@ -621,52 +621,65 @@ element<C, Fq, Fr, G> element<C, Fq, Fr, G>::batch_mul(const std::vector<element
                                                        const std::vector<Fr>& scalars,
                                                        const size_t max_num_bits)
 {
-    // Perform goblinized batched mul if available; supported only for BN254
-    if constexpr (IsGoblinBuilder<C> && std::same_as<G, bb::g1>) {
-        return goblin_batch_mul(points, scalars);
+    if constexpr (IsSimulator<C>) {
+        // TODO(https://github.com/AztecProtocol/barretenberg/issues/663)
+        auto context = points[0].get_context();
+        using element_t = typename G::element;
+        element_t result = G::one;
+        result.self_set_infinity();
+        for (size_t i = 0; i < points.size(); i++) {
+            result += (element_t(points[i].get_value()) * scalars[i].get_value());
+        }
+        result = result.normalize();
+        return from_witness(context, result);
     } else {
+        // Perform goblinized batched mul if available; supported only for BN254
+        if constexpr (IsGoblinBuilder<C> && std::same_as<G, bb::g1>) {
+            return goblin_batch_mul(points, scalars);
+        } else {
 
-        const size_t num_points = points.size();
-        ASSERT(scalars.size() == num_points);
-        batch_lookup_table point_table(points);
-        const size_t num_rounds = (max_num_bits == 0) ? Fr::modulus.get_msb() + 1 : max_num_bits;
+            const size_t num_points = points.size();
+            ASSERT(scalars.size() == num_points);
+            batch_lookup_table point_table(points);
+            const size_t num_rounds = (max_num_bits == 0) ? Fr::modulus.get_msb() + 1 : max_num_bits;
 
-        std::vector<std::vector<bool_t<C>>> naf_entries;
-        for (size_t i = 0; i < num_points; ++i) {
-            naf_entries.emplace_back(compute_naf(scalars[i], max_num_bits));
-        }
-        const auto offset_generators = compute_offset_generators(num_rounds);
-        element accumulator =
-            element::chain_add_end(element::chain_add(offset_generators.first, point_table.get_chain_initial_entry()));
-
-        constexpr size_t num_rounds_per_iteration = 4;
-        size_t num_iterations = num_rounds / num_rounds_per_iteration;
-        num_iterations += ((num_iterations * num_rounds_per_iteration) == num_rounds) ? 0 : 1;
-        const size_t num_rounds_per_final_iteration =
-            (num_rounds - 1) - ((num_iterations - 1) * num_rounds_per_iteration);
-        for (size_t i = 0; i < num_iterations; ++i) {
-
-            std::vector<bool_t<C>> nafs(num_points);
-            std::vector<element::chain_add_accumulator> to_add;
-            const size_t inner_num_rounds =
-                (i != num_iterations - 1) ? num_rounds_per_iteration : num_rounds_per_final_iteration;
-            for (size_t j = 0; j < inner_num_rounds; ++j) {
-                for (size_t k = 0; k < num_points; ++k) {
-                    nafs[k] = (naf_entries[k][i * num_rounds_per_iteration + j + 1]);
+            std::vector<std::vector<bool_t<C>>> naf_entries;
+            for (size_t i = 0; i < num_points; ++i) {
+                naf_entries.emplace_back(compute_naf(scalars[i], max_num_bits));
+            }
+            const auto offset_generators = compute_offset_generators(num_rounds);
+            element accumulator = element::chain_add_end(
+                element::chain_add(offset_generators.first, point_table.get_chain_initial_entry()));
+
+            constexpr size_t num_rounds_per_iteration = 4;
+            size_t num_iterations = num_rounds / num_rounds_per_iteration;
+            num_iterations += ((num_iterations * num_rounds_per_iteration) == num_rounds) ? 0 : 1;
+            const size_t num_rounds_per_final_iteration =
+                (num_rounds - 1) - ((num_iterations - 1) * num_rounds_per_iteration);
+            for (size_t i = 0; i < num_iterations; ++i) {
+
+                std::vector<bool_t<C>> nafs(num_points);
+                std::vector<element::chain_add_accumulator> to_add;
+                const size_t inner_num_rounds =
+                    (i != num_iterations - 1) ? num_rounds_per_iteration : num_rounds_per_final_iteration;
+                for (size_t j = 0; j < inner_num_rounds; ++j) {
+                    for (size_t k = 0; k < num_points; ++k) {
+                        nafs[k] = (naf_entries[k][i * num_rounds_per_iteration + j + 1]);
+                    }
+                    to_add.emplace_back(point_table.get_chain_add_accumulator(nafs));
                 }
-                to_add.emplace_back(point_table.get_chain_add_accumulator(nafs));
+                accumulator = accumulator.multiple_montgomery_ladder(to_add);
             }
-            accumulator = accumulator.multiple_montgomery_ladder(to_add);
-        }
-        for (size_t i = 0; i < num_points; ++i) {
-            element skew = accumulator - points[i];
-            Fq out_x = accumulator.x.conditional_select(skew.x, naf_entries[i][num_rounds]);
-            Fq out_y = accumulator.y.conditional_select(skew.y, naf_entries[i][num_rounds]);
-            accumulator = element(out_x, out_y);
-        }
-        accumulator = accumulator - offset_generators.second;
+            for (size_t i = 0; i < num_points; ++i) {
+                element skew = accumulator - points[i];
+                Fq out_x = accumulator.x.conditional_select(skew.x, naf_entries[i][num_rounds]);
+                Fq out_y = accumulator.y.conditional_select(skew.y, naf_entries[i][num_rounds]);
+                accumulator = element(out_x, out_y);
+            }
+            accumulator = accumulator - offset_generators.second;
 
-        return accumulator;
+            return accumulator;
+        }
     }
 }
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_nafs.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_nafs.hpp
index 32a8a3876c13..c82ad8daab39 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_nafs.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_nafs.hpp
@@ -384,6 +384,8 @@ std::vector<field_t<C>> element<C, Fq, Fr, G>::compute_wnaf(const Fr& scalar)
         field_t<C> entry(witness_t<C>(ctx, offset_entry));
         if constexpr (HasPlookup<C>) {
             ctx->create_new_range_constraint(entry.witness_index, 1ULL << (WNAF_SIZE), "biggroup_nafs");
+        } else if constexpr (IsSimulator<C>) {
+            ctx->create_range_constraint(entry.get_value(), WNAF_SIZE, "biggroup_nafs");
         } else {
             ctx->create_range_constraint(entry.witness_index, WNAF_SIZE, "biggroup_nafs");
         }
@@ -394,11 +396,14 @@ std::vector<field_t<C>> element<C, Fq, Fr, G>::compute_wnaf(const Fr& scalar)
     wnaf_entries.emplace_back(witness_t<C>(ctx, skew));
     if constexpr (HasPlookup<C>) {
         ctx->create_new_range_constraint(wnaf_entries[wnaf_entries.size() - 1].witness_index, 1, "biggroup_nafs");
+    } else if constexpr (IsSimulator<C>) {
+        ctx->create_range_constraint(wnaf_entries[wnaf_entries.size() - 1].get_value(), 1, "biggroup_nafs");
     } else {
         ctx->create_range_constraint(wnaf_entries[wnaf_entries.size() - 1].witness_index, 1, "biggroup_nafs");
     }
 
-    // TODO: VALIDATE SUM DOES NOT OVERFLOW P
+    // TODO(https://github.com/AztecProtocol/barretenberg/issues/664)
+    // VALIDATE SUM DOES NOT OVERFLOW P
 
     // validate correctness of wNAF
     if constexpr (!Fr::is_composite) {
@@ -503,7 +508,10 @@ std::vector<bool_t<C>> element<C, Fq, Fr, G>::compute_naf(const Fr& scalar, cons
             bit.context = ctx;
             bit.witness_index = witness_t<C>(ctx, true).witness_index; // flip sign
             bit.witness_bool = true;
-            if constexpr (HasPlookup<C>) {
+            if constexpr (IsSimulator<C>) {
+                ctx->create_range_constraint(
+                    bit.get_value(), 1, "biggroup_nafs: compute_naf extracted too many bits in non-next_entry case");
+            } else if constexpr (HasPlookup<C>) {
                 ctx->create_new_range_constraint(
                     bit.witness_index, 1, "biggroup_nafs: compute_naf extracted too many bits in non-next_entry case");
             } else {
@@ -515,7 +523,11 @@ std::vector<bool_t<C>> element<C, Fq, Fr, G>::compute_naf(const Fr& scalar, cons
             bool_t<C> bit(ctx, false);
             bit.witness_index = witness_t<C>(ctx, false).witness_index; // don't flip sign
             bit.witness_bool = false;
-            if constexpr (HasPlookup<C>) {
+            if constexpr (IsSimulator<C>) {
+                ctx->create_range_constraint(
+                    bit.get_value(), 1, "biggroup_nafs: compute_naf extracted too many bits in next_entry case");
+            } else if constexpr (HasPlookup<C>) {
+                // TODO(https://github.com/AztecProtocol/barretenberg/issues/665)
                 ctx->create_new_range_constraint(
                     bit.witness_index, 1, "biggroup_nafs: compute_naf extracted too many bits in next_entry case");
             } else {
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.cpp
index 45089bc78aa9..b6a80f70112e 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.cpp
@@ -159,5 +159,6 @@ template <typename Builder> std::string bit_array<Builder>::get_witness_as_strin
 template class bit_array<bb::StandardCircuitBuilder>;
 template class bit_array<bb::UltraCircuitBuilder>;
 template class bit_array<bb::GoblinUltraCircuitBuilder>;
+template class bit_array<bb::CircuitSimulatorBN254>;
 
 } // namespace bb::stdlib
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.test.cpp
index 7f002085da0c..0df52d116b53 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.test.cpp
@@ -25,7 +25,7 @@ auto& engine = numeric::get_debug_randomness();
 
 template <class Builder> class BitArrayTest : public ::testing::Test {};
 
-using CircuitTypes = ::testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder>;
+using CircuitTypes = ::testing::Types<bb::CircuitSimulatorBN254, bb::StandardCircuitBuilder, bb::UltraCircuitBuilder>;
 TYPED_TEST_SUITE(BitArrayTest, CircuitTypes);
 
 TYPED_TEST(BitArrayTest, test_uint32_input_output_consistency)
@@ -46,10 +46,8 @@ TYPED_TEST(BitArrayTest, test_uint32_input_output_consistency)
 
     EXPECT_EQ(result.size(), 2UL);
 
-    auto a_result =
-        static_cast<uint32_t>(builder.get_variable(result[0].get_witness_index()).from_montgomery_form().data[0]);
-    auto b_result =
-        static_cast<uint32_t>(builder.get_variable(result[1].get_witness_index()).from_montgomery_form().data[0]);
+    auto a_result = static_cast<uint32_t>(result[0].get_value());
+    auto b_result = static_cast<uint32_t>(result[1].get_value());
 
     EXPECT_EQ(a_result, a_expected);
     EXPECT_EQ(b_result, b_expected);
@@ -72,8 +70,7 @@ TYPED_TEST(BitArrayTest, test_binary_input_output_consistency)
 
     EXPECT_EQ(uint32_vec.size(), 1UL);
 
-    auto result =
-        static_cast<uint32_t>(builder.get_variable(uint32_vec[0].get_witness_index()).from_montgomery_form().data[0]);
+    auto result = static_cast<uint32_t>(uint32_vec[0].get_value());
 
     auto expected = 0b01101;
     EXPECT_EQ(result, expected);
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.cpp
index f300fb48278b..1ced465f97e8 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.cpp
@@ -400,7 +400,9 @@ template <typename Builder> void bool_t<Builder>::assert_equal(const bool_t& rhs
     const bool_t lhs = *this;
     Builder* ctx = lhs.get_context() ? lhs.get_context() : rhs.get_context();
 
-    if (lhs.is_constant() && rhs.is_constant()) {
+    if constexpr (IsSimulator<Builder>) {
+        ctx->assert_equal(lhs.get_value(), rhs.get_value(), msg);
+    } else if (lhs.is_constant() && rhs.is_constant()) {
         ASSERT(lhs.get_value() == rhs.get_value());
     } else if (lhs.is_constant()) {
         // if rhs is inverted, flip the value of the lhs constant
@@ -549,5 +551,6 @@ template <typename Builder> bool_t<Builder> bool_t<Builder>::normalize() const
 template class bool_t<bb::StandardCircuitBuilder>;
 template class bool_t<bb::UltraCircuitBuilder>;
 template class bool_t<bb::GoblinUltraCircuitBuilder>;
+template class bool_t<bb::CircuitSimulatorBN254>;
 
 } // namespace bb::stdlib
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp
index 4f83f0bae341..45f4b3fe9423 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp
@@ -17,7 +17,7 @@ auto& engine = numeric::get_debug_randomness();
 
 template <class Builder> class BoolTest : public ::testing::Test {};
 
-using CircuitTypes = ::testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder>;
+using CircuitTypes = ::testing::Types<bb::CircuitSimulatorBN254, bb::StandardCircuitBuilder, bb::UltraCircuitBuilder>;
 
 TYPED_TEST_SUITE(BoolTest, CircuitTypes);
 TYPED_TEST(BoolTest, TestBasicOperations)
@@ -48,8 +48,10 @@ TYPED_TEST(BoolTest, TestBasicOperations)
     bool result = CircuitChecker::check(builder);
     EXPECT_EQ(result, true);
 
-    auto gates_after = builder.get_num_gates();
-    EXPECT_EQ(gates_after - gates_before, 6UL);
+    if (!IsSimulator<Builder>) {
+        auto gates_after = builder.get_num_gates();
+        EXPECT_EQ(gates_after - gates_before, 6UL);
+    }
 }
 
 TYPED_TEST(BoolTest, Xor)
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.cpp
index c9022864a092..2437c9f935b4 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.cpp
@@ -350,9 +350,9 @@ typename byte_array<Builder>::byte_slice byte_array<Builder>::split_byte(const s
 
     if (byte.is_constant()) {
         field_t<Builder> low(context, low_value);
-        field_t<Builder> high(context, high_value);
+        field_t<Builder> shifted_high(context, high_value * (uint64_t(1) << (8ULL - num_high_bits)));
         bool_t<Builder> bit(context, static_cast<bool>(bit_value));
-        return { low, high, bit };
+        return { low, shifted_high, bit };
     }
     field_t<Builder> low = witness_t<Builder>(context, low_value);
     field_t<Builder> high = witness_t<Builder>(context, high_value);
@@ -382,5 +382,6 @@ typename byte_array<Builder>::byte_slice byte_array<Builder>::split_byte(const s
 template class byte_array<bb::StandardCircuitBuilder>;
 template class byte_array<bb::UltraCircuitBuilder>;
 template class byte_array<bb::GoblinUltraCircuitBuilder>;
+template class byte_array<bb::CircuitSimulatorBN254>;
 
 } // namespace bb::stdlib
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.test.cpp
index 850179470a65..62f05c2f98f4 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.test.cpp
@@ -22,7 +22,7 @@ template <class Builder> class ByteArrayTest : public ::testing::Test {};
 
 template <class Builder> using byte_array_ct = byte_array<Builder>;
 
-using CircuitTypes = ::testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder>;
+using CircuitTypes = ::testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder, bb::CircuitSimulatorBN254>;
 TYPED_TEST_SUITE(ByteArrayTest, CircuitTypes);
 
 TYPED_TEST(ByteArrayTest, test_reverse)
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp
index 60d564e52cd7..2285d18e97d3 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp
@@ -3,6 +3,7 @@
  * instantiate templates.
  */
 #pragma once
+#include "barretenberg/stdlib_circuit_builders/circuit_simulator.hpp"
 #include "barretenberg/stdlib_circuit_builders/goblin_ultra_circuit_builder.hpp"
 #include "barretenberg/stdlib_circuit_builders/standard_circuit_builder.hpp"
 #include "barretenberg/stdlib_circuit_builders/ultra_circuit_builder.hpp"
@@ -20,3 +21,6 @@ concept IsGoblinBuilder = bb::IsAnyOf<T, bb::GoblinUltraCircuitBuilder>;
 template <typename T>
 concept IsNotGoblinBuilder = !
 IsGoblinBuilder<T>;
+
+template <typename T>
+concept IsSimulator = bb::IsAnyOf<T, bb::CircuitSimulatorBN254>;
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp
index 6c0d18f5fd59..843b2bc64670 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp
@@ -23,4 +23,5 @@ template <class Arithmetization> class UltraCircuitBuilder_;
 using UltraCircuitBuilder = UltraCircuitBuilder_<UltraArith<field<Bn254FrParams>>>;
 template <class FF> class GoblinUltraCircuitBuilder_;
 using GoblinUltraCircuitBuilder = GoblinUltraCircuitBuilder_<field<Bn254FrParams>>;
-} // namespace bb
\ No newline at end of file
+class CircuitSimulatorBN254;
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.hpp
index d5968f7e74a3..99d043ad830d 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.hpp
@@ -33,7 +33,8 @@ template <typename Builder, size_t SIZE> field_t<Builder> array_length(std::arra
 template <typename Builder, size_t SIZE> field_t<Builder> array_pop(std::array<field_t<Builder>, SIZE> const& arr)
 {
     field_t<Builder> popped_value = 0;
-    bool_t<Builder> already_popped = false;
+    bool_t<Builder> already_popped = { arr[0].context, false };
+
     for (size_t i = arr.size() - 1; i != (size_t)-1; i--) {
         bool_t<Builder> is_non_zero = arr[i] != 0;
         popped_value = field_t<Builder>::conditional_assign(!already_popped && is_non_zero, arr[i], popped_value);
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.test.cpp
index 13f906116405..50d034c2590d 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.test.cpp
@@ -16,10 +16,10 @@ auto& engine = numeric::get_debug_randomness();
 template <class T> void ignore_unused(T&) {} // use to ignore unused variables in lambdas
 
 template <typename Builder> class stdlib_array : public testing::Test {
-    typedef stdlib::bool_t<Builder> bool_ct;
-    typedef stdlib::field_t<Builder> field_ct;
-    typedef stdlib::witness_t<Builder> witness_ct;
-    typedef stdlib::public_witness_t<Builder> public_witness_ct;
+    using bool_ct = stdlib::bool_t<Builder>;
+    using field_ct = stdlib::field_t<Builder>;
+    using witness_ct = stdlib::witness_t<Builder>;
+    using public_witness_ct = stdlib::public_witness_t<Builder>;
 
   public:
     static void test_array_length()
@@ -517,7 +517,10 @@ template <typename Builder> class stdlib_array : public testing::Test {
             test_push_array_to_array_helper(builder, source, target, expected_target, expect_fail);
 
         EXPECT_FALSE(proof_result);
-        EXPECT_EQ(error, "Once we've hit the first zero, there must only be zeros thereafter!");
+        // TODO(https://github.com/AztecProtocol/barretenberg/issues/666):
+        if constexpr (!IsSimulator<Builder>) {
+            EXPECT_EQ(error, "Once we've hit the first zero, there must only be zeros thereafter!");
+        }
     }
 
     class MockClass {
@@ -593,7 +596,7 @@ template <typename Builder> class stdlib_array : public testing::Test {
     }
 };
 
-typedef testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder> CircuitTypes;
+typedef testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder, bb::CircuitSimulatorBN254> CircuitTypes;
 
 TYPED_TEST_SUITE(stdlib_array, CircuitTypes);
 
@@ -631,7 +634,12 @@ TYPED_TEST(stdlib_array, test_array_push_generic)
 }
 TYPED_TEST(stdlib_array, test_array_push_generic_full)
 {
-    TestFixture::test_array_push_generic_full();
+    if constexpr (IsSimulator<TypeParam>) {
+        // TODO(https://github.com/AztecProtocol/barretenberg/issues/666):
+        GTEST_SKIP() << "Skipped for simulator";
+    } else {
+        TestFixture::test_array_push_generic_full();
+    }
 }
 // push array to array (pata) tests
 TYPED_TEST(stdlib_array, test_pata_large_bench)
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.cpp
index 5fdaac99179b..831896bc473e 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.cpp
@@ -20,9 +20,15 @@ template <typename Builder>
 field_t<Builder>::field_t(const witness_t<Builder>& value)
     : context(value.context)
 {
-    additive_constant = 0;
-    multiplicative_constant = 1;
-    witness_index = value.witness_index;
+    if constexpr (IsSimulator<Builder>) {
+        additive_constant = value.witness;
+        multiplicative_constant = 1;
+        witness_index = IS_CONSTANT;
+    } else {
+        additive_constant = 0;
+        multiplicative_constant = 1;
+        witness_index = value.witness_index;
+    }
 }
 
 template <typename Builder>
@@ -342,11 +348,18 @@ template <typename Builder> field_t<Builder> field_t<Builder>::divide_no_zero_ch
  */
 template <typename Builder> field_t<Builder> field_t<Builder>::pow(const field_t& exponent) const
 {
+
     auto* ctx = get_context() ? get_context() : exponent.get_context();
+    uint256_t exponent_value = exponent.get_value();
+    if constexpr (IsSimulator<Builder>) {
+        if ((exponent_value >> 32) != static_cast<uint256_t>(0)) {
+            ctx->failure("field_t::pow exponent accumulator incorrect");
+        }
+        constexpr uint256_t MASK_32_BITS = 0xffff'ffff;
+        return get_value().pow(exponent_value & MASK_32_BITS);
+    }
 
     bool exponent_constant = exponent.is_constant();
-
-    uint256_t exponent_value = exponent.get_value();
     std::vector<bool_t<Builder>> exponent_bits(32);
     for (size_t i = 0; i < exponent_bits.size(); ++i) {
         uint256_t value_bit = exponent_value & 1;
@@ -510,32 +523,38 @@ template <typename Builder> field_t<Builder> field_t<Builder>::normalize() const
 
 template <typename Builder> void field_t<Builder>::assert_is_zero(std::string const& msg) const
 {
-    if (get_value() != bb::fr(0)) {
-        context->failure(msg);
-    }
-
-    if (witness_index == IS_CONSTANT) {
-        ASSERT(additive_constant == bb::fr(0));
-        return;
-    }
-
-    // Aim of new gate: this.v * this.mul + this.add == 0
-    // I.e.:
-    // this.v * 0 * [ 0 ] + this.v * [this.mul] + 0 * [ 0 ] + 0 * [ 0 ] + [this.add] == 0
-    // this.v * 0 * [q_m] + this.v * [   q_l  ] + 0 * [q_r] + 0 * [q_o] + [   q_c  ] == 0
+    if constexpr (IsSimulator<Builder>) {
+        if (get_value() != 0) {
+            context->failure(msg);
+        }
+    } else {
+        if (get_value() != bb::fr(0)) {
+            context->failure(msg);
+        }
 
-    Builder* ctx = context;
+        if (witness_index == IS_CONSTANT) {
+            ASSERT(additive_constant == bb::fr(0));
+            return;
+        }
 
-    context->create_poly_gate({
-        .a = witness_index,
-        .b = ctx->zero_idx,
-        .c = ctx->zero_idx,
-        .q_m = bb::fr(0),
-        .q_l = multiplicative_constant,
-        .q_r = bb::fr(0),
-        .q_o = bb::fr(0),
-        .q_c = additive_constant,
-    });
+        // Aim of new gate: this.v * this.mul + this.add == 0
+        // I.e.:
+        // this.v * 0 * [ 0 ] + this.v * [this.mul] + 0 * [ 0 ] + 0 * [ 0 ] + [this.add] == 0
+        // this.v * 0 * [q_m] + this.v * [   q_l  ] + 0 * [q_r] + 0 * [q_o] + [   q_c  ] == 0
+
+        Builder* ctx = context;
+
+        context->create_poly_gate({
+            .a = witness_index,
+            .b = ctx->zero_idx,
+            .c = ctx->zero_idx,
+            .q_m = bb::fr(0),
+            .q_l = multiplicative_constant,
+            .q_r = bb::fr(0),
+            .q_o = bb::fr(0),
+            .q_c = additive_constant,
+        });
+    }
 }
 
 template <typename Builder> void field_t<Builder>::assert_is_not_zero(std::string const& msg) const
@@ -545,19 +564,20 @@ template <typename Builder> void field_t<Builder>::assert_is_not_zero(std::strin
         // We don't return; we continue with the function, for debugging purposes.
     }
 
-    if (witness_index == IS_CONSTANT) {
-        ASSERT(additive_constant != bb::fr(0));
-        return;
+    if constexpr (!IsSimulator<Builder>) {
+        if (witness_index == IS_CONSTANT) {
+            ASSERT(additive_constant != bb::fr(0));
+            return;
+        }
     }
 
-    Builder* ctx = context;
-    if (get_value() == 0 && ctx) {
-        ctx->failure(msg);
+    if (get_value() == 0 && context) {
+        context->failure(msg);
     }
 
     bb::fr inverse_value = (get_value() == 0) ? 0 : get_value().invert();
 
-    field_t<Builder> inverse(witness_t<Builder>(ctx, inverse_value));
+    field_t<Builder> inverse(witness_t<Builder>(context, inverse_value));
 
     // Aim of new gate: `this` has an inverse (hence is not zero).
     // I.e.:
@@ -569,7 +589,7 @@ template <typename Builder> void field_t<Builder>::assert_is_not_zero(std::strin
     context->create_poly_gate({
         .a = witness_index,             // input value
         .b = inverse.witness_index,     // inverse
-        .c = ctx->zero_idx,             // no output
+        .c = context->zero_idx,         // no output
         .q_m = multiplicative_constant, // a * b * mul_const
         .q_l = bb::fr(0),               // a * 0
         .q_r = additive_constant,       // b * mul_const
@@ -714,19 +734,23 @@ field_t<Builder> field_t<Builder>::conditional_assign(const bool_t<Builder>& pre
 template <typename Builder>
 void field_t<Builder>::create_range_constraint(const size_t num_bits, std::string const& msg) const
 {
-    if (num_bits == 0) {
-        assert_is_zero("0-bit range_constraint on non-zero field_t.");
+    if constexpr (IsSimulator<Builder>) {
+        context->create_range_constraint(get_value(), num_bits, msg);
     } else {
-        if (is_constant()) {
-            ASSERT(uint256_t(get_value()).get_msb() < num_bits);
+        if (num_bits == 0) {
+            assert_is_zero("0-bit range_constraint on non-zero field_t.");
         } else {
-            if constexpr (HasPlookup<Builder>) {
-                context->decompose_into_default_range(normalize().get_witness_index(),
-                                                      num_bits,
-                                                      bb::UltraCircuitBuilder::DEFAULT_PLOOKUP_RANGE_BITNUM,
-                                                      msg);
+            if (is_constant()) {
+                ASSERT(uint256_t(get_value()).get_msb() < num_bits);
             } else {
-                context->decompose_into_base4_accumulators(normalize().get_witness_index(), num_bits, msg);
+                if constexpr (HasPlookup<Builder>) {
+                    context->decompose_into_default_range(normalize().get_witness_index(),
+                                                          num_bits,
+                                                          bb::UltraCircuitBuilder::DEFAULT_PLOOKUP_RANGE_BITNUM,
+                                                          msg);
+                } else {
+                    context->decompose_into_base4_accumulators(normalize().get_witness_index(), num_bits, msg);
+                }
             }
         }
     }
@@ -744,7 +768,9 @@ template <typename Builder> void field_t<Builder>::assert_equal(const field_t& r
     const field_t lhs = *this;
     Builder* ctx = lhs.get_context() ? lhs.get_context() : rhs.get_context();
 
-    if (lhs.is_constant() && rhs.is_constant()) {
+    if constexpr (IsSimulator<Builder>) {
+        ctx->assert_equal(lhs.get_value(), rhs.get_value(), msg);
+    } else if (lhs.is_constant() && rhs.is_constant()) {
         ASSERT(lhs.get_value() == rhs.get_value());
     } else if (lhs.is_constant()) {
         field_t right = rhs.normalize();
@@ -1103,9 +1129,10 @@ std::vector<bool_t<Builder>> field_t<Builder>::decompose_into_bits(
     }
 
     this->assert_equal(sum); // `this` and `sum` are both normalized here.
+
+    // If value can be larger than modulus we must enforce unique representation
     constexpr uint256_t modulus_minus_one = fr::modulus - 1;
     auto modulus_bits = modulus_minus_one.get_msb() + 1;
-    // If value can be larger than modulus we must enforce unique representation
     if (num_bits >= modulus_bits) {
         // r - 1 = p_lo + 2**128 * p_hi
         const fr p_lo = modulus_minus_one.slice(0, 128);
@@ -1119,21 +1146,30 @@ std::vector<bool_t<Builder>> field_t<Builder>::decompose_into_bits(
         y_lo += shifted_high_limb;
         y_lo.normalize();
 
-        // A carry was necessary if and only if the 128th bit y_lo_hi of y_lo is 0.
-        auto [y_lo_lo, y_lo_hi, zeros] = y_lo.slice(128, 128);
-        // This copy constraint, along with the constraints of field_t::slice, imposes that y_lo has bit length 129.
-        // Since the integer y_lo is at least -2**128+1, which has more than 129 bits in `Fr`, the implicit range
-        // constraint shows that y_lo is non-negative.
-        context->assert_equal(
-            zeros.witness_index, context->zero_idx, "field_t: bit decomposition_fails: high limb non-zero");
-        // y_borrow is the boolean "a carry was necessary"
-        field_t<Builder> y_borrow = -(y_lo_hi - 1);
-        // If a carry was necessary, subtract that carry from p_hi
-        // y_hi = (p_hi - y_borrow) - sum_hi
-        field_t<Builder> y_hi = -(shifted_high_limb / shift) + (p_hi);
-        y_hi -= y_borrow;
-        // As before, except that now the range constraint is explicit, this shows that y_hi is non-negative.
-        y_hi.create_range_constraint(128, "field_t: bit decomposition fails: y_hi is too large.");
+        if constexpr (IsSimulator<Builder>) {
+            fr sum_lo = shift + p_lo - y_lo.get_value();
+            auto sum_nonreduced =
+                static_cast<uint256_t>(sum_lo) + static_cast<uint256_t>(shifted_high_limb.get_value());
+            if (sum_nonreduced > modulus_minus_one) {
+                context->failure("Bit decomposition describes non-reduced form of a field element.");
+            }
+        } else {
+            // A carry was necessary if and only if the 128th bit y_lo_hi of y_lo is 0.
+            auto [y_lo_lo, y_lo_hi, zeros] = y_lo.slice(128, 128);
+            // This copy constraint, along with the constraints of field_t::slice, imposes that y_lo has bit length 129.
+            // Since the integer y_lo is at least -2**128+1, which has more than 129 bits in `Fr`, the implicit range
+            // constraint shows that y_lo is non-negative.
+            context->assert_equal(
+                zeros.witness_index, context->zero_idx, "field_t: bit decomposition_fails: high limb non-zero");
+            // y_borrow is the boolean "a carry was necessary"
+            field_t<Builder> y_borrow = -(y_lo_hi - 1);
+            // If a carry was necessary, subtract that carry from p_hi
+            // y_hi = (p_hi - y_borrow) - sum_hi
+            field_t<Builder> y_hi = -(shifted_high_limb / shift) + (p_hi);
+            y_hi -= y_borrow;
+            // As before, except that now the range constraint is explicit, this shows that y_hi is non-negative.
+            y_hi.create_range_constraint(128, "field_t: bit decomposition fails: y_hi is too large.");
+        }
     }
 
     return result;
@@ -1142,5 +1178,6 @@ std::vector<bool_t<Builder>> field_t<Builder>::decompose_into_bits(
 template class field_t<bb::StandardCircuitBuilder>;
 template class field_t<bb::UltraCircuitBuilder>;
 template class field_t<bb::GoblinUltraCircuitBuilder>;
+template class field_t<bb::CircuitSimulatorBN254>;
 
 } // namespace bb::stdlib
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.hpp
index 3e2ea89f551f..d16f51198a51 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.hpp
@@ -265,7 +265,15 @@ template <typename Builder> class field_t {
     void assert_is_not_zero(std::string const& msg = "field_t::assert_is_not_zero") const;
     void assert_is_zero(std::string const& msg = "field_t::assert_is_zero") const;
     bool is_constant() const { return witness_index == IS_CONSTANT; }
-    void set_public() const { context->set_public_input(normalize().witness_index); }
+    void set_public() const
+    {
+        if constexpr (IsSimulator<Builder>) {
+            auto value = normalize().get_value();
+            context->set_public_input(value);
+        } else {
+            context->set_public_input(normalize().witness_index);
+        }
+    }
 
     /**
      * Create a witness form a constant. This way the value of the witness is fixed and public (public, because the
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp
index a3cc221b2d7c..76ecb764289e 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp
@@ -19,24 +19,11 @@ template <class T> void ignore_unused(T&) {} // use to ignore unused variables i
 using namespace bb;
 
 template <typename Builder> class stdlib_field : public testing::Test {
-    typedef stdlib::bool_t<Builder> bool_ct;
-    typedef stdlib::field_t<Builder> field_ct;
-    typedef stdlib::witness_t<Builder> witness_ct;
-    typedef stdlib::public_witness_t<Builder> public_witness_ct;
+    using bool_ct = stdlib::bool_t<Builder>;
+    using field_ct = stdlib::field_t<Builder>;
+    using witness_ct = stdlib::witness_t<Builder>;
+    using public_witness_ct = stdlib::public_witness_t<Builder>;
 
-    static void fibbonaci(Builder& builder)
-    {
-        field_ct a(witness_ct(&builder, fr::one()));
-        field_ct b(witness_ct(&builder, fr::one()));
-
-        field_ct c = a + b;
-
-        for (size_t i = 0; i < 17; ++i) {
-            b = a;
-            a = c;
-            c = a + b;
-        }
-    }
     static uint64_t fidget(Builder& builder)
     {
         field_ct a(public_witness_ct(&builder, fr::one())); // a is a legit wire value in our circuit
@@ -84,6 +71,14 @@ template <typename Builder> class stdlib_field : public testing::Test {
     }
 
   public:
+    static void test_constructor_from_witness()
+    {
+        bb::fr val = 2;
+        Builder builder = Builder();
+        field_ct elt(witness_ct(&builder, val));
+        EXPECT_EQ(elt.get_value(), val);
+    }
+
     static void create_range_constraint()
     {
         auto run_test = [&](fr elt, size_t num_bits, bool expect_verified) {
@@ -117,61 +112,81 @@ template <typename Builder> class stdlib_field : public testing::Test {
      */
     static void test_assert_equal()
     {
-        auto run_test = [](bool constrain, bool true_when_y_val_zero = true) {
-            Builder builder = Builder();
-            field_ct x = witness_ct(&builder, 1);
-            field_ct y = witness_ct(&builder, 0);
-
-            // With no constraints, the proof verification will pass even though
-            // we assert x and y are equal.
-            bool expected_result = true;
-
-            if (constrain) {
-                /* The fact that we have a passing test in both cases that follow tells us
-                 * that the failure in the first case comes from the additive constraint,
-                 * not from a copy constraint. That failure is because the assert_equal
-                 * below says that 'the value of y was always x'--the value 1 is substituted
-                 * for x when evaluating the gate identity.
-                 */
-                if (true_when_y_val_zero) {
-                    // constraint: 0*x + 1*y + 0*0 + 0 == 0
-
-                    builder.create_add_gate({ .a = x.witness_index,
-                                              .b = y.witness_index,
-                                              .c = builder.zero_idx,
-                                              .a_scaling = 0,
-                                              .b_scaling = 1,
-                                              .c_scaling = 0,
-                                              .const_scaling = 0 });
-                    expected_result = false;
+        if constexpr (IsSimulator<Builder>) {
+            auto run_test = [](bool expect_failure) {
+                Builder simulator;
+                auto lhs = bb::fr::random_element();
+                auto rhs = lhs;
+                if (expect_failure) {
+                    lhs++;
+                }
+                simulator.assert_equal(lhs, rhs, "testing assert equal");
+                if (expect_failure) {
+                    ASSERT_TRUE(simulator.failed());
                 } else {
-                    // constraint: 0*x + 1*y + 0*0 - 1 == 0
-
-                    builder.create_add_gate({ .a = x.witness_index,
-                                              .b = y.witness_index,
-                                              .c = builder.zero_idx,
-                                              .a_scaling = 0,
-                                              .b_scaling = 1,
-                                              .c_scaling = 0,
-                                              .const_scaling = -1 });
-                    expected_result = true;
+                    ASSERT_FALSE(simulator.failed());
+                }
+            };
+            run_test(true);
+            run_test(false);
+        } else {
+
+            auto run_test = [](bool constrain, bool true_when_y_val_zero = true) {
+                Builder builder = Builder();
+                field_ct x = witness_ct(&builder, 1);
+                field_ct y = witness_ct(&builder, 0);
+
+                // With no constraints, the proof verification will pass even though
+                // we assert x and y are equal.
+                bool expected_result = true;
+
+                if (constrain) {
+                    /* The fact that we have a passing test in both cases that follow tells us
+                     * that the failure in the first case comes from the additive constraint,
+                     * not from a copy constraint. That failure is because the assert_equal
+                     * below says that 'the value of y was always x'--the value 1 is substituted
+                     * for x when evaluating the gate identity.
+                     */
+                    if (true_when_y_val_zero) {
+                        // constraint: 0*x + 1*y + 0*0 + 0 == 0
+
+                        builder.create_add_gate({ .a = x.witness_index,
+                                                  .b = y.witness_index,
+                                                  .c = builder.zero_idx,
+                                                  .a_scaling = 0,
+                                                  .b_scaling = 1,
+                                                  .c_scaling = 0,
+                                                  .const_scaling = 0 });
+                        expected_result = false;
+                    } else {
+                        // constraint: 0*x + 1*y + 0*0 - 1 == 0
+
+                        builder.create_add_gate({ .a = x.witness_index,
+                                                  .b = y.witness_index,
+                                                  .c = builder.zero_idx,
+                                                  .a_scaling = 0,
+                                                  .b_scaling = 1,
+                                                  .c_scaling = 0,
+                                                  .const_scaling = -1 });
+                        expected_result = true;
+                    }
                 }
-            }
 
-            x.assert_equal(y);
+                x.assert_equal(y);
 
-            // both field elements have real value 1 now
-            EXPECT_EQ(x.get_value(), 1);
-            EXPECT_EQ(y.get_value(), 1);
+                // both field elements have real value 1 now
+                EXPECT_EQ(x.get_value(), 1);
+                EXPECT_EQ(y.get_value(), 1);
 
-            bool result = CircuitChecker::check(builder);
+                bool result = CircuitChecker::check(builder);
 
-            EXPECT_EQ(result, expected_result);
-        };
+                EXPECT_EQ(result, expected_result);
+            };
 
-        run_test(false);
-        run_test(true, true);
-        run_test(true, false);
+            run_test(false);
+            run_test(true, true);
+            run_test(true, false);
+        }
     }
 
     static void test_add_mul_with_constants()
@@ -179,10 +194,12 @@ template <typename Builder> class stdlib_field : public testing::Test {
         Builder builder = Builder();
         auto gates_before = builder.get_num_gates();
         uint64_t expected = fidget(builder);
-        auto gates_after = builder.get_num_gates();
-        auto& block = builder.blocks.arithmetic;
-        EXPECT_EQ(builder.get_variable(block.w_o()[block.size() - 1]), fr(expected));
-        info("Number of gates added", gates_after - gates_before);
+        if constexpr (!IsSimulator<Builder>) {
+            auto gates_after = builder.get_num_gates();
+            auto& block = builder.blocks.arithmetic;
+            EXPECT_EQ(builder.get_variable(block.w_o()[block.size() - 1]), fr(expected));
+            info("Number of gates added", gates_after - gates_before);
+        }
         bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
     }
@@ -252,12 +269,18 @@ template <typename Builder> class stdlib_field : public testing::Test {
     static void test_field_fibbonaci()
     {
         Builder builder = Builder();
-        auto gates_before = builder.get_num_gates();
-        fibbonaci(builder);
-        auto gates_after = builder.get_num_gates();
-        auto& block = builder.blocks.arithmetic;
-        EXPECT_EQ(builder.get_variable(block.w_l()[block.size() - 1]), fr(4181));
-        EXPECT_EQ(gates_after - gates_before, 18UL);
+        field_ct a(witness_ct(&builder, fr::one()));
+        field_ct b(witness_ct(&builder, fr::one()));
+
+        field_ct c = a + b;
+
+        for (size_t i = 0; i < 16; ++i) {
+            b = a;
+            a = c;
+            c = a + b;
+        }
+
+        EXPECT_EQ(c.get_value(), fr(4181));
 
         bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
@@ -282,9 +305,6 @@ template <typename Builder> class stdlib_field : public testing::Test {
 
         bool verified = CircuitChecker::check(builder);
 
-        for (size_t i = 0; i < builder.variables.size(); i++) {
-            info(i, builder.variables[i]);
-        }
         ASSERT_TRUE(verified);
     }
 
@@ -299,14 +319,14 @@ template <typename Builder> class stdlib_field : public testing::Test {
         auto gates_after = builder.get_num_gates();
         EXPECT_EQ(r.get_value(), true);
 
-        fr x = builder.get_variable(r.witness_index);
+        fr x = r.get_value();
         EXPECT_EQ(x, fr(1));
 
         // This logic requires on madd in field, which creates a big mul gate.
         // This gate is implemented in standard by create 2 actual gates, while in ultra there are 2
         if constexpr (std::same_as<Builder, StandardCircuitBuilder>) {
             EXPECT_EQ(gates_after - gates_before, 6UL);
-        } else {
+        } else if (std::same_as<Builder, UltraCircuitBuilder>) {
             EXPECT_EQ(gates_after - gates_before, 4UL);
         }
 
@@ -327,14 +347,14 @@ template <typename Builder> class stdlib_field : public testing::Test {
 
         auto gates_after = builder.get_num_gates();
 
-        fr x = builder.get_variable(r.witness_index);
+        fr x = r.get_value();
         EXPECT_EQ(x, fr(0));
 
         // This logic requires on madd in field, which creates a big mul gate.
         // This gate is implemented in standard by create 2 actual gates, while in ultra there are 2
         if constexpr (std::same_as<Builder, StandardCircuitBuilder>) {
             EXPECT_EQ(gates_after - gates_before, 6UL);
-        } else {
+        } else if (std::same_as<Builder, UltraCircuitBuilder>) {
             EXPECT_EQ(gates_after - gates_before, 4UL);
         }
 
@@ -356,14 +376,14 @@ template <typename Builder> class stdlib_field : public testing::Test {
 
         auto gates_after = builder.get_num_gates();
 
-        fr x = builder.get_variable(r.witness_index);
+        fr x = r.get_value();
         EXPECT_EQ(x, fr(1));
 
         // This logic requires on madd in field, which creates a big mul gate.
         // This gate is implemented in standard by create 2 actual gates, while in ultra there are 2
         if constexpr (std::same_as<Builder, StandardCircuitBuilder>) {
             EXPECT_EQ(gates_after - gates_before, 11UL);
-        } else {
+        } else if (std::same_as<Builder, UltraCircuitBuilder>) {
             EXPECT_EQ(gates_after - gates_before, 7UL);
         }
 
@@ -853,10 +873,12 @@ template <typename Builder> class stdlib_field : public testing::Test {
         EXPECT_EQ(value_ct.get_value(), value);
         EXPECT_EQ(first_copy.get_value(), value);
         EXPECT_EQ(second_copy.get_value(), value);
-        EXPECT_EQ(value_ct.get_witness_index() + 1, first_copy.get_witness_index());
-        EXPECT_EQ(value_ct.get_witness_index() + 2, second_copy.get_witness_index());
 
-        info("num gates = ", builder.get_num_gates());
+        if (!IsSimulator<Builder>) {
+            EXPECT_EQ(value_ct.get_witness_index() + 1, first_copy.get_witness_index());
+            EXPECT_EQ(value_ct.get_witness_index() + 2, second_copy.get_witness_index());
+            info("num gates = ", builder.get_num_gates());
+        }
 
         bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
@@ -905,12 +927,35 @@ template <typename Builder> class stdlib_field : public testing::Test {
         bool check_result = CircuitChecker::check(builder);
         EXPECT_EQ(check_result, true);
     }
+
+    static void test_add_two()
+    {
+        Builder composer = Builder();
+        auto x_1 = bb::fr::random_element();
+        auto x_2 = bb::fr::random_element();
+        auto x_3 = bb::fr::random_element();
+
+        field_ct x_1_ct = witness_ct(&composer, x_1);
+        field_ct x_2_ct = witness_ct(&composer, x_2);
+        field_ct x_3_ct = witness_ct(&composer, x_3);
+
+        auto sum_ct = x_1_ct.add_two(x_2_ct, x_3_ct);
+
+        EXPECT_EQ(sum_ct.get_value(), x_1 + x_2 + x_3);
+
+        bool circuit_checks = composer.check_circuit();
+        EXPECT_TRUE(circuit_checks);
+    }
 };
 
-typedef testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder> CircuitTypes;
+using CircuitTypes = testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder, bb::CircuitSimulatorBN254>;
 
 TYPED_TEST_SUITE(stdlib_field, CircuitTypes);
 
+TYPED_TEST(stdlib_field, test_constructor_from_witness)
+{
+    TestFixture::test_constructor_from_witness();
+}
 TYPED_TEST(stdlib_field, test_create_range_constraint)
 {
     TestFixture::create_range_constraint();
@@ -919,10 +964,7 @@ TYPED_TEST(stdlib_field, test_assert_equal)
 {
     TestFixture::test_assert_equal();
 }
-TYPED_TEST(stdlib_field, test_add_mul_with_constants)
-{
-    TestFixture::test_add_mul_with_constants();
-}
+
 TYPED_TEST(stdlib_field, test_div)
 {
     TestFixture::test_div();
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.cpp
index ffc92ce12248..bbaa229dd913 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.cpp
@@ -34,86 +34,90 @@ field_t<Builder> logic<Builder>::create_logic_constraint(
     ASSERT(num_bits < 254);
     ASSERT(num_bits > 0);
 
-    if (a.is_constant() && b.is_constant()) {
+    if constexpr (IsSimulator<Builder>) {
         uint256_t a_native(a.get_value());
         uint256_t b_native(b.get_value());
         uint256_t c_native = is_xor_gate ? (a_native ^ b_native) : (a_native & b_native);
         return field_t<Builder>(c_native);
-    }
-    if (a.is_constant() && !b.is_constant()) {
-        Builder* ctx = b.get_context();
-        uint256_t a_native(a.get_value());
-        field_pt a_witness = field_pt::from_witness_index(ctx, ctx->put_constant_variable(a_native));
-        return create_logic_constraint(a_witness, b, num_bits, is_xor_gate, get_chunk);
-    }
-    if (!a.is_constant() && b.is_constant()) {
-        Builder* ctx = a.get_context();
-        uint256_t b_native(b.get_value());
-        field_pt b_witness = field_pt::from_witness_index(ctx, ctx->put_constant_variable(b_native));
-        return create_logic_constraint(a, b_witness, num_bits, is_xor_gate, get_chunk);
-    }
-    if constexpr (HasPlookup<Builder>) {
-        Builder* ctx = a.get_context();
+    } else {
+        if (a.is_constant() && !b.is_constant()) {
+            Builder* ctx = b.get_context();
+            uint256_t a_native(a.get_value());
+            field_pt a_witness = field_pt::from_witness_index(ctx, ctx->put_constant_variable(a_native));
+            return create_logic_constraint(a_witness, b, num_bits, is_xor_gate, get_chunk);
+        }
+        if (!a.is_constant() && b.is_constant()) {
+            Builder* ctx = a.get_context();
+            uint256_t b_native(b.get_value());
+            field_pt b_witness = field_pt::from_witness_index(ctx, ctx->put_constant_variable(b_native));
+            return create_logic_constraint(a, b_witness, num_bits, is_xor_gate, get_chunk);
+        }
+        if constexpr (HasPlookup<Builder>) {
+            Builder* ctx = a.get_context();
 
-        const size_t num_chunks = (num_bits / 32) + ((num_bits % 32 == 0) ? 0 : 1);
-        auto left((uint256_t)a.get_value());
-        auto right((uint256_t)b.get_value());
+            const size_t num_chunks = (num_bits / 32) + ((num_bits % 32 == 0) ? 0 : 1);
+            auto left((uint256_t)a.get_value());
+            auto right((uint256_t)b.get_value());
 
-        field_pt a_accumulator(bb::fr::zero());
-        field_pt b_accumulator(bb::fr::zero());
+            field_pt a_accumulator(bb::fr::zero());
+            field_pt b_accumulator(bb::fr::zero());
 
-        field_pt res(ctx, 0);
-        for (size_t i = 0; i < num_chunks; ++i) {
-            size_t chunk_size = (i != num_chunks - 1) ? 32 : num_bits - i * 32;
-            auto [left_chunk, right_chunk] = get_chunk(left, right, chunk_size);
+            field_pt res(ctx, 0);
+            for (size_t i = 0; i < num_chunks; ++i) {
+                size_t chunk_size = (i != num_chunks - 1) ? 32 : num_bits - i * 32;
+                auto [left_chunk, right_chunk] = get_chunk(left, right, chunk_size);
 
-            field_pt a_chunk = witness_pt(ctx, left_chunk);
-            field_pt b_chunk = witness_pt(ctx, right_chunk);
-            field_pt result_chunk = 0;
-            if (is_xor_gate) {
-                result_chunk = stdlib::plookup_read<Builder>::read_from_2_to_1_table(
-                    plookup::MultiTableId::UINT32_XOR, a_chunk, b_chunk);
+                field_pt a_chunk = witness_pt(ctx, left_chunk);
+                field_pt b_chunk = witness_pt(ctx, right_chunk);
+                field_pt result_chunk = 0;
+                if (is_xor_gate) {
+                    result_chunk = stdlib::plookup_read<Builder>::read_from_2_to_1_table(
+                        plookup::MultiTableId::UINT32_XOR, a_chunk, b_chunk);
 
-            } else {
-                result_chunk = stdlib::plookup_read<Builder>::read_from_2_to_1_table(
-                    plookup::MultiTableId::UINT32_AND, a_chunk, b_chunk);
-            }
+                } else {
+                    result_chunk = stdlib::plookup_read<Builder>::read_from_2_to_1_table(
+                        plookup::MultiTableId::UINT32_AND, a_chunk, b_chunk);
+                }
 
-            auto scaling_factor = uint256_t(1) << (32 * i);
-            a_accumulator += a_chunk * scaling_factor;
-            b_accumulator += b_chunk * scaling_factor;
+                auto scaling_factor = uint256_t(1) << (32 * i);
+                a_accumulator += a_chunk * scaling_factor;
+                b_accumulator += b_chunk * scaling_factor;
 
-            if (chunk_size != 32) {
-                ctx->create_range_constraint(
-                    a_chunk.witness_index, chunk_size, "stdlib logic: bad range on final chunk of left operand");
-                ctx->create_range_constraint(
-                    b_chunk.witness_index, chunk_size, "stdlib logic: bad range on final chunk of right operand");
-            }
+                if (chunk_size != 32) {
+                    ctx->create_range_constraint(
+                        a_chunk.witness_index, chunk_size, "stdlib logic: bad range on final chunk of left operand");
+                    ctx->create_range_constraint(
+                        b_chunk.witness_index, chunk_size, "stdlib logic: bad range on final chunk of right operand");
+                }
 
-            res += result_chunk * scaling_factor;
+                res += result_chunk * scaling_factor;
 
-            left = left >> 32;
-            right = right >> 32;
-        }
-        field_pt a_slice = a.slice(static_cast<uint8_t>(num_bits - 1), 0)[1];
-        field_pt b_slice = b.slice(static_cast<uint8_t>(num_bits - 1), 0)[1];
-        a_slice.assert_equal(a_accumulator, "stdlib logic: failed to reconstruct left operand");
-        b_slice.assert_equal(b_accumulator, "stdlib logic: failed to reconstruct right operand");
+                left = left >> 32;
+                right = right >> 32;
+            }
+            field_pt a_slice = a.slice(static_cast<uint8_t>(num_bits - 1), 0)[1];
+            field_pt b_slice = b.slice(static_cast<uint8_t>(num_bits - 1), 0)[1];
+            a_slice.assert_equal(a_accumulator, "stdlib logic: failed to reconstruct left operand");
+            b_slice.assert_equal(b_accumulator, "stdlib logic: failed to reconstruct right operand");
 
-        return res;
-    } else {
-        // If the builder doesn't have lookups we call the expensive logic constraint gate
-        // which creates constraints for each bit. We only create constraints up to num_bits.
-        Builder* ctx = a.get_context();
-        field_pt a_slice = a.slice(static_cast<uint8_t>(num_bits - 1), 0)[1];
-        field_pt b_slice = b.slice(static_cast<uint8_t>(num_bits - 1), 0)[1];
-        auto accumulator_triple = ctx->create_logic_constraint(
-            a_slice.normalize().get_witness_index(), b_slice.normalize().get_witness_index(), num_bits, is_xor_gate);
-        auto out_idx = accumulator_triple.out[accumulator_triple.out.size() - 1];
-        return field_t<Builder>::from_witness_index(ctx, out_idx);
+            return res;
+        } else {
+            // If the builder doesn't have lookups we call the expensive logic constraint gate
+            // which creates constraints for each bit. We only create constraints up to num_bits.
+            Builder* ctx = a.get_context();
+            field_pt a_slice = a.slice(static_cast<uint8_t>(num_bits - 1), 0)[1];
+            field_pt b_slice = b.slice(static_cast<uint8_t>(num_bits - 1), 0)[1];
+            auto accumulator_triple = ctx->create_logic_constraint(a_slice.normalize().get_witness_index(),
+                                                                   b_slice.normalize().get_witness_index(),
+                                                                   num_bits,
+                                                                   is_xor_gate);
+            auto out_idx = accumulator_triple.out[accumulator_triple.out.size() - 1];
+            return field_t<Builder>::from_witness_index(ctx, out_idx);
+        }
     }
 }
 template class logic<bb::StandardCircuitBuilder>;
 template class logic<bb::UltraCircuitBuilder>;
 template class logic<bb::GoblinUltraCircuitBuilder>;
+template class logic<bb::CircuitSimulatorBN254>;
 } // namespace bb::stdlib
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.test.cpp
index 55cefd0f3f03..350c93a4f771 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.test.cpp
@@ -26,7 +26,7 @@ template <class T> void ignore_unused(T&) {} // use to ignore unused variables i
 
 template <class Builder> class LogicTest : public testing::Test {};
 
-using CircuitTypes = ::testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder>;
+using CircuitTypes = ::testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder, bb::CircuitSimulatorBN254>;
 
 TYPED_TEST_SUITE(LogicTest, CircuitTypes);
 
@@ -91,6 +91,9 @@ TYPED_TEST(LogicTest, TestCorrectLogic)
 TYPED_TEST(LogicTest, LargeOperands)
 {
     STDLIB_TYPE_ALIASES
+    if constexpr (IsSimulator<Builder>) {
+        GTEST_SKIP() << "Skipping this test for the simulator";
+    }
     auto builder = Builder();
 
     uint256_t mask = (uint256_t(1) << 48) - 1;
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.cpp
index d4ca9f54ed24..5a98c060d737 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.cpp
@@ -265,6 +265,7 @@ template <typename Builder> std::string packed_byte_array<Builder>::get_value()
     return bytes;
 }
 
+template class packed_byte_array<bb::CircuitSimulatorBN254>;
 template class packed_byte_array<bb::StandardCircuitBuilder>;
 template class packed_byte_array<bb::UltraCircuitBuilder>;
 template class packed_byte_array<bb::GoblinUltraCircuitBuilder>;
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp
index ccfd1a90dd43..00c007e6e7fb 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp
@@ -20,7 +20,7 @@ auto& engine = numeric::get_debug_randomness();
 
 template <class Builder> class PackedByteArrayTest : public ::testing::Test {};
 
-using CircuitTypes = ::testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder>;
+using CircuitTypes = ::testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder, bb::CircuitSimulatorBN254>;
 TYPED_TEST_SUITE(PackedByteArrayTest, CircuitTypes);
 
 TYPED_TEST(PackedByteArrayTest, string_constructor_and_get_value_consistency)
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.cpp
index 6e065c1d7f0f..9de7ba4b328c 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.cpp
@@ -92,4 +92,5 @@ field_t<Builder> plookup_read<Builder>::read_from_1_to_2_table(const MultiTableI
 
 template class plookup_read<bb::UltraCircuitBuilder>;
 template class plookup_read<bb::GoblinUltraCircuitBuilder>;
+template class plookup_read<bb::CircuitSimulatorBN254>;
 } // namespace bb::stdlib
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.test.cpp
index 8103f159e34f..d9ccfec43a16 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.test.cpp
@@ -22,7 +22,7 @@ namespace {
 auto& engine = numeric::get_debug_randomness();
 }
 
-// TODO FIX FIX
+// TODO(https://github.com/AztecProtocol/barretenberg/issues/953): Re-enable these tests
 // TEST(stdlib_plookup, pedersen_lookup_left)
 // {
 //     Builder builder = Builder();
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.cpp
index 524ce8324b76..f19faa6b5403 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.cpp
@@ -36,7 +36,9 @@ safe_uint_t<Builder> safe_uint_t<Builder>::subtract(const safe_uint_t& other,
                                                     std::string const& description) const
 {
     ASSERT(difference_bit_size <= MAX_BIT_NUM);
-    ASSERT(!(this->value.is_constant() && other.value.is_constant()));
+    if constexpr (!IsSimulator<Builder>) {
+        ASSERT(!(this->value.is_constant() && other.value.is_constant()));
+    }
     field_ct difference_val = this->value - other.value;
     // Creates the range constraint that difference_val is in [0, (1<<difference_bit_size) - 1].
     safe_uint_t<Builder> difference(difference_val, difference_bit_size, format("subtract: ", description));
@@ -66,8 +68,10 @@ safe_uint_t<Builder> safe_uint_t<Builder>::subtract(const safe_uint_t& other,
 template <typename Builder> safe_uint_t<Builder> safe_uint_t<Builder>::operator-(const safe_uint_t& other) const
 {
     // If both are constants and the operation is an underflow, throw an error since circuit itself underflows
-    ASSERT(!(this->value.is_constant() && other.value.is_constant() &&
-             static_cast<uint256_t>(value.get_value()) < static_cast<uint256_t>(other.value.get_value())));
+    if constexpr (!IsSimulator<Builder>) {
+        ASSERT(!(this->value.is_constant() && other.value.is_constant() &&
+                 static_cast<uint256_t>(value.get_value()) < static_cast<uint256_t>(other.value.get_value())));
+    }
     field_ct difference_val = this->value - other.value;
 
     // safe_uint_t constructor creates a range constraint which checks that `difference_val` is within [0,
@@ -107,7 +111,9 @@ safe_uint_t<Builder> safe_uint_t<Builder>::divide(
     std::string const& description,
     const std::function<std::pair<uint256_t, uint256_t>(uint256_t, uint256_t)>& get_quotient) const
 {
-    ASSERT(this->value.is_constant() == false);
+    if constexpr (!IsSimulator<Builder>) {
+        ASSERT(this->value.is_constant() == false);
+    }
     ASSERT(quotient_bit_size <= MAX_BIT_NUM);
     ASSERT(remainder_bit_size <= MAX_BIT_NUM);
     uint256_t val = this->value.get_value();
@@ -141,7 +147,9 @@ safe_uint_t<Builder> safe_uint_t<Builder>::divide(
  */
 template <typename Builder> safe_uint_t<Builder> safe_uint_t<Builder>::operator/(const safe_uint_t& other) const
 {
-    ASSERT(this->value.is_constant() == false);
+    if constexpr (!IsSimulator<Builder>) {
+        ASSERT(this->value.is_constant() == false);
+    }
     uint256_t val = this->value.get_value();
     auto [quotient_val, remainder_val] = val.divmod((uint256_t)other.value.get_value());
     field_ct quotient_field(witness_t(value.context, quotient_val));
@@ -241,5 +249,6 @@ std::array<safe_uint_t<Builder>, 3> safe_uint_t<Builder>::slice(const uint8_t ms
 template class safe_uint_t<bb::StandardCircuitBuilder>;
 template class safe_uint_t<bb::UltraCircuitBuilder>;
 template class safe_uint_t<bb::GoblinUltraCircuitBuilder>;
+template class safe_uint_t<bb::CircuitSimulatorBN254>;
 
 } // namespace bb::stdlib
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.hpp
index 876f3782b0a6..125e2496cd00 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.hpp
@@ -80,7 +80,7 @@ template <typename Builder> class safe_uint_t {
 
     {
         witness_t<Builder> out(parent_context, value);
-        parent_context->assert_equal_constant(out.witness_index, value);
+        parent_context->assert_equal_constant(out.witness_index, value, "create_constant_witness");
         return safe_uint_t(value, uint256_t(value), IS_UNSAFE);
     }
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp
index 63aa1d77549f..98154121f8be 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp
@@ -1,4 +1,3 @@
-
 #include "safe_uint.hpp"
 #include "../byte_array/byte_array.hpp"
 #include "barretenberg/circuit_checker/circuit_checker.hpp"
@@ -31,7 +30,7 @@ template <class T> void ignore_unused(T&) {} // use to ignore unused variables i
 
 template <class Builder> class SafeUintTest : public ::testing::Test {};
 
-using CircuitTypes = ::testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder>;
+using CircuitTypes = ::testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder, bb::CircuitSimulatorBN254>;
 TYPED_TEST_SUITE(SafeUintTest, CircuitTypes);
 
 // CONSTRUCTOR
@@ -332,14 +331,14 @@ TYPED_TEST(SafeUintTest, TestMinusUnderflowSpecial1)
     suint_ct c(a, suint_ct::MAX_BIT_NUM);
     suint_ct d(b, suint_ct::MAX_BIT_NUM);
     try {
-        c = c - d; // even though this is not an underflow, we cannot distinguish it from an actual underflow because
-                   // the sum of maxes exceeds MAX_VALUE so we must throw an error
+        c = c - d; // even though this is not an underflow, we cannot distinguish it from an actual underflow
+                   // because the sum of maxes exceeds MAX_VALUE so we must throw an error
         FAIL() << "Expected error to be thrown";
     } catch (std::runtime_error const& err) {
         EXPECT_TRUE(CircuitChecker::check(builder)); // no incorrect constraints
         EXPECT_EQ(err.what(),
-                  std::string("maximum value exceeded in safe_uint minus operator")); // possible underflow is detected
-                                                                                      // with check on maxes
+                  std::string("maximum value exceeded in safe_uint minus operator")); // possible underflow is
+                                                                                      // detected with check on maxes
     } catch (...) {
         FAIL() << "Expected no error, got other error";
     }
@@ -368,8 +367,8 @@ TYPED_TEST(SafeUintTest, TestMinusUnderflowSpecial2)
     } catch (std::runtime_error const& err) {
         EXPECT_FALSE(CircuitChecker::check(builder)); // underflow causes failing constraint
         EXPECT_EQ(err.what(),
-                  std::string("maximum value exceeded in safe_uint minus operator")); // possible underflow is detected
-                                                                                      // with check on maxes
+                  std::string("maximum value exceeded in safe_uint minus operator")); // possible underflow is
+                                                                                      // detected with check on maxes
     } catch (...) {
         FAIL() << "Expected no error, got other error";
     }
@@ -453,8 +452,8 @@ TYPED_TEST(SafeUintTest, TestDivideMethodQuotientRemainderModRFails)
     suint_ct c(a, 3);
     suint_ct d(b, 5);
     d = d.divide(c, 3, 1, "d/c", [](uint256_t a, uint256_t b) { return std::make_pair((fr)a / (fr)b, 0); });
-    // 19 / 5 in the field is 0x1d08fbde871dc67f6e96903a4db401d17e858b5eaf6f438a5bedf9bf2999999e, so the quotient
-    // should fail the range check of 3-bits.
+    // 19 / 5 in the field is 0x1d08fbde871dc67f6e96903a4db401d17e858b5eaf6f438a5bedf9bf2999999e, so the
+    // quotient should fail the range check of 3-bits.
 
     EXPECT_FALSE(CircuitChecker::check(builder));
 }
@@ -681,8 +680,7 @@ TYPED_TEST(SafeUintTest, TestDivRemainderConstraint)
     suint_ct b(witness_ct(&builder, val), 32);
 
     // set quotient to 0 and remainder to val.
-    auto supply_bad_witnesses = [](uint256_t val, uint256_t divisor) {
-        ignore_unused(divisor);
+    auto supply_bad_witnesses = [](uint256_t val, [[maybe_unused]] uint256_t divisor) {
         return std::make_pair(0, val);
     };
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/arithmetic.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/arithmetic.cpp
index 72c9ff1f42b4..9897f1d74ca9 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/arithmetic.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/arithmetic.cpp
@@ -311,6 +311,7 @@ std::pair<uint<Builder, Native>, uint<Builder, Native>> uint<Builder, Native>::d
         field_t<Builder> one = field_t<Builder>::from_witness_index(context, 1);
         field_t<Builder> zero = field_t<Builder>::from_witness_index(context, 0);
         one / zero;
+        context->failure("uint division by 0.");
     } else if (!other.is_constant()) {
         const bool_t<Builder> is_divisor_zero = field_t<Builder>(other).is_zero();
         field_t<Builder>(is_divisor_zero).assert_equal(0); // here 0 is a circuit constant
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/arithmetic.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/arithmetic.cpp
index 4b72767e086d..ba21cf5f831e 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/arithmetic.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/arithmetic.cpp
@@ -98,46 +98,50 @@ uint_plookup<Builder, Native> uint_plookup<Builder, Native>::operator*(const uin
 
     Builder* ctx = (context == nullptr) ? other.context : context;
 
-    if (is_constant() && other.is_constant()) {
+    if constexpr (IsSimulator<Builder>) {
         return uint_plookup<Builder, Native>(context, (additive_constant * other.additive_constant) & MASK);
+    } else {
+        if (is_constant() && other.is_constant()) {
+            return uint_plookup<Builder, Native>(context, (additive_constant * other.additive_constant) & MASK);
+        }
+        if (is_constant() && !other.is_constant()) {
+            return other * (*this);
+        }
+
+        const uint32_t rhs_idx = other.is_constant() ? ctx->zero_idx : other.witness_index;
+
+        const uint256_t lhs = ctx->variables[witness_index];
+        const uint256_t rhs = ctx->variables[rhs_idx];
+
+        const uint256_t product = (lhs * rhs) + (lhs * other.additive_constant) + (rhs * additive_constant);
+        const uint256_t overflow = product >> width;
+        const uint256_t remainder = product & MASK;
+
+        const mul_quad_<FF> gate{
+            witness_index,
+            rhs_idx,
+            ctx->add_variable(remainder),
+            ctx->add_variable(overflow),
+            FF::one(),
+            other.additive_constant,
+            additive_constant,
+            FF::neg_one(),
+            -FF(CIRCUIT_UINT_MAX_PLUS_ONE),
+            0,
+        };
+
+        ctx->create_big_mul_gate(gate);
+
+        // discard the high bits
+        ctx->decompose_into_default_range(gate.d, width);
+
+        uint_plookup<Builder, Native> result(ctx);
+        result.accumulators = constrain_accumulators(ctx, gate.c);
+        result.witness_index = gate.c;
+        result.witness_status = WitnessStatus::OK;
+
+        return result;
     }
-    if (is_constant() && !other.is_constant()) {
-        return other * (*this);
-    }
-
-    const uint32_t rhs_idx = other.is_constant() ? ctx->zero_idx : other.witness_index;
-
-    const uint256_t lhs = ctx->variables[witness_index];
-    const uint256_t rhs = ctx->variables[rhs_idx];
-
-    const uint256_t product = (lhs * rhs) + (lhs * other.additive_constant) + (rhs * additive_constant);
-    const uint256_t overflow = product >> width;
-    const uint256_t remainder = product & MASK;
-
-    const mul_quad_<FF> gate{
-        witness_index,
-        rhs_idx,
-        ctx->add_variable(remainder),
-        ctx->add_variable(overflow),
-        FF::one(),
-        other.additive_constant,
-        additive_constant,
-        FF::neg_one(),
-        -FF(CIRCUIT_UINT_MAX_PLUS_ONE),
-        0,
-    };
-
-    ctx->create_big_mul_gate(gate);
-
-    // discard the high bits
-    ctx->decompose_into_default_range(gate.d, width);
-
-    uint_plookup<Builder, Native> result(ctx);
-    result.accumulators = constrain_accumulators(ctx, gate.c);
-    result.witness_index = gate.c;
-    result.witness_status = WitnessStatus::OK;
-
-    return result;
 }
 
 template <typename Builder, typename Native>
@@ -182,8 +186,11 @@ std::pair<uint_plookup<Builder, Native>, uint_plookup<Builder, Native>> uint_plo
     if (other.is_constant() && other.get_value() == 0) {
         // TODO: should have an actual error handler!
         const uint32_t one = ctx->add_variable(FF::one());
-        ctx->assert_equal_constant(one, FF::zero());
-        ctx->failure("plookup_arithmetic: divide by zero!");
+        if constexpr (IsSimulator<Builder>) {
+            ctx->assert_equal_constant(FF::one(), FF::zero(), "plookup_arithmetic: divide by zero!");
+        } else {
+            ctx->assert_equal_constant(one, FF::zero(), "plookup_arithmetic: divide by zero!");
+        }
     } else if (!other.is_constant()) {
         const bool_t<Builder> is_divisor_zero = field_t<Builder>(other).is_zero();
         ctx->assert_equal_constant(is_divisor_zero.witness_index, FF::zero(), "plookup_arithmetic: divide by zero!");
@@ -256,11 +263,15 @@ std::pair<uint_plookup<Builder, Native>, uint_plookup<Builder, Native>> uint_plo
 }
 template class uint_plookup<bb::UltraCircuitBuilder, uint8_t>;
 template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint8_t>;
+template class uint_plookup<bb::CircuitSimulatorBN254, uint8_t>;
 template class uint_plookup<bb::UltraCircuitBuilder, uint16_t>;
 template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint16_t>;
+template class uint_plookup<bb::CircuitSimulatorBN254, uint16_t>;
 template class uint_plookup<bb::UltraCircuitBuilder, uint32_t>;
 template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint32_t>;
+template class uint_plookup<bb::CircuitSimulatorBN254, uint32_t>;
 template class uint_plookup<bb::UltraCircuitBuilder, uint64_t>;
 template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint64_t>;
-;
+template class uint_plookup<bb::CircuitSimulatorBN254, uint64_t>;
+
 } // namespace bb::stdlib
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/comparison.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/comparison.cpp
index d435a6a1d025..c3b89745b488 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/comparison.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/comparison.cpp
@@ -75,10 +75,14 @@ template <typename Builder, typename Native> bool_t<Builder> uint_plookup<Builde
 
 template class uint_plookup<bb::UltraCircuitBuilder, uint8_t>;
 template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint8_t>;
+template class uint_plookup<bb::CircuitSimulatorBN254, uint8_t>;
 template class uint_plookup<bb::UltraCircuitBuilder, uint16_t>;
 template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint16_t>;
+template class uint_plookup<bb::CircuitSimulatorBN254, uint16_t>;
 template class uint_plookup<bb::UltraCircuitBuilder, uint32_t>;
 template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint32_t>;
+template class uint_plookup<bb::CircuitSimulatorBN254, uint32_t>;
 template class uint_plookup<bb::UltraCircuitBuilder, uint64_t>;
 template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint64_t>;
+template class uint_plookup<bb::CircuitSimulatorBN254, uint64_t>;
 } // namespace bb::stdlib
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/logic.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/logic.cpp
index e9e2960b7756..81b5bd421202 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/logic.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/logic.cpp
@@ -327,11 +327,15 @@ uint_plookup<Builder, Native> uint_plookup<Builder, Native>::logic_operator(cons
 
 template class uint_plookup<bb::UltraCircuitBuilder, uint8_t>;
 template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint8_t>;
+template class uint_plookup<bb::CircuitSimulatorBN254, uint8_t>;
 template class uint_plookup<bb::UltraCircuitBuilder, uint16_t>;
 template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint16_t>;
+template class uint_plookup<bb::CircuitSimulatorBN254, uint16_t>;
 template class uint_plookup<bb::UltraCircuitBuilder, uint32_t>;
 template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint32_t>;
+template class uint_plookup<bb::CircuitSimulatorBN254, uint32_t>;
 template class uint_plookup<bb::UltraCircuitBuilder, uint64_t>;
 template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint64_t>;
+template class uint_plookup<bb::CircuitSimulatorBN254, uint64_t>;
 
 } // namespace bb::stdlib
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.cpp
index e7ca642dc613..ebbc48884df1 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.cpp
@@ -16,22 +16,26 @@ std::vector<uint32_t> uint_plookup<Builder, Native>::constrain_accumulators(Buil
 template <typename Builder, typename Native>
 uint_plookup<Builder, Native>::uint_plookup(const witness_t<Builder>& witness)
     : context(witness.context)
-    , additive_constant(0)
     , witness_status(WitnessStatus::OK)
-    , accumulators(constrain_accumulators(context, witness.witness_index))
-    , witness_index(witness.witness_index)
-{}
+{
+    if (witness.witness_index == IS_CONSTANT) {
+        additive_constant = witness.witness;
+        witness_index = IS_CONSTANT;
+    } else {
+        accumulators = constrain_accumulators(context, witness.witness_index);
+        witness_index = witness.witness_index;
+    }
+}
 
 template <typename Builder, typename Native>
 uint_plookup<Builder, Native>::uint_plookup(const field_t<Builder>& value)
     : context(value.context)
     , additive_constant(0)
     , witness_status(WitnessStatus::OK)
-    , accumulators()
-    , witness_index(IS_CONSTANT)
 {
     if (value.witness_index == IS_CONSTANT) {
         additive_constant = value.additive_constant;
+        witness_index = IS_CONSTANT;
     } else {
         field_t<Builder> norm = value.normalize();
         accumulators = constrain_accumulators(context, norm.get_witness_index());
@@ -241,11 +245,15 @@ bool_t<Builder> uint_plookup<Builder, Native>::at(const size_t bit_index) const
 
 template class uint_plookup<bb::UltraCircuitBuilder, uint8_t>;
 template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint8_t>;
+template class uint_plookup<bb::CircuitSimulatorBN254, uint8_t>;
 template class uint_plookup<bb::UltraCircuitBuilder, uint16_t>;
 template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint16_t>;
+template class uint_plookup<bb::CircuitSimulatorBN254, uint16_t>;
 template class uint_plookup<bb::UltraCircuitBuilder, uint32_t>;
 template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint32_t>;
+template class uint_plookup<bb::CircuitSimulatorBN254, uint32_t>;
 template class uint_plookup<bb::UltraCircuitBuilder, uint64_t>;
 template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint64_t>;
+template class uint_plookup<bb::CircuitSimulatorBN254, uint64_t>;
 
-} // namespace bb::stdlib
\ No newline at end of file
+} // namespace bb::stdlib
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.cpp
index e63ccb12adda..1ab80a7684ea 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.cpp
@@ -34,12 +34,18 @@ std::vector<uint32_t> uint<Builder, Native>::constrain_accumulators(Builder* con
 template <typename Builder, typename Native>
 uint<Builder, Native>::uint(const witness_t<Builder>& witness)
     : context(witness.context)
-    , additive_constant(0)
     , witness_status(WitnessStatus::OK)
-    , accumulators(constrain_accumulators(
-          context, witness.witness_index, width, "uint: range constraint fails in constructor of uint from witness"))
-    , witness_index(accumulators[num_accumulators() - 1])
-{}
+{
+    if constexpr (IsSimulator<Builder>) {
+        additive_constant = witness.witness;
+        witness_index = IS_CONSTANT;
+    } else {
+        additive_constant = 0;
+        accumulators = constrain_accumulators(
+            context, witness.witness_index, width, "uint: range constraint fails in constructor of uint from witness");
+        witness_index = accumulators[num_accumulators() - 1];
+    }
+}
 
 template <typename Builder, typename Native>
 uint<Builder, Native>::uint(const field_t<Builder>& value)
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.hpp
index 78f2592cfd55..12805759166e 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.hpp
@@ -188,16 +188,20 @@ template <typename T, typename w> inline std::ostream& operator<<(std::ostream&
 }
 
 template <typename Builder>
-using uint8 =
-    typename std::conditional<HasPlookup<Builder>, uint_plookup<Builder, uint8_t>, uint<Builder, uint8_t>>::type;
+using uint8 = typename std::conditional<HasPlookup<Builder> || IsSimulator<Builder>,
+                                        uint_plookup<Builder, uint8_t>,
+                                        uint<Builder, uint8_t>>::type;
 template <typename Builder>
-using uint16 =
-    typename std::conditional<HasPlookup<Builder>, uint_plookup<Builder, uint16_t>, uint<Builder, uint16_t>>::type;
+using uint16 = typename std::conditional<HasPlookup<Builder> || IsSimulator<Builder>,
+                                         uint_plookup<Builder, uint16_t>,
+                                         uint<Builder, uint16_t>>::type;
 template <typename Builder>
-using uint32 =
-    typename std::conditional<HasPlookup<Builder>, uint_plookup<Builder, uint32_t>, uint<Builder, uint32_t>>::type;
+using uint32 = typename std::conditional<HasPlookup<Builder> || IsSimulator<Builder>,
+                                         uint_plookup<Builder, uint32_t>,
+                                         uint<Builder, uint32_t>>::type;
 template <typename Builder>
-using uint64 =
-    typename std::conditional<HasPlookup<Builder>, uint_plookup<Builder, uint64_t>, uint<Builder, uint64_t>>::type;
+using uint64 = typename std::conditional<HasPlookup<Builder> || IsSimulator<Builder>,
+                                         uint_plookup<Builder, uint64_t>,
+                                         uint<Builder, uint64_t>>::type;
 
 } // namespace bb::stdlib
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp
index 8192e36a02f2..08ec8b849a2e 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp
@@ -74,12 +74,12 @@ uint_native rotate(uint_native value, size_t rotation)
                     : value;
 }
 template <typename Builder> class stdlib_uint : public testing::Test {
-    typedef typename std::conditional<std::same_as<Builder, UltraCircuitBuilder>,
-                                      stdlib::uint_plookup<Builder, uint_native>,
-                                      stdlib::uint<Builder, uint_native>>::type uint_ct;
-    typedef stdlib::bool_t<Builder> bool_ct;
-    typedef stdlib::witness_t<Builder> witness_ct;
-    typedef stdlib::byte_array<Builder> byte_array_ct;
+    using uint_ct = typename std::conditional<std::same_as<Builder, StandardCircuitBuilder>,
+                                              stdlib::uint<Builder, uint_native>,
+                                              stdlib::uint_plookup<Builder, uint_native>>::type;
+    using bool_ct = stdlib::bool_t<Builder>;
+    using witness_ct = stdlib::witness_t<Builder>;
+    using byte_array_ct = stdlib::byte_array<Builder>;
 
     static inline std::vector<uint_native> special_values{ 0U,
                                                            1U,
@@ -332,8 +332,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
             a = c;
             c = a * b;
         }
-        uint_native c_result =
-            static_cast<uint_native>(builder.get_variable(c.get_witness_index()).from_montgomery_form().data[0]);
+        uint_native c_result = static_cast<uint_native>(c.get_value());
         EXPECT_EQ(c_result, c_expected);
 
         auto special_uints = get_special_uints(&builder);
@@ -397,8 +396,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
             c = a + b;
             a = c ^ a;
         }
-        uint_native a_result =
-            static_cast<uint_native>(builder.get_variable(a.get_witness_index()).from_montgomery_form().data[0]);
+        uint_native a_result = static_cast<uint_native>(a.get_value());
 
         EXPECT_EQ(a_result, a_expected);
 
@@ -449,9 +447,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
             a = c;
             c = (a + b) ^ (const_a ^ const_b);
         }
-        uint32_t c_witness_index = c.get_witness_index();
-        uint_native c_result =
-            static_cast<uint_native>(builder.get_variable(c_witness_index).from_montgomery_form().data[0]);
+        uint_native c_result = static_cast<uint_native>(c.get_value());
         EXPECT_EQ(c_result, c_expected);
         bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
@@ -486,9 +482,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
             a = c;
             c = (~a & const_a) + (b & const_b);
         }
-        uint32_t c_witness_index = c.get_witness_index();
-        uint_native c_result =
-            static_cast<uint_native>(builder.get_variable(c_witness_index).from_montgomery_form().data[0]);
+        uint_native c_result = static_cast<uint_native>(c.get_value());
         EXPECT_EQ(c_result, c_expected);
         bool result = CircuitChecker::check(builder);
         EXPECT_EQ(result, true);
@@ -520,8 +514,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
             c = a + b;
             a = c & a;
         }
-        uint_native a_result =
-            static_cast<uint_native>(builder.get_variable(a.get_witness_index()).from_montgomery_form().data[0]);
+        uint_native a_result = static_cast<uint_native>(a.get_value());
         EXPECT_EQ(a_result, a_expected);
 
         bool result = CircuitChecker::check(builder);
@@ -554,8 +547,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
             c = a + b;
             a = c | a;
         }
-        uint_native a_result =
-            static_cast<uint_native>(builder.get_variable(a.get_witness_index()).from_montgomery_form().data[0]);
+        uint_native a_result = static_cast<uint_native>(a.get_value());
         EXPECT_EQ(a_result, a_expected);
 
         bool result = CircuitChecker::check(builder);
@@ -662,8 +654,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
             c = a + b;
             a = c.ror(static_cast<uint_native>(i % 31)) + a.ror(static_cast<uint_native>((i + 1) % 31));
         }
-        uint_native a_result =
-            static_cast<uint_native>(builder.get_variable(a.get_witness_index()).from_montgomery_form().data[0]);
+        uint_native a_result = static_cast<uint_native>(a.get_value());
         EXPECT_EQ(a_result, a_expected);
 
         bool result = CircuitChecker::check(builder);
@@ -794,22 +785,14 @@ template <typename Builder> class stdlib_uint : public testing::Test {
             a = temp1 + temp2;
         }
 
-        uint_native a_result =
-            static_cast<uint_native>(builder.get_variable(a.get_witness_index()).from_montgomery_form().data[0]);
-        uint_native b_result =
-            static_cast<uint_native>(builder.get_variable(b.get_witness_index()).from_montgomery_form().data[0]);
-        uint_native c_result =
-            static_cast<uint_native>(builder.get_variable(c.get_witness_index()).from_montgomery_form().data[0]);
-        uint_native d_result =
-            static_cast<uint_native>(builder.get_variable(d.get_witness_index()).from_montgomery_form().data[0]);
-        uint_native e_result =
-            static_cast<uint_native>(builder.get_variable(e.get_witness_index()).from_montgomery_form().data[0]);
-        uint_native f_result =
-            static_cast<uint_native>(builder.get_variable(f.get_witness_index()).from_montgomery_form().data[0]);
-        uint_native g_result =
-            static_cast<uint_native>(builder.get_variable(g.get_witness_index()).from_montgomery_form().data[0]);
-        uint_native h_result =
-            static_cast<uint_native>(builder.get_variable(h.get_witness_index()).from_montgomery_form().data[0]);
+        uint_native a_result = static_cast<uint_native>(a.get_value()); // PROBLEM
+        uint_native b_result = static_cast<uint_native>(b.get_value());
+        uint_native c_result = static_cast<uint_native>(c.get_value());
+        uint_native d_result = static_cast<uint_native>(d.get_value());
+        uint_native e_result = static_cast<uint_native>(e.get_value());
+        uint_native f_result = static_cast<uint_native>(f.get_value());
+        uint_native g_result = static_cast<uint_native>(g.get_value());
+        uint_native h_result = static_cast<uint_native>(h.get_value());
 
         EXPECT_EQ(a_result, a_alt);
         EXPECT_EQ(b_result, b_alt);
@@ -1059,10 +1042,26 @@ template <typename Builder> class stdlib_uint : public testing::Test {
             EXPECT_EQ(proof_result, false);
         };
 
-        divide_integers(false, false, false, false, true);
-        divide_integers(false, false, false, true, true);
-        divide_integers(true, true, false, false, true);
-        divide_integers(true, true, false, true, true);
+        divide_integers(/*lhs_constant=*/false,
+                        /*rhs_constant=*/false,
+                        /*dividend_is_divisor=*/false,
+                        /*dividend_zero=*/false,
+                        /*divisor_zero=*/true);
+        divide_integers(/*lhs_constant=*/false,
+                        /*rhs_constant=*/false,
+                        /*dividend_is_divisor=*/false,
+                        /*dividend_zero=*/true,
+                        /*divisor_zero=*/true);
+        divide_integers(/*lhs_constant=*/true,
+                        /*rhs_constant=*/true,
+                        /*dividend_is_divisor=*/false,
+                        /*dividend_zero=*/false,
+                        /*divisor_zero=*/true);
+        divide_integers(/*lhs_constant=*/true,
+                        /*rhs_constant=*/true,
+                        /*dividend_is_divisor=*/false,
+                        /*dividend_zero=*/true,
+                        /*divisor_zero=*/true);
     }
 
     static void test_divide_special()
@@ -1099,7 +1098,8 @@ template <typename Builder> class stdlib_uint : public testing::Test {
 
     /**
      * @brief Make sure we prevent proving v / v = 0 by setting the divison remainder to be v.
-     * TODO: This is lifted from the implementation. Should rewrite this test after introducing framework that separates
+     * TODO: This is lifted from the implementation. Should rewrite this test after introducing framework that
+     separates
      * circuit construction from witness generation.
 
      */
@@ -1738,7 +1738,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
     }
 };
 
-typedef testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder> CircuitTypes;
+using CircuitTypes = testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder, bb::CircuitSimulatorBN254>;
 
 TYPED_TEST_SUITE(stdlib_uint, CircuitTypes);
 
@@ -1845,7 +1845,11 @@ TYPED_TEST(stdlib_uint, test_divide_special)
 }
 TYPED_TEST(stdlib_uint, div_remainder_constraint)
 {
-    TestFixture::div_remainder_constraint();
+    if constexpr (IsSimulator<CircuitSimulatorBN254>) {
+        GTEST_SKIP() << "Doesn't apply to the simulator.";
+    } else {
+        TestFixture::div_remainder_constraint();
+    }
 }
 TYPED_TEST(stdlib_uint, test_and)
 {
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/witness/witness.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/witness/witness.hpp
index ad3e24297c40..8e26b020add3 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/witness/witness.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/witness/witness.hpp
@@ -1,5 +1,6 @@
 #pragma once
 #include "barretenberg/ecc/curves/bn254/fr.hpp"
+#include "barretenberg/stdlib/primitives//circuit_builders/circuit_builders.hpp"
 
 namespace bb::stdlib {
 
@@ -14,7 +15,9 @@ template <typename Builder> class witness_t {
     {
         context = parent_context;
         witness = in;
-        witness_index = context->add_variable(witness);
+        if constexpr (!IsSimulator<Builder>) {
+            witness_index = context->add_variable(witness);
+        }
     }
 
     witness_t(Builder* parent_context, const bool in)
@@ -25,20 +28,28 @@ template <typename Builder> class witness_t {
         } else {
             bb::fr::__copy(bb::fr::zero(), witness);
         }
-        witness_index = context->add_variable(witness);
+        if constexpr (!IsSimulator<Builder>) {
+            witness_index = context->add_variable(witness);
+        }
     }
 
     witness_t(Builder* parent_context, IntegralOrEnum auto const in)
     {
         context = parent_context;
         witness = bb::fr{ static_cast<uint64_t>(in), 0, 0, 0 }.to_montgomery_form();
-        witness_index = context->add_variable(witness);
+        if constexpr (!IsSimulator<Builder>) {
+            witness_index = context->add_variable(witness);
+        }
     }
 
     static witness_t create_constant_witness(Builder* parent_context, const bb::fr& in)
     {
         witness_t out(parent_context, in);
-        parent_context->assert_equal_constant(out.witness_index, in);
+        if constexpr (IsSimulator<Builder>) {
+            parent_context->assert_equal_constant(out.witness, in, "Failed to create constant witness.");
+        } else {
+            parent_context->assert_equal_constant(out.witness_index, in, "Failed to create constant witness.");
+        }
         return out;
     }
 
@@ -58,7 +69,9 @@ template <typename Builder> class public_witness_t : public witness_t<Builder> {
     {
         context = parent_context;
         bb::fr::__copy(in, witness);
-        witness_index = context->add_public_variable(witness);
+        if constexpr (!IsSimulator<Builder>) {
+            witness_index = context->add_public_variable(witness);
+        }
     }
 
     public_witness_t(Builder* parent_context, const bool in)
@@ -76,7 +89,9 @@ template <typename Builder> class public_witness_t : public witness_t<Builder> {
     {
         context = parent_context;
         witness = bb::fr{ static_cast<uint64_t>(in), 0, 0, 0 }.to_montgomery_form();
-        witness_index = context->add_public_variable(witness);
+        if constexpr (!IsSimulator<Builder>) {
+            witness_index = context->add_public_variable(witness);
+        }
     }
 };
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/circuit_simulator.hpp b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/circuit_simulator.hpp
new file mode 100644
index 000000000000..184ff7ea5544
--- /dev/null
+++ b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/circuit_simulator.hpp
@@ -0,0 +1,195 @@
+#pragma once
+#include "barretenberg/ecc/curves/bn254/fr.hpp"
+#include "barretenberg/plonk_honk_shared/arithmetization/gate_data.hpp"
+#include "barretenberg/plonk_honk_shared/types/circuit_type.hpp"
+#include "barretenberg/plonk_honk_shared/types/merkle_hash_type.hpp"
+#include "barretenberg/plonk_honk_shared/types/pedersen_commitment_type.hpp"
+#include "barretenberg/stdlib_circuit_builders/plookup_tables/plookup_tables.hpp"
+#include "barretenberg/stdlib_circuit_builders/plookup_tables/types.hpp"
+#include <cstdint>
+
+namespace bb {
+
+/**
+ * @brief Simulate circuit construction to quickly get function outputs.
+ * @details Instantiating the stdlib with this type will give a version of the stdlib where none of the classes store
+ * witness data. This significantly speeds us the cost of executing stdlib functions. What's more, for even faster
+ * speeds, we have the option (partially implemented) to completely skip computing most witness constrution, and instead
+ * proxy out to "native" functions (for instance, bb::stdlib::ecdsa_verify_signature we might reformat
+ * its inputs and then directly call the function crypto::ecdsa_verify_signature).
+ *
+ * The general strategy is to use the "constant" code paths that already exist in the stdlib, but with a circuit
+ * simulator as its context (rather than, for instance, a nullptr). In cases where this doesn't quite work, we use
+ * template metaprogramming to provide an alternative implementation.
+ *
+ * This means changing the data model in some ways. Since a simulator does not contain a `variables` vector, we cannot
+ * work with witness indices anymore. In particular, the witness index of every witness instantiated with a simulator
+ * type will be `IS_CONSTANT`, and the witness is just a wrapper for a value. A stdlib `field_t` instance will now store
+ * all of its data in the `additive_constant`, and something similar is true for the `uint` classes. Changes are also
+ * necessary with some basic builder functions, like `assert_equal`, which would take in a pair of witness indices for a
+ * real builder, but which just takes in a pair of native field elements during simulation. This strategy has a
+ * relatively small footprint, but it feels possible to improve upon the idioms, reduce the size of the divergence, or
+ * perhaps organize things more cleanly in a way that avoids the use of compile time `if` statements.
+ *
+ */
+// TODO(https://github.com/AztecProtocol/barretenberg/issues/961): Ensure we can execute the simulator in the context of
+// ECCVM which is instantiated on Grumpkin
+class CircuitSimulatorBN254 {
+  public:
+    using FF = bb::fr;
+    static constexpr CircuitType CIRCUIT_TYPE = CircuitType::ULTRA;
+    static constexpr std::string_view NAME_STRING = "SIMULATOR";
+    bool contains_recursive_proof = false;
+    static constexpr size_t UINT_LOG2_BASE = 2; // Would be 6 for UltraPlonk
+    static constexpr size_t DEFAULT_PLOOKUP_RANGE_BITNUM = 1028;
+
+    static constexpr size_t num_gates = 0;  // WORKTODO: it was dumb to make this static.
+                                            // Should agree with what is in circuit builders
+    static constexpr uint32_t zero_idx = 0; // Ditto?
+    std::vector<FF> public_inputs;
+
+    void add_recursive_proof(const std::vector<FF>& proof_element_limbs)
+    {
+
+        if (contains_recursive_proof) {
+            failure("added recursive proof when one already exists");
+        }
+        contains_recursive_proof = true;
+
+        for (uint32_t idx = 0; idx < proof_element_limbs.size(); idx++) {
+            set_public_input(proof_element_limbs[idx]);
+            recursive_proof_public_input_indices.push_back(static_cast<uint32_t>(public_inputs.size() - 1));
+        }
+    }
+
+    inline uint32_t add_variable([[maybe_unused]] const bb::fr index) const { return 1028; }
+    inline bb::fr get_variable([[maybe_unused]] const uint32_t index) const { return 1028; }
+
+    uint32_t put_constant_variable([[maybe_unused]] const bb::fr& variable) { return 1028; }
+    void set_public_input([[maybe_unused]] const uint32_t witness_index) {}
+
+    void set_public_input(const bb::fr value) { public_inputs.emplace_back(value); }
+
+    void fix_witness([[maybe_unused]] const uint32_t witness_index, [[maybe_unused]] const bb::fr& witness_value){};
+
+    [[nodiscard]] size_t get_num_gates() const { return 0; }
+
+    void create_add_gate([[maybe_unused]] const add_triple_<FF>& in){};
+    void create_mul_gate([[maybe_unused]] const mul_triple_<FF>& in){};
+    void create_bool_gate([[maybe_unused]] const uint32_t a){};
+    void create_poly_gate([[maybe_unused]] const poly_triple_<FF>& in){};
+    void create_big_add_gate([[maybe_unused]] const add_quad_<FF>& in){};
+    void create_big_add_gate_with_bit_extraction([[maybe_unused]] const add_quad_<FF>& in){};
+    void create_big_mul_gate([[maybe_unused]] const mul_quad_<FF>& in){};
+    void create_balanced_add_gate([[maybe_unused]] const add_quad_<FF>& in){};
+    void create_fixed_group_add_gate([[maybe_unused]] const fixed_group_add_quad_<FF>& in){};
+    void create_fixed_group_add_gate_with_init([[maybe_unused]] const fixed_group_add_quad_<FF>& in,
+                                               [[maybe_unused]] const fixed_group_init_quad_<FF>& init){};
+    void create_fixed_group_add_gate_final([[maybe_unused]] const add_quad_<FF>& in){};
+    void create_ecc_add_gate([[maybe_unused]] const ecc_add_gate_<FF>& in){};
+
+    plookup::ReadData<uint32_t> create_gates_from_plookup_accumulators(
+        [[maybe_unused]] const plookup::MultiTableId& id,
+        [[maybe_unused]] const plookup::ReadData<FF>& read_values,
+        [[maybe_unused]] const uint32_t key_a_index,
+        [[maybe_unused]] std::optional<uint32_t> key_b_index = std::nullopt)
+    {
+        return {};
+    };
+
+    std::vector<uint32_t> decompose_into_default_range(
+        [[maybe_unused]] const uint32_t variable_index,
+        [[maybe_unused]] const uint64_t num_bits,
+        [[maybe_unused]] const uint64_t target_range_bitnum = 1028,
+        [[maybe_unused]] std::string const& msg = "decompose_into_default_range")
+    {
+        return {};
+    };
+
+    std::vector<uint32_t> decompose_into_default_range_better_for_oddlimbnum(
+        [[maybe_unused]] const uint32_t variable_index,
+        [[maybe_unused]] const size_t num_bits,
+        [[maybe_unused]] std::string const& msg = "decompose_into_default_range_better_for_oddlimbnum")
+    {
+        return {};
+    };
+    void create_dummy_constraints([[maybe_unused]] const std::vector<uint32_t>& variable_index){};
+    void create_sort_constraint([[maybe_unused]] const std::vector<uint32_t>& variable_index){};
+    void create_sort_constraint_with_edges([[maybe_unused]] const std::vector<uint32_t>& variable_index,
+                                           [[maybe_unused]] const FF&,
+                                           [[maybe_unused]] const FF&){};
+    void assign_tag([[maybe_unused]] const uint32_t variable_index, [[maybe_unused]] const uint32_t tag){};
+
+    accumulator_triple_<FF> create_and_constraint([[maybe_unused]] const uint32_t a,
+                                                  [[maybe_unused]] const uint32_t b,
+                                                  [[maybe_unused]] const size_t num_bits)
+    {
+        return { { 1028 }, { 1028 }, { 1028 } };
+    };
+    accumulator_triple_<FF> create_xor_constraint([[maybe_unused]] const uint32_t a,
+                                                  [[maybe_unused]] const uint32_t b,
+                                                  [[maybe_unused]] const size_t num_bits)
+    {
+        return { { 1028 }, { 1028 }, { 1028 } };
+    };
+
+    size_t get_num_constant_gates() { return 1028; };
+    // maybe this shouldn't be implemented?
+
+    bool create_range_constraint(FF const& elt,
+                                 size_t const& num_bits,
+                                 std::string const& msg = "create_range_constraint")
+    {
+        const bool constraint_holds = static_cast<uint256_t>(elt).get_msb() < num_bits;
+        if (!constraint_holds) {
+            failure(msg);
+        }
+        return constraint_holds;
+    }
+
+    std::vector<uint32_t> decompose_into_base4_accumulators(
+        [[maybe_unused]] const uint32_t witness_index,
+        [[maybe_unused]] const size_t num_bits,
+        [[maybe_unused]] std::string const& msg = "create_range_constraint")
+    {
+        return { 1028 };
+    };
+
+    void create_new_range_constraint([[maybe_unused]] const uint32_t variable_index,
+                                     [[maybe_unused]] const uint64_t target_range,
+                                     [[maybe_unused]] std::string const msg = "create_new_range_constraint"){};
+
+    void assert_equal(FF left, FF right, std::string const& msg)
+    {
+        if (left != right) {
+            failure(msg);
+        }
+    }
+
+    void assert_equal_constant(FF left, FF right, std::string const& msg) { assert_equal(left, right, msg); }
+
+    bool _failed = false;
+    std::string _err;
+
+    [[nodiscard]] bool failed() const { return _failed; };
+    [[nodiscard]] const std::string& err() const { return _err; };
+
+    void set_err(std::string msg) { _err = std::move(msg); }
+    void failure(std::string msg)
+    {
+        _failed = true;
+        set_err(std::move(msg));
+    }
+
+    [[nodiscard]] bool check_circuit() const { return !_failed; }
+
+    // Public input indices which contain recursive proof information
+    std::vector<uint32_t> recursive_proof_public_input_indices;
+};
+
+class SimulatorCircuitChecker {
+  public:
+    static bool check(const CircuitSimulatorBN254& builder) { return builder.check_circuit(); }
+};
+
+} // namespace bb

From cfa850bbbad9ff54a7efd9fd7a045a6d3f158ebf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Venturo?= <nicolas.venturo@gmail.com>
Date: Tue, 30 Apr 2024 13:32:41 -0300
Subject: [PATCH 13/42] chore: prepare ScheduledValueChange for mutable delays.
 (#6085)

Part of #5493. This lays some of the groundwork by making
`ScheduledValueChange` not have an immutable delay. The only user of
this struct is `SharedMutable` however, which does (so far) have
immutable delays, so there's no functionality changes.
---
 .../shared_mutable/scheduled_value_change.nr  | 126 ++++++++++--------
 .../shared_mutable/shared_mutable.nr          |  24 ++--
 .../shared_mutable_private_getter.nr          |  91 +++++++------
 3 files changed, 135 insertions(+), 106 deletions(-)

diff --git a/noir-projects/aztec-nr/aztec/src/state_vars/shared_mutable/scheduled_value_change.nr b/noir-projects/aztec-nr/aztec/src/state_vars/shared_mutable/scheduled_value_change.nr
index 482bbf0d3f77..52aba6277eac 100644
--- a/noir-projects/aztec-nr/aztec/src/state_vars/shared_mutable/scheduled_value_change.nr
+++ b/noir-projects/aztec-nr/aztec/src/state_vars/shared_mutable/scheduled_value_change.nr
@@ -2,27 +2,18 @@ use dep::protocol_types::traits::{Serialize, Deserialize, FromField, ToField};
 
 // This data structure is used by SharedMutable to represent a value that changes from `pre` to `post` at some block 
 // called the `block_of_change`. The value can only be made to change by scheduling a change event at some future block
-// of change after some delay measured in blocks has elapsed. This means that at any given block number we know both the 
-// current value and the smallest block number at which the value might change - this is called the 'block horizon'.
-//
-// The delay being a type parameter instead of a struct field is an implementation detail, and is due to a number of
-// reasons:
-//  - we want to serialize and deserialize this object in order to store it in public storage, but we don't want to
-//    include the delay there because it is immutable
-//  - because of how aztec-nr state variables are declared, having a type with some immutable property is better 
-//    expressed via types, since they are always constructed with the same `::new(context, storage_slot)` function.
-struct ScheduledValueChange<T, DELAY> {
+// of change after some minimum delay measured in blocks has elapsed. This means that at any given block number we know 
+// both the current value and the smallest block number at which the value might change - this is called the 
+// 'block horizon'.
+struct ScheduledValueChange<T> {
     pre: T,
     post: T,
     block_of_change: u32,
-    // The _dummy variable forces DELAY to be interpreted as a numberic value. This is a workaround to
-    // https://github.com/noir-lang/noir/issues/4633. Remove once resolved.
-    _dummy: [Field; DELAY],
 }
 
-impl<T, DELAY> ScheduledValueChange<T, DELAY> {
+impl<T> ScheduledValueChange<T> {
     pub fn new(pre: T, post: T, block_of_change: u32) -> Self {
-        Self { pre, post, block_of_change, _dummy: [0; DELAY] }
+        Self { pre, post, block_of_change }
     }
 
     /// Returns the value stored in the data structure at a given block. This function can be called both in public 
@@ -54,10 +45,12 @@ impl<T, DELAY> ScheduledValueChange<T, DELAY> {
     /// Returns the largest block number at which the value returned by `get_current_at` is known to remain the current
     /// value. This value is only meaningful in private when constructing a proof at some `historical_block_number`, 
     /// since due to its asynchronous nature private execution cannot know about any later scheduled changes.
+    /// The caller of this function must know how quickly the value can change due to a scheduled change in the form of 
+    /// `minimum_delay`. If the delay itself is immutable, then this is just its duration.
     /// The value returned by `get_current_at` in private when called with a historical block number is only safe to use
     /// if the transaction's `max_block_number` property is set to a value lower or equal to the block horizon computed
     /// using the same historical block number.
-    pub fn get_block_horizon(self, historical_block_number: u32) -> u32 {
+    pub fn get_block_horizon(self, historical_block_number: u32, minimum_delay: u32) -> u32 {
         // The block horizon is the very last block in which the current value is known. Any block past the horizon 
         // (i.e. with a block number larger than the block horizon) may have a different current value. Reading the
         // current value in private typically requires constraining the maximum valid block number to be equal to the
@@ -68,22 +61,23 @@ impl<T, DELAY> ScheduledValueChange<T, DELAY> {
             // change is scheduled. This did not happen at the historical block number (or else it would not be
             // greater or equal to the block of change), and therefore could only happen after the historical block
             // number. The earliest would be the immediate next block, and so the smallest possible next block of change
-            // equals `historical_block_number + 1 + DELAY`. Our block horizon is simply the previous block to that one.
+            // equals `historical_block_number + 1 + minimum_delay`. Our block horizon is simply the previous block to 
+            // that one.
             //
             //      block of      historical        
             //       change         block            block horizon
             //   =======|=============N===================H===========>
             //                         ^                   ^
             //                         ---------------------
-            //                                delay
+            //                             minimum delay
 
-            historical_block_number + DELAY
+            historical_block_number + minimum_delay
         } else {
             // If the block of change has not yet been mined however, then there are two possible scenarios.
-            //   a) It could be so far into the future that the block horizon is actually determined by the delay,
-            //      because a new change could be scheduled and take place _before_ the currently scheduled one. This is
-            //      similar to the scenario where the block of change is in the past: the time horizon is the block
-            //      prior to the earliest one in which a new block of change might land.
+            //   a) It could be so far into the future that the block horizon is actually determined by the minimum 
+            //      delay, because a new change could be scheduled and take place _before_ the currently scheduled one. 
+            //      This is similar to the scenario where the block of change is in the past: the time horizon is the 
+            //      block prior to the earliest one in which a new block of change might land.
             // 
             //         historical                         
             //           block                        block horizon      block of change
@@ -91,11 +85,12 @@ impl<T, DELAY> ScheduledValueChange<T, DELAY> {
             //              ^                                 ^
             //              |                                 |   
             //              -----------------------------------
-            //                           delay
+            //                        minimum delay
             //
-            //   b) It could be fewer than `delay` blocks away from the historical block number, in which case it would
-            //      become the limiting factor for the time horizon, which would be the block right before the block of
-            //      change (since by definition the value changes at the block of change).
+            //   b) It could be fewer than `minimum_delay` blocks away from the historical block number, in which case 
+            //      the block of change would become the limiting factor for the time horizon, which would equal the 
+            //      block right before the block of change (since by definition the value changes at the block of 
+            //      change).
             //
             //           historical                         block horizon
             //             block     block of change       if not scheduled
@@ -103,7 +98,7 @@ impl<T, DELAY> ScheduledValueChange<T, DELAY> {
             //                ^           ^                     ^
             //                |     actual horizon              |   
             //                -----------------------------------
-            //                             delay
+            //                        minimum delay
             //      
             // Note that the current implementation does not allow the caller to set the block of change to an arbitrary
             // value, and therefore scenario a) is not currently possible. However implementing #5501 would allow for 
@@ -111,34 +106,42 @@ impl<T, DELAY> ScheduledValueChange<T, DELAY> {
 
             // Because historical_block_number < self.block_of_change, then block_of_change > 0 and we can safely
             // subtract 1.
-            min(self.block_of_change - 1, historical_block_number + DELAY)
+            min(
+                self.block_of_change - 1,
+                historical_block_number + minimum_delay
+            )
         }
     }
 
     /// Mutates a scheduled value change by scheduling a change at the current block number. This function is only
     /// meaningful when called in public with the current block number.
-    pub fn schedule_change(&mut self, new_value: T, current_block_number: u32) {
+    pub fn schedule_change(
+        &mut self,
+        new_value: T,
+        current_block_number: u32,
+        minimum_delay: u32,
+        block_of_change: u32
+    ) {
+        assert(block_of_change >= current_block_number + minimum_delay);
+
         self.pre = self.get_current_at(current_block_number);
         self.post = new_value;
-        // TODO: make this configurable 
-        // https://github.com/AztecProtocol/aztec-packages/issues/5501
-        self.block_of_change = current_block_number + DELAY;
+        self.block_of_change = block_of_change;
     }
 }
 
-impl<T, DELAY> Serialize<3> for ScheduledValueChange<T, DELAY> {
+impl<T> Serialize<3> for ScheduledValueChange<T> {
     fn serialize(self) -> [Field; 3] where T: ToField {
         [self.pre.to_field(), self.post.to_field(), self.block_of_change.to_field()]
     }
 }
 
-impl<T, DELAY> Deserialize<3> for ScheduledValueChange<T, DELAY> {
+impl<T> Deserialize<3> for ScheduledValueChange<T> {
   fn deserialize(input: [Field; 3]) -> Self  where T: FromField {
     Self { 
         pre: FromField::from_field(input[0]), 
         post: FromField::from_field(input[1]), 
-        block_of_change: FromField::from_field(input[2]), 
-        _dummy: [0; DELAY] 
+        block_of_change: FromField::from_field(input[2]),
     }
   }
 }
@@ -157,7 +160,7 @@ fn test_min() {
 mod test {
     use crate::state_vars::shared_mutable::scheduled_value_change::ScheduledValueChange;
 
-    global TEST_DELAY = 200;
+    global TEST_DELAY: u32 = 200;
 
     #[test]
     fn test_get_current_at() {
@@ -165,7 +168,7 @@ mod test {
         let post = 2;
         let block_of_change = 50;
 
-        let value: ScheduledValueChange<Field, TEST_DELAY> = ScheduledValueChange::new(pre, post, block_of_change);
+        let value: ScheduledValueChange<Field> = ScheduledValueChange::new(pre, post, block_of_change);
 
         assert_eq(value.get_current_at(0), pre);
         assert_eq(value.get_current_at(block_of_change - 1), pre);
@@ -179,13 +182,13 @@ mod test {
         let post = 2;
         let block_of_change = 50;
 
-        let value: ScheduledValueChange<Field, TEST_DELAY> = ScheduledValueChange::new(pre, post, block_of_change);
+        let value: ScheduledValueChange<Field> = ScheduledValueChange::new(pre, post, block_of_change);
 
         assert_eq(value.get_scheduled(), (post, block_of_change));
     }
 
     fn assert_block_horizon_invariants(
-        value: &mut ScheduledValueChange<Field, TEST_DELAY>,
+        value: &mut ScheduledValueChange<Field>,
         historical_block_number: u32,
         block_horizon: u32
     ) {
@@ -198,7 +201,12 @@ mod test {
         // changing at the previously determined block_horizon.
 
         let new = value.pre + value.post; // Make sure it's different to both pre and post
-        value.schedule_change(new, historical_block_number + 1);
+        value.schedule_change(
+            new,
+            historical_block_number + 1,
+            TEST_DELAY,
+            historical_block_number + 1 + TEST_DELAY
+        );
 
         assert(value.block_of_change > block_horizon);
         assert_eq(current_at_historical, value.get_current_at(block_horizon));
@@ -209,9 +217,9 @@ mod test {
         let historical_block_number = 100;
         let block_of_change = 50;
 
-        let mut value: ScheduledValueChange<Field, TEST_DELAY> = ScheduledValueChange::new(1, 2, block_of_change);
+        let mut value: ScheduledValueChange<Field> = ScheduledValueChange::new(1, 2, block_of_change);
 
-        let block_horizon = value.get_block_horizon(historical_block_number);
+        let block_horizon = value.get_block_horizon(historical_block_number, TEST_DELAY);
         assert_eq(block_horizon, historical_block_number + TEST_DELAY);
 
         assert_block_horizon_invariants(&mut value, historical_block_number, block_horizon);
@@ -222,9 +230,9 @@ mod test {
         let historical_block_number = 100;
         let block_of_change = 100;
 
-        let mut value: ScheduledValueChange<Field, TEST_DELAY> = ScheduledValueChange::new(1, 2, block_of_change);
+        let mut value: ScheduledValueChange<Field> = ScheduledValueChange::new(1, 2, block_of_change);
 
-        let block_horizon = value.get_block_horizon(historical_block_number);
+        let block_horizon = value.get_block_horizon(historical_block_number, TEST_DELAY);
         assert_eq(block_horizon, historical_block_number + TEST_DELAY);
 
         assert_block_horizon_invariants(&mut value, historical_block_number, block_horizon);
@@ -235,12 +243,12 @@ mod test {
         let historical_block_number = 100;
         let block_of_change = 120;
 
-        let mut value: ScheduledValueChange<Field, TEST_DELAY> = ScheduledValueChange::new(1, 2, block_of_change);
+        let mut value: ScheduledValueChange<Field> = ScheduledValueChange::new(1, 2, block_of_change);
 
         // Note that this is the only scenario in which the block of change informs the block horizon.
         // This may result in privacy leaks when interacting with applications that have a scheduled change
         // in the near future.
-        let block_horizon = value.get_block_horizon(historical_block_number);
+        let block_horizon = value.get_block_horizon(historical_block_number, TEST_DELAY);
         assert_eq(block_horizon, block_of_change - 1);
 
         assert_block_horizon_invariants(&mut value, historical_block_number, block_horizon);
@@ -251,9 +259,9 @@ mod test {
         let historical_block_number = 100;
         let block_of_change = 500;
 
-        let mut value: ScheduledValueChange<Field, TEST_DELAY> = ScheduledValueChange::new(1, 2, block_of_change);
+        let mut value: ScheduledValueChange<Field> = ScheduledValueChange::new(1, 2, block_of_change);
 
-        let block_horizon = value.get_block_horizon(historical_block_number);
+        let block_horizon = value.get_block_horizon(historical_block_number, TEST_DELAY);
         assert_eq(block_horizon, historical_block_number + TEST_DELAY);
 
         assert_block_horizon_invariants(&mut value, historical_block_number, block_horizon);
@@ -265,11 +273,16 @@ mod test {
         let post = 2;
         let block_of_change = 500;
 
-        let mut value: ScheduledValueChange<Field, TEST_DELAY> = ScheduledValueChange::new(pre, post, block_of_change);
+        let mut value: ScheduledValueChange<Field> = ScheduledValueChange::new(pre, post, block_of_change);
 
         let new = 42;
         let current_block_number = block_of_change - 50;
-        value.schedule_change(new, current_block_number);
+        value.schedule_change(
+            new,
+            current_block_number,
+            TEST_DELAY,
+            current_block_number + TEST_DELAY
+        );
 
         // Because we re-schedule before the last scheduled change takes effect, the old `post` value is lost.
         assert_eq(value.pre, pre);
@@ -283,11 +296,16 @@ mod test {
         let post = 2;
         let block_of_change = 500;
 
-        let mut value: ScheduledValueChange<Field, TEST_DELAY>  = ScheduledValueChange::new(pre, post, block_of_change);
+        let mut value: ScheduledValueChange<Field>  = ScheduledValueChange::new(pre, post, block_of_change);
 
         let new = 42;
         let current_block_number = block_of_change + 50;
-        value.schedule_change(new, current_block_number);
+        value.schedule_change(
+            new,
+            current_block_number,
+            TEST_DELAY,
+            current_block_number + TEST_DELAY
+        );
 
         assert_eq(value.pre, post);
         assert_eq(value.post, new);
diff --git a/noir-projects/aztec-nr/aztec/src/state_vars/shared_mutable/shared_mutable.nr b/noir-projects/aztec-nr/aztec/src/state_vars/shared_mutable/shared_mutable.nr
index 71cf0a859569..8ab974c73895 100644
--- a/noir-projects/aztec-nr/aztec/src/state_vars/shared_mutable/shared_mutable.nr
+++ b/noir-projects/aztec-nr/aztec/src/state_vars/shared_mutable/shared_mutable.nr
@@ -8,6 +8,9 @@ use crate::state_vars::{storage::Storage, shared_mutable::scheduled_value_change
 struct SharedMutable<T, DELAY> {
     context: Context,
     storage_slot: Field,
+    // The _dummy variable forces DELAY to be interpreted as a numberic value. This is a workaround to
+    // https://github.com/noir-lang/noir/issues/4633. Remove once resolved.
+    _dummy: [Field; DELAY],
 }
 
 impl<T, DELAY> Storage<T> for SharedMutable<T, DELAY> {}
@@ -24,27 +27,32 @@ impl<T, DELAY> Storage<T> for SharedMutable<T, DELAY> {}
 impl<T, DELAY> SharedMutable<T, DELAY> {
     pub fn new(context: Context, storage_slot: Field) -> Self {
         assert(storage_slot != 0, "Storage slot 0 not allowed. Storage slots must start from 1.");
-        Self { context, storage_slot }
+        Self { context, storage_slot, _dummy: [0; DELAY] }
     }
 
     pub fn schedule_value_change(self, new_value: T) {
         let context = self.context.public.unwrap();
-        let mut scheduled_value_change: ScheduledValueChange<T, DELAY> = public_storage::read(self.get_derived_storage_slot());
+        let mut scheduled_value_change: ScheduledValueChange<T> = public_storage::read(self.get_derived_storage_slot());
 
-        scheduled_value_change.schedule_change(new_value, context.block_number() as u32);
+        let block_number = context.block_number() as u32;
+        // TODO: make this configurable
+        // https://github.com/AztecProtocol/aztec-packages/issues/5501
+        let block_of_change = block_number + DELAY;
+
+        scheduled_value_change.schedule_change(new_value, block_number, DELAY, block_of_change);
 
         public_storage::write(self.get_derived_storage_slot(), scheduled_value_change);
     }
 
     pub fn get_current_value_in_public(self) -> T {
-        let scheduled_value_change: ScheduledValueChange<T, DELAY> = public_storage::read(self.get_derived_storage_slot());
+        let scheduled_value_change: ScheduledValueChange<T> = public_storage::read(self.get_derived_storage_slot());
 
         let block_number = self.context.public.unwrap().block_number() as u32;
         scheduled_value_change.get_current_at(block_number)
     }
 
     pub fn get_scheduled_value_in_public(self) -> (T, u32) {
-        let scheduled_value_change: ScheduledValueChange<T, DELAY> = public_storage::read(self.get_derived_storage_slot());
+        let scheduled_value_change: ScheduledValueChange<T> = public_storage::read(self.get_derived_storage_slot());
         scheduled_value_change.get_scheduled()
     }
 
@@ -52,7 +60,7 @@ impl<T, DELAY> SharedMutable<T, DELAY> {
         let mut context = self.context.private.unwrap();
 
         let (scheduled_value_change, historical_block_number) = self.historical_read_from_public_storage(*context);
-        let block_horizon = scheduled_value_change.get_block_horizon(historical_block_number);
+        let block_horizon = scheduled_value_change.get_block_horizon(historical_block_number, DELAY);
 
         // We prevent this transaction from being included in any block after the block horizon, ensuring that the 
         // historical public value matches the current one, since it can only change after the horizon.
@@ -63,7 +71,7 @@ impl<T, DELAY> SharedMutable<T, DELAY> {
     fn historical_read_from_public_storage(
         self,
         context: PrivateContext
-    ) -> (ScheduledValueChange<T, DELAY>, u32) where T: FromField {
+    ) -> (ScheduledValueChange<T>, u32) where T: FromField {
         let derived_slot = self.get_derived_storage_slot();
 
         // Ideally the following would be simply public_storage::read_historical, but we can't implement that yet.
@@ -76,7 +84,7 @@ impl<T, DELAY> SharedMutable<T, DELAY> {
                 );
         }
 
-        let scheduled_value: ScheduledValueChange<T, DELAY> = ScheduledValueChange::deserialize(raw_fields);
+        let scheduled_value: ScheduledValueChange<T> = ScheduledValueChange::deserialize(raw_fields);
         let historical_block_number = context.historical_header.global_variables.block_number as u32;
 
         (scheduled_value, historical_block_number)
diff --git a/noir-projects/aztec-nr/aztec/src/state_vars/shared_mutable/shared_mutable_private_getter.nr b/noir-projects/aztec-nr/aztec/src/state_vars/shared_mutable/shared_mutable_private_getter.nr
index 2f4f4339481d..d4e9ddb6bd24 100644
--- a/noir-projects/aztec-nr/aztec/src/state_vars/shared_mutable/shared_mutable_private_getter.nr
+++ b/noir-projects/aztec-nr/aztec/src/state_vars/shared_mutable/shared_mutable_private_getter.nr
@@ -6,65 +6,68 @@ use crate::public_storage;
 use crate::state_vars::{storage::Storage, shared_mutable::scheduled_value_change::ScheduledValueChange};
 
 struct SharedMutablePrivateGetter<T, DELAY> {
-  context: PrivateContext,
-  // The contract address of the contract we want to read from
-  other_contract_address: AztecAddress,
-  // The storage slot where the SharedMutable is stored on the other contract
-  storage_slot: Field,
+    context: PrivateContext,
+    // The contract address of the contract we want to read from
+    other_contract_address: AztecAddress,
+    // The storage slot where the SharedMutable is stored on the other contract
+    storage_slot: Field,
+    // The _dummy variable forces DELAY to be interpreted as a numberic value. This is a workaround to
+    // https://github.com/noir-lang/noir/issues/4633. Remove once resolved.
+    _dummy: [Field; DELAY],
 }
 
 // We have this as a view-only interface to reading Shared Mutables in other contracts.
 // Currently the Shared Mutable does not support this. We can adapt SharedMutable at a later date
 impl<T, DELAY> SharedMutablePrivateGetter<T, DELAY> {
-  pub fn new(
-    context: PrivateContext,
-    other_contract_address: AztecAddress,
-    storage_slot: Field,
-  ) -> Self {
-    assert(storage_slot != 0, "Storage slot 0 not allowed. Storage slots must start from 1.");
-    assert(other_contract_address.to_field() != 0, "Other contract address cannot be 0");
-    Self { context, other_contract_address, storage_slot }
-  }
+    pub fn new(
+        context: PrivateContext,
+        other_contract_address: AztecAddress,
+        storage_slot: Field
+    ) -> Self {
+        assert(storage_slot != 0, "Storage slot 0 not allowed. Storage slots must start from 1.");
+        assert(other_contract_address.to_field() != 0, "Other contract address cannot be 0");
+        Self { context, other_contract_address, storage_slot, _dummy: [0; DELAY] }
+    }
 
-  pub fn get_current_value_in_private(self) -> T where T: FromField {
-    let mut context = self.context;
+    pub fn get_current_value_in_private(self) -> T where T: FromField {
+        let mut context = self.context;
 
-    let (scheduled_value_change, historical_block_number) = self.historical_read_from_public_storage(context);
-    let block_horizon = scheduled_value_change.get_block_horizon(historical_block_number);
+        let (scheduled_value_change, historical_block_number) = self.historical_read_from_public_storage(context);
+        let block_horizon = scheduled_value_change.get_block_horizon(historical_block_number, DELAY);
 
-    // We prevent this transaction from being included in any block after the block horizon, ensuring that the 
-    // historical public value matches the current one, since it can only change after the horizon.
-    context.set_tx_max_block_number(block_horizon);
-    scheduled_value_change.get_current_at(historical_block_number)
-  }
+        // We prevent this transaction from being included in any block after the block horizon, ensuring that the 
+        // historical public value matches the current one, since it can only change after the horizon.
+        context.set_tx_max_block_number(block_horizon);
+        scheduled_value_change.get_current_at(historical_block_number)
+    }
 
-  fn historical_read_from_public_storage(
-      self,
-      context: PrivateContext
-  ) -> (ScheduledValueChange<T, DELAY>, u32) where T: FromField {
-    let derived_slot = self.get_derived_storage_slot();
+    fn historical_read_from_public_storage(
+        self,
+        context: PrivateContext
+    ) -> (ScheduledValueChange<T>, u32) where T: FromField {
+        let derived_slot = self.get_derived_storage_slot();
 
-    // Ideally the following would be simply public_storage::read_historical, but we can't implement that yet.
-    let mut raw_fields = [0; 3];
-    for i in 0..3 {
-      raw_fields[i] = public_storage_historical_read(
+        // Ideally the following would be simply public_storage::read_historical, but we can't implement that yet.
+        let mut raw_fields = [0; 3];
+        for i in 0..3 {
+            raw_fields[i] = public_storage_historical_read(
         context,
         derived_slot + i as Field,
         self.other_contract_address
       );
-    }
+        }
 
-    let scheduled_value: ScheduledValueChange<T, DELAY> = ScheduledValueChange::deserialize(raw_fields);
-    let historical_block_number = context.historical_header.global_variables.block_number as u32;
+        let scheduled_value: ScheduledValueChange<T> = ScheduledValueChange::deserialize(raw_fields);
+        let historical_block_number = context.historical_header.global_variables.block_number as u32;
 
-    (scheduled_value, historical_block_number)
-  }
+        (scheduled_value, historical_block_number)
+    }
 
-  fn get_derived_storage_slot(self) -> Field {
-    // Since we're actually storing three values (a ScheduledValueChange struct), we hash the storage slot to get a
-    // unique location in which we can safely store as much data as we need. This could be removed if we informed
-    // the slot allocator of how much space we need so that proper padding could be added.
-    // See https://github.com/AztecProtocol/aztec-packages/issues/5492
-    pedersen_hash([self.storage_slot, 0], 0)
-  }
+    fn get_derived_storage_slot(self) -> Field {
+        // Since we're actually storing three values (a ScheduledValueChange struct), we hash the storage slot to get a
+        // unique location in which we can safely store as much data as we need. This could be removed if we informed
+        // the slot allocator of how much space we need so that proper padding could be added.
+        // See https://github.com/AztecProtocol/aztec-packages/issues/5492
+        pedersen_hash([self.storage_slot, 0], 0)
+    }
 }

From 642146705857cf34eb0f9feab665977fb2d8fb02 Mon Sep 17 00:00:00 2001
From: Cat McGee <helloworld@mcgee.cat>
Date: Tue, 30 Apr 2024 18:28:18 +0100
Subject: [PATCH 14/42] fix(docs): Tutorial fixes (#5600)

Closes https://github.com/AztecProtocol/aztec-packages/issues/5781

This fixes all tutorials and removes uniswap - we will need to write our
own TS for this one because referencing the monorepo gets messy & has a
lot of unnecessary things

---------

Co-authored-by: Josh Crites <jc@joshcrites.com>
Co-authored-by: josh crites <critesjosh@gmail.com>
---
 .../tutorials/crowdfunding/donations.md       |  2 +-
 .../token_portal/depositing_to_aztec.md       |  7 +++
 .../tutorials/token_portal/setup.md           | 40 +++++++++-------
 .../token_portal/typescript_glue_code.md      | 14 +++---
 .../token_portal/withdrawing_to_l1.md         |  6 ++-
 .../developers/tutorials/uniswap/l1_portal.md |  4 +-
 .../writing_private_voting_contract.md        | 24 ++++------
 .../tutorials/writing_token_contract.md       | 48 +++++++++----------
 docs/docs/developers/versions-updating.md     | 16 +++----
 docs/sidebars.js                              | 38 +++++++--------
 l1-contracts/test/portals/DataStructures.sol  |  2 +
 .../contracts/uniswap_contract/src/main.nr    |  5 +-
 12 files changed, 110 insertions(+), 96 deletions(-)

diff --git a/docs/docs/developers/tutorials/crowdfunding/donations.md b/docs/docs/developers/tutorials/crowdfunding/donations.md
index 16dcfae5c582..ffbe02ed1224 100644
--- a/docs/docs/developers/tutorials/crowdfunding/donations.md
+++ b/docs/docs/developers/tutorials/crowdfunding/donations.md
@@ -94,7 +94,7 @@ aztec = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_
 ```
 
 A word about versions:
-- Choose the aztec packages version to match your aztec tools as seen here - `aztec-cli -V`
+- Choose the aztec packages version to match your aztec sandbox version
 - Check that your `compiler_version` in Nargo.toml is satisified by your aztec compiler - `aztec-nargo -V`
 
 More about versions [here](https://docs.aztec.network/developers/versions-updating).
diff --git a/docs/docs/developers/tutorials/token_portal/depositing_to_aztec.md b/docs/docs/developers/tutorials/token_portal/depositing_to_aztec.md
index 167d77e46b59..0b05d3e92a62 100644
--- a/docs/docs/developers/tutorials/token_portal/depositing_to_aztec.md
+++ b/docs/docs/developers/tutorials/token_portal/depositing_to_aztec.md
@@ -17,6 +17,7 @@ import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol
 // Messaging
 import {IRegistry} from "@aztec/l1-contracts/src/core/interfaces/messagebridge/IRegistry.sol";
 import {IInbox} from "@aztec/l1-contracts/src/core/interfaces/messagebridge/IInbox.sol";
+import {IOutbox} from "@aztec/l1-contracts/src/core/interfaces/messagebridge/IOutbox.sol";
 import {DataStructures} from "@aztec/l1-contracts/src/core/libraries/DataStructures.sol";
 import {Hash} from "@aztec/l1-contracts/src/core/libraries/Hash.sol";
 
@@ -35,6 +36,12 @@ Create a file `PortalERC20.sol` in the same folder and add:
 
 #include_code contract /l1-contracts/test/portals/PortalERC20.sol solidity
 
+Replace the openzeppelin import with this:
+
+```solidity
+import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+```
+
 ## Depositing tokens to Aztec publicly
 
 Next, we will write a function that is used to deposit funds on L1 that a user may have into an Aztec portal and send a message to the Aztec rollup to mint tokens _publicly_ on Aztec.
diff --git a/docs/docs/developers/tutorials/token_portal/setup.md b/docs/docs/developers/tutorials/token_portal/setup.md
index 8eb45c6d4356..d4c44d374963 100644
--- a/docs/docs/developers/tutorials/token_portal/setup.md
+++ b/docs/docs/developers/tutorials/token_portal/setup.md
@@ -15,7 +15,7 @@ We recommend going through this setup to fully understand where things live.
 
 However if you’d rather skip this part, our dev-rels repo contains the starter code here.
 
-# Prerequisites
+## Prerequisites
 
 - [node v18+](https://github.com/tj/n)
 - [docker](https://docs.docker.com/)
@@ -26,7 +26,7 @@ However if you’d rather skip this part, our dev-rels repo contains the starter
 /bin/sh -c "$(curl -fsSL 'https://sandbox.aztec.network')"
 ```
 
-# Create the root project and packages
+## Create the root project and packages
 
 Our root project will house everything ✨
 
@@ -37,11 +37,21 @@ cd aztec-token-bridge && mkdir packages
 
 We will hold our projects inside of `packages` to follow the design of the project in the [repo](https://github.com/AztecProtocol/dev-rel/tree/main/tutorials/token-bridge-e2e).
 
-# Create a noir project
+## Create a noir project
 
-Now inside `packages` create a new directory called `aztec-contracts`
+Inside `packages` create a new directory `aztec-contracts`:
 
-Inside `aztec-contracts`, create the following file structure:
+```bash
+cd packages && mkdir aztec-contracts
+```
+
+Inside `aztec-contracts` create a new contract project like this:
+
+```bash
+aztec-nargo new --contract token_bridge
+```
+
+Your file structure should look something like this:
 
 ```tree
 aztec-contracts
@@ -51,18 +61,13 @@ aztec-contracts
        ├── main.nr
 ```
 
-Inside `Nargo.toml` add the following content:
+Inside `Nargo.toml` add the following dependencies:
 
 ```toml
-[package]
-name = "token_bridge"
-authors = [""]
-compiler_version = ">=0.18.0"
-type = "contract"
-
 [dependencies]
 aztec = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="noir-projects/aztec-nr/aztec" }
 token_portal_content_hash_lib = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="noir-projects/noir-contracts/contracts/token_portal_content_hash_lib" }
+token = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="noir-projects/noir-contracts/contracts/token_contract" }
 ```
 
 We will also be writing some helper functions that should exist elsewhere so we don't overcomplicated our contract. In `src` create one more file called `util.nr` - so your dir structure should now look like this:
@@ -76,7 +81,7 @@ aztec-contracts
       ├── util.nr
 ```
 
-# Create a JS hardhat project
+## Create a JS hardhat project
 
 In the `packages` dir, create a new directory called `l1-contracts` and run `yarn init -yp &&
 npx hardhat init` inside of it. Keep hitting enter so you get the default setup (Javascript project)
@@ -91,7 +96,7 @@ npx hardhat init
 Once you have a hardhat project set up, delete the existing contracts, tests, and scripts, and create a `TokenPortal.sol`:
 
 ```bash
-rm -rf contracts test scripts
+rm -rf contracts test scripts ignition
 mkdir contracts && cd contracts
 touch TokenPortal.sol
 ```
@@ -99,8 +104,7 @@ touch TokenPortal.sol
 Now add dependencies that are required. These include interfaces to Aztec Inbox, Outbox and Registry smart contracts, OpenZeppelin contracts, and NomicFoundation.
 
 ```bash
-yarn add @aztec/foundation @aztec/l1-contracts @openzeppelin/contracts && yarn add --dev @nomicfoundation/hardhat-network-helpers @nomicfoundation/hardhat-chai-matchers @nomiclabs/hardhat-ethers @nomiclabs/hardhat-etherscan @types/chai @types/mocha @typechain/ethers-v5 @typechain/hardhat chai@4.0.0 hardhat-gas-reporter solidity-coverage ts-node typechain typescript
-
+yarn add @aztec/foundation @aztec/l1-contracts @openzeppelin/contracts ethers && yarn add --dev @nomicfoundation/hardhat-network-helpers @nomicfoundation/hardhat-chai-matchers @nomiclabs/hardhat-ethers @nomiclabs/hardhat-etherscan @types/chai @types/mocha @typechain/ethers-v5 @typechain/hardhat chai@4.0.0 hardhat-gas-reporter solidity-coverage ts-node typechain typescript @nomicfoundation/hardhat-ignition @nomicfoundation/hardhat-ignition-ethers @nomicfoundation/hardhat-verify
 ```
 
 This is what your `l1-contracts` should look like:
@@ -129,7 +133,7 @@ Inside the `packages` directory, run
 
 ```bash
 mkdir src && cd src && yarn init -yp
-yarn add typescript @aztec/aztec.js @aztec/accounts @aztec/noir-contracts.js @aztec/types @aztec/foundation @aztec/l1-artifacts viem@1.21.4 "@types/node@^20.8.2"
+yarn add typescript @aztec/aztec.js @aztec/accounts @aztec/noir-contracts.js @aztec/types @aztec/foundation @aztec/l1-artifacts viem@^2.7.15 "@types/node@^20.8.2"
 yarn add -D jest @jest/globals ts-jest
 ```
 
@@ -141,7 +145,7 @@ In `package.json`, add:
 "type": "module",
 "scripts": {
   "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest)"
-}
+},
 ```
 
 Your `package.json` should look something like this (do not copy and paste):
diff --git a/docs/docs/developers/tutorials/token_portal/typescript_glue_code.md b/docs/docs/developers/tutorials/token_portal/typescript_glue_code.md
index 592ca263f2f7..7fd19a14a8ea 100644
--- a/docs/docs/developers/tutorials/token_portal/typescript_glue_code.md
+++ b/docs/docs/developers/tutorials/token_portal/typescript_glue_code.md
@@ -36,10 +36,11 @@ Open `cross_chain_messaging.test.ts` and paste the initial description of the te
 
 ```typescript
 import { expect, jest} from '@jest/globals'
-import { AccountWallet, AztecAddress, DebugLogger, EthAddress, Fr, computeAuthWitMessageHash, createDebugLogger, createPXEClient, waitForSandbox } from '@aztec/aztec.js';
-import { getSandboxAccountsWallets } from '@aztec/accounts/testing';
+import { AccountWallet, AztecAddress, DebugLogger, EthAddress, Fr, computeAuthWitMessageHash, createDebugLogger, createPXEClient, waitForPXE } from '@aztec/aztec.js';
+import { getInitialTestAccountsWallets } from '@aztec/accounts/testing';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
-import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
+import { TokenBridgeContract } from './fixtures/TokenBridge.js';
+import { createAztecNodeClient } from '@aztec/circuit-types';
 
 import { CrossChainTestHarness } from './shared/cross_chain_test_harness.js';
 import { mnemonicToAccount } from 'viem/accounts';
@@ -49,12 +50,12 @@ import { foundry } from 'viem/chains';
 const { PXE_URL = 'http://localhost:8080', ETHEREUM_HOST = 'http://localhost:8545' } = process.env;
 const MNEMONIC = 'test test test test test test test test test test test junk';
 const hdAccount = mnemonicToAccount(MNEMONIC);
+const aztecNode = createAztecNodeClient(PXE_URL);
 
 describe('e2e_cross_chain_messaging', () => {
   jest.setTimeout(90_000);
 
   let logger: DebugLogger;
-  // include code:
   let user1Wallet: AccountWallet;
   let user2Wallet: AccountWallet;
   let ethAccount: EthAddress;
@@ -68,8 +69,8 @@ describe('e2e_cross_chain_messaging', () => {
   beforeEach(async () => {
     logger = createDebugLogger('aztec:e2e_uniswap');
     const pxe = createPXEClient(PXE_URL);
-    await waitForSandbox(pxe);
-    const wallets = await getSandboxAccountsWallets(pxe);
+    await waitForPXE(pxe);
+    const wallets = await getInitialTestAccountsWallets(pxe);
 
     const walletClient = createWalletClient({
       account: hdAccount,
@@ -82,6 +83,7 @@ describe('e2e_cross_chain_messaging', () => {
     });
 
     crossChainTestHarness = await CrossChainTestHarness.new(
+      aztecNode,
       pxe,
       publicClient,
       walletClient,
diff --git a/docs/docs/developers/tutorials/token_portal/withdrawing_to_l1.md b/docs/docs/developers/tutorials/token_portal/withdrawing_to_l1.md
index 38a5458d7860..82d8ca8cfbed 100644
--- a/docs/docs/developers/tutorials/token_portal/withdrawing_to_l1.md
+++ b/docs/docs/developers/tutorials/token_portal/withdrawing_to_l1.md
@@ -79,12 +79,14 @@ cd aztec-contracts/token_bridge
 aztec-nargo compile
 ```
 
-And generate the TypeScript interface for the contract and add it to the test dir:
+You may get some unused variable warnings - you can ignore these.
+
+And generate the TypeScript interface for the contract and add it to the test dir. Run this inside `aztec-contracts/token_bridge`:
 
 ```bash
 aztec-builder target -o ../../src/test/fixtures
 ```
 
-This will create a TS interface in our `src/test` folder!
+This will create a TS interface inside `fixtures` dir in our `src/test` folder!
 
 In the next step we will write the TypeScript code to deploy our contracts and call on both L1 and L2 so we can see how everything works together.
diff --git a/docs/docs/developers/tutorials/uniswap/l1_portal.md b/docs/docs/developers/tutorials/uniswap/l1_portal.md
index f22941f2514b..d628755da835 100644
--- a/docs/docs/developers/tutorials/uniswap/l1_portal.md
+++ b/docs/docs/developers/tutorials/uniswap/l1_portal.md
@@ -13,12 +13,14 @@ cd l1-contracts/contracts && touch UniswapPortal.sol
 and paste this inside:
 
 ```solidity
-pragma solidity ^0.8.20;
+pragma solidity >=0.8.18;
 
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 import {IRegistry} from "@aztec/l1-contracts/src/core/interfaces/messagebridge/IRegistry.sol";
+import {IOutbox} from  "@aztec/l1-contracts/src/core/interfaces/messagebridge/IOutbox.sol";
 import {DataStructures} from "@aztec/l1-contracts/src/core/libraries/DataStructures.sol";
+import {DataStructures as PortalDataStructures} from "./DataStructures.sol";
 import {Hash} from "@aztec/l1-contracts/src/core/libraries/Hash.sol";
 
 #include_code setup l1-contracts/test/portals/UniswapPortal.sol raw
diff --git a/docs/docs/developers/tutorials/writing_private_voting_contract.md b/docs/docs/developers/tutorials/writing_private_voting_contract.md
index 6af73511d58f..f4c178087814 100644
--- a/docs/docs/developers/tutorials/writing_private_voting_contract.md
+++ b/docs/docs/developers/tutorials/writing_private_voting_contract.md
@@ -39,15 +39,9 @@ Your file structure should look something like this:
 
 The file `main.nr` will soon turn into our smart contract!
 
-We will need the Aztec library to create this contract. Add the following content to `Nargo.toml`:
+We will need the Aztec library to create this contract. In your `Nargo.toml` you should see `[dependencies]` - paste this bellow it.
 
 ```toml
-[package]
-name = "private_voting"
-type = "contract"
-authors = [""]
-compiler_version = ">=0.18.0"
-
 [dependencies]
 aztec = { git="https://github.com/AztecProtocol/aztec-packages", tag="#include_aztec_version", directory="noir-projects/aztec-nr/aztec" }
 ```
@@ -70,13 +64,11 @@ Inside this, paste these imports:
 
 We are using various utils within the Aztec library:
 
-- `context` - exposes things such as the contract address, msg_sender, etc
-- `context.request_nullifier_secret_key` - get your secret key to help us create a randomized nullifier
-- `FunctionSelector::from_signature` - compute a function selector from signature so we can call functions from other functions
-- `state_vars::{Map, PublicMutable}` - we will use a Map to store the votes (key = voteId, value = number of votes), and PublicMutable to hold our public values that we mentioned earlier
-- `types::type_serialization::{..}` - various serialization methods for defining how to use these types
-- `types::address::{AztecAddress},` - our admin will be held as an address
-- `constants::EMPTY_NULLIFIED_COMMITMENT,` - this will come in useful when creating our nullifier
+- `Context` and `PrivateContext` - exposes things such as the contract address, msg_sender, etc
+- `AztecAddress` - A type for storing an address on Aztec
+- `FunctionSelector` - Used for computing a selector to call a function
+- `Map` - A data storage type for storing candidates with the number of votes they have
+- `PublicMutable` - A type of storage, which holds a mutable public value. We'll store votes as PublicMutables
 
 ## Set up storage
 
@@ -155,7 +147,9 @@ The easiest way to compile the contract is with `aztec-nargo`. Run the following
 aztec-nargo compile
 ```
 
-This will create a new directory called `target` and a JSON artifact inside it. To optionally create a typescript interface, run:
+This will create a new directory called `target` and a JSON artifact inside it.
+
+Once it is compiled you can [deploy](../contracts/deploying_contracts/how_to_deploy_contract.md) it to the sandbox. Ensure your [sandbox is running](../sandbox/references/sandbox-reference.md). 
 
 ```bash
 aztec-builder target -o src/artifacts
diff --git a/docs/docs/developers/tutorials/writing_token_contract.md b/docs/docs/developers/tutorials/writing_token_contract.md
index 5805cddfe552..cc555428c13d 100644
--- a/docs/docs/developers/tutorials/writing_token_contract.md
+++ b/docs/docs/developers/tutorials/writing_token_contract.md
@@ -26,48 +26,41 @@ Check the [Dev Tools section](https://github.com/noir-lang/awesome-noir#dev-tool
 
 ## Project setup
 
-Create a new directory called `token_contract_tutorial`
+Create a new project with:
 
 ```bash
-mkdir token_contract_tutorial
+aztec-nargo new --contract token_contract
 ```
 
-inside that directory, create a `contracts` folder for the Aztec contracts.
-
-```bash
-cd token_contract_tutorial && mkdir contracts && cd contracts
-```
-
-Create the following file structure
+Your file structure should look something like this:
 
 ```tree
 .
-└── contracts
-    ├── Nargo.toml
-    └── src
-        └── main.nr
+|--private_voting
+|  |--src
+|  |  |--main.nr
+|  |--Nargo.toml
 ```
 
-Add the following content to Nargo.toml file:
+Inside `Nargo.toml` paste the following:
 
 ```toml
-[package]
-name = "token_contract"
-authors = [""]
-compiler_version = ">=0.18.0"
-type = "contract"
-
 [dependencies]
 aztec = { git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="noir-projects/aztec-nr/aztec" }
 authwit={ git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="noir-projects/aztec-nr/authwit"}
 compressed_string = {git="https://github.com/AztecProtocol/aztec-packages/", tag="#include_aztec_version", directory="noir-projects/aztec-nr/compressed-string"}
 ```
 
+We will be working within `main.nr` for the rest of the tutorial.
+
 ## Contract Interface
 
+Remove everything from `main.nr` and paste this:
+
 ```rust
 contract Token {
     #[aztec(private)]
+    #[aztec(initializer)]
     fn constructor() {}
 
     #[aztec(public)]
@@ -111,11 +104,13 @@ contract Token {
     #[aztec(public)]
     fn _initialize(new_admin: AztecAddress) {}
 
+    #[aztec(internal)]
     #[aztec(public)]
-    internal fn _increase_public_balance(to: AztecAddress, amount: Field) {}
+    fn _increase_public_balance(to: AztecAddress, amount: Field) {}
 
+    #[aztec(internal)]
     #[aztec(public)]
-    internal fn _reduce_total_supply(amount: Field) {}
+    fn _reduce_total_supply(amount: Field) {}
 
     // Unconstrained functions (read only)
 
@@ -131,7 +126,7 @@ contract Token {
 }
 ```
 
-This specifies the interface of the `Token` contract. Go ahead and copy and paste this interface into your `main.nr` file.
+This specifies the interface of the `Token` contract. Don't worry if you get some warnings - we haven't imported our types yet.
 
 Before we through the interface and implement each function, let's review the functions to get a sense of what the contract does.
 
@@ -204,7 +199,12 @@ Just below the contract definition, add the following imports:
 
 #include_code imports /noir-projects/noir-contracts/contracts/token_contract/src/main.nr rust
 
-We are importing the Option type, items from the `value_note` library to help manage private value storage, note utilities, context (for managing private and public execution contexts), `state_vars` for helping manage state, `types` for data manipulation and `oracle` for help passing data from the private to public execution context. We also import the `auth` [library](https://github.com/AztecProtocol/aztec-packages/blob/#include_aztec_version/noir-projects/aztec-nr/aztec/src/auth.nr) to handle token authorizations from [Account Contracts](../../learn/concepts/accounts/main). Check out the Account Contract with AuthWitness [here](https://github.com/AztecProtocol/aztec-packages/blob/#include_aztec_version/noir-projects/noir-contracts/contracts/schnorr_single_key_account_contract/src/main.nr).
+We are importing:
+
+- `CompressedString` to hold the token symbol
+- Types from `aztec::prelude`
+- `compute_secret_hash` that will help with the shielding and unshielding, allowing someone to claim a token from private to public
+- Types for storing note types
 
 For more detail on execution contexts, see [Contract Communication](../../learn/concepts/communication/main).
 
diff --git a/docs/docs/developers/versions-updating.md b/docs/docs/developers/versions-updating.md
index 7e2e46d81690..a4fee3a3640d 100644
--- a/docs/docs/developers/versions-updating.md
+++ b/docs/docs/developers/versions-updating.md
@@ -74,14 +74,14 @@ VERSION=0.35.0 aztec-up
 
 2. Update aztec-nr and individual @aztec dependencies:
 
-<!-- Inside your project run:
+Inside your project run:
 
 ```shell
 cd your/aztec/project
-aztec-cli update . --contract src/contract1 --contract src/contract2
+aztec-builder update . --contract src/contract1 --contract src/contract2
 ```
 
-The sandbox must be running for the update command to work. Make sure it is [installed and running](../developers/sandbox/references/sandbox-reference.md). -->
+The sandbox must be running for the update command to work. Make sure it is [installed and running](../developers/sandbox/references/sandbox-reference.md).
 
 Follow [updating Aztec.nr packages](#updating-aztecnr-packages) and [updating JavaScript packages](#updating-aztecjs-packages) guides.
 
@@ -96,19 +96,19 @@ There are four components whose versions need to be kept compatible:
 3. `Aztec.nr`, the Noir framework for writing Aztec contracts
 
 First three are packaged together in docker and are kept compatible by running `aztec-up`.
-But you need to update your Aztec.nr version manually or using `aztec-cli update`.
+But you need to update your Aztec.nr version manually or using `aztec-builder update`.
 
 ## Updating Aztec.nr packages
 
-<!-- ### Automatic update
+### Automatic update
 
-`aztec-cli` will update your Aztec.nr packages to the appropriate version with the `aztec-cli update` command. Run this command from the root of your project and pass the paths to the folders containing the Nargo.toml files for your projects like so:
+`aztec-builder` will update your Aztec.nr packages to the appropriate version with the `aztec-builder update` command. Run this command from the root of your project and pass the paths to the folders containing the Nargo.toml files for your projects like so:
 
 ```shell
-aztec-cli update . --contract src/contract1 --contract src/contract2
+aztec-builder update . --contract src/contract1 --contract src/contract2
 ```
 
-### Manual update -->
+### Manual update
 
 To update the aztec.nr packages manually, update the tags of the `aztec.nr` dependencies in the `Nargo.toml` file.
 
diff --git a/docs/sidebars.js b/docs/sidebars.js
index 9c522947d5de..b2272172ad87 100644
--- a/docs/sidebars.js
+++ b/docs/sidebars.js
@@ -260,25 +260,25 @@ const sidebars = {
             "developers/tutorials/token_portal/typescript_glue_code",
           ],
         },
-        {
-          label: "Swap on L1 Uniswap from L2 with Portals",
-          type: "category",
-          link: {
-            type: "doc",
-            id: "developers/tutorials/uniswap/main",
-          },
-          items: [
-            "developers/tutorials/uniswap/setup",
-            "developers/tutorials/uniswap/l1_portal",
-            "developers/tutorials/uniswap/l2_contract_setup",
-            "developers/tutorials/uniswap/swap_publicly",
-            "developers/tutorials/uniswap/execute_public_swap_on_l1",
-            "developers/tutorials/uniswap/swap_privately",
-            "developers/tutorials/uniswap/execute_private_swap_on_l1",
-            "developers/tutorials/uniswap/redeeming_swapped_assets_on_l2",
-            "developers/tutorials/uniswap/typescript_glue_code",
-          ],
-        },
+        // { // temporarily removing as it is very very messy with monorepo references. we need to write new ts for this
+        //   label: "Swap on L1 Uniswap from L2 with Portals",
+        //   type: "category",
+        //   link: {
+        //     type: "doc",
+        //     id: "developers/tutorials/uniswap/main",
+        //   },
+        //   items: [
+        //     "developers/tutorials/uniswap/setup",
+        //     "developers/tutorials/uniswap/l1_portal",
+        //     "developers/tutorials/uniswap/l2_contract_setup",
+        //     "developers/tutorials/uniswap/swap_publicly",
+        //     "developers/tutorials/uniswap/execute_public_swap_on_l1",
+        //     "developers/tutorials/uniswap/swap_privately",
+        //     "developers/tutorials/uniswap/execute_private_swap_on_l1",
+        //     "developers/tutorials/uniswap/redeeming_swapped_assets_on_l2",
+        //     "developers/tutorials/uniswap/typescript_glue_code",
+        //   ],
+        // },
         "developers/tutorials/testing",
       ],
     },
diff --git a/l1-contracts/test/portals/DataStructures.sol b/l1-contracts/test/portals/DataStructures.sol
index 7f6291a0f987..03245f859c1c 100644
--- a/l1-contracts/test/portals/DataStructures.sol
+++ b/l1-contracts/test/portals/DataStructures.sol
@@ -1,3 +1,4 @@
+// docs:start:portals_data_structures
 // SPDX-License-Identifier: Apache-2.0
 // Copyright 2024 Aztec Labs.
 pragma solidity >=0.8.18;
@@ -9,3 +10,4 @@ library DataStructures {
     bytes32[] _path;
   }
 }
+// docs:end:portals_data_structures
diff --git a/noir-projects/noir-contracts/contracts/uniswap_contract/src/main.nr b/noir-projects/noir-contracts/contracts/uniswap_contract/src/main.nr
index f8227136c67c..7fe8812d566a 100644
--- a/noir-projects/noir-contracts/contracts/uniswap_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/uniswap_contract/src/main.nr
@@ -223,12 +223,13 @@ contract Uniswap {
             token.eq(TokenBridge::at(token_bridge).get_token().call(&mut context)), "input_asset address is not the same as seen in the bridge contract"
         );
     }
-    // docs:end:assert_token_is_same
-
+    
     // /// Unconstrained ///
 
     // this method exists solely for e2e tests to test that nonce gets incremented each time.
     unconstrained fn nonce_for_burn_approval() -> pub Field {
         storage.nonce_for_burn_approval.read()
     }
+    // docs:end:assert_token_is_same
+
 }

From 864b8aaec9957e3e1457c2e1e51d2ff758366176 Mon Sep 17 00:00:00 2001
From: Aztec Bot <49558828+AztecBot@users.noreply.github.com>
Date: Tue, 30 Apr 2024 18:57:05 +0100
Subject: [PATCH 15/42] chore(master): Release 0.36.0 (#5791)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

:robot: I have created a release *beep* *boop*
---


<details><summary>aztec-package: 0.36.0</summary>

##
[0.36.0](https://github.com/AztecProtocol/aztec-packages/compare/aztec-package-v0.35.1...aztec-package-v0.36.0)
(2024-04-30)


### Features

* Add key registry to deployment (e2e & sandbox)
([#5875](https://github.com/AztecProtocol/aztec-packages/issues/5875))
([0881cd3](https://github.com/AztecProtocol/aztec-packages/commit/0881cd3083af70271bceda695d0c8ad21212c172)),
closes
[#5611](https://github.com/AztecProtocol/aztec-packages/issues/5611)
* Configure prover as separate process
([#5973](https://github.com/AztecProtocol/aztec-packages/issues/5973))
([c0dd7b2](https://github.com/AztecProtocol/aztec-packages/commit/c0dd7b21779b99f1b9d3ed43623d3de25a332699))
* **p2p:** DiscV5 Peer Discovery
([#5652](https://github.com/AztecProtocol/aztec-packages/issues/5652))
([0e81642](https://github.com/AztecProtocol/aztec-packages/commit/0e8164239b6a1180fd292e37faf1a0e64aa9cff4))


### Bug Fixes

* Deploy L1 contracts before starting node
([#5969](https://github.com/AztecProtocol/aztec-packages/issues/5969))
([1908139](https://github.com/AztecProtocol/aztec-packages/commit/190813911c5e4fc7533525478ceca4162170fa6b))
* Refuse to start sequencer without a prover
([#6000](https://github.com/AztecProtocol/aztec-packages/issues/6000))
([b30d0b6](https://github.com/AztecProtocol/aztec-packages/commit/b30d0b6481b0f0b2241f1fcc9ec9bc0f82308ce9))


### Miscellaneous

* **ci:** Prevent haywire logs
([#5966](https://github.com/AztecProtocol/aztec-packages/issues/5966))
([b12f609](https://github.com/AztecProtocol/aztec-packages/commit/b12f60994fdd54cb4d8e18e444c207e319f9d6a6))
* Integrate new key store
([#5731](https://github.com/AztecProtocol/aztec-packages/issues/5731))
([ab9fe78](https://github.com/AztecProtocol/aztec-packages/commit/ab9fe780e8a9fc3187a02b37ddbefa609d3bff8f)),
closes
[#5720](https://github.com/AztecProtocol/aztec-packages/issues/5720)
* Purging portal addresses
([#5842](https://github.com/AztecProtocol/aztec-packages/issues/5842))
([4faccad](https://github.com/AztecProtocol/aztec-packages/commit/4faccad569e39228b0f3fbf741fc95e3a189e276))
* Renaming `noir-compiler` as `builder`
([#5951](https://github.com/AztecProtocol/aztec-packages/issues/5951))
([185e57d](https://github.com/AztecProtocol/aztec-packages/commit/185e57d51e8bbf6194628ce62db3dd44f11634a4))
* Replace queue with facade over CircuitProver
([#5972](https://github.com/AztecProtocol/aztec-packages/issues/5972))
([dafb3ed](https://github.com/AztecProtocol/aztec-packages/commit/dafb3edc799b2adaf285ffe57b41630040c68449))
* Using poseidon2 when computing a nullifier
([#5906](https://github.com/AztecProtocol/aztec-packages/issues/5906))
([3a10e5e](https://github.com/AztecProtocol/aztec-packages/commit/3a10e5e75b8053dfea13a4901873d42ca01ca7c2)),
closes
[#5832](https://github.com/AztecProtocol/aztec-packages/issues/5832)
[#1205](https://github.com/AztecProtocol/aztec-packages/issues/1205)
</details>

<details><summary>barretenberg.js: 0.36.0</summary>

##
[0.36.0](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.35.1...barretenberg.js-v0.36.0)
(2024-04-30)


### Miscellaneous

* Do not bootstrap cache if working copy is dirty
([#6033](https://github.com/AztecProtocol/aztec-packages/issues/6033))
([3671932](https://github.com/AztecProtocol/aztec-packages/commit/367193253670a1d61ffa440d94dad4b9d068e72f))
</details>

<details><summary>aztec-packages: 0.36.0</summary>

##
[0.36.0](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.35.1...aztec-packages-v0.36.0)
(2024-04-30)


### ⚠ BREAKING CHANGES

* remove `Opcode::Brillig` from ACIR
([#5995](https://github.com/AztecProtocol/aztec-packages/issues/5995))
* delete field note
([#5959](https://github.com/AztecProtocol/aztec-packages/issues/5959))
* remove slow updates tree
([#5954](https://github.com/AztecProtocol/aztec-packages/issues/5954))
* Add `as_array` and remove `_slice` variants of hash functions
(https://github.com/noir-lang/noir/pull/4675)
* reserve keyword `super` (https://github.com/noir-lang/noir/pull/4836)
* **aztec-nr:** unencrypted logs go behind context
([#5871](https://github.com/AztecProtocol/aztec-packages/issues/5871))
* move fixtures to @aztec/circuits.js/testing/fixtures
([#5826](https://github.com/AztecProtocol/aztec-packages/issues/5826))
* contract interfaces and better function calls
([#5687](https://github.com/AztecProtocol/aztec-packages/issues/5687))
* change backend width to 4
([#5374](https://github.com/AztecProtocol/aztec-packages/issues/5374))

### Features

* `variable_base_scalar_mul` blackbox func
([#6039](https://github.com/AztecProtocol/aztec-packages/issues/6039))
([81142fe](https://github.com/AztecProtocol/aztec-packages/commit/81142fe799338e6ed73b30eeac4468c1345f6fab))
* **acir_gen:** Brillig stdlib
(https://github.com/noir-lang/noir/pull/4848)
([8f73f18](https://github.com/AztecProtocol/aztec-packages/commit/8f73f18f3c07de0fd5e247ade5a48109c37c1bc5))
* Add `#[inline(tag)]` attribute and codegen
(https://github.com/noir-lang/noir/pull/4913)
([e615a83](https://github.com/AztecProtocol/aztec-packages/commit/e615a831a12b78644b798e12395d970bf5601948))
* Add `min` and `max` functions to the stdlib
(https://github.com/noir-lang/noir/pull/4839)
([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
* Add `NARGO_FOREIGN_CALL_TIMEOUT` environment variable
(https://github.com/noir-lang/noir/pull/4780)
([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
* Add comptime Interpreter (https://github.com/noir-lang/noir/pull/4821)
([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
* Add key registry to deployment (e2e & sandbox)
([#5875](https://github.com/AztecProtocol/aztec-packages/issues/5875))
([0881cd3](https://github.com/AztecProtocol/aztec-packages/commit/0881cd3083af70271bceda695d0c8ad21212c172)),
closes
[#5611](https://github.com/AztecProtocol/aztec-packages/issues/5611)
* Add promiseWithResolvers
([#5808](https://github.com/AztecProtocol/aztec-packages/issues/5808))
([afeef17](https://github.com/AztecProtocol/aztec-packages/commit/afeef17e14054f8ee95a6244c1b165435fddaa50))
* Add proving queue
([#5754](https://github.com/AztecProtocol/aztec-packages/issues/5754))
([a0a9668](https://github.com/AztecProtocol/aztec-packages/commit/a0a9668d933907a89f21077fd700b6d2f44e6c74))
* Add side effect counter to logs
([#5718](https://github.com/AztecProtocol/aztec-packages/issues/5718))
([d7486a6](https://github.com/AztecProtocol/aztec-packages/commit/d7486a6b0b26b5264a1b02c1134d82abfb497aa0))
* Add the storage layout to the contract artifact
([#5952](https://github.com/AztecProtocol/aztec-packages/issues/5952))
([88ee0af](https://github.com/AztecProtocol/aztec-packages/commit/88ee0af9987063d63afb49c4f61ab5ae5f7c1b73))
* Add TimeoutError
([#5751](https://github.com/AztecProtocol/aztec-packages/issues/5751))
([741fdf1](https://github.com/AztecProtocol/aztec-packages/commit/741fdf16e7f0b3f116c724505afa8e604bc51bf1))
* Add variable size sha256 (https://github.com/noir-lang/noir/pull/4920)
([e615a83](https://github.com/AztecProtocol/aztec-packages/commit/e615a831a12b78644b798e12395d970bf5601948))
* Add variable size sha256 (https://github.com/noir-lang/noir/pull/4920)
([078aa61](https://github.com/AztecProtocol/aztec-packages/commit/078aa61b06557aba74ac9cce557ee6bd05040feb))
* AES oracle
([#5996](https://github.com/AztecProtocol/aztec-packages/issues/5996))
([8e0a563](https://github.com/AztecProtocol/aztec-packages/commit/8e0a56306ba45ea1eaaa25ee47d84b7334e0bbe3)),
closes
[#5895](https://github.com/AztecProtocol/aztec-packages/issues/5895)
* AES oracle padding
([#6013](https://github.com/AztecProtocol/aztec-packages/issues/6013))
([4b563cd](https://github.com/AztecProtocol/aztec-packages/commit/4b563cd79f16f513a05c1595a4f2673cdaa7600a))
* Allow numeric generics to non inlined ACIR functions
(https://github.com/noir-lang/noir/pull/4834)
([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
* Avm mem trace validation
([#6025](https://github.com/AztecProtocol/aztec-packages/issues/6025))
([3a3afb5](https://github.com/AztecProtocol/aztec-packages/commit/3a3afb57ab8b6b3f11b7a7799d557436638c8cd3)),
closes
[#5950](https://github.com/AztecProtocol/aztec-packages/issues/5950)
* **avm:** Avm circuit FDIV opcode
([#5958](https://github.com/AztecProtocol/aztec-packages/issues/5958))
([fed5b6d](https://github.com/AztecProtocol/aztec-packages/commit/fed5b6dd1ee310fc90404a3e5ec9eb02ad7dbc10)),
closes
[#5953](https://github.com/AztecProtocol/aztec-packages/issues/5953)
* **avm:** CAST opcode implementation
([#5477](https://github.com/AztecProtocol/aztec-packages/issues/5477))
([a821bcc](https://github.com/AztecProtocol/aztec-packages/commit/a821bccef7b1894140f0495510d7c6b4eefde821)),
closes
[#5466](https://github.com/AztecProtocol/aztec-packages/issues/5466)
* **avm:** Negative tests
([#5919](https://github.com/AztecProtocol/aztec-packages/issues/5919))
([8a5ece7](https://github.com/AztecProtocol/aztec-packages/commit/8a5ece7548a86d099ac6a166f04882624b8d95fd))
* **avm:** Shift relations
([#5716](https://github.com/AztecProtocol/aztec-packages/issues/5716))
([a516637](https://github.com/AztecProtocol/aztec-packages/commit/a51663707b96914b0a300440611748ce44fbe933))
* Avoiding redundant computation in PG
([#5844](https://github.com/AztecProtocol/aztec-packages/issues/5844))
([9f57733](https://github.com/AztecProtocol/aztec-packages/commit/9f5773353aa0261fa07a81704bcadcee513d42c5))
* Brillig pointer codegen and execution
([#5737](https://github.com/AztecProtocol/aztec-packages/issues/5737))
([a7b9d20](https://github.com/AztecProtocol/aztec-packages/commit/a7b9d20a962c33d8585502fd00739138c6d79aca))
* Bump lmdb
([#5783](https://github.com/AztecProtocol/aztec-packages/issues/5783))
([f7d5cf2](https://github.com/AztecProtocol/aztec-packages/commit/f7d5cf2c683ee7840885ac176b9e838b4e3ab6e2))
* Change backend width to 4
([#5374](https://github.com/AztecProtocol/aztec-packages/issues/5374))
([3f24fc2](https://github.com/AztecProtocol/aztec-packages/commit/3f24fc2cdb56eff6da6e47062d2a2a3dc0fa4bd2))
* Circuit simulator for Ultra and GoblinUltra verifiers
([#1195](https://github.com/AztecProtocol/aztec-packages/issues/1195))
([0032a3a](https://github.com/AztecProtocol/aztec-packages/commit/0032a3a55dea5e4c9051dbc36607288f8ca1be4a))
* Computing sym key for incoming ciphertext
([#6020](https://github.com/AztecProtocol/aztec-packages/issues/6020))
([1904fa8](https://github.com/AztecProtocol/aztec-packages/commit/1904fa864ff8c546d4d849436c6ca7a7606fb3d2))
* Configure prover as separate process
([#5973](https://github.com/AztecProtocol/aztec-packages/issues/5973))
([c0dd7b2](https://github.com/AztecProtocol/aztec-packages/commit/c0dd7b21779b99f1b9d3ed43623d3de25a332699))
* Contract interfaces and better function calls
([#5687](https://github.com/AztecProtocol/aztec-packages/issues/5687))
([274f7d9](https://github.com/AztecProtocol/aztec-packages/commit/274f7d935230ce21d062644f6ec5f7cd0f58ae62))
* Decoded return values
([#5762](https://github.com/AztecProtocol/aztec-packages/issues/5762))
([03e693a](https://github.com/AztecProtocol/aztec-packages/commit/03e693a0db52a0c0b02c403f9ded2e28f3c7ced2))
* Delete field note
([#5959](https://github.com/AztecProtocol/aztec-packages/issues/5959))
([ae18396](https://github.com/AztecProtocol/aztec-packages/commit/ae183960a96d14d1eac2876bc070ed09f75b8f25))
* **docs:** Nuke CLI from docs
([#5936](https://github.com/AztecProtocol/aztec-packages/issues/5936))
([9af68d8](https://github.com/AztecProtocol/aztec-packages/commit/9af68d8bd59a84e014567b429e9c9b4aed7fee74))
* Dynamic assertion payloads v2
([#5949](https://github.com/AztecProtocol/aztec-packages/issues/5949))
([405bdf6](https://github.com/AztecProtocol/aztec-packages/commit/405bdf6a297b81e0c3fda303cf2b1480eaea69f1))
* **experimental:** Add `comptime` keyword
(https://github.com/noir-lang/noir/pull/4840)
([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
* Handle `BrilligCall` opcodes in the debugger
(https://github.com/noir-lang/noir/pull/4897)
([3b91791](https://github.com/AztecProtocol/aztec-packages/commit/3b9179118369137880277f1444f0e3f94b3f5e79))
* Implement `Eq` trait on `BoundedVec`
(https://github.com/noir-lang/noir/pull/4830)
([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
* Implement canonical key registry 5609 and implement shared mutable
getter from another contract 5689
([#5723](https://github.com/AztecProtocol/aztec-packages/issues/5723))
([15b569f](https://github.com/AztecProtocol/aztec-packages/commit/15b569f24e55d374bfb5a54c8771118653e5e77c))
* Implement recursive verification in the parity circuits
([#6006](https://github.com/AztecProtocol/aztec-packages/issues/6006))
([a5b6dac](https://github.com/AztecProtocol/aztec-packages/commit/a5b6dacd5512d7a035655845381b2c720b1e550a))
* Keshas skipping plus conditions for grand prod relations
([#5766](https://github.com/AztecProtocol/aztec-packages/issues/5766))
([d8fcfb5](https://github.com/AztecProtocol/aztec-packages/commit/d8fcfb590f788b911111010e20458797d76f5779))
* Lalrpop lexer prototype (https://github.com/noir-lang/noir/pull/4656)
([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
* Make public l1tol2 message consumption take leafIndex
([#5805](https://github.com/AztecProtocol/aztec-packages/issues/5805))
([302e3bb](https://github.com/AztecProtocol/aztec-packages/commit/302e3bbb2d7a7d54f362026edb314f3d3596b6d6))
* More robust spot shutdown + CI commandline
([#5825](https://github.com/AztecProtocol/aztec-packages/issues/5825))
([12064f9](https://github.com/AztecProtocol/aztec-packages/commit/12064f95abb3125933eb55996abb978c4aeaad53))
* Naive structured execution trace
([#5853](https://github.com/AztecProtocol/aztec-packages/issues/5853))
([23aab17](https://github.com/AztecProtocol/aztec-packages/commit/23aab171b17d0dfb840621a74266496ac270b3e8))
* **nargo:** Handle call stacks for multiple Acir calls
(https://github.com/noir-lang/noir/pull/4711)
([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
* Narrow ABI encoding errors down to target problem argument/field
(https://github.com/noir-lang/noir/pull/4798)
([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
* **p2p:** DiscV5 Peer Discovery
([#5652](https://github.com/AztecProtocol/aztec-packages/issues/5652))
([0e81642](https://github.com/AztecProtocol/aztec-packages/commit/0e8164239b6a1180fd292e37faf1a0e64aa9cff4))
* Prove the public kernel circuits
([#5778](https://github.com/AztecProtocol/aztec-packages/issues/5778))
([f9a843a](https://github.com/AztecProtocol/aztec-packages/commit/f9a843a00ff41ef39b958ae7f5a24bdbc1b1add2))
* Prove then verify flow for honk
([#5957](https://github.com/AztecProtocol/aztec-packages/issues/5957))
([099346e](https://github.com/AztecProtocol/aztec-packages/commit/099346ebbab9428f57bfffdc03e8bede5c2e2bed))
* Re-introducing update command
([#5946](https://github.com/AztecProtocol/aztec-packages/issues/5946))
([13153d0](https://github.com/AztecProtocol/aztec-packages/commit/13153d02c8b0eb9cae1b7c0436fe1a1ddb49734f))
* Remove slow updates tree
([#5954](https://github.com/AztecProtocol/aztec-packages/issues/5954))
([52a1631](https://github.com/AztecProtocol/aztec-packages/commit/52a1631b59297ce062eda14a10e99e552f7fa706))
* Reserve keyword `super` (https://github.com/noir-lang/noir/pull/4836)
([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
* Serialize public kernel private inputs
([#5971](https://github.com/AztecProtocol/aztec-packages/issues/5971))
([0c712b9](https://github.com/AztecProtocol/aztec-packages/commit/0c712b9c0f69bad0da3910add5adba40622d3cea))
* Simplify `BoundedVec::eq`
(https://github.com/noir-lang/noir/pull/4838)
([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
* Squashing transient note hashes and nullifiers
([#6059](https://github.com/AztecProtocol/aztec-packages/issues/6059))
([2b8b2c3](https://github.com/AztecProtocol/aztec-packages/commit/2b8b2c3bcbed425027f343bd2b90fd6380e2ddc4))
* Sync from aztec-packages (https://github.com/noir-lang/noir/pull/4792)
([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
* Sync from aztec-packages (https://github.com/noir-lang/noir/pull/4833)
([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
* Sync from aztec-packages (https://github.com/noir-lang/noir/pull/4902)
([3b91791](https://github.com/AztecProtocol/aztec-packages/commit/3b9179118369137880277f1444f0e3f94b3f5e79))
* Validate globals in public kernel
([#6031](https://github.com/AztecProtocol/aztec-packages/issues/6031))
([82b17c8](https://github.com/AztecProtocol/aztec-packages/commit/82b17c8f0e9207db803fd3b824e63bac25ea69f6))
* Verify public data reads
([#5701](https://github.com/AztecProtocol/aztec-packages/issues/5701))
([323f59f](https://github.com/AztecProtocol/aztec-packages/commit/323f59f55bcd64e32725d1ed5aab72d5b9dbe31d))
* Wire gas from public execution to kernels
([#5941](https://github.com/AztecProtocol/aztec-packages/issues/5941))
([6894fc7](https://github.com/AztecProtocol/aztec-packages/commit/6894fc759cc4cd4e77d297fe6164cd39478ece4a))


### Bug Fixes

* `test_native.sh` not running all noir tests
([#6075](https://github.com/AztecProtocol/aztec-packages/issues/6075))
([cc7676e](https://github.com/AztecProtocol/aztec-packages/commit/cc7676e87a7002f14b1b77b7c13f88f71355ec5b))
* Args + selector in deploy.nr
([#5948](https://github.com/AztecProtocol/aztec-packages/issues/5948))
([100744f](https://github.com/AztecProtocol/aztec-packages/commit/100744f89b676a03990c2d29aa0b48da77be5d8d))
* **avm-simulator:** L1TOL2MESSAGEEXISTS opcode
([#5807](https://github.com/AztecProtocol/aztec-packages/issues/5807))
([71b60f3](https://github.com/AztecProtocol/aztec-packages/commit/71b60f32c3b3781dda1c79bb6a926050bad7bb55))
* **avm:** Comments and assert
([#5956](https://github.com/AztecProtocol/aztec-packages/issues/5956))
([ae50219](https://github.com/AztecProtocol/aztec-packages/commit/ae502199b84999418d461ed5d0d6fca0c60494c5))
* **avm:** Do not scale CALLDATACOPY base cost with size
([#5879](https://github.com/AztecProtocol/aztec-packages/issues/5879))
([99e12b1](https://github.com/AztecProtocol/aztec-packages/commit/99e12b1abd7e66e871b41572a54cee63b5300d96))
* Bigint corruption in lmdb
([#6002](https://github.com/AztecProtocol/aztec-packages/issues/6002))
([703e0c1](https://github.com/AztecProtocol/aztec-packages/commit/703e0c1e2c2a5703410ff5fd4c1a135131254a53))
* Calculate tx fee using current constants in public kernel
([#6066](https://github.com/AztecProtocol/aztec-packages/issues/6066))
([c359d79](https://github.com/AztecProtocol/aztec-packages/commit/c359d796e72c215edf1af06c54d9287ee87df425))
* Catch panics from EC point creation (e.g. the point is at infinity)
(https://github.com/noir-lang/noir/pull/4790)
([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
* Check if a runner is available + safer refcount for spot life
([#5793](https://github.com/AztecProtocol/aztec-packages/issues/5793))
([67077a1](https://github.com/AztecProtocol/aztec-packages/commit/67077a11250cb28dbef890009668341524b85d8b))
* **ci:** Always run merge-check
([#6065](https://github.com/AztecProtocol/aztec-packages/issues/6065))
([b43b84f](https://github.com/AztecProtocol/aztec-packages/commit/b43b84f5993e6950c5f081c3c77e9549dc7fddbe))
* **ci:** Deploy_npm script
([#5817](https://github.com/AztecProtocol/aztec-packages/issues/5817))
([df1c3c4](https://github.com/AztecProtocol/aztec-packages/commit/df1c3c4c706a44847b25a66d27544eedc508cf62))
* **ci:** Merge check fails ungracefully on spot issues
([#5887](https://github.com/AztecProtocol/aztec-packages/issues/5887))
([3683f0b](https://github.com/AztecProtocol/aztec-packages/commit/3683f0bb034ea59258c587d70d0517ee2ed00b91))
* **ci:** Race condition when making spot in multiple PRs
([#5798](https://github.com/AztecProtocol/aztec-packages/issues/5798))
([18e75b8](https://github.com/AztecProtocol/aztec-packages/commit/18e75b85bcd6eec53cee3a5da854a8d27e3f186e))
* Deploy L1 contracts before starting node
([#5969](https://github.com/AztecProtocol/aztec-packages/issues/5969))
([1908139](https://github.com/AztecProtocol/aztec-packages/commit/190813911c5e4fc7533525478ceca4162170fa6b))
* **docs:** Fix admonition in contract class protocol spec
([#6017](https://github.com/AztecProtocol/aztec-packages/issues/6017))
([12bfc15](https://github.com/AztecProtocol/aztec-packages/commit/12bfc15923ee4b7b57e50ac714953cb8129e7d5d))
* **docs:** Fix formatting in protocol specs
([#5882](https://github.com/AztecProtocol/aztec-packages/issues/5882))
([07fc143](https://github.com/AztecProtocol/aztec-packages/commit/07fc1434ac780f8a35533775e26ef2bd9e190816))
* **docs:** Tutorial fixes
([#5600](https://github.com/AztecProtocol/aztec-packages/issues/5600))
([6421467](https://github.com/AztecProtocol/aztec-packages/commit/642146705857cf34eb0f9feab665977fb2d8fb02))
* Don't refcount spot
([#5812](https://github.com/AztecProtocol/aztec-packages/issues/5812))
([98e8da0](https://github.com/AztecProtocol/aztec-packages/commit/98e8da094dbac1c06f800f82bd89181a6b9039b5))
* Don't reuse brillig with slice arguments
([#5800](https://github.com/AztecProtocol/aztec-packages/issues/5800))
([be9f24c](https://github.com/AztecProtocol/aztec-packages/commit/be9f24c16484b26a1eb88bcf35b785553160995d))
* **experimental:** Skip over comptime functions in scan pass
(https://github.com/noir-lang/noir/pull/4893)
([2e64428](https://github.com/AztecProtocol/aztec-packages/commit/2e64428af9525bd8c390931061505f7b48d729a4))
* Fix and reenable fees e2e tests
([#5877](https://github.com/AztecProtocol/aztec-packages/issues/5877))
([165e62f](https://github.com/AztecProtocol/aztec-packages/commit/165e62f38239f25cc6595bb43f435e9f4673fd83))
* Fix curve parameters for bigints
(https://github.com/noir-lang/noir/pull/4900)
([2e64428](https://github.com/AztecProtocol/aztec-packages/commit/2e64428af9525bd8c390931061505f7b48d729a4))
* Fix panic when returning a zeroed unit value
(https://github.com/noir-lang/noir/pull/4797)
([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
* Fix relation skipping for sumcheck
([#6092](https://github.com/AztecProtocol/aztec-packages/issues/6092))
([1449c33](https://github.com/AztecProtocol/aztec-packages/commit/1449c338ca79f8d72b71484546aa46ddebb21779))
* Hotfix stopped instance terminate
([#6037](https://github.com/AztecProtocol/aztec-packages/issues/6037))
([005c71c](https://github.com/AztecProtocol/aztec-packages/commit/005c71cff4b592f89833c5556d827e55b7678b7b))
* Issue 4682 and add solver for unconstrained bigintegers
(https://github.com/noir-lang/noir/pull/4729)
([beab8c9](https://github.com/AztecProtocol/aztec-packages/commit/beab8c93857536e07fa37994213fc664a5864013))
* Make discv5 test deterministic
([#5968](https://github.com/AztecProtocol/aztec-packages/issues/5968))
([41749a5](https://github.com/AztecProtocol/aztec-packages/commit/41749a5148b9b5360659e06155cd09d8d7f2a78e))
* MemoryFifo return null when empty and timeout 0
([#5753](https://github.com/AztecProtocol/aztec-packages/issues/5753))
([27129e6](https://github.com/AztecProtocol/aztec-packages/commit/27129e6d483e787abea5084c029e560d5d4b5b0e))
* Merge-check
([#5873](https://github.com/AztecProtocol/aztec-packages/issues/5873))
([c999dae](https://github.com/AztecProtocol/aztec-packages/commit/c999dae76580ea63486aaa17edb774736dc32b89))
* Move fixtures to @aztec/circuits.js/testing/fixtures
([#5826](https://github.com/AztecProtocol/aztec-packages/issues/5826))
([fb7a617](https://github.com/AztecProtocol/aztec-packages/commit/fb7a6175b185725e607d28a8930a15d88f84e117))
* Nested array equality (https://github.com/noir-lang/noir/pull/4903)
([3b91791](https://github.com/AztecProtocol/aztec-packages/commit/3b9179118369137880277f1444f0e3f94b3f5e79))
* Proper field inversion for bigints
(https://github.com/noir-lang/noir/pull/4802)
([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
* Refuse to start sequencer without a prover
([#6000](https://github.com/AztecProtocol/aztec-packages/issues/6000))
([b30d0b6](https://github.com/AztecProtocol/aztec-packages/commit/b30d0b6481b0f0b2241f1fcc9ec9bc0f82308ce9))
* Remove tx.origin
([#5765](https://github.com/AztecProtocol/aztec-packages/issues/5765))
([c8784d7](https://github.com/AztecProtocol/aztec-packages/commit/c8784d7994937bfae9d23f5d17eb914bae92d8dc)),
closes
[#5756](https://github.com/AztecProtocol/aztec-packages/issues/5756)
* Reset the noir-gates-diff report on master
(https://github.com/noir-lang/noir/pull/4878)
([2e64428](https://github.com/AztecProtocol/aztec-packages/commit/2e64428af9525bd8c390931061505f7b48d729a4))
* Revert "feat: Sync from noir"
([#6034](https://github.com/AztecProtocol/aztec-packages/issues/6034))
([6383a09](https://github.com/AztecProtocol/aztec-packages/commit/6383a09ce5d9ab581af5d458bdcb65f92d9011fb))
* **Revert:** "refactor: purge unconstrained functions where possible"
([#5911](https://github.com/AztecProtocol/aztec-packages/issues/5911))
([c36246b](https://github.com/AztecProtocol/aztec-packages/commit/c36246bb692bf9a3d8e338bbc26a3ce801f0e389))
* Set gas settings in bench
([#5796](https://github.com/AztecProtocol/aztec-packages/issues/5796))
([86d8176](https://github.com/AztecProtocol/aztec-packages/commit/86d8176279fdc07d3b0eed91f226985e2b15f54e))
* Start spot label
([#5810](https://github.com/AztecProtocol/aztec-packages/issues/5810))
([96da333](https://github.com/AztecProtocol/aztec-packages/commit/96da3334af2b4b1815f9d3eb9839840c0b76d5bc))
* Start-spot.yml
([#5824](https://github.com/AztecProtocol/aztec-packages/issues/5824))
([3cf9c2c](https://github.com/AztecProtocol/aztec-packages/commit/3cf9c2c908b361437050e97fcdf67359727eff8b))
* Temporarily exclude bytecode from class id computation
([#5857](https://github.com/AztecProtocol/aztec-packages/issues/5857))
([55ff125](https://github.com/AztecProtocol/aztec-packages/commit/55ff1251c2c1c02ecbbaadfa38764c5847fee910))
* Update noir-gates-diff commit to use master reference report
(https://github.com/noir-lang/noir/pull/4891)
([2e64428](https://github.com/AztecProtocol/aztec-packages/commit/2e64428af9525bd8c390931061505f7b48d729a4))
* Use correct gates diff commit now that master has been reset
([#6004](https://github.com/AztecProtocol/aztec-packages/issues/6004))
([d8e5af4](https://github.com/AztecProtocol/aztec-packages/commit/d8e5af4eb023f68140d8cebd39d1d15b4683a4a3))


### Miscellaneous

* `create_fixed_base_constraint` cleanup
([#6047](https://github.com/AztecProtocol/aztec-packages/issues/6047))
([e1d6526](https://github.com/AztecProtocol/aztec-packages/commit/e1d6526b34f03458f258c0f0fa6967b5f20035f4))
* `TransparentNote` cleanup
([#5904](https://github.com/AztecProtocol/aztec-packages/issues/5904))
([febf00f](https://github.com/AztecProtocol/aztec-packages/commit/febf00fb841407d54f42634560146568c383f80a))
* Add `as_array` and remove `_slice` variants of hash functions
(https://github.com/noir-lang/noir/pull/4675)
([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
* Add benchmarks for serializing a dummy program
(https://github.com/noir-lang/noir/pull/4813)
([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
* Add error conversion from `InterpreterError`
(https://github.com/noir-lang/noir/pull/4896)
([e615a83](https://github.com/AztecProtocol/aztec-packages/commit/e615a831a12b78644b798e12395d970bf5601948))
* Add error conversion from `InterpreterError`
(https://github.com/noir-lang/noir/pull/4896)
([078aa61](https://github.com/AztecProtocol/aztec-packages/commit/078aa61b06557aba74ac9cce557ee6bd05040feb))
* Add Hir -&gt; Ast conversion
(https://github.com/noir-lang/noir/pull/4788)
([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
* Add target for individual e2e tests
([#6009](https://github.com/AztecProtocol/aztec-packages/issues/6009))
([e2842a6](https://github.com/AztecProtocol/aztec-packages/commit/e2842a6e02bd42792c8ee8ca03316e5aa4902f5b))
* Adding devcontainer with create aztec app
([#5752](https://github.com/AztecProtocol/aztec-packages/issues/5752))
([c72f34e](https://github.com/AztecProtocol/aztec-packages/commit/c72f34ef0ff582269db245643909e02b66a4d37a))
* Adding devcontainer with create aztec app
([#5849](https://github.com/AztecProtocol/aztec-packages/issues/5849))
([eb1cfef](https://github.com/AztecProtocol/aztec-packages/commit/eb1cfefc4ff11802a97127f10ab30fb5487335fd))
* Allow expressions in constant generation
([#5839](https://github.com/AztecProtocol/aztec-packages/issues/5839))
([cb1e25b](https://github.com/AztecProtocol/aztec-packages/commit/cb1e25b8c6f203d8a7e4beb2f027d72bee981695))
* **avm-simulator:** Remove AvmContext::raw_* external calls
([#5869](https://github.com/AztecProtocol/aztec-packages/issues/5869))
([0c9d0b4](https://github.com/AztecProtocol/aztec-packages/commit/0c9d0b4e611472e0e8718449f6d8f2451e0391a0))
* **avm:** More test cleanup
([#5771](https://github.com/AztecProtocol/aztec-packages/issues/5771))
([23d0070](https://github.com/AztecProtocol/aztec-packages/commit/23d0070095bf7d32cfdcf97e7aea348753bb7492))
* **avm:** Negative unit tests for AVM CAST opcode
([#5907](https://github.com/AztecProtocol/aztec-packages/issues/5907))
([4465e3b](https://github.com/AztecProtocol/aztec-packages/commit/4465e3be870963ea435d9a0cd063397020442f0b)),
closes
[#5908](https://github.com/AztecProtocol/aztec-packages/issues/5908)
* **avm:** Re-enable proof in some unit tests
([#6056](https://github.com/AztecProtocol/aztec-packages/issues/6056))
([0ebee28](https://github.com/AztecProtocol/aztec-packages/commit/0ebee28b14042417956a02a3247af68f4f13dcf5)),
closes
[#6019](https://github.com/AztecProtocol/aztec-packages/issues/6019)
* **aztec-nr:** Unencrypted logs go behind context
([#5871](https://github.com/AztecProtocol/aztec-packages/issues/5871))
([6a5ad7c](https://github.com/AztecProtocol/aztec-packages/commit/6a5ad7ccfe7fc17237a5a6237493c1fbb6af6d53))
* Bump `rustls` to v0.21.11
(https://github.com/noir-lang/noir/pull/4895)
([2e64428](https://github.com/AztecProtocol/aztec-packages/commit/2e64428af9525bd8c390931061505f7b48d729a4))
* Bump MSRV to `1.74.1` (https://github.com/noir-lang/noir/pull/4873)
([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
* Bump public call depth
([#5845](https://github.com/AztecProtocol/aztec-packages/issues/5845))
([b61502f](https://github.com/AztecProtocol/aztec-packages/commit/b61502f372e5b09d8bff138fdb74e3175b5186ff))
* Bundle spot runner + target more spot types
([#6012](https://github.com/AztecProtocol/aztec-packages/issues/6012))
([d51c8b8](https://github.com/AztecProtocol/aztec-packages/commit/d51c8b8698187b4a69aadf1ce47f1565d71d2827))
* Check working copy is clean before extract-repo
([#5851](https://github.com/AztecProtocol/aztec-packages/issues/5851))
([8ff9767](https://github.com/AztecProtocol/aztec-packages/commit/8ff9767c213d172ee1568aeedaa7265ead7b5466))
* **ci:** Address start-runner edge-cases
([#5888](https://github.com/AztecProtocol/aztec-packages/issues/5888))
([564b893](https://github.com/AztecProtocol/aztec-packages/commit/564b893486375e88945bdeb63364bca374f376fb))
* **ci:** Back to on-demand
([#5998](https://github.com/AztecProtocol/aztec-packages/issues/5998))
([f2f15f0](https://github.com/AztecProtocol/aztec-packages/commit/f2f15f0808c7b03a3ef90afae4b71015cfe1b9fd))
* **ci:** Better docker prune
([#5889](https://github.com/AztecProtocol/aztec-packages/issues/5889))
([b5a8e02](https://github.com/AztecProtocol/aztec-packages/commit/b5a8e02edf44bacc3415e478b75b182c5b352ca2))
* **ci:** Don't interleave docker prunes
([#5914](https://github.com/AztecProtocol/aztec-packages/issues/5914))
([2b51fee](https://github.com/AztecProtocol/aztec-packages/commit/2b51fee7dee663ee4a8cc54b5a5412d862d04862))
* **ci:** Don't use redirected earthly
([#5909](https://github.com/AztecProtocol/aztec-packages/issues/5909))
([2e55713](https://github.com/AztecProtocol/aztec-packages/commit/2e557130ace2f6db555fa27eab80ccfc18f0d88e))
* **ci:** Fix alerts on msrv issues
(https://github.com/noir-lang/noir/pull/4816)
([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
* **ci:** Fix concurrency key
([#5962](https://github.com/AztecProtocol/aztec-packages/issues/5962))
([7eb164f](https://github.com/AztecProtocol/aztec-packages/commit/7eb164f28a65426482557cc5dfcb31b9e7c23ab9))
* **ci:** Hotfix runners not starting
([067e460](https://github.com/AztecProtocol/aztec-packages/commit/067e4607019c17dad7c3861734c4bee0e849fbad))
* **ci:** Make syncing out to Noir manual
([#5997](https://github.com/AztecProtocol/aztec-packages/issues/5997))
([1801db8](https://github.com/AztecProtocol/aztec-packages/commit/1801db88640b0e012fa32650bf8074587709ef83))
* **ci:** Move yarn-project-test to new CI
([#5850](https://github.com/AztecProtocol/aztec-packages/issues/5850))
([d8254ef](https://github.com/AztecProtocol/aztec-packages/commit/d8254efe958898d28dbe25474b9eb21cebb4ed2c))
* **ci:** Notify internal Slack channel when CI breaks on master
([#5788](https://github.com/AztecProtocol/aztec-packages/issues/5788))
([70b3f3f](https://github.com/AztecProtocol/aztec-packages/commit/70b3f3f1aebbb626014d54e121e841938407bdaf))
* **ci:** Notify on ARM failures
([#5847](https://github.com/AztecProtocol/aztec-packages/issues/5847))
([bdb59cb](https://github.com/AztecProtocol/aztec-packages/commit/bdb59cb4dc2c691798be3d1ef46d422f8fcd930d))
* **ci:** Prevent haywire logs
([#5966](https://github.com/AztecProtocol/aztec-packages/issues/5966))
([b12f609](https://github.com/AztecProtocol/aztec-packages/commit/b12f60994fdd54cb4d8e18e444c207e319f9d6a6))
* **ci:** Reenable deploy tests
([#6011](https://github.com/AztecProtocol/aztec-packages/issues/6011))
([087a624](https://github.com/AztecProtocol/aztec-packages/commit/087a624689ca34de4ac6dca759cf5e644a163b37))
* **ci:** Reenable spot
([348b34f](https://github.com/AztecProtocol/aztec-packages/commit/348b34f868e98c1e6dc388b164b0df6ee131ae6c))
* **ci:** Remove devnet deployments (for now)
([#5912](https://github.com/AztecProtocol/aztec-packages/issues/5912))
([d9c1ee9](https://github.com/AztecProtocol/aztec-packages/commit/d9c1ee938ea8ff94639f29e457bd5e04ab2b9e8a))
* **ci:** Use on-demand for now
([#5933](https://github.com/AztecProtocol/aztec-packages/issues/5933))
([f77636f](https://github.com/AztecProtocol/aztec-packages/commit/f77636f686d5416c9e2f893ed40730a08b48a5ee))
* Clean up and clarify some translator flavor logic
([#5965](https://github.com/AztecProtocol/aztec-packages/issues/5965))
([242b364](https://github.com/AztecProtocol/aztec-packages/commit/242b364aacdf662cd6dab6254562ab5f61a58731))
* Clean up stopped instances
([#6030](https://github.com/AztecProtocol/aztec-packages/issues/6030))
([1318bd5](https://github.com/AztecProtocol/aztec-packages/commit/1318bd5493e65ac8f478d74bc1537dea2facd575))
* **debugger:** Docs (https://github.com/noir-lang/noir/pull/4145)
([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
* Delete dead code (https://github.com/noir-lang/noir/pull/4906)
([e615a83](https://github.com/AztecProtocol/aztec-packages/commit/e615a831a12b78644b798e12395d970bf5601948))
* Delete dead code (https://github.com/noir-lang/noir/pull/4906)
([078aa61](https://github.com/AztecProtocol/aztec-packages/commit/078aa61b06557aba74ac9cce557ee6bd05040feb))
* Delete flake.lock (https://github.com/noir-lang/noir/pull/4855)
([e615a83](https://github.com/AztecProtocol/aztec-packages/commit/e615a831a12b78644b798e12395d970bf5601948))
* Delete flake.lock (https://github.com/noir-lang/noir/pull/4855)
([078aa61](https://github.com/AztecProtocol/aztec-packages/commit/078aa61b06557aba74ac9cce557ee6bd05040feb))
* Delete unnecessary Prover.toml file
(https://github.com/noir-lang/noir/pull/4829)
([beab8c9](https://github.com/AztecProtocol/aztec-packages/commit/beab8c93857536e07fa37994213fc664a5864013))
* Delete unused brillig methods
(https://github.com/noir-lang/noir/pull/4887)
([8f73f18](https://github.com/AztecProtocol/aztec-packages/commit/8f73f18f3c07de0fd5e247ade5a48109c37c1bc5))
* Do not aggregate note decryption time for benchmarks
([#6032](https://github.com/AztecProtocol/aztec-packages/issues/6032))
([658a880](https://github.com/AztecProtocol/aztec-packages/commit/658a880fe40273e16cb65bbc18ede7740895baf4))
* Do not bootstrap cache if working copy is dirty
([#6033](https://github.com/AztecProtocol/aztec-packages/issues/6033))
([3671932](https://github.com/AztecProtocol/aztec-packages/commit/367193253670a1d61ffa440d94dad4b9d068e72f))
* **docs:** Fix migration notes
([#6083](https://github.com/AztecProtocol/aztec-packages/issues/6083))
([e1f3e32](https://github.com/AztecProtocol/aztec-packages/commit/e1f3e320f15003282ca5b5ea707471cfcd1b6354))
* **docs:** Fix wrong Nargo.toml workspace examples
(https://github.com/noir-lang/noir/pull/4822)
([beab8c9](https://github.com/AztecProtocol/aztec-packages/commit/beab8c93857536e07fa37994213fc664a5864013))
* **docs:** Remove 'yellow paper' reference from protocol specs
([#5872](https://github.com/AztecProtocol/aztec-packages/issues/5872))
([b348ec1](https://github.com/AztecProtocol/aztec-packages/commit/b348ec149b7df0d4620a79d501834a6590078160))
* **docs:** Remove link to play.noir-lang.org
(https://github.com/noir-lang/noir/pull/4872)
([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
* **experimental:** Add scan pass and `into_expression` for comptime
interpreter (https://github.com/noir-lang/noir/pull/4884)
([2e64428](https://github.com/AztecProtocol/aztec-packages/commit/2e64428af9525bd8c390931061505f7b48d729a4))
* **experimental:** Improve variable not defined error message in
comptime interpreter (https://github.com/noir-lang/noir/pull/4889)
([2e64428](https://github.com/AztecProtocol/aztec-packages/commit/2e64428af9525bd8c390931061505f7b48d729a4))
* Extend SharedMutable tests
([#6005](https://github.com/AztecProtocol/aztec-packages/issues/6005))
([4cee8e0](https://github.com/AztecProtocol/aztec-packages/commit/4cee8e0644780e527395da452a831055ec41a4c7))
* Fix alerts on rust msrv (https://github.com/noir-lang/noir/pull/4817)
([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
* Fix and reenable e2e account init fees test
([#5878](https://github.com/AztecProtocol/aztec-packages/issues/5878))
([cec8191](https://github.com/AztecProtocol/aztec-packages/commit/cec819178635b41c3b310431afa435bea207d925))
* Fix formatting and serialization that fails CI run
([#5942](https://github.com/AztecProtocol/aztec-packages/issues/5942))
([da67f18](https://github.com/AztecProtocol/aztec-packages/commit/da67f181b09439e2e2e04209ed3d84c21c7cc6bf))
* Fix typo in error message
([#5139](https://github.com/AztecProtocol/aztec-packages/issues/5139))
([b194f83](https://github.com/AztecProtocol/aztec-packages/commit/b194f83188f0e874a1f4c67a512370d3efcf883b))
* Flag account init test as flakey
([ea030e5](https://github.com/AztecProtocol/aztec-packages/commit/ea030e534b965d154b00ececd5974606dd85f217))
* Flag two failing e2e tests as flakey until we fix them
([901ae87](https://github.com/AztecProtocol/aztec-packages/commit/901ae87795ba39420258e5d70b92221f11f7d20e))
* Improve `compute_note_hash_and_nullifier` autogeneration and
`NoteProcessor` warnings
([#5838](https://github.com/AztecProtocol/aztec-packages/issues/5838))
([566f25c](https://github.com/AztecProtocol/aztec-packages/commit/566f25c25744501ce1ae31243820ef549d9b1f30))
* Improved naming in `TxExecutionRequest`
([#6014](https://github.com/AztecProtocol/aztec-packages/issues/6014))
([f2364d4](https://github.com/AztecProtocol/aztec-packages/commit/f2364d40f850414029ed967eb05c48b5be2ffff6))
* Integrate new key store
([#5731](https://github.com/AztecProtocol/aztec-packages/issues/5731))
([ab9fe78](https://github.com/AztecProtocol/aztec-packages/commit/ab9fe780e8a9fc3187a02b37ddbefa609d3bff8f)),
closes
[#5720](https://github.com/AztecProtocol/aztec-packages/issues/5720)
* Introducing re-export for poseidon2
([#5898](https://github.com/AztecProtocol/aztec-packages/issues/5898))
([03a87b8](https://github.com/AztecProtocol/aztec-packages/commit/03a87b8d97b72f8144ef83b679eed564048d4683)),
closes
[#5863](https://github.com/AztecProtocol/aztec-packages/issues/5863)
* Lift run-e2e to yarn-project earthfile
([#6018](https://github.com/AztecProtocol/aztec-packages/issues/6018))
([b7900b8](https://github.com/AztecProtocol/aztec-packages/commit/b7900b88a66bfd9d75b92ed05a4236dda41b2013))
* Migrate blacklist token to use shared mutable
([#5885](https://github.com/AztecProtocol/aztec-packages/issues/5885))
([26c1eec](https://github.com/AztecProtocol/aztec-packages/commit/26c1eecc76613c7c7883031691672ba36fb16152))
* More explicit `self` parameter in `Into` trait
(https://github.com/noir-lang/noir/pull/4867)
([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
* No implicit overrides
([#5792](https://github.com/AztecProtocol/aztec-packages/issues/5792))
([0fafaef](https://github.com/AztecProtocol/aztec-packages/commit/0fafaef8eb92ba261c1aefe1daab2539caab0bea))
* Nuking CLI
([#5865](https://github.com/AztecProtocol/aztec-packages/issues/5865))
([c48c913](https://github.com/AztecProtocol/aztec-packages/commit/c48c91349dd592520ee33d4c45bc2d3913883541)),
closes
[#5894](https://github.com/AztecProtocol/aztec-packages/issues/5894)
* Nuking unused keys.nr
([#5910](https://github.com/AztecProtocol/aztec-packages/issues/5910))
([1d3af93](https://github.com/AztecProtocol/aztec-packages/commit/1d3af93f26d7b09389debe4b7046ae3359ff1893))
* Optimize poseidon2 implementation
(https://github.com/noir-lang/noir/pull/4807)
([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
* Patch jest to not use JSON serialization in message passing
([#5883](https://github.com/AztecProtocol/aztec-packages/issues/5883))
([1c24c8e](https://github.com/AztecProtocol/aztec-packages/commit/1c24c8e53f190c7b1ac3b4d8896abb4ab6b5712b))
* Prepare ScheduledValueChange for mutable delays.
([#6085](https://github.com/AztecProtocol/aztec-packages/issues/6085))
([cfa850b](https://github.com/AztecProtocol/aztec-packages/commit/cfa850bbbad9ff54a7efd9fd7a045a6d3f158ebf))
* ProvingKey has ProverPolynomials
([#5940](https://github.com/AztecProtocol/aztec-packages/issues/5940))
([0a64279](https://github.com/AztecProtocol/aztec-packages/commit/0a64279ba1b2b3bb6627c675b8a0b116be17f579))
* Purge unconstrained functions where possible
([#5819](https://github.com/AztecProtocol/aztec-packages/issues/5819))
([ce84161](https://github.com/AztecProtocol/aztec-packages/commit/ce8416174f360a4a00cc70c20c8f2d99354aec2e)),
closes
[#5451](https://github.com/AztecProtocol/aztec-packages/issues/5451)
* Purging portal addresses
([#5842](https://github.com/AztecProtocol/aztec-packages/issues/5842))
([4faccad](https://github.com/AztecProtocol/aztec-packages/commit/4faccad569e39228b0f3fbf741fc95e3a189e276))
* Redo typo PR by dockercui
([#5930](https://github.com/AztecProtocol/aztec-packages/issues/5930))
([b23e42f](https://github.com/AztecProtocol/aztec-packages/commit/b23e42f5f897936bb9607ba94e57f31723d9984b))
* Redo typo PR by satyambnsal
([#5929](https://github.com/AztecProtocol/aztec-packages/issues/5929))
([d28b1cb](https://github.com/AztecProtocol/aztec-packages/commit/d28b1cbc0364c1d760187ffa7263c147e9295dd4))
* Redo typo PR by socialsister
([#5931](https://github.com/AztecProtocol/aztec-packages/issues/5931))
([e817f78](https://github.com/AztecProtocol/aztec-packages/commit/e817f78158e895807151f6b451cb506cab9c2510))
* Redo typo script
([#5926](https://github.com/AztecProtocol/aztec-packages/issues/5926))
([41fa87e](https://github.com/AztecProtocol/aztec-packages/commit/41fa87e1216eeb6ff774eb1925797f9ae721c70b))
* Reenable account init fees e2e
([#5938](https://github.com/AztecProtocol/aztec-packages/issues/5938))
([49c45c3](https://github.com/AztecProtocol/aztec-packages/commit/49c45c38f01e5a2034f81506089640d93c87744d))
* Refactor e2e tests to use the new simulate fn
([#5854](https://github.com/AztecProtocol/aztec-packages/issues/5854))
([e7d2aff](https://github.com/AztecProtocol/aztec-packages/commit/e7d2aff3a1922dc685bc859901dffdb83933dff2))
* Refactor public cross chain tests for speed
([#6082](https://github.com/AztecProtocol/aztec-packages/issues/6082))
([6065a6c](https://github.com/AztecProtocol/aztec-packages/commit/6065a6c4157a2d356964f4c5476425da55e09728))
* Refactor recursive verifier tests
([#6063](https://github.com/AztecProtocol/aztec-packages/issues/6063))
([94a2d61](https://github.com/AztecProtocol/aztec-packages/commit/94a2d61d10d8e21d0080b7ea3a8b283f8dd0162f))
* Refactor token blacklist test for speed
([#6054](https://github.com/AztecProtocol/aztec-packages/issues/6054))
([ab36d7e](https://github.com/AztecProtocol/aztec-packages/commit/ab36d7e42ccd6403c5b6967c4e2b319ab7b85d37))
* Release Noir(0.28.0) (https://github.com/noir-lang/noir/pull/4776)
([3b91791](https://github.com/AztecProtocol/aztec-packages/commit/3b9179118369137880277f1444f0e3f94b3f5e79))
* Remove `Opcode::Brillig` from ACIR
([#5995](https://github.com/AztecProtocol/aztec-packages/issues/5995))
([ffd5f46](https://github.com/AztecProtocol/aztec-packages/commit/ffd5f460fce8b1f12265730f97c8cfcd3a4774ca))
* Remove `SecondaryAttribute::Event`
(https://github.com/noir-lang/noir/pull/4868)
([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
* Remove empty yarn.lock
([#5835](https://github.com/AztecProtocol/aztec-packages/issues/5835))
([c3dd039](https://github.com/AztecProtocol/aztec-packages/commit/c3dd039e5d2a779cc9bda1c0ac46306563914578))
* Remove get_portal_address oracle
([#5816](https://github.com/AztecProtocol/aztec-packages/issues/5816))
([67c2823](https://github.com/AztecProtocol/aztec-packages/commit/67c2823e3bb302d4d7a28bca03de468c92336680))
* Remove initialisation of logger in `acvm_js` tests
(https://github.com/noir-lang/noir/pull/4850)
([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
* Remove l1 gas
([#6069](https://github.com/AztecProtocol/aztec-packages/issues/6069))
([0e3705f](https://github.com/AztecProtocol/aztec-packages/commit/0e3705f2591c1da36778c316d8b7ab914f5d6757))
* Remove private kernel snapshot test
([#5829](https://github.com/AztecProtocol/aztec-packages/issues/5829))
([9434784](https://github.com/AztecProtocol/aztec-packages/commit/9434784b12f5e5402e93596110ee2e131317b251))
* Remove pub wildcard import of ast into `noirc_frontend` root
(https://github.com/noir-lang/noir/pull/4862)
([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
* Remove unnecessary casts in `BoundedVec`
(https://github.com/noir-lang/noir/pull/4831)
([beab8c9](https://github.com/AztecProtocol/aztec-packages/commit/beab8c93857536e07fa37994213fc664a5864013))
* Rename 'global' to 'function' in the monomorphization pass
(https://github.com/noir-lang/noir/pull/4774)
([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
* Rename capture to end_setup
([#6008](https://github.com/AztecProtocol/aztec-packages/issues/6008))
([61e61ab](https://github.com/AztecProtocol/aztec-packages/commit/61e61aba60ec02d12141ef396c4e827c800d57bf))
* Renaming `noir-compiler` as `builder`
([#5951](https://github.com/AztecProtocol/aztec-packages/issues/5951))
([185e57d](https://github.com/AztecProtocol/aztec-packages/commit/185e57d51e8bbf6194628ce62db3dd44f11634a4))
* Reorganize gas fields in structs
([#5828](https://github.com/AztecProtocol/aztec-packages/issues/5828))
([e26d342](https://github.com/AztecProtocol/aztec-packages/commit/e26d342c5646425da31d95c50ce94025e5c6d053))
* Replace queue with facade over CircuitProver
([#5972](https://github.com/AztecProtocol/aztec-packages/issues/5972))
([dafb3ed](https://github.com/AztecProtocol/aztec-packages/commit/dafb3edc799b2adaf285ffe57b41630040c68449))
* Replace relative paths to noir-protocol-circuits
([b723534](https://github.com/AztecProtocol/aztec-packages/commit/b723534db2fcbd3399aca722354df7c45ee8a84f))
* Replace relative paths to noir-protocol-circuits
([20057b2](https://github.com/AztecProtocol/aztec-packages/commit/20057b25bbf9c6b007fe3595eca7a2cff872aa52))
* Replace relative paths to noir-protocol-circuits
([543ff13](https://github.com/AztecProtocol/aztec-packages/commit/543ff131c32cd005de2e83fe2af59b132c5896de))
* Replace relative paths to noir-protocol-circuits
([d0622cf](https://github.com/AztecProtocol/aztec-packages/commit/d0622cffa2dfffdf8bd96cc34627a78aeb8a72e5))
* Replace relative paths to noir-protocol-circuits
([41d6e81](https://github.com/AztecProtocol/aztec-packages/commit/41d6e81426090c5b8c50787123bac826a732204d))
* Replace relative paths to noir-protocol-circuits
([c0c8e3f](https://github.com/AztecProtocol/aztec-packages/commit/c0c8e3f880076d20cca96a3c92a1484abdcc66a0))
* Replace relative paths to noir-protocol-circuits
([8b33a58](https://github.com/AztecProtocol/aztec-packages/commit/8b33a58e095815d5b131ab3fbd668c4e88680e13))
* Replace relative paths to noir-protocol-circuits
([ce4a010](https://github.com/AztecProtocol/aztec-packages/commit/ce4a010c7c075cb68bed91e0123d4fcecc7c6938))
* Replace use of PublicContext with interface
([#5840](https://github.com/AztecProtocol/aztec-packages/issues/5840))
([834067f](https://github.com/AztecProtocol/aztec-packages/commit/834067f12b07a36b9348a368b83d61d789c5c22b))
* Reset noir-gates-diff report on master
([#6003](https://github.com/AztecProtocol/aztec-packages/issues/6003))
([7f01f7d](https://github.com/AztecProtocol/aztec-packages/commit/7f01f7d16230fe011a3f52db9e477a958796b202))
* Revert "Check working copy is clean before extract-repo
([#5851](https://github.com/AztecProtocol/aztec-packages/issues/5851))"
([ec21fb8](https://github.com/AztecProtocol/aztec-packages/commit/ec21fb8251c34d535fd0c5e08f354cfa22c25320))
* **revert:** "chore(ci): don't use redirected earthly"
([#6062](https://github.com/AztecProtocol/aztec-packages/issues/6062))
([26cba9e](https://github.com/AztecProtocol/aztec-packages/commit/26cba9e4ef9b63bf100e451b66cfe3ea62ab416c))
* Rework workspace structure for utils crates
(https://github.com/noir-lang/noir/pull/4886)
([e615a83](https://github.com/AztecProtocol/aztec-packages/commit/e615a831a12b78644b798e12395d970bf5601948))
* Rework workspace structure for utils crates
(https://github.com/noir-lang/noir/pull/4886)
([078aa61](https://github.com/AztecProtocol/aztec-packages/commit/078aa61b06557aba74ac9cce557ee6bd05040feb))
* Run clippy (https://github.com/noir-lang/noir/pull/4810)
([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
* Run flakey e2e tests on CI but allow failure
([#5937](https://github.com/AztecProtocol/aztec-packages/issues/5937))
([a074251](https://github.com/AztecProtocol/aztec-packages/commit/a07425184d08d647588e3778221740e724b1b052))
* Run noir projects tests in earthly
([#6024](https://github.com/AztecProtocol/aztec-packages/issues/6024))
([e950433](https://github.com/AztecProtocol/aztec-packages/commit/e9504333dcb25c3f9bd1344743a0e12e7719ab2e))
* Simplify computation of pow for each sumcheck round
([#5903](https://github.com/AztecProtocol/aztec-packages/issues/5903))
([74a9d5d](https://github.com/AztecProtocol/aztec-packages/commit/74a9d5d6736a4376e40e501765974b9686ca738e))
* Temporarily skip failing gas tests
([#5874](https://github.com/AztecProtocol/aztec-packages/issues/5874))
([ad55af0](https://github.com/AztecProtocol/aztec-packages/commit/ad55af0d44b3c818d5e42fe75bb72fa95e88c309))
* Update noir README (https://github.com/noir-lang/noir/pull/4856)
([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
* Update NoirJS tutorial (https://github.com/noir-lang/noir/pull/4861)
([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
* Use BrilligCall for unconstrained main and update AVM transpiler
([#5797](https://github.com/AztecProtocol/aztec-packages/issues/5797))
([3fb94c0](https://github.com/AztecProtocol/aztec-packages/commit/3fb94c0cd5ffba20a99b97c0088ae5ef357c205d))
* Use new mock.get_last_params() for public storage writes
([#5823](https://github.com/AztecProtocol/aztec-packages/issues/5823))
([6b0f919](https://github.com/AztecProtocol/aztec-packages/commit/6b0f919d83209a83e5d1900942a160424b30fe22))
* Using poseidon2 when computing a nullifier
([#5906](https://github.com/AztecProtocol/aztec-packages/issues/5906))
([3a10e5e](https://github.com/AztecProtocol/aztec-packages/commit/3a10e5e75b8053dfea13a4901873d42ca01ca7c2)),
closes
[#5832](https://github.com/AztecProtocol/aztec-packages/issues/5832)
[#1205](https://github.com/AztecProtocol/aztec-packages/issues/1205)
* Validate instance deployer address every time we request it
([#5848](https://github.com/AztecProtocol/aztec-packages/issues/5848))
([2422891](https://github.com/AztecProtocol/aztec-packages/commit/2422891fa021cfb4c83b91849ff1f22baa93a4b9))
* Workaround earthly flake
([#5811](https://github.com/AztecProtocol/aztec-packages/issues/5811))
([dd3a521](https://github.com/AztecProtocol/aztec-packages/commit/dd3a521b59b950871645306179d23a3f332ef6f3))
* Yarn build:dev don't clear terminal
([#5970](https://github.com/AztecProtocol/aztec-packages/issues/5970))
([b3fdb3b](https://github.com/AztecProtocol/aztec-packages/commit/b3fdb3b59e887974b89db0eb209e16b0630b1360))


### Documentation

* Addition around Nargo.toml search
([#5943](https://github.com/AztecProtocol/aztec-packages/issues/5943))
([d1350da](https://github.com/AztecProtocol/aztec-packages/commit/d1350da9e3d78fa53ccd5663219f70c67df4c66d))
* Aztec smart contract tutorial - crowdfunding
([#5786](https://github.com/AztecProtocol/aztec-packages/issues/5786))
([91cc0a4](https://github.com/AztecProtocol/aztec-packages/commit/91cc0a424031b9b8346cc9182f303d1468b1179b))
* Gas and accounting
([#5855](https://github.com/AztecProtocol/aztec-packages/issues/5855))
([d0b3f06](https://github.com/AztecProtocol/aztec-packages/commit/d0b3f06ff29d5e5ac99097cb1ab2906190eec5c3))
* Migration notes for GasOpts in public calls
([#5822](https://github.com/AztecProtocol/aztec-packages/issues/5822))
([edeea3d](https://github.com/AztecProtocol/aztec-packages/commit/edeea3dfe425b83b36c981dde3ce169e33aaece9))
* Remove mentions of slow updates
([#5884](https://github.com/AztecProtocol/aztec-packages/issues/5884))
([029d1e5](https://github.com/AztecProtocol/aztec-packages/commit/029d1e5d4ff679f73dce72779cb316a1d8c7eda8))
* Shared state
([#5963](https://github.com/AztecProtocol/aztec-packages/issues/5963))
([86c106f](https://github.com/AztecProtocol/aztec-packages/commit/86c106f122b3fe0daa5853f7824bb68abadf70d0))
* Update emit_event.md
([#5964](https://github.com/AztecProtocol/aztec-packages/issues/5964))
([616a8f3](https://github.com/AztecProtocol/aztec-packages/commit/616a8f328f893ab563b1d90c5c627572cf838968))
* Update info around VERSION
([#5891](https://github.com/AztecProtocol/aztec-packages/issues/5891))
([e1eb98e](https://github.com/AztecProtocol/aztec-packages/commit/e1eb98e85e6ef6ca87f502036426457c8c2a7efc))
</details>

<details><summary>barretenberg: 0.36.0</summary>

##
[0.36.0](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.35.1...barretenberg-v0.36.0)
(2024-04-30)


### ⚠ BREAKING CHANGES

* remove `Opcode::Brillig` from ACIR
([#5995](https://github.com/AztecProtocol/aztec-packages/issues/5995))
* change backend width to 4
([#5374](https://github.com/AztecProtocol/aztec-packages/issues/5374))

### Features

* `variable_base_scalar_mul` blackbox func
([#6039](https://github.com/AztecProtocol/aztec-packages/issues/6039))
([81142fe](https://github.com/AztecProtocol/aztec-packages/commit/81142fe799338e6ed73b30eeac4468c1345f6fab))
* Avm mem trace validation
([#6025](https://github.com/AztecProtocol/aztec-packages/issues/6025))
([3a3afb5](https://github.com/AztecProtocol/aztec-packages/commit/3a3afb57ab8b6b3f11b7a7799d557436638c8cd3)),
closes
[#5950](https://github.com/AztecProtocol/aztec-packages/issues/5950)
* **avm:** Avm circuit FDIV opcode
([#5958](https://github.com/AztecProtocol/aztec-packages/issues/5958))
([fed5b6d](https://github.com/AztecProtocol/aztec-packages/commit/fed5b6dd1ee310fc90404a3e5ec9eb02ad7dbc10)),
closes
[#5953](https://github.com/AztecProtocol/aztec-packages/issues/5953)
* **avm:** CAST opcode implementation
([#5477](https://github.com/AztecProtocol/aztec-packages/issues/5477))
([a821bcc](https://github.com/AztecProtocol/aztec-packages/commit/a821bccef7b1894140f0495510d7c6b4eefde821)),
closes
[#5466](https://github.com/AztecProtocol/aztec-packages/issues/5466)
* **avm:** Negative tests
([#5919](https://github.com/AztecProtocol/aztec-packages/issues/5919))
([8a5ece7](https://github.com/AztecProtocol/aztec-packages/commit/8a5ece7548a86d099ac6a166f04882624b8d95fd))
* **avm:** Shift relations
([#5716](https://github.com/AztecProtocol/aztec-packages/issues/5716))
([a516637](https://github.com/AztecProtocol/aztec-packages/commit/a51663707b96914b0a300440611748ce44fbe933))
* Avoiding redundant computation in PG
([#5844](https://github.com/AztecProtocol/aztec-packages/issues/5844))
([9f57733](https://github.com/AztecProtocol/aztec-packages/commit/9f5773353aa0261fa07a81704bcadcee513d42c5))
* Change backend width to 4
([#5374](https://github.com/AztecProtocol/aztec-packages/issues/5374))
([3f24fc2](https://github.com/AztecProtocol/aztec-packages/commit/3f24fc2cdb56eff6da6e47062d2a2a3dc0fa4bd2))
* Circuit simulator for Ultra and GoblinUltra verifiers
([#1195](https://github.com/AztecProtocol/aztec-packages/issues/1195))
([0032a3a](https://github.com/AztecProtocol/aztec-packages/commit/0032a3a55dea5e4c9051dbc36607288f8ca1be4a))
* Dynamic assertion payloads v2
([#5949](https://github.com/AztecProtocol/aztec-packages/issues/5949))
([405bdf6](https://github.com/AztecProtocol/aztec-packages/commit/405bdf6a297b81e0c3fda303cf2b1480eaea69f1))
* Implement recursive verification in the parity circuits
([#6006](https://github.com/AztecProtocol/aztec-packages/issues/6006))
([a5b6dac](https://github.com/AztecProtocol/aztec-packages/commit/a5b6dacd5512d7a035655845381b2c720b1e550a))
* Keshas skipping plus conditions for grand prod relations
([#5766](https://github.com/AztecProtocol/aztec-packages/issues/5766))
([d8fcfb5](https://github.com/AztecProtocol/aztec-packages/commit/d8fcfb590f788b911111010e20458797d76f5779))
* Naive structured execution trace
([#5853](https://github.com/AztecProtocol/aztec-packages/issues/5853))
([23aab17](https://github.com/AztecProtocol/aztec-packages/commit/23aab171b17d0dfb840621a74266496ac270b3e8))
* Prove then verify flow for honk
([#5957](https://github.com/AztecProtocol/aztec-packages/issues/5957))
([099346e](https://github.com/AztecProtocol/aztec-packages/commit/099346ebbab9428f57bfffdc03e8bede5c2e2bed))


### Bug Fixes

* **avm:** Comments and assert
([#5956](https://github.com/AztecProtocol/aztec-packages/issues/5956))
([ae50219](https://github.com/AztecProtocol/aztec-packages/commit/ae502199b84999418d461ed5d0d6fca0c60494c5))
* Fix relation skipping for sumcheck
([#6092](https://github.com/AztecProtocol/aztec-packages/issues/6092))
([1449c33](https://github.com/AztecProtocol/aztec-packages/commit/1449c338ca79f8d72b71484546aa46ddebb21779))
* Remove tx.origin
([#5765](https://github.com/AztecProtocol/aztec-packages/issues/5765))
([c8784d7](https://github.com/AztecProtocol/aztec-packages/commit/c8784d7994937bfae9d23f5d17eb914bae92d8dc)),
closes
[#5756](https://github.com/AztecProtocol/aztec-packages/issues/5756)


### Miscellaneous

* `create_fixed_base_constraint` cleanup
([#6047](https://github.com/AztecProtocol/aztec-packages/issues/6047))
([e1d6526](https://github.com/AztecProtocol/aztec-packages/commit/e1d6526b34f03458f258c0f0fa6967b5f20035f4))
* **avm:** Negative unit tests for AVM CAST opcode
([#5907](https://github.com/AztecProtocol/aztec-packages/issues/5907))
([4465e3b](https://github.com/AztecProtocol/aztec-packages/commit/4465e3be870963ea435d9a0cd063397020442f0b)),
closes
[#5908](https://github.com/AztecProtocol/aztec-packages/issues/5908)
* **avm:** Re-enable proof in some unit tests
([#6056](https://github.com/AztecProtocol/aztec-packages/issues/6056))
([0ebee28](https://github.com/AztecProtocol/aztec-packages/commit/0ebee28b14042417956a02a3247af68f4f13dcf5)),
closes
[#6019](https://github.com/AztecProtocol/aztec-packages/issues/6019)
* Clean up and clarify some translator flavor logic
([#5965](https://github.com/AztecProtocol/aztec-packages/issues/5965))
([242b364](https://github.com/AztecProtocol/aztec-packages/commit/242b364aacdf662cd6dab6254562ab5f61a58731))
* Do not bootstrap cache if working copy is dirty
([#6033](https://github.com/AztecProtocol/aztec-packages/issues/6033))
([3671932](https://github.com/AztecProtocol/aztec-packages/commit/367193253670a1d61ffa440d94dad4b9d068e72f))
* ProvingKey has ProverPolynomials
([#5940](https://github.com/AztecProtocol/aztec-packages/issues/5940))
([0a64279](https://github.com/AztecProtocol/aztec-packages/commit/0a64279ba1b2b3bb6627c675b8a0b116be17f579))
* Purging portal addresses
([#5842](https://github.com/AztecProtocol/aztec-packages/issues/5842))
([4faccad](https://github.com/AztecProtocol/aztec-packages/commit/4faccad569e39228b0f3fbf741fc95e3a189e276))
* Refactor recursive verifier tests
([#6063](https://github.com/AztecProtocol/aztec-packages/issues/6063))
([94a2d61](https://github.com/AztecProtocol/aztec-packages/commit/94a2d61d10d8e21d0080b7ea3a8b283f8dd0162f))
* Remove `Opcode::Brillig` from ACIR
([#5995](https://github.com/AztecProtocol/aztec-packages/issues/5995))
([ffd5f46](https://github.com/AztecProtocol/aztec-packages/commit/ffd5f460fce8b1f12265730f97c8cfcd3a4774ca))
* Remove l1 gas
([#6069](https://github.com/AztecProtocol/aztec-packages/issues/6069))
([0e3705f](https://github.com/AztecProtocol/aztec-packages/commit/0e3705f2591c1da36778c316d8b7ab914f5d6757))
* Simplify computation of pow for each sumcheck round
([#5903](https://github.com/AztecProtocol/aztec-packages/issues/5903))
([74a9d5d](https://github.com/AztecProtocol/aztec-packages/commit/74a9d5d6736a4376e40e501765974b9686ca738e))
</details>

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
---
 .release-please-manifest.json   |   8 +-
 CHANGELOG.md                    | 271 ++++++++++++++++++++++++++++++++
 barretenberg/CHANGELOG.md       |  47 ++++++
 barretenberg/cpp/CMakeLists.txt |   2 +-
 barretenberg/ts/CHANGELOG.md    |   7 +
 barretenberg/ts/package.json    |   2 +-
 yarn-project/aztec/CHANGELOG.md |  25 +++
 yarn-project/aztec/package.json |   2 +-
 8 files changed, 357 insertions(+), 7 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 2af8fe1250f3..a3061298efcf 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,7 +1,7 @@
 {
-  ".": "0.35.1",
+  ".": "0.36.0",
   "yarn-project/cli": "0.35.1",
-  "yarn-project/aztec": "0.35.1",
-  "barretenberg": "0.35.1",
-  "barretenberg/ts": "0.35.1"
+  "yarn-project/aztec": "0.36.0",
+  "barretenberg": "0.36.0",
+  "barretenberg/ts": "0.36.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18ca6ac87370..1f4fa357c90b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,276 @@
 # Changelog
 
+## [0.36.0](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.35.1...aztec-packages-v0.36.0) (2024-04-30)
+
+
+### ⚠ BREAKING CHANGES
+
+* remove `Opcode::Brillig` from ACIR ([#5995](https://github.com/AztecProtocol/aztec-packages/issues/5995))
+* delete field note ([#5959](https://github.com/AztecProtocol/aztec-packages/issues/5959))
+* remove slow updates tree ([#5954](https://github.com/AztecProtocol/aztec-packages/issues/5954))
+* Add `as_array` and remove `_slice` variants of hash functions (https://github.com/noir-lang/noir/pull/4675)
+* reserve keyword `super` (https://github.com/noir-lang/noir/pull/4836)
+* **aztec-nr:** unencrypted logs go behind context ([#5871](https://github.com/AztecProtocol/aztec-packages/issues/5871))
+* move fixtures to @aztec/circuits.js/testing/fixtures ([#5826](https://github.com/AztecProtocol/aztec-packages/issues/5826))
+* contract interfaces and better function calls ([#5687](https://github.com/AztecProtocol/aztec-packages/issues/5687))
+* change backend width to 4 ([#5374](https://github.com/AztecProtocol/aztec-packages/issues/5374))
+
+### Features
+
+* `variable_base_scalar_mul` blackbox func ([#6039](https://github.com/AztecProtocol/aztec-packages/issues/6039)) ([81142fe](https://github.com/AztecProtocol/aztec-packages/commit/81142fe799338e6ed73b30eeac4468c1345f6fab))
+* **acir_gen:** Brillig stdlib (https://github.com/noir-lang/noir/pull/4848) ([8f73f18](https://github.com/AztecProtocol/aztec-packages/commit/8f73f18f3c07de0fd5e247ade5a48109c37c1bc5))
+* Add `#[inline(tag)]` attribute and codegen (https://github.com/noir-lang/noir/pull/4913) ([e615a83](https://github.com/AztecProtocol/aztec-packages/commit/e615a831a12b78644b798e12395d970bf5601948))
+* Add `min` and `max` functions to the stdlib (https://github.com/noir-lang/noir/pull/4839) ([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
+* Add `NARGO_FOREIGN_CALL_TIMEOUT` environment variable (https://github.com/noir-lang/noir/pull/4780) ([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
+* Add comptime Interpreter (https://github.com/noir-lang/noir/pull/4821) ([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
+* Add key registry to deployment (e2e & sandbox) ([#5875](https://github.com/AztecProtocol/aztec-packages/issues/5875)) ([0881cd3](https://github.com/AztecProtocol/aztec-packages/commit/0881cd3083af70271bceda695d0c8ad21212c172)), closes [#5611](https://github.com/AztecProtocol/aztec-packages/issues/5611)
+* Add promiseWithResolvers ([#5808](https://github.com/AztecProtocol/aztec-packages/issues/5808)) ([afeef17](https://github.com/AztecProtocol/aztec-packages/commit/afeef17e14054f8ee95a6244c1b165435fddaa50))
+* Add proving queue ([#5754](https://github.com/AztecProtocol/aztec-packages/issues/5754)) ([a0a9668](https://github.com/AztecProtocol/aztec-packages/commit/a0a9668d933907a89f21077fd700b6d2f44e6c74))
+* Add side effect counter to logs ([#5718](https://github.com/AztecProtocol/aztec-packages/issues/5718)) ([d7486a6](https://github.com/AztecProtocol/aztec-packages/commit/d7486a6b0b26b5264a1b02c1134d82abfb497aa0))
+* Add the storage layout to the contract artifact ([#5952](https://github.com/AztecProtocol/aztec-packages/issues/5952)) ([88ee0af](https://github.com/AztecProtocol/aztec-packages/commit/88ee0af9987063d63afb49c4f61ab5ae5f7c1b73))
+* Add TimeoutError ([#5751](https://github.com/AztecProtocol/aztec-packages/issues/5751)) ([741fdf1](https://github.com/AztecProtocol/aztec-packages/commit/741fdf16e7f0b3f116c724505afa8e604bc51bf1))
+* Add variable size sha256 (https://github.com/noir-lang/noir/pull/4920) ([e615a83](https://github.com/AztecProtocol/aztec-packages/commit/e615a831a12b78644b798e12395d970bf5601948))
+* Add variable size sha256 (https://github.com/noir-lang/noir/pull/4920) ([078aa61](https://github.com/AztecProtocol/aztec-packages/commit/078aa61b06557aba74ac9cce557ee6bd05040feb))
+* AES oracle ([#5996](https://github.com/AztecProtocol/aztec-packages/issues/5996)) ([8e0a563](https://github.com/AztecProtocol/aztec-packages/commit/8e0a56306ba45ea1eaaa25ee47d84b7334e0bbe3)), closes [#5895](https://github.com/AztecProtocol/aztec-packages/issues/5895)
+* AES oracle padding ([#6013](https://github.com/AztecProtocol/aztec-packages/issues/6013)) ([4b563cd](https://github.com/AztecProtocol/aztec-packages/commit/4b563cd79f16f513a05c1595a4f2673cdaa7600a))
+* Allow numeric generics to non inlined ACIR functions (https://github.com/noir-lang/noir/pull/4834) ([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
+* Avm mem trace validation ([#6025](https://github.com/AztecProtocol/aztec-packages/issues/6025)) ([3a3afb5](https://github.com/AztecProtocol/aztec-packages/commit/3a3afb57ab8b6b3f11b7a7799d557436638c8cd3)), closes [#5950](https://github.com/AztecProtocol/aztec-packages/issues/5950)
+* **avm:** Avm circuit FDIV opcode ([#5958](https://github.com/AztecProtocol/aztec-packages/issues/5958)) ([fed5b6d](https://github.com/AztecProtocol/aztec-packages/commit/fed5b6dd1ee310fc90404a3e5ec9eb02ad7dbc10)), closes [#5953](https://github.com/AztecProtocol/aztec-packages/issues/5953)
+* **avm:** CAST opcode implementation ([#5477](https://github.com/AztecProtocol/aztec-packages/issues/5477)) ([a821bcc](https://github.com/AztecProtocol/aztec-packages/commit/a821bccef7b1894140f0495510d7c6b4eefde821)), closes [#5466](https://github.com/AztecProtocol/aztec-packages/issues/5466)
+* **avm:** Negative tests ([#5919](https://github.com/AztecProtocol/aztec-packages/issues/5919)) ([8a5ece7](https://github.com/AztecProtocol/aztec-packages/commit/8a5ece7548a86d099ac6a166f04882624b8d95fd))
+* **avm:** Shift relations ([#5716](https://github.com/AztecProtocol/aztec-packages/issues/5716)) ([a516637](https://github.com/AztecProtocol/aztec-packages/commit/a51663707b96914b0a300440611748ce44fbe933))
+* Avoiding redundant computation in PG ([#5844](https://github.com/AztecProtocol/aztec-packages/issues/5844)) ([9f57733](https://github.com/AztecProtocol/aztec-packages/commit/9f5773353aa0261fa07a81704bcadcee513d42c5))
+* Brillig pointer codegen and execution ([#5737](https://github.com/AztecProtocol/aztec-packages/issues/5737)) ([a7b9d20](https://github.com/AztecProtocol/aztec-packages/commit/a7b9d20a962c33d8585502fd00739138c6d79aca))
+* Bump lmdb ([#5783](https://github.com/AztecProtocol/aztec-packages/issues/5783)) ([f7d5cf2](https://github.com/AztecProtocol/aztec-packages/commit/f7d5cf2c683ee7840885ac176b9e838b4e3ab6e2))
+* Change backend width to 4 ([#5374](https://github.com/AztecProtocol/aztec-packages/issues/5374)) ([3f24fc2](https://github.com/AztecProtocol/aztec-packages/commit/3f24fc2cdb56eff6da6e47062d2a2a3dc0fa4bd2))
+* Circuit simulator for Ultra and GoblinUltra verifiers ([#1195](https://github.com/AztecProtocol/aztec-packages/issues/1195)) ([0032a3a](https://github.com/AztecProtocol/aztec-packages/commit/0032a3a55dea5e4c9051dbc36607288f8ca1be4a))
+* Computing sym key for incoming ciphertext ([#6020](https://github.com/AztecProtocol/aztec-packages/issues/6020)) ([1904fa8](https://github.com/AztecProtocol/aztec-packages/commit/1904fa864ff8c546d4d849436c6ca7a7606fb3d2))
+* Configure prover as separate process ([#5973](https://github.com/AztecProtocol/aztec-packages/issues/5973)) ([c0dd7b2](https://github.com/AztecProtocol/aztec-packages/commit/c0dd7b21779b99f1b9d3ed43623d3de25a332699))
+* Contract interfaces and better function calls ([#5687](https://github.com/AztecProtocol/aztec-packages/issues/5687)) ([274f7d9](https://github.com/AztecProtocol/aztec-packages/commit/274f7d935230ce21d062644f6ec5f7cd0f58ae62))
+* Decoded return values ([#5762](https://github.com/AztecProtocol/aztec-packages/issues/5762)) ([03e693a](https://github.com/AztecProtocol/aztec-packages/commit/03e693a0db52a0c0b02c403f9ded2e28f3c7ced2))
+* Delete field note ([#5959](https://github.com/AztecProtocol/aztec-packages/issues/5959)) ([ae18396](https://github.com/AztecProtocol/aztec-packages/commit/ae183960a96d14d1eac2876bc070ed09f75b8f25))
+* **docs:** Nuke CLI from docs ([#5936](https://github.com/AztecProtocol/aztec-packages/issues/5936)) ([9af68d8](https://github.com/AztecProtocol/aztec-packages/commit/9af68d8bd59a84e014567b429e9c9b4aed7fee74))
+* Dynamic assertion payloads v2 ([#5949](https://github.com/AztecProtocol/aztec-packages/issues/5949)) ([405bdf6](https://github.com/AztecProtocol/aztec-packages/commit/405bdf6a297b81e0c3fda303cf2b1480eaea69f1))
+* **experimental:** Add `comptime` keyword (https://github.com/noir-lang/noir/pull/4840) ([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
+* Handle `BrilligCall` opcodes in the debugger (https://github.com/noir-lang/noir/pull/4897) ([3b91791](https://github.com/AztecProtocol/aztec-packages/commit/3b9179118369137880277f1444f0e3f94b3f5e79))
+* Implement `Eq` trait on `BoundedVec` (https://github.com/noir-lang/noir/pull/4830) ([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
+* Implement canonical key registry 5609 and implement shared mutable getter from another contract 5689  ([#5723](https://github.com/AztecProtocol/aztec-packages/issues/5723)) ([15b569f](https://github.com/AztecProtocol/aztec-packages/commit/15b569f24e55d374bfb5a54c8771118653e5e77c))
+* Implement recursive verification in the parity circuits ([#6006](https://github.com/AztecProtocol/aztec-packages/issues/6006)) ([a5b6dac](https://github.com/AztecProtocol/aztec-packages/commit/a5b6dacd5512d7a035655845381b2c720b1e550a))
+* Keshas skipping plus conditions for grand prod relations ([#5766](https://github.com/AztecProtocol/aztec-packages/issues/5766)) ([d8fcfb5](https://github.com/AztecProtocol/aztec-packages/commit/d8fcfb590f788b911111010e20458797d76f5779))
+* Lalrpop lexer prototype (https://github.com/noir-lang/noir/pull/4656) ([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
+* Make public l1tol2 message consumption take leafIndex ([#5805](https://github.com/AztecProtocol/aztec-packages/issues/5805)) ([302e3bb](https://github.com/AztecProtocol/aztec-packages/commit/302e3bbb2d7a7d54f362026edb314f3d3596b6d6))
+* More robust spot shutdown + CI commandline ([#5825](https://github.com/AztecProtocol/aztec-packages/issues/5825)) ([12064f9](https://github.com/AztecProtocol/aztec-packages/commit/12064f95abb3125933eb55996abb978c4aeaad53))
+* Naive structured execution trace ([#5853](https://github.com/AztecProtocol/aztec-packages/issues/5853)) ([23aab17](https://github.com/AztecProtocol/aztec-packages/commit/23aab171b17d0dfb840621a74266496ac270b3e8))
+* **nargo:** Handle call stacks for multiple Acir calls (https://github.com/noir-lang/noir/pull/4711) ([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
+* Narrow ABI encoding errors down to target problem argument/field (https://github.com/noir-lang/noir/pull/4798) ([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
+* **p2p:** DiscV5 Peer Discovery ([#5652](https://github.com/AztecProtocol/aztec-packages/issues/5652)) ([0e81642](https://github.com/AztecProtocol/aztec-packages/commit/0e8164239b6a1180fd292e37faf1a0e64aa9cff4))
+* Prove the public kernel circuits ([#5778](https://github.com/AztecProtocol/aztec-packages/issues/5778)) ([f9a843a](https://github.com/AztecProtocol/aztec-packages/commit/f9a843a00ff41ef39b958ae7f5a24bdbc1b1add2))
+* Prove then verify flow for honk ([#5957](https://github.com/AztecProtocol/aztec-packages/issues/5957)) ([099346e](https://github.com/AztecProtocol/aztec-packages/commit/099346ebbab9428f57bfffdc03e8bede5c2e2bed))
+* Re-introducing update command ([#5946](https://github.com/AztecProtocol/aztec-packages/issues/5946)) ([13153d0](https://github.com/AztecProtocol/aztec-packages/commit/13153d02c8b0eb9cae1b7c0436fe1a1ddb49734f))
+* Remove slow updates tree ([#5954](https://github.com/AztecProtocol/aztec-packages/issues/5954)) ([52a1631](https://github.com/AztecProtocol/aztec-packages/commit/52a1631b59297ce062eda14a10e99e552f7fa706))
+* Reserve keyword `super` (https://github.com/noir-lang/noir/pull/4836) ([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
+* Serialize public kernel private inputs ([#5971](https://github.com/AztecProtocol/aztec-packages/issues/5971)) ([0c712b9](https://github.com/AztecProtocol/aztec-packages/commit/0c712b9c0f69bad0da3910add5adba40622d3cea))
+* Simplify `BoundedVec::eq` (https://github.com/noir-lang/noir/pull/4838) ([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
+* Squashing transient note hashes and nullifiers ([#6059](https://github.com/AztecProtocol/aztec-packages/issues/6059)) ([2b8b2c3](https://github.com/AztecProtocol/aztec-packages/commit/2b8b2c3bcbed425027f343bd2b90fd6380e2ddc4))
+* Sync from aztec-packages (https://github.com/noir-lang/noir/pull/4792) ([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
+* Sync from aztec-packages (https://github.com/noir-lang/noir/pull/4833) ([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
+* Sync from aztec-packages (https://github.com/noir-lang/noir/pull/4902) ([3b91791](https://github.com/AztecProtocol/aztec-packages/commit/3b9179118369137880277f1444f0e3f94b3f5e79))
+* Validate globals in public kernel ([#6031](https://github.com/AztecProtocol/aztec-packages/issues/6031)) ([82b17c8](https://github.com/AztecProtocol/aztec-packages/commit/82b17c8f0e9207db803fd3b824e63bac25ea69f6))
+* Verify public data reads ([#5701](https://github.com/AztecProtocol/aztec-packages/issues/5701)) ([323f59f](https://github.com/AztecProtocol/aztec-packages/commit/323f59f55bcd64e32725d1ed5aab72d5b9dbe31d))
+* Wire gas from public execution to kernels ([#5941](https://github.com/AztecProtocol/aztec-packages/issues/5941)) ([6894fc7](https://github.com/AztecProtocol/aztec-packages/commit/6894fc759cc4cd4e77d297fe6164cd39478ece4a))
+
+
+### Bug Fixes
+
+* `test_native.sh` not running all noir tests ([#6075](https://github.com/AztecProtocol/aztec-packages/issues/6075)) ([cc7676e](https://github.com/AztecProtocol/aztec-packages/commit/cc7676e87a7002f14b1b77b7c13f88f71355ec5b))
+* Args + selector in deploy.nr ([#5948](https://github.com/AztecProtocol/aztec-packages/issues/5948)) ([100744f](https://github.com/AztecProtocol/aztec-packages/commit/100744f89b676a03990c2d29aa0b48da77be5d8d))
+* **avm-simulator:** L1TOL2MESSAGEEXISTS opcode ([#5807](https://github.com/AztecProtocol/aztec-packages/issues/5807)) ([71b60f3](https://github.com/AztecProtocol/aztec-packages/commit/71b60f32c3b3781dda1c79bb6a926050bad7bb55))
+* **avm:** Comments and assert ([#5956](https://github.com/AztecProtocol/aztec-packages/issues/5956)) ([ae50219](https://github.com/AztecProtocol/aztec-packages/commit/ae502199b84999418d461ed5d0d6fca0c60494c5))
+* **avm:** Do not scale CALLDATACOPY base cost with size ([#5879](https://github.com/AztecProtocol/aztec-packages/issues/5879)) ([99e12b1](https://github.com/AztecProtocol/aztec-packages/commit/99e12b1abd7e66e871b41572a54cee63b5300d96))
+* Bigint corruption in lmdb ([#6002](https://github.com/AztecProtocol/aztec-packages/issues/6002)) ([703e0c1](https://github.com/AztecProtocol/aztec-packages/commit/703e0c1e2c2a5703410ff5fd4c1a135131254a53))
+* Calculate tx fee using current constants in public kernel ([#6066](https://github.com/AztecProtocol/aztec-packages/issues/6066)) ([c359d79](https://github.com/AztecProtocol/aztec-packages/commit/c359d796e72c215edf1af06c54d9287ee87df425))
+* Catch panics from EC point creation (e.g. the point is at infinity) (https://github.com/noir-lang/noir/pull/4790) ([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
+* Check if a runner is available + safer refcount for spot life ([#5793](https://github.com/AztecProtocol/aztec-packages/issues/5793)) ([67077a1](https://github.com/AztecProtocol/aztec-packages/commit/67077a11250cb28dbef890009668341524b85d8b))
+* **ci:** Always run merge-check ([#6065](https://github.com/AztecProtocol/aztec-packages/issues/6065)) ([b43b84f](https://github.com/AztecProtocol/aztec-packages/commit/b43b84f5993e6950c5f081c3c77e9549dc7fddbe))
+* **ci:** Deploy_npm script ([#5817](https://github.com/AztecProtocol/aztec-packages/issues/5817)) ([df1c3c4](https://github.com/AztecProtocol/aztec-packages/commit/df1c3c4c706a44847b25a66d27544eedc508cf62))
+* **ci:** Merge check fails ungracefully on spot issues ([#5887](https://github.com/AztecProtocol/aztec-packages/issues/5887)) ([3683f0b](https://github.com/AztecProtocol/aztec-packages/commit/3683f0bb034ea59258c587d70d0517ee2ed00b91))
+* **ci:** Race condition when making spot in multiple PRs ([#5798](https://github.com/AztecProtocol/aztec-packages/issues/5798)) ([18e75b8](https://github.com/AztecProtocol/aztec-packages/commit/18e75b85bcd6eec53cee3a5da854a8d27e3f186e))
+* Deploy L1 contracts before starting node ([#5969](https://github.com/AztecProtocol/aztec-packages/issues/5969)) ([1908139](https://github.com/AztecProtocol/aztec-packages/commit/190813911c5e4fc7533525478ceca4162170fa6b))
+* **docs:** Fix admonition in contract class protocol spec ([#6017](https://github.com/AztecProtocol/aztec-packages/issues/6017)) ([12bfc15](https://github.com/AztecProtocol/aztec-packages/commit/12bfc15923ee4b7b57e50ac714953cb8129e7d5d))
+* **docs:** Fix formatting in protocol specs ([#5882](https://github.com/AztecProtocol/aztec-packages/issues/5882)) ([07fc143](https://github.com/AztecProtocol/aztec-packages/commit/07fc1434ac780f8a35533775e26ef2bd9e190816))
+* **docs:** Tutorial fixes ([#5600](https://github.com/AztecProtocol/aztec-packages/issues/5600)) ([6421467](https://github.com/AztecProtocol/aztec-packages/commit/642146705857cf34eb0f9feab665977fb2d8fb02))
+* Don't refcount spot ([#5812](https://github.com/AztecProtocol/aztec-packages/issues/5812)) ([98e8da0](https://github.com/AztecProtocol/aztec-packages/commit/98e8da094dbac1c06f800f82bd89181a6b9039b5))
+* Don't reuse brillig with slice arguments ([#5800](https://github.com/AztecProtocol/aztec-packages/issues/5800)) ([be9f24c](https://github.com/AztecProtocol/aztec-packages/commit/be9f24c16484b26a1eb88bcf35b785553160995d))
+* **experimental:** Skip over comptime functions in scan pass (https://github.com/noir-lang/noir/pull/4893) ([2e64428](https://github.com/AztecProtocol/aztec-packages/commit/2e64428af9525bd8c390931061505f7b48d729a4))
+* Fix and reenable fees e2e tests ([#5877](https://github.com/AztecProtocol/aztec-packages/issues/5877)) ([165e62f](https://github.com/AztecProtocol/aztec-packages/commit/165e62f38239f25cc6595bb43f435e9f4673fd83))
+* Fix curve parameters for bigints (https://github.com/noir-lang/noir/pull/4900) ([2e64428](https://github.com/AztecProtocol/aztec-packages/commit/2e64428af9525bd8c390931061505f7b48d729a4))
+* Fix panic when returning a zeroed unit value (https://github.com/noir-lang/noir/pull/4797) ([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
+* Fix relation skipping for sumcheck ([#6092](https://github.com/AztecProtocol/aztec-packages/issues/6092)) ([1449c33](https://github.com/AztecProtocol/aztec-packages/commit/1449c338ca79f8d72b71484546aa46ddebb21779))
+* Hotfix stopped instance terminate ([#6037](https://github.com/AztecProtocol/aztec-packages/issues/6037)) ([005c71c](https://github.com/AztecProtocol/aztec-packages/commit/005c71cff4b592f89833c5556d827e55b7678b7b))
+* Issue 4682 and add solver for unconstrained bigintegers (https://github.com/noir-lang/noir/pull/4729) ([beab8c9](https://github.com/AztecProtocol/aztec-packages/commit/beab8c93857536e07fa37994213fc664a5864013))
+* Make discv5 test deterministic ([#5968](https://github.com/AztecProtocol/aztec-packages/issues/5968)) ([41749a5](https://github.com/AztecProtocol/aztec-packages/commit/41749a5148b9b5360659e06155cd09d8d7f2a78e))
+* MemoryFifo return null when empty and timeout 0 ([#5753](https://github.com/AztecProtocol/aztec-packages/issues/5753)) ([27129e6](https://github.com/AztecProtocol/aztec-packages/commit/27129e6d483e787abea5084c029e560d5d4b5b0e))
+* Merge-check ([#5873](https://github.com/AztecProtocol/aztec-packages/issues/5873)) ([c999dae](https://github.com/AztecProtocol/aztec-packages/commit/c999dae76580ea63486aaa17edb774736dc32b89))
+* Move fixtures to @aztec/circuits.js/testing/fixtures ([#5826](https://github.com/AztecProtocol/aztec-packages/issues/5826)) ([fb7a617](https://github.com/AztecProtocol/aztec-packages/commit/fb7a6175b185725e607d28a8930a15d88f84e117))
+* Nested array equality (https://github.com/noir-lang/noir/pull/4903) ([3b91791](https://github.com/AztecProtocol/aztec-packages/commit/3b9179118369137880277f1444f0e3f94b3f5e79))
+* Proper field inversion for bigints (https://github.com/noir-lang/noir/pull/4802) ([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
+* Refuse to start sequencer without a prover ([#6000](https://github.com/AztecProtocol/aztec-packages/issues/6000)) ([b30d0b6](https://github.com/AztecProtocol/aztec-packages/commit/b30d0b6481b0f0b2241f1fcc9ec9bc0f82308ce9))
+* Remove tx.origin ([#5765](https://github.com/AztecProtocol/aztec-packages/issues/5765)) ([c8784d7](https://github.com/AztecProtocol/aztec-packages/commit/c8784d7994937bfae9d23f5d17eb914bae92d8dc)), closes [#5756](https://github.com/AztecProtocol/aztec-packages/issues/5756)
+* Reset the noir-gates-diff report on master (https://github.com/noir-lang/noir/pull/4878) ([2e64428](https://github.com/AztecProtocol/aztec-packages/commit/2e64428af9525bd8c390931061505f7b48d729a4))
+* Revert "feat: Sync from noir" ([#6034](https://github.com/AztecProtocol/aztec-packages/issues/6034)) ([6383a09](https://github.com/AztecProtocol/aztec-packages/commit/6383a09ce5d9ab581af5d458bdcb65f92d9011fb))
+* **Revert:** "refactor: purge unconstrained functions where possible" ([#5911](https://github.com/AztecProtocol/aztec-packages/issues/5911)) ([c36246b](https://github.com/AztecProtocol/aztec-packages/commit/c36246bb692bf9a3d8e338bbc26a3ce801f0e389))
+* Set gas settings in bench ([#5796](https://github.com/AztecProtocol/aztec-packages/issues/5796)) ([86d8176](https://github.com/AztecProtocol/aztec-packages/commit/86d8176279fdc07d3b0eed91f226985e2b15f54e))
+* Start spot label ([#5810](https://github.com/AztecProtocol/aztec-packages/issues/5810)) ([96da333](https://github.com/AztecProtocol/aztec-packages/commit/96da3334af2b4b1815f9d3eb9839840c0b76d5bc))
+* Start-spot.yml ([#5824](https://github.com/AztecProtocol/aztec-packages/issues/5824)) ([3cf9c2c](https://github.com/AztecProtocol/aztec-packages/commit/3cf9c2c908b361437050e97fcdf67359727eff8b))
+* Temporarily exclude bytecode from class id computation ([#5857](https://github.com/AztecProtocol/aztec-packages/issues/5857)) ([55ff125](https://github.com/AztecProtocol/aztec-packages/commit/55ff1251c2c1c02ecbbaadfa38764c5847fee910))
+* Update noir-gates-diff commit to use master reference report (https://github.com/noir-lang/noir/pull/4891) ([2e64428](https://github.com/AztecProtocol/aztec-packages/commit/2e64428af9525bd8c390931061505f7b48d729a4))
+* Use correct gates diff commit now that master has been reset ([#6004](https://github.com/AztecProtocol/aztec-packages/issues/6004)) ([d8e5af4](https://github.com/AztecProtocol/aztec-packages/commit/d8e5af4eb023f68140d8cebd39d1d15b4683a4a3))
+
+
+### Miscellaneous
+
+* `create_fixed_base_constraint` cleanup ([#6047](https://github.com/AztecProtocol/aztec-packages/issues/6047)) ([e1d6526](https://github.com/AztecProtocol/aztec-packages/commit/e1d6526b34f03458f258c0f0fa6967b5f20035f4))
+* `TransparentNote` cleanup ([#5904](https://github.com/AztecProtocol/aztec-packages/issues/5904)) ([febf00f](https://github.com/AztecProtocol/aztec-packages/commit/febf00fb841407d54f42634560146568c383f80a))
+* Add `as_array` and remove `_slice` variants of hash functions (https://github.com/noir-lang/noir/pull/4675) ([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
+* Add benchmarks for serializing a dummy program (https://github.com/noir-lang/noir/pull/4813) ([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
+* Add error conversion from `InterpreterError` (https://github.com/noir-lang/noir/pull/4896) ([e615a83](https://github.com/AztecProtocol/aztec-packages/commit/e615a831a12b78644b798e12395d970bf5601948))
+* Add error conversion from `InterpreterError` (https://github.com/noir-lang/noir/pull/4896) ([078aa61](https://github.com/AztecProtocol/aztec-packages/commit/078aa61b06557aba74ac9cce557ee6bd05040feb))
+* Add Hir -&gt; Ast conversion (https://github.com/noir-lang/noir/pull/4788) ([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
+* Add target for individual e2e tests ([#6009](https://github.com/AztecProtocol/aztec-packages/issues/6009)) ([e2842a6](https://github.com/AztecProtocol/aztec-packages/commit/e2842a6e02bd42792c8ee8ca03316e5aa4902f5b))
+* Adding devcontainer with create aztec app ([#5752](https://github.com/AztecProtocol/aztec-packages/issues/5752)) ([c72f34e](https://github.com/AztecProtocol/aztec-packages/commit/c72f34ef0ff582269db245643909e02b66a4d37a))
+* Adding devcontainer with create aztec app ([#5849](https://github.com/AztecProtocol/aztec-packages/issues/5849)) ([eb1cfef](https://github.com/AztecProtocol/aztec-packages/commit/eb1cfefc4ff11802a97127f10ab30fb5487335fd))
+* Allow expressions in constant generation ([#5839](https://github.com/AztecProtocol/aztec-packages/issues/5839)) ([cb1e25b](https://github.com/AztecProtocol/aztec-packages/commit/cb1e25b8c6f203d8a7e4beb2f027d72bee981695))
+* **avm-simulator:** Remove AvmContext::raw_* external calls ([#5869](https://github.com/AztecProtocol/aztec-packages/issues/5869)) ([0c9d0b4](https://github.com/AztecProtocol/aztec-packages/commit/0c9d0b4e611472e0e8718449f6d8f2451e0391a0))
+* **avm:** More test cleanup ([#5771](https://github.com/AztecProtocol/aztec-packages/issues/5771)) ([23d0070](https://github.com/AztecProtocol/aztec-packages/commit/23d0070095bf7d32cfdcf97e7aea348753bb7492))
+* **avm:** Negative unit tests for AVM CAST opcode ([#5907](https://github.com/AztecProtocol/aztec-packages/issues/5907)) ([4465e3b](https://github.com/AztecProtocol/aztec-packages/commit/4465e3be870963ea435d9a0cd063397020442f0b)), closes [#5908](https://github.com/AztecProtocol/aztec-packages/issues/5908)
+* **avm:** Re-enable proof in some unit tests ([#6056](https://github.com/AztecProtocol/aztec-packages/issues/6056)) ([0ebee28](https://github.com/AztecProtocol/aztec-packages/commit/0ebee28b14042417956a02a3247af68f4f13dcf5)), closes [#6019](https://github.com/AztecProtocol/aztec-packages/issues/6019)
+* **aztec-nr:** Unencrypted logs go behind context ([#5871](https://github.com/AztecProtocol/aztec-packages/issues/5871)) ([6a5ad7c](https://github.com/AztecProtocol/aztec-packages/commit/6a5ad7ccfe7fc17237a5a6237493c1fbb6af6d53))
+* Bump `rustls` to v0.21.11 (https://github.com/noir-lang/noir/pull/4895) ([2e64428](https://github.com/AztecProtocol/aztec-packages/commit/2e64428af9525bd8c390931061505f7b48d729a4))
+* Bump MSRV to `1.74.1` (https://github.com/noir-lang/noir/pull/4873) ([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
+* Bump public call depth ([#5845](https://github.com/AztecProtocol/aztec-packages/issues/5845)) ([b61502f](https://github.com/AztecProtocol/aztec-packages/commit/b61502f372e5b09d8bff138fdb74e3175b5186ff))
+* Bundle spot runner + target more spot types ([#6012](https://github.com/AztecProtocol/aztec-packages/issues/6012)) ([d51c8b8](https://github.com/AztecProtocol/aztec-packages/commit/d51c8b8698187b4a69aadf1ce47f1565d71d2827))
+* Check working copy is clean before extract-repo ([#5851](https://github.com/AztecProtocol/aztec-packages/issues/5851)) ([8ff9767](https://github.com/AztecProtocol/aztec-packages/commit/8ff9767c213d172ee1568aeedaa7265ead7b5466))
+* **ci:** Address start-runner edge-cases ([#5888](https://github.com/AztecProtocol/aztec-packages/issues/5888)) ([564b893](https://github.com/AztecProtocol/aztec-packages/commit/564b893486375e88945bdeb63364bca374f376fb))
+* **ci:** Back to on-demand ([#5998](https://github.com/AztecProtocol/aztec-packages/issues/5998)) ([f2f15f0](https://github.com/AztecProtocol/aztec-packages/commit/f2f15f0808c7b03a3ef90afae4b71015cfe1b9fd))
+* **ci:** Better docker prune ([#5889](https://github.com/AztecProtocol/aztec-packages/issues/5889)) ([b5a8e02](https://github.com/AztecProtocol/aztec-packages/commit/b5a8e02edf44bacc3415e478b75b182c5b352ca2))
+* **ci:** Don't interleave docker prunes ([#5914](https://github.com/AztecProtocol/aztec-packages/issues/5914)) ([2b51fee](https://github.com/AztecProtocol/aztec-packages/commit/2b51fee7dee663ee4a8cc54b5a5412d862d04862))
+* **ci:** Don't use redirected earthly ([#5909](https://github.com/AztecProtocol/aztec-packages/issues/5909)) ([2e55713](https://github.com/AztecProtocol/aztec-packages/commit/2e557130ace2f6db555fa27eab80ccfc18f0d88e))
+* **ci:** Fix alerts on msrv issues (https://github.com/noir-lang/noir/pull/4816) ([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
+* **ci:** Fix concurrency key ([#5962](https://github.com/AztecProtocol/aztec-packages/issues/5962)) ([7eb164f](https://github.com/AztecProtocol/aztec-packages/commit/7eb164f28a65426482557cc5dfcb31b9e7c23ab9))
+* **ci:** Hotfix runners not starting ([067e460](https://github.com/AztecProtocol/aztec-packages/commit/067e4607019c17dad7c3861734c4bee0e849fbad))
+* **ci:** Make syncing out to Noir manual ([#5997](https://github.com/AztecProtocol/aztec-packages/issues/5997)) ([1801db8](https://github.com/AztecProtocol/aztec-packages/commit/1801db88640b0e012fa32650bf8074587709ef83))
+* **ci:** Move yarn-project-test to new CI ([#5850](https://github.com/AztecProtocol/aztec-packages/issues/5850)) ([d8254ef](https://github.com/AztecProtocol/aztec-packages/commit/d8254efe958898d28dbe25474b9eb21cebb4ed2c))
+* **ci:** Notify internal Slack channel when CI breaks on master ([#5788](https://github.com/AztecProtocol/aztec-packages/issues/5788)) ([70b3f3f](https://github.com/AztecProtocol/aztec-packages/commit/70b3f3f1aebbb626014d54e121e841938407bdaf))
+* **ci:** Notify on ARM failures ([#5847](https://github.com/AztecProtocol/aztec-packages/issues/5847)) ([bdb59cb](https://github.com/AztecProtocol/aztec-packages/commit/bdb59cb4dc2c691798be3d1ef46d422f8fcd930d))
+* **ci:** Prevent haywire logs ([#5966](https://github.com/AztecProtocol/aztec-packages/issues/5966)) ([b12f609](https://github.com/AztecProtocol/aztec-packages/commit/b12f60994fdd54cb4d8e18e444c207e319f9d6a6))
+* **ci:** Reenable deploy tests ([#6011](https://github.com/AztecProtocol/aztec-packages/issues/6011)) ([087a624](https://github.com/AztecProtocol/aztec-packages/commit/087a624689ca34de4ac6dca759cf5e644a163b37))
+* **ci:** Reenable spot ([348b34f](https://github.com/AztecProtocol/aztec-packages/commit/348b34f868e98c1e6dc388b164b0df6ee131ae6c))
+* **ci:** Remove devnet deployments (for now) ([#5912](https://github.com/AztecProtocol/aztec-packages/issues/5912)) ([d9c1ee9](https://github.com/AztecProtocol/aztec-packages/commit/d9c1ee938ea8ff94639f29e457bd5e04ab2b9e8a))
+* **ci:** Use on-demand for now ([#5933](https://github.com/AztecProtocol/aztec-packages/issues/5933)) ([f77636f](https://github.com/AztecProtocol/aztec-packages/commit/f77636f686d5416c9e2f893ed40730a08b48a5ee))
+* Clean up and clarify some translator flavor logic ([#5965](https://github.com/AztecProtocol/aztec-packages/issues/5965)) ([242b364](https://github.com/AztecProtocol/aztec-packages/commit/242b364aacdf662cd6dab6254562ab5f61a58731))
+* Clean up stopped instances ([#6030](https://github.com/AztecProtocol/aztec-packages/issues/6030)) ([1318bd5](https://github.com/AztecProtocol/aztec-packages/commit/1318bd5493e65ac8f478d74bc1537dea2facd575))
+* **debugger:** Docs (https://github.com/noir-lang/noir/pull/4145) ([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
+* Delete dead code (https://github.com/noir-lang/noir/pull/4906) ([e615a83](https://github.com/AztecProtocol/aztec-packages/commit/e615a831a12b78644b798e12395d970bf5601948))
+* Delete dead code (https://github.com/noir-lang/noir/pull/4906) ([078aa61](https://github.com/AztecProtocol/aztec-packages/commit/078aa61b06557aba74ac9cce557ee6bd05040feb))
+* Delete flake.lock (https://github.com/noir-lang/noir/pull/4855) ([e615a83](https://github.com/AztecProtocol/aztec-packages/commit/e615a831a12b78644b798e12395d970bf5601948))
+* Delete flake.lock (https://github.com/noir-lang/noir/pull/4855) ([078aa61](https://github.com/AztecProtocol/aztec-packages/commit/078aa61b06557aba74ac9cce557ee6bd05040feb))
+* Delete unnecessary Prover.toml file (https://github.com/noir-lang/noir/pull/4829) ([beab8c9](https://github.com/AztecProtocol/aztec-packages/commit/beab8c93857536e07fa37994213fc664a5864013))
+* Delete unused brillig methods (https://github.com/noir-lang/noir/pull/4887) ([8f73f18](https://github.com/AztecProtocol/aztec-packages/commit/8f73f18f3c07de0fd5e247ade5a48109c37c1bc5))
+* Do not aggregate note decryption time for benchmarks ([#6032](https://github.com/AztecProtocol/aztec-packages/issues/6032)) ([658a880](https://github.com/AztecProtocol/aztec-packages/commit/658a880fe40273e16cb65bbc18ede7740895baf4))
+* Do not bootstrap cache if working copy is dirty ([#6033](https://github.com/AztecProtocol/aztec-packages/issues/6033)) ([3671932](https://github.com/AztecProtocol/aztec-packages/commit/367193253670a1d61ffa440d94dad4b9d068e72f))
+* **docs:** Fix migration notes ([#6083](https://github.com/AztecProtocol/aztec-packages/issues/6083)) ([e1f3e32](https://github.com/AztecProtocol/aztec-packages/commit/e1f3e320f15003282ca5b5ea707471cfcd1b6354))
+* **docs:** Fix wrong Nargo.toml workspace examples (https://github.com/noir-lang/noir/pull/4822) ([beab8c9](https://github.com/AztecProtocol/aztec-packages/commit/beab8c93857536e07fa37994213fc664a5864013))
+* **docs:** Remove 'yellow paper' reference from protocol specs ([#5872](https://github.com/AztecProtocol/aztec-packages/issues/5872)) ([b348ec1](https://github.com/AztecProtocol/aztec-packages/commit/b348ec149b7df0d4620a79d501834a6590078160))
+* **docs:** Remove link to play.noir-lang.org (https://github.com/noir-lang/noir/pull/4872) ([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
+* **experimental:** Add scan pass and `into_expression` for comptime interpreter (https://github.com/noir-lang/noir/pull/4884) ([2e64428](https://github.com/AztecProtocol/aztec-packages/commit/2e64428af9525bd8c390931061505f7b48d729a4))
+* **experimental:** Improve variable not defined error message in comptime interpreter (https://github.com/noir-lang/noir/pull/4889) ([2e64428](https://github.com/AztecProtocol/aztec-packages/commit/2e64428af9525bd8c390931061505f7b48d729a4))
+* Extend SharedMutable tests ([#6005](https://github.com/AztecProtocol/aztec-packages/issues/6005)) ([4cee8e0](https://github.com/AztecProtocol/aztec-packages/commit/4cee8e0644780e527395da452a831055ec41a4c7))
+* Fix alerts on rust msrv (https://github.com/noir-lang/noir/pull/4817) ([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
+* Fix and reenable e2e account init fees test ([#5878](https://github.com/AztecProtocol/aztec-packages/issues/5878)) ([cec8191](https://github.com/AztecProtocol/aztec-packages/commit/cec819178635b41c3b310431afa435bea207d925))
+* Fix formatting and serialization that fails CI run ([#5942](https://github.com/AztecProtocol/aztec-packages/issues/5942)) ([da67f18](https://github.com/AztecProtocol/aztec-packages/commit/da67f181b09439e2e2e04209ed3d84c21c7cc6bf))
+* Fix typo in error message ([#5139](https://github.com/AztecProtocol/aztec-packages/issues/5139)) ([b194f83](https://github.com/AztecProtocol/aztec-packages/commit/b194f83188f0e874a1f4c67a512370d3efcf883b))
+* Flag account init test as flakey ([ea030e5](https://github.com/AztecProtocol/aztec-packages/commit/ea030e534b965d154b00ececd5974606dd85f217))
+* Flag two failing e2e tests as flakey until we fix them ([901ae87](https://github.com/AztecProtocol/aztec-packages/commit/901ae87795ba39420258e5d70b92221f11f7d20e))
+* Improve `compute_note_hash_and_nullifier` autogeneration and `NoteProcessor` warnings ([#5838](https://github.com/AztecProtocol/aztec-packages/issues/5838)) ([566f25c](https://github.com/AztecProtocol/aztec-packages/commit/566f25c25744501ce1ae31243820ef549d9b1f30))
+* Improved naming in `TxExecutionRequest` ([#6014](https://github.com/AztecProtocol/aztec-packages/issues/6014)) ([f2364d4](https://github.com/AztecProtocol/aztec-packages/commit/f2364d40f850414029ed967eb05c48b5be2ffff6))
+* Integrate new key store ([#5731](https://github.com/AztecProtocol/aztec-packages/issues/5731)) ([ab9fe78](https://github.com/AztecProtocol/aztec-packages/commit/ab9fe780e8a9fc3187a02b37ddbefa609d3bff8f)), closes [#5720](https://github.com/AztecProtocol/aztec-packages/issues/5720)
+* Introducing re-export for poseidon2 ([#5898](https://github.com/AztecProtocol/aztec-packages/issues/5898)) ([03a87b8](https://github.com/AztecProtocol/aztec-packages/commit/03a87b8d97b72f8144ef83b679eed564048d4683)), closes [#5863](https://github.com/AztecProtocol/aztec-packages/issues/5863)
+* Lift run-e2e to yarn-project earthfile ([#6018](https://github.com/AztecProtocol/aztec-packages/issues/6018)) ([b7900b8](https://github.com/AztecProtocol/aztec-packages/commit/b7900b88a66bfd9d75b92ed05a4236dda41b2013))
+* Migrate blacklist token to use shared mutable ([#5885](https://github.com/AztecProtocol/aztec-packages/issues/5885)) ([26c1eec](https://github.com/AztecProtocol/aztec-packages/commit/26c1eecc76613c7c7883031691672ba36fb16152))
+* More explicit `self` parameter in `Into` trait (https://github.com/noir-lang/noir/pull/4867) ([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
+* No implicit overrides ([#5792](https://github.com/AztecProtocol/aztec-packages/issues/5792)) ([0fafaef](https://github.com/AztecProtocol/aztec-packages/commit/0fafaef8eb92ba261c1aefe1daab2539caab0bea))
+* Nuking CLI ([#5865](https://github.com/AztecProtocol/aztec-packages/issues/5865)) ([c48c913](https://github.com/AztecProtocol/aztec-packages/commit/c48c91349dd592520ee33d4c45bc2d3913883541)), closes [#5894](https://github.com/AztecProtocol/aztec-packages/issues/5894)
+* Nuking unused keys.nr ([#5910](https://github.com/AztecProtocol/aztec-packages/issues/5910)) ([1d3af93](https://github.com/AztecProtocol/aztec-packages/commit/1d3af93f26d7b09389debe4b7046ae3359ff1893))
+* Optimize poseidon2 implementation (https://github.com/noir-lang/noir/pull/4807) ([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
+* Patch jest to not use JSON serialization in message passing ([#5883](https://github.com/AztecProtocol/aztec-packages/issues/5883)) ([1c24c8e](https://github.com/AztecProtocol/aztec-packages/commit/1c24c8e53f190c7b1ac3b4d8896abb4ab6b5712b))
+* Prepare ScheduledValueChange for mutable delays. ([#6085](https://github.com/AztecProtocol/aztec-packages/issues/6085)) ([cfa850b](https://github.com/AztecProtocol/aztec-packages/commit/cfa850bbbad9ff54a7efd9fd7a045a6d3f158ebf))
+* ProvingKey has ProverPolynomials ([#5940](https://github.com/AztecProtocol/aztec-packages/issues/5940)) ([0a64279](https://github.com/AztecProtocol/aztec-packages/commit/0a64279ba1b2b3bb6627c675b8a0b116be17f579))
+* Purge unconstrained functions where possible ([#5819](https://github.com/AztecProtocol/aztec-packages/issues/5819)) ([ce84161](https://github.com/AztecProtocol/aztec-packages/commit/ce8416174f360a4a00cc70c20c8f2d99354aec2e)), closes [#5451](https://github.com/AztecProtocol/aztec-packages/issues/5451)
+* Purging portal addresses ([#5842](https://github.com/AztecProtocol/aztec-packages/issues/5842)) ([4faccad](https://github.com/AztecProtocol/aztec-packages/commit/4faccad569e39228b0f3fbf741fc95e3a189e276))
+* Redo typo PR by dockercui ([#5930](https://github.com/AztecProtocol/aztec-packages/issues/5930)) ([b23e42f](https://github.com/AztecProtocol/aztec-packages/commit/b23e42f5f897936bb9607ba94e57f31723d9984b))
+* Redo typo PR by satyambnsal ([#5929](https://github.com/AztecProtocol/aztec-packages/issues/5929)) ([d28b1cb](https://github.com/AztecProtocol/aztec-packages/commit/d28b1cbc0364c1d760187ffa7263c147e9295dd4))
+* Redo typo PR by socialsister ([#5931](https://github.com/AztecProtocol/aztec-packages/issues/5931)) ([e817f78](https://github.com/AztecProtocol/aztec-packages/commit/e817f78158e895807151f6b451cb506cab9c2510))
+* Redo typo script ([#5926](https://github.com/AztecProtocol/aztec-packages/issues/5926)) ([41fa87e](https://github.com/AztecProtocol/aztec-packages/commit/41fa87e1216eeb6ff774eb1925797f9ae721c70b))
+* Reenable account init fees e2e ([#5938](https://github.com/AztecProtocol/aztec-packages/issues/5938)) ([49c45c3](https://github.com/AztecProtocol/aztec-packages/commit/49c45c38f01e5a2034f81506089640d93c87744d))
+* Refactor e2e tests to use the new simulate fn ([#5854](https://github.com/AztecProtocol/aztec-packages/issues/5854)) ([e7d2aff](https://github.com/AztecProtocol/aztec-packages/commit/e7d2aff3a1922dc685bc859901dffdb83933dff2))
+* Refactor public cross chain tests for speed ([#6082](https://github.com/AztecProtocol/aztec-packages/issues/6082)) ([6065a6c](https://github.com/AztecProtocol/aztec-packages/commit/6065a6c4157a2d356964f4c5476425da55e09728))
+* Refactor recursive verifier tests ([#6063](https://github.com/AztecProtocol/aztec-packages/issues/6063)) ([94a2d61](https://github.com/AztecProtocol/aztec-packages/commit/94a2d61d10d8e21d0080b7ea3a8b283f8dd0162f))
+* Refactor token blacklist test for speed ([#6054](https://github.com/AztecProtocol/aztec-packages/issues/6054)) ([ab36d7e](https://github.com/AztecProtocol/aztec-packages/commit/ab36d7e42ccd6403c5b6967c4e2b319ab7b85d37))
+* Release Noir(0.28.0) (https://github.com/noir-lang/noir/pull/4776) ([3b91791](https://github.com/AztecProtocol/aztec-packages/commit/3b9179118369137880277f1444f0e3f94b3f5e79))
+* Remove `Opcode::Brillig` from ACIR ([#5995](https://github.com/AztecProtocol/aztec-packages/issues/5995)) ([ffd5f46](https://github.com/AztecProtocol/aztec-packages/commit/ffd5f460fce8b1f12265730f97c8cfcd3a4774ca))
+* Remove `SecondaryAttribute::Event` (https://github.com/noir-lang/noir/pull/4868) ([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
+* Remove empty yarn.lock ([#5835](https://github.com/AztecProtocol/aztec-packages/issues/5835)) ([c3dd039](https://github.com/AztecProtocol/aztec-packages/commit/c3dd039e5d2a779cc9bda1c0ac46306563914578))
+* Remove get_portal_address oracle ([#5816](https://github.com/AztecProtocol/aztec-packages/issues/5816)) ([67c2823](https://github.com/AztecProtocol/aztec-packages/commit/67c2823e3bb302d4d7a28bca03de468c92336680))
+* Remove initialisation of logger in `acvm_js` tests (https://github.com/noir-lang/noir/pull/4850) ([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
+* Remove l1 gas ([#6069](https://github.com/AztecProtocol/aztec-packages/issues/6069)) ([0e3705f](https://github.com/AztecProtocol/aztec-packages/commit/0e3705f2591c1da36778c316d8b7ab914f5d6757))
+* Remove private kernel snapshot test ([#5829](https://github.com/AztecProtocol/aztec-packages/issues/5829)) ([9434784](https://github.com/AztecProtocol/aztec-packages/commit/9434784b12f5e5402e93596110ee2e131317b251))
+* Remove pub wildcard import of ast into `noirc_frontend` root (https://github.com/noir-lang/noir/pull/4862) ([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
+* Remove unnecessary casts in `BoundedVec` (https://github.com/noir-lang/noir/pull/4831) ([beab8c9](https://github.com/AztecProtocol/aztec-packages/commit/beab8c93857536e07fa37994213fc664a5864013))
+* Rename 'global' to 'function' in the monomorphization pass (https://github.com/noir-lang/noir/pull/4774) ([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
+* Rename capture to end_setup ([#6008](https://github.com/AztecProtocol/aztec-packages/issues/6008)) ([61e61ab](https://github.com/AztecProtocol/aztec-packages/commit/61e61aba60ec02d12141ef396c4e827c800d57bf))
+* Renaming `noir-compiler` as `builder` ([#5951](https://github.com/AztecProtocol/aztec-packages/issues/5951)) ([185e57d](https://github.com/AztecProtocol/aztec-packages/commit/185e57d51e8bbf6194628ce62db3dd44f11634a4))
+* Reorganize gas fields in structs ([#5828](https://github.com/AztecProtocol/aztec-packages/issues/5828)) ([e26d342](https://github.com/AztecProtocol/aztec-packages/commit/e26d342c5646425da31d95c50ce94025e5c6d053))
+* Replace queue with facade over CircuitProver ([#5972](https://github.com/AztecProtocol/aztec-packages/issues/5972)) ([dafb3ed](https://github.com/AztecProtocol/aztec-packages/commit/dafb3edc799b2adaf285ffe57b41630040c68449))
+* Replace relative paths to noir-protocol-circuits ([b723534](https://github.com/AztecProtocol/aztec-packages/commit/b723534db2fcbd3399aca722354df7c45ee8a84f))
+* Replace relative paths to noir-protocol-circuits ([20057b2](https://github.com/AztecProtocol/aztec-packages/commit/20057b25bbf9c6b007fe3595eca7a2cff872aa52))
+* Replace relative paths to noir-protocol-circuits ([543ff13](https://github.com/AztecProtocol/aztec-packages/commit/543ff131c32cd005de2e83fe2af59b132c5896de))
+* Replace relative paths to noir-protocol-circuits ([d0622cf](https://github.com/AztecProtocol/aztec-packages/commit/d0622cffa2dfffdf8bd96cc34627a78aeb8a72e5))
+* Replace relative paths to noir-protocol-circuits ([41d6e81](https://github.com/AztecProtocol/aztec-packages/commit/41d6e81426090c5b8c50787123bac826a732204d))
+* Replace relative paths to noir-protocol-circuits ([c0c8e3f](https://github.com/AztecProtocol/aztec-packages/commit/c0c8e3f880076d20cca96a3c92a1484abdcc66a0))
+* Replace relative paths to noir-protocol-circuits ([8b33a58](https://github.com/AztecProtocol/aztec-packages/commit/8b33a58e095815d5b131ab3fbd668c4e88680e13))
+* Replace relative paths to noir-protocol-circuits ([ce4a010](https://github.com/AztecProtocol/aztec-packages/commit/ce4a010c7c075cb68bed91e0123d4fcecc7c6938))
+* Replace use of PublicContext with interface ([#5840](https://github.com/AztecProtocol/aztec-packages/issues/5840)) ([834067f](https://github.com/AztecProtocol/aztec-packages/commit/834067f12b07a36b9348a368b83d61d789c5c22b))
+* Reset noir-gates-diff report on master  ([#6003](https://github.com/AztecProtocol/aztec-packages/issues/6003)) ([7f01f7d](https://github.com/AztecProtocol/aztec-packages/commit/7f01f7d16230fe011a3f52db9e477a958796b202))
+* Revert "Check working copy is clean before extract-repo ([#5851](https://github.com/AztecProtocol/aztec-packages/issues/5851))" ([ec21fb8](https://github.com/AztecProtocol/aztec-packages/commit/ec21fb8251c34d535fd0c5e08f354cfa22c25320))
+* **revert:** "chore(ci): don't use redirected earthly" ([#6062](https://github.com/AztecProtocol/aztec-packages/issues/6062)) ([26cba9e](https://github.com/AztecProtocol/aztec-packages/commit/26cba9e4ef9b63bf100e451b66cfe3ea62ab416c))
+* Rework workspace structure for utils crates (https://github.com/noir-lang/noir/pull/4886) ([e615a83](https://github.com/AztecProtocol/aztec-packages/commit/e615a831a12b78644b798e12395d970bf5601948))
+* Rework workspace structure for utils crates (https://github.com/noir-lang/noir/pull/4886) ([078aa61](https://github.com/AztecProtocol/aztec-packages/commit/078aa61b06557aba74ac9cce557ee6bd05040feb))
+* Run clippy (https://github.com/noir-lang/noir/pull/4810) ([84c930a](https://github.com/AztecProtocol/aztec-packages/commit/84c930a912ca9ed0d9c0ce2436309a4e9a840bcb))
+* Run flakey e2e tests on CI but allow failure ([#5937](https://github.com/AztecProtocol/aztec-packages/issues/5937)) ([a074251](https://github.com/AztecProtocol/aztec-packages/commit/a07425184d08d647588e3778221740e724b1b052))
+* Run noir projects tests in earthly ([#6024](https://github.com/AztecProtocol/aztec-packages/issues/6024)) ([e950433](https://github.com/AztecProtocol/aztec-packages/commit/e9504333dcb25c3f9bd1344743a0e12e7719ab2e))
+* Simplify computation of pow for each sumcheck round ([#5903](https://github.com/AztecProtocol/aztec-packages/issues/5903)) ([74a9d5d](https://github.com/AztecProtocol/aztec-packages/commit/74a9d5d6736a4376e40e501765974b9686ca738e))
+* Temporarily skip failing gas tests ([#5874](https://github.com/AztecProtocol/aztec-packages/issues/5874)) ([ad55af0](https://github.com/AztecProtocol/aztec-packages/commit/ad55af0d44b3c818d5e42fe75bb72fa95e88c309))
+* Update noir README (https://github.com/noir-lang/noir/pull/4856) ([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
+* Update NoirJS tutorial (https://github.com/noir-lang/noir/pull/4861) ([cea5107](https://github.com/AztecProtocol/aztec-packages/commit/cea51073be4ecc65a3c8d36cfe107df8390b853f))
+* Use BrilligCall for unconstrained main and update AVM transpiler ([#5797](https://github.com/AztecProtocol/aztec-packages/issues/5797)) ([3fb94c0](https://github.com/AztecProtocol/aztec-packages/commit/3fb94c0cd5ffba20a99b97c0088ae5ef357c205d))
+* Use new mock.get_last_params() for public storage writes ([#5823](https://github.com/AztecProtocol/aztec-packages/issues/5823)) ([6b0f919](https://github.com/AztecProtocol/aztec-packages/commit/6b0f919d83209a83e5d1900942a160424b30fe22))
+* Using poseidon2 when computing a nullifier ([#5906](https://github.com/AztecProtocol/aztec-packages/issues/5906)) ([3a10e5e](https://github.com/AztecProtocol/aztec-packages/commit/3a10e5e75b8053dfea13a4901873d42ca01ca7c2)), closes [#5832](https://github.com/AztecProtocol/aztec-packages/issues/5832) [#1205](https://github.com/AztecProtocol/aztec-packages/issues/1205)
+* Validate instance deployer address every time we request it ([#5848](https://github.com/AztecProtocol/aztec-packages/issues/5848)) ([2422891](https://github.com/AztecProtocol/aztec-packages/commit/2422891fa021cfb4c83b91849ff1f22baa93a4b9))
+* Workaround earthly flake ([#5811](https://github.com/AztecProtocol/aztec-packages/issues/5811)) ([dd3a521](https://github.com/AztecProtocol/aztec-packages/commit/dd3a521b59b950871645306179d23a3f332ef6f3))
+* Yarn build:dev don't clear terminal ([#5970](https://github.com/AztecProtocol/aztec-packages/issues/5970)) ([b3fdb3b](https://github.com/AztecProtocol/aztec-packages/commit/b3fdb3b59e887974b89db0eb209e16b0630b1360))
+
+
+### Documentation
+
+* Addition around Nargo.toml search ([#5943](https://github.com/AztecProtocol/aztec-packages/issues/5943)) ([d1350da](https://github.com/AztecProtocol/aztec-packages/commit/d1350da9e3d78fa53ccd5663219f70c67df4c66d))
+* Aztec smart contract tutorial - crowdfunding ([#5786](https://github.com/AztecProtocol/aztec-packages/issues/5786)) ([91cc0a4](https://github.com/AztecProtocol/aztec-packages/commit/91cc0a424031b9b8346cc9182f303d1468b1179b))
+* Gas and accounting ([#5855](https://github.com/AztecProtocol/aztec-packages/issues/5855)) ([d0b3f06](https://github.com/AztecProtocol/aztec-packages/commit/d0b3f06ff29d5e5ac99097cb1ab2906190eec5c3))
+* Migration notes for GasOpts in public calls ([#5822](https://github.com/AztecProtocol/aztec-packages/issues/5822)) ([edeea3d](https://github.com/AztecProtocol/aztec-packages/commit/edeea3dfe425b83b36c981dde3ce169e33aaece9))
+* Remove mentions of slow updates ([#5884](https://github.com/AztecProtocol/aztec-packages/issues/5884)) ([029d1e5](https://github.com/AztecProtocol/aztec-packages/commit/029d1e5d4ff679f73dce72779cb316a1d8c7eda8))
+* Shared state ([#5963](https://github.com/AztecProtocol/aztec-packages/issues/5963)) ([86c106f](https://github.com/AztecProtocol/aztec-packages/commit/86c106f122b3fe0daa5853f7824bb68abadf70d0))
+* Update emit_event.md ([#5964](https://github.com/AztecProtocol/aztec-packages/issues/5964)) ([616a8f3](https://github.com/AztecProtocol/aztec-packages/commit/616a8f328f893ab563b1d90c5c627572cf838968))
+* Update info around VERSION ([#5891](https://github.com/AztecProtocol/aztec-packages/issues/5891)) ([e1eb98e](https://github.com/AztecProtocol/aztec-packages/commit/e1eb98e85e6ef6ca87f502036426457c8c2a7efc))
+
 ## [0.35.1](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.35.0...aztec-packages-v0.35.1) (2024-04-16)
 
 
diff --git a/barretenberg/CHANGELOG.md b/barretenberg/CHANGELOG.md
index d37b74ee13c1..b6ba610067e1 100644
--- a/barretenberg/CHANGELOG.md
+++ b/barretenberg/CHANGELOG.md
@@ -1,5 +1,52 @@
 # Changelog
 
+## [0.36.0](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.35.1...barretenberg-v0.36.0) (2024-04-30)
+
+
+### ⚠ BREAKING CHANGES
+
+* remove `Opcode::Brillig` from ACIR ([#5995](https://github.com/AztecProtocol/aztec-packages/issues/5995))
+* change backend width to 4 ([#5374](https://github.com/AztecProtocol/aztec-packages/issues/5374))
+
+### Features
+
+* `variable_base_scalar_mul` blackbox func ([#6039](https://github.com/AztecProtocol/aztec-packages/issues/6039)) ([81142fe](https://github.com/AztecProtocol/aztec-packages/commit/81142fe799338e6ed73b30eeac4468c1345f6fab))
+* Avm mem trace validation ([#6025](https://github.com/AztecProtocol/aztec-packages/issues/6025)) ([3a3afb5](https://github.com/AztecProtocol/aztec-packages/commit/3a3afb57ab8b6b3f11b7a7799d557436638c8cd3)), closes [#5950](https://github.com/AztecProtocol/aztec-packages/issues/5950)
+* **avm:** Avm circuit FDIV opcode ([#5958](https://github.com/AztecProtocol/aztec-packages/issues/5958)) ([fed5b6d](https://github.com/AztecProtocol/aztec-packages/commit/fed5b6dd1ee310fc90404a3e5ec9eb02ad7dbc10)), closes [#5953](https://github.com/AztecProtocol/aztec-packages/issues/5953)
+* **avm:** CAST opcode implementation ([#5477](https://github.com/AztecProtocol/aztec-packages/issues/5477)) ([a821bcc](https://github.com/AztecProtocol/aztec-packages/commit/a821bccef7b1894140f0495510d7c6b4eefde821)), closes [#5466](https://github.com/AztecProtocol/aztec-packages/issues/5466)
+* **avm:** Negative tests ([#5919](https://github.com/AztecProtocol/aztec-packages/issues/5919)) ([8a5ece7](https://github.com/AztecProtocol/aztec-packages/commit/8a5ece7548a86d099ac6a166f04882624b8d95fd))
+* **avm:** Shift relations ([#5716](https://github.com/AztecProtocol/aztec-packages/issues/5716)) ([a516637](https://github.com/AztecProtocol/aztec-packages/commit/a51663707b96914b0a300440611748ce44fbe933))
+* Avoiding redundant computation in PG ([#5844](https://github.com/AztecProtocol/aztec-packages/issues/5844)) ([9f57733](https://github.com/AztecProtocol/aztec-packages/commit/9f5773353aa0261fa07a81704bcadcee513d42c5))
+* Change backend width to 4 ([#5374](https://github.com/AztecProtocol/aztec-packages/issues/5374)) ([3f24fc2](https://github.com/AztecProtocol/aztec-packages/commit/3f24fc2cdb56eff6da6e47062d2a2a3dc0fa4bd2))
+* Circuit simulator for Ultra and GoblinUltra verifiers ([#1195](https://github.com/AztecProtocol/aztec-packages/issues/1195)) ([0032a3a](https://github.com/AztecProtocol/aztec-packages/commit/0032a3a55dea5e4c9051dbc36607288f8ca1be4a))
+* Dynamic assertion payloads v2 ([#5949](https://github.com/AztecProtocol/aztec-packages/issues/5949)) ([405bdf6](https://github.com/AztecProtocol/aztec-packages/commit/405bdf6a297b81e0c3fda303cf2b1480eaea69f1))
+* Implement recursive verification in the parity circuits ([#6006](https://github.com/AztecProtocol/aztec-packages/issues/6006)) ([a5b6dac](https://github.com/AztecProtocol/aztec-packages/commit/a5b6dacd5512d7a035655845381b2c720b1e550a))
+* Keshas skipping plus conditions for grand prod relations ([#5766](https://github.com/AztecProtocol/aztec-packages/issues/5766)) ([d8fcfb5](https://github.com/AztecProtocol/aztec-packages/commit/d8fcfb590f788b911111010e20458797d76f5779))
+* Naive structured execution trace ([#5853](https://github.com/AztecProtocol/aztec-packages/issues/5853)) ([23aab17](https://github.com/AztecProtocol/aztec-packages/commit/23aab171b17d0dfb840621a74266496ac270b3e8))
+* Prove then verify flow for honk ([#5957](https://github.com/AztecProtocol/aztec-packages/issues/5957)) ([099346e](https://github.com/AztecProtocol/aztec-packages/commit/099346ebbab9428f57bfffdc03e8bede5c2e2bed))
+
+
+### Bug Fixes
+
+* **avm:** Comments and assert ([#5956](https://github.com/AztecProtocol/aztec-packages/issues/5956)) ([ae50219](https://github.com/AztecProtocol/aztec-packages/commit/ae502199b84999418d461ed5d0d6fca0c60494c5))
+* Fix relation skipping for sumcheck ([#6092](https://github.com/AztecProtocol/aztec-packages/issues/6092)) ([1449c33](https://github.com/AztecProtocol/aztec-packages/commit/1449c338ca79f8d72b71484546aa46ddebb21779))
+* Remove tx.origin ([#5765](https://github.com/AztecProtocol/aztec-packages/issues/5765)) ([c8784d7](https://github.com/AztecProtocol/aztec-packages/commit/c8784d7994937bfae9d23f5d17eb914bae92d8dc)), closes [#5756](https://github.com/AztecProtocol/aztec-packages/issues/5756)
+
+
+### Miscellaneous
+
+* `create_fixed_base_constraint` cleanup ([#6047](https://github.com/AztecProtocol/aztec-packages/issues/6047)) ([e1d6526](https://github.com/AztecProtocol/aztec-packages/commit/e1d6526b34f03458f258c0f0fa6967b5f20035f4))
+* **avm:** Negative unit tests for AVM CAST opcode ([#5907](https://github.com/AztecProtocol/aztec-packages/issues/5907)) ([4465e3b](https://github.com/AztecProtocol/aztec-packages/commit/4465e3be870963ea435d9a0cd063397020442f0b)), closes [#5908](https://github.com/AztecProtocol/aztec-packages/issues/5908)
+* **avm:** Re-enable proof in some unit tests ([#6056](https://github.com/AztecProtocol/aztec-packages/issues/6056)) ([0ebee28](https://github.com/AztecProtocol/aztec-packages/commit/0ebee28b14042417956a02a3247af68f4f13dcf5)), closes [#6019](https://github.com/AztecProtocol/aztec-packages/issues/6019)
+* Clean up and clarify some translator flavor logic ([#5965](https://github.com/AztecProtocol/aztec-packages/issues/5965)) ([242b364](https://github.com/AztecProtocol/aztec-packages/commit/242b364aacdf662cd6dab6254562ab5f61a58731))
+* Do not bootstrap cache if working copy is dirty ([#6033](https://github.com/AztecProtocol/aztec-packages/issues/6033)) ([3671932](https://github.com/AztecProtocol/aztec-packages/commit/367193253670a1d61ffa440d94dad4b9d068e72f))
+* ProvingKey has ProverPolynomials ([#5940](https://github.com/AztecProtocol/aztec-packages/issues/5940)) ([0a64279](https://github.com/AztecProtocol/aztec-packages/commit/0a64279ba1b2b3bb6627c675b8a0b116be17f579))
+* Purging portal addresses ([#5842](https://github.com/AztecProtocol/aztec-packages/issues/5842)) ([4faccad](https://github.com/AztecProtocol/aztec-packages/commit/4faccad569e39228b0f3fbf741fc95e3a189e276))
+* Refactor recursive verifier tests ([#6063](https://github.com/AztecProtocol/aztec-packages/issues/6063)) ([94a2d61](https://github.com/AztecProtocol/aztec-packages/commit/94a2d61d10d8e21d0080b7ea3a8b283f8dd0162f))
+* Remove `Opcode::Brillig` from ACIR ([#5995](https://github.com/AztecProtocol/aztec-packages/issues/5995)) ([ffd5f46](https://github.com/AztecProtocol/aztec-packages/commit/ffd5f460fce8b1f12265730f97c8cfcd3a4774ca))
+* Remove l1 gas ([#6069](https://github.com/AztecProtocol/aztec-packages/issues/6069)) ([0e3705f](https://github.com/AztecProtocol/aztec-packages/commit/0e3705f2591c1da36778c316d8b7ab914f5d6757))
+* Simplify computation of pow for each sumcheck round ([#5903](https://github.com/AztecProtocol/aztec-packages/issues/5903)) ([74a9d5d](https://github.com/AztecProtocol/aztec-packages/commit/74a9d5d6736a4376e40e501765974b9686ca738e))
+
 ## [0.35.1](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.35.0...barretenberg-v0.35.1) (2024-04-16)
 
 
diff --git a/barretenberg/cpp/CMakeLists.txt b/barretenberg/cpp/CMakeLists.txt
index f33ff1034bd1..8b0b82e934fa 100644
--- a/barretenberg/cpp/CMakeLists.txt
+++ b/barretenberg/cpp/CMakeLists.txt
@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.24 FATAL_ERROR)
 project(
     Barretenberg
     DESCRIPTION "BN254 elliptic curve library, and PLONK SNARK prover"
-    VERSION 0.35.1 # x-release-please-version
+    VERSION 0.36.0 # x-release-please-version
     LANGUAGES CXX C
 )
 # Insert version into `bb` config file
diff --git a/barretenberg/ts/CHANGELOG.md b/barretenberg/ts/CHANGELOG.md
index 8592c453620b..2dae6986aedd 100644
--- a/barretenberg/ts/CHANGELOG.md
+++ b/barretenberg/ts/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.36.0](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.35.1...barretenberg.js-v0.36.0) (2024-04-30)
+
+
+### Miscellaneous
+
+* Do not bootstrap cache if working copy is dirty ([#6033](https://github.com/AztecProtocol/aztec-packages/issues/6033)) ([3671932](https://github.com/AztecProtocol/aztec-packages/commit/367193253670a1d61ffa440d94dad4b9d068e72f))
+
 ## [0.35.1](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.35.0...barretenberg.js-v0.35.1) (2024-04-16)
 
 
diff --git a/barretenberg/ts/package.json b/barretenberg/ts/package.json
index 888182337d63..f8408dcd0f9d 100644
--- a/barretenberg/ts/package.json
+++ b/barretenberg/ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aztec/bb.js",
-  "version": "0.35.1",
+  "version": "0.36.0",
   "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/barretenberg/ts",
   "license": "MIT",
   "type": "module",
diff --git a/yarn-project/aztec/CHANGELOG.md b/yarn-project/aztec/CHANGELOG.md
index 054e57bc4f4b..ebde28154600 100644
--- a/yarn-project/aztec/CHANGELOG.md
+++ b/yarn-project/aztec/CHANGELOG.md
@@ -1,5 +1,30 @@
 # Changelog
 
+## [0.36.0](https://github.com/AztecProtocol/aztec-packages/compare/aztec-package-v0.35.1...aztec-package-v0.36.0) (2024-04-30)
+
+
+### Features
+
+* Add key registry to deployment (e2e & sandbox) ([#5875](https://github.com/AztecProtocol/aztec-packages/issues/5875)) ([0881cd3](https://github.com/AztecProtocol/aztec-packages/commit/0881cd3083af70271bceda695d0c8ad21212c172)), closes [#5611](https://github.com/AztecProtocol/aztec-packages/issues/5611)
+* Configure prover as separate process ([#5973](https://github.com/AztecProtocol/aztec-packages/issues/5973)) ([c0dd7b2](https://github.com/AztecProtocol/aztec-packages/commit/c0dd7b21779b99f1b9d3ed43623d3de25a332699))
+* **p2p:** DiscV5 Peer Discovery ([#5652](https://github.com/AztecProtocol/aztec-packages/issues/5652)) ([0e81642](https://github.com/AztecProtocol/aztec-packages/commit/0e8164239b6a1180fd292e37faf1a0e64aa9cff4))
+
+
+### Bug Fixes
+
+* Deploy L1 contracts before starting node ([#5969](https://github.com/AztecProtocol/aztec-packages/issues/5969)) ([1908139](https://github.com/AztecProtocol/aztec-packages/commit/190813911c5e4fc7533525478ceca4162170fa6b))
+* Refuse to start sequencer without a prover ([#6000](https://github.com/AztecProtocol/aztec-packages/issues/6000)) ([b30d0b6](https://github.com/AztecProtocol/aztec-packages/commit/b30d0b6481b0f0b2241f1fcc9ec9bc0f82308ce9))
+
+
+### Miscellaneous
+
+* **ci:** Prevent haywire logs ([#5966](https://github.com/AztecProtocol/aztec-packages/issues/5966)) ([b12f609](https://github.com/AztecProtocol/aztec-packages/commit/b12f60994fdd54cb4d8e18e444c207e319f9d6a6))
+* Integrate new key store ([#5731](https://github.com/AztecProtocol/aztec-packages/issues/5731)) ([ab9fe78](https://github.com/AztecProtocol/aztec-packages/commit/ab9fe780e8a9fc3187a02b37ddbefa609d3bff8f)), closes [#5720](https://github.com/AztecProtocol/aztec-packages/issues/5720)
+* Purging portal addresses ([#5842](https://github.com/AztecProtocol/aztec-packages/issues/5842)) ([4faccad](https://github.com/AztecProtocol/aztec-packages/commit/4faccad569e39228b0f3fbf741fc95e3a189e276))
+* Renaming `noir-compiler` as `builder` ([#5951](https://github.com/AztecProtocol/aztec-packages/issues/5951)) ([185e57d](https://github.com/AztecProtocol/aztec-packages/commit/185e57d51e8bbf6194628ce62db3dd44f11634a4))
+* Replace queue with facade over CircuitProver ([#5972](https://github.com/AztecProtocol/aztec-packages/issues/5972)) ([dafb3ed](https://github.com/AztecProtocol/aztec-packages/commit/dafb3edc799b2adaf285ffe57b41630040c68449))
+* Using poseidon2 when computing a nullifier ([#5906](https://github.com/AztecProtocol/aztec-packages/issues/5906)) ([3a10e5e](https://github.com/AztecProtocol/aztec-packages/commit/3a10e5e75b8053dfea13a4901873d42ca01ca7c2)), closes [#5832](https://github.com/AztecProtocol/aztec-packages/issues/5832) [#1205](https://github.com/AztecProtocol/aztec-packages/issues/1205)
+
 ## [0.35.1](https://github.com/AztecProtocol/aztec-packages/compare/aztec-package-v0.35.0...aztec-package-v0.35.1) (2024-04-16)
 
 
diff --git a/yarn-project/aztec/package.json b/yarn-project/aztec/package.json
index 9f91f14b3ea6..debd7c234fa7 100644
--- a/yarn-project/aztec/package.json
+++ b/yarn-project/aztec/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aztec/aztec",
-  "version": "0.35.1",
+  "version": "0.36.0",
   "type": "module",
   "exports": {
     ".": "./dest/index.js"

From 086945223602f5d909fc79b56420046c0808f35c Mon Sep 17 00:00:00 2001
From: Tom French <15848336+TomAFrench@users.noreply.github.com>
Date: Tue, 30 Apr 2024 20:13:28 +0100
Subject: [PATCH 16/42] chore: redo typo PR by stayweek (#6080)

Thanks stayweek for
https://github.com/AztecProtocol/aztec-packages/pull/6074. Our policy is
to redo typo changes to dissuade metric farming. This is an automated
script.

Signed-off-by: stayweek <jiangtengtao@outlook.com>
Co-authored-by: AztecBot <tech@aztecprotocol.com>
---
 barretenberg/acir_tests/headless-test/src/index.ts            | 2 +-
 barretenberg/acir_tests/sol-test/src/index.js                 | 2 +-
 .../src/barretenberg/sumcheck/instance/prover_instance.cpp    | 4 ++--
 l1-contracts/scripts/ci_deploy_contracts.sh                   | 2 +-
 scripts/git-subrepo/note/Dags                                 | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/barretenberg/acir_tests/headless-test/src/index.ts b/barretenberg/acir_tests/headless-test/src/index.ts
index 5c91dc8fa15f..1902e510e87c 100644
--- a/barretenberg/acir_tests/headless-test/src/index.ts
+++ b/barretenberg/acir_tests/headless-test/src/index.ts
@@ -51,7 +51,7 @@ const readWitnessFile = (path: string): Uint8Array => {
 // Set up the command-line interface
 const program = new Command();
 program.option("-v, --verbose", "verbose logging");
-program.option("-c, --crs-path <path>", "ignored (here for compatability)");
+program.option("-c, --crs-path <path>", "ignored (here for compatibility)");
 
 program
   .command("prove_and_verify")
diff --git a/barretenberg/acir_tests/sol-test/src/index.js b/barretenberg/acir_tests/sol-test/src/index.js
index b63921d2709d..59d43bea54f9 100644
--- a/barretenberg/acir_tests/sol-test/src/index.js
+++ b/barretenberg/acir_tests/sol-test/src/index.js
@@ -137,7 +137,7 @@ const readPublicInputs = (proofAsFields) => {
  * Get Anvil
  * 
  * Creates an anvil instance on a random port, and returns the instance and the port
- * If the port is alredy allocated, it will try again
+ * If the port is already allocated, it will try again
  * @returns {[ChildProcess, Number]} [anvil, port]
  */
 const getAnvil = async () => {
diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.cpp b/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.cpp
index 3b42eab9d0fb..06f08d6b302b 100644
--- a/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.cpp
+++ b/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.cpp
@@ -15,13 +15,13 @@ template <class Flavor> size_t ProverInstance_<Flavor>::compute_dyadic_size(Circ
     // minimum circuit size due to lookup argument
     const size_t min_size_due_to_lookups = circuit.get_tables_size() + circuit.get_lookups_size();
 
-    // minumum size of execution trace due to everything else
+    // minimum size of execution trace due to everything else
     size_t min_size_of_execution_trace = circuit.public_inputs.size() + circuit.num_gates;
     if constexpr (IsGoblinFlavor<Flavor>) {
         min_size_of_execution_trace += circuit.blocks.ecc_op.size();
     }
 
-    // The number of gates is the maxmimum required by the lookup argument or everything else, plus an optional zero row
+    // The number of gates is the maximum required by the lookup argument or everything else, plus an optional zero row
     // to allow for shifts.
     size_t num_zero_rows = Flavor::has_zero_row ? 1 : 0;
     size_t total_num_gates = num_zero_rows + std::max(min_size_due_to_lookups, min_size_of_execution_trace);
diff --git a/l1-contracts/scripts/ci_deploy_contracts.sh b/l1-contracts/scripts/ci_deploy_contracts.sh
index 914e28f128e7..73dcf50f1a8c 100755
--- a/l1-contracts/scripts/ci_deploy_contracts.sh
+++ b/l1-contracts/scripts/ci_deploy_contracts.sh
@@ -10,7 +10,7 @@ CONTENT_HASH=$(calculate_content_hash $REPOSITORY)
 
 echo "Last successfully published commit: $CONTENT_HASH"
 
-# Check if image hash has alredy been deployed.
+# Check if image hash has already been deployed.
 if check_rebuild "cache-$CONTENT_HASH-$DEPLOY_TAG-deployed" $REPOSITORY; then
   echo "No changes detected, no contract deploy necessary."
   # Set global variable for redeployment of contracts
diff --git a/scripts/git-subrepo/note/Dags b/scripts/git-subrepo/note/Dags
index 0481f98af5e5..29417c1fc803 100644
--- a/scripts/git-subrepo/note/Dags
+++ b/scripts/git-subrepo/note/Dags
@@ -1,4 +1,4 @@
-== ASCII commmit DAG diagrams
+== ASCII commit DAG diagrams
 
          D--E--F--G--H
         /     /

From 1a89d1a8bfa05fbac9904adc63b57ba94896c8d6 Mon Sep 17 00:00:00 2001
From: Tom French <15848336+TomAFrench@users.noreply.github.com>
Date: Tue, 30 Apr 2024 20:14:11 +0100
Subject: [PATCH 17/42] chore: redo typo PR by vitalmotif (#6081)

Thanks vitalmotif for
https://github.com/AztecProtocol/aztec-packages/pull/6072. Our policy is
to redo typo changes to dissuade metric farming. This is an automated
script.

Signed-off-by: vitalmotif <zhangshengqiang@outlook.com>
Co-authored-by: AztecBot <tech@aztecprotocol.com>
---
 l1-contracts/src/core/libraries/decoders/TxsDecoder.sol         | 2 +-
 noir/noir-repo/CONTRIBUTING.md                                  | 2 +-
 .../noir-repo/compiler/noirc_evaluator/src/ssa/ir/post_order.rs | 2 +-
 .../compiler/noirc_evaluator/src/ssa/opt/remove_bit_shifts.rs   | 2 +-
 noir/noir-repo/docs/docs/tutorials/noirjs_app.md                | 2 +-
 .../version-v0.17.0/noir_js/getting_started/01_tiny_noir_app.md | 2 +-
 .../version-v0.19.0/noir_js/getting_started/01_tiny_noir_app.md | 2 +-
 .../version-v0.19.1/noir_js/getting_started/01_tiny_noir_app.md | 2 +-
 .../version-v0.19.2/noir_js/getting_started/01_tiny_noir_app.md | 2 +-
 .../version-v0.19.3/noir_js/getting_started/01_tiny_noir_app.md | 2 +-
 .../version-v0.19.4/noir_js/getting_started/01_tiny_noir_app.md | 2 +-
 .../docs/versioned_docs/version-v0.22.0/tutorials/noirjs_app.md | 2 +-
 .../docs/versioned_docs/version-v0.23.0/tutorials/noirjs_app.md | 2 +-
 .../docs/versioned_docs/version-v0.24.0/tutorials/noirjs_app.md | 2 +-
 .../docs/versioned_docs/version-v0.25.0/tutorials/noirjs_app.md | 2 +-
 .../docs/versioned_docs/version-v0.26.0/tutorials/noirjs_app.md | 2 +-
 .../docs/versioned_docs/version-v0.27.0/tutorials/noirjs_app.md | 2 +-
 .../docs/versioned_docs/version-v0.28.0/tutorials/noirjs_app.md | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/l1-contracts/src/core/libraries/decoders/TxsDecoder.sol b/l1-contracts/src/core/libraries/decoders/TxsDecoder.sol
index dac894c870b0..747c446279a1 100644
--- a/l1-contracts/src/core/libraries/decoders/TxsDecoder.sol
+++ b/l1-contracts/src/core/libraries/decoders/TxsDecoder.sol
@@ -194,7 +194,7 @@ library TxsDecoder {
    * @dev We have logs preimages on the input and we need to perform the same hashing process as is done in the app
    *      circuit (hashing the logs) and in the kernel circuit (accumulating the logs hashes). In each iteration of
    *      kernel, the kernel computes a hash of the previous iteration's logs hash (the hash in the previous kernel's
-   *      public inputs) and the the current iteration private circuit public inputs logs hash.
+   *      public inputs) and the current iteration private circuit public inputs logs hash.
    *
    *      E.g. for resulting logs hash of a kernel with 3 iterations would be computed as:
    *
diff --git a/noir/noir-repo/CONTRIBUTING.md b/noir/noir-repo/CONTRIBUTING.md
index d2553b003f8b..c02d24e91b8d 100644
--- a/noir/noir-repo/CONTRIBUTING.md
+++ b/noir/noir-repo/CONTRIBUTING.md
@@ -196,7 +196,7 @@ yarn docusaurus docs:version <new_version_tag>
 
 This should create a new version by copying the docs folder and the sidebars.js file to the relevant folders, as well as adding this version to versions.json.
 
-You can then open a Pull Request according to the the [PR section](#pull-requests)
+You can then open a Pull Request according to the [PR section](#pull-requests)
 
 ## Changelog
 
diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/post_order.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/post_order.rs
index d95ec4517796..94ff96ba1d70 100644
--- a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/post_order.rs
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/post_order.rs
@@ -51,7 +51,7 @@ impl PostOrder {
                         // stack, we push the item that's due for a visit first to the top.
                         for successor_id in func.dfg[block_id].successors().rev() {
                             if !visited.contains(&successor_id) {
-                                // This not visited check would also be cover by the the next
+                                // This not visited check would also be cover by the next
                                 // iteration, but checking here two saves an iteration per successor.
                                 stack.push((Visit::First, successor_id));
                             }
diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/remove_bit_shifts.rs b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/remove_bit_shifts.rs
index 1eb1e20d41d5..9b41f28ef56c 100644
--- a/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/remove_bit_shifts.rs
+++ b/noir/noir-repo/compiler/noirc_evaluator/src/ssa/opt/remove_bit_shifts.rs
@@ -97,7 +97,7 @@ impl Context<'_> {
         let typ = self.function.dfg.type_of_value(lhs);
         let (max_bit, pow) = if let Some(rhs_constant) = self.function.dfg.get_numeric_constant(rhs)
         {
-            // Happy case is that we know precisely by how many bits the the integer will
+            // Happy case is that we know precisely by how many bits the integer will
             // increase: lhs_bit_size + rhs
             let bit_shift_size = rhs_constant.to_u128() as u32;
 
diff --git a/noir/noir-repo/docs/docs/tutorials/noirjs_app.md b/noir/noir-repo/docs/docs/tutorials/noirjs_app.md
index 6446e0b2a76f..3dd9fe7d2b02 100644
--- a/noir/noir-repo/docs/docs/tutorials/noirjs_app.md
+++ b/noir/noir-repo/docs/docs/tutorials/noirjs_app.md
@@ -24,7 +24,7 @@ Before we start, we want to make sure we have Node and Nargo installed.
 
 We start by opening a terminal and executing `node --version`. If we don't get an output like `v20.10.0`, that means node is not installed. Let's do that by following the handy [nvm guide](https://github.com/nvm-sh/nvm?tab=readme-ov-file#install--update-script).
 
-As for `Nargo`, we can follow the the [Nargo guide](../getting_started/installation/index.md) to install it. If you're lazy, just paste this on a terminal and run `noirup`:
+As for `Nargo`, we can follow the [Nargo guide](../getting_started/installation/index.md) to install it. If you're lazy, just paste this on a terminal and run `noirup`:
 
 ```sh
 curl -L https://raw.githubusercontent.com/noir-lang/noirup/main/install | bash
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.17.0/noir_js/getting_started/01_tiny_noir_app.md b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/noir_js/getting_started/01_tiny_noir_app.md
index 142cd02b94cc..b3f1d6df7476 100644
--- a/noir/noir-repo/docs/versioned_docs/version-v0.17.0/noir_js/getting_started/01_tiny_noir_app.md
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.17.0/noir_js/getting_started/01_tiny_noir_app.md
@@ -18,7 +18,7 @@ In this guide, we will be pinned to 0.17.0.
 
 Make sure you have Node installed on your machine by opening a terminal and executing `node --version`. If you don't see a version, you should install [node](https://github.com/nvm-sh/nvm). You can also use `yarn` if you prefer that package manager over npm (which comes with node).
 
-First of all, follow the the [Nargo guide](../../getting_started/00_nargo_installation.md) to install nargo version 0.17.0 and create a new project with `nargo new circuit`. Once there, `cd` into the `circuit` folder. You should then be able to compile your circuit into `json` format and see it inside the `target` folder:
+First of all, follow the [Nargo guide](../../getting_started/00_nargo_installation.md) to install nargo version 0.17.0 and create a new project with `nargo new circuit`. Once there, `cd` into the `circuit` folder. You should then be able to compile your circuit into `json` format and see it inside the `target` folder:
 
 ```bash
 nargo compile
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/getting_started/01_tiny_noir_app.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/getting_started/01_tiny_noir_app.md
index 795baa59d59c..64ba4a2c44ad 100644
--- a/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/getting_started/01_tiny_noir_app.md
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.19.0/noir_js/getting_started/01_tiny_noir_app.md
@@ -20,7 +20,7 @@ In this guide, we will be pinned to 0.17.0.
 
 Make sure you have Node installed on your machine by opening a terminal and executing `node --version`. If you don't see a version, you should install [node](https://github.com/nvm-sh/nvm). You can also use `yarn` if you prefer that package manager over npm (which comes with node).
 
-First of all, follow the the [Nargo guide](../../getting_started/00_nargo_installation.md) to install nargo version 0.17.0 and create a new project with `nargo new circuit`. Once there, `cd` into the `circuit` folder. You should then be able to compile your circuit into `json` format and see it inside the `target` folder:
+First of all, follow the [Nargo guide](../../getting_started/00_nargo_installation.md) to install nargo version 0.17.0 and create a new project with `nargo new circuit`. Once there, `cd` into the `circuit` folder. You should then be able to compile your circuit into `json` format and see it inside the `target` folder:
 
 ```bash
 nargo compile
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/getting_started/01_tiny_noir_app.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/getting_started/01_tiny_noir_app.md
index 795baa59d59c..64ba4a2c44ad 100644
--- a/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/getting_started/01_tiny_noir_app.md
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.19.1/noir_js/getting_started/01_tiny_noir_app.md
@@ -20,7 +20,7 @@ In this guide, we will be pinned to 0.17.0.
 
 Make sure you have Node installed on your machine by opening a terminal and executing `node --version`. If you don't see a version, you should install [node](https://github.com/nvm-sh/nvm). You can also use `yarn` if you prefer that package manager over npm (which comes with node).
 
-First of all, follow the the [Nargo guide](../../getting_started/00_nargo_installation.md) to install nargo version 0.17.0 and create a new project with `nargo new circuit`. Once there, `cd` into the `circuit` folder. You should then be able to compile your circuit into `json` format and see it inside the `target` folder:
+First of all, follow the [Nargo guide](../../getting_started/00_nargo_installation.md) to install nargo version 0.17.0 and create a new project with `nargo new circuit`. Once there, `cd` into the `circuit` folder. You should then be able to compile your circuit into `json` format and see it inside the `target` folder:
 
 ```bash
 nargo compile
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/getting_started/01_tiny_noir_app.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/getting_started/01_tiny_noir_app.md
index 795baa59d59c..64ba4a2c44ad 100644
--- a/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/getting_started/01_tiny_noir_app.md
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.19.2/noir_js/getting_started/01_tiny_noir_app.md
@@ -20,7 +20,7 @@ In this guide, we will be pinned to 0.17.0.
 
 Make sure you have Node installed on your machine by opening a terminal and executing `node --version`. If you don't see a version, you should install [node](https://github.com/nvm-sh/nvm). You can also use `yarn` if you prefer that package manager over npm (which comes with node).
 
-First of all, follow the the [Nargo guide](../../getting_started/00_nargo_installation.md) to install nargo version 0.17.0 and create a new project with `nargo new circuit`. Once there, `cd` into the `circuit` folder. You should then be able to compile your circuit into `json` format and see it inside the `target` folder:
+First of all, follow the [Nargo guide](../../getting_started/00_nargo_installation.md) to install nargo version 0.17.0 and create a new project with `nargo new circuit`. Once there, `cd` into the `circuit` folder. You should then be able to compile your circuit into `json` format and see it inside the `target` folder:
 
 ```bash
 nargo compile
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/getting_started/01_tiny_noir_app.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/getting_started/01_tiny_noir_app.md
index 795baa59d59c..64ba4a2c44ad 100644
--- a/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/getting_started/01_tiny_noir_app.md
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.19.3/noir_js/getting_started/01_tiny_noir_app.md
@@ -20,7 +20,7 @@ In this guide, we will be pinned to 0.17.0.
 
 Make sure you have Node installed on your machine by opening a terminal and executing `node --version`. If you don't see a version, you should install [node](https://github.com/nvm-sh/nvm). You can also use `yarn` if you prefer that package manager over npm (which comes with node).
 
-First of all, follow the the [Nargo guide](../../getting_started/00_nargo_installation.md) to install nargo version 0.17.0 and create a new project with `nargo new circuit`. Once there, `cd` into the `circuit` folder. You should then be able to compile your circuit into `json` format and see it inside the `target` folder:
+First of all, follow the [Nargo guide](../../getting_started/00_nargo_installation.md) to install nargo version 0.17.0 and create a new project with `nargo new circuit`. Once there, `cd` into the `circuit` folder. You should then be able to compile your circuit into `json` format and see it inside the `target` folder:
 
 ```bash
 nargo compile
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/getting_started/01_tiny_noir_app.md b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/getting_started/01_tiny_noir_app.md
index 795baa59d59c..64ba4a2c44ad 100644
--- a/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/getting_started/01_tiny_noir_app.md
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.19.4/noir_js/getting_started/01_tiny_noir_app.md
@@ -20,7 +20,7 @@ In this guide, we will be pinned to 0.17.0.
 
 Make sure you have Node installed on your machine by opening a terminal and executing `node --version`. If you don't see a version, you should install [node](https://github.com/nvm-sh/nvm). You can also use `yarn` if you prefer that package manager over npm (which comes with node).
 
-First of all, follow the the [Nargo guide](../../getting_started/00_nargo_installation.md) to install nargo version 0.17.0 and create a new project with `nargo new circuit`. Once there, `cd` into the `circuit` folder. You should then be able to compile your circuit into `json` format and see it inside the `target` folder:
+First of all, follow the [Nargo guide](../../getting_started/00_nargo_installation.md) to install nargo version 0.17.0 and create a new project with `nargo new circuit`. Once there, `cd` into the `circuit` folder. You should then be able to compile your circuit into `json` format and see it inside the `target` folder:
 
 ```bash
 nargo compile
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.22.0/tutorials/noirjs_app.md b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/tutorials/noirjs_app.md
index 0763b6224c97..516e07c89fd3 100644
--- a/noir/noir-repo/docs/versioned_docs/version-v0.22.0/tutorials/noirjs_app.md
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.22.0/tutorials/noirjs_app.md
@@ -21,7 +21,7 @@ In this guide, we will be pinned to 0.17.0.
 
 Make sure you have Node installed on your machine by opening a terminal and executing `node --version`. If you don't see a version, you should install [node](https://github.com/nvm-sh/nvm). You can also use `yarn` if you prefer that package manager over npm (which comes with node).
 
-First of all, follow the the [Nargo guide](../getting_started/installation/index.md) to install nargo version 0.17.0 and create a new project with `nargo new circuit`. Once there, `cd` into the `circuit` folder. You should then be able to compile your circuit into `json` format and see it inside the `target` folder:
+First of all, follow the [Nargo guide](../getting_started/installation/index.md) to install nargo version 0.17.0 and create a new project with `nargo new circuit`. Once there, `cd` into the `circuit` folder. You should then be able to compile your circuit into `json` format and see it inside the `target` folder:
 
 ```bash
 nargo compile
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.23.0/tutorials/noirjs_app.md b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/tutorials/noirjs_app.md
index 82899217e61d..e3bc8c58b24d 100644
--- a/noir/noir-repo/docs/versioned_docs/version-v0.23.0/tutorials/noirjs_app.md
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.23.0/tutorials/noirjs_app.md
@@ -24,7 +24,7 @@ Before we start, we want to make sure we have Node and Nargo installed.
 
 We start by opening a terminal and executing `node --version`. If we don't get an output like `v20.10.0`, that means node is not installed. Let's do that by following the handy [nvm guide](https://github.com/nvm-sh/nvm?tab=readme-ov-file#install--update-script).
 
-As for `Nargo`, we can follow the the [Nargo guide](../getting_started/installation/index.md) to install it. If you're lazy, just paste this on a terminal and run `noirup`:
+As for `Nargo`, we can follow the [Nargo guide](../getting_started/installation/index.md) to install it. If you're lazy, just paste this on a terminal and run `noirup`:
 
 ```sh
 curl -L https://raw.githubusercontent.com/noir-lang/noirup/main/install | bash
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.24.0/tutorials/noirjs_app.md b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/tutorials/noirjs_app.md
index 12beb476994a..0d75e2e80452 100644
--- a/noir/noir-repo/docs/versioned_docs/version-v0.24.0/tutorials/noirjs_app.md
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.24.0/tutorials/noirjs_app.md
@@ -24,7 +24,7 @@ Before we start, we want to make sure we have Node and Nargo installed.
 
 We start by opening a terminal and executing `node --version`. If we don't get an output like `v20.10.0`, that means node is not installed. Let's do that by following the handy [nvm guide](https://github.com/nvm-sh/nvm?tab=readme-ov-file#install--update-script).
 
-As for `Nargo`, we can follow the the [Nargo guide](../getting_started/installation/index.md) to install it. If you're lazy, just paste this on a terminal and run `noirup`:
+As for `Nargo`, we can follow the [Nargo guide](../getting_started/installation/index.md) to install it. If you're lazy, just paste this on a terminal and run `noirup`:
 
 ```sh
 curl -L https://raw.githubusercontent.com/noir-lang/noirup/main/install | bash
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/tutorials/noirjs_app.md b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/tutorials/noirjs_app.md
index 02044cd2ff67..0cea72314ce4 100644
--- a/noir/noir-repo/docs/versioned_docs/version-v0.25.0/tutorials/noirjs_app.md
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.25.0/tutorials/noirjs_app.md
@@ -24,7 +24,7 @@ Before we start, we want to make sure we have Node and Nargo installed.
 
 We start by opening a terminal and executing `node --version`. If we don't get an output like `v20.10.0`, that means node is not installed. Let's do that by following the handy [nvm guide](https://github.com/nvm-sh/nvm?tab=readme-ov-file#install--update-script).
 
-As for `Nargo`, we can follow the the [Nargo guide](../getting_started/installation/index.md) to install it. If you're lazy, just paste this on a terminal and run `noirup`:
+As for `Nargo`, we can follow the [Nargo guide](../getting_started/installation/index.md) to install it. If you're lazy, just paste this on a terminal and run `noirup`:
 
 ```sh
 curl -L https://raw.githubusercontent.com/noir-lang/noirup/main/install | bash
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.26.0/tutorials/noirjs_app.md b/noir/noir-repo/docs/versioned_docs/version-v0.26.0/tutorials/noirjs_app.md
index d098827e6d98..a6dda7e08c3a 100644
--- a/noir/noir-repo/docs/versioned_docs/version-v0.26.0/tutorials/noirjs_app.md
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.26.0/tutorials/noirjs_app.md
@@ -24,7 +24,7 @@ Before we start, we want to make sure we have Node and Nargo installed.
 
 We start by opening a terminal and executing `node --version`. If we don't get an output like `v20.10.0`, that means node is not installed. Let's do that by following the handy [nvm guide](https://github.com/nvm-sh/nvm?tab=readme-ov-file#install--update-script).
 
-As for `Nargo`, we can follow the the [Nargo guide](../getting_started/installation/index.md) to install it. If you're lazy, just paste this on a terminal and run `noirup`:
+As for `Nargo`, we can follow the [Nargo guide](../getting_started/installation/index.md) to install it. If you're lazy, just paste this on a terminal and run `noirup`:
 
 ```sh
 curl -L https://raw.githubusercontent.com/noir-lang/noirup/main/install | bash
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.27.0/tutorials/noirjs_app.md b/noir/noir-repo/docs/versioned_docs/version-v0.27.0/tutorials/noirjs_app.md
index 12beb476994a..0d75e2e80452 100644
--- a/noir/noir-repo/docs/versioned_docs/version-v0.27.0/tutorials/noirjs_app.md
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.27.0/tutorials/noirjs_app.md
@@ -24,7 +24,7 @@ Before we start, we want to make sure we have Node and Nargo installed.
 
 We start by opening a terminal and executing `node --version`. If we don't get an output like `v20.10.0`, that means node is not installed. Let's do that by following the handy [nvm guide](https://github.com/nvm-sh/nvm?tab=readme-ov-file#install--update-script).
 
-As for `Nargo`, we can follow the the [Nargo guide](../getting_started/installation/index.md) to install it. If you're lazy, just paste this on a terminal and run `noirup`:
+As for `Nargo`, we can follow the [Nargo guide](../getting_started/installation/index.md) to install it. If you're lazy, just paste this on a terminal and run `noirup`:
 
 ```sh
 curl -L https://raw.githubusercontent.com/noir-lang/noirup/main/install | bash
diff --git a/noir/noir-repo/docs/versioned_docs/version-v0.28.0/tutorials/noirjs_app.md b/noir/noir-repo/docs/versioned_docs/version-v0.28.0/tutorials/noirjs_app.md
index 6446e0b2a76f..3dd9fe7d2b02 100644
--- a/noir/noir-repo/docs/versioned_docs/version-v0.28.0/tutorials/noirjs_app.md
+++ b/noir/noir-repo/docs/versioned_docs/version-v0.28.0/tutorials/noirjs_app.md
@@ -24,7 +24,7 @@ Before we start, we want to make sure we have Node and Nargo installed.
 
 We start by opening a terminal and executing `node --version`. If we don't get an output like `v20.10.0`, that means node is not installed. Let's do that by following the handy [nvm guide](https://github.com/nvm-sh/nvm?tab=readme-ov-file#install--update-script).
 
-As for `Nargo`, we can follow the the [Nargo guide](../getting_started/installation/index.md) to install it. If you're lazy, just paste this on a terminal and run `noirup`:
+As for `Nargo`, we can follow the [Nargo guide](../getting_started/installation/index.md) to install it. If you're lazy, just paste this on a terminal and run `noirup`:
 
 ```sh
 curl -L https://raw.githubusercontent.com/noir-lang/noirup/main/install | bash

From 784d54258ca3bce47f030790afa3ba1e4d5e0ad9 Mon Sep 17 00:00:00 2001
From: just-mitch <68168980+just-mitch@users.noreply.github.com>
Date: Tue, 30 Apr 2024 13:30:09 -0600
Subject: [PATCH 18/42] chore: build docs in earthly (#6038)

Adds a `docs-preview` job to the github actions `CI` workflow which:
1. Builds the docs
2. Adds the familiar PR comment with link to preview

Adds a `Publish Docs` workflow, which gets triggered from the
`release-please` workflow which builds and deploys docs to production.

Removes doc builds from circle ci.
---
 .circleci/config.yml                          |   20 -
 .github/workflows/ci.yml                      |   16 +
 .github/workflows/publish-docs.yml            |   18 +
 .github/workflows/release-please.yml          |   11 +-
 Earthfile                                     |    4 +
 docs/.earthlyignore                           |    4 +
 docs/Earthfile                                |   56 +
 docs/deploy_netlify.sh                        |   48 -
 docs/deploy_preview.sh                        |   29 +
 docs/deploy_prod.sh                           |    4 +
 docs/package.json                             |    1 +
 docs/yarn.lock                                | 6455 ++++++++++++++++-
 yarn-project/Earthfile                        |    9 +
 .../scripts/src/benchmarks/markdown.ts        |    7 +-
 yarn-project/scripts/src/bin/bench-comment.ts |    3 +-
 .../scripts/src/bin/bench-markdown.ts         |    3 +-
 yarn-project/scripts/src/bin/docs-preview.ts  |    3 +-
 .../scripts/src/docs_previews/markdown.ts     |    3 +-
 yarn-project/scripts/src/utils/comment.ts     |   39 +-
 yarn-project/scripts/src/utils/pr-number.ts   |   22 +
 20 files changed, 6508 insertions(+), 247 deletions(-)
 create mode 100644 .github/workflows/publish-docs.yml
 create mode 100644 docs/.earthlyignore
 create mode 100644 docs/Earthfile
 delete mode 100755 docs/deploy_netlify.sh
 create mode 100755 docs/deploy_preview.sh
 create mode 100755 docs/deploy_prod.sh
 create mode 100644 yarn-project/scripts/src/utils/pr-number.ts

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ac54d75ec06b..7ac64d1ae95a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -513,24 +513,6 @@ jobs:
           aztec_manifest_key: end-to-end
     <<: *defaults_e2e_test
 
-  build-docs:
-    machine:
-      image: default
-    resource_class: large
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Build docs"
-          command: |
-            echo "Building docs"
-            build docs
-      - run:
-          name: "Deploy docs"
-          command: |
-            echo "Deploying docs"
-            docs/deploy_netlify.sh $BRANCH $PULL_REQUEST
-
   e2e-join:
     docker:
       - image: cimg/base:2023.09
@@ -741,7 +723,6 @@ workflows:
             - noir-projects
           <<: *defaults
       - end-to-end: *defaults_yarn_project
-      - build-docs: *defaults_yarn_project_pre_join
       - prover-client-test: *defaults_yarn_project
       - yarn-project-x86_64: *defaults_yarn_project_pre_join
       - yarn-project-arm64: *defaults_yarn_project_pre_join
@@ -787,7 +768,6 @@ workflows:
             - barretenberg-acir-tests-bb
             - barretenberg-acir-tests-bb-sol
             - barretenberg-docs
-            - build-docs
             - boxes-vanilla
             - boxes-react
             - noir-packages-tests
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 73dc79e18afd..1f2d4ab8783d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -153,6 +153,22 @@ jobs:
         timeout-minutes: 25
         run: earthly-ci --no-output ./yarn-project/+test
 
+  docs-preview:
+    needs: setup
+    runs-on: ${{ inputs.username || github.actor }}-x86
+    steps:
+      - {
+          uses: actions/checkout@v4,
+          with: { ref: "${{ github.event.pull_request.head.sha }}" },
+        }
+      - uses: ./.github/ci-setup-action
+        with:
+          dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
+          concurrency_key: docs-preview-${{ inputs.username || github.actor }}-x86
+      - name: "Docs Preview"
+        timeout-minutes: 25
+        run: earthly --no-output ./docs/+deploy-preview --PR=${{ github.event.number }} --AZTEC_BOT_COMMENTER_GITHUB_TOKEN=${{ secrets.AZTEC_BOT_GITHUB_TOKEN }} --NETLIFY_AUTH_TOKEN=${{ secrets.NETLIFY_AUTH_TOKEN }} --NETLIFY_SITE_ID=${{ secrets.NETLIFY_SITE_ID }}
+
   # push benchmarking binaries to dockerhub registry
   bb-bench-binaries:
     needs: setup
diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml
new file mode 100644
index 000000000000..2ad60d1bf638
--- /dev/null
+++ b/.github/workflows/publish-docs.yml
@@ -0,0 +1,18 @@
+name: Publish Docs
+on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: The tag to build from (leave empty to build a nightly release from master)
+        required: true
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.tag || env.GITHUB_REF }}
+
+      - timeout-minutes: 25
+        run: earthly --no-output ./docs/+deploy-prod --NETLIFY_AUTH_TOKEN=${{ secrets.NETLIFY_AUTH_TOKEN }} --NETLIFY_SITE_ID=${{ secrets.NETLIFY_SITE_ID }}
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
index ce4badd3ed4d..a294ba2f6539 100644
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -22,7 +22,7 @@ jobs:
           token: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
           command: manifest
 
-      - name: Dispatch to publish workflow
+      - name: Dispatch to publish BB workflow
         uses: benc-uk/workflow-dispatch@v1
         if: ${{ steps.release.outputs.tag_name }}
         with:
@@ -30,3 +30,12 @@ jobs:
           ref: master
           token: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
           inputs: '{ "tag": "${{ steps.release.outputs.tag_name }}", "publish": true }'
+
+      - name: Dispatch to publish docs workflow
+        uses: benc-uk/workflow-dispatch@v1
+        if: ${{ steps.release.outputs.tag_name }}
+        with:
+          workflow: publish-docs.yml
+          ref: master
+          token: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
+          inputs: '{ "tag": "${{ steps.release.outputs.tag_name }}" }'
diff --git a/Earthfile b/Earthfile
index 8ecbc266c065..65abde37745a 100644
--- a/Earthfile
+++ b/Earthfile
@@ -28,3 +28,7 @@ test-end-to-end:
 
 bench:
   RUN echo hi
+
+release-meta:
+    COPY .release-please-manifest.json /usr/src/.release-please-manifest.json
+    SAVE ARTIFACT /usr/src /usr/src
diff --git a/docs/.earthlyignore b/docs/.earthlyignore
new file mode 100644
index 000000000000..6e4c2cc83967
--- /dev/null
+++ b/docs/.earthlyignore
@@ -0,0 +1,4 @@
+.docusaurus
+node_modules
+processed-docs
+processed-docs-cache
diff --git a/docs/Earthfile b/docs/Earthfile
new file mode 100644
index 000000000000..b7a020426bd4
--- /dev/null
+++ b/docs/Earthfile
@@ -0,0 +1,56 @@
+VERSION 0.8
+
+FROM node:18.19.0
+WORKDIR /usr/src/docs
+
+deps:
+  RUN apt update && apt install -y jq curl perl && rm -rf /var/lib/apt/lists/* && apt-get clean
+  COPY ./yarn.lock ./yarn.lock
+  COPY ./package.json ./package.json
+  RUN yarn install --frozen-lockfile
+
+build:
+  BUILD ../yarn-project/+build-dev
+  BUILD ../+release-meta
+  FROM +deps
+
+  COPY --dir ../yarn-project/+build-dev/usr/src /usr
+  COPY ../+release-meta/usr/src/.release-please-manifest.json /usr/src
+
+  COPY . .
+
+  RUN ./scripts/build.sh
+  SAVE ARTIFACT build
+
+serve:
+  FROM +deps
+  COPY +build/build build
+  COPY ./static static
+  COPY ./src src
+  COPY ./docusaurus.config.js .
+  COPY ./sidebars.js .
+  ENTRYPOINT ["yarn", "serve"]
+  EXPOSE 3000
+  SAVE ARTIFACT /usr/src/docs
+  SAVE IMAGE aztecprotocol/docs-server
+
+deploy-preview:
+  BUILD ../yarn-project/+scripts-prod
+  ARG NETLIFY_AUTH_TOKEN
+  ARG NETLIFY_SITE_ID
+  ARG AZTEC_BOT_COMMENTER_GITHUB_TOKEN
+  ARG PR
+  FROM +serve
+  COPY --dir ../yarn-project/+scripts-prod/usr/src/yarn-project /usr/src
+  COPY ./netlify.toml .
+  COPY ./deploy_preview.sh .
+  RUN NETLIFY_AUTH_TOKEN=$NETLIFY_AUTH_TOKEN NETLIFY_SITE_ID=$NETLIFY_SITE_ID ./deploy_preview.sh $PR $AZTEC_BOT_COMMENTER_GITHUB_TOKEN
+
+deploy-prod:
+  BUILD ../yarn-project/+scripts-prod
+  ARG NETLIFY_AUTH_TOKEN
+  ARG NETLIFY_SITE_ID
+  FROM +serve
+  COPY ./netlify.toml .
+  COPY ./deploy_prod.sh .
+  RUN NETLIFY_AUTH_TOKEN=$NETLIFY_AUTH_TOKEN NETLIFY_SITE_ID=$NETLIFY_SITE_ID ./deploy_prod.sh
diff --git a/docs/deploy_netlify.sh b/docs/deploy_netlify.sh
deleted file mode 100755
index f443b1342c49..000000000000
--- a/docs/deploy_netlify.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env bash
-[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
-set -eu
-
-retry ecr_login
-extract_repo docs /usr/src extracted-repo
-cd extracted-repo/src/docs
-npm install netlify-cli -g
-
-DEPLOY_OUTPUT=""
-
-if should_release; then
-    # Deploy to production only on a release
-    if [ -z "$COMMIT_TAG" ]; then
-        echo "No commit tag, not deploying to npm."
-        exit 0
-    fi
-    DEPLOY_OUTPUT=$(netlify deploy --site aztec-docs-dev --prod)
-elif [ "$1" != "master" ]; then
-    # Deploy preview on PRs
-    # TODO we should prob see if check_rebuild can be used for this
-    PR_URL="$2"
-    API_URL="${PR_URL/github.com/api.github.com/repos}"
-    API_URL="${API_URL/pull/pulls}"
-    API_URL="${API_URL}/files"
-
-    echo "API URL: $API_URL"
-
-    DOCS_CHANGED=$(curl -L \
-        -H "Authorization: Bearer $AZTEC_BOT_COMMENTER_GITHUB_TOKEN" \
-        "${API_URL}" | \
-        jq '[.[] | select(.filename | startswith("docs/"))] | length > 0')
-
-    echo "Docs changed: $DOCS_CHANGED"
-
-    if [ "$DOCS_CHANGED" = "false" ]; then
-        echo "No docs changed, not deploying"
-        exit 0
-    fi
-
-    # Regular deploy if the argument is not "master" and docs changed
-    DEPLOY_OUTPUT=$(netlify deploy --site aztec-docs-dev)
-    UNIQUE_DEPLOY_URL=$(echo "$DEPLOY_OUTPUT" | grep -E "https://.*aztec-docs-dev.netlify.app" | awk '{print $4}')
-    echo "Unique deploy URL: $UNIQUE_DEPLOY_URL"
-
-    cd ../yarn-project/scripts
-    UNIQUE_DEPLOY_URL=$UNIQUE_DEPLOY_URL yarn docs-preview-comment
-fi
diff --git a/docs/deploy_preview.sh b/docs/deploy_preview.sh
new file mode 100755
index 000000000000..74091495fd0c
--- /dev/null
+++ b/docs/deploy_preview.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+set -eu
+
+PR_NUMBER=$1
+AZTEC_BOT_COMMENTER_GITHUB_TOKEN="$2"
+
+API_URL="https://api.github.com/repos/AztecProtocol/aztec-packages/pulls/${PR_NUMBER}/files"
+
+echo "API URL: $API_URL"
+
+DOCS_CHANGED=$(curl -L \
+    -H "Authorization: Bearer $AZTEC_BOT_COMMENTER_GITHUB_TOKEN" \
+    "${API_URL}" | \
+    jq '[.[] | select(.filename | startswith("docs/"))] | length > 0')
+
+echo "Docs changed: $DOCS_CHANGED"
+
+if [ "$DOCS_CHANGED" = "false" ]; then
+    echo "No docs changed, not deploying"
+    exit 0
+fi
+
+# Regular deploy if the argument is not "master" and docs changed
+DEPLOY_OUTPUT=$(yarn netlify deploy --site aztec-docs-dev)
+DOCS_PREVIEW_URL=$(echo "$DEPLOY_OUTPUT" | grep -E "https://.*aztec-docs-dev.netlify.app" | awk '{print $4}')
+echo "Unique deploy URL: $DOCS_PREVIEW_URL"
+
+cd ../yarn-project/scripts
+AZTEC_BOT_COMMENTER_GITHUB_TOKEN=$AZTEC_BOT_COMMENTER_GITHUB_TOKEN PR_NUMBER=$PR_NUMBER DOCS_PREVIEW_URL=$DOCS_PREVIEW_URL yarn docs-preview-comment 
diff --git a/docs/deploy_prod.sh b/docs/deploy_prod.sh
new file mode 100755
index 000000000000..7f161e5635ec
--- /dev/null
+++ b/docs/deploy_prod.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -eu
+
+netlify deploy --site aztec-docs-dev --prod
diff --git a/docs/package.json b/docs/package.json
index 10f82ae2712c..a6cd883a4e2c 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -42,6 +42,7 @@
     "concurrently": "^8.0.1",
     "docusaurus-plugin-typedoc": "^0.20.2",
     "dotenv": "^16.3.1",
+    "netlify-cli": "^17.23.0",
     "nodemon": "^3.0.1",
     "typedoc": "^0.25.1",
     "typedoc-plugin-markdown": "^3.16.0",
diff --git a/docs/yarn.lock b/docs/yarn.lock
index 33eee5c977f9..c458f26d9692 100644
--- a/docs/yarn.lock
+++ b/docs/yarn.lock
@@ -431,6 +431,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.6.tgz#ba1c9e512bda72a47e285ae42aff9d2a635a9e3b"
   integrity sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==
 
+"@babel/parser@^7.21.8", "@babel/parser@^7.22.5":
+  version "7.24.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.4.tgz#234487a110d89ad5a3ed4a8a566c36b9453e8c88"
+  integrity sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.23.3":
   version "7.23.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz#5cd1c87ba9380d0afb78469292c954fee5d2411a"
@@ -1230,7 +1235,7 @@
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.12.7", "@babel/types@^7.20.0", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.4", "@babel/types@^7.23.6", "@babel/types@^7.4.4":
+"@babel/types@7.23.6", "@babel/types@^7.12.7", "@babel/types@^7.20.0", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.4", "@babel/types@^7.23.6", "@babel/types@^7.4.4":
   version "7.23.6"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.6.tgz#be33fdb151e1f5a56877d704492c240fc71c7ccd"
   integrity sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==
@@ -1244,11 +1249,88 @@
   resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-6.0.4.tgz#923ca57e173c6b232bbbb07347b1be982f03e783"
   integrity sha512-s3jaWicZd0pkP0jf5ysyHUI/RE7MHos6qlToFcGWXVp+ykHOy77OUMrfbgJ9it2C5bow7OIQwYYaHjk9XlBQ2A==
 
+"@bugsnag/browser@^7.22.7":
+  version "7.22.7"
+  resolved "https://registry.yarnpkg.com/@bugsnag/browser/-/browser-7.22.7.tgz#ba1f9f3596b9d3cf1b4db11250f8be2f178a78c1"
+  integrity sha512-70jFkWKscK2osm7bnFbPLevrzHClrygM3UcKetKs/l81Xuzlxnu1SS3onN5OUl9kd9RN4XMFr46Pv5jSqWqImQ==
+  dependencies:
+    "@bugsnag/core" "^7.22.7"
+
+"@bugsnag/core@^7.22.7":
+  version "7.22.7"
+  resolved "https://registry.yarnpkg.com/@bugsnag/core/-/core-7.22.7.tgz#ea5e0822b01913c88be4dbc67d388aff8d65f26a"
+  integrity sha512-9DPWBkkBjhFJc5dCFy/wVC3HE0Aw3ZiLJKjyAxgywSKbILgtpD+qT1Xe8sacWyxU92znamlZ8H8ziQOe7jhhbA==
+  dependencies:
+    "@bugsnag/cuid" "^3.0.0"
+    "@bugsnag/safe-json-stringify" "^6.0.0"
+    error-stack-parser "^2.0.3"
+    iserror "0.0.2"
+    stack-generator "^2.0.3"
+
+"@bugsnag/cuid@^3.0.0":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@bugsnag/cuid/-/cuid-3.1.1.tgz#dbd5d76559f6b7a66306fceacf503888883da514"
+  integrity sha512-d2z4b0rEo3chI07FNN1Xds8v25CNeekecU6FC/2Fs9MxY2EipkZTThVcV2YinMn8dvRUlViKOyC50evoUxg8tw==
+
+"@bugsnag/js@7.22.7", "@bugsnag/js@^7.0.0", "@bugsnag/js@^7.20.0":
+  version "7.22.7"
+  resolved "https://registry.yarnpkg.com/@bugsnag/js/-/js-7.22.7.tgz#d631584ae37803b275798544232cef4f7e5afbfc"
+  integrity sha512-Qq8l06rSDTZtxgNIDpTeXHrin9C30INNbPfnR2CNcEsCmfqyVQb4USPEuRb0xg5wiaLKU9r4IAatMqiCgdzG6A==
+  dependencies:
+    "@bugsnag/browser" "^7.22.7"
+    "@bugsnag/node" "^7.22.7"
+
+"@bugsnag/node@^7.22.7":
+  version "7.22.7"
+  resolved "https://registry.yarnpkg.com/@bugsnag/node/-/node-7.22.7.tgz#85231637527eb0be9baeed4ed88ed226da7ca577"
+  integrity sha512-Ud8vpX9UkGxoWAk7OigyR7w1eycbsE5uv5KZx0aWiqDPXylvICd42V5ZiWstpkdm9IVFo9AQ4+gmerHPe4Lwrg==
+  dependencies:
+    "@bugsnag/core" "^7.22.7"
+    byline "^5.0.0"
+    error-stack-parser "^2.0.2"
+    iserror "^0.0.2"
+    pump "^3.0.0"
+    stack-generator "^2.0.3"
+
+"@bugsnag/safe-json-stringify@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@bugsnag/safe-json-stringify/-/safe-json-stringify-6.0.0.tgz#22abdcd83e008c369902976730c34c150148a758"
+  integrity sha512-htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA==
+
 "@colors/colors@1.5.0":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
   integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
 
+"@colors/colors@1.6.0", "@colors/colors@^1.6.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.6.0.tgz#ec6cd237440700bc23ca23087f513c75508958b0"
+  integrity sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==
+
+"@cspotcode/source-map-support@^0.8.0":
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
+  integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
+  dependencies:
+    "@jridgewell/trace-mapping" "0.3.9"
+
+"@dabh/diagnostics@^2.0.2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.3.tgz#7f7e97ee9a725dffc7808d93668cc984e1dc477a"
+  integrity sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==
+  dependencies:
+    colorspace "1.1.x"
+    enabled "2.0.x"
+    kuler "^2.0.0"
+
+"@dependents/detective-less@^4.1.0":
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/@dependents/detective-less/-/detective-less-4.1.0.tgz#4a979ee7a6a79eb33602862d6a1263e30f98002e"
+  integrity sha512-KrkT6qO5NxqNfy68sBl6CTSoJ4SNDIS5iQArkibhlbGU4LaDukZ3q2HIkh8aUKDio6o4itU4xDR7t82Y2eP1Bg==
+  dependencies:
+    gonzales-pe "^4.3.0"
+    node-source-walk "^6.0.1"
+
 "@discoveryjs/json-ext@0.5.7":
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
@@ -1563,7 +1645,7 @@
     "@docusaurus/theme-search-algolia" "2.4.3"
     "@docusaurus/types" "2.4.3"
 
-"@docusaurus/react-loadable@5.5.2", "react-loadable@npm:@docusaurus/react-loadable@5.5.2":
+"@docusaurus/react-loadable@5.5.2":
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/@docusaurus/react-loadable/-/react-loadable-5.5.2.tgz#81aae0db81ecafbdaee3651f12804580868fa6ce"
   integrity sha512-A3dYjdBGuy0IGT+wyLIGIKLRE+sAk1iNk0f1HjNDysO7u8lhL4N3VEm+FAubmJbAztn94F7MxBTPmnixbiyFdQ==
@@ -1734,6 +1816,292 @@
   resolved "https://registry.yarnpkg.com/@endiliey/react-ideal-image/-/react-ideal-image-0.0.11.tgz#dc3803d04e1409cf88efa4bba0f67667807bdf27"
   integrity sha512-QxMjt/Gvur/gLxSoCy7VIyGGGrGmDN+VHcXkN3R2ApoWX0EYUE+hMgPHSW/PV6VVebZ1Nd4t2UnGRBDihu16JQ==
 
+"@esbuild/aix-ppc64@0.19.11":
+  version "0.19.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.19.11.tgz#2acd20be6d4f0458bc8c784103495ff24f13b1d3"
+  integrity sha512-FnzU0LyE3ySQk7UntJO4+qIiQgI7KoODnZg5xzXIrFJlKd2P2gwHsHY4927xj9y5PJmJSzULiUCWmv7iWnNa7g==
+
+"@esbuild/aix-ppc64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz#a70f4ac11c6a1dfc18b8bbb13284155d933b9537"
+  integrity sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==
+
+"@esbuild/android-arm64@0.19.11":
+  version "0.19.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.19.11.tgz#b45d000017385c9051a4f03e17078abb935be220"
+  integrity sha512-aiu7K/5JnLj//KOnOfEZ0D90obUkRzDMyqd/wNAUQ34m4YUPVhRZpnqKV9uqDGxT7cToSDnIHsGooyIczu9T+Q==
+
+"@esbuild/android-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz#db1c9202a5bc92ea04c7b6840f1bbe09ebf9e6b9"
+  integrity sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==
+
+"@esbuild/android-arm@0.19.11":
+  version "0.19.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.19.11.tgz#f46f55414e1c3614ac682b29977792131238164c"
+  integrity sha512-5OVapq0ClabvKvQ58Bws8+wkLCV+Rxg7tUVbo9xu034Nm536QTII4YzhaFriQ7rMrorfnFKUsArD2lqKbFY4vw==
+
+"@esbuild/android-arm@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.20.2.tgz#3b488c49aee9d491c2c8f98a909b785870d6e995"
+  integrity sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==
+
+"@esbuild/android-x64@0.19.11":
+  version "0.19.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.19.11.tgz#bfc01e91740b82011ef503c48f548950824922b2"
+  integrity sha512-eccxjlfGw43WYoY9QgB82SgGgDbibcqyDTlk3l3C0jOVHKxrjdc9CTwDUQd0vkvYg5um0OH+GpxYvp39r+IPOg==
+
+"@esbuild/android-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.20.2.tgz#3b1628029e5576249d2b2d766696e50768449f98"
+  integrity sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==
+
+"@esbuild/darwin-arm64@0.19.11":
+  version "0.19.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.11.tgz#533fb7f5a08c37121d82c66198263dcc1bed29bf"
+  integrity sha512-ETp87DRWuSt9KdDVkqSoKoLFHYTrkyz2+65fj9nfXsaV3bMhTCjtQfw3y+um88vGRKRiF7erPrh/ZuIdLUIVxQ==
+
+"@esbuild/darwin-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz#6e8517a045ddd86ae30c6608c8475ebc0c4000bb"
+  integrity sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==
+
+"@esbuild/darwin-x64@0.19.11":
+  version "0.19.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.11.tgz#62f3819eff7e4ddc656b7c6815a31cf9a1e7d98e"
+  integrity sha512-fkFUiS6IUK9WYUO/+22omwetaSNl5/A8giXvQlcinLIjVkxwTLSktbF5f/kJMftM2MJp9+fXqZ5ezS7+SALp4g==
+
+"@esbuild/darwin-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz#90ed098e1f9dd8a9381695b207e1cff45540a0d0"
+  integrity sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==
+
+"@esbuild/freebsd-arm64@0.19.11":
+  version "0.19.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.11.tgz#d478b4195aa3ca44160272dab85ef8baf4175b4a"
+  integrity sha512-lhoSp5K6bxKRNdXUtHoNc5HhbXVCS8V0iZmDvyWvYq9S5WSfTIHU2UGjcGt7UeS6iEYp9eeymIl5mJBn0yiuxA==
+
+"@esbuild/freebsd-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz#d71502d1ee89a1130327e890364666c760a2a911"
+  integrity sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==
+
+"@esbuild/freebsd-x64@0.19.11":
+  version "0.19.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.11.tgz#7bdcc1917409178257ca6a1a27fe06e797ec18a2"
+  integrity sha512-JkUqn44AffGXitVI6/AbQdoYAq0TEullFdqcMY/PCUZ36xJ9ZJRtQabzMA+Vi7r78+25ZIBosLTOKnUXBSi1Kw==
+
+"@esbuild/freebsd-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz#aa5ea58d9c1dd9af688b8b6f63ef0d3d60cea53c"
+  integrity sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==
+
+"@esbuild/linux-arm64@0.19.11":
+  version "0.19.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.19.11.tgz#58ad4ff11685fcc735d7ff4ca759ab18fcfe4545"
+  integrity sha512-LneLg3ypEeveBSMuoa0kwMpCGmpu8XQUh+mL8XXwoYZ6Be2qBnVtcDI5azSvh7vioMDhoJFZzp9GWp9IWpYoUg==
+
+"@esbuild/linux-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz#055b63725df678379b0f6db9d0fa85463755b2e5"
+  integrity sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==
+
+"@esbuild/linux-arm@0.19.11":
+  version "0.19.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.19.11.tgz#ce82246d873b5534d34de1e5c1b33026f35e60e3"
+  integrity sha512-3CRkr9+vCV2XJbjwgzjPtO8T0SZUmRZla+UL1jw+XqHZPkPgZiyWvbDvl9rqAN8Zl7qJF0O/9ycMtjU67HN9/Q==
+
+"@esbuild/linux-arm@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz#76b3b98cb1f87936fbc37f073efabad49dcd889c"
+  integrity sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==
+
+"@esbuild/linux-ia32@0.19.11":
+  version "0.19.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.19.11.tgz#cbae1f313209affc74b80f4390c4c35c6ab83fa4"
+  integrity sha512-caHy++CsD8Bgq2V5CodbJjFPEiDPq8JJmBdeyZ8GWVQMjRD0sU548nNdwPNvKjVpamYYVL40AORekgfIubwHoA==
+
+"@esbuild/linux-ia32@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz#c0e5e787c285264e5dfc7a79f04b8b4eefdad7fa"
+  integrity sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==
+
+"@esbuild/linux-loong64@0.19.11":
+  version "0.19.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.19.11.tgz#5f32aead1c3ec8f4cccdb7ed08b166224d4e9121"
+  integrity sha512-ppZSSLVpPrwHccvC6nQVZaSHlFsvCQyjnvirnVjbKSHuE5N24Yl8F3UwYUUR1UEPaFObGD2tSvVKbvR+uT1Nrg==
+
+"@esbuild/linux-loong64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz#a6184e62bd7cdc63e0c0448b83801001653219c5"
+  integrity sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==
+
+"@esbuild/linux-mips64el@0.19.11":
+  version "0.19.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.11.tgz#38eecf1cbb8c36a616261de858b3c10d03419af9"
+  integrity sha512-B5x9j0OgjG+v1dF2DkH34lr+7Gmv0kzX6/V0afF41FkPMMqaQ77pH7CrhWeR22aEeHKaeZVtZ6yFwlxOKPVFyg==
+
+"@esbuild/linux-mips64el@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz#d08e39ce86f45ef8fc88549d29c62b8acf5649aa"
+  integrity sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==
+
+"@esbuild/linux-ppc64@0.19.11":
+  version "0.19.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.11.tgz#9c5725a94e6ec15b93195e5a6afb821628afd912"
+  integrity sha512-MHrZYLeCG8vXblMetWyttkdVRjQlQUb/oMgBNurVEnhj4YWOr4G5lmBfZjHYQHHN0g6yDmCAQRR8MUHldvvRDA==
+
+"@esbuild/linux-ppc64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz#8d252f0b7756ffd6d1cbde5ea67ff8fd20437f20"
+  integrity sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==
+
+"@esbuild/linux-riscv64@0.19.11":
+  version "0.19.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.11.tgz#2dc4486d474a2a62bbe5870522a9a600e2acb916"
+  integrity sha512-f3DY++t94uVg141dozDu4CCUkYW+09rWtaWfnb3bqe4w5NqmZd6nPVBm+qbz7WaHZCoqXqHz5p6CM6qv3qnSSQ==
+
+"@esbuild/linux-riscv64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz#19f6dcdb14409dae607f66ca1181dd4e9db81300"
+  integrity sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==
+
+"@esbuild/linux-s390x@0.19.11":
+  version "0.19.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.19.11.tgz#4ad8567df48f7dd4c71ec5b1753b6f37561a65a8"
+  integrity sha512-A5xdUoyWJHMMlcSMcPGVLzYzpcY8QP1RtYzX5/bS4dvjBGVxdhuiYyFwp7z74ocV7WDc0n1harxmpq2ePOjI0Q==
+
+"@esbuild/linux-s390x@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz#3c830c90f1a5d7dd1473d5595ea4ebb920988685"
+  integrity sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==
+
+"@esbuild/linux-x64@0.19.11":
+  version "0.19.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.19.11.tgz#b7390c4d5184f203ebe7ddaedf073df82a658766"
+  integrity sha512-grbyMlVCvJSfxFQUndw5mCtWs5LO1gUlwP4CDi4iJBbVpZcqLVT29FxgGuBJGSzyOxotFG4LoO5X+M1350zmPA==
+
+"@esbuild/linux-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz#86eca35203afc0d9de0694c64ec0ab0a378f6fff"
+  integrity sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==
+
+"@esbuild/netbsd-x64@0.19.11":
+  version "0.19.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.11.tgz#d633c09492a1721377f3bccedb2d821b911e813d"
+  integrity sha512-13jvrQZJc3P230OhU8xgwUnDeuC/9egsjTkXN49b3GcS5BKvJqZn86aGM8W9pd14Kd+u7HuFBMVtrNGhh6fHEQ==
+
+"@esbuild/netbsd-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz#e771c8eb0e0f6e1877ffd4220036b98aed5915e6"
+  integrity sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==
+
+"@esbuild/openbsd-x64@0.19.11":
+  version "0.19.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.11.tgz#17388c76e2f01125bf831a68c03a7ffccb65d1a2"
+  integrity sha512-ysyOGZuTp6SNKPE11INDUeFVVQFrhcNDVUgSQVDzqsqX38DjhPEPATpid04LCoUr2WXhQTEZ8ct/EgJCUDpyNw==
+
+"@esbuild/openbsd-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz#9a795ae4b4e37e674f0f4d716f3e226dd7c39baf"
+  integrity sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==
+
+"@esbuild/sunos-x64@0.19.11":
+  version "0.19.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.19.11.tgz#e320636f00bb9f4fdf3a80e548cb743370d41767"
+  integrity sha512-Hf+Sad9nVwvtxy4DXCZQqLpgmRTQqyFyhT3bZ4F2XlJCjxGmRFF0Shwn9rzhOYRB61w9VMXUkxlBy56dk9JJiQ==
+
+"@esbuild/sunos-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz#7df23b61a497b8ac189def6e25a95673caedb03f"
+  integrity sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==
+
+"@esbuild/win32-arm64@0.19.11":
+  version "0.19.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.19.11.tgz#c778b45a496e90b6fc373e2a2bb072f1441fe0ee"
+  integrity sha512-0P58Sbi0LctOMOQbpEOvOL44Ne0sqbS0XWHMvvrg6NE5jQ1xguCSSw9jQeUk2lfrXYsKDdOe6K+oZiwKPilYPQ==
+
+"@esbuild/win32-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz#f1ae5abf9ca052ae11c1bc806fb4c0f519bacf90"
+  integrity sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==
+
+"@esbuild/win32-ia32@0.19.11":
+  version "0.19.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.19.11.tgz#481a65fee2e5cce74ec44823e6b09ecedcc5194c"
+  integrity sha512-6YOrWS+sDJDmshdBIQU+Uoyh7pQKrdykdefC1avn76ss5c+RN6gut3LZA4E2cH5xUEp5/cA0+YxRaVtRAb0xBg==
+
+"@esbuild/win32-ia32@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz#241fe62c34d8e8461cd708277813e1d0ba55ce23"
+  integrity sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==
+
+"@esbuild/win32-x64@0.19.11":
+  version "0.19.11"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.11.tgz#a5d300008960bb39677c46bf16f53ec70d8dee04"
+  integrity sha512-vfkhltrjCAb603XaFhqhAF4LGDi2M4OrCRrFusyQ+iTLQ/o60QQXxc9cZC/FFpihBI9N1Grn6SMKVJ4KP7Fuiw==
+
+"@esbuild/win32-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz#9c907b21e30a52db959ba4f80bb01a0cc403d5cc"
+  integrity sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==
+
+"@fastify/accept-negotiator@^1.0.0", "@fastify/accept-negotiator@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@fastify/accept-negotiator/-/accept-negotiator-1.1.0.tgz#c1c66b3b771c09742a54dd5bc87c582f6b0630ff"
+  integrity sha512-OIHZrb2ImZ7XG85HXOONLcJWGosv7sIvM2ifAPQVhg9Lv7qdmMBNVaai4QTdyuaqbKM5eO6sLSQOYI7wEQeCJQ==
+
+"@fastify/ajv-compiler@^3.5.0":
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/@fastify/ajv-compiler/-/ajv-compiler-3.5.0.tgz#459bff00fefbf86c96ec30e62e933d2379e46670"
+  integrity sha512-ebbEtlI7dxXF5ziNdr05mOY8NnDiPB1XvAlLHctRt/Rc+C3LCOVW5imUVX+mhvUhnNzmPBHewUkOFgGlCxgdAA==
+  dependencies:
+    ajv "^8.11.0"
+    ajv-formats "^2.1.1"
+    fast-uri "^2.0.0"
+
+"@fastify/error@^3.0.0", "@fastify/error@^3.3.0":
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/@fastify/error/-/error-3.4.1.tgz#b14bb4cac3dd4ec614becbc643d1511331a6425c"
+  integrity sha512-wWSvph+29GR783IhmvdwWnN4bUxTD01Vm5Xad4i7i1VuAOItLvbPAb69sb0IQ2N57yprvhNIwAP5B6xfKTmjmQ==
+
+"@fastify/fast-json-stringify-compiler@^4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@fastify/fast-json-stringify-compiler/-/fast-json-stringify-compiler-4.3.0.tgz#5df89fa4d1592cbb8780f78998355feb471646d5"
+  integrity sha512-aZAXGYo6m22Fk1zZzEUKBvut/CIIQe/BapEORnxiD5Qr0kPHqqI69NtEMCme74h+at72sPhbkb4ZrLd1W3KRLA==
+  dependencies:
+    fast-json-stringify "^5.7.0"
+
+"@fastify/merge-json-schemas@^0.1.0":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@fastify/merge-json-schemas/-/merge-json-schemas-0.1.1.tgz#3551857b8a17a24e8c799e9f51795edb07baa0bc"
+  integrity sha512-fERDVz7topgNjtXsJTTW1JKLy0rhuLRcquYqNR9rF7OcVpCa2OVW49ZPDIhaRRCaUuvVxI+N416xUoF76HNSXA==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+
+"@fastify/send@^2.0.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@fastify/send/-/send-2.1.0.tgz#1aa269ccb4b0940a2dadd1f844443b15d8224ea0"
+  integrity sha512-yNYiY6sDkexoJR0D8IDy3aRP3+L4wdqCpvx5WP+VtEU58sn7USmKynBzDQex5X42Zzvw2gNzzYgP90UfWShLFA==
+  dependencies:
+    "@lukeed/ms" "^2.0.1"
+    escape-html "~1.0.3"
+    fast-decode-uri-component "^1.0.1"
+    http-errors "2.0.0"
+    mime "^3.0.0"
+
+"@fastify/static@6.12.0":
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/@fastify/static/-/static-6.12.0.tgz#f3d55dda201c072bae0593e5d45dde8fd235c288"
+  integrity sha512-KK1B84E6QD/FcQWxDI2aiUCwHxMJBI1KeCUzm1BwYpPY1b742+jeKruGHP2uOluuM6OkBPI8CIANrXcCRtC2oQ==
+  dependencies:
+    "@fastify/accept-negotiator" "^1.0.0"
+    "@fastify/send" "^2.0.0"
+    content-disposition "^0.5.3"
+    fastify-plugin "^4.0.0"
+    glob "^8.0.1"
+    p-limit "^3.1.0"
+
 "@hapi/hoek@^9.0.0", "@hapi/hoek@^9.3.0":
   version "9.3.0"
   resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb"
@@ -1746,6 +2114,21 @@
   dependencies:
     "@hapi/hoek" "^9.0.0"
 
+"@humanwhocodes/momoa@^2.0.2":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/momoa/-/momoa-2.0.4.tgz#8b9e7a629651d15009c3587d07a222deeb829385"
+  integrity sha512-RE815I4arJFtt+FVeU1Tgp9/Xvecacji8w/V6XtXsWWH/wz/eNkNbhb+ny/+PlVZjV0rxQpRSQKNKE3lcktHEA==
+
+"@iarna/toml@^2.2.5":
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/@iarna/toml/-/toml-2.2.5.tgz#b32366c89b43c6f8cefbdefac778b9c828e3ba8c"
+  integrity sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==
+
+"@import-maps/resolve@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@import-maps/resolve/-/resolve-1.0.1.tgz#1e9fcadcf23aa0822256a329aabca241879d37c9"
+  integrity sha512-tWZNBIS1CoekcwlMuyG2mr0a1Wo5lb5lEHwwWvZo+5GLgr3e9LLDTtmgtCWEwBpXMkxn9D+2W9j2FY6eZQq0tA==
+
 "@jest/schemas@^29.6.3":
   version "29.6.3"
   resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03"
@@ -1753,6 +2136,17 @@
   dependencies:
     "@sinclair/typebox" "^0.27.8"
 
+"@jest/types@^27.5.1":
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.5.1.tgz#3c79ec4a8ba61c170bf937bcf9e98a9df175ec80"
+  integrity sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
+    "@types/yargs" "^16.0.0"
+    chalk "^4.0.0"
+
 "@jest/types@^29.6.3":
   version "29.6.3"
   resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.6.3.tgz#1131f8cf634e7e84c5e77bab12f052af585fba59"
@@ -1774,6 +2168,11 @@
     "@jridgewell/sourcemap-codec" "^1.4.10"
     "@jridgewell/trace-mapping" "^0.3.9"
 
+"@jridgewell/resolve-uri@^3.0.3":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
+  integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
+
 "@jridgewell/resolve-uri@^3.1.0":
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721"
@@ -1797,6 +2196,14 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
   integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
 
+"@jridgewell/trace-mapping@0.3.9":
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
+  integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.0.3"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
 "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.9":
   version "0.3.21"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.21.tgz#5dc1df7b3dc4a6209e503a924e1ca56097a2bb15"
@@ -1810,6 +2217,26 @@
   resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b"
   integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==
 
+"@lukeed/ms@^2.0.1":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@lukeed/ms/-/ms-2.0.2.tgz#07f09e59a74c52f4d88c6db5c1054e819538e2a8"
+  integrity sha512-9I2Zn6+NJLfaGoz9jN3lpwDgAYvfGeNYdbAIjJOqzs4Tpc+VU3Jqq4IofSUBKajiDS8k9fZIg18/z13mpk1bsA==
+
+"@mapbox/node-pre-gyp@^1.0.5":
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz#417db42b7f5323d79e93b34a6d7a2a12c0df43fa"
+  integrity sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==
+  dependencies:
+    detect-libc "^2.0.0"
+    https-proxy-agent "^5.0.0"
+    make-dir "^3.1.0"
+    node-fetch "^2.6.7"
+    nopt "^5.0.0"
+    npmlog "^5.0.1"
+    rimraf "^3.0.2"
+    semver "^7.3.5"
+    tar "^6.1.11"
+
 "@mdx-js/mdx@^1.6.22":
   version "1.6.22"
   resolved "https://registry.yarnpkg.com/@mdx-js/mdx/-/mdx-1.6.22.tgz#8a723157bf90e78f17dc0f27995398e6c731f1ba"
@@ -1845,6 +2272,448 @@
   resolved "https://registry.yarnpkg.com/@mdx-js/util/-/util-1.6.22.tgz#219dfd89ae5b97a8801f015323ffa4b62f45718b"
   integrity sha512-H1rQc1ZOHANWBvPcW+JpGwr+juXSxM8Q8YCkm3GhZd8REu1fHR3z99CErO1p9pkcfcxZnMdIZdIsXkOHY0NilA==
 
+"@mswjs/interceptors@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@mswjs/interceptors/-/interceptors-0.27.2.tgz#220df9a48fdfdc61b7e0519ad51ab07967941324"
+  integrity sha512-mE6PhwcoW70EX8+h+Y/4dLfHk33GFt/y5PzDJz56ktMyaVGFXMJ5BYLbUjdmGEABfE0x5GgAGyKbrbkYww2s3A==
+  dependencies:
+    "@open-draft/deferred-promise" "^2.2.0"
+    "@open-draft/logger" "^0.3.0"
+    "@open-draft/until" "^2.0.0"
+    is-node-process "^1.2.0"
+    outvariant "^1.2.1"
+    strict-event-emitter "^0.5.1"
+
+"@netlify/binary-info@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@netlify/binary-info/-/binary-info-1.0.0.tgz#cd0d86fb783fb03e52067f0cd284865e57be86c8"
+  integrity sha512-4wMPu9iN3/HL97QblBsBay3E1etIciR84izI3U+4iALY+JHCrI+a2jO0qbAZ/nxKoegypYEaiiqWXylm+/zfrw==
+
+"@netlify/blobs@7.3.0", "@netlify/blobs@^7.3.0":
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/@netlify/blobs/-/blobs-7.3.0.tgz#3331cfe79781c679f73bb2ee67619c4b2d1e5bb3"
+  integrity sha512-wN/kNTZo4xjlUM/C0WILOkJbe8p4AFquSGkZEIoIcgnsx5ikp2GyqGiq1WMLee7QdbnqeIV2g2hn/PjT324E5w==
+
+"@netlify/build-info@7.13.2":
+  version "7.13.2"
+  resolved "https://registry.yarnpkg.com/@netlify/build-info/-/build-info-7.13.2.tgz#8700e782c038640193b0d5ae67c20d3d38d14a62"
+  integrity sha512-smzhIgcms6Z/v2cct90l8ncBbnA5kvknj5/quhwyM6UHUycgMKFlA22qkB0KLj9shwL1Lkh7iQW751JwhSaP9g==
+  dependencies:
+    "@bugsnag/js" "^7.20.0"
+    "@iarna/toml" "^2.2.5"
+    dot-prop "^7.2.0"
+    find-up "^6.3.0"
+    minimatch "^9.0.0"
+    read-pkg "^7.1.0"
+    semver "^7.3.8"
+    yaml "^2.1.3"
+    yargs "^17.6.0"
+
+"@netlify/build@29.41.0":
+  version "29.41.0"
+  resolved "https://registry.yarnpkg.com/@netlify/build/-/build-29.41.0.tgz#8cc0736c6930dabb51a75bf937b6da959859d301"
+  integrity sha512-BOgi9r/94raJtiRy0jyrPGWpgVH/I1SpcY+M+rCa30d0vNW3lOkMHrhYaAo2x6f/UEdhHp/u9r6lOSR2aWrSBw==
+  dependencies:
+    "@bugsnag/js" "^7.0.0"
+    "@netlify/blobs" "^7.3.0"
+    "@netlify/cache-utils" "^5.1.5"
+    "@netlify/config" "^20.12.2"
+    "@netlify/edge-bundler" "12.0.0"
+    "@netlify/framework-info" "^9.8.11"
+    "@netlify/functions-utils" "^5.2.54"
+    "@netlify/git-utils" "^5.1.1"
+    "@netlify/opentelemetry-utils" "^1.2.0"
+    "@netlify/plugins-list" "^6.77.0"
+    "@netlify/run-utils" "^5.1.1"
+    "@netlify/zip-it-and-ship-it" "9.31.3"
+    "@sindresorhus/slugify" "^2.0.0"
+    ansi-escapes "^6.0.0"
+    chalk "^5.0.0"
+    clean-stack "^4.0.0"
+    execa "^6.0.0"
+    fdir "^6.0.1"
+    figures "^5.0.0"
+    filter-obj "^5.0.0"
+    got "^12.0.0"
+    hot-shots "10.0.0"
+    indent-string "^5.0.0"
+    is-plain-obj "^4.0.0"
+    js-yaml "^4.0.0"
+    keep-func-props "^4.0.0"
+    locate-path "^7.0.0"
+    log-process-errors "^8.0.0"
+    map-obj "^5.0.0"
+    memoize-one "^6.0.0"
+    minimatch "^9.0.4"
+    node-fetch "^3.3.2"
+    os-name "^5.0.0"
+    p-event "^5.0.0"
+    p-every "^2.0.0"
+    p-filter "^3.0.0"
+    p-locate "^6.0.0"
+    p-map "^6.0.0"
+    p-reduce "^3.0.0"
+    path-exists "^5.0.0"
+    path-type "^5.0.0"
+    pkg-dir "^7.0.0"
+    pretty-ms "^8.0.0"
+    ps-list "^8.0.0"
+    read-pkg-up "^9.0.0"
+    readdirp "^3.4.0"
+    resolve "^2.0.0-next.1"
+    rfdc "^1.3.0"
+    safe-json-stringify "^1.2.0"
+    semver "^7.3.8"
+    string-width "^5.0.0"
+    strip-ansi "^7.0.0"
+    supports-color "^9.0.0"
+    terminal-link "^3.0.0"
+    ts-node "^10.9.1"
+    typescript "^5.0.0"
+    uuid "^9.0.0"
+    yargs "^17.6.0"
+
+"@netlify/cache-utils@^5.1.5":
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/@netlify/cache-utils/-/cache-utils-5.1.5.tgz#848c59003e576fa0b2f9c6ca270eff27af938b25"
+  integrity sha512-lMNdFmy2Yu3oVquSPooRDLxJ8QOsIX6X6vzA2pKz/9V2LQFJiqBukggXM+Rnqzk1regPpdJ0jK3dPGvOKaRQgg==
+  dependencies:
+    cpy "^9.0.0"
+    get-stream "^6.0.0"
+    globby "^13.0.0"
+    junk "^4.0.0"
+    locate-path "^7.0.0"
+    move-file "^3.0.0"
+    path-exists "^5.0.0"
+    readdirp "^3.4.0"
+
+"@netlify/config@20.12.2":
+  version "20.12.2"
+  resolved "https://registry.yarnpkg.com/@netlify/config/-/config-20.12.2.tgz#26a17eb3444dc77e0926365246127a8a3ccaa53e"
+  integrity sha512-1o33RyGR3RGFh3ed1mQ1qvRahtm7EJINaWEeO2attcbtElezaTkrlOgEIwsgdxWNlwbHvFqspcsajWFnZNUF0w==
+  dependencies:
+    "@iarna/toml" "^2.2.5"
+    chalk "^5.0.0"
+    cron-parser "^4.1.0"
+    deepmerge "^4.2.2"
+    dot-prop "^7.0.0"
+    execa "^6.0.0"
+    fast-safe-stringify "^2.0.7"
+    figures "^5.0.0"
+    filter-obj "^5.0.0"
+    find-up "^6.0.0"
+    indent-string "^5.0.0"
+    is-plain-obj "^4.0.0"
+    js-yaml "^4.0.0"
+    map-obj "^5.0.0"
+    netlify "^13.1.14"
+    netlify-headers-parser "^7.1.4"
+    netlify-redirect-parser "^14.2.2"
+    node-fetch "^3.3.1"
+    omit.js "^2.0.2"
+    p-locate "^6.0.0"
+    path-type "^5.0.0"
+    tomlify-j0.4 "^3.0.0"
+    validate-npm-package-name "^4.0.0"
+    yargs "^17.6.0"
+
+"@netlify/config@^20.12.2":
+  version "20.12.3"
+  resolved "https://registry.yarnpkg.com/@netlify/config/-/config-20.12.3.tgz#3cc2983f87a7f9d3a33aea11b0de30d6b263b0ab"
+  integrity sha512-E+oiGEm6zIvyFJ2kQC1IV5Ipiv7Ar84RuP2K+aVMSgu/raOn7ZfN9lM5TC43qboF3bDrJd6EuYDxVIAuxVkMCA==
+  dependencies:
+    "@iarna/toml" "^2.2.5"
+    chalk "^5.0.0"
+    cron-parser "^4.1.0"
+    deepmerge "^4.2.2"
+    dot-prop "^7.0.0"
+    execa "^6.0.0"
+    fast-safe-stringify "^2.0.7"
+    figures "^5.0.0"
+    filter-obj "^5.0.0"
+    find-up "^6.0.0"
+    indent-string "^5.0.0"
+    is-plain-obj "^4.0.0"
+    js-yaml "^4.0.0"
+    map-obj "^5.0.0"
+    netlify "^13.1.15"
+    netlify-headers-parser "^7.1.4"
+    netlify-redirect-parser "^14.2.2"
+    node-fetch "^3.3.1"
+    omit.js "^2.0.2"
+    p-locate "^6.0.0"
+    path-type "^5.0.0"
+    tomlify-j0.4 "^3.0.0"
+    validate-npm-package-name "^4.0.0"
+    yargs "^17.6.0"
+
+"@netlify/edge-bundler@12.0.0":
+  version "12.0.0"
+  resolved "https://registry.yarnpkg.com/@netlify/edge-bundler/-/edge-bundler-12.0.0.tgz#85bd0210314b675a52fa47dfd796657fe86206d5"
+  integrity sha512-whAeq2gQxWz8Bt85XN8VJRBwhHpGlbmu7LRX4bFBgXPNWVi1a9UrQ+F51gHj9p+B01tsztVrKlxqA555Sg0dgg==
+  dependencies:
+    "@import-maps/resolve" "^1.0.1"
+    "@vercel/nft" "^0.26.0"
+    ajv "^8.11.2"
+    ajv-errors "^3.0.0"
+    better-ajv-errors "^1.2.0"
+    common-path-prefix "^3.0.0"
+    env-paths "^3.0.0"
+    esbuild "0.20.2"
+    execa "^6.0.0"
+    find-up "^6.3.0"
+    get-package-name "^2.2.0"
+    get-port "^6.1.2"
+    is-path-inside "^4.0.0"
+    jsonc-parser "^3.2.0"
+    node-fetch "^3.1.1"
+    node-stream-zip "^1.15.0"
+    p-retry "^5.1.1"
+    p-wait-for "^4.1.0"
+    path-key "^4.0.0"
+    semver "^7.3.8"
+    tmp-promise "^3.0.3"
+    urlpattern-polyfill "8.0.2"
+    uuid "^9.0.0"
+
+"@netlify/edge-functions@2.5.1":
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/@netlify/edge-functions/-/edge-functions-2.5.1.tgz#465b4fa51f4f37775876a0c515b1f1ee8e1793ca"
+  integrity sha512-6YGlbzxPaSqc/D2LhP4T4PXrim/vRmqpO1RwQKqVod6WCWlkdtJcAd3mGoI7efrjfND8twh7TqXtL7RRCI23qA==
+
+"@netlify/framework-info@^9.8.11":
+  version "9.8.11"
+  resolved "https://registry.yarnpkg.com/@netlify/framework-info/-/framework-info-9.8.11.tgz#a4b4740b906e7c59c853a8eaaf9a7067a2258a71"
+  integrity sha512-8NuvzQQVeU36PRilWqijiIWmjy6JZcqbKooGQ4bNgH/26YNdS+tN5gOWGWVYnRHgdmBUCycyYrM5h1Srwnq3hQ==
+  dependencies:
+    ajv "^8.12.0"
+    filter-obj "^5.0.0"
+    find-up "^6.3.0"
+    is-plain-obj "^4.0.0"
+    locate-path "^7.0.0"
+    p-filter "^3.0.0"
+    p-locate "^6.0.0"
+    process "^0.11.10"
+    read-pkg-up "^9.0.0"
+    semver "^7.3.8"
+
+"@netlify/functions-utils@^5.2.54":
+  version "5.2.55"
+  resolved "https://registry.yarnpkg.com/@netlify/functions-utils/-/functions-utils-5.2.55.tgz#ccf51970875d6fd3f4344ecdb9d0c6c8fb8f9abd"
+  integrity sha512-4xTb/zuUT5SFpZH+RGKUV6pwrYyGS3L4emcrVi5u/nbJ/8yU8v8MdUdTGxoUhyeFw1kIp5C6vsru1fpU0ti0XA==
+  dependencies:
+    "@netlify/zip-it-and-ship-it" "9.32.1"
+    cpy "^9.0.0"
+    path-exists "^5.0.0"
+
+"@netlify/git-utils@^5.1.1":
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/@netlify/git-utils/-/git-utils-5.1.1.tgz#36d5a6433a070035099b47d9151638053752cd7b"
+  integrity sha512-oyHieuTZH3rKTmg7EKpGEGa28IFxta2oXuVwpPJI/FJAtBje3UE+yko0eDjNufgm3AyGa8G77trUxgBhInAYuw==
+  dependencies:
+    execa "^6.0.0"
+    map-obj "^5.0.0"
+    micromatch "^4.0.2"
+    moize "^6.1.3"
+    path-exists "^5.0.0"
+
+"@netlify/local-functions-proxy-darwin-arm64@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@netlify/local-functions-proxy-darwin-arm64/-/local-functions-proxy-darwin-arm64-1.1.1.tgz#c83a0a142637fb8cefe25c95f5c5cf6f2d7e32ed"
+  integrity sha512-lphJ9qqZ3glnKWEqlemU1LMqXxtJ/tKf7VzakqqyjigwLscXSZSb6fupSjQfd4tR1xqxA76ylws/2HDhc/gs+Q==
+
+"@netlify/local-functions-proxy-darwin-x64@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@netlify/local-functions-proxy-darwin-x64/-/local-functions-proxy-darwin-x64-1.1.1.tgz#e8b558cfd459a5d8343d468e5c128a144638967a"
+  integrity sha512-4CRB0H+dXZzoEklq5Jpmg+chizXlVwCko94d8+UHWCgy/bA3M/rU/BJ8OLZisnJaAktHoeLABKtcLOhtRHpxZQ==
+
+"@netlify/local-functions-proxy-freebsd-arm64@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@netlify/local-functions-proxy-freebsd-arm64/-/local-functions-proxy-freebsd-arm64-1.1.1.tgz#3a60e32fe1929f97817db5da0925c37feea7606e"
+  integrity sha512-u13lWTVMJDF0A6jX7V4N3HYGTIHLe5d1Z2wT43fSIHwXkTs6UXi72cGSraisajG+5JFIwHfPr7asw5vxFC0P9w==
+
+"@netlify/local-functions-proxy-freebsd-x64@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@netlify/local-functions-proxy-freebsd-x64/-/local-functions-proxy-freebsd-x64-1.1.1.tgz#ddc526256cb835f6dbd6747d75a7f3dbcca77da8"
+  integrity sha512-g5xw4xATK5YDzvXtzJ8S1qSkWBiyF8VVRehXPMOAMzpGjCX86twYhWp8rbAk7yA1zBWmmWrWNA2Odq/MgpKJJg==
+
+"@netlify/local-functions-proxy-linux-arm64@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@netlify/local-functions-proxy-linux-arm64/-/local-functions-proxy-linux-arm64-1.1.1.tgz#c88c3d8eacdaf655f871eb1eff58b1b3262c38ff"
+  integrity sha512-dPGu1H5n8na7mBKxiXQ+FNmthDAiA57wqgpm5JMAHtcdcmRvcXwJkwWVGvwfj8ShhYJHQaSaS9oPgO+mpKkgmA==
+
+"@netlify/local-functions-proxy-linux-arm@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@netlify/local-functions-proxy-linux-arm/-/local-functions-proxy-linux-arm-1.1.1.tgz#d92905605f3f17c442001e6ead3710b64366fbd1"
+  integrity sha512-YsTpL+AbHwQrfHWXmKnwUrJBjoUON363nr6jUG1ueYnpbbv6wTUA7gI5snMi/gkGpqFusBthAA7C30e6bixfiA==
+
+"@netlify/local-functions-proxy-linux-ia32@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@netlify/local-functions-proxy-linux-ia32/-/local-functions-proxy-linux-ia32-1.1.1.tgz#b4cb57c438a82f42c2e30ee4ec50cfa233379d59"
+  integrity sha512-Ra0FlXDrmPRaq+rYH3/ttkXSrwk1D5Zx/Na7UPfJZxMY7Qo5iY4bgi/FuzjzWzlp0uuKZOhYOYzYzsIIyrSvmw==
+
+"@netlify/local-functions-proxy-linux-ppc64@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@netlify/local-functions-proxy-linux-ppc64/-/local-functions-proxy-linux-ppc64-1.1.1.tgz#3fdef281191dd819fee72ac58ccbca1ac650fee3"
+  integrity sha512-oXf1satwqwUUxz7LHS1BxbRqc4FFEKIDFTls04eXiLReFR3sqv9H/QuYNTCCDMuRcCOd92qKyDfATdnxT4HR8w==
+
+"@netlify/local-functions-proxy-linux-x64@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@netlify/local-functions-proxy-linux-x64/-/local-functions-proxy-linux-x64-1.1.1.tgz#bd2c8059c5d7dd46ef5da174723ca2cdd7bfdb2f"
+  integrity sha512-bS3u4JuDg/eC0y4Na3i/29JBOxrdUvsK5JSjHfzUeZEbOcuXYf4KavTpHS5uikdvTgyczoSrvbmQJ5m0FLXfLA==
+
+"@netlify/local-functions-proxy-openbsd-x64@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@netlify/local-functions-proxy-openbsd-x64/-/local-functions-proxy-openbsd-x64-1.1.1.tgz#31a3340f4f10dd5c95cd3f2dc9f1e967c051aa2a"
+  integrity sha512-1xLef/kLRNkBTXJ+ZGoRFcwsFxd/B2H3oeJZyXaZ3CN5umd9Mv9wZuAD74NuMt/535yRva8jtAJqvEgl9xMSdA==
+
+"@netlify/local-functions-proxy-win32-ia32@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@netlify/local-functions-proxy-win32-ia32/-/local-functions-proxy-win32-ia32-1.1.1.tgz#354890bc58f54e8b26721447f243c49945f2fe74"
+  integrity sha512-4IOMDBxp2f8VbIkhZ85zGNDrZR4ey8d68fCMSOIwitjsnKav35YrCf8UmAh3UR6CNIRJdJL4MW1GYePJ7iJ8uA==
+
+"@netlify/local-functions-proxy-win32-x64@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@netlify/local-functions-proxy-win32-x64/-/local-functions-proxy-win32-x64-1.1.1.tgz#7ee183b4ccd0062b6124275387d844530ea0b224"
+  integrity sha512-VCBXBJWBujVxyo5f+3r8ovLc9I7wJqpmgDn3ixs1fvdrER5Ac+SzYwYH4mUug9HI08mzTSAKZErzKeuadSez3w==
+
+"@netlify/local-functions-proxy@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@netlify/local-functions-proxy/-/local-functions-proxy-1.1.1.tgz#e5d1416e6d607f8e8bd4d295b1ee1e550d5bd3cb"
+  integrity sha512-eXSsayLT6PMvjzFQpjC9nkg2Otc3lZ5GoYele9M6f8PmsvWpaXRhwjNQ0NYhQQ2UZbLMIiO2dH8dbRsT3bMkFw==
+  optionalDependencies:
+    "@netlify/local-functions-proxy-darwin-arm64" "1.1.1"
+    "@netlify/local-functions-proxy-darwin-x64" "1.1.1"
+    "@netlify/local-functions-proxy-freebsd-arm64" "1.1.1"
+    "@netlify/local-functions-proxy-freebsd-x64" "1.1.1"
+    "@netlify/local-functions-proxy-linux-arm" "1.1.1"
+    "@netlify/local-functions-proxy-linux-arm64" "1.1.1"
+    "@netlify/local-functions-proxy-linux-ia32" "1.1.1"
+    "@netlify/local-functions-proxy-linux-ppc64" "1.1.1"
+    "@netlify/local-functions-proxy-linux-x64" "1.1.1"
+    "@netlify/local-functions-proxy-openbsd-x64" "1.1.1"
+    "@netlify/local-functions-proxy-win32-ia32" "1.1.1"
+    "@netlify/local-functions-proxy-win32-x64" "1.1.1"
+
+"@netlify/node-cookies@^0.1.0":
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/@netlify/node-cookies/-/node-cookies-0.1.0.tgz#dda912ba618527695cf519fafa221c5e6777c612"
+  integrity sha512-OAs1xG+FfLX0LoRASpqzVntVV/RpYkgpI0VrUnw2u0Q1qiZUzcPffxRK8HF3gc4GjuhG5ahOEMJ9bswBiZPq0g==
+
+"@netlify/open-api@^2.28.0", "@netlify/open-api@^2.30.0":
+  version "2.30.0"
+  resolved "https://registry.yarnpkg.com/@netlify/open-api/-/open-api-2.30.0.tgz#d0a96b73e2df02c99768607dee7621b9529ed7c9"
+  integrity sha512-SMRzNwaG6/2MTIBe/RThLQRm3kNpiwb90te+iDJgMLLfTdVA33P/oiinTypBMyQU4Cm3IvQm7P5zD2mXZacSsg==
+
+"@netlify/opentelemetry-utils@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@netlify/opentelemetry-utils/-/opentelemetry-utils-1.2.0.tgz#81b157c18ac33f05252f9874f6659adedc79ff50"
+  integrity sha512-sdeYmvUHXzs7bfoh7f32WVh2wLMOdF3d2Xdcg2FG1lCySXOJ4V6F3n8vPoPXwO7S5iSzJbfO2RPJsTtZCmbIcg==
+
+"@netlify/plugins-list@^6.77.0":
+  version "6.77.0"
+  resolved "https://registry.yarnpkg.com/@netlify/plugins-list/-/plugins-list-6.77.0.tgz#c8815325706531c924133db8366bc0a758dac174"
+  integrity sha512-czL3FH61hFhhVQydRj2xjIwLVYHDNskMhRib7dUfOQrUHifqLlUFKp03NwBD87G9BFKXUYGWZMEUU+JjIpVc9w==
+
+"@netlify/run-utils@^5.1.1":
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/@netlify/run-utils/-/run-utils-5.1.1.tgz#be1938aaca58f9032054cddea02e2673ffa9c4ee"
+  integrity sha512-V2B8ZB19heVKa715uOeDkztxLH7uaqZ+9U5fV7BRzbQ2514DO5Vxj9hG0irzuRLfZXZZjp/chPUesv4VVsce/A==
+  dependencies:
+    execa "^6.0.0"
+
+"@netlify/serverless-functions-api@^1.16.2", "@netlify/serverless-functions-api@^1.18.0":
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/@netlify/serverless-functions-api/-/serverless-functions-api-1.18.0.tgz#83542c0ec29602e55871744e1539ad761b7fd308"
+  integrity sha512-VCU5btoGZ8M6iI7HSwpfZXCpBLKWFmRtq5xYt0K7dY96BZWVBmaZY6Tn+w4L2DrGXwAsIeOFNp8CHjVXfuCAkg==
+  dependencies:
+    "@mswjs/interceptors" "0.27.2"
+    "@netlify/node-cookies" "^0.1.0"
+    "@opentelemetry/core" "^1.23.0"
+    "@opentelemetry/otlp-transformer" "^0.50.0"
+    "@opentelemetry/resources" "^1.23.0"
+    "@opentelemetry/sdk-trace-base" "^1.23.0"
+    "@opentelemetry/semantic-conventions" "^1.23.0"
+    urlpattern-polyfill "8.0.2"
+
+"@netlify/zip-it-and-ship-it@9.31.3":
+  version "9.31.3"
+  resolved "https://registry.yarnpkg.com/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-9.31.3.tgz#9f97475a94f177412d1fc0cf8a2222c1892cd1dd"
+  integrity sha512-cB8DE0pV90IYShytLcKyxZFy6aolKqSuFDMOKVL/svJ6hMQOVlngz5ZKcNRX4rQ2uHWHTe75tgTn6OqmelQYrw==
+  dependencies:
+    "@babel/parser" "^7.22.5"
+    "@babel/types" "7.23.6"
+    "@netlify/binary-info" "^1.0.0"
+    "@netlify/serverless-functions-api" "^1.16.2"
+    "@vercel/nft" "^0.23.0"
+    archiver "^6.0.0"
+    common-path-prefix "^3.0.0"
+    cp-file "^10.0.0"
+    es-module-lexer "^1.0.0"
+    esbuild "0.19.11"
+    execa "^6.0.0"
+    fast-glob "^3.3.2"
+    filter-obj "^5.0.0"
+    find-up "^6.0.0"
+    glob "^8.0.3"
+    is-builtin-module "^3.1.0"
+    is-path-inside "^4.0.0"
+    junk "^4.0.0"
+    locate-path "^7.0.0"
+    merge-options "^3.0.4"
+    minimatch "^9.0.0"
+    normalize-path "^3.0.0"
+    p-map "^5.0.0"
+    path-exists "^5.0.0"
+    precinct "^11.0.0"
+    require-package-name "^2.0.1"
+    resolve "^2.0.0-next.1"
+    semver "^7.3.8"
+    tmp-promise "^3.0.2"
+    toml "^3.0.0"
+    unixify "^1.0.0"
+    urlpattern-polyfill "8.0.2"
+    yargs "^17.0.0"
+
+"@netlify/zip-it-and-ship-it@9.32.1":
+  version "9.32.1"
+  resolved "https://registry.yarnpkg.com/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-9.32.1.tgz#1fd025d2934548774f509678a3bf8156cfc36273"
+  integrity sha512-zLsWEJYCoWbQ7ZM0WcPdXzXtIRp9Y2KvbGpL7iWYmTaLBDrmZtYDnUkoyG0E3b9zmuQp9EAiE6evBdRr6usiRg==
+  dependencies:
+    "@babel/parser" "^7.22.5"
+    "@babel/types" "7.23.6"
+    "@netlify/binary-info" "^1.0.0"
+    "@netlify/serverless-functions-api" "^1.18.0"
+    "@vercel/nft" "^0.23.0"
+    archiver "^6.0.0"
+    common-path-prefix "^3.0.0"
+    cp-file "^10.0.0"
+    es-module-lexer "^1.0.0"
+    esbuild "0.19.11"
+    execa "^6.0.0"
+    fast-glob "^3.3.2"
+    filter-obj "^5.0.0"
+    find-up "^6.0.0"
+    glob "^8.0.3"
+    is-builtin-module "^3.1.0"
+    is-path-inside "^4.0.0"
+    junk "^4.0.0"
+    locate-path "^7.0.0"
+    merge-options "^3.0.4"
+    minimatch "^9.0.0"
+    normalize-path "^3.0.0"
+    p-map "^5.0.0"
+    path-exists "^5.0.0"
+    precinct "^11.0.0"
+    require-package-name "^2.0.1"
+    resolve "^2.0.0-next.1"
+    semver "^7.3.8"
+    tmp-promise "^3.0.2"
+    toml "^3.0.0"
+    unixify "^1.0.0"
+    urlpattern-polyfill "8.0.2"
+    yargs "^17.0.0"
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -1866,71 +2735,440 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@polka/url@^1.0.0-next.24":
-  version "1.0.0-next.24"
-  resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.24.tgz#58601079e11784d20f82d0585865bb42305c4df3"
-  integrity sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ==
+"@octokit/auth-token@^3.0.0":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-3.0.4.tgz#70e941ba742bdd2b49bdb7393e821dea8520a3db"
+  integrity sha512-TWFX7cZF2LXoCvdmJWY7XVPi74aSY0+FfBZNSXEXFkMpjcqsQwDSYVv5FhRFaI0V1ECnwbz4j59T/G+rXNWaIQ==
+
+"@octokit/core@^4.2.1":
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/@octokit/core/-/core-4.2.4.tgz#d8769ec2b43ff37cc3ea89ec4681a20ba58ef907"
+  integrity sha512-rYKilwgzQ7/imScn3M9/pFfUf4I1AZEH3KhyJmtPdE2zfaXAn2mFfUy4FbKewzc2We5y/LlKLj36fWJLKC2SIQ==
+  dependencies:
+    "@octokit/auth-token" "^3.0.0"
+    "@octokit/graphql" "^5.0.0"
+    "@octokit/request" "^6.0.0"
+    "@octokit/request-error" "^3.0.0"
+    "@octokit/types" "^9.0.0"
+    before-after-hook "^2.2.0"
+    universal-user-agent "^6.0.0"
+
+"@octokit/endpoint@^7.0.0":
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-7.0.6.tgz#791f65d3937555141fb6c08f91d618a7d645f1e2"
+  integrity sha512-5L4fseVRUsDFGR00tMWD/Trdeeihn999rTMGRMC1G/Ldi1uWlWJzI98H4Iak5DB/RVvQuyMYKqSK/R6mbSOQyg==
+  dependencies:
+    "@octokit/types" "^9.0.0"
+    is-plain-object "^5.0.0"
+    universal-user-agent "^6.0.0"
 
-"@sideway/address@^4.1.4":
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.4.tgz#03dccebc6ea47fdc226f7d3d1ad512955d4783f0"
-  integrity sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==
+"@octokit/graphql@^5.0.0":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-5.0.6.tgz#9eac411ac4353ccc5d3fca7d76736e6888c5d248"
+  integrity sha512-Fxyxdy/JH0MnIB5h+UQ3yCoh1FG4kWXfFKkpWqjZHw/p+Kc8Y44Hu/kCgNBT6nU1shNumEchmW/sUO1JuQnPcw==
   dependencies:
-    "@hapi/hoek" "^9.0.0"
+    "@octokit/request" "^6.0.0"
+    "@octokit/types" "^9.0.0"
+    universal-user-agent "^6.0.0"
 
-"@sideway/formula@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.1.tgz#80fcbcbaf7ce031e0ef2dd29b1bfc7c3f583611f"
-  integrity sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==
+"@octokit/openapi-types@^18.0.0":
+  version "18.1.1"
+  resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-18.1.1.tgz#09bdfdabfd8e16d16324326da5148010d765f009"
+  integrity sha512-VRaeH8nCDtF5aXWnjPuEMIYf1itK/s3JYyJcWFJT8X9pSNnBtriDf7wlEWsGuhPLl4QIH4xM8fqTXDwJ3Mu6sw==
 
-"@sideway/pinpoint@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
-  integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
+"@octokit/plugin-paginate-rest@^6.1.2":
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-6.1.2.tgz#f86456a7a1fe9e58fec6385a85cf1b34072341f8"
+  integrity sha512-qhrmtQeHU/IivxucOV1bbI/xZyC/iOBhclokv7Sut5vnejAIAEXVcGQeRpQlU39E0WwK9lNvJHphHri/DB6lbQ==
+  dependencies:
+    "@octokit/tsconfig" "^1.0.2"
+    "@octokit/types" "^9.2.3"
 
-"@sinclair/typebox@^0.27.8":
-  version "0.27.8"
-  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e"
-  integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==
+"@octokit/plugin-request-log@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz#5e50ed7083a613816b1e4a28aeec5fb7f1462e85"
+  integrity sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==
 
-"@sindresorhus/is@^0.14.0":
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
-  integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
+"@octokit/plugin-rest-endpoint-methods@^7.1.2":
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-7.2.3.tgz#37a84b171a6cb6658816c82c4082ac3512021797"
+  integrity sha512-I5Gml6kTAkzVlN7KCtjOM+Ruwe/rQppp0QU372K1GP7kNOYEKe8Xn5BW4sE62JAHdwpq95OQK/qGNyKQMUzVgA==
+  dependencies:
+    "@octokit/types" "^10.0.0"
 
-"@slorber/static-site-generator-webpack-plugin@^4.0.7":
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/@slorber/static-site-generator-webpack-plugin/-/static-site-generator-webpack-plugin-4.0.7.tgz#fc1678bddefab014e2145cbe25b3ce4e1cfc36f3"
-  integrity sha512-Ug7x6z5lwrz0WqdnNFOMYrDQNTPAprvHLSh6+/fmml3qUiz6l5eq+2MzLKWtn/q5K5NpSiFsZTP/fck/3vjSxA==
+"@octokit/request-error@^3.0.0":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-3.0.3.tgz#ef3dd08b8e964e53e55d471acfe00baa892b9c69"
+  integrity sha512-crqw3V5Iy2uOU5Np+8M/YexTlT8zxCfI+qu+LxUB7SZpje4Qmx3mub5DfEKSO8Ylyk0aogi6TYdf6kxzh2BguQ==
   dependencies:
-    eval "^0.1.8"
-    p-map "^4.0.0"
-    webpack-sources "^3.2.2"
+    "@octokit/types" "^9.0.0"
+    deprecation "^2.0.0"
+    once "^1.4.0"
 
-"@svgr/babel-plugin-add-jsx-attribute@^6.5.1":
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-6.5.1.tgz#74a5d648bd0347bda99d82409d87b8ca80b9a1ba"
-  integrity sha512-9PYGcXrAxitycIjRmZB+Q0JaN07GZIWaTBIGQzfaZv+qr1n8X1XUEJ5rZ/vx6OVD9RRYlrNnXWExQXcmZeD/BQ==
+"@octokit/request@^6.0.0":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-6.2.8.tgz#aaf480b32ab2b210e9dadd8271d187c93171d8eb"
+  integrity sha512-ow4+pkVQ+6XVVsekSYBzJC0VTVvh/FCTUUgTsboGq+DTeWdyIFV8WSCdo0RIxk6wSkBTHqIK1mYuY7nOBXOchw==
+  dependencies:
+    "@octokit/endpoint" "^7.0.0"
+    "@octokit/request-error" "^3.0.0"
+    "@octokit/types" "^9.0.0"
+    is-plain-object "^5.0.0"
+    node-fetch "^2.6.7"
+    universal-user-agent "^6.0.0"
 
-"@svgr/babel-plugin-remove-jsx-attribute@*":
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-8.0.0.tgz#69177f7937233caca3a1afb051906698f2f59186"
-  integrity sha512-BcCkm/STipKvbCl6b7QFrMh/vx00vIP63k2eM66MfHJzPr6O2U0jYEViXkHJWqXqQYjdeA9cuCl5KWmlwjDvbA==
+"@octokit/rest@19.0.13":
+  version "19.0.13"
+  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-19.0.13.tgz#e799393264edc6d3c67eeda9e5bd7832dcf974e4"
+  integrity sha512-/EzVox5V9gYGdbAI+ovYj3nXQT1TtTHRT+0eZPcuC05UFSWO3mdO9UY1C0i2eLF9Un1ONJkAk+IEtYGAC+TahA==
+  dependencies:
+    "@octokit/core" "^4.2.1"
+    "@octokit/plugin-paginate-rest" "^6.1.2"
+    "@octokit/plugin-request-log" "^1.0.4"
+    "@octokit/plugin-rest-endpoint-methods" "^7.1.2"
 
-"@svgr/babel-plugin-remove-jsx-empty-expression@*":
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-8.0.0.tgz#c2c48104cfd7dcd557f373b70a56e9e3bdae1d44"
-  integrity sha512-5BcGCBfBxB5+XSDSWnhTThfI9jcO5f0Ai2V24gZpG+wXF14BzwxxdDb4g6trdOux0rhibGs385BeFMSmxtS3uA==
+"@octokit/tsconfig@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@octokit/tsconfig/-/tsconfig-1.0.2.tgz#59b024d6f3c0ed82f00d08ead5b3750469125af7"
+  integrity sha512-I0vDR0rdtP8p2lGMzvsJzbhdOWy405HcGovrspJ8RRibHnyRgggUSNO5AIox5LmqiwmatHKYsvj6VGFHkqS7lA==
 
-"@svgr/babel-plugin-replace-jsx-attribute-value@^6.5.1":
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-6.5.1.tgz#fb9d22ea26d2bc5e0a44b763d4c46d5d3f596c60"
-  integrity sha512-8DPaVVE3fd5JKuIC29dqyMB54sA6mfgki2H2+swh+zNJoynC8pMPzOkidqHOSc6Wj032fhl8Z0TVn1GiPpAiJg==
+"@octokit/types@^10.0.0":
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-10.0.0.tgz#7ee19c464ea4ada306c43f1a45d444000f419a4a"
+  integrity sha512-Vm8IddVmhCgU1fxC1eyinpwqzXPEYu0NrYzD3YZjlGjyftdLBTeqNblRC0jmJmgxbJIsQlyogVeGnrNaaMVzIg==
+  dependencies:
+    "@octokit/openapi-types" "^18.0.0"
 
-"@svgr/babel-plugin-svg-dynamic-title@^6.5.1":
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-6.5.1.tgz#01b2024a2b53ffaa5efceaa0bf3e1d5a4c520ce4"
-  integrity sha512-FwOEi0Il72iAzlkaHrlemVurgSQRDFbk0OC8dSvD5fSBPHltNh7JtLsxmZUhjYBZo2PpcU/RJvvi6Q0l7O7ogw==
+"@octokit/types@^9.0.0", "@octokit/types@^9.2.3":
+  version "9.3.2"
+  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-9.3.2.tgz#3f5f89903b69f6a2d196d78ec35f888c0013cac5"
+  integrity sha512-D4iHGTdAnEEVsB8fl95m1hiz7D5YiRdQ9b/OEb3BYRVwbLsGHcRVPz+u+BgRLNk0Q0/4iZCBqDN96j2XNxfXrA==
+  dependencies:
+    "@octokit/openapi-types" "^18.0.0"
+
+"@open-draft/deferred-promise@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@open-draft/deferred-promise/-/deferred-promise-2.2.0.tgz#4a822d10f6f0e316be4d67b4d4f8c9a124b073bd"
+  integrity sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==
+
+"@open-draft/logger@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@open-draft/logger/-/logger-0.3.0.tgz#2b3ab1242b360aa0adb28b85f5d7da1c133a0954"
+  integrity sha512-X2g45fzhxH238HKO4xbSr7+wBS8Fvw6ixhTDuvLd5mqh6bJJCFAPwU9mPDxbcrRtfxv4u5IHCEH77BmxvXmmxQ==
+  dependencies:
+    is-node-process "^1.2.0"
+    outvariant "^1.4.0"
+
+"@open-draft/until@^2.0.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@open-draft/until/-/until-2.1.0.tgz#0acf32f470af2ceaf47f095cdecd40d68666efda"
+  integrity sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==
+
+"@opentelemetry/api-logs@0.50.0":
+  version "0.50.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.50.0.tgz#d46b76daab0bc18fa92dcdabacfc106c380d19a1"
+  integrity sha512-JdZuKrhOYggqOpUljAq4WWNi5nB10PmgoF0y2CvedLGXd0kSawb/UBnWT8gg1ND3bHCNHStAIVT0ELlxJJRqrA==
+  dependencies:
+    "@opentelemetry/api" "^1.0.0"
+
+"@opentelemetry/api@1.8.0", "@opentelemetry/api@^1.0.0":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.8.0.tgz#5aa7abb48f23f693068ed2999ae627d2f7d902ec"
+  integrity sha512-I/s6F7yKUDdtMsoBWXJe8Qz40Tui5vsuKCWJEWVL+5q9sSWRzzx6v2KeNsOBEwd94j0eWkpWCH4yB6rZg9Mf0w==
+
+"@opentelemetry/core@1.23.0":
+  version "1.23.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.23.0.tgz#f2e7ada7f35750f3c1674aef1e52c879005c0731"
+  integrity sha512-hdQ/a9TMzMQF/BO8Cz1juA43/L5YGtCSiKoOHmrTEf7VMDAZgy8ucpWx3eQTnQ3gBloRcWtzvcrMZABC3PTSKQ==
+  dependencies:
+    "@opentelemetry/semantic-conventions" "1.23.0"
+
+"@opentelemetry/core@1.24.0", "@opentelemetry/core@^1.23.0":
+  version "1.24.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.24.0.tgz#5568b6c1328a6b9c94a77f9b2c7f872b852bba40"
+  integrity sha512-FP2oN7mVPqcdxJDTTnKExj4mi91EH+DNuArKfHTjPuJWe2K1JfMIVXNfahw1h3onJxQnxS8K0stKkogX05s+Aw==
+  dependencies:
+    "@opentelemetry/semantic-conventions" "1.24.0"
+
+"@opentelemetry/otlp-transformer@^0.50.0":
+  version "0.50.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-transformer/-/otlp-transformer-0.50.0.tgz#211fe512fcce9d76042680f955336dbde3be03ef"
+  integrity sha512-s0sl1Yfqd5q1Kjrf6DqXPWzErL+XHhrXOfejh4Vc/SMTNqC902xDsC8JQxbjuramWt/+hibfguIvi7Ns8VLolA==
+  dependencies:
+    "@opentelemetry/api-logs" "0.50.0"
+    "@opentelemetry/core" "1.23.0"
+    "@opentelemetry/resources" "1.23.0"
+    "@opentelemetry/sdk-logs" "0.50.0"
+    "@opentelemetry/sdk-metrics" "1.23.0"
+    "@opentelemetry/sdk-trace-base" "1.23.0"
+
+"@opentelemetry/resources@1.23.0":
+  version "1.23.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-1.23.0.tgz#4c71430f3e20c4d88b67ef5629759fae108485e5"
+  integrity sha512-iPRLfVfcEQynYGo7e4Di+ti+YQTAY0h5mQEUJcHlU9JOqpb4x965O6PZ+wMcwYVY63G96KtdS86YCM1BF1vQZg==
+  dependencies:
+    "@opentelemetry/core" "1.23.0"
+    "@opentelemetry/semantic-conventions" "1.23.0"
+
+"@opentelemetry/resources@1.24.0", "@opentelemetry/resources@^1.23.0":
+  version "1.24.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-1.24.0.tgz#f27911af0917986da5716775021eae0a872ba98e"
+  integrity sha512-mxC7E7ocUS1tLzepnA7O9/G8G6ZTdjCH2pXme1DDDuCuk6n2/53GADX+GWBuyX0dfIxeMInIbJAdjlfN9GNr6A==
+  dependencies:
+    "@opentelemetry/core" "1.24.0"
+    "@opentelemetry/semantic-conventions" "1.24.0"
+
+"@opentelemetry/sdk-logs@0.50.0":
+  version "0.50.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-logs/-/sdk-logs-0.50.0.tgz#6636492cf626a9666f61d91025e25243d1a43bfc"
+  integrity sha512-PeUEupBB29p9nlPNqXoa1PUWNLsZnxG0DCDj3sHqzae+8y76B/A5hvZjg03ulWdnvBLYpnJslqzylG9E0IL87g==
+  dependencies:
+    "@opentelemetry/core" "1.23.0"
+    "@opentelemetry/resources" "1.23.0"
+
+"@opentelemetry/sdk-metrics@1.23.0":
+  version "1.23.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-metrics/-/sdk-metrics-1.23.0.tgz#b4cf3cc86b6dedf5c438c67c829df7399bf64be1"
+  integrity sha512-4OkvW6+wST4h6LFG23rXSTf6nmTf201h9dzq7bE0z5R9ESEVLERZz6WXwE7PSgg1gdjlaznm1jLJf8GttypFDg==
+  dependencies:
+    "@opentelemetry/core" "1.23.0"
+    "@opentelemetry/resources" "1.23.0"
+    lodash.merge "^4.6.2"
+
+"@opentelemetry/sdk-trace-base@1.23.0":
+  version "1.23.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.23.0.tgz#ff0a0f8ec47205e0b14b3b765ea2a34de1ad01dd"
+  integrity sha512-PzBmZM8hBomUqvCddF/5Olyyviayka44O5nDWq673np3ctnvwMOvNrsUORZjKja1zJbwEuD9niAGbnVrz3jwRQ==
+  dependencies:
+    "@opentelemetry/core" "1.23.0"
+    "@opentelemetry/resources" "1.23.0"
+    "@opentelemetry/semantic-conventions" "1.23.0"
+
+"@opentelemetry/sdk-trace-base@^1.23.0":
+  version "1.24.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.24.0.tgz#e2de869e33fd224f6d9f39bafa4172074d1086c8"
+  integrity sha512-H9sLETZ4jw9UJ3totV8oM5R0m4CW0ZIOLfp4NV3g0CM8HD5zGZcaW88xqzWDgiYRpctFxd+WmHtGX/Upoa2vRg==
+  dependencies:
+    "@opentelemetry/core" "1.24.0"
+    "@opentelemetry/resources" "1.24.0"
+    "@opentelemetry/semantic-conventions" "1.24.0"
+
+"@opentelemetry/semantic-conventions@1.23.0":
+  version "1.23.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.23.0.tgz#627f2721b960fe586b7f72a07912cb7699f06eef"
+  integrity sha512-MiqFvfOzfR31t8cc74CTP1OZfz7MbqpAnLCra8NqQoaHJX6ncIRTdYOQYBDQ2uFISDq0WY8Y9dDTWvsgzzBYRg==
+
+"@opentelemetry/semantic-conventions@1.24.0", "@opentelemetry/semantic-conventions@^1.23.0":
+  version "1.24.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.24.0.tgz#f074db930a7feb4d64103a9a576c5fbad046fcac"
+  integrity sha512-yL0jI6Ltuz8R+Opj7jClGrul6pOoYrdfVmzQS4SITXRPH7I5IRZbrwe/6/v8v4WYMa6MYZG480S1+uc/IGfqsA==
+
+"@parcel/watcher-android-arm64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.4.1.tgz#c2c19a3c442313ff007d2d7a9c2c1dd3e1c9ca84"
+  integrity sha512-LOi/WTbbh3aTn2RYddrO8pnapixAziFl6SMxHM69r3tvdSm94JtCenaKgk1GRg5FJ5wpMCpHeW+7yqPlvZv7kg==
+
+"@parcel/watcher-darwin-arm64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.4.1.tgz#c817c7a3b4f3a79c1535bfe54a1c2818d9ffdc34"
+  integrity sha512-ln41eihm5YXIY043vBrrHfn94SIBlqOWmoROhsMVTSXGh0QahKGy77tfEywQ7v3NywyxBBkGIfrWRHm0hsKtzA==
+
+"@parcel/watcher-darwin-x64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.4.1.tgz#1a3f69d9323eae4f1c61a5f480a59c478d2cb020"
+  integrity sha512-yrw81BRLjjtHyDu7J61oPuSoeYWR3lDElcPGJyOvIXmor6DEo7/G2u1o7I38cwlcoBHQFULqF6nesIX3tsEXMg==
+
+"@parcel/watcher-freebsd-x64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.4.1.tgz#0d67fef1609f90ba6a8a662bc76a55fc93706fc8"
+  integrity sha512-TJa3Pex/gX3CWIx/Co8k+ykNdDCLx+TuZj3f3h7eOjgpdKM+Mnix37RYsYU4LHhiYJz3DK5nFCCra81p6g050w==
+
+"@parcel/watcher-linux-arm-glibc@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.4.1.tgz#ce5b340da5829b8e546bd00f752ae5292e1c702d"
+  integrity sha512-4rVYDlsMEYfa537BRXxJ5UF4ddNwnr2/1O4MHM5PjI9cvV2qymvhwZSFgXqbS8YoTk5i/JR0L0JDs69BUn45YA==
+
+"@parcel/watcher-linux-arm64-glibc@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.4.1.tgz#6d7c00dde6d40608f9554e73998db11b2b1ff7c7"
+  integrity sha512-BJ7mH985OADVLpbrzCLgrJ3TOpiZggE9FMblfO65PlOCdG++xJpKUJ0Aol74ZUIYfb8WsRlUdgrZxKkz3zXWYA==
+
+"@parcel/watcher-linux-arm64-musl@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.4.1.tgz#bd39bc71015f08a4a31a47cd89c236b9d6a7f635"
+  integrity sha512-p4Xb7JGq3MLgAfYhslU2SjoV9G0kI0Xry0kuxeG/41UfpjHGOhv7UoUDAz/jb1u2elbhazy4rRBL8PegPJFBhA==
+
+"@parcel/watcher-linux-x64-glibc@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.4.1.tgz#0ce29966b082fb6cdd3de44f2f74057eef2c9e39"
+  integrity sha512-s9O3fByZ/2pyYDPoLM6zt92yu6P4E39a03zvO0qCHOTjxmt3GHRMLuRZEWhWLASTMSrrnVNWdVI/+pUElJBBBg==
+
+"@parcel/watcher-linux-x64-musl@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.4.1.tgz#d2ebbf60e407170bb647cd6e447f4f2bab19ad16"
+  integrity sha512-L2nZTYR1myLNST0O632g0Dx9LyMNHrn6TOt76sYxWLdff3cB22/GZX2UPtJnaqQPdCRoszoY5rcOj4oMTtp5fQ==
+
+"@parcel/watcher-wasm@^2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-wasm/-/watcher-wasm-2.4.1.tgz#c4353e4fdb96ee14389856f7f6f6d21b7dcef9e1"
+  integrity sha512-/ZR0RxqxU/xxDGzbzosMjh4W6NdYFMqq2nvo2b8SLi7rsl/4jkL8S5stIikorNkdR50oVDvqb/3JT05WM+CRRA==
+  dependencies:
+    is-glob "^4.0.3"
+    micromatch "^4.0.5"
+    napi-wasm "^1.1.0"
+
+"@parcel/watcher-win32-arm64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.4.1.tgz#eb4deef37e80f0b5e2f215dd6d7a6d40a85f8adc"
+  integrity sha512-Uq2BPp5GWhrq/lcuItCHoqxjULU1QYEcyjSO5jqqOK8RNFDBQnenMMx4gAl3v8GiWa59E9+uDM7yZ6LxwUIfRg==
+
+"@parcel/watcher-win32-ia32@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.4.1.tgz#94fbd4b497be39fd5c8c71ba05436927842c9df7"
+  integrity sha512-maNRit5QQV2kgHFSYwftmPBxiuK5u4DXjbXx7q6eKjq5dsLXZ4FJiVvlcw35QXzk0KrUecJmuVFbj4uV9oYrcw==
+
+"@parcel/watcher-win32-x64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.4.1.tgz#4bf920912f67cae5f2d264f58df81abfea68dadf"
+  integrity sha512-+DvS92F9ezicfswqrvIRM2njcYJbd5mb9CUgtrHCHmvn7pPPa+nMDRu1o1bYYz/l5IB2NVGNJWiH7h1E58IF2A==
+
+"@parcel/watcher@^2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.4.1.tgz#a50275151a1bb110879c6123589dba90c19f1bf8"
+  integrity sha512-HNjmfLQEVRZmHRET336f20H/8kOozUGwk7yajvsonjNxbj2wBTK1WsQuHkD5yYh9RxFGL2EyDHryOihOwUoKDA==
+  dependencies:
+    detect-libc "^1.0.3"
+    is-glob "^4.0.3"
+    micromatch "^4.0.5"
+    node-addon-api "^7.0.0"
+  optionalDependencies:
+    "@parcel/watcher-android-arm64" "2.4.1"
+    "@parcel/watcher-darwin-arm64" "2.4.1"
+    "@parcel/watcher-darwin-x64" "2.4.1"
+    "@parcel/watcher-freebsd-x64" "2.4.1"
+    "@parcel/watcher-linux-arm-glibc" "2.4.1"
+    "@parcel/watcher-linux-arm64-glibc" "2.4.1"
+    "@parcel/watcher-linux-arm64-musl" "2.4.1"
+    "@parcel/watcher-linux-x64-glibc" "2.4.1"
+    "@parcel/watcher-linux-x64-musl" "2.4.1"
+    "@parcel/watcher-win32-arm64" "2.4.1"
+    "@parcel/watcher-win32-ia32" "2.4.1"
+    "@parcel/watcher-win32-x64" "2.4.1"
+
+"@pnpm/config.env-replace@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@pnpm/config.env-replace/-/config.env-replace-1.1.0.tgz#ab29da53df41e8948a00f2433f085f54de8b3a4c"
+  integrity sha512-htyl8TWnKL7K/ESFa1oW2UB5lVDxuF5DpM7tBi6Hu2LNL3mWkIzNLG6N4zoCUP1lCKNxWy/3iu8mS8MvToGd6w==
+
+"@pnpm/network.ca-file@^1.0.1":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@pnpm/network.ca-file/-/network.ca-file-1.0.2.tgz#2ab05e09c1af0cdf2fcf5035bea1484e222f7983"
+  integrity sha512-YcPQ8a0jwYU9bTdJDpXjMi7Brhkr1mXsXrUJvjqM2mQDgkRiz8jFaQGOdaLxgjtUfQgZhKy/O3cG/YwmgKaxLA==
+  dependencies:
+    graceful-fs "4.2.10"
+
+"@pnpm/npm-conf@^2.1.0":
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/@pnpm/npm-conf/-/npm-conf-2.2.2.tgz#0058baf1c26cbb63a828f0193795401684ac86f0"
+  integrity sha512-UA91GwWPhFExt3IizW6bOeY/pQ0BkuNwKjk9iQW9KqxluGCrg4VenZ0/L+2Y0+ZOtme72EVvg6v0zo3AMQRCeA==
+  dependencies:
+    "@pnpm/config.env-replace" "^1.1.0"
+    "@pnpm/network.ca-file" "^1.0.1"
+    config-chain "^1.1.11"
+
+"@polka/url@^1.0.0-next.24":
+  version "1.0.0-next.24"
+  resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.24.tgz#58601079e11784d20f82d0585865bb42305c4df3"
+  integrity sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ==
+
+"@rollup/pluginutils@^4.0.0":
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz#e6c6c3aba0744edce3fb2074922d3776c0af2a6d"
+  integrity sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==
+  dependencies:
+    estree-walker "^2.0.1"
+    picomatch "^2.2.2"
+
+"@sideway/address@^4.1.4":
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.4.tgz#03dccebc6ea47fdc226f7d3d1ad512955d4783f0"
+  integrity sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==
+  dependencies:
+    "@hapi/hoek" "^9.0.0"
+
+"@sideway/formula@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.1.tgz#80fcbcbaf7ce031e0ef2dd29b1bfc7c3f583611f"
+  integrity sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==
+
+"@sideway/pinpoint@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
+  integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
+
+"@sinclair/typebox@^0.27.8":
+  version "0.27.8"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e"
+  integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==
+
+"@sindresorhus/is@^0.14.0":
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
+  integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
+
+"@sindresorhus/is@^5.2.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-5.6.0.tgz#41dd6093d34652cddb5d5bdeee04eafc33826668"
+  integrity sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g==
+
+"@sindresorhus/slugify@^2.0.0":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/slugify/-/slugify-2.2.1.tgz#fa2e2e25d6e1e74a2eeb5e2c37f5ccc516ed2c4b"
+  integrity sha512-MkngSCRZ8JdSOCHRaYd+D01XhvU3Hjy6MGl06zhOk614hp9EOAp5gIkBeQg7wtmxpitU6eAL4kdiRMcJa2dlrw==
+  dependencies:
+    "@sindresorhus/transliterate" "^1.0.0"
+    escape-string-regexp "^5.0.0"
+
+"@sindresorhus/transliterate@^1.0.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/transliterate/-/transliterate-1.6.0.tgz#2309fff65a868047e6d2dd70dec747c5b36a8327"
+  integrity sha512-doH1gimEu3A46VX6aVxpHTeHrytJAG6HgdxntYnCFiIFHEM/ZGpG8KiZGBChchjQmG0XFIBL552kBTjVcMZXwQ==
+  dependencies:
+    escape-string-regexp "^5.0.0"
+
+"@slorber/static-site-generator-webpack-plugin@^4.0.7":
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/@slorber/static-site-generator-webpack-plugin/-/static-site-generator-webpack-plugin-4.0.7.tgz#fc1678bddefab014e2145cbe25b3ce4e1cfc36f3"
+  integrity sha512-Ug7x6z5lwrz0WqdnNFOMYrDQNTPAprvHLSh6+/fmml3qUiz6l5eq+2MzLKWtn/q5K5NpSiFsZTP/fck/3vjSxA==
+  dependencies:
+    eval "^0.1.8"
+    p-map "^4.0.0"
+    webpack-sources "^3.2.2"
+
+"@svgr/babel-plugin-add-jsx-attribute@^6.5.1":
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-6.5.1.tgz#74a5d648bd0347bda99d82409d87b8ca80b9a1ba"
+  integrity sha512-9PYGcXrAxitycIjRmZB+Q0JaN07GZIWaTBIGQzfaZv+qr1n8X1XUEJ5rZ/vx6OVD9RRYlrNnXWExQXcmZeD/BQ==
+
+"@svgr/babel-plugin-remove-jsx-attribute@*":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-8.0.0.tgz#69177f7937233caca3a1afb051906698f2f59186"
+  integrity sha512-BcCkm/STipKvbCl6b7QFrMh/vx00vIP63k2eM66MfHJzPr6O2U0jYEViXkHJWqXqQYjdeA9cuCl5KWmlwjDvbA==
+
+"@svgr/babel-plugin-remove-jsx-empty-expression@*":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-8.0.0.tgz#c2c48104cfd7dcd557f373b70a56e9e3bdae1d44"
+  integrity sha512-5BcGCBfBxB5+XSDSWnhTThfI9jcO5f0Ai2V24gZpG+wXF14BzwxxdDb4g6trdOux0rhibGs385BeFMSmxtS3uA==
+
+"@svgr/babel-plugin-replace-jsx-attribute-value@^6.5.1":
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-6.5.1.tgz#fb9d22ea26d2bc5e0a44b763d4c46d5d3f596c60"
+  integrity sha512-8DPaVVE3fd5JKuIC29dqyMB54sA6mfgki2H2+swh+zNJoynC8pMPzOkidqHOSc6Wj032fhl8Z0TVn1GiPpAiJg==
+
+"@svgr/babel-plugin-svg-dynamic-title@^6.5.1":
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-6.5.1.tgz#01b2024a2b53ffaa5efceaa0bf3e1d5a4c520ce4"
+  integrity sha512-FwOEi0Il72iAzlkaHrlemVurgSQRDFbk0OC8dSvD5fSBPHltNh7JtLsxmZUhjYBZo2PpcU/RJvvi6Q0l7O7ogw==
 
 "@svgr/babel-plugin-svg-em-dimensions@^6.5.1":
   version "6.5.1"
@@ -2020,6 +3258,18 @@
   dependencies:
     defer-to-connect "^1.0.1"
 
+"@szmarczak/http-timer@^5.0.1":
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-5.0.1.tgz#c7c1bf1141cdd4751b0399c8fc7b8b664cd5be3a"
+  integrity sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==
+  dependencies:
+    defer-to-connect "^2.0.1"
+
+"@tokenizer/token@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.3.0.tgz#fe98a93fe789247e998c75e74e9c7c63217aa276"
+  integrity sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==
+
 "@trysound/sax@0.2.0":
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad"
@@ -2030,6 +3280,26 @@
   resolved "https://registry.yarnpkg.com/@tsconfig/docusaurus/-/docusaurus-1.0.7.tgz#a3ee3c8109b3fec091e3d61a61834e563aeee3c3"
   integrity sha512-ffTXxGIP/IRMCjuzHd6M4/HdIrw1bMfC7Bv8hMkTadnePkpe0lG0oDSdbRpSDZb2rQMAgpbWiR10BvxvNYwYrg==
 
+"@tsconfig/node10@^1.0.7":
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.11.tgz#6ee46400685f130e278128c7b38b7e031ff5b2f2"
+  integrity sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==
+
+"@tsconfig/node12@^1.0.7":
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
+  integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
+
+"@tsconfig/node14@^1.0.0":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
+  integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
+
+"@tsconfig/node16@^1.0.2":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
+  integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
+
 "@types/body-parser@*":
   version "1.19.5"
   resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.5.tgz#04ce9a3b677dc8bd681a17da1ab9835dc9d3ede4"
@@ -2118,6 +3388,11 @@
   resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#4fc33a00c1d0c16987b1a20cf92d20614c55ac35"
   integrity sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==
 
+"@types/http-cache-semantics@^4.0.2":
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz#b979ebad3919799c979b17c72621c0bc0a31c6c4"
+  integrity sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==
+
 "@types/http-errors@*":
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.4.tgz#7eb47726c391b7345a6ec35ad7f4de469cf5ba4f"
@@ -2195,6 +3470,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.45.tgz#2c0fafd78705e7a18b7906b5201a522719dc5190"
   integrity sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==
 
+"@types/normalize-package-data@^2.4.1", "@types/normalize-package-data@^2.4.3":
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901"
+  integrity sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==
+
 "@types/parse-json@^4.0.0":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.2.tgz#5950e50960793055845e956c427fc2b0d70c5239"
@@ -2260,6 +3540,11 @@
   resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
   integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
 
+"@types/retry@0.12.1":
+  version "0.12.1"
+  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065"
+  integrity sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==
+
 "@types/sax@^1.2.1":
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/@types/sax/-/sax-1.2.7.tgz#ba5fe7df9aa9c89b6dff7688a19023dd2963091d"
@@ -2303,6 +3588,11 @@
   dependencies:
     "@types/node" "*"
 
+"@types/triple-beam@^1.3.2":
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/@types/triple-beam/-/triple-beam-1.3.5.tgz#74fef9ffbaa198eb8b588be029f38b00299caa2c"
+  integrity sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==
+
 "@types/unist@^2", "@types/unist@^2.0.0", "@types/unist@^2.0.2", "@types/unist@^2.0.3":
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.10.tgz#04ffa7f406ab628f7f7e97ca23e290cd8ab15efc"
@@ -2320,6 +3610,13 @@
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15"
   integrity sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==
 
+"@types/yargs@^16.0.0":
+  version "16.0.9"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.9.tgz#ba506215e45f7707e6cbcaf386981155b7ab956e"
+  integrity sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==
+  dependencies:
+    "@types/yargs-parser" "*"
+
 "@types/yargs@^17.0.8":
   version "17.0.32"
   resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.32.tgz#030774723a2f7faafebf645f4e5a48371dca6229"
@@ -2327,6 +3624,74 @@
   dependencies:
     "@types/yargs-parser" "*"
 
+"@types/yauzl@^2.9.1":
+  version "2.10.3"
+  resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.3.tgz#e9b2808b4f109504a03cda958259876f61017999"
+  integrity sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==
+  dependencies:
+    "@types/node" "*"
+
+"@typescript-eslint/types@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"
+  integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==
+
+"@typescript-eslint/typescript-estree@^5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b"
+  integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==
+  dependencies:
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/visitor-keys" "5.62.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/visitor-keys@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e"
+  integrity sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==
+  dependencies:
+    "@typescript-eslint/types" "5.62.0"
+    eslint-visitor-keys "^3.3.0"
+
+"@vercel/nft@^0.23.0":
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/@vercel/nft/-/nft-0.23.1.tgz#f17c5f9d3f3a0178ea25eb7397a14618c00529bf"
+  integrity sha512-NE0xSmGWVhgHF1OIoir71XAd0W0C1UE3nzFyhpFiMr3rVhetww7NvM1kc41trBsPG37Bh+dE5FYCTMzM/gBu0w==
+  dependencies:
+    "@mapbox/node-pre-gyp" "^1.0.5"
+    "@rollup/pluginutils" "^4.0.0"
+    acorn "^8.6.0"
+    async-sema "^3.1.1"
+    bindings "^1.4.0"
+    estree-walker "2.0.2"
+    glob "^7.1.3"
+    graceful-fs "^4.2.9"
+    micromatch "^4.0.2"
+    node-gyp-build "^4.2.2"
+    resolve-from "^5.0.0"
+
+"@vercel/nft@^0.26.0":
+  version "0.26.4"
+  resolved "https://registry.yarnpkg.com/@vercel/nft/-/nft-0.26.4.tgz#d7e8ebb91567d25240e8cb996152ea77392cea7f"
+  integrity sha512-j4jCOOXke2t8cHZCIxu1dzKLHLcFmYzC3yqAK6MfZznOL1QIJKd0xcFsXK3zcqzU7ScsE2zWkiMMNHGMHgp+FA==
+  dependencies:
+    "@mapbox/node-pre-gyp" "^1.0.5"
+    "@rollup/pluginutils" "^4.0.0"
+    acorn "^8.6.0"
+    acorn-import-attributes "^1.9.2"
+    async-sema "^3.1.1"
+    bindings "^1.4.0"
+    estree-walker "2.0.2"
+    glob "^7.1.3"
+    graceful-fs "^4.2.9"
+    micromatch "^4.0.2"
+    node-gyp-build "^4.2.2"
+    resolve-from "^5.0.0"
+
 "@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5":
   version "1.11.6"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24"
@@ -2448,6 +3813,80 @@
     "@webassemblyjs/ast" "1.11.6"
     "@xtuc/long" "4.2.2"
 
+"@xhmikosr/archive-type@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/@xhmikosr/archive-type/-/archive-type-6.0.1.tgz#684e9e5369bfa93223d7aeb2c84fe0780d6d5e24"
+  integrity sha512-PB3NeJL8xARZt52yDBupK0dNPn8uIVQDe15qNehUpoeeLWCZyAOam4vGXnoZGz2N9D1VXtjievJuCsXam2TmbQ==
+  dependencies:
+    file-type "^18.5.0"
+
+"@xhmikosr/decompress-tar@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@xhmikosr/decompress-tar/-/decompress-tar-7.0.0.tgz#ae1ecc723bde8547ff65540018765875712d400b"
+  integrity sha512-kyWf2hybtQVbWtB+FdRyOT+jyR5jxCNZPLqvQGB7djZj75lrpLUPEmRbyo86AtJ5OEtivpYaNWjCkqSJ8xtRWw==
+  dependencies:
+    file-type "^18.5.0"
+    is-stream "^3.0.0"
+    tar-stream "^3.1.4"
+
+"@xhmikosr/decompress-tarbz2@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@xhmikosr/decompress-tarbz2/-/decompress-tarbz2-7.0.0.tgz#eea242c59e7d52f9bccc91e1a51d4b34ed048792"
+  integrity sha512-3QnjipYkRgh3Dee1MWDgKmANWxOQBVN4e1IwiGNe2fHYfMYTeSkVvWREt87UIoSucKUh3E95v8uGFttgTknZcA==
+  dependencies:
+    "@xhmikosr/decompress-tar" "^7.0.0"
+    file-type "^18.5.0"
+    is-stream "^3.0.0"
+    seek-bzip "^1.0.6"
+    unbzip2-stream "^1.4.3"
+
+"@xhmikosr/decompress-targz@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@xhmikosr/decompress-targz/-/decompress-targz-7.0.0.tgz#b80c913056903b162088b85619f632914f514f74"
+  integrity sha512-7BNHJl92g9OLhw89zqcFS67V1LAtm4Ex02j6OiQzuE8P7Yy9lQcyBuEL3x6v436grLdL+BcFjgbmhWxnem4GHw==
+  dependencies:
+    "@xhmikosr/decompress-tar" "^7.0.0"
+    file-type "^18.5.0"
+    is-stream "^3.0.0"
+
+"@xhmikosr/decompress-unzip@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@xhmikosr/decompress-unzip/-/decompress-unzip-6.0.0.tgz#d617956a1e762c5396cef8340973dd60ba24c9dd"
+  integrity sha512-R1HAkjXLS7RAL74YFLxYY9zYflCcYGssld9KKFDu87PnJ4h4btdhzXfSC8J5i5A2njH3oYIoCzx03RIGTH07Sg==
+  dependencies:
+    file-type "^18.5.0"
+    get-stream "^6.0.1"
+    yauzl "^2.10.0"
+
+"@xhmikosr/decompress@^9.0.1":
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/@xhmikosr/decompress/-/decompress-9.0.1.tgz#e35977739da39bc664e0b49015b402a7cf9b1d91"
+  integrity sha512-9Lvlt6Qdpo9SaRQyRIXCo3lgU++eMZ68lzgjcTwtuKDrlwT635+5zsHZ1yrSx/Blc5IDuVLlPkBPj5CZkx+2+Q==
+  dependencies:
+    "@xhmikosr/decompress-tar" "^7.0.0"
+    "@xhmikosr/decompress-tarbz2" "^7.0.0"
+    "@xhmikosr/decompress-targz" "^7.0.0"
+    "@xhmikosr/decompress-unzip" "^6.0.0"
+    graceful-fs "^4.2.11"
+    make-dir "^4.0.0"
+    strip-dirs "^3.0.0"
+
+"@xhmikosr/downloader@^13.0.0":
+  version "13.0.1"
+  resolved "https://registry.yarnpkg.com/@xhmikosr/downloader/-/downloader-13.0.1.tgz#8478b36606d2108eb86bff419e1df36d84cc262d"
+  integrity sha512-mBvWew1kZJHfNQVVfVllMjUDwCGN9apPa0t4/z1zaUJ9MzpXjRL3w8fsfJKB8gHN/h4rik9HneKfDbh2fErN+w==
+  dependencies:
+    "@xhmikosr/archive-type" "^6.0.1"
+    "@xhmikosr/decompress" "^9.0.1"
+    content-disposition "^0.5.4"
+    ext-name "^5.0.0"
+    file-type "^18.5.0"
+    filenamify "^5.1.1"
+    get-stream "^6.0.1"
+    got "^12.6.1"
+    merge-options "^3.0.4"
+    p-event "^5.0.1"
+
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
@@ -2463,6 +3902,18 @@ abbrev@1:
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
+abort-controller@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
+  integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
+  dependencies:
+    event-target-shim "^5.0.0"
+
+abstract-logging@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/abstract-logging/-/abstract-logging-2.0.1.tgz#6b0c371df212db7129b57d2e7fcf282b8bf1c839"
+  integrity sha512-2BjRTZxTPvheOvGbBslFSYOUkr+SjPtOnrLP33f+VIWLzezQpZcqVg7ja3L4dBXmzzgwT+a029jRx5PCi3JuiA==
+
 accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
@@ -2476,12 +3927,17 @@ acorn-import-assertions@^1.9.0:
   resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
   integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
 
-acorn-walk@^8.0.0:
+acorn-import-attributes@^1.9.2:
+  version "1.9.5"
+  resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef"
+  integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==
+
+acorn-walk@^8.0.0, acorn-walk@^8.1.1:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.2.tgz#7703af9415f1b6db9315d6895503862e231d34aa"
   integrity sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==
 
-acorn@^8.0.4, acorn@^8.7.1, acorn@^8.8.2:
+acorn@^8.0.4, acorn@^8.11.3, acorn@^8.4.1, acorn@^8.6.0, acorn@^8.7.1, acorn@^8.8.2:
   version "8.11.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
   integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
@@ -2491,6 +3947,20 @@ address@^1.0.1, address@^1.1.2:
   resolved "https://registry.yarnpkg.com/address/-/address-1.2.2.tgz#2b5248dac5485a6390532c6a517fda2e3faac89e"
   integrity sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==
 
+agent-base@6:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
+  dependencies:
+    debug "4"
+
+agent-base@^7.0.2:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.1.tgz#bdbded7dfb096b751a2a087eeeb9664725b2e317"
+  integrity sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==
+  dependencies:
+    debug "^4.3.4"
+
 aggregate-error@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
@@ -2499,6 +3969,19 @@ aggregate-error@^3.0.0:
     clean-stack "^2.0.0"
     indent-string "^4.0.0"
 
+aggregate-error@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-4.0.1.tgz#25091fe1573b9e0be892aeda15c7c66a545f758e"
+  integrity sha512-0poP0T7el6Vq3rstR8Mn4V/IQrpBLO6POkUSrN7RhyY+GF/InCFShQzsQ39T25gkHhLgSLByyAz+Kjb+c2L98w==
+  dependencies:
+    clean-stack "^4.0.0"
+    indent-string "^5.0.0"
+
+ajv-errors@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-3.0.0.tgz#e54f299f3a3d30fe144161e5f0d8d51196c527bc"
+  integrity sha512-V3wD15YHfHz6y0KdhYFjyy9vWtEVALT9UrxfN3zqlI6dMioHnJrqOYfyPKol3oqrnCM9uwkcdCwkJ0WUcbLMTQ==
+
 ajv-formats@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
@@ -2506,6 +3989,13 @@ ajv-formats@^2.1.1:
   dependencies:
     ajv "^8.0.0"
 
+ajv-formats@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-3.0.1.tgz#3d5dc762bca17679c3c2ea7e90ad6b7532309578"
+  integrity sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==
+  dependencies:
+    ajv "^8.0.0"
+
 ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
@@ -2528,7 +4018,7 @@ ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.0.0, ajv@^8.9.0:
+ajv@^8.0.0, ajv@^8.10.0, ajv@^8.11.0, ajv@^8.11.2, ajv@^8.12.0, ajv@^8.9.0:
   version "8.12.0"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
   integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
@@ -2565,6 +4055,20 @@ algoliasearch@^4.13.1, algoliasearch@^4.19.1:
     "@algolia/requester-node-http" "4.22.1"
     "@algolia/transporter" "4.22.1"
 
+all-node-versions@^11.3.0:
+  version "11.3.0"
+  resolved "https://registry.yarnpkg.com/all-node-versions/-/all-node-versions-11.3.0.tgz#ace1c8c9598bb900ba296450ccf0281aabaff7a4"
+  integrity sha512-psMkc5s3qpr+QMfires9bC4azRYciPWql1wqZKMsYRh1731qefQDH2X4+O19xSBX6u0Ra/8Y5diG6y/fEmqKsw==
+  dependencies:
+    fetch-node-website "^7.3.0"
+    filter-obj "^5.1.0"
+    get-stream "^6.0.0"
+    global-cache-dir "^4.3.1"
+    is-plain-obj "^4.1.0"
+    path-exists "^5.0.0"
+    semver "^7.3.7"
+    write-file-atomic "^4.0.1"
+
 ansi-align@^3.0.0, ansi-align@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59"
@@ -2572,11 +4076,45 @@ ansi-align@^3.0.0, ansi-align@^3.0.1:
   dependencies:
     string-width "^4.1.0"
 
+ansi-escapes@6.2.1, ansi-escapes@^6.0.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-6.2.1.tgz#76c54ce9b081dad39acec4b5d53377913825fb0f"
+  integrity sha512-4nJ3yixlEthEJ9Rk4vPcdBRkZvQZlYyu8j4/Mqz5sgIkddmEnH2Yj2ZrnP9S3tQOvSNRUIgVNF/1yPpRAGNRig==
+
+ansi-escapes@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
+  integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
+
+ansi-escapes@^4.3.1:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
+  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
+  dependencies:
+    type-fest "^0.21.3"
+
+ansi-escapes@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-5.0.0.tgz#b6a0caf0eef0c41af190e9a749e0c00ec04bb2a6"
+  integrity sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==
+  dependencies:
+    type-fest "^1.0.2"
+
 ansi-html-community@^0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41"
   integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==
 
+ansi-regex@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1"
+  integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==
+
+ansi-regex@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed"
+  integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==
+
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
@@ -2592,6 +4130,11 @@ ansi-sequence-parser@^1.1.0:
   resolved "https://registry.yarnpkg.com/ansi-sequence-parser/-/ansi-sequence-parser-1.1.1.tgz#e0aa1cdcbc8f8bb0b5bca625aac41f5f056973cf"
   integrity sha512-vJXt3yiaUL4UU546s3rPXlsry/RnM730G1+HkpKE012AN0sx1eOrxSu95oKDIonskeLTijMgqWZ3uDEe3NFvyg==
 
+ansi-styles@6.2.1, ansi-styles@^6.0.0, ansi-styles@^6.1.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
+  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
+
 ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -2606,12 +4149,19 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
-ansi-styles@^6.1.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
-  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
+ansi-styles@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
+  integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
+
+ansi-to-html@0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/ansi-to-html/-/ansi-to-html-0.7.2.tgz#a92c149e4184b571eb29a0135ca001a8e2d710cb"
+  integrity sha512-v6MqmEpNlxF+POuyhKkidusCHWWkaLcGRURzivcU3I9tv7k4JVhFcnukrM5Rlk2rUywdZuzYAZ+kbZqWCnfN3g==
+  dependencies:
+    entities "^2.2.0"
 
-anymatch@~3.1.2:
+anymatch@^3.1.3, anymatch@~3.1.2:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
   integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
@@ -2619,6 +4169,54 @@ anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
+"aproba@^1.0.3 || ^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
+  integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
+
+archiver-utils@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-4.0.1.tgz#66ad15256e69589a77f706c90c6dbcc1b2775d2a"
+  integrity sha512-Q4Q99idbvzmgCTEAAhi32BkOyq8iVI5EwdO0PmBDSGIzzjYNdcFn7Q7k3OzbLy4kLUPXfJtG6fO2RjftXbobBg==
+  dependencies:
+    glob "^8.0.0"
+    graceful-fs "^4.2.0"
+    lazystream "^1.0.0"
+    lodash "^4.17.15"
+    normalize-path "^3.0.0"
+    readable-stream "^3.6.0"
+
+archiver@^6.0.0:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/archiver/-/archiver-6.0.2.tgz#f45e7598dfe48e834ac8c7a0c37033f826f5a639"
+  integrity sha512-UQ/2nW7NMl1G+1UnrLypQw1VdT9XZg/ECcKPq7l+STzStrSivFIXIp34D8M5zeNGW5NoOupdYCHv6VySCPNNlw==
+  dependencies:
+    archiver-utils "^4.0.1"
+    async "^3.2.4"
+    buffer-crc32 "^0.2.1"
+    readable-stream "^3.6.0"
+    readdir-glob "^1.1.2"
+    tar-stream "^3.0.0"
+    zip-stream "^5.0.1"
+
+archy@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
+  integrity sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==
+
+are-we-there-yet@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c"
+  integrity sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^3.6.0"
+
+arg@^4.1.0:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
+  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
+
 arg@^5.0.0:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c"
@@ -2636,22 +4234,82 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
+arr-diff@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==
+
+arr-flatten@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
+
+arr-union@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==
+
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
   integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
 
+array-timsort@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array-timsort/-/array-timsort-1.0.3.tgz#3c9e4199e54fb2b9c3fe5976396a21614ef0d926"
+  integrity sha512-/+3GRL7dDAGEfM6TseQk/U+mi18TU2Ms9I3UlLdUMhz2hbvGNTKdj9xniwXfUqgYhHxRx0+8UnKkvlNwVU+cWQ==
+
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
+array-unique@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==
+
+arrify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-3.0.0.tgz#ccdefb8eaf2a1d2ab0da1ca2ce53118759fd46bc"
+  integrity sha512-tLkvA81vQG/XqE2mjDkGQHoOINtMHtysSnemrmoGe6PydDPMRbVugqyk4A6V/WDWEfm3l+0d8anA9r8cv/5Jaw==
+
 asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==
 
-asynckit@^0.4.0:
+ascii-table@0.0.9:
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/ascii-table/-/ascii-table-0.0.9.tgz#06a6604d6a55d4bf41a9a47d9872d7a78da31e73"
+  integrity sha512-xpkr6sCDIYTPqzvjG8M3ncw1YOTaloWZOyrUmicoEifBEKzQzt+ooUpRpQ/AbOoJfO/p2ZKiyp79qHThzJDulQ==
+
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==
+
+ast-module-types@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ast-module-types/-/ast-module-types-5.0.0.tgz#32b2b05c56067ff38e95df66f11d6afd6c9ba16b"
+  integrity sha512-JvqziE0Wc0rXQfma0HZC/aY7URXHFuZV84fJRtP8u+lhp0JYCNd5wJzVXP45t0PH0Mej3ynlzvdyITYIu0G4LQ==
+
+async-sema@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/async-sema/-/async-sema-3.1.1.tgz#e527c08758a0f8f6f9f15f799a173ff3c40ea808"
+  integrity sha512-tLRNUXati5MFePdAk8dw7Qt7DpxPB60ofAgn8WRhW6a2rcimZnYBP9oxHiv0OHy+Wz7kPMG+t4LGdt31+4EmGg==
+
+async@^3.2.3, async@^3.2.4:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66"
+  integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==
+
+async@~1.5:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+  integrity sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==
+
+asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
@@ -2661,6 +4319,16 @@ at-least-node@^1.0.0:
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
+atob@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
+
+atomic-sleep@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/atomic-sleep/-/atomic-sleep-1.0.0.tgz#eb85b77a601fc932cfe432c5acd364a9e2c9075b"
+  integrity sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==
+
 autoprefixer@^10.4.12, autoprefixer@^10.4.7:
   version "10.4.17"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.17.tgz#35cd5695cbbe82f536a50fa025d561b01fdec8be"
@@ -2673,6 +4341,16 @@ autoprefixer@^10.4.12, autoprefixer@^10.4.7:
     picocolors "^1.0.0"
     postcss-value-parser "^4.2.0"
 
+avvio@^8.2.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/avvio/-/avvio-8.3.0.tgz#1e019433d935730b814978a583eefac41a65082f"
+  integrity sha512-VBVH0jubFr9LdFASy/vNtm5giTrnbVquWBhT0fyizuNK2rQ7e7ONU2plZQWUNqtE1EmxFEb+kbSkFRkstiaS9Q==
+  dependencies:
+    "@fastify/error" "^3.3.0"
+    archy "^1.0.0"
+    debug "^4.0.0"
+    fastq "^1.17.1"
+
 axios@^0.25.0:
   version "0.25.0"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.25.0.tgz#349cfbb31331a9b4453190791760a8d35b093e0a"
@@ -2689,6 +4367,11 @@ axios@^1.4.0:
     form-data "^4.0.0"
     proxy-from-env "^1.1.0"
 
+b4a@^1.6.4:
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.6.6.tgz#a4cc349a3851987c3c4ac2d7785c18744f6da9ba"
+  integrity sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==
+
 babel-loader@^8.2.5:
   version "8.3.0"
   resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.3.0.tgz#124936e841ba4fe8176786d6ff28add1f134d6a8"
@@ -2745,6 +4428,13 @@ babel-plugin-polyfill-regenerator@^0.5.4:
   dependencies:
     "@babel/helper-define-polyfill-provider" "^0.5.0"
 
+backoff@2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/backoff/-/backoff-2.5.0.tgz#f616eda9d3e4b66b8ca7fca79f695722c5f8e26f"
+  integrity sha512-wC5ihrnUXmR2douXmXLCe5O3zg3GKIyvRi/hi58a/XyRxVI+3/yM0PYueQOZXPXQ9pxBislYkw+sF9b7C/RuMA==
+  dependencies:
+    precond "0.2"
+
 bail@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776"
@@ -2755,6 +4445,39 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
+bare-events@^2.0.0, bare-events@^2.2.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.2.2.tgz#a98a41841f98b2efe7ecc5c5468814469b018078"
+  integrity sha512-h7z00dWdG0PYOQEvChhOSWvOfkIKsdZGkWr083FgN/HyoQuebSew/cgirYqh9SCuy/hRvxc5Vy6Fw8xAmYHLkQ==
+
+bare-fs@^2.1.1:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/bare-fs/-/bare-fs-2.3.0.tgz#0872f8e33cf291c9fd527d827154f156a298d402"
+  integrity sha512-TNFqa1B4N99pds2a5NYHR15o0ZpdNKbAeKTE/+G6ED/UeOavv8RY3dr/Fu99HW3zU3pXpo2kDNO8Sjsm2esfOw==
+  dependencies:
+    bare-events "^2.0.0"
+    bare-path "^2.0.0"
+    bare-stream "^1.0.0"
+
+bare-os@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/bare-os/-/bare-os-2.3.0.tgz#718e680b139effff0624a7421c098e7a2c2d63da"
+  integrity sha512-oPb8oMM1xZbhRQBngTgpcQ5gXw6kjOaRsSWsIeNyRxGed2w/ARyP7ScBYpWR1qfX2E5rS3gBw6OWcSQo+s+kUg==
+
+bare-path@^2.0.0, bare-path@^2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/bare-path/-/bare-path-2.1.2.tgz#7a0940d34ebe65f7e179fa61ed8d49d9dc151d67"
+  integrity sha512-o7KSt4prEphWUHa3QUwCxUI00R86VdjiuxmJK0iNVDHYPGo+HsDaVCnqCmPbf/MiW1ok8F4p3m8RTHlWk8K2ig==
+  dependencies:
+    bare-os "^2.1.0"
+
+bare-stream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/bare-stream/-/bare-stream-1.0.0.tgz#25c3e56198d922187320c3f8c52d75c4051178b4"
+  integrity sha512-KhNUoDL40iP4gFaLSsoGE479t0jHijfYdIcxRn/XtezA2BaUD0NRf/JGRpsMq6dMNM+SrCrB0YSSo/5wBY4rOQ==
+  dependencies:
+    streamx "^2.16.1"
+
 base16@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/base16/-/base16-1.0.0.tgz#e297f60d7ec1014a7a971a39ebc8a98c0b681e70"
@@ -2765,11 +4488,47 @@ base64-js@^1.3.1:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
+base@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
+  dependencies:
+    cache-base "^1.0.1"
+    class-utils "^0.3.5"
+    component-emitter "^1.2.1"
+    define-property "^1.0.0"
+    isobject "^3.0.1"
+    mixin-deep "^1.2.0"
+    pascalcase "^0.1.1"
+
 batch@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
   integrity sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==
 
+before-after-hook@^2.2.0:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.3.tgz#c51e809c81a4e354084422b9b26bad88249c517c"
+  integrity sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==
+
+better-ajv-errors@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/better-ajv-errors/-/better-ajv-errors-1.2.0.tgz#6412d58fa4d460ff6ccbd9e65c5fef9781cc5286"
+  integrity sha512-UW+IsFycygIo7bclP9h5ugkNH8EjCSgqyFB/yQ4Hqqa1OEYDtb0uFIkYE0b6+CjkgJYVM5UKI/pJPxjYe9EZlA==
+  dependencies:
+    "@babel/code-frame" "^7.16.0"
+    "@humanwhocodes/momoa" "^2.0.2"
+    chalk "^4.1.2"
+    jsonpointer "^5.0.0"
+    leven "^3.1.0 < 4"
+
+better-opn@3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/better-opn/-/better-opn-3.0.2.tgz#f96f35deaaf8f34144a4102651babcf00d1d8817"
+  integrity sha512-aVNobHnJqLiUelTaHat9DZ1qM2w0C0Eym4LPI/3JxOnSokGVdsl1T1kN7TFvsEAD8G47A6VKQ0TVHqbBnYMJlQ==
+  dependencies:
+    open "^8.0.4"
+
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
@@ -2780,6 +4539,13 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
+bindings@^1.4.0, bindings@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
+  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
+  dependencies:
+    file-uri-to-path "1.0.0"
+
 bl@^4.0.3:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
@@ -2789,6 +4555,20 @@ bl@^4.0.3:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
+bl@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-5.1.0.tgz#183715f678c7188ecef9fe475d90209400624273"
+  integrity sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==
+  dependencies:
+    buffer "^6.0.3"
+    inherits "^2.0.4"
+    readable-stream "^3.4.0"
+
+blueimp-md5@^2.10.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.19.0.tgz#b53feea5498dcb53dc6ec4b823adb84b729c4af0"
+  integrity sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w==
+
 body-parser@1.20.1:
   version "1.20.1"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668"
@@ -2807,6 +4587,24 @@ body-parser@1.20.1:
     type-is "~1.6.18"
     unpipe "1.0.0"
 
+body-parser@1.20.2:
+  version "1.20.2"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd"
+  integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==
+  dependencies:
+    bytes "3.1.2"
+    content-type "~1.0.5"
+    debug "2.6.9"
+    depd "2.0.0"
+    destroy "1.2.0"
+    http-errors "2.0.0"
+    iconv-lite "0.4.24"
+    on-finished "2.4.1"
+    qs "6.11.0"
+    raw-body "2.5.2"
+    type-is "~1.6.18"
+    unpipe "1.0.0"
+
 bonjour-service@^1.0.11:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.2.1.tgz#eb41b3085183df3321da1264719fbada12478d02"
@@ -2820,6 +4618,20 @@ boolbase@^1.0.0:
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
 
+boxen@7.1.1, boxen@^7.0.0:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/boxen/-/boxen-7.1.1.tgz#f9ba525413c2fec9cdb88987d835c4f7cad9c8f4"
+  integrity sha512-2hCgjEmP8YLWQ130n2FerGv7rYpfBmnmp9Uy2Le1vge6X3gZIfSmEzP5QTDElFxcvVcXlEn8Aq6MU/PZygIOog==
+  dependencies:
+    ansi-align "^3.0.1"
+    camelcase "^7.0.1"
+    chalk "^5.2.0"
+    cli-boxes "^3.0.0"
+    string-width "^5.1.2"
+    type-fest "^2.13.0"
+    widest-line "^4.0.1"
+    wrap-ansi "^8.1.0"
+
 boxen@^5.0.0:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50"
@@ -2863,6 +4675,22 @@ brace-expansion@^2.0.1:
   dependencies:
     balanced-match "^1.0.0"
 
+braces@^2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
+  dependencies:
+    arr-flatten "^1.1.0"
+    array-unique "^0.3.2"
+    extend-shallow "^2.0.1"
+    fill-range "^4.0.0"
+    isobject "^3.0.1"
+    repeat-element "^1.1.2"
+    snapdragon "^0.8.1"
+    snapdragon-node "^2.0.1"
+    split-string "^3.0.2"
+    to-regex "^3.0.1"
+
 braces@^3.0.2, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
@@ -2880,12 +4708,22 @@ browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.18.1, browserslist@^4
     node-releases "^2.0.14"
     update-browserslist-db "^1.0.13"
 
+buffer-crc32@^0.2.1, buffer-crc32@~0.2.3:
+  version "0.2.13"
+  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
+  integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
+
+buffer-equal-constant-time@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
+  integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==
+
 buffer-from@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
-buffer@^5.5.0:
+buffer@^5.2.1, buffer@^5.5.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
   integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
@@ -2893,6 +4731,31 @@ buffer@^5.5.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
+buffer@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
+  integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.2.1"
+
+builtin-modules@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6"
+  integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==
+
+builtins@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.1.0.tgz#6d85eeb360c4ebc166c3fdef922a15aa7316a5e8"
+  integrity sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==
+  dependencies:
+    semver "^7.0.0"
+
+byline@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
+  integrity sha512-s6webAy+R4SR8XVuJWt2V2rGvhnrhxN+9S15GNuTK3wKPOXFF6RNc+8ug2XhH+2s4f+uudG4kUVYmYOQWL2g0Q==
+
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
@@ -2903,6 +4766,39 @@ bytes@3.1.2:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
   integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
+cache-base@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
+  dependencies:
+    collection-visit "^1.0.0"
+    component-emitter "^1.2.1"
+    get-value "^2.0.6"
+    has-value "^1.0.0"
+    isobject "^3.0.1"
+    set-value "^2.0.0"
+    to-object-path "^0.3.0"
+    union-value "^1.0.0"
+    unset-value "^1.0.0"
+
+cacheable-lookup@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz#3476a8215d046e5a3202a9209dd13fec1f933a27"
+  integrity sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==
+
+cacheable-request@^10.2.8:
+  version "10.2.14"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-10.2.14.tgz#eb915b665fda41b79652782df3f553449c406b9d"
+  integrity sha512-zkDT5WAF4hSSoUgyfg5tFIxz8XQK+25W/TLVojJTMKBaxevLBBtLxgqguAuVQB8PVW79FVjHcU+GJ9tVbDZ9mQ==
+  dependencies:
+    "@types/http-cache-semantics" "^4.0.2"
+    get-stream "^6.0.1"
+    http-cache-semantics "^4.1.1"
+    keyv "^4.5.3"
+    mimic-response "^4.0.0"
+    normalize-url "^8.0.0"
+    responselike "^3.0.0"
+
 cacheable-request@^6.0.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
@@ -2916,6 +4812,11 @@ cacheable-request@^6.0.0:
     normalize-url "^4.1.0"
     responselike "^1.0.2"
 
+cachedir@^2.3.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.4.0.tgz#7fef9cf7367233d7c88068fe6e34ed0d355a610d"
+  integrity sha512-9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ==
+
 call-bind@^1.0.0, call-bind@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.5.tgz#6fa2b7845ce0ea49bf4d8b9ef64727a2c2e2e513"
@@ -2925,6 +4826,22 @@ call-bind@^1.0.0, call-bind@^1.0.5:
     get-intrinsic "^1.2.1"
     set-function-length "^1.1.1"
 
+call-bind@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9"
+  integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==
+  dependencies:
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.4"
+    set-function-length "^1.2.1"
+
+callsite@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
+  integrity sha512-0vdNRFXn5q+dtOqjfFtmtlI9N2eVZ7LMyEV2iKC5mEEFvSg/69Ml6b/WU2qF8W1nLRa0wiSrDT3Y5jOHZCwKPQ==
+
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
@@ -2948,6 +4865,11 @@ camelcase@^6.2.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
+camelcase@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-7.0.1.tgz#f02e50af9fd7782bc8b88a3558c32fd3a388f048"
+  integrity sha512-xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw==
+
 caniuse-api@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
@@ -2968,6 +4890,11 @@ ccount@^1.0.0:
   resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.1.0.tgz#246687debb6014735131be8abab2d93898f8d043"
   integrity sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==
 
+chalk@5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.2.0.tgz#249623b7d66869c673699fb66d65723e54dfcfb3"
+  integrity sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==
+
 chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -2985,6 +4912,11 @@ chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+chalk@^5.0.0, chalk@^5.0.1, chalk@^5.2.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385"
+  integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==
+
 character-entities-legacy@^1.0.0:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1"
@@ -3000,6 +4932,11 @@ character-reference-invalid@^1.0.0:
   resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560"
   integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==
 
+chardet@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
+
 cheerio-select@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-2.1.0.tgz#4d8673286b8126ca2a8e42740d5e3c4884ae21b4"
@@ -3025,7 +4962,7 @@ cheerio@^1.0.0-rc.12:
     parse5 "^7.0.0"
     parse5-htmlparser2-tree-adapter "^7.0.0"
 
-chokidar@^3.4.2, chokidar@^3.5.2, chokidar@^3.5.3:
+chokidar@3.5.3, chokidar@^3.4.2, chokidar@^3.5.2, chokidar@^3.5.3:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
   integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
@@ -3040,16 +4977,41 @@ chokidar@^3.4.2, chokidar@^3.5.2, chokidar@^3.5.3:
   optionalDependencies:
     fsevents "~2.3.2"
 
+chokidar@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
+  integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
+  dependencies:
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
 chownr@^1.1.1:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
   integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
 
+chownr@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
+  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
+
 chrome-trace-event@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
   integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
 
+ci-info@3.8.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91"
+  integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==
+
 ci-info@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
@@ -3060,6 +5022,23 @@ ci-info@^3.2.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
   integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
 
+citty@^0.1.5, citty@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/citty/-/citty-0.1.6.tgz#0f7904da1ed4625e1a9ea7e0fa780981aab7c5e4"
+  integrity sha512-tskPPKEs8D2KPafUypv2gxwJP8h/OaJmC82QQGGDQcHvXX43xF2VDACcJVmZ0EuSxkpO9Kc4MlrA3q0+FG58AQ==
+  dependencies:
+    consola "^3.2.3"
+
+class-utils@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
+  dependencies:
+    arr-union "^3.1.0"
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    static-extend "^0.1.1"
+
 clean-css@^5.2.2, clean-css@^5.3.0:
   version "5.3.3"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.3.tgz#b330653cd3bd6b75009cc25c714cae7b93351ccd"
@@ -3067,11 +5046,27 @@ clean-css@^5.2.2, clean-css@^5.3.0:
   dependencies:
     source-map "~0.6.0"
 
+clean-deep@3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/clean-deep/-/clean-deep-3.4.0.tgz#c465c4de1003ae13a1a859e6c69366ab96069f75"
+  integrity sha512-Lo78NV5ItJL/jl+B5w0BycAisaieJGXK1qYi/9m4SjR8zbqmrUtO7Yhro40wEShGmmxs/aJLI/A+jNhdkXK8mw==
+  dependencies:
+    lodash.isempty "^4.4.0"
+    lodash.isplainobject "^4.0.6"
+    lodash.transform "^4.6.0"
+
 clean-stack@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
   integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
 
+clean-stack@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-4.2.0.tgz#c464e4cde4ac789f4e0735c5d75beb49d7b30b31"
+  integrity sha512-LYv6XPxoyODi36Dp976riBtSY27VmFo+MKqEU9QCCWyTrdEPDog+RWA7xQWHi6Vbp61j5c4cdzzX1NidnwtUWg==
+  dependencies:
+    escape-string-regexp "5.0.0"
+
 cli-boxes@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
@@ -3082,6 +5077,32 @@ cli-boxes@^3.0.0:
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-3.0.0.tgz#71a10c716feeba005e4504f36329ef0b17cf3145"
   integrity sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==
 
+cli-cursor@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  integrity sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==
+  dependencies:
+    restore-cursor "^2.0.0"
+
+cli-cursor@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-4.0.0.tgz#3cecfe3734bf4fe02a8361cbdc0f6fe28c6a57ea"
+  integrity sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==
+  dependencies:
+    restore-cursor "^4.0.0"
+
+cli-progress@^3.11.2:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/cli-progress/-/cli-progress-3.12.0.tgz#807ee14b66bcc086258e444ad0f19e7d42577942"
+  integrity sha512-tRkV3HJ1ASwm19THiiLIXLO7Im7wlTuKnvkYaTkyoAPefqjNg7W7DHKUlGRxy9vxDvbyCYQkQozvptuMkGCg8A==
+  dependencies:
+    string-width "^4.2.3"
+
+cli-spinners@^2.6.1:
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.2.tgz#1773a8f4b9c4d6ac31563df53b3fc1d79462fe41"
+  integrity sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==
+
 cli-table3@^0.6.2:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.3.tgz#61ab765aac156b52f222954ffc607a6f01dbeeb2"
@@ -3091,6 +5112,28 @@ cli-table3@^0.6.2:
   optionalDependencies:
     "@colors/colors" "1.5.0"
 
+cli-truncate@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-3.1.0.tgz#3f23ab12535e3d73e839bb43e73c9de487db1389"
+  integrity sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==
+  dependencies:
+    slice-ansi "^5.0.0"
+    string-width "^5.0.0"
+
+cli-width@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
+  integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
+
+clipboardy@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-4.0.0.tgz#e73ced93a76d19dd379ebf1f297565426dffdca1"
+  integrity sha512-5mOlNS0mhX0707P2I0aZ2V/cmHUEO/fL7VFLqszkhUsxt7RwnmrInf/eEQKlf5GzvYeHIjT+Ov1HRfNmymlG0w==
+  dependencies:
+    execa "^8.0.1"
+    is-wsl "^3.1.0"
+    is64bit "^2.0.0"
+
 cliui@^8.0.1:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
@@ -3116,6 +5159,11 @@ clone-response@^1.0.2:
   dependencies:
     mimic-response "^1.0.0"
 
+clone@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+  integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
+
 clsx@^1.1.1, clsx@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12"
@@ -3126,7 +5174,15 @@ collapse-white-space@^1.0.2:
   resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287"
   integrity sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==
 
-color-convert@^1.9.0:
+collection-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==
+  dependencies:
+    map-visit "^1.0.0"
+    object-visit "^1.0.0"
+
+color-convert@^1.9.0, color-convert@^1.9.3:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
   integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
@@ -3145,12 +5201,12 @@ color-name@1.1.3:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
-color-name@^1.0.0, color-name@~1.1.4:
+color-name@^1.0.0, color-name@^1.1.4, color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-color-string@^1.9.0:
+color-string@^1.6.0, color-string@^1.9.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4"
   integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==
@@ -3158,6 +5214,19 @@ color-string@^1.9.0:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
+color-support@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
+
+color@^3.1.3:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164"
+  integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==
+  dependencies:
+    color-convert "^1.9.3"
+    color-string "^1.6.0"
+
 color@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/color/-/color-4.2.3.tgz#d781ecb5e57224ee43ea9627560107c0e0c6463a"
@@ -3171,11 +5240,42 @@ colord@^2.9.1:
   resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43"
   integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==
 
-colorette@^2.0.10:
+colorette@^2.0.10, colorette@^2.0.20:
   version "2.0.20"
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
   integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
 
+colors-option@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/colors-option/-/colors-option-3.0.0.tgz#51f5d0d2b511a01859cdd70eaa9ed43ca4abf108"
+  integrity sha512-DP3FpjsiDDvnQC1OJBsdOJZPuy7r0o6sepY2T5M3L/d2nrE23O/ErFkEqyY3ngVL1ZhTj/H0pCMNObZGkEOaaQ==
+  dependencies:
+    chalk "^5.0.0"
+    filter-obj "^3.0.0"
+    is-plain-obj "^4.0.0"
+    jest-validate "^27.3.1"
+
+colors-option@^4.4.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/colors-option/-/colors-option-4.5.0.tgz#f307605fcf2ac8165fb15510852717c58ef60ec4"
+  integrity sha512-Soe5lerRg3erMRgYC0EC696/8dMCGpBzcQchFfi55Yrkja8F+P7cUt0LVTIg7u5ob5BexLZ/F1kO+ejmv+nq8w==
+  dependencies:
+    chalk "^5.0.1"
+    is-plain-obj "^4.1.0"
+
+colors@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
+  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
+
+colorspace@1.1.x:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.4.tgz#8d442d1186152f60453bf8070cd66eb364e59243"
+  integrity sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==
+  dependencies:
+    color "^3.1.3"
+    text-hex "1.0.x"
+
 combine-promises@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/combine-promises/-/combine-promises-1.2.0.tgz#5f2e68451862acf85761ded4d9e2af7769c2ca6a"
@@ -3193,12 +5293,17 @@ comma-separated-tokens@^1.0.0:
   resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea"
   integrity sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==
 
+commander@10.0.1, commander@^10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
+  integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==
+
 commander@7, commander@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
   integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
 
-commander@^2.20.0:
+commander@^2.20.0, commander@^2.20.3, commander@^2.8.1:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -3213,11 +5318,47 @@ commander@^8.0.0, commander@^8.3.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
   integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
 
+commander@^9.3.0:
+  version "9.5.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30"
+  integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==
+
+comment-json@4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/comment-json/-/comment-json-4.2.3.tgz#50b487ebbf43abe44431f575ebda07d30d015365"
+  integrity sha512-SsxdiOf064DWoZLH799Ata6u7iV658A11PlWtZATDlXPpKGJnbJZ5Z24ybixAi+LUUqJ/GKowAejtC5GFUG7Tw==
+  dependencies:
+    array-timsort "^1.0.3"
+    core-util-is "^1.0.3"
+    esprima "^4.0.1"
+    has-own-prop "^2.0.0"
+    repeat-string "^1.6.1"
+
+common-path-prefix@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-3.0.0.tgz#7d007a7e07c58c4b4d5f433131a19141b29f11e0"
+  integrity sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==
+
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
   integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
 
+component-emitter@^1.2.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.1.tgz#ef1d5796f7d93f135ee6fb684340b26403c97d17"
+  integrity sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==
+
+compress-commons@^5.0.1:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-5.0.3.tgz#36b6572fdfc220c88c9c939b48667818806667e9"
+  integrity sha512-/UIcLWvwAQyVibgpQDPtfNM3SvqN7G9elAPAV7GM0L53EbNWwWiCsWtK8Fwed/APEbptPHXs5PuW+y8Bq8lFTA==
+  dependencies:
+    crc-32 "^1.2.0"
+    crc32-stream "^5.0.0"
+    normalize-path "^3.0.0"
+    readable-stream "^3.6.0"
+
 compressible@~2.0.16:
   version "2.0.18"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
@@ -3243,6 +5384,20 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
+concordance@5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/concordance/-/concordance-5.0.4.tgz#9896073261adced72f88d60e4d56f8efc4bbbbd2"
+  integrity sha512-OAcsnTEYu1ARJqWVGwf4zh4JDfHZEaSNlNccFmt8YjB2l/n19/PF2viLINHc57vO4FKIAFl2FWASIGZZWZ2Kxw==
+  dependencies:
+    date-time "^3.1.0"
+    esutils "^2.0.3"
+    fast-diff "^1.2.0"
+    js-string-escape "^1.0.1"
+    lodash "^4.17.15"
+    md5-hex "^3.0.1"
+    semver "^7.3.2"
+    well-known-symbols "^2.0.0"
+
 concurrently@^8.0.1:
   version "8.2.2"
   resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-8.2.2.tgz#353141985c198cfa5e4a3ef90082c336b5851784"
@@ -3258,6 +5413,30 @@ concurrently@^8.0.1:
     tree-kill "^1.2.2"
     yargs "^17.7.2"
 
+confbox@^0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/confbox/-/confbox-0.1.7.tgz#ccfc0a2bcae36a84838e83a3b7f770fb17d6c579"
+  integrity sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA==
+
+config-chain@^1.1.11:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"
+  integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==
+  dependencies:
+    ini "^1.3.4"
+    proto-list "~1.2.1"
+
+configstore@6.0.0, configstore@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/configstore/-/configstore-6.0.0.tgz#49eca2ebc80983f77e09394a1a56e0aca8235566"
+  integrity sha512-cD31W1v3GqUlQvbBCGcXmd2Nj9SvLDOP1oQ0YFuLETufzSPaKp11rYBsSOm7rCsW3OnIRAFM3OxRhceaXNYHkA==
+  dependencies:
+    dot-prop "^6.0.1"
+    graceful-fs "^4.2.6"
+    unique-string "^3.0.0"
+    write-file-atomic "^3.0.3"
+    xdg-basedir "^5.0.1"
+
 configstore@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"
@@ -3280,6 +5459,16 @@ consola@^2.15.3:
   resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550"
   integrity sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==
 
+consola@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/consola/-/consola-3.2.3.tgz#0741857aa88cfa0d6fd53f1cff0375136e98502f"
+  integrity sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==
+
+console-control-strings@^1.0.0, console-control-strings@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
+
 "consolidated-events@^1.1.0 || ^2.0.0":
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/consolidated-events/-/consolidated-events-2.0.2.tgz#da8d8f8c2b232831413d9e190dc11669c79f4a91"
@@ -3290,14 +5479,14 @@ content-disposition@0.5.2:
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
   integrity sha512-kRGRZw3bLlFISDBgwTSA1TMBFN6J6GWDeubmDE3AF+3+yXL8hTWv8r5rkLbqYXY4RjPk/EzHnClI3zQf1cFmHA==
 
-content-disposition@0.5.4:
+content-disposition@0.5.4, content-disposition@^0.5.3, content-disposition@^0.5.4:
   version "0.5.4"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
   integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==
   dependencies:
     safe-buffer "5.2.1"
 
-content-type@~1.0.4:
+content-type@1.0.5, content-type@~1.0.4, content-type@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
   integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
@@ -3312,6 +5501,11 @@ convert-source-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
   integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
+cookie-es@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/cookie-es/-/cookie-es-1.1.0.tgz#68f8d9f48aeb5a534f3896f80e792760d3d20def"
+  integrity sha512-L2rLOcK0wzWSfSDA33YR+PUHDG10a8px7rUHKWbGLP4YfbsMed2KFUw5fczvDPbT98DDe3LEzviswl810apTEw==
+
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
@@ -3322,6 +5516,31 @@ cookie@0.5.0:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
   integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
 
+cookie@0.6.0, cookie@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051"
+  integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==
+
+copy-descriptor@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==
+
+copy-template-dir@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/copy-template-dir/-/copy-template-dir-1.4.0.tgz#cb2bd62415abe963a53bb867bb24379df3998112"
+  integrity sha512-xkXSJhvKz4MfLbVkZ7GyCaFo4ciB3uKI/HHzkGwj1eyTH5+7RTFxW5CE0irWAZgV5oFcO9hd6+NVXAtY9hlo7Q==
+  dependencies:
+    end-of-stream "^1.1.0"
+    graceful-fs "^4.1.3"
+    maxstache "^1.0.0"
+    maxstache-stream "^1.0.0"
+    mkdirp "^0.5.1"
+    noop2 "^2.0.0"
+    pump "^1.0.0"
+    readdirp "^2.0.0"
+    run-parallel "^1.1.4"
+
 copy-text-to-clipboard@^3.0.1:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/copy-text-to-clipboard/-/copy-text-to-clipboard-3.2.0.tgz#0202b2d9bdae30a49a53f898626dcc3b49ad960b"
@@ -3356,7 +5575,7 @@ core-js@^3.23.3:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.35.0.tgz#58e651688484f83c34196ca13f099574ee53d6b4"
   integrity sha512-ntakECeqg81KqMueeGJ79Q5ZgQNR+6eaE8sxGCx62zMbAIj65q+uYvatToew3m6eAGdU4gNZwpZ34NMe4GYswg==
 
-core-util-is@~1.0.0:
+core-util-is@^1.0.3, core-util-is@~1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
@@ -3407,6 +5626,71 @@ cosmiconfig@^8.3.5:
     parse-json "^5.2.0"
     path-type "^4.0.0"
 
+cp-file@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/cp-file/-/cp-file-10.0.0.tgz#bbae9ecb9f505951b862880d2901e1f56de7a4dc"
+  integrity sha512-vy2Vi1r2epK5WqxOLnskeKeZkdZvTKfFZQCplE3XWsP+SUJyd5XAUFC9lFgTjjXJF2GMne/UML14iEmkAaDfFg==
+  dependencies:
+    graceful-fs "^4.2.10"
+    nested-error-stacks "^2.1.1"
+    p-event "^5.0.1"
+
+cp-file@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/cp-file/-/cp-file-9.1.0.tgz#e98e30db72d57d47b5b1d444deb70d05e5684921"
+  integrity sha512-3scnzFj/94eb7y4wyXRWwvzLFaQp87yyfTnChIjlfYrVqp5lVO3E2hIJMeQIltUT0K2ZAB3An1qXcBmwGyvuwA==
+  dependencies:
+    graceful-fs "^4.1.2"
+    make-dir "^3.0.0"
+    nested-error-stacks "^2.0.0"
+    p-event "^4.1.0"
+
+cpy@^9.0.0:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/cpy/-/cpy-9.0.1.tgz#7f3ad0ad5bafe0bc70645c4bb567969927cadb9f"
+  integrity sha512-D9U0DR5FjTCN3oMTcFGktanHnAG5l020yvOCR1zKILmAyPP7I/9pl6NFgRbDcmSENtbK1sQLBz1p9HIOlroiNg==
+  dependencies:
+    arrify "^3.0.0"
+    cp-file "^9.1.0"
+    globby "^13.1.1"
+    junk "^4.0.0"
+    micromatch "^4.0.4"
+    nested-error-stacks "^2.1.0"
+    p-filter "^3.0.0"
+    p-map "^5.3.0"
+
+crc-32@^1.2.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.2.tgz#3cad35a934b8bf71f25ca524b6da51fb7eace2ff"
+  integrity sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==
+
+crc32-stream@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-5.0.1.tgz#bc1581c9a9022a9242605dc91b14e069e3aa87a5"
+  integrity sha512-lO1dFui+CEUh/ztYIpgpKItKW9Bb4NWakCRJrnqAbFIYD+OZAwb2VfD5T5eXMw2FNcsDHkQcNl/Wh3iVXYwU6g==
+  dependencies:
+    crc-32 "^1.2.0"
+    readable-stream "^3.4.0"
+
+create-require@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
+  integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
+
+cron-parser@4.8.1:
+  version "4.8.1"
+  resolved "https://registry.yarnpkg.com/cron-parser/-/cron-parser-4.8.1.tgz#47062ea63d21d78c10ddedb08ea4c5b6fc2750fb"
+  integrity sha512-jbokKWGcyU4gl6jAfX97E1gDpY12DJ1cLJZmoDzaAln/shZ+S3KBFBuA2Q6WeUN4gJf/8klnV1EfvhA2lK5IRQ==
+  dependencies:
+    luxon "^3.2.1"
+
+cron-parser@^4.1.0:
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/cron-parser/-/cron-parser-4.9.0.tgz#0340694af3e46a0894978c6f52a6dbb5c0f11ad5"
+  integrity sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==
+  dependencies:
+    luxon "^3.2.1"
+
 cross-fetch@^3.1.5:
   version "3.1.8"
   resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.8.tgz#0327eba65fd68a7d119f8fb2bf9334a1a7956f82"
@@ -3423,11 +5707,23 @@ cross-spawn@^7.0.3:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
+crossws@^0.2.0, crossws@^0.2.2:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/crossws/-/crossws-0.2.4.tgz#82a8b518bff1018ab1d21ced9e35ffbe1681ad03"
+  integrity sha512-DAxroI2uSOgUKLz00NX6A8U/8EE3SZHmIND+10jkVSaypvyt57J5JEOxAQOL6lQxyzi/wZbTIwssU1uy69h5Vg==
+
 crypto-random-string@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
   integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
 
+crypto-random-string@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-4.0.0.tgz#5a3cc53d7dd86183df5da0312816ceeeb5bb1fc2"
+  integrity sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==
+  dependencies:
+    type-fest "^1.0.1"
+
 css-declaration-sorter@^6.3.1:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz#28beac7c20bad7f1775be3a7129d7eae409a3a71"
@@ -3489,6 +5785,22 @@ css-tree@^1.1.2, css-tree@^1.1.3:
     mdn-data "2.0.14"
     source-map "^0.6.1"
 
+css-tree@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20"
+  integrity sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==
+  dependencies:
+    mdn-data "2.0.30"
+    source-map-js "^1.0.1"
+
+css-tree@~2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.2.1.tgz#36115d382d60afd271e377f9c5f67d02bd48c032"
+  integrity sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==
+  dependencies:
+    mdn-data "2.0.28"
+    source-map-js "^1.0.1"
+
 css-what@^6.0.1, css-what@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
@@ -3499,6 +5811,11 @@ cssesc@^3.0.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
+cssfilter@0.0.10:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/cssfilter/-/cssfilter-0.0.10.tgz#c6d2672632a2e5c83e013e6864a42ce8defd20ae"
+  integrity sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw==
+
 cssnano-preset-advanced@^5.3.8:
   version "5.3.10"
   resolved "https://registry.yarnpkg.com/cssnano-preset-advanced/-/cssnano-preset-advanced-5.3.10.tgz#25558a1fbf3a871fb6429ce71e41be7f5aca6eef"
@@ -3567,11 +5884,23 @@ csso@^4.2.0:
   dependencies:
     css-tree "^1.1.2"
 
+csso@^5.0.5:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/csso/-/csso-5.0.5.tgz#f9b7fe6cc6ac0b7d90781bb16d5e9874303e2ca6"
+  integrity sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==
+  dependencies:
+    css-tree "~2.2.0"
+
 csstype@^3.0.2:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
   integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
 
+cyclist@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.2.tgz#673b5f233bf34d8e602b949429f8171d9121bea3"
+  integrity sha512-0sVXIohTfLqVIW3kb/0n6IiWF3Ifj5nm2XaSrLq2DI6fKIGa2fYAZdk917rUneaeLVpYfFcyXE2ft0fe3remsA==
+
 cytoscape-cose-bilkent@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/cytoscape-cose-bilkent/-/cytoscape-cose-bilkent-4.1.0.tgz#762fa121df9930ffeb51a495d87917c570ac209b"
@@ -3846,6 +6175,11 @@ dagre-d3-es@7.0.9:
     d3 "^7.8.2"
     lodash-es "^4.17.21"
 
+data-uri-to-buffer@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz#d8feb2b2881e6a4f58c2e08acfd0e2834e26222e"
+  integrity sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==
+
 date-fns@^2.30.0:
   version "2.30.0"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0"
@@ -3853,6 +6187,13 @@ date-fns@^2.30.0:
   dependencies:
     "@babel/runtime" "^7.21.0"
 
+date-time@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/date-time/-/date-time-3.1.0.tgz#0d1e934d170579f481ed8df1e2b8ff70ee845e1e"
+  integrity sha512-uqCUKXE5q1PNBXjPqvwhwJf9SwMoAHBgWJ6DcrnS5o+W2JOiIILl0JEdVD8SGujrNS02GGxgwAg2PN2zONgtjg==
+  dependencies:
+    time-zone "^1.0.0"
+
 dayjs@^1.11.7:
   version "1.11.10"
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.10.tgz#68acea85317a6e164457d6d6947564029a6a16a0"
@@ -3863,20 +6204,32 @@ debounce@^1.2.1:
   resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
   integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
 
-debug@2.6.9, debug@^2.6.0:
+debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
+debug@4, debug@4.3.4, debug@^4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
   dependencies:
     ms "2.1.2"
 
+decache@4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/decache/-/decache-4.6.2.tgz#c1df1325a2f36d53922e08f33380f083148199cd"
+  integrity sha512-2LPqkLeu8XWHU8qNCS3kcF6sCcb5zIzvWaAHYSvPfwhdd7mHuah29NssMzrTYyHN4F5oFy2ko9OBYxegtU0FEw==
+  dependencies:
+    callsite "^1.0.0"
+
+decode-uri-component@^0.2.0:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
+  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
+
 decompress-response@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
@@ -3908,11 +6261,23 @@ default-gateway@^6.0.3:
   dependencies:
     execa "^5.0.0"
 
+defaults@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz#b0b02062c1e2aa62ff5d9528f0f98baa90978d7a"
+  integrity sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==
+  dependencies:
+    clone "^1.0.2"
+
 defer-to-connect@^1.0.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
   integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
 
+defer-to-connect@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587"
+  integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==
+
 define-data-property@^1.0.1, define-data-property@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3"
@@ -3922,6 +6287,15 @@ define-data-property@^1.0.1, define-data-property@^1.1.1:
     gopd "^1.0.1"
     has-property-descriptors "^1.0.0"
 
+define-data-property@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"
+  integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==
+  dependencies:
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    gopd "^1.0.1"
+
 define-lazy-prop@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
@@ -3936,6 +6310,33 @@ define-properties@^1.2.1:
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==
+  dependencies:
+    is-descriptor "^0.1.0"
+
+define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  integrity sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==
+  dependencies:
+    is-descriptor "^1.0.0"
+
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
+defu@^6.1.3, defu@^6.1.4:
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/defu/-/defu-6.1.4.tgz#4e0c9cf9ff68fe5f3d7f2765cc1a012dfdcb0479"
+  integrity sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==
+
 del@^6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/del/-/del-6.1.1.tgz#3b70314f1ec0aa325c6b14eb36b95786671edb7a"
@@ -3962,6 +6363,11 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
+
 depd@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
@@ -3972,6 +6378,16 @@ depd@~1.1.2:
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
   integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
 
+deprecation@^2.0.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
+  integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
+
+destr@^2.0.2, destr@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/destr/-/destr-2.0.3.tgz#7f9e97cb3d16dbdca7be52aca1644ce402cfe449"
+  integrity sha512-2N3BOUU4gYMpTP24s5rF5iP7BDr7uNTCs4ozw3kf/eKfvWSIu93GEBi5m427YoyJoeOzQ5smuu4nNAPGb8idSQ==
+
 destroy@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
@@ -3984,11 +6400,21 @@ detab@2.0.4:
   dependencies:
     repeat-string "^1.5.4"
 
+detect-libc@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==
+
 detect-libc@^2.0.0, detect-libc@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.2.tgz#8ccf2ba9315350e1241b88d0ac3b0e1fbd99605d"
   integrity sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==
 
+detect-libc@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.3.tgz#f0cd503b40f9939b894697d19ad50895e30cf700"
+  integrity sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==
+
 detect-node@^2.0.4:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
@@ -4010,6 +6436,76 @@ detect-port@^1.3.0:
     address "^1.0.1"
     debug "4"
 
+detective-amd@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/detective-amd/-/detective-amd-5.0.2.tgz#579900f301c160efe037a6377ec7e937434b2793"
+  integrity sha512-XFd/VEQ76HSpym80zxM68ieB77unNuoMwopU2TFT/ErUk5n4KvUTwW4beafAVUugrjV48l4BmmR0rh2MglBaiA==
+  dependencies:
+    ast-module-types "^5.0.0"
+    escodegen "^2.0.0"
+    get-amd-module-type "^5.0.1"
+    node-source-walk "^6.0.1"
+
+detective-cjs@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/detective-cjs/-/detective-cjs-5.0.1.tgz#836ad51c6de4863efc7c419ec243694f760ff8b2"
+  integrity sha512-6nTvAZtpomyz/2pmEmGX1sXNjaqgMplhQkskq2MLrar0ZAIkHMrDhLXkRiK2mvbu9wSWr0V5/IfiTrZqAQMrmQ==
+  dependencies:
+    ast-module-types "^5.0.0"
+    node-source-walk "^6.0.0"
+
+detective-es6@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/detective-es6/-/detective-es6-4.0.1.tgz#38d5d49a6d966e992ef8f2d9bffcfe861a58a88a"
+  integrity sha512-k3Z5tB4LQ8UVHkuMrFOlvb3GgFWdJ9NqAa2YLUU/jTaWJIm+JJnEh4PsMc+6dfT223Y8ACKOaC0qcj7diIhBKw==
+  dependencies:
+    node-source-walk "^6.0.1"
+
+detective-postcss@^6.1.3:
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/detective-postcss/-/detective-postcss-6.1.3.tgz#51a2d4419327ad85d0af071c7054c79fafca7e73"
+  integrity sha512-7BRVvE5pPEvk2ukUWNQ+H2XOq43xENWbH0LcdCE14mwgTBEAMoAx+Fc1rdp76SmyZ4Sp48HlV7VedUnP6GA1Tw==
+  dependencies:
+    is-url "^1.2.4"
+    postcss "^8.4.23"
+    postcss-values-parser "^6.0.2"
+
+detective-sass@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/detective-sass/-/detective-sass-5.0.3.tgz#63e54bc9b32f4bdbd9d5002308f9592a3d3a508f"
+  integrity sha512-YsYT2WuA8YIafp2RVF5CEfGhhyIVdPzlwQgxSjK+TUm3JoHP+Tcorbk3SfG0cNZ7D7+cYWa0ZBcvOaR0O8+LlA==
+  dependencies:
+    gonzales-pe "^4.3.0"
+    node-source-walk "^6.0.1"
+
+detective-scss@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/detective-scss/-/detective-scss-4.0.3.tgz#79758baa0158f72bfc4481eb7e21cc3b5f1ea6eb"
+  integrity sha512-VYI6cHcD0fLokwqqPFFtDQhhSnlFWvU614J42eY6G0s8c+MBhi9QAWycLwIOGxlmD8I/XvGSOUV1kIDhJ70ZPg==
+  dependencies:
+    gonzales-pe "^4.3.0"
+    node-source-walk "^6.0.1"
+
+detective-stylus@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/detective-stylus/-/detective-stylus-4.0.0.tgz#ce97b6499becdc291de7b3c11df8c352c1eee46e"
+  integrity sha512-TfPotjhszKLgFBzBhTOxNHDsutIxx9GTWjrL5Wh7Qx/ydxKhwUrlSFeLIn+ZaHPF+h0siVBkAQSuy6CADyTxgQ==
+
+detective-typescript@^11.1.0:
+  version "11.2.0"
+  resolved "https://registry.yarnpkg.com/detective-typescript/-/detective-typescript-11.2.0.tgz#5b1450b518cb84b6cfb98ea72d5edd9660668e1b"
+  integrity sha512-ARFxjzizOhPqs1fYC/2NMC3N4jrQ6HvVflnXBTRqNEqJuXwyKLRr9CrJwkRcV/SnZt1sNXgsF6FPm0x57Tq0rw==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "^5.62.0"
+    ast-module-types "^5.0.0"
+    node-source-walk "^6.0.2"
+    typescript "^5.4.4"
+
+diff@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
+  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
+
 dir-glob@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
@@ -4104,6 +6600,13 @@ dot-case@^3.0.4:
     no-case "^3.0.4"
     tslib "^2.0.3"
 
+dot-prop@7.2.0, dot-prop@^7.0.0, dot-prop@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-7.2.0.tgz#468172a3529779814d21a779c1ba2f6d76609809"
+  integrity sha512-Ol/IPXUARn9CSbkrdV4VJo7uCy1I3VuSiWCaFSg+8BdUOzF9n3jefIpcgAydvUZbTdEBZs2vEiTiS9m61ssiDA==
+  dependencies:
+    type-fest "^2.11.2"
+
 dot-prop@^5.2.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
@@ -4111,6 +6614,18 @@ dot-prop@^5.2.0:
   dependencies:
     is-obj "^2.0.0"
 
+dot-prop@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-6.0.1.tgz#fc26b3cf142b9e59b74dbd39ed66ce620c681083"
+  integrity sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==
+  dependencies:
+    is-obj "^2.0.0"
+
+dotenv@16.0.3:
+  version "16.0.3"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.3.tgz#115aec42bac5053db3c456db30cc243a5a836a07"
+  integrity sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==
+
 dotenv@^16.3.1:
   version "16.3.1"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e"
@@ -4131,6 +6646,13 @@ eastasianwidth@^0.2.0:
   resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
   integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
 
+ecdsa-sig-formatter@1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf"
+  integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==
+  dependencies:
+    safe-buffer "^5.0.1"
+
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -4166,6 +6688,11 @@ emoticon@^3.2.0:
   resolved "https://registry.yarnpkg.com/emoticon/-/emoticon-3.2.0.tgz#c008ca7d7620fac742fe1bf4af8ff8fed154ae7f"
   integrity sha512-SNujglcLTTg+lDAcApPNgEdudaqQFiAbJCqzjNxJkvN9vAwCGi0uu8IUVvx+f16h+V44KCY6Y2yboroc9pilHg==
 
+enabled@2.0.x:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2"
+  integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==
+
 encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
@@ -4186,7 +6713,7 @@ enhanced-resolve@^5.15.0:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
-entities@^2.0.0:
+entities@^2.0.0, entities@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
   integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
@@ -4196,6 +6723,16 @@ entities@^4.2.0, entities@^4.4.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
   integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
 
+env-paths@3.0.0, env-paths@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-3.0.0.tgz#2f1e89c2f6dbd3408e1b1711dd82d62e317f58da"
+  integrity sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==
+
+envinfo@7.8.1:
+  version "7.8.1"
+  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475"
+  integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==
+
 error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
@@ -4203,11 +6740,98 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
+error-stack-parser@^2.0.2, error-stack-parser@^2.0.3:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz#229cb01cdbfa84440bfa91876285b94680188286"
+  integrity sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==
+  dependencies:
+    stackframe "^1.3.4"
+
+es-define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845"
+  integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==
+  dependencies:
+    get-intrinsic "^1.2.4"
+
+es-errors@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
+  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
+
+es-module-lexer@^1.0.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.5.0.tgz#4878fee3789ad99e065f975fdd3c645529ff0236"
+  integrity sha512-pqrTKmwEIgafsYZAGw9kszYzmagcE/n4dbgwGWLEXg7J4QFJVQRBld8j3Q3GNez79jzxZshq0bcT962QHOghjw==
+
 es-module-lexer@^1.2.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.4.1.tgz#41ea21b43908fe6a287ffcbe4300f790555331f5"
   integrity sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==
 
+es6-promisify@^6.0.0:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-6.1.1.tgz#46837651b7b06bf6fff893d03f29393668d01621"
+  integrity sha512-HBL8I3mIki5C1Cc9QjKUenHtnG0A5/xA8Q/AllRcfiwl2CZFXGK7ddBiCoRwAix4i2KxcQfjtIVcrVbB3vbmwg==
+
+esbuild@0.19.11:
+  version "0.19.11"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.19.11.tgz#4a02dca031e768b5556606e1b468fe72e3325d96"
+  integrity sha512-HJ96Hev2hX/6i5cDVwcqiJBBtuo9+FeIJOtZ9W1kA5M6AMJRHUZlpYZ1/SbEwtO0ioNAW8rUooVpC/WehY2SfA==
+  optionalDependencies:
+    "@esbuild/aix-ppc64" "0.19.11"
+    "@esbuild/android-arm" "0.19.11"
+    "@esbuild/android-arm64" "0.19.11"
+    "@esbuild/android-x64" "0.19.11"
+    "@esbuild/darwin-arm64" "0.19.11"
+    "@esbuild/darwin-x64" "0.19.11"
+    "@esbuild/freebsd-arm64" "0.19.11"
+    "@esbuild/freebsd-x64" "0.19.11"
+    "@esbuild/linux-arm" "0.19.11"
+    "@esbuild/linux-arm64" "0.19.11"
+    "@esbuild/linux-ia32" "0.19.11"
+    "@esbuild/linux-loong64" "0.19.11"
+    "@esbuild/linux-mips64el" "0.19.11"
+    "@esbuild/linux-ppc64" "0.19.11"
+    "@esbuild/linux-riscv64" "0.19.11"
+    "@esbuild/linux-s390x" "0.19.11"
+    "@esbuild/linux-x64" "0.19.11"
+    "@esbuild/netbsd-x64" "0.19.11"
+    "@esbuild/openbsd-x64" "0.19.11"
+    "@esbuild/sunos-x64" "0.19.11"
+    "@esbuild/win32-arm64" "0.19.11"
+    "@esbuild/win32-ia32" "0.19.11"
+    "@esbuild/win32-x64" "0.19.11"
+
+esbuild@0.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.20.2.tgz#9d6b2386561766ee6b5a55196c6d766d28c87ea1"
+  integrity sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==
+  optionalDependencies:
+    "@esbuild/aix-ppc64" "0.20.2"
+    "@esbuild/android-arm" "0.20.2"
+    "@esbuild/android-arm64" "0.20.2"
+    "@esbuild/android-x64" "0.20.2"
+    "@esbuild/darwin-arm64" "0.20.2"
+    "@esbuild/darwin-x64" "0.20.2"
+    "@esbuild/freebsd-arm64" "0.20.2"
+    "@esbuild/freebsd-x64" "0.20.2"
+    "@esbuild/linux-arm" "0.20.2"
+    "@esbuild/linux-arm64" "0.20.2"
+    "@esbuild/linux-ia32" "0.20.2"
+    "@esbuild/linux-loong64" "0.20.2"
+    "@esbuild/linux-mips64el" "0.20.2"
+    "@esbuild/linux-ppc64" "0.20.2"
+    "@esbuild/linux-riscv64" "0.20.2"
+    "@esbuild/linux-s390x" "0.20.2"
+    "@esbuild/linux-x64" "0.20.2"
+    "@esbuild/netbsd-x64" "0.20.2"
+    "@esbuild/openbsd-x64" "0.20.2"
+    "@esbuild/sunos-x64" "0.20.2"
+    "@esbuild/win32-arm64" "0.20.2"
+    "@esbuild/win32-ia32" "0.20.2"
+    "@esbuild/win32-x64" "0.20.2"
+
 escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
@@ -4218,11 +6842,21 @@ escape-goat@^2.0.0:
   resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675"
   integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==
 
+escape-goat@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-4.0.0.tgz#9424820331b510b0666b98f7873fe11ac4aa8081"
+  integrity sha512-2Sd4ShcWxbx6OY1IHyla/CVNwvg7XwZVoXZHcSu9w9SReNP1EzzD5T8NWKIR38fIqEns9kDWKUQTXXAmlDrdPg==
+
 escape-html@^1.0.3, escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
 
+escape-string-regexp@5.0.0, escape-string-regexp@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz#4683126b500b61762f2dbebace1806e8be31b1c8"
+  integrity sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==
+
 escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
@@ -4233,6 +6867,17 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
+escodegen@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.1.0.tgz#ba93bbb7a43986d29d6041f99f5262da773e2e17"
+  integrity sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==
+  dependencies:
+    esprima "^4.0.1"
+    estraverse "^5.2.0"
+    esutils "^2.0.2"
+  optionalDependencies:
+    source-map "~0.6.1"
+
 eslint-scope@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
@@ -4241,7 +6886,12 @@ eslint-scope@5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-esprima@^4.0.0:
+eslint-visitor-keys@^3.3.0:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
+  integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
+
+esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
@@ -4263,7 +6913,12 @@ estraverse@^5.2.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
-esutils@^2.0.2:
+estree-walker@2.0.2, estree-walker@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
+  integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
+
+esutils@^2.0.2, esutils@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
@@ -4273,7 +6928,7 @@ eta@^2.0.0:
   resolved "https://registry.yarnpkg.com/eta/-/eta-2.2.0.tgz#eb8b5f8c4e8b6306561a455e62cd7492fe3a9b8a"
   integrity sha512-UVQ72Rqjy/ZKQalzV5dCCJP80GrmPrMxh6NlNf+erV6ObL0ZFkhCstWRawS85z3smdr3d2wXPsZEY7rDPfGd2g==
 
-etag@~1.8.1:
+etag@1.8.1, etag@^1.8.1, etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
@@ -4286,17 +6941,27 @@ eval@^0.1.8:
     "@types/node" "*"
     require-like ">= 0.1.1"
 
+event-target-shim@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
+  integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
+
 eventemitter3@^4.0.0:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
   integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
 
-events@^3.2.0:
+eventemitter3@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.1.tgz#53f5ffd0a492ac800721bb42c66b841de96423c4"
+  integrity sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==
+
+events@^3.2.0, events@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
-execa@^5.0.0:
+execa@5.1.1, execa@^5.0.0, execa@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
   integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
@@ -4311,11 +6976,98 @@ execa@^5.0.0:
     signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
+execa@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-6.1.0.tgz#cea16dee211ff011246556388effa0818394fb20"
+  integrity sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==
+  dependencies:
+    cross-spawn "^7.0.3"
+    get-stream "^6.0.1"
+    human-signals "^3.0.1"
+    is-stream "^3.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^5.1.0"
+    onetime "^6.0.0"
+    signal-exit "^3.0.7"
+    strip-final-newline "^3.0.0"
+
+execa@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-8.0.1.tgz#51f6a5943b580f963c3ca9c6321796db8cc39b8c"
+  integrity sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==
+  dependencies:
+    cross-spawn "^7.0.3"
+    get-stream "^8.0.1"
+    human-signals "^5.0.0"
+    is-stream "^3.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^5.1.0"
+    onetime "^6.0.0"
+    signal-exit "^4.1.0"
+    strip-final-newline "^3.0.0"
+
+expand-brackets@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==
+  dependencies:
+    debug "^2.3.3"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    posix-character-classes "^0.1.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
 expand-template@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
   integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
 
+express-logging@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/express-logging/-/express-logging-1.1.1.tgz#62839618cbab5bb3610f1a1c1485352fe9d26c2a"
+  integrity sha512-1KboYwxxCG5kwkJHR5LjFDTD1Mgl8n4PIMcCuhhd/1OqaxlC68P3QKbvvAbZVUtVgtlxEdTgSUwf6yxwzRCuuA==
+  dependencies:
+    on-headers "^1.0.0"
+
+express@4.19.2:
+  version "4.19.2"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465"
+  integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==
+  dependencies:
+    accepts "~1.3.8"
+    array-flatten "1.1.1"
+    body-parser "1.20.2"
+    content-disposition "0.5.4"
+    content-type "~1.0.4"
+    cookie "0.6.0"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "2.0.0"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "1.2.0"
+    fresh "0.5.2"
+    http-errors "2.0.0"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "2.4.1"
+    parseurl "~1.3.3"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.7"
+    qs "6.11.0"
+    range-parser "~1.2.1"
+    safe-buffer "5.2.1"
+    send "0.18.0"
+    serve-static "1.15.0"
+    setprototypeof "1.2.0"
+    statuses "2.0.1"
+    type-is "~1.6.18"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
 express@^4.17.3:
   version "4.18.2"
   resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
@@ -4353,6 +7105,21 @@ express@^4.17.3:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
+ext-list@^2.0.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/ext-list/-/ext-list-2.2.2.tgz#0b98e64ed82f5acf0f2931babf69212ef52ddd37"
+  integrity sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==
+  dependencies:
+    mime-db "^1.28.0"
+
+ext-name@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ext-name/-/ext-name-5.0.0.tgz#70781981d183ee15d13993c8822045c506c8f0a6"
+  integrity sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==
+  dependencies:
+    ext-list "^2.0.0"
+    sort-keys-length "^1.0.0"
+
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -4360,17 +7127,84 @@ extend-shallow@^2.0.1:
   dependencies:
     is-extendable "^0.1.0"
 
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  integrity sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==
+  dependencies:
+    assign-symbols "^1.0.0"
+    is-extendable "^1.0.1"
+
 extend@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
+external-editor@^3.0.3:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
+  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
+  dependencies:
+    chardet "^0.7.0"
+    iconv-lite "^0.4.24"
+    tmp "^0.0.33"
+
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
+  dependencies:
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    expand-brackets "^2.1.4"
+    extend-shallow "^2.0.1"
+    fragment-cache "^0.2.1"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+extract-zip@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
+  integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
+  dependencies:
+    debug "^4.1.1"
+    get-stream "^5.1.0"
+    yauzl "^2.10.0"
+  optionalDependencies:
+    "@types/yauzl" "^2.9.1"
+
+fast-content-type-parse@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fast-content-type-parse/-/fast-content-type-parse-1.1.0.tgz#4087162bf5af3294d4726ff29b334f72e3a1092c"
+  integrity sha512-fBHHqSTFLVnR61C+gltJuE5GkVQMV0S2nqUO8TJ+5Z3qAKG8vAx4FKai1s5jq/inV1+sREynIWSuQ6HgoSXpDQ==
+
+fast-decode-uri-component@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/fast-decode-uri-component/-/fast-decode-uri-component-1.0.1.tgz#46f8b6c22b30ff7a81357d4f59abfae938202543"
+  integrity sha512-WKgKWg5eUxvRZGwW8FvfbaH7AXSh2cL+3j5fMGzUMCxWBJ3dV3a7Wz8y2f/uQ0e3B6WmodD3oS54jTQ9HVTIIg==
+
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-glob@^3.2.11, fast-glob@^3.2.9, fast-glob@^3.3.0:
+fast-diff@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0"
+  integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==
+
+fast-equals@^3.0.1:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/fast-equals/-/fast-equals-3.0.3.tgz#8e6cb4e51ca1018d87dd41982ef92758b3e4197f"
+  integrity sha512-NCe8qxnZFARSHGztGMZOO/PC1qa5MIFB5Hp66WdzbCRAz8U8US3bx1UTgLS49efBQPcUtO9gf5oVEY8o7y/7Kg==
+
+fast-fifo@^1.1.0, fast-fifo@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.2.tgz#286e31de96eb96d38a97899815740ba2a4f3640c"
+  integrity sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==
+
+fast-glob@^3.2.11, fast-glob@^3.2.9, fast-glob@^3.3.0, fast-glob@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
   integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
@@ -4386,6 +7220,41 @@ fast-json-stable-stringify@^2.0.0:
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
+fast-json-stringify@^5.7.0:
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stringify/-/fast-json-stringify-5.15.0.tgz#79ea7203c8e541c744e1d59a4fb17133688c181a"
+  integrity sha512-BUEAAyDKb64u+kmkINYfXUUiKjBKerSmVu/dzotfaWSHBxR44JFrOZgkhMO6VxDhDfiuAoi8mx4drd5nvNdA4Q==
+  dependencies:
+    "@fastify/merge-json-schemas" "^0.1.0"
+    ajv "^8.10.0"
+    ajv-formats "^3.0.1"
+    fast-deep-equal "^3.1.3"
+    fast-uri "^2.1.0"
+    json-schema-ref-resolver "^1.0.1"
+    rfdc "^1.2.0"
+
+fast-querystring@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/fast-querystring/-/fast-querystring-1.1.2.tgz#a6d24937b4fc6f791b4ee31dcb6f53aeafb89f53"
+  integrity sha512-g6KuKWmFXc0fID8WWH0jit4g0AGBoJhCkJMb1RmbsSEUNvQ+ZC8D6CUZ+GtF8nMzSPXnhiePyyqqipzNNEnHjg==
+  dependencies:
+    fast-decode-uri-component "^1.0.1"
+
+fast-redact@^3.1.1:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/fast-redact/-/fast-redact-3.5.0.tgz#e9ea02f7e57d0cd8438180083e93077e496285e4"
+  integrity sha512-dwsoQlS7h9hMeYUq1W++23NDcBLV4KqONnITDV9DjfS3q1SgDGVrBdvvTLUotWtPSD7asWDV9/CmsZPy8Hf70A==
+
+fast-safe-stringify@^2.0.7, fast-safe-stringify@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884"
+  integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==
+
+fast-uri@^2.0.0, fast-uri@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-2.3.0.tgz#bdae493942483d299e7285dcb4627767d42e2793"
+  integrity sha512-eel5UKGn369gGEWOqBShmFJWfq/xSJvsgDzgLYC845GneayWvXBf0lJCBn5qTABfewy1ZDPoaR5OZCP+kssfuw==
+
 fast-url-parser@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/fast-url-parser/-/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d"
@@ -4393,6 +7262,45 @@ fast-url-parser@1.1.3:
   dependencies:
     punycode "^1.3.2"
 
+fastest-levenshtein@1.0.16:
+  version "1.0.16"
+  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
+  integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
+
+fastify-plugin@^4.0.0:
+  version "4.5.1"
+  resolved "https://registry.yarnpkg.com/fastify-plugin/-/fastify-plugin-4.5.1.tgz#44dc6a3cc2cce0988bc09e13f160120bbd91dbee"
+  integrity sha512-stRHYGeuqpEZTL1Ef0Ovr2ltazUT9g844X5z/zEBFLG8RYlpDiOCIG+ATvYEp+/zmc7sN29mcIMp8gvYplYPIQ==
+
+fastify@4.17.0:
+  version "4.17.0"
+  resolved "https://registry.yarnpkg.com/fastify/-/fastify-4.17.0.tgz#b2c8245e572edef0b02a167d2d411a3c8a46d01a"
+  integrity sha512-tzuY1tgWJo2Y6qEKwmLhFvACUmr68Io2pqP/sDKU71KRM6A6R3DrCDqLGqANbeLZcKUfdfY58ut35CGqemcTgg==
+  dependencies:
+    "@fastify/ajv-compiler" "^3.5.0"
+    "@fastify/error" "^3.0.0"
+    "@fastify/fast-json-stringify-compiler" "^4.3.0"
+    abstract-logging "^2.0.1"
+    avvio "^8.2.0"
+    fast-content-type-parse "^1.0.0"
+    fast-json-stringify "^5.7.0"
+    find-my-way "^7.6.0"
+    light-my-request "^5.6.1"
+    pino "^8.5.0"
+    process-warning "^2.0.0"
+    proxy-addr "^2.0.7"
+    rfdc "^1.3.0"
+    secure-json-parse "^2.5.0"
+    semver "^7.3.7"
+    tiny-lru "^11.0.1"
+
+fastq@^1.17.1:
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47"
+  integrity sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==
+  dependencies:
+    reusify "^1.0.4"
+
 fastq@^1.6.0:
   version "1.16.0"
   resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.16.0.tgz#83b9a9375692db77a822df081edb6a9cf6839320"
@@ -4432,6 +7340,23 @@ fbjs@^3.0.0, fbjs@^3.0.1:
     setimmediate "^1.0.5"
     ua-parser-js "^1.0.35"
 
+fd-slicer@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
+  integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==
+  dependencies:
+    pend "~1.2.0"
+
+fdir@^6.0.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.1.1.tgz#316b58145a05223b75c8b371e80bb3bad8f1441e"
+  integrity sha512-QfKBVg453Dyn3mr0Q0O+Tkr1r79lOTAKSi9f/Ot4+qVEwxWhav2Z+SudrG9vQjM2aYRMQQZ2/Q1zdA8ACM1pDg==
+
+fecha@^4.2.0:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd"
+  integrity sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==
+
 feed@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/feed/-/feed-4.2.2.tgz#865783ef6ed12579e2c44bbef3c9113bc4956a7e"
@@ -4439,6 +7364,55 @@ feed@^4.2.2:
   dependencies:
     xml-js "^1.6.11"
 
+fetch-blob@^3.1.2, fetch-blob@^3.1.4:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/fetch-blob/-/fetch-blob-3.2.0.tgz#f09b8d4bbd45adc6f0c20b7e787e793e309dcce9"
+  integrity sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==
+  dependencies:
+    node-domexception "^1.0.0"
+    web-streams-polyfill "^3.0.3"
+
+fetch-node-website@^7.3.0:
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/fetch-node-website/-/fetch-node-website-7.3.0.tgz#89823c96087935eeb2e80ce0e7a6557d27761bb7"
+  integrity sha512-/wayUHbdVUWrD72aqRNNrr6+MHnCkumZgNugN0RfiWJpbNJUdAkMk4Z18MGayGZVVqYXR1RWrV+bIFEt5HuBZg==
+  dependencies:
+    cli-progress "^3.11.2"
+    colors-option "^4.4.0"
+    figures "^5.0.0"
+    got "^12.3.1"
+    is-plain-obj "^4.1.0"
+
+figures@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  integrity sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+figures@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
+  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+figures@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-4.0.1.tgz#27b26609907bc888b3e3b0ef5403643f80aa2518"
+  integrity sha512-rElJwkA/xS04Vfg+CaZodpso7VqBknOYbzi6I76hI4X80RUjkSxO2oAyPmGbuXUppywjqndOrQDl817hDnI++w==
+  dependencies:
+    escape-string-regexp "^5.0.0"
+    is-unicode-supported "^1.2.0"
+
+figures@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-5.0.0.tgz#126cd055052dea699f8a54e8c9450e6ecfc44d5f"
+  integrity sha512-ej8ksPF4x6e5wvK9yevct0UCXh8TTFlWGVLlgjZuoBH1HwjIfKE/IdL5mq89sFA7zELi1VhKpmtDnrs7zWyeyg==
+  dependencies:
+    escape-string-regexp "^5.0.0"
+    is-unicode-supported "^1.2.0"
+
 file-loader@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d"
@@ -4447,11 +7421,49 @@ file-loader@^6.2.0:
     loader-utils "^2.0.0"
     schema-utils "^3.0.0"
 
+file-type@^18.5.0:
+  version "18.7.0"
+  resolved "https://registry.yarnpkg.com/file-type/-/file-type-18.7.0.tgz#cddb16f184d6b94106cfc4bb56978726b25cb2a2"
+  integrity sha512-ihHtXRzXEziMrQ56VSgU7wkxh55iNchFkosu7Y9/S+tXHdKyrGjVK0ujbqNnsxzea+78MaLhN6PGmfYSAv1ACw==
+  dependencies:
+    readable-web-to-node-stream "^3.0.2"
+    strtok3 "^7.0.0"
+    token-types "^5.0.1"
+
+file-uri-to-path@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
+  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
+
+filename-reserved-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-3.0.0.tgz#3d5dd6d4e2d73a3fed2ebc4cd0b3448869a081f7"
+  integrity sha512-hn4cQfU6GOT/7cFHXBqeBg2TbrMBgdD0kcjLhvSQYYwm3s4B6cjvBfb7nBALJLAXqmU5xajSa7X2NnUud/VCdw==
+
+filenamify@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-5.1.1.tgz#a1ccc5ae678a5e34f578afcb9b72898264d166d2"
+  integrity sha512-M45CbrJLGACfrPOkrTp3j2EcO9OBkKUYME0eiqOCa7i2poaklU0jhlIaMlr8ijLorT0uLAzrn3qXOp5684CkfA==
+  dependencies:
+    filename-reserved-regex "^3.0.0"
+    strip-outer "^2.0.0"
+    trim-repeated "^2.0.0"
+
 filesize@^8.0.6:
   version "8.0.7"
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-8.0.7.tgz#695e70d80f4e47012c132d57a059e80c6b580bd8"
   integrity sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ==
 
+fill-range@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+    to-regex-range "^2.1.0"
+
 fill-range@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
@@ -4459,6 +7471,16 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
+filter-obj@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-3.0.0.tgz#dba2f9e64e921758ed9a51028ca2ed02d4cccbcf"
+  integrity sha512-oQZM+QmVni8MsYzcq9lgTHD/qeLqaG8XaOPOW7dzuSafVxSUlH1+1ZDefj2OD9f2XsmG5lFl2Euc9NI4jgwFWg==
+
+filter-obj@^5.0.0, filter-obj@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-5.1.0.tgz#5bd89676000a713d7db2e197f660274428e524ed"
+  integrity sha512-qWeTREPoT7I0bifpPUXtxkZJ1XJzxWtfoWWkdVGqa+eCr3SHW/Ocp89o8vLvbUuQnadybJpjOKu4V+RwO6sGng==
+
 finalhandler@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32"
@@ -4481,6 +7503,28 @@ find-cache-dir@^3.3.1:
     make-dir "^3.0.2"
     pkg-dir "^4.1.0"
 
+find-my-way@^7.6.0:
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/find-my-way/-/find-my-way-7.7.0.tgz#d7b51ca6046782bcddd5a8435e99ad057e5a8876"
+  integrity sha512-+SrHpvQ52Q6W9f3wJoJBbAQULJuNEEQwBvlvYwACDhBTLOTMiQ0HYWh4+vC3OivGP2ENcTI1oKlFA2OepJNjhQ==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+    fast-querystring "^1.0.0"
+    safe-regex2 "^2.0.0"
+
+find-up-simple@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/find-up-simple/-/find-up-simple-1.0.0.tgz#21d035fde9fdbd56c8f4d2f63f32fd93a1cfc368"
+  integrity sha512-q7Us7kcjj2VMePAa02hDAF6d+MzsdsAWEwYyOpwUtlerRBkOEPBCRZrAV4XfcSN8fHAgaD0hP7miwoay6DCprw==
+
+find-up@6.3.0, find-up@^6.0.0, find-up@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-6.3.0.tgz#2abab3d3280b2dc7ac10199ef324c4e002c8c790"
+  integrity sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==
+  dependencies:
+    locate-path "^7.1.0"
+    path-exists "^5.0.0"
+
 find-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
@@ -4509,6 +7553,14 @@ flat@^5.0.2:
   resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
   integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
 
+flush-write-stream@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-2.0.0.tgz#6f58e776154f5eefacff92a6e5a681c88ac50f7c"
+  integrity sha512-uXClqPxT4xW0lcdSBheb2ObVU+kuqUk3Jk64EwieirEXZx9XUrVwp/JuBfKAWaM4T5Td/VL7QLDWPXp/MvGm/g==
+  dependencies:
+    inherits "^2.0.3"
+    readable-stream "^3.1.1"
+
 flux@^4.0.1:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/flux/-/flux-4.0.4.tgz#9661182ea81d161ee1a6a6af10d20485ef2ac572"
@@ -4517,11 +7569,28 @@ flux@^4.0.1:
     fbemitter "^3.0.0"
     fbjs "^3.0.1"
 
+fn.name@1.x.x:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc"
+  integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
+
+folder-walker@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/folder-walker/-/folder-walker-3.2.0.tgz#98e00e59773f43416a6dcf0926d4c9436f65121d"
+  integrity sha512-VjAQdSLsl6AkpZNyrQJfO7BXLo4chnStqb055bumZMbRUPpVuPN3a4ktsnRCmrFZjtMlYLkyXiR5rAs4WOpC4Q==
+  dependencies:
+    from2 "^2.1.0"
+
 follow-redirects@^1.0.0, follow-redirects@^1.14.7, follow-redirects@^1.15.4:
   version "1.15.5"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.5.tgz#54d4d6d062c0fa7d9d17feb008461550e3ba8020"
   integrity sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==
 
+for-in@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  integrity sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==
+
 fork-ts-checker-webpack-plugin@^6.5.0:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.3.tgz#eda2eff6e22476a2688d10661688c47f611b37f3"
@@ -4541,6 +7610,11 @@ fork-ts-checker-webpack-plugin@^6.5.0:
     semver "^7.3.2"
     tapable "^1.0.0"
 
+form-data-encoder@^2.1.2:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-2.1.4.tgz#261ea35d2a70d48d30ec7a9603130fa5515e9cd5"
+  integrity sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==
+
 form-data@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
@@ -4550,6 +7624,13 @@ form-data@^4.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
+formdata-polyfill@^4.0.10:
+  version "4.0.10"
+  resolved "https://registry.yarnpkg.com/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz#24807c31c9d402e002ab3d8c720144ceb8848423"
+  integrity sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==
+  dependencies:
+    fetch-blob "^3.1.2"
+
 forwarded@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
@@ -4560,11 +7641,33 @@ fraction.js@^4.3.7:
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7"
   integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==
 
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==
+  dependencies:
+    map-cache "^0.2.2"
+
 fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
   integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
 
+from2-array@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/from2-array/-/from2-array-0.0.4.tgz#eafc16b65f6e2719bcd57fdc1869005ac1332cd6"
+  integrity sha512-0G0cAp7sYLobH7ALsr835x98PU/YeVF7wlwxdWbCUaea7wsa7lJfKZUAo6p2YZGZ8F94luCuqHZS3JtFER6uPg==
+  dependencies:
+    from2 "^2.0.3"
+
+from2@^2.0.3, from2@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+  integrity sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+
 fs-constants@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
@@ -4589,6 +7692,13 @@ fs-extra@^9.0.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
+fs-minipass@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
+  integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
+  dependencies:
+    minipass "^3.0.0"
+
 fs-monkey@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.5.tgz#fe450175f0db0d7ea758102e1d84096acb925788"
@@ -4609,11 +7719,39 @@ function-bind@^1.1.2:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
   integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
+fuzzy@0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/fuzzy/-/fuzzy-0.1.3.tgz#4c76ec2ff0ac1a36a9dccf9a00df8623078d4ed8"
+  integrity sha512-/gZffu4ykarLrCiP3Ygsa86UAo1E5vEVlvTrpkKywXSbP9Xhln3oSp9QSV57gEq3JFFpGJ4GZ+5zdEp3FcUh4w==
+
+gauge@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-3.0.2.tgz#03bf4441c044383908bcfa0656ad91803259b395"
+  integrity sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==
+  dependencies:
+    aproba "^1.0.3 || ^2.0.0"
+    color-support "^1.1.2"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.1"
+    object-assign "^4.1.1"
+    signal-exit "^3.0.0"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+    wide-align "^1.1.2"
+
 gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
+get-amd-module-type@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/get-amd-module-type/-/get-amd-module-type-5.0.1.tgz#bef38ea3674e1aa1bda9c59c8b0da598582f73f2"
+  integrity sha512-jb65zDeHyDjFR1loOVk0HQGM5WNwoGB8aLWy3LKCieMKol0/ProHkhO2X1JxojuN10vbz1qNn09MJ7tNp7qMzw==
+  dependencies:
+    ast-module-types "^5.0.0"
+    node-source-walk "^6.0.1"
+
 get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
@@ -4629,11 +7767,42 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@
     has-symbols "^1.0.3"
     hasown "^2.0.0"
 
+get-intrinsic@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd"
+  integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==
+  dependencies:
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+    hasown "^2.0.0"
+
 get-own-enumerable-property-symbols@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664"
   integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==
 
+get-package-name@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/get-package-name/-/get-package-name-2.2.0.tgz#34d8438b5aa8b887a7c54cdf09854471cc8836de"
+  integrity sha512-LmCKVxioe63Fy6KDAQ/mmCSOSSRUE/x4zdrMD+7dU8quF3bGpzvP8mOmq4Dgce3nzU9AgkVDotucNOOg7c27BQ==
+
+get-port-please@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/get-port-please/-/get-port-please-3.1.2.tgz#502795e56217128e4183025c89a48c71652f4e49"
+  integrity sha512-Gxc29eLs1fbn6LQ4jSU4vXjlwyZhF5HsGuMAa7gqBP4Rw4yxxltyDUuF5MBclFzDTXO+ACchGQoeela4DSfzdQ==
+
+get-port@7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/get-port/-/get-port-7.1.0.tgz#d5a500ebfc7aa705294ec2b83cc38c5d0e364fec"
+  integrity sha512-QB9NKEeDg3xxVwCCwJQ9+xycaz6pBB6iQ76wiWMl1927n0Kir6alPiP+yuiICLLU4jpMe08dXfpebuQppFA2zw==
+
+get-port@^6.1.2:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/get-port/-/get-port-6.1.2.tgz#c1228abb67ba0e17fb346da33b15187833b9c08a"
+  integrity sha512-BrGGraKm2uPqurfGVj/z97/zv8dPleC6x9JBNRTrDNtCkkRF4rPwrQXFgL7+I+q8QSdU4ntLQX2D7KIxSy8nGw==
+
 get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@@ -4648,11 +7817,42 @@ get-stream@^5.1.0:
   dependencies:
     pump "^3.0.0"
 
-get-stream@^6.0.0:
+get-stream@^6.0.0, get-stream@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
+get-stream@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-8.0.1.tgz#def9dfd71742cd7754a7761ed43749a27d02eca2"
+  integrity sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==
+
+get-value@^2.0.3, get-value@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==
+
+gh-release-fetch@4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/gh-release-fetch/-/gh-release-fetch-4.0.3.tgz#258b6f6f247af68228510c89140751f38bd4e7a5"
+  integrity sha512-TOiP1nwLsH5shG85Yt6v6Kjq5JU/44jXyEpbcfPgmj3C829yeXIlx9nAEwQRaxtRF3SJinn2lz7XUkfG9W/U4g==
+  dependencies:
+    "@xhmikosr/downloader" "^13.0.0"
+    node-fetch "^3.3.1"
+    semver "^7.5.3"
+
+git-repo-info@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-2.1.1.tgz#220ffed8cbae74ef8a80e3052f2ccb5179aed058"
+  integrity sha512-8aCohiDo4jwjOwma4FmYFd3i97urZulL8XL24nIPxuE+GZnfsAyy/g2Shqx6OjUiFKUXZM+Yy+KHnOmmA3FVcg==
+
+gitconfiglocal@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/gitconfiglocal/-/gitconfiglocal-2.1.0.tgz#07c28685c55cc5338b27b5acbcfe34aeb92e43d1"
+  integrity sha512-qoerOEliJn3z+Zyn1HW2F6eoYJqKwS6MgC9cztTLUB/xLWX8gD/6T60pKn4+t/d6tP7JlybI7Z3z+I572CR/Vg==
+  dependencies:
+    ini "^1.3.2"
+
 github-from-package@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
@@ -4694,6 +7894,25 @@ glob@^7.0.0, glob@^7.1.3, glob@^7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^8.0.0, glob@^8.0.1, glob@^8.0.3:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
+  integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^5.0.1"
+    once "^1.3.0"
+
+global-cache-dir@^4.3.1:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/global-cache-dir/-/global-cache-dir-4.4.0.tgz#8921295d32abe0f7768e96acdf7f40a9874050b7"
+  integrity sha512-bk0gI6IbbphRjAaCJJn5H+T/CcEck5B3a5KBO2BXSDzjFSV+API17w8GA7YPJ6IXJiasW8M0VsEIig1PCHdfOQ==
+  dependencies:
+    cachedir "^2.3.0"
+    path-exists "^5.0.0"
+
 global-dirs@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.1.tgz#0c488971f066baceda21447aecb1a8b911d22485"
@@ -4734,7 +7953,7 @@ globby@^11.0.1, globby@^11.0.4, globby@^11.1.0:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
-globby@^13.1.1:
+globby@^13.0.0, globby@^13.1.1:
   version "13.2.2"
   resolved "https://registry.yarnpkg.com/globby/-/globby-13.2.2.tgz#63b90b1bf68619c2135475cbd4e71e66aa090592"
   integrity sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==
@@ -4745,6 +7964,13 @@ globby@^13.1.1:
     merge2 "^1.4.1"
     slash "^4.0.0"
 
+gonzales-pe@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.3.0.tgz#fe9dec5f3c557eead09ff868c65826be54d067b3"
+  integrity sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==
+  dependencies:
+    minimist "^1.2.5"
+
 gopd@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
@@ -4752,6 +7978,23 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
+got@^12.0.0, got@^12.1.0, got@^12.3.1, got@^12.6.1:
+  version "12.6.1"
+  resolved "https://registry.yarnpkg.com/got/-/got-12.6.1.tgz#8869560d1383353204b5a9435f782df9c091f549"
+  integrity sha512-mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ==
+  dependencies:
+    "@sindresorhus/is" "^5.2.0"
+    "@szmarczak/http-timer" "^5.0.1"
+    cacheable-lookup "^7.0.0"
+    cacheable-request "^10.2.8"
+    decompress-response "^6.0.0"
+    form-data-encoder "^2.1.2"
+    get-stream "^6.0.1"
+    http2-wrapper "^2.1.10"
+    lowercase-keys "^3.0.0"
+    p-cancelable "^3.0.0"
+    responselike "^3.0.0"
+
 got@^9.6.0:
   version "9.6.0"
   resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
@@ -4769,7 +8012,12 @@ got@^9.6.0:
     to-readable-stream "^1.0.0"
     url-parse-lax "^3.0.0"
 
-graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@4.2.10:
+  version "4.2.10"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
+  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
+
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.10, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
@@ -4791,6 +8039,22 @@ gzip-size@^6.0.0:
   dependencies:
     duplexer "^0.1.2"
 
+h3@^1.10.0, h3@^1.10.2, h3@^1.11.1:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/h3/-/h3-1.11.1.tgz#e9414ae6f2a076a345ea07256b320edb29bab9f7"
+  integrity sha512-AbaH6IDnZN6nmbnJOH72y3c5Wwh9P97soSVdGSBbcDACRdkC0FEWf25pzx4f/NuOCK6quHmW18yF2Wx+G4Zi1A==
+  dependencies:
+    cookie-es "^1.0.0"
+    crossws "^0.2.2"
+    defu "^6.1.4"
+    destr "^2.0.3"
+    iron-webcrypto "^1.0.0"
+    ohash "^1.1.3"
+    radix3 "^1.1.0"
+    ufo "^1.4.0"
+    uncrypto "^0.1.3"
+    unenv "^1.9.0"
+
 handle-thing@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
@@ -4818,6 +8082,11 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
+has-own-prop@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-own-prop/-/has-own-prop-2.0.0.tgz#f0f95d58f65804f5d218db32563bb85b8e0417af"
+  integrity sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==
+
 has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz#52ba30b6c5ec87fd89fa574bc1c39125c6f65340"
@@ -4825,6 +8094,13 @@ has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.1:
   dependencies:
     get-intrinsic "^1.2.2"
 
+has-property-descriptors@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854"
+  integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==
+  dependencies:
+    es-define-property "^1.0.0"
+
 has-proto@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0"
@@ -4835,11 +8111,67 @@ has-symbols@^1.0.3:
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
   integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
 
+has-unicode@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
+
+has-value@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==
+  dependencies:
+    get-value "^2.0.3"
+    has-values "^0.1.4"
+    isobject "^2.0.0"
+
+has-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  integrity sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==
+  dependencies:
+    get-value "^2.0.6"
+    has-values "^1.0.0"
+    isobject "^3.0.0"
+
+has-values@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  integrity sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==
+
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
 has-yarn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"
   integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==
 
+has-yarn@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-3.0.0.tgz#c3c21e559730d1d3b57e28af1f30d06fac38147d"
+  integrity sha512-IrsVwUHhEULx3R8f/aA8AHuEzAorplsab/v8HBzEiIukwq5i/EC+xmOW+HfP1OaDP+2JkgT1yILHN2O3UFIbcA==
+
+hasbin@1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/hasbin/-/hasbin-1.2.3.tgz#78c5926893c80215c2b568ae1fd3fcab7a2696b0"
+  integrity sha512-CCd8e/w2w28G8DyZvKgiHnQJ/5XXDz6qiUHnthvtag/6T5acUeN5lqq+HMoBqcmgWueWDhiCplrw0Kb1zDACRg==
+  dependencies:
+    async "~1.5"
+
+hasha@5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/hasha/-/hasha-5.2.2.tgz#a48477989b3b327aea3c04f53096d816d97522a1"
+  integrity sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==
+  dependencies:
+    is-stream "^2.0.0"
+    type-fest "^0.8.0"
+
 hasown@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c"
@@ -4958,6 +8290,27 @@ hoist-non-react-statics@^3.1.0:
   dependencies:
     react-is "^16.7.0"
 
+hosted-git-info@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
+  integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
+  dependencies:
+    lru-cache "^6.0.0"
+
+hosted-git-info@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-7.0.1.tgz#9985fcb2700467fecf7f33a4d4874e30680b5322"
+  integrity sha512-+K84LB1DYwMHoHSgaOY/Jfhw3ucPmSET5v98Ke/HdNSw4a0UktWzyW1mjhjpuxxTqOOsfWT/7iVshHmVZ4IpOA==
+  dependencies:
+    lru-cache "^10.0.1"
+
+hot-shots@10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/hot-shots/-/hot-shots-10.0.0.tgz#d360f9dd252da78297aca1cb08fd84a8936739c2"
+  integrity sha512-uy/uGpuJk7yuyiKRfZMBNkF1GAOX5O2ifO9rDCaX9jw8fu6eW9QeWC7WRPDI+O98frW1HQgV3+xwjWsZPECIzQ==
+  optionalDependencies:
+    unix-dgram "2.x"
+
 hpack.js@^2.1.6:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
@@ -5032,7 +8385,7 @@ htmlparser2@^8.0.1:
     domutils "^3.0.1"
     entities "^4.4.0"
 
-http-cache-semantics@^4.0.0:
+http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
   integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
@@ -5063,12 +8416,23 @@ http-errors@~1.6.2:
     setprototypeof "1.1.0"
     statuses ">= 1.4.0 < 2"
 
+http-errors@~1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
+  integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.4"
+    setprototypeof "1.2.0"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.1"
+
 http-parser-js@>=0.5.1:
   version "0.5.8"
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.8.tgz#af23090d9ac4e24573de6f6aecc9d84a48bf20e3"
   integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==
 
-http-proxy-middleware@^2.0.3:
+http-proxy-middleware@2.0.6, http-proxy-middleware@^2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f"
   integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==
@@ -5079,7 +8443,7 @@ http-proxy-middleware@^2.0.3:
     is-plain-obj "^3.0.0"
     micromatch "^4.0.2"
 
-http-proxy@^1.18.1:
+http-proxy@1.18.1, http-proxy@^1.18.1:
   version "1.18.1"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
   integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
@@ -5088,12 +8452,51 @@ http-proxy@^1.18.1:
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
+http-shutdown@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/http-shutdown/-/http-shutdown-1.2.2.tgz#41bc78fc767637c4c95179bc492f312c0ae64c5f"
+  integrity sha512-S9wWkJ/VSY9/k4qcjG318bqJNruzE4HySUhFYknwmu6LBP97KLLfwNf+n4V1BHurvFNkSKLFnK/RsuUnRTf9Vw==
+
+http2-wrapper@^2.1.10:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-2.2.1.tgz#310968153dcdedb160d8b72114363ef5fce1f64a"
+  integrity sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==
+  dependencies:
+    quick-lru "^5.1.1"
+    resolve-alpn "^1.2.0"
+
+https-proxy-agent@7.0.4:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz#8e97b841a029ad8ddc8731f26595bad868cb4168"
+  integrity sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==
+  dependencies:
+    agent-base "^7.0.2"
+    debug "4"
+
+https-proxy-agent@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
+  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
+  dependencies:
+    agent-base "6"
+    debug "4"
+
 human-signals@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
-iconv-lite@0.4.24:
+human-signals@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-3.0.1.tgz#c740920859dafa50e5a3222da9d3bf4bb0e5eef5"
+  integrity sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==
+
+human-signals@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-5.0.0.tgz#42665a284f9ae0dade3ba41ebc37eb4b852f3a28"
+  integrity sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==
+
+iconv-lite@0.4.24, iconv-lite@^0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -5112,7 +8515,7 @@ icss-utils@^5.0.0, icss-utils@^5.1.0:
   resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
   integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
 
-ieee754@^1.1.13:
+ieee754@^1.1.13, ieee754@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
@@ -5127,6 +8530,11 @@ ignore@^5.2.0, ignore@^5.2.4:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.0.tgz#67418ae40d34d6999c95ff56016759c718c82f78"
   integrity sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==
 
+image-meta@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/image-meta/-/image-meta-0.2.0.tgz#ea28d05d52f5ad35f75b14f46278a44d626f48bc"
+  integrity sha512-ZBGjl0ZMEMeOC3Ns0wUF/5UdUmr3qQhBSCniT0LxOgGGIRHiNFOkMtIHB7EOznRU47V2AxPgiVP+s+0/UCU0Hg==
+
 image-size@^1.0.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/image-size/-/image-size-1.1.1.tgz#ddd67d4dc340e52ac29ce5f546a09f4e29e840ac"
@@ -5152,6 +8560,11 @@ import-lazy@^2.1.0:
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
   integrity sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A==
 
+import-lazy@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153"
+  integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==
+
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -5162,6 +8575,16 @@ indent-string@^4.0.0:
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
+indent-string@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-5.0.0.tgz#4fd2980fccaf8622d14c64d694f4cf33c81951a5"
+  integrity sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==
+
+index-to-position@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/index-to-position/-/index-to-position-0.1.2.tgz#e11bfe995ca4d8eddb1ec43274488f3c201a7f09"
+  integrity sha512-MWDKS3AS1bGCHLBA2VLImJz42f7bJh8wQsTGCzI3j519/CASStoDONUBVz2I/VID0MpiX3SGSnbOD2xUalbE5g==
+
 infima@0.2.0-alpha.43:
   version "0.2.0-alpha.43"
   resolved "https://registry.yarnpkg.com/infima/-/infima-0.2.0-alpha.43.tgz#f7aa1d7b30b6c08afef441c726bac6150228cbe0"
@@ -5190,7 +8613,7 @@ ini@2.0.0:
   resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
   integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
 
-ini@^1.3.5, ini@~1.3.0:
+ini@^1.3.2, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
@@ -5200,6 +8623,43 @@ inline-style-parser@0.1.1:
   resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1"
   integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==
 
+inquirer-autocomplete-prompt@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-1.4.0.tgz#e767592f747e3d5bb6336fe71fb4094352e4c317"
+  integrity sha512-qHgHyJmbULt4hI+kCmwX92MnSxDs/Yhdt4wPA30qnoa01OF6uTXV8yvH4hKXgdaTNmkZ9D01MHjqKYEuJN+ONw==
+  dependencies:
+    ansi-escapes "^4.3.1"
+    chalk "^4.0.0"
+    figures "^3.2.0"
+    run-async "^2.4.0"
+    rxjs "^6.6.2"
+
+inquirer@6.5.2, inquirer@^6.0.0:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
+  integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==
+  dependencies:
+    ansi-escapes "^3.2.0"
+    chalk "^2.4.2"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^3.0.3"
+    figures "^2.0.0"
+    lodash "^4.17.12"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rxjs "^6.4.0"
+    string-width "^2.1.0"
+    strip-ansi "^5.1.0"
+    through "^2.3.6"
+
+inspect-with-kind@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/inspect-with-kind/-/inspect-with-kind-1.0.5.tgz#fce151d4ce89722c82ca8e9860bb96f9167c316c"
+  integrity sha512-MAQUJuIo7Xqk8EVNP+6d3CKq9c80hi4tjIbIAT6lmGW9W6WzlHiu9PS8uSuUYU+Do+j1baiFp3H25XEVxDIG2g==
+  dependencies:
+    kind-of "^6.0.2"
+
 "internmap@1 - 2":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/internmap/-/internmap-2.0.3.tgz#6685f23755e43c524e251d29cbc97248e3061009"
@@ -5227,6 +8687,40 @@ ipaddr.js@^2.0.1:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.1.0.tgz#2119bc447ff8c257753b196fc5f1ce08a4cdf39f"
   integrity sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==
 
+ipx@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ipx/-/ipx-2.1.0.tgz#235d37f789b6c5100f34a0bb3b3bef9852af4d76"
+  integrity sha512-AVnPGXJ8L41vjd11Z4akIF2yd14636Klxul3tBySxHA6PKfCOQPxBDkCFK5zcWh0z/keR6toh1eg8qzdBVUgdA==
+  dependencies:
+    "@fastify/accept-negotiator" "^1.1.0"
+    citty "^0.1.5"
+    consola "^3.2.3"
+    defu "^6.1.4"
+    destr "^2.0.2"
+    etag "^1.8.1"
+    h3 "^1.10.0"
+    image-meta "^0.2.0"
+    listhen "^1.5.6"
+    ofetch "^1.3.3"
+    pathe "^1.1.2"
+    sharp "^0.32.6"
+    svgo "^3.2.0"
+    ufo "^1.3.2"
+    unstorage "^1.10.1"
+    xss "^1.0.14"
+
+iron-webcrypto@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/iron-webcrypto/-/iron-webcrypto-1.1.1.tgz#245c9d467075ee810343ddfa53dd4909616aaf33"
+  integrity sha512-5xGwQUWHQSy039rFr+5q/zOmj7GP0Ypzvo34Ep+61bPIhaLduEDp/PvLGlU3awD2mzWUR0weN2vJ1mILydFPEg==
+
+is-accessor-descriptor@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz#3223b10628354644b86260db29b3e693f5ceedd4"
+  integrity sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==
+  dependencies:
+    hasown "^2.0.0"
+
 is-alphabetical@1.0.4, is-alphabetical@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d"
@@ -5257,11 +8751,23 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.0.0"
 
+is-buffer@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
+
 is-buffer@^2.0.0:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
   integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
 
+is-builtin-module@^3.1.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.2.1.tgz#f03271717d8654cfcaf07ab0463faa3571581169"
+  integrity sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==
+  dependencies:
+    builtin-modules "^3.3.0"
+
 is-ci@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
@@ -5269,38 +8775,90 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
-is-core-module@^2.13.0:
+is-ci@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867"
+  integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==
+  dependencies:
+    ci-info "^3.2.0"
+
+is-core-module@^2.13.0, is-core-module@^2.5.0, is-core-module@^2.8.1:
   version "2.13.1"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
   integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
   dependencies:
     hasown "^2.0.0"
 
+is-data-descriptor@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz#2109164426166d32ea38c405c1e0945d9e6a4eeb"
+  integrity sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==
+  dependencies:
+    hasown "^2.0.0"
+
 is-decimal@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5"
   integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==
 
+is-descriptor@^0.1.0:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.7.tgz#2727eb61fd789dcd5bdf0ed4569f551d2fe3be33"
+  integrity sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==
+  dependencies:
+    is-accessor-descriptor "^1.0.1"
+    is-data-descriptor "^1.0.1"
+
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.3.tgz#92d27cb3cd311c4977a4db47df457234a13cb306"
+  integrity sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==
+  dependencies:
+    is-accessor-descriptor "^1.0.1"
+    is-data-descriptor "^1.0.1"
+
+is-docker@3.0.0, is-docker@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-3.0.0.tgz#90093aa3106277d8a77a5910dbae71747e15a200"
+  integrity sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==
+
 is-docker@^2.0.0, is-docker@^2.1.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
   integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
 
-is-extendable@^0.1.0:
+is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
   integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==
 
+is-extendable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
+  dependencies:
+    is-plain-object "^2.0.4"
+
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==
+
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
+is-fullwidth-code-point@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz#fae3167c729e7463f8461ce512b080a49268aa88"
+  integrity sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==
+
 is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
@@ -5313,6 +8871,13 @@ is-hexadecimal@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7"
   integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==
 
+is-inside-container@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-inside-container/-/is-inside-container-1.0.0.tgz#e81fba699662eb31dbdaf26766a61d4814717ea4"
+  integrity sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==
+  dependencies:
+    is-docker "^3.0.0"
+
 is-installed-globally@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520"
@@ -5321,11 +8886,33 @@ is-installed-globally@^0.4.0:
     global-dirs "^3.0.0"
     is-path-inside "^3.0.2"
 
+is-interactive@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-2.0.0.tgz#40c57614593826da1100ade6059778d597f16e90"
+  integrity sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==
+
+is-node-process@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/is-node-process/-/is-node-process-1.2.0.tgz#ea02a1b90ddb3934a19aea414e88edef7e11d134"
+  integrity sha512-Vg4o6/fqPxIjtxgUH5QLJhwZ7gW5diGCVlXpuUfELC62CuxM1iHcRe51f2W1FDy04Ai4KJkagKjx3XaqyfRKXw==
+
 is-npm@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8"
   integrity sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==
 
+is-npm@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-6.0.0.tgz#b59e75e8915543ca5d881ecff864077cba095261"
+  integrity sha512-JEjxbSmtPSt1c8XTkVrlujcXdKV1/tvuQ7GwKcAlyiVLeYFQ2VHat8xfrDJsIkhCdF/tZ7CiIR3sy141c6+gPQ==
+
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==
+  dependencies:
+    kind-of "^3.0.2"
+
 is-number@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
@@ -5351,7 +8938,17 @@ is-path-inside@^3.0.2:
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
   integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
 
-is-plain-obj@^2.0.0:
+is-path-inside@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-4.0.0.tgz#805aeb62c47c1b12fc3fd13bfb3ed1e7430071db"
+  integrity sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==
+
+is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==
+
+is-plain-obj@^2.0.0, is-plain-obj@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
   integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
@@ -5361,7 +8958,12 @@ is-plain-obj@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7"
   integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==
 
-is-plain-object@^2.0.4:
+is-plain-obj@^4.0.0, is-plain-obj@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-4.1.0.tgz#d65025edec3657ce032fd7db63c97883eaed71f0"
+  integrity sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==
+
+is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
   integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
@@ -5383,6 +8985,11 @@ is-root@^2.1.0:
   resolved "https://registry.yarnpkg.com/is-root/-/is-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c"
   integrity sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==
 
+is-stream@3.0.0, is-stream@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac"
+  integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==
+
 is-stream@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
@@ -5393,48 +9000,104 @@ is-typedarray@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
 
+is-unicode-supported@^1.1.0, is-unicode-supported@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz#d824984b616c292a2e198207d4a609983842f714"
+  integrity sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==
+
+is-url-superb@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-url-superb/-/is-url-superb-4.0.0.tgz#b54d1d2499bb16792748ac967aa3ecb41a33a8c2"
+  integrity sha512-GI+WjezhPPcbM+tqE9LnmsY5qqjwHzTvjJ36wxYX5ujNXefSUJ/T17r5bqDV8yLhcgB59KTPNOc9O9cmHTPWsA==
+
+is-url@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52"
+  integrity sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==
+
 is-whitespace-character@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7"
   integrity sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w==
 
+is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
+
 is-word-character@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.4.tgz#ce0e73216f98599060592f62ff31354ddbeb0230"
   integrity sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA==
 
-is-wsl@^2.2.0:
+is-wsl@2.2.0, is-wsl@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
   integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
   dependencies:
     is-docker "^2.0.0"
 
+is-wsl@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-3.1.0.tgz#e1c657e39c10090afcbedec61720f6b924c3cbd2"
+  integrity sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==
+  dependencies:
+    is-inside-container "^1.0.0"
+
 is-yarn-global@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232"
   integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==
 
+is-yarn-global@^0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.4.1.tgz#b312d902b313f81e4eaf98b6361ba2b45cd694bb"
+  integrity sha512-/kppl+R+LO5VmhYSEWARUFjodS25D68gvj8W7z0I7OWhUla5xWu8KL6CtB2V0R6yqhnRgbcaREMr4EEM6htLPQ==
+
+is64bit@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is64bit/-/is64bit-2.0.0.tgz#198c627cbcb198bbec402251f88e5e1a51236c07"
+  integrity sha512-jv+8jaWCl0g2lSBkNSVXdzfBA0npK1HGC2KtWM9FumFRoGS94g3NbCCLVnCYHLjp4GrW2KZeeSTMo5ddtznmGw==
+  dependencies:
+    system-architecture "^0.1.0"
+
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
   integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
 
-isarray@~1.0.0:
+isarray@1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
 
-isexe@^2.0.0:
+iserror@0.0.2, iserror@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/iserror/-/iserror-0.0.2.tgz#bd53451fe2f668b9f2402c1966787aaa2c7c0bf5"
+  integrity sha512-oKGGrFVaWwETimP3SiWwjDeY27ovZoyZPHtxblC4hCq9fXxed/jasx+ATWFFjCVSRZng8VTMsN1nDnGo6zMBSw==
+
+isexe@2.0.0, isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
-isobject@^3.0.1:
+isobject@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==
+  dependencies:
+    isarray "1.0.0"
+
+isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
+jest-get-type@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.5.1.tgz#3cd613c507b0f7ace013df407a1c1cd578bcb4f1"
+  integrity sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==
+
 jest-util@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.7.0.tgz#23c2b62bfb22be82b44de98055802ff3710fc0bc"
@@ -5447,6 +9110,18 @@ jest-util@^29.7.0:
     graceful-fs "^4.2.9"
     picomatch "^2.2.3"
 
+jest-validate@^27.3.1, jest-validate@^27.4.2:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.5.1.tgz#9197d54dc0bdb52260b8db40b46ae668e04df067"
+  integrity sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==
+  dependencies:
+    "@jest/types" "^27.5.1"
+    camelcase "^6.2.0"
+    chalk "^4.0.0"
+    jest-get-type "^27.5.1"
+    leven "^3.1.0"
+    pretty-format "^27.5.1"
+
 jest-worker@^27.4.5:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
@@ -5466,7 +9141,7 @@ jest-worker@^29.1.2:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jiti@^1.20.0:
+jiti@^1.20.0, jiti@^1.21.0:
   version "1.21.0"
   resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.0.tgz#7c97f8fe045724e136a397f7340475244156105d"
   integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==
@@ -5482,11 +9157,23 @@ joi@^17.6.0:
     "@sideway/formula" "^3.0.1"
     "@sideway/pinpoint" "^2.0.0"
 
+js-string-escape@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
+  integrity sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg==
+
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
+js-yaml@4.1.0, js-yaml@^4.0.0, js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
 js-yaml@^3.13.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
@@ -5495,13 +9182,6 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
-  dependencies:
-    argparse "^2.0.1"
-
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
@@ -5517,11 +9197,23 @@ json-buffer@3.0.0:
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
   integrity sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==
 
+json-buffer@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
+  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
+
 json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
 
+json-schema-ref-resolver@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-schema-ref-resolver/-/json-schema-ref-resolver-1.0.1.tgz#6586f483b76254784fc1d2120f717bdc9f0a99bf"
+  integrity sha512-EJAj1pgHc1hxF6vo2Z3s69fMjO1INq6eGHXZ8Z6wCQeldCuwxGK9Sxf4/cScGn3FZubCVUehfWtcDM/PLteCQw==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -5551,6 +9243,54 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+jsonpointer@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-5.0.1.tgz#2110e0af0900fd37467b5907ecd13a7884a1b559"
+  integrity sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==
+
+jsonwebtoken@9.0.2:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz#65ff91f4abef1784697d40952bb1998c504caaf3"
+  integrity sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==
+  dependencies:
+    jws "^3.2.2"
+    lodash.includes "^4.3.0"
+    lodash.isboolean "^3.0.3"
+    lodash.isinteger "^4.0.4"
+    lodash.isnumber "^3.0.3"
+    lodash.isplainobject "^4.0.6"
+    lodash.isstring "^4.0.1"
+    lodash.once "^4.0.0"
+    ms "^2.1.1"
+    semver "^7.5.4"
+
+junk@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/junk/-/junk-4.0.1.tgz#7ee31f876388c05177fe36529ee714b07b50fbed"
+  integrity sha512-Qush0uP+G8ZScpGMZvHUiRfI0YBWuB3gVBYlI0v0vvOJt5FLicco+IkP0a50LqTTQhmts/m6tP5SWE+USyIvcQ==
+
+jwa@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
+  integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==
+  dependencies:
+    buffer-equal-constant-time "1.0.1"
+    ecdsa-sig-formatter "1.0.11"
+    safe-buffer "^5.0.1"
+
+jws@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304"
+  integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==
+  dependencies:
+    jwa "^1.4.1"
+    safe-buffer "^5.0.1"
+
+jwt-decode@3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-3.1.2.tgz#3fb319f3675a2df0c2895c8f5e9fa4b67b04ed59"
+  integrity sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==
+
 katex@^0.13.0:
   version "0.13.24"
   resolved "https://registry.yarnpkg.com/katex/-/katex-0.13.24.tgz#fe55455eb455698cb24b911a353d16a3c855d905"
@@ -5558,6 +9298,13 @@ katex@^0.13.0:
   dependencies:
     commander "^8.0.0"
 
+keep-func-props@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/keep-func-props/-/keep-func-props-4.0.1.tgz#3a9ab077a1bcc7f98771fd534940826d44cd5df1"
+  integrity sha512-87ftOIICfdww3SxR5P1veq3ThBNyRPG0JGL//oaR08v0k2yTicEIHd7s0GqSJfQvlb+ybC3GiDepOweo0LDhvw==
+  dependencies:
+    mimic-fn "^4.0.0"
+
 keyv@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
@@ -5565,11 +9312,32 @@ keyv@^3.0.0:
   dependencies:
     json-buffer "3.0.0"
 
+keyv@^4.5.3:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
+  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
+  dependencies:
+    json-buffer "3.0.1"
+
 khroma@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/khroma/-/khroma-2.1.0.tgz#45f2ce94ce231a437cf5b63c2e886e6eb42bbbb1"
   integrity sha512-Ls993zuzfayK269Svk9hzpeGUKob/sIgZzyHYdjQoAdQetRKpOLj+k/QQQ/6Qi0Yz65mlROrfd+Ev+1+7dz9Kw==
 
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  integrity sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==
+  dependencies:
+    is-buffer "^1.1.5"
+
 kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
@@ -5580,6 +9348,20 @@ kleur@^3.0.3:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
+kuler@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3"
+  integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==
+
+lambda-local@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/lambda-local/-/lambda-local-2.1.2.tgz#22b0ecdc15ae400841e268991402e87566ba0554"
+  integrity sha512-nGTJn2JxZWcLGpNwXFmXC7UEXL7QCLieQWDiXs46vIv9y/gSPm/uHygEMCaym+HIziniAw0XIm+1VTrXCvG1Zw==
+  dependencies:
+    commander "^10.0.1"
+    dotenv "^16.3.1"
+    winston "^3.10.0"
+
 latest-version@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face"
@@ -5587,6 +9369,13 @@ latest-version@^5.1.0:
   dependencies:
     package-json "^6.3.0"
 
+latest-version@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-7.0.0.tgz#843201591ea81a4d404932eeb61240fe04e9e5da"
+  integrity sha512-KvNT4XqAMzdcL6ka6Tl3i2lYeFDgXNCuIX+xNx6ZMVR1dFq+idXd9FLKNMOIx0t9mJ9/HudyX4oZWXZQ0UJHeg==
+  dependencies:
+    package-json "^8.1.0"
+
 launch-editor@^2.6.0:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.1.tgz#f259c9ef95cbc9425620bbbd14b468fcdb4ffe3c"
@@ -5605,11 +9394,27 @@ layout-base@^2.0.0:
   resolved "https://registry.yarnpkg.com/layout-base/-/layout-base-2.0.1.tgz#d0337913586c90f9c2c075292069f5c2da5dd285"
   integrity sha512-dp3s92+uNI1hWIpPGH3jK2kxE2lMjdXdr+DH8ynZHpd6PUlH6x6cbuXnoMmiNumznqaNO31xu9e79F0uuZ0JFg==
 
-leven@^3.1.0:
+lazystream@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.1.tgz#494c831062f1f9408251ec44db1cba29242a2638"
+  integrity sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==
+  dependencies:
+    readable-stream "^2.0.5"
+
+leven@^3.1.0, "leven@^3.1.0 < 4":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
   integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
 
+light-my-request@^5.6.1:
+  version "5.13.0"
+  resolved "https://registry.yarnpkg.com/light-my-request/-/light-my-request-5.13.0.tgz#b29905e55e8605b77fee2a946e17b219bca35113"
+  integrity sha512-9IjUN9ZyCS9pTG+KqTDEQo68Sui2lHsYBrfMyVUTTZ3XhH8PMZq7xO94Kr+eP9dhi/kcKsx4N41p2IXEBil1pQ==
+  dependencies:
+    cookie "^0.6.0"
+    process-warning "^3.0.0"
+    set-cookie-parser "^2.4.1"
+
 lilconfig@^2.0.3:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52"
@@ -5620,6 +9425,42 @@ lines-and-columns@^1.1.6:
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
+listhen@^1.5.6, listhen@^1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/listhen/-/listhen-1.7.2.tgz#66b81740692269d5d8cafdc475020f2fc51afbae"
+  integrity sha512-7/HamOm5YD9Wb7CFgAZkKgVPA96WwhcTQoqtm2VTZGVbVVn3IWKRBTgrU7cchA3Q8k9iCsG8Osoi9GX4JsGM9g==
+  dependencies:
+    "@parcel/watcher" "^2.4.1"
+    "@parcel/watcher-wasm" "^2.4.1"
+    citty "^0.1.6"
+    clipboardy "^4.0.0"
+    consola "^3.2.3"
+    crossws "^0.2.0"
+    defu "^6.1.4"
+    get-port-please "^3.1.2"
+    h3 "^1.10.2"
+    http-shutdown "^1.2.2"
+    jiti "^1.21.0"
+    mlly "^1.6.1"
+    node-forge "^1.3.1"
+    pathe "^1.1.2"
+    std-env "^3.7.0"
+    ufo "^1.4.0"
+    untun "^0.1.3"
+    uqr "^0.1.2"
+
+listr2@7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/listr2/-/listr2-7.0.2.tgz#3aa3e1549dfaf3c57ab5eeaba754da3b87f33063"
+  integrity sha512-rJysbR9GKIalhTbVL2tYbF2hVyDnrf7pFUZBwjPaMIdadYHmeT+EVi/Bu3qd7ETQPahTotg2WRCatXwRBW554g==
+  dependencies:
+    cli-truncate "^3.1.0"
+    colorette "^2.0.20"
+    eventemitter3 "^5.0.1"
+    log-update "^5.0.1"
+    rfdc "^1.3.0"
+    wrap-ansi "^8.1.0"
+
 load-script@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/load-script/-/load-script-1.0.0.tgz#0491939e0bee5643ee494a7e3da3d2bac70c6ca4"
@@ -5644,6 +9485,13 @@ loader-utils@^3.2.0:
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-3.2.1.tgz#4fb104b599daafd82ef3e1a41fb9265f87e1f576"
   integrity sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==
 
+locate-path@7.2.0, locate-path@^7.0.0, locate-path@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-7.2.0.tgz#69cb1779bd90b35ab1e771e1f2f89a202c2a8a8a"
+  integrity sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==
+  dependencies:
+    p-locate "^6.0.0"
+
 locate-path@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
@@ -5686,21 +9534,115 @@ lodash.flow@^3.3.0:
   resolved "https://registry.yarnpkg.com/lodash.flow/-/lodash.flow-3.5.0.tgz#87bf40292b8cf83e4e8ce1a3ae4209e20071675a"
   integrity sha512-ff3BX/tSioo+XojX4MOsOMhJw0nZoUEF011LX8g8d3gvjVbxd89cCio4BCXronjxcTUIJUoqKEUA+n4CqvvRPw==
 
+lodash.includes@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f"
+  integrity sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==
+
+lodash.isboolean@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
+  integrity sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==
+
+lodash.isempty@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.isempty/-/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e"
+  integrity sha512-oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg==
+
+lodash.isinteger@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343"
+  integrity sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==
+
+lodash.isnumber@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc"
+  integrity sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==
+
+lodash.isplainobject@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+  integrity sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==
+
+lodash.isstring@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
+  integrity sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==
+
 lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
   integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==
 
+lodash.merge@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+
+lodash.once@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
+  integrity sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==
+
+lodash.transform@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.transform/-/lodash.transform-4.6.0.tgz#12306422f63324aed8483d3f38332b5f670547a0"
+  integrity sha512-LO37ZnhmBVx0GvOU/caQuipEh4GN82TcWv3yHlebGDgOxbxiwwzW5Pcx2AcvpIv2WmvmSMoC492yQFNhy/l/UQ==
+
 lodash.uniq@4.5.0, lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==
 
-lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21:
+lodash@4.17.21, lodash@^4.17.12, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
+log-process-errors@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/log-process-errors/-/log-process-errors-8.0.0.tgz#f88a9556e4914037ad97ceee24b148dc1b566dfd"
+  integrity sha512-+SNGqNC1gCMJfhwYzAHr/YgNT/ZJc+V2nCkvtPnjrENMeCe+B/jgShBW0lmWoh6uVV2edFAPc/IUOkDdsjTbTg==
+  dependencies:
+    colors-option "^3.0.0"
+    figures "^4.0.0"
+    filter-obj "^3.0.0"
+    jest-validate "^27.4.2"
+    map-obj "^5.0.0"
+    moize "^6.1.0"
+    semver "^7.3.5"
+
+log-symbols@5.1.0, log-symbols@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-5.1.0.tgz#a20e3b9a5f53fac6aeb8e2bb22c07cf2c8f16d93"
+  integrity sha512-l0x2DvrW294C9uDCoQe1VSU4gf529FkSZ6leBl4TiqZH/e+0R7hSfHQBNut2mNygDgHwvYHfFLn6Oxb3VWj2rA==
+  dependencies:
+    chalk "^5.0.0"
+    is-unicode-supported "^1.1.0"
+
+log-update@5.0.1, log-update@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/log-update/-/log-update-5.0.1.tgz#9e928bf70cb183c1f0c9e91d9e6b7115d597ce09"
+  integrity sha512-5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw==
+  dependencies:
+    ansi-escapes "^5.0.0"
+    cli-cursor "^4.0.0"
+    slice-ansi "^5.0.0"
+    strip-ansi "^7.0.1"
+    wrap-ansi "^8.0.1"
+
+logform@^2.3.2, logform@^2.4.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/logform/-/logform-2.6.0.tgz#8c82a983f05d6eaeb2d75e3decae7a768b2bf9b5"
+  integrity sha512-1ulHeNPp6k/LD8H91o7VYFBng5i1BDE7HoKxVbZiGFidS1Rj65qcywLxX+pVfAPoQJEjRdvKcusKwOupHCVOVQ==
+  dependencies:
+    "@colors/colors" "1.6.0"
+    "@types/triple-beam" "^1.3.2"
+    fecha "^4.2.0"
+    ms "^2.1.1"
+    safe-stable-stringify "^2.3.1"
+    triple-beam "^1.3.0"
+
 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
@@ -5725,6 +9667,16 @@ lowercase-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
   integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
 
+lowercase-keys@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-3.0.0.tgz#c5e7d442e37ead247ae9db117a9d0a467c89d4f2"
+  integrity sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==
+
+lru-cache@^10.0.1, lru-cache@^10.2.0:
+  version "10.2.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.1.tgz#e8d901141f22937968e45a6533d52824070151e4"
+  integrity sha512-tS24spDe/zXhWbNPErCHs/AGOzbKGHT+ybSBqmdLm8WZ1xXLWvH8Qn71QPAlqVhd0qUTWjy+Kl9JmISgDdEjsA==
+
 lru-cache@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
@@ -5744,6 +9696,16 @@ lunr@^2.3.9:
   resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.9.tgz#18b123142832337dd6e964df1a5a7707b25d35e1"
   integrity sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==
 
+luxon@^3.2.1:
+  version "3.4.4"
+  resolved "https://registry.yarnpkg.com/luxon/-/luxon-3.4.4.tgz#cf20dc27dc532ba41a169c43fdcc0063601577af"
+  integrity sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==
+
+macos-release@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-3.2.0.tgz#dcee82b6a4932971b1538dbf6f3aabc4a903b613"
+  integrity sha512-fSErXALFNsnowREYZ49XCdOHF8wOPWuFOGQrAhP7x5J/BqQv+B02cNsTykGpDgRVx43EKg++6ANmTaGTtW+hUA==
+
 make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
@@ -5751,6 +9713,35 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   dependencies:
     semver "^6.0.0"
 
+make-dir@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e"
+  integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==
+  dependencies:
+    semver "^7.5.3"
+
+make-error@^1.1.1:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
+  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
+
+map-cache@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==
+
+map-obj@^5.0.0:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-5.0.2.tgz#174ad9f7e5e4e777a219126d9a734ff3e14a1c68"
+  integrity sha512-K6K2NgKnTXimT3779/4KxSvobxOtMmx1LBZ3NwRxT/MDIR3Br/fQ4Q+WCX5QxjyUR8zg5+RV9Tbf2c5pAWTD2A==
+
+map-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==
+  dependencies:
+    object-visit "^1.0.0"
+
 markdown-escapes@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535"
@@ -5761,6 +9752,28 @@ marked@^4.3.0:
   resolved "https://registry.yarnpkg.com/marked/-/marked-4.3.0.tgz#796362821b019f734054582038b116481b456cf3"
   integrity sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==
 
+maxstache-stream@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/maxstache-stream/-/maxstache-stream-1.0.4.tgz#9c7f5cab7e5fdd2d90da86143b4e9631ea328040"
+  integrity sha512-v8qlfPN0pSp7bdSoLo1NTjG43GXGqk5W2NWFnOCq2GlmFFqebGzPCjLKSbShuqIOVorOtZSAy7O/S1OCCRONUw==
+  dependencies:
+    maxstache "^1.0.0"
+    pump "^1.0.0"
+    split2 "^1.0.0"
+    through2 "^2.0.0"
+
+maxstache@^1.0.0:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/maxstache/-/maxstache-1.0.7.tgz#2231d5180ba783d5ecfc31c45fedac7ae4276984"
+  integrity sha512-53ZBxHrZM+W//5AcRVewiLpDunHnucfdzZUGz54Fnvo4tE+J3p8EL66kBrs2UhBXvYKTWckWYYWBqJqoTcenqg==
+
+md5-hex@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-3.0.1.tgz#be3741b510591434b2784d79e556eefc2c9a8e5c"
+  integrity sha512-BUiRtTtV39LIJwinWBjqVsU9xhdnz7/i889V859IBFpuqGAj6LuOvHv5XLbgZ2R7ptJoJaEcxkv88/h25T7Ciw==
+  dependencies:
+    blueimp-md5 "^2.10.0"
+
 mdast-squeeze-paragraphs@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/mdast-squeeze-paragraphs/-/mdast-squeeze-paragraphs-4.0.0.tgz#7c4c114679c3bee27ef10b58e2e015be79f1ef97"
@@ -5824,6 +9837,16 @@ mdn-data@2.0.14:
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
   integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
 
+mdn-data@2.0.28:
+  version "2.0.28"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.28.tgz#5ec48e7bef120654539069e1ae4ddc81ca490eba"
+  integrity sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==
+
+mdn-data@2.0.30:
+  version "2.0.30"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc"
+  integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==
+
 mdurl@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
@@ -5846,11 +9869,23 @@ memoize-one@^5.1.1:
   resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e"
   integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==
 
+memoize-one@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-6.0.0.tgz#b2591b871ed82948aee4727dc6abceeeac8c1045"
+  integrity sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==
+
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
   integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==
 
+merge-options@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/merge-options/-/merge-options-3.0.4.tgz#84709c2aa2a4b24c1981f66c179fe5565cc6dbb7"
+  integrity sha512-2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ==
+  dependencies:
+    is-plain-obj "^2.1.0"
+
 merge-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
@@ -5888,6 +9923,16 @@ methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
+micro-api-client@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/micro-api-client/-/micro-api-client-3.3.0.tgz#52dd567d322f10faffe63d19d4feeac4e4ffd215"
+  integrity sha512-y0y6CUB9RLVsy3kfgayU28746QrNMpSm9O/AYGNsBgOkJr/X/Jk0VLGoO8Ude7Bpa8adywzF+MzXNZRFRsNPhg==
+
+micro-memoize@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/micro-memoize/-/micro-memoize-4.1.2.tgz#ce719c1ba1e41592f1cd91c64c5f41dcbf135f36"
+  integrity sha512-+HzcV2H+rbSJzApgkj0NdTakkC+bnyeiUxgT6/m7mjcz1CmM22KYFKp+EVj1sWe4UYcnriJr5uqHQD/gMHLD+g==
+
 micromark@~2.11.0:
   version "2.11.4"
   resolved "https://registry.yarnpkg.com/micromark/-/micromark-2.11.4.tgz#d13436138eea826383e822449c9a5c50ee44665a"
@@ -5896,6 +9941,25 @@ micromark@~2.11.0:
     debug "^4.0.0"
     parse-entities "^2.0.0"
 
+micromatch@^3.1.10:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.2"
+
 micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
@@ -5904,7 +9968,7 @@ micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
     braces "^3.0.2"
     picomatch "^2.3.1"
 
-mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
+mime-db@1.52.0, "mime-db@>= 1.43.0 < 2", mime-db@^1.28.0:
   version "1.52.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
@@ -5933,11 +9997,26 @@ mime@1.6.0:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
+mime@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-3.0.0.tgz#b374550dca3a0c18443b0c950a6a58f1931cf7a7"
+  integrity sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==
+
+mimic-fn@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
+
 mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
+mimic-fn@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc"
+  integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==
+
 mimic-response@^1.0.0, mimic-response@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
@@ -5948,6 +10027,11 @@ mimic-response@^3.1.0:
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
   integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
 
+mimic-response@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-4.0.0.tgz#35468b19e7c75d10f5165ea25e75a5ceea7cf70f"
+  integrity sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==
+
 mini-css-extract-plugin@^2.6.1:
   version "2.7.7"
   resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.7.tgz#4acf02f362c641c38fb913bfcb7ca2fc4a7cf339"
@@ -5967,6 +10051,20 @@ minimatch@3.1.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@^5.0.1, minimatch@^5.1.0:
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
+  integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
+  dependencies:
+    brace-expansion "^2.0.1"
+
+minimatch@^9.0.0, minimatch@^9.0.4:
+  version "9.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51"
+  integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimatch@^9.0.3:
   version "9.0.3"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
@@ -5974,16 +10072,94 @@ minimatch@^9.0.3:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5:
+minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
+minipass@^3.0.0:
+  version "3.3.6"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
+  integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
+  dependencies:
+    yallist "^4.0.0"
+
+minipass@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
+  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
+
+minizlib@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
+  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
+  dependencies:
+    minipass "^3.0.0"
+    yallist "^4.0.0"
+
+mixin-deep@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
+
 mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
   integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
 
+mkdirp@^0.5.1:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
+  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
+  dependencies:
+    minimist "^1.2.6"
+
+mkdirp@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
+mlly@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/mlly/-/mlly-1.6.1.tgz#0983067dc3366d6314fc5e12712884e6978d028f"
+  integrity sha512-vLgaHvaeunuOXHSmEbZ9izxPx3USsk8KCQ8iC+aTlp5sKRSoZvwhHh5L9VbKSaVC6sJDqbyohIS76E2VmHIPAA==
+  dependencies:
+    acorn "^8.11.3"
+    pathe "^1.1.2"
+    pkg-types "^1.0.3"
+    ufo "^1.3.2"
+
+module-definition@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/module-definition/-/module-definition-5.0.1.tgz#62d1194e5d5ea6176b7dc7730f818f466aefa32f"
+  integrity sha512-kvw3B4G19IXk+BOXnYq/D/VeO9qfHaapMeuS7w7sNUqmGaA6hywdFHMi+VWeR9wUScXM7XjoryTffCZ5B0/8IA==
+  dependencies:
+    ast-module-types "^5.0.0"
+    node-source-walk "^6.0.1"
+
+moize@^6.1.0, moize@^6.1.3:
+  version "6.1.6"
+  resolved "https://registry.yarnpkg.com/moize/-/moize-6.1.6.tgz#ac2e723e74b951875fe2c0c3433405c2b098c3e6"
+  integrity sha512-vSKdIUO61iCmTqhdoIDrqyrtp87nWZUmBPniNjO0fX49wEYmyDO4lvlnFXiGcaH1JLE/s/9HbiK4LSHsbiUY6Q==
+  dependencies:
+    fast-equals "^3.0.1"
+    micro-memoize "^4.1.2"
+
+move-file@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/move-file/-/move-file-3.1.0.tgz#ea9675d54852708242462bfe60d56b3c3854cdf7"
+  integrity sha512-4aE3U7CCBWgrQlQDMq8da4woBWDGHioJFiOZ8Ie6Yq2uwYQ9V2kGhTz4x3u6Wc+OU17nw0yc3rJ/lQ4jIiPe3A==
+  dependencies:
+    path-exists "^5.0.0"
+
+mri@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b"
+  integrity sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==
+
 mrmime@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-2.0.0.tgz#151082a6e06e59a9a39b46b3e14d5cfe92b3abb4"
@@ -5999,7 +10175,7 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@2.1.3:
+ms@2.1.3, ms@^2.1.1:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -6012,16 +10188,57 @@ multicast-dns@^7.2.5:
     dns-packet "^5.2.2"
     thunky "^1.0.2"
 
+multiparty@4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/multiparty/-/multiparty-4.2.3.tgz#6b14981badb5ad3f0929622868751810368d4633"
+  integrity sha512-Ak6EUJZuhGS8hJ3c2fY6UW5MbkGUPMBEGd13djUzoY/BHqV/gTuFWtC6IuVA7A2+v3yjBS6c4or50xhzTQZImQ==
+  dependencies:
+    http-errors "~1.8.1"
+    safe-buffer "5.2.1"
+    uid-safe "2.1.5"
+
+mute-stream@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+  integrity sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ==
+
+nan@^2.16.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.19.0.tgz#bb58122ad55a6c5bc973303908d5b16cfdd5a8c0"
+  integrity sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==
+
 nanoid@^3.3.7:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
   integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
 
+nanomatch@^1.2.9:
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    fragment-cache "^0.2.1"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
 napi-build-utils@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806"
   integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==
 
+napi-wasm@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/napi-wasm/-/napi-wasm-1.1.0.tgz#bbe617823765ae9c1bc12ff5942370eae7b2ba4e"
+  integrity sha512-lHwIAJbmLSjF9VDRm9GoVOy9AGp3aIvkjv+Kvz9h16QR3uSVYH78PNQUnT2U4X53mhlnV2M7wrhibQ3GHicDmg==
+
 negotiator@0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
@@ -6032,6 +10249,183 @@ neo-async@^2.6.2:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
+nested-error-stacks@^2.0.0, nested-error-stacks@^2.1.0, nested-error-stacks@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/nested-error-stacks/-/nested-error-stacks-2.1.1.tgz#26c8a3cee6cc05fbcf1e333cd2fc3e003326c0b5"
+  integrity sha512-9iN1ka/9zmX1ZvLV9ewJYEk9h7RyRRtqdK0woXcqohu8EWIerfPUjYJPg0ULy0UqP7cslmdGc8xKDJcojlKiaw==
+
+netlify-cli@^17.23.0:
+  version "17.23.0"
+  resolved "https://registry.yarnpkg.com/netlify-cli/-/netlify-cli-17.23.0.tgz#8948a69477feb23a9c17e67ad9d12e436c115e54"
+  integrity sha512-tGHa8HeQbGqeQgJzz7KW8xajU8ZWKUzb30H9+B/igRemmm3aF0ZB5k43Dh4iTngS8Z//oXfuT7naYjTagTcxCQ==
+  dependencies:
+    "@bugsnag/js" "7.22.7"
+    "@fastify/static" "6.12.0"
+    "@netlify/blobs" "7.3.0"
+    "@netlify/build" "29.41.0"
+    "@netlify/build-info" "7.13.2"
+    "@netlify/config" "20.12.2"
+    "@netlify/edge-bundler" "12.0.0"
+    "@netlify/edge-functions" "2.5.1"
+    "@netlify/local-functions-proxy" "1.1.1"
+    "@netlify/zip-it-and-ship-it" "9.32.1"
+    "@octokit/rest" "19.0.13"
+    "@opentelemetry/api" "1.8.0"
+    ansi-escapes "6.2.1"
+    ansi-styles "6.2.1"
+    ansi-to-html "0.7.2"
+    ascii-table "0.0.9"
+    backoff "2.5.0"
+    better-opn "3.0.2"
+    boxen "7.1.1"
+    chalk "5.2.0"
+    chokidar "3.5.3"
+    ci-info "3.8.0"
+    clean-deep "3.4.0"
+    commander "10.0.1"
+    comment-json "4.2.3"
+    concordance "5.0.4"
+    configstore "6.0.0"
+    content-type "1.0.5"
+    cookie "0.5.0"
+    copy-template-dir "1.4.0"
+    cron-parser "4.8.1"
+    debug "4.3.4"
+    decache "4.6.2"
+    dot-prop "7.2.0"
+    dotenv "16.0.3"
+    env-paths "3.0.0"
+    envinfo "7.8.1"
+    etag "1.8.1"
+    execa "5.1.1"
+    express "4.19.2"
+    express-logging "1.1.1"
+    extract-zip "2.0.1"
+    fastest-levenshtein "1.0.16"
+    fastify "4.17.0"
+    find-up "6.3.0"
+    flush-write-stream "2.0.0"
+    folder-walker "3.2.0"
+    from2-array "0.0.4"
+    fuzzy "0.1.3"
+    get-port "7.1.0"
+    gh-release-fetch "4.0.3"
+    git-repo-info "2.1.1"
+    gitconfiglocal "2.1.0"
+    hasbin "1.2.3"
+    hasha "5.2.2"
+    http-proxy "1.18.1"
+    http-proxy-middleware "2.0.6"
+    https-proxy-agent "7.0.4"
+    inquirer "6.5.2"
+    inquirer-autocomplete-prompt "1.4.0"
+    ipx "2.1.0"
+    is-docker "3.0.0"
+    is-stream "3.0.0"
+    is-wsl "2.2.0"
+    isexe "2.0.0"
+    js-yaml "4.1.0"
+    jsonwebtoken "9.0.2"
+    jwt-decode "3.1.2"
+    lambda-local "2.1.2"
+    listr2 "7.0.2"
+    locate-path "7.2.0"
+    lodash "4.17.21"
+    log-symbols "5.1.0"
+    log-update "5.0.1"
+    multiparty "4.2.3"
+    netlify "13.1.14"
+    netlify-headers-parser "7.1.4"
+    netlify-redirect-parser "14.2.2"
+    netlify-redirector "0.5.0"
+    node-fetch "2.6.12"
+    node-version-alias "3.4.1"
+    ora "6.3.1"
+    p-filter "3.0.0"
+    p-map "5.5.0"
+    p-wait-for "5.0.2"
+    parallel-transform "1.2.0"
+    parse-github-url "1.0.2"
+    parse-gitignore "2.0.0"
+    path-key "4.0.0"
+    prettyjson "1.2.5"
+    pump "3.0.0"
+    raw-body "2.5.2"
+    read-package-up "11.0.0"
+    semver "7.6.0"
+    source-map-support "0.5.21"
+    strip-ansi-control-characters "2.0.0"
+    tabtab "3.0.2"
+    tempy "3.0.0"
+    terminal-link "3.0.0"
+    through2-filter "3.0.0"
+    through2-map "3.0.0"
+    to-readable-stream "3.0.0"
+    toml "3.0.0"
+    tomlify-j0.4 "3.0.0"
+    ulid "2.3.0"
+    unixify "1.0.0"
+    update-notifier "6.0.2"
+    uuid "9.0.1"
+    wait-port "1.0.4"
+    write-file-atomic "5.0.1"
+    ws "8.14.2"
+    zod "3.22.4"
+
+netlify-headers-parser@7.1.4, netlify-headers-parser@^7.1.4:
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/netlify-headers-parser/-/netlify-headers-parser-7.1.4.tgz#ec692e9278f2d68b9a7176ee186b069d37bc1be5"
+  integrity sha512-fTVQf8u65vS4YTP2Qt1K6Np01q3yecRKXf6VMONMlWbfl5n3M/on7pZlZISNAXHNOtnVt+6Kpwfl+RIeALC8Kg==
+  dependencies:
+    "@iarna/toml" "^2.2.5"
+    escape-string-regexp "^5.0.0"
+    fast-safe-stringify "^2.0.7"
+    is-plain-obj "^4.0.0"
+    map-obj "^5.0.0"
+    path-exists "^5.0.0"
+
+netlify-redirect-parser@14.2.2, netlify-redirect-parser@^14.2.2:
+  version "14.2.2"
+  resolved "https://registry.yarnpkg.com/netlify-redirect-parser/-/netlify-redirect-parser-14.2.2.tgz#ad3c705ea5f4c574ac37b82d4fe21854678b28ac"
+  integrity sha512-LS3cbHZfATtfZFeJr8RLBREAjCE1rEG1CybKnA6dTLgXez0lGJE/QTPzjn6GqfNmiMowo15YQe4+UjRhbzQ04w==
+  dependencies:
+    "@iarna/toml" "^2.2.5"
+    fast-safe-stringify "^2.1.1"
+    filter-obj "^5.0.0"
+    is-plain-obj "^4.0.0"
+    path-exists "^5.0.0"
+
+netlify-redirector@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/netlify-redirector/-/netlify-redirector-0.5.0.tgz#9611dd8497dab4e13d9f6a6f1595b9528b9e7abf"
+  integrity sha512-4zdzIP+6muqPCuE8avnrgDJ6KW/2+UpHTRcTbMXCIRxiRmyrX+IZ4WSJGZdHPWF3WmQpXpy603XxecZ9iygN7w==
+
+netlify@13.1.14:
+  version "13.1.14"
+  resolved "https://registry.yarnpkg.com/netlify/-/netlify-13.1.14.tgz#fbba73e5d979b94c2b050037c9dbf16f10523801"
+  integrity sha512-7vSq6so7lPjr3HEpjbtLyde0F3IXOzD0ocJs3s2wnJR+nX+8pWOAVGe+KN6S98odsClJBJxCkWG2rLjTBzW9pw==
+  dependencies:
+    "@netlify/open-api" "^2.28.0"
+    lodash-es "^4.17.21"
+    micro-api-client "^3.3.0"
+    node-fetch "^3.0.0"
+    omit.js "^2.0.2"
+    p-wait-for "^4.0.0"
+    qs "^6.9.6"
+
+netlify@^13.1.14, netlify@^13.1.15:
+  version "13.1.15"
+  resolved "https://registry.yarnpkg.com/netlify/-/netlify-13.1.15.tgz#4ccedd7b64df2cafe6238b2e7974e941762768de"
+  integrity sha512-6gZ2lMcjqiXqirwbxeXoNyQn1LcW18s8zdR9eTS8Dtuqg/h4JxI7y9ahV9fypfp0bdaTt8hkBoopBJXLQPsJmA==
+  dependencies:
+    "@netlify/open-api" "^2.30.0"
+    lodash-es "^4.17.21"
+    micro-api-client "^3.3.0"
+    node-fetch "^3.0.0"
+    omit.js "^2.0.2"
+    p-wait-for "^4.0.0"
+    qs "^6.9.6"
+
 no-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
@@ -6052,6 +10446,21 @@ node-addon-api@^5.0.0:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-5.1.0.tgz#49da1ca055e109a23d537e9de43c09cca21eb762"
   integrity sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==
 
+node-addon-api@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-6.1.0.tgz#ac8470034e58e67d0c6f1204a18ae6995d9c0d76"
+  integrity sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==
+
+node-addon-api@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.0.tgz#71f609369379c08e251c558527a107107b5e0fdb"
+  integrity sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==
+
+node-domexception@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5"
+  integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==
+
 node-emoji@^1.10.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c"
@@ -6059,23 +10468,73 @@ node-emoji@^1.10.0:
   dependencies:
     lodash "^4.17.21"
 
-node-fetch@^2.6.12:
+node-fetch-native@^1.6.1, node-fetch-native@^1.6.2, node-fetch-native@^1.6.3:
+  version "1.6.4"
+  resolved "https://registry.yarnpkg.com/node-fetch-native/-/node-fetch-native-1.6.4.tgz#679fc8fd8111266d47d7e72c379f1bed9acff06e"
+  integrity sha512-IhOigYzAKHd244OC0JIMIUrjzctirCmPkaIfhDeGcEETWof5zKYUW7e7MYvChGWh/4CJeXEgsRyGzuF334rOOQ==
+
+node-fetch@2.6.12:
+  version "2.6.12"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.12.tgz#02eb8e22074018e3d5a83016649d04df0e348fba"
+  integrity sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==
+  dependencies:
+    whatwg-url "^5.0.0"
+
+node-fetch@^2.6.12, node-fetch@^2.6.7:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
   integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
   dependencies:
     whatwg-url "^5.0.0"
 
-node-forge@^1:
+node-fetch@^3.0.0, node-fetch@^3.1.1, node-fetch@^3.3.1, node-fetch@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.3.2.tgz#d1e889bacdf733b4ff3b2b243eb7a12866a0b78b"
+  integrity sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==
+  dependencies:
+    data-uri-to-buffer "^4.0.0"
+    fetch-blob "^3.1.4"
+    formdata-polyfill "^4.0.10"
+
+node-forge@^1, node-forge@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
   integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
 
+node-gyp-build@^4.2.2:
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.0.tgz#3fee9c1731df4581a3f9ead74664369ff00d26dd"
+  integrity sha512-u6fs2AEUljNho3EYTJNBfImO5QTo/J/1Etd+NVdCj7qWKUSN/bSLkZwhDv7I+w/MSC6qJ4cknepkAYykDdK8og==
+
 node-releases@^2.0.14:
   version "2.0.14"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
   integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
 
+node-source-walk@^6.0.0, node-source-walk@^6.0.1, node-source-walk@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/node-source-walk/-/node-source-walk-6.0.2.tgz#ba81bc4bc0f6f05559b084bea10be84c3f87f211"
+  integrity sha512-jn9vOIK/nfqoFCcpK89/VCVaLg1IHE6UVfDOzvqmANaJ/rWCTEdH8RZ1V278nv2jr36BJdyQXIAavBLXpzdlag==
+  dependencies:
+    "@babel/parser" "^7.21.8"
+
+node-stream-zip@^1.15.0:
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/node-stream-zip/-/node-stream-zip-1.15.0.tgz#158adb88ed8004c6c49a396b50a6a5de3bca33ea"
+  integrity sha512-LN4fydt9TqhZhThkZIVQnF9cwjU3qmUH9h78Mx/K7d3VvfRqqwthLwJEUOEL0QPZ0XQmNN7be5Ggit5+4dq3Bw==
+
+node-version-alias@3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/node-version-alias/-/node-version-alias-3.4.1.tgz#3b38457372bd54ecf2fe10607b8124067d4c60a8"
+  integrity sha512-Kf3L9spAL6lEHMPyqpwHSTNG3LPkOXBfSUnBMG/YE2TdoC8Qoqf0+qg01nr6K9MFQEcXtWUyTQzLJByRixSBsA==
+  dependencies:
+    all-node-versions "^11.3.0"
+    filter-obj "^5.1.0"
+    is-plain-obj "^4.1.0"
+    normalize-node-version "^12.4.0"
+    path-exists "^5.0.0"
+    semver "^7.3.8"
+
 nodemon@^3.0.1:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-3.0.3.tgz#244a62d1c690eece3f6165c6cdb0db03ebd80b76"
@@ -6097,6 +10556,18 @@ non-layered-tidy-tree-layout@^2.0.2:
   resolved "https://registry.yarnpkg.com/non-layered-tidy-tree-layout/-/non-layered-tidy-tree-layout-2.0.2.tgz#57d35d13c356643fc296a55fb11ac15e74da7804"
   integrity sha512-gkXMxRzUH+PB0ax9dUN0yYF0S25BqeAYqhgMaLUFmpXLEk7Fcu8f4emJuOAY0V8kjDICxROIKsTAKsV/v355xw==
 
+noop2@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/noop2/-/noop2-2.0.0.tgz#4b636015e9882b54783c02b412f699d8c5cd0a5b"
+  integrity sha512-2bu7Pfpf6uNqashWV8P7yYeutQ3XkLY9MBSYI5sOAFZxuWcW/uJfLbKj5m6SvMDT9U1Y0C+7UFG+7VSiIdXjtA==
+
+nopt@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
+  integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==
+  dependencies:
+    abbrev "1"
+
 nopt@~1.0.10:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
@@ -6104,6 +10575,42 @@ nopt@~1.0.10:
   dependencies:
     abbrev "1"
 
+normalize-node-version@^12.4.0:
+  version "12.4.0"
+  resolved "https://registry.yarnpkg.com/normalize-node-version/-/normalize-node-version-12.4.0.tgz#94d4be3f7e6769d85c5de8b4b8d4ed3bc232f538"
+  integrity sha512-0oLZN5xcyKVrSHMk8/9RuNblEe7HEsXAt5Te2xmMiZD9VX7bqWYe0HMyfqSYFD3xv0949lZuXaEwjTqle1uWWQ==
+  dependencies:
+    all-node-versions "^11.3.0"
+    filter-obj "^5.1.0"
+    semver "^7.3.7"
+
+normalize-package-data@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
+  integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
+  dependencies:
+    hosted-git-info "^4.0.1"
+    is-core-module "^2.5.0"
+    semver "^7.3.4"
+    validate-npm-package-license "^3.0.1"
+
+normalize-package-data@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-6.0.0.tgz#68a96b3c11edd462af7189c837b6b1064a484196"
+  integrity sha512-UL7ELRVxYBHBgYEtZCXjxuD5vPxnmvMGq0jp/dGPKKrN7tfsBh2IY7TlJ15WWwdjRWD3RJbnsygUurTK3xkPkg==
+  dependencies:
+    hosted-git-info "^7.0.0"
+    is-core-module "^2.8.1"
+    semver "^7.3.5"
+    validate-npm-package-license "^3.0.4"
+
+normalize-path@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  integrity sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==
+  dependencies:
+    remove-trailing-separator "^1.0.1"
+
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
@@ -6124,6 +10631,11 @@ normalize-url@^6.0.1:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
   integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
 
+normalize-url@^8.0.0:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-8.0.1.tgz#9b7d96af9836577c58f5883e939365fa15623a4a"
+  integrity sha512-IO9QvjUMWxPQQhs60oOu10CRkWCiZzSUkzbXGGV9pviYl1fXYcvkzQ5jV9z8Y6un8ARoVRl4EtC6v6jNqbaJ/w==
+
 npm-run-path@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
@@ -6131,6 +10643,23 @@ npm-run-path@^4.0.1:
   dependencies:
     path-key "^3.0.0"
 
+npm-run-path@^5.1.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.3.0.tgz#e23353d0ebb9317f174e93417e4a4d82d0249e9f"
+  integrity sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==
+  dependencies:
+    path-key "^4.0.0"
+
+npmlog@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-5.0.1.tgz#f06678e80e29419ad67ab964e0fa69959c1eb8b0"
+  integrity sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==
+  dependencies:
+    are-we-there-yet "^2.0.0"
+    console-control-strings "^1.1.0"
+    gauge "^3.0.0"
+    set-blocking "^2.0.0"
+
 nprogress@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/nprogress/-/nprogress-0.2.0.tgz#cb8f34c53213d895723fcbab907e9422adbcafb1"
@@ -6148,7 +10677,16 @@ object-assign@^4.1.0, object-assign@^4.1.1:
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
-object-inspect@^1.9.0:
+object-copy@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==
+  dependencies:
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
+
+object-inspect@^1.13.1, object-inspect@^1.9.0:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2"
   integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==
@@ -6158,6 +10696,13 @@ object-keys@^1.1.1:
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
+object-visit@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==
+  dependencies:
+    isobject "^3.0.0"
+
 object.assign@^4.1.0:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0"
@@ -6168,11 +10713,42 @@ object.assign@^4.1.0:
     has-symbols "^1.0.3"
     object-keys "^1.1.1"
 
+object.pick@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==
+  dependencies:
+    isobject "^3.0.1"
+
 obuf@^1.0.0, obuf@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
   integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
 
+ofetch@^1.3.3:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/ofetch/-/ofetch-1.3.4.tgz#7ea65ced3c592ec2b9906975ae3fe1d26a56f635"
+  integrity sha512-KLIET85ik3vhEfS+3fDlc/BAZiAp+43QEC/yCo5zkNoY2YaKvNkOaFr/6wCFgFH1kuYQM5pMNi0Tg8koiIemtw==
+  dependencies:
+    destr "^2.0.3"
+    node-fetch-native "^1.6.3"
+    ufo "^1.5.3"
+
+ohash@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/ohash/-/ohash-1.1.3.tgz#f12c3c50bfe7271ce3fd1097d42568122ccdcf07"
+  integrity sha512-zuHHiGTYTA1sYJ/wZN+t5HKZaH23i4yI1HMwbuXm24Nid7Dv0KcuRlKoNKS9UNfAVSBlnGLcuQrnOKWOZoEGaw==
+
+omit.js@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/omit.js/-/omit.js-2.0.2.tgz#dd9b8436fab947a5f3ff214cb2538631e313ec2f"
+  integrity sha512-hJmu9D+bNB40YpL9jYebQl4lsTW6yEHRTroJzNLqQJYHm7c+NQnJGfZmIWh8S3q3KoaxV1aLhV6B3+0N0/kyJg==
+
+on-exit-leak-free@^2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/on-exit-leak-free/-/on-exit-leak-free-2.1.2.tgz#fed195c9ebddb7d9e4c3842f93f281ac8dadd3b8"
+  integrity sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA==
+
 on-finished@2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
@@ -6180,7 +10756,7 @@ on-finished@2.4.1:
   dependencies:
     ee-first "1.1.1"
 
-on-headers@~1.0.2:
+on-headers@^1.0.0, on-headers@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
   integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
@@ -6192,14 +10768,35 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
   dependencies:
     wrappy "1"
 
-onetime@^5.1.2:
+one-time@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz#e06bc174aed214ed58edede573b433bbf827cb45"
+  integrity sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==
+  dependencies:
+    fn.name "1.x.x"
+
+onetime@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  integrity sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==
+  dependencies:
+    mimic-fn "^1.0.0"
+
+onetime@^5.1.0, onetime@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
   integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
   dependencies:
     mimic-fn "^2.1.0"
 
-open@^8.0.9, open@^8.4.0:
+onetime@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-6.0.0.tgz#7c24c18ed1fd2e9bca4bd26806a33613c77d34b4"
+  integrity sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==
+  dependencies:
+    mimic-fn "^4.0.0"
+
+open@^8.0.4, open@^8.0.9, open@^8.4.0:
   version "8.4.2"
   resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"
   integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==
@@ -6213,11 +10810,82 @@ opener@^1.5.2:
   resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
   integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
 
+ora@6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-6.3.1.tgz#a4e9e5c2cf5ee73c259e8b410273e706a2ad3ed6"
+  integrity sha512-ERAyNnZOfqM+Ao3RAvIXkYh5joP220yf59gVe2X/cI6SiCxIdi4c9HZKZD8R6q/RDXEje1THBju6iExiSsgJaQ==
+  dependencies:
+    chalk "^5.0.0"
+    cli-cursor "^4.0.0"
+    cli-spinners "^2.6.1"
+    is-interactive "^2.0.0"
+    is-unicode-supported "^1.1.0"
+    log-symbols "^5.1.0"
+    stdin-discarder "^0.1.0"
+    strip-ansi "^7.0.1"
+    wcwidth "^1.0.1"
+
+os-name@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/os-name/-/os-name-5.1.0.tgz#4f5ab5edfa6938b590112714f1570fe79f1d957a"
+  integrity sha512-YEIoAnM6zFmzw3PQ201gCVCIWbXNyKObGlVvpAVvraAeOHnlYVKFssbA/riRX5R40WA6kKrZ7Dr7dWzO3nKSeQ==
+  dependencies:
+    macos-release "^3.1.0"
+    windows-release "^5.0.1"
+
+os-tmpdir@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
+
+outvariant@^1.2.1, outvariant@^1.4.0:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/outvariant/-/outvariant-1.4.2.tgz#f54f19240eeb7f15b28263d5147405752d8e2066"
+  integrity sha512-Ou3dJ6bA/UJ5GVHxah4LnqDwZRwAmWxrG3wtrHrbGnP4RnLCtA64A4F+ae7Y8ww660JaddSoArUR5HjipWSHAQ==
+
 p-cancelable@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
   integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
 
+p-cancelable@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-3.0.0.tgz#63826694b54d61ca1c20ebcb6d3ecf5e14cd8050"
+  integrity sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==
+
+p-event@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/p-event/-/p-event-4.2.0.tgz#af4b049c8acd91ae81083ebd1e6f5cae2044c1b5"
+  integrity sha512-KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ==
+  dependencies:
+    p-timeout "^3.1.0"
+
+p-event@^5.0.0, p-event@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/p-event/-/p-event-5.0.1.tgz#614624ec02ae7f4f13d09a721c90586184af5b0c"
+  integrity sha512-dd589iCQ7m1L0bmC5NLlVYfy3TbBEsMUfWx9PyAgPeIcFZ/E2yaTZ4Rz4MiBmmJShviiftHVXOqfnfzJ6kyMrQ==
+  dependencies:
+    p-timeout "^5.0.2"
+
+p-every@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-every/-/p-every-2.0.0.tgz#ad940b82b1bd1da01c307b11e1dd25fe7286181a"
+  integrity sha512-MCz9DqD5opPC48Zsd+BHm56O/HfhYIQQtupfDzhXoVgQdg/Ux4F8/JcdRuQ+arq7zD5fB6zP3axbH3d9Nr8dlw==
+  dependencies:
+    p-map "^2.0.0"
+
+p-filter@3.0.0, p-filter@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-filter/-/p-filter-3.0.0.tgz#ce50e03b24b23930e11679ab8694bd09a2d7ed35"
+  integrity sha512-QtoWLjXAW++uTX67HZQz1dbTpqBfiidsB6VtQUC9iR85S120+s0T5sO6s+B5MLzFcZkrEd/DGMmCjR+f2Qpxwg==
+  dependencies:
+    p-map "^5.1.0"
+
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
+
 p-limit@^2.0.0, p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
@@ -6225,13 +10893,20 @@ p-limit@^2.0.0, p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
-p-limit@^3.0.2:
+p-limit@^3.0.2, p-limit@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
   integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
   dependencies:
     yocto-queue "^0.1.0"
 
+p-limit@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-4.0.0.tgz#914af6544ed32bfa54670b061cafcbd04984b644"
+  integrity sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==
+  dependencies:
+    yocto-queue "^1.0.0"
+
 p-locate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
@@ -6253,6 +10928,25 @@ p-locate@^5.0.0:
   dependencies:
     p-limit "^3.0.2"
 
+p-locate@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-6.0.0.tgz#3da9a49d4934b901089dca3302fa65dc5a05c04f"
+  integrity sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==
+  dependencies:
+    p-limit "^4.0.0"
+
+p-map@5.5.0, p-map@^5.0.0, p-map@^5.1.0, p-map@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-5.5.0.tgz#054ca8ca778dfa4cf3f8db6638ccb5b937266715"
+  integrity sha512-VFqfGDHlx87K66yZrNdI4YGtD70IRyd+zSvgks6mzHPRNkoKy+9EKP4SFC77/vTTQYmRmti7dvqC+m5jBrBAcg==
+  dependencies:
+    aggregate-error "^4.0.0"
+
+p-map@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
+  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
+
 p-map@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
@@ -6260,6 +10954,16 @@ p-map@^4.0.0:
   dependencies:
     aggregate-error "^3.0.0"
 
+p-map@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-6.0.0.tgz#4d9c40d3171632f86c47601b709f4b4acd70fed4"
+  integrity sha512-T8BatKGY+k5rU+Q/GTYgrEf2r4xRMevAN5mtXc2aPc4rS1j3s+vWTaO2Wag94neXuCAUAs8cxBL9EeB5EA6diw==
+
+p-reduce@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-3.0.0.tgz#f11773794792974bd1f7a14c72934248abff4160"
+  integrity sha512-xsrIUgI0Kn6iyDYm9StOpOeK29XM1aboGji26+QEortiFST1hGZaUQOLhtEbqHErPpGW/aSz6allwK2qcptp0Q==
+
 p-retry@^4.5.0:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16"
@@ -6268,11 +10972,50 @@ p-retry@^4.5.0:
     "@types/retry" "0.12.0"
     retry "^0.13.1"
 
+p-retry@^5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-5.1.2.tgz#c16eaee4f2016f9161d12da40d3b8b0f2e3c1b76"
+  integrity sha512-couX95waDu98NfNZV+i/iLt+fdVxmI7CbrrdC2uDWfPdUAApyxT4wmDlyOtR5KtTDmkDO0zDScDjDou9YHhd9g==
+  dependencies:
+    "@types/retry" "0.12.1"
+    retry "^0.13.1"
+
+p-timeout@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe"
+  integrity sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==
+  dependencies:
+    p-finally "^1.0.0"
+
+p-timeout@^5.0.0, p-timeout@^5.0.2:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-5.1.0.tgz#b3c691cf4415138ce2d9cfe071dba11f0fee085b"
+  integrity sha512-auFDyzzzGZZZdHz3BtET9VEz0SE/uMEAx7uWfGPucfzEwwe/xH0iVeZibQmANYE/hp9T2+UUZT5m+BKyrDp3Ew==
+
+p-timeout@^6.0.0:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-6.1.2.tgz#22b8d8a78abf5e103030211c5fc6dee1166a6aa5"
+  integrity sha512-UbD77BuZ9Bc9aABo74gfXhNvzC9Tx7SxtHSh1fxvx3jTLLYvmVhiQZZrJzqqU0jKbN32kb5VOKiLEQI/3bIjgQ==
+
 p-try@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
+p-wait-for@5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/p-wait-for/-/p-wait-for-5.0.2.tgz#1546a15e64accf1897377cb1507fa4c756fffe96"
+  integrity sha512-lwx6u1CotQYPVju77R+D0vFomni/AqRfqLmqQ8hekklqZ6gAY9rONh7lBQ0uxWMkC2AuX9b2DVAl8To0NyP1JA==
+  dependencies:
+    p-timeout "^6.0.0"
+
+p-wait-for@^4.0.0, p-wait-for@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-wait-for/-/p-wait-for-4.1.0.tgz#290f126f49bbd7c84e0cedccb342cd631aaa0f16"
+  integrity sha512-i8nE5q++9h8oaQHWltS1Tnnv4IoMDOlqN7C0KFG2OdbK0iFJIt6CROZ8wfBM+K4Pxqfnq4C4lkkpXqTEpB5DZw==
+  dependencies:
+    p-timeout "^5.0.0"
+
 package-json@^6.3.0:
   version "6.5.0"
   resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0"
@@ -6283,6 +11026,25 @@ package-json@^6.3.0:
     registry-url "^5.0.0"
     semver "^6.2.0"
 
+package-json@^8.1.0:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/package-json/-/package-json-8.1.1.tgz#3e9948e43df40d1e8e78a85485f1070bf8f03dc8"
+  integrity sha512-cbH9IAIJHNj9uXi196JVsRlt7cHKak6u/e6AkL/bkRelZ7rlL3X1YKxsZwa36xipOEKAsdtmaG6aAJoM1fx2zA==
+  dependencies:
+    got "^12.1.0"
+    registry-auth-token "^5.0.1"
+    registry-url "^6.0.0"
+    semver "^7.3.7"
+
+parallel-transform@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc"
+  integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==
+  dependencies:
+    cyclist "^1.0.1"
+    inherits "^2.0.3"
+    readable-stream "^2.1.5"
+
 param-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5"
@@ -6310,6 +11072,16 @@ parse-entities@^2.0.0:
     is-decimal "^1.0.0"
     is-hexadecimal "^1.0.0"
 
+parse-github-url@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/parse-github-url/-/parse-github-url-1.0.2.tgz#242d3b65cbcdda14bb50439e3242acf6971db395"
+  integrity sha512-kgBf6avCbO3Cn6+RnzRGLkUsv4ZVqv/VfAYkRsyBcgkshNvVBkRn1FEZcW0Jb+npXQWm2vHPnnOqFteZxRRGNw==
+
+parse-gitignore@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/parse-gitignore/-/parse-gitignore-2.0.0.tgz#81156b265115c507129f3faea067b8476da3b642"
+  integrity sha512-RmVuCHWsfu0QPNW+mraxh/xjQVw/lhUCUru8Zni3Ctq3AoMhpDTq0OVdKS6iesd6Kqb7viCV3isAL43dciOSog==
+
 parse-json@^5.0.0, parse-json@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
@@ -6320,6 +11092,20 @@ parse-json@^5.0.0, parse-json@^5.2.0:
     json-parse-even-better-errors "^2.3.0"
     lines-and-columns "^1.1.6"
 
+parse-json@^8.0.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-8.1.0.tgz#91cdc7728004e955af9cb734de5684733b24a717"
+  integrity sha512-rum1bPifK5SSar35Z6EKZuYPJx85pkNaFrxBK3mwdfSJ1/WKbYrjoW/zTPSjRRamfmVX1ACBIdFAO0VRErW/EA==
+  dependencies:
+    "@babel/code-frame" "^7.22.13"
+    index-to-position "^0.1.2"
+    type-fest "^4.7.1"
+
+parse-ms@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-3.0.0.tgz#3ea24a934913345fcc3656deda72df921da3a70e"
+  integrity sha512-Tpb8Z7r7XbbtBTrM9UhpkzzaMrqA2VXMT3YChzYltwV3P3pM6t8wl7TvpMnSTosz1aQAdVib7kdoys7vYOPerw==
+
 parse-numeric-range@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/parse-numeric-range/-/parse-numeric-range-1.3.0.tgz#7c63b61190d61e4d53a1197f0c83c47bb670ffa3"
@@ -6358,6 +11144,11 @@ pascal-case@^3.1.2:
     no-case "^3.0.4"
     tslib "^2.0.3"
 
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==
+
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
@@ -6368,6 +11159,11 @@ path-exists@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
   integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
+path-exists@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-5.0.0.tgz#a6aad9489200b21fab31e49cf09277e5116fb9e7"
+  integrity sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==
+
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
@@ -6378,6 +11174,11 @@ path-is-inside@1.0.2:
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
   integrity sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==
 
+path-key@4.0.0, path-key@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-4.0.0.tgz#295588dc3aee64154f877adb9d780b81c554bf18"
+  integrity sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==
+
 path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
@@ -6410,16 +11211,66 @@ path-type@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
+path-type@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-5.0.0.tgz#14b01ed7aea7ddf9c7c3f46181d4d04f9c785bb8"
+  integrity sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==
+
+pathe@^1.1.1, pathe@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/pathe/-/pathe-1.1.2.tgz#6c4cb47a945692e48a1ddd6e4094d170516437ec"
+  integrity sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==
+
+peek-readable@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-5.0.0.tgz#7ead2aff25dc40458c60347ea76cfdfd63efdfec"
+  integrity sha512-YtCKvLUOvwtMGmrniQPdO7MwPjgkFBtFIrmfSbYmYuq3tKDV/mcfAhBth1+C3ru7uXIZasc/pHnb+YDYNkkj4A==
+
+pend@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
+  integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
+
 picocolors@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1:
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
+pino-abstract-transport@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/pino-abstract-transport/-/pino-abstract-transport-1.2.0.tgz#97f9f2631931e242da531b5c66d3079c12c9d1b5"
+  integrity sha512-Guhh8EZfPCfH+PMXAb6rKOjGQEoy0xlAIn+irODG5kgfYV+BQ0rGYYWTIel3P5mmyXqkYkPmdIkywsn6QKUR1Q==
+  dependencies:
+    readable-stream "^4.0.0"
+    split2 "^4.0.0"
+
+pino-std-serializers@^6.0.0:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-6.2.2.tgz#d9a9b5f2b9a402486a5fc4db0a737570a860aab3"
+  integrity sha512-cHjPPsE+vhj/tnhCy/wiMh3M3z3h/j15zHQX+S9GkTBgqJuTuJzYJ4gUyACLhDaJ7kk9ba9iRDmbH2tJU03OiA==
+
+pino@^8.5.0:
+  version "8.21.0"
+  resolved "https://registry.yarnpkg.com/pino/-/pino-8.21.0.tgz#e1207f3675a2722940d62da79a7a55a98409f00d"
+  integrity sha512-ip4qdzjkAyDDZklUaZkcRFb2iA118H9SgRh8yzTkSQK8HilsOJF7rSY8HoW5+I0M46AZgX/pxbprf2vvzQCE0Q==
+  dependencies:
+    atomic-sleep "^1.0.0"
+    fast-redact "^3.1.1"
+    on-exit-leak-free "^2.1.0"
+    pino-abstract-transport "^1.2.0"
+    pino-std-serializers "^6.0.0"
+    process-warning "^3.0.0"
+    quick-format-unescaped "^4.0.3"
+    real-require "^0.2.0"
+    safe-stable-stringify "^2.3.1"
+    sonic-boom "^3.7.0"
+    thread-stream "^2.6.0"
+
 pkg-dir@^4.1.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
@@ -6427,6 +11278,22 @@ pkg-dir@^4.1.0:
   dependencies:
     find-up "^4.0.0"
 
+pkg-dir@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-7.0.0.tgz#8f0c08d6df4476756c5ff29b3282d0bab7517d11"
+  integrity sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==
+  dependencies:
+    find-up "^6.3.0"
+
+pkg-types@^1.0.3:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-1.1.0.tgz#3ec1bf33379030fd0a34c227b6c650e8ea7ca271"
+  integrity sha512-/RpmvKdxKf8uILTtoOhAgf30wYbP2Qw+L9p3Rvshx1JZVX+XQNZQFjlbmGHEGIm4CkVPlSn+NXmIM8+9oWQaSA==
+  dependencies:
+    confbox "^0.1.7"
+    mlly "^1.6.1"
+    pathe "^1.1.2"
+
 pkg-up@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
@@ -6434,6 +11301,11 @@ pkg-up@^3.1.0:
   dependencies:
     find-up "^3.0.0"
 
+posix-character-classes@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==
+
 postcss-calc@^8.2.3:
   version "8.2.4"
   resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.4.tgz#77b9c29bfcbe8a07ff6693dc87050828889739a5"
@@ -6710,6 +11582,15 @@ postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
+postcss-values-parser@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-6.0.2.tgz#636edc5b86c953896f1bb0d7a7a6615df00fb76f"
+  integrity sha512-YLJpK0N1brcNJrs9WatuJFtHaV9q5aAOj+S4DI5S7jgHlRfm0PIbDCAFRYMQD5SHq7Fy6xsDhyutgS0QOAs0qw==
+  dependencies:
+    color-name "^1.1.4"
+    is-url-superb "^4.0.0"
+    quote-unquote "^1.0.0"
+
 postcss-zindex@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-5.1.0.tgz#4a5c7e5ff1050bd4c01d95b1847dfdcc58a496ff"
@@ -6724,6 +11605,15 @@ postcss@^8.3.11, postcss@^8.4.14, postcss@^8.4.17, postcss@^8.4.33:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
+postcss@^8.4.23:
+  version "8.4.38"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e"
+  integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==
+  dependencies:
+    nanoid "^3.3.7"
+    picocolors "^1.0.0"
+    source-map-js "^1.2.0"
+
 prebuild-install@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.1.tgz#de97d5b34a70a0c81334fd24641f2a1702352e45"
@@ -6742,6 +11632,29 @@ prebuild-install@^7.1.1:
     tar-fs "^2.0.0"
     tunnel-agent "^0.6.0"
 
+precinct@^11.0.0:
+  version "11.0.5"
+  resolved "https://registry.yarnpkg.com/precinct/-/precinct-11.0.5.tgz#3e15b3486670806f18addb54b8533e23596399ff"
+  integrity sha512-oHSWLC8cL/0znFhvln26D14KfCQFFn4KOLSw6hmLhd+LQ2SKt9Ljm89but76Pc7flM9Ty1TnXyrA2u16MfRV3w==
+  dependencies:
+    "@dependents/detective-less" "^4.1.0"
+    commander "^10.0.1"
+    detective-amd "^5.0.2"
+    detective-cjs "^5.0.1"
+    detective-es6 "^4.0.1"
+    detective-postcss "^6.1.3"
+    detective-sass "^5.0.3"
+    detective-scss "^4.0.3"
+    detective-stylus "^4.0.0"
+    detective-typescript "^11.1.0"
+    module-definition "^5.0.1"
+    node-source-walk "^6.0.2"
+
+precond@0.2:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/precond/-/precond-0.2.3.tgz#aa9591bcaa24923f1e0f4849d240f47efc1075ac"
+  integrity sha512-QCYG84SgGyGzqJ/vlMsxeXd/pgL/I94ixdNFyh1PusWmTCyVfPJjZ1K1jvHtsbfnXQs2TSkEP2fR7QiMZAnKFQ==
+
 prepend-http@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
@@ -6755,11 +11668,35 @@ pretty-error@^4.0.0:
     lodash "^4.17.20"
     renderkid "^3.0.0"
 
+pretty-format@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e"
+  integrity sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==
+  dependencies:
+    ansi-regex "^5.0.1"
+    ansi-styles "^5.0.0"
+    react-is "^17.0.1"
+
+pretty-ms@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-8.0.0.tgz#a35563b2a02df01e595538f86d7de54ca23194a3"
+  integrity sha512-ASJqOugUF1bbzI35STMBUpZqdfYKlJugy6JBziGi2EE+AL5JPJGSzvpeVXojxrr0ViUYoToUjb5kjSEGf7Y83Q==
+  dependencies:
+    parse-ms "^3.0.0"
+
 pretty-time@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/pretty-time/-/pretty-time-1.1.0.tgz#ffb7429afabb8535c346a34e41873adf3d74dd0e"
   integrity sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA==
 
+prettyjson@1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/prettyjson/-/prettyjson-1.2.5.tgz#ef3cfffcc70505c032abc59785884b4027031835"
+  integrity sha512-rksPWtoZb2ZpT5OVgtmy0KHVM+Dca3iVwWY9ifwhcexfjebtgjg3wmrUt9PvJ59XIYBcknQeYHD8IAnVlh9lAw==
+  dependencies:
+    colors "1.4.0"
+    minimist "^1.2.0"
+
 prism-react-renderer@^1.3.1, prism-react-renderer@^1.3.5:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/prism-react-renderer/-/prism-react-renderer-1.3.5.tgz#786bb69aa6f73c32ba1ee813fbe17a0115435085"
@@ -6775,6 +11712,21 @@ process-nextick-args@~2.0.0:
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
+process-warning@^2.0.0:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/process-warning/-/process-warning-2.3.2.tgz#70d8a3251aab0eafe3a595d8ae2c5d2277f096a5"
+  integrity sha512-n9wh8tvBe5sFmsqlg+XQhaQLumwpqoAUruLwjCopgTmUBjJ/fjtBsJzKleCaIGBOMXYEhp1YfKl4d7rJ5ZKJGA==
+
+process-warning@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/process-warning/-/process-warning-3.0.0.tgz#96e5b88884187a1dce6f5c3166d611132058710b"
+  integrity sha512-mqn0kFRl0EoqhnL0GQ0veqFHyIN1yig9RHh/InzORTUiZHFRAur+aMtRkELNwGs9aNwKS6tg/An4NYBPGwvtzQ==
+
+process@^0.11.10:
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
+
 promise@^7.1.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
@@ -6806,7 +11758,12 @@ property-information@^5.0.0, property-information@^5.3.0:
   dependencies:
     xtend "^4.0.0"
 
-proxy-addr@~2.0.7:
+proto-list@~1.2.1:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
+  integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==
+
+proxy-addr@^2.0.7, proxy-addr@~2.0.7:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
   integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
@@ -6819,12 +11776,17 @@ proxy-from-env@^1.1.0:
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
   integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
 
+ps-list@^8.0.0:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/ps-list/-/ps-list-8.1.1.tgz#9ff1952b26a9a07fcc05270407e60544237ae581"
+  integrity sha512-OPS9kEJYVmiO48u/B9qneqhkMvgCxT+Tm28VCEJpheTpl8cJ0ffZRRNgS5mrQRTrX5yRTpaJ+hRDeefXYmmorQ==
+
 pstree.remy@^1.1.8:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.8.tgz#c242224f4a67c21f686839bbdb4ac282b8373d3a"
   integrity sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==
 
-pump@^3.0.0:
+pump@3.0.0, pump@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
   integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
@@ -6832,6 +11794,14 @@ pump@^3.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
+pump@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz#5dfe8311c33bbf6fc18261f9f34702c47c08a954"
+  integrity sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
 punycode@^1.3.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
@@ -6849,6 +11819,13 @@ pupa@^2.1.1:
   dependencies:
     escape-goat "^2.0.0"
 
+pupa@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/pupa/-/pupa-3.1.0.tgz#f15610274376bbcc70c9a3aa8b505ea23f41c579"
+  integrity sha512-FLpr4flz5xZTSJxSeaheeMKN/EDzMdK7b8PTOC6a5PYFKTucWbdqjgqaEyH0shFiSJrVB1+Qqi4Tk19ccU6Aug==
+  dependencies:
+    escape-goat "^4.0.0"
+
 pure-color@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/pure-color/-/pure-color-1.3.0.tgz#1fe064fb0ac851f0de61320a8bf796836422f33e"
@@ -6861,11 +11838,23 @@ qs@6.11.0:
   dependencies:
     side-channel "^1.0.4"
 
+qs@^6.9.6:
+  version "6.12.1"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.12.1.tgz#39422111ca7cbdb70425541cba20c7d7b216599a"
+  integrity sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ==
+  dependencies:
+    side-channel "^1.0.6"
+
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
+queue-tick@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/queue-tick/-/queue-tick-1.0.1.tgz#f6f07ac82c1fd60f82e098b417a80e52f1f4c142"
+  integrity sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==
+
 queue@6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/queue/-/queue-6.0.2.tgz#b91525283e2315c7553d2efa18d83e76432fed65"
@@ -6873,6 +11862,31 @@ queue@6.0.2:
   dependencies:
     inherits "~2.0.3"
 
+quick-format-unescaped@^4.0.3:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz#93ef6dd8d3453cbc7970dd614fad4c5954d6b5a7"
+  integrity sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==
+
+quick-lru@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
+  integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
+
+quote-unquote@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/quote-unquote/-/quote-unquote-1.0.0.tgz#67a9a77148effeaf81a4d428404a710baaac8a0b"
+  integrity sha512-twwRO/ilhlG/FIgYeKGFqyHhoEhqgnKVkcmqMKi2r524gz3ZbDTcyFt38E9xjJI2vT+KbRNHVbnJ/e0I25Azwg==
+
+radix3@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/radix3/-/radix3-1.1.2.tgz#fd27d2af3896c6bf4bcdfab6427c69c2afc69ec0"
+  integrity sha512-b484I/7b8rDEdSDKckSSBA8knMpcdsXudlE/LNL639wFoHKwLbEkQFZHWEYwDC0wa0FKUcCY+GAF73Z7wxNVFA==
+
+random-bytes@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/random-bytes/-/random-bytes-1.0.0.tgz#4f68a1dc0ae58bd3fb95848c30324db75d64360b"
+  integrity sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ==
+
 randombytes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
@@ -6900,6 +11914,16 @@ raw-body@2.5.1:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
+raw-body@2.5.2:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
+  integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==
+  dependencies:
+    bytes "3.1.2"
+    http-errors "2.0.0"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
 rc@1.2.8, rc@^1.2.7, rc@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
@@ -6994,7 +12018,7 @@ react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-react-is@^17.0.0:
+react-is@^17.0.0, react-is@^17.0.1:
   version "17.0.2"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
@@ -7026,6 +12050,14 @@ react-loadable-ssr-addon-v5-slorber@^1.0.1:
   dependencies:
     "@babel/runtime" "^7.10.3"
 
+"react-loadable@npm:@docusaurus/react-loadable@5.5.2":
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/react-loadable/-/react-loadable-5.5.2.tgz#81aae0db81ecafbdaee3651f12804580868fa6ce"
+  integrity sha512-A3dYjdBGuy0IGT+wyLIGIKLRE+sAk1iNk0f1HjNDysO7u8lhL4N3VEm+FAubmJbAztn94F7MxBTPmnixbiyFdQ==
+  dependencies:
+    "@types/react" "*"
+    prop-types "^15.6.2"
+
 react-markdown@6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-6.0.0.tgz#e63cd32d095e864384d524986c44c34c919de517"
@@ -7117,7 +12149,46 @@ react@^17.0.2:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-readable-stream@^2.0.1:
+read-package-up@11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/read-package-up/-/read-package-up-11.0.0.tgz#71fb879fdaac0e16891e6e666df22de24a48d5ba"
+  integrity sha512-MbgfoNPANMdb4oRBNg5eqLbB2t2r+o5Ua1pNt8BqGp4I0FJZhuVSOj3PaBPni4azWuSzEdNn2evevzVmEk1ohQ==
+  dependencies:
+    find-up-simple "^1.0.0"
+    read-pkg "^9.0.0"
+    type-fest "^4.6.0"
+
+read-pkg-up@^9.0.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-9.1.0.tgz#38ca48e0bc6c6b260464b14aad9bcd4e5b1fbdc3"
+  integrity sha512-vaMRR1AC1nrd5CQM0PhlRsO5oc2AAigqr7cCrZ/MW/Rsaflz4RlgzkpL4qoU/z1F6wrbd85iFv1OQj/y5RdGvg==
+  dependencies:
+    find-up "^6.3.0"
+    read-pkg "^7.1.0"
+    type-fest "^2.5.0"
+
+read-pkg@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-7.1.0.tgz#438b4caed1ad656ba359b3e00fd094f3c427a43e"
+  integrity sha512-5iOehe+WF75IccPc30bWTbpdDQLOCc3Uu8bi3Dte3Eueij81yx1Mrufk8qBx/YAbR4uL1FdUr+7BKXDwEtisXg==
+  dependencies:
+    "@types/normalize-package-data" "^2.4.1"
+    normalize-package-data "^3.0.2"
+    parse-json "^5.2.0"
+    type-fest "^2.0.0"
+
+read-pkg@^9.0.0:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-9.0.1.tgz#b1b81fb15104f5dbb121b6bbdee9bbc9739f569b"
+  integrity sha512-9viLL4/n1BJUCT1NXVTdS1jtm80yDEgR5T4yCelII49Mbj0v1rZdKqj7zCiYdbB0CuCgdrvHcNogAKTFPBocFA==
+  dependencies:
+    "@types/normalize-package-data" "^2.4.3"
+    normalize-package-data "^6.0.0"
+    parse-json "^8.0.0"
+    type-fest "^4.6.0"
+    unicorn-magic "^0.1.0"
+
+readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.5, readable-stream@~2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
   integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
@@ -7130,7 +12201,7 @@ readable-stream@^2.0.1:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0:
+readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
   integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
@@ -7139,7 +12210,41 @@ readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readdirp@~3.6.0:
+readable-stream@^4.0.0:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-4.5.2.tgz#9e7fc4c45099baeed934bff6eb97ba6cf2729e09"
+  integrity sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==
+  dependencies:
+    abort-controller "^3.0.0"
+    buffer "^6.0.3"
+    events "^3.3.0"
+    process "^0.11.10"
+    string_decoder "^1.3.0"
+
+readable-web-to-node-stream@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz#5d52bb5df7b54861fd48d015e93a2cb87b3ee0bb"
+  integrity sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==
+  dependencies:
+    readable-stream "^3.6.0"
+
+readdir-glob@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.3.tgz#c3d831f51f5e7bfa62fa2ffbe4b508c640f09584"
+  integrity sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==
+  dependencies:
+    minimatch "^5.1.0"
+
+readdirp@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
+  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
+  dependencies:
+    graceful-fs "^4.1.11"
+    micromatch "^3.1.10"
+    readable-stream "^2.0.2"
+
+readdirp@^3.4.0, readdirp@~3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
   integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
@@ -7151,6 +12256,11 @@ reading-time@^1.5.0:
   resolved "https://registry.yarnpkg.com/reading-time/-/reading-time-1.5.0.tgz#d2a7f1b6057cb2e169beaf87113cc3411b5bc5bb"
   integrity sha512-onYyVhBNr4CmAxFsKS7bz+uTLRakypIe4R+5A824vBSkQy/hB3fZepoVEf8OVAxzLvK+H/jm9TzpI3ETSm64Kg==
 
+real-require@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/real-require/-/real-require-0.2.0.tgz#209632dea1810be2ae063a6ac084fee7e33fba78"
+  integrity sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg==
+
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
@@ -7189,6 +12299,14 @@ regenerator-transform@^0.15.2:
   dependencies:
     "@babel/runtime" "^7.8.4"
 
+regex-not@^1.0.0, regex-not@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
+  dependencies:
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
+
 regexpu-core@^5.3.1:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b"
@@ -7208,6 +12326,13 @@ registry-auth-token@^4.0.0:
   dependencies:
     rc "1.2.8"
 
+registry-auth-token@^5.0.1:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-5.0.2.tgz#8b026cc507c8552ebbe06724136267e63302f756"
+  integrity sha512-o/3ikDxtXaA59BmZuZrJZDJv8NMDGSj+6j6XaeBmHw8eY1i1qd9+6H+LjVvQXx3HN6aRCGa1cUdJ9RaJZUugnQ==
+  dependencies:
+    "@pnpm/npm-conf" "^2.1.0"
+
 registry-url@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009"
@@ -7215,6 +12340,13 @@ registry-url@^5.0.0:
   dependencies:
     rc "^1.2.8"
 
+registry-url@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-6.0.1.tgz#056d9343680f2f64400032b1e199faa692286c58"
+  integrity sha512-+crtS5QjFRqFCoQmvGduwYWEBng99ZvmFvF+cUJkGYF1L1BfU8C6Zp9T7f5vPAwyLkUExpvK+ANVZmGU49qi4Q==
+  dependencies:
+    rc "1.2.8"
+
 regjsparser@^0.9.1:
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709"
@@ -7323,6 +12455,11 @@ remark-squeeze-paragraphs@4.0.0:
   dependencies:
     mdast-squeeze-paragraphs "^4.0.0"
 
+remove-trailing-separator@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==
+
 renderkid@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-3.0.0.tgz#5fd823e4d6951d37358ecc9a58b1f06836b6268a"
@@ -7334,7 +12471,12 @@ renderkid@^3.0.0:
     lodash "^4.17.21"
     strip-ansi "^6.0.1"
 
-repeat-string@^1.0.0, repeat-string@^1.5.4:
+repeat-element@^1.1.2:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
+  integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
+
+repeat-string@^1.0.0, repeat-string@^1.5.4, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
@@ -7354,21 +12496,41 @@ require-from-string@^2.0.2:
   resolved "https://registry.yarnpkg.com/require-like/-/require-like-0.1.2.tgz#ad6f30c13becd797010c468afa775c0c0a6b47fa"
   integrity sha512-oyrU88skkMtDdauHDuKVrgR+zuItqr6/c//FXzvmxRGMexSDc6hNvJInGW3LL46n+8b50RykrvwSUIIQH2LQ5A==
 
+require-package-name@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/require-package-name/-/require-package-name-2.0.1.tgz#c11e97276b65b8e2923f75dabf5fb2ef0c3841b9"
+  integrity sha512-uuoJ1hU/k6M0779t3VMVIYpb2VMJk05cehCaABFhXaibcbvfgR8wKiozLjVFSzJPmQMRqIcO0HMyTFqfV09V6Q==
+
 requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
 
+resolve-alpn@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9"
+  integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==
+
 resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
+resolve-from@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
+
 resolve-pathname@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd"
   integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==
 
+resolve-url@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==
+
 resolve@^1.1.6, resolve@^1.14.2, resolve@^1.3.2:
   version "1.22.8"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
@@ -7378,6 +12540,15 @@ resolve@^1.1.6, resolve@^1.14.2, resolve@^1.3.2:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+resolve@^2.0.0-next.1:
+  version "2.0.0-next.5"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.5.tgz#6b0ec3107e671e52b68cd068ef327173b90dc03c"
+  integrity sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==
+  dependencies:
+    is-core-module "^2.13.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
 responselike@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
@@ -7385,6 +12556,39 @@ responselike@^1.0.2:
   dependencies:
     lowercase-keys "^1.0.0"
 
+responselike@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/responselike/-/responselike-3.0.0.tgz#20decb6c298aff0dbee1c355ca95461d42823626"
+  integrity sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==
+  dependencies:
+    lowercase-keys "^3.0.0"
+
+restore-cursor@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  integrity sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==
+  dependencies:
+    onetime "^2.0.0"
+    signal-exit "^3.0.2"
+
+restore-cursor@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-4.0.0.tgz#519560a4318975096def6e609d44100edaa4ccb9"
+  integrity sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==
+  dependencies:
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
+
+ret@~0.2.0:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.2.2.tgz#b6861782a1f4762dce43402a71eb7a283f44573c"
+  integrity sha512-M0b3YWQs7R3Z917WRQy1HHA7Ba7D8hvZg6UE5mLykJxQVE2ju0IXbGlaHPPlkY+WN7wFP+wUMXmBFA0aV6vYGQ==
+
 retry@^0.13.1:
   version "0.13.1"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
@@ -7395,6 +12599,11 @@ reusify@^1.0.4:
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
+rfdc@^1.2.0, rfdc@^1.3.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.1.tgz#2b6d4df52dffe8bb346992a10ea9451f24373a8f"
+  integrity sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==
+
 rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
@@ -7422,7 +12631,12 @@ rtlcss@^3.5.0:
     postcss "^8.3.11"
     strip-json-comments "^3.1.1"
 
-run-parallel@^1.1.9:
+run-async@^2.2.0, run-async@^2.4.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
+  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
+
+run-parallel@^1.1.4, run-parallel@^1.1.9:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
   integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
@@ -7434,6 +12648,13 @@ rw@1:
   resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
   integrity sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==
 
+rxjs@^6.4.0, rxjs@^6.6.2:
+  version "6.6.7"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
+  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
+  dependencies:
+    tslib "^1.9.0"
+
 rxjs@^7.5.4, rxjs@^7.8.1:
   version "7.8.1"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
@@ -7451,6 +12672,30 @@ safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0,
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
+safe-json-stringify@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz#356e44bc98f1f93ce45df14bcd7c01cda86e0afd"
+  integrity sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==
+
+safe-regex2@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/safe-regex2/-/safe-regex2-2.0.0.tgz#b287524c397c7a2994470367e0185e1916b1f5b9"
+  integrity sha512-PaUSFsUaNNuKwkBijoAPHAK6/eM6VirvyPWlZ7BAQy4D+hCvh4B6lIG+nPdhbFfIbP+gTGBcrdsOaUs0F+ZBOQ==
+  dependencies:
+    ret "~0.2.0"
+
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==
+  dependencies:
+    ret "~0.1.10"
+
+safe-stable-stringify@^2.3.1:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz#138c84b6f6edb3db5f8ef3ef7115b8f55ccbf886"
+  integrity sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==
+
 "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
@@ -7514,6 +12759,18 @@ section-matter@^1.0.0:
     extend-shallow "^2.0.1"
     kind-of "^6.0.0"
 
+secure-json-parse@^2.5.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/secure-json-parse/-/secure-json-parse-2.7.0.tgz#5a5f9cd6ae47df23dba3151edd06855d47e09862"
+  integrity sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw==
+
+seek-bzip@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.6.tgz#35c4171f55a680916b52a07859ecf3b5857f21c4"
+  integrity sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ==
+  dependencies:
+    commander "^2.8.1"
+
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
@@ -7534,6 +12791,20 @@ semver-diff@^3.1.1:
   dependencies:
     semver "^6.3.0"
 
+semver-diff@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-4.0.0.tgz#3afcf5ed6d62259f5c72d0d5d50dffbdc9680df5"
+  integrity sha512-0Ju4+6A8iOnpL/Thra7dZsSlOHYAHIeMxfhWQRI1/VLcT3WDBZKKtQt/QkBOsiIN9ZpuvHE6cGZ0x4glCMmfiA==
+  dependencies:
+    semver "^7.3.5"
+
+semver@7.6.0, semver@^7.0.0, semver@^7.3.8:
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
+  integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
+  dependencies:
+    lru-cache "^6.0.0"
+
 semver@^5.4.1:
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
@@ -7614,6 +12885,16 @@ serve-static@1.15.0:
     parseurl "~1.3.3"
     send "0.18.0"
 
+set-blocking@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
+
+set-cookie-parser@^2.4.1:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.6.0.tgz#131921e50f62ff1a66a461d7d62d7b21d5d15a51"
+  integrity sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ==
+
 set-function-length@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.0.tgz#2f81dc6c16c7059bda5ab7c82c11f03a515ed8e1"
@@ -7625,6 +12906,28 @@ set-function-length@^1.1.1:
     gopd "^1.0.1"
     has-property-descriptors "^1.0.1"
 
+set-function-length@^1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
+  integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==
+  dependencies:
+    define-data-property "^1.1.4"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.4"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.2"
+
+set-value@^2.0.0, set-value@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
+
 setimmediate@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
@@ -7666,6 +12969,20 @@ sharp@^0.30.7:
     tar-fs "^2.1.1"
     tunnel-agent "^0.6.0"
 
+sharp@^0.32.6:
+  version "0.32.6"
+  resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.32.6.tgz#6ad30c0b7cd910df65d5f355f774aa4fce45732a"
+  integrity sha512-KyLTWwgcR9Oe4d9HwCwNM2l7+J0dUQwn/yf7S0EnTtb0eVS4RxO0eUSvxPtzT4F3SY+C4K6fqdv/DO27sJ/v/w==
+  dependencies:
+    color "^4.2.3"
+    detect-libc "^2.0.2"
+    node-addon-api "^6.1.0"
+    prebuild-install "^7.1.1"
+    semver "^7.5.4"
+    simple-get "^4.0.1"
+    tar-fs "^3.0.4"
+    tunnel-agent "^0.6.0"
+
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -7711,11 +13028,26 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-signal-exit@^3.0.2, signal-exit@^3.0.3:
+side-channel@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2"
+  integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==
+  dependencies:
+    call-bind "^1.0.7"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.4"
+    object-inspect "^1.13.1"
+
+signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
+signal-exit@^4.0.1, signal-exit@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
+  integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
+
 simple-concat@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f"
@@ -7778,6 +13110,44 @@ slash@^4.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
   integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==
 
+slice-ansi@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-5.0.0.tgz#b73063c57aa96f9cd881654b15294d95d285c42a"
+  integrity sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==
+  dependencies:
+    ansi-styles "^6.0.0"
+    is-fullwidth-code-point "^4.0.0"
+
+snapdragon-node@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
+  dependencies:
+    define-property "^1.0.0"
+    isobject "^3.0.0"
+    snapdragon-util "^3.0.1"
+
+snapdragon-util@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
+  dependencies:
+    kind-of "^3.2.0"
+
+snapdragon@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
+  dependencies:
+    base "^0.11.1"
+    debug "^2.2.0"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    map-cache "^0.2.2"
+    source-map "^0.5.6"
+    source-map-resolve "^0.5.0"
+    use "^3.1.0"
+
 sockjs@^0.3.24:
   version "0.3.24"
   resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce"
@@ -7787,17 +13157,54 @@ sockjs@^0.3.24:
     uuid "^8.3.2"
     websocket-driver "^0.7.4"
 
+sonic-boom@^3.7.0:
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-3.8.1.tgz#d5ba8c4e26d6176c9a1d14d549d9ff579a163422"
+  integrity sha512-y4Z8LCDBuum+PBP3lSV7RHrXscqksve/bi0as7mhwVnBW+/wUqKT/2Kb7um8yqcFy0duYbbPxzt89Zy2nOCaxg==
+  dependencies:
+    atomic-sleep "^1.0.0"
+
 sort-css-media-queries@2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/sort-css-media-queries/-/sort-css-media-queries-2.1.0.tgz#7c85e06f79826baabb232f5560e9745d7a78c4ce"
   integrity sha512-IeWvo8NkNiY2vVYdPa27MCQiR0MN0M80johAYFVxWWXQ44KU84WNxjslwBHmc/7ZL2ccwkM7/e6S5aiKZXm7jA==
 
+sort-keys-length@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/sort-keys-length/-/sort-keys-length-1.0.1.tgz#9cb6f4f4e9e48155a6aa0671edd336ff1479a188"
+  integrity sha512-GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw==
+  dependencies:
+    sort-keys "^1.0.0"
+
+sort-keys@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
+  integrity sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg==
+  dependencies:
+    is-plain-obj "^1.0.0"
+
+source-map-js@^1.0.1, source-map-js@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
+  integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
+
 source-map-js@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
   integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
 
-source-map-support@~0.5.20:
+source-map-resolve@^0.5.0:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
+  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
+  dependencies:
+    atob "^2.1.2"
+    decode-uri-component "^0.2.0"
+    resolve-url "^0.2.1"
+    source-map-url "^0.4.0"
+    urix "^0.1.0"
+
+source-map-support@0.5.21, source-map-support@~0.5.20:
   version "0.5.21"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
   integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
@@ -7805,12 +13212,17 @@ source-map-support@~0.5.20:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map@^0.5.0:
+source-map-url@^0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
+  integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
+
+source-map@^0.5.0, source-map@^0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
 
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0:
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
@@ -7825,6 +13237,32 @@ spawn-command@0.0.2:
   resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2.tgz#9544e1a43ca045f8531aac1a48cb29bdae62338e"
   integrity sha512-zC8zGoGkmc8J9ndvml8Xksr1Amk9qBujgbF0JAIWO7kXr43w0h/0GJNM/Vustixu+YE8N/MTrQ7N31FvHUACxQ==
 
+spdx-correct@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c"
+  integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==
+  dependencies:
+    spdx-expression-parse "^3.0.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-exceptions@^2.1.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz#5d607d27fc806f66d7b64a766650fa890f04ed66"
+  integrity sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==
+
+spdx-expression-parse@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
+  dependencies:
+    spdx-exceptions "^2.1.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-license-ids@^3.0.0:
+  version "3.0.17"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz#887da8aa73218e51a1d917502d79863161a93f9c"
+  integrity sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==
+
 spdy-transport@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"
@@ -7848,6 +13286,25 @@ spdy@^4.0.2:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
+split-string@^3.0.1, split-string@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
+  dependencies:
+    extend-shallow "^3.0.0"
+
+split2@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/split2/-/split2-1.1.1.tgz#162d9b18865f02ab2f2ad9585522db9b54c481f9"
+  integrity sha512-cfurE2q8LamExY+lJ9Ex3ZfBwqAPduzOKVscPDXNCLLMvyaeD3DTz1yk7fVIs6Chco+12XeD0BB6HEoYzPYbXA==
+  dependencies:
+    through2 "~2.0.0"
+
+split2@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/split2/-/split2-4.2.0.tgz#c9c5920904d148bab0b9f67145f245a86aadbfa4"
+  integrity sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==
+
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
@@ -7858,27 +13315,74 @@ stable@^0.1.8:
   resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
   integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
 
+stack-generator@^2.0.3:
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/stack-generator/-/stack-generator-2.0.10.tgz#8ae171e985ed62287d4f1ed55a1633b3fb53bb4d"
+  integrity sha512-mwnua/hkqM6pF4k8SnmZ2zfETsRUpWXREfA/goT8SLCV4iOFa4bzOX2nDipWAZFPTjLvQB82f5yaodMVhK0yJQ==
+  dependencies:
+    stackframe "^1.3.4"
+
+stack-trace@0.0.x:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
+  integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==
+
+stackframe@^1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310"
+  integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==
+
 state-toggle@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe"
   integrity sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ==
 
+static-extend@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==
+  dependencies:
+    define-property "^0.2.5"
+    object-copy "^0.1.0"
+
 statuses@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
   integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
 
-"statuses@>= 1.4.0 < 2":
+"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
-std-env@^3.0.1:
+std-env@^3.0.1, std-env@^3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.7.0.tgz#c9f7386ced6ecf13360b6c6c55b8aaa4ef7481d2"
   integrity sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==
 
-string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
+stdin-discarder@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/stdin-discarder/-/stdin-discarder-0.1.0.tgz#22b3e400393a8e28ebf53f9958f3880622efde21"
+  integrity sha512-xhV7w8S+bUwlPTb4bAOUQhv8/cSS5offJuX8GQGq32ONF0ZtDWKfkdomM3HMRA+LhX6um/FZ0COqlwsjD53LeQ==
+  dependencies:
+    bl "^5.0.0"
+
+streamx@^2.15.0, streamx@^2.16.1:
+  version "2.16.1"
+  resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.16.1.tgz#2b311bd34832f08aa6bb4d6a80297c9caef89614"
+  integrity sha512-m9QYj6WygWyWa3H1YY69amr4nVgy61xfjys7xO7kviL5rfIEc2naf+ewFiOA+aEJD7y0JO3h2GoiUv4TDwEGzQ==
+  dependencies:
+    fast-fifo "^1.1.0"
+    queue-tick "^1.0.1"
+  optionalDependencies:
+    bare-events "^2.2.0"
+
+strict-event-emitter@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/strict-event-emitter/-/strict-event-emitter-0.5.1.tgz#1602ece81c51574ca39c6815e09f1a3e8550bd93"
+  integrity sha512-vMgjE/GGEPEFnhFub6pa4FmJBRBVOLpIII2hvCZ8Kzb7K0hlHo7mQv6xYrBvCL2LtAIBwFUK8wvuJgTVSQ5MFQ==
+
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -7887,7 +13391,15 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string-width@^5.0.1:
+string-width@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
+string-width@^5.0.0, string-width@^5.0.1, string-width@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
   integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
@@ -7896,7 +13408,7 @@ string-width@^5.0.1:
     emoji-regex "^9.2.2"
     strip-ansi "^7.0.1"
 
-string_decoder@^1.1.1:
+string_decoder@^1.1.1, string_decoder@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
   integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
@@ -7919,6 +13431,25 @@ stringify-object@^3.3.0:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
+strip-ansi-control-characters@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi-control-characters/-/strip-ansi-control-characters-2.0.0.tgz#8875b5ba3a859a0a44f94e1cf7d3eda8980997b9"
+  integrity sha512-Q0/k5orrVGeaOlIOUn1gybGU0IcAbgHQT1faLo5hik4DqClKVSaka5xOhNNoRgtfztHVxCYxi7j71mrWom0bIw==
+
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==
+  dependencies:
+    ansi-regex "^3.0.0"
+
+strip-ansi@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
+  dependencies:
+    ansi-regex "^4.1.0"
+
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -7926,7 +13457,7 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   dependencies:
     ansi-regex "^5.0.1"
 
-strip-ansi@^7.0.1:
+strip-ansi@^7.0.0, strip-ansi@^7.0.1:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
   integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
@@ -7938,11 +13469,24 @@ strip-bom-string@^1.0.0:
   resolved "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92"
   integrity sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g==
 
+strip-dirs@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-dirs/-/strip-dirs-3.0.0.tgz#7c9a5d7822ce079a9db40387a4b20d5654746f42"
+  integrity sha512-I0sdgcFTfKQlUPZyAqPJmSG3HLO9rWDFnxonnIbskYNM3DwFOeTNB5KzVq3dA1GdRAc/25b5Y7UO2TQfKWw4aQ==
+  dependencies:
+    inspect-with-kind "^1.0.5"
+    is-plain-obj "^1.1.0"
+
 strip-final-newline@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
+strip-final-newline@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-3.0.0.tgz#52894c313fbff318835280aed60ff71ebf12b8fd"
+  integrity sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==
+
 strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
@@ -7953,6 +13497,19 @@ strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==
 
+strip-outer@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-outer/-/strip-outer-2.0.0.tgz#c45c724ed9b1ff6be5f660503791404f4714084b"
+  integrity sha512-A21Xsm1XzUkK0qK1ZrytDUvqsQWict2Cykhvi0fBQntGG5JSprESasEyV1EZ/4CiR5WB5KjzLTrP/bO37B0wPg==
+
+strtok3@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/strtok3/-/strtok3-7.0.0.tgz#868c428b4ade64a8fd8fee7364256001c1a4cbe5"
+  integrity sha512-pQ+V+nYQdC5H3Q7qBZAz/MO6lwGhoC2gOAjuouGf/VO0m7vQRh8QNMl2Uf6SwAtzZ9bOw3UIeBukEGNJl5dtXQ==
+  dependencies:
+    "@tokenizer/token" "^0.3.0"
+    peek-readable "^5.0.0"
+
 style-to-object@0.3.0, style-to-object@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46"
@@ -7980,7 +13537,7 @@ supports-color@^5.3.0, supports-color@^5.5.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^7.1.0:
+supports-color@^7.0.0, supports-color@^7.1.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
   integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
@@ -7994,6 +13551,19 @@ supports-color@^8.0.0, supports-color@^8.1.1:
   dependencies:
     has-flag "^4.0.0"
 
+supports-color@^9.0.0:
+  version "9.4.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-9.4.0.tgz#17bfcf686288f531db3dea3215510621ccb55954"
+  integrity sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw==
+
+supports-hyperlinks@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624"
+  integrity sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==
+  dependencies:
+    has-flag "^4.0.0"
+    supports-color "^7.0.0"
+
 supports-preserve-symlinks-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
@@ -8017,6 +13587,36 @@ svgo@^2.7.0, svgo@^2.8.0:
     picocolors "^1.0.0"
     stable "^0.1.8"
 
+svgo@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/svgo/-/svgo-3.2.0.tgz#7a5dff2938d8c6096e00295c2390e8e652fa805d"
+  integrity sha512-4PP6CMW/V7l/GmKRKzsLR8xxjdHTV4IMvhTnpuHwwBazSIlw5W/5SmPjN8Dwyt7lKbSJrRDgp4t9ph0HgChFBQ==
+  dependencies:
+    "@trysound/sax" "0.2.0"
+    commander "^7.2.0"
+    css-select "^5.1.0"
+    css-tree "^2.3.1"
+    css-what "^6.1.0"
+    csso "^5.0.5"
+    picocolors "^1.0.0"
+
+system-architecture@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/system-architecture/-/system-architecture-0.1.0.tgz#71012b3ac141427d97c67c56bc7921af6bff122d"
+  integrity sha512-ulAk51I9UVUyJgxlv9M6lFot2WP3e7t8Kz9+IS6D4rVba1tR9kON+Ey69f+1R4Q8cd45Lod6a4IcJIxnzGc/zA==
+
+tabtab@3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/tabtab/-/tabtab-3.0.2.tgz#a2cea0f1035f88d145d7da77eaabbd3fe03e1ec9"
+  integrity sha512-jANKmUe0sIQc/zTALTBy186PoM/k6aPrh3A7p6AaAfF6WPSbTx1JYeGIGH162btpH+mmVEXln+UxwViZHO2Jhg==
+  dependencies:
+    debug "^4.0.1"
+    es6-promisify "^6.0.0"
+    inquirer "^6.0.0"
+    minimist "^1.2.0"
+    mkdirp "^0.5.1"
+    untildify "^3.0.3"
+
 tapable@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
@@ -8037,6 +13637,17 @@ tar-fs@^2.0.0, tar-fs@^2.1.1:
     pump "^3.0.0"
     tar-stream "^2.1.4"
 
+tar-fs@^3.0.4:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-3.0.5.tgz#f954d77767e4e6edf973384e1eb95f8f81d64ed9"
+  integrity sha512-JOgGAmZyMgbqpLwct7ZV8VzkEB6pxXFBVErLtb+XCOqzc6w1xiWKI9GVd6bwk68EX7eJ4DWmfXVmq8K2ziZTGg==
+  dependencies:
+    pump "^3.0.0"
+    tar-stream "^3.1.5"
+  optionalDependencies:
+    bare-fs "^2.1.1"
+    bare-path "^2.1.0"
+
 tar-stream@^2.1.4:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
@@ -8048,6 +13659,50 @@ tar-stream@^2.1.4:
     inherits "^2.0.3"
     readable-stream "^3.1.1"
 
+tar-stream@^3.0.0, tar-stream@^3.1.4, tar-stream@^3.1.5:
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-3.1.7.tgz#24b3fb5eabada19fe7338ed6d26e5f7c482e792b"
+  integrity sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==
+  dependencies:
+    b4a "^1.6.4"
+    fast-fifo "^1.2.0"
+    streamx "^2.15.0"
+
+tar@^6.1.11:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
+  integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
+  dependencies:
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    minipass "^5.0.0"
+    minizlib "^2.1.1"
+    mkdirp "^1.0.3"
+    yallist "^4.0.0"
+
+temp-dir@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-2.0.0.tgz#bde92b05bdfeb1516e804c9c00ad45177f31321e"
+  integrity sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==
+
+tempy@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/tempy/-/tempy-3.0.0.tgz#a6c0a15f5534a820e92c3e1369f1c1e87ebd6b68"
+  integrity sha512-B2I9X7+o2wOaW4r/CWMkpOO9mdiTRCxXNgob6iGvPmfPWgH/KyUD6Uy5crtWBxIBe3YrNZKR2lSzv1JJKWD4vA==
+  dependencies:
+    is-stream "^3.0.0"
+    temp-dir "^2.0.0"
+    type-fest "^2.12.2"
+    unique-string "^3.0.0"
+
+terminal-link@3.0.0, terminal-link@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-3.0.0.tgz#91c82a66b52fc1684123297ce384429faf72ac5c"
+  integrity sha512-flFL3m4wuixmf6IfhFJd1YPiLiMuxEc8uHRM1buzIeZPm22Au2pDqBJQgdo7n1WfPU1ONFGv7YDwpFBmHGF6lg==
+  dependencies:
+    ansi-escapes "^5.0.0"
+    supports-hyperlinks "^2.2.0"
+
 terser-webpack-plugin@^5.3.3, terser-webpack-plugin@^5.3.7:
   version "5.3.10"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199"
@@ -8069,36 +13724,126 @@ terser@^5.10.0, terser@^5.26.0:
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
+text-hex@1.0.x:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5"
+  integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==
+
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
+thread-stream@^2.6.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/thread-stream/-/thread-stream-2.7.0.tgz#d8a8e1b3fd538a6cca8ce69dbe5d3d097b601e11"
+  integrity sha512-qQiRWsU/wvNolI6tbbCKd9iKaTnCXsTwVxhhKM6nctPdujTyztjlbUkUTUymidWcMnZ5pWR0ej4a0tjsW021vw==
+  dependencies:
+    real-require "^0.2.0"
+
+through2-filter@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254"
+  integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==
+  dependencies:
+    through2 "~2.0.0"
+    xtend "~4.0.0"
+
+through2-map@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/through2-map/-/through2-map-3.0.0.tgz#a6c3026ce63b4898a997d540506b66ffd970f271"
+  integrity sha512-Ms68QPbSJKjRYY7fmqZHB0VGt+vD0/tjmDHUWgxltjifCof6hZWWeQAEi27Wjbs7jyNlIIyerQw/TVj7gHkd/Q==
+  dependencies:
+    through2 "~2.0.0"
+    xtend "^4.0.0"
+
+through2@^2.0.0, through2@~2.0.0:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
+  dependencies:
+    readable-stream "~2.3.6"
+    xtend "~4.0.1"
+
+through@^2.3.6, through@^2.3.8:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
+
 thunky@^1.0.2:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
   integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==
 
+time-zone@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/time-zone/-/time-zone-1.0.0.tgz#99c5bf55958966af6d06d83bdf3800dc82faec5d"
+  integrity sha512-TIsDdtKo6+XrPtiTm1ssmMngN1sAhyKnTO2kunQWqNPWIVvCm15Wmw4SWInwTVgJ5u/Tr04+8Ei9TNcw4x4ONA==
+
 tiny-invariant@^1.0.2:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.1.tgz#8560808c916ef02ecfd55e66090df23a4b7aa642"
   integrity sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==
 
+tiny-lru@^11.0.1:
+  version "11.2.6"
+  resolved "https://registry.yarnpkg.com/tiny-lru/-/tiny-lru-11.2.6.tgz#86a4fd0ad615eac1639adf92010e8b944e209fdb"
+  integrity sha512-0PU3c9PjMnltZaFo2sGYv/nnJsMjG0Cxx8X6FXHPPGjFyoo1SJDxvUXW1207rdiSxYizf31roo+GrkIByQeZoA==
+
 tiny-warning@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
   integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
 
+tmp-promise@^3.0.2, tmp-promise@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz#60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7"
+  integrity sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==
+  dependencies:
+    tmp "^0.2.0"
+
+tmp@^0.0.33:
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
+  dependencies:
+    os-tmpdir "~1.0.2"
+
+tmp@^0.2.0:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae"
+  integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==
+
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
   integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
 
+to-object-path@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  integrity sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==
+  dependencies:
+    kind-of "^3.0.2"
+
+to-readable-stream@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-3.0.0.tgz#7c4aa6e3e2413c86c6276a57780dadfba226762f"
+  integrity sha512-vD2LytT6DxPynBa1xbMtswY9gGqj27wNbh2uvI5OhBe+mrGLurRWRQZyQn3812sqlQRtUJwaKVshG+PoGwbPDQ==
+
 to-readable-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
   integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
 
+to-regex-range@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  integrity sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==
+  dependencies:
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
@@ -8106,11 +13851,39 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
+to-regex@^3.0.1, to-regex@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
+  dependencies:
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
+
 toidentifier@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
   integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
 
+token-types@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/token-types/-/token-types-5.0.1.tgz#aa9d9e6b23c420a675e55413b180635b86a093b4"
+  integrity sha512-Y2fmSnZjQdDb9W4w4r1tswlMHylzWIeOKpx0aZH9BgGtACHhrk3OkT52AzwcuqTRBZtvvnTjDBh8eynMulu8Vg==
+  dependencies:
+    "@tokenizer/token" "^0.3.0"
+    ieee754 "^1.2.1"
+
+toml@3.0.0, toml@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/toml/-/toml-3.0.0.tgz#342160f1af1904ec9d204d03a5d61222d762c5ee"
+  integrity sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==
+
+tomlify-j0.4@3.0.0, tomlify-j0.4@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/tomlify-j0.4/-/tomlify-j0.4-3.0.0.tgz#99414d45268c3a3b8bf38be82145b7bba34b7473"
+  integrity sha512-2Ulkc8T7mXJ2l0W476YC/A209PR38Nw8PuaCNtk9uI3t1zzFdGQeWYGQvmj2PZkVvRC/Yoi4xQKMRnWc/N29tQ==
+
 totalist@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/totalist/-/totalist-3.0.1.tgz#ba3a3d600c915b1a97872348f79c127475f6acf8"
@@ -8133,6 +13906,13 @@ tree-kill@^1.2.2:
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
   integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
 
+trim-repeated@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/trim-repeated/-/trim-repeated-2.0.0.tgz#5d60556d6d40d9461b7c7e06c3ac20b6b1d50090"
+  integrity sha512-QUHBFTJGdOwmp0tbOG505xAgOp/YliZP/6UgafFXYZ26WT1bvQmSMJUvkeVSASuJJHbqsFbynTvkd5W8RBTipg==
+  dependencies:
+    escape-string-regexp "^5.0.0"
+
 trim-trailing-lines@^1.0.0:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz#bd4abbec7cc880462f10b2c8b5ce1d8d1ec7c2c0"
@@ -8143,6 +13923,11 @@ trim@0.0.1:
   resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd"
   integrity sha512-YzQV+TZg4AxpKxaTHK3c3D+kRDCGVEE7LemdlQZoQXn0iennk10RsIoY6ikzAqJTc9Xjl9C1/waHom/J86ziAQ==
 
+triple-beam@^1.3.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.4.1.tgz#6fde70271dc6e5d73ca0c3b24e2d92afb7441984"
+  integrity sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==
+
 trough@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
@@ -8153,11 +13938,42 @@ ts-dedent@^2.2.0:
   resolved "https://registry.yarnpkg.com/ts-dedent/-/ts-dedent-2.2.0.tgz#39e4bd297cd036292ae2394eb3412be63f563bb5"
   integrity sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==
 
+ts-node@^10.9.1:
+  version "10.9.2"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f"
+  integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==
+  dependencies:
+    "@cspotcode/source-map-support" "^0.8.0"
+    "@tsconfig/node10" "^1.0.7"
+    "@tsconfig/node12" "^1.0.7"
+    "@tsconfig/node14" "^1.0.0"
+    "@tsconfig/node16" "^1.0.2"
+    acorn "^8.4.1"
+    acorn-walk "^8.1.1"
+    arg "^4.1.0"
+    create-require "^1.1.0"
+    diff "^4.0.1"
+    make-error "^1.1.1"
+    v8-compile-cache-lib "^3.0.1"
+    yn "3.1.1"
+
+tslib@^1.8.1, tslib@^1.9.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
+
 tslib@^2.0.3, tslib@^2.1.0, tslib@^2.4.0:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
 
+tsutils@^3.21.0:
+  version "3.21.0"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
+  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
+  dependencies:
+    tslib "^1.8.1"
+
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -8170,11 +13986,31 @@ type-fest@^0.20.2:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
-type-fest@^2.5.0:
+type-fest@^0.21.3:
+  version "0.21.3"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
+  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
+
+type-fest@^0.8.0:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
+  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
+
+type-fest@^1.0.1, type-fest@^1.0.2:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1"
+  integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==
+
+type-fest@^2.0.0, type-fest@^2.11.2, type-fest@^2.12.2, type-fest@^2.13.0, type-fest@^2.5.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b"
   integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==
 
+type-fest@^4.6.0, type-fest@^4.7.1:
+  version "4.17.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-4.17.0.tgz#4c1b2c2852d2a40ba8c0236d3afc6fc68229e5bf"
+  integrity sha512-9flrz1zkfLRH3jO3bLflmTxryzKMxVa7841VeMgBaNQGY6vH4RCcpN/sQLB7mQQYh1GZ5utT2deypMuCy4yicw==
+
 type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
@@ -8207,6 +14043,11 @@ typedoc@^0.25.1:
     minimatch "^9.0.3"
     shiki "^0.14.7"
 
+typescript@^5.0.0, typescript@^5.4.4:
+  version "5.4.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
+  integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==
+
 typescript@^5.0.4:
   version "5.3.3"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
@@ -8217,11 +14058,41 @@ ua-parser-js@^1.0.35:
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.37.tgz#b5dc7b163a5c1f0c510b08446aed4da92c46373f"
   integrity sha512-bhTyI94tZofjo+Dn8SN6Zv8nBDvyXTymAdM3LDI/0IboIUwTu1rEhW7v2TfiVsoYWgkQ4kOVqnI8APUFbIQIFQ==
 
+ufo@^1.3.2, ufo@^1.4.0, ufo@^1.5.3:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.5.3.tgz#3325bd3c977b6c6cd3160bf4ff52989adc9d3344"
+  integrity sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==
+
 uglify-js@^3.1.4:
   version "3.17.4"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"
   integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==
 
+uid-safe@2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/uid-safe/-/uid-safe-2.1.5.tgz#2b3d5c7240e8fc2e58f8aa269e5ee49c0857bd3a"
+  integrity sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==
+  dependencies:
+    random-bytes "~1.0.0"
+
+ulid@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/ulid/-/ulid-2.3.0.tgz#93063522771a9774121a84d126ecd3eb9804071f"
+  integrity sha512-keqHubrlpvT6G2wH0OEfSW4mquYRcbe/J8NMmveoQOjUqmo+hXtO+ORCpWhdbZ7k72UtY61BL7haGxW6enBnjw==
+
+unbzip2-stream@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7"
+  integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==
+  dependencies:
+    buffer "^5.2.1"
+    through "^2.3.8"
+
+uncrypto@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/uncrypto/-/uncrypto-0.1.3.tgz#e1288d609226f2d02d8d69ee861fa20d8348ef2b"
+  integrity sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==
+
 undefsafe@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.5.tgz#38733b9327bdcd226db889fb723a6efd162e6e2c"
@@ -8232,6 +14103,17 @@ undici-types@~5.26.4:
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
   integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
 
+unenv@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/unenv/-/unenv-1.9.0.tgz#469502ae85be1bd3a6aa60f810972b1a904ca312"
+  integrity sha512-QKnFNznRxmbOF1hDgzpqrlIf6NC5sbZ2OJ+5Wl3OX8uM+LUJXbj4TXvLJCtwbPTmbMHCLIz6JLKNinNsMShK9g==
+  dependencies:
+    consola "^3.2.3"
+    defu "^6.1.3"
+    mime "^3.0.0"
+    node-fetch-native "^1.6.1"
+    pathe "^1.1.1"
+
 unherit@^1.0.4:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22"
@@ -8263,6 +14145,11 @@ unicode-property-aliases-ecmascript@^2.0.0:
   resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd"
   integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
 
+unicorn-magic@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/unicorn-magic/-/unicorn-magic-0.1.0.tgz#1bb9a51c823aaf9d73a8bfcd3d1a23dde94b0ce4"
+  integrity sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==
+
 unified@9.2.0:
   version "9.2.0"
   resolved "https://registry.yarnpkg.com/unified/-/unified-9.2.0.tgz#67a62c627c40589edebbf60f53edfd4d822027f8"
@@ -8287,6 +14174,16 @@ unified@^9.0.0, unified@^9.2.2:
     trough "^1.0.0"
     vfile "^4.0.0"
 
+union-value@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
+  dependencies:
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^2.0.1"
+
 unique-string@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
@@ -8294,6 +14191,13 @@ unique-string@^2.0.0:
   dependencies:
     crypto-random-string "^2.0.0"
 
+unique-string@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-3.0.0.tgz#84a1c377aff5fd7a8bc6b55d8244b2bd90d75b9a"
+  integrity sha512-VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ==
+  dependencies:
+    crypto-random-string "^4.0.0"
+
 unist-builder@2.0.3, unist-builder@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/unist-builder/-/unist-builder-2.0.3.tgz#77648711b5d86af0942f334397a33c5e91516436"
@@ -8359,16 +14263,74 @@ unist-util-visit@2.0.3, unist-util-visit@^2.0.0, unist-util-visit@^2.0.3:
     unist-util-is "^4.0.0"
     unist-util-visit-parents "^3.0.0"
 
+universal-user-agent@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.1.tgz#15f20f55da3c930c57bddbf1734c6654d5fd35aa"
+  integrity sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==
+
 universalify@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
   integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==
 
+unix-dgram@2.x:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/unix-dgram/-/unix-dgram-2.0.6.tgz#6d567b0eb6d7a9504e561532b598a46e34c5968b"
+  integrity sha512-AURroAsb73BZ6CdAyMrTk/hYKNj3DuYYEuOaB8bYMOHGKupRNScw90Q5C71tWJc3uE7dIeXRyuwN0xLLq3vDTg==
+  dependencies:
+    bindings "^1.5.0"
+    nan "^2.16.0"
+
+unixify@1.0.0, unixify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unixify/-/unixify-1.0.0.tgz#3a641c8c2ffbce4da683a5c70f03a462940c2090"
+  integrity sha512-6bc58dPYhCMHHuwxldQxO3RRNZ4eCogZ/st++0+fcC1nr0jiGUtAdBJ2qzmLQWSxbtz42pWt4QQMiZ9HvZf5cg==
+  dependencies:
+    normalize-path "^2.1.1"
+
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
   integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
 
+unset-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  integrity sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==
+  dependencies:
+    has-value "^0.3.1"
+    isobject "^3.0.0"
+
+unstorage@^1.10.1:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/unstorage/-/unstorage-1.10.2.tgz#fb7590ada8b30e83be9318f85100158b02a76dae"
+  integrity sha512-cULBcwDqrS8UhlIysUJs2Dk0Mmt8h7B0E6mtR+relW9nZvsf/u4SkAYyNliPiPW7XtFNb5u3IUMkxGxFTTRTgQ==
+  dependencies:
+    anymatch "^3.1.3"
+    chokidar "^3.6.0"
+    destr "^2.0.3"
+    h3 "^1.11.1"
+    listhen "^1.7.2"
+    lru-cache "^10.2.0"
+    mri "^1.2.0"
+    node-fetch-native "^1.6.2"
+    ofetch "^1.3.3"
+    ufo "^1.4.0"
+
+untildify@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/untildify/-/untildify-3.0.3.tgz#1e7b42b140bcfd922b22e70ca1265bfe3634c7c9"
+  integrity sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==
+
+untun@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/untun/-/untun-0.1.3.tgz#5d10dee37a3a5737ff03d158be877dae0a0e58a6"
+  integrity sha512-4luGP9LMYszMRZwsvyUd9MrxgEGZdZuZgpVQHEEX0lCYFESasVRvZd0EYpCkOIbJKHMuv0LskpXc/8Un+MJzEQ==
+  dependencies:
+    citty "^0.1.5"
+    consola "^3.2.3"
+    pathe "^1.1.1"
+
 update-browserslist-db@^1.0.13:
   version "1.0.13"
   resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
@@ -8377,6 +14339,26 @@ update-browserslist-db@^1.0.13:
     escalade "^3.1.1"
     picocolors "^1.0.0"
 
+update-notifier@6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-6.0.2.tgz#a6990253dfe6d5a02bd04fbb6a61543f55026b60"
+  integrity sha512-EDxhTEVPZZRLWYcJ4ZXjGFN0oP7qYvbXWzEgRm/Yql4dHX5wDbvh89YHP6PK1lzZJYrMtXUuZZz8XGK+U6U1og==
+  dependencies:
+    boxen "^7.0.0"
+    chalk "^5.0.1"
+    configstore "^6.0.0"
+    has-yarn "^3.0.0"
+    import-lazy "^4.0.0"
+    is-ci "^3.0.1"
+    is-installed-globally "^0.4.0"
+    is-npm "^6.0.0"
+    is-yarn-global "^0.4.0"
+    latest-version "^7.0.0"
+    pupa "^3.1.0"
+    semver "^7.3.7"
+    semver-diff "^4.0.0"
+    xdg-basedir "^5.1.0"
+
 update-notifier@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9"
@@ -8397,6 +14379,11 @@ update-notifier@^5.1.0:
     semver-diff "^3.1.1"
     xdg-basedir "^4.0.0"
 
+uqr@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/uqr/-/uqr-0.1.2.tgz#5c6cd5dcff9581f9bb35b982cb89e2c483a41d7d"
+  integrity sha512-MJu7ypHq6QasgF5YRTjqscSzQp/W11zoUk6kvmlH+fmWEs63Y0Eib13hYFwAzagRJcVY8WVnlV+eBDUGMJ5IbA==
+
 uri-js@^4.2.2:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
@@ -8404,6 +14391,11 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
+urix@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  integrity sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==
+
 url-loader@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-4.1.1.tgz#28505e905cae158cf07c92ca622d7f237e70a4e2"
@@ -8420,6 +14412,11 @@ url-parse-lax@^3.0.0:
   dependencies:
     prepend-http "^2.0.0"
 
+urlpattern-polyfill@8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/urlpattern-polyfill/-/urlpattern-polyfill-8.0.2.tgz#99f096e35eff8bf4b5a2aa7d58a1523d6ebc7ce5"
+  integrity sha512-Qp95D4TPJl1kC9SKigDcqgyM2VDVO4RiJc2d4qe5GrYm+zbIQCWWKAFaJNQ4BhdFeDGwBmAxqJBwWSJDb9T3BQ==
+
 use-composed-ref@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/use-composed-ref/-/use-composed-ref-1.3.0.tgz#3d8104db34b7b264030a9d916c5e94fbe280dbda"
@@ -8442,6 +14439,11 @@ use-sync-external-store@^1.2.0:
   resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a"
   integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==
 
+use@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
+
 util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
@@ -8462,15 +14464,35 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
 
+uuid@9.0.1, uuid@^9.0.0:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
+  integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==
+
 uuid@^8.3.2:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-uuid@^9.0.0:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
-  integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==
+v8-compile-cache-lib@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
+  integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
+
+validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
+  dependencies:
+    spdx-correct "^3.0.0"
+    spdx-expression-parse "^3.0.0"
+
+validate-npm-package-name@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-4.0.0.tgz#fe8f1c50ac20afdb86f177da85b3600f0ac0d747"
+  integrity sha512-mzR0L8ZDktZjpX4OB46KT+56MAhl4EIazWP/+G/HPGuvfdaqg4YsCdtOm6U9+LOFyYDoh4dpnpxZRB9MQQns5Q==
+  dependencies:
+    builtins "^5.0.0"
 
 value-equal@^1.0.1:
   version "1.0.1"
@@ -8526,6 +14548,15 @@ wait-on@^6.0.1:
     minimist "^1.2.5"
     rxjs "^7.5.4"
 
+wait-port@1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/wait-port/-/wait-port-1.0.4.tgz#6f9474645ddbf7701ac100ab6762438edf6e5689"
+  integrity sha512-w8Ftna3h6XSFWWc2JC5gZEgp64nz8bnaTp5cvzbJSZ53j+omktWTDdwXxEF0jM8YveviLgFWvNGrSvRHnkyHyw==
+  dependencies:
+    chalk "^4.1.2"
+    commander "^9.3.0"
+    debug "^4.3.4"
+
 watchpack@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
@@ -8541,11 +14572,23 @@ wbuf@^1.1.0, wbuf@^1.7.3:
   dependencies:
     minimalistic-assert "^1.0.0"
 
+wcwidth@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
+  integrity sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==
+  dependencies:
+    defaults "^1.0.3"
+
 web-namespaces@^1.0.0:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-1.1.4.tgz#bc98a3de60dadd7faefc403d1076d529f5e030ec"
   integrity sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw==
 
+web-streams-polyfill@^3.0.3:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz#2073b91a2fdb1fbfbd401e7de0ac9f8214cecb4b"
+  integrity sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==
+
 web-worker@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/web-worker/-/web-worker-1.3.0.tgz#e5f2df5c7fe356755a5fb8f8410d4312627e6776"
@@ -8690,6 +14733,11 @@ websocket-extensions@>=0.1.1:
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
   integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
 
+well-known-symbols@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/well-known-symbols/-/well-known-symbols-2.0.0.tgz#e9c7c07dbd132b7b84212c8174391ec1f9871ba5"
+  integrity sha512-ZMjC3ho+KXo0BfJb7JgtQ5IBuvnShdlACNkKkdsqBmYw3bPAaJfPeYUo6tLUaT5tG/Gkh7xkpBhKRQ9e7pyg9Q==
+
 whatwg-url@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
@@ -8712,6 +14760,13 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
+wide-align@^1.1.2:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
+  integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
+  dependencies:
+    string-width "^1.0.2 || 2 || 3 || 4"
+
 widest-line@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca"
@@ -8731,6 +14786,39 @@ wildcard@^2.0.0:
   resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67"
   integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==
 
+windows-release@^5.0.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-5.1.1.tgz#7ac7019f9baeaea6c00ec889b11824f46c12ee8d"
+  integrity sha512-NMD00arvqcq2nwqc5Q6KtrSRHK+fVD31erE5FEMahAw5PmVCgD7MUXodq3pdZSUkqA9Cda2iWx6s1XYwiJWRmw==
+  dependencies:
+    execa "^5.1.1"
+
+winston-transport@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.7.0.tgz#e302e6889e6ccb7f383b926df6936a5b781bd1f0"
+  integrity sha512-ajBj65K5I7denzer2IYW6+2bNIVqLGDHqDw3Ow8Ohh+vdW+rv4MZ6eiDvHoKhfJFZ2auyN8byXieDDJ96ViONg==
+  dependencies:
+    logform "^2.3.2"
+    readable-stream "^3.6.0"
+    triple-beam "^1.3.0"
+
+winston@^3.10.0:
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/winston/-/winston-3.13.0.tgz#e76c0d722f78e04838158c61adc1287201de7ce3"
+  integrity sha512-rwidmA1w3SE4j0E5MuIufFhyJPBDG7Nu71RkZor1p2+qHvJSZ9GYDA81AyleQcZbh/+V6HjeBdfnTZJm9rSeQQ==
+  dependencies:
+    "@colors/colors" "^1.6.0"
+    "@dabh/diagnostics" "^2.0.2"
+    async "^3.2.3"
+    is-stream "^2.0.0"
+    logform "^2.4.0"
+    one-time "^1.0.0"
+    readable-stream "^3.4.0"
+    safe-stable-stringify "^2.3.1"
+    stack-trace "0.0.x"
+    triple-beam "^1.3.0"
+    winston-transport "^4.7.0"
+
 wordwrap@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
@@ -8745,7 +14833,7 @@ wrap-ansi@^7.0.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^8.0.1:
+wrap-ansi@^8.0.1, wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
   integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
@@ -8759,7 +14847,15 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-write-file-atomic@^3.0.0:
+write-file-atomic@5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-5.0.1.tgz#68df4717c55c6fa4281a7860b4c2ba0a6d2b11e7"
+  integrity sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==
+  dependencies:
+    imurmurhash "^0.1.4"
+    signal-exit "^4.0.1"
+
+write-file-atomic@^3.0.0, write-file-atomic@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
   integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
@@ -8769,6 +14865,19 @@ write-file-atomic@^3.0.0:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
+write-file-atomic@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
+  integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
+  dependencies:
+    imurmurhash "^0.1.4"
+    signal-exit "^3.0.7"
+
+ws@8.14.2:
+  version "8.14.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.14.2.tgz#6c249a806eb2db7a20d26d51e7709eab7b2e6c7f"
+  integrity sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==
+
 ws@^7.3.1:
   version "7.5.9"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
@@ -8784,6 +14893,11 @@ xdg-basedir@^4.0.0:
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
   integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==
 
+xdg-basedir@^5.0.1, xdg-basedir@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-5.1.0.tgz#1efba19425e73be1bc6f2a6ceb52a3d2c884c0c9"
+  integrity sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==
+
 xml-js@^1.6.11:
   version "1.6.11"
   resolved "https://registry.yarnpkg.com/xml-js/-/xml-js-1.6.11.tgz#927d2f6947f7f1c19a316dd8eea3614e8b18f8e9"
@@ -8791,7 +14905,15 @@ xml-js@^1.6.11:
   dependencies:
     sax "^1.2.4"
 
-xtend@^4.0.0, xtend@^4.0.1:
+xss@^1.0.14:
+  version "1.0.15"
+  resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.15.tgz#96a0e13886f0661063028b410ed1b18670f4e59a"
+  integrity sha512-FVdlVVC67WOIPvfOwhoMETV72f6GbW7aOabBC3WxN/oUdoEMDyLz4OgRv5/gck2ZeNqEQu+Tb0kloovXOfpYVg==
+  dependencies:
+    commander "^2.20.3"
+    cssfilter "0.0.10"
+
+xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
@@ -8816,12 +14938,17 @@ yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2:
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
+yaml@^2.1.3:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.4.1.tgz#2e57e0b5e995292c25c75d2658f0664765210eed"
+  integrity sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==
+
 yargs-parser@^21.1.1:
   version "21.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
-yargs@^17.7.2:
+yargs@^17.0.0, yargs@^17.6.0, yargs@^17.7.2:
   version "17.7.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
   integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
@@ -8834,11 +14961,43 @@ yargs@^17.7.2:
     y18n "^5.0.5"
     yargs-parser "^21.1.1"
 
+yauzl@^2.10.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
+  integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==
+  dependencies:
+    buffer-crc32 "~0.2.3"
+    fd-slicer "~1.1.0"
+
+yn@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
+  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
+
 yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
+yocto-queue@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251"
+  integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==
+
+zip-stream@^5.0.1:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-5.0.2.tgz#77b1dce7af291482d368a9203c9029f4eb52e12e"
+  integrity sha512-LfOdrUvPB8ZoXtvOBz6DlNClfvi//b5d56mSWyJi7XbH/HfhOHfUhOqxhT/rUiR7yiktlunqRo+jY6y/cWC/5g==
+  dependencies:
+    archiver-utils "^4.0.1"
+    compress-commons "^5.0.1"
+    readable-stream "^3.6.0"
+
+zod@3.22.4:
+  version "3.22.4"
+  resolved "https://registry.yarnpkg.com/zod/-/zod-3.22.4.tgz#f31c3a9386f61b1f228af56faa9255e845cf3fff"
+  integrity sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==
+
 zwitch@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920"
diff --git a/yarn-project/Earthfile b/yarn-project/Earthfile
index 0821b63f8a15..00bd6f6e9f05 100644
--- a/yarn-project/Earthfile
+++ b/yarn-project/Earthfile
@@ -47,6 +47,10 @@ build:
     ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
     RUN ./bootstrap.sh full
 
+build-dev:
+    FROM +build
+    SAVE ARTIFACT /usr/src /usr/src
+
 aztec-prod:
     FROM +build
     RUN yarn workspaces focus @aztec/aztec --production && yarn cache clean
@@ -75,6 +79,11 @@ end-to-end:
     WORKDIR /usr/src/yarn-project/end-to-end
     ENTRYPOINT ["yarn", "test"]
 
+scripts-prod:
+    FROM +build
+    RUN yarn workspaces focus @aztec/scripts --production && yarn cache clean
+    SAVE ARTIFACT /usr/src /usr/src
+
 all:
     BUILD +aztec
     BUILD +cli
diff --git a/yarn-project/scripts/src/benchmarks/markdown.ts b/yarn-project/scripts/src/benchmarks/markdown.ts
index 2887805cfdcf..772238679a94 100644
--- a/yarn-project/scripts/src/benchmarks/markdown.ts
+++ b/yarn-project/scripts/src/benchmarks/markdown.ts
@@ -179,7 +179,7 @@ ${rows.join('\n')}
 }
 
 /** Creates a md with the benchmark contents. */
-export function getMarkdown() {
+export function getMarkdown(prNumber: number) {
   const benchmark = JSON.parse(fs.readFileSync(inputFile, 'utf-8'));
   const baseBenchmark = getBaseBenchmark();
 
@@ -199,7 +199,6 @@ export function getMarkdown() {
     ? `\nValues are compared against data from master at commit ${baseUrl} and shown if the difference exceeds 1%.`
     : '';
 
-  const prNumber = process.env.CIRCLE_PULL_REQUEST && parseInt(process.env.CIRCLE_PULL_REQUEST.split('/')[6]);
   const prSourceDataUrl = prNumber && `${S3_URL}/benchmarks-v1/pulls/${prNumber}.json`;
   const prSourceDataText = prSourceDataUrl
     ? `\nThis benchmark source data is available in JSON format on S3 [here](${prSourceDataUrl}).`
@@ -256,6 +255,6 @@ ${COMMENT_MARK}
 }
 
 /** Entrypoint */
-export function main() {
-  log(getMarkdown());
+export function main(prNumber: number) {
+  log(getMarkdown(prNumber));
 }
diff --git a/yarn-project/scripts/src/bin/bench-comment.ts b/yarn-project/scripts/src/bin/bench-comment.ts
index 4a90f897b1cf..41440175dab6 100644
--- a/yarn-project/scripts/src/bin/bench-comment.ts
+++ b/yarn-project/scripts/src/bin/bench-comment.ts
@@ -1,7 +1,8 @@
 import { COMMENT_TYPES } from '../types.js';
 import main from '../utils/comment.js';
+import { getPrNumber } from '../utils/pr-number.js';
 
-void main(COMMENT_TYPES.BENCH).catch(err => {
+void main(getPrNumber(), COMMENT_TYPES.BENCH).catch(err => {
   // eslint-disable-next-line no-console
   console.error(err.message);
   process.exit(1);
diff --git a/yarn-project/scripts/src/bin/bench-markdown.ts b/yarn-project/scripts/src/bin/bench-markdown.ts
index ede0215d5d8e..b87762c26e0d 100644
--- a/yarn-project/scripts/src/bin/bench-markdown.ts
+++ b/yarn-project/scripts/src/bin/bench-markdown.ts
@@ -1,7 +1,8 @@
 import { main } from '../benchmarks/markdown.js';
+import { getPrNumber } from '../utils/pr-number.js';
 
 try {
-  void main();
+  void main(getPrNumber());
 } catch (err: any) {
   // eslint-disable-next-line no-console
   console.error(err);
diff --git a/yarn-project/scripts/src/bin/docs-preview.ts b/yarn-project/scripts/src/bin/docs-preview.ts
index 4007d4539f5b..1189885a61b2 100644
--- a/yarn-project/scripts/src/bin/docs-preview.ts
+++ b/yarn-project/scripts/src/bin/docs-preview.ts
@@ -1,7 +1,8 @@
 import { COMMENT_TYPES } from '../types.js';
 import main from '../utils/comment.js';
+import { getPrNumber } from '../utils/pr-number.js';
 
-void main(COMMENT_TYPES.DOCS).catch(err => {
+void main(getPrNumber(), COMMENT_TYPES.DOCS).catch(err => {
   // eslint-disable-next-line no-console
   console.error(err.message);
   process.exit(1);
diff --git a/yarn-project/scripts/src/docs_previews/markdown.ts b/yarn-project/scripts/src/docs_previews/markdown.ts
index 0b3de6e146a1..aa14a57a9b4e 100644
--- a/yarn-project/scripts/src/docs_previews/markdown.ts
+++ b/yarn-project/scripts/src/docs_previews/markdown.ts
@@ -1,11 +1,10 @@
-const url = process.env.UNIQUE_DEPLOY_URL as string;
 const cleanUrl = (str: string) =>
   // eslint-disable-next-line no-control-regex
   str.replace(/[\u001B\u009B][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g, '');
 
 const COMMENT_MARK = '<!-- AUTOGENERATED DOCS COMMENT -->';
 
-export function getMarkdown() {
+export function getMarkdown(url: string) {
   return `
 # Docs Preview
 Hey there! 👋 You can check your preview at ${cleanUrl(url)}
diff --git a/yarn-project/scripts/src/utils/comment.ts b/yarn-project/scripts/src/utils/comment.ts
index 44ee01f72849..7e7cc00fbb50 100644
--- a/yarn-project/scripts/src/utils/comment.ts
+++ b/yarn-project/scripts/src/utils/comment.ts
@@ -8,34 +8,31 @@ import * as https from 'https';
 import { COMMENT_TYPES } from '../types.js';
 
 const GITHUB_TOKEN = process.env.AZTEC_BOT_COMMENTER_GITHUB_TOKEN;
+const DOCS_PREVIEW_URL = process.env.DOCS_PREVIEW_URL;
+
 const OWNER = 'AztecProtocol';
-const REPO = 'aztec3-packages';
+const REPO = 'aztec-packages';
 
 const log = createConsoleLogger();
 
-async function getMarkdown(commentType: COMMENT_TYPES) {
+async function getMarkdown(prNumber: number, commentType: COMMENT_TYPES) {
   if (commentType === COMMENT_TYPES.BENCH) {
-    return (await import('../benchmarks/markdown.js')).getMarkdown();
+    return (await import('../benchmarks/markdown.js')).getMarkdown(prNumber);
   } else if (commentType === COMMENT_TYPES.DOCS) {
-    return (await import('../docs_previews/markdown.js')).getMarkdown();
+    if (!DOCS_PREVIEW_URL) {
+      throw new Error('DOCS_PREVIEW_URL is not set');
+    } else {
+      return (await import('../docs_previews/markdown.js')).getMarkdown(DOCS_PREVIEW_URL);
+    }
   } else {
     throw new Error('Invalid comment type');
   }
 }
 
-/** Returns the number of the current PR */
-function getPrNumber() {
-  if (!process.env.CIRCLE_PULL_REQUEST) {
-    throw new Error(`Not in Circle PR`);
-  }
-  const fragments = process.env.CIRCLE_PULL_REQUEST.split('/');
-  return fragments[fragments.length - 1];
-}
-
 /** Function to check if a bench comment already exists */
-async function getExistingComment(commentType: COMMENT_TYPES) {
+async function getExistingComment(prNumber: number, commentType: COMMENT_TYPES) {
   try {
-    const response = await sendGitHubRequest(`/repos/${OWNER}/${REPO}/issues/${getPrNumber()}/comments`);
+    const response = await sendGitHubRequest(`/repos/${OWNER}/${REPO}/issues/${prNumber}/comments`);
     const comments = JSON.parse(response);
     return comments.find((comment: any) => comment.body.includes(commentType));
   } catch (error: any) {
@@ -44,15 +41,15 @@ async function getExistingComment(commentType: COMMENT_TYPES) {
 }
 
 /** Function to create or update a comment */
-async function upsertComment(existingCommentId: string, commentType: COMMENT_TYPES) {
+async function upsertComment(prNumber: number, existingCommentId: string, commentType: COMMENT_TYPES) {
   try {
-    const commentContent = await getMarkdown(commentType);
+    const commentContent = await getMarkdown(prNumber, commentType);
     const commentData = { body: commentContent };
 
     const requestMethod = existingCommentId ? 'PATCH' : 'POST';
     const requestUrl = existingCommentId
       ? `/repos/${OWNER}/${REPO}/issues/comments/${existingCommentId}`
-      : `/repos/${OWNER}/${REPO}/issues/${getPrNumber()}/comments`;
+      : `/repos/${OWNER}/${REPO}/issues/${prNumber}/comments`;
 
     await sendGitHubRequest(requestUrl, requestMethod, commentData);
     log('Comment added or updated successfully.');
@@ -113,7 +110,7 @@ function sendGitHubRequest(url: string, method = 'GET', data?: object): Promise<
 }
 
 /** Entrypoint */
-export default async function main(commentType: COMMENT_TYPES = COMMENT_TYPES.BENCH) {
-  const existingComment = await getExistingComment(commentType);
-  await upsertComment(existingComment?.id, commentType);
+export default async function main(prNumber: number, commentType: COMMENT_TYPES = COMMENT_TYPES.BENCH) {
+  const existingComment = await getExistingComment(prNumber, commentType);
+  await upsertComment(prNumber, existingComment?.id, commentType);
 }
diff --git a/yarn-project/scripts/src/utils/pr-number.ts b/yarn-project/scripts/src/utils/pr-number.ts
new file mode 100644
index 000000000000..778f4473fdd9
--- /dev/null
+++ b/yarn-project/scripts/src/utils/pr-number.ts
@@ -0,0 +1,22 @@
+/** Inpsects process.env to returns the number of the current PR */
+export function getPrNumber(): number {
+  let prString;
+  if (process.env.PR_NUMBER) {
+    prString = process.env.PR_NUMBER;
+  }
+  if (process.env.CIRCLE_PULL_REQUEST) {
+    const fragments = process.env.CIRCLE_PULL_REQUEST.split('/');
+    prString = fragments[fragments.length - 1];
+  }
+  if (!prString) {
+    throw new Error(`PR number not found. Either set it as PR_NUMBER or a url with CIRCLE_PULL_REQUEST.`);
+  }
+
+  const prNumber = parseInt(prString, 10);
+
+  if (isNaN(prNumber)) {
+    throw new Error(`Invalid PR number: ${prString}`);
+  }
+
+  return prNumber;
+}

From 1a8f372b326eacbccdc2e7e56f87821f658a75f8 Mon Sep 17 00:00:00 2001
From: just-mitch <68168980+just-mitch@users.noreply.github.com>
Date: Tue, 30 Apr 2024 15:15:05 -0600
Subject: [PATCH 19/42] feat: private da gas metering (#6103)

# Context
At the end of the private kernel, we either use the `PrivateKernelTail`
or `PrivateKernelTailToPublic`:
if `PrivateKernelTail`, we are heading straight to the base rollup
because there is no public component and we have a
`CombinedAccumulatedData` struct as part of the public inputs, called
`end`, which has a `gas_used` (which has L2 and DA gas); if
`PrivateKernelTailToPublic`, there is a public component, so we split
the side effects from private execution into `end` and
`end_non_revertible`, each of which has a `gas_used`.

Without this change, we were only populating `end.gas_used` to be equal
to the `teardown_gas` which the used supplied for the transaction.

# With this change

## In `PrivateKernelTail`
We compute the amount of "metered gas" in the
PrivateAccumulatedDataBuilder. This returns the amount of DA and L2 gas
the transaction has consumed as part of private execution. L2 gas is
presently zero, but that will likely change (see the warning under the
L2 gas section
[here](https://docs.aztec.network/protocol-specs/gas-and-fees/fee-schedule)).

To this metered `Gas`, it adds the teardown gas and a "tx overhead"
`Gas`, which represents flat, fixed costs associated with every
transaction; it "tx overhead" presently just has a DA component.

## In `PrivateKernelTailToPublic`
We now sum "metered" gas associated with side effects while splitting
non/revertible side effects. The revertible gas used is initialized with
the teardown gas, and the "tx overhead" gas is added to non_revertible.

See
[spec](https://docs.aztec.network/protocol-specs/gas-and-fees/fee-schedule)
for more info.
---
 .../src/core/libraries/ConstantsGen.sol       |  3 +
 .../kernel_circuit_public_inputs_composer.nr  | 17 ++--
 .../src/private_kernel_tail.nr                | 14 ++-
 .../src/private_kernel_tail_to_public.nr      | 14 ++-
 .../private_accumulated_data_builder.nr       | 87 ++++++++++++++++---
 .../crates/types/src/abis/gas.nr              | 26 ++++--
 ...te_kernel_circuit_public_inputs_builder.nr | 14 +--
 .../crates/types/src/constants.nr             |  3 +
 yarn-project/circuits.js/src/constants.gen.ts |  3 +
 9 files changed, 135 insertions(+), 46 deletions(-)

diff --git a/l1-contracts/src/core/libraries/ConstantsGen.sol b/l1-contracts/src/core/libraries/ConstantsGen.sol
index d6a267143885..05102ea2ab5b 100644
--- a/l1-contracts/src/core/libraries/ConstantsGen.sol
+++ b/l1-contracts/src/core/libraries/ConstantsGen.sol
@@ -94,6 +94,9 @@ library Constants {
   uint256 internal constant DEFAULT_TEARDOWN_GAS_LIMIT = 100_000_000;
   uint256 internal constant DEFAULT_MAX_FEE_PER_GAS = 10;
   uint256 internal constant DEFAULT_INCLUSION_FEE = 0;
+  uint256 internal constant DA_BYTES_PER_FIELD = 32;
+  uint256 internal constant DA_GAS_PER_BYTE = 16;
+  uint256 internal constant FIXED_DA_GAS = 512;
   uint256 internal constant CANONICAL_KEY_REGISTRY_ADDRESS =
     0x1585e564a60e6ec974bc151b62705292ebfc75c33341986a47fd9749cedb567e;
   uint256 internal constant AZTEC_ADDRESS_LENGTH = 1;
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/kernel_circuit_public_inputs_composer.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/kernel_circuit_public_inputs_composer.nr
index 9107e0a34290..2abc0ee11f44 100644
--- a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/kernel_circuit_public_inputs_composer.nr
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/kernel_circuit_public_inputs_composer.nr
@@ -8,13 +8,14 @@ use dep::types::{
     abis::{
     kernel_data::PrivateKernelData,
     kernel_circuit_public_inputs::{KernelCircuitPublicInputs, PrivateKernelCircuitPublicInputsBuilder, PublicKernelCircuitPublicInputs},
-    note_hash::NoteHashContext, nullifier::Nullifier, side_effect::{SideEffect, Ordered}
+    note_hash::NoteHashContext, nullifier::Nullifier, side_effect::{SideEffect, Ordered}, gas::Gas
 },
     constants::{
     MAX_NEW_NOTE_HASHES_PER_TX, MAX_NEW_NULLIFIERS_PER_TX, MAX_NOTE_HASH_READ_REQUESTS_PER_TX,
     MAX_NULLIFIER_READ_REQUESTS_PER_TX, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX,
     MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX,
-    MAX_ENCRYPTED_LOGS_PER_TX, MAX_UNENCRYPTED_LOGS_PER_TX
+    MAX_ENCRYPTED_LOGS_PER_TX, MAX_UNENCRYPTED_LOGS_PER_TX, DA_BYTES_PER_FIELD, FIXED_DA_GAS,
+    DA_GAS_PER_BYTE
 },
     grumpkin_private_key::GrumpkinPrivateKey,
     hash::{compute_note_hash_nonce, compute_unique_siloed_note_hash},
@@ -99,8 +100,6 @@ impl KernelCircuitPublicInputsComposer {
 
         self.silo_values();
 
-        self.set_gas_used();
-
         *self
     }
 
@@ -113,18 +112,14 @@ impl KernelCircuitPublicInputsComposer {
     }
 
     pub fn finish(self) -> KernelCircuitPublicInputs {
-        self.public_inputs.finish_tail()
+        let teardown_gas = self.previous_kernel.public_inputs.constants.tx_context.gas_settings.teardown_gas_limits;
+        self.public_inputs.finish_tail(teardown_gas)
     }
 
     pub fn finish_to_public(self) -> PublicKernelCircuitPublicInputs {
         let min_revertible_side_effect_counter = self.previous_kernel.public_inputs.min_revertible_side_effect_counter;
-        self.public_inputs.finish_to_public(min_revertible_side_effect_counter)
-    }
-
-    fn set_gas_used(&mut self) {
-        // TODO(gas): Compute DA gas used here and add to public_inputs.(end,end_non_revertible).gas_used
         let teardown_gas = self.previous_kernel.public_inputs.constants.tx_context.gas_settings.teardown_gas_limits;
-        self.public_inputs.end.gas_used = teardown_gas;
+        self.public_inputs.finish_to_public(teardown_gas, min_revertible_side_effect_counter)
     }
 
     fn silo_values(&mut self) {
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_tail.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_tail.nr
index 551acfa19839..568098daa59f 100644
--- a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_tail.nr
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_tail.nr
@@ -89,7 +89,8 @@ mod tests {
     };
     use dep::types::constants::{
         MAX_NOTE_HASH_READ_REQUESTS_PER_TX, MAX_NEW_NOTE_HASHES_PER_TX, MAX_NEW_NULLIFIERS_PER_TX,
-        MAX_NULLIFIER_READ_REQUESTS_PER_TX, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX
+        MAX_NULLIFIER_READ_REQUESTS_PER_TX, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX,
+        DA_BYTES_PER_FIELD, DA_GAS_PER_BYTE
     };
     use dep::types::{
         abis::{
@@ -508,6 +509,8 @@ mod tests {
         let public_inputs = builder.execute();
         assert_eq(array_length(public_inputs.end.new_note_hashes), 2);
         assert_eq(array_length(public_inputs.end.new_nullifiers), 3);
+        let expected_gas = Gas::tx_overhead() + Gas::new(DA_GAS_PER_BYTE * DA_BYTES_PER_FIELD * 5, 0);
+        assert_eq(public_inputs.end.gas_used, expected_gas);
     }
 
     #[test(should_fail_with="Hinted note hash does not match")]
@@ -558,12 +561,15 @@ mod tests {
     }
 
     #[test]
-    unconstrained fn set_teardown_gas_as_gas_used() {
-        // TODO(gas): When we compute DA gas used, we'll have to include it here as well.
+    unconstrained fn empty_tx_consumes_teardown_limits_plus_fixed_gas() {
         let mut builder = PrivateKernelTailInputsBuilder::new();
         builder.previous_kernel.tx_context.gas_settings.teardown_gas_limits = Gas::new(300, 300);
         let public_inputs = builder.execute();
 
-        assert_eq(public_inputs.end.gas_used, Gas::new(300, 300));
+
+        let expected_gas_consumed = Gas::new(300, 300) // teardown gas
+            + Gas::tx_overhead() // tx overhead
+            + Gas::new(DA_GAS_PER_BYTE * DA_BYTES_PER_FIELD * 1, 0); // tx nullifier
+        assert_eq(public_inputs.end.gas_used, expected_gas_consumed);
     }
 }
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_tail_to_public.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_tail_to_public.nr
index a2ba70994b93..1454b919aa54 100644
--- a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_tail_to_public.nr
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_tail_to_public.nr
@@ -92,7 +92,8 @@ mod tests {
     };
     use dep::types::constants::{
         MAX_NOTE_HASH_READ_REQUESTS_PER_TX, MAX_NEW_NOTE_HASHES_PER_TX, MAX_NEW_NULLIFIERS_PER_TX,
-        MAX_NULLIFIER_READ_REQUESTS_PER_TX, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX
+        MAX_NULLIFIER_READ_REQUESTS_PER_TX, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX,
+        DA_BYTES_PER_FIELD, DA_GAS_PER_BYTE
     };
     use dep::types::{
         abis::{
@@ -532,6 +533,11 @@ mod tests {
                 [new_nullifiers[3], new_nullifiers[4]]
             )
         );
+
+        assert_eq(public_inputs.end.gas_used, Gas::new(2 * DA_BYTES_PER_FIELD * DA_GAS_PER_BYTE, 0));
+        assert_eq(
+            public_inputs.end_non_revertible.gas_used, Gas::new(3 * DA_BYTES_PER_FIELD * DA_GAS_PER_BYTE, 0) + Gas::tx_overhead()
+        );
     }
 
     #[test]
@@ -586,12 +592,12 @@ mod tests {
     }
 
     #[test]
-    unconstrained fn set_teardown_gas_as_gas_used() {
-        // TODO(gas): When we compute DA gas used, we'll have to include it here as well.
+    unconstrained fn empty_tx_consumes_teardown_limits_plus_fixed_gas() {
         let mut builder = PrivateKernelTailToPublicInputsBuilder::new();
         builder.previous_kernel.tx_context.gas_settings.teardown_gas_limits = Gas::new(300, 300);
         let public_inputs = builder.execute();
 
-        assert_eq(public_inputs.end.gas_used, Gas::new(300, 300));
+        let expected_gas_consumed = Gas::new(300, 300) + Gas::tx_overhead();
+        assert_eq(public_inputs.end.gas_used, expected_gas_consumed);
     }
 }
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/private_accumulated_data_builder.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/private_accumulated_data_builder.nr
index 7f686715f25f..5e62c134874b 100644
--- a/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/private_accumulated_data_builder.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/private_accumulated_data_builder.nr
@@ -13,9 +13,10 @@ use crate::{
     constants::{
     MAX_NEW_NOTE_HASHES_PER_TX, MAX_NEW_NULLIFIERS_PER_TX, MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX,
     MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, MAX_NEW_L2_TO_L1_MSGS_PER_TX,
-    MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MAX_ENCRYPTED_LOGS_PER_TX, MAX_UNENCRYPTED_LOGS_PER_TX
+    MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MAX_ENCRYPTED_LOGS_PER_TX, MAX_UNENCRYPTED_LOGS_PER_TX,
+    DA_BYTES_PER_FIELD, DA_GAS_PER_BYTE
 },
-    traits::Empty
+    traits::{Empty, is_empty}
 };
 
 // Builds via PrivateKernelCircuitPublicInputsBuilder:
@@ -60,10 +61,11 @@ impl PrivateAccumulatedDataBuilder {
         }
     }
 
-    pub fn to_combined(self) -> CombinedAccumulatedData {
+    pub fn to_combined(self, teardown_gas: Gas) -> CombinedAccumulatedData {
         // TODO(Miranda): Hash here or elsewhere?
         let encrypted_logs_hash = compute_tx_logs_hash(self.encrypted_logs_hashes.storage);
         let unencrypted_logs_hash = compute_tx_logs_hash(self.unencrypted_logs_hashes.storage);
+        let gas_used = self.to_metered_gas_used() + Gas::tx_overhead() + teardown_gas;
 
         CombinedAccumulatedData {
             new_note_hashes: self.new_note_hashes.storage.map(|n: NoteHashContext| n.value),
@@ -74,24 +76,69 @@ impl PrivateAccumulatedDataBuilder {
             encrypted_log_preimages_length: self.encrypted_log_preimages_length,
             unencrypted_log_preimages_length: self.unencrypted_log_preimages_length,
             public_data_update_requests: [PublicDataUpdateRequest::empty(); MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX],
-            gas_used: self.gas_used.add(self.non_revertible_gas_used)
+            gas_used
         }
     }
 
+    pub fn to_metered_gas_used(self) -> Gas {
+        let mut metered_bytes = 0;
+
+        // note_hash_gas
+        for i in 0..self.new_note_hashes.storage.len() {
+            if !is_empty(self.new_note_hashes.get_unchecked(i)) {
+                metered_bytes += DA_BYTES_PER_FIELD;
+            }
+        }
+
+        // nullifier_gas
+        for i in 0..self.new_nullifiers.storage.len() {
+            if !is_empty(self.new_nullifiers.get_unchecked(i)) {
+                metered_bytes += DA_BYTES_PER_FIELD;
+            }
+        }
+
+        // l2_to_l1_msg_gas
+        for i in 0..self.new_l2_to_l1_msgs.storage.len() {
+            if !is_empty(self.new_l2_to_l1_msgs.get_unchecked(i)) {
+                metered_bytes += DA_BYTES_PER_FIELD;
+            }
+        }
+
+        // encrypted_logs_hash_gas
+        metered_bytes += self.encrypted_log_preimages_length as u32;
+
+        // unencrypted_logs_hash_gas
+        metered_bytes += self.unencrypted_log_preimages_length as u32;
+
+        Gas::new(DA_GAS_PER_BYTE * metered_bytes, 0)
+    }
+
     pub fn split_to_public(
         self,
-        min_revertible_side_effect_counter: u32
+        min_revertible_side_effect_counter: u32,
+        teardown_gas: Gas
     ) -> (PublicAccumulatedData, PublicAccumulatedData) {
         let mut non_revertible_builder = PublicAccumulatedDataBuilder::empty();
         let mut revertible_builder = PublicAccumulatedDataBuilder::empty();
+        let mut non_revertible_da_gas_used = 0;
+        let mut non_revertible_l2_gas_used = 0;
+        let mut revertible_da_gas_used = teardown_gas.da_gas; // pre-pay for teardown gas
+        let mut revertible_l2_gas_used = teardown_gas.l2_gas;
+        let DA_GAS_PER_FIELD = DA_BYTES_PER_FIELD * DA_GAS_PER_BYTE;
 
         for i in 0..MAX_NEW_NOTE_HASHES_PER_TX {
             let note_hash = self.new_note_hashes.storage[i];
             let public_note_hash = note_hash.expose_to_public();
             if note_hash.counter < min_revertible_side_effect_counter {
                 non_revertible_builder.new_note_hashes.push(public_note_hash);
+                if !is_empty(public_note_hash) {
+                    non_revertible_da_gas_used += DA_GAS_PER_FIELD ;
+                }
             } else {
                 revertible_builder.new_note_hashes.push(public_note_hash);
+                if !is_empty(public_note_hash) {
+                    revertible_da_gas_used += DA_GAS_PER_FIELD;
+                }
             }
         }
 
@@ -99,11 +146,18 @@ impl PrivateAccumulatedDataBuilder {
             let nullifier = self.new_nullifiers.storage[i];
             if nullifier.counter < min_revertible_side_effect_counter {
                 non_revertible_builder.new_nullifiers.push(nullifier);
+                if !is_empty(nullifier) {
+                    non_revertible_da_gas_used += DA_GAS_PER_FIELD;
+                }
             } else {
                 revertible_builder.new_nullifiers.push(nullifier);
+                if !is_empty(nullifier) {
+                    revertible_da_gas_used += DA_GAS_PER_FIELD;
+                }
             }
         }
 
+        // TODO(gas): add AVM_STARTUP_L2_GAS here
         for i in 0..MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX {
             let call_stack_item = self.public_call_stack.storage[i];
             if call_stack_item.start_side_effect_counter < min_revertible_side_effect_counter {
@@ -136,8 +190,10 @@ impl PrivateAccumulatedDataBuilder {
         revertible_builder.encrypted_log_preimages_length =  self.encrypted_log_preimages_length;
         revertible_builder.unencrypted_log_preimages_length = self.unencrypted_log_preimages_length;
 
-        revertible_builder.gas_used = self.gas_used;
-        non_revertible_builder.gas_used = self.non_revertible_gas_used;
+        revertible_da_gas_used += DA_GAS_PER_BYTE * (self.encrypted_log_preimages_length as u32 + self.unencrypted_log_preimages_length as u32);
+
+        revertible_builder.gas_used = Gas::new(revertible_da_gas_used, revertible_l2_gas_used);
+        non_revertible_builder.gas_used = Gas::tx_overhead() + Gas::new(non_revertible_da_gas_used, non_revertible_l2_gas_used);
         (non_revertible_builder.finish(), revertible_builder.finish())
     }
 }
@@ -150,7 +206,7 @@ mod tests {
         note_hash::{NoteHash, NoteHashContext}, nullifier::Nullifier,
         public_data_update_request::PublicDataUpdateRequest, side_effect::SideEffect
     },
-        address::AztecAddress, utils::arrays::array_eq
+        address::AztecAddress, utils::arrays::array_eq, constants::{DA_BYTES_PER_FIELD, DA_GAS_PER_BYTE}
     };
 
     #[test]
@@ -213,10 +269,7 @@ mod tests {
         builder.public_call_stack.extend_from_array(non_revertible_public_stack);
         builder.public_call_stack.extend_from_array(revertible_public_call_stack);
 
-        builder.gas_used = Gas::new(20,20);
-        builder.non_revertible_gas_used = Gas::new(10,10);
-
-        let (non_revertible, revertible) = builder.split_to_public(7);
+        let (non_revertible, revertible) = builder.split_to_public(7, Gas::new(42, 17));
 
         assert(
             array_eq(
@@ -242,8 +295,14 @@ mod tests {
         assert(array_eq(revertible.new_nullifiers, revertible_nullifiers));
         assert(array_eq(revertible.public_call_stack, revertible_public_call_stack));
 
-        assert_eq(revertible.gas_used, Gas::new(20, 20));
-        assert_eq(non_revertible.gas_used, Gas::new(10, 10));
+        assert_eq(
+            revertible.gas_used, Gas::new(4 * DA_BYTES_PER_FIELD * DA_GAS_PER_BYTE, 0) + Gas::new(42, 17)
+        );
+
+        print(non_revertible.gas_used);
+        assert_eq(
+            non_revertible.gas_used, Gas::new(4 * DA_BYTES_PER_FIELD * DA_GAS_PER_BYTE, 0) + Gas::tx_overhead()
+        );
     }
 }
 
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/gas.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/gas.nr
index 63a8db91ec94..07e9c6d53604 100644
--- a/noir-projects/noir-protocol-circuits/crates/types/src/abis/gas.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/gas.nr
@@ -1,8 +1,10 @@
 use crate::{
     abis::function_selector::FunctionSelector, address::{EthAddress, AztecAddress},
-    constants::GAS_LENGTH, hash::pedersen_hash, traits::{Deserialize, Hash, Serialize, Empty},
-    abis::side_effect::Ordered, utils::reader::Reader, abis::gas_fees::GasFees
+    constants::{GAS_LENGTH, FIXED_DA_GAS}, hash::pedersen_hash,
+    traits::{Deserialize, Hash, Serialize, Empty}, abis::side_effect::Ordered, utils::reader::Reader,
+    abis::gas_fees::GasFees
 };
+use dep::std::ops::{Add, Sub};
 
 struct Gas {
     da_gas: u32,
@@ -14,12 +16,8 @@ impl Gas {
         Self { da_gas, l2_gas }
     }
 
-    pub fn add(self, other: Gas) -> Self {
-        Gas::new(self.da_gas + other.da_gas, self.l2_gas + other.l2_gas)
-    }
-
-    pub fn sub(self, other: Gas) -> Self {
-        Gas::new(self.da_gas - other.da_gas, self.l2_gas - other.l2_gas)
+    pub fn tx_overhead() -> Self {
+        Self { da_gas: FIXED_DA_GAS, l2_gas: 0 }
     }
 
     pub fn compute_fee(self, fees: GasFees) -> Field {
@@ -31,6 +29,18 @@ impl Gas {
     }
 }
 
+impl Add for Gas {
+    fn add(self, other: Gas) -> Self {
+        Gas::new(self.da_gas + other.da_gas, self.l2_gas + other.l2_gas)
+    }
+}
+
+impl Sub for Gas {
+    fn sub(self, other: Gas) -> Self {
+        Gas::new(self.da_gas - other.da_gas, self.l2_gas - other.l2_gas)
+    }
+}
+
 impl Serialize<GAS_LENGTH> for Gas {
     fn serialize(self) -> [Field; GAS_LENGTH] {
         [self.da_gas as Field, self.l2_gas as Field]
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_circuit_public_inputs/private_kernel_circuit_public_inputs_builder.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_circuit_public_inputs/private_kernel_circuit_public_inputs_builder.nr
index 301dce0667df..8314d48a5ced 100644
--- a/noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_circuit_public_inputs/private_kernel_circuit_public_inputs_builder.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/kernel_circuit_public_inputs/private_kernel_circuit_public_inputs_builder.nr
@@ -6,7 +6,7 @@ use crate::{
     private_kernel_circuit_public_inputs::PrivateKernelCircuitPublicInputs,
     public_kernel_circuit_public_inputs::PublicKernelCircuitPublicInputs
 },
-    validation_requests::validation_requests_builder::ValidationRequestsBuilder
+    gas::Gas, validation_requests::validation_requests_builder::ValidationRequestsBuilder
 },
     mocked::AggregationObject, partial_state_reference::PartialStateReference, traits::Empty
 };
@@ -34,19 +34,23 @@ impl PrivateKernelCircuitPublicInputsBuilder {
         }
     }
 
-    pub fn finish_tail(self) -> KernelCircuitPublicInputs {
+    pub fn finish_tail(self, teardown_gas: Gas) -> KernelCircuitPublicInputs {
         KernelCircuitPublicInputs {
             aggregation_object: self.aggregation_object,
             rollup_validation_requests: self.validation_requests.to_rollup(),
-            end: self.end.to_combined(),
+            end: self.end.to_combined(teardown_gas),
             constants: self.constants,
             start_state: PartialStateReference::empty(),
             revert_code: 0
         }
     }
 
-    pub fn finish_to_public(self, min_revertible_side_effect_counter: u32) -> PublicKernelCircuitPublicInputs {
-        let (end_non_revertible, end) = self.end.split_to_public(min_revertible_side_effect_counter);
+    pub fn finish_to_public(
+        self,
+        teardown_gas: Gas,
+        min_revertible_side_effect_counter: u32
+    ) -> PublicKernelCircuitPublicInputs {
+        let (end_non_revertible, end) = self.end.split_to_public(min_revertible_side_effect_counter, teardown_gas);
 
         PublicKernelCircuitPublicInputs {
             aggregation_object: self.aggregation_object,
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr b/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr
index 37c7bc84848c..a1bb67a91af8 100644
--- a/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr
@@ -133,6 +133,9 @@ global DEFAULT_GAS_LIMIT: u32 = 1_000_000_000;
 global DEFAULT_TEARDOWN_GAS_LIMIT: u32 = 100_000_000;
 global DEFAULT_MAX_FEE_PER_GAS: Field = 10;
 global DEFAULT_INCLUSION_FEE: Field = 0;
+global DA_BYTES_PER_FIELD: u32 = 32;
+global DA_GAS_PER_BYTE: u32 = 16;
+global FIXED_DA_GAS: u32 = 512;
 
 global CANONICAL_KEY_REGISTRY_ADDRESS = 0x1585e564a60e6ec974bc151b62705292ebfc75c33341986a47fd9749cedb567e;
 
diff --git a/yarn-project/circuits.js/src/constants.gen.ts b/yarn-project/circuits.js/src/constants.gen.ts
index 0e2f73c46d25..fa54b70305ac 100644
--- a/yarn-project/circuits.js/src/constants.gen.ts
+++ b/yarn-project/circuits.js/src/constants.gen.ts
@@ -79,6 +79,9 @@ export const DEFAULT_GAS_LIMIT = 1_000_000_000;
 export const DEFAULT_TEARDOWN_GAS_LIMIT = 100_000_000;
 export const DEFAULT_MAX_FEE_PER_GAS = 10;
 export const DEFAULT_INCLUSION_FEE = 0;
+export const DA_BYTES_PER_FIELD = 32;
+export const DA_GAS_PER_BYTE = 16;
+export const FIXED_DA_GAS = 512;
 export const CANONICAL_KEY_REGISTRY_ADDRESS = 0x1585e564a60e6ec974bc151b62705292ebfc75c33341986a47fd9749cedb567en;
 export const AZTEC_ADDRESS_LENGTH = 1;
 export const GAS_FEES_LENGTH = 2;

From 7933f0f32c293e4c9f1f4437fbb4c82cf63b35bf Mon Sep 17 00:00:00 2001
From: just-mitch <68168980+just-mitch@users.noreply.github.com>
Date: Tue, 30 Apr 2024 16:09:12 -0600
Subject: [PATCH 20/42] chore: disable doc builds (#6107)

disable temporarily.
---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1f2d4ab8783d..22aa6eefad4c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -156,6 +156,7 @@ jobs:
   docs-preview:
     needs: setup
     runs-on: ${{ inputs.username || github.actor }}-x86
+    if: github.event.number
     steps:
       - {
           uses: actions/checkout@v4,

From c985c73c0da3212076d14c5f6e9f83d450c88278 Mon Sep 17 00:00:00 2001
From: Santiago Palladino <santiago@aztecprotocol.com>
Date: Tue, 30 Apr 2024 19:39:21 -0300
Subject: [PATCH 21/42] chore(ci): Run benchmarks on Earthly (#6089)

Migrates benchmark jobs from CCI to Earthly+GA.

Introduces a new `yarn-project/scripts/Earthfile` with jobs for
downloading logs, aggregating them, and commenting, which are called
from a new `bench-summary` job in GA's CI workflow that runs after
`e2e`. Adds a new `UPLOAD_LOGS` function in the
`yarn-projects/end-to-end/Earthfile` to upload logs to S3, gets called
from all bench e2e jobs.

Perhaps we can ditch S3 for storing logs (not historic benches, since
those are needed for comparisons) and use Earthly artifacts for that,
but we can do that later down the road.
---
 .circleci/config.yml                          |  52 ---------
 .github/ci-setup-action/action.yml            |  11 +-
 .github/workflows/ci.yml                      |  41 +++++--
 .gitignore                                    |   4 +
 Earthfile                                     |   6 ++
 scripts/ci/assemble_e2e_benchmark.sh          | 101 ------------------
 scripts/logs/check_logs_for_benchmark.sh      |  25 +++++
 .../logs/download_base_benchmark_from_s3.sh   |  33 ++++++
 scripts/logs/download_logs_from_s3.sh         |  36 +++++++
 .../upload_aggregated_benchmarks_to_s3.sh     |  37 +++++++
 scripts/logs/upload_logs_to_s3.sh             |  39 +++++++
 scripts/setup_env.sh                          |   5 +-
 yarn-project/end-to-end/Earthfile             |  60 ++++++++---
 yarn-project/scripts/Earthfile                |  70 ++++++++++++
 14 files changed, 340 insertions(+), 180 deletions(-)
 delete mode 100755 scripts/ci/assemble_e2e_benchmark.sh
 create mode 100755 scripts/logs/check_logs_for_benchmark.sh
 create mode 100755 scripts/logs/download_base_benchmark_from_s3.sh
 create mode 100755 scripts/logs/download_logs_from_s3.sh
 create mode 100755 scripts/logs/upload_aggregated_benchmarks_to_s3.sh
 create mode 100755 scripts/logs/upload_logs_to_s3.sh
 create mode 100644 yarn-project/scripts/Earthfile

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7ac64d1ae95a..70b0393270e2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -482,37 +482,6 @@ jobs:
   # For old e2e tests see yarn-project/end-to-end/Earthfile
   # Semantics are similar to Dockerfile
 
-  # NOTE: Unlike other e2e, these will be re-enabled here as currently the logs functionality is not in the new earthfile setup
-  bench-publish-rollup:
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Benchmark"
-          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose-no-sandbox.yml TEST=benchmarks/bench_publish_rollup.test.ts DEBUG=aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees
-          aztec_manifest_key: end-to-end
-    <<: *defaults_e2e_test
-
-  bench-process-history:
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Benchmark"
-          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose-no-sandbox.yml TEST=benchmarks/bench_process_history.test.ts DEBUG=aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees
-          aztec_manifest_key: end-to-end
-    <<: *defaults_e2e_test
-
-  bench-tx-size:
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Benchmark"
-          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose-no-sandbox.yml TEST=benchmarks/bench_tx_size_fees.test.ts ENABLE_GAS=1 DEBUG=aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees
-          aztec_manifest_key: end-to-end
-    <<: *defaults_e2e_test
-
   e2e-join:
     docker:
       - image: cimg/base:2023.09
@@ -531,16 +500,6 @@ jobs:
           name: "Noop"
           command: echo Noop
 
-  bench-summary:
-    machine:
-      image: default
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Assemble benchmark summary from uploaded logs"
-          command: ./scripts/ci/assemble_e2e_benchmark.sh
-
   # Deploy & release jobs.
   deploy-and-release:
     machine:
@@ -775,16 +734,5 @@ workflows:
             - e2e-join
           <<: *defaults
 
-      # Benchmark jobs.
-      - bench-publish-rollup: *e2e_test
-      - bench-process-history: *e2e_test
-      - bench-tx-size: *e2e_test
-      - bench-summary:
-          requires:
-            - bench-publish-rollup
-            - bench-process-history
-            - bench-tx-size
-          <<: *defaults
-
       # Production releases.
       - deploy-and-release: *defaults_deploy
diff --git a/.github/ci-setup-action/action.yml b/.github/ci-setup-action/action.yml
index 4b1d7da6dbbd..f5d8029f6561 100644
--- a/.github/ci-setup-action/action.yml
+++ b/.github/ci-setup-action/action.yml
@@ -1,14 +1,14 @@
 # Reusable setup workflow for CI tasks
 name: Setup Workflow
-description: 'Reusable setup steps'
+description: "Reusable setup steps"
 
 inputs:
   dockerhub_password:
     required: true
-    description: 'DockerHub Password'
+    description: "DockerHub Password"
   concurrency_key:
     required: false
-    description: 'Concurrency key for locking jobs'
+    description: "Concurrency key for locking jobs"
 runs:
   # define an action, runs in OS of caller
   using: composite
@@ -43,11 +43,14 @@ runs:
       with:
         # permission issue with spot runners, simpler to leave out
         use-cache: false
-        version: 'v0.8.5'
+        version: "v0.8.5"
 
     - name: Setup Env
       shell: bash
       run: ./scripts/setup_env.sh ${{ inputs.dockerhub_password }}
+      env:
+        PULL_REQUEST: "${{ github.event.pull_request.number }}"
+        BRANCH: "${{ github.ref_name }}"
 
     # As detailed in https://github.com/ben-z/gh-action-mutex
     # things do not become 'pending' in github actions, and instead just cancel one another
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 22aa6eefad4c..42c9e4fe619a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,10 +11,12 @@ on:
       runner_action:
         description: "The action to take with the self-hosted runner (start, stop, restart)."
         required: false
+
 concurrency:
   # force parallelism in master
   group: ci-${{ github.ref_name == 'master' && github.run_id || github.ref_name }}
   cancel-in-progress: true
+
 jobs:
   setup:
     uses: ./.github/workflows/setup-runner.yml
@@ -64,10 +66,8 @@ jobs:
       matrix:
         test: ${{ fromJson( needs.build.outputs.e2e_list )}}
     steps:
-      - {
-          uses: actions/checkout@v4,
-          with: { ref: "${{ github.event.pull_request.head.sha }}" },
-        }
+      - uses: actions/checkout@v4
+        with: { ref: "${{ github.event.pull_request.head.sha }}" }
       - uses: ./.github/ci-setup-action
         with:
           dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
@@ -76,10 +76,35 @@ jobs:
       - name: Test
         working-directory: ./yarn-project/end-to-end/
         timeout-minutes: 25
-        run: earthly-ci -P --no-output +${{ matrix.test }} --e2e_mode=cache
-      # TODO
-      # - name: Upload logs
-      #   run: BRANCH=${{ github.ref_name }} PULL_REQUEST=${{ github.event.number }} scripts/ci/upload_logs_to_s3 ./yarn-project/end-to-end/log
+        run: earthly-ci -P --secret AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }} --secret AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} --no-output +${{ matrix.test }} --e2e_mode=cache
+
+  bench-summary:
+    needs: e2e
+    runs-on: ${{ inputs.username || github.actor }}-x86
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 100 # Downloading base benchmark from master requires access to history
+          ref: "${{ github.event.pull_request.head.sha }}"
+      - uses: ./.github/ci-setup-action
+        with:
+          dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
+          concurrency_key: build-${{ inputs.username || github.actor }}-x86
+      - name: "Build and upload bench aggregate file"
+        working-directory: ./yarn-project/scripts
+        run: earthly-ci -P --secret AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }} --secret AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} +bench-aggregate
+      - name: "Download base benchmark"
+        if: ${{ github.event_name == 'pull_request' }}
+        run: scripts/logs/download_base_benchmark_from_s3.sh
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          BENCH_FOLDER: ./yarn-project/scripts/bench
+          PULL_REQUEST: "${{ github.event.pull_request.number }}"
+      - name: "Generate summary comment if pull request"
+        if: ${{ github.event_name == 'pull_request' }}
+        working-directory: ./yarn-project/scripts
+        run: earthly-ci -P --secret AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }} --secret AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} --secret AZTEC_BOT_COMMENTER_GITHUB_TOKEN=${{ secrets.AZTEC_BOT_GITHUB_TOKEN }} +bench-comment
 
   # barretenberg (prover) native and AVM (public VM) tests
   # only ran on x86 for resource reasons (memory intensive)
diff --git a/.gitignore b/.gitignore
index fcee2d1838e1..8e28a8bac2f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,7 @@ cmake-build-debug
 .DS_Store
 
 **/*.dockerignore
+
+# Earthly
+.arg
+.secret
diff --git a/Earthfile b/Earthfile
index 65abde37745a..096ac3bac0df 100644
--- a/Earthfile
+++ b/Earthfile
@@ -32,3 +32,9 @@ bench:
 release-meta:
     COPY .release-please-manifest.json /usr/src/.release-please-manifest.json
     SAVE ARTIFACT /usr/src /usr/src
+
+scripts:
+    FROM ubuntu:lunar
+    RUN apt-get update && apt-get install -y awscli
+    COPY scripts /usr/src/scripts
+    SAVE ARTIFACT /usr/src/scripts scripts
\ No newline at end of file
diff --git a/scripts/ci/assemble_e2e_benchmark.sh b/scripts/ci/assemble_e2e_benchmark.sh
deleted file mode 100755
index 90291ffa8b8e..000000000000
--- a/scripts/ci/assemble_e2e_benchmark.sh
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/usr/bin/env bash
-# Grabs the log files uploaded in build-system/scripts/upload_logs_to_s3
-# that contain representative benchmarks, extracts whatever metrics are interesting,
-# and assembles a single file that shows the current state of the repository.
-
-[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
-set -eu
-
-BUCKET_NAME="aztec-ci-artifacts"
-LOG_FOLDER="${LOG_FOLDER:-log}"
-BENCH_FOLDER="${BENCH_FOLDER:-bench}"
-COMMIT_HASH="${COMMIT_HASH:-$(git rev-parse HEAD)}"
-BASE_BENCH_PATH=""
-BENCHMARK_FILE_JSON="${BENCH_FOLDER}/benchmark.json"
-BASE_BENCHMARK_FILE_JSON="${BENCH_FOLDER}/base-benchmark.json"
-
-# Paths from build-system/scripts/upload_logs_to_s3
-if [ "${CIRCLE_BRANCH:-}" = "master" ]; then
-  LOG_SOURCE_FOLDER="logs-v1/master/$COMMIT_HASH"
-  BARRETENBERG_BENCH_SOURCE_FOLDER="barretenberg-bench-v1/master/$COMMIT_HASH"
-  BENCHMARK_TARGET_FILE="benchmarks-v1/master/$COMMIT_HASH.json"
-  BENCHMARK_LATEST_FILE="benchmarks-v1/latest.json"
-elif [ -n "${CIRCLE_PULL_REQUEST:-}" ]; then
-  LOG_SOURCE_FOLDER="logs-v1/pulls/${CIRCLE_PULL_REQUEST##*/}"
-  BARRETENBERG_BENCH_SOURCE_FOLDER="barretenberg-bench-v1/pulls/${CIRCLE_PULL_REQUEST##*/}"
-  BENCHMARK_TARGET_FILE="benchmarks-v1/pulls/${CIRCLE_PULL_REQUEST##*/}.json"
-elif [ -n "${CIRCLE_TAG:-}" ]; then
-  echo "Skipping benchmark run for ${CIRCLE_TAG} tagged release."
-  exit 0
-else
-  echo "Skipping benchmark run on branch ${CIRCLE_BRANCH:-unknown}."
-  exit 0
-fi
-
-# Download benchmark log files from S3 LOG_SOURCE_FOLDER into local LOG_FOLDER
-mkdir -p $LOG_FOLDER
-aws s3 cp "s3://${BUCKET_NAME}/${LOG_SOURCE_FOLDER}/" $LOG_FOLDER --exclude '*' --include 'bench*.jsonl' --recursive
-
-# Only generate the aggregated benchmark if we've managed to retrieve all the needed log files
-# If these runs were skipped due to no changes in their rebuild-patterns, then there's no need
-# to recompute the aggregated benchmark. Note that if one benchmark did run but others didn't,
-# this skips the whole aggregation. For now, that's fine because all benchmark files have the
-# same rebuild pattern rules. But if that changes, then we'd need to go up in the commit history
-# to find the latest log files for the unchanged benchmarks.
-EXPECTED_LOGS_COUNT=$(find yarn-project/end-to-end/src -type f -name "bench*.test.ts" | wc -l)
-DOWNLOADED_LOGS_COUNT=$(find $LOG_FOLDER -type f -name "*.jsonl" | wc -l)
-if [ "$DOWNLOADED_LOGS_COUNT" -lt "$EXPECTED_LOGS_COUNT" ]; then
-  echo Found $DOWNLOADED_LOGS_COUNT out of $EXPECTED_LOGS_COUNT benchmark log files in s3://${BUCKET_NAME}/${LOG_SOURCE_FOLDER}/. Exiting.
-  exit 0
-fi
-
-# Download barretenberg log files, these are direct benchmarks and separate from the above
-aws s3 cp "s3://${BUCKET_NAME}/${BARRETENBERG_BENCH_SOURCE_FOLDER}/" $LOG_FOLDER --exclude '*' --include '*_bench.json' --recursive
-
-# Generate the aggregated benchmark file
-mkdir -p $BENCH_FOLDER
-CONTAINER_BENCH_FOLDER="/usr/src/yarn-project/bench"
-CONTAINER_LOG_FOLDER="/usr/src/yarn-project/log"
-export DOCKER_RUN_OPTS="\
- -v $(realpath $BENCH_FOLDER):${CONTAINER_BENCH_FOLDER}:rw \
- -e BENCH_FOLDER=${CONTAINER_BENCH_FOLDER} \
- -v $(realpath $LOG_FOLDER):${CONTAINER_LOG_FOLDER}:rw \
- -e LOG_FOLDER=${CONTAINER_LOG_FOLDER} \
- -e BASE_BENCH_PATH \
- -e AZTEC_BOT_COMMENTER_GITHUB_TOKEN \
- -e CIRCLE_PULL_REQUEST"
-yarn-project/scripts/run_script.sh workspace @aztec/scripts bench-aggregate
-echo "generated: $BENCHMARK_FILE_JSON"
-
-# Upload it to master or pulls
-aws s3 cp $BENCHMARK_FILE_JSON "s3://${BUCKET_NAME}/${BENCHMARK_TARGET_FILE}"
-
-# If on master, also update the "latest" benchmark file
-if [ -n "${BENCHMARK_LATEST_FILE:-}" ]; then
-  aws s3 cp $BENCHMARK_FILE_JSON "s3://${BUCKET_NAME}/${BENCHMARK_LATEST_FILE}"
-fi
-
-# If on a pull request, get the data from the most recent commit on master where it's available,
-# generate a markdown comment, and post it on the pull request
-if [ -n "${CIRCLE_PULL_REQUEST:-}" ]; then
-  MASTER_COMMIT_HASH=$(curl -s "https://api.github.com/repos/AztecProtocol/aztec-packages/pulls/${CIRCLE_PULL_REQUEST##*/}" | jq -r '.base.sha')
-  MASTER_COMMIT_HASHES=($(git log $MASTER_COMMIT_HASH --format="%H" -n 50))
-
-  set +e
-  echo "Searching for base benchmark data starting from commit $MASTER_COMMIT_HASH"
-  for commit_hash in "${MASTER_COMMIT_HASHES[@]}"; do
-    aws s3 cp "s3://${BUCKET_NAME}/benchmarks-v1/master/$commit_hash.json" $BASE_BENCHMARK_FILE_JSON
-    if [ $? -eq 0 ]; then
-      echo "Downloaded base data from commit $commit_hash"
-      export BASE_BENCH_PATH=master/$commit_hash
-      break;
-    fi
-  done
-  set -e
-
-  if [ -z "${BASE_BENCH_PATH:-}" ]; then
-    echo "No base commit data found"
-  fi
-
-  (yarn-project/scripts/run_script.sh workspace @aztec/scripts bench-comment && echo "commented on pr $CIRCLE_PULL_REQUEST") || echo "failed commenting on pr"
-fi
diff --git a/scripts/logs/check_logs_for_benchmark.sh b/scripts/logs/check_logs_for_benchmark.sh
new file mode 100755
index 000000000000..69075d4160de
--- /dev/null
+++ b/scripts/logs/check_logs_for_benchmark.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+# Checks that all logs needed for assembling aggregate benchmarks have been retrieved.
+
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
+set -eu
+
+LOG_FOLDER="${LOG_FOLDER:-log}"
+E2E_SRC_FOLDER=/usr/src/yarn-project/end-to-end/src
+
+echo "Checking log files in $LOG_FOLDER"
+
+# Only generate the aggregated benchmark if we've managed to retrieve all the needed log files
+# If these runs were skipped due to no changes in their rebuild-patterns, then there's no need
+# to recompute the aggregated benchmark. Note that if one benchmark did run but others didn't,
+# this skips the whole aggregation. For now, that's fine because all benchmark files have the
+# same rebuild pattern rules. But if that changes, then we'd need to go up in the commit history
+# to find the latest log files for the unchanged benchmarks.
+EXPECTED_LOGS_COUNT=$(find $E2E_SRC_FOLDER -type f -name "bench*.test.ts" | wc -l)
+DOWNLOADED_LOGS_COUNT=$(find $LOG_FOLDER -type f -name "*.jsonl" | wc -l)
+if [ "$DOWNLOADED_LOGS_COUNT" -lt "$EXPECTED_LOGS_COUNT" ]; then
+  echo Found only $DOWNLOADED_LOGS_COUNT out of $EXPECTED_LOGS_COUNT benchmark log files in S3.
+  echo Files found: $(find $LOG_FOLDER -type f -name "*.jsonl")
+  exit 1
+fi
+
diff --git a/scripts/logs/download_base_benchmark_from_s3.sh b/scripts/logs/download_base_benchmark_from_s3.sh
new file mode 100755
index 000000000000..dfe5d631ab47
--- /dev/null
+++ b/scripts/logs/download_base_benchmark_from_s3.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+# Downloads base benchmarks from S3 to compare with the current benchmarks via bench-comment
+
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
+set -eu
+
+BUCKET_NAME="aztec-ci-artifacts"
+BENCH_FOLDER="${BENCH_FOLDER:-bench}"
+COMMIT_HASH="${COMMIT_HASH:-$(git rev-parse HEAD)}"
+BASE_BENCHMARK_FILE_JSON="${BENCH_FOLDER}/base-benchmark.json"
+
+# If on a pull request, get the data from the most recent commit on master where it's available to generate a comment comparing them
+if [ -n "${PULL_REQUEST:-}" ]; then
+  MASTER_COMMIT_HASH=$(curl -s "https://api.github.com/repos/AztecProtocol/aztec-packages/pulls/${PULL_REQUEST##*/}" | jq -r '.base.sha')
+  MASTER_COMMIT_HASHES=($(git log $MASTER_COMMIT_HASH --format="%H" -n 50))
+
+  mkdir -p $BENCH_FOLDER
+
+  set +e
+  echo "Searching for base benchmark data starting from commit $MASTER_COMMIT_HASH"
+  for commit_hash in "${MASTER_COMMIT_HASHES[@]}"; do
+    aws s3 cp "s3://${BUCKET_NAME}/benchmarks-v1/master/$commit_hash.json" $BASE_BENCHMARK_FILE_JSON
+    if [ $? -eq 0 ]; then
+      echo "Downloaded base data from commit $commit_hash"
+      exit 0
+    fi
+  done
+  set -e
+
+  echo "No base commit data found"
+else
+  echo "Not on a pull request, skipping download of base benchmark data"
+fi
diff --git a/scripts/logs/download_logs_from_s3.sh b/scripts/logs/download_logs_from_s3.sh
new file mode 100755
index 000000000000..a31979e3968c
--- /dev/null
+++ b/scripts/logs/download_logs_from_s3.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+# Downloads the log files uploaded in upload_logs_to_s3
+
+set -eu
+
+BUCKET_NAME="aztec-ci-artifacts"
+LOG_FOLDER="${LOG_FOLDER:-log}"
+COMMIT_HASH="${COMMIT_HASH:-$(git rev-parse HEAD)}"
+
+echo "Downloading logs from S3 for commit $COMMIT_HASH in branch ${BRANCH:-} at pull request ${PULL_REQUEST:-none}"
+
+# Paths from upload_logs_to_s3
+if [ "${BRANCH:-}" = "master" ]; then
+  LOG_SOURCE_FOLDER="logs-v1/master/$COMMIT_HASH"
+  BARRETENBERG_BENCH_SOURCE_FOLDER="barretenberg-bench-v1/master/$COMMIT_HASH"
+  BENCHMARK_TARGET_FILE="benchmarks-v1/master/$COMMIT_HASH.json"
+  BENCHMARK_LATEST_FILE="benchmarks-v1/latest.json"
+elif [ -n "${PULL_REQUEST:-}" ]; then
+  LOG_SOURCE_FOLDER="logs-v1/pulls/${PULL_REQUEST##*/}"
+  BARRETENBERG_BENCH_SOURCE_FOLDER="barretenberg-bench-v1/pulls/${PULL_REQUEST##*/}"
+  BENCHMARK_TARGET_FILE="benchmarks-v1/pulls/${PULL_REQUEST##*/}.json"
+else
+  echo "Skipping benchmark run on branch ${BRANCH:-unknown}."
+  exit 0
+fi
+
+mkdir -p $LOG_FOLDER
+
+# Download benchmark log files from S3 LOG_SOURCE_FOLDER into local LOG_FOLDER
+echo "Downloading benchmark log files from $BUCKET_NAME/$LOG_SOURCE_FOLDER to $LOG_FOLDER"
+aws s3 cp "s3://${BUCKET_NAME}/${LOG_SOURCE_FOLDER}/" $LOG_FOLDER --exclude '*' --include 'bench*.jsonl' --recursive
+
+# Download barretenberg log files, these are direct benchmarks and separate from the above
+aws s3 cp "s3://${BUCKET_NAME}/${BARRETENBERG_BENCH_SOURCE_FOLDER}/" $LOG_FOLDER --exclude '*' --include '*_bench.json' --recursive
+
+echo "Downloaded log files $(ls $LOG_FOLDER)"
\ No newline at end of file
diff --git a/scripts/logs/upload_aggregated_benchmarks_to_s3.sh b/scripts/logs/upload_aggregated_benchmarks_to_s3.sh
new file mode 100755
index 000000000000..76b00122c89c
--- /dev/null
+++ b/scripts/logs/upload_aggregated_benchmarks_to_s3.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+# Uploads aggregated benchmark logs to S3
+
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
+set -eu
+
+BUCKET_NAME="aztec-ci-artifacts"
+LOG_FOLDER="${LOG_FOLDER:-log}"
+BENCH_FOLDER="${BENCH_FOLDER:-bench}"
+COMMIT_HASH="${COMMIT_HASH:-$(git rev-parse HEAD)}"
+BENCHMARK_FILE_JSON="${BENCH_FOLDER}/benchmark.json"
+
+# Paths from upload_logs_to_s3
+if [ "${BRANCH:-}" = "master" ]; then
+  LOG_SOURCE_FOLDER="logs-v1/master/$COMMIT_HASH"
+  BARRETENBERG_BENCH_SOURCE_FOLDER="barretenberg-bench-v1/master/$COMMIT_HASH"
+  BENCHMARK_TARGET_FILE="benchmarks-v1/master/$COMMIT_HASH.json"
+  BENCHMARK_LATEST_FILE="benchmarks-v1/latest.json"
+elif [ -n "${PULL_REQUEST:-}" ]; then
+  LOG_SOURCE_FOLDER="logs-v1/pulls/${PULL_REQUEST##*/}"
+  BARRETENBERG_BENCH_SOURCE_FOLDER="barretenberg-bench-v1/pulls/${PULL_REQUEST##*/}"
+  BENCHMARK_TARGET_FILE="benchmarks-v1/pulls/${PULL_REQUEST##*/}.json"
+elif [ -n "${CIRCLE_TAG:-}" ]; then
+  echo "Skipping benchmark run for ${CIRCLE_TAG} tagged release."
+  exit 0
+else
+  echo "Skipping benchmark run on branch ${BRANCH:-unknown}."
+  exit 0
+fi
+
+# Upload it to master or pulls
+aws s3 cp $BENCHMARK_FILE_JSON "s3://${BUCKET_NAME}/${BENCHMARK_TARGET_FILE}"
+
+# If on master, also update the "latest" benchmark file
+if [ -n "${BENCHMARK_LATEST_FILE:-}" ]; then
+  aws s3 cp $BENCHMARK_FILE_JSON "s3://${BUCKET_NAME}/${BENCHMARK_LATEST_FILE}"
+fi
diff --git a/scripts/logs/upload_logs_to_s3.sh b/scripts/logs/upload_logs_to_s3.sh
new file mode 100755
index 000000000000..a5e46f5a9680
--- /dev/null
+++ b/scripts/logs/upload_logs_to_s3.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+
+# Uploads to S3 the contents of the log file mounted on the end-to-end container,
+# which contains log entries with an associated event and metrics for it.
+# Logs are uploaded to aztec-ci-artifacts/logs-v1/master/$COMMIT/$JOB.jsonl
+# or to aztec-ci-artifacts/logs-v1/pulls/$PRNUMBER/$JOB.jsonl if on a PR
+
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
+set -eu
+
+LOG_FOLDER=$1
+BUCKET_NAME="aztec-ci-artifacts"
+COMMIT_HASH="${COMMIT_HASH:-$(git rev-parse HEAD)}"
+E2E_MODE="${E2E_MODE:-local}"
+
+echo "Uploading logs to S3 in mode $E2E_MODE for commit $COMMIT_HASH in branch ${BRANCH:-} at pull request ${PULL_REQUEST:-none}"
+
+if [ ! -d "$LOG_FOLDER" ] || [ -z "$(ls -A "$LOG_FOLDER")" ]; then
+  echo "No logs in folder $LOG_FOLDER to upload"
+  exit 0
+fi
+
+if [ "$E2E_MODE" == "local" ]; then
+  echo "Skipping upload since running in local mode"
+  exit 0
+fi
+
+# Paths used in scripts/ci/assemble_e2e_benchmark.sh
+if [ "${BRANCH:-}" = "master" ]; then
+  TARGET_FOLDER="logs-v1/master/$COMMIT_HASH/"
+elif [ -n "${PULL_REQUEST:-}" ]; then
+  TARGET_FOLDER="logs-v1/pulls/${PULL_REQUEST##*/}"
+fi
+
+if [ -n "${TARGET_FOLDER:-}" ]; then
+  aws s3 cp $LOG_FOLDER "s3://${BUCKET_NAME}/${TARGET_FOLDER}"  --include "*.jsonl" --recursive
+else
+  echo Skipping upload since no target folder was defined
+fi
\ No newline at end of file
diff --git a/scripts/setup_env.sh b/scripts/setup_env.sh
index 70ecf9d7654c..7ad729fdda9e 100755
--- a/scripts/setup_env.sh
+++ b/scripts/setup_env.sh
@@ -1,8 +1,11 @@
 #!/bin/bash
 
+COMMIT_HASH=$(git rev-parse HEAD)
+
 # Setup environment variables
 echo "Setting up environment variables..."
-echo FORCE_COLOR=1 >> $GITHUB_ENV
+echo "FORCE_COLOR=1" >> $GITHUB_ENV
+echo "EARTHLY_BUILD_ARGS=PULL_REQUEST=$PULL_REQUEST,BRANCH=$BRANCH,COMMIT_HASH=$COMMIT_HASH" >> $GITHUB_ENV
 
 # Docker login
 echo "Logging in to Docker..."
diff --git a/yarn-project/end-to-end/Earthfile b/yarn-project/end-to-end/Earthfile
index 59403a2400c8..d59b9222d0ed 100644
--- a/yarn-project/end-to-end/Earthfile
+++ b/yarn-project/end-to-end/Earthfile
@@ -9,10 +9,12 @@ E2E_TEST_LOCAL:
   ARG compose_file=./scripts/docker-compose.yml
   ARG enable_gas=""
   ARG debug="aztec:*"
+  ARG EARTHLY_TARGET_NAME
   LOCALLY
   ENV ENABLE_GAS=$enable_gas
   ENV TEST=$test
   ENV DEBUG=$debug
+  ENV JOB_NAME=$EARTHLY_TARGET_NAME
   WITH DOCKER \
     --load aztecprotocol/aztec:latest=../+aztec \
     --load aztecprotocol/end-to-end:latest=../+end-to-end \
@@ -29,13 +31,15 @@ E2E_TEST_FROM_CACHE:
   ARG enable_gas=""
   ARG debug="aztec:*"
   ARG aztec_docker_tag
+  ARG EARTHLY_TARGET_NAME
   LOCALLY
   ENV ENABLE_GAS=$enable_gas
   ENV TEST=$test
   ENV DEBUG=$debug
   ENV AZTEC_DOCKER_TAG=$aztec_docker_tag
+  ENV JOB_NAME=$EARTHLY_TARGET_NAME
   # need a different project name for each to run in parallel
-  LET project_name=$(echo $test | sed 's/\./_/g')
+  LET project_name=$(echo $test | sed 's/[./]/_/g')
   IF docker compose > /dev/null 2>&1
     LET CMD="docker compose"
   ELSE
@@ -51,10 +55,12 @@ E2E_TEST_FROM_BUILD:
   ARG compose_file=./scripts/docker-compose.yml
   ARG enable_gas=""
   ARG debug="aztec:*"
+  ARG EARTHLY_TARGET_NAME
   FROM earthly/dind:alpine-3.19-docker-25.0.2-r0
   ENV ENABLE_GAS=$enable_gas
   ENV TEST=$test
   ENV DEBUG=$debug
+  ENV JOB_NAME=$EARTHLY_TARGET_NAME
   COPY $compose_file $compose_file
   # For ARM, we do use WITH DOCKER as we don't have many e2e tests, but note E2E_TEST_FROM_CACHE
   WITH DOCKER \
@@ -81,6 +87,22 @@ E2E_TEST:
     DO +E2E_TEST_FROM_BUILD --test=$test --compose_file=$compose_file --enable_gas=$enable_gas --debug=$debug
   END
 
+UPLOAD_LOGS:
+  FUNCTION
+  ARG e2e_mode=cache
+  ARG PULL_REQUEST
+  ARG BRANCH
+  ARG COMMIT_HASH
+  LOCALLY
+  LET COMMIT_HASH="${COMMIT_HASH:-$(git rev-parse HEAD)}"
+  FROM ../../+scripts
+  COPY ./log /usr/var/log
+  ENV PULL_REQUEST=$PULL_REQUEST
+  ENV BRANCH=$BRANCH
+  ENV COMMIT_HASH=$COMMIT_HASH
+  ENV E2E_MODE=$e2e_mode
+  RUN --secret AWS_ACCESS_KEY_ID --secret AWS_SECRET_ACCESS_KEY /usr/src/scripts/logs/upload_logs_to_s3.sh /usr/var/log
+
 # Define e2e tests
 e2e-tests:
   FROM ../+end-to-end
@@ -124,24 +146,34 @@ guides-dapp-testing:
 
 # TODO intermittent failure
 # guides-sample-dapp:
-#  ARG e2e_mode=local
-#  DO +E2E_TEST --test=sample-dapp --e2e_mode=$e2e_mode
+#   ARG e2e_mode=local
+#   DO +E2E_TEST --test=sample-dapp --e2e_mode=$e2e_mode
 
 # TODO currently hangs for hour+
 # guides-up-quick-start:
 #   ARG e2e_mode=local
 #   DO +E2E_TEST --test=guides/up_quick_start.test.ts --e2e_mode=$e2e_mode
 
-# TODO hanging
-# bench-publish-rollup:
-#   ARG e2e_mode=local
-#   DO +E2E_TEST --test=benchmarks/bench_publish_rollup.test.ts --debug="aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees" --e2e_mode=$e2e_mode  --compose_file=./scripts/docker-compose-no-sandbox.yml
+bench-publish-rollup:
+  ARG e2e_mode=local
+  ARG PULL_REQUEST
+  ARG BRANCH
+  ARG COMMIT_HASH
+  DO +E2E_TEST --test=benchmarks/bench_publish_rollup.test.ts --debug="aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees" --e2e_mode=$e2e_mode --compose_file=./scripts/docker-compose-no-sandbox.yml
+  DO +UPLOAD_LOGS --e2e_mode=$e2e_mode --PULL_REQUEST=$PULL_REQUEST --BRANCH=$BRANCH --COMMIT_HASH=$COMMIT_HASH
 
-# TODO hanging
-# bench-process-history:
-#   ARG e2e_mode=local
-#   DO +E2E_TEST --test=benchmarks/bench_process_history.test.ts --debug="aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees" --e2e_mode=$e2e_mode  --compose_file=./scripts/docker-compose-no-sandbox.yml
+bench-process-history:
+  ARG e2e_mode=local
+  ARG PULL_REQUEST
+  ARG BRANCH
+  ARG COMMIT_HASH
+  DO +E2E_TEST --test=benchmarks/bench_process_history.test.ts --debug="aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees" --e2e_mode=$e2e_mode --compose_file=./scripts/docker-compose-no-sandbox.yml
+  DO +UPLOAD_LOGS --e2e_mode=$e2e_mode --PULL_REQUEST=$PULL_REQUEST --BRANCH=$BRANCH --COMMIT_HASH=$COMMIT_HASH
 
-# bench-tx-size:
-#   ARG e2e_mode=local
-#   DO +E2E_TEST --test=benchmarks/bench_tx_size_fees.test.ts --debug="aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees" --e2e_mode=$e2e_mode --enable_gas=1 --compose_file=./scripts/docker-compose-no-sandbox.yml
+bench-tx-size:
+  ARG e2e_mode=local
+  ARG PULL_REQUEST
+  ARG BRANCH
+  ARG COMMIT_HASH
+  DO +E2E_TEST --test=benchmarks/bench_tx_size_fees.test.ts --debug="aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees" --e2e_mode=$e2e_mode --enable_gas=1 --compose_file=./scripts/docker-compose-no-sandbox.yml
+  DO +UPLOAD_LOGS --e2e_mode=$e2e_mode --PULL_REQUEST=$PULL_REQUEST --BRANCH=$BRANCH --COMMIT_HASH=$COMMIT_HASH
diff --git a/yarn-project/scripts/Earthfile b/yarn-project/scripts/Earthfile
new file mode 100644
index 000000000000..37aba4bda90c
--- /dev/null
+++ b/yarn-project/scripts/Earthfile
@@ -0,0 +1,70 @@
+VERSION 0.8
+FROM node:18.19.0
+
+build:
+  FROM ../+scripts-prod
+  RUN apt-get update && apt-get install awscli -y
+  COPY ../../+scripts/scripts /usr/src/scripts
+  WORKDIR /usr/src
+
+download-logs:
+  # Downloads logs for the current PR and saves them as an artifact, to be consumed by bench-aggregate.
+  ARG COMMIT_HASH
+  ARG PULL_REQUEST
+  ARG BRANCH
+  FROM +build
+  LET LOG_FOLDER=/usr/var/logs
+  LET BENCH_FOLDER=/usr/var/bench
+  ENV LOG_FOLDER=$LOG_FOLDER
+  ENV BENCH_FOLDER=$BENCH_FOLDER
+  ENV COMMIT_HASH=$COMMIT_HASH
+  ENV PULL_REQUEST=$PULL_REQUEST
+  ENV BRANCH=$BRANCH
+  RUN --secret AWS_ACCESS_KEY_ID --secret AWS_SECRET_ACCESS_KEY ./scripts/logs/download_logs_from_s3.sh 
+  SAVE ARTIFACT $LOG_FOLDER logs
+
+bench-aggregate:
+  # Copies logs downloaded from download-logs and aggregates them using bench-aggregate.
+  # No aggregation is done if there is a log missing from the benchmark jobs.
+  ARG COMMIT_HASH
+  ARG PULL_REQUEST
+  ARG BRANCH
+  FROM +build
+  LET LOG_FOLDER=/usr/var/logs
+  LET BENCH_FOLDER=/usr/var/bench
+  ENV LOG_FOLDER=$LOG_FOLDER
+  ENV BENCH_FOLDER=$BENCH_FOLDER
+  ENV COMMIT_HASH=$COMMIT_HASH
+  ENV PULL_REQUEST=$PULL_REQUEST
+  ENV BRANCH=$BRANCH
+  COPY +download-logs/logs $LOG_FOLDER
+  RUN --secret AWS_ACCESS_KEY_ID --secret AWS_SECRET_ACCESS_KEY \
+    ./scripts/logs/check_logs_for_benchmark.sh \
+    && ((cd /usr/src/yarn-project/scripts && yarn bench-aggregate) && ./scripts/logs/upload_aggregated_benchmarks_to_s3.sh) \
+    || (echo "Not all log files from benchmark jobs found"; mkdir -p $BENCH_FOLDER)
+  SAVE ARTIFACT $BENCH_FOLDER bench
+
+bench-comment:
+  # Use the scripts image to run bench comment after loading the benchmark from bench-aggregate.
+  # Requires base-benchmark to be downloaded outside of this target. Note we cannot run it within
+  # an Earthly container because it needs access to the .git folder, and we cannot run it with a
+  # LOCALLY statement because Earthly does not support secrets when running locally (and we need)
+  # the AWS access keys to access S3. This step is then manually run in the ci.yml.
+  ARG COMMIT_HASH
+  ARG PULL_REQUEST
+  ARG BRANCH
+  FROM +build
+  LET BENCH_FOLDER=/usr/var/bench
+  ENV BENCH_FOLDER=$BENCH_FOLDER
+  ENV COMMIT_HASH=$COMMIT_HASH
+  ENV PULL_REQUEST=$PULL_REQUEST
+  ENV PR_NUMBER=$PULL_REQUEST
+  ENV BRANCH=$BRANCH
+  COPY ./bench $BENCH_FOLDER/
+  COPY +bench-aggregate/bench $BENCH_FOLDER
+  RUN echo "Bench folder contents $(ls $BENCH_FOLDER)"
+  RUN --secret AZTEC_BOT_COMMENTER_GITHUB_TOKEN \
+    [ -f $BENCH_FOLDER/benchmark.json ] \
+      && (cd /usr/src/yarn-project/scripts && AZTEC_BOT_COMMENTER_GITHUB_TOKEN=$AZTEC_BOT_COMMENTER_GITHUB_TOKEN yarn bench-comment) \
+      || echo "No benchmark file found in $BENCH_FOLDER"
+  
\ No newline at end of file

From c702688435d66436d0ee0d66c32aba99392d719d Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Tue, 30 Apr 2024 18:18:51 -0500
Subject: [PATCH 22/42] chore: ebs attach robustness (#6108)

---
 .github/workflows/setup-runner.yml |  4 ++--
 scripts/attach_ebs_cache.sh        | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/setup-runner.yml b/.github/workflows/setup-runner.yml
index a29ccc6d5e5f..dff8f10cff3e 100644
--- a/.github/workflows/setup-runner.yml
+++ b/.github/workflows/setup-runner.yml
@@ -78,11 +78,11 @@ jobs:
         run: |
           # Compare the checked-out CI configuration files with the reference files
           if ! git diff --no-index .github/workflows/ci.yml merge-commit-pipeline-files/.github/workflows/ci.yml; then
-            echo "Error: ci.yml changes in master (or PR base). Please merge these changes."
+            echo "Error: ci.yml changes in master (or PR base). Please merge these changes. This is to prevent surprises from Github Action's merge behavior."
             exit 1
           fi
           if ! git diff --no-index .github/workflows/setup-runner.yml merge-commit-pipeline-files/.github/workflows/setup-runner.yml; then
-            echo "Error: setup-runner.yml changes in master (or PR base). Please merge these changes."
+            echo "Error: setup-runner.yml changes in master (or PR base). Please merge these changes. This is to prevent surprises from Github Action's merge behavior."
             exit 1
           fi
 
diff --git a/scripts/attach_ebs_cache.sh b/scripts/attach_ebs_cache.sh
index 94d5838ca39b..76b348fe6af4 100755
--- a/scripts/attach_ebs_cache.sh
+++ b/scripts/attach_ebs_cache.sh
@@ -14,8 +14,20 @@ if [ -f /run/.ebs-cache-mounted ] ; then
   WAIT_INTERVAL=10  # Interval between checks in seconds
   elapsed_time=0
   # Check for existing mount, assume we can continue if existing
+
   while ! mount | grep -q "/var/lib/docker type ext4"; do
-    echo "Someone already marked as mounting, waiting for them..."
+    echo "Someone already marked as mounting, terminating any stopped instances and waiting..."
+    # Identify and terminate instances in 'STOPPED' state that are using this volume
+    STOPPED_INSTANCES=$(aws ec2 describe-instances \
+      --region $REGION \
+      --filters "Name=instance-state-name,Values=stopped" "Name=block-device-mapping.volume-id,Values=$VOLUME_ID" \
+      --query "Reservations[*].Instances[*].InstanceId" \
+      --output text)
+
+    for instance in $STOPPED_INSTANCES; do
+      echo "Terminating instance $instance"
+      aws ec2 terminate-instances --instance-ids $instance
+    done
     if [ $elapsed_time -ge $MAX_WAIT_TIME ]; then
       echo "Cache mount did not become available within $MAX_WAIT_TIME seconds... race condition?"
       exit 1

From aa3eefac5e7b21fad06a975b0b0a523ac7af7b3d Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Tue, 30 Apr 2024 18:31:17 -0500
Subject: [PATCH 23/42] chore: bump bench-tx-size timeout (#6109)

---
 .../end-to-end/src/benchmarks/bench_tx_size_fees.test.ts        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn-project/end-to-end/src/benchmarks/bench_tx_size_fees.test.ts b/yarn-project/end-to-end/src/benchmarks/bench_tx_size_fees.test.ts
index d20aa63ad5a9..19a2ceefbd63 100644
--- a/yarn-project/end-to-end/src/benchmarks/bench_tx_size_fees.test.ts
+++ b/yarn-project/end-to-end/src/benchmarks/bench_tx_size_fees.test.ts
@@ -16,7 +16,7 @@ import { jest } from '@jest/globals';
 
 import { publicDeployAccounts, setup } from '../fixtures/utils.js';
 
-jest.setTimeout(50_000);
+jest.setTimeout(100_000);
 
 describe('benchmarks/tx_size_fees', () => {
   let aliceWallet: AccountWalletWithSecretKey;

From 5297b5bb2de63003fdb97b9ad75e06c485327b1c Mon Sep 17 00:00:00 2001
From: Innokentii Sennovskii <isennovskiy@gmail.com>
Date: Wed, 1 May 2024 01:35:11 +0100
Subject: [PATCH 24/42] feat: Pippenger benchmarks compatible with wasmtime
 (#6095)

Added pippenger benchmarks

```
--------------------------------------------------------------------
Benchmark                          Time             CPU   Iterations
--------------------------------------------------------------------
pippenger/16/iterations:5     133089 us   1.3309e+11 us            5
pippenger/17/iterations:5     255069 us   2.5507e+11 us            5
pippenger/18/iterations:5     481599 us   4.8160e+11 us            5
pippenger/19/iterations:5     892886 us   8.9289e+11 us            5
pippenger/20/iterations:5    1706423 us   1.7064e+12 us            5
 */
```
---
 .../benchmark/basics_bench/CMakeLists.txt     |  2 +-
 .../benchmark/basics_bench/basics.bench.cpp   | 48 ++++++++++++++++++-
 2 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/barretenberg/cpp/src/barretenberg/benchmark/basics_bench/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/benchmark/basics_bench/CMakeLists.txt
index 1740ea9ecb6d..3b27b458bc54 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/basics_bench/CMakeLists.txt
+++ b/barretenberg/cpp/src/barretenberg/benchmark/basics_bench/CMakeLists.txt
@@ -1 +1 @@
-barretenberg_module(basics_bench ecc)
\ No newline at end of file
+barretenberg_module(basics_bench ecc srs)
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/basics_bench/basics.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/basics_bench/basics.bench.cpp
index 036146933969..5aa278d66f91 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/basics_bench/basics.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/basics_bench/basics.bench.cpp
@@ -20,9 +20,11 @@
  *      sequential_copy:                        3.3
  *
  */
+#include "barretenberg/commitment_schemes/commitment_key.hpp"
 #include "barretenberg/common/op_count.hpp"
 #include "barretenberg/common/thread.hpp"
 #include "barretenberg/ecc/curves/bn254/bn254.hpp"
+#include "barretenberg/srs/global_crs.hpp"
 #include <benchmark/benchmark.h>
 
 using namespace benchmark;
@@ -304,7 +306,7 @@ void projective_point_doubling(State& state)
  *@details ~50000 ns
  * @param state
  */
-void scalar_multiplication(State& state)
+void scalar_multiplication_bench(State& state)
 {
     numeric::RNG& engine = numeric::get_debug_randomness();
     Curve::Element element = Curve::Element::random_element(&engine);
@@ -364,6 +366,47 @@ void sequential_copy(State& state)
         }
     }
 }
+
+/**
+ * @brief Load srs for pippenger
+ *
+ */
+static void DoPippengerSetup(const benchmark::State&)
+{
+    bb::srs::init_crs_factory("../srs_db/ignition");
+}
+
+/**
+ * @brief Run pippenger benchmarks (can be used with wasmtime)
+ *
+ *@details(Wasmtime) -----------------------------------------------
+Benchmark                          Time             CPU   Iterations
+--------------------------------------------------------------------
+pippenger/16/iterations:5     133089 us   1.3309e+11 us            5
+pippenger/17/iterations:5     255069 us   2.5507e+11 us            5
+pippenger/18/iterations:5     481599 us   4.8160e+11 us            5
+pippenger/19/iterations:5     892886 us   8.9289e+11 us            5
+pippenger/20/iterations:5    1706423 us   1.7064e+12 us            5
+ */
+void pippenger(State& state)
+{
+    numeric::RNG& engine = numeric::get_debug_randomness();
+    for (auto _ : state) {
+        state.PauseTiming();
+        size_t num_cycles = 1 << static_cast<size_t>(state.range(0));
+        Polynomial<Fr> pol(num_cycles);
+        for (size_t i = 0; i < num_cycles; i++) {
+            *(uint256_t*)&pol[i] = engine.get_random_uint256();
+            pol[i].self_reduce_once();
+            pol[i].self_reduce_once();
+            pol[i].self_reduce_once();
+        }
+
+        auto ck = std::make_shared<CommitmentKey<curve::BN254>>(num_cycles);
+        state.ResumeTiming();
+        benchmark::DoNotOptimize(ck->commit(pol));
+    }
+}
 } // namespace
 
 BENCHMARK(parallel_for_field_element_addition)->Unit(kMicrosecond)->DenseRange(0, MAX_REPETITION_LOG);
@@ -377,7 +420,8 @@ BENCHMARK(ff_reduce)->Unit(kMicrosecond)->DenseRange(12, 29);
 BENCHMARK(projective_point_addition)->Unit(kMicrosecond)->DenseRange(12, 22);
 BENCHMARK(projective_point_accidental_doubling)->Unit(kMicrosecond)->DenseRange(12, 22);
 BENCHMARK(projective_point_doubling)->Unit(kMicrosecond)->DenseRange(12, 22);
-BENCHMARK(scalar_multiplication)->Unit(kMicrosecond)->DenseRange(12, 18);
+BENCHMARK(scalar_multiplication_bench)->Unit(kMicrosecond)->DenseRange(12, 18);
 BENCHMARK(cycle_waste)->Unit(kMicrosecond)->DenseRange(20, 30);
 BENCHMARK(sequential_copy)->Unit(kMicrosecond)->DenseRange(20, 25);
+BENCHMARK(pippenger)->Unit(kMicrosecond)->DenseRange(16, 20)->Setup(DoPippengerSetup)->Iterations(5);
 BENCHMARK_MAIN();
\ No newline at end of file

From a5d9062afb6a6dd013b199f2e9ef0c636a3a136a Mon Sep 17 00:00:00 2001
From: AztecBot <tech@aztecprotocol.com>
Date: Wed, 1 May 2024 02:13:20 +0000
Subject: [PATCH 25/42] git subrepo push --branch=master barretenberg

subrepo:
  subdir:   "barretenberg"
  merged:   "e43e6b0a1"
upstream:
  origin:   "https://github.com/AztecProtocol/barretenberg"
  branch:   "master"
  commit:   "e43e6b0a1"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???" [skip ci]
---
 barretenberg/.gitrepo | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/barretenberg/.gitrepo b/barretenberg/.gitrepo
index ee434d12668a..63cb67c57a54 100644
--- a/barretenberg/.gitrepo
+++ b/barretenberg/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/AztecProtocol/barretenberg
 	branch = master
-	commit = 31ec6089135e12bf85240d50bc8bac066918dfa0
-	parent = 1449c338ca79f8d72b71484546aa46ddebb21779
+	commit = e43e6b0a1bd6e46298391ab921fc52d6423317db
+	parent = 5297b5bb2de63003fdb97b9ad75e06c485327b1c
 	method = merge
 	cmdver = 0.4.6

From f0d95f5cfc5654120192d48dddc4803d21dfbbc8 Mon Sep 17 00:00:00 2001
From: AztecBot <tech@aztecprotocol.com>
Date: Wed, 1 May 2024 02:13:44 +0000
Subject: [PATCH 26/42] chore: replace relative paths to noir-protocol-circuits

---
 noir-projects/aztec-nr/aztec/Nargo.toml | 2 +-
 noir-projects/aztec-nr/tests/Nargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/noir-projects/aztec-nr/aztec/Nargo.toml b/noir-projects/aztec-nr/aztec/Nargo.toml
index 7a1f1af58631..78207d329642 100644
--- a/noir-projects/aztec-nr/aztec/Nargo.toml
+++ b/noir-projects/aztec-nr/aztec/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = ">=0.18.0"
 type = "lib"
 
 [dependencies]
-protocol_types = { path = "../../noir-protocol-circuits/crates/types" }
+protocol_types = { git="https://github.com/AztecProtocol/aztec-packages", tag="aztec-packages-v0.36.0", directory="noir-projects/noir-protocol-circuits/crates/types" }
diff --git a/noir-projects/aztec-nr/tests/Nargo.toml b/noir-projects/aztec-nr/tests/Nargo.toml
index 13404b373243..74195275970a 100644
--- a/noir-projects/aztec-nr/tests/Nargo.toml
+++ b/noir-projects/aztec-nr/tests/Nargo.toml
@@ -6,4 +6,4 @@ type = "lib"
 
 [dependencies]
 aztec = { path = "../aztec" }
-protocol_types = { path = "../../noir-protocol-circuits/crates/types" }
+protocol_types = { git="https://github.com/AztecProtocol/aztec-packages", tag="aztec-packages-v0.36.0", directory="noir-projects/noir-protocol-circuits/crates/types" }

From cfb206bc94f23e752cbd695b9c8614fadaa76c7b Mon Sep 17 00:00:00 2001
From: AztecBot <tech@aztecprotocol.com>
Date: Wed, 1 May 2024 02:13:44 +0000
Subject: [PATCH 27/42] git_subrepo.sh: Fix parent in .gitrepo file. [skip ci]

---
 noir-projects/aztec-nr/.gitrepo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/noir-projects/aztec-nr/.gitrepo b/noir-projects/aztec-nr/.gitrepo
index 08320c53a994..e8946ed3f7dd 100644
--- a/noir-projects/aztec-nr/.gitrepo
+++ b/noir-projects/aztec-nr/.gitrepo
@@ -9,4 +9,4 @@
 	commit = a27226a7655c81f7b9f3bc2457eb860100eed9cc
 	method = merge
 	cmdver = 0.4.6
-	parent = bc2e3073176f2fe7f254e83ac082c2fad5e491f0
+	parent = 655bb8f87242b0cab45961b86825ab1db202d705

From 1c305beb2d2104b1594567abc9b7ab178b235e48 Mon Sep 17 00:00:00 2001
From: AztecBot <tech@aztecprotocol.com>
Date: Wed, 1 May 2024 02:13:49 +0000
Subject: [PATCH 28/42] git subrepo push --branch=master noir-projects/aztec-nr

subrepo:
  subdir:   "noir-projects/aztec-nr"
  merged:   "89651d6d9"
upstream:
  origin:   "https://github.com/AztecProtocol/aztec-nr"
  branch:   "master"
  commit:   "89651d6d9"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???" [skip ci]
---
 noir-projects/aztec-nr/.gitrepo         | 4 ++--
 noir-projects/aztec-nr/aztec/Nargo.toml | 2 +-
 noir-projects/aztec-nr/tests/Nargo.toml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/noir-projects/aztec-nr/.gitrepo b/noir-projects/aztec-nr/.gitrepo
index e8946ed3f7dd..31a0272ded44 100644
--- a/noir-projects/aztec-nr/.gitrepo
+++ b/noir-projects/aztec-nr/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/AztecProtocol/aztec-nr
 	branch = master
-	commit = a27226a7655c81f7b9f3bc2457eb860100eed9cc
+	commit = 89651d6d96499fa34f96adb65f88374bdce0736b
 	method = merge
 	cmdver = 0.4.6
-	parent = 655bb8f87242b0cab45961b86825ab1db202d705
+	parent = 9939b11d9842929f55784242cea91af581188bca
diff --git a/noir-projects/aztec-nr/aztec/Nargo.toml b/noir-projects/aztec-nr/aztec/Nargo.toml
index 78207d329642..7a1f1af58631 100644
--- a/noir-projects/aztec-nr/aztec/Nargo.toml
+++ b/noir-projects/aztec-nr/aztec/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = ">=0.18.0"
 type = "lib"
 
 [dependencies]
-protocol_types = { git="https://github.com/AztecProtocol/aztec-packages", tag="aztec-packages-v0.36.0", directory="noir-projects/noir-protocol-circuits/crates/types" }
+protocol_types = { path = "../../noir-protocol-circuits/crates/types" }
diff --git a/noir-projects/aztec-nr/tests/Nargo.toml b/noir-projects/aztec-nr/tests/Nargo.toml
index 74195275970a..13404b373243 100644
--- a/noir-projects/aztec-nr/tests/Nargo.toml
+++ b/noir-projects/aztec-nr/tests/Nargo.toml
@@ -6,4 +6,4 @@ type = "lib"
 
 [dependencies]
 aztec = { path = "../aztec" }
-protocol_types = { git="https://github.com/AztecProtocol/aztec-packages", tag="aztec-packages-v0.36.0", directory="noir-projects/noir-protocol-circuits/crates/types" }
+protocol_types = { path = "../../noir-protocol-circuits/crates/types" }

From cfe1b05b46be55072ada81e54a6eda7ef6fff23f Mon Sep 17 00:00:00 2001
From: PhilWindle <60546371+PhilWindle@users.noreply.github.com>
Date: Wed, 1 May 2024 09:13:38 +0100
Subject: [PATCH 29/42] docs: Yellow paper updates for the parity circuits
 (#6048)

A small yellow paper update for the parity circuits.
---
 .../protocol-specs/rollup-circuits/tree-parity.md    | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/docs/docs/protocol-specs/rollup-circuits/tree-parity.md b/docs/docs/protocol-specs/rollup-circuits/tree-parity.md
index 98d2fc7edf71..77ec759a851f 100644
--- a/docs/docs/protocol-specs/rollup-circuits/tree-parity.md
+++ b/docs/docs/protocol-specs/rollup-circuits/tree-parity.md
@@ -68,13 +68,11 @@ And the `sha_root` which must match the root of the sha256 message tree from the
 The circuit computes the two trees using the same inputs, and then we ensure that the elements of the trees match the inbox later in the [state transitioner](./../l1-smart-contracts/index.md#overview).
 It proves parity of the leaves in the two trees.
 
-
 ```mermaid
 classDiagram
 direction LR
 
 class ParityPublicInputs {
-    aggregation_object: AggregationObject
     sha_root: Fr[2]
     converted_root: Fr
 }
@@ -87,6 +85,7 @@ RootParityInputs *-- RootParityInput: children
 
 class RootParityInput {
     proof: Proof
+    verification_key: VerificationKey
     public_inputs: ParityPublicInputs
 }
 RootParityInput *-- ParityPublicInputs: public_inputs
@@ -95,6 +94,7 @@ class BaseParityInputs {
     msgs: List~Fr[2]~
 }
 ```
+
 The logic of the circuits is quite simple - build both a SHA256 and a snark-friendly tree from the same inputs.
 For optimization purposes, it can be useful to have the layers take more than 2 inputs to increase the task of every layer.
 If each just take 2 inputs, the overhead of recursing through the layers might be higher than the actual work done.
@@ -108,17 +108,15 @@ def base_parity_circuit(inputs: BaseParityInputs) -> ParityPublicInputs:
 
 def root_parity_circuit(inputs: RootParityInputs) -> ParityPublicInputs:
     for msg in inputs.children:
-        assert msg.proof.verify(msg.public_inputs);
+        assert msg.proof.verify(msg.public_inputs, msg.verification_key);
 
     sha_root = MERKLE_TREE(
-      [msg.public_inputs.sha_root for msg in inputs.children], 
+      [msg.public_inputs.sha_root for msg in inputs.children],
       SHA256
     );
     converted_root = MERKLE_TREE(
-      [msg.public_inputs.converted_root for msg in inputs.children], 
+      [msg.public_inputs.converted_root for msg in inputs.children],
       SNARK_FRIENDLY_HASH_FUNCTION
     );
     return ParityPublicInputs(sha_root, converted_root)
 ```
-
-

From 72321f9d3af27f85c92564754d444ac3df1fcad2 Mon Sep 17 00:00:00 2001
From: Charlie Lye <karl.lye@gmail.com>
Date: Wed, 1 May 2024 10:28:32 +0100
Subject: [PATCH 30/42] feat: devbox (#5772)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This introduces a base build image in `./build-images`. The idea is that
this image contains a complete environment to bootstrap aztec-packages.
It's available for both x86 and arm, and thus can be used to have a
stable and consistent development environment on all operating systems
that have docker installed.

The Dockerfile is a multi-stage image with 3 interesting targets:
* `build`: The base build image - this can be used by CI to build any
part of the project. It contains just the tools needed to successfully
bootstrap.
* `devbox`: Extends `build` and includes all sorts of useful developer
tools. This container can be run independently via a
`./build-images/run.sh` script. Vscode can launch it via it's "Dev
Containers" plugin, or github/vscode can launch it within codespaces,
the configuration is at `.devcontainer/dev/devcontainer.json`.
* `sysbox`: Is similar to `devbox` but is designed to be run using
nestybox's sysbox runtime, like internal aztec developers use on
mainframe.

An important thing to note, is that this approach removes all toolchain
installations from bootstrap scripts, as it's expected for the right
things to be available in your PATH (or in the case of wasi-sdk, at
`/opt/wasi-sdk`). The `bootstrap.sh` script now checks all toolchains
are available and the right version at start. You can also run this
command:

```
% ./bootstrap.sh check
Toolchains look good! 🎉
```

If there's an issue, a hint is provided on how to resolve, but the
engineer is encouraged to just use the dev container.

What's currently checked for:
* Utils: `jq`, `parallel`, `awk`, `git`, `curl`.
* `cmake` min 3.24.
* `clang-16`.
* Rust 1.74.
* Wasi SDK 22 at `/opt/wasi-sdk`.
* `forge` and `anvil` at commit `de33b6a`.
* `node` min 18.19.
* `yarn` and `solhint`.

Aztec internal engineers who use sysbox on mainframe, should run a `sudo
halt` at their convenience, wait for the box to restart, and they should
have a setup that passes the above check. If somethings wrong, you may
have some custom configuration in your home dot files that needs
removing. Otherwise contact me.

**Your hostkey to your sysbox may have changed! Get your IP from
`~/.ssh/config` and do an e.g.**
```
ssh-keygen -R 173.26.1.1
```

Other notable changes:
* wasi-sdk is now version 22.0. This means we have a single sdk for both
threaded and unthreaded wasms (they still need to be built independently
however. TODO: Investigate if we can build once and link twice). It's
expected to be installed at `/opt/wasi-sdk`.
* Ensured we're using version 16 of both `clangd` and `clang-format`. We
should always be explicit about the version we're using. We should
probably upgrade to clang/d/format 18 soon as that's what's distributed
in ubuntu noble, and is also what the wasi-sdk uses.
* Update Earthly builds to use noble.
* Some cpp files formatting change with the shift from 15 to 16.
* Removed the `parallel_for` `moody` implementation. Had to update
various bits of threading code to be properly ignored when building non
threaded wasm. Maybe we can just always build the threaded wasm, and
just link it twice with shared memory enable/disabled? Not sure.
* When running the dev container on a mac, with aztec-packages mounted
from the host filesystem, there is a known bug around incremental rust
builds, and fractional file modification timestamps. A script runs after
building noir-repo to normalise these timestamps, if it's detected that
the host is a mac.
* Purge a load of unneeded stuff when building aztec prod image, to
reduce container size. We do similar for end-to-end tests because they
need to be serialized from Earthly to Docker and that's currently slow.
* Simplified some end-to-end Earthly config.
* Removed all test specific timeouts in favour of just launching jest
with a 5m test timeout.
---
 .devcontainer/dev/devcontainer.json           |   33 +-
 .github/workflows/ci-arm.yml                  |   12 +-
 .github/workflows/ci.yml                      |    2 +-
 .vscode/extensions.json                       |    4 +-
 .vscode/settings.json                         |    5 +-
 Earthfile                                     |    7 +-
 avm-transpiler/Earthfile                      |   19 +-
 barretenberg/cpp/CMakePresets.json            |    2 +-
 barretenberg/cpp/Earthfile                    |   83 +-
 barretenberg/cpp/bootstrap.sh                 |    9 +-
 barretenberg/cpp/cmake/threading.cmake        |    2 +-
 .../dockerfiles/Dockerfile.x86_64-linux-clang |    2 +-
 .../Dockerfile.x86_64-linux-clang-assert      |    5 +-
 barretenberg/cpp/format.sh                    |    8 +-
 barretenberg/cpp/scripts/install-wasi-sdk.sh  |    6 +-
 barretenberg/cpp/scripts/strip-wasm.sh        |    4 +-
 barretenberg/cpp/src/CMakeLists.txt           |    3 +-
 .../cpp/src/barretenberg/common/fuzzer.hpp    |   97 +-
 .../common/moody/blockingconcurrentqueue.h    |  561 ---
 .../common/moody/concurrentqueue.h            | 3988 -----------------
 .../common/moody/lightweightsemaphore.h       |  396 --
 .../common/parallel_for_atomic_pool.cpp       |    4 +-
 .../common/parallel_for_moody.cpp             |  103 -
 .../common/parallel_for_mutex_pool.cpp        |    4 +-
 .../barretenberg/common/parallel_for_omp.cpp  |    4 +-
 .../common/parallel_for_queued.cpp            |    4 +-
 .../common/parallel_for_spawning.cpp          |    3 +
 .../cpp/src/barretenberg/common/serialize.hpp |    3 +-
 .../cpp/src/barretenberg/common/thread.hpp    |    7 +-
 .../barretenberg/env/hardware_concurrency.cpp |   10 +
 .../barretenberg/relations/relation_types.hpp |   16 +-
 .../cpp/src/barretenberg/relations/utils.hpp  |    3 +-
 .../circuit_builders/circuit_builders.hpp     |    3 +-
 .../barretenberg/transcript/transcript.hpp    |    6 +-
 barretenberg/cpp/srs_db/Earthfile             |    2 +-
 barretenberg/exports.json                     |    4 +-
 barretenberg/scripts/bindgen.sh               |   12 +-
 barretenberg/scripts/decls_json.py            |    2 +-
 barretenberg/ts/Earthfile                     |    4 +-
 barretenberg/ts/src/barretenberg_api/index.ts |    8 +-
 bootstrap.sh                                  |   99 +-
 build-images/Dockerfile                       |  289 ++
 build-images/Earthfile                        |    5 +
 build-images/Makefile                         |   19 +
 build-images/README.md                        |   27 +
 build-images/entrypoint.sh                    |   22 +
 build-images/environment                      |    3 +
 build-images/home/.gitconfig                  |    2 +
 build-images/home/.npmrc                      |    1 +
 build-images/home/.tmux.conf                  |   67 +
 build-images/home/.zshrc                      |  106 +
 build-images/key-bindings.zsh                 |  120 +
 build-images/run.sh                           |   23 +
 build-system/scripts/setup_env                |    6 +-
 foundry/.gitignore                            |    2 -
 foundry/Earthfile                             |   17 -
 foundry/bootstrap.sh                          |   25 -
 l1-contracts/Dockerfile                       |    6 +-
 l1-contracts/Earthfile                        |   21 +-
 l1-contracts/bootstrap.sh                     |    4 +-
 l1-contracts/package.json                     |   15 -
 noir-projects/Earthfile                       |   20 +-
 noir-projects/bootstrap.sh                    |    4 +-
 noir/Earthfile                                |   13 +-
 noir/scripts/bootstrap_native.sh              |    6 +-
 noir/scripts/bootstrap_packages.sh            |    6 +-
 noir/scripts/fix_incremental_ts.sh            |   12 +
 yarn-project/Earthfile                        |   60 +-
 yarn-project/bootstrap.sh                     |   11 -
 yarn-project/end-to-end/Earthfile             |  113 +-
 yarn-project/end-to-end/package.json          |    2 +-
 yarn-project/end-to-end/package.local.json    |    2 +-
 .../end-to-end/scripts/anvil_kill_wrapper.sh  |    2 +-
 .../benchmarks/bench_process_history.test.ts  |    2 +-
 .../benchmarks/bench_publish_rollup.test.ts   |    2 +-
 .../src/composed/docs_examples.test.ts        |    2 +-
 .../src/composed/e2e_persistence.test.ts      |    8 +-
 .../src/composed/e2e_sandbox_example.test.ts  |    4 +-
 .../composed/integration_l1_publisher.test.ts |    6 +-
 .../end-to-end/src/e2e_2_pxes.test.ts         |    4 +-
 .../src/e2e_account_contracts.test.ts         |    6 +-
 .../end-to-end/src/e2e_authwit.test.ts        |    2 +-
 .../end-to-end/src/e2e_avm_simulator.test.ts  |   10 +-
 .../e2e_blacklist_token_contract/burn.test.ts |    2 +-
 .../minting.test.ts                           |    2 +-
 .../shielding.test.ts                         |    2 +-
 .../transfer_private.test.ts                  |    2 +-
 .../transfer_public.test.ts                   |    2 +-
 .../unshielding.test.ts                       |    2 +-
 .../end-to-end/src/e2e_block_building.test.ts |   16 +-
 .../end-to-end/src/e2e_card_game.test.ts      |   14 +-
 .../end-to-end/src/e2e_cheat_codes.test.ts    |    6 +-
 .../src/e2e_counter_contract.test.ts          |    2 +-
 .../src/e2e_cross_chain_messaging.test.ts     |   10 +-
 .../src/e2e_dapp_subscription.test.ts         |    2 +-
 .../src/e2e_delegate_calls/delegate.test.ts   |    6 +-
 .../contract_class_registration.test.ts       |   26 +-
 .../e2e_deploy_contract/deploy_method.test.ts |    8 +-
 .../src/e2e_deploy_contract/legacy.test.ts    |   10 +-
 .../private_initialization.test.ts            |    2 +-
 .../end-to-end/src/e2e_encryption.test.ts     |    2 +-
 .../src/e2e_escrow_contract.test.ts           |    8 +-
 .../end-to-end/src/e2e_key_registry.test.ts   |    2 +-
 .../src/e2e_lending_contract.test.ts          |    2 +-
 .../src/e2e_max_block_number.test.ts          |    2 +-
 .../e2e_multiple_accounts_1_enc_key.test.ts   |    4 +-
 .../src/e2e_nested_contract.test.ts           |   34 +-
 .../src/e2e_non_contract_account.test.ts      |    6 +-
 .../end-to-end/src/e2e_note_getter.test.ts    |   18 +-
 .../end-to-end/src/e2e_ordering.test.ts       |    2 +-
 .../end-to-end/src/e2e_outbox.test.ts         |    4 +-
 .../e2e_pending_note_hashes_contract.test.ts  |   14 +-
 .../src/e2e_private_voting_contract.test.ts   |    2 +-
 .../e2e_public_to_private_messaging.test.ts   |    4 +-
 .../end-to-end/src/e2e_state_vars.test.ts     |   10 +-
 .../end-to-end/src/e2e_static_calls.test.ts   |   28 +-
 ...akey_e2e_inclusion_proofs_contract.test.ts |    2 +-
 .../src/flakey_e2e_p2p_network.test.ts        |    4 +-
 .../src/guides/dapp_testing.test.ts           |   28 +-
 .../src/guides/up_quick_start.test.ts         |    2 +-
 .../writing_an_account_contract.test.ts       |    4 +-
 yarn-project/end-to-end/src/shared/browser.ts |    8 +-
 .../end-to-end/src/shared/uniswap_l1_l2.ts    |    2 +-
 123 files changed, 1241 insertions(+), 5691 deletions(-)
 delete mode 100644 barretenberg/cpp/src/barretenberg/common/moody/blockingconcurrentqueue.h
 delete mode 100644 barretenberg/cpp/src/barretenberg/common/moody/concurrentqueue.h
 delete mode 100644 barretenberg/cpp/src/barretenberg/common/moody/lightweightsemaphore.h
 delete mode 100644 barretenberg/cpp/src/barretenberg/common/parallel_for_moody.cpp
 create mode 100644 build-images/Dockerfile
 create mode 100644 build-images/Earthfile
 create mode 100755 build-images/Makefile
 create mode 100644 build-images/README.md
 create mode 100755 build-images/entrypoint.sh
 create mode 100644 build-images/environment
 create mode 100644 build-images/home/.gitconfig
 create mode 100644 build-images/home/.npmrc
 create mode 100644 build-images/home/.tmux.conf
 create mode 100644 build-images/home/.zshrc
 create mode 100644 build-images/key-bindings.zsh
 create mode 100755 build-images/run.sh
 delete mode 100644 foundry/.gitignore
 delete mode 100644 foundry/Earthfile
 delete mode 100755 foundry/bootstrap.sh
 delete mode 100644 l1-contracts/package.json
 create mode 100755 noir/scripts/fix_incremental_ts.sh

diff --git a/.devcontainer/dev/devcontainer.json b/.devcontainer/dev/devcontainer.json
index 50354b2b5700..792ffdbc010d 100644
--- a/.devcontainer/dev/devcontainer.json
+++ b/.devcontainer/dev/devcontainer.json
@@ -1,17 +1,22 @@
 {
-  "image": "node:lts-bookworm-slim",
-  "features": {
-    "ghcr.io/devcontainers/features/docker-in-docker:2": {}
+  "name": "Development",
+  "build": {
+    "dockerfile": "../../build-images/Dockerfile",
+    "context": "../../build-images",
+    "target": "devbox"
   },
-  "postCreateCommand": "curl -s install.aztec.network | VERSION=master NON_INTERACTIVE=1 BIN_PATH=/usr/local/bin bash -s",
-  "customizations": {
-    "vscode": {
-      "settings": {},
-      "extensions": [
-        "noir-lang.vscode-noir"
-      ]
-    }
-  },
-  "workspaceMount": "source=${localWorkspaceFolder},target=/root/workspace,type=bind",
-  "workspaceFolder": "/root/workspace"
+  "containerUser": "aztec-dev",
+  // ubuntu:noble is currently not supported.
+  // Can possibly workaround cherry-picking from here:
+  //   https://github.com/devcontainers/features/blob/main/src/docker-in-docker/install.sh
+  //
+  // "image": "aztecprotocol/codespace",
+  // "features": {
+  //   "docker-in-docker": {
+  //     "version": "latest",
+  //     "moby": true,
+  //     "dockerDashComposeVersion": "v1"
+  //   }
+  // },
+  "mounts": ["source=devbox-home,target=/home/aztec-dev,type=volume"]
 }
diff --git a/.github/workflows/ci-arm.yml b/.github/workflows/ci-arm.yml
index aa1d3f26ea76..bcc20694ede7 100644
--- a/.github/workflows/ci-arm.yml
+++ b/.github/workflows/ci-arm.yml
@@ -32,7 +32,10 @@ jobs:
     needs: setup
     runs-on: master-arm
     steps:
-      - {uses: actions/checkout@v4, with: { ref: "${{ github.event.pull_request.head.sha }}"}}
+      - {
+          uses: actions/checkout@v4,
+          with: { ref: "${{ github.event.pull_request.head.sha }}" },
+        }
       - uses: ./.github/ci-setup-action
         with:
           dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
@@ -48,7 +51,10 @@ jobs:
     needs: build
     runs-on: master-arm
     steps:
-      - {uses: actions/checkout@v4, with: { ref: "${{ github.event.pull_request.head.sha }}"}}
+      - {
+          uses: actions/checkout@v4,
+          with: { ref: "${{ github.event.pull_request.head.sha }}" },
+        }
       - uses: ./.github/ci-setup-action
         with:
           dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
@@ -56,7 +62,7 @@ jobs:
       - name: Test
         working-directory: ./yarn-project/end-to-end/
         timeout-minutes: 15
-        run: earthly -P --no-output +uniswap-trade-on-l1-from-l2 --e2e_mode=cache
+        run: earthly -P --no-output +uniswap-trade-on-l1-from-l2
 
   notify:
     needs: [e2e]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 42c9e4fe619a..d9f0f8c5699e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -76,7 +76,7 @@ jobs:
       - name: Test
         working-directory: ./yarn-project/end-to-end/
         timeout-minutes: 25
-        run: earthly-ci -P --secret AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }} --secret AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} --no-output +${{ matrix.test }} --e2e_mode=cache
+        run: earthly-ci -P --secret AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }} --secret AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} --no-output +${{ matrix.test }}
 
   bench-summary:
     needs: e2e
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 988ff79b4751..a872182ad77b 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -37,7 +37,7 @@
     // Displays code coverage report information within vscode
     "ryanluker.vscode-coverage-gutters",
     // Spell checking
-    "streetsidesoftware.code-spell-checker",
+    "streetsidesoftware.code-spell-checker"
     // End C++/Circuits extensions
     ///////////////////////////////////////
   ],
@@ -58,7 +58,7 @@
     // Most features are disabled in `settings.json`
     // which confict with `clangd`
     // Since we ignore GDB, we no longer need this extension
-    "ms-vscode.cpptools",
+    "ms-vscode.cpptools"
     // End C++/Circuits unwanted extensions
     ///////////////////////////////////////
   ]
diff --git a/.vscode/settings.json b/.vscode/settings.json
index ea41bbe2bc22..48a4cde9de80 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -136,7 +136,7 @@
   // Clangd. Note that this setting may be overridden by user settings
   // to the default value "clangd".
   //
-  "clangd.path": "clangd-15",
+  "clangd.path": "clangd-16",
   //
   // C/C++ (should be disabled)
   //
@@ -165,6 +165,5 @@
     "**/target/**": true,
     "**/l1-contracts/lib/**": true,
     "**/barretenberg/cpp/build*/**": true
-  },
-  "cmake.sourceDirectory": "/mnt/user-data/adam/aztec-packages/barretenberg/cpp"
+  }
 }
diff --git a/Earthfile b/Earthfile
index 096ac3bac0df..5a42a251dfd2 100644
--- a/Earthfile
+++ b/Earthfile
@@ -1,5 +1,5 @@
 VERSION 0.8
-FROM ubuntu:lunar
+FROM ubuntu:noble
 
 build-ci:
     BUILD ./avm-transpiler/+build
@@ -16,15 +16,12 @@ build-ci:
     BUILD ./yarn-project/+end-to-end
     BUILD ./yarn-project/+aztec
 
-build-ci-small:
-    BUILD ./yarn-project/end-to-end/+e2e-escrow-contract
-
 build:
     # yarn-project has the entry point to Aztec
     BUILD ./yarn-project/+build
 
 test-end-to-end:
-    BUILD ./yarn-project/end-to-end/+test-all
+    BUILD ./yarn-project/end-to-end+e2e-tests
 
 bench:
   RUN echo hi
diff --git a/avm-transpiler/Earthfile b/avm-transpiler/Earthfile
index b2c77f9b3f95..4c3102dec8c9 100644
--- a/avm-transpiler/Earthfile
+++ b/avm-transpiler/Earthfile
@@ -1,18 +1,17 @@
 VERSION 0.8
 IMPORT ../noir AS noir
-# we rely on noir source, which this image has
-FROM noir+nargo
 
-# move noir contents to /usr/src/noir
-RUN mv /usr/src /noir && mkdir /usr/src && mv /noir /usr/src
-# work in avm-transpiler
-WORKDIR /usr/src/avm-transpiler
+source:
+  # we rely on noir source, which this image has
+  FROM noir+nargo
 
-RUN apt-get update && apt-get install -y git
+  # move noir contents to /usr/src/noir
+  RUN mv /usr/src /noir && mkdir /usr/src && mv /noir /usr/src
+  # work in avm-transpiler
+  WORKDIR /usr/src/avm-transpiler
 
-COPY --dir scripts src Cargo.lock Cargo.toml rust-toolchain.toml .
+  COPY --dir scripts src Cargo.lock Cargo.toml rust-toolchain.toml .
 
-source:
   # for debugging rebuilds
   RUN echo CONTENT HASH $(find . -type f -exec sha256sum {} ';' | sort | sha256sum | awk '{print $1}') | tee .content-hash
 
@@ -21,7 +20,7 @@ build:
     RUN ./scripts/bootstrap_native.sh
     SAVE ARTIFACT target/release/avm-transpiler avm-transpiler
 
-run: 
+run:
     #TODO needed?
     FROM ubuntu:focal
     COPY +build/avm-transpiler /usr/src/avm-transpiler
diff --git a/barretenberg/cpp/CMakePresets.json b/barretenberg/cpp/CMakePresets.json
index 24538c08c0b5..a42cf23517c5 100644
--- a/barretenberg/cpp/CMakePresets.json
+++ b/barretenberg/cpp/CMakePresets.json
@@ -256,7 +256,7 @@
       "generator": "Ninja",
       "toolchainFile": "cmake/toolchains/wasm32-wasi.cmake",
       "environment": {
-        "WASI_SDK_PREFIX": "${sourceDir}/src/wasi-sdk",
+        "WASI_SDK_PREFIX": "/opt/wasi-sdk",
         "CC": "$env{WASI_SDK_PREFIX}/bin/clang",
         "CXX": "$env{WASI_SDK_PREFIX}/bin/clang++",
         "AR": "$env{WASI_SDK_PREFIX}/bin/llvm-ar",
diff --git a/barretenberg/cpp/Earthfile b/barretenberg/cpp/Earthfile
index 346d1be3d07c..e4057ec965cd 100644
--- a/barretenberg/cpp/Earthfile
+++ b/barretenberg/cpp/Earthfile
@@ -1,80 +1,13 @@
 VERSION 0.8
 
-build-base:
-    ARG TARGETARCH
-    FROM --platform=linux/$TARGETARCH ubuntu:lunar
-    RUN apt-get update && apt-get install -y \
-        build-essential \
-        curl \
-        git \
-        cmake \
-        lsb-release \
-        wget \
-        software-properties-common \
-        gnupg \
-        ninja-build \
-        npm \
-        libssl-dev \
-        jq \
-        bash \
-        libstdc++6 \
-        clang-format \
-        clang-16
-
-    IF [ $TARGETARCH = arm64 ]
-        # publish arm after, assumes x86 already exists, becomes multiplatform image
-        SAVE IMAGE --push aztecprotocol/bb-ubuntu-lunar
-        FROM --platform=linux/amd64 aztecprotocol/bb-ubuntu-lunar:x86-latest
-        SAVE IMAGE --push aztecprotocol/bb-ubuntu-lunar
-    ELSE
-        SAVE IMAGE --push aztecprotocol/bb-ubuntu-lunar:x86-latest
-    END
-
-build-wasi-sdk-image:
-    WORKDIR /
-    RUN git clone --recursive https://github.com/WebAssembly/wasi-sdk.git
-    WORKDIR /wasi-sdk
-    RUN git checkout 9389ea5eeec98afc61039683ae92c6147fee9c54
-    ENV NINJA_FLAGS=-v
-    ENV MAKEFLAGS="-j$(nproc)"
-    RUN make build/llvm.BUILT
-    RUN make build/wasi-libc.BUILT
-    RUN make build/compiler-rt.BUILT
-    RUN make build/libcxx.BUILT
-    RUN make build/config.BUILT
-    SAVE ARTIFACT build/install/opt/wasi-sdk
-
-build-wasi-sdk:
-    ARG TARGETARCH
-    # Wrapper just exists share files.
-    FROM scratch
-    WORKDIR /usr/src
-    COPY +get-wasi-sdk-image/wasi-sdk wasi-sdk
-    SAVE ARTIFACT wasi-sdk
-    SAVE IMAGE --push aztecprotocol/cache:wasi-sdk-threads-v21.0-$TARGETARCH
-
-get-wasi-sdk-threads:
-    ARG TARGETARCH
-    # If this is failing, we need to run earthly --push +build-wasi-sdk
-    FROM aztecprotocol/cache:wasi-sdk-threads-v21.0-$TARGETARCH
-    SAVE ARTIFACT wasi-sdk
-
-get-wasi-sdk:
-    # NOTE: currently only works with x86
-    # TODO Align with above
-    FROM +source
-    COPY ./scripts/install-wasi-sdk.sh ./scripts/
-    RUN ./scripts/install-wasi-sdk.sh
-    # TODO better output name to mirror wasi-sdk
-    SAVE ARTIFACT src/wasi-sdk-20.0 wasi-sdk
-
 wasmtime:
-    FROM aztecprotocol/bb-ubuntu-lunar
+    FROM ubuntu:noble
+    RUN apt update && apt install -y curl xz-utils
     RUN curl https://wasmtime.dev/install.sh -sSf | bash
     SAVE ARTIFACT /root/.wasmtime/bin/wasmtime
 
 source:
-    FROM aztecprotocol/bb-ubuntu-lunar
+    FROM ../../build-images+build
     WORKDIR /usr/src/barretenberg
     # cpp source
     COPY --dir src/barretenberg src/CMakeLists.txt src
@@ -106,19 +39,17 @@ preset-wasm:
         FROM +preset-wasm-threads
         SAVE ARTIFACT build/bin
     ELSE
-        COPY +get-wasi-sdk/wasi-sdk src/wasi-sdk
         RUN cmake --preset wasm -Bbuild && cmake --build build --target barretenberg.wasm
-        RUN src/wasi-sdk/bin/llvm-strip ./build/bin/barretenberg.wasm
+        RUN /opt/wasi-sdk/bin/llvm-strip ./build/bin/barretenberg.wasm
         SAVE ARTIFACT build/bin
         SAVE IMAGE --cache-hint
     END
 
 preset-wasm-threads:
     FROM +source
-    COPY +get-wasi-sdk-threads/wasi-sdk src/wasi-sdk
     RUN cmake --preset wasm-threads -Bbuild && cmake --build build --target barretenberg.wasm
     # TODO(https://github.com/AztecProtocol/barretenberg/issues/941) We currently do not strip barretenberg threaded wasm, for stack traces.
-    # RUN src/wasi-sdk/bin/llvm-strip ./build/bin/barretenberg.wasm
+    # RUN /opt/wasi-sdk/bin/llvm-strip ./build/bin/barretenberg.wasm
     SAVE ARTIFACT build/bin
 
 preset-gcc:
@@ -189,7 +120,7 @@ bench-binaries:
 # Runs on the bench image, sent from the builder runner
 bench-ultra-honk:
     BUILD +wasmtime # prefetch
-    FROM +source
+    FROM ubuntu:noble
     COPY --dir +bench-binaries/* .
     # install SRS needed for proving
     COPY --dir ./srs_db/+build/. srs_db
@@ -201,7 +132,7 @@ bench-ultra-honk:
 
 bench-client-ivc:
     BUILD +wasmtime # prefetch
-    FROM +source
+    FROM ubuntu:noble
     COPY --dir +bench-binaries/* .
     # install SRS needed for proving
     COPY --dir ./srs_db/+build/. srs_db
diff --git a/barretenberg/cpp/bootstrap.sh b/barretenberg/cpp/bootstrap.sh
index 2eaafa29571d..a323eb601ccd 100755
--- a/barretenberg/cpp/bootstrap.sh
+++ b/barretenberg/cpp/bootstrap.sh
@@ -31,9 +31,6 @@ fi
 # Download ignition transcripts.
 (cd ./srs_db && ./download_ignition.sh 0)
 
-# Install wasi-sdk.
-./scripts/install-wasi-sdk.sh
-
 # Attempt to just pull artefacts from CI and exit on success.
 [ -n "${USE_CACHE:-}" ] && ./bootstrap_cache.sh && exit
 
@@ -82,7 +79,7 @@ AVAILABLE_MEMORY=0
 case "$(uname)" in
   Linux*)
     # Check available memory on Linux
-    AVAILABLE_MEMORY=$(awk '/MemFree/ { printf $2 }' /proc/meminfo)
+    AVAILABLE_MEMORY=$(awk '/MemTotal/ { printf $2 }' /proc/meminfo)
     ;;
   *)
     echo "Parallel builds not supported on this operating system"
@@ -90,11 +87,11 @@ case "$(uname)" in
 esac
 # This value may be too low.
 # If builds fail with an amount of free memory greater than this value then it should be increased.
-MIN_PARALLEL_BUILD_MEMORY=32000000
+MIN_PARALLEL_BUILD_MEMORY=32854492
 
 if [[ AVAILABLE_MEMORY -lt MIN_PARALLEL_BUILD_MEMORY ]]; then
   echo "System does not have enough memory for parallel builds, falling back to sequential"
-  build_native 
+  build_native
   build_wasm
   build_wasm_threads
 else
diff --git a/barretenberg/cpp/cmake/threading.cmake b/barretenberg/cpp/cmake/threading.cmake
index ff60f240a169..fffffb6f83c7 100644
--- a/barretenberg/cpp/cmake/threading.cmake
+++ b/barretenberg/cpp/cmake/threading.cmake
@@ -4,7 +4,7 @@ if(MULTITHREADING)
     add_link_options(-pthread)
     if(WASM)
         add_compile_options(--target=wasm32-wasi-threads)
-        add_link_options(--target=wasm32-wasi-threads)
+        add_link_options(--target=wasm32-wasi-threads -Wl,--shared-memory)
     endif()
     #add_compile_options(-fsanitize=thread)
     #add_link_options(-fsanitize=thread)
diff --git a/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang b/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang
index 568f0fcd9e48..012cae9403b1 100644
--- a/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang
+++ b/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang
@@ -20,7 +20,7 @@ RUN wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 16
 
 WORKDIR /usr/src/barretenberg/cpp
 COPY . .
-# Build bb binary and targets needed for benchmarking. 
+# Build bb binary and targets needed for benchmarking.
 # Everything else is built as part linux-clang-assert.
 # Benchmark targets want to run without asserts, so get built alongside bb.
 RUN cmake --preset clang16
diff --git a/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-assert b/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-assert
index bef8e3427566..3cff8c5023c6 100644
--- a/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-assert
+++ b/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-assert
@@ -14,10 +14,9 @@ RUN apt update && apt install -y \
   libssl-dev \
   jq \
   bash \
-  libstdc++6 \
-  clang-format
+  libstdc++6
 
-RUN wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 16
+RUN wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 16 && apt install -y clang-format-16
 
 WORKDIR /usr/src/barretenberg/cpp
 COPY . .
diff --git a/barretenberg/cpp/format.sh b/barretenberg/cpp/format.sh
index ae314e96a6f1..4b1b9e7cbd7f 100755
--- a/barretenberg/cpp/format.sh
+++ b/barretenberg/cpp/format.sh
@@ -4,22 +4,22 @@ set -e
 if [ "$1" == "staged" ]; then
   echo Formatting barretenberg staged files...
   for FILE in $(git diff-index --diff-filter=d --relative --cached --name-only HEAD | grep -e '\.\(cpp\|hpp\|tcc\)$'); do
-    clang-format -i $FILE
+    clang-format-16 -i $FILE
     sed -i.bak 's/\r$//' $FILE && rm ${FILE}.bak
     git add $FILE
   done
 elif [ "$1" == "check" ]; then
   for FILE in $(find ./src -iname *.hpp -o -iname *.cpp -o -iname *.tcc | grep -v src/msgpack-c); do
-    clang-format --dry-run --Werror $FILE
+    clang-format-16 --dry-run --Werror $FILE
   done
 elif [ -n "$1" ]; then
   for FILE in $(git diff-index --relative --name-only $1 | grep -e '\.\(cpp\|hpp\|tcc\)$'); do
-    clang-format -i $FILE
+    clang-format-16 -i $FILE
     sed -i.bak 's/\r$//' $FILE && rm ${FILE}.bak
   done
 else
   for FILE in $(find ./src -iname *.hpp -o -iname *.cpp -o -iname *.tcc | grep -v src/msgpack-c); do
-    clang-format -i $FILE
+    clang-format-16 -i $FILE
     sed -i.bak 's/\r$//' $FILE && rm ${FILE}.bak
   done
 fi
diff --git a/barretenberg/cpp/scripts/install-wasi-sdk.sh b/barretenberg/cpp/scripts/install-wasi-sdk.sh
index 22224212170f..650ab723d22a 100755
--- a/barretenberg/cpp/scripts/install-wasi-sdk.sh
+++ b/barretenberg/cpp/scripts/install-wasi-sdk.sh
@@ -35,4 +35,8 @@ else
   curl -s -L https://wasi-sdk.s3.eu-west-2.amazonaws.com/yamt-wasi-sysroot-20.0.threads.tgz | tar zxf -
 fi
 # TODO(https://github.com/AztecProtocol/barretenberg/issues/906): in the future this should use earthly and a 'SAVE ARTIFACT wasi-sdk AS LOCAL wasi-sdk'
-mv wasi-sdk-20.0+threads wasi-sdk
+if [ "$(id -u)" -eq 0 ]; then
+  mv wasi-sdk-20.0+threads /opt/wasi-sdk
+else
+  sudo mv wasi-sdk-20.0+threads /opt/wasi-sdk
+fi
diff --git a/barretenberg/cpp/scripts/strip-wasm.sh b/barretenberg/cpp/scripts/strip-wasm.sh
index 18e3cf78d02b..9d0c4c36cffc 100755
--- a/barretenberg/cpp/scripts/strip-wasm.sh
+++ b/barretenberg/cpp/scripts/strip-wasm.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
-./src/wasi-sdk-20.0/bin/llvm-strip ./build-wasm/bin/barretenberg.wasm
+/opt/wasi-sdk/bin/llvm-strip ./build-wasm/bin/barretenberg.wasm
 # TODO(https://github.com/AztecProtocol/barretenberg/issues/941) We currently do not strip barretenberg threaded wasm, for stack traces.
-# ./src/wasi-sdk-20.0/bin/llvm-strip ./build-wasm-threads/bin/barretenberg.wasm
+# /opt/wasi-sdk/bin/llvm-strip ./build-wasm-threads/bin/barretenberg.wasm
diff --git a/barretenberg/cpp/src/CMakeLists.txt b/barretenberg/cpp/src/CMakeLists.txt
index 57f24f01fdfd..7f7b588c58de 100644
--- a/barretenberg/cpp/src/CMakeLists.txt
+++ b/barretenberg/cpp/src/CMakeLists.txt
@@ -23,8 +23,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     endif()
     if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 18)
         # We target clang18 and need this, eventually warning should be fixed or this will be unconditional.
-        add_compile_options(-Wno-vla-cxx-extension -pthread)
-        add_link_options(-Wl,--shared-memory)
+        add_compile_options(-Wno-vla-cxx-extension)
     endif()
 endif()
 
diff --git a/barretenberg/cpp/src/barretenberg/common/fuzzer.hpp b/barretenberg/cpp/src/barretenberg/common/fuzzer.hpp
index aaa2e71f6764..51e9f2024636 100644
--- a/barretenberg/cpp/src/barretenberg/common/fuzzer.hpp
+++ b/barretenberg/cpp/src/barretenberg/common/fuzzer.hpp
@@ -90,10 +90,10 @@ class FastRandom {
  */
 template <typename T>
 concept SimpleRng = requires(T a) {
-                        {
-                            a.next()
-                            } -> std::convertible_to<uint32_t>;
-                    };
+    {
+        a.next()
+    } -> std::convertible_to<uint32_t>;
+};
 /**
  * @brief Concept for forcing ArgumentSizes to be size_t
  *
@@ -101,27 +101,27 @@ concept SimpleRng = requires(T a) {
  */
 template <typename T>
 concept InstructionArgumentSizes = requires {
-                                       {
-                                           std::make_tuple(T::CONSTANT,
-                                                           T::WITNESS,
-                                                           T::CONSTANT_WITNESS,
-                                                           T::ADD,
-                                                           T::SUBTRACT,
-                                                           T::MULTIPLY,
-                                                           T::DIVIDE,
-                                                           T::ADD_TWO,
-                                                           T::MADD,
-                                                           T::MULT_MADD,
-                                                           T::MSUB_DIV,
-                                                           T::SQR,
-                                                           T::SQR_ADD,
-                                                           T::SUBTRACT_WITH_CONSTRAINT,
-                                                           T::DIVIDE_WITH_CONSTRAINTS,
-                                                           T::SLICE,
-                                                           T::ASSERT_ZERO,
-                                                           T::ASSERT_NOT_ZERO)
-                                           } -> std::same_as<std::tuple<size_t>>;
-                                   };
+    {
+        std::make_tuple(T::CONSTANT,
+                        T::WITNESS,
+                        T::CONSTANT_WITNESS,
+                        T::ADD,
+                        T::SUBTRACT,
+                        T::MULTIPLY,
+                        T::DIVIDE,
+                        T::ADD_TWO,
+                        T::MADD,
+                        T::MULT_MADD,
+                        T::MSUB_DIV,
+                        T::SQR,
+                        T::SQR_ADD,
+                        T::SUBTRACT_WITH_CONSTRAINT,
+                        T::DIVIDE_WITH_CONSTRAINTS,
+                        T::SLICE,
+                        T::ASSERT_ZERO,
+                        T::ASSERT_NOT_ZERO)
+    } -> std::same_as<std::tuple<size_t>>;
+};
 
 /**
  * @brief Concept for Havoc Configurations
@@ -129,13 +129,12 @@ concept InstructionArgumentSizes = requires {
  * @tparam T
  */
 template <typename T>
-concept HavocConfigConstraint =
-    requires {
-        {
-            std::make_tuple(T::GEN_MUTATION_COUNT_LOG, T::GEN_STRUCTURAL_MUTATION_PROBABILITY)
-            } -> std::same_as<std::tuple<size_t>>;
-        T::GEN_MUTATION_COUNT_LOG <= 7;
-    };
+concept HavocConfigConstraint = requires {
+    {
+        std::make_tuple(T::GEN_MUTATION_COUNT_LOG, T::GEN_STRUCTURAL_MUTATION_PROBABILITY)
+    } -> std::same_as<std::tuple<size_t>>;
+    T::GEN_MUTATION_COUNT_LOG <= 7;
+};
 /**
  * @brief Concept specifying the class used by the fuzzer
  *
@@ -143,12 +142,12 @@ concept HavocConfigConstraint =
  */
 template <typename T>
 concept ArithmeticFuzzHelperConstraint = requires {
-                                             typename T::ArgSizes;
-                                             typename T::Instruction;
-                                             typename T::ExecutionState;
-                                             typename T::ExecutionHandler;
-                                             InstructionArgumentSizes<typename T::ArgSizes>;
-                                         };
+    typename T::ArgSizes;
+    typename T::Instruction;
+    typename T::ExecutionState;
+    typename T::ExecutionHandler;
+    InstructionArgumentSizes<typename T::ArgSizes>;
+};
 
 /**
  * @brief Fuzzer uses only composers with check_circuit function
@@ -157,10 +156,10 @@ concept ArithmeticFuzzHelperConstraint = requires {
  */
 template <typename T>
 concept CheckableComposer = requires(T a) {
-                                {
-                                    CircuitChecker::check(a)
-                                    } -> std::same_as<bool>;
-                            };
+    {
+        CircuitChecker::check(a)
+    } -> std::same_as<bool>;
+};
 
 /**
  * @brief The fuzzer can use a postprocessing function that is specific to the type being fuzzed
@@ -171,10 +170,10 @@ concept CheckableComposer = requires(T a) {
  */
 template <typename T, typename Composer, typename Context>
 concept PostProcessingEnabled = requires(Composer composer, Context context) {
-                                    {
-                                        T::postProcess(&composer, context)
-                                        } -> std::same_as<bool>;
-                                };
+    {
+        T::postProcess(&composer, context)
+    } -> std::same_as<bool>;
+};
 
 /**
  * @brief This concept is used when we want to limit the number of executions of certain instructions (for example,
@@ -184,9 +183,9 @@ concept PostProcessingEnabled = requires(Composer composer, Context context) {
  */
 template <typename T>
 concept InstructionWeightsEnabled = requires {
-                                        typename T::InstructionWeights;
-                                        T::InstructionWeights::_LIMIT;
-                                    };
+    typename T::InstructionWeights;
+    T::InstructionWeights::_LIMIT;
+};
 
 /**
  * @brief Mutate the value of a field element
diff --git a/barretenberg/cpp/src/barretenberg/common/moody/blockingconcurrentqueue.h b/barretenberg/cpp/src/barretenberg/common/moody/blockingconcurrentqueue.h
deleted file mode 100644
index 60d3c5ce7255..000000000000
--- a/barretenberg/cpp/src/barretenberg/common/moody/blockingconcurrentqueue.h
+++ /dev/null
@@ -1,561 +0,0 @@
-// Provides an efficient blocking version of moodycamel::ConcurrentQueue.
-// ©2015-2020 Cameron Desrochers. Distributed under the terms of the simplified
-// BSD license, available at the top of concurrentqueue.h.
-// Also dual-licensed under the Boost Software License (see LICENSE.md)
-// Uses Jeff Preshing's semaphore implementation (under the terms of its
-// separate zlib license, see lightweightsemaphore.h).
-
-#pragma once
-
-#include "concurrentqueue.h"
-#include "lightweightsemaphore.h"
-
-#include <type_traits>
-#include <cerrno>
-#include <memory>
-#include <chrono>
-#include <ctime>
-
-namespace moodycamel {
-// This is a blocking version of the queue. It has an almost identical interface to
-// the normal non-blocking version, with the addition of various wait_dequeue() methods
-// and the removal of producer-specific dequeue methods.
-template <typename T, typename Traits = ConcurrentQueueDefaultTraits> class BlockingConcurrentQueue {
-  private:
-    typedef ::moodycamel::ConcurrentQueue<T, Traits> ConcurrentQueue;
-    typedef ::moodycamel::LightweightSemaphore LightweightSemaphore;
-
-  public:
-    typedef typename ConcurrentQueue::producer_token_t producer_token_t;
-    typedef typename ConcurrentQueue::consumer_token_t consumer_token_t;
-
-    typedef typename ConcurrentQueue::index_t index_t;
-    typedef typename ConcurrentQueue::size_t size_t;
-    typedef typename std::make_signed<size_t>::type ssize_t;
-
-    static const size_t BLOCK_SIZE = ConcurrentQueue::BLOCK_SIZE;
-    static const size_t EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD =
-        ConcurrentQueue::EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD;
-    static const size_t EXPLICIT_INITIAL_INDEX_SIZE = ConcurrentQueue::EXPLICIT_INITIAL_INDEX_SIZE;
-    static const size_t IMPLICIT_INITIAL_INDEX_SIZE = ConcurrentQueue::IMPLICIT_INITIAL_INDEX_SIZE;
-    static const size_t INITIAL_IMPLICIT_PRODUCER_HASH_SIZE = ConcurrentQueue::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE;
-    static const std::uint32_t EXPLICIT_CONSUMER_CONSUMPTION_QUOTA_BEFORE_ROTATE =
-        ConcurrentQueue::EXPLICIT_CONSUMER_CONSUMPTION_QUOTA_BEFORE_ROTATE;
-    static const size_t MAX_SUBQUEUE_SIZE = ConcurrentQueue::MAX_SUBQUEUE_SIZE;
-
-  public:
-    // Creates a queue with at least `capacity` element slots; note that the
-    // actual number of elements that can be inserted without additional memory
-    // allocation depends on the number of producers and the block size (e.g. if
-    // the block size is equal to `capacity`, only a single block will be allocated
-    // up-front, which means only a single producer will be able to enqueue elements
-    // without an extra allocation -- blocks aren't shared between producers).
-    // This method is not thread safe -- it is up to the user to ensure that the
-    // queue is fully constructed before it starts being used by other threads (this
-    // includes making the memory effects of construction visible, possibly with a
-    // memory barrier).
-    explicit BlockingConcurrentQueue(size_t capacity = 6 * BLOCK_SIZE)
-        : inner(capacity)
-        , sema(create<LightweightSemaphore, ssize_t, int>(0, (int)Traits::MAX_SEMA_SPINS),
-               &BlockingConcurrentQueue::template destroy<LightweightSemaphore>)
-    {
-        assert(reinterpret_cast<ConcurrentQueue*>((BlockingConcurrentQueue*)1) ==
-                   &((BlockingConcurrentQueue*)1)->inner &&
-               "BlockingConcurrentQueue must have ConcurrentQueue as its first member");
-        if (!sema) {
-            MOODYCAMEL_THROW(std::bad_alloc());
-        }
-    }
-
-    BlockingConcurrentQueue(size_t minCapacity, size_t maxExplicitProducers, size_t maxImplicitProducers)
-        : inner(minCapacity, maxExplicitProducers, maxImplicitProducers)
-        , sema(create<LightweightSemaphore, ssize_t, int>(0, (int)Traits::MAX_SEMA_SPINS),
-               &BlockingConcurrentQueue::template destroy<LightweightSemaphore>)
-    {
-        assert(reinterpret_cast<ConcurrentQueue*>((BlockingConcurrentQueue*)1) ==
-                   &((BlockingConcurrentQueue*)1)->inner &&
-               "BlockingConcurrentQueue must have ConcurrentQueue as its first member");
-        if (!sema) {
-            MOODYCAMEL_THROW(std::bad_alloc());
-        }
-    }
-
-    // Disable copying and copy assignment
-    BlockingConcurrentQueue(BlockingConcurrentQueue const&) MOODYCAMEL_DELETE_FUNCTION;
-    BlockingConcurrentQueue& operator=(BlockingConcurrentQueue const&) MOODYCAMEL_DELETE_FUNCTION;
-
-    // Moving is supported, but note that it is *not* a thread-safe operation.
-    // Nobody can use the queue while it's being moved, and the memory effects
-    // of that move must be propagated to other threads before they can use it.
-    // Note: When a queue is moved, its tokens are still valid but can only be
-    // used with the destination queue (i.e. semantically they are moved along
-    // with the queue itself).
-    BlockingConcurrentQueue(BlockingConcurrentQueue&& other) MOODYCAMEL_NOEXCEPT : inner(std::move(other.inner)),
-                                                                                   sema(std::move(other.sema))
-    {}
-
-    inline BlockingConcurrentQueue& operator=(BlockingConcurrentQueue&& other) MOODYCAMEL_NOEXCEPT
-    {
-        return swap_internal(other);
-    }
-
-    // Swaps this queue's state with the other's. Not thread-safe.
-    // Swapping two queues does not invalidate their tokens, however
-    // the tokens that were created for one queue must be used with
-    // only the swapped queue (i.e. the tokens are tied to the
-    // queue's movable state, not the object itself).
-    inline void swap(BlockingConcurrentQueue& other) MOODYCAMEL_NOEXCEPT { swap_internal(other); }
-
-  private:
-    BlockingConcurrentQueue& swap_internal(BlockingConcurrentQueue& other)
-    {
-        if (this == &other) {
-            return *this;
-        }
-
-        inner.swap(other.inner);
-        sema.swap(other.sema);
-        return *this;
-    }
-
-  public:
-    // Enqueues a single item (by copying it).
-    // Allocates memory if required. Only fails if memory allocation fails (or implicit
-    // production is disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE is 0,
-    // or Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-    // Thread-safe.
-    inline bool enqueue(T const& item)
-    {
-        if ((details::likely)(inner.enqueue(item))) {
-            sema->signal();
-            return true;
-        }
-        return false;
-    }
-
-    // Enqueues a single item (by moving it, if possible).
-    // Allocates memory if required. Only fails if memory allocation fails (or implicit
-    // production is disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE is 0,
-    // or Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-    // Thread-safe.
-    inline bool enqueue(T&& item)
-    {
-        if ((details::likely)(inner.enqueue(std::move(item)))) {
-            sema->signal();
-            return true;
-        }
-        return false;
-    }
-
-    // Enqueues a single item (by copying it) using an explicit producer token.
-    // Allocates memory if required. Only fails if memory allocation fails (or
-    // Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-    // Thread-safe.
-    inline bool enqueue(producer_token_t const& token, T const& item)
-    {
-        if ((details::likely)(inner.enqueue(token, item))) {
-            sema->signal();
-            return true;
-        }
-        return false;
-    }
-
-    // Enqueues a single item (by moving it, if possible) using an explicit producer token.
-    // Allocates memory if required. Only fails if memory allocation fails (or
-    // Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-    // Thread-safe.
-    inline bool enqueue(producer_token_t const& token, T&& item)
-    {
-        if ((details::likely)(inner.enqueue(token, std::move(item)))) {
-            sema->signal();
-            return true;
-        }
-        return false;
-    }
-
-    // Enqueues several items.
-    // Allocates memory if required. Only fails if memory allocation fails (or
-    // implicit production is disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE
-    // is 0, or Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-    // Note: Use std::make_move_iterator if the elements should be moved instead of copied.
-    // Thread-safe.
-    template <typename It> inline bool enqueue_bulk(It itemFirst, size_t count)
-    {
-        if ((details::likely)(inner.enqueue_bulk(std::forward<It>(itemFirst), count))) {
-            sema->signal((LightweightSemaphore::ssize_t)(ssize_t)count);
-            return true;
-        }
-        return false;
-    }
-
-    // Enqueues several items using an explicit producer token.
-    // Allocates memory if required. Only fails if memory allocation fails
-    // (or Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-    // Note: Use std::make_move_iterator if the elements should be moved
-    // instead of copied.
-    // Thread-safe.
-    template <typename It> inline bool enqueue_bulk(producer_token_t const& token, It itemFirst, size_t count)
-    {
-        if ((details::likely)(inner.enqueue_bulk(token, std::forward<It>(itemFirst), count))) {
-            sema->signal((LightweightSemaphore::ssize_t)(ssize_t)count);
-            return true;
-        }
-        return false;
-    }
-
-    // Enqueues a single item (by copying it).
-    // Does not allocate memory. Fails if not enough room to enqueue (or implicit
-    // production is disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE
-    // is 0).
-    // Thread-safe.
-    inline bool try_enqueue(T const& item)
-    {
-        if (inner.try_enqueue(item)) {
-            sema->signal();
-            return true;
-        }
-        return false;
-    }
-
-    // Enqueues a single item (by moving it, if possible).
-    // Does not allocate memory (except for one-time implicit producer).
-    // Fails if not enough room to enqueue (or implicit production is
-    // disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE is 0).
-    // Thread-safe.
-    inline bool try_enqueue(T&& item)
-    {
-        if (inner.try_enqueue(std::move(item))) {
-            sema->signal();
-            return true;
-        }
-        return false;
-    }
-
-    // Enqueues a single item (by copying it) using an explicit producer token.
-    // Does not allocate memory. Fails if not enough room to enqueue.
-    // Thread-safe.
-    inline bool try_enqueue(producer_token_t const& token, T const& item)
-    {
-        if (inner.try_enqueue(token, item)) {
-            sema->signal();
-            return true;
-        }
-        return false;
-    }
-
-    // Enqueues a single item (by moving it, if possible) using an explicit producer token.
-    // Does not allocate memory. Fails if not enough room to enqueue.
-    // Thread-safe.
-    inline bool try_enqueue(producer_token_t const& token, T&& item)
-    {
-        if (inner.try_enqueue(token, std::move(item))) {
-            sema->signal();
-            return true;
-        }
-        return false;
-    }
-
-    // Enqueues several items.
-    // Does not allocate memory (except for one-time implicit producer).
-    // Fails if not enough room to enqueue (or implicit production is
-    // disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE is 0).
-    // Note: Use std::make_move_iterator if the elements should be moved
-    // instead of copied.
-    // Thread-safe.
-    template <typename It> inline bool try_enqueue_bulk(It itemFirst, size_t count)
-    {
-        if (inner.try_enqueue_bulk(std::forward<It>(itemFirst), count)) {
-            sema->signal((LightweightSemaphore::ssize_t)(ssize_t)count);
-            return true;
-        }
-        return false;
-    }
-
-    // Enqueues several items using an explicit producer token.
-    // Does not allocate memory. Fails if not enough room to enqueue.
-    // Note: Use std::make_move_iterator if the elements should be moved
-    // instead of copied.
-    // Thread-safe.
-    template <typename It> inline bool try_enqueue_bulk(producer_token_t const& token, It itemFirst, size_t count)
-    {
-        if (inner.try_enqueue_bulk(token, std::forward<It>(itemFirst), count)) {
-            sema->signal((LightweightSemaphore::ssize_t)(ssize_t)count);
-            return true;
-        }
-        return false;
-    }
-
-    // Attempts to dequeue from the queue.
-    // Returns false if all producer streams appeared empty at the time they
-    // were checked (so, the queue is likely but not guaranteed to be empty).
-    // Never allocates. Thread-safe.
-    template <typename U> inline bool try_dequeue(U& item)
-    {
-        if (sema->tryWait()) {
-            while (!inner.try_dequeue(item)) {
-                continue;
-            }
-            return true;
-        }
-        return false;
-    }
-
-    // Attempts to dequeue from the queue using an explicit consumer token.
-    // Returns false if all producer streams appeared empty at the time they
-    // were checked (so, the queue is likely but not guaranteed to be empty).
-    // Never allocates. Thread-safe.
-    template <typename U> inline bool try_dequeue(consumer_token_t& token, U& item)
-    {
-        if (sema->tryWait()) {
-            while (!inner.try_dequeue(token, item)) {
-                continue;
-            }
-            return true;
-        }
-        return false;
-    }
-
-    // Attempts to dequeue several elements from the queue.
-    // Returns the number of items actually dequeued.
-    // Returns 0 if all producer streams appeared empty at the time they
-    // were checked (so, the queue is likely but not guaranteed to be empty).
-    // Never allocates. Thread-safe.
-    template <typename It> inline size_t try_dequeue_bulk(It itemFirst, size_t max)
-    {
-        size_t count = 0;
-        max = (size_t)sema->tryWaitMany((LightweightSemaphore::ssize_t)(ssize_t)max);
-        while (count != max) {
-            count += inner.template try_dequeue_bulk<It&>(itemFirst, max - count);
-        }
-        return count;
-    }
-
-    // Attempts to dequeue several elements from the queue using an explicit consumer token.
-    // Returns the number of items actually dequeued.
-    // Returns 0 if all producer streams appeared empty at the time they
-    // were checked (so, the queue is likely but not guaranteed to be empty).
-    // Never allocates. Thread-safe.
-    template <typename It> inline size_t try_dequeue_bulk(consumer_token_t& token, It itemFirst, size_t max)
-    {
-        size_t count = 0;
-        max = (size_t)sema->tryWaitMany((LightweightSemaphore::ssize_t)(ssize_t)max);
-        while (count != max) {
-            count += inner.template try_dequeue_bulk<It&>(token, itemFirst, max - count);
-        }
-        return count;
-    }
-
-    // Blocks the current thread until there's something to dequeue, then
-    // dequeues it.
-    // Never allocates. Thread-safe.
-    template <typename U> inline void wait_dequeue(U& item)
-    {
-        while (!sema->wait()) {
-            continue;
-        }
-        while (!inner.try_dequeue(item)) {
-            continue;
-        }
-    }
-
-    // Blocks the current thread until either there's something to dequeue
-    // or the timeout (specified in microseconds) expires. Returns false
-    // without setting `item` if the timeout expires, otherwise assigns
-    // to `item` and returns true.
-    // Using a negative timeout indicates an indefinite timeout,
-    // and is thus functionally equivalent to calling wait_dequeue.
-    // Never allocates. Thread-safe.
-    template <typename U> inline bool wait_dequeue_timed(U& item, std::int64_t timeout_usecs)
-    {
-        if (!sema->wait(timeout_usecs)) {
-            return false;
-        }
-        while (!inner.try_dequeue(item)) {
-            continue;
-        }
-        return true;
-    }
-
-    // Blocks the current thread until either there's something to dequeue
-    // or the timeout expires. Returns false without setting `item` if the
-    // timeout expires, otherwise assigns to `item` and returns true.
-    // Never allocates. Thread-safe.
-    template <typename U, typename Rep, typename Period>
-    inline bool wait_dequeue_timed(U& item, std::chrono::duration<Rep, Period> const& timeout)
-    {
-        return wait_dequeue_timed(item, std::chrono::duration_cast<std::chrono::microseconds>(timeout).count());
-    }
-
-    // Blocks the current thread until there's something to dequeue, then
-    // dequeues it using an explicit consumer token.
-    // Never allocates. Thread-safe.
-    template <typename U> inline void wait_dequeue(consumer_token_t& token, U& item)
-    {
-        while (!sema->wait()) {
-            continue;
-        }
-        while (!inner.try_dequeue(token, item)) {
-            continue;
-        }
-    }
-
-    // Blocks the current thread until either there's something to dequeue
-    // or the timeout (specified in microseconds) expires. Returns false
-    // without setting `item` if the timeout expires, otherwise assigns
-    // to `item` and returns true.
-    // Using a negative timeout indicates an indefinite timeout,
-    // and is thus functionally equivalent to calling wait_dequeue.
-    // Never allocates. Thread-safe.
-    template <typename U> inline bool wait_dequeue_timed(consumer_token_t& token, U& item, std::int64_t timeout_usecs)
-    {
-        if (!sema->wait(timeout_usecs)) {
-            return false;
-        }
-        while (!inner.try_dequeue(token, item)) {
-            continue;
-        }
-        return true;
-    }
-
-    // Blocks the current thread until either there's something to dequeue
-    // or the timeout expires. Returns false without setting `item` if the
-    // timeout expires, otherwise assigns to `item` and returns true.
-    // Never allocates. Thread-safe.
-    template <typename U, typename Rep, typename Period>
-    inline bool wait_dequeue_timed(consumer_token_t& token, U& item, std::chrono::duration<Rep, Period> const& timeout)
-    {
-        return wait_dequeue_timed(token, item, std::chrono::duration_cast<std::chrono::microseconds>(timeout).count());
-    }
-
-    // Attempts to dequeue several elements from the queue.
-    // Returns the number of items actually dequeued, which will
-    // always be at least one (this method blocks until the queue
-    // is non-empty) and at most max.
-    // Never allocates. Thread-safe.
-    template <typename It> inline size_t wait_dequeue_bulk(It itemFirst, size_t max)
-    {
-        size_t count = 0;
-        max = (size_t)sema->waitMany((LightweightSemaphore::ssize_t)(ssize_t)max);
-        while (count != max) {
-            count += inner.template try_dequeue_bulk<It&>(itemFirst, max - count);
-        }
-        return count;
-    }
-
-    // Attempts to dequeue several elements from the queue.
-    // Returns the number of items actually dequeued, which can
-    // be 0 if the timeout expires while waiting for elements,
-    // and at most max.
-    // Using a negative timeout indicates an indefinite timeout,
-    // and is thus functionally equivalent to calling wait_dequeue_bulk.
-    // Never allocates. Thread-safe.
-    template <typename It> inline size_t wait_dequeue_bulk_timed(It itemFirst, size_t max, std::int64_t timeout_usecs)
-    {
-        size_t count = 0;
-        max = (size_t)sema->waitMany((LightweightSemaphore::ssize_t)(ssize_t)max, timeout_usecs);
-        while (count != max) {
-            count += inner.template try_dequeue_bulk<It&>(itemFirst, max - count);
-        }
-        return count;
-    }
-
-    // Attempts to dequeue several elements from the queue.
-    // Returns the number of items actually dequeued, which can
-    // be 0 if the timeout expires while waiting for elements,
-    // and at most max.
-    // Never allocates. Thread-safe.
-    template <typename It, typename Rep, typename Period>
-    inline size_t wait_dequeue_bulk_timed(It itemFirst, size_t max, std::chrono::duration<Rep, Period> const& timeout)
-    {
-        return wait_dequeue_bulk_timed<It&>(
-            itemFirst, max, std::chrono::duration_cast<std::chrono::microseconds>(timeout).count());
-    }
-
-    // Attempts to dequeue several elements from the queue using an explicit consumer token.
-    // Returns the number of items actually dequeued, which will
-    // always be at least one (this method blocks until the queue
-    // is non-empty) and at most max.
-    // Never allocates. Thread-safe.
-    template <typename It> inline size_t wait_dequeue_bulk(consumer_token_t& token, It itemFirst, size_t max)
-    {
-        size_t count = 0;
-        max = (size_t)sema->waitMany((LightweightSemaphore::ssize_t)(ssize_t)max);
-        while (count != max) {
-            count += inner.template try_dequeue_bulk<It&>(token, itemFirst, max - count);
-        }
-        return count;
-    }
-
-    // Attempts to dequeue several elements from the queue using an explicit consumer token.
-    // Returns the number of items actually dequeued, which can
-    // be 0 if the timeout expires while waiting for elements,
-    // and at most max.
-    // Using a negative timeout indicates an indefinite timeout,
-    // and is thus functionally equivalent to calling wait_dequeue_bulk.
-    // Never allocates. Thread-safe.
-    template <typename It>
-    inline size_t wait_dequeue_bulk_timed(consumer_token_t& token, It itemFirst, size_t max, std::int64_t timeout_usecs)
-    {
-        size_t count = 0;
-        max = (size_t)sema->waitMany((LightweightSemaphore::ssize_t)(ssize_t)max, timeout_usecs);
-        while (count != max) {
-            count += inner.template try_dequeue_bulk<It&>(token, itemFirst, max - count);
-        }
-        return count;
-    }
-
-    // Attempts to dequeue several elements from the queue using an explicit consumer token.
-    // Returns the number of items actually dequeued, which can
-    // be 0 if the timeout expires while waiting for elements,
-    // and at most max.
-    // Never allocates. Thread-safe.
-    template <typename It, typename Rep, typename Period>
-    inline size_t wait_dequeue_bulk_timed(consumer_token_t& token,
-                                          It itemFirst,
-                                          size_t max,
-                                          std::chrono::duration<Rep, Period> const& timeout)
-    {
-        return wait_dequeue_bulk_timed<It&>(
-            token, itemFirst, max, std::chrono::duration_cast<std::chrono::microseconds>(timeout).count());
-    }
-
-    // Returns an estimate of the total number of elements currently in the queue. This
-    // estimate is only accurate if the queue has completely stabilized before it is called
-    // (i.e. all enqueue and dequeue operations have completed and their memory effects are
-    // visible on the calling thread, and no further operations start while this method is
-    // being called).
-    // Thread-safe.
-    inline size_t size_approx() const { return (size_t)sema->availableApprox(); }
-
-    // Returns true if the underlying atomic variables used by
-    // the queue are lock-free (they should be on most platforms).
-    // Thread-safe.
-    static constexpr bool is_lock_free() { return ConcurrentQueue::is_lock_free(); }
-
-  private:
-    template <typename U, typename A1, typename A2> static inline U* create(A1&& a1, A2&& a2)
-    {
-        void* p = (Traits::malloc)(sizeof(U));
-        return p != nullptr ? new (p) U(std::forward<A1>(a1), std::forward<A2>(a2)) : nullptr;
-    }
-
-    template <typename U> static inline void destroy(U* p)
-    {
-        if (p != nullptr) {
-            p->~U();
-        }
-        (Traits::free)(p);
-    }
-
-  private:
-    ConcurrentQueue inner;
-    std::unique_ptr<LightweightSemaphore, void (*)(LightweightSemaphore*)> sema;
-};
-
-template <typename T, typename Traits>
-inline void swap(BlockingConcurrentQueue<T, Traits>& a, BlockingConcurrentQueue<T, Traits>& b) MOODYCAMEL_NOEXCEPT
-{
-    a.swap(b);
-}
-
-} // end namespace moodycamel
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/common/moody/concurrentqueue.h b/barretenberg/cpp/src/barretenberg/common/moody/concurrentqueue.h
deleted file mode 100644
index fc23142efcfb..000000000000
--- a/barretenberg/cpp/src/barretenberg/common/moody/concurrentqueue.h
+++ /dev/null
@@ -1,3988 +0,0 @@
-// Provides a C++11 implementation of a multi-producer, multi-consumer lock-free queue.
-// An overview, including benchmark results, is provided here:
-//     http://moodycamel.com/blog/2014/a-fast-general-purpose-lock-free-queue-for-c++
-// The full design is also described in excruciating detail at:
-//    http://moodycamel.com/blog/2014/detailed-design-of-a-lock-free-queue
-
-// Simplified BSD license:
-// Copyright (c) 2013-2020, Cameron Desrochers.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// - Redistributions of source code must retain the above copyright notice, this list of
-// conditions and the following disclaimer.
-// - Redistributions in binary form must reproduce the above copyright notice, this list of
-// conditions and the following disclaimer in the documentation and/or other materials
-// provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-// OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-// TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-// EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Also dual-licensed under the Boost Software License (see LICENSE.md)
-
-#pragma once
-
-#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
-// Disable -Wconversion warnings (spuriously triggered when Traits::size_t and
-// Traits::index_t are set to < 32 bits, causing integer promotion, causing warnings
-// upon assigning any computed values)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-
-#ifdef MCDBGQ_USE_RELACY
-#pragma GCC diagnostic ignored "-Wint-to-pointer-cast"
-#endif
-#endif
-
-#if defined(_MSC_VER) && (!defined(_HAS_CXX17) || !_HAS_CXX17)
-// VS2019 with /W4 warns about constant conditional expressions but unless /std=c++17 or higher
-// does not support `if constexpr`, so we have no choice but to simply disable the warning
-#pragma warning(push)
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
-
-#if defined(__APPLE__)
-#include "TargetConditionals.h"
-#endif
-
-#ifdef MCDBGQ_USE_RELACY
-#include "relacy/relacy_std.hpp"
-#include "relacy_shims.h"
-// We only use malloc/free anyway, and the delete macro messes up `= delete` method declarations.
-// We'll override the default trait malloc ourselves without a macro.
-#undef new
-#undef delete
-#undef malloc
-#undef free
-#else
-#include <atomic> // Requires C++11. Sorry VS2010.
-#include <cassert>
-#endif
-#include <cstddef> // for max_align_t
-#include <cstdint>
-#include <cstdlib>
-#include <type_traits>
-#include <algorithm>
-#include <utility>
-#include <limits>
-#include <climits> // for CHAR_BIT
-#include <array>
-#include <thread> // partly for __WINPTHREADS_VERSION if on MinGW-w64 w/ POSIX threading
-#include <mutex>  // used for thread exit synchronization
-
-// Platform-specific definitions of a numeric thread ID type and an invalid value
-namespace moodycamel {
-namespace details {
-template <typename thread_id_t> struct thread_id_converter {
-    typedef thread_id_t thread_id_numeric_size_t;
-    typedef thread_id_t thread_id_hash_t;
-    static thread_id_hash_t prehash(thread_id_t const& x) { return x; }
-};
-} // namespace details
-} // namespace moodycamel
-#if defined(MCDBGQ_USE_RELACY)
-namespace moodycamel {
-namespace details {
-typedef std::uint32_t thread_id_t;
-static const thread_id_t invalid_thread_id = 0xFFFFFFFFU;
-static const thread_id_t invalid_thread_id2 = 0xFFFFFFFEU;
-static inline thread_id_t thread_id()
-{
-    return rl::thread_index();
-}
-} // namespace details
-} // namespace moodycamel
-#elif defined(_WIN32) || defined(__WINDOWS__) || defined(__WIN32__)
-// No sense pulling in windows.h in a header, we'll manually declare the function
-// we use and rely on backwards-compatibility for this not to break
-extern "C" __declspec(dllimport) unsigned long __stdcall GetCurrentThreadId(void);
-namespace moodycamel {
-namespace details {
-static_assert(sizeof(unsigned long) == sizeof(std::uint32_t),
-              "Expected size of unsigned long to be 32 bits on Windows");
-typedef std::uint32_t thread_id_t;
-static const thread_id_t invalid_thread_id = 0; // See http://blogs.msdn.com/b/oldnewthing/archive/2004/02/23/78395.aspx
-static const thread_id_t invalid_thread_id2 =
-    0xFFFFFFFFU; // Not technically guaranteed to be invalid, but is never used in practice. Note that all Win32 thread
-                 // IDs are presently multiples of 4.
-static inline thread_id_t thread_id()
-{
-    return static_cast<thread_id_t>(::GetCurrentThreadId());
-}
-} // namespace details
-} // namespace moodycamel
-#elif defined(__arm__) || defined(_M_ARM) || defined(__aarch64__) || (defined(__APPLE__) && TARGET_OS_IPHONE) ||       \
-    defined(MOODYCAMEL_NO_THREAD_LOCAL)
-namespace moodycamel {
-namespace details {
-static_assert(sizeof(std::thread::id) == 4 || sizeof(std::thread::id) == 8,
-              "std::thread::id is expected to be either 4 or 8 bytes");
-
-typedef std::thread::id thread_id_t;
-static const thread_id_t invalid_thread_id; // Default ctor creates invalid ID
-
-// Note we don't define a invalid_thread_id2 since std::thread::id doesn't have one; it's
-// only used if MOODYCAMEL_CPP11_THREAD_LOCAL_SUPPORTED is defined anyway, which it won't
-// be.
-static inline thread_id_t thread_id()
-{
-    return std::this_thread::get_id();
-}
-
-template <std::size_t> struct thread_id_size {};
-template <> struct thread_id_size<4> {
-    typedef std::uint32_t numeric_t;
-};
-template <> struct thread_id_size<8> {
-    typedef std::uint64_t numeric_t;
-};
-
-template <> struct thread_id_converter<thread_id_t> {
-    typedef thread_id_size<sizeof(thread_id_t)>::numeric_t thread_id_numeric_size_t;
-#ifndef __APPLE__
-    typedef std::size_t thread_id_hash_t;
-#else
-    typedef thread_id_numeric_size_t thread_id_hash_t;
-#endif
-
-    static thread_id_hash_t prehash(thread_id_t const& x)
-    {
-#ifndef __APPLE__
-        return std::hash<std::thread::id>()(x);
-#else
-        return *reinterpret_cast<thread_id_hash_t const*>(&x);
-#endif
-    }
-};
-}
-}
-#else
-// Use a nice trick from this answer: http://stackoverflow.com/a/8438730/21475
-// In order to get a numeric thread ID in a platform-independent way, we use a thread-local
-// static variable's address as a thread identifier :-)
-#if defined(__GNUC__) || defined(__INTEL_COMPILER)
-#define MOODYCAMEL_THREADLOCAL __thread
-#elif defined(_MSC_VER)
-#define MOODYCAMEL_THREADLOCAL __declspec(thread)
-#else
-// Assume C++11 compliant compiler
-#define MOODYCAMEL_THREADLOCAL thread_local
-#endif
-namespace moodycamel {
-namespace details {
-typedef std::uintptr_t thread_id_t;
-static const thread_id_t invalid_thread_id = 0; // Address can't be nullptr
-static const thread_id_t invalid_thread_id2 =
-    1; // Member accesses off a null pointer are also generally invalid. Plus it's not aligned.
-inline thread_id_t thread_id()
-{
-    static MOODYCAMEL_THREADLOCAL int x;
-    return reinterpret_cast<thread_id_t>(&x);
-}
-}
-}
-#endif
-
-// Constexpr if
-#ifndef MOODYCAMEL_CONSTEXPR_IF
-#if (defined(_MSC_VER) && defined(_HAS_CXX17) && _HAS_CXX17) || __cplusplus > 201402L
-#define MOODYCAMEL_CONSTEXPR_IF if constexpr
-#define MOODYCAMEL_MAYBE_UNUSED [[maybe_unused]]
-#else
-#define MOODYCAMEL_CONSTEXPR_IF if
-#define MOODYCAMEL_MAYBE_UNUSED
-#endif
-#endif
-
-// Exceptions
-#ifndef MOODYCAMEL_EXCEPTIONS_ENABLED
-#if (defined(_MSC_VER) && defined(_CPPUNWIND)) || (defined(__GNUC__) && defined(__EXCEPTIONS)) ||                      \
-    (!defined(_MSC_VER) && !defined(__GNUC__))
-#define MOODYCAMEL_EXCEPTIONS_ENABLED
-#endif
-#endif
-#ifdef MOODYCAMEL_EXCEPTIONS_ENABLED
-#define MOODYCAMEL_TRY try
-#define MOODYCAMEL_CATCH(...) catch (__VA_ARGS__)
-#define MOODYCAMEL_RETHROW throw
-#define MOODYCAMEL_THROW(expr) throw(expr)
-#else
-#define MOODYCAMEL_TRY MOODYCAMEL_CONSTEXPR_IF(true)
-#define MOODYCAMEL_CATCH(...) else MOODYCAMEL_CONSTEXPR_IF(false)
-#define MOODYCAMEL_RETHROW
-#define MOODYCAMEL_THROW(expr)
-#endif
-
-#ifndef MOODYCAMEL_NOEXCEPT
-#if !defined(MOODYCAMEL_EXCEPTIONS_ENABLED)
-#define MOODYCAMEL_NOEXCEPT
-#define MOODYCAMEL_NOEXCEPT_CTOR(type, valueType, expr) true
-#define MOODYCAMEL_NOEXCEPT_ASSIGN(type, valueType, expr) true
-#elif defined(_MSC_VER) && defined(_NOEXCEPT) && _MSC_VER < 1800
-// VS2012's std::is_nothrow_[move_]constructible is broken and returns true when it shouldn't :-(
-// We have to assume *all* non-trivial constructors may throw on VS2012!
-#define MOODYCAMEL_NOEXCEPT _NOEXCEPT
-#define MOODYCAMEL_NOEXCEPT_CTOR(type, valueType, expr)                                                                \
-    (std::is_rvalue_reference<valueType>::value && std::is_move_constructible<type>::value                             \
-         ? std::is_trivially_move_constructible<type>::value                                                           \
-         : std::is_trivially_copy_constructible<type>::value)
-#define MOODYCAMEL_NOEXCEPT_ASSIGN(type, valueType, expr)                                                              \
-    ((std::is_rvalue_reference<valueType>::value && std::is_move_assignable<type>::value                               \
-          ? std::is_trivially_move_assignable<type>::value || std::is_nothrow_move_assignable<type>::value             \
-          : std::is_trivially_copy_assignable<type>::value || std::is_nothrow_copy_assignable<type>::value) &&         \
-     MOODYCAMEL_NOEXCEPT_CTOR(type, valueType, expr))
-#elif defined(_MSC_VER) && defined(_NOEXCEPT) && _MSC_VER < 1900
-#define MOODYCAMEL_NOEXCEPT _NOEXCEPT
-#define MOODYCAMEL_NOEXCEPT_CTOR(type, valueType, expr)                                                                \
-    (std::is_rvalue_reference<valueType>::value && std::is_move_constructible<type>::value                             \
-         ? std::is_trivially_move_constructible<type>::value || std::is_nothrow_move_constructible<type>::value        \
-         : std::is_trivially_copy_constructible<type>::value || std::is_nothrow_copy_constructible<type>::value)
-#define MOODYCAMEL_NOEXCEPT_ASSIGN(type, valueType, expr)                                                              \
-    ((std::is_rvalue_reference<valueType>::value && std::is_move_assignable<type>::value                               \
-          ? std::is_trivially_move_assignable<type>::value || std::is_nothrow_move_assignable<type>::value             \
-          : std::is_trivially_copy_assignable<type>::value || std::is_nothrow_copy_assignable<type>::value) &&         \
-     MOODYCAMEL_NOEXCEPT_CTOR(type, valueType, expr))
-#else
-#define MOODYCAMEL_NOEXCEPT noexcept
-#define MOODYCAMEL_NOEXCEPT_CTOR(type, valueType, expr) noexcept(expr)
-#define MOODYCAMEL_NOEXCEPT_ASSIGN(type, valueType, expr) noexcept(expr)
-#endif
-#endif
-
-#ifndef MOODYCAMEL_CPP11_THREAD_LOCAL_SUPPORTED
-#ifdef MCDBGQ_USE_RELACY
-#define MOODYCAMEL_CPP11_THREAD_LOCAL_SUPPORTED
-#else
-// VS2013 doesn't support `thread_local`, and MinGW-w64 w/ POSIX threading has a crippling bug:
-// http://sourceforge.net/p/mingw-w64/bugs/445 g++ <=4.7 doesn't support thread_local either. Finally, iOS/ARM doesn't
-// have support for it either, and g++/ARM allows it to compile but it's unconfirmed to actually work
-#if (!defined(_MSC_VER) || _MSC_VER >= 1900) &&                                                                        \
-    (!defined(__MINGW32__) && !defined(__MINGW64__) || !defined(__WINPTHREADS_VERSION)) &&                             \
-    (!defined(__GNUC__) || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) &&                                  \
-    (!defined(__APPLE__) || !TARGET_OS_IPHONE) && !defined(__arm__) && !defined(_M_ARM) && !defined(__aarch64__)
-// Assume `thread_local` is fully supported in all other C++11 compilers/platforms
-#define MOODYCAMEL_CPP11_THREAD_LOCAL_SUPPORTED // tentatively enabled for now; years ago several users report having
-                                                // problems with it on
-#endif
-#endif
-#endif
-
-// VS2012 doesn't support deleted functions.
-// In this case, we declare the function normally but don't define it. A link error will be generated if the function is
-// called.
-#ifndef MOODYCAMEL_DELETE_FUNCTION
-#if defined(_MSC_VER) && _MSC_VER < 1800
-#define MOODYCAMEL_DELETE_FUNCTION
-#else
-#define MOODYCAMEL_DELETE_FUNCTION = delete
-#endif
-#endif
-
-namespace moodycamel {
-namespace details {
-#ifndef MOODYCAMEL_ALIGNAS
-// VS2013 doesn't support alignas or alignof, and align() requires a constant literal
-#if defined(_MSC_VER) && _MSC_VER <= 1800
-#define MOODYCAMEL_ALIGNAS(alignment) __declspec(align(alignment))
-#define MOODYCAMEL_ALIGNOF(obj) __alignof(obj)
-#define MOODYCAMEL_ALIGNED_TYPE_LIKE(T, obj) typename details::Vs2013Aligned<std::alignment_of<obj>::value, T>::type
-template <int Align, typename T> struct Vs2013Aligned {}; // default, unsupported alignment
-template <typename T> struct Vs2013Aligned<1, T> {
-    typedef __declspec(align(1)) T type;
-};
-template <typename T> struct Vs2013Aligned<2, T> {
-    typedef __declspec(align(2)) T type;
-};
-template <typename T> struct Vs2013Aligned<4, T> {
-    typedef __declspec(align(4)) T type;
-};
-template <typename T> struct Vs2013Aligned<8, T> {
-    typedef __declspec(align(8)) T type;
-};
-template <typename T> struct Vs2013Aligned<16, T> {
-    typedef __declspec(align(16)) T type;
-};
-template <typename T> struct Vs2013Aligned<32, T> {
-    typedef __declspec(align(32)) T type;
-};
-template <typename T> struct Vs2013Aligned<64, T> {
-    typedef __declspec(align(64)) T type;
-};
-template <typename T> struct Vs2013Aligned<128, T> {
-    typedef __declspec(align(128)) T type;
-};
-template <typename T> struct Vs2013Aligned<256, T> {
-    typedef __declspec(align(256)) T type;
-};
-#else
-template <typename T> struct identity {
-    typedef T type;
-};
-#define MOODYCAMEL_ALIGNAS(alignment) alignas(alignment)
-#define MOODYCAMEL_ALIGNOF(obj) alignof(obj)
-#define MOODYCAMEL_ALIGNED_TYPE_LIKE(T, obj) alignas(alignof(obj)) typename details::identity<T>::type
-#endif
-#endif
-} // namespace details
-} // namespace moodycamel
-
-// TSAN can false report races in lock-free code.  To enable TSAN to be used from projects that use this one,
-// we can apply per-function compile-time suppression.
-// See https://clang.llvm.org/docs/ThreadSanitizer.html#has-feature-thread-sanitizer
-#define MOODYCAMEL_NO_TSAN
-#if defined(__has_feature)
-#if __has_feature(thread_sanitizer)
-#undef MOODYCAMEL_NO_TSAN
-#define MOODYCAMEL_NO_TSAN __attribute__((no_sanitize("thread")))
-#endif // TSAN
-#endif // TSAN
-
-// Compiler-specific likely/unlikely hints
-namespace moodycamel {
-namespace details {
-#if defined(__GNUC__)
-static inline bool(likely)(bool x)
-{
-    return __builtin_expect((x), true);
-}
-static inline bool(unlikely)(bool x)
-{
-    return __builtin_expect((x), false);
-}
-#else
-static inline bool(likely)(bool x)
-{
-    return x;
-}
-static inline bool(unlikely)(bool x)
-{
-    return x;
-}
-#endif
-} // namespace details
-} // namespace moodycamel
-
-#ifdef MOODYCAMEL_QUEUE_INTERNAL_DEBUG
-#include "internal/concurrentqueue_internal_debug.h"
-#endif
-
-namespace moodycamel {
-namespace details {
-template <typename T> struct const_numeric_max {
-    static_assert(std::is_integral<T>::value, "const_numeric_max can only be used with integers");
-    static const T value = std::numeric_limits<T>::is_signed
-                               ? (static_cast<T>(1) << (sizeof(T) * CHAR_BIT - 1)) - static_cast<T>(1)
-                               : static_cast<T>(-1);
-};
-
-#if defined(__GLIBCXX__)
-typedef ::max_align_t std_max_align_t; // libstdc++ forgot to add it to std:: for a while
-#else
-typedef std::max_align_t std_max_align_t; // Others (e.g. MSVC) insist it can *only* be accessed via std::
-#endif
-
-// Some platforms have incorrectly set max_align_t to a type with <8 bytes alignment even while supporting
-// 8-byte aligned scalar values (*cough* 32-bit iOS). Work around this with our own union. See issue #64.
-typedef union {
-    std_max_align_t x;
-    long long y;
-    void* z;
-} max_align_t;
-} // namespace details
-
-// Default traits for the ConcurrentQueue. To change some of the
-// traits without re-implementing all of them, inherit from this
-// struct and shadow the declarations you wish to be different;
-// since the traits are used as a template type parameter, the
-// shadowed declarations will be used where defined, and the defaults
-// otherwise.
-struct ConcurrentQueueDefaultTraits {
-    // General-purpose size type. std::size_t is strongly recommended.
-    typedef std::size_t size_t;
-
-    // The type used for the enqueue and dequeue indices. Must be at least as
-    // large as size_t. Should be significantly larger than the number of elements
-    // you expect to hold at once, especially if you have a high turnover rate;
-    // for example, on 32-bit x86, if you expect to have over a hundred million
-    // elements or pump several million elements through your queue in a very
-    // short space of time, using a 32-bit type *may* trigger a race condition.
-    // A 64-bit int type is recommended in that case, and in practice will
-    // prevent a race condition no matter the usage of the queue. Note that
-    // whether the queue is lock-free with a 64-int type depends on the whether
-    // std::atomic<std::uint64_t> is lock-free, which is platform-specific.
-    typedef std::size_t index_t;
-
-    // Internally, all elements are enqueued and dequeued from multi-element
-    // blocks; this is the smallest controllable unit. If you expect few elements
-    // but many producers, a smaller block size should be favoured. For few producers
-    // and/or many elements, a larger block size is preferred. A sane default
-    // is provided. Must be a power of 2.
-    static const size_t BLOCK_SIZE = 32;
-
-    // For explicit producers (i.e. when using a producer token), the block is
-    // checked for being empty by iterating through a list of flags, one per element.
-    // For large block sizes, this is too inefficient, and switching to an atomic
-    // counter-based approach is faster. The switch is made for block sizes strictly
-    // larger than this threshold.
-    static const size_t EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD = 32;
-
-    // How many full blocks can be expected for a single explicit producer? This should
-    // reflect that number's maximum for optimal performance. Must be a power of 2.
-    static const size_t EXPLICIT_INITIAL_INDEX_SIZE = 32;
-
-    // How many full blocks can be expected for a single implicit producer? This should
-    // reflect that number's maximum for optimal performance. Must be a power of 2.
-    static const size_t IMPLICIT_INITIAL_INDEX_SIZE = 32;
-
-    // The initial size of the hash table mapping thread IDs to implicit producers.
-    // Note that the hash is resized every time it becomes half full.
-    // Must be a power of two, and either 0 or at least 1. If 0, implicit production
-    // (using the enqueue methods without an explicit producer token) is disabled.
-    static const size_t INITIAL_IMPLICIT_PRODUCER_HASH_SIZE = 32;
-
-    // Controls the number of items that an explicit consumer (i.e. one with a token)
-    // must consume before it causes all consumers to rotate and move on to the next
-    // internal queue.
-    static const std::uint32_t EXPLICIT_CONSUMER_CONSUMPTION_QUOTA_BEFORE_ROTATE = 256;
-
-    // The maximum number of elements (inclusive) that can be enqueued to a sub-queue.
-    // Enqueue operations that would cause this limit to be surpassed will fail. Note
-    // that this limit is enforced at the block level (for performance reasons), i.e.
-    // it's rounded up to the nearest block size.
-    static const size_t MAX_SUBQUEUE_SIZE = details::const_numeric_max<size_t>::value;
-
-    // The number of times to spin before sleeping when waiting on a semaphore.
-    // Recommended values are on the order of 1000-10000 unless the number of
-    // consumer threads exceeds the number of idle cores (in which case try 0-100).
-    // Only affects instances of the BlockingConcurrentQueue.
-    static const int MAX_SEMA_SPINS = 10000;
-
-    // Whether to recycle dynamically-allocated blocks into an internal free list or
-    // not. If false, only pre-allocated blocks (controlled by the constructor
-    // arguments) will be recycled, and all others will be `free`d back to the heap.
-    // Note that blocks consumed by explicit producers are only freed on destruction
-    // of the queue (not following destruction of the token) regardless of this trait.
-    static const bool RECYCLE_ALLOCATED_BLOCKS = false;
-
-#ifndef MCDBGQ_USE_RELACY
-    // Memory allocation can be customized if needed.
-    // malloc should return nullptr on failure, and handle alignment like std::malloc.
-#if defined(malloc) || defined(free)
-    // Gah, this is 2015, stop defining macros that break standard code already!
-    // Work around malloc/free being special macros:
-    static inline void* WORKAROUND_malloc(size_t size) { return malloc(size); }
-    static inline void WORKAROUND_free(void* ptr) { return free(ptr); }
-    static inline void*(malloc)(size_t size) { return WORKAROUND_malloc(size); }
-    static inline void(free)(void* ptr) { return WORKAROUND_free(ptr); }
-#else
-    static inline void* malloc(size_t size) { return std::malloc(size); }
-    static inline void free(void* ptr) { return std::free(ptr); }
-#endif
-#else
-    // Debug versions when running under the Relacy race detector (ignore
-    // these in user code)
-    static inline void* malloc(size_t size) { return rl::rl_malloc(size, $); }
-    static inline void free(void* ptr) { return rl::rl_free(ptr, $); }
-#endif
-};
-
-// When producing or consuming many elements, the most efficient way is to:
-//    1) Use one of the bulk-operation methods of the queue with a token
-//    2) Failing that, use the bulk-operation methods without a token
-//    3) Failing that, create a token and use that with the single-item methods
-//    4) Failing that, use the single-parameter methods of the queue
-// Having said that, don't create tokens willy-nilly -- ideally there should be
-// a maximum of one token per thread (of each kind).
-struct ProducerToken;
-struct ConsumerToken;
-
-template <typename T, typename Traits> class ConcurrentQueue;
-template <typename T, typename Traits> class BlockingConcurrentQueue;
-class ConcurrentQueueTests;
-
-namespace details {
-struct ConcurrentQueueProducerTypelessBase {
-    ConcurrentQueueProducerTypelessBase* next;
-    std::atomic<bool> inactive;
-    ProducerToken* token;
-
-    ConcurrentQueueProducerTypelessBase()
-        : next(nullptr)
-        , inactive(false)
-        , token(nullptr)
-    {}
-};
-
-template <bool use32> struct _hash_32_or_64 {
-    static inline std::uint32_t hash(std::uint32_t h)
-    {
-        // MurmurHash3 finalizer -- see https://code.google.com/p/smhasher/source/browse/trunk/MurmurHash3.cpp
-        // Since the thread ID is already unique, all we really want to do is propagate that
-        // uniqueness evenly across all the bits, so that we can use a subset of the bits while
-        // reducing collisions significantly
-        h ^= h >> 16;
-        h *= 0x85ebca6b;
-        h ^= h >> 13;
-        h *= 0xc2b2ae35;
-        return h ^ (h >> 16);
-    }
-};
-template <> struct _hash_32_or_64<1> {
-    static inline std::uint64_t hash(std::uint64_t h)
-    {
-        h ^= h >> 33;
-        h *= 0xff51afd7ed558ccd;
-        h ^= h >> 33;
-        h *= 0xc4ceb9fe1a85ec53;
-        return h ^ (h >> 33);
-    }
-};
-template <std::size_t size> struct hash_32_or_64 : public _hash_32_or_64<(size > 4)> {};
-
-static inline size_t hash_thread_id(thread_id_t id)
-{
-    static_assert(sizeof(thread_id_t) <= 8, "Expected a platform where thread IDs are at most 64-bit values");
-    return static_cast<size_t>(hash_32_or_64<sizeof(thread_id_converter<thread_id_t>::thread_id_hash_t)>::hash(
-        thread_id_converter<thread_id_t>::prehash(id)));
-}
-
-template <typename T> static inline bool circular_less_than(T a, T b)
-{
-    static_assert(std::is_integral<T>::value && !std::numeric_limits<T>::is_signed,
-                  "circular_less_than is intended to be used only with unsigned integer types");
-    return static_cast<T>(a - b) > static_cast<T>(static_cast<T>(1) << (static_cast<T>(sizeof(T) * CHAR_BIT - 1)));
-    // Note: extra parens around rhs of operator<< is MSVC bug:
-    // https://developercommunity2.visualstudio.com/t/C4554-triggers-when-both-lhs-and-rhs-is/10034931
-    //       silencing the bug requires #pragma warning(disable: 4554) around the calling code and has no effect when
-    //       done here.
-}
-
-template <typename U> static inline char* align_for(char* ptr)
-{
-    const std::size_t alignment = std::alignment_of<U>::value;
-    return ptr + (alignment - (reinterpret_cast<std::uintptr_t>(ptr) % alignment)) % alignment;
-}
-
-template <typename T> static inline T ceil_to_pow_2(T x)
-{
-    static_assert(std::is_integral<T>::value && !std::numeric_limits<T>::is_signed,
-                  "ceil_to_pow_2 is intended to be used only with unsigned integer types");
-
-    // Adapted from http://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2
-    --x;
-    x |= x >> 1;
-    x |= x >> 2;
-    x |= x >> 4;
-    for (std::size_t i = 1; i < sizeof(T); i <<= 1) {
-        x |= x >> (i << 3);
-    }
-    ++x;
-    return x;
-}
-
-template <typename T> static inline void swap_relaxed(std::atomic<T>& left, std::atomic<T>& right)
-{
-    T temp = std::move(left.load(std::memory_order_relaxed));
-    left.store(std::move(right.load(std::memory_order_relaxed)), std::memory_order_relaxed);
-    right.store(std::move(temp), std::memory_order_relaxed);
-}
-
-template <typename T> static inline T const& nomove(T const& x)
-{
-    return x;
-}
-
-template <bool Enable> struct nomove_if {
-    template <typename T> static inline T const& eval(T const& x) { return x; }
-};
-
-template <> struct nomove_if<false> {
-    template <typename U> static inline auto eval(U&& x) -> decltype(std::forward<U>(x)) { return std::forward<U>(x); }
-};
-
-template <typename It> static inline auto deref_noexcept(It& it) MOODYCAMEL_NOEXCEPT->decltype(*it)
-{
-    return *it;
-}
-
-#if defined(__clang__) || !defined(__GNUC__) || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)
-template <typename T> struct is_trivially_destructible : std::is_trivially_destructible<T> {};
-#else
-template <typename T> struct is_trivially_destructible : std::has_trivial_destructor<T> {};
-#endif
-
-#ifdef MOODYCAMEL_CPP11_THREAD_LOCAL_SUPPORTED
-#ifdef MCDBGQ_USE_RELACY
-typedef RelacyThreadExitListener ThreadExitListener;
-typedef RelacyThreadExitNotifier ThreadExitNotifier;
-#else
-class ThreadExitNotifier;
-
-struct ThreadExitListener {
-    typedef void (*callback_t)(void*);
-    callback_t callback;
-    void* userData;
-
-    ThreadExitListener* next;  // reserved for use by the ThreadExitNotifier
-    ThreadExitNotifier* chain; // reserved for use by the ThreadExitNotifier
-};
-
-class ThreadExitNotifier {
-  public:
-    static void subscribe(ThreadExitListener* listener)
-    {
-        auto& tlsInst = instance();
-        std::lock_guard<std::mutex> guard(mutex());
-        listener->next = tlsInst.tail;
-        listener->chain = &tlsInst;
-        tlsInst.tail = listener;
-    }
-
-    static void unsubscribe(ThreadExitListener* listener)
-    {
-        std::lock_guard<std::mutex> guard(mutex());
-        if (!listener->chain) {
-            return; // race with ~ThreadExitNotifier
-        }
-        auto& tlsInst = *listener->chain;
-        listener->chain = nullptr;
-        ThreadExitListener** prev = &tlsInst.tail;
-        for (auto ptr = tlsInst.tail; ptr != nullptr; ptr = ptr->next) {
-            if (ptr == listener) {
-                *prev = ptr->next;
-                break;
-            }
-            prev = &ptr->next;
-        }
-    }
-
-  private:
-    ThreadExitNotifier()
-        : tail(nullptr)
-    {}
-    ThreadExitNotifier(ThreadExitNotifier const&) MOODYCAMEL_DELETE_FUNCTION;
-    ThreadExitNotifier& operator=(ThreadExitNotifier const&) MOODYCAMEL_DELETE_FUNCTION;
-
-    ~ThreadExitNotifier()
-    {
-        // This thread is about to exit, let everyone know!
-        assert(this == &instance() &&
-               "If this assert fails, you likely have a buggy compiler! Change the preprocessor conditions such that "
-               "MOODYCAMEL_CPP11_THREAD_LOCAL_SUPPORTED is no longer defined.");
-        std::lock_guard<std::mutex> guard(mutex());
-        for (auto ptr = tail; ptr != nullptr; ptr = ptr->next) {
-            ptr->chain = nullptr;
-            ptr->callback(ptr->userData);
-        }
-    }
-
-    // Thread-local
-    static inline ThreadExitNotifier& instance()
-    {
-        static thread_local ThreadExitNotifier notifier;
-        return notifier;
-    }
-
-    static inline std::mutex& mutex()
-    {
-        // Must be static because the ThreadExitNotifier could be destroyed while unsubscribe is called
-        static std::mutex mutex;
-        return mutex;
-    }
-
-  private:
-    ThreadExitListener* tail;
-};
-#endif
-#endif
-
-template <typename T> struct static_is_lock_free_num {
-    enum { value = 0 };
-};
-template <> struct static_is_lock_free_num<signed char> {
-    enum { value = ATOMIC_CHAR_LOCK_FREE };
-};
-template <> struct static_is_lock_free_num<short> {
-    enum { value = ATOMIC_SHORT_LOCK_FREE };
-};
-template <> struct static_is_lock_free_num<int> {
-    enum { value = ATOMIC_INT_LOCK_FREE };
-};
-template <> struct static_is_lock_free_num<long> {
-    enum { value = ATOMIC_LONG_LOCK_FREE };
-};
-template <> struct static_is_lock_free_num<long long> {
-    enum { value = ATOMIC_LLONG_LOCK_FREE };
-};
-template <typename T> struct static_is_lock_free : static_is_lock_free_num<typename std::make_signed<T>::type> {};
-template <> struct static_is_lock_free<bool> {
-    enum { value = ATOMIC_BOOL_LOCK_FREE };
-};
-template <typename U> struct static_is_lock_free<U*> {
-    enum { value = ATOMIC_POINTER_LOCK_FREE };
-};
-} // namespace details
-
-struct ProducerToken {
-    template <typename T, typename Traits> explicit ProducerToken(ConcurrentQueue<T, Traits>& queue);
-
-    template <typename T, typename Traits> explicit ProducerToken(BlockingConcurrentQueue<T, Traits>& queue);
-
-    ProducerToken(ProducerToken&& other) MOODYCAMEL_NOEXCEPT : producer(other.producer)
-    {
-        other.producer = nullptr;
-        if (producer != nullptr) {
-            producer->token = this;
-        }
-    }
-
-    inline ProducerToken& operator=(ProducerToken&& other) MOODYCAMEL_NOEXCEPT
-    {
-        swap(other);
-        return *this;
-    }
-
-    void swap(ProducerToken& other) MOODYCAMEL_NOEXCEPT
-    {
-        std::swap(producer, other.producer);
-        if (producer != nullptr) {
-            producer->token = this;
-        }
-        if (other.producer != nullptr) {
-            other.producer->token = &other;
-        }
-    }
-
-    // A token is always valid unless:
-    //     1) Memory allocation failed during construction
-    //     2) It was moved via the move constructor
-    //        (Note: assignment does a swap, leaving both potentially valid)
-    //     3) The associated queue was destroyed
-    // Note that if valid() returns true, that only indicates
-    // that the token is valid for use with a specific queue,
-    // but not which one; that's up to the user to track.
-    inline bool valid() const { return producer != nullptr; }
-
-    ~ProducerToken()
-    {
-        if (producer != nullptr) {
-            producer->token = nullptr;
-            producer->inactive.store(true, std::memory_order_release);
-        }
-    }
-
-    // Disable copying and assignment
-    ProducerToken(ProducerToken const&) MOODYCAMEL_DELETE_FUNCTION;
-    ProducerToken& operator=(ProducerToken const&) MOODYCAMEL_DELETE_FUNCTION;
-
-  private:
-    template <typename T, typename Traits> friend class ConcurrentQueue;
-    friend class ConcurrentQueueTests;
-
-  protected:
-    details::ConcurrentQueueProducerTypelessBase* producer;
-};
-
-struct ConsumerToken {
-    template <typename T, typename Traits> explicit ConsumerToken(ConcurrentQueue<T, Traits>& q);
-
-    template <typename T, typename Traits> explicit ConsumerToken(BlockingConcurrentQueue<T, Traits>& q);
-
-    ConsumerToken(ConsumerToken&& other) MOODYCAMEL_NOEXCEPT : initialOffset(other.initialOffset),
-                                                               lastKnownGlobalOffset(other.lastKnownGlobalOffset),
-                                                               itemsConsumedFromCurrent(other.itemsConsumedFromCurrent),
-                                                               currentProducer(other.currentProducer),
-                                                               desiredProducer(other.desiredProducer)
-    {}
-
-    inline ConsumerToken& operator=(ConsumerToken&& other) MOODYCAMEL_NOEXCEPT
-    {
-        swap(other);
-        return *this;
-    }
-
-    void swap(ConsumerToken& other) MOODYCAMEL_NOEXCEPT
-    {
-        std::swap(initialOffset, other.initialOffset);
-        std::swap(lastKnownGlobalOffset, other.lastKnownGlobalOffset);
-        std::swap(itemsConsumedFromCurrent, other.itemsConsumedFromCurrent);
-        std::swap(currentProducer, other.currentProducer);
-        std::swap(desiredProducer, other.desiredProducer);
-    }
-
-    // Disable copying and assignment
-    ConsumerToken(ConsumerToken const&) MOODYCAMEL_DELETE_FUNCTION;
-    ConsumerToken& operator=(ConsumerToken const&) MOODYCAMEL_DELETE_FUNCTION;
-
-  private:
-    template <typename T, typename Traits> friend class ConcurrentQueue;
-    friend class ConcurrentQueueTests;
-
-  private: // but shared with ConcurrentQueue
-    std::uint32_t initialOffset;
-    std::uint32_t lastKnownGlobalOffset;
-    std::uint32_t itemsConsumedFromCurrent;
-    details::ConcurrentQueueProducerTypelessBase* currentProducer;
-    details::ConcurrentQueueProducerTypelessBase* desiredProducer;
-};
-
-// Need to forward-declare this swap because it's in a namespace.
-// See
-// http://stackoverflow.com/questions/4492062/why-does-a-c-friend-class-need-a-forward-declaration-only-in-other-namespaces
-template <typename T, typename Traits>
-inline void swap(typename ConcurrentQueue<T, Traits>::ImplicitProducerKVP& a,
-                 typename ConcurrentQueue<T, Traits>::ImplicitProducerKVP& b) MOODYCAMEL_NOEXCEPT;
-
-template <typename T, typename Traits = ConcurrentQueueDefaultTraits> class ConcurrentQueue {
-  public:
-    typedef ::moodycamel::ProducerToken producer_token_t;
-    typedef ::moodycamel::ConsumerToken consumer_token_t;
-
-    typedef typename Traits::index_t index_t;
-    typedef typename Traits::size_t size_t;
-
-    static const size_t BLOCK_SIZE = static_cast<size_t>(Traits::BLOCK_SIZE);
-    static const size_t EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD =
-        static_cast<size_t>(Traits::EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD);
-    static const size_t EXPLICIT_INITIAL_INDEX_SIZE = static_cast<size_t>(Traits::EXPLICIT_INITIAL_INDEX_SIZE);
-    static const size_t IMPLICIT_INITIAL_INDEX_SIZE = static_cast<size_t>(Traits::IMPLICIT_INITIAL_INDEX_SIZE);
-    static const size_t INITIAL_IMPLICIT_PRODUCER_HASH_SIZE =
-        static_cast<size_t>(Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE);
-    static const std::uint32_t EXPLICIT_CONSUMER_CONSUMPTION_QUOTA_BEFORE_ROTATE =
-        static_cast<std::uint32_t>(Traits::EXPLICIT_CONSUMER_CONSUMPTION_QUOTA_BEFORE_ROTATE);
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4307) // + integral constant overflow (that's what the ternary expression is for!)
-#pragma warning(disable : 4309) // static_cast: Truncation of constant value
-#endif
-    static const size_t MAX_SUBQUEUE_SIZE =
-        (details::const_numeric_max<size_t>::value - static_cast<size_t>(Traits::MAX_SUBQUEUE_SIZE) < BLOCK_SIZE)
-            ? details::const_numeric_max<size_t>::value
-            : ((static_cast<size_t>(Traits::MAX_SUBQUEUE_SIZE) + (BLOCK_SIZE - 1)) / BLOCK_SIZE * BLOCK_SIZE);
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-    static_assert(!std::numeric_limits<size_t>::is_signed && std::is_integral<size_t>::value,
-                  "Traits::size_t must be an unsigned integral type");
-    static_assert(!std::numeric_limits<index_t>::is_signed && std::is_integral<index_t>::value,
-                  "Traits::index_t must be an unsigned integral type");
-    static_assert(sizeof(index_t) >= sizeof(size_t), "Traits::index_t must be at least as wide as Traits::size_t");
-    static_assert((BLOCK_SIZE > 1) && !(BLOCK_SIZE & (BLOCK_SIZE - 1)),
-                  "Traits::BLOCK_SIZE must be a power of 2 (and at least 2)");
-    static_assert((EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD > 1) &&
-                      !(EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD & (EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD - 1)),
-                  "Traits::EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD must be a power of 2 (and greater than 1)");
-    static_assert((EXPLICIT_INITIAL_INDEX_SIZE > 1) &&
-                      !(EXPLICIT_INITIAL_INDEX_SIZE & (EXPLICIT_INITIAL_INDEX_SIZE - 1)),
-                  "Traits::EXPLICIT_INITIAL_INDEX_SIZE must be a power of 2 (and greater than 1)");
-    static_assert((IMPLICIT_INITIAL_INDEX_SIZE > 1) &&
-                      !(IMPLICIT_INITIAL_INDEX_SIZE & (IMPLICIT_INITIAL_INDEX_SIZE - 1)),
-                  "Traits::IMPLICIT_INITIAL_INDEX_SIZE must be a power of 2 (and greater than 1)");
-    static_assert((INITIAL_IMPLICIT_PRODUCER_HASH_SIZE == 0) ||
-                      !(INITIAL_IMPLICIT_PRODUCER_HASH_SIZE & (INITIAL_IMPLICIT_PRODUCER_HASH_SIZE - 1)),
-                  "Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE must be a power of 2");
-    static_assert(
-        INITIAL_IMPLICIT_PRODUCER_HASH_SIZE == 0 || INITIAL_IMPLICIT_PRODUCER_HASH_SIZE >= 1,
-        "Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE must be at least 1 (or 0 to disable implicit enqueueing)");
-
-  public:
-    // Creates a queue with at least `capacity` element slots; note that the
-    // actual number of elements that can be inserted without additional memory
-    // allocation depends on the number of producers and the block size (e.g. if
-    // the block size is equal to `capacity`, only a single block will be allocated
-    // up-front, which means only a single producer will be able to enqueue elements
-    // without an extra allocation -- blocks aren't shared between producers).
-    // This method is not thread safe -- it is up to the user to ensure that the
-    // queue is fully constructed before it starts being used by other threads (this
-    // includes making the memory effects of construction visible, possibly with a
-    // memory barrier).
-    explicit ConcurrentQueue(size_t capacity = 32 * BLOCK_SIZE)
-        : producerListTail(nullptr)
-        , producerCount(0)
-        , initialBlockPoolIndex(0)
-        , nextExplicitConsumerId(0)
-        , globalExplicitConsumerOffset(0)
-    {
-        implicitProducerHashResizeInProgress.clear(std::memory_order_relaxed);
-        populate_initial_implicit_producer_hash();
-        populate_initial_block_list(capacity / BLOCK_SIZE + ((capacity & (BLOCK_SIZE - 1)) == 0 ? 0 : 1));
-
-#ifdef MOODYCAMEL_QUEUE_INTERNAL_DEBUG
-        // Track all the producers using a fully-resolved typed list for
-        // each kind; this makes it possible to debug them starting from
-        // the root queue object (otherwise wacky casts are needed that
-        // don't compile in the debugger's expression evaluator).
-        explicitProducers.store(nullptr, std::memory_order_relaxed);
-        implicitProducers.store(nullptr, std::memory_order_relaxed);
-#endif
-    }
-
-    // Computes the correct amount of pre-allocated blocks for you based
-    // on the minimum number of elements you want available at any given
-    // time, and the maximum concurrent number of each type of producer.
-    ConcurrentQueue(size_t minCapacity, size_t maxExplicitProducers, size_t maxImplicitProducers)
-        : producerListTail(nullptr)
-        , producerCount(0)
-        , initialBlockPoolIndex(0)
-        , nextExplicitConsumerId(0)
-        , globalExplicitConsumerOffset(0)
-    {
-        implicitProducerHashResizeInProgress.clear(std::memory_order_relaxed);
-        populate_initial_implicit_producer_hash();
-        size_t blocks = (((minCapacity + BLOCK_SIZE - 1) / BLOCK_SIZE) - 1) * (maxExplicitProducers + 1) +
-                        2 * (maxExplicitProducers + maxImplicitProducers);
-        populate_initial_block_list(blocks);
-
-#ifdef MOODYCAMEL_QUEUE_INTERNAL_DEBUG
-        explicitProducers.store(nullptr, std::memory_order_relaxed);
-        implicitProducers.store(nullptr, std::memory_order_relaxed);
-#endif
-    }
-
-    // Note: The queue should not be accessed concurrently while it's
-    // being deleted. It's up to the user to synchronize this.
-    // This method is not thread safe.
-    ~ConcurrentQueue()
-    {
-        // Destroy producers
-        auto ptr = producerListTail.load(std::memory_order_relaxed);
-        while (ptr != nullptr) {
-            auto next = ptr->next_prod();
-            if (ptr->token != nullptr) {
-                ptr->token->producer = nullptr;
-            }
-            destroy(ptr);
-            ptr = next;
-        }
-
-        // Destroy implicit producer hash tables
-        MOODYCAMEL_CONSTEXPR_IF(INITIAL_IMPLICIT_PRODUCER_HASH_SIZE != 0)
-        {
-            auto hash = implicitProducerHash.load(std::memory_order_relaxed);
-            while (hash != nullptr) {
-                auto prev = hash->prev;
-                if (prev != nullptr) { // The last hash is part of this object and was not allocated dynamically
-                    for (size_t i = 0; i != hash->capacity; ++i) {
-                        hash->entries[i].~ImplicitProducerKVP();
-                    }
-                    hash->~ImplicitProducerHash();
-                    (Traits::free)(hash);
-                }
-                hash = prev;
-            }
-        }
-
-        // Destroy global free list
-        auto block = freeList.head_unsafe();
-        while (block != nullptr) {
-            auto next = block->freeListNext.load(std::memory_order_relaxed);
-            if (block->dynamicallyAllocated) {
-                destroy(block);
-            }
-            block = next;
-        }
-
-        // Destroy initial free list
-        destroy_array(initialBlockPool, initialBlockPoolSize);
-    }
-
-    // Disable copying and copy assignment
-    ConcurrentQueue(ConcurrentQueue const&) MOODYCAMEL_DELETE_FUNCTION;
-    ConcurrentQueue& operator=(ConcurrentQueue const&) MOODYCAMEL_DELETE_FUNCTION;
-
-    // Moving is supported, but note that it is *not* a thread-safe operation.
-    // Nobody can use the queue while it's being moved, and the memory effects
-    // of that move must be propagated to other threads before they can use it.
-    // Note: When a queue is moved, its tokens are still valid but can only be
-    // used with the destination queue (i.e. semantically they are moved along
-    // with the queue itself).
-    ConcurrentQueue(ConcurrentQueue&& other) MOODYCAMEL_NOEXCEPT
-        : producerListTail(other.producerListTail.load(std::memory_order_relaxed)),
-          producerCount(other.producerCount.load(std::memory_order_relaxed)),
-          initialBlockPoolIndex(other.initialBlockPoolIndex.load(std::memory_order_relaxed)),
-          initialBlockPool(other.initialBlockPool),
-          initialBlockPoolSize(other.initialBlockPoolSize),
-          freeList(std::move(other.freeList)),
-          nextExplicitConsumerId(other.nextExplicitConsumerId.load(std::memory_order_relaxed)),
-          globalExplicitConsumerOffset(other.globalExplicitConsumerOffset.load(std::memory_order_relaxed))
-    {
-        // Move the other one into this, and leave the other one as an empty queue
-        implicitProducerHashResizeInProgress.clear(std::memory_order_relaxed);
-        populate_initial_implicit_producer_hash();
-        swap_implicit_producer_hashes(other);
-
-        other.producerListTail.store(nullptr, std::memory_order_relaxed);
-        other.producerCount.store(0, std::memory_order_relaxed);
-        other.nextExplicitConsumerId.store(0, std::memory_order_relaxed);
-        other.globalExplicitConsumerOffset.store(0, std::memory_order_relaxed);
-
-#ifdef MOODYCAMEL_QUEUE_INTERNAL_DEBUG
-        explicitProducers.store(other.explicitProducers.load(std::memory_order_relaxed), std::memory_order_relaxed);
-        other.explicitProducers.store(nullptr, std::memory_order_relaxed);
-        implicitProducers.store(other.implicitProducers.load(std::memory_order_relaxed), std::memory_order_relaxed);
-        other.implicitProducers.store(nullptr, std::memory_order_relaxed);
-#endif
-
-        other.initialBlockPoolIndex.store(0, std::memory_order_relaxed);
-        other.initialBlockPoolSize = 0;
-        other.initialBlockPool = nullptr;
-
-        reown_producers();
-    }
-
-    inline ConcurrentQueue& operator=(ConcurrentQueue&& other) MOODYCAMEL_NOEXCEPT { return swap_internal(other); }
-
-    // Swaps this queue's state with the other's. Not thread-safe.
-    // Swapping two queues does not invalidate their tokens, however
-    // the tokens that were created for one queue must be used with
-    // only the swapped queue (i.e. the tokens are tied to the
-    // queue's movable state, not the object itself).
-    inline void swap(ConcurrentQueue& other) MOODYCAMEL_NOEXCEPT { swap_internal(other); }
-
-  private:
-    ConcurrentQueue& swap_internal(ConcurrentQueue& other)
-    {
-        if (this == &other) {
-            return *this;
-        }
-
-        details::swap_relaxed(producerListTail, other.producerListTail);
-        details::swap_relaxed(producerCount, other.producerCount);
-        details::swap_relaxed(initialBlockPoolIndex, other.initialBlockPoolIndex);
-        std::swap(initialBlockPool, other.initialBlockPool);
-        std::swap(initialBlockPoolSize, other.initialBlockPoolSize);
-        freeList.swap(other.freeList);
-        details::swap_relaxed(nextExplicitConsumerId, other.nextExplicitConsumerId);
-        details::swap_relaxed(globalExplicitConsumerOffset, other.globalExplicitConsumerOffset);
-
-        swap_implicit_producer_hashes(other);
-
-        reown_producers();
-        other.reown_producers();
-
-#ifdef MOODYCAMEL_QUEUE_INTERNAL_DEBUG
-        details::swap_relaxed(explicitProducers, other.explicitProducers);
-        details::swap_relaxed(implicitProducers, other.implicitProducers);
-#endif
-
-        return *this;
-    }
-
-  public:
-    // Enqueues a single item (by copying it).
-    // Allocates memory if required. Only fails if memory allocation fails (or implicit
-    // production is disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE is 0,
-    // or Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-    // Thread-safe.
-    inline bool enqueue(T const& item)
-    {
-        MOODYCAMEL_CONSTEXPR_IF(INITIAL_IMPLICIT_PRODUCER_HASH_SIZE == 0) return false;
-        else return inner_enqueue<CanAlloc>(item);
-    }
-
-    // Enqueues a single item (by moving it, if possible).
-    // Allocates memory if required. Only fails if memory allocation fails (or implicit
-    // production is disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE is 0,
-    // or Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-    // Thread-safe.
-    inline bool enqueue(T&& item)
-    {
-        MOODYCAMEL_CONSTEXPR_IF(INITIAL_IMPLICIT_PRODUCER_HASH_SIZE == 0) return false;
-        else return inner_enqueue<CanAlloc>(std::move(item));
-    }
-
-    // Enqueues a single item (by copying it) using an explicit producer token.
-    // Allocates memory if required. Only fails if memory allocation fails (or
-    // Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-    // Thread-safe.
-    inline bool enqueue(producer_token_t const& token, T const& item) { return inner_enqueue<CanAlloc>(token, item); }
-
-    // Enqueues a single item (by moving it, if possible) using an explicit producer token.
-    // Allocates memory if required. Only fails if memory allocation fails (or
-    // Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-    // Thread-safe.
-    inline bool enqueue(producer_token_t const& token, T&& item)
-    {
-        return inner_enqueue<CanAlloc>(token, std::move(item));
-    }
-
-    // Enqueues several items.
-    // Allocates memory if required. Only fails if memory allocation fails (or
-    // implicit production is disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE
-    // is 0, or Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-    // Note: Use std::make_move_iterator if the elements should be moved instead of copied.
-    // Thread-safe.
-    template <typename It> bool enqueue_bulk(It itemFirst, size_t count)
-    {
-        MOODYCAMEL_CONSTEXPR_IF(INITIAL_IMPLICIT_PRODUCER_HASH_SIZE == 0) return false;
-        else return inner_enqueue_bulk<CanAlloc>(itemFirst, count);
-    }
-
-    // Enqueues several items using an explicit producer token.
-    // Allocates memory if required. Only fails if memory allocation fails
-    // (or Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-    // Note: Use std::make_move_iterator if the elements should be moved
-    // instead of copied.
-    // Thread-safe.
-    template <typename It> bool enqueue_bulk(producer_token_t const& token, It itemFirst, size_t count)
-    {
-        return inner_enqueue_bulk<CanAlloc>(token, itemFirst, count);
-    }
-
-    // Enqueues a single item (by copying it).
-    // Does not allocate memory. Fails if not enough room to enqueue (or implicit
-    // production is disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE
-    // is 0).
-    // Thread-safe.
-    inline bool try_enqueue(T const& item)
-    {
-        MOODYCAMEL_CONSTEXPR_IF(INITIAL_IMPLICIT_PRODUCER_HASH_SIZE == 0) return false;
-        else return inner_enqueue<CannotAlloc>(item);
-    }
-
-    // Enqueues a single item (by moving it, if possible).
-    // Does not allocate memory (except for one-time implicit producer).
-    // Fails if not enough room to enqueue (or implicit production is
-    // disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE is 0).
-    // Thread-safe.
-    inline bool try_enqueue(T&& item)
-    {
-        MOODYCAMEL_CONSTEXPR_IF(INITIAL_IMPLICIT_PRODUCER_HASH_SIZE == 0) return false;
-        else return inner_enqueue<CannotAlloc>(std::move(item));
-    }
-
-    // Enqueues a single item (by copying it) using an explicit producer token.
-    // Does not allocate memory. Fails if not enough room to enqueue.
-    // Thread-safe.
-    inline bool try_enqueue(producer_token_t const& token, T const& item)
-    {
-        return inner_enqueue<CannotAlloc>(token, item);
-    }
-
-    // Enqueues a single item (by moving it, if possible) using an explicit producer token.
-    // Does not allocate memory. Fails if not enough room to enqueue.
-    // Thread-safe.
-    inline bool try_enqueue(producer_token_t const& token, T&& item)
-    {
-        return inner_enqueue<CannotAlloc>(token, std::move(item));
-    }
-
-    // Enqueues several items.
-    // Does not allocate memory (except for one-time implicit producer).
-    // Fails if not enough room to enqueue (or implicit production is
-    // disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE is 0).
-    // Note: Use std::make_move_iterator if the elements should be moved
-    // instead of copied.
-    // Thread-safe.
-    template <typename It> bool try_enqueue_bulk(It itemFirst, size_t count)
-    {
-        MOODYCAMEL_CONSTEXPR_IF(INITIAL_IMPLICIT_PRODUCER_HASH_SIZE == 0) return false;
-        else return inner_enqueue_bulk<CannotAlloc>(itemFirst, count);
-    }
-
-    // Enqueues several items using an explicit producer token.
-    // Does not allocate memory. Fails if not enough room to enqueue.
-    // Note: Use std::make_move_iterator if the elements should be moved
-    // instead of copied.
-    // Thread-safe.
-    template <typename It> bool try_enqueue_bulk(producer_token_t const& token, It itemFirst, size_t count)
-    {
-        return inner_enqueue_bulk<CannotAlloc>(token, itemFirst, count);
-    }
-
-    // Attempts to dequeue from the queue.
-    // Returns false if all producer streams appeared empty at the time they
-    // were checked (so, the queue is likely but not guaranteed to be empty).
-    // Never allocates. Thread-safe.
-    template <typename U> bool try_dequeue(U& item)
-    {
-        // Instead of simply trying each producer in turn (which could cause needless contention on the first
-        // producer), we score them heuristically.
-        size_t nonEmptyCount = 0;
-        ProducerBase* best = nullptr;
-        size_t bestSize = 0;
-        for (auto ptr = producerListTail.load(std::memory_order_acquire); nonEmptyCount < 3 && ptr != nullptr;
-             ptr = ptr->next_prod()) {
-            auto size = ptr->size_approx();
-            if (size > 0) {
-                if (size > bestSize) {
-                    bestSize = size;
-                    best = ptr;
-                }
-                ++nonEmptyCount;
-            }
-        }
-
-        // If there was at least one non-empty queue but it appears empty at the time
-        // we try to dequeue from it, we need to make sure every queue's been tried
-        if (nonEmptyCount > 0) {
-            if ((details::likely)(best->dequeue(item))) {
-                return true;
-            }
-            for (auto ptr = producerListTail.load(std::memory_order_acquire); ptr != nullptr; ptr = ptr->next_prod()) {
-                if (ptr != best && ptr->dequeue(item)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    // Attempts to dequeue from the queue.
-    // Returns false if all producer streams appeared empty at the time they
-    // were checked (so, the queue is likely but not guaranteed to be empty).
-    // This differs from the try_dequeue(item) method in that this one does
-    // not attempt to reduce contention by interleaving the order that producer
-    // streams are dequeued from. So, using this method can reduce overall throughput
-    // under contention, but will give more predictable results in single-threaded
-    // consumer scenarios. This is mostly only useful for internal unit tests.
-    // Never allocates. Thread-safe.
-    template <typename U> bool try_dequeue_non_interleaved(U& item)
-    {
-        for (auto ptr = producerListTail.load(std::memory_order_acquire); ptr != nullptr; ptr = ptr->next_prod()) {
-            if (ptr->dequeue(item)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    // Attempts to dequeue from the queue using an explicit consumer token.
-    // Returns false if all producer streams appeared empty at the time they
-    // were checked (so, the queue is likely but not guaranteed to be empty).
-    // Never allocates. Thread-safe.
-    template <typename U> bool try_dequeue(consumer_token_t& token, U& item)
-    {
-        // The idea is roughly as follows:
-        // Every 256 items from one producer, make everyone rotate (increase the global offset) -> this means the
-        // highest efficiency consumer dictates the rotation speed of everyone else, more or less If you see that the
-        // global offset has changed, you must reset your consumption counter and move to your designated place If
-        // there's no items where you're supposed to be, keep moving until you find a producer with some items If the
-        // global offset has not changed but you've run out of items to consume, move over from your current position
-        // until you find an producer with something in it
-
-        if (token.desiredProducer == nullptr ||
-            token.lastKnownGlobalOffset != globalExplicitConsumerOffset.load(std::memory_order_relaxed)) {
-            if (!update_current_producer_after_rotation(token)) {
-                return false;
-            }
-        }
-
-        // If there was at least one non-empty queue but it appears empty at the time
-        // we try to dequeue from it, we need to make sure every queue's been tried
-        if (static_cast<ProducerBase*>(token.currentProducer)->dequeue(item)) {
-            if (++token.itemsConsumedFromCurrent == EXPLICIT_CONSUMER_CONSUMPTION_QUOTA_BEFORE_ROTATE) {
-                globalExplicitConsumerOffset.fetch_add(1, std::memory_order_relaxed);
-            }
-            return true;
-        }
-
-        auto tail = producerListTail.load(std::memory_order_acquire);
-        auto ptr = static_cast<ProducerBase*>(token.currentProducer)->next_prod();
-        if (ptr == nullptr) {
-            ptr = tail;
-        }
-        while (ptr != static_cast<ProducerBase*>(token.currentProducer)) {
-            if (ptr->dequeue(item)) {
-                token.currentProducer = ptr;
-                token.itemsConsumedFromCurrent = 1;
-                return true;
-            }
-            ptr = ptr->next_prod();
-            if (ptr == nullptr) {
-                ptr = tail;
-            }
-        }
-        return false;
-    }
-
-    // Attempts to dequeue several elements from the queue.
-    // Returns the number of items actually dequeued.
-    // Returns 0 if all producer streams appeared empty at the time they
-    // were checked (so, the queue is likely but not guaranteed to be empty).
-    // Never allocates. Thread-safe.
-    template <typename It> size_t try_dequeue_bulk(It itemFirst, size_t max)
-    {
-        size_t count = 0;
-        for (auto ptr = producerListTail.load(std::memory_order_acquire); ptr != nullptr; ptr = ptr->next_prod()) {
-            count += ptr->dequeue_bulk(itemFirst, max - count);
-            if (count == max) {
-                break;
-            }
-        }
-        return count;
-    }
-
-    // Attempts to dequeue several elements from the queue using an explicit consumer token.
-    // Returns the number of items actually dequeued.
-    // Returns 0 if all producer streams appeared empty at the time they
-    // were checked (so, the queue is likely but not guaranteed to be empty).
-    // Never allocates. Thread-safe.
-    template <typename It> size_t try_dequeue_bulk(consumer_token_t& token, It itemFirst, size_t max)
-    {
-        if (token.desiredProducer == nullptr ||
-            token.lastKnownGlobalOffset != globalExplicitConsumerOffset.load(std::memory_order_relaxed)) {
-            if (!update_current_producer_after_rotation(token)) {
-                return 0;
-            }
-        }
-
-        size_t count = static_cast<ProducerBase*>(token.currentProducer)->dequeue_bulk(itemFirst, max);
-        if (count == max) {
-            if ((token.itemsConsumedFromCurrent += static_cast<std::uint32_t>(max)) >=
-                EXPLICIT_CONSUMER_CONSUMPTION_QUOTA_BEFORE_ROTATE) {
-                globalExplicitConsumerOffset.fetch_add(1, std::memory_order_relaxed);
-            }
-            return max;
-        }
-        token.itemsConsumedFromCurrent += static_cast<std::uint32_t>(count);
-        max -= count;
-
-        auto tail = producerListTail.load(std::memory_order_acquire);
-        auto ptr = static_cast<ProducerBase*>(token.currentProducer)->next_prod();
-        if (ptr == nullptr) {
-            ptr = tail;
-        }
-        while (ptr != static_cast<ProducerBase*>(token.currentProducer)) {
-            auto dequeued = ptr->dequeue_bulk(itemFirst, max);
-            count += dequeued;
-            if (dequeued != 0) {
-                token.currentProducer = ptr;
-                token.itemsConsumedFromCurrent = static_cast<std::uint32_t>(dequeued);
-            }
-            if (dequeued == max) {
-                break;
-            }
-            max -= dequeued;
-            ptr = ptr->next_prod();
-            if (ptr == nullptr) {
-                ptr = tail;
-            }
-        }
-        return count;
-    }
-
-    // Attempts to dequeue from a specific producer's inner queue.
-    // If you happen to know which producer you want to dequeue from, this
-    // is significantly faster than using the general-case try_dequeue methods.
-    // Returns false if the producer's queue appeared empty at the time it
-    // was checked (so, the queue is likely but not guaranteed to be empty).
-    // Never allocates. Thread-safe.
-    template <typename U> inline bool try_dequeue_from_producer(producer_token_t const& producer, U& item)
-    {
-        return static_cast<ExplicitProducer*>(producer.producer)->dequeue(item);
-    }
-
-    // Attempts to dequeue several elements from a specific producer's inner queue.
-    // Returns the number of items actually dequeued.
-    // If you happen to know which producer you want to dequeue from, this
-    // is significantly faster than using the general-case try_dequeue methods.
-    // Returns 0 if the producer's queue appeared empty at the time it
-    // was checked (so, the queue is likely but not guaranteed to be empty).
-    // Never allocates. Thread-safe.
-    template <typename It>
-    inline size_t try_dequeue_bulk_from_producer(producer_token_t const& producer, It itemFirst, size_t max)
-    {
-        return static_cast<ExplicitProducer*>(producer.producer)->dequeue_bulk(itemFirst, max);
-    }
-
-    // Returns an estimate of the total number of elements currently in the queue. This
-    // estimate is only accurate if the queue has completely stabilized before it is called
-    // (i.e. all enqueue and dequeue operations have completed and their memory effects are
-    // visible on the calling thread, and no further operations start while this method is
-    // being called).
-    // Thread-safe.
-    size_t size_approx() const
-    {
-        size_t size = 0;
-        for (auto ptr = producerListTail.load(std::memory_order_acquire); ptr != nullptr; ptr = ptr->next_prod()) {
-            size += ptr->size_approx();
-        }
-        return size;
-    }
-
-    // Returns true if the underlying atomic variables used by
-    // the queue are lock-free (they should be on most platforms).
-    // Thread-safe.
-    static constexpr bool is_lock_free()
-    {
-        return details::static_is_lock_free<bool>::value == 2 && details::static_is_lock_free<size_t>::value == 2 &&
-               details::static_is_lock_free<std::uint32_t>::value == 2 &&
-               details::static_is_lock_free<index_t>::value == 2 && details::static_is_lock_free<void*>::value == 2 &&
-               details::static_is_lock_free<
-                   typename details::thread_id_converter<details::thread_id_t>::thread_id_numeric_size_t>::value == 2;
-    }
-
-  private:
-    friend struct ProducerToken;
-    friend struct ConsumerToken;
-    struct ExplicitProducer;
-    friend struct ExplicitProducer;
-    struct ImplicitProducer;
-    friend struct ImplicitProducer;
-    friend class ConcurrentQueueTests;
-
-    enum AllocationMode { CanAlloc, CannotAlloc };
-
-    ///////////////////////////////
-    // Queue methods
-    ///////////////////////////////
-
-    template <AllocationMode canAlloc, typename U> inline bool inner_enqueue(producer_token_t const& token, U&& element)
-    {
-        return static_cast<ExplicitProducer*>(token.producer)
-            ->ConcurrentQueue::ExplicitProducer::template enqueue<canAlloc>(std::forward<U>(element));
-    }
-
-    template <AllocationMode canAlloc, typename U> inline bool inner_enqueue(U&& element)
-    {
-        auto producer = get_or_add_implicit_producer();
-        return producer == nullptr
-                   ? false
-                   : producer->ConcurrentQueue::ImplicitProducer::template enqueue<canAlloc>(std::forward<U>(element));
-    }
-
-    template <AllocationMode canAlloc, typename It>
-    inline bool inner_enqueue_bulk(producer_token_t const& token, It itemFirst, size_t count)
-    {
-        return static_cast<ExplicitProducer*>(token.producer)
-            ->ConcurrentQueue::ExplicitProducer::template enqueue_bulk<canAlloc>(itemFirst, count);
-    }
-
-    template <AllocationMode canAlloc, typename It> inline bool inner_enqueue_bulk(It itemFirst, size_t count)
-    {
-        auto producer = get_or_add_implicit_producer();
-        return producer == nullptr
-                   ? false
-                   : producer->ConcurrentQueue::ImplicitProducer::template enqueue_bulk<canAlloc>(itemFirst, count);
-    }
-
-    inline bool update_current_producer_after_rotation(consumer_token_t& token)
-    {
-        // Ah, there's been a rotation, figure out where we should be!
-        auto tail = producerListTail.load(std::memory_order_acquire);
-        if (token.desiredProducer == nullptr && tail == nullptr) {
-            return false;
-        }
-        auto prodCount = producerCount.load(std::memory_order_relaxed);
-        auto globalOffset = globalExplicitConsumerOffset.load(std::memory_order_relaxed);
-        if ((details::unlikely)(token.desiredProducer == nullptr)) {
-            // Aha, first time we're dequeueing anything.
-            // Figure out our local position
-            // Note: offset is from start, not end, but we're traversing from end -- subtract from count first
-            std::uint32_t offset = prodCount - 1 - (token.initialOffset % prodCount);
-            token.desiredProducer = tail;
-            for (std::uint32_t i = 0; i != offset; ++i) {
-                token.desiredProducer = static_cast<ProducerBase*>(token.desiredProducer)->next_prod();
-                if (token.desiredProducer == nullptr) {
-                    token.desiredProducer = tail;
-                }
-            }
-        }
-
-        std::uint32_t delta = globalOffset - token.lastKnownGlobalOffset;
-        if (delta >= prodCount) {
-            delta = delta % prodCount;
-        }
-        for (std::uint32_t i = 0; i != delta; ++i) {
-            token.desiredProducer = static_cast<ProducerBase*>(token.desiredProducer)->next_prod();
-            if (token.desiredProducer == nullptr) {
-                token.desiredProducer = tail;
-            }
-        }
-
-        token.lastKnownGlobalOffset = globalOffset;
-        token.currentProducer = token.desiredProducer;
-        token.itemsConsumedFromCurrent = 0;
-        return true;
-    }
-
-    ///////////////////////////
-    // Free list
-    ///////////////////////////
-
-    template <typename N> struct FreeListNode {
-        FreeListNode()
-            : freeListRefs(0)
-            , freeListNext(nullptr)
-        {}
-
-        std::atomic<std::uint32_t> freeListRefs;
-        std::atomic<N*> freeListNext;
-    };
-
-    // A simple CAS-based lock-free free list. Not the fastest thing in the world under heavy contention, but
-    // simple and correct (assuming nodes are never freed until after the free list is destroyed), and fairly
-    // speedy under low contention.
-    template <typename N> // N must inherit FreeListNode or have the same fields (and initialization of them)
-    struct FreeList {
-        FreeList()
-            : freeListHead(nullptr)
-        {}
-        FreeList(FreeList&& other)
-            : freeListHead(other.freeListHead.load(std::memory_order_relaxed))
-        {
-            other.freeListHead.store(nullptr, std::memory_order_relaxed);
-        }
-        void swap(FreeList& other) { details::swap_relaxed(freeListHead, other.freeListHead); }
-
-        FreeList(FreeList const&) MOODYCAMEL_DELETE_FUNCTION;
-        FreeList& operator=(FreeList const&) MOODYCAMEL_DELETE_FUNCTION;
-
-        inline void add(N* node)
-        {
-#ifdef MCDBGQ_NOLOCKFREE_FREELIST
-            debug::DebugLock lock(mutex);
-#endif
-            // We know that the should-be-on-freelist bit is 0 at this point, so it's safe to
-            // set it using a fetch_add
-            if (node->freeListRefs.fetch_add(SHOULD_BE_ON_FREELIST, std::memory_order_acq_rel) == 0) {
-                // Oh look! We were the last ones referencing this node, and we know
-                // we want to add it to the free list, so let's do it!
-                add_knowing_refcount_is_zero(node);
-            }
-        }
-
-        inline N* try_get()
-        {
-#ifdef MCDBGQ_NOLOCKFREE_FREELIST
-            debug::DebugLock lock(mutex);
-#endif
-            auto head = freeListHead.load(std::memory_order_acquire);
-            while (head != nullptr) {
-                auto prevHead = head;
-                auto refs = head->freeListRefs.load(std::memory_order_relaxed);
-                if ((refs & REFS_MASK) == 0 ||
-                    !head->freeListRefs.compare_exchange_strong(
-                        refs, refs + 1, std::memory_order_acquire, std::memory_order_relaxed)) {
-                    head = freeListHead.load(std::memory_order_acquire);
-                    continue;
-                }
-
-                // Good, reference count has been incremented (it wasn't at zero), which means we can read the
-                // next and not worry about it changing between now and the time we do the CAS
-                auto next = head->freeListNext.load(std::memory_order_relaxed);
-                if (freeListHead.compare_exchange_strong(
-                        head, next, std::memory_order_acquire, std::memory_order_relaxed)) {
-                    // Yay, got the node. This means it was on the list, which means shouldBeOnFreeList must be false no
-                    // matter the refcount (because nobody else knows it's been taken off yet, it can't have been put
-                    // back on).
-                    assert((head->freeListRefs.load(std::memory_order_relaxed) & SHOULD_BE_ON_FREELIST) == 0);
-
-                    // Decrease refcount twice, once for our ref, and once for the list's ref
-                    head->freeListRefs.fetch_sub(2, std::memory_order_release);
-                    return head;
-                }
-
-                // OK, the head must have changed on us, but we still need to decrease the refcount we increased.
-                // Note that we don't need to release any memory effects, but we do need to ensure that the reference
-                // count decrement happens-after the CAS on the head.
-                refs = prevHead->freeListRefs.fetch_sub(1, std::memory_order_acq_rel);
-                if (refs == SHOULD_BE_ON_FREELIST + 1) {
-                    add_knowing_refcount_is_zero(prevHead);
-                }
-            }
-
-            return nullptr;
-        }
-
-        // Useful for traversing the list when there's no contention (e.g. to destroy remaining nodes)
-        N* head_unsafe() const { return freeListHead.load(std::memory_order_relaxed); }
-
-      private:
-        inline void add_knowing_refcount_is_zero(N* node)
-        {
-            // Since the refcount is zero, and nobody can increase it once it's zero (except us, and we run
-            // only one copy of this method per node at a time, i.e. the single thread case), then we know
-            // we can safely change the next pointer of the node; however, once the refcount is back above
-            // zero, then other threads could increase it (happens under heavy contention, when the refcount
-            // goes to zero in between a load and a refcount increment of a node in try_get, then back up to
-            // something non-zero, then the refcount increment is done by the other thread) -- so, if the CAS
-            // to add the node to the actual list fails, decrease the refcount and leave the add operation to
-            // the next thread who puts the refcount back at zero (which could be us, hence the loop).
-            auto head = freeListHead.load(std::memory_order_relaxed);
-            while (true) {
-                node->freeListNext.store(head, std::memory_order_relaxed);
-                node->freeListRefs.store(1, std::memory_order_release);
-                if (!freeListHead.compare_exchange_strong(
-                        head, node, std::memory_order_release, std::memory_order_relaxed)) {
-                    // Hmm, the add failed, but we can only try again when the refcount goes back to zero
-                    if (node->freeListRefs.fetch_add(SHOULD_BE_ON_FREELIST - 1, std::memory_order_release) == 1) {
-                        continue;
-                    }
-                }
-                return;
-            }
-        }
-
-      private:
-        // Implemented like a stack, but where node order doesn't matter (nodes are inserted out of order under
-        // contention)
-        std::atomic<N*> freeListHead;
-
-        static const std::uint32_t REFS_MASK = 0x7FFFFFFF;
-        static const std::uint32_t SHOULD_BE_ON_FREELIST = 0x80000000;
-
-#ifdef MCDBGQ_NOLOCKFREE_FREELIST
-        debug::DebugMutex mutex;
-#endif
-    };
-
-    ///////////////////////////
-    // Block
-    ///////////////////////////
-
-    enum InnerQueueContext { implicit_context = 0, explicit_context = 1 };
-
-    struct Block {
-        Block()
-            : next(nullptr)
-            , elementsCompletelyDequeued(0)
-            , freeListRefs(0)
-            , freeListNext(nullptr)
-            , dynamicallyAllocated(true)
-        {
-#ifdef MCDBGQ_TRACKMEM
-            owner = nullptr;
-#endif
-        }
-
-        template <InnerQueueContext context> inline bool is_empty() const
-        {
-            MOODYCAMEL_CONSTEXPR_IF(context == explicit_context && BLOCK_SIZE <= EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD)
-            {
-                // Check flags
-                for (size_t i = 0; i < BLOCK_SIZE; ++i) {
-                    if (!emptyFlags[i].load(std::memory_order_relaxed)) {
-                        return false;
-                    }
-                }
-
-                // Aha, empty; make sure we have all other memory effects that happened before the empty flags were set
-                std::atomic_thread_fence(std::memory_order_acquire);
-                return true;
-            }
-            else
-            {
-                // Check counter
-                if (elementsCompletelyDequeued.load(std::memory_order_relaxed) == BLOCK_SIZE) {
-                    std::atomic_thread_fence(std::memory_order_acquire);
-                    return true;
-                }
-                assert(elementsCompletelyDequeued.load(std::memory_order_relaxed) <= BLOCK_SIZE);
-                return false;
-            }
-        }
-
-        // Returns true if the block is now empty (does not apply in explicit context)
-        template <InnerQueueContext context> inline bool set_empty(MOODYCAMEL_MAYBE_UNUSED index_t i)
-        {
-            MOODYCAMEL_CONSTEXPR_IF(context == explicit_context && BLOCK_SIZE <= EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD)
-            {
-                // Set flag
-                assert(!emptyFlags[BLOCK_SIZE - 1 - static_cast<size_t>(i & static_cast<index_t>(BLOCK_SIZE - 1))].load(
-                    std::memory_order_relaxed));
-                emptyFlags[BLOCK_SIZE - 1 - static_cast<size_t>(i & static_cast<index_t>(BLOCK_SIZE - 1))].store(
-                    true, std::memory_order_release);
-                return false;
-            }
-            else
-            {
-                // Increment counter
-                auto prevVal = elementsCompletelyDequeued.fetch_add(1, std::memory_order_release);
-                assert(prevVal < BLOCK_SIZE);
-                return prevVal == BLOCK_SIZE - 1;
-            }
-        }
-
-        // Sets multiple contiguous item statuses to 'empty' (assumes no wrapping and count > 0).
-        // Returns true if the block is now empty (does not apply in explicit context).
-        template <InnerQueueContext context> inline bool set_many_empty(MOODYCAMEL_MAYBE_UNUSED index_t i, size_t count)
-        {
-            MOODYCAMEL_CONSTEXPR_IF(context == explicit_context && BLOCK_SIZE <= EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD)
-            {
-                // Set flags
-                std::atomic_thread_fence(std::memory_order_release);
-                i = BLOCK_SIZE - 1 - static_cast<size_t>(i & static_cast<index_t>(BLOCK_SIZE - 1)) - count + 1;
-                for (size_t j = 0; j != count; ++j) {
-                    assert(!emptyFlags[i + j].load(std::memory_order_relaxed));
-                    emptyFlags[i + j].store(true, std::memory_order_relaxed);
-                }
-                return false;
-            }
-            else
-            {
-                // Increment counter
-                auto prevVal = elementsCompletelyDequeued.fetch_add(count, std::memory_order_release);
-                assert(prevVal + count <= BLOCK_SIZE);
-                return prevVal + count == BLOCK_SIZE;
-            }
-        }
-
-        template <InnerQueueContext context> inline void set_all_empty()
-        {
-            MOODYCAMEL_CONSTEXPR_IF(context == explicit_context && BLOCK_SIZE <= EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD)
-            {
-                // Set all flags
-                for (size_t i = 0; i != BLOCK_SIZE; ++i) {
-                    emptyFlags[i].store(true, std::memory_order_relaxed);
-                }
-            }
-            else
-            {
-                // Reset counter
-                elementsCompletelyDequeued.store(BLOCK_SIZE, std::memory_order_relaxed);
-            }
-        }
-
-        template <InnerQueueContext context> inline void reset_empty()
-        {
-            MOODYCAMEL_CONSTEXPR_IF(context == explicit_context && BLOCK_SIZE <= EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD)
-            {
-                // Reset flags
-                for (size_t i = 0; i != BLOCK_SIZE; ++i) {
-                    emptyFlags[i].store(false, std::memory_order_relaxed);
-                }
-            }
-            else
-            {
-                // Reset counter
-                elementsCompletelyDequeued.store(0, std::memory_order_relaxed);
-            }
-        }
-
-        inline T* operator[](index_t idx) MOODYCAMEL_NOEXCEPT
-        {
-            return static_cast<T*>(static_cast<void*>(elements)) +
-                   static_cast<size_t>(idx & static_cast<index_t>(BLOCK_SIZE - 1));
-        }
-        inline T const* operator[](index_t idx) const MOODYCAMEL_NOEXCEPT
-        {
-            return static_cast<T const*>(static_cast<void const*>(elements)) +
-                   static_cast<size_t>(idx & static_cast<index_t>(BLOCK_SIZE - 1));
-        }
-
-      private:
-        static_assert(std::alignment_of<T>::value <= sizeof(T),
-                      "The queue does not support types with an alignment greater than their size at this time");
-        MOODYCAMEL_ALIGNED_TYPE_LIKE(char[sizeof(T) * BLOCK_SIZE], T) elements;
-
-      public:
-        Block* next;
-        std::atomic<size_t> elementsCompletelyDequeued;
-        std::atomic<bool> emptyFlags[BLOCK_SIZE <= EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD ? BLOCK_SIZE : 1];
-
-      public:
-        std::atomic<std::uint32_t> freeListRefs;
-        std::atomic<Block*> freeListNext;
-        bool dynamicallyAllocated; // Perhaps a better name for this would be 'isNotPartOfInitialBlockPool'
-
-#ifdef MCDBGQ_TRACKMEM
-        void* owner;
-#endif
-    };
-    static_assert(std::alignment_of<Block>::value >= std::alignment_of<T>::value,
-                  "Internal error: Blocks must be at least as aligned as the type they are wrapping");
-
-#ifdef MCDBGQ_TRACKMEM
-  public:
-    struct MemStats;
-
-  private:
-#endif
-
-    ///////////////////////////
-    // Producer base
-    ///////////////////////////
-
-    struct ProducerBase : public details::ConcurrentQueueProducerTypelessBase {
-        ProducerBase(ConcurrentQueue* parent_, bool isExplicit_)
-            : tailIndex(0)
-            , headIndex(0)
-            , dequeueOptimisticCount(0)
-            , dequeueOvercommit(0)
-            , tailBlock(nullptr)
-            , isExplicit(isExplicit_)
-            , parent(parent_)
-        {}
-
-        virtual ~ProducerBase() {}
-
-        template <typename U> inline bool dequeue(U& element)
-        {
-            if (isExplicit) {
-                return static_cast<ExplicitProducer*>(this)->dequeue(element);
-            } else {
-                return static_cast<ImplicitProducer*>(this)->dequeue(element);
-            }
-        }
-
-        template <typename It> inline size_t dequeue_bulk(It& itemFirst, size_t max)
-        {
-            if (isExplicit) {
-                return static_cast<ExplicitProducer*>(this)->dequeue_bulk(itemFirst, max);
-            } else {
-                return static_cast<ImplicitProducer*>(this)->dequeue_bulk(itemFirst, max);
-            }
-        }
-
-        inline ProducerBase* next_prod() const { return static_cast<ProducerBase*>(next); }
-
-        inline size_t size_approx() const
-        {
-            auto tail = tailIndex.load(std::memory_order_relaxed);
-            auto head = headIndex.load(std::memory_order_relaxed);
-            return details::circular_less_than(head, tail) ? static_cast<size_t>(tail - head) : 0;
-        }
-
-        inline index_t getTail() const { return tailIndex.load(std::memory_order_relaxed); }
-
-      protected:
-        std::atomic<index_t> tailIndex; // Where to enqueue to next
-        std::atomic<index_t> headIndex; // Where to dequeue from next
-
-        std::atomic<index_t> dequeueOptimisticCount;
-        std::atomic<index_t> dequeueOvercommit;
-
-        Block* tailBlock;
-
-      public:
-        bool isExplicit;
-        ConcurrentQueue* parent;
-
-      protected:
-#ifdef MCDBGQ_TRACKMEM
-        friend struct MemStats;
-#endif
-    };
-
-    ///////////////////////////
-    // Explicit queue
-    ///////////////////////////
-
-    struct ExplicitProducer : public ProducerBase {
-        explicit ExplicitProducer(ConcurrentQueue* parent_)
-            : ProducerBase(parent_, true)
-            , blockIndex(nullptr)
-            , pr_blockIndexSlotsUsed(0)
-            , pr_blockIndexSize(EXPLICIT_INITIAL_INDEX_SIZE >> 1)
-            , pr_blockIndexFront(0)
-            , pr_blockIndexEntries(nullptr)
-            , pr_blockIndexRaw(nullptr)
-        {
-            size_t poolBasedIndexSize = details::ceil_to_pow_2(parent_->initialBlockPoolSize) >> 1;
-            if (poolBasedIndexSize > pr_blockIndexSize) {
-                pr_blockIndexSize = poolBasedIndexSize;
-            }
-
-            new_block_index(
-                0); // This creates an index with double the number of current entries, i.e. EXPLICIT_INITIAL_INDEX_SIZE
-        }
-
-        ~ExplicitProducer()
-        {
-            // Destruct any elements not yet dequeued.
-            // Since we're in the destructor, we can assume all elements
-            // are either completely dequeued or completely not (no halfways).
-            if (this->tailBlock != nullptr) { // Note this means there must be a block index too
-                // First find the block that's partially dequeued, if any
-                Block* halfDequeuedBlock = nullptr;
-                if ((this->headIndex.load(std::memory_order_relaxed) & static_cast<index_t>(BLOCK_SIZE - 1)) != 0) {
-                    // The head's not on a block boundary, meaning a block somewhere is partially dequeued
-                    // (or the head block is the tail block and was fully dequeued, but the head/tail are still not on a
-                    // boundary)
-                    size_t i = (pr_blockIndexFront - pr_blockIndexSlotsUsed) & (pr_blockIndexSize - 1);
-                    while (details::circular_less_than<index_t>(pr_blockIndexEntries[i].base + BLOCK_SIZE,
-                                                                this->headIndex.load(std::memory_order_relaxed))) {
-                        i = (i + 1) & (pr_blockIndexSize - 1);
-                    }
-                    assert(details::circular_less_than<index_t>(pr_blockIndexEntries[i].base,
-                                                                this->headIndex.load(std::memory_order_relaxed)));
-                    halfDequeuedBlock = pr_blockIndexEntries[i].block;
-                }
-
-                // Start at the head block (note the first line in the loop gives us the head from the tail on the first
-                // iteration)
-                auto block = this->tailBlock;
-                do {
-                    block = block->next;
-                    if (block->ConcurrentQueue::Block::template is_empty<explicit_context>()) {
-                        continue;
-                    }
-
-                    size_t i = 0; // Offset into block
-                    if (block == halfDequeuedBlock) {
-                        i = static_cast<size_t>(this->headIndex.load(std::memory_order_relaxed) &
-                                                static_cast<index_t>(BLOCK_SIZE - 1));
-                    }
-
-                    // Walk through all the items in the block; if this is the tail block, we need to stop when we reach
-                    // the tail index
-                    auto lastValidIndex =
-                        (this->tailIndex.load(std::memory_order_relaxed) & static_cast<index_t>(BLOCK_SIZE - 1)) == 0
-                            ? BLOCK_SIZE
-                            : static_cast<size_t>(this->tailIndex.load(std::memory_order_relaxed) &
-                                                  static_cast<index_t>(BLOCK_SIZE - 1));
-                    while (i != BLOCK_SIZE && (block != this->tailBlock || i != lastValidIndex)) {
-                        (*block)[i++]->~T();
-                    }
-                } while (block != this->tailBlock);
-            }
-
-            // Destroy all blocks that we own
-            if (this->tailBlock != nullptr) {
-                auto block = this->tailBlock;
-                do {
-                    auto nextBlock = block->next;
-                    this->parent->add_block_to_free_list(block);
-                    block = nextBlock;
-                } while (block != this->tailBlock);
-            }
-
-            // Destroy the block indices
-            auto header = static_cast<BlockIndexHeader*>(pr_blockIndexRaw);
-            while (header != nullptr) {
-                auto prev = static_cast<BlockIndexHeader*>(header->prev);
-                header->~BlockIndexHeader();
-                (Traits::free)(header);
-                header = prev;
-            }
-        }
-
-        template <AllocationMode allocMode, typename U> inline bool enqueue(U&& element)
-        {
-            index_t currentTailIndex = this->tailIndex.load(std::memory_order_relaxed);
-            index_t newTailIndex = 1 + currentTailIndex;
-            if ((currentTailIndex & static_cast<index_t>(BLOCK_SIZE - 1)) == 0) {
-                // We reached the end of a block, start a new one
-                auto startBlock = this->tailBlock;
-                auto originalBlockIndexSlotsUsed = pr_blockIndexSlotsUsed;
-                if (this->tailBlock != nullptr &&
-                    this->tailBlock->next->ConcurrentQueue::Block::template is_empty<explicit_context>()) {
-                    // We can re-use the block ahead of us, it's empty!
-                    this->tailBlock = this->tailBlock->next;
-                    this->tailBlock->ConcurrentQueue::Block::template reset_empty<explicit_context>();
-
-                    // We'll put the block on the block index (guaranteed to be room since we're conceptually removing
-                    // the last block from it first -- except instead of removing then adding, we can just overwrite).
-                    // Note that there must be a valid block index here, since even if allocation failed in the ctor,
-                    // it would have been re-attempted when adding the first block to the queue; since there is such
-                    // a block, a block index must have been successfully allocated.
-                } else {
-                    // Whatever head value we see here is >= the last value we saw here (relatively),
-                    // and <= its current value. Since we have the most recent tail, the head must be
-                    // <= to it.
-                    auto head = this->headIndex.load(std::memory_order_relaxed);
-                    assert(!details::circular_less_than<index_t>(currentTailIndex, head));
-                    if (!details::circular_less_than<index_t>(head, currentTailIndex + BLOCK_SIZE) ||
-                        (MAX_SUBQUEUE_SIZE != details::const_numeric_max<size_t>::value &&
-                         (MAX_SUBQUEUE_SIZE == 0 || MAX_SUBQUEUE_SIZE - BLOCK_SIZE < currentTailIndex - head))) {
-                        // We can't enqueue in another block because there's not enough leeway -- the
-                        // tail could surpass the head by the time the block fills up! (Or we'll exceed
-                        // the size limit, if the second part of the condition was true.)
-                        return false;
-                    }
-                    // We're going to need a new block; check that the block index has room
-                    if (pr_blockIndexRaw == nullptr || pr_blockIndexSlotsUsed == pr_blockIndexSize) {
-                        // Hmm, the circular block index is already full -- we'll need
-                        // to allocate a new index. Note pr_blockIndexRaw can only be nullptr if
-                        // the initial allocation failed in the constructor.
-
-                        MOODYCAMEL_CONSTEXPR_IF(allocMode == CannotAlloc)
-                        {
-                            return false;
-                        }
-                        else if (!new_block_index(pr_blockIndexSlotsUsed))
-                        {
-                            return false;
-                        }
-                    }
-
-                    // Insert a new block in the circular linked list
-                    auto newBlock = this->parent->ConcurrentQueue::template requisition_block<allocMode>();
-                    if (newBlock == nullptr) {
-                        return false;
-                    }
-#ifdef MCDBGQ_TRACKMEM
-                    newBlock->owner = this;
-#endif
-                    newBlock->ConcurrentQueue::Block::template reset_empty<explicit_context>();
-                    if (this->tailBlock == nullptr) {
-                        newBlock->next = newBlock;
-                    } else {
-                        newBlock->next = this->tailBlock->next;
-                        this->tailBlock->next = newBlock;
-                    }
-                    this->tailBlock = newBlock;
-                    ++pr_blockIndexSlotsUsed;
-                }
-
-                MOODYCAMEL_CONSTEXPR_IF(
-                    !MOODYCAMEL_NOEXCEPT_CTOR(T, U, new (static_cast<T*>(nullptr)) T(std::forward<U>(element))))
-                {
-                    // The constructor may throw. We want the element not to appear in the queue in
-                    // that case (without corrupting the queue):
-                    MOODYCAMEL_TRY
-                    {
-                        new ((*this->tailBlock)[currentTailIndex]) T(std::forward<U>(element));
-                    }
-                    MOODYCAMEL_CATCH(...)
-                    {
-                        // Revert change to the current block, but leave the new block available
-                        // for next time
-                        pr_blockIndexSlotsUsed = originalBlockIndexSlotsUsed;
-                        this->tailBlock = startBlock == nullptr ? this->tailBlock : startBlock;
-                        MOODYCAMEL_RETHROW;
-                    }
-                }
-                else
-                {
-                    (void)startBlock;
-                    (void)originalBlockIndexSlotsUsed;
-                }
-
-                // Add block to block index
-                auto& entry = blockIndex.load(std::memory_order_relaxed)->entries[pr_blockIndexFront];
-                entry.base = currentTailIndex;
-                entry.block = this->tailBlock;
-                blockIndex.load(std::memory_order_relaxed)->front.store(pr_blockIndexFront, std::memory_order_release);
-                pr_blockIndexFront = (pr_blockIndexFront + 1) & (pr_blockIndexSize - 1);
-
-                MOODYCAMEL_CONSTEXPR_IF(
-                    !MOODYCAMEL_NOEXCEPT_CTOR(T, U, new (static_cast<T*>(nullptr)) T(std::forward<U>(element))))
-                {
-                    this->tailIndex.store(newTailIndex, std::memory_order_release);
-                    return true;
-                }
-            }
-
-            // Enqueue
-            new ((*this->tailBlock)[currentTailIndex]) T(std::forward<U>(element));
-
-            this->tailIndex.store(newTailIndex, std::memory_order_release);
-            return true;
-        }
-
-        template <typename U> bool dequeue(U& element)
-        {
-            auto tail = this->tailIndex.load(std::memory_order_relaxed);
-            auto overcommit = this->dequeueOvercommit.load(std::memory_order_relaxed);
-            if (details::circular_less_than<index_t>(
-                    this->dequeueOptimisticCount.load(std::memory_order_relaxed) - overcommit, tail)) {
-                // Might be something to dequeue, let's give it a try
-
-                // Note that this if is purely for performance purposes in the common case when the queue is
-                // empty and the values are eventually consistent -- we may enter here spuriously.
-
-                // Note that whatever the values of overcommit and tail are, they are not going to change (unless we
-                // change them) and must be the same value at this point (inside the if) as when the if condition was
-                // evaluated.
-
-                // We insert an acquire fence here to synchronize-with the release upon incrementing dequeueOvercommit
-                // below. This ensures that whatever the value we got loaded into overcommit, the load of
-                // dequeueOptisticCount in the fetch_add below will result in a value at least as recent as that (and
-                // therefore at least as large). Note that I believe a compiler (signal) fence here would be sufficient
-                // due to the nature of fetch_add (all read-modify-write operations are guaranteed to work on the latest
-                // value in the modification order), but unfortunately that can't be shown to be correct using only the
-                // C++11 standard. See
-                // http://stackoverflow.com/questions/18223161/what-are-the-c11-memory-ordering-guarantees-in-this-corner-case
-                std::atomic_thread_fence(std::memory_order_acquire);
-
-                // Increment optimistic counter, then check if it went over the boundary
-                auto myDequeueCount = this->dequeueOptimisticCount.fetch_add(1, std::memory_order_relaxed);
-
-                // Note that since dequeueOvercommit must be <= dequeueOptimisticCount (because dequeueOvercommit is
-                // only ever incremented after dequeueOptimisticCount -- this is enforced in the `else` block below),
-                // and since we now have a version of dequeueOptimisticCount that is at least as recent as overcommit
-                // (due to the release upon incrementing dequeueOvercommit and the acquire above that synchronizes with
-                // it), overcommit <= myDequeueCount. However, we can't assert this since both dequeueOptimisticCount
-                // and dequeueOvercommit may (independently) overflow; in such a case, though, the logic still holds
-                // since the difference between the two is maintained.
-
-                // Note that we reload tail here in case it changed; it will be the same value as before or greater,
-                // since this load is sequenced after (happens after) the earlier load above. This is supported by
-                // read-read coherency (as defined in the standard), explained here:
-                // http://en.cppreference.com/w/cpp/atomic/memory_order
-                tail = this->tailIndex.load(std::memory_order_acquire);
-                if ((details::likely)(details::circular_less_than<index_t>(myDequeueCount - overcommit, tail))) {
-                    // Guaranteed to be at least one element to dequeue!
-
-                    // Get the index. Note that since there's guaranteed to be at least one element, this
-                    // will never exceed tail. We need to do an acquire-release fence here since it's possible
-                    // that whatever condition got us to this point was for an earlier enqueued element (that
-                    // we already see the memory effects for), but that by the time we increment somebody else
-                    // has incremented it, and we need to see the memory effects for *that* element, which is
-                    // in such a case is necessarily visible on the thread that incremented it in the first
-                    // place with the more current condition (they must have acquired a tail that is at least
-                    // as recent).
-                    auto index = this->headIndex.fetch_add(1, std::memory_order_acq_rel);
-
-                    // Determine which block the element is in
-
-                    auto localBlockIndex = blockIndex.load(std::memory_order_acquire);
-                    auto localBlockIndexHead = localBlockIndex->front.load(std::memory_order_acquire);
-
-                    // We need to be careful here about subtracting and dividing because of index wrap-around.
-                    // When an index wraps, we need to preserve the sign of the offset when dividing it by the
-                    // block size (in order to get a correct signed block count offset in all cases):
-                    auto headBase = localBlockIndex->entries[localBlockIndexHead].base;
-                    auto blockBaseIndex = index & ~static_cast<index_t>(BLOCK_SIZE - 1);
-                    auto offset = static_cast<size_t>(
-                        static_cast<typename std::make_signed<index_t>::type>(blockBaseIndex - headBase) /
-                        static_cast<typename std::make_signed<index_t>::type>(BLOCK_SIZE));
-                    auto block =
-                        localBlockIndex->entries[(localBlockIndexHead + offset) & (localBlockIndex->size - 1)].block;
-
-                    // Dequeue
-                    auto& el = *((*block)[index]);
-                    if (!MOODYCAMEL_NOEXCEPT_ASSIGN(T, T&&, element = std::move(el))) {
-                        // Make sure the element is still fully dequeued and destroyed even if the assignment
-                        // throws
-                        struct Guard {
-                            Block* block;
-                            index_t index;
-
-                            ~Guard()
-                            {
-                                (*block)[index]->~T();
-                                block->ConcurrentQueue::Block::template set_empty<explicit_context>(index);
-                            }
-                        } guard = { block, index };
-
-                        element = std::move(el); // NOLINT
-                    } else {
-                        element = std::move(el); // NOLINT
-                        el.~T();                 // NOLINT
-                        block->ConcurrentQueue::Block::template set_empty<explicit_context>(index);
-                    }
-
-                    return true;
-                } else {
-                    // Wasn't anything to dequeue after all; make the effective dequeue count eventually consistent
-                    this->dequeueOvercommit.fetch_add(
-                        1, std::memory_order_release); // Release so that the fetch_add on dequeueOptimisticCount is
-                                                       // guaranteed to happen before this write
-                }
-            }
-
-            return false;
-        }
-
-        template <AllocationMode allocMode, typename It>
-        bool MOODYCAMEL_NO_TSAN enqueue_bulk(It itemFirst, size_t count)
-        {
-            // First, we need to make sure we have enough room to enqueue all of the elements;
-            // this means pre-allocating blocks and putting them in the block index (but only if
-            // all the allocations succeeded).
-            index_t startTailIndex = this->tailIndex.load(std::memory_order_relaxed);
-            auto startBlock = this->tailBlock;
-            auto originalBlockIndexFront = pr_blockIndexFront;
-            auto originalBlockIndexSlotsUsed = pr_blockIndexSlotsUsed;
-
-            Block* firstAllocatedBlock = nullptr;
-
-            // Figure out how many blocks we'll need to allocate, and do so
-            size_t blockBaseDiff = ((startTailIndex + count - 1) & ~static_cast<index_t>(BLOCK_SIZE - 1)) -
-                                   ((startTailIndex - 1) & ~static_cast<index_t>(BLOCK_SIZE - 1));
-            index_t currentTailIndex = (startTailIndex - 1) & ~static_cast<index_t>(BLOCK_SIZE - 1);
-            if (blockBaseDiff > 0) {
-                // Allocate as many blocks as possible from ahead
-                while (blockBaseDiff > 0 && this->tailBlock != nullptr &&
-                       this->tailBlock->next != firstAllocatedBlock &&
-                       this->tailBlock->next->ConcurrentQueue::Block::template is_empty<explicit_context>()) {
-                    blockBaseDiff -= static_cast<index_t>(BLOCK_SIZE);
-                    currentTailIndex += static_cast<index_t>(BLOCK_SIZE);
-
-                    this->tailBlock = this->tailBlock->next;
-                    firstAllocatedBlock = firstAllocatedBlock == nullptr ? this->tailBlock : firstAllocatedBlock;
-
-                    auto& entry = blockIndex.load(std::memory_order_relaxed)->entries[pr_blockIndexFront];
-                    entry.base = currentTailIndex;
-                    entry.block = this->tailBlock;
-                    pr_blockIndexFront = (pr_blockIndexFront + 1) & (pr_blockIndexSize - 1);
-                }
-
-                // Now allocate as many blocks as necessary from the block pool
-                while (blockBaseDiff > 0) {
-                    blockBaseDiff -= static_cast<index_t>(BLOCK_SIZE);
-                    currentTailIndex += static_cast<index_t>(BLOCK_SIZE);
-
-                    auto head = this->headIndex.load(std::memory_order_relaxed);
-                    assert(!details::circular_less_than<index_t>(currentTailIndex, head));
-                    bool full = !details::circular_less_than<index_t>(head, currentTailIndex + BLOCK_SIZE) ||
-                                (MAX_SUBQUEUE_SIZE != details::const_numeric_max<size_t>::value &&
-                                 (MAX_SUBQUEUE_SIZE == 0 || MAX_SUBQUEUE_SIZE - BLOCK_SIZE < currentTailIndex - head));
-                    if (pr_blockIndexRaw == nullptr || pr_blockIndexSlotsUsed == pr_blockIndexSize || full) {
-                        MOODYCAMEL_CONSTEXPR_IF(allocMode == CannotAlloc)
-                        {
-                            // Failed to allocate, undo changes (but keep injected blocks)
-                            pr_blockIndexFront = originalBlockIndexFront;
-                            pr_blockIndexSlotsUsed = originalBlockIndexSlotsUsed;
-                            this->tailBlock = startBlock == nullptr ? firstAllocatedBlock : startBlock;
-                            return false;
-                        }
-                        else if (full || !new_block_index(originalBlockIndexSlotsUsed))
-                        {
-                            // Failed to allocate, undo changes (but keep injected blocks)
-                            pr_blockIndexFront = originalBlockIndexFront;
-                            pr_blockIndexSlotsUsed = originalBlockIndexSlotsUsed;
-                            this->tailBlock = startBlock == nullptr ? firstAllocatedBlock : startBlock;
-                            return false;
-                        }
-
-                        // pr_blockIndexFront is updated inside new_block_index, so we need to
-                        // update our fallback value too (since we keep the new index even if we
-                        // later fail)
-                        originalBlockIndexFront = originalBlockIndexSlotsUsed;
-                    }
-
-                    // Insert a new block in the circular linked list
-                    auto newBlock = this->parent->ConcurrentQueue::template requisition_block<allocMode>();
-                    if (newBlock == nullptr) {
-                        pr_blockIndexFront = originalBlockIndexFront;
-                        pr_blockIndexSlotsUsed = originalBlockIndexSlotsUsed;
-                        this->tailBlock = startBlock == nullptr ? firstAllocatedBlock : startBlock;
-                        return false;
-                    }
-
-#ifdef MCDBGQ_TRACKMEM
-                    newBlock->owner = this;
-#endif
-                    newBlock->ConcurrentQueue::Block::template set_all_empty<explicit_context>();
-                    if (this->tailBlock == nullptr) {
-                        newBlock->next = newBlock;
-                    } else {
-                        newBlock->next = this->tailBlock->next;
-                        this->tailBlock->next = newBlock;
-                    }
-                    this->tailBlock = newBlock;
-                    firstAllocatedBlock = firstAllocatedBlock == nullptr ? this->tailBlock : firstAllocatedBlock;
-
-                    ++pr_blockIndexSlotsUsed;
-
-                    auto& entry = blockIndex.load(std::memory_order_relaxed)->entries[pr_blockIndexFront];
-                    entry.base = currentTailIndex;
-                    entry.block = this->tailBlock;
-                    pr_blockIndexFront = (pr_blockIndexFront + 1) & (pr_blockIndexSize - 1);
-                }
-
-                // Excellent, all allocations succeeded. Reset each block's emptiness before we fill them up, and
-                // publish the new block index front
-                auto block = firstAllocatedBlock;
-                while (true) {
-                    block->ConcurrentQueue::Block::template reset_empty<explicit_context>();
-                    if (block == this->tailBlock) {
-                        break;
-                    }
-                    block = block->next;
-                }
-
-                MOODYCAMEL_CONSTEXPR_IF(MOODYCAMEL_NOEXCEPT_CTOR(
-                    T, decltype(*itemFirst), new (static_cast<T*>(nullptr)) T(details::deref_noexcept(itemFirst))))
-                {
-                    blockIndex.load(std::memory_order_relaxed)
-                        ->front.store((pr_blockIndexFront - 1) & (pr_blockIndexSize - 1), std::memory_order_release);
-                }
-            }
-
-            // Enqueue, one block at a time
-            index_t newTailIndex = startTailIndex + static_cast<index_t>(count);
-            currentTailIndex = startTailIndex;
-            auto endBlock = this->tailBlock;
-            this->tailBlock = startBlock;
-            assert((startTailIndex & static_cast<index_t>(BLOCK_SIZE - 1)) != 0 || firstAllocatedBlock != nullptr ||
-                   count == 0);
-            if ((startTailIndex & static_cast<index_t>(BLOCK_SIZE - 1)) == 0 && firstAllocatedBlock != nullptr) {
-                this->tailBlock = firstAllocatedBlock;
-            }
-            while (true) {
-                index_t stopIndex =
-                    (currentTailIndex & ~static_cast<index_t>(BLOCK_SIZE - 1)) + static_cast<index_t>(BLOCK_SIZE);
-                if (details::circular_less_than<index_t>(newTailIndex, stopIndex)) {
-                    stopIndex = newTailIndex;
-                }
-                MOODYCAMEL_CONSTEXPR_IF(MOODYCAMEL_NOEXCEPT_CTOR(
-                    T, decltype(*itemFirst), new (static_cast<T*>(nullptr)) T(details::deref_noexcept(itemFirst))))
-                {
-                    while (currentTailIndex != stopIndex) {
-                        new ((*this->tailBlock)[currentTailIndex++]) T(*itemFirst++);
-                    }
-                }
-                else
-                {
-                    MOODYCAMEL_TRY
-                    {
-                        while (currentTailIndex != stopIndex) {
-                            // Must use copy constructor even if move constructor is available
-                            // because we may have to revert if there's an exception.
-                            // Sorry about the horrible templated next line, but it was the only way
-                            // to disable moving *at compile time*, which is important because a type
-                            // may only define a (noexcept) move constructor, and so calls to the
-                            // cctor will not compile, even if they are in an if branch that will never
-                            // be executed
-                            new ((*this->tailBlock)[currentTailIndex])
-                                T(details::nomove_if<!MOODYCAMEL_NOEXCEPT_CTOR(
-                                      T,
-                                      decltype(*itemFirst),
-                                      new (static_cast<T*>(nullptr))
-                                          T(details::deref_noexcept(itemFirst)))>::eval(*itemFirst));
-                            ++currentTailIndex;
-                            ++itemFirst;
-                        }
-                    }
-                    MOODYCAMEL_CATCH(...)
-                    {
-                        // Oh dear, an exception's been thrown -- destroy the elements that
-                        // were enqueued so far and revert the entire bulk operation (we'll keep
-                        // any allocated blocks in our linked list for later, though).
-                        auto constructedStopIndex = currentTailIndex;
-                        auto lastBlockEnqueued = this->tailBlock;
-
-                        pr_blockIndexFront = originalBlockIndexFront;
-                        pr_blockIndexSlotsUsed = originalBlockIndexSlotsUsed;
-                        this->tailBlock = startBlock == nullptr ? firstAllocatedBlock : startBlock;
-
-                        if (!details::is_trivially_destructible<T>::value) {
-                            auto block = startBlock;
-                            if ((startTailIndex & static_cast<index_t>(BLOCK_SIZE - 1)) == 0) {
-                                block = firstAllocatedBlock;
-                            }
-                            currentTailIndex = startTailIndex;
-                            while (true) {
-                                stopIndex = (currentTailIndex & ~static_cast<index_t>(BLOCK_SIZE - 1)) +
-                                            static_cast<index_t>(BLOCK_SIZE);
-                                if (details::circular_less_than<index_t>(constructedStopIndex, stopIndex)) {
-                                    stopIndex = constructedStopIndex;
-                                }
-                                while (currentTailIndex != stopIndex) {
-                                    (*block)[currentTailIndex++]->~T();
-                                }
-                                if (block == lastBlockEnqueued) {
-                                    break;
-                                }
-                                block = block->next;
-                            }
-                        }
-                        MOODYCAMEL_RETHROW;
-                    }
-                }
-
-                if (this->tailBlock == endBlock) {
-                    assert(currentTailIndex == newTailIndex);
-                    break;
-                }
-                this->tailBlock = this->tailBlock->next;
-            }
-
-            MOODYCAMEL_CONSTEXPR_IF(!MOODYCAMEL_NOEXCEPT_CTOR(
-                T, decltype(*itemFirst), new (static_cast<T*>(nullptr)) T(details::deref_noexcept(itemFirst))))
-            {
-                if (firstAllocatedBlock != nullptr)
-                    blockIndex.load(std::memory_order_relaxed)
-                        ->front.store((pr_blockIndexFront - 1) & (pr_blockIndexSize - 1), std::memory_order_release);
-            }
-
-            this->tailIndex.store(newTailIndex, std::memory_order_release);
-            return true;
-        }
-
-        template <typename It> size_t dequeue_bulk(It& itemFirst, size_t max)
-        {
-            auto tail = this->tailIndex.load(std::memory_order_relaxed);
-            auto overcommit = this->dequeueOvercommit.load(std::memory_order_relaxed);
-            auto desiredCount =
-                static_cast<size_t>(tail - (this->dequeueOptimisticCount.load(std::memory_order_relaxed) - overcommit));
-            if (details::circular_less_than<size_t>(0, desiredCount)) {
-                desiredCount = desiredCount < max ? desiredCount : max;
-                std::atomic_thread_fence(std::memory_order_acquire);
-
-                auto myDequeueCount = this->dequeueOptimisticCount.fetch_add(desiredCount, std::memory_order_relaxed);
-
-                tail = this->tailIndex.load(std::memory_order_acquire);
-                auto actualCount = static_cast<size_t>(tail - (myDequeueCount - overcommit));
-                if (details::circular_less_than<size_t>(0, actualCount)) {
-                    actualCount = desiredCount < actualCount ? desiredCount : actualCount;
-                    if (actualCount < desiredCount) {
-                        this->dequeueOvercommit.fetch_add(desiredCount - actualCount, std::memory_order_release);
-                    }
-
-                    // Get the first index. Note that since there's guaranteed to be at least actualCount elements, this
-                    // will never exceed tail.
-                    auto firstIndex = this->headIndex.fetch_add(actualCount, std::memory_order_acq_rel);
-
-                    // Determine which block the first element is in
-                    auto localBlockIndex = blockIndex.load(std::memory_order_acquire);
-                    auto localBlockIndexHead = localBlockIndex->front.load(std::memory_order_acquire);
-
-                    auto headBase = localBlockIndex->entries[localBlockIndexHead].base;
-                    auto firstBlockBaseIndex = firstIndex & ~static_cast<index_t>(BLOCK_SIZE - 1);
-                    auto offset = static_cast<size_t>(
-                        static_cast<typename std::make_signed<index_t>::type>(firstBlockBaseIndex - headBase) /
-                        static_cast<typename std::make_signed<index_t>::type>(BLOCK_SIZE));
-                    auto indexIndex = (localBlockIndexHead + offset) & (localBlockIndex->size - 1);
-
-                    // Iterate the blocks and dequeue
-                    auto index = firstIndex;
-                    do {
-                        auto firstIndexInBlock = index;
-                        index_t endIndex =
-                            (index & ~static_cast<index_t>(BLOCK_SIZE - 1)) + static_cast<index_t>(BLOCK_SIZE);
-                        endIndex = details::circular_less_than<index_t>(firstIndex + static_cast<index_t>(actualCount),
-                                                                        endIndex)
-                                       ? firstIndex + static_cast<index_t>(actualCount)
-                                       : endIndex;
-                        auto block = localBlockIndex->entries[indexIndex].block;
-                        if (MOODYCAMEL_NOEXCEPT_ASSIGN(
-                                T, T&&, details::deref_noexcept(itemFirst) = std::move((*(*block)[index])))) {
-                            while (index != endIndex) {
-                                auto& el = *((*block)[index]);
-                                *itemFirst++ = std::move(el);
-                                el.~T();
-                                ++index;
-                            }
-                        } else {
-                            MOODYCAMEL_TRY
-                            {
-                                while (index != endIndex) {
-                                    auto& el = *((*block)[index]);
-                                    *itemFirst = std::move(el);
-                                    ++itemFirst;
-                                    el.~T();
-                                    ++index;
-                                }
-                            }
-                            MOODYCAMEL_CATCH(...)
-                            {
-                                // It's too late to revert the dequeue, but we can make sure that all
-                                // the dequeued objects are properly destroyed and the block index
-                                // (and empty count) are properly updated before we propagate the exception
-                                do {
-                                    block = localBlockIndex->entries[indexIndex].block;
-                                    while (index != endIndex) {
-                                        (*block)[index++]->~T();
-                                    }
-                                    block->ConcurrentQueue::Block::template set_many_empty<explicit_context>(
-                                        firstIndexInBlock, static_cast<size_t>(endIndex - firstIndexInBlock));
-                                    indexIndex = (indexIndex + 1) & (localBlockIndex->size - 1);
-
-                                    firstIndexInBlock = index;
-                                    endIndex = (index & ~static_cast<index_t>(BLOCK_SIZE - 1)) +
-                                               static_cast<index_t>(BLOCK_SIZE);
-                                    endIndex = details::circular_less_than<index_t>(
-                                                   firstIndex + static_cast<index_t>(actualCount), endIndex)
-                                                   ? firstIndex + static_cast<index_t>(actualCount)
-                                                   : endIndex;
-                                } while (index != firstIndex + actualCount);
-
-                                MOODYCAMEL_RETHROW;
-                            }
-                        }
-                        block->ConcurrentQueue::Block::template set_many_empty<explicit_context>(
-                            firstIndexInBlock, static_cast<size_t>(endIndex - firstIndexInBlock));
-                        indexIndex = (indexIndex + 1) & (localBlockIndex->size - 1);
-                    } while (index != firstIndex + actualCount);
-
-                    return actualCount;
-                } else {
-                    // Wasn't anything to dequeue after all; make the effective dequeue count eventually consistent
-                    this->dequeueOvercommit.fetch_add(desiredCount, std::memory_order_release);
-                }
-            }
-
-            return 0;
-        }
-
-      private:
-        struct BlockIndexEntry {
-            index_t base;
-            Block* block;
-        };
-
-        struct BlockIndexHeader {
-            size_t size;
-            std::atomic<size_t> front; // Current slot (not next, like pr_blockIndexFront)
-            BlockIndexEntry* entries;
-            void* prev;
-        };
-
-        bool new_block_index(size_t numberOfFilledSlotsToExpose)
-        {
-            auto prevBlockSizeMask = pr_blockIndexSize - 1;
-
-            // Create the new block
-            pr_blockIndexSize <<= 1;
-            auto newRawPtr = static_cast<char*>((Traits::malloc)(sizeof(BlockIndexHeader) +
-                                                                 std::alignment_of<BlockIndexEntry>::value - 1 +
-                                                                 sizeof(BlockIndexEntry) * pr_blockIndexSize));
-            if (newRawPtr == nullptr) {
-                pr_blockIndexSize >>= 1; // Reset to allow graceful retry
-                return false;
-            }
-
-            auto newBlockIndexEntries = reinterpret_cast<BlockIndexEntry*>(
-                details::align_for<BlockIndexEntry>(newRawPtr + sizeof(BlockIndexHeader)));
-
-            // Copy in all the old indices, if any
-            size_t j = 0;
-            if (pr_blockIndexSlotsUsed != 0) {
-                auto i = (pr_blockIndexFront - pr_blockIndexSlotsUsed) & prevBlockSizeMask;
-                do {
-                    newBlockIndexEntries[j++] = pr_blockIndexEntries[i];
-                    i = (i + 1) & prevBlockSizeMask;
-                } while (i != pr_blockIndexFront);
-            }
-
-            // Update everything
-            auto header = new (newRawPtr) BlockIndexHeader;
-            header->size = pr_blockIndexSize;
-            header->front.store(numberOfFilledSlotsToExpose - 1, std::memory_order_relaxed);
-            header->entries = newBlockIndexEntries;
-            header->prev = pr_blockIndexRaw; // we link the new block to the old one so we can free it later
-
-            pr_blockIndexFront = j;
-            pr_blockIndexEntries = newBlockIndexEntries;
-            pr_blockIndexRaw = newRawPtr;
-            blockIndex.store(header, std::memory_order_release);
-
-            return true;
-        }
-
-      private:
-        std::atomic<BlockIndexHeader*> blockIndex;
-
-        // To be used by producer only -- consumer must use the ones in referenced by blockIndex
-        size_t pr_blockIndexSlotsUsed;
-        size_t pr_blockIndexSize;
-        size_t pr_blockIndexFront; // Next slot (not current)
-        BlockIndexEntry* pr_blockIndexEntries;
-        void* pr_blockIndexRaw;
-
-#ifdef MOODYCAMEL_QUEUE_INTERNAL_DEBUG
-      public:
-        ExplicitProducer* nextExplicitProducer;
-
-      private:
-#endif
-
-#ifdef MCDBGQ_TRACKMEM
-        friend struct MemStats;
-#endif
-    };
-
-    //////////////////////////////////
-    // Implicit queue
-    //////////////////////////////////
-
-    struct ImplicitProducer : public ProducerBase {
-        ImplicitProducer(ConcurrentQueue* parent_)
-            : ProducerBase(parent_, false)
-            , nextBlockIndexCapacity(IMPLICIT_INITIAL_INDEX_SIZE)
-            , blockIndex(nullptr)
-        {
-            new_block_index();
-        }
-
-        ~ImplicitProducer()
-        {
-            // Note that since we're in the destructor we can assume that all enqueue/dequeue operations
-            // completed already; this means that all undequeued elements are placed contiguously across
-            // contiguous blocks, and that only the first and last remaining blocks can be only partially
-            // empty (all other remaining blocks must be completely full).
-
-#ifdef MOODYCAMEL_CPP11_THREAD_LOCAL_SUPPORTED
-            // Unregister ourselves for thread termination notification
-            if (!this->inactive.load(std::memory_order_relaxed)) {
-                details::ThreadExitNotifier::unsubscribe(&threadExitListener);
-            }
-#endif
-
-            // Destroy all remaining elements!
-            auto tail = this->tailIndex.load(std::memory_order_relaxed);
-            auto index = this->headIndex.load(std::memory_order_relaxed);
-            Block* block = nullptr;
-            assert(index == tail || details::circular_less_than(index, tail));
-            bool forceFreeLastBlock =
-                index != tail; // If we enter the loop, then the last (tail) block will not be freed
-            while (index != tail) {
-                if ((index & static_cast<index_t>(BLOCK_SIZE - 1)) == 0 || block == nullptr) {
-                    if (block != nullptr) {
-                        // Free the old block
-                        this->parent->add_block_to_free_list(block);
-                    }
-
-                    block = get_block_index_entry_for_index(index)->value.load(std::memory_order_relaxed);
-                }
-
-                ((*block)[index])->~T();
-                ++index;
-            }
-            // Even if the queue is empty, there's still one block that's not on the free list
-            // (unless the head index reached the end of it, in which case the tail will be poised
-            // to create a new block).
-            if (this->tailBlock != nullptr &&
-                (forceFreeLastBlock || (tail & static_cast<index_t>(BLOCK_SIZE - 1)) != 0)) {
-                this->parent->add_block_to_free_list(this->tailBlock);
-            }
-
-            // Destroy block index
-            auto localBlockIndex = blockIndex.load(std::memory_order_relaxed);
-            if (localBlockIndex != nullptr) {
-                for (size_t i = 0; i != localBlockIndex->capacity; ++i) {
-                    localBlockIndex->index[i]->~BlockIndexEntry();
-                }
-                do {
-                    auto prev = localBlockIndex->prev;
-                    localBlockIndex->~BlockIndexHeader();
-                    (Traits::free)(localBlockIndex);
-                    localBlockIndex = prev;
-                } while (localBlockIndex != nullptr);
-            }
-        }
-
-        template <AllocationMode allocMode, typename U> inline bool enqueue(U&& element)
-        {
-            index_t currentTailIndex = this->tailIndex.load(std::memory_order_relaxed);
-            index_t newTailIndex = 1 + currentTailIndex;
-            if ((currentTailIndex & static_cast<index_t>(BLOCK_SIZE - 1)) == 0) {
-                // We reached the end of a block, start a new one
-                auto head = this->headIndex.load(std::memory_order_relaxed);
-                assert(!details::circular_less_than<index_t>(currentTailIndex, head));
-                if (!details::circular_less_than<index_t>(head, currentTailIndex + BLOCK_SIZE) ||
-                    (MAX_SUBQUEUE_SIZE != details::const_numeric_max<size_t>::value &&
-                     (MAX_SUBQUEUE_SIZE == 0 || MAX_SUBQUEUE_SIZE - BLOCK_SIZE < currentTailIndex - head))) {
-                    return false;
-                }
-#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
-                debug::DebugLock lock(mutex);
-#endif
-                // Find out where we'll be inserting this block in the block index
-                BlockIndexEntry* idxEntry;
-                if (!insert_block_index_entry<allocMode>(idxEntry, currentTailIndex)) {
-                    return false;
-                }
-
-                // Get ahold of a new block
-                auto newBlock = this->parent->ConcurrentQueue::template requisition_block<allocMode>();
-                if (newBlock == nullptr) {
-                    rewind_block_index_tail();
-                    idxEntry->value.store(nullptr, std::memory_order_relaxed);
-                    return false;
-                }
-#ifdef MCDBGQ_TRACKMEM
-                newBlock->owner = this;
-#endif
-                newBlock->ConcurrentQueue::Block::template reset_empty<implicit_context>();
-
-                MOODYCAMEL_CONSTEXPR_IF(
-                    !MOODYCAMEL_NOEXCEPT_CTOR(T, U, new (static_cast<T*>(nullptr)) T(std::forward<U>(element))))
-                {
-                    // May throw, try to insert now before we publish the fact that we have this new block
-                    MOODYCAMEL_TRY
-                    {
-                        new ((*newBlock)[currentTailIndex]) T(std::forward<U>(element));
-                    }
-                    MOODYCAMEL_CATCH(...)
-                    {
-                        rewind_block_index_tail();
-                        idxEntry->value.store(nullptr, std::memory_order_relaxed);
-                        this->parent->add_block_to_free_list(newBlock);
-                        MOODYCAMEL_RETHROW;
-                    }
-                }
-
-                // Insert the new block into the index
-                idxEntry->value.store(newBlock, std::memory_order_relaxed);
-
-                this->tailBlock = newBlock;
-
-                MOODYCAMEL_CONSTEXPR_IF(
-                    !MOODYCAMEL_NOEXCEPT_CTOR(T, U, new (static_cast<T*>(nullptr)) T(std::forward<U>(element))))
-                {
-                    this->tailIndex.store(newTailIndex, std::memory_order_release);
-                    return true;
-                }
-            }
-
-            // Enqueue
-            new ((*this->tailBlock)[currentTailIndex]) T(std::forward<U>(element));
-
-            this->tailIndex.store(newTailIndex, std::memory_order_release);
-            return true;
-        }
-
-        template <typename U> bool dequeue(U& element)
-        {
-            // See ExplicitProducer::dequeue for rationale and explanation
-            index_t tail = this->tailIndex.load(std::memory_order_relaxed);
-            index_t overcommit = this->dequeueOvercommit.load(std::memory_order_relaxed);
-            if (details::circular_less_than<index_t>(
-                    this->dequeueOptimisticCount.load(std::memory_order_relaxed) - overcommit, tail)) {
-                std::atomic_thread_fence(std::memory_order_acquire);
-
-                index_t myDequeueCount = this->dequeueOptimisticCount.fetch_add(1, std::memory_order_relaxed);
-                tail = this->tailIndex.load(std::memory_order_acquire);
-                if ((details::likely)(details::circular_less_than<index_t>(myDequeueCount - overcommit, tail))) {
-                    index_t index = this->headIndex.fetch_add(1, std::memory_order_acq_rel);
-
-                    // Determine which block the element is in
-                    auto entry = get_block_index_entry_for_index(index);
-
-                    // Dequeue
-                    auto block = entry->value.load(std::memory_order_relaxed);
-                    auto& el = *((*block)[index]);
-
-                    if (!MOODYCAMEL_NOEXCEPT_ASSIGN(T, T&&, element = std::move(el))) {
-#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
-                        // Note: Acquiring the mutex with every dequeue instead of only when a block
-                        // is released is very sub-optimal, but it is, after all, purely debug code.
-                        debug::DebugLock lock(producer->mutex);
-#endif
-                        struct Guard {
-                            Block* block;
-                            index_t index;
-                            BlockIndexEntry* entry;
-                            ConcurrentQueue* parent;
-
-                            ~Guard()
-                            {
-                                (*block)[index]->~T();
-                                if (block->ConcurrentQueue::Block::template set_empty<implicit_context>(index)) {
-                                    entry->value.store(nullptr, std::memory_order_relaxed);
-                                    parent->add_block_to_free_list(block);
-                                }
-                            }
-                        } guard = { block, index, entry, this->parent };
-
-                        element = std::move(el); // NOLINT
-                    } else {
-                        element = std::move(el); // NOLINT
-                        el.~T();                 // NOLINT
-
-                        if (block->ConcurrentQueue::Block::template set_empty<implicit_context>(index)) {
-                            {
-#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
-                                debug::DebugLock lock(mutex);
-#endif
-                                // Add the block back into the global free pool (and remove from block index)
-                                entry->value.store(nullptr, std::memory_order_relaxed);
-                            }
-                            this->parent->add_block_to_free_list(block); // releases the above store
-                        }
-                    }
-
-                    return true;
-                } else {
-                    this->dequeueOvercommit.fetch_add(1, std::memory_order_release);
-                }
-            }
-
-            return false;
-        }
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4706) // assignment within conditional expression
-#endif
-        template <AllocationMode allocMode, typename It> bool enqueue_bulk(It itemFirst, size_t count)
-        {
-            // First, we need to make sure we have enough room to enqueue all of the elements;
-            // this means pre-allocating blocks and putting them in the block index (but only if
-            // all the allocations succeeded).
-
-            // Note that the tailBlock we start off with may not be owned by us any more;
-            // this happens if it was filled up exactly to the top (setting tailIndex to
-            // the first index of the next block which is not yet allocated), then dequeued
-            // completely (putting it on the free list) before we enqueue again.
-
-            index_t startTailIndex = this->tailIndex.load(std::memory_order_relaxed);
-            auto startBlock = this->tailBlock;
-            Block* firstAllocatedBlock = nullptr;
-            auto endBlock = this->tailBlock;
-
-            // Figure out how many blocks we'll need to allocate, and do so
-            size_t blockBaseDiff = ((startTailIndex + count - 1) & ~static_cast<index_t>(BLOCK_SIZE - 1)) -
-                                   ((startTailIndex - 1) & ~static_cast<index_t>(BLOCK_SIZE - 1));
-            index_t currentTailIndex = (startTailIndex - 1) & ~static_cast<index_t>(BLOCK_SIZE - 1);
-            if (blockBaseDiff > 0) {
-#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
-                debug::DebugLock lock(mutex);
-#endif
-                do {
-                    blockBaseDiff -= static_cast<index_t>(BLOCK_SIZE);
-                    currentTailIndex += static_cast<index_t>(BLOCK_SIZE);
-
-                    // Find out where we'll be inserting this block in the block index
-                    BlockIndexEntry* idxEntry =
-                        nullptr; // initialization here unnecessary but compiler can't always tell
-                    Block* newBlock;
-                    bool indexInserted = false;
-                    auto head = this->headIndex.load(std::memory_order_relaxed);
-                    assert(!details::circular_less_than<index_t>(currentTailIndex, head));
-                    bool full = !details::circular_less_than<index_t>(head, currentTailIndex + BLOCK_SIZE) ||
-                                (MAX_SUBQUEUE_SIZE != details::const_numeric_max<size_t>::value &&
-                                 (MAX_SUBQUEUE_SIZE == 0 || MAX_SUBQUEUE_SIZE - BLOCK_SIZE < currentTailIndex - head));
-
-                    if (full || !(indexInserted = insert_block_index_entry<allocMode>(idxEntry, currentTailIndex)) ||
-                        (newBlock = this->parent->ConcurrentQueue::template requisition_block<allocMode>()) ==
-                            nullptr) {
-                        // Index allocation or block allocation failed; revert any other allocations
-                        // and index insertions done so far for this operation
-                        if (indexInserted) {
-                            rewind_block_index_tail();
-                            idxEntry->value.store(nullptr, std::memory_order_relaxed);
-                        }
-                        currentTailIndex = (startTailIndex - 1) & ~static_cast<index_t>(BLOCK_SIZE - 1);
-                        for (auto block = firstAllocatedBlock; block != nullptr; block = block->next) {
-                            currentTailIndex += static_cast<index_t>(BLOCK_SIZE);
-                            idxEntry = get_block_index_entry_for_index(currentTailIndex);
-                            idxEntry->value.store(nullptr, std::memory_order_relaxed);
-                            rewind_block_index_tail();
-                        }
-                        this->parent->add_blocks_to_free_list(firstAllocatedBlock);
-                        this->tailBlock = startBlock;
-
-                        return false;
-                    }
-
-#ifdef MCDBGQ_TRACKMEM
-                    newBlock->owner = this;
-#endif
-                    newBlock->ConcurrentQueue::Block::template reset_empty<implicit_context>();
-                    newBlock->next = nullptr;
-
-                    // Insert the new block into the index
-                    idxEntry->value.store(newBlock, std::memory_order_relaxed);
-
-                    // Store the chain of blocks so that we can undo if later allocations fail,
-                    // and so that we can find the blocks when we do the actual enqueueing
-                    if ((startTailIndex & static_cast<index_t>(BLOCK_SIZE - 1)) != 0 ||
-                        firstAllocatedBlock != nullptr) {
-                        assert(this->tailBlock != nullptr);
-                        this->tailBlock->next = newBlock;
-                    }
-                    this->tailBlock = newBlock;
-                    endBlock = newBlock;
-                    firstAllocatedBlock = firstAllocatedBlock == nullptr ? newBlock : firstAllocatedBlock;
-                } while (blockBaseDiff > 0);
-            }
-
-            // Enqueue, one block at a time
-            index_t newTailIndex = startTailIndex + static_cast<index_t>(count);
-            currentTailIndex = startTailIndex;
-            this->tailBlock = startBlock;
-            assert((startTailIndex & static_cast<index_t>(BLOCK_SIZE - 1)) != 0 || firstAllocatedBlock != nullptr ||
-                   count == 0);
-            if ((startTailIndex & static_cast<index_t>(BLOCK_SIZE - 1)) == 0 && firstAllocatedBlock != nullptr) {
-                this->tailBlock = firstAllocatedBlock;
-            }
-            while (true) {
-                index_t stopIndex =
-                    (currentTailIndex & ~static_cast<index_t>(BLOCK_SIZE - 1)) + static_cast<index_t>(BLOCK_SIZE);
-                if (details::circular_less_than<index_t>(newTailIndex, stopIndex)) {
-                    stopIndex = newTailIndex;
-                }
-                MOODYCAMEL_CONSTEXPR_IF(MOODYCAMEL_NOEXCEPT_CTOR(
-                    T, decltype(*itemFirst), new (static_cast<T*>(nullptr)) T(details::deref_noexcept(itemFirst))))
-                {
-                    while (currentTailIndex != stopIndex) {
-                        new ((*this->tailBlock)[currentTailIndex++]) T(*itemFirst++);
-                    }
-                }
-                else
-                {
-                    MOODYCAMEL_TRY
-                    {
-                        while (currentTailIndex != stopIndex) {
-                            new ((*this->tailBlock)[currentTailIndex])
-                                T(details::nomove_if<!MOODYCAMEL_NOEXCEPT_CTOR(
-                                      T,
-                                      decltype(*itemFirst),
-                                      new (static_cast<T*>(nullptr))
-                                          T(details::deref_noexcept(itemFirst)))>::eval(*itemFirst));
-                            ++currentTailIndex;
-                            ++itemFirst;
-                        }
-                    }
-                    MOODYCAMEL_CATCH(...)
-                    {
-                        auto constructedStopIndex = currentTailIndex;
-                        auto lastBlockEnqueued = this->tailBlock;
-
-                        if (!details::is_trivially_destructible<T>::value) {
-                            auto block = startBlock;
-                            if ((startTailIndex & static_cast<index_t>(BLOCK_SIZE - 1)) == 0) {
-                                block = firstAllocatedBlock;
-                            }
-                            currentTailIndex = startTailIndex;
-                            while (true) {
-                                stopIndex = (currentTailIndex & ~static_cast<index_t>(BLOCK_SIZE - 1)) +
-                                            static_cast<index_t>(BLOCK_SIZE);
-                                if (details::circular_less_than<index_t>(constructedStopIndex, stopIndex)) {
-                                    stopIndex = constructedStopIndex;
-                                }
-                                while (currentTailIndex != stopIndex) {
-                                    (*block)[currentTailIndex++]->~T();
-                                }
-                                if (block == lastBlockEnqueued) {
-                                    break;
-                                }
-                                block = block->next;
-                            }
-                        }
-
-                        currentTailIndex = (startTailIndex - 1) & ~static_cast<index_t>(BLOCK_SIZE - 1);
-                        for (auto block = firstAllocatedBlock; block != nullptr; block = block->next) {
-                            currentTailIndex += static_cast<index_t>(BLOCK_SIZE);
-                            auto idxEntry = get_block_index_entry_for_index(currentTailIndex);
-                            idxEntry->value.store(nullptr, std::memory_order_relaxed);
-                            rewind_block_index_tail();
-                        }
-                        this->parent->add_blocks_to_free_list(firstAllocatedBlock);
-                        this->tailBlock = startBlock;
-                        MOODYCAMEL_RETHROW;
-                    }
-                }
-
-                if (this->tailBlock == endBlock) {
-                    assert(currentTailIndex == newTailIndex);
-                    break;
-                }
-                this->tailBlock = this->tailBlock->next;
-            }
-            this->tailIndex.store(newTailIndex, std::memory_order_release);
-            return true;
-        }
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-        template <typename It> size_t dequeue_bulk(It& itemFirst, size_t max)
-        {
-            auto tail = this->tailIndex.load(std::memory_order_relaxed);
-            auto overcommit = this->dequeueOvercommit.load(std::memory_order_relaxed);
-            auto desiredCount =
-                static_cast<size_t>(tail - (this->dequeueOptimisticCount.load(std::memory_order_relaxed) - overcommit));
-            if (details::circular_less_than<size_t>(0, desiredCount)) {
-                desiredCount = desiredCount < max ? desiredCount : max;
-                std::atomic_thread_fence(std::memory_order_acquire);
-
-                auto myDequeueCount = this->dequeueOptimisticCount.fetch_add(desiredCount, std::memory_order_relaxed);
-
-                tail = this->tailIndex.load(std::memory_order_acquire);
-                auto actualCount = static_cast<size_t>(tail - (myDequeueCount - overcommit));
-                if (details::circular_less_than<size_t>(0, actualCount)) {
-                    actualCount = desiredCount < actualCount ? desiredCount : actualCount;
-                    if (actualCount < desiredCount) {
-                        this->dequeueOvercommit.fetch_add(desiredCount - actualCount, std::memory_order_release);
-                    }
-
-                    // Get the first index. Note that since there's guaranteed to be at least actualCount elements, this
-                    // will never exceed tail.
-                    auto firstIndex = this->headIndex.fetch_add(actualCount, std::memory_order_acq_rel);
-
-                    // Iterate the blocks and dequeue
-                    auto index = firstIndex;
-                    BlockIndexHeader* localBlockIndex;
-                    auto indexIndex = get_block_index_index_for_index(index, localBlockIndex);
-                    do {
-                        auto blockStartIndex = index;
-                        index_t endIndex =
-                            (index & ~static_cast<index_t>(BLOCK_SIZE - 1)) + static_cast<index_t>(BLOCK_SIZE);
-                        endIndex = details::circular_less_than<index_t>(firstIndex + static_cast<index_t>(actualCount),
-                                                                        endIndex)
-                                       ? firstIndex + static_cast<index_t>(actualCount)
-                                       : endIndex;
-
-                        auto entry = localBlockIndex->index[indexIndex];
-                        auto block = entry->value.load(std::memory_order_relaxed);
-                        if (MOODYCAMEL_NOEXCEPT_ASSIGN(
-                                T, T&&, details::deref_noexcept(itemFirst) = std::move((*(*block)[index])))) {
-                            while (index != endIndex) {
-                                auto& el = *((*block)[index]);
-                                *itemFirst++ = std::move(el);
-                                el.~T();
-                                ++index;
-                            }
-                        } else {
-                            MOODYCAMEL_TRY
-                            {
-                                while (index != endIndex) {
-                                    auto& el = *((*block)[index]);
-                                    *itemFirst = std::move(el);
-                                    ++itemFirst;
-                                    el.~T();
-                                    ++index;
-                                }
-                            }
-                            MOODYCAMEL_CATCH(...)
-                            {
-                                do {
-                                    entry = localBlockIndex->index[indexIndex];
-                                    block = entry->value.load(std::memory_order_relaxed);
-                                    while (index != endIndex) {
-                                        (*block)[index++]->~T();
-                                    }
-
-                                    if (block->ConcurrentQueue::Block::template set_many_empty<implicit_context>(
-                                            blockStartIndex, static_cast<size_t>(endIndex - blockStartIndex))) {
-#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
-                                        debug::DebugLock lock(mutex);
-#endif
-                                        entry->value.store(nullptr, std::memory_order_relaxed);
-                                        this->parent->add_block_to_free_list(block);
-                                    }
-                                    indexIndex = (indexIndex + 1) & (localBlockIndex->capacity - 1);
-
-                                    blockStartIndex = index;
-                                    endIndex = (index & ~static_cast<index_t>(BLOCK_SIZE - 1)) +
-                                               static_cast<index_t>(BLOCK_SIZE);
-                                    endIndex = details::circular_less_than<index_t>(
-                                                   firstIndex + static_cast<index_t>(actualCount), endIndex)
-                                                   ? firstIndex + static_cast<index_t>(actualCount)
-                                                   : endIndex;
-                                } while (index != firstIndex + actualCount);
-
-                                MOODYCAMEL_RETHROW;
-                            }
-                        }
-                        if (block->ConcurrentQueue::Block::template set_many_empty<implicit_context>(
-                                blockStartIndex, static_cast<size_t>(endIndex - blockStartIndex))) {
-                            {
-#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
-                                debug::DebugLock lock(mutex);
-#endif
-                                // Note that the set_many_empty above did a release, meaning that anybody who acquires
-                                // the block we're about to free can use it safely since our writes (and reads!) will
-                                // have happened-before then.
-                                entry->value.store(nullptr, std::memory_order_relaxed);
-                            }
-                            this->parent->add_block_to_free_list(block); // releases the above store
-                        }
-                        indexIndex = (indexIndex + 1) & (localBlockIndex->capacity - 1);
-                    } while (index != firstIndex + actualCount);
-
-                    return actualCount;
-                } else {
-                    this->dequeueOvercommit.fetch_add(desiredCount, std::memory_order_release);
-                }
-            }
-
-            return 0;
-        }
-
-      private:
-        // The block size must be > 1, so any number with the low bit set is an invalid block base index
-        static const index_t INVALID_BLOCK_BASE = 1;
-
-        struct BlockIndexEntry {
-            std::atomic<index_t> key;
-            std::atomic<Block*> value;
-        };
-
-        struct BlockIndexHeader {
-            size_t capacity;
-            std::atomic<size_t> tail;
-            BlockIndexEntry* entries;
-            BlockIndexEntry** index;
-            BlockIndexHeader* prev;
-        };
-
-        template <AllocationMode allocMode>
-        inline bool insert_block_index_entry(BlockIndexEntry*& idxEntry, index_t blockStartIndex)
-        {
-            auto localBlockIndex =
-                blockIndex.load(std::memory_order_relaxed); // We're the only writer thread, relaxed is OK
-            if (localBlockIndex == nullptr) {
-                return false; // this can happen if new_block_index failed in the constructor
-            }
-            size_t newTail =
-                (localBlockIndex->tail.load(std::memory_order_relaxed) + 1) & (localBlockIndex->capacity - 1);
-            idxEntry = localBlockIndex->index[newTail];
-            if (idxEntry->key.load(std::memory_order_relaxed) == INVALID_BLOCK_BASE ||
-                idxEntry->value.load(std::memory_order_relaxed) == nullptr) {
-
-                idxEntry->key.store(blockStartIndex, std::memory_order_relaxed);
-                localBlockIndex->tail.store(newTail, std::memory_order_release);
-                return true;
-            }
-
-            // No room in the old block index, try to allocate another one!
-            MOODYCAMEL_CONSTEXPR_IF(allocMode == CannotAlloc)
-            {
-                return false;
-            }
-            else if (!new_block_index())
-            {
-                return false;
-            }
-            else
-            {
-                localBlockIndex = blockIndex.load(std::memory_order_relaxed);
-                newTail = (localBlockIndex->tail.load(std::memory_order_relaxed) + 1) & (localBlockIndex->capacity - 1);
-                idxEntry = localBlockIndex->index[newTail];
-                assert(idxEntry->key.load(std::memory_order_relaxed) == INVALID_BLOCK_BASE);
-                idxEntry->key.store(blockStartIndex, std::memory_order_relaxed);
-                localBlockIndex->tail.store(newTail, std::memory_order_release);
-                return true;
-            }
-        }
-
-        inline void rewind_block_index_tail()
-        {
-            auto localBlockIndex = blockIndex.load(std::memory_order_relaxed);
-            localBlockIndex->tail.store((localBlockIndex->tail.load(std::memory_order_relaxed) - 1) &
-                                            (localBlockIndex->capacity - 1),
-                                        std::memory_order_relaxed);
-        }
-
-        inline BlockIndexEntry* get_block_index_entry_for_index(index_t index) const
-        {
-            BlockIndexHeader* localBlockIndex;
-            auto idx = get_block_index_index_for_index(index, localBlockIndex);
-            return localBlockIndex->index[idx];
-        }
-
-        inline size_t get_block_index_index_for_index(index_t index, BlockIndexHeader*& localBlockIndex) const
-        {
-#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
-            debug::DebugLock lock(mutex);
-#endif
-            index &= ~static_cast<index_t>(BLOCK_SIZE - 1);
-            localBlockIndex = blockIndex.load(std::memory_order_acquire);
-            auto tail = localBlockIndex->tail.load(std::memory_order_acquire);
-            auto tailBase = localBlockIndex->index[tail]->key.load(std::memory_order_relaxed);
-            assert(tailBase != INVALID_BLOCK_BASE);
-            // Note: Must use division instead of shift because the index may wrap around, causing a negative
-            // offset, whose negativity we want to preserve
-            auto offset = static_cast<size_t>(static_cast<typename std::make_signed<index_t>::type>(index - tailBase) /
-                                              static_cast<typename std::make_signed<index_t>::type>(BLOCK_SIZE));
-            size_t idx = (tail + offset) & (localBlockIndex->capacity - 1);
-            assert(localBlockIndex->index[idx]->key.load(std::memory_order_relaxed) == index &&
-                   localBlockIndex->index[idx]->value.load(std::memory_order_relaxed) != nullptr);
-            return idx;
-        }
-
-        bool new_block_index()
-        {
-            auto prev = blockIndex.load(std::memory_order_relaxed);
-            size_t prevCapacity = prev == nullptr ? 0 : prev->capacity;
-            auto entryCount = prev == nullptr ? nextBlockIndexCapacity : prevCapacity;
-            auto raw = static_cast<char*>(
-                (Traits::malloc)(sizeof(BlockIndexHeader) + std::alignment_of<BlockIndexEntry>::value - 1 +
-                                 sizeof(BlockIndexEntry) * entryCount + std::alignment_of<BlockIndexEntry*>::value - 1 +
-                                 sizeof(BlockIndexEntry*) * nextBlockIndexCapacity));
-            if (raw == nullptr) {
-                return false;
-            }
-
-            auto header = new (raw) BlockIndexHeader;
-            auto entries =
-                reinterpret_cast<BlockIndexEntry*>(details::align_for<BlockIndexEntry>(raw + sizeof(BlockIndexHeader)));
-            auto index = reinterpret_cast<BlockIndexEntry**>(details::align_for<BlockIndexEntry*>(
-                reinterpret_cast<char*>(entries) + sizeof(BlockIndexEntry) * entryCount));
-            if (prev != nullptr) {
-                auto prevTail = prev->tail.load(std::memory_order_relaxed);
-                auto prevPos = prevTail;
-                size_t i = 0;
-                do {
-                    prevPos = (prevPos + 1) & (prev->capacity - 1);
-                    index[i++] = prev->index[prevPos];
-                } while (prevPos != prevTail);
-                assert(i == prevCapacity);
-            }
-            for (size_t i = 0; i != entryCount; ++i) {
-                new (entries + i) BlockIndexEntry;
-                entries[i].key.store(INVALID_BLOCK_BASE, std::memory_order_relaxed);
-                index[prevCapacity + i] = entries + i;
-            }
-            header->prev = prev;
-            header->entries = entries;
-            header->index = index;
-            header->capacity = nextBlockIndexCapacity;
-            header->tail.store((prevCapacity - 1) & (nextBlockIndexCapacity - 1), std::memory_order_relaxed);
-
-            blockIndex.store(header, std::memory_order_release);
-
-            nextBlockIndexCapacity <<= 1;
-
-            return true;
-        }
-
-      private:
-        size_t nextBlockIndexCapacity;
-        std::atomic<BlockIndexHeader*> blockIndex;
-
-#ifdef MOODYCAMEL_CPP11_THREAD_LOCAL_SUPPORTED
-      public:
-        details::ThreadExitListener threadExitListener;
-
-      private:
-#endif
-
-#ifdef MOODYCAMEL_QUEUE_INTERNAL_DEBUG
-      public:
-        ImplicitProducer* nextImplicitProducer;
-
-      private:
-#endif
-
-#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
-        mutable debug::DebugMutex mutex;
-#endif
-#ifdef MCDBGQ_TRACKMEM
-        friend struct MemStats;
-#endif
-    };
-
-    //////////////////////////////////
-    // Block pool manipulation
-    //////////////////////////////////
-
-    void populate_initial_block_list(size_t blockCount)
-    {
-        initialBlockPoolSize = blockCount;
-        if (initialBlockPoolSize == 0) {
-            initialBlockPool = nullptr;
-            return;
-        }
-
-        initialBlockPool = create_array<Block>(blockCount);
-        if (initialBlockPool == nullptr) {
-            initialBlockPoolSize = 0;
-        }
-        for (size_t i = 0; i < initialBlockPoolSize; ++i) {
-            initialBlockPool[i].dynamicallyAllocated = false;
-        }
-    }
-
-    inline Block* try_get_block_from_initial_pool()
-    {
-        if (initialBlockPoolIndex.load(std::memory_order_relaxed) >= initialBlockPoolSize) {
-            return nullptr;
-        }
-
-        auto index = initialBlockPoolIndex.fetch_add(1, std::memory_order_relaxed);
-
-        return index < initialBlockPoolSize ? (initialBlockPool + index) : nullptr;
-    }
-
-    inline void add_block_to_free_list(Block* block)
-    {
-#ifdef MCDBGQ_TRACKMEM
-        block->owner = nullptr;
-#endif
-        if (!Traits::RECYCLE_ALLOCATED_BLOCKS && block->dynamicallyAllocated) {
-            destroy(block);
-        } else {
-            freeList.add(block);
-        }
-    }
-
-    inline void add_blocks_to_free_list(Block* block)
-    {
-        while (block != nullptr) {
-            auto next = block->next;
-            add_block_to_free_list(block);
-            block = next;
-        }
-    }
-
-    inline Block* try_get_block_from_free_list() { return freeList.try_get(); }
-
-    // Gets a free block from one of the memory pools, or allocates a new one (if applicable)
-    template <AllocationMode canAlloc> Block* requisition_block()
-    {
-        auto block = try_get_block_from_initial_pool();
-        if (block != nullptr) {
-            return block;
-        }
-
-        block = try_get_block_from_free_list();
-        if (block != nullptr) {
-            return block;
-        }
-
-        MOODYCAMEL_CONSTEXPR_IF(canAlloc == CanAlloc)
-        {
-            return create<Block>();
-        }
-        else
-        {
-            return nullptr;
-        }
-    }
-
-#ifdef MCDBGQ_TRACKMEM
-  public:
-    struct MemStats {
-        size_t allocatedBlocks;
-        size_t usedBlocks;
-        size_t freeBlocks;
-        size_t ownedBlocksExplicit;
-        size_t ownedBlocksImplicit;
-        size_t implicitProducers;
-        size_t explicitProducers;
-        size_t elementsEnqueued;
-        size_t blockClassBytes;
-        size_t queueClassBytes;
-        size_t implicitBlockIndexBytes;
-        size_t explicitBlockIndexBytes;
-
-        friend class ConcurrentQueue;
-
-      private:
-        static MemStats getFor(ConcurrentQueue* q)
-        {
-            MemStats stats = { 0 };
-
-            stats.elementsEnqueued = q->size_approx();
-
-            auto block = q->freeList.head_unsafe();
-            while (block != nullptr) {
-                ++stats.allocatedBlocks;
-                ++stats.freeBlocks;
-                block = block->freeListNext.load(std::memory_order_relaxed);
-            }
-
-            for (auto ptr = q->producerListTail.load(std::memory_order_acquire); ptr != nullptr;
-                 ptr = ptr->next_prod()) {
-                bool implicit = dynamic_cast<ImplicitProducer*>(ptr) != nullptr;
-                stats.implicitProducers += implicit ? 1 : 0;
-                stats.explicitProducers += implicit ? 0 : 1;
-
-                if (implicit) {
-                    auto prod = static_cast<ImplicitProducer*>(ptr);
-                    stats.queueClassBytes += sizeof(ImplicitProducer);
-                    auto head = prod->headIndex.load(std::memory_order_relaxed);
-                    auto tail = prod->tailIndex.load(std::memory_order_relaxed);
-                    auto hash = prod->blockIndex.load(std::memory_order_relaxed);
-                    if (hash != nullptr) {
-                        for (size_t i = 0; i != hash->capacity; ++i) {
-                            if (hash->index[i]->key.load(std::memory_order_relaxed) !=
-                                    ImplicitProducer::INVALID_BLOCK_BASE &&
-                                hash->index[i]->value.load(std::memory_order_relaxed) != nullptr) {
-                                ++stats.allocatedBlocks;
-                                ++stats.ownedBlocksImplicit;
-                            }
-                        }
-                        stats.implicitBlockIndexBytes +=
-                            hash->capacity * sizeof(typename ImplicitProducer::BlockIndexEntry);
-                        for (; hash != nullptr; hash = hash->prev) {
-                            stats.implicitBlockIndexBytes +=
-                                sizeof(typename ImplicitProducer::BlockIndexHeader) +
-                                hash->capacity * sizeof(typename ImplicitProducer::BlockIndexEntry*);
-                        }
-                    }
-                    for (; details::circular_less_than<index_t>(head, tail); head += BLOCK_SIZE) {
-                        // auto block = prod->get_block_index_entry_for_index(head);
-                        ++stats.usedBlocks;
-                    }
-                } else {
-                    auto prod = static_cast<ExplicitProducer*>(ptr);
-                    stats.queueClassBytes += sizeof(ExplicitProducer);
-                    auto tailBlock = prod->tailBlock;
-                    bool wasNonEmpty = false;
-                    if (tailBlock != nullptr) {
-                        auto block = tailBlock;
-                        do {
-                            ++stats.allocatedBlocks;
-                            if (!block->ConcurrentQueue::Block::template is_empty<explicit_context>() || wasNonEmpty) {
-                                ++stats.usedBlocks;
-                                wasNonEmpty = wasNonEmpty || block != tailBlock;
-                            }
-                            ++stats.ownedBlocksExplicit;
-                            block = block->next;
-                        } while (block != tailBlock);
-                    }
-                    auto index = prod->blockIndex.load(std::memory_order_relaxed);
-                    while (index != nullptr) {
-                        stats.explicitBlockIndexBytes +=
-                            sizeof(typename ExplicitProducer::BlockIndexHeader) +
-                            index->size * sizeof(typename ExplicitProducer::BlockIndexEntry);
-                        index = static_cast<typename ExplicitProducer::BlockIndexHeader*>(index->prev);
-                    }
-                }
-            }
-
-            auto freeOnInitialPool =
-                q->initialBlockPoolIndex.load(std::memory_order_relaxed) >= q->initialBlockPoolSize
-                    ? 0
-                    : q->initialBlockPoolSize - q->initialBlockPoolIndex.load(std::memory_order_relaxed);
-            stats.allocatedBlocks += freeOnInitialPool;
-            stats.freeBlocks += freeOnInitialPool;
-
-            stats.blockClassBytes = sizeof(Block) * stats.allocatedBlocks;
-            stats.queueClassBytes += sizeof(ConcurrentQueue);
-
-            return stats;
-        }
-    };
-
-    // For debugging only. Not thread-safe.
-    MemStats getMemStats() { return MemStats::getFor(this); }
-
-  private:
-    friend struct MemStats;
-#endif
-
-    //////////////////////////////////
-    // Producer list manipulation
-    //////////////////////////////////
-
-    ProducerBase* recycle_or_create_producer(bool isExplicit)
-    {
-#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODHASH
-        debug::DebugLock lock(implicitProdMutex);
-#endif
-        // Try to re-use one first
-        for (auto ptr = producerListTail.load(std::memory_order_acquire); ptr != nullptr; ptr = ptr->next_prod()) {
-            if (ptr->inactive.load(std::memory_order_relaxed) && ptr->isExplicit == isExplicit) {
-                bool expected = true;
-                if (ptr->inactive.compare_exchange_strong(
-                        expected, /* desired */ false, std::memory_order_acquire, std::memory_order_relaxed)) {
-                    // We caught one! It's been marked as activated, the caller can have it
-                    return ptr;
-                }
-            }
-        }
-
-        return add_producer(isExplicit ? static_cast<ProducerBase*>(create<ExplicitProducer>(this))
-                                       : create<ImplicitProducer>(this));
-    }
-
-    ProducerBase* add_producer(ProducerBase* producer)
-    {
-        // Handle failed memory allocation
-        if (producer == nullptr) {
-            return nullptr;
-        }
-
-        producerCount.fetch_add(1, std::memory_order_relaxed);
-
-        // Add it to the lock-free list
-        auto prevTail = producerListTail.load(std::memory_order_relaxed);
-        do {
-            producer->next = prevTail;
-        } while (!producerListTail.compare_exchange_weak(
-            prevTail, producer, std::memory_order_release, std::memory_order_relaxed));
-
-#ifdef MOODYCAMEL_QUEUE_INTERNAL_DEBUG
-        if (producer->isExplicit) {
-            auto prevTailExplicit = explicitProducers.load(std::memory_order_relaxed);
-            do {
-                static_cast<ExplicitProducer*>(producer)->nextExplicitProducer = prevTailExplicit;
-            } while (!explicitProducers.compare_exchange_weak(prevTailExplicit,
-                                                              static_cast<ExplicitProducer*>(producer),
-                                                              std::memory_order_release,
-                                                              std::memory_order_relaxed));
-        } else {
-            auto prevTailImplicit = implicitProducers.load(std::memory_order_relaxed);
-            do {
-                static_cast<ImplicitProducer*>(producer)->nextImplicitProducer = prevTailImplicit;
-            } while (!implicitProducers.compare_exchange_weak(prevTailImplicit,
-                                                              static_cast<ImplicitProducer*>(producer),
-                                                              std::memory_order_release,
-                                                              std::memory_order_relaxed));
-        }
-#endif
-
-        return producer;
-    }
-
-    void reown_producers()
-    {
-        // After another instance is moved-into/swapped-with this one, all the
-        // producers we stole still think their parents are the other queue.
-        // So fix them up!
-        for (auto ptr = producerListTail.load(std::memory_order_relaxed); ptr != nullptr; ptr = ptr->next_prod()) {
-            ptr->parent = this;
-        }
-    }
-
-    //////////////////////////////////
-    // Implicit producer hash
-    //////////////////////////////////
-
-    struct ImplicitProducerKVP {
-        std::atomic<details::thread_id_t> key;
-        ImplicitProducer*
-            value; // No need for atomicity since it's only read by the thread that sets it in the first place
-
-        ImplicitProducerKVP()
-            : value(nullptr)
-        {}
-
-        ImplicitProducerKVP(ImplicitProducerKVP&& other) MOODYCAMEL_NOEXCEPT
-        {
-            key.store(other.key.load(std::memory_order_relaxed), std::memory_order_relaxed);
-            value = other.value;
-        }
-
-        inline ImplicitProducerKVP& operator=(ImplicitProducerKVP&& other) MOODYCAMEL_NOEXCEPT
-        {
-            swap(other);
-            return *this;
-        }
-
-        inline void swap(ImplicitProducerKVP& other) MOODYCAMEL_NOEXCEPT
-        {
-            if (this != &other) {
-                details::swap_relaxed(key, other.key);
-                std::swap(value, other.value);
-            }
-        }
-    };
-
-    template <typename XT, typename XTraits>
-    friend void moodycamel::swap(typename ConcurrentQueue<XT, XTraits>::ImplicitProducerKVP&,
-                                 typename ConcurrentQueue<XT, XTraits>::ImplicitProducerKVP&) MOODYCAMEL_NOEXCEPT;
-
-    struct ImplicitProducerHash {
-        size_t capacity;
-        ImplicitProducerKVP* entries;
-        ImplicitProducerHash* prev;
-    };
-
-    inline void populate_initial_implicit_producer_hash()
-    {
-        MOODYCAMEL_CONSTEXPR_IF(INITIAL_IMPLICIT_PRODUCER_HASH_SIZE == 0)
-        {
-            return;
-        }
-        else
-        {
-            implicitProducerHashCount.store(0, std::memory_order_relaxed);
-            auto hash = &initialImplicitProducerHash;
-            hash->capacity = INITIAL_IMPLICIT_PRODUCER_HASH_SIZE;
-            hash->entries = &initialImplicitProducerHashEntries[0];
-            for (size_t i = 0; i != INITIAL_IMPLICIT_PRODUCER_HASH_SIZE; ++i) {
-                initialImplicitProducerHashEntries[i].key.store(details::invalid_thread_id, std::memory_order_relaxed);
-            }
-            hash->prev = nullptr;
-            implicitProducerHash.store(hash, std::memory_order_relaxed);
-        }
-    }
-
-    void swap_implicit_producer_hashes(ConcurrentQueue& other)
-    {
-        MOODYCAMEL_CONSTEXPR_IF(INITIAL_IMPLICIT_PRODUCER_HASH_SIZE == 0)
-        {
-            return;
-        }
-        else
-        {
-            // Swap (assumes our implicit producer hash is initialized)
-            initialImplicitProducerHashEntries.swap(other.initialImplicitProducerHashEntries);
-            initialImplicitProducerHash.entries = &initialImplicitProducerHashEntries[0];
-            other.initialImplicitProducerHash.entries = &other.initialImplicitProducerHashEntries[0];
-
-            details::swap_relaxed(implicitProducerHashCount, other.implicitProducerHashCount);
-
-            details::swap_relaxed(implicitProducerHash, other.implicitProducerHash);
-            if (implicitProducerHash.load(std::memory_order_relaxed) == &other.initialImplicitProducerHash) {
-                implicitProducerHash.store(&initialImplicitProducerHash, std::memory_order_relaxed);
-            } else {
-                ImplicitProducerHash* hash;
-                for (hash = implicitProducerHash.load(std::memory_order_relaxed);
-                     hash->prev != &other.initialImplicitProducerHash;
-                     hash = hash->prev) {
-                    continue;
-                }
-                hash->prev = &initialImplicitProducerHash;
-            }
-            if (other.implicitProducerHash.load(std::memory_order_relaxed) == &initialImplicitProducerHash) {
-                other.implicitProducerHash.store(&other.initialImplicitProducerHash, std::memory_order_relaxed);
-            } else {
-                ImplicitProducerHash* hash;
-                for (hash = other.implicitProducerHash.load(std::memory_order_relaxed);
-                     hash->prev != &initialImplicitProducerHash;
-                     hash = hash->prev) {
-                    continue;
-                }
-                hash->prev = &other.initialImplicitProducerHash;
-            }
-        }
-    }
-
-    // Only fails (returns nullptr) if memory allocation fails
-    ImplicitProducer* get_or_add_implicit_producer()
-    {
-        // Note that since the data is essentially thread-local (key is thread ID),
-        // there's a reduced need for fences (memory ordering is already consistent
-        // for any individual thread), except for the current table itself.
-
-        // Start by looking for the thread ID in the current and all previous hash tables.
-        // If it's not found, it must not be in there yet, since this same thread would
-        // have added it previously to one of the tables that we traversed.
-
-        // Code and algorithm adapted from http://preshing.com/20130605/the-worlds-simplest-lock-free-hash-table
-
-#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODHASH
-        debug::DebugLock lock(implicitProdMutex);
-#endif
-
-        auto id = details::thread_id();
-        auto hashedId = details::hash_thread_id(id);
-
-        auto mainHash = implicitProducerHash.load(std::memory_order_acquire);
-        assert(mainHash != nullptr); // silence clang-tidy and MSVC warnings (hash cannot be null)
-        for (auto hash = mainHash; hash != nullptr; hash = hash->prev) {
-            // Look for the id in this hash
-            auto index = hashedId;
-            while (true) { // Not an infinite loop because at least one slot is free in the hash table
-                index &= hash->capacity - 1u;
-
-                auto probedKey = hash->entries[index].key.load(std::memory_order_relaxed);
-                if (probedKey == id) {
-                    // Found it! If we had to search several hashes deep, though, we should lazily add it
-                    // to the current main hash table to avoid the extended search next time.
-                    // Note there's guaranteed to be room in the current hash table since every subsequent
-                    // table implicitly reserves space for all previous tables (there's only one
-                    // implicitProducerHashCount).
-                    auto value = hash->entries[index].value;
-                    if (hash != mainHash) {
-                        index = hashedId;
-                        while (true) {
-                            index &= mainHash->capacity - 1u;
-                            auto empty = details::invalid_thread_id;
-#ifdef MOODYCAMEL_CPP11_THREAD_LOCAL_SUPPORTED
-                            auto reusable = details::invalid_thread_id2;
-                            if (mainHash->entries[index].key.compare_exchange_strong(
-                                    empty, id, std::memory_order_seq_cst, std::memory_order_relaxed) ||
-                                mainHash->entries[index].key.compare_exchange_strong(
-                                    reusable, id, std::memory_order_seq_cst, std::memory_order_relaxed)) {
-#else
-                            if (mainHash->entries[index].key.compare_exchange_strong(
-                                    empty, id, std::memory_order_seq_cst, std::memory_order_relaxed)) {
-#endif
-                                mainHash->entries[index].value = value;
-                                break;
-                            }
-                            ++index;
-                        }
-                    }
-
-                    return value;
-                }
-                if (probedKey == details::invalid_thread_id) {
-                    break; // Not in this hash table
-                }
-                ++index;
-            }
-        }
-
-        // Insert!
-        auto newCount = 1 + implicitProducerHashCount.fetch_add(1, std::memory_order_relaxed);
-        while (true) {
-            // NOLINTNEXTLINE(clang-analyzer-core.NullDereference)
-            if (newCount >= (mainHash->capacity >> 1) &&
-                !implicitProducerHashResizeInProgress.test_and_set(std::memory_order_acquire)) {
-                // We've acquired the resize lock, try to allocate a bigger hash table.
-                // Note the acquire fence synchronizes with the release fence at the end of this block, and hence when
-                // we reload implicitProducerHash it must be the most recent version (it only gets changed within this
-                // locked block).
-                mainHash = implicitProducerHash.load(std::memory_order_acquire);
-                if (newCount >= (mainHash->capacity >> 1)) {
-                    size_t newCapacity = mainHash->capacity << 1;
-                    while (newCount >= (newCapacity >> 1)) {
-                        newCapacity <<= 1;
-                    }
-                    auto raw = static_cast<char*>((Traits::malloc)(sizeof(ImplicitProducerHash) +
-                                                                   std::alignment_of<ImplicitProducerKVP>::value - 1 +
-                                                                   sizeof(ImplicitProducerKVP) * newCapacity));
-                    if (raw == nullptr) {
-                        // Allocation failed
-                        implicitProducerHashCount.fetch_sub(1, std::memory_order_relaxed);
-                        implicitProducerHashResizeInProgress.clear(std::memory_order_relaxed);
-                        return nullptr;
-                    }
-
-                    auto newHash = new (raw) ImplicitProducerHash;
-                    newHash->capacity = static_cast<size_t>(newCapacity);
-                    newHash->entries = reinterpret_cast<ImplicitProducerKVP*>(
-                        details::align_for<ImplicitProducerKVP>(raw + sizeof(ImplicitProducerHash)));
-                    for (size_t i = 0; i != newCapacity; ++i) {
-                        new (newHash->entries + i) ImplicitProducerKVP;
-                        newHash->entries[i].key.store(details::invalid_thread_id, std::memory_order_relaxed);
-                    }
-                    newHash->prev = mainHash;
-                    implicitProducerHash.store(newHash, std::memory_order_release);
-                    implicitProducerHashResizeInProgress.clear(std::memory_order_release);
-                    mainHash = newHash;
-                } else {
-                    implicitProducerHashResizeInProgress.clear(std::memory_order_release);
-                }
-            }
-
-            // If it's < three-quarters full, add to the old one anyway so that we don't have to wait for the next table
-            // to finish being allocated by another thread (and if we just finished allocating above, the condition will
-            // always be true)
-            if (newCount < (mainHash->capacity >> 1) + (mainHash->capacity >> 2)) {
-                auto producer = static_cast<ImplicitProducer*>(recycle_or_create_producer(false));
-                if (producer == nullptr) {
-                    implicitProducerHashCount.fetch_sub(1, std::memory_order_relaxed);
-                    return nullptr;
-                }
-
-#ifdef MOODYCAMEL_CPP11_THREAD_LOCAL_SUPPORTED
-                producer->threadExitListener.callback = &ConcurrentQueue::implicit_producer_thread_exited_callback;
-                producer->threadExitListener.userData = producer;
-                details::ThreadExitNotifier::subscribe(&producer->threadExitListener);
-#endif
-
-                auto index = hashedId;
-                while (true) {
-                    index &= mainHash->capacity - 1u;
-                    auto empty = details::invalid_thread_id;
-#ifdef MOODYCAMEL_CPP11_THREAD_LOCAL_SUPPORTED
-                    auto reusable = details::invalid_thread_id2;
-                    if (mainHash->entries[index].key.compare_exchange_strong(
-                            reusable, id, std::memory_order_seq_cst, std::memory_order_relaxed)) {
-                        implicitProducerHashCount.fetch_sub(
-                            1, std::memory_order_relaxed); // already counted as a used slot
-                        mainHash->entries[index].value = producer;
-                        break;
-                    }
-#endif
-                    if (mainHash->entries[index].key.compare_exchange_strong(
-                            empty, id, std::memory_order_seq_cst, std::memory_order_relaxed)) {
-                        mainHash->entries[index].value = producer;
-                        break;
-                    }
-                    ++index;
-                }
-                return producer;
-            }
-
-            // Hmm, the old hash is quite full and somebody else is busy allocating a new one.
-            // We need to wait for the allocating thread to finish (if it succeeds, we add, if not,
-            // we try to allocate ourselves).
-            mainHash = implicitProducerHash.load(std::memory_order_acquire);
-        }
-    }
-
-#ifdef MOODYCAMEL_CPP11_THREAD_LOCAL_SUPPORTED
-    void implicit_producer_thread_exited(ImplicitProducer* producer)
-    {
-        // Remove from hash
-#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODHASH
-        debug::DebugLock lock(implicitProdMutex);
-#endif
-        auto hash = implicitProducerHash.load(std::memory_order_acquire);
-        assert(hash !=
-               nullptr); // The thread exit listener is only registered if we were added to a hash in the first place
-        auto id = details::thread_id();
-        auto hashedId = details::hash_thread_id(id);
-        details::thread_id_t probedKey;
-
-        // We need to traverse all the hashes just in case other threads aren't on the current one yet and are
-        // trying to add an entry thinking there's a free slot (because they reused a producer)
-        for (; hash != nullptr; hash = hash->prev) {
-            auto index = hashedId;
-            do {
-                index &= hash->capacity - 1u;
-                probedKey = id;
-                if (hash->entries[index].key.compare_exchange_strong(
-                        probedKey, details::invalid_thread_id2, std::memory_order_seq_cst, std::memory_order_relaxed)) {
-                    break;
-                }
-                ++index;
-            } while (probedKey !=
-                     details::invalid_thread_id); // Can happen if the hash has changed but we weren't put back in it
-                                                  // yet, or if we weren't added to this hash in the first place
-        }
-
-        // Mark the queue as being recyclable
-        producer->inactive.store(true, std::memory_order_release);
-    }
-
-    static void implicit_producer_thread_exited_callback(void* userData)
-    {
-        auto producer = static_cast<ImplicitProducer*>(userData);
-        auto queue = producer->parent;
-        queue->implicit_producer_thread_exited(producer);
-    }
-#endif
-
-    //////////////////////////////////
-    // Utility functions
-    //////////////////////////////////
-
-    template <typename TAlign> static inline void* aligned_malloc(size_t size)
-    {
-        MOODYCAMEL_CONSTEXPR_IF(std::alignment_of<TAlign>::value <= std::alignment_of<details::max_align_t>::value)
-        return (Traits::malloc)(size);
-        else
-        {
-            size_t alignment = std::alignment_of<TAlign>::value;
-            void* raw = (Traits::malloc)(size + alignment - 1 + sizeof(void*));
-            if (!raw)
-                return nullptr;
-            char* ptr = details::align_for<TAlign>(reinterpret_cast<char*>(raw) + sizeof(void*));
-            *(reinterpret_cast<void**>(ptr) - 1) = raw;
-            return ptr;
-        }
-    }
-
-    template <typename TAlign> static inline void aligned_free(void* ptr)
-    {
-        MOODYCAMEL_CONSTEXPR_IF(std::alignment_of<TAlign>::value <= std::alignment_of<details::max_align_t>::value)
-        return (Traits::free)(ptr);
-        else(Traits::free)(ptr ? *(reinterpret_cast<void**>(ptr) - 1) : nullptr);
-    }
-
-    template <typename U> static inline U* create_array(size_t count)
-    {
-        assert(count > 0);
-        U* p = static_cast<U*>(aligned_malloc<U>(sizeof(U) * count));
-        if (p == nullptr)
-            return nullptr;
-
-        for (size_t i = 0; i != count; ++i)
-            new (p + i) U();
-        return p;
-    }
-
-    template <typename U> static inline void destroy_array(U* p, size_t count)
-    {
-        if (p != nullptr) {
-            assert(count > 0);
-            for (size_t i = count; i != 0;)
-                (p + --i)->~U();
-        }
-        aligned_free<U>(p);
-    }
-
-    template <typename U> static inline U* create()
-    {
-        void* p = aligned_malloc<U>(sizeof(U));
-        return p != nullptr ? new (p) U : nullptr;
-    }
-
-    template <typename U, typename A1> static inline U* create(A1&& a1)
-    {
-        void* p = aligned_malloc<U>(sizeof(U));
-        return p != nullptr ? new (p) U(std::forward<A1>(a1)) : nullptr;
-    }
-
-    template <typename U> static inline void destroy(U* p)
-    {
-        if (p != nullptr)
-            p->~U();
-        aligned_free<U>(p);
-    }
-
-  private:
-    std::atomic<ProducerBase*> producerListTail;
-    std::atomic<std::uint32_t> producerCount;
-
-    std::atomic<size_t> initialBlockPoolIndex;
-    Block* initialBlockPool;
-    size_t initialBlockPoolSize;
-
-#ifndef MCDBGQ_USEDEBUGFREELIST
-    FreeList<Block> freeList;
-#else
-    debug::DebugFreeList<Block> freeList;
-#endif
-
-    std::atomic<ImplicitProducerHash*> implicitProducerHash;
-    std::atomic<size_t> implicitProducerHashCount; // Number of slots logically used
-    ImplicitProducerHash initialImplicitProducerHash;
-    std::array<ImplicitProducerKVP, INITIAL_IMPLICIT_PRODUCER_HASH_SIZE> initialImplicitProducerHashEntries;
-    std::atomic_flag implicitProducerHashResizeInProgress;
-
-    std::atomic<std::uint32_t> nextExplicitConsumerId;
-    std::atomic<std::uint32_t> globalExplicitConsumerOffset;
-
-#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODHASH
-    debug::DebugMutex implicitProdMutex;
-#endif
-
-#ifdef MOODYCAMEL_QUEUE_INTERNAL_DEBUG
-    std::atomic<ExplicitProducer*> explicitProducers;
-    std::atomic<ImplicitProducer*> implicitProducers;
-#endif
-};
-
-template <typename T, typename Traits>
-ProducerToken::ProducerToken(ConcurrentQueue<T, Traits>& queue)
-    : producer(queue.recycle_or_create_producer(true))
-{
-    if (producer != nullptr) {
-        producer->token = this;
-    }
-}
-
-template <typename T, typename Traits>
-ProducerToken::ProducerToken(BlockingConcurrentQueue<T, Traits>& queue)
-    : producer(reinterpret_cast<ConcurrentQueue<T, Traits>*>(&queue)->recycle_or_create_producer(true))
-{
-    if (producer != nullptr) {
-        producer->token = this;
-    }
-}
-
-template <typename T, typename Traits>
-ConsumerToken::ConsumerToken(ConcurrentQueue<T, Traits>& queue)
-    : itemsConsumedFromCurrent(0)
-    , currentProducer(nullptr)
-    , desiredProducer(nullptr)
-{
-    initialOffset = queue.nextExplicitConsumerId.fetch_add(1, std::memory_order_release);
-    lastKnownGlobalOffset = static_cast<std::uint32_t>(-1);
-}
-
-template <typename T, typename Traits>
-ConsumerToken::ConsumerToken(BlockingConcurrentQueue<T, Traits>& queue)
-    : itemsConsumedFromCurrent(0)
-    , currentProducer(nullptr)
-    , desiredProducer(nullptr)
-{
-    initialOffset = reinterpret_cast<ConcurrentQueue<T, Traits>*>(&queue)->nextExplicitConsumerId.fetch_add(
-        1, std::memory_order_release);
-    lastKnownGlobalOffset = static_cast<std::uint32_t>(-1);
-}
-
-template <typename T, typename Traits>
-inline void swap(ConcurrentQueue<T, Traits>& a, ConcurrentQueue<T, Traits>& b) MOODYCAMEL_NOEXCEPT
-{
-    a.swap(b);
-}
-
-inline void swap(ProducerToken& a, ProducerToken& b) MOODYCAMEL_NOEXCEPT
-{
-    a.swap(b);
-}
-
-inline void swap(ConsumerToken& a, ConsumerToken& b) MOODYCAMEL_NOEXCEPT
-{
-    a.swap(b);
-}
-
-template <typename T, typename Traits>
-inline void swap(typename ConcurrentQueue<T, Traits>::ImplicitProducerKVP& a,
-                 typename ConcurrentQueue<T, Traits>::ImplicitProducerKVP& b) MOODYCAMEL_NOEXCEPT
-{
-    a.swap(b);
-}
-
-} // namespace moodycamel
-
-#if defined(_MSC_VER) && (!defined(_HAS_CXX17) || !_HAS_CXX17)
-#pragma warning(pop)
-#endif
-
-#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
-#pragma GCC diagnostic pop
-#endif
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/common/moody/lightweightsemaphore.h b/barretenberg/cpp/src/barretenberg/common/moody/lightweightsemaphore.h
deleted file mode 100644
index d0ee0e452533..000000000000
--- a/barretenberg/cpp/src/barretenberg/common/moody/lightweightsemaphore.h
+++ /dev/null
@@ -1,396 +0,0 @@
-// Provides an efficient implementation of a semaphore (LightweightSemaphore).
-// This is an extension of Jeff Preshing's sempahore implementation (licensed
-// under the terms of its separate zlib license) that has been adapted and
-// extended by Cameron Desrochers.
-
-#pragma once
-
-#include <cstddef> // For std::size_t
-#include <atomic>
-#include <type_traits> // For std::make_signed<T>
-
-#if defined(_WIN32)
-// Avoid including windows.h in a header; we only need a handful of
-// items, so we'll redeclare them here (this is relatively safe since
-// the API generally has to remain stable between Windows versions).
-// I know this is an ugly hack but it still beats polluting the global
-// namespace with thousands of generic names or adding a .cpp for nothing.
-extern "C" {
-struct _SECURITY_ATTRIBUTES;
-__declspec(dllimport) void* __stdcall CreateSemaphoreW(_SECURITY_ATTRIBUTES* lpSemaphoreAttributes,
-                                                       long lInitialCount,
-                                                       long lMaximumCount,
-                                                       const wchar_t* lpName);
-__declspec(dllimport) int __stdcall CloseHandle(void* hObject);
-__declspec(dllimport) unsigned long __stdcall WaitForSingleObject(void* hHandle, unsigned long dwMilliseconds);
-__declspec(dllimport) int __stdcall ReleaseSemaphore(void* hSemaphore, long lReleaseCount, long* lpPreviousCount);
-}
-#elif defined(__MACH__)
-#include <mach/mach.h>
-#elif defined(__unix__) || defined(__wasm__)
-#include <semaphore.h>
-
-#if defined(__GLIBC_PREREQ) && defined(_GNU_SOURCE)
-#if __GLIBC_PREREQ(2, 30)
-#define MOODYCAMEL_LIGHTWEIGHTSEMAPHORE_MONOTONIC
-#endif
-#endif
-#endif
-
-namespace moodycamel {
-namespace details {
-
-// Code in the mpmc_sema namespace below is an adaptation of Jeff Preshing's
-// portable + lightweight semaphore implementations, originally from
-// https://github.com/preshing/cpp11-on-multicore/blob/master/common/sema.h
-// LICENSE:
-// Copyright (c) 2015 Jeff Preshing
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-//	claim that you wrote the original software. If you use this software
-//	in a product, an acknowledgement in the product documentation would be
-//	appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//	misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-#if defined(_WIN32)
-class Semaphore {
-  private:
-    void* m_hSema;
-
-    Semaphore(const Semaphore& other) MOODYCAMEL_DELETE_FUNCTION;
-    Semaphore& operator=(const Semaphore& other) MOODYCAMEL_DELETE_FUNCTION;
-
-  public:
-    Semaphore(int initialCount = 0)
-    {
-        assert(initialCount >= 0);
-        const long maxLong = 0x7fffffff;
-        m_hSema = CreateSemaphoreW(nullptr, initialCount, maxLong, nullptr);
-        assert(m_hSema);
-    }
-
-    ~Semaphore() { CloseHandle(m_hSema); }
-
-    bool wait()
-    {
-        const unsigned long infinite = 0xffffffff;
-        return WaitForSingleObject(m_hSema, infinite) == 0;
-    }
-
-    bool try_wait() { return WaitForSingleObject(m_hSema, 0) == 0; }
-
-    bool timed_wait(std::uint64_t usecs) { return WaitForSingleObject(m_hSema, (unsigned long)(usecs / 1000)) == 0; }
-
-    void signal(int count = 1)
-    {
-        while (!ReleaseSemaphore(m_hSema, count, nullptr))
-            ;
-    }
-};
-#elif defined(__MACH__)
-//---------------------------------------------------------
-// Semaphore (Apple iOS and OSX)
-// Can't use POSIX semaphores due to http://lists.apple.com/archives/darwin-kernel/2009/Apr/msg00010.html
-//---------------------------------------------------------
-class Semaphore {
-  private:
-    semaphore_t m_sema;
-
-    Semaphore(const Semaphore& other) MOODYCAMEL_DELETE_FUNCTION;
-    Semaphore& operator=(const Semaphore& other) MOODYCAMEL_DELETE_FUNCTION;
-
-  public:
-    Semaphore(int initialCount = 0)
-    {
-        assert(initialCount >= 0);
-        kern_return_t rc = semaphore_create(mach_task_self(), &m_sema, SYNC_POLICY_FIFO, initialCount);
-        assert(rc == KERN_SUCCESS);
-        (void)rc;
-    }
-
-    ~Semaphore() { semaphore_destroy(mach_task_self(), m_sema); }
-
-    bool wait() { return semaphore_wait(m_sema) == KERN_SUCCESS; }
-
-    bool try_wait() { return timed_wait(0); }
-
-    bool timed_wait(std::uint64_t timeout_usecs)
-    {
-        mach_timespec_t ts;
-        ts.tv_sec = static_cast<unsigned int>(timeout_usecs / 1000000);
-        ts.tv_nsec = static_cast<int>((timeout_usecs % 1000000) * 1000);
-
-        // added in OSX 10.10:
-        // https://developer.apple.com/library/prerelease/mac/documentation/General/Reference/APIDiffsMacOSX10_10SeedDiff/modules/Darwin.html
-        kern_return_t rc = semaphore_timedwait(m_sema, ts);
-        return rc == KERN_SUCCESS;
-    }
-
-    void signal()
-    {
-        while (semaphore_signal(m_sema) != KERN_SUCCESS)
-            ;
-    }
-
-    void signal(int count)
-    {
-        while (count-- > 0) {
-            while (semaphore_signal(m_sema) != KERN_SUCCESS)
-                ;
-        }
-    }
-};
-#elif defined(__unix__) || defined(__wasm__)
-//---------------------------------------------------------
-// Semaphore (POSIX, Linux)
-//---------------------------------------------------------
-class Semaphore {
-  private:
-    sem_t m_sema;
-
-    Semaphore(const Semaphore& other) MOODYCAMEL_DELETE_FUNCTION;
-    Semaphore& operator=(const Semaphore& other) MOODYCAMEL_DELETE_FUNCTION;
-
-  public:
-    Semaphore(int initialCount = 0)
-    {
-        assert(initialCount >= 0);
-        int rc = sem_init(&m_sema, 0, static_cast<unsigned int>(initialCount));
-        assert(rc == 0);
-        (void)rc;
-    }
-
-    ~Semaphore() { sem_destroy(&m_sema); }
-
-    bool wait()
-    {
-        // http://stackoverflow.com/questions/2013181/gdb-causes-sem-wait-to-fail-with-eintr-error
-        int rc;
-        do {
-            rc = sem_wait(&m_sema);
-        } while (rc == -1 && errno == EINTR);
-        return rc == 0;
-    }
-
-    bool try_wait()
-    {
-        int rc;
-        do {
-            rc = sem_trywait(&m_sema);
-        } while (rc == -1 && errno == EINTR);
-        return rc == 0;
-    }
-
-    bool timed_wait(std::uint64_t usecs)
-    {
-        struct timespec ts;
-        const int usecs_in_1_sec = 1000000;
-        const int nsecs_in_1_sec = 1000000000;
-#ifdef MOODYCAMEL_LIGHTWEIGHTSEMAPHORE_MONOTONIC
-        clock_gettime(CLOCK_MONOTONIC, &ts);
-#else
-        clock_gettime(CLOCK_REALTIME, &ts);
-#endif
-        ts.tv_sec += (time_t)(usecs / usecs_in_1_sec);
-        ts.tv_nsec += (long)(usecs % usecs_in_1_sec) * 1000;
-        // sem_timedwait bombs if you have more than 1e9 in tv_nsec
-        // so we have to clean things up before passing it in
-        if (ts.tv_nsec >= nsecs_in_1_sec) {
-            ts.tv_nsec -= nsecs_in_1_sec;
-            ++ts.tv_sec;
-        }
-
-        int rc;
-        do {
-#ifdef MOODYCAMEL_LIGHTWEIGHTSEMAPHORE_MONOTONIC
-            rc = sem_clockwait(&m_sema, CLOCK_MONOTONIC, &ts);
-#else
-            rc = sem_timedwait(&m_sema, &ts);
-#endif
-        } while (rc == -1 && errno == EINTR);
-        return rc == 0;
-    }
-
-    void signal()
-    {
-        while (sem_post(&m_sema) == -1)
-            ;
-    }
-
-    void signal(int count)
-    {
-        while (count-- > 0) {
-            while (sem_post(&m_sema) == -1)
-                ;
-        }
-    }
-};
-#else
-#error Unsupported platform! (No semaphore wrapper available)
-#endif
-
-} // end namespace details
-
-//---------------------------------------------------------
-// LightweightSemaphore
-//---------------------------------------------------------
-class LightweightSemaphore {
-  public:
-    typedef std::make_signed<std::size_t>::type ssize_t;
-
-  private:
-    std::atomic<ssize_t> m_count;
-    details::Semaphore m_sema;
-    int m_maxSpins;
-
-    bool waitWithPartialSpinning(std::int64_t timeout_usecs = -1)
-    {
-        ssize_t oldCount;
-        int spin = m_maxSpins;
-        while (--spin >= 0) {
-            oldCount = m_count.load(std::memory_order_relaxed);
-            if ((oldCount > 0) && m_count.compare_exchange_strong(
-                                      oldCount, oldCount - 1, std::memory_order_acquire, std::memory_order_relaxed))
-                return true;
-            std::atomic_signal_fence(std::memory_order_acquire); // Prevent the compiler from collapsing the loop.
-        }
-        oldCount = m_count.fetch_sub(1, std::memory_order_acquire);
-        if (oldCount > 0)
-            return true;
-        if (timeout_usecs < 0) {
-            if (m_sema.wait())
-                return true;
-        }
-        if (timeout_usecs > 0 && m_sema.timed_wait((std::uint64_t)timeout_usecs))
-            return true;
-        // At this point, we've timed out waiting for the semaphore, but the
-        // count is still decremented indicating we may still be waiting on
-        // it. So we have to re-adjust the count, but only if the semaphore
-        // wasn't signaled enough times for us too since then. If it was, we
-        // need to release the semaphore too.
-        while (true) {
-            oldCount = m_count.load(std::memory_order_acquire);
-            if (oldCount >= 0 && m_sema.try_wait())
-                return true;
-            if (oldCount < 0 && m_count.compare_exchange_strong(
-                                    oldCount, oldCount + 1, std::memory_order_relaxed, std::memory_order_relaxed))
-                return false;
-        }
-    }
-
-    ssize_t waitManyWithPartialSpinning(ssize_t max, std::int64_t timeout_usecs = -1)
-    {
-        assert(max > 0);
-        ssize_t oldCount;
-        int spin = m_maxSpins;
-        while (--spin >= 0) {
-            oldCount = m_count.load(std::memory_order_relaxed);
-            if (oldCount > 0) {
-                ssize_t newCount = oldCount > max ? oldCount - max : 0;
-                if (m_count.compare_exchange_strong(
-                        oldCount, newCount, std::memory_order_acquire, std::memory_order_relaxed))
-                    return oldCount - newCount;
-            }
-            std::atomic_signal_fence(std::memory_order_acquire);
-        }
-        oldCount = m_count.fetch_sub(1, std::memory_order_acquire);
-        if (oldCount <= 0) {
-            if ((timeout_usecs == 0) || (timeout_usecs < 0 && !m_sema.wait()) ||
-                (timeout_usecs > 0 && !m_sema.timed_wait((std::uint64_t)timeout_usecs))) {
-                while (true) {
-                    oldCount = m_count.load(std::memory_order_acquire);
-                    if (oldCount >= 0 && m_sema.try_wait())
-                        break;
-                    if (oldCount < 0 &&
-                        m_count.compare_exchange_strong(
-                            oldCount, oldCount + 1, std::memory_order_relaxed, std::memory_order_relaxed))
-                        return 0;
-                }
-            }
-        }
-        if (max > 1)
-            return 1 + tryWaitMany(max - 1);
-        return 1;
-    }
-
-  public:
-    LightweightSemaphore(ssize_t initialCount = 0, int maxSpins = 10000)
-        : m_count(initialCount)
-        , m_maxSpins(maxSpins)
-    {
-        assert(initialCount >= 0);
-        assert(maxSpins >= 0);
-    }
-
-    bool tryWait()
-    {
-        ssize_t oldCount = m_count.load(std::memory_order_relaxed);
-        while (oldCount > 0) {
-            if (m_count.compare_exchange_weak(
-                    oldCount, oldCount - 1, std::memory_order_acquire, std::memory_order_relaxed))
-                return true;
-        }
-        return false;
-    }
-
-    bool wait() { return tryWait() || waitWithPartialSpinning(); }
-
-    bool wait(std::int64_t timeout_usecs) { return tryWait() || waitWithPartialSpinning(timeout_usecs); }
-
-    // Acquires between 0 and (greedily) max, inclusive
-    ssize_t tryWaitMany(ssize_t max)
-    {
-        assert(max >= 0);
-        ssize_t oldCount = m_count.load(std::memory_order_relaxed);
-        while (oldCount > 0) {
-            ssize_t newCount = oldCount > max ? oldCount - max : 0;
-            if (m_count.compare_exchange_weak(oldCount, newCount, std::memory_order_acquire, std::memory_order_relaxed))
-                return oldCount - newCount;
-        }
-        return 0;
-    }
-
-    // Acquires at least one, and (greedily) at most max
-    ssize_t waitMany(ssize_t max, std::int64_t timeout_usecs)
-    {
-        assert(max >= 0);
-        ssize_t result = tryWaitMany(max);
-        if (result == 0 && max > 0)
-            result = waitManyWithPartialSpinning(max, timeout_usecs);
-        return result;
-    }
-
-    ssize_t waitMany(ssize_t max)
-    {
-        ssize_t result = waitMany(max, -1);
-        assert(result > 0);
-        return result;
-    }
-
-    void signal(ssize_t count = 1)
-    {
-        assert(count >= 0);
-        ssize_t oldCount = m_count.fetch_add(count, std::memory_order_release);
-        ssize_t toRelease = -oldCount < count ? -oldCount : count;
-        if (toRelease > 0) {
-            m_sema.signal((int)toRelease);
-        }
-    }
-
-    std::size_t availableApprox() const
-    {
-        ssize_t count = m_count.load(std::memory_order_relaxed);
-        return count > 0 ? static_cast<std::size_t>(count) : 0;
-    }
-};
-
-} // end namespace moodycamel
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/common/parallel_for_atomic_pool.cpp b/barretenberg/cpp/src/barretenberg/common/parallel_for_atomic_pool.cpp
index 29c45e348969..f71522f9f02c 100644
--- a/barretenberg/cpp/src/barretenberg/common/parallel_for_atomic_pool.cpp
+++ b/barretenberg/cpp/src/barretenberg/common/parallel_for_atomic_pool.cpp
@@ -1,3 +1,4 @@
+#ifndef NO_MULTITHREADING
 #include "log.hpp"
 #include "thread.hpp"
 #include <atomic>
@@ -113,4 +114,5 @@ void parallel_for_atomic_pool(size_t num_iterations, const std::function<void(si
     pool.start_tasks(num_iterations, func);
     // info("done");
 }
-} // namespace bb
\ No newline at end of file
+} // namespace bb
+#endif
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/common/parallel_for_moody.cpp b/barretenberg/cpp/src/barretenberg/common/parallel_for_moody.cpp
deleted file mode 100644
index 24cc9738de6f..000000000000
--- a/barretenberg/cpp/src/barretenberg/common/parallel_for_moody.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-#include "barretenberg/common/thread.hpp"
-#include "log.hpp"
-#include "moody/blockingconcurrentqueue.h"
-#include "timer.hpp"
-#include <atomic>
-#include <condition_variable>
-#include <functional>
-#include <mutex>
-#include <queue>
-#include <thread>
-#include <vector>
-
-namespace {
-class ThreadPool {
-  public:
-    ThreadPool(size_t num_threads)
-        : tasks(1024)
-        , complete_queue_(1)
-    {
-        workers.reserve(num_threads);
-        for (size_t i = 0; i < num_threads; ++i) {
-            workers.emplace_back(&ThreadPool::worker_loop, this, i);
-        }
-    }
-
-    ~ThreadPool()
-    {
-        stop = true;
-        for (size_t i = 0; i < workers.size(); ++i) {
-            tasks.enqueue([]() {});
-        }
-        for (auto& worker : workers) {
-            worker.join();
-        }
-    }
-
-    ThreadPool(const ThreadPool& other) = delete;
-    ThreadPool(ThreadPool&& other) = delete;
-    ThreadPool& operator=(const ThreadPool& other) = delete;
-    ThreadPool& operator=(ThreadPool&& other) = delete;
-
-    void start_tasks(const std::function<void(size_t)>& task, size_t num_iterations)
-    {
-        std::atomic<size_t> complete_counter;
-        //  3rd party library expects c-style array as input. Boo.
-        // NOLINTNEXTLINE(cppcoreguidelines-avoid-c-arrays)
-        std::function<void()> funcs[num_iterations];
-        for (size_t i = 0; i < num_iterations; ++i) {
-            funcs[i] = [&, i]() {
-                // Timer t;
-                task(i);
-                // info("task took: ", t.nanoseconds());
-                if (complete_counter.fetch_add(1, std::memory_order_relaxed) == num_iterations - 1) {
-                    // info("iteration ", i, " was the last");
-                    complete_queue_.enqueue(true);
-                }
-            };
-        }
-        tasks.enqueue_bulk(funcs, num_iterations);
-
-        {
-            std::function<void()> task;
-            while (tasks.try_dequeue(task)) {
-                task();
-            }
-        }
-
-        bool complete = false;
-        complete_queue_.wait_dequeue(complete);
-        // info("all done!");
-    }
-
-  private:
-    std::vector<std::thread> workers;
-    moodycamel::BlockingConcurrentQueue<std::function<void()>> tasks;
-    moodycamel::BlockingConcurrentQueue<bool> complete_queue_;
-    std::atomic<bool> stop = false;
-
-    void worker_loop(size_t /*unused*/)
-    {
-        // info("worker started");
-        while (!stop) {
-            std::function<void()> task;
-            tasks.wait_dequeue(task);
-            task();
-        }
-    }
-};
-} // namespace
-
-namespace bb {
-/**
- * A Thread pooled strategy that uses a popular lock-free multiple-producer multiple-consume queue library by
- * "moodycamel" as the underlying mechanism to distribute work and join on completion.
- */
-void parallel_for_moody(size_t num_iterations, const std::function<void(size_t)>& func)
-{
-    // -1 because main thread works.
-    static ThreadPool pool(get_num_cpus() - 1);
-
-    pool.start_tasks(func, num_iterations);
-}
-} // namespace bb
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/common/parallel_for_mutex_pool.cpp b/barretenberg/cpp/src/barretenberg/common/parallel_for_mutex_pool.cpp
index 24479dec9c1e..16b922b99c8b 100644
--- a/barretenberg/cpp/src/barretenberg/common/parallel_for_mutex_pool.cpp
+++ b/barretenberg/cpp/src/barretenberg/common/parallel_for_mutex_pool.cpp
@@ -1,3 +1,4 @@
+#ifndef NO_MULTITHREADING
 #include "log.hpp"
 #include "thread.hpp"
 #include <atomic>
@@ -128,4 +129,5 @@ void parallel_for_mutex_pool(size_t num_iterations, const std::function<void(siz
     pool.start_tasks(num_iterations, func);
     // info("done");
 }
-} // namespace bb
\ No newline at end of file
+} // namespace bb
+#endif
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/common/parallel_for_omp.cpp b/barretenberg/cpp/src/barretenberg/common/parallel_for_omp.cpp
index d169acf233dd..812e7c51cac0 100644
--- a/barretenberg/cpp/src/barretenberg/common/parallel_for_omp.cpp
+++ b/barretenberg/cpp/src/barretenberg/common/parallel_for_omp.cpp
@@ -1,3 +1,4 @@
+#ifndef NO_MULTITHREADING
 #include <cstddef>
 #include <functional>
 
@@ -11,4 +12,5 @@ void parallel_for_omp(size_t num_iterations, const std::function<void(size_t)>&
         func(i);
     }
 }
-} // namespace bb
\ No newline at end of file
+} // namespace bb
+#endif
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/common/parallel_for_queued.cpp b/barretenberg/cpp/src/barretenberg/common/parallel_for_queued.cpp
index 33dc7af9c29b..acaf920fd038 100644
--- a/barretenberg/cpp/src/barretenberg/common/parallel_for_queued.cpp
+++ b/barretenberg/cpp/src/barretenberg/common/parallel_for_queued.cpp
@@ -1,3 +1,4 @@
+#ifndef NO_MULTITHREADING
 #include "log.hpp"
 #include "thread.hpp"
 #include <atomic>
@@ -123,4 +124,5 @@ void parallel_for_queued(size_t num_iterations, const std::function<void(size_t)
     pool.wait();
     // info("pool finished work");
 }
-} // namespace bb
\ No newline at end of file
+} // namespace bb
+#endif
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/common/parallel_for_spawning.cpp b/barretenberg/cpp/src/barretenberg/common/parallel_for_spawning.cpp
index 391596ff596c..f4d5842f66fd 100644
--- a/barretenberg/cpp/src/barretenberg/common/parallel_for_spawning.cpp
+++ b/barretenberg/cpp/src/barretenberg/common/parallel_for_spawning.cpp
@@ -1,4 +1,6 @@
+#ifndef NO_MULTITHREADING
 #include "thread.hpp"
+#include <thread>
 
 namespace bb {
 /**
@@ -41,3 +43,4 @@ void parallel_for_spawning(size_t num_iterations, const std::function<void(size_
     // info("joined!\n\n");
 }
 } // namespace bb
+#endif
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/common/serialize.hpp b/barretenberg/cpp/src/barretenberg/common/serialize.hpp
index 3f3cd3778e4b..6b86e8adedf0 100644
--- a/barretenberg/cpp/src/barretenberg/common/serialize.hpp
+++ b/barretenberg/cpp/src/barretenberg/common/serialize.hpp
@@ -371,8 +371,7 @@ template <typename B, typename T> inline void read(B& it, std::optional<T>& opt_
 }
 
 template <typename T>
-concept HasGetAll = requires(T t) { t.get_all(); } && !
-msgpack_concepts::HasMsgPack<T>;
+concept HasGetAll = requires(T t) { t.get_all(); } && !msgpack_concepts::HasMsgPack<T>;
 
 // Write out a struct that defines get_all()
 template <typename B, HasGetAll T> inline void write(B& buf, T const& value)
diff --git a/barretenberg/cpp/src/barretenberg/common/thread.hpp b/barretenberg/cpp/src/barretenberg/common/thread.hpp
index 723d2834fa59..77309cd90984 100644
--- a/barretenberg/cpp/src/barretenberg/common/thread.hpp
+++ b/barretenberg/cpp/src/barretenberg/common/thread.hpp
@@ -4,18 +4,13 @@
 #include <barretenberg/numeric/bitop/get_msb.hpp>
 #include <functional>
 #include <iostream>
-#include <thread>
 #include <vector>
 
 namespace bb {
 
 inline size_t get_num_cpus()
 {
-#ifdef NO_MULTITHREADING
-    return 1;
-#else
     return env_hardware_concurrency();
-#endif
 }
 
 // For algorithms that need to be divided amongst power of 2 threads.
@@ -117,4 +112,4 @@ size_t calculate_num_threads(size_t num_iterations, size_t min_iterations_per_th
 size_t calculate_num_threads_pow2(size_t num_iterations,
                                   size_t min_iterations_per_thread = DEFAULT_MIN_ITERS_PER_THREAD);
 
-} // namespace bb
\ No newline at end of file
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/env/hardware_concurrency.cpp b/barretenberg/cpp/src/barretenberg/env/hardware_concurrency.cpp
index 9217e014eb94..5fe706d527f2 100644
--- a/barretenberg/cpp/src/barretenberg/env/hardware_concurrency.cpp
+++ b/barretenberg/cpp/src/barretenberg/env/hardware_concurrency.cpp
@@ -4,10 +4,19 @@
 #include <iostream>
 #include <stdexcept>
 #include <string>
+
+#ifndef NO_MULTITHREADING
 #include <thread>
+#endif
 
 extern "C" {
 
+#ifdef NO_MULTITHREADING
+uint32_t env_hardware_concurrency()
+{
+    return 1;
+}
+#else
 uint32_t env_hardware_concurrency()
 {
 #ifndef __wasm__
@@ -22,4 +31,5 @@ uint32_t env_hardware_concurrency()
     }
 #endif
 }
+#endif
 }
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/relations/relation_types.hpp b/barretenberg/cpp/src/barretenberg/relations/relation_types.hpp
index 20e55502c612..0a1cdbed54d6 100644
--- a/barretenberg/cpp/src/barretenberg/relations/relation_types.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/relation_types.hpp
@@ -23,10 +23,10 @@ using GetParameterView = std::conditional_t<IsField<typename Params::DataType>,
 
 template <typename T, size_t subrelation_idx>
 concept HasSubrelationLinearlyIndependentMember = requires(T) {
-                                                      {
-                                                          std::get<subrelation_idx>(T::SUBRELATION_LINEARLY_INDEPENDENT)
-                                                          } -> std::convertible_to<bool>;
-                                                  };
+    {
+        std::get<subrelation_idx>(T::SUBRELATION_LINEARLY_INDEPENDENT)
+    } -> std::convertible_to<bool>;
+};
 
 template <typename T>
 concept HasParameterLengthAdjustmentsMember = requires { T::TOTAL_LENGTH_ADJUSTMENTS; };
@@ -121,10 +121,10 @@ consteval std::array<size_t, NUM_SUBRELATIONS> compute_composed_subrelation_part
  */
 template <typename Relation, typename AllEntities>
 concept isSkippable = requires(const AllEntities& input) {
-                          {
-                              Relation::skip(input)
-                              } -> std::same_as<bool>;
-                      };
+    {
+        Relation::skip(input)
+    } -> std::same_as<bool>;
+};
 
 /**
  * @brief A wrapper for Relations to expose methods used by the Sumcheck prover or verifier to add the
diff --git a/barretenberg/cpp/src/barretenberg/relations/utils.hpp b/barretenberg/cpp/src/barretenberg/relations/utils.hpp
index 0eced14c1957..1a777af8fdcd 100644
--- a/barretenberg/cpp/src/barretenberg/relations/utils.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/utils.hpp
@@ -113,8 +113,7 @@ template <typename Flavor> class RelationUtils {
     template <typename... T>
     static constexpr void add_tuples(std::tuple<T...>& tuple_1, const std::tuple<T...>& tuple_2)
     {
-        auto add_tuples_helper = [&]<std::size_t... I>(std::index_sequence<I...>)
-        {
+        auto add_tuples_helper = [&]<std::size_t... I>(std::index_sequence<I...>) {
             ((std::get<I>(tuple_1) += std::get<I>(tuple_2)), ...);
         };
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp
index 2285d18e97d3..b16e5c636d85 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp
@@ -19,8 +19,7 @@ concept IsUltraBuilder = bb::IsAnyOf<T, bb::UltraCircuitBuilder, bb::GoblinUltra
 template <typename T>
 concept IsGoblinBuilder = bb::IsAnyOf<T, bb::GoblinUltraCircuitBuilder>;
 template <typename T>
-concept IsNotGoblinBuilder = !
-IsGoblinBuilder<T>;
+concept IsNotGoblinBuilder = !IsGoblinBuilder<T>;
 
 template <typename T>
 concept IsSimulator = bb::IsAnyOf<T, bb::CircuitSimulatorBN254>;
diff --git a/barretenberg/cpp/src/barretenberg/transcript/transcript.hpp b/barretenberg/cpp/src/barretenberg/transcript/transcript.hpp
index 655641144b31..d5d7347229d3 100644
--- a/barretenberg/cpp/src/barretenberg/transcript/transcript.hpp
+++ b/barretenberg/cpp/src/barretenberg/transcript/transcript.hpp
@@ -16,9 +16,9 @@
 namespace bb {
 
 template <typename T, typename... U>
-concept Loggable = (std::same_as<T, bb::fr> || std::same_as<T, grumpkin::fr> ||
-                    std::same_as<T, bb::g1::affine_element> || std::same_as<T, grumpkin::g1::affine_element> ||
-                    std::same_as<T, uint32_t>);
+concept Loggable =
+    (std::same_as<T, bb::fr> || std::same_as<T, grumpkin::fr> || std::same_as<T, bb::g1::affine_element> ||
+     std::same_as<T, grumpkin::g1::affine_element> || std::same_as<T, uint32_t>);
 
 // class TranscriptManifest;
 class TranscriptManifest {
diff --git a/barretenberg/cpp/srs_db/Earthfile b/barretenberg/cpp/srs_db/Earthfile
index 9bb57f1d5c69..5ccba0b6d671 100644
--- a/barretenberg/cpp/srs_db/Earthfile
+++ b/barretenberg/cpp/srs_db/Earthfile
@@ -1,5 +1,5 @@
 VERSION 0.8
-FROM ubuntu:lunar
+FROM ubuntu:noble
 
 RUN apt-get update && apt-get install -y curl
 
diff --git a/barretenberg/exports.json b/barretenberg/exports.json
index 08ddefa86a5f..b0ed6310fb37 100644
--- a/barretenberg/exports.json
+++ b/barretenberg/exports.json
@@ -111,13 +111,13 @@
     "functionName": "poseidon2_permutation",
     "inArgs": [
       {
-        "name": "input_state",
+        "name": "inputs_buffer",
         "type": "fr::vec_in_buf"
       }
     ],
     "outArgs": [
       {
-        "name": "output_state",
+        "name": "output",
         "type": "fr::vec_out_buf"
       }
     ],
diff --git a/barretenberg/scripts/bindgen.sh b/barretenberg/scripts/bindgen.sh
index e3d5b9b5a70c..29ee5eb07787 100755
--- a/barretenberg/scripts/bindgen.sh
+++ b/barretenberg/scripts/bindgen.sh
@@ -1,6 +1,16 @@
 #!/usr/bin/env bash
 set -eu
 
+if ! dpkg -l python3-clang-18 &> /dev/null; then
+  echo "You need to install python clang 18 e.g.: apt install python3-clang-18"
+  exit 1
+fi
+
 #find ./cpp/src -type f -name "c_bind*.hpp" | ./scripts/decls_json.py > exports.json
 cat ./scripts/c_bind_files.txt | ./scripts/decls_json.py > exports.json
-(cd ./ts && yarn node --loader ts-node/esm ./src/bindgen/index.ts ../exports.json > ./src/barretenberg_api/index.ts)
\ No newline at end of file
+(
+  cd ./ts && \
+  yarn install && \
+  yarn node --loader ts-node/esm ./src/bindgen/index.ts ../exports.json > ./src/barretenberg_api/index.ts && \
+  yarn prettier -w ./src/barretenberg_api/index.ts
+)
\ No newline at end of file
diff --git a/barretenberg/scripts/decls_json.py b/barretenberg/scripts/decls_json.py
index 2b1753220baa..a27edd0401e4 100755
--- a/barretenberg/scripts/decls_json.py
+++ b/barretenberg/scripts/decls_json.py
@@ -4,7 +4,7 @@
 import clang.cindex
 from typing import List
 
-clang.cindex.Config.set_library_file('/usr/lib/llvm-16/lib/libclang-16.so.1')
+clang.cindex.Config.set_library_file('/usr/lib/llvm-18/lib/libclang-18.so.1')
 
 def has_annotation(node, annotation):
     for child in node.get_children():
diff --git a/barretenberg/ts/Earthfile b/barretenberg/ts/Earthfile
index a11afe022ee8..fce0ab368070 100644
--- a/barretenberg/ts/Earthfile
+++ b/barretenberg/ts/Earthfile
@@ -1,6 +1,6 @@
 VERSION 0.8
 
-FROM node:18.19.0
+FROM ../../build-images+build
 WORKDIR /usr/src/barretenberg/ts-build
 
 # minimum files to download yarn packages
@@ -12,7 +12,7 @@ RUN yarn --immutable
 # other source files
 COPY --dir src *.json *.js *.cjs .
 
-# copy over wasm build from cpp folder
+# copy over wasm builds from cpp folder
 COPY ../cpp/+preset-wasm-threads/bin/barretenberg.wasm src/barretenberg_wasm/barretenberg-threads.wasm
 COPY ../cpp/+preset-wasm/bin/barretenberg.wasm src/barretenberg_wasm/barretenberg.wasm
 COPY ../cpp/+preset-wasm-threads/bin/barretenberg.wasm dest/node/barretenberg_wasm/barretenberg-threads.wasm
diff --git a/barretenberg/ts/src/barretenberg_api/index.ts b/barretenberg/ts/src/barretenberg_api/index.ts
index 967fc1b03a22..bdd35960e7e6 100644
--- a/barretenberg/ts/src/barretenberg_api/index.ts
+++ b/barretenberg/ts/src/barretenberg_api/index.ts
@@ -87,8 +87,8 @@ export class BarretenbergApi {
     return out[0];
   }
 
-  async poseidon2Permutation(inputState: Fr[]): Promise<Fr[]> {
-    const inArgs = [inputState].map(serializeBufferable);
+  async poseidon2Permutation(inputsBuffer: Fr[]): Promise<Fr[]> {
+    const inArgs = [inputsBuffer].map(serializeBufferable);
     const outTypes: OutputType[] = [VectorDeserializer(Fr)];
     const result = await this.wasm.callWasmExport(
       'poseidon2_permutation',
@@ -643,8 +643,8 @@ export class BarretenbergApiSync {
     return out[0];
   }
 
-  poseidon2Permutation(inputState: Fr[]): Fr[] {
-    const inArgs = [inputState].map(serializeBufferable);
+  poseidon2Permutation(inputsBuffer: Fr[]): Fr[] {
+    const inArgs = [inputsBuffer].map(serializeBufferable);
     const outTypes: OutputType[] = [VectorDeserializer(Fr)];
     const result = this.wasm.callWasmExport(
       'poseidon2_permutation',
diff --git a/bootstrap.sh b/bootstrap.sh
index cdecd4a065a0..83216dc04704 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,11 +1,9 @@
 #!/usr/bin/env bash
-# Usage:
-# Bootstraps the repo. End to end tests should be runnable after a bootstrap:
-#   ./bootstrap.sh
-# Run a second time to perform a "light bootstrap", rebuilds code that's changed:
-#   ./bootstrap.sh
-# Force a clean of the repo before performing a full bootstrap, erases untracked files, be careful!
-#   ./bootstrap.sh clean
+# Usage: ./bootstrap.sh <full|fast|check|clean>"
+#   full: Bootstrap the repo from scratch.
+#   fast: Bootstrap the repo using CI cache where possible to save time building.
+#   check: Check required toolchains and versions are installed.
+#   clean: Force a complete clean of the repo. Erases untracked files, be careful!
 set -eu
 
 cd "$(dirname "$0")"
@@ -13,11 +11,89 @@ cd "$(dirname "$0")"
 CMD=${1:-}
 
 YELLOW="\033[93m"
+RED="\033[31m"
 BOLD="\033[1m"
 RESET="\033[0m"
 
 source ./build-system/scripts/setup_env '' '' '' > /dev/null
 
+function encourage_dev_container {
+  echo -e "${BOLD}${RED}ERROR: Toolchain incompatability. We encourage use of our dev container. See build-images/README.md.${RESET}"
+}
+
+# Checks for required utilities, toolchains and their versions.
+# Developers should probably use the dev container in /build-images to ensure the smoothest experience.
+function check_toolchains {
+  # Check for various required utilities.
+  for util in jq parallel awk git curl; do
+    if ! command -v $util > /dev/null; then
+      encourage_dev_container
+      echo "Utility $util not found."
+      exit 1
+    fi
+  done
+  # Check cmake version.
+  CMAKE_MIN_VERSION="3.24"
+  CMAKE_INSTALLED_VERSION=$(cmake --version | head -n1 | awk '{print $3}')
+  if [[ "$(printf '%s\n' "$CMAKE_MIN_VERSION" "$CMAKE_INSTALLED_VERSION" | sort -V | head -n1)" != "$CMAKE_MIN_VERSION" ]]; then
+    encourage_dev_container
+    echo "Minimum cmake version 3.24 not found."
+    exit 1
+  fi
+  # Check clang version.
+  if ! clang++-16 --version > /dev/null; then
+    encourage_dev_container
+    echo "clang 16 not installed."
+    echo "Installation: sudo apt install clang-16"
+    exit 1
+  fi
+  # Check rust version.
+  if ! rustup show | grep "1.74" > /dev/null; then
+    encourage_dev_container
+    echo "Rust version 1.74 not installed."
+    echo "Installation:"
+    echo "  curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.74.1"
+    exit 1
+  fi
+  # Check wasi-sdk version.
+  if ! cat /opt/wasi-sdk/VERSION 2> /dev/null | grep 22.0 > /dev/null; then
+    encourage_dev_container
+    echo "wasi-sdk-22 not found at /opt/wasi-sdk."
+    echo "Use dev container, build from source, or you can install linux x86 version with:"
+    echo "  curl -s -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-22/wasi-sdk-22.0-linux.tar.gz | tar zxf - && sudo mv wasi-sdk-22.0 /opt/wasi-sdk"
+    exit 1
+  fi
+  # Check foundry version.
+  for tool in forge anvil; do
+    if ! $tool --version 2> /dev/null | grep de33b6a > /dev/null; then
+      encourage_dev_container
+      echo "$tool not in PATH or incorrect version (requires de33b6af53005037b463318d2628b5cfcaf39916)."
+      echo "Installation: https://book.getfoundry.sh/getting-started/installation (requires rust 1.75)"
+      echo "  curl -L https://foundry.paradigm.xyz | bash"
+      echo "  foundryup -b de33b6af53005037b463318d2628b5cfcaf39916"
+      exit 1
+    fi
+  done
+  # Check Node.js version.
+  NODE_MIN_VERSION="18.19.0"
+  NODE_INSTALLED_VERSION=$(node --version | cut -d 'v' -f 2)
+  if [[ "$(printf '%s\n' "$NODE_MIN_VERSION" "$NODE_INSTALLED_VERSION" | sort -V | head -n1)" != "$NODE_MIN_VERSION" ]]; then
+    encourage_dev_container
+    echo "Minimum Node.js version 18.19.0 not found."
+    echo "Installation: nvm install 18"
+    exit 1
+  fi
+  # Check for required npm globals.
+  for util in yarn solhint; do
+    if ! command -v $util > /dev/null; then
+      encourage_dev_container
+      echo "$util not found."
+      echo "Installation: npm install --global $util"
+      exit 1
+    fi
+  done
+}
+
 if [ "$CMD" = "clean" ]; then
   echo "WARNING: This will erase *all* untracked files, including hooks and submodules."
   echo -n "Continue? [y/n] "
@@ -48,8 +124,12 @@ elif [ "$CMD" = "fast" ]; then
     echo -e "${BOLD}${YELLOW}WARNING: Either docker or aws credentials are missing. Install docker and request credentials. Note this is for internal aztec devs only.${RESET}"
     exit 1
   fi
+elif [ "$CMD" = "check" ]; then
+  check_toolchains
+  echo "Toolchains look good! 🎉"
+  exit 0
 else
-  echo "usage: $0 <full|fast|clean>"
+  echo "usage: $0 <full|fast|check|clean>"
   exit 1
 fi
 
@@ -60,10 +140,11 @@ chmod +x $HOOKS_DIR/pre-commit
 
 git submodule update --init --recursive
 
+check_toolchains
+
 PROJECTS=(
   barretenberg
   noir
-  foundry
   l1-contracts
   avm-transpiler
   noir-projects
diff --git a/build-images/Dockerfile b/build-images/Dockerfile
new file mode 100644
index 000000000000..e7b4c7c76fa5
--- /dev/null
+++ b/build-images/Dockerfile
@@ -0,0 +1,289 @@
+########################################################################################################################
+# Build wasi-sdk.
+FROM ubuntu:noble AS wasi-sdk-build
+RUN apt update && apt install -y \
+    clang \
+    cmake \
+    ninja-build \
+    git \
+    cargo
+RUN git clone --depth 1 --recursive --branch wasi-sdk-22 \
+        https://github.com/WebAssembly/wasi-sdk.git
+RUN mkdir -p /wasi-sdk/build/install/opt/wasi-sdk
+WORKDIR /wasi-sdk
+ENV MAKEFLAGS="-j$(nproc)"
+RUN make build/llvm.BUILT
+RUN make build/wasi-libc.BUILT
+RUN make build/compiler-rt.BUILT
+RUN make build/libcxx.BUILT
+RUN make build/config.BUILT
+RUN make build/version.BUILT
+RUN mv build/install/opt/wasi-sdk /opt/wasi-sdk
+FROM ubuntu:noble AS wasi-sdk
+COPY --from=wasi-sdk-build /opt/wasi-sdk /opt/wasi-sdk
+
+########################################################################################################################
+# Build foundry.
+FROM ubuntu:noble AS foundry
+RUN apt update && apt install -y git cargo
+RUN ulimit -n 65535 && \
+    git clone --depth 1 --branch nightly-de33b6af53005037b463318d2628b5cfcaf39916 \
+        https://github.com/foundry-rs/foundry.git && \
+    cd foundry && cargo build --profile local && \
+    mkdir -p /opt/foundry/bin && \
+    for t in forge cast anvil chisel; do \
+        mv ./target/local/$t /opt/foundry/bin/$t; \
+        strip /opt/foundry/bin/$t; \
+    done
+
+########################################################################################################################
+# This image contains *just* what's needed to perform a full build of the aztec project.
+# It acts as the base image for all CI builds, and we build on it to produce a developer box.
+FROM ubuntu:noble as build
+RUN apt update && \
+    apt install -y \
+        # Utils
+        curl \
+        git \
+        curl \
+        wget \
+        jq \
+        gawk \
+        unzip \
+        netcat-openbsd \
+        parallel \
+        # C++ (clang=18, which we will move to. 16 is for current build.)
+        build-essential \
+        cmake \
+        ninja-build \
+        clang \
+        clang-16 \
+        clang-format-16 \
+        libc++-dev \
+        libomp-dev \
+        doxygen \
+        # Node (18.19.1)
+        nodejs \
+        npm \
+        # Python (clang bindings for wasm bindgen.)
+        python3 \
+        python3-clang \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+# Install wasi-sdk.
+COPY --from=aztecprotocol/wasi-sdk:22.0 /opt/wasi-sdk /opt/wasi-sdk
+
+# Install foundry.
+COPY --from=foundry /opt/foundry /opt/foundry
+ENV PATH="/opt/foundry/bin:$PATH"
+
+# Install rust and cross-compilers. Noir specifically uses 1.74.1.
+# We add everyone write ownership so downstream boxes can write.
+ENV RUSTUP_HOME=/opt/rust/rustup \
+    CARGO_HOME=/opt/rust/cargo \
+    PATH="/opt/rust/cargo/bin:$PATH"
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.74.1 && \
+    rustup target add wasm32-unknown-unknown wasm32-wasi aarch64-apple-darwin && \
+    chmod -R a+w /opt/rust
+
+# Install yq
+RUN curl -L https://github.com/mikefarah/yq/releases/download/v4.42.1/yq_linux_$(dpkg --print-architecture) \
+        -o /usr/local/bin/yq && chmod +x /usr/local/bin/yq
+
+# Install yarn
+RUN npm install --global yarn
+
+# Install solhint
+RUN npm install --global solhint
+
+########################################################################################################################
+# We want to produce downstream images: codespace, devbox and sysbox. This image is the base image for each.
+# It contains a suite of tools that developers might use to develop aztec.
+FROM build as basebox
+RUN yes | unminimize
+
+# Install stuff devs need.
+RUN apt update && \
+    apt install -y \
+        zsh \
+        fzf \
+        libfuse2 \
+        iproute2 \
+        iputils-ping \
+        telnet \
+        lsb-release \
+        tmux \
+        vim \
+        software-properties-common \
+        gnupg \
+        htop \
+        cgroup-tools \
+        neovim \
+        sudo \
+        clangd-16 \
+        man \
+        python3-blessed \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+# Install earthly.
+RUN wget https://github.com/earthly/earthly/releases/latest/download/earthly-linux-$(dpkg --print-architecture) -O /usr/local/bin/earthly && \
+    chmod +x /usr/local/bin/earthly
+
+# Install gh (github cli).
+RUN mkdir -p -m 755 /etc/apt/keyrings && wget -qO- https://cli.github.com/packages/githubcli-archive-keyring.gpg > /etc/apt/keyrings/githubcli-archive-keyring.gpg \
+    && chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg \
+    && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
+    && apt update \
+    && apt install gh -y
+
+# Install gt (graphite).
+RUN npm install -g @withgraphite/graphite-cli@stable
+
+# Install aws cli.
+RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m).zip" -o "awscliv2.zip" && \
+    unzip awscliv2.zip && \
+    ./aws/install --bin-dir /usr/local/bin --install-dir /usr/local/aws-cli --update && \
+    rm -rf aws awscliv2.zip
+
+# Install terraform.
+RUN curl -fsSL https://releases.hashicorp.com/terraform/1.7.5/terraform_1.7.5_linux_$(dpkg --print-architecture).zip -o terraform.zip \
+    && unzip terraform.zip -d /usr/local/bin \
+    && chmod +x /usr/local/bin/terraform \
+    && rm terraform.zip
+
+# fzf seems to not install this file for some reason.
+COPY ./key-bindings.zsh /usr/share/doc/fzf/examples/key-bindings.zsh
+
+# Sets LANG explicitly. Ensures tmux shows unicode symbols.
+# Sets RUSTUP_HOME.
+# Adds foundry and cargo bin dirs to PATH.
+COPY environment /etc/environment
+
+# Cargo home and bin path should be set within users home dir at login.
+RUN echo 'export CARGO_HOME="$HOME/.cargo"' >> /etc/zsh/zshenv
+RUN echo 'export PATH="$HOME/.cargo/bin:$PATH"' >> /etc/zsh/zshenv
+
+# sudo group can sudo without password.
+RUN echo '%sudo ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
+
+########################################################################################################################
+# This devbox container can be used to provide a full development environment.
+#
+# It can be used as a dev container:
+# - Configuration in .devcontainer/devcontainer.json.
+# - To run locally install "Dev Containers" plugin in vscode.
+# - To run in GitHub codespaces, visit the repo in github, press '.', and open the terminal.
+#
+# It can be used independently:
+# - The user should use the ./run.sh script to launch.
+# - A persistent volume will be mounted to /home/aztec-dev.
+# - It provides docker via the hosts docker instance, mounted at /var/lib/docker.sock.
+# - It uses an entrypoint script at runtime to perform uid/gid alignment with the host and drop into user account.
+FROM basebox as devbox
+RUN apt install -y gosu
+ENV TERM=xterm-256color
+# Detect if the host machine is Mac, if so set an env var, and disable prompts vcs info for performance.
+RUN <<EOF
+echo '
+if mount | grep -q /host_mark/Users; then
+    export HOST_OSTYPE=darwin
+    export PROMPT_LEAN_VCS=0
+fi
+' >> /etc/zsh/zshrc
+EOF
+# Create the user we'll run as and become the user.
+RUN useradd --shell /bin/zsh -G sudo -m aztec-dev
+USER aztec-dev
+WORKDIR /home/aztec-dev
+# Add dotfiles.
+COPY --chown=aztec-dev:aztec-dev home .
+# The .npmrc config is set to install global bins here, update PATH.
+ENV PATH=/home/aztec-dev/.npm-global/bin:$PATH
+# Need to ensure correct permissions, under some conditions these would otherwise be created by root.
+RUN mkdir .vscode-server .npm-global .ssh
+# Switch back to root. Gives option for root runtime adjustments before becoming aztec-dev.
+USER root
+# Use as entrypoint when running in an environment that requires uid/gid alignment (e.g. vanilla linux docker).
+COPY ./entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
+CMD ["/bin/zsh"]
+
+########################################################################################################################
+# This sysbox container can be used to provide a full development environment.
+# It's more advanced than devbox in that it uses nestybox's sysbox container runtime to provide more of a vm experience.
+# It's used primarily by internal aztec developers who have sysboxes running on a powerful underlying mainframe.
+# It provides better isolation and security guarantees than a plain devbox.
+FROM basebox AS sysbox
+
+###################### START OF STOCK NESTYBOX SYSTEMD CONTAINER ###############################
+#
+# Systemd installation
+#
+RUN apt-get update &&                            \
+    apt-get install -y --no-install-recommends   \
+            systemd                              \
+            systemd-sysv                         \
+            libsystemd0                          \
+            ca-certificates                      \
+            dbus                                 \
+            iptables                             \
+            iproute2                             \
+            kmod                                 \
+            locales                              \
+            sudo                                 \
+            udev &&                              \
+                                                 \
+    # Prevents journald from reading kernel messages from /dev/kmsg
+    echo "ReadKMsg=no" >> /etc/systemd/journald.conf &&               \
+                                                                      \
+    # Housekeeping
+    apt-get clean -y &&                                               \
+    rm -rf                                                            \
+       /var/cache/debconf/*                                           \
+       /var/lib/apt/lists/*                                           \
+       /var/log/*                                                     \
+       /tmp/*                                                         \
+       /var/tmp/*                                                     \
+       /usr/share/local/* &&                                          \
+                                                                      \
+    # Create default 'ubuntu/ubuntu' user
+    echo "ubuntu:ubuntu" | chpasswd && adduser ubuntu sudo
+
+# Disable systemd services/units that are unnecessary within a container.
+RUN systemctl mask systemd-udevd.service \
+                   systemd-udevd-kernel.socket \
+                   systemd-udevd-control.socket \
+                   systemd-modules-load.service \
+                   sys-kernel-config.mount \
+                   sys-kernel-debug.mount \
+                   sys-kernel-tracing.mount \
+                   e2scrub_reap.service
+
+# Make use of stopsignal (instead of sigterm) to stop systemd containers.
+STOPSIGNAL SIGRTMIN+3
+
+# Set systemd as entrypoint.
+ENTRYPOINT [ "/sbin/init", "--log-level=err" ]
+
+###################### END OF STOCK NESTYBOX SYSTEMD CONTAINER ###############################
+
+# Install docker.
+RUN curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh \
+    # Add user "ubuntu" to the Docker group
+    && usermod -a -G docker ubuntu
+ADD https://raw.githubusercontent.com/docker/docker-ce/master/components/cli/contrib/completion/bash/docker /etc/bash_completion.d/docker.sh
+
+# Install sshd.
+RUN apt install --no-install-recommends -y openssh-server \
+    && rm -rf /var/lib/apt/lists/* \
+    && mkdir /home/ubuntu/.ssh \
+    && chown ubuntu:ubuntu /home/ubuntu/.ssh \
+    && echo 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDagCvr/+CA1jmFaJf+e9+Kw6iwfhvaKOpfbGEl5zLgB+rum5L4Kga6Jow1gLQeMnAHfqc2IgpsU4t04c8PYApAt8AWNDL+KxMiFytfjKfJ2DZJA73CYkFnkfnMtU+ki+JG9dAHd6m7ShtCSzE5n6EDO2yWCVWQfqE3dcnpwrymSWkJYrbxzeOixiNZ4f1nD9ddvFvTWGB4l+et5SWgeIaYgJYDqTI2teRt9ytJiDGrCWXs9olHsCZOL6TEJPUQmNekwBkjMAZ4TmbBMjwbUlIxOpW2UxzlONcNn7IlRcGQg0Gdbkpo/zOlCNXsvacvnphDk5vKKaQj+aQiG916LU5P charlie@aztecprotocol.com' >> /home/ubuntu/.ssh/authorized_keys \
+    && echo 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDb5OVc+9S9nXx3/34F7eLVXjoPgQ3YHSdlfhTb8WflAGmpKJTLxtAYngtDBvhKofH5HrjPPkBWxOHP9KOTo0jxUQSr0suMpggLLOHuIrCszJKXIVi7whnQ4p2RHyzyS2ANwmpxWZmYxfgamzYst9JIvQYJgAPjTFweKBsG/Lc03knJ/qgz9BHqDSZHweMTnhv1dJNhZRKy1Lxyl/CjXKF374i8qbzVWJMeDgLEH6C84vCeaH89KMmM9J0+T31uEqxzIhZxNmRz9v+x6cQAVJtGi9OIveGT9qUQwKXZsk6/zorzxV+NiIvTWHxIn9epX/FUjgUmb/jFvpbEjDkbIngj adomurad@localhost.localdomain' >> /home/ubuntu/.ssh/authorized_keys \
+    && echo 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFKlUeOh9DyAL85NJ10LE+nyfi8oYm+CwxQ9JMaB6H+t root@mainframe' >> /home/ubuntu/.ssh/authorized_keys \
+    && chown ubuntu:ubuntu /home/ubuntu/.ssh/authorized_keys
+
+# Install google authenticator for setting up 2fa.
+RUN apt update && apt install -y libpam-google-authenticator
+
+EXPOSE 22
diff --git a/build-images/Earthfile b/build-images/Earthfile
new file mode 100644
index 000000000000..1429b5a6cd1e
--- /dev/null
+++ b/build-images/Earthfile
@@ -0,0 +1,5 @@
+VERSION 0.8
+
+build:
+  FROM DOCKERFILE --target build .
+  SAVE ARTIFACT /opt/foundry/bin/anvil
\ No newline at end of file
diff --git a/build-images/Makefile b/build-images/Makefile
new file mode 100755
index 000000000000..3e64904b3f2e
--- /dev/null
+++ b/build-images/Makefile
@@ -0,0 +1,19 @@
+wasi-sdk:
+	docker build -t aztecprotocol/wasi-sdk:$$(uname -m | sed 's/aarch64/arm64/')-22.0 --target wasi-sdk --push .
+	docker manifest create aztecprotocol/wasi-sdk:22.0 \
+		--amend aztecprotocol/wasi-sdk:x86_64-22.0 \
+		--amend aztecprotocol/wasi-sdk:arm64-22.0
+	docker manifest push aztecprotocol/wasi-sdk:22.0
+
+build:
+	docker build -t aztecprotocol/build --target build .
+
+devbox:
+	docker build -t aztecprotocol/devbox --target devbox .
+
+sysbox:
+	docker build -t aztecprotocol/sysbox --target sysbox .
+
+all: build devbox sysbox
+
+.PHONY: all build devbox sysbox
diff --git a/build-images/README.md b/build-images/README.md
new file mode 100644
index 000000000000..2ff02e1393f8
--- /dev/null
+++ b/build-images/README.md
@@ -0,0 +1,27 @@
+# Build Image
+
+To ensure a consistent environment for developers, and ease of getting started, we provide a development container.
+
+## Install Docker
+
+If you don't already have docker installed, follow this guide: https://docs.docker.com/engine/install
+
+## Visual Studio Code
+
+If you use vscode, the simplest thing to do is install the "Dev Containers" plugin, and open the repo.
+You'll be prompted to reload in a dev container, at which point you can open a terminal and bootstrap.
+You can connect to your container from outside vscode with e.g.: `docker exec -ti <container_id> /bin/zsh`
+
+Your repo will be mounted at `/workspaces/aztec-packages`, and your home directory is persisted in a docker volume.
+
+## Running Independently
+
+If you don't use vscode, you can simply run `./run.sh` to create and drop into the container.
+
+Your repo will be mounted at `/workspaces/aztec-packages`, and your home directory is persisted in a docker volume.
+
+## GitHub Codespaces
+
+This is also compatible with GitHub codespaces. Visit the repo at `http://github.com/aztecprotocol/aztec-packages`.
+Press `.`, and open a terminal window. You will be prompted to create a new machine.
+You can then continue to work within the browser, or reopen the codespace in your local vscode.
diff --git a/build-images/entrypoint.sh b/build-images/entrypoint.sh
new file mode 100755
index 000000000000..d6f36b79dd0c
--- /dev/null
+++ b/build-images/entrypoint.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+set -e
+
+# Modify the uid and gid of aztec-dev to match that of the host users.
+[ -n "$LOCAL_GROUP_ID" ] && groupmod -g $LOCAL_GROUP_ID aztec-dev
+[ -n "$LOCAL_USER_ID" ] && usermod -u $LOCAL_USER_ID aztec-dev &> /dev/null
+
+# Find the group id of the docker socket, add aztec-dev to that group, or create the group and add aztec-dev.
+if [ -S /var/run/docker.sock ]; then
+    SOCKET_GID=$(stat -c %g /var/run/docker.sock)
+    EXISTING_GROUP=$(getent group $SOCKET_GID | cut -d: -f1)
+    if [ -z "$EXISTING_GROUP" ]; then
+        # No existing group with that gid, so create one called 'docker' and add the user to it.
+        groupadd -g $SOCKET_GID docker
+        usermod -aG docker aztec-dev
+    else
+        # A group with the desired gid already exists, add the user to it.
+        usermod -aG $EXISTING_GROUP aztec-dev
+    fi
+fi
+
+exec /usr/sbin/gosu aztec-dev "$@"
\ No newline at end of file
diff --git a/build-images/environment b/build-images/environment
new file mode 100644
index 000000000000..6c67b72a1af5
--- /dev/null
+++ b/build-images/environment
@@ -0,0 +1,3 @@
+PATH="/opt/foundry/bin:/opt/rust/cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin"
+LANG=C.UTF-8
+RUSTUP_HOME=/opt/rust/rustup
\ No newline at end of file
diff --git a/build-images/home/.gitconfig b/build-images/home/.gitconfig
new file mode 100644
index 000000000000..e3fc331a4383
--- /dev/null
+++ b/build-images/home/.gitconfig
@@ -0,0 +1,2 @@
+[safe]
+	directory = /workspaces/aztec-packages
\ No newline at end of file
diff --git a/build-images/home/.npmrc b/build-images/home/.npmrc
new file mode 100644
index 000000000000..7d79625eaf71
--- /dev/null
+++ b/build-images/home/.npmrc
@@ -0,0 +1 @@
+prefix=/home/aztec-dev/.npm-global
\ No newline at end of file
diff --git a/build-images/home/.tmux.conf b/build-images/home/.tmux.conf
new file mode 100644
index 000000000000..4b0be338e7e2
--- /dev/null
+++ b/build-images/home/.tmux.conf
@@ -0,0 +1,67 @@
+set-window-option -g mode-keys vi
+
+# Increase scrollback buffer.
+set-option -g history-limit 50000
+
+# Clear the screen, and the scrollback buffer.
+bind -n M-u send-keys C-l \; run-shell "sleep .3s" \; clear-history
+
+# Enable mouse.
+set -g mouse on
+
+# Rebind prefix key to backtick.
+unbind C-b
+set -g prefix `
+bind ` send-prefix
+
+# Allows for faster key repetition. Essential for vim to work properly.
+set-option -g escape-time 0
+
+# Send focus events for vim autoread, etc.
+set -g focus-events on
+
+# Smart pane switching with awareness of Vim splits.
+# See: https://github.com/christoomey/vim-tmux-navigator
+is_vim="ps -o state= -o comm= -t '#{pane_tty}' | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
+bind-key -n C-h if-shell "$is_vim" "send-keys C-h"  "select-pane -L"
+bind-key -n C-j if-shell "$is_vim" "send-keys C-j"  "select-pane -D"
+bind-key -n C-k if-shell "$is_vim" "send-keys C-k"  "select-pane -U"
+bind-key -n C-l if-shell "$is_vim" "send-keys C-l"  "select-pane -R"
+bind-key -n Pageup if-shell "$is_vim" "send-keys Pageup" "copy-mode -u"
+
+bind-key -T copy-mode-vi -n C-h if-shell "$is_vim" "send-keys C-h"  "select-pane -L"
+bind-key -T copy-mode-vi -n C-j if-shell "$is_vim" "send-keys C-j"  "select-pane -D"
+bind-key -T copy-mode-vi -n C-k if-shell "$is_vim" "send-keys C-k"  "select-pane -U"
+bind-key -T copy-mode-vi -n C-l if-shell "$is_vim" "send-keys C-l"  "select-pane -R"
+
+# Window navigation.
+bind-key -n M-h previous-window
+bind-key -n M-l next-window
+bind-key -n M-Left previous-window
+bind-key -n M-Right next-window
+bind-key -T copy-mode-vi -n M-h previous-window
+bind-key -T copy-mode-vi -n M-l next-window
+bind-key -T copy-mode-vi -n M-Left previous-window
+bind-key -T copy-mode-vi -n M-Right next-window
+
+# Window and pane creation.
+bind c new-window -c "#{pane_current_path}"
+bind s split-window -v -c "#{pane_current_path}"
+bind v split-window -h -c "#{pane_current_path}"
+
+# Window sizing.
+bind j resize-pane -D 5
+bind k resize-pane -U 5
+
+# Vertically zoom current column of panes.
+bind x if -F '#{@layout_save}' \
+    {run 'tmux select-layout "#{@layout_save}" \; set -up @layout_save'} \
+    {set -Fp @layout_save "#{window_layout}" ; run 'tmux resizep -y "#{window_height}"'}
+
+# Reload configuration shortcut.
+bind R source-file ~/.tmux.conf \; display-message "Config reloaded..."
+
+# Disable status bar.
+set -g status off
+
+set -g -a terminal-overrides ',xterm-256color:Tc'
diff --git a/build-images/home/.zshrc b/build-images/home/.zshrc
new file mode 100644
index 000000000000..122ced9ed53d
--- /dev/null
+++ b/build-images/home/.zshrc
@@ -0,0 +1,106 @@
+# zgen
+if [ ! -d "$HOME/.zgen" ]; then
+  git clone https://github.com/tarjoilija/zgen.git "${HOME}/.zgen"
+fi
+
+source "${HOME}/.zgen/zgen.zsh"
+
+if ! zgen saved; then
+  # specify plugins here
+  zgen oh-my-zsh
+  zgen oh-my-zsh plugins/git
+  zgen oh-my-zsh plugins/vi-mode
+  zgen oh-my-zsh plugins/fzf
+  zgen load miekg/lean
+
+  # generate the init script from plugins above
+  zgen save
+fi
+
+function zle-keymap-select zle-line-init
+{
+    # change cursor shape in iTerm2
+    case $KEYMAP in
+        vicmd)      echo -ne '\e[1 q';;
+        viins|main) echo -ne '\e[5 q';;
+    esac
+
+    zle reset-prompt
+    zle -R
+}
+
+function zle-line-finish
+{
+    print -n -- "\E]50;CursorShape=0\C-G"  # block cursor
+}
+
+zle -N zle-line-init
+zle -N zle-line-finish
+zle -N zle-keymap-select
+
+setopt no_share_history
+setopt rm_star_silent
+setopt auto_pushd
+setopt +o nomatch
+set +o histexpand
+
+bindkey    "^[[3~"          delete-char
+bindkey    "^[3;5~"         delete-char
+bindkey    "^[[A"           history-search-backward
+bindkey    "^[[B"           history-search-forward
+
+# Prevent mad background colors on permissive permissions.
+export LS_COLORS="di=34:ln=36:so=35:pi=33:ex=32:bd=1;33:cd=1;33:su=31:sg=32:tw=34:ow=34:st=37"
+
+# Colorize completions using default `ls` colors.
+zstyle ':completion:*' list-colors ''
+zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}"
+
+export MAKEFLAGS=-j$(nproc)
+
+alias dr="docker run -ti --rm"
+alias drs="docker run -ti --rm --entrypoint /bin/sh"
+alias vim=nvim
+
+# Graphite aliases
+alias gtl="gt log"
+alias gtd="gt down"
+alias gtu="gt up"
+alias gts="gt sync"
+alias gto="gt checkout"
+
+# Fuzzy git rooted dir change on ctrl-f.
+gitcd() {
+  git_root=$(git rev-parse --show-toplevel 2> /dev/null)
+  if [[ $? -eq 0 ]]; then
+    local selected_dir=$(cd "$git_root" && find * -type d -not -path '*node_modules*' -not -path '.git*' | fzf)
+    if [[ -n "$selected_dir" ]]; then
+      # Instead of changing directory, prepare a cd command
+      BUFFER="cd \"$git_root/$selected_dir\""
+      zle accept-line
+    fi
+  fi
+}
+zle -N gitcd_widget gitcd
+bindkey '^F' gitcd_widget
+
+# Graphite autocomplete.
+#compdef gt
+###-begin-gt-completions-###
+#
+# yargs command completion script
+#
+# Installation: gt completion >> ~/.zshrc
+#    or gt completion >> ~/.zprofile on OSX.
+#
+_gt_yargs_completions()
+{
+  local reply
+  local si=$IFS
+  IFS=$'
+' reply=($(COMP_CWORD="$((CURRENT-1))" COMP_LINE="$BUFFER" COMP_POINT="$CURSOR" gt --get-yargs-completions "${words[@]}"))
+  IFS=$si
+  _describe 'values' reply
+}
+compdef _gt_yargs_completions gt
+###-end-gt-completions-###
diff --git a/build-images/key-bindings.zsh b/build-images/key-bindings.zsh
new file mode 100644
index 000000000000..dfb473cc8be1
--- /dev/null
+++ b/build-images/key-bindings.zsh
@@ -0,0 +1,120 @@
+#     ____      ____
+#    / __/___  / __/
+#   / /_/_  / / /_
+#  / __/ / /_/ __/
+# /_/   /___/_/ key-bindings.zsh
+#
+# - $FZF_TMUX_OPTS
+# - $FZF_CTRL_T_COMMAND
+# - $FZF_CTRL_T_OPTS
+# - $FZF_CTRL_R_OPTS
+# - $FZF_ALT_C_COMMAND
+# - $FZF_ALT_C_OPTS
+
+# Key bindings
+# ------------
+
+# The code at the top and the bottom of this file is the same as in completion.zsh.
+# Refer to that file for explanation.
+if 'zmodload' 'zsh/parameter' 2>'/dev/null' && (( ${+options} )); then
+  __fzf_key_bindings_options="options=(${(j: :)${(kv)options[@]}})"
+else
+  () {
+    __fzf_key_bindings_options="setopt"
+    'local' '__fzf_opt'
+    for __fzf_opt in "${(@)${(@f)$(set -o)}%% *}"; do
+      if [[ -o "$__fzf_opt" ]]; then
+        __fzf_key_bindings_options+=" -o $__fzf_opt"
+      else
+        __fzf_key_bindings_options+=" +o $__fzf_opt"
+      fi
+    done
+  }
+fi
+
+'emulate' 'zsh' '-o' 'no_aliases'
+
+{
+
+[[ -o interactive ]] || return 0
+
+# CTRL-T - Paste the selected file path(s) into the command line
+__fsel() {
+  local cmd="${FZF_CTRL_T_COMMAND:-"command find -L . -mindepth 1 \\( -path '*/\\.*' -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' -o -fstype 'proc' \\) -prune \
+    -o -type f -print \
+    -o -type d -print \
+    -o -type l -print 2> /dev/null | cut -b3-"}"
+  setopt localoptions pipefail no_aliases 2> /dev/null
+  local item
+  eval "$cmd" | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} ${FZF_CTRL_T_OPTS-}" $(__fzfcmd) -m "$@" | while read item; do
+    echo -n "${(q)item} "
+  done
+  local ret=$?
+  echo
+  return $ret
+}
+
+__fzfcmd() {
+  [ -n "${TMUX_PANE-}" ] && { [ "${FZF_TMUX:-0}" != 0 ] || [ -n "${FZF_TMUX_OPTS-}" ]; } &&
+    echo "fzf-tmux ${FZF_TMUX_OPTS:--d${FZF_TMUX_HEIGHT:-40%}} -- " || echo "fzf"
+}
+
+fzf-file-widget() {
+  LBUFFER="${LBUFFER}$(__fsel)"
+  local ret=$?
+  zle reset-prompt
+  return $ret
+}
+zle     -N            fzf-file-widget
+bindkey -M emacs '^T' fzf-file-widget
+bindkey -M vicmd '^T' fzf-file-widget
+bindkey -M viins '^T' fzf-file-widget
+
+# ALT-C - cd into the selected directory
+fzf-cd-widget() {
+  local cmd="${FZF_ALT_C_COMMAND:-"command find -L . -mindepth 1 \\( -path '*/\\.*' -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' -o -fstype 'proc' \\) -prune \
+    -o -type d -print 2> /dev/null | cut -b3-"}"
+  setopt localoptions pipefail no_aliases 2> /dev/null
+  local dir="$(eval "$cmd" | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} ${FZF_ALT_C_OPTS-}" $(__fzfcmd) +m)"
+  if [[ -z "$dir" ]]; then
+    zle redisplay
+    return 0
+  fi
+  zle push-line # Clear buffer. Auto-restored on next prompt.
+  BUFFER="builtin cd -- ${(q)dir}"
+  zle accept-line
+  local ret=$?
+  unset dir # ensure this doesn't end up appearing in prompt expansion
+  zle reset-prompt
+  return $ret
+}
+zle     -N             fzf-cd-widget
+bindkey -M emacs '\ec' fzf-cd-widget
+bindkey -M vicmd '\ec' fzf-cd-widget
+bindkey -M viins '\ec' fzf-cd-widget
+
+# CTRL-R - Paste the selected command from history into the command line
+fzf-history-widget() {
+  local selected num
+  setopt localoptions noglobsubst noposixbuiltins pipefail no_aliases 2> /dev/null
+  selected=( $(fc -rl 1 | awk '{ cmd=$0; sub(/^[ \t]*[0-9]+\**[ \t]+/, "", cmd); if (!seen[cmd]++) print $0 }' |
+    FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} ${FZF_DEFAULT_OPTS-} -n2..,.. --scheme=history --bind=ctrl-r:toggle-sort,ctrl-z:ignore ${FZF_CTRL_R_OPTS-} --query=${(qqq)LBUFFER} +m" $(__fzfcmd)) )
+  local ret=$?
+  if [ -n "$selected" ]; then
+    num=$selected[1]
+    if [ -n "$num" ]; then
+      zle vi-fetch-history -n $num
+    fi
+  fi
+  zle reset-prompt
+  return $ret
+}
+zle     -N            fzf-history-widget
+bindkey -M emacs '^R' fzf-history-widget
+bindkey -M vicmd '^R' fzf-history-widget
+bindkey -M viins '^R' fzf-history-widget
+
+} always {
+  eval $__fzf_key_bindings_options
+  'unset' '__fzf_key_bindings_options'
+}
diff --git a/build-images/run.sh b/build-images/run.sh
new file mode 100755
index 000000000000..97132414f768
--- /dev/null
+++ b/build-images/run.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+set -eu
+
+cd $(dirname $0)
+
+# On linux we need to perform uid/gid alignment to ensure files modified on the host have the correct owner.
+# The entrypoint.sh script picks up these environment variables and adjusts the aztec-dev user accordingly.
+# This isn't necessary on mac.
+if [[ "$OSTYPE" == "linux"* ]]; then
+  ID_ARGS="-e LOCAL_USER_ID=$(id -u) -e LOCAL_GROUP_ID=$(id -g)"
+fi
+
+docker run \
+  -ti --rm \
+  --hostname devbox \
+  -e SSH_CONNECTION=' ' \
+  ${ID_ARGS:-} \
+  -w/workspaces/aztec-packages \
+  -v$PWD/..:/workspaces/aztec-packages \
+  -vdevbox-home:/home/aztec-dev \
+  -v$HOME/.ssh/id_rsa:/home/aztec-dev/.ssh/id_rsa:ro \
+  -v/var/run/docker.sock:/var/run/docker.sock \
+  aztecprotocol/devbox
diff --git a/build-system/scripts/setup_env b/build-system/scripts/setup_env
index 7280711ed1b2..b98486cef0df 100755
--- a/build-system/scripts/setup_env
+++ b/build-system/scripts/setup_env
@@ -130,8 +130,10 @@ if [ -n "$COMMIT_HASH" ]; then
 
   # Install and ensure correct permissions on build instance key.
   mkdir -p ~/.ssh
-  echo ${BUILD_INSTANCE_KEY:-} | base64 -d > ~/.ssh/build_instance_key
-  chmod 600 ~/.ssh/build_instance_key
+  if [ -n "${BUILD_INSTANCE_KEY:-}" ]; then
+    echo $BUILD_INSTANCE_KEY | base64 -d > ~/.ssh/build_instance_key
+    chmod 600 ~/.ssh/build_instance_key
+  fi
   cp $BUILD_SYSTEM_PATH/remote/ssh_config ~/.ssh/config
 
   if [[ "$COMMIT_MESSAGE" == *"[ci debug]"* ]]; then
diff --git a/foundry/.gitignore b/foundry/.gitignore
deleted file mode 100644
index 532fb7016f2f..000000000000
--- a/foundry/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-foundry-repo
\ No newline at end of file
diff --git a/foundry/Earthfile b/foundry/Earthfile
deleted file mode 100644
index 14262b0b3fb6..000000000000
--- a/foundry/Earthfile
+++ /dev/null
@@ -1,17 +0,0 @@
-VERSION 0.8
-
-builder:
-    FROM rust:bookworm
-    ARG TARGETARCH
-    WORKDIR /usr/src/foundry
-    COPY bootstrap.sh bootstrap.sh
-    RUN ./bootstrap.sh && rm -rf foundry-repo
-    SAVE ARTIFACT bin /usr/src/foundry/bin
-
-build:
-    FROM ubuntu:lunar
-    ARG TARGETARCH
-    COPY --dir +builder/usr/src/foundry/bin /usr/src/foundry/bin
-    SAVE ARTIFACT /usr/src/foundry/bin /usr/src/foundry/bin
-    ENV PATH="${PATH}:/usr/src/foundry/bin"
-    SAVE IMAGE --push aztecprotocol/foundry-nightly-de33b6af53005037b463318d2628b5cfcaf3991-$TARGETARCH:latest
\ No newline at end of file
diff --git a/foundry/bootstrap.sh b/foundry/bootstrap.sh
deleted file mode 100755
index 446ddd6228e6..000000000000
--- a/foundry/bootstrap.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-set -eu
-
-cd $(dirname $0)
-
-rm -rf bin share
-
-[ "${TARGETARCH:-$(uname -m)}" = "arm64" ] && echo "export CFLAGS=-mno-outline-atomics" >> $HOME/.profile || true
-
-if [ ! -d './foundry-repo' ]; then
-    git clone --depth 1 --branch nightly-de33b6af53005037b463318d2628b5cfcaf39916 \
-        https://github.com/foundry-rs/foundry.git foundry-repo
-fi
-
-(cd foundry-repo && cargo build --profile local)
-
-mkdir bin \
-    && mv foundry-repo/target/local/forge bin/forge \
-    && mv foundry-repo/target/local/cast bin/cast \
-    && mv foundry-repo/target/local/anvil bin/anvil \
-    && mv foundry-repo/target/local/chisel bin/chisel \
-    && strip bin/forge \
-    && strip bin/cast \
-    && strip bin/chisel \
-    && strip bin/anvil;
\ No newline at end of file
diff --git a/l1-contracts/Dockerfile b/l1-contracts/Dockerfile
index 75568db49f8d..2cfabf3ca1b1 100644
--- a/l1-contracts/Dockerfile
+++ b/l1-contracts/Dockerfile
@@ -14,11 +14,11 @@ RUN foundryup --version nightly-de33b6af53005037b463318d2628b5cfcaf39916
 
 WORKDIR /usr/src/l1-contracts
 COPY . .
-RUN git init
+#RUN git init
 RUN forge clean && forge fmt --check && forge build && forge test --no-match-contract UniswapPortalTest
 
-RUN npm install --global yarn
-RUN yarn && yarn lint
+RUN npm install --global solhint
+RUN solhint --config ./.solhint.json --fix "src/**/*.sol"
 
 # RUN git add . && yarn slither && yarn slither-has-diff
 RUN forge build
diff --git a/l1-contracts/Earthfile b/l1-contracts/Earthfile
index efa14c848196..57d0a1c8a519 100644
--- a/l1-contracts/Earthfile
+++ b/l1-contracts/Earthfile
@@ -1,23 +1,12 @@
 VERSION 0.8
 
 build:
-    FROM ubuntu:lunar
-    RUN apt update && apt install curl git jq bash nodejs npm python3.11-full python3-pip -y
-
-    # Use virtualenv, do not try to use pipx, it's not working.
-    RUN python3 -m venv /root/.venv
-    RUN /root/.venv/bin/pip3 install slither-analyzer==0.10.0 slitherin==0.5.0
-    ENV PATH="${PATH}:/root/.venv/bin"
-
-    # Install yarn and solhint.
-    RUN npm install --global yarn solhint
-
-    # Install our build of foundry.
-    COPY --dir ../foundry/+build/usr/src/foundry/bin /usr/src/foundry/bin
-    ENV PATH="${PATH}:/usr/src/foundry/bin"
-
+    FROM ../build-images+build
     WORKDIR /usr/src/l1-contracts
     COPY --dir lib scripts src terraform test *.json *.toml *.sh .
-    RUN git init && git add . && yarn lint && yarn slither && yarn slither-has-diff
+    #RUN git init && git add . && yarn lint && yarn slither && yarn slither-has-diff
+    # "slither": "forge clean && forge build --build-info --skip '*/test/**' --force && slither . --checklist --ignore-compile --show-ignored-findings --config-file ./slither.config.json | tee slither_output.md",
+    # "slither-has-diff": "./slither_has_diff.sh"
+    RUN solhint --config ./.solhint.json --fix "src/**/*.sol"
     RUN forge clean && forge fmt --check && forge build && forge test --no-match-contract UniswapPortalTest
     SAVE ARTIFACT /usr/src/l1-contracts /usr/src/l1-contracts
\ No newline at end of file
diff --git a/l1-contracts/bootstrap.sh b/l1-contracts/bootstrap.sh
index 7274d3dac7dd..75d22eea902e 100755
--- a/l1-contracts/bootstrap.sh
+++ b/l1-contracts/bootstrap.sh
@@ -23,10 +23,10 @@ fi
 rm -rf broadcast cache out serve
 
 # Install
-../foundry/bin/forge install --no-commit
+forge install --no-commit
 
 # Ensure libraries are at the correct version
 git submodule update --init --recursive ./lib
 
 # Compile contracts
-../foundry/bin/forge build
+forge build
diff --git a/l1-contracts/package.json b/l1-contracts/package.json
deleted file mode 100644
index bd9aab6899d7..000000000000
--- a/l1-contracts/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "@aztec/l1-contracts",
-  "version": "0.1.0",
-  "license": "Apache-2.0",
-  "description": "Aztec contracts for the Ethereum mainnet and testnets",
-  "devDependencies": {
-    "solhint": "https://github.com/LHerskind/solhint#master"
-  },
-  "scripts": {
-    "format": "../foundry/bin/forge fmt",
-    "lint": "solhint --config ./.solhint.json --fix \"src/**/*.sol\"",
-    "slither": "../foundry/bin/forge clean && ../foundry/bin/forge build --build-info --skip '*/test/**' --force && slither . --checklist --ignore-compile --show-ignored-findings --config-file ./slither.config.json | tee slither_output.md",
-    "slither-has-diff": "./slither_has_diff.sh"
-  }
-}
diff --git a/noir-projects/Earthfile b/noir-projects/Earthfile
index ccdfe81acf1a..85fe5130a92a 100644
--- a/noir-projects/Earthfile
+++ b/noir-projects/Earthfile
@@ -1,18 +1,18 @@
 VERSION 0.8
-FROM ubuntu:lunar
-RUN apt-get update && apt-get install -y parallel
 
-# Install nargo
-COPY ../noir/+nargo/nargo /usr/bin/nargo
-# Install transpiler
-COPY ../avm-transpiler/+build/avm-transpiler /usr/bin/avm-transpiler
+source:
+  FROM ../build-images+build
 
-WORKDIR /usr/src/noir-projects
+  # Install nargo
+  COPY ../noir/+nargo/nargo /usr/bin/nargo
+  # Install transpiler
+  COPY ../avm-transpiler/+build/avm-transpiler /usr/bin/avm-transpiler
 
-# Copy source.
-COPY --dir aztec-nr noir-contracts noir-protocol-circuits .
+  WORKDIR /usr/src/noir-projects
+
+  # Copy source.
+  COPY --dir aztec-nr noir-contracts noir-protocol-circuits .
 
-source:
   # for debugging rebuilds
   RUN echo CONTENT HASH $(find . -type f -exec sha256sum {} ';' | sort | sha256sum | awk '{print $1}') | tee .content-hash
 
diff --git a/noir-projects/bootstrap.sh b/noir-projects/bootstrap.sh
index 2a46c6e26f27..0d800c336a6d 100755
--- a/noir-projects/bootstrap.sh
+++ b/noir-projects/bootstrap.sh
@@ -27,7 +27,7 @@ AVAILABLE_MEMORY=0
 case "$(uname)" in
   Linux*)
     # Check available memory on Linux
-    AVAILABLE_MEMORY=$(awk '/MemFree/ { printf $2 }' /proc/meminfo)
+    AVAILABLE_MEMORY=$(awk '/MemTotal/ { printf $2 }' /proc/meminfo)
     ;;
   *)
     echo "Parallel builds not supported on this operating system"
@@ -35,7 +35,7 @@ case "$(uname)" in
 esac
 # This value may be too low.
 # If builds fail with an amount of free memory greater than this value then it should be increased.
-MIN_PARALLEL_BUILD_MEMORY=32000000
+MIN_PARALLEL_BUILD_MEMORY=32854492
 
 if [[ AVAILABLE_MEMORY -lt MIN_PARALLEL_BUILD_MEMORY ]]; then
   echo "System does not have enough memory for parallel builds, falling back to sequential"
diff --git a/noir/Earthfile b/noir/Earthfile
index 63f377746072..18faae05e2e9 100644
--- a/noir/Earthfile
+++ b/noir/Earthfile
@@ -1,8 +1,7 @@
 VERSION 0.8
 
 nargo:
-    FROM rust:bullseye
-    RUN apt update && apt install -y libc++1
+    FROM ../build-images/+build
     WORKDIR /usr/src
     # Relevant source (TODO finer-grained 'tooling')
     COPY --dir \
@@ -28,11 +27,7 @@ nargo:
 
 packages:
     BUILD ../barretenberg/ts/+build # prefetch
-    FROM node:20
-
-    RUN curl https://sh.rustup.rs -sSf | bash -s -- -y
-    RUN echo 'source $HOME/.cargo/env' >> $HOME/.bashrc
-    RUN apt update && apt install -y jq libc++1
+    FROM ../build-images/+build
 
     # `noir-repo` is nested inside of `noir` so we copy `bb.js` as such to account
     # for the extra nested folder specified in portalled package paths
@@ -69,13 +64,13 @@ packages:
     # TODO(AD) is this OK as a content hash?
     ENV COMMIT_HASH=$(find . -type f -exec sha256sum {} ';' | sort | sha256sum | awk '{print $1}')
     RUN echo CONTENT HASH $COMMIT_HASH | tee .content-hash
-    RUN PATH="/root/.cargo/bin:$PATH" ./scripts/bootstrap_packages.sh
+    RUN ./scripts/bootstrap_packages.sh
     SAVE ARTIFACT packages
     SAVE IMAGE --cache-hint
 
 run:
     # When running the container, mount the users home directory to same location.
-    FROM ubuntu:lunar
+    FROM ubuntu:noble
     # Install Tini as nargo doesn't handle signals properly.
     # Install git as nargo needs it to clone.
     RUN apt-get update && apt-get install -y git tini && rm -rf /var/lib/apt/lists/* && apt-get clean
diff --git a/noir/scripts/bootstrap_native.sh b/noir/scripts/bootstrap_native.sh
index 67fcc6f6d92e..7504a74f50d2 100755
--- a/noir/scripts/bootstrap_native.sh
+++ b/noir/scripts/bootstrap_native.sh
@@ -19,4 +19,8 @@ if [ -n "${DEBUG:-}" ]; then
   cargo build
 else
   cargo build --release
-fi
\ No newline at end of file
+fi
+
+if [ -x ../scripts/fix_incremental_ts.sh ]; then
+  ../scripts/fix_incremental_ts.sh
+fi
diff --git a/noir/scripts/bootstrap_packages.sh b/noir/scripts/bootstrap_packages.sh
index 939735060e27..f82924280558 100755
--- a/noir/scripts/bootstrap_packages.sh
+++ b/noir/scripts/bootstrap_packages.sh
@@ -31,4 +31,8 @@ rm -rf packages && mkdir -p packages
 for PROJECT in "${PROJECTS[@]}"; do
   PPATH=$(cd noir-repo && yarn workspaces list --json | jq -r "select(.name==\"$PROJECT\").location")
   tar zxfv noir-repo/$PPATH/package.tgz -C packages && mv packages/package packages/${PROJECT#*/}
-done
\ No newline at end of file
+done
+
+if [ -x $ROOT/scripts/fix_incremental_ts.sh ]; then
+  $ROOT/scripts/fix_incremental_ts.sh
+fi
diff --git a/noir/scripts/fix_incremental_ts.sh b/noir/scripts/fix_incremental_ts.sh
new file mode 100755
index 000000000000..ab54606420a6
--- /dev/null
+++ b/noir/scripts/fix_incremental_ts.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+# Hack to workaround incremental builds not working on mac when mounted into dev container.
+# Drops the fractional part of file timestamps.
+set -eu
+
+cd $(dirname $0)/../noir-repo
+
+if [ "${HOST_OSTYPE:-}" == "darwin" ]; then
+  echo -n "Fixing incremental timestamps... "
+  find target -type f -print0 | xargs -0 -P $(nproc) -I {} sh -c 'touch -d @$(stat --format="%Y" {}) {}'
+  echo "Done."
+fi
\ No newline at end of file
diff --git a/yarn-project/Earthfile b/yarn-project/Earthfile
index 00bd6f6e9f05..6da55e013d9b 100644
--- a/yarn-project/Earthfile
+++ b/yarn-project/Earthfile
@@ -4,7 +4,7 @@ deps:
     LOCALLY
     LET packages = $(git ls-files "**/package*.json" package*.json)
     LET tsconfigs = $(git ls-files "**/tsconfig*.json" tsconfig*.json)
-    FROM node:18.19.0
+    FROM ../build-images+build
     # copy bb-js and noir-packages
     COPY ../barretenberg/ts/+build/build /usr/src/barretenberg/ts
     COPY ../noir/+packages/packages /usr/src/noir/packages
@@ -35,7 +35,6 @@ build:
     BUILD ../noir-projects/+build
     BUILD ../l1-contracts/+build
     FROM +deps
-    RUN apt update && apt install -y jq curl perl && rm -rf /var/lib/apt/lists/* && apt-get clean
 
     COPY ../barretenberg/cpp/+preset-release/bin/bb /usr/src/barretenberg/cpp/build/bin/bb
     COPY ../noir/+nargo/acvm /usr/src/noir/noir-repo/target/release/acvm
@@ -54,29 +53,53 @@ build-dev:
 aztec-prod:
     FROM +build
     RUN yarn workspaces focus @aztec/aztec --production && yarn cache clean
+    # Remove a bunch of stuff that we don't need that takes up space.
+    RUN rm -rf \
+        ../noir-projects \
+        ../l1-contracts \
+        ../barretenberg/ts/src \
+        ../barretenberg/ts/dest/node-cjs \
+        ../barretenberg/ts/dest/browser \
+        aztec.js/dest/main.js \
+        end-to-end \
+        **/src \
+        **/artifacts
     SAVE ARTIFACT /usr/src /usr/src
 
-aztec-prod-slim:
-    FROM node:18.19.1-slim
-    COPY +aztec-prod/usr/src /usr/src
-
 aztec:
-    FROM +aztec-prod-slim
+    FROM ubuntu:noble
+    RUN apt update && apt install nodejs -y && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+    COPY +aztec-prod/usr/src /usr/src
     ENTRYPOINT ["node", "--no-warnings", "/usr/src/yarn-project/aztec/dest/bin/index.js"]
     EXPOSE 8080
 
+# We care about creating a slimmed down e2e image because we have to serialize it from earthly to docker for running.
 end-to-end-prod:
     FROM +build
     RUN yarn workspaces focus @aztec/end-to-end --production && yarn cache clean
+    # Remove a bunch of stuff that we don't need that takes up space.
+    RUN rm -rf \
+        ../noir-projects \
+        ../l1-contracts \
+        ../barretenberg/ts/src \
+        ../barretenberg/ts/dest/node-cjs \
+        ../barretenberg/ts/dest/browser \
+        **/artifacts
     SAVE ARTIFACT /usr/src /usr/src
 
 end-to-end:
-    FROM node:18.19.1-slim
-    RUN apt-get update && apt-get install jq chromium netcat-openbsd -y
-    ENV CHROME_BIN="/usr/bin/chromium"
-    COPY ../foundry/+build/usr/src/foundry/bin/anvil /usr/src/foundry/bin/anvil
+    FROM ubuntu:noble
+    RUN apt-get update && apt-get install -y wget gnupg \
+        && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
+        && echo "deb [arch=$(dpkg --print-architecture)] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list \
+        && apt update && apt install nodejs jq google-chrome-stable netcat-openbsd -y \
+        && rm -rf /var/lib/apt/lists/*
+    ENV CHROME_BIN="/usr/bin/google-chrome-stable"
+    ENV PATH=/opt/foundry/bin:$PATH
+    COPY ../build-images+build/anvil /opt/foundry/bin/anvil
     COPY +end-to-end-prod/usr/src /usr/src
     WORKDIR /usr/src/yarn-project/end-to-end
+    RUN ln -s /usr/src/yarn-project/.yarn/releases/yarn-3.6.3.cjs /usr/local/bin/yarn
     ENTRYPOINT ["yarn", "test"]
 
 scripts-prod:
@@ -86,22 +109,17 @@ scripts-prod:
 
 all:
     BUILD +aztec
-    BUILD +cli
     BUILD +end-to-end
 
-# for use with yarn-project/end-to-end and its e2e_mode=cache option
+export-aztec:
+    ARG EARTHLY_GIT_HASH
+    FROM +aztec
+    SAVE IMAGE aztecprotocol/aztec:$EARTHLY_GIT_HASH
+
 export-end-to-end:
-    # Prefetch targets to build in parallel.
-    BUILD +end-to-end
-    BUILD +aztec
     ARG EARTHLY_GIT_HASH
-    # pushes the foundry image to local docker images
-    FROM ../foundry/+build
-    SAVE IMAGE aztecprotocol/foundry-nightly-de33b6af53005037b463318d2628b5cfcaf3991:latest
     FROM +end-to-end
     SAVE IMAGE aztecprotocol/end-to-end:$EARTHLY_GIT_HASH
-    FROM +aztec
-    SAVE IMAGE aztecprotocol/aztec:$EARTHLY_GIT_HASH
 
 format-check:
     FROM +build
diff --git a/yarn-project/bootstrap.sh b/yarn-project/bootstrap.sh
index a4ac9c351375..9d78eb6b1c1b 100755
--- a/yarn-project/bootstrap.sh
+++ b/yarn-project/bootstrap.sh
@@ -2,23 +2,12 @@
 [ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
-# Check node version.
-node_version=$(node -v | tr -d 'v')
-major=${node_version%%.*}
-rest=${node_version#*.}
-minor=${rest%%.*}
-
 YELLOW="\033[93m"
 BLUE="\033[34m"
 GREEN="\033[32m"
 BOLD="\033[1m"
 RESET="\033[0m"
 
-if ((major < 18 || (major == 18 && minor < 19))); then
-  echo "Node.js version is less than 18.19. Exiting."
-  exit 1
-fi
-
 cd "$(dirname "$0")"
 
 CMD=${1:-}
diff --git a/yarn-project/end-to-end/Earthfile b/yarn-project/end-to-end/Earthfile
index d59b9222d0ed..8ff7a7f9aa18 100644
--- a/yarn-project/end-to-end/Earthfile
+++ b/yarn-project/end-to-end/Earthfile
@@ -1,95 +1,30 @@
 VERSION 0.8
 
-# requires first saving the images locally with ../+export-end-to-end
-
-# run locally and build
-E2E_TEST_LOCAL:
-  FUNCTION
-  ARG test
-  ARG compose_file=./scripts/docker-compose.yml
-  ARG enable_gas=""
-  ARG debug="aztec:*"
-  ARG EARTHLY_TARGET_NAME
-  LOCALLY
-  ENV ENABLE_GAS=$enable_gas
-  ENV TEST=$test
-  ENV DEBUG=$debug
-  ENV JOB_NAME=$EARTHLY_TARGET_NAME
-  WITH DOCKER \
-    --load aztecprotocol/aztec:latest=../+aztec \
-    --load aztecprotocol/end-to-end:latest=../+end-to-end \
-    --load aztecprotocol/foundry-nightly-de33b6af53005037b463318d2628b5cfcaf3991:latest=../../foundry/+build
-    # Run our docker compose, ending whenever sandbox ends, filtering out noisy eth_getLogs
-    RUN docker compose -f $compose_file up --exit-code-from=end-to-end --force-recreate
-  END
-
-# run locally and take from cache, used for our mainly x86 jobs
-E2E_TEST_FROM_CACHE:
+E2E_COMPOSE_TEST:
   FUNCTION
   ARG test
   ARG compose_file=./scripts/docker-compose.yml
-  ARG enable_gas=""
   ARG debug="aztec:*"
-  ARG aztec_docker_tag
   ARG EARTHLY_TARGET_NAME
   LOCALLY
-  ENV ENABLE_GAS=$enable_gas
   ENV TEST=$test
   ENV DEBUG=$debug
-  ENV AZTEC_DOCKER_TAG=$aztec_docker_tag
-  ENV JOB_NAME=$EARTHLY_TARGET_NAME
-  # need a different project name for each to run in parallel
-  LET project_name=$(echo $test | sed 's/[./]/_/g')
+  LET project_name=$(echo $test | sed 's/\./_/g')
   IF docker compose > /dev/null 2>&1
     LET CMD="docker compose"
   ELSE
     LET CMD="docker-compose"
   END
-  # In CI we do not use WITH DOCKER as we have had issues with earthly copying big images
-  RUN $CMD -p $project_name -f $compose_file up --exit-code-from=end-to-end --force-recreate
-
-# run on satellite and build, used for our few ARM jobs (means github runner doesn't need to be ARM)
-E2E_TEST_FROM_BUILD:
-  FUNCTION
-  ARG test
-  ARG compose_file=./scripts/docker-compose.yml
-  ARG enable_gas=""
-  ARG debug="aztec:*"
-  ARG EARTHLY_TARGET_NAME
-  FROM earthly/dind:alpine-3.19-docker-25.0.2-r0
-  ENV ENABLE_GAS=$enable_gas
-  ENV TEST=$test
-  ENV DEBUG=$debug
-  ENV JOB_NAME=$EARTHLY_TARGET_NAME
-  COPY $compose_file $compose_file
-  # For ARM, we do use WITH DOCKER as we don't have many e2e tests, but note E2E_TEST_FROM_CACHE
   WITH DOCKER \
     --load aztecprotocol/aztec:latest=../+aztec \
     --load aztecprotocol/end-to-end:latest=../+end-to-end \
-    --load aztecprotocol/foundry-nightly-de33b6af53005037b463318d2628b5cfcaf3991:latest=../../foundry/+build
+    --load aztecprotocol/foundry-nightly-de33b6af53005037b463318d2628b5cfcaf3991:latest=../../build-images+build
     # Run our docker compose, ending whenever sandbox ends, filtering out noisy eth_getLogs
-    RUN docker compose -f $compose_file up --exit-code-from=end-to-end --force-recreate
-  END
-
-E2E_TEST:
-  FUNCTION
-  ARG test
-  ARG compose_file=./scripts/docker-compose.yml
-  ARG enable_gas=""
-  ARG e2e_mode=local
-  ARG debug="aztec:*"
-  LOCALLY
-  IF [ $e2e_mode = local ]
-    DO +E2E_TEST_LOCAL --test=$test --compose_file=$compose_file --enable_gas=$enable_gas --debug=$debug
-  ELSE IF [ $e2e_mode = cache ]
-    DO +E2E_TEST_FROM_CACHE --test=$test --aztec_docker_tag=$(git rev-parse HEAD) --compose_file=$compose_file --enable_gas=$enable_gas --debug=$debug
-  ELSE
-    DO +E2E_TEST_FROM_BUILD --test=$test --compose_file=$compose_file --enable_gas=$enable_gas --debug=$debug
+    RUN $CMD -p $project_name -f $compose_file up --exit-code-from=end-to-end --force-recreate
   END
 
 UPLOAD_LOGS:
   FUNCTION
-  ARG e2e_mode=cache
   ARG PULL_REQUEST
   ARG BRANCH
   ARG COMMIT_HASH
@@ -100,7 +35,6 @@ UPLOAD_LOGS:
   ENV PULL_REQUEST=$PULL_REQUEST
   ENV BRANCH=$BRANCH
   ENV COMMIT_HASH=$COMMIT_HASH
-  ENV E2E_MODE=$e2e_mode
   RUN --secret AWS_ACCESS_KEY_ID --secret AWS_SECRET_ACCESS_KEY /usr/src/scripts/logs/upload_logs_to_s3.sh /usr/var/log
 
 # Define e2e tests
@@ -113,67 +47,54 @@ flakey-e2e-tests:
   RUN yarn test --passWithNoTests ./src/flakey || true
 
 e2e-sandbox-example:
-  ARG e2e_mode=local
-  DO +E2E_TEST --test=e2e_sandbox_example.test.ts --e2e_mode=$e2e_mode
+  DO +E2E_COMPOSE_TEST --test=e2e_sandbox_example.test.ts
 
 uniswap-trade-on-l1-from-l2:
-  ARG e2e_mode=local
-  DO +E2E_TEST --test=uniswap_trade_on_l1_from_l2.test.ts --e2e_mode=$e2e_mode
+  DO +E2E_COMPOSE_TEST --test=uniswap_trade_on_l1_from_l2.test.ts
 
 integration-l1-publisher:
-  ARG e2e_mode=local
-  DO +E2E_TEST --test=integration_l1_publisher.test.ts --e2e_mode=$e2e_mode
+  DO +E2E_COMPOSE_TEST --test=integration_l1_publisher.test.ts
 
 e2e-browser:
-  ARG e2e_mode=local
-  DO +E2E_TEST --test=e2e_aztec_js_browser.test.ts --e2e_mode=$e2e_mode
+  DO +E2E_COMPOSE_TEST --test=e2e_aztec_js_browser.test.ts
 
 pxe:
-  ARG e2e_mode=local
-  DO +E2E_TEST --test=pxe.test.ts --e2e_mode=$e2e_mode
+  DO +E2E_COMPOSE_TEST --test=pxe.test.ts
 
 e2e-docs-examples:
-  ARG e2e_mode=local
-  DO +E2E_TEST --test=docs_examples.test.ts --e2e_mode=$e2e_mode
+  DO +E2E_COMPOSE_TEST --test=docs_examples.test.ts
 
 guides-writing-an-account-contract:
-  ARG e2e_mode=local
-  DO +E2E_TEST --test=guides/writing_an_account_contract.test.ts --e2e_mode=$e2e_mode
+  DO +E2E_COMPOSE_TEST --test=guides/writing_an_account_contract.test.ts
 
 guides-dapp-testing:
-  ARG e2e_mode=local
-  DO +E2E_TEST --test=guides/dapp_testing.test.ts --e2e_mode=$e2e_mode
+  DO +E2E_COMPOSE_TEST --test=guides/dapp_testing.test.ts
 
 # TODO intermittent failure
 # guides-sample-dapp:
-#   ARG e2e_mode=local
-#   DO +E2E_TEST --test=sample-dapp --e2e_mode=$e2e_mode
+#   DO +E2E_COMPOSE_TEST --test=sample-dapp
 
 # TODO currently hangs for hour+
 # guides-up-quick-start:
-#   ARG e2e_mode=local
-#   DO +E2E_TEST --test=guides/up_quick_start.test.ts --e2e_mode=$e2e_mode
+#   DO +E2E_COMPOSE_TEST --test=guides/up_quick_start.test.ts
 
 bench-publish-rollup:
-  ARG e2e_mode=local
   ARG PULL_REQUEST
   ARG BRANCH
   ARG COMMIT_HASH
-  DO +E2E_TEST --test=benchmarks/bench_publish_rollup.test.ts --debug="aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees" --e2e_mode=$e2e_mode --compose_file=./scripts/docker-compose-no-sandbox.yml
+  DO +E2E_COMPOSE_TEST --test=benchmarks/bench_publish_rollup.test.ts --debug="aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees" --compose_file=./scripts/docker-compose-no-sandbox.yml
   DO +UPLOAD_LOGS --e2e_mode=$e2e_mode --PULL_REQUEST=$PULL_REQUEST --BRANCH=$BRANCH --COMMIT_HASH=$COMMIT_HASH
 
 bench-process-history:
-  ARG e2e_mode=local
   ARG PULL_REQUEST
   ARG BRANCH
   ARG COMMIT_HASH
-  DO +E2E_TEST --test=benchmarks/bench_process_history.test.ts --debug="aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees" --e2e_mode=$e2e_mode --compose_file=./scripts/docker-compose-no-sandbox.yml
+  DO +E2E_COMPOSE_TEST --test=benchmarks/bench_process_history.test.ts --debug="aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees" --compose_file=./scripts/docker-compose-no-sandbox.yml
   DO +UPLOAD_LOGS --e2e_mode=$e2e_mode --PULL_REQUEST=$PULL_REQUEST --BRANCH=$BRANCH --COMMIT_HASH=$COMMIT_HASH
 
 bench-tx-size:
-  ARG e2e_mode=local
   ARG PULL_REQUEST
   ARG BRANCH
   ARG COMMIT_HASH
-  DO +E2E_TEST --test=benchmarks/bench_tx_size_fees.test.ts --debug="aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees" --e2e_mode=$e2e_mode --enable_gas=1 --compose_file=./scripts/docker-compose-no-sandbox.yml
+  DO +E2E_COMPOSE_TEST --test=benchmarks/bench_tx_size_fees.test.ts --debug="aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees" --enable_gas=1 --compose_file=./scripts/docker-compose-no-sandbox.yml
   DO +UPLOAD_LOGS --e2e_mode=$e2e_mode --PULL_REQUEST=$PULL_REQUEST --BRANCH=$BRANCH --COMMIT_HASH=$COMMIT_HASH
diff --git a/yarn-project/end-to-end/package.json b/yarn-project/end-to-end/package.json
index e5e5c0ba6bab..fcc621d59adf 100644
--- a/yarn-project/end-to-end/package.json
+++ b/yarn-project/end-to-end/package.json
@@ -15,7 +15,7 @@
     "clean": "rm -rf ./dest .tsbuildinfo",
     "formatting": "run -T prettier --check ./src \"!src/web/main.js\" && run -T eslint ./src",
     "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
-    "test": "LOG_LEVEL=${LOG_LEVEL:-silent} DEBUG_COLORS=1 NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=120000 --forceExit",
+    "test": "LOG_LEVEL=${LOG_LEVEL:-silent} DEBUG_COLORS=1 NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=300000 --forceExit",
     "test:integration": "concurrently -k -s first -c reset,dim -n test,anvil \"yarn test:integration:run\" \"anvil\"",
     "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --no-cache --runInBand --config jest.integration.config.json"
   },
diff --git a/yarn-project/end-to-end/package.local.json b/yarn-project/end-to-end/package.local.json
index 089811e03e9f..6e3666e9fa6f 100644
--- a/yarn-project/end-to-end/package.local.json
+++ b/yarn-project/end-to-end/package.local.json
@@ -2,6 +2,6 @@
   "scripts": {
     "build": "yarn clean && tsc -b && webpack",
     "formatting": "run -T prettier --check ./src \"!src/web/main.js\" && run -T eslint ./src",
-    "test": "LOG_LEVEL=${LOG_LEVEL:-silent} DEBUG_COLORS=1 NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=120000 --forceExit"
+    "test": "LOG_LEVEL=${LOG_LEVEL:-silent} DEBUG_COLORS=1 NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=300000 --forceExit"
   }
 }
diff --git a/yarn-project/end-to-end/scripts/anvil_kill_wrapper.sh b/yarn-project/end-to-end/scripts/anvil_kill_wrapper.sh
index ddeea389ef2c..8eec17e179f4 100755
--- a/yarn-project/end-to-end/scripts/anvil_kill_wrapper.sh
+++ b/yarn-project/end-to-end/scripts/anvil_kill_wrapper.sh
@@ -4,7 +4,7 @@
 PARENT_PID=$(awk '{print $4}' /proc/$$/stat)
 
 # Start anvil in the background.
-../../foundry/bin/anvil $@ &
+anvil $@ &
 CHILD_PID=$!
 
 cleanup() {
diff --git a/yarn-project/end-to-end/src/benchmarks/bench_process_history.test.ts b/yarn-project/end-to-end/src/benchmarks/bench_process_history.test.ts
index 22d114298731..b34053842f5e 100644
--- a/yarn-project/end-to-end/src/benchmarks/bench_process_history.test.ts
+++ b/yarn-project/end-to-end/src/benchmarks/bench_process_history.test.ts
@@ -30,7 +30,7 @@ describe('benchmarks/process_history', () => {
 
   beforeEach(async () => {
     ({ context, contract, sequencer } = await benchmarkSetup({ maxTxsPerBlock: BLOCK_SIZE }));
-  }, 60_000);
+  });
 
   it(
     `processes chain history of ${MAX_CHAIN_LENGTH} with ${BLOCK_SIZE}-tx blocks`,
diff --git a/yarn-project/end-to-end/src/benchmarks/bench_publish_rollup.test.ts b/yarn-project/end-to-end/src/benchmarks/bench_publish_rollup.test.ts
index 542bbfeeb5ed..b3bb55d64897 100644
--- a/yarn-project/end-to-end/src/benchmarks/bench_publish_rollup.test.ts
+++ b/yarn-project/end-to-end/src/benchmarks/bench_publish_rollup.test.ts
@@ -14,7 +14,7 @@ describe('benchmarks/publish_rollup', () => {
 
   beforeEach(async () => {
     ({ context, contract, sequencer } = await benchmarkSetup({ maxTxsPerBlock: 1024 }));
-  }, 60_000);
+  });
 
   it.each(BENCHMARK_BLOCK_SIZES)(
     `publishes a rollup with %d txs`,
diff --git a/yarn-project/end-to-end/src/composed/docs_examples.test.ts b/yarn-project/end-to-end/src/composed/docs_examples.test.ts
index 42aada0f881e..e764a048fa69 100644
--- a/yarn-project/end-to-end/src/composed/docs_examples.test.ts
+++ b/yarn-project/end-to-end/src/composed/docs_examples.test.ts
@@ -47,5 +47,5 @@ describe('docs_examples', () => {
     const balance = await contract.methods.balance_of_public(wallet.getAddress()).simulate();
     expect(balance).toEqual(1n);
     // docs:end:simulate_function
-  }, 120_000);
+  });
 });
diff --git a/yarn-project/end-to-end/src/composed/e2e_persistence.test.ts b/yarn-project/end-to-end/src/composed/e2e_persistence.test.ts
index 14fa82a73fef..656fd6fe3678 100644
--- a/yarn-project/end-to-end/src/composed/e2e_persistence.test.ts
+++ b/yarn-project/end-to-end/src/composed/e2e_persistence.test.ts
@@ -85,7 +85,7 @@ describe('Aztec persistence', () => {
     await contract.methods.redeem_shield(ownerAddress.address, 1000n, secret).send().wait();
 
     await initialContext.teardown();
-  }, 100_000);
+  });
 
   describe.each([
     [
@@ -160,7 +160,7 @@ describe('Aztec persistence', () => {
 
       expect(ownerBalance).toEqual(initialOwnerBalance - 500n);
       expect(targetBalance).toEqual(500n);
-    }, 30_000);
+    });
   });
 
   describe.each([
@@ -278,7 +278,7 @@ describe('Aztec persistence', () => {
 
       // shut everything down
       await temporaryContext.teardown();
-    }, 100_000);
+    });
 
     let ownerWallet: AccountWallet;
     let contract: TokenContract;
@@ -290,7 +290,7 @@ describe('Aztec persistence', () => {
       contract = await TokenContract.at(contractAddress, ownerWallet);
 
       await waitForAccountSynch(context.pxe, ownerAddress, { interval: 0.1, timeout: 5 });
-    }, 5000);
+    });
 
     afterEach(async () => {
       await context.teardown();
diff --git a/yarn-project/end-to-end/src/composed/e2e_sandbox_example.test.ts b/yarn-project/end-to-end/src/composed/e2e_sandbox_example.test.ts
index 1ae3c9362f6e..1bc0f9b33342 100644
--- a/yarn-project/end-to-end/src/composed/e2e_sandbox_example.test.ts
+++ b/yarn-project/end-to-end/src/composed/e2e_sandbox_example.test.ts
@@ -175,7 +175,7 @@ describe('e2e_sandbox_example', () => {
 
     expect(aliceBalance).toBe(initialSupply - transferQuantity);
     expect(bobBalance).toBe(transferQuantity + mintQuantity);
-  }, 120_000);
+  });
 
   it('can create accounts on the sandbox', async () => {
     const logger = createDebugLogger('token');
@@ -231,5 +231,5 @@ describe('e2e_sandbox_example', () => {
     // check that alice and bob are in registeredAccounts
     expect(registeredAccounts.find(acc => acc.equals(alice))).toBeTruthy();
     expect(registeredAccounts.find(acc => acc.equals(bob))).toBeTruthy();
-  }, 60_000);
+  });
 });
diff --git a/yarn-project/end-to-end/src/composed/integration_l1_publisher.test.ts b/yarn-project/end-to-end/src/composed/integration_l1_publisher.test.ts
index 29432464114a..8f3658a1907a 100644
--- a/yarn-project/end-to-end/src/composed/integration_l1_publisher.test.ts
+++ b/yarn-project/end-to-end/src/composed/integration_l1_publisher.test.ts
@@ -159,7 +159,7 @@ describe('L1Publisher integration', () => {
     feeRecipient = config.feeRecipient || AztecAddress.random();
 
     prevHeader = await builderDb.buildInitialHeader(false);
-  }, 100_000);
+  });
 
   const makeEmptyProcessedTx = () => {
     const tx = makeEmptyProcessedTxFromHistoricalTreeRoots(prevHeader, new Fr(chainId), new Fr(config.version));
@@ -463,7 +463,7 @@ describe('L1Publisher integration', () => {
       // We wipe the messages from previous iteration
       nextL1ToL2Messages = [];
     }
-  }, 360_000);
+  });
 
   it(`Build ${numberOfConsecutiveBlocks} blocks of 2 empty txs building on each other`, async () => {
     const archiveInRollup_ = await rollup.read.archive();
@@ -523,7 +523,7 @@ describe('L1Publisher integration', () => {
       });
       expect(ethTx.input).toEqual(expectedData);
     }
-  }, 60_000);
+  });
 });
 
 /**
diff --git a/yarn-project/end-to-end/src/e2e_2_pxes.test.ts b/yarn-project/end-to-end/src/e2e_2_pxes.test.ts
index 95dcb88a2f4f..4f7f20cbe87a 100644
--- a/yarn-project/end-to-end/src/e2e_2_pxes.test.ts
+++ b/yarn-project/end-to-end/src/e2e_2_pxes.test.ts
@@ -45,7 +45,7 @@ describe('e2e_2_pxes', () => {
       wallets: [walletB],
       teardown: teardownB,
     } = await setupPXEService(1, aztecNode!, {}, undefined, true));
-  }, 100_000);
+  });
 
   afterEach(async () => {
     await teardownB();
@@ -163,7 +163,7 @@ describe('e2e_2_pxes', () => {
     );
     await expectTokenBalance(walletB, tokenAddress, walletB.getAddress(), transferAmount1 - transferAmount2);
     await expectsNumOfEncryptedLogsInTheLastBlockToBe(aztecNode, 2);
-  }, 120_000);
+  });
 
   const deployChildContractViaServerA = async () => {
     logger.info(`Deploying Child contract...`);
diff --git a/yarn-project/end-to-end/src/e2e_account_contracts.test.ts b/yarn-project/end-to-end/src/e2e_account_contracts.test.ts
index 93fee9d85898..e5f8f0743a55 100644
--- a/yarn-project/end-to-end/src/e2e_account_contracts.test.ts
+++ b/yarn-project/end-to-end/src/e2e_account_contracts.test.ts
@@ -40,21 +40,21 @@ function itShouldBehaveLikeAnAccountContract(
 
       wallet = await walletSetup(pxe, secretKey, getAccountContract(signingKey));
       child = await ChildContract.deploy(wallet).send().deployed();
-    }, 60_000);
+    });
 
     afterEach(() => teardown());
 
     it('calls a private function', async () => {
       logger.info('Calling private function...');
       await child.methods.value(42).send().wait({ interval: 0.1 });
-    }, 60_000);
+    });
 
     it('calls a public function', async () => {
       logger.info('Calling public function...');
       await child.methods.pub_inc_value(42).send().wait({ interval: 0.1 });
       const storedValue = await pxe.getPublicStorageAt(child.address, new Fr(1));
       expect(storedValue).toEqual(new Fr(42n));
-    }, 60_000);
+    });
 
     // TODO(#5830): re-enable this test
     it.skip('fails to call a function using an invalid signature', async () => {
diff --git a/yarn-project/end-to-end/src/e2e_authwit.test.ts b/yarn-project/end-to-end/src/e2e_authwit.test.ts
index b882374745c5..42865d4793a1 100644
--- a/yarn-project/end-to-end/src/e2e_authwit.test.ts
+++ b/yarn-project/end-to-end/src/e2e_authwit.test.ts
@@ -22,7 +22,7 @@ describe('e2e_authwit_tests', () => {
     const nodeInfo = await wallets[0].getNodeInfo();
     chainId = new Fr(nodeInfo.chainId);
     version = new Fr(nodeInfo.protocolVersion);
-  }, 100_000);
+  });
 
   describe('Private', () => {
     describe('arbitrary data', () => {
diff --git a/yarn-project/end-to-end/src/e2e_avm_simulator.test.ts b/yarn-project/end-to-end/src/e2e_avm_simulator.test.ts
index c4d153b3bed2..12cd2508c2f7 100644
--- a/yarn-project/end-to-end/src/e2e_avm_simulator.test.ts
+++ b/yarn-project/end-to-end/src/e2e_avm_simulator.test.ts
@@ -22,7 +22,7 @@ describe('e2e_avm_simulator', () => {
   beforeAll(async () => {
     ({ teardown, wallet } = await setup());
     await publicDeployAccounts(wallet, [wallet]);
-  }, 100_000);
+  });
 
   afterAll(() => teardown());
 
@@ -31,7 +31,7 @@ describe('e2e_avm_simulator', () => {
 
     beforeEach(async () => {
       avmContract = await AvmTestContract.deploy(wallet).send().deployed();
-    }, 50_000);
+    });
 
     describe('Gas metering', () => {
       it('Tracks L2 gas usage on simulation', async () => {
@@ -93,7 +93,7 @@ describe('e2e_avm_simulator', () => {
 
     beforeEach(async () => {
       avmContract = await AvmAcvmInteropTestContract.deploy(wallet).send().deployed();
-    }, 50_000);
+    });
 
     it('Can execute ACVM function among AVM functions', async () => {
       expect(await avmContract.methods.constant_field_acvm().simulate()).toEqual(123456n);
@@ -159,7 +159,7 @@ describe('e2e_avm_simulator', () => {
 
       beforeEach(async () => {
         avmContract = await AvmInitializerTestContract.deploy(wallet).send().deployed();
-      }, 50_000);
+      });
 
       describe('Storage', () => {
         it('Read immutable (initialized) storage (Field)', async () => {
@@ -176,7 +176,7 @@ describe('e2e_avm_simulator', () => {
     beforeEach(async () => {
       avmContract = await AvmNestedCallsTestContract.deploy(wallet).send().deployed();
       secondAvmContract = await AvmNestedCallsTestContract.deploy(wallet).send().deployed();
-    }, 50_000);
+    });
 
     it('Should NOT be able to emit the same unsiloed nullifier from the same contract', async () => {
       const nullifier = new Fr(1);
diff --git a/yarn-project/end-to-end/src/e2e_blacklist_token_contract/burn.test.ts b/yarn-project/end-to-end/src/e2e_blacklist_token_contract/burn.test.ts
index ffe828172f4b..cb521a0baef2 100644
--- a/yarn-project/end-to-end/src/e2e_blacklist_token_contract/burn.test.ts
+++ b/yarn-project/end-to-end/src/e2e_blacklist_token_contract/burn.test.ts
@@ -14,7 +14,7 @@ describe('e2e_blacklist_token_contract burn', () => {
     await t.setup();
     // Have to destructure again to ensure we have latest refs.
     ({ asset, tokenSim, wallets, blacklisted } = t);
-  }, 200_000);
+  });
 
   afterAll(async () => {
     await t.teardown();
diff --git a/yarn-project/end-to-end/src/e2e_blacklist_token_contract/minting.test.ts b/yarn-project/end-to-end/src/e2e_blacklist_token_contract/minting.test.ts
index b003195c3933..0bef2150baec 100644
--- a/yarn-project/end-to-end/src/e2e_blacklist_token_contract/minting.test.ts
+++ b/yarn-project/end-to-end/src/e2e_blacklist_token_contract/minting.test.ts
@@ -14,7 +14,7 @@ describe('e2e_blacklist_token_contract mint', () => {
     await t.setup();
     // Have to destructure again to ensure we have latest refs.
     ({ asset, tokenSim, wallets, blacklisted } = t);
-  }, 200_000);
+  });
 
   afterAll(async () => {
     await t.teardown();
diff --git a/yarn-project/end-to-end/src/e2e_blacklist_token_contract/shielding.test.ts b/yarn-project/end-to-end/src/e2e_blacklist_token_contract/shielding.test.ts
index 0414e3c57428..4bffbc3a7ef2 100644
--- a/yarn-project/end-to-end/src/e2e_blacklist_token_contract/shielding.test.ts
+++ b/yarn-project/end-to-end/src/e2e_blacklist_token_contract/shielding.test.ts
@@ -13,7 +13,7 @@ describe('e2e_blacklist_token_contract shield + redeem_shield', () => {
     await t.setup();
     // Have to destructure again to ensure we have latest refs.
     ({ asset, tokenSim, wallets, blacklisted } = t);
-  }, 200_000);
+  });
 
   afterAll(async () => {
     await t.teardown();
diff --git a/yarn-project/end-to-end/src/e2e_blacklist_token_contract/transfer_private.test.ts b/yarn-project/end-to-end/src/e2e_blacklist_token_contract/transfer_private.test.ts
index 6ac2f3b6af16..ed78def14819 100644
--- a/yarn-project/end-to-end/src/e2e_blacklist_token_contract/transfer_private.test.ts
+++ b/yarn-project/end-to-end/src/e2e_blacklist_token_contract/transfer_private.test.ts
@@ -13,7 +13,7 @@ describe('e2e_blacklist_token_contract transfer private', () => {
     await t.setup();
     // Have to destructure again to ensure we have latest refs.
     ({ asset, tokenSim, wallets, blacklisted } = t);
-  }, 200_000);
+  });
 
   afterAll(async () => {
     await t.teardown();
diff --git a/yarn-project/end-to-end/src/e2e_blacklist_token_contract/transfer_public.test.ts b/yarn-project/end-to-end/src/e2e_blacklist_token_contract/transfer_public.test.ts
index bc452f28f11f..1459704e8aa4 100644
--- a/yarn-project/end-to-end/src/e2e_blacklist_token_contract/transfer_public.test.ts
+++ b/yarn-project/end-to-end/src/e2e_blacklist_token_contract/transfer_public.test.ts
@@ -14,7 +14,7 @@ describe('e2e_blacklist_token_contract transfer public', () => {
     await t.setup();
     // Have to destructure again to ensure we have latest refs.
     ({ asset, tokenSim, wallets, blacklisted } = t);
-  }, 200_000);
+  });
 
   afterAll(async () => {
     await t.teardown();
diff --git a/yarn-project/end-to-end/src/e2e_blacklist_token_contract/unshielding.test.ts b/yarn-project/end-to-end/src/e2e_blacklist_token_contract/unshielding.test.ts
index 4a26ad118b92..ba8f69e6f26c 100644
--- a/yarn-project/end-to-end/src/e2e_blacklist_token_contract/unshielding.test.ts
+++ b/yarn-project/end-to-end/src/e2e_blacklist_token_contract/unshielding.test.ts
@@ -13,7 +13,7 @@ describe('e2e_blacklist_token_contract unshielding', () => {
     await t.setup();
     // Have to destructure again to ensure we have latest refs.
     ({ asset, tokenSim, wallets, blacklisted } = t);
-  }, 200_000);
+  });
 
   afterAll(async () => {
     await t.teardown();
diff --git a/yarn-project/end-to-end/src/e2e_block_building.test.ts b/yarn-project/end-to-end/src/e2e_block_building.test.ts
index b2f77702822f..31698d5516bb 100644
--- a/yarn-project/end-to-end/src/e2e_block_building.test.ts
+++ b/yarn-project/end-to-end/src/e2e_block_building.test.ts
@@ -39,7 +39,7 @@ describe('e2e_block_building', () => {
         aztecNode,
         wallets: [owner, minter],
       } = await setup(2));
-    }, 100_000);
+    });
 
     afterEach(() => aztecNode.setConfig({ minTxsPerBlock: 1 }));
     afterAll(() => teardown());
@@ -75,7 +75,7 @@ describe('e2e_block_building', () => {
       const isContractDeployed = async (address: AztecAddress) => !!(await pxe.getContractInstance(address));
       const areDeployed = await Promise.all(receipts.map(r => isContractDeployed(r.contract.address)));
       expect(areDeployed).toEqual(times(TX_COUNT, () => true));
-    }, 60_000);
+    });
 
     it.skip('can call public function from different tx in same block', async () => {
       // Ensure both txs will land on the same block
@@ -108,7 +108,7 @@ describe('e2e_block_building', () => {
       ]);
 
       expect(deployTxReceipt.blockNumber).toEqual(callTxReceipt.blockNumber);
-    }, 60_000);
+    });
   });
 
   describe('double-spends', () => {
@@ -119,7 +119,7 @@ describe('e2e_block_building', () => {
       ({ teardown, pxe, logger, wallet: owner } = await setup(1));
       contract = await TestContract.deploy(owner).send().deployed();
       logger.info(`Test contract deployed at ${contract.address}`);
-    }, 100_000);
+    });
 
     afterAll(() => teardown());
 
@@ -133,7 +133,7 @@ describe('e2e_block_building', () => {
         }
         const [tx1, tx2] = calls.map(call => call.send());
         await expectXorTx(tx1, tx2);
-      }, 30_000);
+      });
 
       it('drops tx with public nullifier already emitted on the same block', async () => {
         const secret = Fr.random();
@@ -143,13 +143,13 @@ describe('e2e_block_building', () => {
         }
         const [tx1, tx2] = calls.map(call => call.send());
         await expectXorTx(tx1, tx2);
-      }, 30_000);
+      });
 
       it('drops tx with two equal nullifiers', async () => {
         const nullifier = Fr.random();
         const calls = times(2, () => contract.methods.emit_nullifier(nullifier).request());
         await expect(new BatchCall(owner, calls).send().wait()).rejects.toThrow(/dropped/);
-      }, 30_000);
+      });
 
       it('drops tx with private nullifier already emitted from public on the same block', async () => {
         const secret = Fr.random();
@@ -166,7 +166,7 @@ describe('e2e_block_building', () => {
         }
         const [tx1, tx2] = calls.map(call => call.send());
         await expectXorTx(tx1, tx2);
-      }, 30_000);
+      });
     });
 
     describe('across blocks', () => {
diff --git a/yarn-project/end-to-end/src/e2e_card_game.test.ts b/yarn-project/end-to-end/src/e2e_card_game.test.ts
index 6342654d9edf..56f7a547f412 100644
--- a/yarn-project/end-to-end/src/e2e_card_game.test.ts
+++ b/yarn-project/end-to-end/src/e2e_card_game.test.ts
@@ -123,7 +123,7 @@ describe('e2e_card_game', () => {
     [firstPlayer, secondPlayer, thirdPlayer] = wallets.map(a => a.getAddress());
 
     masterNullifierSecretKeys = PLAYER_SECRET_KEYS.map(sk => deriveMasterNullifierSecretKey(sk));
-  }, 100_000);
+  });
 
   beforeEach(async () => {
     await deployContract();
@@ -148,7 +148,7 @@ describe('e2e_card_game', () => {
     const collection = await contract.methods.view_collection_cards(firstPlayer, 0).simulate({ from: firstPlayer });
     const expected = getPackedCards(0, seed);
     expect(unwrapOptions(collection)).toMatchObject(expected);
-  }, 30_000);
+  });
 
   describe('game join', () => {
     const seed = 27n;
@@ -162,7 +162,7 @@ describe('e2e_card_game', () => {
       firstPlayerCollection = unwrapOptions(
         await contract.methods.view_collection_cards(firstPlayer, 0).simulate({ from: firstPlayer }),
       );
-    }, 30_000);
+    });
 
     it('should be able to join games', async () => {
       await contract.methods
@@ -199,7 +199,7 @@ describe('e2e_card_game', () => {
         claimed: false,
         current_player: 0n,
       });
-    }, 30_000);
+    });
 
     it('should start games', async () => {
       const secondPlayerCollection = unwrapOptions(
@@ -239,7 +239,7 @@ describe('e2e_card_game', () => {
         claimed: false,
         current_player: 0n,
       });
-    }, 360_000);
+    });
   });
 
   describe('game play', () => {
@@ -266,7 +266,7 @@ describe('e2e_card_game', () => {
       thirdPlayerCOllection = unwrapOptions(
         await contract.methods.view_collection_cards(thirdPlayer, 0).simulate({ from: thirdPlayer }),
       );
-    }, 60_000);
+    });
 
     async function joinGame(playerWallet: Wallet, cards: Card[], id = GAME_ID) {
       await contract.withWallet(playerWallet).methods.join_game(id, cards.map(cardToField)).send().wait();
@@ -343,6 +343,6 @@ describe('e2e_card_game', () => {
       );
 
       expect(game.finished).toBe(true);
-    }, 360_000);
+    });
   });
 });
diff --git a/yarn-project/end-to-end/src/e2e_cheat_codes.test.ts b/yarn-project/end-to-end/src/e2e_cheat_codes.test.ts
index 4fd2e8d6d6f9..562a7fef0da6 100644
--- a/yarn-project/end-to-end/src/e2e_cheat_codes.test.ts
+++ b/yarn-project/end-to-end/src/e2e_cheat_codes.test.ts
@@ -47,7 +47,7 @@ describe('e2e_cheat_codes', () => {
     admin = wallet.getCompleteAddress();
 
     token = await TokenContract.deploy(wallet, admin, 'TokenName', 'TokenSymbol', 18).send().deployed();
-  }, 100_000);
+  });
 
   afterAll(() => teardown());
 
@@ -186,7 +186,7 @@ describe('e2e_cheat_codes', () => {
           .wait({ interval: 0.1 });
         // block is published at t >= newTimestamp + 1.
         expect(Number(await rollup.read.lastBlockTs())).toBeGreaterThanOrEqual(newTimestamp + 1);
-      }, 50_000);
+      });
 
       it('should throw if setting L2 block time to a past timestamp', async () => {
         const timestamp = await cc.eth.timestamp();
@@ -244,6 +244,6 @@ describe('e2e_cheat_codes', () => {
       const balance = values.reduce((sum, current) => sum + current.toBigInt(), 0n);
       expect(balance).toEqual(mintAmount);
       // docs:end:load_private_cheatcode
-    }, 50_000);
+    });
   });
 });
diff --git a/yarn-project/end-to-end/src/e2e_counter_contract.test.ts b/yarn-project/end-to-end/src/e2e_counter_contract.test.ts
index ec7394bb4342..da41aa985ca9 100644
--- a/yarn-project/end-to-end/src/e2e_counter_contract.test.ts
+++ b/yarn-project/end-to-end/src/e2e_counter_contract.test.ts
@@ -19,7 +19,7 @@ describe('e2e_counter_contract', () => {
     counterContract = await CounterContract.deploy(wallet, 0, owner).send().deployed();
 
     logger.info(`Counter contract deployed at ${counterContract.address}`);
-  }, 45_000);
+  });
 
   afterAll(() => teardown());
 
diff --git a/yarn-project/end-to-end/src/e2e_cross_chain_messaging.test.ts b/yarn-project/end-to-end/src/e2e_cross_chain_messaging.test.ts
index 862c4a1ac097..ce136e9113c6 100644
--- a/yarn-project/end-to-end/src/e2e_cross_chain_messaging.test.ts
+++ b/yarn-project/end-to-end/src/e2e_cross_chain_messaging.test.ts
@@ -61,7 +61,7 @@ describe('e2e_cross_chain_messaging', () => {
     aztecNode = aztecNode_;
     teardown = teardown_;
     logger.info('Successfully deployed contracts and initialized portal');
-  }, 100_000);
+  });
 
   afterEach(async () => {
     await teardown();
@@ -132,7 +132,7 @@ describe('e2e_cross_chain_messaging', () => {
       siblingPath,
     );
     expect(await crossChainTestHarness.getL1BalanceOf(ethAccount)).toBe(l1TokenBalance - bridgeAmount + withdrawAmount);
-  }, 120_000);
+  });
   // docs:end:e2e_private_cross_chain
 
   // Unit tests for TokenBridge's private methods.
@@ -191,7 +191,7 @@ describe('e2e_cross_chain_messaging', () => {
     );
     await crossChainTestHarness.redeemShieldPrivatelyOnL2(bridgeAmount, secretForRedeemingMintedNotes);
     await crossChainTestHarness.expectPrivateBalanceOnL2(ownerAddress, bridgeAmount);
-  }, 120_000);
+  });
 
   it("Bridge can't withdraw my funds if I don't give approval", async () => {
     const mintAmountToUser1 = 100n;
@@ -212,7 +212,7 @@ describe('e2e_cross_chain_messaging', () => {
         .methods.exit_to_l1_private(l2Token.address, ethAccount, withdrawAmount, EthAddress.ZERO, nonce)
         .prove(),
     ).rejects.toThrow(`Unknown auth witness for message hash ${expectedBurnMessageHash.toString()}`);
-  }, 120_000);
+  });
 
   it("Can't claim funds publicly if they were deposited privately", async () => {
     // 1. Mint tokens on L1
@@ -257,5 +257,5 @@ describe('e2e_cross_chain_messaging', () => {
         .methods.claim_public(ownerAddress, bridgeAmount, secretForL2MessageConsumption, messageLeafIndex)
         .prove(),
     ).rejects.toThrow(`No non-nullified L1 to L2 message found for message hash ${wrongMessage.hash().toString()}`);
-  }, 120_000);
+  });
 });
diff --git a/yarn-project/end-to-end/src/e2e_dapp_subscription.test.ts b/yarn-project/end-to-end/src/e2e_dapp_subscription.test.ts
index d496bfb87162..109c89c181d9 100644
--- a/yarn-project/end-to-end/src/e2e_dapp_subscription.test.ts
+++ b/yarn-project/end-to-end/src/e2e_dapp_subscription.test.ts
@@ -121,7 +121,7 @@ describe('e2e_dapp_subscription', () => {
       [aliceAddress, sequencerAddress, subscriptionContract.address, bananaFPC.address],
       [0n, 0n, INITIAL_GAS_BALANCE, INITIAL_GAS_BALANCE],
     );
-  }, 180_000);
+  });
 
   it('should allow Alice to subscribe by paying privately with bananas', async () => {
     /**
diff --git a/yarn-project/end-to-end/src/e2e_delegate_calls/delegate.test.ts b/yarn-project/end-to-end/src/e2e_delegate_calls/delegate.test.ts
index 03246dcff0fd..9f6890efb007 100644
--- a/yarn-project/end-to-end/src/e2e_delegate_calls/delegate.test.ts
+++ b/yarn-project/end-to-end/src/e2e_delegate_calls/delegate.test.ts
@@ -33,7 +33,7 @@ describe('e2e_delegate_calls', () => {
 
       expect(delegatedOnValue).toEqual(0n);
       expect(delegatorValue).toEqual(sentValue);
-    }, 100_000);
+    });
 
     it("runs another contract's enqueued public function on delegator's storage", async () => {
       const sentValue = 42n;
@@ -44,7 +44,7 @@ describe('e2e_delegate_calls', () => {
 
       expect(delegatedOnValue).toEqual(0n);
       expect(delegatorValue).toEqual(sentValue);
-    }, 100_000);
+    });
 
     it("runs another contract's public function on delegator's storage", async () => {
       const sentValue = 42n;
@@ -55,6 +55,6 @@ describe('e2e_delegate_calls', () => {
 
       expect(delegatedOnValue).toEqual(0n);
       expect(delegatorValue).toEqual(sentValue);
-    }, 100_000);
+    });
   });
 });
diff --git a/yarn-project/end-to-end/src/e2e_deploy_contract/contract_class_registration.test.ts b/yarn-project/end-to-end/src/e2e_deploy_contract/contract_class_registration.test.ts
index 5c6d418a535f..aa92b4d2b56c 100644
--- a/yarn-project/end-to-end/src/e2e_deploy_contract/contract_class_registration.test.ts
+++ b/yarn-project/end-to-end/src/e2e_deploy_contract/contract_class_registration.test.ts
@@ -47,7 +47,7 @@ describe('e2e_deploy_contract contract class registration', () => {
     artifact = StatefulTestContract.artifact;
     await registerContractClass(wallet, artifact).then(c => c.send().wait());
     contractClass = getContractClassFromArtifact(artifact);
-  }, 60_000);
+  });
 
   it('registers the contract class on the node', async () => {
     const registeredClass = await aztecNode.getContractClass(contractClass.id);
@@ -70,7 +70,7 @@ describe('e2e_deploy_contract contract class registration', () => {
     const fetchedFunction = fetchedClass!.privateFunctions[0]!;
     expect(fetchedFunction).toBeDefined();
     expect(fetchedFunction.selector).toEqual(selector);
-  }, 60_000);
+  });
 
   it('broadcasts an unconstrained function', async () => {
     const functionArtifact = artifact.functions.find(fn => fn.functionType === FunctionType.UNCONSTRAINED)!;
@@ -84,7 +84,7 @@ describe('e2e_deploy_contract contract class registration', () => {
     const fetchedFunction = fetchedClass!.unconstrainedFunctions[0]!;
     expect(fetchedFunction).toBeDefined();
     expect(fetchedFunction.selector).toEqual(selector);
-  }, 60_000);
+  });
 
   const testDeployingAnInstance = (how: string, deployFn: (toDeploy: ContractInstanceWithAddress) => Promise<void>) =>
     describe(`deploying a contract instance ${how}`, () => {
@@ -131,7 +131,7 @@ describe('e2e_deploy_contract contract class registration', () => {
       describe('using a private constructor', () => {
         beforeAll(async () => {
           ({ instance, initArgs, contract } = await deployInstance());
-        }, 60_000);
+        });
 
         it('stores contract instance in the aztec node', async () => {
           const deployed = await aztecNode.getContract(instance.address);
@@ -152,7 +152,7 @@ describe('e2e_deploy_contract contract class registration', () => {
             .wait();
           const stored = await contract.methods.get_public_value(whom).simulate();
           expect(stored).toEqual(10n);
-        }, 30_000);
+        });
 
         it('refuses to call a public function with init check if the instance is not initialized', async () => {
           const whom = AztecAddress.random();
@@ -164,13 +164,13 @@ describe('e2e_deploy_contract contract class registration', () => {
 
           // Meanwhile we check we didn't increment the value
           expect(await contract.methods.get_public_value(whom).simulate()).toEqual(0n);
-        }, 30_000);
+        });
 
         it('refuses to initialize the instance with wrong args via a private function', async () => {
           await expect(contract.methods.constructor(AztecAddress.random(), 43).prove()).rejects.toThrow(
             /initialization hash does not match/i,
           );
-        }, 30_000);
+        });
 
         it('initializes the contract and calls a public function', async () => {
           await contract.methods
@@ -181,7 +181,7 @@ describe('e2e_deploy_contract contract class registration', () => {
           await contract.methods.increment_public_value(whom, 10).send({ skipPublicSimulation: true }).wait();
           const stored = await contract.methods.get_public_value(whom).simulate();
           expect(stored).toEqual(10n);
-        }, 30_000);
+        });
 
         it('refuses to reinitialize the contract', async () => {
           await expect(
@@ -190,13 +190,13 @@ describe('e2e_deploy_contract contract class registration', () => {
               .send({ skipPublicSimulation: true })
               .wait(),
           ).rejects.toThrow(/dropped/i);
-        }, 30_000);
+        });
       });
 
       describe('using a public constructor', () => {
         beforeAll(async () => {
           ({ instance, initArgs, contract } = await deployInstance({ constructorName: 'public_constructor' }));
-        }, 60_000);
+        });
 
         it('refuses to initialize the instance with wrong args via a public function', async () => {
           const whom = AztecAddress.random();
@@ -206,7 +206,7 @@ describe('e2e_deploy_contract contract class registration', () => {
             .wait({ dontThrowOnRevert: true });
           expect(receipt.status).toEqual(TxStatus.REVERTED);
           expect(await contract.methods.get_public_value(whom).simulate()).toEqual(0n);
-        }, 30_000);
+        });
 
         it('initializes the contract and calls a public function', async () => {
           await contract.methods
@@ -217,7 +217,7 @@ describe('e2e_deploy_contract contract class registration', () => {
           await contract.methods.increment_public_value(whom, 10).send({ skipPublicSimulation: true }).wait();
           const stored = await contract.methods.get_public_value(whom).simulate();
           expect(stored).toEqual(10n);
-        }, 30_000);
+        });
 
         it('refuses to reinitialize the contract', async () => {
           await expect(
@@ -226,7 +226,7 @@ describe('e2e_deploy_contract contract class registration', () => {
               .send({ skipPublicSimulation: true })
               .wait(),
           ).rejects.toThrow(/dropped/i);
-        }, 30_000);
+        });
       });
     });
 
diff --git a/yarn-project/end-to-end/src/e2e_deploy_contract/deploy_method.test.ts b/yarn-project/end-to-end/src/e2e_deploy_contract/deploy_method.test.ts
index f791681b1cb6..a881d5a277b3 100644
--- a/yarn-project/end-to-end/src/e2e_deploy_contract/deploy_method.test.ts
+++ b/yarn-project/end-to-end/src/e2e_deploy_contract/deploy_method.test.ts
@@ -26,7 +26,7 @@ describe('e2e_deploy_contract deploy method', () => {
     logger.debug(`Calling public method on stateful test contract at ${contract.address.toString()}`);
     await contract.methods.increment_public_value(owner, 84).send().wait();
     expect(await contract.methods.get_public_value(owner).simulate()).toEqual(84n);
-  }, 60_000);
+  });
 
   it('publicly universally deploys and initializes a contract', async () => {
     const owner = wallet.getAddress();
@@ -35,13 +35,13 @@ describe('e2e_deploy_contract deploy method', () => {
     expect(await contract.methods.summed_values(owner).simulate()).toEqual(42n);
     await contract.methods.increment_public_value(owner, 84).send().wait();
     expect(await contract.methods.get_public_value(owner).simulate()).toEqual(84n);
-  }, 60_000);
+  });
 
   it('publicly deploys and calls a public function from the constructor', async () => {
     const owner = wallet.getAddress();
     const token = await TokenContract.deploy(wallet, owner, 'TOKEN', 'TKN', 18).send().deployed();
     expect(await token.methods.is_minter(owner).simulate()).toEqual(true);
-  }, 60_000);
+  });
 
   it('publicly deploys and initializes via a public function', async () => {
     const owner = wallet.getAddress();
@@ -53,7 +53,7 @@ describe('e2e_deploy_contract deploy method', () => {
     logger.debug(`Calling a private function to ensure the contract was properly initialized`);
     await contract.methods.create_note(owner, 30).send().wait();
     expect(await contract.methods.summed_values(owner).simulate()).toEqual(30n);
-  }, 60_000);
+  });
 
   it('deploys a contract with a default initializer not named constructor', async () => {
     logger.debug(`Deploying contract with a default initializer named initialize`);
diff --git a/yarn-project/end-to-end/src/e2e_deploy_contract/legacy.test.ts b/yarn-project/end-to-end/src/e2e_deploy_contract/legacy.test.ts
index 8dda2e91815d..403da38154cb 100644
--- a/yarn-project/end-to-end/src/e2e_deploy_contract/legacy.test.ts
+++ b/yarn-project/end-to-end/src/e2e_deploy_contract/legacy.test.ts
@@ -44,7 +44,7 @@ describe('e2e_deploy_contract legacy', () => {
     expect(receipt.contract.address).toEqual(deploymentData.address);
     expect(await pxe.getContractInstance(deploymentData.address)).toBeDefined();
     expect(await pxe.isContractPubliclyDeployed(deploymentData.address)).toBeDefined();
-  }, 60_000);
+  });
 
   /**
    * Verify that we can produce multiple rollups.
@@ -56,7 +56,7 @@ describe('e2e_deploy_contract legacy', () => {
       logger.info(`Deploying contract ${index + 1}...`);
       await deployer.deploy().send({ contractAddressSalt: Fr.random() }).wait({ wallet });
     }
-  }, 60_000);
+  });
 
   /**
    * Verify that we can deploy multiple contracts and interact with all of them.
@@ -70,7 +70,7 @@ describe('e2e_deploy_contract legacy', () => {
       logger.info(`Sending TX to contract ${index + 1}...`);
       await receipt.contract.methods.get_public_key(wallet.getAddress()).send().wait();
     }
-  }, 90_000);
+  });
 
   /**
    * Milestone 1.2.
@@ -82,7 +82,7 @@ describe('e2e_deploy_contract legacy', () => {
 
     await deployer.deploy().send({ contractAddressSalt }).wait({ wallet });
     await expect(deployer.deploy().send({ contractAddressSalt }).wait()).rejects.toThrow(/dropped/);
-  }, 60_000);
+  });
 
   it('should not deploy a contract which failed the public part of the execution', async () => {
     // This test requires at least another good transaction to go through in the same block as the bad one.
@@ -114,5 +114,5 @@ describe('e2e_deploy_contract legacy', () => {
 
     // But the bad tx did not deploy
     await expect(pxe.isContractClassPubliclyRegistered(badDeploy.getInstance().address)).resolves.toBeFalsy();
-  }, 90_000);
+  });
 });
diff --git a/yarn-project/end-to-end/src/e2e_deploy_contract/private_initialization.test.ts b/yarn-project/end-to-end/src/e2e_deploy_contract/private_initialization.test.ts
index 7ea721c21dda..6567c8e5cc06 100644
--- a/yarn-project/end-to-end/src/e2e_deploy_contract/private_initialization.test.ts
+++ b/yarn-project/end-to-end/src/e2e_deploy_contract/private_initialization.test.ts
@@ -65,7 +65,7 @@ describe('e2e_deploy_contract private initialization', () => {
     await new BatchCall(wallet, calls).send().wait();
     expect(await contracts[0].methods.summed_values(owner).simulate()).toEqual(42n);
     expect(await contracts[1].methods.summed_values(owner).simulate()).toEqual(52n);
-  }, 30_000);
+  });
 
   // TODO(@spalladino): This won't work until we can read a nullifier in the same tx in which it was emitted.
   it.skip('initializes and calls a private function in a single tx', async () => {
diff --git a/yarn-project/end-to-end/src/e2e_encryption.test.ts b/yarn-project/end-to-end/src/e2e_encryption.test.ts
index 7734c66ee46e..a8d4e7b34be3 100644
--- a/yarn-project/end-to-end/src/e2e_encryption.test.ts
+++ b/yarn-project/end-to-end/src/e2e_encryption.test.ts
@@ -17,7 +17,7 @@ describe('e2e_encryption', () => {
   beforeAll(async () => {
     ({ teardown, wallet } = await setup());
     contract = await TestContract.deploy(wallet).send().deployed();
-  }, 45_000);
+  });
 
   afterAll(() => teardown());
 
diff --git a/yarn-project/end-to-end/src/e2e_escrow_contract.test.ts b/yarn-project/end-to-end/src/e2e_escrow_contract.test.ts
index 12017b84bb89..8d0639c2346f 100644
--- a/yarn-project/end-to-end/src/e2e_escrow_contract.test.ts
+++ b/yarn-project/end-to-end/src/e2e_escrow_contract.test.ts
@@ -77,7 +77,7 @@ describe('e2e_escrow_contract', () => {
     await token.methods.redeem_shield(escrowContract.address, mintAmount, secret).send().wait();
 
     logger.info(`Token contract deployed at ${token.address}`);
-  }, 100_000);
+  });
 
   afterEach(() => teardown(), 30_000);
 
@@ -98,13 +98,13 @@ describe('e2e_escrow_contract', () => {
     await expectBalance(owner, 0n);
     await expectBalance(recipient, 30n);
     await expectBalance(escrowContract.address, 70n);
-  }, 60_000);
+  });
 
   it('refuses to withdraw funds as a non-owner', async () => {
     await expect(
       escrowContract.withWallet(recipientWallet).methods.withdraw(token.address, 30, recipient).prove(),
     ).rejects.toThrow();
-  }, 60_000);
+  });
 
   it('moves funds using multiple keys on the same tx (#1010)', async () => {
     logger.info(`Minting funds in token contract to ${owner}`);
@@ -136,5 +136,5 @@ describe('e2e_escrow_contract', () => {
 
     await new BatchCall(wallet, actions).send().wait();
     await expectBalance(recipient, 30n);
-  }, 120_000);
+  });
 });
diff --git a/yarn-project/end-to-end/src/e2e_key_registry.test.ts b/yarn-project/end-to-end/src/e2e_key_registry.test.ts
index b3dccd1b34b2..97157db0657f 100644
--- a/yarn-project/end-to-end/src/e2e_key_registry.test.ts
+++ b/yarn-project/end-to-end/src/e2e_key_registry.test.ts
@@ -28,7 +28,7 @@ describe('SharedMutablePrivateGetter', () => {
     testContract = await TestContract.deploy(wallets[0]).send().deployed();
 
     await publicDeployAccounts(wallets[0], wallets.slice(0, 2));
-  }, 120_000);
+  });
 
   const delay = async (blocks: number) => {
     for (let i = 0; i < blocks; i++) {
diff --git a/yarn-project/end-to-end/src/e2e_lending_contract.test.ts b/yarn-project/end-to-end/src/e2e_lending_contract.test.ts
index 2dd4614f80ed..62acc1ab9c6f 100644
--- a/yarn-project/end-to-end/src/e2e_lending_contract.test.ts
+++ b/yarn-project/end-to-end/src/e2e_lending_contract.test.ts
@@ -77,7 +77,7 @@ describe('e2e_lending_contract', () => {
       new TokenSimulator(collateralAsset, logger, [lendingContract.address, wallet.getAddress()]),
       new TokenSimulator(stableCoin, logger, [lendingContract.address, wallet.getAddress()]),
     );
-  }, 200_000);
+  });
 
   afterAll(() => teardown());
 
diff --git a/yarn-project/end-to-end/src/e2e_max_block_number.test.ts b/yarn-project/end-to-end/src/e2e_max_block_number.test.ts
index 56cc4e4f10e2..16758ffc7eaa 100644
--- a/yarn-project/end-to-end/src/e2e_max_block_number.test.ts
+++ b/yarn-project/end-to-end/src/e2e_max_block_number.test.ts
@@ -13,7 +13,7 @@ describe('e2e_max_block_number', () => {
   beforeAll(async () => {
     ({ teardown, wallet, pxe } = await setup());
     contract = await TestContract.deploy(wallet).send().deployed();
-  }, 45_000);
+  });
 
   afterAll(() => teardown());
 
diff --git a/yarn-project/end-to-end/src/e2e_multiple_accounts_1_enc_key.test.ts b/yarn-project/end-to-end/src/e2e_multiple_accounts_1_enc_key.test.ts
index cf239abd44f5..a8b0ed53439f 100644
--- a/yarn-project/end-to-end/src/e2e_multiple_accounts_1_enc_key.test.ts
+++ b/yarn-project/end-to-end/src/e2e_multiple_accounts_1_enc_key.test.ts
@@ -75,7 +75,7 @@ describe('e2e_multiple_accounts_1_enc_key', () => {
     await pxe.addNote(extendedNote);
 
     await token.methods.redeem_shield(accounts[0], initialBalance, secret).send().wait();
-  }, 100_000);
+  });
 
   afterEach(() => teardown());
 
@@ -142,5 +142,5 @@ describe('e2e_multiple_accounts_1_enc_key', () => {
       expectedBalancesAfterTransfer2[2] + transferAmount3,
     ];
     await transfer(1, 2, transferAmount3, expectedBalancesAfterTransfer3);
-  }, 180_000);
+  });
 });
diff --git a/yarn-project/end-to-end/src/e2e_nested_contract.test.ts b/yarn-project/end-to-end/src/e2e_nested_contract.test.ts
index 661978ce75ce..9e878db7895a 100644
--- a/yarn-project/end-to-end/src/e2e_nested_contract.test.ts
+++ b/yarn-project/end-to-end/src/e2e_nested_contract.test.ts
@@ -11,7 +11,7 @@ describe('e2e_nested_contract', () => {
 
   beforeEach(async () => {
     ({ teardown, pxe, wallet, logger } = await setup());
-  }, 100_000);
+  });
 
   afterEach(() => teardown());
 
@@ -22,7 +22,7 @@ describe('e2e_nested_contract', () => {
     beforeEach(async () => {
       parentContract = await ParentContract.deploy(wallet).send().deployed();
       childContract = await ChildContract.deploy(wallet).send().deployed();
-    }, 100_000);
+    });
 
     const getChildStoredValue = (child: { address: AztecAddress }) => pxe.getPublicStorageAt(child.address, new Fr(1));
 
@@ -31,7 +31,7 @@ describe('e2e_nested_contract', () => {
         .entry_point(childContract.address, childContract.methods.value.selector)
         .send()
         .wait();
-    }, 100_000);
+    });
 
     it('fails simulation if calling a function not allowed to be called externally', async () => {
       await expect(
@@ -39,14 +39,14 @@ describe('e2e_nested_contract', () => {
           .entry_point(childContract.address, (childContract.methods as any).value_internal.selector)
           .prove(),
       ).rejects.toThrow(/Assertion failed: Function value_internal can only be called internally/);
-    }, 100_000);
+    });
 
     it('performs public nested calls', async () => {
       await parentContract.methods
         .pub_entry_point(childContract.address, childContract.methods.pub_get_value.selector, 42n)
         .send()
         .wait();
-    }, 100_000);
+    });
 
     it('enqueues a single public call', async () => {
       await parentContract.methods
@@ -54,7 +54,7 @@ describe('e2e_nested_contract', () => {
         .send()
         .wait();
       expect(await getChildStoredValue(childContract)).toEqual(new Fr(42n));
-    }, 100_000);
+    });
 
     it('fails simulation if calling a public function not allowed to be called externally', async () => {
       await expect(
@@ -66,7 +66,7 @@ describe('e2e_nested_contract', () => {
           )
           .prove(),
       ).rejects.toThrow(/Assertion failed: Function pub_inc_value_internal can only be called internally/);
-    }, 100_000);
+    });
 
     it('enqueues multiple public calls', async () => {
       await parentContract.methods
@@ -74,7 +74,7 @@ describe('e2e_nested_contract', () => {
         .send()
         .wait();
       expect(await getChildStoredValue(childContract)).toEqual(new Fr(85n));
-    }, 100_000);
+    });
 
     it('enqueues a public call with nested public calls', async () => {
       await parentContract.methods
@@ -82,7 +82,7 @@ describe('e2e_nested_contract', () => {
         .send()
         .wait();
       expect(await getChildStoredValue(childContract)).toEqual(new Fr(42n));
-    }, 100_000);
+    });
 
     it('enqueues multiple public calls with nested public calls', async () => {
       await parentContract.methods
@@ -90,7 +90,7 @@ describe('e2e_nested_contract', () => {
         .send()
         .wait();
       expect(await getChildStoredValue(childContract)).toEqual(new Fr(85n));
-    }, 100_000);
+    });
 
     // Regression for https://github.com/AztecProtocol/aztec-packages/issues/640
     it('reads fresh value after write within the same tx', async () => {
@@ -99,7 +99,7 @@ describe('e2e_nested_contract', () => {
         .send()
         .wait();
       expect(await getChildStoredValue(childContract)).toEqual(new Fr(84n));
-    }, 100_000);
+    });
 
     // Regression for https://github.com/AztecProtocol/aztec-packages/issues/1645
     // Executes a public call first and then a private call (which enqueues another public call)
@@ -121,7 +121,7 @@ describe('e2e_nested_contract', () => {
       const processedLogs = extendedLogs.map(extendedLog => toBigIntBE(extendedLog.log.data));
       expect(processedLogs).toEqual([20n, 40n]);
       expect(await getChildStoredValue(childContract)).toEqual(new Fr(40n));
-    }, 100_000);
+    });
   });
 
   describe('importer uses autogenerated test contract interface', () => {
@@ -133,26 +133,26 @@ describe('e2e_nested_contract', () => {
       importerContract = await ImportTestContract.deploy(wallet).send().deployed();
       logger.info(`Deploying test contract`);
       testContract = await TestContract.deploy(wallet).send().deployed();
-    }, 30_000);
+    });
 
     it('calls a method with multiple arguments', async () => {
       logger.info(`Calling main on importer contract`);
       await importerContract.methods.main_contract(testContract.address).send().wait();
-    }, 30_000);
+    });
 
     it('calls a method no arguments', async () => {
       logger.info(`Calling noargs on importer contract`);
       await importerContract.methods.call_no_args(testContract.address).send().wait();
-    }, 30_000);
+    });
 
     it('calls an open function', async () => {
       logger.info(`Calling openfn on importer contract`);
       await importerContract.methods.call_open_fn(testContract.address).send().wait();
-    }, 30_000);
+    });
 
     it('calls an open function from an open function', async () => {
       logger.info(`Calling pub openfn on importer contract`);
       await importerContract.methods.pub_call_open_fn(testContract.address).send().wait();
-    }, 30_000);
+    });
   });
 });
diff --git a/yarn-project/end-to-end/src/e2e_non_contract_account.test.ts b/yarn-project/end-to-end/src/e2e_non_contract_account.test.ts
index 8b08c8fa4fc8..878112b259a7 100644
--- a/yarn-project/end-to-end/src/e2e_non_contract_account.test.ts
+++ b/yarn-project/end-to-end/src/e2e_non_contract_account.test.ts
@@ -30,7 +30,7 @@ describe('e2e_non_contract_account', () => {
     logger.debug(`Deploying L2 contract...`);
     contract = await TestContract.deploy(wallet).send().deployed();
     logger.info(`L2 contract deployed at ${contract.address}`);
-  }, 100_000);
+  });
 
   afterEach(() => teardown());
 
@@ -48,7 +48,7 @@ describe('e2e_non_contract_account', () => {
     const siloedNullifier = debugInfo!.nullifiers[1];
 
     expect(siloedNullifier.equals(expectedSiloedNullifier)).toBeTruthy();
-  }, 120_000);
+  });
 
   it('msg.sender is 0 when a non-contract account calls a private function on a contract', async () => {
     const contractWithNoContractWallet = await TestContract.at(contract.address, nonContractAccountWallet);
@@ -62,7 +62,7 @@ describe('e2e_non_contract_account', () => {
 
     const msgSender = toBigInt(logs[0].log.data);
     expect(msgSender).toBe(0n);
-  }, 120_000);
+  });
 
   // Note: This test doesn't really belong here as it doesn't have anything to do with non-contract accounts. I needed
   // to test the TestNote functionality and it doesn't really fit anywhere else. Creating a separate e2e test for this
diff --git a/yarn-project/end-to-end/src/e2e_note_getter.test.ts b/yarn-project/end-to-end/src/e2e_note_getter.test.ts
index c7deb286a920..b17cb3ed2862 100644
--- a/yarn-project/end-to-end/src/e2e_note_getter.test.ts
+++ b/yarn-project/end-to-end/src/e2e_note_getter.test.ts
@@ -21,7 +21,7 @@ describe('e2e_note_getter', () => {
 
   beforeAll(async () => {
     ({ teardown, wallet } = await setup());
-  }, 25_000);
+  });
 
   afterAll(() => teardown());
 
@@ -32,7 +32,7 @@ describe('e2e_note_getter', () => {
       contract = await DocsExampleContract.deploy(wallet).send().deployed();
       // sets card value to 1 and leader to sender.
       await contract.methods.initialize_private(Fr.random(), 1).send().wait();
-    }, 25_000);
+    });
 
     it('inserts notes from 0-9, then makes multiple queries specifying the total suite of comparators', async () => {
       // ISSUE #4243
@@ -145,7 +145,7 @@ describe('e2e_note_getter', () => {
           { points: 8n, randomness: 1n },
         ].sort(sortFunc),
       );
-    }, 300_000);
+    });
   });
 
   describe('status filter', () => {
@@ -155,7 +155,7 @@ describe('e2e_note_getter', () => {
     beforeAll(async () => {
       contract = await TestContract.deploy(wallet).send().deployed();
       owner = wallet.getCompleteAddress().address;
-    }, 100_000);
+    });
 
     const VALUE = 5;
 
@@ -189,14 +189,14 @@ describe('e2e_note_getter', () => {
       it('returns active notes', async () => {
         await contract.methods.call_create_note(VALUE, owner, storageSlot).send().wait();
         await assertNoteIsReturned(storageSlot, VALUE, activeOrNullified);
-      }, 30_000);
+      });
 
       it('does not return nullified notes', async () => {
         await contract.methods.call_create_note(VALUE, owner, storageSlot).send().wait();
         await contract.methods.call_destroy_note(storageSlot).send().wait();
 
         await assertNoReturnValue(storageSlot, activeOrNullified);
-      }, 30_000);
+      });
     });
 
     describe('active and nullified notes', () => {
@@ -205,14 +205,14 @@ describe('e2e_note_getter', () => {
       it('returns active notes', async () => {
         await contract.methods.call_create_note(VALUE, owner, storageSlot).send().wait();
         await assertNoteIsReturned(storageSlot, VALUE, activeOrNullified);
-      }, 30_000);
+      });
 
       it('returns nullified notes', async () => {
         await contract.methods.call_create_note(VALUE, owner, storageSlot).send().wait();
         await contract.methods.call_destroy_note(storageSlot).send().wait();
 
         await assertNoteIsReturned(storageSlot, VALUE, activeOrNullified);
-      }, 30_000);
+      });
 
       it('returns both active and nullified notes', async () => {
         // We store two notes with two different values in the same storage slot, and then delete one of them. Note that
@@ -236,7 +236,7 @@ describe('e2e_note_getter', () => {
         // however that both view_notes and get_notes get the exact same result.
         expect(viewNotesManyResult).toEqual(getNotesManyResult);
         expect(viewNotesManyResult.sort()).toEqual([BigInt(VALUE), BigInt(VALUE + 1)]);
-      }, 45_000);
+      });
     });
   });
 });
diff --git a/yarn-project/end-to-end/src/e2e_ordering.test.ts b/yarn-project/end-to-end/src/e2e_ordering.test.ts
index 16ce4309f7dd..66a37afe6e2f 100644
--- a/yarn-project/end-to-end/src/e2e_ordering.test.ts
+++ b/yarn-project/end-to-end/src/e2e_ordering.test.ts
@@ -29,7 +29,7 @@ describe('e2e_ordering', () => {
 
   beforeEach(async () => {
     ({ teardown, pxe, wallet } = await setup());
-  }, 100_000);
+  });
 
   afterEach(() => teardown());
 
diff --git a/yarn-project/end-to-end/src/e2e_outbox.test.ts b/yarn-project/end-to-end/src/e2e_outbox.test.ts
index 9d613efa09f3..4a8d8ede8212 100644
--- a/yarn-project/end-to-end/src/e2e_outbox.test.ts
+++ b/yarn-project/end-to-end/src/e2e_outbox.test.ts
@@ -32,7 +32,7 @@ describe('E2E Outbox Tests', () => {
 
     const receipt = await TestContract.deploy(wallets[0]).send({ contractAddressSalt: Fr.ZERO }).wait();
     contract = receipt.contract;
-  }, 100_000);
+  });
 
   afterAll(() => teardown());
 
@@ -84,7 +84,7 @@ describe('E2E Outbox Tests', () => {
     expect(index2).toBe(1n);
     const expectedRoot2 = calculateExpectedRoot(l2ToL1Messages![1], siblingPath2 as SiblingPath<2>, index2);
     expect(expectedRoot2.toString('hex')).toEqual(block?.header.contentCommitment.outHash.toString('hex'));
-  }, 360_000);
+  });
 
   function calculateExpectedRoot(l2ToL1Message: Fr, siblingPath: SiblingPath<2>, index: bigint): Buffer {
     const firstLayerInput: [Buffer, Buffer] =
diff --git a/yarn-project/end-to-end/src/e2e_pending_note_hashes_contract.test.ts b/yarn-project/end-to-end/src/e2e_pending_note_hashes_contract.test.ts
index 47cbd7202ed7..405fab1fab7e 100644
--- a/yarn-project/end-to-end/src/e2e_pending_note_hashes_contract.test.ts
+++ b/yarn-project/end-to-end/src/e2e_pending_note_hashes_contract.test.ts
@@ -14,7 +14,7 @@ describe('e2e_pending_note_hashes_contract', () => {
   beforeEach(async () => {
     ({ teardown, aztecNode, wallet, logger } = await setup(2));
     owner = wallet.getAddress();
-  }, 100_000);
+  });
 
   afterEach(() => teardown());
 
@@ -63,7 +63,7 @@ describe('e2e_pending_note_hashes_contract', () => {
     const deployedContract = await deployContract();
 
     await deployedContract.methods.test_insert_then_get_then_nullify_flat(mintAmount, owner).send().wait();
-  }, 60_000);
+  });
 
   it('Squash! Aztec.nr function can "create" and "nullify" note in the same TX', async () => {
     // Kernel will squash the noteHash and its nullifier.
@@ -87,7 +87,7 @@ describe('e2e_pending_note_hashes_contract', () => {
 
     await expectNoteHashesSquashedExcept(0);
     await expectNullifiersSquashedExcept(0);
-  }, 60_000);
+  });
 
   it('Squash! Aztec.nr function can "create" 2 notes and "nullify" both in the same TX', async () => {
     // Kernel will squash both noteHashes and their nullifier.
@@ -108,7 +108,7 @@ describe('e2e_pending_note_hashes_contract', () => {
 
     await expectNoteHashesSquashedExcept(0);
     await expectNullifiersSquashedExcept(0);
-  }, 60_000);
+  });
 
   it('Squash! Aztec.nr function can "create" 2 notes and "nullify" 1 in the same TX (kernel will squash one note + nullifier)', async () => {
     // Kernel will squash one noteHash and its nullifier.
@@ -130,7 +130,7 @@ describe('e2e_pending_note_hashes_contract', () => {
 
     await expectNoteHashesSquashedExcept(1);
     await expectNullifiersSquashedExcept(0);
-  }, 60_000);
+  });
 
   it('Squash! Aztec.nr function can nullify a pending note and a persistent in the same TX', async () => {
     // Create 1 note in isolated TX.
@@ -167,7 +167,7 @@ describe('e2e_pending_note_hashes_contract', () => {
     // the nullifier corresponding to this transient note is squashed, but the
     // other nullifier corresponding to the persistent note becomes persistent itself.
     await expectNullifiersSquashedExcept(1);
-  }, 60_000);
+  });
 
   it('get_notes function filters a nullified note created in a previous transaction', async () => {
     // Create a note in an isolated transaction.
@@ -195,5 +195,5 @@ describe('e2e_pending_note_hashes_contract', () => {
 
     // There is a single new nullifier.
     await expectNullifiersSquashedExcept(1);
-  }, 60_000);
+  });
 });
diff --git a/yarn-project/end-to-end/src/e2e_private_voting_contract.test.ts b/yarn-project/end-to-end/src/e2e_private_voting_contract.test.ts
index 15f537643a1c..aeda6f45ee83 100644
--- a/yarn-project/end-to-end/src/e2e_private_voting_contract.test.ts
+++ b/yarn-project/end-to-end/src/e2e_private_voting_contract.test.ts
@@ -20,7 +20,7 @@ describe('e2e_voting_contract', () => {
     votingContract = await EasyPrivateVotingContract.deploy(wallet, owner).send().deployed();
 
     logger.info(`Counter contract deployed at ${votingContract.address}`);
-  }, 45_000);
+  });
 
   afterAll(() => teardown());
 
diff --git a/yarn-project/end-to-end/src/e2e_public_to_private_messaging.test.ts b/yarn-project/end-to-end/src/e2e_public_to_private_messaging.test.ts
index 51077dc9de89..6b7ac9451ae8 100644
--- a/yarn-project/end-to-end/src/e2e_public_to_private_messaging.test.ts
+++ b/yarn-project/end-to-end/src/e2e_public_to_private_messaging.test.ts
@@ -39,7 +39,7 @@ describe('e2e_public_to_private_messaging', () => {
     teardown = teardown_;
     logger = logger_;
     logger.info('Successfully deployed contracts and initialized portal');
-  }, 100_000);
+  });
 
   afterEach(async () => {
     await teardown();
@@ -79,5 +79,5 @@ describe('e2e_public_to_private_messaging', () => {
     await crossChainTestHarness.unshieldTokensOnL2(shieldAmount);
     await crossChainTestHarness.expectPublicBalanceOnL2(ownerAddress, bridgeAmount);
     await crossChainTestHarness.expectPrivateBalanceOnL2(ownerAddress, 0n);
-  }, 200_000);
+  });
 });
diff --git a/yarn-project/end-to-end/src/e2e_state_vars.test.ts b/yarn-project/end-to-end/src/e2e_state_vars.test.ts
index 8d63cafea4f9..ae6a7281aee4 100644
--- a/yarn-project/end-to-end/src/e2e_state_vars.test.ts
+++ b/yarn-project/end-to-end/src/e2e_state_vars.test.ts
@@ -22,7 +22,7 @@ describe('e2e_state_vars', () => {
   beforeAll(async () => {
     ({ teardown, wallet, pxe } = await setup(2));
     contract = await DocsExampleContract.deploy(wallet).send().deployed();
-  }, 60_000);
+  });
 
   afterAll(() => teardown());
 
@@ -84,7 +84,7 @@ describe('e2e_state_vars', () => {
       await expect(contract.methods.initialize_shared_immutable(1).send().wait()).rejects.toThrow(
         "Assertion failed: SharedImmutable already initialized 'fields_read[0] == 0'",
       );
-    }, 100_000);
+    });
   });
 
   describe('PublicImmutable', () => {
@@ -96,7 +96,7 @@ describe('e2e_state_vars', () => {
 
       expect(p.account).toEqual(wallet.getCompleteAddress().address);
       expect(p.points).toEqual(numPoints);
-    }, 200_000);
+    });
 
     it('initializing PublicImmutable the second time should fail', async () => {
       // Jest executes the tests sequentially and the first call to initialize_public_immutable was executed
@@ -104,7 +104,7 @@ describe('e2e_state_vars', () => {
       await expect(contract.methods.initialize_public_immutable(1).send().wait()).rejects.toThrow(
         "Assertion failed: PublicImmutable already initialized 'fields_read[0] == 0'",
       );
-    }, 100_000);
+    });
   });
 
   describe('PrivateMutable', () => {
@@ -246,7 +246,7 @@ describe('e2e_state_vars', () => {
         .methods.set_authorized(AztecAddress.fromField(new Fr(6969696969)))
         .send()
         .wait();
-    }, 30_000);
+    });
 
     it("checks authorized in auth contract from test contract and finds the old value because the change hasn't been applied yet", async () => {
       const { txHash } = await testContract.methods
diff --git a/yarn-project/end-to-end/src/e2e_static_calls.test.ts b/yarn-project/end-to-end/src/e2e_static_calls.test.ts
index 839e1628acc2..2d5a9cbe4dc6 100644
--- a/yarn-project/end-to-end/src/e2e_static_calls.test.ts
+++ b/yarn-project/end-to-end/src/e2e_static_calls.test.ts
@@ -11,14 +11,14 @@ describe('e2e_static_calls', () => {
 
   beforeEach(async () => {
     ({ teardown, wallet } = await setup());
-  }, 100_000);
+  });
 
   afterEach(() => teardown());
 
   beforeEach(async () => {
     parentContract = await ParentContract.deploy(wallet).send().deployed();
     childContract = await ChildContract.deploy(wallet).send().deployed();
-  }, 100_000);
+  });
 
   describe('parent calls child', () => {
     it('performs legal private to private static calls', async () => {
@@ -32,7 +32,7 @@ describe('e2e_static_calls', () => {
         ])
         .send()
         .wait();
-    }, 100_000);
+    });
 
     it('performs legal (nested) private to private static calls', async () => {
       // We create a note in the set, so...
@@ -45,28 +45,28 @@ describe('e2e_static_calls', () => {
         ])
         .send()
         .wait();
-    }, 100_000);
+    });
 
     it('performs legal public to public static calls', async () => {
       await parentContract.methods
         .public_static_call(childContract.address, childContract.methods.pub_get_value.selector, [42n])
         .send()
         .wait();
-    }, 100_000);
+    });
 
     it('performs legal (nested) public to public static calls', async () => {
       await parentContract.methods
         .public_nested_static_call(childContract.address, childContract.methods.pub_get_value.selector, [42n])
         .send()
         .wait();
-    }, 100_000);
+    });
 
     it('performs legal enqueued public static calls', async () => {
       await parentContract.methods
         .enqueue_static_call_to_pub_function(childContract.address, childContract.methods.pub_get_value.selector, [42n])
         .send()
         .wait();
-    }, 100_000);
+    });
 
     it('performs legal (nested) enqueued public static calls', async () => {
       await parentContract.methods
@@ -77,7 +77,7 @@ describe('e2e_static_calls', () => {
         )
         .send()
         .wait();
-    }, 100_000);
+    });
 
     it('fails when performing illegal private to private static calls', async () => {
       await expect(
@@ -89,7 +89,7 @@ describe('e2e_static_calls', () => {
           .send()
           .wait(),
       ).rejects.toThrow('Static call cannot create new notes, emit L2->L1 messages or generate logs');
-    }, 100_000);
+    });
 
     it('fails when performing illegal (nested) private to private static calls', async () => {
       await expect(
@@ -101,7 +101,7 @@ describe('e2e_static_calls', () => {
           .send()
           .wait(),
       ).rejects.toThrow('Static call cannot create new notes, emit L2->L1 messages or generate logs');
-    }, 100_000);
+    });
 
     it('fails when performing illegal public to public static calls', async () => {
       await expect(
@@ -110,7 +110,7 @@ describe('e2e_static_calls', () => {
           .send()
           .wait(),
       ).rejects.toThrow('Static call cannot update the state, emit L2->L1 messages or generate logs');
-    }, 100_000);
+    });
 
     it('fails when performing illegal (nested) public to public static calls', async () => {
       await expect(
@@ -119,7 +119,7 @@ describe('e2e_static_calls', () => {
           .send()
           .wait(),
       ).rejects.toThrow('Static call cannot update the state, emit L2->L1 messages or generate logs');
-    }, 100_000);
+    });
 
     it('fails when performing illegal enqueued public static calls', async () => {
       await expect(
@@ -130,7 +130,7 @@ describe('e2e_static_calls', () => {
           .send()
           .wait(),
       ).rejects.toThrow('Static call cannot update the state, emit L2->L1 messages or generate logs');
-    }, 100_000);
+    });
 
     it('fails when performing illegal (nested) enqueued public static calls', async () => {
       await expect(
@@ -143,6 +143,6 @@ describe('e2e_static_calls', () => {
           .send()
           .wait(),
       ).rejects.toThrow('Static call cannot update the state, emit L2->L1 messages or generate logs');
-    }, 100_000);
+    });
   });
 });
diff --git a/yarn-project/end-to-end/src/flakey_e2e_inclusion_proofs_contract.test.ts b/yarn-project/end-to-end/src/flakey_e2e_inclusion_proofs_contract.test.ts
index b82bb8153d98..6be433e2b2ae 100644
--- a/yarn-project/end-to-end/src/flakey_e2e_inclusion_proofs_contract.test.ts
+++ b/yarn-project/end-to-end/src/flakey_e2e_inclusion_proofs_contract.test.ts
@@ -38,7 +38,7 @@ describe('e2e_inclusion_proofs_contract', () => {
     const receipt = await InclusionProofsContract.deploy(wallets[0], publicValue).send({ contractAddressSalt }).wait();
     contract = receipt.contract;
     deploymentBlockNumber = receipt.blockNumber!;
-  }, 100_000);
+  });
 
   afterAll(() => teardown());
 
diff --git a/yarn-project/end-to-end/src/flakey_e2e_p2p_network.test.ts b/yarn-project/end-to-end/src/flakey_e2e_p2p_network.test.ts
index 77e8382ad670..97fe61a71c0e 100644
--- a/yarn-project/end-to-end/src/flakey_e2e_p2p_network.test.ts
+++ b/yarn-project/end-to-end/src/flakey_e2e_p2p_network.test.ts
@@ -37,7 +37,7 @@ describe('e2e_p2p_network', () => {
 
   beforeEach(async () => {
     ({ teardown, config, logger } = await setup(1));
-  }, 100_000);
+  });
 
   afterEach(() => teardown());
 
@@ -68,7 +68,7 @@ describe('e2e_p2p_network', () => {
       await context.pxeService.stop();
     }
     await bootstrapNode.stop();
-  }, 120_000);
+  });
 
   const createBootstrapNode = async () => {
     const peerId = await createLibP2PPeerId();
diff --git a/yarn-project/end-to-end/src/guides/dapp_testing.test.ts b/yarn-project/end-to-end/src/guides/dapp_testing.test.ts
index 78267af530fe..db87d5f90e9f 100644
--- a/yarn-project/end-to-end/src/guides/dapp_testing.test.ts
+++ b/yarn-project/end-to-end/src/guides/dapp_testing.test.ts
@@ -39,7 +39,7 @@ describe('guides/dapp/testing', () => {
         token = await TokenContract.deploy(owner, owner.getCompleteAddress(), 'TokenName', 'TokenSymbol', 18)
           .send()
           .deployed();
-      }, 60_000);
+      });
 
       it('increases recipient funds on mint', async () => {
         const recipientAddress = recipient.getAddress();
@@ -63,7 +63,7 @@ describe('guides/dapp/testing', () => {
 
         await token.methods.redeem_shield(recipientAddress, mintAmount, secret).send().wait();
         expect(await token.methods.balance_of_private(recipientAddress).simulate()).toEqual(20n);
-      }, 30_000);
+      });
     });
     // docs:end:sandbox-example
 
@@ -81,7 +81,7 @@ describe('guides/dapp/testing', () => {
           .send()
           .deployed();
         // docs:end:use-existing-wallets
-      }, 30_000);
+      });
 
       it('increases recipient funds on mint', async () => {
         expect(await token.methods.balance_of_private(recipient.getAddress()).simulate()).toEqual(0n);
@@ -104,7 +104,7 @@ describe('guides/dapp/testing', () => {
 
         await token.methods.redeem_shield(recipientAddress, mintAmount, secret).send().wait();
         expect(await token.methods.balance_of_private(recipientAddress).simulate()).toEqual(20n);
-      }, 30_000);
+      });
     });
 
     describe('cheats', () => {
@@ -118,7 +118,7 @@ describe('guides/dapp/testing', () => {
         owner = await createAccount(pxe);
         testContract = await TestContract.deploy(owner).send().deployed();
         cheats = CheatCodes.create(ETHEREUM_HOST, pxe);
-      }, 30_000);
+      });
 
       it('warps time to 1h into the future', async () => {
         // docs:start:warp
@@ -171,7 +171,7 @@ describe('guides/dapp/testing', () => {
         // The balances mapping is indexed by user address
         ownerSlot = cheats.aztec.computeSlotInMap(TokenContract.storage.balances.slot, ownerAddress);
         // docs:end:calc-slot
-      }, 90_000);
+      });
 
       it('checks private storage', async () => {
         // docs:start:private-storage
@@ -184,7 +184,7 @@ describe('guides/dapp/testing', () => {
         const balance = values.reduce((sum, current) => sum + current.toBigInt(), 0n);
         expect(balance).toEqual(100n);
         // docs:end:private-storage
-      }, 30_000);
+      });
 
       it('checks public storage', async () => {
         // docs:start:public-storage
@@ -193,7 +193,7 @@ describe('guides/dapp/testing', () => {
         const balance = await pxe.getPublicStorageAt(token.address, ownerPublicBalanceSlot);
         expect(balance.value).toEqual(100n);
         // docs:end:public-storage
-      }, 30_000);
+      });
 
       it('checks unencrypted logs, [Kinda broken with current implementation]', async () => {
         // docs:start:unencrypted-logs
@@ -206,21 +206,21 @@ describe('guides/dapp/testing', () => {
         const logs = (await pxe.getUnencryptedLogs(filter)).logs;
         expect(Fr.fromBuffer(logs[0].log.data)).toEqual(value);
         // docs:end:unencrypted-logs
-      }, 30_000);
+      });
 
       it('asserts a local transaction simulation fails by calling simulate', async () => {
         // docs:start:local-tx-fails
         const call = token.methods.transfer(owner.getAddress(), recipient.getAddress(), 200n, 0);
         await expect(call.prove()).rejects.toThrow(/Balance too low/);
         // docs:end:local-tx-fails
-      }, 30_000);
+      });
 
       it('asserts a local transaction simulation fails by calling send', async () => {
         // docs:start:local-tx-fails-send
         const call = token.methods.transfer(owner.getAddress(), recipient.getAddress(), 200n, 0);
         await expect(call.send().wait()).rejects.toThrow(/Balance too low/);
         // docs:end:local-tx-fails-send
-      }, 30_000);
+      });
 
       it('asserts a transaction is dropped', async () => {
         // docs:start:tx-dropped
@@ -233,14 +233,14 @@ describe('guides/dapp/testing', () => {
         await call1.send().wait();
         await expect(call2.send().wait()).rejects.toThrow(/dropped/);
         // docs:end:tx-dropped
-      }, 30_000);
+      });
 
       it('asserts a simulation for a public function call fails', async () => {
         // docs:start:local-pub-fails
         const call = token.methods.transfer_public(owner.getAddress(), recipient.getAddress(), 1000n, 0);
         await expect(call.prove()).rejects.toThrow(U128_UNDERFLOW_ERROR);
         // docs:end:local-pub-fails
-      }, 30_000);
+      });
 
       it('asserts a transaction with a failing public call is included (with no state changes)', async () => {
         // docs:start:pub-reverted
@@ -251,7 +251,7 @@ describe('guides/dapp/testing', () => {
         const balance = await pxe.getPublicStorageAt(token.address, ownerPublicBalanceSlot);
         expect(balance.value).toEqual(100n);
         // docs:end:pub-reverted
-      }, 30_000);
+      });
     });
   });
 });
diff --git a/yarn-project/end-to-end/src/guides/up_quick_start.test.ts b/yarn-project/end-to-end/src/guides/up_quick_start.test.ts
index 1dd55e6ea35b..03c46a0ff43b 100644
--- a/yarn-project/end-to-end/src/guides/up_quick_start.test.ts
+++ b/yarn-project/end-to-end/src/guides/up_quick_start.test.ts
@@ -16,5 +16,5 @@ describe('guides/up_quick_start', () => {
         stdio: 'inherit',
       },
     );
-  }, 90_000);
+  });
 });
diff --git a/yarn-project/end-to-end/src/guides/writing_an_account_contract.test.ts b/yarn-project/end-to-end/src/guides/writing_an_account_contract.test.ts
index 2072a7ddda54..1d4b7fc70076 100644
--- a/yarn-project/end-to-end/src/guides/writing_an_account_contract.test.ts
+++ b/yarn-project/end-to-end/src/guides/writing_an_account_contract.test.ts
@@ -49,7 +49,7 @@ describe('guides/writing_an_account_contract', () => {
 
   beforeEach(async () => {
     context = await setup(0);
-  }, 60_000);
+  });
 
   afterEach(() => context.teardown());
 
@@ -104,5 +104,5 @@ describe('guides/writing_an_account_contract', () => {
       logger.info(`Failed to send tx: ${err}`);
     }
     // docs:end:account-contract-fails
-  }, 60_000);
+  });
 });
diff --git a/yarn-project/end-to-end/src/shared/browser.ts b/yarn-project/end-to-end/src/shared/browser.ts
index 9a94d89db75a..4463c27cd954 100644
--- a/yarn-project/end-to-end/src/shared/browser.ts
+++ b/yarn-project/end-to-end/src/shared/browser.ts
@@ -101,7 +101,7 @@ export const browserTestSuite = (
         pageLogger.verbose('Waiting for window.AztecJs...');
         await AztecJs.sleep(1000);
       }
-    }, 120_000);
+    });
 
     afterAll(async () => {
       await browser.close();
@@ -136,11 +136,11 @@ export const browserTestSuite = (
       const accounts = await testClient.getRegisteredAccounts();
       const stringAccounts = accounts.map(acc => acc.address.toString());
       expect(stringAccounts.includes(result)).toBeTruthy();
-    }, 15_000);
+    });
 
     it('Deploys Token contract', async () => {
       await deployTokenContract();
-    }, 60_000);
+    });
 
     it('Can access CompleteAddress class in browser', async () => {
       const result: string = await page.evaluate(() => {
@@ -207,7 +207,7 @@ export const browserTestSuite = (
         TokenContractArtifact,
       );
       expect(result).toEqual(transferAmount);
-    }, 60_000);
+    });
 
     const deployTokenContract = async () => {
       const [txHash, tokenAddress] = await page.evaluate(
diff --git a/yarn-project/end-to-end/src/shared/uniswap_l1_l2.ts b/yarn-project/end-to-end/src/shared/uniswap_l1_l2.ts
index d9944d99b54c..7b434878eb9f 100644
--- a/yarn-project/end-to-end/src/shared/uniswap_l1_l2.ts
+++ b/yarn-project/end-to-end/src/shared/uniswap_l1_l2.ts
@@ -623,7 +623,7 @@ export const uniswapL1L2TestSuite = (
       logger.info('***** 🧚‍♀️ SWAP L2 assets on L1 Uniswap 🧚‍♀️ *****');
       logger.info('WETH balance after swap : ', wethL2BalanceAfterSwap.toString());
       logger.info('DAI balance after swap  : ', daiL2BalanceAfterSwap.toString());
-    }, 360_000);
+    });
     // docs:end:uniswap_public
 
     // Edge cases for the private flow:

From 43958554c0d0887e5962580830abc950b86fcff2 Mon Sep 17 00:00:00 2001
From: just-mitch <68168980+just-mitch@users.noreply.github.com>
Date: Wed, 1 May 2024 06:37:49 -0600
Subject: [PATCH 31/42] feat: enforce gas limits from private kernels (#6105)

Now we assert that we stayed within user limits during private execution.
---
 .../protocol-specs/gas-and-fees/kernel-tracking.md    |  1 +
 .../src/kernel_circuit_public_inputs_composer.nr      | 11 +++++++++--
 .../private-kernel-lib/src/private_kernel_tail.nr     | 10 ++++++++++
 .../src/private_kernel_tail_to_public.nr              |  9 +++++++++
 .../private_accumulated_data_builder.nr               |  7 -------
 .../crates/types/src/abis/gas.nr                      |  4 ++++
 .../crates/types/src/tests/fixture_builder.nr         |  4 +---
 7 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/docs/docs/protocol-specs/gas-and-fees/kernel-tracking.md b/docs/docs/protocol-specs/gas-and-fees/kernel-tracking.md
index bf678054ce55..6b1ed68287a7 100644
--- a/docs/docs/protocol-specs/gas-and-fees/kernel-tracking.md
+++ b/docs/docs/protocol-specs/gas-and-fees/kernel-tracking.md
@@ -206,6 +206,7 @@ It must:
 - check that there are enqueued public functions or a public teardown function
 - partition the side effects produced during private execution into revertible and non-revertible sets of `PublicAccumulatedData`
 - compute gas used for the revertible and non-revertible. Both sets can have a DA component, but the revertible set will also include the teardown gas allocations the user specified (if any). This ensures that the user effectively pre-pays for the gas consumed in teardown.
+- ensure the gas used (across revertible and non-revertible) is less than the gas limits
 - ensure that `fee_payer` is set, and set it in the `PublicKernelCircuitPublicInputs`
 - copy the constants from the `PrivateKernelData` to the `PublicKernelCircuitPublicInputs.constants`
 
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/kernel_circuit_public_inputs_composer.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/kernel_circuit_public_inputs_composer.nr
index 2abc0ee11f44..f51146ad4346 100644
--- a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/kernel_circuit_public_inputs_composer.nr
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/kernel_circuit_public_inputs_composer.nr
@@ -113,13 +113,20 @@ impl KernelCircuitPublicInputsComposer {
 
     pub fn finish(self) -> KernelCircuitPublicInputs {
         let teardown_gas = self.previous_kernel.public_inputs.constants.tx_context.gas_settings.teardown_gas_limits;
-        self.public_inputs.finish_tail(teardown_gas)
+        let inputs = self.public_inputs.finish_tail(teardown_gas);
+        let limits = self.previous_kernel.public_inputs.constants.tx_context.gas_settings.gas_limits;
+        assert(inputs.end.gas_used.within(limits), "The gas used exceeds the gas limits");
+        inputs
     }
 
     pub fn finish_to_public(self) -> PublicKernelCircuitPublicInputs {
         let min_revertible_side_effect_counter = self.previous_kernel.public_inputs.min_revertible_side_effect_counter;
         let teardown_gas = self.previous_kernel.public_inputs.constants.tx_context.gas_settings.teardown_gas_limits;
-        self.public_inputs.finish_to_public(teardown_gas, min_revertible_side_effect_counter)
+        let inputs = self.public_inputs.finish_to_public(teardown_gas, min_revertible_side_effect_counter);
+        let limits = self.previous_kernel.public_inputs.constants.tx_context.gas_settings.gas_limits;
+        let total_gas_used = inputs.end.gas_used + inputs.end_non_revertible.gas_used;
+        assert(total_gas_used.within(limits), "The gas used exceeds the gas limits");
+        inputs
     }
 
     fn silo_values(&mut self) {
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_tail.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_tail.nr
index 568098daa59f..27fc6b7c721a 100644
--- a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_tail.nr
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_tail.nr
@@ -115,6 +115,8 @@ mod tests {
     impl PrivateKernelTailInputsBuilder {
         pub fn new() -> Self {
             let mut previous_kernel = FixtureBuilder::new();
+            previous_kernel.tx_context.gas_settings.gas_limits = Gas::new(1_000_000, 1_000_000);
+
             previous_kernel.append_new_nullifiers(1);
 
             PrivateKernelTailInputsBuilder {
@@ -572,4 +574,12 @@ mod tests {
             + Gas::new(DA_GAS_PER_BYTE * DA_BYTES_PER_FIELD * 1, 0); // tx nullifier
         assert_eq(public_inputs.end.gas_used, expected_gas_consumed);
     }
+
+    #[test(should_fail_with="The gas used exceeds the gas limits")]
+    unconstrained fn gas_limits_are_enforced() {
+        let mut builder = PrivateKernelTailInputsBuilder::new();
+        builder.previous_kernel.tx_context.gas_settings.teardown_gas_limits = Gas::new(300, 300);
+        builder.previous_kernel.tx_context.gas_settings.gas_limits = Gas::new(1, 1);
+        builder.failed();
+    }
 }
diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_tail_to_public.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_tail_to_public.nr
index 1454b919aa54..5bd7b7a568e5 100644
--- a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_tail_to_public.nr
+++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/private_kernel_tail_to_public.nr
@@ -118,6 +118,7 @@ mod tests {
     impl PrivateKernelTailToPublicInputsBuilder {
         pub fn new() -> Self {
             let mut previous_kernel = FixtureBuilder::new();
+            previous_kernel.tx_context.gas_settings.gas_limits = Gas::new(1_000_000, 1_000_000);
             previous_kernel.append_new_nullifiers(1);
             previous_kernel.push_public_call_request(1, false);
 
@@ -600,4 +601,12 @@ mod tests {
         let expected_gas_consumed = Gas::new(300, 300) + Gas::tx_overhead();
         assert_eq(public_inputs.end.gas_used, expected_gas_consumed);
     }
+
+    #[test(should_fail_with="The gas used exceeds the gas limits")]
+    unconstrained fn gas_limits_are_enforced() {
+        let mut builder = PrivateKernelTailToPublicInputsBuilder::new();
+        builder.previous_kernel.tx_context.gas_settings.teardown_gas_limits = Gas::new(300, 300);
+        builder.previous_kernel.tx_context.gas_settings.gas_limits = Gas::new(1, 1);
+        builder.failed();
+    }
 }
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/private_accumulated_data_builder.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/private_accumulated_data_builder.nr
index 5e62c134874b..14041908fb5b 100644
--- a/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/private_accumulated_data_builder.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/accumulated_data/private_accumulated_data_builder.nr
@@ -39,15 +39,10 @@ struct PrivateAccumulatedDataBuilder {
     private_call_stack: BoundedVec<CallRequest, MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX>,
     public_call_stack: BoundedVec<CallRequest, MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX>,
 
-    gas_used: Gas,
-    non_revertible_gas_used: Gas,
 }
 
 impl PrivateAccumulatedDataBuilder {
     pub fn finish(self) -> PrivateAccumulatedData {
-        assert(self.gas_used.is_empty());
-        assert(self.non_revertible_gas_used.is_empty());
-
         PrivateAccumulatedData {
             new_note_hashes: self.new_note_hashes.storage,
             new_nullifiers: self.new_nullifiers.storage,
@@ -318,8 +313,6 @@ impl Empty for PrivateAccumulatedDataBuilder {
             unencrypted_log_preimages_length: 0,
             private_call_stack: BoundedVec::new(),
             public_call_stack: BoundedVec::new(),
-            gas_used: Gas::empty(),
-            non_revertible_gas_used: Gas::empty(),
         }
     }
 }
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/gas.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/gas.nr
index 07e9c6d53604..4354f316c3ab 100644
--- a/noir-projects/noir-protocol-circuits/crates/types/src/abis/gas.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/abis/gas.nr
@@ -27,6 +27,10 @@ impl Gas {
     pub fn is_empty(self) -> bool {
         (self.da_gas == 0) & (self.l2_gas == 0)
     }
+
+    pub fn within(self, limits: Gas) -> bool {
+        (self.da_gas <= limits.da_gas) & (self.l2_gas <= limits.l2_gas)
+    }
 }
 
 impl Add for Gas {
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/tests/fixture_builder.nr b/noir-projects/noir-protocol-circuits/crates/types/src/tests/fixture_builder.nr
index 4cf0e8f75964..ef8a379e7494 100644
--- a/noir-projects/noir-protocol-circuits/crates/types/src/tests/fixture_builder.nr
+++ b/noir-projects/noir-protocol-circuits/crates/types/src/tests/fixture_builder.nr
@@ -133,9 +133,7 @@ impl FixtureBuilder {
             encrypted_log_preimages_length: self.encrypted_log_preimages_length,
             unencrypted_log_preimages_length: self.unencrypted_log_preimages_length,
             private_call_stack: self.private_call_stack,
-            public_call_stack: self.public_call_stack,
-            gas_used: self.gas_used,
-            non_revertible_gas_used: self.non_revertible_gas_used
+            public_call_stack: self.public_call_stack
         };
         public_inputs.finish()
     }

From 4a49f9dd573fee22d52996c0d9139d30c6bab1e3 Mon Sep 17 00:00:00 2001
From: Alex Gherghisan <alexghr@users.noreply.github.com>
Date: Wed, 1 May 2024 13:53:01 +0100
Subject: [PATCH 32/42] feat: migrate boxes to GA and Earthly (#6076)

This PR migrates the boxes build & test jobs from CircleCI to Earthly and Github actions.
---
 .circleci/config.yml                     |  52 ---------
 .github/workflows/ci.yml                 |  42 ++++++++
 boxes/.earthlyignore                     |  46 ++++++++
 boxes/Earthfile                          | 128 +++++++++++++++++++++--
 boxes/boxes/react/package.json           |   2 +-
 boxes/boxes/react/playwright.config.ts   |   9 +-
 boxes/boxes/vanilla/package.json         |   2 +-
 boxes/boxes/vanilla/playwright.config.ts |   1 -
 boxes/docker-compose.yml                 |  14 ++-
 boxes/package.json                       |   4 +
 boxes/yarn.lock                          |   1 +
 yarn-project/Earthfile                   |   6 +-
 12 files changed, 234 insertions(+), 73 deletions(-)
 create mode 100644 boxes/.earthlyignore

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 70b0393270e2..97453f8c11bf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -431,42 +431,6 @@ jobs:
           command: build aztec
           aztec_manifest_key: aztec
 
-  boxes:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Build"
-          command: cond_spot_run_build boxes 4
-          aztec_manifest_key: boxes
-
-  boxes-vanilla:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Test"
-          command: cond_spot_run_compose boxes 4 ./docker-compose.yml BOX=vanilla
-          aztec_manifest_key: boxes
-
-  boxes-react:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Test"
-          command: cond_spot_run_compose boxes 4 ./docker-compose.yml BOX=react
-          aztec_manifest_key: boxes
-
   end-to-end:
     machine:
       image: default
@@ -694,20 +658,6 @@ workflows:
       # Artifacts
       - aztec-package: *defaults_yarn_project
 
-      # Boxes.
-      - boxes:
-          requires:
-            - aztec-package
-          <<: *defaults
-      - boxes-vanilla:
-          requires:
-            - boxes
-          <<: *defaults
-      - boxes-react:
-          requires:
-            - boxes
-          <<: *defaults
-
       # End to end tests.
       - e2e-join:
           requires:
@@ -727,8 +677,6 @@ workflows:
             - barretenberg-acir-tests-bb
             - barretenberg-acir-tests-bb-sol
             - barretenberg-docs
-            - boxes-vanilla
-            - boxes-react
             - noir-packages-tests
             - prover-client-test
             - e2e-join
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d9f0f8c5699e..fac64c91853b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -249,10 +249,52 @@ jobs:
         timeout-minutes: 15
         run: earthly-ci --no-output +bench-ultra-honk --bench_mode=cache
 
+  boxes:
+    needs: build
+    runs-on: ${{ inputs.username || github.actor }}-x86
+    steps:
+      - {
+          uses: actions/checkout@v4,
+          with: { ref: "${{ github.event.pull_request.head.sha }}" },
+        }
+      - uses: ./.github/ci-setup-action
+        with:
+          dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
+          # must be globally unique for build x runner
+          concurrency_key: boxes-${{ inputs.username || github.actor }}-x86-${{ matrix.test }}
+      - name: Build
+        working-directory: ./boxes
+        timeout-minutes: 10
+        run: earthly-ci +export-boxes
+
+  boxes-test:
+    needs: boxes
+    runs-on: ${{ inputs.username || github.actor }}-x86
+    strategy:
+      fail-fast: false
+      matrix:
+        box: [vanilla, react]
+        browser: [chromium, webkit, firefox]
+    steps:
+      - {
+          uses: actions/checkout@v4,
+          with: { ref: "${{ github.event.pull_request.head.sha }}" },
+        }
+      - uses: ./.github/ci-setup-action
+        with:
+          dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
+          # must be globally unique for build x runner
+          concurrency_key: boxes-${{ inputs.username || github.actor }}-x86-${{ matrix.test }}
+      - name: Box test
+        working-directory: ./boxes
+        timeout-minutes: 10
+        run: earthly-ci -P --no-output +test --box=${{ matrix.box }} --browser=${{ matrix.browser }} --mode=cache
+
   merge-check:
     runs-on: ubuntu-latest
     needs:
       - e2e
+      - boxes-test
       - bb-native-tests
       - bb-bench
       - yarn-project-formatting
diff --git a/boxes/.earthlyignore b/boxes/.earthlyignore
new file mode 100644
index 000000000000..a2c3635374ab
--- /dev/null
+++ b/boxes/.earthlyignore
@@ -0,0 +1,46 @@
+# Must include the .gitignore for all child projects as this is used by Earthly
+
+# Note due to how we use Eartlhy each .gitignore MUST accompany any earthfile that might actually copy these artifacts
+
+**/Earthfile
+**/Readme.md
+**/README.md
+**/Dockerfile*
+\*\*/docker-compose*.yml
+
+# root .gitignore contents
+
+dest
+node_modules
+.cache
+scripts/.earthly
+.pnp.cjs
+.pnp.loader.mjs
+build/
+.idea
+cmake-build-debug
+.terraform\*
+.bootstrapped
+.tsbuildinfo
+
+.graphite\*
+.DS_Store
+
+\*_/_.dockerignore
+
+# .gitignore contents:
+
+.yarn/\*
+!.yarn/releases
+
+node_modules
+dist
+artifacts
+boxes/_/src/contracts/target
+boxes/_/src/contracts/log
+
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/
+codegenCache.json
diff --git a/boxes/Earthfile b/boxes/Earthfile
index d790d1b0da5e..a47fec016be5 100644
--- a/boxes/Earthfile
+++ b/boxes/Earthfile
@@ -1,18 +1,130 @@
 VERSION 0.8
-# Produces a container that can be run to test a specific box. See docker-compose.yml.
 
-build:
-    # We need yarn. Start fresh container.
+deps:
+    LOCALLY
+    LET packages = $(git ls-files "**/package*.json" package*.json)
+    LET tsconfigs = $(git ls-files "**/tsconfig*.json" tsconfig*.json)
     FROM node:18.19.0
-    RUN apt update && apt install netcat-openbsd
-    COPY ../yarn-project+build/build /usr/src
+
+    # copy the aztec yarn workspace, needed to resolve portal dependencies
+    COPY ../yarn-project+build-dev/usr/src /usr/src
+
+    WORKDIR /usr/src/boxes
+
+    COPY --dir .yarn .yarnrc.yml yarn.lock .
+    FOR file IN $packages
+        COPY $file $file
+    END
+    RUN yarn install --immutable
+    RUN yarn install-browsers
+    FOR file IN $tsconfigs
+        COPY $file $file
+    END
+
+build:
+    FROM +deps
+
     COPY ../noir/+nargo/nargo /usr/src/noir/noir-repo/target/release/nargo
     COPY ../noir-projects/+build/aztec-nr /usr/src/noir-projects/aztec-nr
     COPY ../noir-projects/+build/noir-protocol-circuits/crates/types /usr/src/noir-projects/noir-protocol-circuits/crates/types
+
     WORKDIR /usr/src/boxes
-    COPY . .
+
     ENV AZTEC_NARGO=/usr/src/noir/noir-repo/target/release/nargo
     ENV AZTEC_BUILDER=/usr/src/yarn-project/builder/aztec-builder-dest
-    RUN yarn && yarn build
-    RUN npx -y playwright@1.42 install --with-deps
+    COPY . .
+    RUN yarn build
+
+boxes:
+    FROM +build
     ENTRYPOINT ["/bin/sh", "-c"]
+
+BOX_TEST_LOCAL:
+  FUNCTION
+  ARG box
+  ARG browser
+  ARG compose_file=./docker-compose.yml
+  ARG debug="aztec:*"
+  LOCALLY
+  ENV BOX=$box
+  ENV BROWSER=$browser
+  ENV DEBUG=$debug
+  ENV CI=1
+  WITH DOCKER \
+    --load aztecprotocol/aztec:latest=../yarn-project/+aztec \
+    --load aztecprotocol/boxes:latest=+boxes
+    RUN docker compose -f $compose_file up --exit-code-from=boxes --force-recreate
+  END
+
+# run locally and take from cache, used for our mainly x86 jobs
+BOX_TEST_FROM_CACHE:
+  FUNCTION
+  ARG box
+  ARG browser
+  ARG compose_file=./docker-compose.yml
+  ARG debug="aztec:*"
+  ARG aztec_docker_tag
+  LOCALLY
+  ENV BOX=$box
+  ENV BROWSER=$browser
+  ENV DEBUG=$debug
+  ENV AZTEC_DOCKER_TAG=$aztec_docker_tag
+  ENV CI=1
+  # need a different project name for each to run in parallel
+  LET project_name=$box_$browser
+  IF docker compose > /dev/null 2>&1
+    LET CMD="docker compose"
+  ELSE
+    LET CMD="docker-compose"
+  END
+  # In CI we do not use WITH DOCKER as we have had issues with earthly copying big images
+  RUN $CMD -p $project_name -f $compose_file up --exit-code-from=boxes --force-recreate
+
+BOX_TEST_FROM_BUILD:
+  FUNCTION
+  ARG box
+  ARG browser
+  ARG compose_file=./docker-compose.yml
+  ARG debug="aztec:*"
+  FROM earthly/dind:alpine-3.19-docker-25.0.2-r0
+  ENV BOX=$box
+  ENV BROWSER=$browser
+  ENV DEBUG=$debug
+  ENV CI=1
+  COPY $compose_file $compose_file
+  # For ARM, we do use WITH DOCKER as we don't have many e2e tests, but note BOX_TEST_FROM_CACHE
+  WITH DOCKER \
+    --load aztecprotocol/aztec:latest=../yarn-project/+aztec \
+    --load aztecprotocol/boxes:latest=+boxes
+    # Run our docker compose, ending whenever sandbox ends, filtering out noisy eth_getLogs
+    RUN docker compose -f $compose_file up --exit-code-from=boxes --force-recreate
+  END
+
+BOX_TEST:
+  FUNCTION
+  ARG box
+  ARG browser
+  ARG compose_file=./docker-compose.yml
+  ARG mode=local
+  ARG debug="aztec:*"
+  LOCALLY
+  IF [ $mode = local ]
+    DO +BOX_TEST_LOCAL --box=$box --browser=$browser --compose_file=$compose_file --debug=$debug
+  ELSE IF [ $mode = cache ]
+    DO +BOX_TEST_FROM_CACHE --box=$box --browser=$browser --aztec_docker_tag=$(git rev-parse HEAD) --compose_file=$compose_file --debug=$debug
+  ELSE
+    DO +BOX_TEST_FROM_BUILD --box=$box --browser=$browser --compose_file=$compose_file --debug=$debug
+  END
+
+test:
+  ARG box=vanilla
+  ARG browser=chromium
+  ARG mode=local
+  DO +BOX_TEST --box=$box --browser=$browser --mode=$mode
+
+# for use with mode=cache
+export-boxes:
+    BUILD +boxes
+    ARG EARTHLY_GIT_HASH
+    FROM +boxes
+    SAVE IMAGE aztecprotocol/boxes:$EARTHLY_GIT_HASH
diff --git a/boxes/boxes/react/package.json b/boxes/boxes/react/package.json
index 8d121e38a9d2..6707358fed35 100644
--- a/boxes/boxes/react/package.json
+++ b/boxes/boxes/react/package.json
@@ -6,7 +6,7 @@
   "type": "module",
   "main": "./dist/index.js",
   "scripts": {
-    "compile": "cd src/contracts && ${AZTEC_NARGO:-aztec-nargo} compile",
+    "compile": "cd src/contracts && ${AZTEC_NARGO:-aztec-nargo} compile --silence-warnings",
     "codegen": "${AZTEC_BUILDER:-aztec-builder} codegen src/contracts/target -o artifacts",
     "clean": "rm -rf ./dist .tsbuildinfo ./artifacts ./src/contracts/target",
     "prep": "yarn clean && yarn compile && yarn codegen",
diff --git a/boxes/boxes/react/playwright.config.ts b/boxes/boxes/react/playwright.config.ts
index 95e73847ebea..9b6a8f517fcc 100644
--- a/boxes/boxes/react/playwright.config.ts
+++ b/boxes/boxes/react/playwright.config.ts
@@ -25,11 +25,10 @@ export default defineConfig({
       name: 'firefox',
       use: { ...devices['Desktop Firefox'] },
     },
-
-    // {
-    //   name: 'webkit',
-    //   use: { ...devices['Desktop Safari'] },
-    // },
+    {
+      name: 'webkit',
+      use: { ...devices['Desktop Safari'] },
+    },
   ],
   webServer: {
     command: 'yarn serve',
diff --git a/boxes/boxes/vanilla/package.json b/boxes/boxes/vanilla/package.json
index f2d6ee850ee0..c029a78cde0f 100644
--- a/boxes/boxes/vanilla/package.json
+++ b/boxes/boxes/vanilla/package.json
@@ -5,7 +5,7 @@
   "version": "0.1.0",
   "type": "module",
   "scripts": {
-    "compile": "cd src/contracts && ${AZTEC_NARGO:-aztec-nargo} compile",
+    "compile": "cd src/contracts && ${AZTEC_NARGO:-aztec-nargo} compile --silence-warnings",
     "codegen": "${AZTEC_BUILDER:-aztec-builder} codegen src/contracts/target -o artifacts",
     "clean": "rm -rf ./dest .tsbuildinfo ./artifacts ./src/contracts/target",
     "prep": "yarn clean && yarn compile && yarn codegen && tsc -b",
diff --git a/boxes/boxes/vanilla/playwright.config.ts b/boxes/boxes/vanilla/playwright.config.ts
index 96c5e3b073d3..9b6a8f517fcc 100644
--- a/boxes/boxes/vanilla/playwright.config.ts
+++ b/boxes/boxes/vanilla/playwright.config.ts
@@ -25,7 +25,6 @@ export default defineConfig({
       name: 'firefox',
       use: { ...devices['Desktop Firefox'] },
     },
-
     {
       name: 'webkit',
       use: { ...devices['Desktop Safari'] },
diff --git a/boxes/docker-compose.yml b/boxes/docker-compose.yml
index 99c669cbfd1a..b21036bb9342 100644
--- a/boxes/docker-compose.yml
+++ b/boxes/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     command: "'anvil --silent -p 8545 --host 0.0.0.0 --chain-id 31337'"
 
   aztec:
-    image: aztecprotocol/aztec
+    image: aztecprotocol/aztec:${AZTEC_DOCKER_TAG:-latest}
     environment:
       ETHEREUM_HOST: http://ethereum:8545
       CHAIN_ID: 31337
@@ -15,13 +15,14 @@ services:
       WS_BLOCK_CHECK_INTERVAL_MS: 50
       PXE_BLOCK_POLLING_INTERVAL_MS: 50
       ARCHIVER_VIEM_POLLING_INTERVAL_MS: 500
+    depends_on:
+      - ethereum
 
   boxes:
-    image: aztecprotocol/boxes
+    image: aztecprotocol/boxes:${AZTEC_DOCKER_TAG:-latest}
     entrypoint: >
       sh -c '
-        while ! nc -z aztec 8080; do sleep 1; done;
-        yarn workspace @aztec/$BOX test
+        yarn workspace @aztec/$BOX test --project=$BROWSER
       '
     environment:
       DEBUG: "aztec:*"
@@ -30,3 +31,8 @@ services:
       CHAIN_ID: 31337
       PXE_URL: http://aztec:8080
       BOX: ${BOX:-vanilla}
+      CI: ${CI:-}
+      BROWSER: ${BROWSER:-chromium}
+    depends_on:
+      aztec:
+        condition: service_healthy
diff --git a/boxes/package.json b/boxes/package.json
index bff118dbe5be..fb55d34e74d7 100644
--- a/boxes/package.json
+++ b/boxes/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "compile": "yarn workspaces foreach -A -v run compile",
     "build": "yarn workspaces foreach -A -v run build",
+    "install-browsers": "playwright install --with-deps",
     "publish": "yarn npm publish"
   },
   "workspaces": [
@@ -36,5 +37,8 @@
     "pino": "^8.19.0",
     "pino-pretty": "^10.3.1",
     "tiged": "^2.12.6"
+  },
+  "devDependencies": {
+    "@playwright/test": "1.42.0"
   }
 }
diff --git a/boxes/yarn.lock b/boxes/yarn.lock
index d1a4ff91e966..8c1567f2d704 100644
--- a/boxes/yarn.lock
+++ b/boxes/yarn.lock
@@ -3586,6 +3586,7 @@ __metadata:
     "@inquirer/confirm": "npm:^3.0.0"
     "@inquirer/input": "npm:^2.0.0"
     "@inquirer/select": "npm:^2.0.0"
+    "@playwright/test": "npm:1.42.0"
     axios: "npm:^1.6.7"
     commander: "npm:^12.0.0"
     node-pty: "npm:^1.0.0"
diff --git a/yarn-project/Earthfile b/yarn-project/Earthfile
index 6da55e013d9b..e6c124eb6fe0 100644
--- a/yarn-project/Earthfile
+++ b/yarn-project/Earthfile
@@ -70,8 +70,12 @@ aztec:
     FROM ubuntu:noble
     RUN apt update && apt install nodejs -y && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
     COPY +aztec-prod/usr/src /usr/src
+    LET port=8080
+    ENV PORT=$port
+    HEALTHCHECK --interval=10s --timeout=10s --retries=6 \
+        CMD curl -fsSd '{\"jsonrpc\":\"2.0\",\"method\":\"pxe_getNodeInfo\",\"id\":1}' http://127.0.0.1:$port
     ENTRYPOINT ["node", "--no-warnings", "/usr/src/yarn-project/aztec/dest/bin/index.js"]
-    EXPOSE 8080
+    EXPOSE $port
 
 # We care about creating a slimmed down e2e image because we have to serialize it from earthly to docker for running.
 end-to-end-prod:

From 248761e75651d1d8b766ee676459f39c8a36b03e Mon Sep 17 00:00:00 2001
From: Alex Gherghisan <alexghr@users.noreply.github.com>
Date: Wed, 1 May 2024 14:01:34 +0100
Subject: [PATCH 33/42] docs: update @aztec/builder readme (#6115)

Update README for @aztec/builder to match its current level of
functionality
---
 yarn-project/builder/README.md | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/yarn-project/builder/README.md b/yarn-project/builder/README.md
index 3b2a17296766..d584eb774476 100644
--- a/yarn-project/builder/README.md
+++ b/yarn-project/builder/README.md
@@ -1,12 +1,11 @@
-# Aztec.nr compiler
+# Aztec builder
 
-The Aztec.nr compiler compiles Aztec.nr contracts using nargo and outputs Aztec formatted contract ABIs.
-The compiler can also generate typescript classes for each contract, as well as Aztec.nr interfaces for calling external functions.
+The Aztec builder generates typescript classes for Noir contract, as well as Aztec.nr interfaces for calling external functions.
 It can also be used to update aztec project dependencies.
 
 ## Installation
 
-To install the package, run: 
+To install the package, run:
 
 ```bash
 yarn add @aztec/builder
@@ -14,15 +13,8 @@ yarn add @aztec/builder
 
 ## Usage
 
-To run the compiler as a CLI tool, first install the package and then run: 
+To run the tool, first install the package and then run:
 
 ```bash
-yarn aztec-builder compile --help
+yarn aztec-builder --help
 ```
-
-You can also run the compiler from the [main Aztec CLI](../cli/README.md), which includes several other features for interacting with the Aztec Network:
-
-```bash
-yarn add @aztec/cli
-yarn aztec-cli compile --help
-```
\ No newline at end of file

From 7633ea2c7038724a24d1c28b40138d979bba1c2a Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Wed, 1 May 2024 08:56:25 -0500
Subject: [PATCH 34/42] Revert "feat: migrate boxes to GA and Earthly" (#6121)

Reverts AztecProtocol/aztec-packages#6076
---
 .circleci/config.yml                     |  52 +++++++++
 .github/workflows/ci.yml                 |  42 --------
 boxes/.earthlyignore                     |  46 --------
 boxes/Earthfile                          | 128 ++---------------------
 boxes/boxes/react/package.json           |   2 +-
 boxes/boxes/react/playwright.config.ts   |   9 +-
 boxes/boxes/vanilla/package.json         |   2 +-
 boxes/boxes/vanilla/playwright.config.ts |   1 +
 boxes/docker-compose.yml                 |  14 +--
 boxes/package.json                       |   4 -
 boxes/yarn.lock                          |   1 -
 yarn-project/Earthfile                   |   6 +-
 12 files changed, 73 insertions(+), 234 deletions(-)
 delete mode 100644 boxes/.earthlyignore

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 97453f8c11bf..70b0393270e2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -431,6 +431,42 @@ jobs:
           command: build aztec
           aztec_manifest_key: aztec
 
+  boxes:
+    docker:
+      - image: aztecprotocol/alpine-build-image
+    resource_class: small
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Build"
+          command: cond_spot_run_build boxes 4
+          aztec_manifest_key: boxes
+
+  boxes-vanilla:
+    docker:
+      - image: aztecprotocol/alpine-build-image
+    resource_class: small
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Test"
+          command: cond_spot_run_compose boxes 4 ./docker-compose.yml BOX=vanilla
+          aztec_manifest_key: boxes
+
+  boxes-react:
+    docker:
+      - image: aztecprotocol/alpine-build-image
+    resource_class: small
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Test"
+          command: cond_spot_run_compose boxes 4 ./docker-compose.yml BOX=react
+          aztec_manifest_key: boxes
+
   end-to-end:
     machine:
       image: default
@@ -658,6 +694,20 @@ workflows:
       # Artifacts
       - aztec-package: *defaults_yarn_project
 
+      # Boxes.
+      - boxes:
+          requires:
+            - aztec-package
+          <<: *defaults
+      - boxes-vanilla:
+          requires:
+            - boxes
+          <<: *defaults
+      - boxes-react:
+          requires:
+            - boxes
+          <<: *defaults
+
       # End to end tests.
       - e2e-join:
           requires:
@@ -677,6 +727,8 @@ workflows:
             - barretenberg-acir-tests-bb
             - barretenberg-acir-tests-bb-sol
             - barretenberg-docs
+            - boxes-vanilla
+            - boxes-react
             - noir-packages-tests
             - prover-client-test
             - e2e-join
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fac64c91853b..d9f0f8c5699e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -249,52 +249,10 @@ jobs:
         timeout-minutes: 15
         run: earthly-ci --no-output +bench-ultra-honk --bench_mode=cache
 
-  boxes:
-    needs: build
-    runs-on: ${{ inputs.username || github.actor }}-x86
-    steps:
-      - {
-          uses: actions/checkout@v4,
-          with: { ref: "${{ github.event.pull_request.head.sha }}" },
-        }
-      - uses: ./.github/ci-setup-action
-        with:
-          dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
-          # must be globally unique for build x runner
-          concurrency_key: boxes-${{ inputs.username || github.actor }}-x86-${{ matrix.test }}
-      - name: Build
-        working-directory: ./boxes
-        timeout-minutes: 10
-        run: earthly-ci +export-boxes
-
-  boxes-test:
-    needs: boxes
-    runs-on: ${{ inputs.username || github.actor }}-x86
-    strategy:
-      fail-fast: false
-      matrix:
-        box: [vanilla, react]
-        browser: [chromium, webkit, firefox]
-    steps:
-      - {
-          uses: actions/checkout@v4,
-          with: { ref: "${{ github.event.pull_request.head.sha }}" },
-        }
-      - uses: ./.github/ci-setup-action
-        with:
-          dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
-          # must be globally unique for build x runner
-          concurrency_key: boxes-${{ inputs.username || github.actor }}-x86-${{ matrix.test }}
-      - name: Box test
-        working-directory: ./boxes
-        timeout-minutes: 10
-        run: earthly-ci -P --no-output +test --box=${{ matrix.box }} --browser=${{ matrix.browser }} --mode=cache
-
   merge-check:
     runs-on: ubuntu-latest
     needs:
       - e2e
-      - boxes-test
       - bb-native-tests
       - bb-bench
       - yarn-project-formatting
diff --git a/boxes/.earthlyignore b/boxes/.earthlyignore
deleted file mode 100644
index a2c3635374ab..000000000000
--- a/boxes/.earthlyignore
+++ /dev/null
@@ -1,46 +0,0 @@
-# Must include the .gitignore for all child projects as this is used by Earthly
-
-# Note due to how we use Eartlhy each .gitignore MUST accompany any earthfile that might actually copy these artifacts
-
-**/Earthfile
-**/Readme.md
-**/README.md
-**/Dockerfile*
-\*\*/docker-compose*.yml
-
-# root .gitignore contents
-
-dest
-node_modules
-.cache
-scripts/.earthly
-.pnp.cjs
-.pnp.loader.mjs
-build/
-.idea
-cmake-build-debug
-.terraform\*
-.bootstrapped
-.tsbuildinfo
-
-.graphite\*
-.DS_Store
-
-\*_/_.dockerignore
-
-# .gitignore contents:
-
-.yarn/\*
-!.yarn/releases
-
-node_modules
-dist
-artifacts
-boxes/_/src/contracts/target
-boxes/_/src/contracts/log
-
-/test-results/
-/playwright-report/
-/blob-report/
-/playwright/.cache/
-codegenCache.json
diff --git a/boxes/Earthfile b/boxes/Earthfile
index a47fec016be5..d790d1b0da5e 100644
--- a/boxes/Earthfile
+++ b/boxes/Earthfile
@@ -1,130 +1,18 @@
 VERSION 0.8
-
-deps:
-    LOCALLY
-    LET packages = $(git ls-files "**/package*.json" package*.json)
-    LET tsconfigs = $(git ls-files "**/tsconfig*.json" tsconfig*.json)
-    FROM node:18.19.0
-
-    # copy the aztec yarn workspace, needed to resolve portal dependencies
-    COPY ../yarn-project+build-dev/usr/src /usr/src
-
-    WORKDIR /usr/src/boxes
-
-    COPY --dir .yarn .yarnrc.yml yarn.lock .
-    FOR file IN $packages
-        COPY $file $file
-    END
-    RUN yarn install --immutable
-    RUN yarn install-browsers
-    FOR file IN $tsconfigs
-        COPY $file $file
-    END
+# Produces a container that can be run to test a specific box. See docker-compose.yml.
 
 build:
-    FROM +deps
-
+    # We need yarn. Start fresh container.
+    FROM node:18.19.0
+    RUN apt update && apt install netcat-openbsd
+    COPY ../yarn-project+build/build /usr/src
     COPY ../noir/+nargo/nargo /usr/src/noir/noir-repo/target/release/nargo
     COPY ../noir-projects/+build/aztec-nr /usr/src/noir-projects/aztec-nr
     COPY ../noir-projects/+build/noir-protocol-circuits/crates/types /usr/src/noir-projects/noir-protocol-circuits/crates/types
-
     WORKDIR /usr/src/boxes
-
+    COPY . .
     ENV AZTEC_NARGO=/usr/src/noir/noir-repo/target/release/nargo
     ENV AZTEC_BUILDER=/usr/src/yarn-project/builder/aztec-builder-dest
-    COPY . .
-    RUN yarn build
-
-boxes:
-    FROM +build
+    RUN yarn && yarn build
+    RUN npx -y playwright@1.42 install --with-deps
     ENTRYPOINT ["/bin/sh", "-c"]
-
-BOX_TEST_LOCAL:
-  FUNCTION
-  ARG box
-  ARG browser
-  ARG compose_file=./docker-compose.yml
-  ARG debug="aztec:*"
-  LOCALLY
-  ENV BOX=$box
-  ENV BROWSER=$browser
-  ENV DEBUG=$debug
-  ENV CI=1
-  WITH DOCKER \
-    --load aztecprotocol/aztec:latest=../yarn-project/+aztec \
-    --load aztecprotocol/boxes:latest=+boxes
-    RUN docker compose -f $compose_file up --exit-code-from=boxes --force-recreate
-  END
-
-# run locally and take from cache, used for our mainly x86 jobs
-BOX_TEST_FROM_CACHE:
-  FUNCTION
-  ARG box
-  ARG browser
-  ARG compose_file=./docker-compose.yml
-  ARG debug="aztec:*"
-  ARG aztec_docker_tag
-  LOCALLY
-  ENV BOX=$box
-  ENV BROWSER=$browser
-  ENV DEBUG=$debug
-  ENV AZTEC_DOCKER_TAG=$aztec_docker_tag
-  ENV CI=1
-  # need a different project name for each to run in parallel
-  LET project_name=$box_$browser
-  IF docker compose > /dev/null 2>&1
-    LET CMD="docker compose"
-  ELSE
-    LET CMD="docker-compose"
-  END
-  # In CI we do not use WITH DOCKER as we have had issues with earthly copying big images
-  RUN $CMD -p $project_name -f $compose_file up --exit-code-from=boxes --force-recreate
-
-BOX_TEST_FROM_BUILD:
-  FUNCTION
-  ARG box
-  ARG browser
-  ARG compose_file=./docker-compose.yml
-  ARG debug="aztec:*"
-  FROM earthly/dind:alpine-3.19-docker-25.0.2-r0
-  ENV BOX=$box
-  ENV BROWSER=$browser
-  ENV DEBUG=$debug
-  ENV CI=1
-  COPY $compose_file $compose_file
-  # For ARM, we do use WITH DOCKER as we don't have many e2e tests, but note BOX_TEST_FROM_CACHE
-  WITH DOCKER \
-    --load aztecprotocol/aztec:latest=../yarn-project/+aztec \
-    --load aztecprotocol/boxes:latest=+boxes
-    # Run our docker compose, ending whenever sandbox ends, filtering out noisy eth_getLogs
-    RUN docker compose -f $compose_file up --exit-code-from=boxes --force-recreate
-  END
-
-BOX_TEST:
-  FUNCTION
-  ARG box
-  ARG browser
-  ARG compose_file=./docker-compose.yml
-  ARG mode=local
-  ARG debug="aztec:*"
-  LOCALLY
-  IF [ $mode = local ]
-    DO +BOX_TEST_LOCAL --box=$box --browser=$browser --compose_file=$compose_file --debug=$debug
-  ELSE IF [ $mode = cache ]
-    DO +BOX_TEST_FROM_CACHE --box=$box --browser=$browser --aztec_docker_tag=$(git rev-parse HEAD) --compose_file=$compose_file --debug=$debug
-  ELSE
-    DO +BOX_TEST_FROM_BUILD --box=$box --browser=$browser --compose_file=$compose_file --debug=$debug
-  END
-
-test:
-  ARG box=vanilla
-  ARG browser=chromium
-  ARG mode=local
-  DO +BOX_TEST --box=$box --browser=$browser --mode=$mode
-
-# for use with mode=cache
-export-boxes:
-    BUILD +boxes
-    ARG EARTHLY_GIT_HASH
-    FROM +boxes
-    SAVE IMAGE aztecprotocol/boxes:$EARTHLY_GIT_HASH
diff --git a/boxes/boxes/react/package.json b/boxes/boxes/react/package.json
index 6707358fed35..8d121e38a9d2 100644
--- a/boxes/boxes/react/package.json
+++ b/boxes/boxes/react/package.json
@@ -6,7 +6,7 @@
   "type": "module",
   "main": "./dist/index.js",
   "scripts": {
-    "compile": "cd src/contracts && ${AZTEC_NARGO:-aztec-nargo} compile --silence-warnings",
+    "compile": "cd src/contracts && ${AZTEC_NARGO:-aztec-nargo} compile",
     "codegen": "${AZTEC_BUILDER:-aztec-builder} codegen src/contracts/target -o artifacts",
     "clean": "rm -rf ./dist .tsbuildinfo ./artifacts ./src/contracts/target",
     "prep": "yarn clean && yarn compile && yarn codegen",
diff --git a/boxes/boxes/react/playwright.config.ts b/boxes/boxes/react/playwright.config.ts
index 9b6a8f517fcc..95e73847ebea 100644
--- a/boxes/boxes/react/playwright.config.ts
+++ b/boxes/boxes/react/playwright.config.ts
@@ -25,10 +25,11 @@ export default defineConfig({
       name: 'firefox',
       use: { ...devices['Desktop Firefox'] },
     },
-    {
-      name: 'webkit',
-      use: { ...devices['Desktop Safari'] },
-    },
+
+    // {
+    //   name: 'webkit',
+    //   use: { ...devices['Desktop Safari'] },
+    // },
   ],
   webServer: {
     command: 'yarn serve',
diff --git a/boxes/boxes/vanilla/package.json b/boxes/boxes/vanilla/package.json
index c029a78cde0f..f2d6ee850ee0 100644
--- a/boxes/boxes/vanilla/package.json
+++ b/boxes/boxes/vanilla/package.json
@@ -5,7 +5,7 @@
   "version": "0.1.0",
   "type": "module",
   "scripts": {
-    "compile": "cd src/contracts && ${AZTEC_NARGO:-aztec-nargo} compile --silence-warnings",
+    "compile": "cd src/contracts && ${AZTEC_NARGO:-aztec-nargo} compile",
     "codegen": "${AZTEC_BUILDER:-aztec-builder} codegen src/contracts/target -o artifacts",
     "clean": "rm -rf ./dest .tsbuildinfo ./artifacts ./src/contracts/target",
     "prep": "yarn clean && yarn compile && yarn codegen && tsc -b",
diff --git a/boxes/boxes/vanilla/playwright.config.ts b/boxes/boxes/vanilla/playwright.config.ts
index 9b6a8f517fcc..96c5e3b073d3 100644
--- a/boxes/boxes/vanilla/playwright.config.ts
+++ b/boxes/boxes/vanilla/playwright.config.ts
@@ -25,6 +25,7 @@ export default defineConfig({
       name: 'firefox',
       use: { ...devices['Desktop Firefox'] },
     },
+
     {
       name: 'webkit',
       use: { ...devices['Desktop Safari'] },
diff --git a/boxes/docker-compose.yml b/boxes/docker-compose.yml
index b21036bb9342..99c669cbfd1a 100644
--- a/boxes/docker-compose.yml
+++ b/boxes/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     command: "'anvil --silent -p 8545 --host 0.0.0.0 --chain-id 31337'"
 
   aztec:
-    image: aztecprotocol/aztec:${AZTEC_DOCKER_TAG:-latest}
+    image: aztecprotocol/aztec
     environment:
       ETHEREUM_HOST: http://ethereum:8545
       CHAIN_ID: 31337
@@ -15,14 +15,13 @@ services:
       WS_BLOCK_CHECK_INTERVAL_MS: 50
       PXE_BLOCK_POLLING_INTERVAL_MS: 50
       ARCHIVER_VIEM_POLLING_INTERVAL_MS: 500
-    depends_on:
-      - ethereum
 
   boxes:
-    image: aztecprotocol/boxes:${AZTEC_DOCKER_TAG:-latest}
+    image: aztecprotocol/boxes
     entrypoint: >
       sh -c '
-        yarn workspace @aztec/$BOX test --project=$BROWSER
+        while ! nc -z aztec 8080; do sleep 1; done;
+        yarn workspace @aztec/$BOX test
       '
     environment:
       DEBUG: "aztec:*"
@@ -31,8 +30,3 @@ services:
       CHAIN_ID: 31337
       PXE_URL: http://aztec:8080
       BOX: ${BOX:-vanilla}
-      CI: ${CI:-}
-      BROWSER: ${BROWSER:-chromium}
-    depends_on:
-      aztec:
-        condition: service_healthy
diff --git a/boxes/package.json b/boxes/package.json
index fb55d34e74d7..bff118dbe5be 100644
--- a/boxes/package.json
+++ b/boxes/package.json
@@ -6,7 +6,6 @@
   "scripts": {
     "compile": "yarn workspaces foreach -A -v run compile",
     "build": "yarn workspaces foreach -A -v run build",
-    "install-browsers": "playwright install --with-deps",
     "publish": "yarn npm publish"
   },
   "workspaces": [
@@ -37,8 +36,5 @@
     "pino": "^8.19.0",
     "pino-pretty": "^10.3.1",
     "tiged": "^2.12.6"
-  },
-  "devDependencies": {
-    "@playwright/test": "1.42.0"
   }
 }
diff --git a/boxes/yarn.lock b/boxes/yarn.lock
index 8c1567f2d704..d1a4ff91e966 100644
--- a/boxes/yarn.lock
+++ b/boxes/yarn.lock
@@ -3586,7 +3586,6 @@ __metadata:
     "@inquirer/confirm": "npm:^3.0.0"
     "@inquirer/input": "npm:^2.0.0"
     "@inquirer/select": "npm:^2.0.0"
-    "@playwright/test": "npm:1.42.0"
     axios: "npm:^1.6.7"
     commander: "npm:^12.0.0"
     node-pty: "npm:^1.0.0"
diff --git a/yarn-project/Earthfile b/yarn-project/Earthfile
index e6c124eb6fe0..6da55e013d9b 100644
--- a/yarn-project/Earthfile
+++ b/yarn-project/Earthfile
@@ -70,12 +70,8 @@ aztec:
     FROM ubuntu:noble
     RUN apt update && apt install nodejs -y && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
     COPY +aztec-prod/usr/src /usr/src
-    LET port=8080
-    ENV PORT=$port
-    HEALTHCHECK --interval=10s --timeout=10s --retries=6 \
-        CMD curl -fsSd '{\"jsonrpc\":\"2.0\",\"method\":\"pxe_getNodeInfo\",\"id\":1}' http://127.0.0.1:$port
     ENTRYPOINT ["node", "--no-warnings", "/usr/src/yarn-project/aztec/dest/bin/index.js"]
-    EXPOSE $port
+    EXPOSE 8080
 
 # We care about creating a slimmed down e2e image because we have to serialize it from earthly to docker for running.
 end-to-end-prod:

From f332bc95e624e6600b01b4bde67accf9d21add1e Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Wed, 1 May 2024 09:17:02 -0500
Subject: [PATCH 35/42] chore(ci): fix spot runner build key (#6119)

---
 .github/spot-runner-action/action.yaml     |  4 ----
 .github/spot-runner-action/dist/index.js   | 23 +++++++---------------
 .github/spot-runner-action/src/config.ts   |  3 ---
 .github/spot-runner-action/src/ec2.ts      |  3 +--
 .github/spot-runner-action/src/userdata.ts | 21 ++++++--------------
 scripts/earthly-ci                         |  6 ++++++
 6 files changed, 20 insertions(+), 40 deletions(-)

diff --git a/.github/spot-runner-action/action.yaml b/.github/spot-runner-action/action.yaml
index a0290b63b8ad..4b33c7d344f5 100644
--- a/.github/spot-runner-action/action.yaml
+++ b/.github/spot-runner-action/action.yaml
@@ -40,10 +40,6 @@ inputs:
   ec2_ami_id:
     description: 'Ec2 ami ID'
     required: true
-  ec2_instance_iam_role:
-    description: 'IAM role for to associate with ec2 instance'
-    required: false
-    default: ''
   ec2_instance_tags:
     description: 'List of extra aws resource tags for ec2 instance'
     required: false
diff --git a/.github/spot-runner-action/dist/index.js b/.github/spot-runner-action/dist/index.js
index 54dc696e1c35..37aa0ce13a3b 100644
--- a/.github/spot-runner-action/dist/index.js
+++ b/.github/spot-runner-action/dist/index.js
@@ -53,7 +53,6 @@ class ActionConfig {
         // Ec2 params
         this.ec2InstanceType = core.getInput("ec2_instance_type").split(" ");
         this.ec2AmiId = core.getInput("ec2_ami_id");
-        this.ec2InstanceIamRole = core.getInput("ec2_instance_iam_role");
         this.ec2InstanceTags = core.getInput("ec2_instance_tags");
         this.ec2InstanceTtl = core.getInput("ec2_instance_ttl");
         this.ec2SubnetId = core.getInput("ec2_subnet_id");
@@ -308,6 +307,7 @@ class Ec2Instance {
                     InstanceType: instanceType,
                     AvailabilityZone: availabilityZone,
                     SubnetId: this.config.ec2SubnetId,
+                    KeyName: this.config.ec2KeyName,
                 })),
             };
             const createFleetRequest = {
@@ -871,23 +871,14 @@ class UserData {
                 `mkdir -p shutdown-refcount`,
                 // Shutdown rules:
                 // - github actions job starts and ends always bump +ec2InstanceTtl minutes
-                // - when the amount of started jobs (start_run_* files) equal the amount of finished jobs (end_run_* files), we shutdown in 5 minutes
-                `echo "${bumpShutdown}; touch /run/shutdown-refcount/start_run_\\$(date +%s)_\\$RANDOM" > /run/delay_shutdown.sh`,
-                // `echo "[ \\$(find /run/shutdown-refcount/ -name 'start_run_*' | wc -l) -eq \\$(find /run/shutdown-refcount/ -name 'end_run_*' | wc -l) ] && shutdown -P 5 ; true" > /run/if_refcount0_shutdown.sh`,
-                `echo "echo refcounting disabled for now" > /run/if_refcount0_shutdown.sh`,
-                `echo "${bumpShutdown}; touch /run/shutdown-refcount/end_run_\\$(date +%s)_\\$RANDOM ; /run/if_refcount0_shutdown.sh " > /run/refcount_and_delay_shutdown.sh`,
-                `echo "flock /run/refcount-lock /run/delay_shutdown.sh" > /run/safe_delay_shutdown.sh`,
-                `echo "flock /run/refcount-lock /run/refcount_and_delay_shutdown.sh" > /run/safe_refcount_and_delay_shutdown.sh`,
+                // - when the amount of started jobs (start_run_* files) equal the amount of finished jobs (end_run_* files), we shutdown in 5 minutes (with a reaper script installed later)
+                `echo "${bumpShutdown}" > /run/delay_shutdown.sh`,
                 "chmod +x /run/delay_shutdown.sh",
-                "chmod +x /run/refcount_and_delay_shutdown.sh",
-                "chmod +x /run/if_refcount0_shutdown.sh",
-                "chmod +x /run/safe_refcount_and_delay_shutdown.sh",
-                "chmod +x /run/safe_if_refcount0_shutdown.sh",
-                "export ACTIONS_RUNNER_HOOK_JOB_STARTED=/run/safe_delay_shutdown.sh",
-                "export ACTIONS_RUNNER_HOOK_JOB_COMPLETED=/run/safe_refcount_and_delay_shutdown.sh",
+                "export ACTIONS_RUNNER_HOOK_JOB_STARTED=/run/delay_shutdown.sh",
+                "export ACTIONS_RUNNER_HOOK_JOB_COMPLETED=/run/delay_shutdown.sh",
                 "mkdir -p actions-runner && cd actions-runner",
-                'echo "ACTIONS_RUNNER_HOOK_JOB_STARTED=/run/safe_delay_shutdown.sh" > .env',
-                'echo "ACTIONS_RUNNER_HOOK_JOB_COMPLETED=/run/safe_refcount_and_delay_shutdown.sh" > .env',
+                'echo "ACTIONS_RUNNER_HOOK_JOB_STARTED=/run/delay_shutdown.sh" > .env',
+                'echo "ACTIONS_RUNNER_HOOK_JOB_COMPLETED=/run/delay_shutdown.sh" > .env',
                 `GH_RUNNER_VERSION=${githubActionRunnerVersion}`,
                 'case $(uname -m) in aarch64) ARCH="arm64" ;; amd64|x86_64) ARCH="x64" ;; esac && export RUNNER_ARCH=${ARCH}',
                 "curl -O -L https://github.com/actions/runner/releases/download/v${GH_RUNNER_VERSION}/actions-runner-linux-${RUNNER_ARCH}-${GH_RUNNER_VERSION}.tar.gz",
diff --git a/.github/spot-runner-action/src/config.ts b/.github/spot-runner-action/src/config.ts
index da7ec1c9d8b8..1c15bd00e651 100644
--- a/.github/spot-runner-action/src/config.ts
+++ b/.github/spot-runner-action/src/config.ts
@@ -19,7 +19,6 @@ export interface ConfigInterface {
 
   ec2InstanceType: string[];
   ec2AmiId: string;
-  ec2InstanceIamRole: string;
   ec2InstanceTags: string;
   ec2InstanceTtl: string;
   ec2SecurityGroupId: string;
@@ -46,7 +45,6 @@ export class ActionConfig implements ConfigInterface {
 
   ec2InstanceType: string[];
   ec2AmiId: string;
-  ec2InstanceIamRole: string;
   ec2InstanceTags: string;
   ec2InstanceTtl: string;
   ec2SecurityGroupId: string;
@@ -77,7 +75,6 @@ export class ActionConfig implements ConfigInterface {
     // Ec2 params
     this.ec2InstanceType = core.getInput("ec2_instance_type").split(" ");
     this.ec2AmiId = core.getInput("ec2_ami_id");
-    this.ec2InstanceIamRole = core.getInput("ec2_instance_iam_role");
     this.ec2InstanceTags = core.getInput("ec2_instance_tags");
     this.ec2InstanceTtl = core.getInput("ec2_instance_ttl");
     this.ec2SubnetId = core.getInput("ec2_subnet_id");
diff --git a/.github/spot-runner-action/src/ec2.ts b/.github/spot-runner-action/src/ec2.ts
index c9a736cd1e39..195aa3fa919a 100644
--- a/.github/spot-runner-action/src/ec2.ts
+++ b/.github/spot-runner-action/src/ec2.ts
@@ -4,9 +4,7 @@ import {
   CreateFleetInstance,
   CreateFleetRequest,
   CreateLaunchTemplateRequest,
-  FleetLaunchTemplateConfig,
   FleetLaunchTemplateConfigRequest,
-  RunInstancesRequest,
 } from "aws-sdk/clients/ec2";
 import * as crypto from "crypto";
 import * as core from "@actions/core";
@@ -229,6 +227,7 @@ export class Ec2Instance {
         InstanceType: instanceType,
         AvailabilityZone: availabilityZone,
         SubnetId: this.config.ec2SubnetId,
+        KeyName: this.config.ec2KeyName,
       })),
     };
     const createFleetRequest: CreateFleetRequest = {
diff --git a/.github/spot-runner-action/src/userdata.ts b/.github/spot-runner-action/src/userdata.ts
index 9e9963932736..4455735b8d2d 100644
--- a/.github/spot-runner-action/src/userdata.ts
+++ b/.github/spot-runner-action/src/userdata.ts
@@ -35,23 +35,14 @@ export class UserData {
       `mkdir -p shutdown-refcount`,
       // Shutdown rules:
       // - github actions job starts and ends always bump +ec2InstanceTtl minutes
-      // - when the amount of started jobs (start_run_* files) equal the amount of finished jobs (end_run_* files), we shutdown in 5 minutes
-      `echo "${bumpShutdown}; touch /run/shutdown-refcount/start_run_\\$(date +%s)_\\$RANDOM" > /run/delay_shutdown.sh`,
-      // `echo "[ \\$(find /run/shutdown-refcount/ -name 'start_run_*' | wc -l) -eq \\$(find /run/shutdown-refcount/ -name 'end_run_*' | wc -l) ] && shutdown -P 5 ; true" > /run/if_refcount0_shutdown.sh`,
-      `echo "echo refcounting disabled for now" > /run/if_refcount0_shutdown.sh`,
-      `echo "${bumpShutdown}; touch /run/shutdown-refcount/end_run_\\$(date +%s)_\\$RANDOM ; /run/if_refcount0_shutdown.sh " > /run/refcount_and_delay_shutdown.sh`,
-      `echo "flock /run/refcount-lock /run/delay_shutdown.sh" > /run/safe_delay_shutdown.sh`,
-      `echo "flock /run/refcount-lock /run/refcount_and_delay_shutdown.sh" > /run/safe_refcount_and_delay_shutdown.sh`,
+      // - when the amount of started jobs (start_run_* files) equal the amount of finished jobs (end_run_* files), we shutdown in 5 minutes (with a reaper script installed later)
+      `echo "${bumpShutdown}" > /run/delay_shutdown.sh`,
       "chmod +x /run/delay_shutdown.sh",
-      "chmod +x /run/refcount_and_delay_shutdown.sh",
-      "chmod +x /run/if_refcount0_shutdown.sh",
-      "chmod +x /run/safe_refcount_and_delay_shutdown.sh",
-      "chmod +x /run/safe_if_refcount0_shutdown.sh",
-      "export ACTIONS_RUNNER_HOOK_JOB_STARTED=/run/safe_delay_shutdown.sh",
-      "export ACTIONS_RUNNER_HOOK_JOB_COMPLETED=/run/safe_refcount_and_delay_shutdown.sh",
+      "export ACTIONS_RUNNER_HOOK_JOB_STARTED=/run/delay_shutdown.sh",
+      "export ACTIONS_RUNNER_HOOK_JOB_COMPLETED=/run/delay_shutdown.sh",
       "mkdir -p actions-runner && cd actions-runner",
-      'echo "ACTIONS_RUNNER_HOOK_JOB_STARTED=/run/safe_delay_shutdown.sh" > .env',
-      'echo "ACTIONS_RUNNER_HOOK_JOB_COMPLETED=/run/safe_refcount_and_delay_shutdown.sh" > .env',
+      'echo "ACTIONS_RUNNER_HOOK_JOB_STARTED=/run/delay_shutdown.sh" > .env',
+      'echo "ACTIONS_RUNNER_HOOK_JOB_COMPLETED=/run/delay_shutdown.sh" > .env',
       `GH_RUNNER_VERSION=${githubActionRunnerVersion}`,
       'case $(uname -m) in aarch64) ARCH="arm64" ;; amd64|x86_64) ARCH="x64" ;; esac && export RUNNER_ARCH=${ARCH}',
       "curl -O -L https://github.com/actions/runner/releases/download/v${GH_RUNNER_VERSION}/actions-runner-linux-${RUNNER_ARCH}-${GH_RUNNER_VERSION}.tar.gz",
diff --git a/scripts/earthly-ci b/scripts/earthly-ci
index 43eeb9b17aa8..5d7f3fdc50e4 100755
--- a/scripts/earthly-ci
+++ b/scripts/earthly-ci
@@ -29,6 +29,12 @@ elif ! earthly $@ 2>&1 | tee $OUTPUT_FILE >&2 ; then
     earthly $@
     # TODO handle
     # could not configure satellite: failed getting org: unable to authenticate: failed to execute login request: Post
+  elif grep 'Error: pull ping error: pull ping response' $OUTPUT_FILE >/dev/null ; then
+    echo "Got 'Error: pull ping error: pull ping response', intermittent failure when writing out images to docker"
+    earthly $@
+  elif grep '================================= System Info ==================================' $OUTPUT_FILE >/dev/null ; then
+    echo "Detected an Earthly daemon restart, possibly due to it (mis)detecting a cache setting change, trying again..."
+    earthly $@
   else
     # otherwise, propagate error
     exit 1

From 57910041fdd05b2e76489b86d60282411e0c7dde Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Wed, 1 May 2024 09:20:36 -0500
Subject: [PATCH 36/42] fix(ci): build-key hotfix (#6123)

---
 .github/spot-runner-action/dist/index.js | 3 ++-
 .github/spot-runner-action/src/ec2.ts    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/spot-runner-action/dist/index.js b/.github/spot-runner-action/dist/index.js
index 37aa0ce13a3b..c1c60815239b 100644
--- a/.github/spot-runner-action/dist/index.js
+++ b/.github/spot-runner-action/dist/index.js
@@ -245,7 +245,7 @@ class Ec2Instance {
             const client = yield this.getEc2Client();
             // NOTE: This should be deterministic or we will create a launch template each time
             const userData = yield new userdata_1.UserData(this.config).getUserData();
-            const ec2InstanceTypeHash = this.getHashOfStringArray(this.config.ec2InstanceType.concat([userData]).concat([JSON.stringify(this.tags)]));
+            const ec2InstanceTypeHash = this.getHashOfStringArray(this.config.ec2InstanceType.concat([userData, JSON.stringify(this.tags), this.config.ec2KeyName]));
             const launchTemplateName = "aztec-packages-spot-" + this.config.ec2AmiId + "-" + ec2InstanceTypeHash;
             const launchTemplateParams = {
                 LaunchTemplateName: launchTemplateName,
@@ -258,6 +258,7 @@ class Ec2Instance {
                         MemoryMiB: { Min: 0 },
                         AllowedInstanceTypes: this.config.ec2InstanceType,
                     },
+                    KeyName: this.config.ec2KeyName,
                     UserData: userData,
                     TagSpecifications: [
                         {
diff --git a/.github/spot-runner-action/src/ec2.ts b/.github/spot-runner-action/src/ec2.ts
index 195aa3fa919a..413d02ad4fbe 100644
--- a/.github/spot-runner-action/src/ec2.ts
+++ b/.github/spot-runner-action/src/ec2.ts
@@ -161,7 +161,7 @@ export class Ec2Instance {
     // NOTE: This should be deterministic or we will create a launch template each time
     const userData = await new UserData(this.config).getUserData();
     const ec2InstanceTypeHash = this.getHashOfStringArray(
-      this.config.ec2InstanceType.concat([userData]).concat([JSON.stringify(this.tags)])
+      this.config.ec2InstanceType.concat([userData, JSON.stringify(this.tags), this.config.ec2KeyName])
     );
     const launchTemplateName =
       "aztec-packages-spot-" + this.config.ec2AmiId + "-" + ec2InstanceTypeHash;
@@ -177,6 +177,7 @@ export class Ec2Instance {
           MemoryMiB: { Min: 0 },
           AllowedInstanceTypes: this.config.ec2InstanceType,
         },
+        KeyName: this.config.ec2KeyName,
         UserData: userData,
         TagSpecifications: [
           {

From f60dfcd71e58d0a49e29c7efc7fc2f67670a306b Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Wed, 1 May 2024 09:31:32 -0500
Subject: [PATCH 37/42] chore(ci): hotfix (#6124)

---
 .github/spot-runner-action/dist/index.js | 1 -
 .github/spot-runner-action/src/ec2.ts    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.github/spot-runner-action/dist/index.js b/.github/spot-runner-action/dist/index.js
index c1c60815239b..9ec5b06ec5ee 100644
--- a/.github/spot-runner-action/dist/index.js
+++ b/.github/spot-runner-action/dist/index.js
@@ -308,7 +308,6 @@ class Ec2Instance {
                     InstanceType: instanceType,
                     AvailabilityZone: availabilityZone,
                     SubnetId: this.config.ec2SubnetId,
-                    KeyName: this.config.ec2KeyName,
                 })),
             };
             const createFleetRequest = {
diff --git a/.github/spot-runner-action/src/ec2.ts b/.github/spot-runner-action/src/ec2.ts
index 413d02ad4fbe..2561427dc80d 100644
--- a/.github/spot-runner-action/src/ec2.ts
+++ b/.github/spot-runner-action/src/ec2.ts
@@ -228,7 +228,6 @@ export class Ec2Instance {
         InstanceType: instanceType,
         AvailabilityZone: availabilityZone,
         SubnetId: this.config.ec2SubnetId,
-        KeyName: this.config.ec2KeyName,
       })),
     };
     const createFleetRequest: CreateFleetRequest = {

From 30899d0346c632e1c3cfe2ae14357700d635986c Mon Sep 17 00:00:00 2001
From: Alex Gherghisan <alexghr@users.noreply.github.com>
Date: Wed, 1 May 2024 16:45:12 +0100
Subject: [PATCH 38/42] feat: add aztecprotocol/aztec-builder (#6116)

Run aztec-builder through a docker image
---
 .circleci/config.yml                      | 15 +++++++++++++++
 aztec-up/bin/{aztec-cli => aztec-builder} |  2 +-
 build_manifest.yml                        |  7 +++++++
 yarn-project/Dockerfile                   |  2 +-
 yarn-project/Earthfile                    |  2 +-
 yarn-project/builder/Dockerfile           |  6 ++++++
 6 files changed, 31 insertions(+), 3 deletions(-)
 rename aztec-up/bin/{aztec-cli => aztec-builder} (80%)
 create mode 100644 yarn-project/builder/Dockerfile

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 70b0393270e2..bbb89ae9a2a3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -431,6 +431,18 @@ jobs:
           command: build aztec
           aztec_manifest_key: aztec
 
+  aztec-builder:
+    machine:
+      image: default
+    resource_class: small
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Build image"
+          command: build aztec-builder
+          aztec_manifest_key: aztec-builder
+
   boxes:
     docker:
       - image: aztecprotocol/alpine-build-image
@@ -514,6 +526,7 @@ jobs:
             should_release || exit 0
             deploy_dockerhub noir
             deploy_dockerhub aztec
+            deploy_dockerhub aztec-builder
       - run:
           name: "Release canary to NPM: bb.js"
           command: |
@@ -693,6 +706,7 @@ workflows:
 
       # Artifacts
       - aztec-package: *defaults_yarn_project
+      - aztec-builder: *defaults_yarn_project
 
       # Boxes.
       - boxes:
@@ -732,6 +746,7 @@ workflows:
             - noir-packages-tests
             - prover-client-test
             - e2e-join
+            - aztec-builder
           <<: *defaults
 
       # Production releases.
diff --git a/aztec-up/bin/aztec-cli b/aztec-up/bin/aztec-builder
similarity index 80%
rename from aztec-up/bin/aztec-cli
rename to aztec-up/bin/aztec-builder
index 3624338b5c36..a676553772fa 100755
--- a/aztec-up/bin/aztec-cli
+++ b/aztec-up/bin/aztec-builder
@@ -5,4 +5,4 @@ export ENV_VARS_TO_INJECT="PXE_URL PRIVATE_KEY DEBUG"
 export PXE_URL=${PXE_URL:-"http://host.docker.internal:8080"}
 export ETHEREUM_HOST=${ETHEREUM_HOST:-"http://host.docker.internal:8545"}
 
-$(dirname $0)/.aztec-run aztecprotocol/cli $@
+$(dirname $0)/.aztec-run aztecprotocol/aztec-builder $@
diff --git a/build_manifest.yml b/build_manifest.yml
index 6c79c6810d45..4257cd66e11a 100644
--- a/build_manifest.yml
+++ b/build_manifest.yml
@@ -201,6 +201,13 @@ aztec:
     - yarn-project
   multiarch: buildx
 
+aztec-builder:
+  buildDir: yarn-project
+  projectDir: yarn-project/builder
+  dependencies:
+    - yarn-project
+  multiarch: buildx
+
 # Builds all the boxes. They are then independently tested in the container.
 boxes:
   buildDir: boxes
diff --git a/yarn-project/Dockerfile b/yarn-project/Dockerfile
index 2038b05b45e5..591214a3d393 100644
--- a/yarn-project/Dockerfile
+++ b/yarn-project/Dockerfile
@@ -32,7 +32,7 @@ RUN ln -s /usr/src/yarn-project/node_modules /usr/src/node_modules
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
 
 RUN ./bootstrap.sh
-RUN yarn workspaces focus @aztec/aztec --production && yarn cache clean
+RUN yarn workspaces focus @aztec/aztec @aztec/builder --production && yarn cache clean
 
 # TODO: Use release-please to update package.json directly, and remove this!
 # It's here to ensure the image rebuilds if the commit tag changes (as the content hash won't).
diff --git a/yarn-project/Earthfile b/yarn-project/Earthfile
index 6da55e013d9b..7663641719d6 100644
--- a/yarn-project/Earthfile
+++ b/yarn-project/Earthfile
@@ -52,7 +52,7 @@ build-dev:
 
 aztec-prod:
     FROM +build
-    RUN yarn workspaces focus @aztec/aztec --production && yarn cache clean
+    RUN yarn workspaces focus @aztec/aztec @aztec/builder --production && yarn cache clean
     # Remove a bunch of stuff that we don't need that takes up space.
     RUN rm -rf \
         ../noir-projects \
diff --git a/yarn-project/builder/Dockerfile b/yarn-project/builder/Dockerfile
new file mode 100644
index 000000000000..086573488ef6
--- /dev/null
+++ b/yarn-project/builder/Dockerfile
@@ -0,0 +1,6 @@
+FROM aztecprotocol/yarn-project AS yarn-project
+ENTRYPOINT ["node", "--no-warnings", "/usr/src/yarn-project/builder/dest/cli.js"]
+
+# The version has been updated in yarn-project.
+# Adding COMMIT_TAG here to rebuild versioned image.
+ARG COMMIT_TAG=""

From 4839ed99aa3fd6a4a2329612a97a86f4d02eae2d Mon Sep 17 00:00:00 2001
From: josh crites <critesjosh@gmail.com>
Date: Wed, 1 May 2024 13:18:30 -0400
Subject: [PATCH 39/42] fix(docs): add codegen to `aztec-builder` command
 (#6098)

Missed the command in the original PR.

Also note that the `aztec-builder` is not automatically installed with
the sandbox, so for the command to work in the tutorial, devs will need
to install it with something like `npm i -g @aztec/builder` unless the
sandbox install command is updated.
---
 .../docs/developers/tutorials/token_portal/withdrawing_to_l1.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/developers/tutorials/token_portal/withdrawing_to_l1.md b/docs/docs/developers/tutorials/token_portal/withdrawing_to_l1.md
index 82d8ca8cfbed..14723ed9c4b5 100644
--- a/docs/docs/developers/tutorials/token_portal/withdrawing_to_l1.md
+++ b/docs/docs/developers/tutorials/token_portal/withdrawing_to_l1.md
@@ -84,7 +84,7 @@ You may get some unused variable warnings - you can ignore these.
 And generate the TypeScript interface for the contract and add it to the test dir. Run this inside `aztec-contracts/token_bridge`:
 
 ```bash
-aztec-builder target -o ../../src/test/fixtures
+aztec-builder codegen target -o ../../src/test/fixtures
 ```
 
 This will create a TS interface inside `fixtures` dir in our `src/test` folder!

From 705177f2caf4c11f31a22a1ea01b8d0fcd1b4158 Mon Sep 17 00:00:00 2001
From: Cody Gunton <codygunton@gmail.com>
Date: Wed, 1 May 2024 13:25:16 -0400
Subject: [PATCH 40/42] feat: Count Bb lines weighted by complexity (#6090)

The title says it all. A single python script calls to cloc twice,
parses CSVs and then give a % analysis.
---
 barretenberg/cpp/scripts/line_count.py | 101 +++++++++++++++++++++++++
 1 file changed, 101 insertions(+)
 create mode 100755 barretenberg/cpp/scripts/line_count.py

diff --git a/barretenberg/cpp/scripts/line_count.py b/barretenberg/cpp/scripts/line_count.py
new file mode 100755
index 000000000000..450eb14ccfa7
--- /dev/null
+++ b/barretenberg/cpp/scripts/line_count.py
@@ -0,0 +1,101 @@
+# Dependency: The line counting utility cloc https://github.com/AlDanial/cloc
+import csv
+from os import listdir, system
+from pathlib import Path
+
+BASE_DIR = Path("src/barretenberg")
+PER_FILE_REPORT_PATH = Path("build/per_file_report.csv")
+
+# validate that directory structure hasn't changed since last run
+all_dirs = listdir("src/barretenberg")
+last_all_dirs = ['bb', 'benchmark', 'commitment_schemes', 'common', 'crypto', 'dsl', 'ecc', 'eccvm', 'env', 'examples', 'flavor', 'goblin', 'grumpkin_srs_gen', 'honk', 'numeric', 'plonk', 'polynomials', 'protogalaxy', 'relations', 'serialize',
+                 'smt_verification', 'solidity_helpers', 'srs', 'stdlib', 'sumcheck', 'transcript', 'ultra_honk', 'wasi', 'circuit_checker', 'client_ivc', 'translator_vm', 'vm', 'execution_trace', 'plonk_honk_shared', 'stdlib_circuit_builders', 'proof_system', 'build']
+assert (all_dirs == last_all_dirs)
+
+# mark directories that will be covered in an audit of Barretenberg
+# calculated the total number of lines weighted by complexity, with maximum complexity equal to 1
+dirs_to_audit = [
+    'bb',
+    # 'benchmark',
+    'commitment_schemes',
+    # 'common',
+    'crypto',
+    # 'dsl',
+    'ecc',
+    'eccvm',
+    # 'env',
+    # 'examples',
+    'flavor',
+    'goblin',
+    'grumpkin_srs_gen',
+    'honk',
+    'numeric',
+    # 'plonk',
+    'polynomials',
+    'protogalaxy',
+    'relations',
+    # 'serialize',
+    # 'smt_verification',
+    # 'solidity_helpers',
+    'srs',
+    'stdlib',
+    'sumcheck',
+    'transcript',
+    'ultra_honk',
+    # 'wasi',
+    'circuit_checker',
+    'client_ivc',
+    'translator_vm',
+    'vm',
+    'execution_trace',
+    'plonk_honk_shared',
+    'stdlib_circuit_builders',
+    'proof_system'
+]
+weights = {directory: 1 for directory in dirs_to_audit}
+weights["circuit_checker"] = 0.3
+weights["srs"] = 0.3
+weights["polynomials"] = 0.5
+weights["numeric"] = 0.3
+weights["ecc"] = 0.5
+weights["crypto"] = 0.5
+weights["bb"] = 0.3
+
+TOTAL_NUM_CODE_LINES = 0
+# use cloc to count the lines in every file to be audited in the current agreement
+system(
+    f"cloc --include-lang='C++','C/C++ Header' --by-file --csv --out='{PER_FILE_REPORT_PATH}' {BASE_DIR}")
+with open(PER_FILE_REPORT_PATH, newline='') as csvfile:
+    reader = csv.DictReader(csvfile)
+    for row in reader:
+        if row['language'] != 'SUM':
+            path = Path(row['filename']).relative_to(BASE_DIR).parts[0]
+            if path in dirs_to_audit:
+                TOTAL_NUM_CODE_LINES += int(row['code']) * weights[path]
+
+TO_AUDIT_NOW = [
+    "src/barretenberg/stdlib/primitives/bigfield/bigfield.hpp",
+    "src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp",
+    "src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp",
+    "src/barretenberg/stdlib/primitives/field/field.hpp",
+    "src/barretenberg/stdlib/primitives/field/field.cpp",
+    "src/barretenberg/stdlib/primitives/field/field.test.cpp",
+    "src/barretenberg/stdlib/primitives/byte_array/byte_array.hpp",
+    "src/barretenberg/stdlib/primitives/byte_array/byte_array.cpp",
+    "src/barretenberg/stdlib/primitives/byte_array/byte_array.test.cpp",
+    "src/barretenberg/relations/delta_range_constraint_relation.hpp",
+    "src/barretenberg/relations/ultra_arithmetic_relation.hpp",
+    "src/barretenberg/stdlib_circuit_builders/ultra_circuit_builder.hpp",
+    "src/barretenberg/stdlib_circuit_builders/ultra_circuit_builder.cpp"]
+counts = {}
+with open(PER_FILE_REPORT_PATH, newline='') as csvfile:
+    reader = csv.DictReader(csvfile)
+    for row in reader:
+        if row["filename"] in TO_AUDIT_NOW:
+            counts[row["filename"]] = row["code"]
+total = 0
+for filename, count in counts.items():
+    total += int(count)
+
+# print the percentage to be audited
+print(f"Audit covers {total/float(TOTAL_NUM_CODE_LINES):.2%}")

From 853913fd771034fcd959b5dd155a49437eb8989a Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Wed, 1 May 2024 12:47:37 -0500
Subject: [PATCH 41/42] chore(ci): turn off ARM build for now (#6135)

---
 .github/workflows/ci-arm.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-arm.yml b/.github/workflows/ci-arm.yml
index bcc20694ede7..7f9f89ca4da5 100644
--- a/.github/workflows/ci-arm.yml
+++ b/.github/workflows/ci-arm.yml
@@ -1,7 +1,7 @@
 name: CI (ARM)
 on:
   push:
-    branches: [master]
+    branches: [disabled] # [master]
   workflow_dispatch:
     inputs:
       runner_action:

From a59a6c07a15d401e1fbcb4ffc08d79cf4fa6d2fc Mon Sep 17 00:00:00 2001
From: PhilWindle <60546371+PhilWindle@users.noreply.github.com>
Date: Wed, 1 May 2024 19:06:54 +0100
Subject: [PATCH 42/42] chore: Migrate the prover client test to earthly
 (#6118)

This PR migrates the `prover-client-test` CI job from CCI to GA and
Earthly.
---
 .circleci/config.yml                          | 14 ------
 .github/workflows/ci.yml                      | 18 ++++++++
 yarn-project/Earthfile                        |  4 ++
 yarn-project/prover-client/package.json       | 10 ++---
 yarn-project/prover-client/package.local.json |  5 +++
 .../orchestrator/orchestrator_errors.test.ts  | 14 +++---
 .../orchestrator_failures.test.ts             | 44 +++++++++----------
 .../orchestrator_lifecycle.test.ts            |  6 +--
 .../orchestrator_mixed_blocks.test.ts         |  4 +-
 .../orchestrator_mixed_blocks_2.test.ts       |  3 +-
 ...rchestrator_multi_public_functions.test.ts |  3 +-
 .../orchestrator_multiple_blocks.test.ts      |  4 +-
 .../orchestrator_public_functions.test.ts     |  3 +-
 .../orchestrator_single_blocks.test.ts        |  8 ++--
 .../src/prover/bb_prover_base_rollup.test.ts  |  6 +--
 .../src/prover/bb_prover_full_rollup.test.ts  |  6 +--
 .../src/prover/bb_prover_parity.test.ts       |  6 +--
 .../prover/bb_prover_public_kernel.test.ts    |  6 +--
 18 files changed, 85 insertions(+), 79 deletions(-)
 create mode 100644 yarn-project/prover-client/package.local.json

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bbb89ae9a2a3..c77f64bc8a0f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -407,18 +407,6 @@ jobs:
           command: create_ecr_manifest yarn-project x86_64,arm64
           aztec_manifest_key: yarn-project
 
-  prover-client-test:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Build and test"
-          command: cond_spot_run_build prover-client-test 128
-          aztec_manifest_key: prover-client-test
-
   aztec-package:
     machine:
       image: default
@@ -695,7 +683,6 @@ workflows:
             - noir-projects
           <<: *defaults
       - end-to-end: *defaults_yarn_project
-      - prover-client-test: *defaults_yarn_project
       - yarn-project-x86_64: *defaults_yarn_project_pre_join
       - yarn-project-arm64: *defaults_yarn_project_pre_join
       - yarn-project-ecr-manifest:
@@ -744,7 +731,6 @@ workflows:
             - boxes-vanilla
             - boxes-react
             - noir-packages-tests
-            - prover-client-test
             - e2e-join
             - aztec-builder
           <<: *defaults
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d9f0f8c5699e..ad26c91b495c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -178,6 +178,22 @@ jobs:
         timeout-minutes: 25
         run: earthly-ci --no-output ./yarn-project/+test
 
+  prover-client-test:
+    needs: noir-projects
+    runs-on: ${{ github.actor }}-x86
+    steps:
+      - {
+          uses: actions/checkout@v4,
+          with: { ref: "${{ github.event.pull_request.head.sha }}" },
+        }
+      - uses: ./.github/ci-setup-action
+        with:
+          dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
+          concurrency_key: prover-client-test-${{ github.actor }}-x86
+      - name: "Prover Client Tests"
+        timeout-minutes: 25
+        run: earthly-ci --no-output ./yarn-project/+prover-client-test
+
   docs-preview:
     needs: setup
     runs-on: ${{ inputs.username || github.actor }}-x86
@@ -257,6 +273,7 @@ jobs:
       - bb-bench
       - yarn-project-formatting
       - yarn-project-test
+      - prover-client-test
     if: always()
     steps:
       - run: |
@@ -279,6 +296,7 @@ jobs:
         bb-bench,
         yarn-project-formatting,
         yarn-project-test,
+        prover-client-test,
       ]
     runs-on: ubuntu-latest
     if: ${{ github.ref == 'refs/heads/master' && failure() }}
diff --git a/yarn-project/Earthfile b/yarn-project/Earthfile
index 7663641719d6..9a98815ccfe9 100644
--- a/yarn-project/Earthfile
+++ b/yarn-project/Earthfile
@@ -133,3 +133,7 @@ run-e2e:
     ARG test
     FROM +end-to-end
     RUN DEBUG=aztec:* yarn test $test
+
+prover-client-test:
+    FROM +build
+    RUN cd prover-client && yarn test
diff --git a/yarn-project/prover-client/package.json b/yarn-project/prover-client/package.json
index 64580446844a..3bdf47496029 100644
--- a/yarn-project/prover-client/package.json
+++ b/yarn-project/prover-client/package.json
@@ -16,6 +16,10 @@
     "name": "Prover Client",
     "tsconfig": "./tsconfig.json"
   },
+  "inherits": [
+    "../package.common.json",
+    "./package.local.json"
+  ],
   "scripts": {
     "build": "yarn clean && tsc -b",
     "build:dev": "tsc -b --watch",
@@ -23,12 +27,8 @@
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "bb": "node --no-warnings ./dest/bb/index.js",
-    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests",
-    "generate-and-test": "yarn bb-cli write-server-vks && yarn test"
+    "test": "LOG_LEVEL=${LOG_LEVEL:-silent} DEBUG_COLORS=1 NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=600000 --forceExit"
   },
-  "inherits": [
-    "../package.common.json"
-  ],
   "jest": {
     "moduleNameMapper": {
       "^(\\.{1,2}/.*)\\.[cm]?js$": "$1"
diff --git a/yarn-project/prover-client/package.local.json b/yarn-project/prover-client/package.local.json
new file mode 100644
index 000000000000..5eeed2af06ad
--- /dev/null
+++ b/yarn-project/prover-client/package.local.json
@@ -0,0 +1,5 @@
+{
+  "scripts": {
+    "test": "LOG_LEVEL=${LOG_LEVEL:-silent} DEBUG_COLORS=1 NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=600000 --forceExit"
+  }
+}
diff --git a/yarn-project/prover-client/src/orchestrator/orchestrator_errors.test.ts b/yarn-project/prover-client/src/orchestrator/orchestrator_errors.test.ts
index 8f23bd02b3b8..b4269bfc4531 100644
--- a/yarn-project/prover-client/src/orchestrator/orchestrator_errors.test.ts
+++ b/yarn-project/prover-client/src/orchestrator/orchestrator_errors.test.ts
@@ -12,7 +12,7 @@ describe('prover/orchestrator/errors', () => {
 
   beforeEach(async () => {
     context = await TestContext.new(logger);
-  }, 20_000);
+  });
 
   afterEach(async () => {
     await context.cleanup();
@@ -49,25 +49,25 @@ describe('prover/orchestrator/errors', () => {
       const finalisedBlock = await context.orchestrator.finaliseBlock();
 
       expect(finalisedBlock.block.number).toEqual(context.blockNumber);
-    }, 40_000);
+    });
 
     it('throws if adding a transaction before start', async () => {
       await expect(
         async () => await context.orchestrator.addNewTx(await makeEmptyProcessedTestTx(context.actualDb)),
       ).rejects.toThrow(`Invalid proving state, call startNewBlock before adding transactions`);
-    }, 1000);
+    });
 
     it('throws if completing a block before start', async () => {
       await expect(async () => await context.orchestrator.setBlockCompleted()).rejects.toThrow(
         'Invalid proving state, call startNewBlock before adding transactions or completing the block',
       );
-    }, 1000);
+    });
 
     it('throws if finalising an incomplete block', async () => {
       await expect(async () => await context.orchestrator.finaliseBlock()).rejects.toThrow(
         'Invalid proving state, a block must be proven before it can be finalised',
       );
-    }, 1000);
+    });
 
     it('throws if finalising an already finalised block', async () => {
       const txs = await Promise.all([
@@ -91,7 +91,7 @@ describe('prover/orchestrator/errors', () => {
       const finalisedBlock = await context.orchestrator.finaliseBlock();
       expect(finalisedBlock.block.number).toEqual(context.blockNumber);
       await expect(async () => await context.orchestrator.finaliseBlock()).rejects.toThrow('Block already finalised');
-    }, 60000);
+    });
 
     it('throws if adding to a cancelled block', async () => {
       await context.orchestrator.startNewBlock(
@@ -106,7 +106,7 @@ describe('prover/orchestrator/errors', () => {
       await expect(
         async () => await context.orchestrator.addNewTx(await makeEmptyProcessedTestTx(context.actualDb)),
       ).rejects.toThrow('Rollup not accepting further transactions');
-    }, 10000);
+    });
 
     it.each([[-4], [0], [1], [3], [8.1], [7]] as const)(
       'fails to start a block with %i transactions',
diff --git a/yarn-project/prover-client/src/orchestrator/orchestrator_failures.test.ts b/yarn-project/prover-client/src/orchestrator/orchestrator_failures.test.ts
index 5b06d8418fe9..0c56061d87a5 100644
--- a/yarn-project/prover-client/src/orchestrator/orchestrator_failures.test.ts
+++ b/yarn-project/prover-client/src/orchestrator/orchestrator_failures.test.ts
@@ -22,7 +22,7 @@ describe('prover/orchestrator/failures', () => {
 
   beforeEach(async () => {
     context = await TestContext.new(logger);
-  }, 20_000);
+  });
 
   afterEach(async () => {
     await context.cleanup();
@@ -75,30 +75,26 @@ describe('prover/orchestrator/failures', () => {
           jest.spyOn(mockProver, 'getRootParityProof').mockRejectedValue('Root Parity Failed');
         },
       ],
-    ] as const)(
-      'handles a %s error',
-      async (message: string, fn: () => void) => {
-        fn();
-        const txs = await Promise.all([
-          makeEmptyProcessedTestTx(context.actualDb),
-          makeEmptyProcessedTestTx(context.actualDb),
-          makeEmptyProcessedTestTx(context.actualDb),
-          makeEmptyProcessedTestTx(context.actualDb),
-        ]);
+    ] as const)('handles a %s error', async (message: string, fn: () => void) => {
+      fn();
+      const txs = await Promise.all([
+        makeEmptyProcessedTestTx(context.actualDb),
+        makeEmptyProcessedTestTx(context.actualDb),
+        makeEmptyProcessedTestTx(context.actualDb),
+        makeEmptyProcessedTestTx(context.actualDb),
+      ]);
 
-        const blockTicket = await orchestrator.startNewBlock(
-          txs.length,
-          context.globalVariables,
-          [],
-          await makeEmptyProcessedTestTx(context.actualDb),
-        );
+      const blockTicket = await orchestrator.startNewBlock(
+        txs.length,
+        context.globalVariables,
+        [],
+        await makeEmptyProcessedTestTx(context.actualDb),
+      );
 
-        for (const tx of txs) {
-          await orchestrator.addNewTx(tx);
-        }
-        await expect(blockTicket.provingPromise).resolves.toEqual({ status: PROVING_STATUS.FAILURE, reason: message });
-      },
-      60000,
-    );
+      for (const tx of txs) {
+        await orchestrator.addNewTx(tx);
+      }
+      await expect(blockTicket.provingPromise).resolves.toEqual({ status: PROVING_STATUS.FAILURE, reason: message });
+    });
   });
 });
diff --git a/yarn-project/prover-client/src/orchestrator/orchestrator_lifecycle.test.ts b/yarn-project/prover-client/src/orchestrator/orchestrator_lifecycle.test.ts
index 898e3aab9bb5..f380b7cbef96 100644
--- a/yarn-project/prover-client/src/orchestrator/orchestrator_lifecycle.test.ts
+++ b/yarn-project/prover-client/src/orchestrator/orchestrator_lifecycle.test.ts
@@ -14,7 +14,7 @@ describe('prover/orchestrator/lifecycle', () => {
 
   beforeEach(async () => {
     context = await TestContext.new(logger);
-  }, 20_000);
+  });
 
   afterEach(async () => {
     await context.cleanup();
@@ -75,7 +75,7 @@ describe('prover/orchestrator/lifecycle', () => {
       const finalisedBlock = await context.orchestrator.finaliseBlock();
 
       expect(finalisedBlock.block.number).toEqual(101);
-    }, 40000);
+    });
 
     it('automatically cancels an incomplete block when starting a new one', async () => {
       const txs1 = await Promise.all([
@@ -123,6 +123,6 @@ describe('prover/orchestrator/lifecycle', () => {
       const finalisedBlock = await context.orchestrator.finaliseBlock();
 
       expect(finalisedBlock.block.number).toEqual(101);
-    }, 60000);
+    });
   });
 });
diff --git a/yarn-project/prover-client/src/orchestrator/orchestrator_mixed_blocks.test.ts b/yarn-project/prover-client/src/orchestrator/orchestrator_mixed_blocks.test.ts
index 53a6959b710e..8c63265a8e5a 100644
--- a/yarn-project/prover-client/src/orchestrator/orchestrator_mixed_blocks.test.ts
+++ b/yarn-project/prover-client/src/orchestrator/orchestrator_mixed_blocks.test.ts
@@ -14,7 +14,7 @@ describe('prover/orchestrator/mixed-blocks', () => {
 
   beforeEach(async () => {
     context = await TestContext.new(logger);
-  }, 20_000);
+  });
 
   afterEach(async () => {
     await context.cleanup();
@@ -49,6 +49,6 @@ describe('prover/orchestrator/mixed-blocks', () => {
       const finalisedBlock = await context.orchestrator.finaliseBlock();
 
       expect(finalisedBlock.block.number).toEqual(context.blockNumber);
-    }, 60_000);
+    });
   });
 });
diff --git a/yarn-project/prover-client/src/orchestrator/orchestrator_mixed_blocks_2.test.ts b/yarn-project/prover-client/src/orchestrator/orchestrator_mixed_blocks_2.test.ts
index 1233bbe30f72..0a0ae2abb2f6 100644
--- a/yarn-project/prover-client/src/orchestrator/orchestrator_mixed_blocks_2.test.ts
+++ b/yarn-project/prover-client/src/orchestrator/orchestrator_mixed_blocks_2.test.ts
@@ -19,7 +19,7 @@ describe('prover/orchestrator/mixed-blocks', () => {
   beforeEach(async () => {
     context = await TestContext.new(logger);
     expectsDb = await MerkleTrees.new(openTmpStore()).then(t => t.asLatest());
-  }, 20_000);
+  });
 
   afterEach(async () => {
     await context.cleanup();
@@ -70,7 +70,6 @@ describe('prover/orchestrator/mixed-blocks', () => {
         const expectedNoteHashTreeAfter = await expectsDb.getTreeInfo(MerkleTreeId.NOTE_HASH_TREE).then(t => t.root);
         expect(noteHashTreeAfter.root).toEqual(expectedNoteHashTreeAfter);
       },
-      60000,
     );
   });
 });
diff --git a/yarn-project/prover-client/src/orchestrator/orchestrator_multi_public_functions.test.ts b/yarn-project/prover-client/src/orchestrator/orchestrator_multi_public_functions.test.ts
index 6e1054032b11..d9c7e24b0e95 100644
--- a/yarn-project/prover-client/src/orchestrator/orchestrator_multi_public_functions.test.ts
+++ b/yarn-project/prover-client/src/orchestrator/orchestrator_multi_public_functions.test.ts
@@ -12,7 +12,7 @@ describe('prover/orchestrator/public-functions', () => {
 
   beforeEach(async () => {
     context = await TestContext.new(logger);
-  }, 20_000);
+  });
 
   afterEach(async () => {
     await context.cleanup();
@@ -56,7 +56,6 @@ describe('prover/orchestrator/public-functions', () => {
 
         expect(finalisedBlock.block.number).toEqual(context.blockNumber);
       },
-      60_000,
     );
   });
 });
diff --git a/yarn-project/prover-client/src/orchestrator/orchestrator_multiple_blocks.test.ts b/yarn-project/prover-client/src/orchestrator/orchestrator_multiple_blocks.test.ts
index 1525aeff7409..4626edffac37 100644
--- a/yarn-project/prover-client/src/orchestrator/orchestrator_multiple_blocks.test.ts
+++ b/yarn-project/prover-client/src/orchestrator/orchestrator_multiple_blocks.test.ts
@@ -11,7 +11,7 @@ describe('prover/orchestrator/multi-block', () => {
 
   beforeEach(async () => {
     context = await TestContext.new(logger);
-  }, 20_000);
+  });
 
   afterEach(async () => {
     await context.cleanup();
@@ -49,6 +49,6 @@ describe('prover/orchestrator/multi-block', () => {
 
         await context.actualDb.commit();
       }
-    }, 60_000);
+    });
   });
 });
diff --git a/yarn-project/prover-client/src/orchestrator/orchestrator_public_functions.test.ts b/yarn-project/prover-client/src/orchestrator/orchestrator_public_functions.test.ts
index 2f7679b973bb..fa75b9d7ae08 100644
--- a/yarn-project/prover-client/src/orchestrator/orchestrator_public_functions.test.ts
+++ b/yarn-project/prover-client/src/orchestrator/orchestrator_public_functions.test.ts
@@ -11,7 +11,7 @@ describe('prover/orchestrator/public-functions', () => {
 
   beforeEach(async () => {
     context = await TestContext.new(logger);
-  }, 20_000);
+  });
 
   afterEach(async () => {
     await context.cleanup();
@@ -59,7 +59,6 @@ describe('prover/orchestrator/public-functions', () => {
 
         expect(finalisedBlock.block.number).toEqual(context.blockNumber);
       },
-      60_000,
     );
   });
 });
diff --git a/yarn-project/prover-client/src/orchestrator/orchestrator_single_blocks.test.ts b/yarn-project/prover-client/src/orchestrator/orchestrator_single_blocks.test.ts
index 959a6105c6a1..dc3212195a42 100644
--- a/yarn-project/prover-client/src/orchestrator/orchestrator_single_blocks.test.ts
+++ b/yarn-project/prover-client/src/orchestrator/orchestrator_single_blocks.test.ts
@@ -19,7 +19,7 @@ describe('prover/orchestrator/blocks', () => {
   beforeEach(async () => {
     context = await TestContext.new(logger);
     expectsDb = await MerkleTrees.new(openTmpStore()).then(t => t.asLatest());
-  }, 20_000);
+  });
 
   afterEach(async () => {
     await context.cleanup();
@@ -48,7 +48,7 @@ describe('prover/orchestrator/blocks', () => {
       const finalisedBlock = await context.orchestrator.finaliseBlock();
 
       expect(finalisedBlock.block.number).toEqual(context.blockNumber);
-    }, 60_000);
+    });
 
     it('builds a block with 1 transaction', async () => {
       const txs = await Promise.all([makeBloatedProcessedTx(context.actualDb, 1)]);
@@ -75,7 +75,7 @@ describe('prover/orchestrator/blocks', () => {
       const finalisedBlock = await context.orchestrator.finaliseBlock();
 
       expect(finalisedBlock.block.number).toEqual(context.blockNumber);
-    }, 60_000);
+    });
 
     it('builds a block concurrently with transaction simulation', async () => {
       const txs = await Promise.all([
@@ -104,6 +104,6 @@ describe('prover/orchestrator/blocks', () => {
       const finalisedBlock = await context.orchestrator.finaliseBlock();
 
       expect(finalisedBlock.block.number).toEqual(context.blockNumber);
-    }, 60_000);
+    });
   });
 });
diff --git a/yarn-project/prover-client/src/prover/bb_prover_base_rollup.test.ts b/yarn-project/prover-client/src/prover/bb_prover_base_rollup.test.ts
index 7e05cba9871d..f560008db23c 100644
--- a/yarn-project/prover-client/src/prover/bb_prover_base_rollup.test.ts
+++ b/yarn-project/prover-client/src/prover/bb_prover_base_rollup.test.ts
@@ -16,11 +16,11 @@ describe('prover/bb_prover/base-rollup', () => {
       return BBNativeRollupProver.new(bbConfig);
     };
     context = await TestContext.new(logger, 1, buildProver);
-  }, 60_000);
+  });
 
   afterAll(async () => {
     await context.cleanup();
-  }, 5000);
+  });
 
   it('proves the base rollup', async () => {
     const tx = await makeBloatedProcessedTx(context.actualDb, 1);
@@ -31,5 +31,5 @@ describe('prover/bb_prover/base-rollup', () => {
     const proofOutputs = await context.prover.getBaseRollupProof(baseRollupInputs);
     logger.verbose('Verifying base rollups');
     await expect(context.prover.verifyProof('BaseRollupArtifact', proofOutputs.proof)).resolves.not.toThrow();
-  }, 200_000);
+  });
 });
diff --git a/yarn-project/prover-client/src/prover/bb_prover_full_rollup.test.ts b/yarn-project/prover-client/src/prover/bb_prover_full_rollup.test.ts
index dca24b599fb1..8fda81071617 100644
--- a/yarn-project/prover-client/src/prover/bb_prover_full_rollup.test.ts
+++ b/yarn-project/prover-client/src/prover/bb_prover_full_rollup.test.ts
@@ -14,11 +14,11 @@ describe('prover/bb_prover/full-rollup', () => {
 
   beforeAll(async () => {
     context = await TestContext.new(logger, 1, BBNativeRollupProver.new);
-  }, 60_000);
+  });
 
   afterAll(async () => {
     await context.cleanup();
-  }, 5000);
+  });
 
   it('proves all circuits', async () => {
     const numTransactions = 4;
@@ -58,5 +58,5 @@ describe('prover/bb_prover/full-rollup', () => {
     const blockResult = await context.orchestrator.finaliseBlock();
 
     await expect(context.prover.verifyProof('RootRollupArtifact', blockResult.proof)).resolves.not.toThrow();
-  }, 600_000);
+  });
 });
diff --git a/yarn-project/prover-client/src/prover/bb_prover_parity.test.ts b/yarn-project/prover-client/src/prover/bb_prover_parity.test.ts
index 2300450f495f..091f00662c19 100644
--- a/yarn-project/prover-client/src/prover/bb_prover_parity.test.ts
+++ b/yarn-project/prover-client/src/prover/bb_prover_parity.test.ts
@@ -31,11 +31,11 @@ describe('prover/bb_prover/parity', () => {
       return bbProver;
     };
     context = await TestContext.new(logger, 1, buildProver);
-  }, 60_000);
+  });
 
   afterAll(async () => {
     await context.cleanup();
-  }, 5000);
+  });
 
   it('proves the parity circuits', async () => {
     const l1ToL2Messages = makeTuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP>(
@@ -134,5 +134,5 @@ describe('prover/bb_prover/parity', () => {
         ]).toContainEqual(error);
       }
     }
-  }, 200_000);
+  });
 });
diff --git a/yarn-project/prover-client/src/prover/bb_prover_public_kernel.test.ts b/yarn-project/prover-client/src/prover/bb_prover_public_kernel.test.ts
index 251b1f197065..59c6a5786e34 100644
--- a/yarn-project/prover-client/src/prover/bb_prover_public_kernel.test.ts
+++ b/yarn-project/prover-client/src/prover/bb_prover_public_kernel.test.ts
@@ -22,11 +22,11 @@ describe('prover/bb_prover/public-kernel', () => {
       return BBNativeRollupProver.new(bbConfig);
     };
     context = await TestContext.new(logger, 1, buildProver);
-  }, 60_000);
+  });
 
   afterAll(async () => {
     await context.cleanup();
-  }, 5000);
+  });
 
   it('proves the public kernel circuits', async () => {
     const tx = mockTx(1000, {
@@ -83,5 +83,5 @@ describe('prover/bb_prover/public-kernel', () => {
       logger.verbose(`Verifying kernel type: ${PublicKernelType[request.type]}`);
       await expect(context.prover.verifyProof(artifact, proof)).resolves.not.toThrow();
     }
-  }, 60_000);
+  });
 });