Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/RevShareContractsUpgrader.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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))
);

Expand Down
12 changes: 6 additions & 6 deletions src/libraries/FeeVaultUpgrader.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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))
);
}
Expand Down
3 changes: 3 additions & 0 deletions src/libraries/RevShareCommon.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
);
Expand Down Expand Up @@ -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))
)
Expand All @@ -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))
)
Expand All @@ -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))
)
Expand Down