Merge branch 'develop' into cl/fdg-spec-update

op-challenger/game/fault/responder/responder.go

@@ -95,14 +95,14 @@ func (r *FaultResponder) Resolve(ctx context.Context) error {
 }
 
 // buildResolveClaimData creates the transaction data for the ResolveClaim function.
-func (r *FaultResponder) buildResolveClaimData(ctx context.Context, claimIdx uint64) ([]byte, error) {
+func (r *FaultResponder) buildResolveClaimData(claimIdx uint64) ([]byte, error) {
 	return r.fdgAbi.Pack("resolveClaim", big.NewInt(int64(claimIdx)))
 }
 
 // CallResolveClaim determines if the resolveClaim function on the fault dispute game contract
 // would succeed.
 func (r *FaultResponder) CallResolveClaim(ctx context.Context, claimIdx uint64) error {
-	txData, err := r.buildResolveClaimData(ctx, claimIdx)
+	txData, err := r.buildResolveClaimData(claimIdx)
 	if err != nil {
 		return err
 	}
@@ -115,7 +115,7 @@ func (r *FaultResponder) CallResolveClaim(ctx context.Context, claimIdx uint64)
 
 // ResolveClaim executes a resolveClaim transaction to resolve a fault dispute game.
 func (r *FaultResponder) ResolveClaim(ctx context.Context, claimIdx uint64) error {
-	txData, err := r.buildResolveClaimData(ctx, claimIdx)
+	txData, err := r.buildResolveClaimData(claimIdx)
 	if err != nil {
 		return err
 	}

packages/contracts-bedrock/.gas-snapshot

@@ -57,26 +57,26 @@ DisputeGameFactory_SetImplementation_Test:test_setImplementation_notOwner_revert
 DisputeGameFactory_SetImplementation_Test:test_setImplementation_succeeds() (gas: 44301)
 DisputeGameFactory_TransferOwnership_Test:test_transferOwnership_notOwner_reverts() (gas: 15950)
 DisputeGameFactory_TransferOwnership_Test:test_transferOwnership_succeeds() (gas: 18642)
-Drippie_Test:test_create_calledTwice_reverts() (gas: 168931)
-Drippie_Test:test_create_succeeds() (gas: 183380)
-Drippie_Test:test_drip_amount_succeeds() (gas: 285294)
-Drippie_Test:test_drip_notExist_reverts() (gas: 14876)
-Drippie_Test:test_drip_reentrant_reverts() (gas: 18853)
-Drippie_Test:test_name_notExist_reverts() (gas: 16012)
-Drippie_Test:test_notReentrant_zeroInterval_reverts() (gas: 18845)
-Drippie_Test:test_not_active_reverts() (gas: 171074)
-Drippie_Test:test_reentrant_succeeds() (gas: 180159)
-Drippie_Test:test_set_statusNone_reverts() (gas: 168743)
-Drippie_Test:test_set_statusSame_reverts() (gas: 169129)
-Drippie_Test:test_set_status_succeeds() (gas: 198449)
-Drippie_Test:test_shouldArchive_ifPaused_succeeds() (gas: 177260)
-Drippie_Test:test_shouldNotAllowActive_ifArchived_reverts() (gas: 174581)
-Drippie_Test:test_shouldNotAllowPaused_ifArchived_reverts() (gas: 174604)
-Drippie_Test:test_shouldNotArchive_ifActive_reverts() (gas: 175622)
-Drippie_Test:test_status_unauthorized_reverts() (gas: 167344)
-Drippie_Test:test_trigger_oneFunction_succeeds() (gas: 338143)
-Drippie_Test:test_trigger_twoFunctions_succeeds() (gas: 491870)
-Drippie_Test:test_twice_inOneInterval_reverts() (gas: 303767)
+Drippie_Test:test_create_calledTwice_reverts() (gas: 168953)
+Drippie_Test:test_create_succeeds() (gas: 183401)
+Drippie_Test:test_drip_amount_succeeds() (gas: 285353)
+Drippie_Test:test_drip_notExist_reverts() (gas: 14920)
+Drippie_Test:test_drip_reentrant_reverts() (gas: 18875)
+Drippie_Test:test_name_notExist_reverts() (gas: 16056)
+Drippie_Test:test_notReentrant_zeroInterval_reverts() (gas: 18867)
+Drippie_Test:test_not_active_reverts() (gas: 171162)
+Drippie_Test:test_reentrant_succeeds() (gas: 180158)
+Drippie_Test:test_set_statusNone_reverts() (gas: 168809)
+Drippie_Test:test_set_statusSame_reverts() (gas: 169195)
+Drippie_Test:test_set_status_succeeds() (gas: 198603)
+Drippie_Test:test_shouldArchive_ifPaused_succeeds() (gas: 177348)
+Drippie_Test:test_shouldNotAllowActive_ifArchived_reverts() (gas: 174669)
+Drippie_Test:test_shouldNotAllowPaused_ifArchived_reverts() (gas: 174692)
+Drippie_Test:test_shouldNotArchive_ifActive_reverts() (gas: 175732)
+Drippie_Test:test_status_unauthorized_reverts() (gas: 167388)
+Drippie_Test:test_trigger_oneFunction_succeeds() (gas: 338226)
+Drippie_Test:test_trigger_twoFunctions_succeeds() (gas: 491907)
+Drippie_Test:test_twice_inOneInterval_reverts() (gas: 303933)
 EASUpgrader:test_script_succeeds() (gas: 3078)
 FaucetTest:test_authAdmin_drip_succeeds() (gas: 366107)
 FaucetTest:test_drip_afterTimeout_succeeds() (gas: 447891)

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

 {
-  "faucetAdmin": "0xf2C22a95bBA6F35545269183D8d1751a27F047F6"
+  "faucetAdmin": "0xf2C22a95bBA6F35545269183D8d1751a27F047F6",
+  "faucetDrippieOwner": "0xEa193Fd9565284E7534dDDA15b07B119e7792644",
+  "faucetDripV1Value": 20000000000000000000,
+  "faucetDripV1Interval": 3600,
+  "faucetDripV1Threshold": 100000000000000000000,
+  "faucetDripV2Interval": 604800,
+  "faucetDripV2Threshold": 20000000000000000000,
+  "faucetDripV2Value": 500000000000000000000,
+  "faucetAdminDripV1Interval": 86400,
+  "faucetAdminDripV1Threshold": 100000000000000000,
+  "faucetAdminDripV1Value": 1000000000000000000,
+  "faucetGelatoTreasury": "0x644CB00854EDC55FE8CCC9c1967BABb22F08Ad2f",
+  "faucetGelatoRecipient": "0x789e58a4B08A23a7f60141959C6ABbdC0D0C4Aba",
+  "faucetGelatoBalanceV1DripInterval": 86400,
+  "faucetGelatoBalanceV1Value": 1000000000000000000,
+  "faucetGelatoThreshold": 100000000000000000
 }

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

@@ -97,7 +97,7 @@ contract Deploy is Deployer {
     ///         Using this helps to reduce config across networks as the implementation
     ///         addresses will be the same across networks when deployed with create2.
     function implSalt() public returns (bytes32) {
-        return keccak256(bytes(vm.envOr("IMPL_SALT", string("ether's phoenix"))));
+        return keccak256(bytes(vm.envOr("IMPL_SALT", string("ethers phoenix"))));
     }
 
     /// @notice Modifier that wraps a function in broadcasting.

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

@@ -13,6 +13,21 @@ contract PeripheryDeployConfig is Script {
     string internal _json;
 
     address public faucetAdmin;
+    address public faucetDrippieOwner;
+    uint256 public faucetDripV1Value;
+    uint256 public faucetDripV1Interval;
+    uint256 public faucetDripV1Threshold;
+    uint256 public faucetDripV2Value;
+    uint256 public faucetDripV2Interval;
+    uint256 public faucetDripV2Threshold;
+    uint256 public faucetAdminDripV1Value;
+    uint256 public faucetAdminDripV1Interval;
+    uint256 public faucetAdminDripV1Threshold;
+    address public faucetGelatoTreasury;
+    address public faucetGelatoRecipient;
+    uint256 public faucetGelatoBalanceV1DripInterval;
+    uint256 public faucetGelatoBalanceV1Value;
+    uint256 public faucetGelatoThreshold;
 
     constructor(string memory _path) {
         console.log("PeripheryDeployConfig: reading file %s", _path);
@@ -24,5 +39,20 @@ contract PeripheryDeployConfig is Script {
         }
 
         faucetAdmin = stdJson.readAddress(_json, "$.faucetAdmin");
+        faucetDrippieOwner = stdJson.readAddress(_json, "$.faucetDrippieOwner");
+        faucetDripV1Value = stdJson.readUint(_json, "$.faucetDripV1Value");
+        faucetDripV1Interval = stdJson.readUint(_json, "$.faucetDripV1Interval");
+        faucetDripV1Threshold = stdJson.readUint(_json, "$.faucetDripV1Threshold");
+        faucetDripV2Value = stdJson.readUint(_json, "$.faucetDripV2Value");
+        faucetDripV2Interval = stdJson.readUint(_json, "$.faucetDripV2Interval");
+        faucetDripV2Threshold = stdJson.readUint(_json, "$.faucetDripV2Threshold");
+        faucetAdminDripV1Value = stdJson.readUint(_json, "$.faucetAdminDripV1Value");
+        faucetAdminDripV1Interval = stdJson.readUint(_json, "$.faucetAdminDripV1Interval");
+        faucetAdminDripV1Threshold = stdJson.readUint(_json, "$.faucetAdminDripV1Threshold");
+        faucetGelatoTreasury = stdJson.readAddress(_json, "$.faucetGelatoTreasury");
+        faucetGelatoRecipient = stdJson.readAddress(_json, "$.faucetGelatoRecipient");
+        faucetGelatoBalanceV1DripInterval = stdJson.readUint(_json, "$.faucetGelatoBalanceV1DripInterval");
+        faucetGelatoBalanceV1Value = stdJson.readUint(_json, "$.faucetGelatoBalanceV1Value");
+        faucetGelatoThreshold = stdJson.readUint(_json, "$.faucetGelatoThreshold");
     }
 }

packages/contracts-bedrock/src/periphery/drippie/Drippie.sol

@@ -244,4 +244,11 @@ contract Drippie is AssetReceiver {
 
         emit DripExecuted(_name, _name, msg.sender, block.timestamp);
     }
+
+    /// @notice Returns the status of a given drip.
+    /// @param _name Drip to check.
+    /// @return DripStatus of the given drip.
+    function getDripStatus(string calldata _name) public view returns (DripStatus) {
+        return drips[_name].status;
+    }
 }