status-im/EIPs
2
0
Fork 0
mirror of https://github.com/status-im/EIPs.git synced 2025-02-24 04:38:29 +00:00
Code Issues Projects Releases Wiki Activity

start with default base fee on fork block (#3556)

Browse Source
This commit is contained in:
lightclient 2021-05-08 22:54:31 -06:00 committed by GitHub
parent 82881e156d
commit f0a3a23195
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
EIPS/eip-1559.md
View File

@ -139,7 +139,7 @@ class Block:
extra_data: bytes = bytes() extra_data: bytes = bytes()
proof_of_work: int = 0 proof_of_work: int = 0
nonce: int = 0 nonce: int = 0
base_fee_per_gas: int = 0 # default to 1,000,000,000 for blocks before INITIAL_FORK_BLOCK_NUMBER base_fee_per_gas: int = 0
@dataclass @dataclass
class Account: class Account:
@ -149,6 +149,7 @@ class Account:
storage_root: int = 0 storage_root: int = 0
code_hash: int = 0 code_hash: int = 0
INITIAL_BASE_FEE = 1000000000
INITIAL_FORK_BLOCK_NUMBER = 10 # TBD INITIAL_FORK_BLOCK_NUMBER = 10 # TBD
BASE_FEE_MAX_CHANGE_DENOMINATOR = 8 BASE_FEE_MAX_CHANGE_DENOMINATOR = 8
ELASTICITY_MULTIPLIER = 2 ELASTICITY_MULTIPLIER = 2
@ -157,7 +158,7 @@ class World(ABC):
def validate_block(self, block: Block) -> None: def validate_block(self, block: Block) -> None:
parent_gas_target = self.parent(block).gas_limit // ELASTICITY_MULTIPLIER parent_gas_target = self.parent(block).gas_limit // ELASTICITY_MULTIPLIER
# On the fork block, don't account for the ELASTICITY_MULTIPLIER to avoid # on the fork block, don't account for the ELASTICITY_MULTIPLIER to avoid
# unduly halving the gas target. # unduly halving the gas target.
if INITIAL_FORK_BLOCK_NUMBER == block.number: if INITIAL_FORK_BLOCK_NUMBER == block.number:
parent_gas_target = self.parent(block).gas_limit parent_gas_target = self.parent(block).gas_limit
@ -175,7 +176,9 @@ class World(ABC):
assert gas_target >= parent_gas_target - parent_gas_target // 1024, 'invalid block: gas target decreased too much' assert gas_target >= parent_gas_target - parent_gas_target // 1024, 'invalid block: gas target decreased too much'
# check if the base fee is correct # check if the base fee is correct
if parent_gas_used == parent_gas_target: if INITIAL_FORK_BLOCK_NUMBER == block.number:
expected_base_fee_per_gas = INITIAL_BASE_FEE
elif parent_gas_used == parent_gas_target:
expected_base_fee_per_gas = parent_base_fee_per_gas expected_base_fee_per_gas = parent_base_fee_per_gas
elif parent_gas_used > parent_gas_target: elif parent_gas_used > parent_gas_target:
gas_used_delta = parent_gas_used - parent_gas_target gas_used_delta = parent_gas_used - parent_gas_target