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
fba0bba0
Commit
fba0bba0
authored
Mar 10, 2023
by
Mark Tyneway
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contracts-bedrock: update target in ResourceMetering
parent
b3bfb3c7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
7 deletions
+15
-7
.gas-snapshot
packages/contracts-bedrock/.gas-snapshot
+6
-5
ResourceMetering.sol
packages/contracts-bedrock/contracts/L1/ResourceMetering.sol
+1
-1
ResourceMetering.t.sol
...s/contracts-bedrock/contracts/test/ResourceMetering.t.sol
+8
-1
No files found.
packages/contracts-bedrock/.gas-snapshot
View file @
fba0bba0
...
@@ -397,16 +397,17 @@ RLPWriter_writeUint_Test:test_writeUint_smallint_succeeds() (gas: 7280)
...
@@ -397,16 +397,17 @@ RLPWriter_writeUint_Test:test_writeUint_smallint_succeeds() (gas: 7280)
RLPWriter_writeUint_Test:test_writeUint_zero_succeeds() (gas: 7749)
RLPWriter_writeUint_Test:test_writeUint_zero_succeeds() (gas: 7749)
ResolvedDelegateProxy_Test:test_fallback_addressManagerNotSet_reverts() (gas: 605906)
ResolvedDelegateProxy_Test:test_fallback_addressManagerNotSet_reverts() (gas: 605906)
ResolvedDelegateProxy_Test:test_fallback_delegateCallBar_reverts() (gas: 24783)
ResolvedDelegateProxy_Test:test_fallback_delegateCallBar_reverts() (gas: 24783)
ResourceMetering_Test:test_meter_initialBaseFee_succeeds() (gas: 7025)
ResourceMetering_Test:test_meter_initialBaseFee_succeeds() (gas: 7003)
ResourceMetering_Test:test_meter_initialResourceParams_succeeds() (gas: 8983)
ResourceMetering_Test:test_meter_initialResourceParams_succeeds() (gas: 9028)
ResourceMetering_Test:test_meter_maxValue_succeeds() (gas: 7015)
ResourceMetering_Test:test_meter_minBaseFeeLessThanMaxBaseFee_succeeds() (gas: 6194)
ResourceMetering_Test:test_meter_minBaseFeeLessThanMaxBaseFee_succeeds() (gas: 6194)
ResourceMetering_Test:test_meter_updateNoGasDelta_succeeds() (gas:
4008242
)
ResourceMetering_Test:test_meter_updateNoGasDelta_succeeds() (gas:
2008204
)
ResourceMetering_Test:test_meter_updateOneEmptyBlock_succeeds() (gas: 18441)
ResourceMetering_Test:test_meter_updateOneEmptyBlock_succeeds() (gas: 18441)
ResourceMetering_Test:test_meter_updateParamsNoChange_succeeds() (gas: 14005)
ResourceMetering_Test:test_meter_updateParamsNoChange_succeeds() (gas: 14005)
ResourceMetering_Test:test_meter_updateTenEmptyBlocks_succeeds() (gas: 21243)
ResourceMetering_Test:test_meter_updateTenEmptyBlocks_succeeds() (gas: 21243)
ResourceMetering_Test:test_meter_updateTwoEmptyBlocks_succeeds() (gas: 21199)
ResourceMetering_Test:test_meter_updateTwoEmptyBlocks_succeeds() (gas: 21199)
ResourceMetering_Test:test_meter_useMax_succeeds() (gas: 200174
20
)
ResourceMetering_Test:test_meter_useMax_succeeds() (gas: 200174
64
)
ResourceMetering_Test:test_meter_useMoreThanMax_reverts() (gas: 161
42
)
ResourceMetering_Test:test_meter_useMoreThanMax_reverts() (gas: 161
20
)
SafeCall_call_Test:test_callWithMinGas_noLeakageHigh_succeeds() (gas: 2075873614)
SafeCall_call_Test:test_callWithMinGas_noLeakageHigh_succeeds() (gas: 2075873614)
SafeCall_call_Test:test_callWithMinGas_noLeakageLow_succeeds() (gas: 753665282)
SafeCall_call_Test:test_callWithMinGas_noLeakageLow_succeeds() (gas: 753665282)
Semver_Test:test_behindProxy_succeeds() (gas: 506748)
Semver_Test:test_behindProxy_succeeds() (gas: 506748)
...
...
packages/contracts-bedrock/contracts/L1/ResourceMetering.sol
View file @
fba0bba0
...
@@ -36,7 +36,7 @@ abstract contract ResourceMetering is Initializable {
...
@@ -36,7 +36,7 @@ abstract contract ResourceMetering is Initializable {
/**
/**
* @notice Along with the resource limit, determines the target resource limit.
* @notice Along with the resource limit, determines the target resource limit.
*/
*/
int256 public constant ELASTICITY_MULTIPLIER =
5
;
int256 public constant ELASTICITY_MULTIPLIER =
10
;
/**
/**
* @notice Target amount of the resource that should be used within this block.
* @notice Target amount of the resource that should be used within this block.
...
...
packages/contracts-bedrock/contracts/test/ResourceMetering.t.sol
View file @
fba0bba0
...
@@ -67,6 +67,13 @@ contract ResourceMetering_Test is Test {
...
@@ -67,6 +67,13 @@ contract ResourceMetering_Test is Test {
assertEq(prevBlockNum, initialBlockNum);
assertEq(prevBlockNum, initialBlockNum);
}
}
function test_meter_maxValue_succeeds() external {
uint256 max = uint256(meter.MAX_RESOURCE_LIMIT());
uint256 target = uint256(meter.TARGET_RESOURCE_LIMIT());
uint256 elasticity = uint256(meter.ELASTICITY_MULTIPLIER());
assertEq(max / elasticity, target);
}
function test_meter_updateParamsNoChange_succeeds() external {
function test_meter_updateParamsNoChange_succeeds() external {
meter.use(0); // equivalent to just updating the base fee and block number
meter.use(0); // equivalent to just updating the base fee and block number
(uint128 prevBaseFee, uint64 prevBoughtGas, uint64 prevBlockNum) = meter.params();
(uint128 prevBaseFee, uint64 prevBoughtGas, uint64 prevBlockNum) = meter.params();
...
@@ -129,7 +136,7 @@ contract ResourceMetering_Test is Test {
...
@@ -129,7 +136,7 @@ contract ResourceMetering_Test is Test {
vm.roll(initialBlockNum + 1);
vm.roll(initialBlockNum + 1);
meter.use(0);
meter.use(0);
(uint128 postBaseFee, , ) = meter.params();
(uint128 postBaseFee, , ) = meter.params();
assertEq(postBaseFee,
1500
000000);
assertEq(postBaseFee,
2125
000000);
}
}
function test_meter_useMoreThanMax_reverts() external {
function test_meter_useMoreThanMax_reverts() external {
...
...
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