changing naming for configs

packages/contracts-bedrock/.gas-snapshot

@@ -17,7 +17,7 @@ AttestationStationTest:test_attest_bulk_succeeds() (gas: 703749)
 AttestationStationTest:test_attest_individual_succeeds() (gas: 632087)
 AttestationStationTest:test_attest_single_succeeds() (gas: 651325)
 BlockOracle_Test:test_checkpointAndLoad_succeeds() (gas: 58341)
-BlockOracle_Test:test_load_noBlockHash_reverts() (gas: 12805)
+BlockOracle_Test:test_load_noBlockHash_reverts() (gas: 13659)
 Bytes_slice_Test:test_slice_acrossMultipleWords_works() (gas: 9413)
 Bytes_slice_Test:test_slice_acrossWords_works() (gas: 1430)
 Bytes_slice_Test:test_slice_fromNonZeroIdx_works() (gas: 17240)
@@ -47,8 +47,8 @@ CrossDomainOwnableThroughPortal_Test:test_depositTransaction_crossDomainOwner_su
 CrossDomainOwnable_Test:test_onlyOwner_notOwner_reverts() (gas: 10597)
 CrossDomainOwnable_Test:test_onlyOwner_succeeds() (gas: 34883)
 DelayedVetoable_Getters_Test:test_getters() (gas: 24466)
-DelayedVetoable_Getters_TestFail:test_getters_notZeroAddress_reverts() (gas: 31206)
-DelayedVetoable_HandleCall_TestFail:test_handleCall_unauthorizedInitiation_reverts() (gas: 20291)
+DelayedVetoable_Getters_TestFail:test_getters_notZeroAddress_reverts() (gas: 36220)
+DelayedVetoable_HandleCall_TestFail:test_handleCall_unauthorizedInitiation_reverts() (gas: 21867)
 DeleteOutput:test_script_succeeds() (gas: 3100)
 DeployerWhitelist_Test:test_owner_succeeds() (gas: 7582)
 DeployerWhitelist_Test:test_storageSlots_succeeds() (gas: 33395)
@@ -183,7 +183,7 @@ L1CrossDomainMessenger_Test:test_relayMessage_v2_reverts() (gas: 12343)
 L1CrossDomainMessenger_Test:test_replayMessage_withValue_reverts() (gas: 33133)
 L1CrossDomainMessenger_Test:test_sendMessage_succeeds() (gas: 392933)
 L1CrossDomainMessenger_Test:test_sendMessage_twice_succeeds() (gas: 1669172)
-L1CrossDomainMessenger_Test:test_xDomainMessageSender_reset_succeeds() (gas: 86992)
+L1CrossDomainMessenger_Test:test_xDomainMessageSender_reset_succeeds() (gas: 87853)
 L1CrossDomainMessenger_Test:test_xDomainSender_notSet_reverts() (gas: 24253)
 L1ERC721Bridge_Test:test_bridgeERC721To_localTokenZeroAddress_reverts() (gas: 62677)
 L1ERC721Bridge_Test:test_bridgeERC721To_remoteTokenZeroAddress_reverts() (gas: 37273)
