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
3 changes: 1 addition & 2 deletions packages/contracts-bedrock/src/L1/OPContractsManager.sol
Original file line number Diff line number Diff line change
Expand Up @@ -1074,7 +1074,7 @@ contract OPContractsManagerDeployer is OPContractsManagerBase {

// If the custom gas token feature was requested, enable the custom gas token feature in the SystemConfig
// contract.
if (_input.useCustomGasToken) {
if (isDevFeatureEnabled(DevFeatures.CUSTOM_GAS_TOKEN)) {
output.systemConfigProxy.setFeature(Features.CUSTOM_GAS_TOKEN, true);
}

Expand Down Expand Up @@ -1704,7 +1704,6 @@ contract OPContractsManager is ISemver {
uint32 basefeeScalar;
uint32 blobBasefeeScalar;
uint256 l2ChainId;
bool useCustomGasToken;
// The correct type is Proposal memory but OP Deployer does not yet support structs.
bytes startingAnchorRoot;
// The salt mixer is used as part of making the resulting salt unique.
Expand Down
1 change: 0 additions & 1 deletion packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ contract OptimismPortal2_TestInit is DisputeGameFactory_TestInit {

if (isUsingCustomGasToken()) {
_defaultTx.value = 0;
setUseCustomGasToken(true);
}

// Get withdrawal proof data we can use for testing.
Expand Down