@aztec/end-to-end 0.0.0-test.0 → 0.0.1-commit.03f7ef2

package/dest/e2e_fees/fees_test.js

@@ -1,23 +1,22 @@
-import { getSchnorrWallet } from '@aztec/accounts/schnorr';
-import { ChainMonitor, CheatCodes, createLogger, sleep } from '@aztec/aztec.js';
-import { FEE_FUNDING_FOR_TESTER_ACCOUNT } from '@aztec/constants';
-import { RollupContract, createL1Clients } from '@aztec/ethereum';
+import { createLogger } from '@aztec/aztec.js/log';
+import { createExtendedL1Client } from '@aztec/ethereum/client';
+import { RollupContract } from '@aztec/ethereum/contracts';
+import { ChainMonitor } from '@aztec/ethereum/test';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
-import { AppSubscriptionContract } from '@aztec/noir-contracts.js/AppSubscription';
-import { CounterContract } from '@aztec/noir-contracts.js/Counter';
+import { sleep } from '@aztec/foundation/sleep';
+import { TestERC20Abi } from '@aztec/l1-artifacts';
 import { FPCContract } from '@aztec/noir-contracts.js/FPC';
 import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice';
+import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
 import { TokenContract as BananaCoin } from '@aztec/noir-contracts.js/Token';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
-import { computePartialAddress } from '@aztec/stdlib/contract';
 import { GasSettings } from '@aztec/stdlib/gas';
 import { getContract } from 'viem';
 import { MNEMONIC } from '../fixtures/fixtures.js';
 import { createSnapshotManager, deployAccounts } from '../fixtures/snapshot_manager.js';
 import { mintTokensToPrivate } from '../fixtures/token_utils.js';
-import { ensureAccountsPubliclyDeployed, getBalancesFn, setupCanonicalFeeJuice } from '../fixtures/utils.js';
+import { ensureAccountContractsPublished, getBalancesFn, setupSponsoredFPC } from '../fixtures/utils.js';
 import { FeeJuicePortalTestingHarnessFactory } from '../shared/gas_portal_test_harness.js';
 const { E2E_DATA_PATH: dataPath } = process.env;
 /**
@@ -26,27 +25,29 @@ const { E2E_DATA_PATH: dataPath } = process.env;
  * PublicDeployAccounts: Deploys the accounts publicly.
  * DeployFeeJuice: Deploys the Fee Juice contract.
  * FPCSetup: Deploys BananaCoin and FPC contracts, and bridges gas from L1.
+ * SponsoredFPCSetup: Deploys Sponsored FPC contract, and bridges gas from L1.
  * FundAlice: Mints private and public bananas to Alice.
  * SetupSubscription: Deploys a counter contract and a subscription contract, and mints Fee Juice to the subscription contract.
  */ export class FeesTest {
     numberOfAccounts;
     snapshotManager;
-    wallets;
+    accounts;
     logger;
-    pxe;
     aztecNode;
+    aztecNodeAdmin;
     cheatCodes;
-    aliceWallet;
+    wallet;
     aliceAddress;
-    bobWallet;
     bobAddress;
     sequencerAddress;
     coinbase;
     fpcAdmin;
     gasSettings;
+    rollupContract;
     feeJuiceContract;
     bananaCoin;
     bananaFPC;
+    sponsoredFPC;
     counterContract;
     subscriptionContract;
     feeJuiceBridgeTestHarness;
@@ -63,13 +64,15 @@ const { E2E_DATA_PATH: dataPath } = process.env;
     APP_SPONSORED_TX_GAS_LIMIT;
     constructor(testName, numberOfAccounts = 3, setupOptions = {}){
         this.numberOfAccounts = numberOfAccounts;
-        this.wallets = [];
+        this.accounts = [];
         this.ALICE_INITIAL_BANANAS = BigInt(1e22);
         this.SUBSCRIPTION_AMOUNT = BigInt(1e19);
         this.APP_SPONSORED_TX_GAS_LIMIT = BigInt(10e9);
         if (!numberOfAccounts) {
             throw new Error('There must be at least 1 initial account.');
         }
+        setupOptions.coinbase ??= EthAddress.random();
+        this.coinbase = setupOptions.coinbase;
         this.logger = createLogger(`e2e:e2e_fees:${testName}`);
         this.snapshotManager = createSnapshotManager(`e2e_fees/${testName}-${numberOfAccounts}`, dataPath, {
             startProverNode: true,
@@ -80,16 +83,12 @@ const { E2E_DATA_PATH: dataPath } = process.env;
     }
     async setup() {
         const context = await this.snapshotManager.setup();
-        await context.aztecNode.setConfig({
-            feeRecipient: this.sequencerAddress,
-            coinbase: this.coinbase
-        });
-        const rollupContract = RollupContract.getFromConfig(context.aztecNodeConfig);
-        this.chainMonitor = new ChainMonitor(rollupContract, this.logger, 200).start();
+        this.rollupContract = RollupContract.getFromConfig(context.aztecNodeConfig);
+        this.chainMonitor = new ChainMonitor(this.rollupContract, context.dateProvider, this.logger, 200).start();
         return this;
     }
     async teardown() {
-        this.chainMonitor.stop();
+        await this.chainMonitor.stop();
         await this.snapshotManager.teardown();
     }
     setIsMarkingAsProven(b) {
@@ -101,15 +100,33 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             await sleep(1000);
         }
     }
-    async mintAndBridgeFeeJuice(address, amount) {
-        const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(amount, address);
+    async getBlockRewards() {
+        const blockReward = await this.rollupContract.getCheckpointReward();
+        const rewardConfig = await this.rollupContract.getRewardConfig();
+        const balance = await this.feeJuiceBridgeTestHarness.getL1FeeJuiceBalance(EthAddress.fromString(rewardConfig.rewardDistributor));
+        const toDistribute = balance > blockReward ? blockReward : balance;
+        const sequencerBlockRewards = toDistribute * BigInt(rewardConfig.sequencerBps) / 10000n;
+        const proverBlockRewards = toDistribute - sequencerBlockRewards;
+        return {
+            sequencerBlockRewards,
+            proverBlockRewards
+        };
+    }
+    async mintAndBridgeFeeJuice(minter, recipient) {
+        const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(recipient);
         const { claimSecret: secret, messageLeafIndex: index } = claim;
-        await this.feeJuiceContract.methods.claim(address, amount, secret, index).send().wait();
+        await this.feeJuiceContract.methods.claim(recipient, claim.claimAmount, secret, index).send({
+            from: minter
+        }).wait();
     }
     /** Alice mints bananaCoin tokens privately to the target address and redeems them. */ async mintPrivateBananas(amount, address) {
-        const balanceBefore = await this.bananaCoin.methods.balance_of_private(address).simulate();
-        await mintTokensToPrivate(this.bananaCoin, this.aliceWallet, address, amount);
-        const balanceAfter = await this.bananaCoin.methods.balance_of_private(address).simulate();
+        const balanceBefore = await this.bananaCoin.methods.balance_of_private(address).simulate({
+            from: this.aliceAddress
+        });
+        await mintTokensToPrivate(this.bananaCoin, this.aliceAddress, address, amount);
+        const balanceAfter = await this.bananaCoin.methods.balance_of_private(address).simulate({
+            from: this.aliceAddress
+        });
         expect(balanceAfter).toEqual(balanceBefore + amount);
     }
     async applyBaseSnapshots() {
@@ -119,129 +136,126 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         await this.applyDeployBananaTokenSnapshot();
     }
     async applyInitialAccountsSnapshot() {
-        await this.snapshotManager.snapshot('initial_accounts', deployAccounts(this.numberOfAccounts, this.logger), async ({ deployedAccounts }, { pxe, aztecNode, aztecNodeConfig })=>{
-            this.pxe = pxe;
+        await this.snapshotManager.snapshot('initial_accounts', deployAccounts(this.numberOfAccounts, this.logger), async ({ deployedAccounts }, { wallet, aztecNode, cheatCodes })=>{
+            this.wallet = wallet;
             this.aztecNode = aztecNode;
+            this.aztecNodeAdmin = aztecNode;
             this.gasSettings = GasSettings.default({
                 maxFeesPerGas: (await this.aztecNode.getCurrentBaseFees()).mul(2)
             });
-            this.cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe);
-            this.wallets = await Promise.all(deployedAccounts.map((a)=>getSchnorrWallet(pxe, a.address, a.signingKey)));
-            this.wallets.forEach((w, i)=>this.logger.verbose(`Wallet ${i} address: ${w.getAddress()}`));
-            [this.aliceWallet, this.bobWallet] = this.wallets.slice(0, 2);
-            [this.aliceAddress, this.bobAddress, this.sequencerAddress] = this.wallets.map((w)=>w.getAddress());
+            this.cheatCodes = cheatCodes;
+            this.accounts = deployedAccounts.map((a)=>a.address);
+            this.accounts.forEach((a, i)=>this.logger.verbose(`Account ${i} address: ${a}`));
+            [this.aliceAddress, this.bobAddress, this.sequencerAddress] = this.accounts.slice(0, 3);
             // We set Alice as the FPC admin to avoid the need for deployment of another account.
             this.fpcAdmin = this.aliceAddress;
             const canonicalFeeJuice = await getCanonicalFeeJuice();
-            this.feeJuiceContract = await FeeJuiceContract.at(canonicalFeeJuice.address, this.aliceWallet);
-            if (this.numberOfAccounts > 1) {
-                const bobInstance = (await this.bobWallet.getContractMetadata(this.bobAddress)).contractInstance;
-                await this.aliceWallet.registerAccount(deployedAccounts[1].secret, await computePartialAddress(bobInstance));
-            }
-            this.coinbase = EthAddress.random();
-            const { publicClient, walletClient } = createL1Clients(aztecNodeConfig.l1RpcUrls, MNEMONIC);
-            this.feeJuiceBridgeTestHarness = await FeeJuicePortalTestingHarnessFactory.create({
-                aztecNode: aztecNode,
-                pxeService: pxe,
-                publicClient: publicClient,
-                walletClient: walletClient,
-                wallet: this.aliceWallet,
-                logger: this.logger
-            });
+            this.feeJuiceContract = FeeJuiceContract.at(canonicalFeeJuice.address, this.wallet);
         });
     }
     async applyPublicDeployAccountsSnapshot() {
-        await this.snapshotManager.snapshot('public_deploy_accounts', ()=>ensureAccountsPubliclyDeployed(this.aliceWallet, this.wallets));
+        await this.snapshotManager.snapshot('public_deploy_accounts', ()=>ensureAccountContractsPublished(this.wallet, this.accounts));
     }
     async applySetupFeeJuiceSnapshot() {
-        await this.snapshotManager.snapshot('setup_fee_juice', async (context)=>{
-            await setupCanonicalFeeJuice(context.pxe);
-        }, async (_data, context)=>{
+        await this.snapshotManager.snapshot('setup_fee_juice', async ()=>{}, async (_data, context)=>{
             this.context = context;
-            this.feeJuiceContract = await FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, this.aliceWallet);
-            this.getGasBalanceFn = getBalancesFn('⛽', this.feeJuiceContract.methods.balance_of_public, this.logger);
-            const { publicClient, walletClient } = createL1Clients(context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
+            this.feeJuiceContract = FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, this.wallet);
+            this.getGasBalanceFn = getBalancesFn('⛽', this.feeJuiceContract.methods.balance_of_public, this.aliceAddress, this.logger);
             this.feeJuiceBridgeTestHarness = await FeeJuicePortalTestingHarnessFactory.create({
                 aztecNode: context.aztecNode,
-                pxeService: context.pxe,
-                publicClient: publicClient,
-                walletClient: walletClient,
-                wallet: this.aliceWallet,
+                aztecNodeAdmin: context.aztecNode,
+                l1Client: context.deployL1ContractsValues.l1Client,
+                wallet: this.wallet,
                 logger: this.logger
             });
         });
     }
     async applyDeployBananaTokenSnapshot() {
         await this.snapshotManager.snapshot('deploy_banana_token', async ()=>{
-            const bananaCoin = await BananaCoin.deploy(this.aliceWallet, this.aliceAddress, 'BC', 'BC', 18n).send().deployed();
+            const bananaCoin = await BananaCoin.deploy(this.wallet, this.aliceAddress, 'BC', 'BC', 18n).send({
+                from: this.aliceAddress
+            }).deployed();
             this.logger.info(`BananaCoin deployed at ${bananaCoin.address}`);
             return {
                 bananaCoinAddress: bananaCoin.address
             };
-        }, async ({ bananaCoinAddress })=>{
-            this.bananaCoin = await BananaCoin.at(bananaCoinAddress, this.aliceWallet);
+        }, ({ bananaCoinAddress })=>{
+            this.bananaCoin = BananaCoin.at(bananaCoinAddress, this.wallet);
+            const logger = this.logger;
+            this.getBananaPublicBalanceFn = getBalancesFn('🍌.public', this.bananaCoin.methods.balance_of_public, this.aliceAddress, logger);
+            this.getBananaPrivateBalanceFn = getBalancesFn('🍌.private', this.bananaCoin.methods.balance_of_private, this.aliceAddress, logger);
+            return Promise.resolve();
         });
     }
     async applyFPCSetupSnapshot() {
         await this.snapshotManager.snapshot('fpc_setup', async (context)=>{
             const feeJuiceContract = this.feeJuiceBridgeTestHarness.feeJuice;
-            expect((await context.pxe.getContractMetadata(feeJuiceContract.address)).isContractPubliclyDeployed).toBe(true);
+            expect((await context.wallet.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
             const bananaCoin = this.bananaCoin;
-            const bananaFPC = await FPCContract.deploy(this.aliceWallet, bananaCoin.address, this.fpcAdmin).send().deployed();
+            const bananaFPC = await FPCContract.deploy(this.wallet, bananaCoin.address, this.fpcAdmin).send({
+                from: this.aliceAddress
+            }).deployed();
             this.logger.info(`BananaPay deployed at ${bananaFPC.address}`);
-            await this.feeJuiceBridgeTestHarness.bridgeFromL1ToL2(FEE_FUNDING_FOR_TESTER_ACCOUNT, bananaFPC.address);
+            await this.feeJuiceBridgeTestHarness.bridgeFromL1ToL2(bananaFPC.address, this.aliceAddress);
             return {
                 bananaFPCAddress: bananaFPC.address,
                 feeJuiceAddress: feeJuiceContract.address,
                 l1FeeJuiceAddress: this.feeJuiceBridgeTestHarness.l1FeeJuiceAddress,
                 rollupAddress: context.deployL1ContractsValues.l1ContractAddresses.rollupAddress
             };
-        }, async (data, context)=>{
-            const bananaFPC = await FPCContract.at(data.bananaFPCAddress, this.aliceWallet);
+        }, (data, context)=>{
+            const bananaFPC = FPCContract.at(data.bananaFPCAddress, this.wallet);
             this.bananaFPC = bananaFPC;
-            const logger = this.logger;
-            this.getBananaPublicBalanceFn = getBalancesFn('🍌.public', this.bananaCoin.methods.balance_of_public, logger);
-            this.getBananaPrivateBalanceFn = getBalancesFn('🍌.private', this.bananaCoin.methods.balance_of_private, logger);
             this.getCoinbaseBalance = async ()=>{
-                const { walletClient } = createL1Clients(context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
+                const l1Client = createExtendedL1Client(context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
                 const gasL1 = getContract({
                     address: data.l1FeeJuiceAddress.toString(),
                     abi: TestERC20Abi,
-                    client: walletClient
+                    client: l1Client
                 });
                 return await gasL1.read.balanceOf([
                     this.coinbase.toString()
                 ]);
             };
             this.getCoinbaseSequencerRewards = async ()=>{
-                const { walletClient } = createL1Clients(context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
-                const rollup = getContract({
-                    address: data.rollupAddress.toString(),
-                    abi: RollupAbi,
-                    client: walletClient
-                });
-                return await rollup.read.getSequencerRewards([
-                    this.coinbase.toString()
-                ]);
+                return await this.rollupContract.getSequencerRewards(this.coinbase);
             };
             this.getProverFee = async (blockNumber)=>{
-                const { walletClient } = createL1Clients(context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
-                const rollup = getContract({
-                    address: data.rollupAddress.toString(),
-                    abi: RollupAbi,
-                    client: walletClient
-                });
-                const provingCostPerMana = await rollup.read.getProvingCostPerManaInFeeAsset();
-                const block = await this.pxe.getBlock(blockNumber);
+                const block = await this.aztecNode.getBlock(blockNumber);
+                // @todo @lherskind As we deal with #13601
+                // Right now the value is from `FeeLib.sol`
+                const L1_GAS_PER_EPOCH_VERIFIED = 1000000n;
+                // We round up
+                const mulDiv = (a, b, c)=>a * b / c + (a * b % c > 0n ? 1n : 0n);
+                const { baseFee } = await this.rollupContract.getL1FeesAt(block.header.globalVariables.timestamp);
+                const proverCost = mulDiv(mulDiv(L1_GAS_PER_EPOCH_VERIFIED, baseFee, await this.rollupContract.getEpochDuration()), 1n, await this.rollupContract.getManaTarget()) + await this.rollupContract.getProvingCostPerMana();
+                const price = await this.rollupContract.getFeeAssetPerEth();
                 const mana = block.header.totalManaUsed.toBigInt();
-                return mana * provingCostPerMana;
+                return mulDiv(mana * proverCost, price, 10n ** 9n);
             };
+            return Promise.resolve();
+        });
+    }
+    async applySponsoredFPCSetupSnapshot() {
+        await this.snapshotManager.snapshot('sponsored_fpc_setup', async (context)=>{
+            const feeJuiceContract = this.feeJuiceBridgeTestHarness.feeJuice;
+            expect((await context.wallet.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
+            const sponsoredFPC = await setupSponsoredFPC(this.wallet);
+            this.logger.info(`SponsoredFPC at ${sponsoredFPC.address}`);
+            return {
+                sponsoredFPCAddress: sponsoredFPC.address
+            };
+        }, (data)=>{
+            this.sponsoredFPC = SponsoredFPCContract.at(data.sponsoredFPCAddress, this.wallet);
+            return Promise.resolve();
         });
     }
     async applyFundAliceWithBananas() {
         await this.snapshotManager.snapshot('fund_alice', async ()=>{
             await this.mintPrivateBananas(this.ALICE_INITIAL_BANANAS, this.aliceAddress);
-            await this.bananaCoin.methods.mint_to_public(this.aliceAddress, this.ALICE_INITIAL_BANANAS).send().wait();
+            await this.bananaCoin.methods.mint_to_public(this.aliceAddress, this.ALICE_INITIAL_BANANAS).send({
+                from: this.aliceAddress
+            }).wait();
         }, ()=>Promise.resolve());
     }
     async applyFundAliceWithPrivateBananas() {
@@ -249,21 +263,4 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             await this.mintPrivateBananas(this.ALICE_INITIAL_BANANAS, this.aliceAddress);
         }, ()=>Promise.resolve());
     }
-    async applySetupSubscription() {
-        await this.snapshotManager.snapshot('setup_subscription', async ()=>{
-            const counterContract = await CounterContract.deploy(this.bobWallet, 0, this.bobAddress).send().deployed();
-            // Deploy subscription contract, that allows subscriptions for SUBSCRIPTION_AMOUNT of bananas
-            const subscriptionContract = await AppSubscriptionContract.deploy(this.bobWallet, counterContract.address, this.bobAddress, this.bananaCoin.address, this.SUBSCRIPTION_AMOUNT, this.APP_SPONSORED_TX_GAS_LIMIT).send().deployed();
-            // Mint some Fee Juice to the subscription contract
-            // Could also use bridgeFromL1ToL2 from the harness, but this is more direct
-            await this.mintAndBridgeFeeJuice(subscriptionContract.address, FEE_FUNDING_FOR_TESTER_ACCOUNT);
-            return {
-                counterContractAddress: counterContract.address,
-                subscriptionContractAddress: subscriptionContract.address
-            };
-        }, async ({ counterContractAddress, subscriptionContractAddress })=>{
-            this.counterContract = await CounterContract.at(counterContractAddress, this.bobWallet);
-            this.subscriptionContract = await AppSubscriptionContract.at(subscriptionContractAddress, this.bobWallet);
-        });
-    }
 }

package/dest/e2e_l1_publisher/write_json.d.ts

@@ -0,0 +1,10 @@
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import type { L2Block } from '@aztec/aztec.js/block';
+import { Fr } from '@aztec/aztec.js/fields';
+import { BatchedBlob, Blob } from '@aztec/blob-lib';
+/**
+ * Creates a json object that can be used to test the solidity contract.
+ * The json object must be put into
+ */
+export declare function writeJson(fileName: string, block: L2Block, l1ToL2Content: Fr[], blobs: Blob[], batchedBlob: BatchedBlob, recipientAddress: AztecAddress, deployerAddress: `0x${string}`): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid3JpdGVfanNvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2UyZV9sMV9wdWJsaXNoZXIvd3JpdGVfanNvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDckQsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzVDLE9BQU8sRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUE2RCxNQUFNLGlCQUFpQixDQUFDO0FBTy9HOzs7R0FHRztBQUNILHdCQUFzQixTQUFTLENBQzdCLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLEtBQUssRUFBRSxPQUFPLEVBQ2QsYUFBYSxFQUFFLEVBQUUsRUFBRSxFQUNuQixLQUFLLEVBQUUsSUFBSSxFQUFFLEVBQ2IsV0FBVyxFQUFFLFdBQVcsRUFDeEIsZ0JBQWdCLEVBQUUsWUFBWSxFQUM5QixlQUFlLEVBQUUsS0FBSyxNQUFNLEVBQUUsR0FDN0IsT0FBTyxDQUFDLElBQUksQ0FBQyxDQXNEZiJ9

package/dest/e2e_l1_publisher/write_json.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"write_json.d.ts","sourceRoot":"","sources":["../../src/e2e_l1_publisher/write_json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,IAAI,EAA6D,MAAM,iBAAiB,CAAC;AAO/G;;;GAGG;AACH,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO,EACd,aAAa,EAAE,EAAE,EAAE,EACnB,KAAK,EAAE,IAAI,EAAE,EACb,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,YAAY,EAC9B,eAAe,EAAE,KAAK,MAAM,EAAE,GAC7B,OAAO,CAAC,IAAI,CAAC,CAsDf"}

package/dest/e2e_l1_publisher/write_json.js

@@ -0,0 +1,58 @@
+import { getEthBlobEvaluationInputs, getPrefixedEthBlobCommitments } from '@aztec/blob-lib';
+import { writeFile } from 'fs/promises';
+const AZTEC_GENERATE_TEST_DATA = !!process.env.AZTEC_GENERATE_TEST_DATA;
+/**
+ * Creates a json object that can be used to test the solidity contract.
+ * The json object must be put into
+ */ export async function writeJson(fileName, block, l1ToL2Content, blobs, batchedBlob, recipientAddress, deployerAddress) {
+    if (!AZTEC_GENERATE_TEST_DATA) {
+        return;
+    }
+    // Path relative to the package.json in the end-to-end folder
+    const path = `../../l1-contracts/test/fixtures/${fileName}.json`;
+    const asHex = (value, size = 64)=>{
+        const buffer = Buffer.isBuffer(value) ? value : value.toBuffer();
+        return `0x${buffer.toString('hex').padStart(size, '0')}`;
+    };
+    const jsonObject = {
+        populate: {
+            l1ToL2Content: l1ToL2Content.map((value)=>asHex(value)),
+            recipient: asHex(recipientAddress.toField()),
+            sender: deployerAddress
+        },
+        messages: {
+            l2ToL1Messages: block.body.txEffects.flatMap((txEffect)=>txEffect.l2ToL1Msgs).map((value)=>asHex(value))
+        },
+        checkpoint: {
+            // The json formatting in forge is a bit brittle, so we convert Fr to a number in the few values below.
+            // This should not be a problem for testing as long as the values are not larger than u32.
+            archive: asHex(block.archive.root),
+            blobCommitments: getPrefixedEthBlobCommitments(blobs),
+            batchedBlobInputs: getEthBlobEvaluationInputs(batchedBlob),
+            checkpointNumber: block.number,
+            body: `0x${block.body.toBuffer().toString('hex')}`,
+            header: {
+                lastArchiveRoot: asHex(block.header.lastArchive.root),
+                blockHeadersHash: asHex(block.header.blockHeadersHash),
+                contentCommitment: {
+                    blobsHash: asHex(block.header.contentCommitment.blobsHash),
+                    inHash: asHex(block.header.contentCommitment.inHash),
+                    outHash: asHex(block.header.contentCommitment.outHash)
+                },
+                slotNumber: Number(block.header.globalVariables.slotNumber),
+                timestamp: Number(block.header.globalVariables.timestamp),
+                coinbase: asHex(block.header.globalVariables.coinbase, 40),
+                feeRecipient: asHex(block.header.globalVariables.feeRecipient),
+                gasFees: {
+                    feePerDaGas: Number(block.header.globalVariables.gasFees.feePerDaGas),
+                    feePerL2Gas: Number(block.header.globalVariables.gasFees.feePerL2Gas)
+                },
+                totalManaUsed: block.header.totalManaUsed.toNumber()
+            },
+            headerHash: asHex(block.getCheckpointHeader().hash()),
+            numTxs: block.body.txEffects.length
+        }
+    };
+    const output = JSON.stringify(jsonObject, null, 2);
+    await writeFile(path, output, 'utf8');
+}

package/dest/e2e_multi_validator/utils.d.ts

@@ -0,0 +1,12 @@
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import type { EthPrivateKey } from '@aztec/node-keystore';
+export declare function createJSONRPCSigner(keyLookup: Map<string, EthPrivateKey>, stats: Map<string, number>): import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>;
+export declare function createKeyFile1(fileName: string, mnemonic: string, validatorIndex: number, publisher1Key: EthPrivateKey, publisher2Key: EthPrivateKey, coinbase: EthAddress, feeRecipient: AztecAddress): Promise<void>;
+export declare function createKeyFile2(fileName: string, validatorKey: EthPrivateKey, publisherMnemonic: string, publisher1Index: number, coinbase: EthAddress, feeRecipient: AztecAddress): Promise<void>;
+export declare function createKeyFile3(fileName: string, validatorAddress: EthAddress, publisher1Key: EthPrivateKey, publisher2Key: EthPrivateKey, coinbase: EthAddress, remoteSignerUrl: string, feeRecipient: AztecAddress): Promise<void>;
+export declare function createKeyFile4(fileName: string, validator1Address: EthAddress, validator2Address: EthAddress, publisher1Index: number, publisher2Key: EthPrivateKey, mnemonic: string, publisher3Key: EthPrivateKey, coinbase1: EthAddress, coinbase2: EthAddress, remoteSignerUrl: string, feeRecipient1: AztecAddress, feeRecipient2: AztecAddress): Promise<void>;
+export declare function createKeyFile5(fileName: string, proverAddress: EthAddress, remoteSignerUrl: string): Promise<void>;
+export declare function createKeyFile6(fileName: string, mnemonic: string, validator1Index: number, coinbase: EthAddress, feeRecipient: AztecAddress): Promise<void>;
+export declare function addressForPrivateKey(privateKey: EthPrivateKey): EthAddress;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lMmVfbXVsdGlfdmFsaWRhdG9yL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUV6RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFXMUQsd0JBQWdCLG1CQUFtQixDQUFDLFNBQVMsRUFBRSxHQUFHLENBQUMsTUFBTSxFQUFFLGFBQWEsQ0FBQyxFQUFFLEtBQUssRUFBRSxHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxzR0EwRXBHO0FBR0Qsd0JBQXNCLGNBQWMsQ0FDbEMsUUFBUSxFQUFFLE1BQU0sRUFDaEIsUUFBUSxFQUFFLE1BQU0sRUFDaEIsY0FBYyxFQUFFLE1BQU0sRUFDdEIsYUFBYSxFQUFFLGFBQWEsRUFDNUIsYUFBYSxFQUFFLGFBQWEsRUFDNUIsUUFBUSxFQUFFLFVBQVUsRUFDcEIsWUFBWSxFQUFFLFlBQVksaUJBbUIzQjtBQUVELHdCQUFzQixjQUFjLENBQ2xDLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLFlBQVksRUFBRSxhQUFhLEVBQzNCLGlCQUFpQixFQUFFLE1BQU0sRUFDekIsZUFBZSxFQUFFLE1BQU0sRUFDdkIsUUFBUSxFQUFFLFVBQVUsRUFDcEIsWUFBWSxFQUFFLFlBQVksaUJBbUIzQjtBQUVELHdCQUFzQixjQUFjLENBQ2xDLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLGdCQUFnQixFQUFFLFVBQVUsRUFDNUIsYUFBYSxFQUFFLGFBQWEsRUFDNUIsYUFBYSxFQUFFLGFBQWEsRUFDNUIsUUFBUSxFQUFFLFVBQVUsRUFDcEIsZUFBZSxFQUFFLE1BQU0sRUFDdkIsWUFBWSxFQUFFLFlBQVksaUJBaUIzQjtBQUVELHdCQUFzQixjQUFjLENBQ2xDLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLGlCQUFpQixFQUFFLFVBQVUsRUFDN0IsaUJBQWlCLEVBQUUsVUFBVSxFQUM3QixlQUFlLEVBQUUsTUFBTSxFQUN2QixhQUFhLEVBQUUsYUFBYSxFQUM1QixRQUFRLEVBQUUsTUFBTSxFQUNoQixhQUFhLEVBQUUsYUFBYSxFQUM1QixTQUFTLEVBQUUsVUFBVSxFQUNyQixTQUFTLEVBQUUsVUFBVSxFQUNyQixlQUFlLEVBQUUsTUFBTSxFQUN2QixhQUFhLEVBQUUsWUFBWSxFQUMzQixhQUFhLEVBQUUsWUFBWSxpQkE0QjVCO0FBRUQsd0JBQXNCLGNBQWMsQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFLGFBQWEsRUFBRSxVQUFVLEVBQUUsZUFBZSxFQUFFLE1BQU0saUJBY3hHO0FBRUQsd0JBQXNCLGNBQWMsQ0FDbEMsUUFBUSxFQUFFLE1BQU0sRUFDaEIsUUFBUSxFQUFFLE1BQU0sRUFDaEIsZUFBZSxFQUFFLE1BQU0sRUFDdkIsUUFBUSxFQUFFLFVBQVUsRUFDcEIsWUFBWSxFQUFFLFlBQVksaUJBa0IzQjtBQUVELHdCQUFnQixvQkFBb0IsQ0FBQyxVQUFVLEVBQUUsYUFBYSxHQUFHLFVBQVUsQ0FFMUUifQ==

package/dest/e2e_multi_validator/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/e2e_multi_validator/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAW1D,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,sGA0EpG;AAGD,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,iBAmB3B;AAED,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,aAAa,EAC3B,iBAAiB,EAAE,MAAM,EACzB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,iBAmB3B;AAED,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,UAAU,EAC5B,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,UAAU,EACpB,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,YAAY,iBAiB3B;AAED,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,iBAAiB,EAAE,UAAU,EAC7B,iBAAiB,EAAE,UAAU,EAC7B,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,UAAU,EACrB,SAAS,EAAE,UAAU,EACrB,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,YAAY,EAC3B,aAAa,EAAE,YAAY,iBA4B5B;AAED,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,iBAcxG;AAED,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,iBAkB3B;AAED,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,aAAa,GAAG,UAAU,CAE1E"}