diff --git a/src/RevShareContractsUpgrader.sol b/src/RevShareContractsUpgrader.sol index debfbbb94..8d8dbe6bd 100644 --- a/src/RevShareContractsUpgrader.sol +++ b/src/RevShareContractsUpgrader.sol @@ -100,7 +100,7 @@ contract RevShareContractsUpgrader { RevShareCommon.depositCall( config.portal, RevShareCommon.FEE_SPLITTER, - FeeVaultUpgrader.SETTERS_GAS_LIMIT, + RevShareCommon.SETTERS_GAS_LIMIT, abi.encodeCall(IFeeSplitter.setSharesCalculator, (calculator)) ); diff --git a/src/libraries/FeeVaultUpgrader.sol b/src/libraries/FeeVaultUpgrader.sol index b6a3bb93d..fa919b377 100644 --- a/src/libraries/FeeVaultUpgrader.sol +++ b/src/libraries/FeeVaultUpgrader.sol @@ -25,9 +25,6 @@ library FeeVaultUpgrader { /// @notice The gas limit for the Fee Vaults deployment. uint64 internal constant FEE_VAULTS_DEPLOYMENT_GAS_LIMIT = 1_200_000; - /// @notice The gas limit for the Fee Vaults setters. - uint64 internal constant SETTERS_GAS_LIMIT = 50_000; - /// @notice Address of the Operator Fee Vault Predeploy on L2. address internal constant OPERATOR_FEE_VAULT = 0x420000000000000000000000000000000000001b; @@ -103,16 +100,19 @@ library FeeVaultUpgrader { RevShareCommon.depositCall( _portal, vaults[i], - SETTERS_GAS_LIMIT, + RevShareCommon.SETTERS_GAS_LIMIT, abi.encodeCall(IFeeVault.setRecipient, (RevShareCommon.FEE_SPLITTER)) ); RevShareCommon.depositCall( - _portal, vaults[i], SETTERS_GAS_LIMIT, abi.encodeCall(IFeeVault.setMinWithdrawalAmount, (0)) + _portal, + vaults[i], + RevShareCommon.SETTERS_GAS_LIMIT, + abi.encodeCall(IFeeVault.setMinWithdrawalAmount, (0)) ); RevShareCommon.depositCall( _portal, vaults[i], - SETTERS_GAS_LIMIT, + RevShareCommon.SETTERS_GAS_LIMIT, abi.encodeCall(IFeeVault.setWithdrawalNetwork, (IFeeVault.WithdrawalNetwork.L2)) ); } diff --git a/src/libraries/RevShareCommon.sol b/src/libraries/RevShareCommon.sol index bab19b1e2..10a473f6d 100644 --- a/src/libraries/RevShareCommon.sol +++ b/src/libraries/RevShareCommon.sol @@ -19,6 +19,9 @@ library RevShareCommon { /// @notice The gas limit for the upgrade calls on L2. uint64 internal constant UPGRADE_GAS_LIMIT = 150_000; + /// @notice The gas limit for setter calls on L2. + uint64 internal constant SETTERS_GAS_LIMIT = 75_000; + /// @notice The salt prefix for the RevShare system. string internal constant SALT_SEED = "RevShare"; diff --git a/test/template/revenue-share-upgrade-path/RevShareContractsUpgrader.t.sol b/test/template/revenue-share-upgrade-path/RevShareContractsUpgrader.t.sol index a0e74beca..1982e3a5d 100644 --- a/test/template/revenue-share-upgrade-path/RevShareContractsUpgrader.t.sol +++ b/test/template/revenue-share-upgrade-path/RevShareContractsUpgrader.t.sol @@ -189,7 +189,7 @@ contract RevShareContractsUpgrader_TestInit is Test { _portal, abi.encodeCall( IOptimismPortal2.depositTransaction, - (RevShareCommon.FEE_SPLITTER, 0, FeeVaultUpgrader.SETTERS_GAS_LIMIT, false, setCalculatorCall) + (RevShareCommon.FEE_SPLITTER, 0, RevShareCommon.SETTERS_GAS_LIMIT, false, setCalculatorCall) ), abi.encode() ); @@ -250,7 +250,7 @@ contract RevShareContractsUpgrader_TestInit is Test { ( _vault, 0, - FeeVaultUpgrader.SETTERS_GAS_LIMIT, + RevShareCommon.SETTERS_GAS_LIMIT, false, abi.encodeCall(IFeeVault.setRecipient, (RevShareCommon.FEE_SPLITTER)) ) @@ -266,7 +266,7 @@ contract RevShareContractsUpgrader_TestInit is Test { ( _vault, 0, - FeeVaultUpgrader.SETTERS_GAS_LIMIT, + RevShareCommon.SETTERS_GAS_LIMIT, false, abi.encodeCall(IFeeVault.setMinWithdrawalAmount, (0)) ) @@ -282,7 +282,7 @@ contract RevShareContractsUpgrader_TestInit is Test { ( _vault, 0, - FeeVaultUpgrader.SETTERS_GAS_LIMIT, + RevShareCommon.SETTERS_GAS_LIMIT, false, abi.encodeCall(IFeeVault.setWithdrawalNetwork, (IFeeVault.WithdrawalNetwork.L2)) )