status-im
/
nimbus-eth1
mirror of https://github.com/status-im/nimbus-eth1.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bump nim-evmc to 730d35d8572e1b3957b0c6c986ecd86413976da0 (#2879)

This commit is contained in:
andri lim 2024-11-27 16:08:14 +07:00 committed by GitHub
parent b87b255398
commit fbbc500445
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nimbus/common/evmforks.nim
View File

@ -29,3 +29,4 @@ const
FkShanghai* = EVMC_SHANGHAI FkShanghai* = EVMC_SHANGHAI
FkCancun* = EVMC_CANCUN FkCancun* = EVMC_CANCUN
FkPrague* = EVMC_PRAGUE FkPrague* = EVMC_PRAGUE
FkOsaka* = EVMC_OSAKA

7
nimbus/common/hardforks.nim
View File

@ -37,6 +37,7 @@ type
Shanghai Shanghai
Cancun Cancun
Prague Prague
Osaka
const lastPurelyBlockNumberBasedFork* = GrayGlacier const lastPurelyBlockNumberBasedFork* = GrayGlacier
# MergeFork is special because of TTD. # MergeFork is special because of TTD.
@ -52,7 +53,7 @@ type
ForkTransitionTable* = object ForkTransitionTable* = object
blockNumberThresholds*: array[Frontier..GrayGlacier, Opt[BlockNumber]] blockNumberThresholds*: array[Frontier..GrayGlacier, Opt[BlockNumber]]
mergeForkTransitionThreshold*: MergeForkTransitionThreshold mergeForkTransitionThreshold*: MergeForkTransitionThreshold
timeThresholds*: array[Shanghai..Prague, Opt[EthTime]] timeThresholds*: array[Shanghai..Osaka, Opt[EthTime]]
# Starting with Shanghai, forking is based on timestamp # Starting with Shanghai, forking is based on timestamp
# rather than block number. # rather than block number.
@ -173,6 +174,7 @@ type
shanghaiTime* : Opt[EthTime] shanghaiTime* : Opt[EthTime]
cancunTime* : Opt[EthTime] cancunTime* : Opt[EthTime]
pragueTime* : Opt[EthTime] pragueTime* : Opt[EthTime]
osakaTime* : Opt[EthTime]
terminalTotalDifficulty*: Opt[UInt256] terminalTotalDifficulty*: Opt[UInt256]
terminalTotalDifficultyPassed*: Opt[bool] terminalTotalDifficultyPassed*: Opt[bool]
@ -265,6 +267,7 @@ func toForkTransitionTable*(conf: ChainConfig): ForkTransitionTable =
result.timeThresholds[Shanghai] = conf.shanghaiTime result.timeThresholds[Shanghai] = conf.shanghaiTime
result.timeThresholds[Cancun] = conf.cancunTime result.timeThresholds[Cancun] = conf.cancunTime
result.timeThresholds[Prague] = conf.pragueTime result.timeThresholds[Prague] = conf.pragueTime
result.timeThresholds[Osaka] = conf.osakaTime
func populateFromForkTransitionTable*(conf: ChainConfig, t: ForkTransitionTable) = func populateFromForkTransitionTable*(conf: ChainConfig, t: ForkTransitionTable) =
conf.homesteadBlock = t.blockNumberThresholds[HardFork.Homestead] conf.homesteadBlock = t.blockNumberThresholds[HardFork.Homestead]
@ -289,6 +292,7 @@ func populateFromForkTransitionTable*(conf: ChainConfig, t: ForkTransitionTable)
conf.shanghaiTime = t.timeThresholds[HardFork.Shanghai] conf.shanghaiTime = t.timeThresholds[HardFork.Shanghai]
conf.cancunTime = t.timeThresholds[HardFork.Cancun] conf.cancunTime = t.timeThresholds[HardFork.Cancun]
conf.pragueTime = t.timeThresholds[HardFork.Prague] conf.pragueTime = t.timeThresholds[HardFork.Prague]
conf.osakaTime = t.timeThresholds[HardFork.Osaka]
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Map HardFork to EVM/EVMC Fork # Map HardFork to EVM/EVMC Fork
@ -314,6 +318,7 @@ const
FkShanghai, # Shanghai FkShanghai, # Shanghai
FkCancun, # Cancun FkCancun, # Cancun
FkPrague, # Prague FkPrague, # Prague
FkOsaka, # Osaka
] ]
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------

1
nimbus/core/executor/calculate_reward.nim
View File

@ -46,6 +46,7 @@ const
eth0, # Shanghai eth0, # Shanghai
eth0, # Cancun eth0, # Cancun
eth0, # Prague eth0, # Prague
eth0, # Osaka
] ]
proc calculateReward*(vmState: BaseVMState; account: Address; proc calculateReward*(vmState: BaseVMState; account: Address;

1
nimbus/evm/interpreter/gas_costs.nim
View File

@ -789,6 +789,7 @@ const
FkShanghai: ShanghaiGasFees, FkShanghai: ShanghaiGasFees,
FkCancun: ShanghaiGasFees, FkCancun: ShanghaiGasFees,
FkPrague: ShanghaiGasFees, FkPrague: ShanghaiGasFees,
FkOsaka: ShanghaiGasFees,
] ]
gasCosts(FkFrontier, base, BaseGasCosts) gasCosts(FkFrontier, base, BaseGasCosts)

2
vendor/nim-evmc vendored

@ -1 +1 @@
Subproject commit 6e261148565a311536b1a29f1568e8c4470baf9d Subproject commit 730d35d8572e1b3957b0c6c986ecd86413976da0