@@ -227,7 +227,7 @@ L2CrossDomainMessenger_Test:test_relayMessage_toSystemContract_reverts() (gas: 3
 L2CrossDomainMessenger_Test:test_relayMessage_v2_reverts() (gas: 11689)
 L2CrossDomainMessenger_Test:test_sendMessage_succeeds() (gas: 123957)
 L2CrossDomainMessenger_Test:test_sendMessage_twice_succeeds() (gas: 135812)
-L2CrossDomainMessenger_Test:test_xDomainMessageSender_reset_succeeds() (gas: 48371)
+L2CrossDomainMessenger_Test:test_xDomainMessageSender_reset_succeeds() (gas: 49230)
 L2CrossDomainMessenger_Test:test_xDomainSender_senderNotSet_reverts() (gas: 10590)
 L2ERC721Bridge_Test:test_bridgeERC721To_localTokenZeroAddress_reverts() (gas: 31428)
 L2ERC721Bridge_Test:test_bridgeERC721To_remoteTokenZeroAddress_reverts() (gas: 26826)
@@ -260,12 +260,12 @@ L2OutputOracle_deleteOutputs_Test:test_deleteL2Outputs_ifNotChallenger_reverts()
 L2OutputOracle_deleteOutputs_Test:test_deleteL2Outputs_nonExistent_reverts() (gas: 111651)
 L2OutputOracle_deleteOutputs_Test:test_deleteOutputs_multipleOutputs_succeeds() (gas: 307411)
 L2OutputOracle_deleteOutputs_Test:test_deleteOutputs_singleOutput_succeeds() (gas: 185564)
-L2OutputOracle_getter_Test:test_computeL2Timestamp_succeeds() (gas: 37341)
+L2OutputOracle_getter_Test:test_computeL2Timestamp_succeeds() (gas: 38198)
 L2OutputOracle_getter_Test:test_getL2OutputIndexAfter_multipleOutputsExist_succeeds() (gas: 269700)
 L2OutputOracle_getter_Test:test_getL2OutputIndexAfter_noOutputsExis_reverts() (gas: 17892)
 L2OutputOracle_getter_Test:test_getL2OutputIndexAfter_previousBlock_succeeds() (gas: 98188)
 L2OutputOracle_getter_Test:test_getL2OutputIndexAfter_sameBlock_succeeds() (gas: 98096)
-L2OutputOracle_getter_Test:test_getL2Output_succeeds() (gas: 103735)
+L2OutputOracle_getter_Test:test_getL2Output_succeeds() (gas: 104600)
 L2OutputOracle_getter_Test:test_latestBlockNumber_succeeds() (gas: 99129)
 L2OutputOracle_getter_Test:test_nextBlockNumber_succeeds() (gas: 17447)
 L2OutputOracle_proposeL2Output_Test:test_proposeL2Output_emptyOutput_reverts() (gas: 28812)
@@ -475,7 +475,7 @@ OptimismPortal_Test:test_depositTransaction_withEthValueAndContractContractCreat
 OptimismPortal_Test:test_depositTransaction_withEthValueAndEOAContractCreation_succeeds() (gas: 75929)
 OptimismPortal_Test:test_depositTransaction_withEthValueFromContract_succeeds() (gas: 83476)
 OptimismPortal_Test:test_depositTransaction_withEthValueFromEOA_succeeds() (gas: 84069)
-OptimismPortal_Test:test_isOutputFinalized_succeeds() (gas: 126749)
+OptimismPortal_Test:test_isOutputFinalized_succeeds() (gas: 127617)
 OptimismPortal_Test:test_minimumGasLimit_succeeds() (gas: 17430)
 OptimismPortal_Test:test_pause_onlyGuardian_reverts() (gas: 24487)
 OptimismPortal_Test:test_pause_succeeds() (gas: 27344)
@@ -539,7 +539,7 @@ ProtocolVersions_Initialize_Test:test_initialize_events_succeeds() (gas: 52181)
 ProtocolVersions_Initialize_Test:test_initialize_values_succeeds() (gas: 32301)
 ProtocolVersions_Setters_TestFail:test_setRecommended_notOwner_reverts() (gas: 15508)
 ProtocolVersions_Setters_TestFail:test_setRequired_notOwner_reverts() (gas: 15520)
-ProxyAdmin_Test:test_chugsplashChangeProxyAdmin_succeeds() (gas: 35586)
+ProxyAdmin_Test:test_chugsplashChangeProxyAdmin_succeeds() (gas: 36440)
 ProxyAdmin_Test:test_chugsplashGetProxyAdmin_succeeds() (gas: 15675)
 ProxyAdmin_Test:test_chugsplashGetProxyImplementation_succeeds() (gas: 51084)
 ProxyAdmin_Test:test_chugsplashUpgradeAndCall_succeeds() (gas: 82311)
@@ -549,7 +549,7 @@ ProxyAdmin_Test:test_delegateResolvedGetProxyAdmin_succeeds() (gas: 17691)
 ProxyAdmin_Test:test_delegateResolvedGetProxyImplementation_succeeds() (gas: 62028)
 ProxyAdmin_Test:test_delegateResolvedUpgradeAndCall_succeeds() (gas: 98039)
 ProxyAdmin_Test:test_delegateResolvedUpgrade_succeeds() (gas: 58482)
-ProxyAdmin_Test:test_erc1967ChangeProxyAdmin_succeeds() (gas: 33820)
+ProxyAdmin_Test:test_erc1967ChangeProxyAdmin_succeeds() (gas: 34674)
 ProxyAdmin_Test:test_erc1967GetProxyAdmin_succeeds() (gas: 15616)
 ProxyAdmin_Test:test_erc1967GetProxyImplementation_succeeds() (gas: 52073)
 ProxyAdmin_Test:test_erc1967UpgradeAndCall_succeeds() (gas: 78971)
@@ -567,9 +567,9 @@ Proxy_Test:test_implementationKey_succeeds() (gas: 20911)
 Proxy_Test:test_implementation_isZeroAddress_reverts() (gas: 47628)
 Proxy_Test:test_implementation_zeroAddressCaller_succeeds() (gas: 14752)
 Proxy_Test:test_ownerKey_succeeds() (gas: 19067)
-Proxy_Test:test_ownerProxyCall_notAdmin_succeeds() (gas: 34623)
+Proxy_Test:test_ownerProxyCall_notAdmin_succeeds() (gas: 35477)
 Proxy_Test:test_proxyCallToImp_notAdmin_succeeds() (gas: 30010)
-Proxy_Test:test_upgradeToAndCall_functionDoesNotExist_reverts() (gas: 104567)
+Proxy_Test:test_upgradeToAndCall_functionDoesNotExist_reverts() (gas: 107980)
 Proxy_Test:test_upgradeToAndCall_isPayable_succeeds() (gas: 53744)
 Proxy_Test:test_upgradeToAndCall_succeeds() (gas: 125192)
 Proxy_Test:test_upgradeTo_clashingFunctionSignatures_succeeds() (gas: 101363)
@@ -661,12 +661,12 @@ StandardBridge_Stateless_Test:test_isCorrectTokenPair_succeeds() (gas: 49936)
 StandardBridge_Stateless_Test:test_isOptimismMintableERC20_succeeds() (gas: 33072)
 Storage_Roundtrip_Test:test_setGetAddress_succeeds(bytes32,address) (runs: 64, μ: 31799, ~: 31799)
 Storage_Roundtrip_Test:test_setGetBytes32_succeeds(bytes32,bytes32) (runs: 64, μ: 31643, ~: 31643)
-Storage_Roundtrip_Test:test_setGetUint_succeeds(bytes32,uint256) (runs: 64, μ: 30998, ~: 31620)
+Storage_Roundtrip_Test:test_setGetUint_succeeds(bytes32,uint256) (runs: 64, μ: 30687, ~: 31620)
 SystemConfig_Initialize_Test:test_initialize_events_succeeds() (gas: 71950)
 SystemConfig_Initialize_Test:test_initialize_startBlockOverride_succeeds() (gas: 65132)
 SystemConfig_Initialize_Test:test_initialize_values_succeeds() (gas: 64946)
-SystemConfig_Initialize_TestFail:test_initialize_lowGasLimit_reverts() (gas: 55589)
-SystemConfig_Initialize_TestFail:test_initialize_startBlock_reverts() (gas: 78214)
+SystemConfig_Initialize_TestFail:test_initialize_lowGasLimit_reverts() (gas: 57177)
+SystemConfig_Initialize_TestFail:test_initialize_startBlock_reverts() (gas: 79800)
 SystemConfig_Setters_TestFail:test_setBatcherHash_notOwner_reverts() (gas: 15607)
 SystemConfig_Setters_TestFail:test_setGasConfig_notOwner_reverts() (gas: 15577)
 SystemConfig_Setters_TestFail:test_setGasLimit_notOwner_reverts() (gas: 15676)
@@ -677,9 +677,9 @@ SystemConfig_Setters_TestFail:test_setResourceConfig_notOwner_reverts() (gas: 16
 SystemConfig_Setters_TestFail:test_setResourceConfig_zeroDenominator_reverts() (gas: 18578)
 SystemConfig_Setters_TestFail:test_setUnsafeBlockSigner_notOwner_reverts() (gas: 15590)
 TransactorTest:test_call_succeeds() (gas: 26709)
-TransactorTest:test_call_unauthorized_reverts() (gas: 16543)
+TransactorTest:test_call_unauthorized_reverts() (gas: 18117)
 TransactorTest:test_constructor_succeeds() (gas: 9739)
 TransactorTest:test_delegateCall_succeeds() (gas: 20909)
-TransactorTest:test_delegateCall_unauthorized_reverts() (gas: 16550)
+TransactorTest:test_delegateCall_unauthorized_reverts() (gas: 18124)
 TransferOnionTest:test_constructor_succeeds() (gas: 564855)
 TransferOnionTest:test_unwrap_succeeds() (gas: 724955)
\ No newline at end of file

packages/contracts-bedrock/periphery-deploy-config/optimism-goerli.json

@@ -16,9 +16,9 @@
   "faucetGelatoBalanceV1Value": 1000000000000000000,
   "faucetGelatoThreshold": 100000000000000000,
   "faucetOnchainAuthModuleAdmin": "0x8F0EBDaA1cF7106bE861753B0f9F5c0250fE0819",
-  "faucetOnchainAuthModuleAdminDripInterval": 86400,
-  "faucetOnchainAuthModuleAdminDripValue": 1000000000000000000,
+  "faucetOnchainAuthModuleTtl": 86400,
+  "faucetOnchainAuthModuleAmount": 1000000000000000000,
   "faucetOffchainAuthModuleAdmin": "0x8F0EBDaA1cF7106bE861753B0f9F5c0250fE0819",
-  "faucetOffchainAuthModuleAdminDripInterval": 86400,
-  "faucetOffchainAuthModuleAdminDripValue": 50000000000000000
+  "faucetOffchainAuthModuleTtl": 86400,
+  "faucetOffchainAuthModuleAmount": 50000000000000000
 }

packages/contracts-bedrock/scripts/DeployPeriphery.s.sol

@@ -459,15 +459,15 @@ contract DeployPeriphery is Deployer {
         string memory moduleName = "OnChainAuthModule";
         Faucet faucet = Faucet(mustGetAddress("Faucet"));
         AdminFaucetAuthModule onChainAuthModule = AdminFaucetAuthModule(mustGetAddress(moduleName));
-        if (faucet.getModuleStatus(onChainAuthModule)) {
+        if (faucet.isModuleEnabled(onChainAuthModule)) {
             console.log("%s already installed.", moduleName);
         } else {
             console.log("Installing %s", moduleName);
             Faucet.ModuleConfig memory myModuleConfig = Faucet.ModuleConfig({
                 name: moduleName,
                 enabled: true,
-                ttl: cfg.faucetOnchainAuthModuleAdminDripInterval(),
-                amount: cfg.faucetOnchainAuthModuleAdminDripValue()
+                ttl: cfg.faucetOnchainAuthModuleTtl(),
+                amount: cfg.faucetOnchainAuthModuleAmount()
             });
             faucet.configure(onChainAuthModule, myModuleConfig);
             console.log("%s installed successfully", moduleName);
@@ -479,15 +479,15 @@ contract DeployPeriphery is Deployer {
         string memory moduleName = "OffChainAuthModule";
         Faucet faucet = Faucet(mustGetAddress("Faucet"));
         AdminFaucetAuthModule offChainAuthModule = AdminFaucetAuthModule(mustGetAddress(moduleName));
-        if (faucet.getModuleStatus(offChainAuthModule)) {
+        if (faucet.isModuleEnabled(offChainAuthModule)) {
             console.log("%s already installed.", moduleName);
         } else {
             console.log("Installing %s", moduleName);
             Faucet.ModuleConfig memory myModuleConfig = Faucet.ModuleConfig({
                 name: moduleName,
                 enabled: true,
-                ttl: cfg.faucetOffchainAuthModuleAdminDripInterval(),
-                amount: cfg.faucetOffchainAuthModuleAdminDripValue()
+                ttl: cfg.faucetOffchainAuthModuleTtl(),
+                amount: cfg.faucetOffchainAuthModuleAmount()
             });
             faucet.configure(offChainAuthModule, myModuleConfig);
             console.log("%s installed successfully", moduleName);

packages/contracts-bedrock/scripts/PeripheryDeployConfig.s.sol

@@ -29,11 +29,11 @@ contract PeripheryDeployConfig is Script {
     uint256 public faucetGelatoBalanceV1Value;
     uint256 public faucetGelatoThreshold;
     address public faucetOnchainAuthModuleAdmin;
-    uint256 public faucetOnchainAuthModuleAdminDripInterval;
-    uint256 public faucetOnchainAuthModuleAdminDripValue;
+    uint256 public faucetOnchainAuthModuleTtl;
+    uint256 public faucetOnchainAuthModuleAmount;
     address public faucetOffchainAuthModuleAdmin;
-    uint256 public faucetOffchainAuthModuleAdminDripInterval;
-    uint256 public faucetOffchainAuthModuleAdminDripValue;
+    uint256 public faucetOffchainAuthModuleTtl;
+    uint256 public faucetOffchainAuthModuleAmount;
 
     constructor(string memory _path) {
         console.log("PeripheryDeployConfig: reading file %s", _path);
@@ -61,10 +61,10 @@ contract PeripheryDeployConfig is Script {
         faucetGelatoBalanceV1Value = stdJson.readUint(_json, "$.faucetGelatoBalanceV1Value");
         faucetGelatoThreshold = stdJson.readUint(_json, "$.faucetGelatoThreshold");
         faucetOnchainAuthModuleAdmin = stdJson.readAddress(_json, "$.faucetOnchainAuthModuleAdmin");
-        faucetOnchainAuthModuleAdminDripInterval = stdJson.readUint(_json, "$.faucetOnchainAuthModuleAdminDripInterval");
-        faucetOnchainAuthModuleAdminDripValue = stdJson.readUint(_json, "$.faucetOnchainAuthModuleAdminDripValue");
+        faucetOnchainAuthModuleTtl = stdJson.readUint(_json, "$.faucetOnchainAuthModuleTtl");
+        faucetOnchainAuthModuleAmount = stdJson.readUint(_json, "$.faucetOnchainAuthModuleAmount");
         faucetOffchainAuthModuleAdmin = stdJson.readAddress(_json, "$.faucetOffchainAuthModuleAdmin");
-        faucetOffchainAuthModuleAdminDripInterval = stdJson.readUint(_json, "$.faucetOffchainAuthModuleAdminDripInterval");
-        faucetOffchainAuthModuleAdminDripValue = stdJson.readUint(_json, "$.faucetOffchainAuthModuleAdminDripValue");
+        faucetOffchainAuthModuleTtl = stdJson.readUint(_json, "$.faucetOffchainAuthModuleTtl");
+        faucetOffchainAuthModuleAmount = stdJson.readUint(_json, "$.faucetOffchainAuthModuleAmount");
     }
 }

packages/contracts-bedrock/src/periphery/faucet/Faucet.sol

@@ -125,10 +125,10 @@ contract Faucet {
         emit Drip(config.name, _auth.id, config.amount, _params.recipient);
     }
 
-    /// @notice Returns the enable status of a given auth module.
+    /// @notice Returns the enable value of a given auth module.
     /// @param _module module to check.
     /// @return bool enabled status of auth modulew.
-    function getModuleStatus(IFaucetAuthModule _module) public view returns (bool) {
+    function isModuleEnabled(IFaucetAuthModule _module) public view returns (bool) {
         return modules[_module].enabled;
     }
 }