chore: reconsider life choices

Author: LHerskind

l1-contracts/src/mock/TestERC20.sol

@@ -34,11 +34,8 @@ contract TestERC20 is ERC20, IMintableERC20, Ownable2Step {
   }
 
   function acceptOwnership() public virtual override(Ownable2Step) {
-    address oldOwner = owner();
     address newOwner = pendingOwner();
     super.acceptOwnership();
-
-    removeMinter(oldOwner);
     addMinter(newOwner);
   }
 }

l1-contracts/test/test_erc20/transferOwnership.t.sol

@@ -64,8 +64,6 @@ contract TransferOwnershipTest is TestERC20TestBase {
 
     assertEq(testERC20.owner(), _newOwner);
     assertEq(testERC20.minters(_newOwner), true);
-    if (_newOwner != oldOwner) {
-      assertEq(testERC20.minters(oldOwner), false);
-    }
+    assertEq(testERC20.minters(oldOwner), true);
   }
 }

yarn-project/end-to-end/src/e2e_epochs/epochs_test.ts

@@ -92,7 +92,7 @@ export class EpochsTestContext {
       : DEFAULT_L1_BLOCK_TIME;
     const ethereumSlotDuration = opts.ethereumSlotDuration ?? envEthereumSlotDuration;
     const aztecSlotDuration = opts.aztecSlotDuration ?? ethereumSlotDuration * 2;
-    const aztecEpochDuration = opts.aztecEpochDuration ?? 4;
+    const aztecEpochDuration = opts.aztecEpochDuration ?? 6;
     const aztecProofSubmissionEpochs = opts.aztecProofSubmissionEpochs ?? 1;
     return { ethereumSlotDuration, aztecSlotDuration, aztecEpochDuration, aztecProofSubmissionEpochs };
   }

yarn-project/end-to-end/src/e2e_epochs/epochs_upload_failed_proof.test.ts

@@ -73,7 +73,7 @@ describe('e2e_epochs/epochs_upload_failed_proof', () => {
     // Wait until the start of epoch one so prover node starts proving epoch 0,
     // and wait for the data to be uploaded to the remote file store
     await test.waitUntilEpochStarts(1);
-    await retryUntil(() => epochUploadUrl !== undefined, 'Upload epoch failure', 120, 1);
+    await retryUntil(() => epochUploadUrl !== undefined, 'Upload epoch failure', 240, 1);
 
     // Stop everything, we're going to prove on a fresh instance
     await test.teardown();

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

@@ -264,19 +264,26 @@ describe('veto slash', () => {
 
       const newSlasherAddress = await deployNewSlasher(vetoerL1Client, slasherType);
       debugLogger.info(`\n\nnewSlasherAddress: ${newSlasherAddress}\n\n`);
-      const { receipt } = await createL1TxUtilsFromViemWallet(
-        t.ctx.deployL1ContractsValues.l1Client,
-        t.logger,
-        t.ctx.dateProvider,
-      ).sendAndMonitorTransaction({
-        to: rollup.address,
-        data: encodeFunctionData({
-          abi: RollupAbi,
-          functionName: 'setSlasher',
-          args: [newSlasherAddress.toString()],
-        }),
+
+      // Need to impersonate governance to set the new slasher
+      await t.ctx.cheatCodes.eth.startImpersonating(
+        t.ctx.deployL1ContractsValues.l1ContractAddresses.governanceAddress,
+      );
+
+      const setSlasherTx = await t.ctx.deployL1ContractsValues.l1Client.writeContract({
+        address: rollup.address,
+        abi: RollupAbi,
+        functionName: 'setSlasher',
+        args: [newSlasherAddress.toString()],
+        account: t.ctx.deployL1ContractsValues.l1ContractAddresses.governanceAddress.toString(),
+      });
+      const receipt = await t.ctx.deployL1ContractsValues.l1Client.waitForTransactionReceipt({
+        hash: setSlasherTx,
       });
       expect(receipt.status).toEqual('success');
+
+      await t.ctx.cheatCodes.eth.stopImpersonating(t.ctx.deployL1ContractsValues.l1ContractAddresses.governanceAddress);
+
       const slasherAddress = await rollup.getSlasher();
       expect(slasherAddress.toLowerCase()).toEqual(newSlasherAddress.toString().toLowerCase());
       debugLogger.info(`\n\nnew slasher address: ${slasherAddress}\n\n`);

yarn-project/ethereum/src/test/eth_cheat_codes.ts

@@ -1,6 +1,6 @@
 import { toBigIntBE, toHex } from '@aztec/foundation/bigint-buffer';
 import { keccak256 } from '@aztec/foundation/crypto';
-import type { EthAddress } from '@aztec/foundation/eth-address';
+import { EthAddress } from '@aztec/foundation/eth-address';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 import { createLogger } from '@aztec/foundation/log';
 import type { TestDateProvider } from '@aztec/foundation/timer';
@@ -112,7 +112,7 @@ export class EthCheatCodes {
    * @param account - The account to set the balance for
    * @param balance - The balance to set
    */
-  public async setBalance(account: EthAddress, balance: bigint): Promise<void> {
+  public async setBalance(account: EthAddress | Hex, balance: bigint): Promise<void> {
     try {
       await this.rpcCall('anvil_setBalance', [account.toString(), toHex(balance)]);
     } catch (err) {
@@ -121,6 +121,11 @@ export class EthCheatCodes {
     this.logger.warn(`Set balance for ${account} to ${balance}`);
   }
 
+  public async getBalance(account: EthAddress | Hex): Promise<bigint> {
+    const res = await this.rpcCall('eth_getBalance', [account.toString(), 'latest']);
+    return BigInt(res);
+  }
+
   /**
    * Set the interval between successive blocks (block time). This does NOT enable interval mining.
    * @param interval - The interval to use between blocks
@@ -300,6 +305,11 @@ export class EthCheatCodes {
    */
   public async startImpersonating(who: EthAddress | Hex): Promise<void> {
     try {
+      // Since the `who` impersonated will sometimes be a contract without funds, we fund it if needed.
+      if ((await this.getBalance(who)) === 0n) {
+        await this.setBalance(who, 10n * 10n ** 18n);
+      }
+
       await this.rpcCall('hardhat_impersonateAccount', [who.toString()]);
     } catch (err) {
       throw new Error(`Error impersonating ${who}: ${err}`);

yarn-project/ethereum/src/test/rollup_cheat_codes.ts

@@ -258,9 +258,6 @@ export class RollupCheatCodes {
    */
   public async setProvingCostPerMana(ethValue: bigint) {
     await this.asOwner(async (account, rollup) => {
-      // We are minting funds for the `account` since we seem to sometimes ends up with just a poor account :shrug:.
-      await this.ethCheatCodes.setBalance(EthAddress.fromString(account), 10n * 10n ** 18n);
-
       const hash = await rollup.write.setProvingCostPerMana([ethValue], {
         account,
         chain: this.client.chain,