Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
0ed8dca8
Commit
0ed8dca8
authored
Mar 23, 2023
by
Mark Tyneway
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contracts-bedrock: more cleanup
parent
31ac6d98
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
.gas-snapshot
packages/contracts-bedrock/.gas-snapshot
+1
-1
SystemConfig.sol
packages/contracts-bedrock/contracts/L1/SystemConfig.sol
+5
-7
019-SystemDictatorInit.ts
packages/contracts-bedrock/deploy/019-SystemDictatorInit.ts
+2
-0
No files found.
packages/contracts-bedrock/.gas-snapshot
View file @
0ed8dca8
...
...
@@ -418,7 +418,7 @@ SequencerFeeVault_Test:test_withdraw_succeeds() (gas: 163228)
SetPrevBaseFee_Test:test_setPrevBaseFee_succeeds() (gas: 11515)
StandardBridge_Stateless_Test:test_isCorrectTokenPair_succeeds() (gas: 49936)
StandardBridge_Stateless_Test:test_isOptimismMintableERC20_succeeds() (gas: 33072)
SystemConfig_Initialize_TestFail:test_initialize_lowGasLimit_reverts() (gas: 1488
94
)
SystemConfig_Initialize_TestFail:test_initialize_lowGasLimit_reverts() (gas: 1488
58
)
SystemConfig_Setters_TestFail:test_setBatcherHash_notOwner_reverts() (gas: 10546)
SystemConfig_Setters_TestFail:test_setGasConfig_notOwner_reverts() (gas: 10622)
SystemConfig_Setters_TestFail:test_setGasLimit_notOwner_reverts() (gas: 10615)
...
...
packages/contracts-bedrock/contracts/L1/SystemConfig.sol
View file @
0ed8dca8
...
...
@@ -21,14 +21,12 @@ contract SystemConfig is OwnableUpgradeable, Semver {
* @custom:value GAS_LIMIT Represents an update to gas limit on L2.
* @custom:value UNSAFE_BLOCK_SIGNER Represents an update to the signer key for unsafe
* block distrubution.
* @custom:value RESOURCE_CONFIG Represents an update to the resource config.
*/
enum UpdateType {
BATCHER,
GAS_CONFIG,
GAS_LIMIT,
UNSAFE_BLOCK_SIGNER,
RESOURCE_CONFIG
UNSAFE_BLOCK_SIGNER
}
/**
...
...
@@ -269,14 +267,14 @@ contract SystemConfig is OwnableUpgradeable, Semver {
}
/**
* @notice An external setter for the resource config.
* @notice An external setter for the resource config. In the future, this
* method may emit an event that the `op-node` picks up for when the
* resource config is changed.
*
* @param _config The new resource config values.
*/
function setResourceConfig(ResourceConfig memory _config) external onlyOwner {
_setResourceConfig(_config);
bytes memory data = abi.encode(_config);
emit ConfigUpdate(VERSION, UpdateType.RESOURCE_CONFIG, data);
}
/**
...
...
packages/contracts-bedrock/deploy/019-SystemDictatorInit.ts
View file @
0ed8dca8
...
...
@@ -100,6 +100,8 @@ const deployFn: DeployFunction = async (hre) => {
),
gasLimit
:
hre
.
deployConfig
.
l2GenesisBlockGasLimit
,
unsafeBlockSigner
:
hre
.
deployConfig
.
p2pSequencerAddress
,
// The resource config is not exposed to the end user
// to simplify deploy config. It may be introduced in the future.
resourceConfig
:
{
maxResourceLimit
:
20
_000_000
,
elasticityMultiplier
:
10
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment