refactor!: StakingAssetHandler is a normal faucet

Author: just-mitch

l1-contracts/script/InternalGov.s.sol

@@ -66,10 +66,8 @@ contract GovScript is Test {
     emit log_named_decimal_uint("\tMint Amount", feeAssetHandler.mintAmount(), 18);
 
     emit log_named_address("# Staking Asset", address(stakingAsset));
-    emit log_named_uint("\tMint Interval    ", stakingAssetHandler.mintInterval());
-    emit log_named_uint("\tDeposits Per Mint", stakingAssetHandler.depositsPerMint());
+    emit log_named_decimal_uint("\tFaucet Amount    ", stakingAssetHandler.faucetAmount(), 18);
     emit log_named_address("\tRollup           ", address(stakingAssetHandler.getRollup()));
-    emit log_named_address("\tWithdrawer       ", address(stakingAssetHandler.withdrawer()));
 
     emit log_named_address("# Rollup", address(rollup));
     uint256 baseFee = rollup.getManaBaseFeeAt(Timestamp.wrap(block.timestamp), true);
@@ -207,28 +205,13 @@ contract GovScript is Test {
 
   // This should be called to update the staking asset handler config when the rollup is updated
   function updateStakingAssetHandlerConfig() public {
-    uint256 mintInterval = 60 * 60 * 24;
-    uint256 depositsPerMint = 100;
+    uint256 newFaucetAmount = 1_000_000 * 1e18; // 1M STK
     address amin = 0x3b218d0F26d15B36C715cB06c949210a0d630637;
 
-    // Update the deposits per mint if it differs
-    if (stakingAssetHandler.mintInterval() != mintInterval) {
+    // Update the faucet amount if it differs
+    if (stakingAssetHandler.faucetAmount() != newFaucetAmount) {
       vm.startBroadcast(ME);
-      stakingAssetHandler.setMintInterval(mintInterval);
-      vm.stopBroadcast();
-    }
-
-    // Update the deposits per mint if it differs
-    if (stakingAssetHandler.depositsPerMint() != depositsPerMint) {
-      vm.startBroadcast(ME);
-      stakingAssetHandler.setDepositsPerMint(depositsPerMint);
-      vm.stopBroadcast();
-    }
-
-    // Update the withdrawer if it's not amin
-    if (stakingAssetHandler.withdrawer() != amin) {
-      vm.startBroadcast(ME);
-      stakingAssetHandler.setWithdrawer(amin);
+      stakingAssetHandler.setFaucetAmount(newFaucetAmount);
       vm.stopBroadcast();
     }
 

l1-contracts/script/StakingAssetHandler.s.sol

@@ -27,8 +27,6 @@ contract StakingAssetHandlerScript is Test {
   string internal constant DOMAIN = "testnet.aztec.network";
   string internal constant SCOPE = "personhood";
 
-  bytes32 public constant DEPOSIT_MERKLE_ROOT = bytes32(0);
-
   ZKPassportVerifier internal constant zkPassportVerifier =
     ZKPassportVerifier(0x0b05F45ff2F431a136eE8e708458286eC02b0d00);
 
@@ -40,25 +38,20 @@ contract StakingAssetHandlerScript is Test {
   function deploy() public {
     address amin = 0x3b218d0F26d15B36C715cB06c949210a0d630637;
 
-    address[] memory isUnhinged = new address[](1);
-    isUnhinged[0] = amin;
+    address[] memory unhingedAddresses = new address[](1);
+    unhingedAddresses[0] = amin;
 
     StakingAssetHandler.StakingAssetHandlerArgs memory stakingAssetHandlerArgs =
       StakingAssetHandler.StakingAssetHandlerArgs({
         owner: ME,
         stakingAsset: address(stakingAsset),
         registry: registry,
-        withdrawer: amin,
-        mintInterval: 60 * 60 * 24,
-        depositsPerMint: 1000,
-        depositMerkleRoot: DEPOSIT_MERKLE_ROOT,
+        faucetAmount: 1_000_000 * 1e18, // 1M STK
         zkPassportVerifier: zkPassportVerifier,
-        unhinged: isUnhinged,
+        unhinged: unhingedAddresses,
         domain: DOMAIN,
         scope: SCOPE,
-        skipBindCheck: false, // DO NOT: skip bind check
-        skipMerkleCheck: true, // DO: skip merkle check
-        validatorsToFlush: 48
+        skipBindCheck: false // DO NOT: skip bind check
       });
 
     vm.startBroadcast(ME);

l1-contracts/script/deploy/DeployAztecL1Contracts.s.sol

@@ -230,18 +230,13 @@ contract DeployAztecL1Contracts is Script, Test {
           owner: deployer,
           stakingAsset: address(_output.stakingAsset),
           registry: _output.registry,
-          withdrawer: AMIN,
-          validatorsToFlush: 16,
-          mintInterval: 60 * 60 * 24,
-          depositsPerMint: 10,
-          depositMerkleRoot: bytes32(0),
+          faucetAmount: 1_000_000 * 1e18, // 1M STK
           zkPassportVerifier: ZKPassportVerifier(zkPassportVerifier),
           unhinged: unhinged,
           // Scopes
           domain: zkConfig.domain,
           scope: zkConfig.scope,
-          skipBindCheck: !isSepoliaTestChain, // Only skip bind check with mock verifier
-          skipMerkleCheck: true // DO: skip merkle check
+          skipBindCheck: !isSepoliaTestChain // Only skip bind check with mock verifier
         })
       );
       TestERC20(address(_output.stakingAsset)).addMinter(address(_output.stakingAssetHandler));