Skip to content

Commit e5e1b8b

Browse files
[ETCM-912] Move isEip2929Enabled flag to BlockchainConfigForEvm
1 parent 41d7365 commit e5e1b8b

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/main/scala/io/iohk/ethereum/vm/BlockchainConfigForEvm.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ object BlockchainConfigForEvm {
6868
val BeforeByzantium, Byzantium, Constantinople, Petersburg, Istanbul, Berlin = Value
6969
}
7070

71+
def isEip2929Enabled(etcFork: EtcFork): Boolean = etcFork >= EtcForks.Magneto
72+
7173
def apply(blockchainConfig: BlockchainConfig): BlockchainConfigForEvm = {
7274
import blockchainConfig._
7375
BlockchainConfigForEvm(

src/main/scala/io/iohk/ethereum/vm/OpCode.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import io.iohk.ethereum.domain.TxLogEntry
99
import io.iohk.ethereum.domain.UInt256
1010
import io.iohk.ethereum.domain.UInt256._
1111
import io.iohk.ethereum.utils.ByteStringUtils.Padding
12+
import io.iohk.ethereum.vm.BlockchainConfigForEvm._
1213
import io.iohk.ethereum.vm.BlockchainConfigForEvm.EtcForks
1314
import io.iohk.ethereum.vm.BlockchainConfigForEvm.EtcForks.EtcFork
1415
import io.iohk.ethereum.vm.BlockchainConfigForEvm.EthForks
@@ -205,7 +206,6 @@ abstract class OpCode(val code: Byte, val delta: Int, val alpha: Int, val constG
205206
protected def availableInContext[W <: WorldStateProxy[W, S], S <: Storage[S]]: ProgramState[W, S] => Boolean = _ =>
206207
true
207208

208-
protected def isEip2929Enabled(etcFork: EtcFork): Boolean = etcFork >= EtcForks.Magneto
209209
}
210210

211211
trait AddrAccessGas { self: OpCode =>

0 commit comments

Comments
 (0)