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
2f284658
Commit
2f284658
authored
Mar 22, 2023
by
Mark Tyneway
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lint: fix
parent
75efabf4
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
5 deletions
+9
-5
ResourceMetering.sol
packages/contracts-bedrock/contracts/L1/ResourceMetering.sol
+2
-1
FuzzResourceMetering.sol
...tracts-bedrock/contracts/echidna/FuzzResourceMetering.sol
+2
-1
ResourceMetering.t.sol
...s/contracts-bedrock/contracts/test/ResourceMetering.t.sol
+2
-2
013-OptimismPortalImpl.ts
packages/contracts-bedrock/deploy/013-OptimismPortalImpl.ts
+3
-1
No files found.
packages/contracts-bedrock/contracts/L1/ResourceMetering.sol
View file @
2f284658
...
...
@@ -65,7 +65,8 @@ abstract contract ResourceMetering is Initializable {
uint256 blockDiff = block.number - params.prevBlockNum;
SystemConfig.ResourceConfig memory config = _resourceConfig();
int256 targetResourceLimit = int256(uint256(config.maxResourceLimit)) / int256(uint256(config.elasticityMultiplier));
int256 targetResourceLimit = int256(uint256(config.maxResourceLimit)) /
int256(uint256(config.elasticityMultiplier));
if (blockDiff > 0) {
// Handle updating EIP-1559 style gas parameters. We use EIP-1559 to restrict the rate
...
...
packages/contracts-bedrock/contracts/echidna/FuzzResourceMetering.sol
View file @
2f284658
...
...
@@ -52,7 +52,8 @@ contract EchidnaFuzzResourceMetering is ResourceMetering, StdUtils {
uint256 cachedPrevBlockNum = uint256(params.prevBlockNum);
SystemConfig.ResourceConfig memory rcfg = resourceConfig();
uint256 targetResourceLimit = uint256(rcfg.maxResourceLimit) / uint256(rcfg.elasticityMultiplier);
uint256 targetResourceLimit = uint256(rcfg.maxResourceLimit) /
uint256(rcfg.elasticityMultiplier);
// check that the last block's base fee hasn't dropped below the minimum
if (cachedPrevBaseFee < uint256(rcfg.minimumBaseFee)) {
...
...
packages/contracts-bedrock/contracts/test/ResourceMetering.t.sol
View file @
2f284658
...
...
@@ -19,7 +19,7 @@ contract MeterUser is ResourceMetering {
return _resourceConfig();
}
function _resourceConfig() internal
override pur
e returns (SystemConfig.ResourceConfig memory) {
function _resourceConfig() internal
pure overrid
e returns (SystemConfig.ResourceConfig memory) {
SystemConfig.ResourceConfig memory config = SystemConfig.ResourceConfig({
maxResourceLimit: 20_000_000,
elasticityMultiplier: 10,
...
...
@@ -184,7 +184,7 @@ contract CustomMeterUser is ResourceMetering {
});
}
function _resourceConfig() internal
override pur
e returns (SystemConfig.ResourceConfig memory) {
function _resourceConfig() internal
pure overrid
e returns (SystemConfig.ResourceConfig memory) {
SystemConfig.ResourceConfig memory config = SystemConfig.ResourceConfig({
maxResourceLimit: 20_000_000,
elasticityMultiplier: 10,
...
...
packages/contracts-bedrock/deploy/013-OptimismPortalImpl.ts
View file @
2f284658
...
...
@@ -17,7 +17,9 @@ const deployFn: DeployFunction = async (hre) => {
'
L2OutputOracleProxy
'
)
const
Artifact__SystemConfigProxy
=
await
hre
.
deployments
.
get
(
'
SystemConfigProxy
'
)
const
Artifact__SystemConfigProxy
=
await
hre
.
deployments
.
get
(
'
SystemConfigProxy
'
)
const
portalGuardian
=
hre
.
deployConfig
.
portalGuardian
const
portalGuardianCode
=
await
hre
.
ethers
.
provider
.
getCode
(
portalGuardian
)
...
...
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