Skip to content

[ETCM-1066] Add EIP-2929 VM integration tests #1104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 20, 2021
Merged

[ETCM-1066] Add EIP-2929 VM integration tests #1104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21960c6
[ETCM-1066] Add EIP-2929 VM integration tests
lukasz-golebiewski Aug 19, 2021
4ce9db2
Merge branch 'develop' into feature/etcm-1066/vm-integration-tests
lukasz-golebiewski Aug 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/scala/io/iohk/ethereum/vm/OpCode.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ trait AddrAccessGas { self: OpCode =>

trait StorageAccessGas { self: OpCode =>

private def coldGasFn: FeeSchedule => BigInt = _.G_cold_account_access
private def coldGasFn: FeeSchedule => BigInt = _.G_cold_sload
private def warmGasFn: FeeSchedule => BigInt = _.G_warm_storage_read

override protected def baseGas[W <: WorldStateProxy[W, S], S <: Storage[S]](state: ProgramState[W, S]): BigInt = {
Expand Down Expand Up @@ -769,7 +769,7 @@ case object SSTORE extends OpCode(0x55, 2, 0, _.G_zero) {
state.config.feeSchedule.G_sreset
}

originalCharge + OpCode.storageAccessCost(state, state.ownAddress, offset)(_ => 0, _.G_cold_account_access, _ => 0)
originalCharge + OpCode.storageAccessCost(state, state.ownAddress, offset)(_ => 0, _.G_cold_sload, _ => 0)
}

override protected def availableInContext[W <: WorldStateProxy[W, S], S <: Storage[S]]
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/io/iohk/ethereum/vm/CallOpcodesPostEip2929Spec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class MagnetoCallOpFixture(config: EvmConfig)
BlockFixtures.ValidBlock.header.copy(number = Fixtures.MagnetoBlockNumber, unixTimestamp = 0)

override val requiredGas: BigInt = {
val storageCost = 3 * (config.feeSchedule.G_sset + config.feeSchedule.G_cold_account_access)
val storageCost = 3 * (config.feeSchedule.G_sset + config.feeSchedule.G_cold_sload)
val memCost = config.calcMemCost(0, 0, 32)
val copyCost = config.feeSchedule.G_copy * wordsForBytes(32)

Expand Down
65 changes: 59 additions & 6 deletions src/test/scala/io/iohk/ethereum/vm/OpCodeGasSpecPostEip2929.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
package io.iohk.ethereum.vm

import akka.util.ByteString
import akka.util.ByteString.{empty => bEmpty}

import org.bouncycastle.util.encoders.Hex
import org.scalacheck.Arbitrary
import org.scalacheck.Gen
import org.scalatest.funsuite.AnyFunSuite
import org.scalatest.matchers.should.Matchers
import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks

import io.iohk.ethereum.Fixtures.Blocks
import io.iohk.ethereum.domain.Account
import io.iohk.ethereum.domain.Address
import io.iohk.ethereum.domain.UInt256
import io.iohk.ethereum.domain.UInt256._
import io.iohk.ethereum.vm.Generators._
import io.iohk.ethereum.vm.MockWorldState.PC
import io.iohk.ethereum.vm.MockWorldState.TestVM

import Fixtures.blockchainConfig

Expand Down Expand Up @@ -126,7 +133,7 @@ class OpCodeGasSpecPostEip2929 extends AnyFunSuite with OpCodeTesting with Match

val stateOut = op.execute(stateIn)

verifyGas(G_cold_account_access, stateIn, stateOut)
verifyGas(G_cold_sload, stateIn, stateOut)
assert(stateOut.accessedStorageKeys.contains((stateIn.ownAddress, offset)))
}

Expand Down Expand Up @@ -203,13 +210,13 @@ class OpCodeGasSpecPostEip2929 extends AnyFunSuite with OpCodeTesting with Match
val table = Table[UInt256, UInt256, Boolean, BigInt, BigInt](
("offset", "value", "alreadyAccessed", "startGas", "expectedGasConsumption"),
(0, 1, true, G_callstipend + 1, G_sload),
(0, 1, false, G_sload + G_cold_account_access, G_sload + G_cold_account_access),
(0, 1, false, G_callstipend + 1, G_sload + G_cold_sload),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was wondering why the '+1' here, but the yellow paper answered me: the call will fail if there is less than or EQUALS to G_callstipend gas left.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we should start adding such tidbits of knowledge into the codebase.
//YP, page X, "quote"

(0, 0, true, G_callstipend + 1, G_sload),
(0, 0, false, G_sload + G_cold_account_access, G_sload + G_cold_account_access),
(0, 0, false, G_callstipend + 1, G_sload + G_cold_sload),
(1, 0, true, G_callstipend + 1, G_sload),
(1, 0, false, G_sload + G_cold_account_access, G_sload + G_cold_account_access),
(1, 0, false, G_callstipend + 1, G_sload + G_cold_sload),
(1, 1, true, G_sset, G_sset),
(1, 1, false, G_sset + G_cold_account_access, G_sset + G_cold_account_access)
(1, 1, false, G_sset + G_cold_sload, G_sset + G_cold_sload)
)

forAll(table) { (offset, value, alreadyAccessed, startGas, expectedGasConsumption) =>
Expand All @@ -229,7 +236,7 @@ class OpCodeGasSpecPostEip2929 extends AnyFunSuite with OpCodeTesting with Match
forAll(Arbitrary.arbitrary[Boolean]) { alreadyAccessed =>
val offset = 0
val value = 0
val expectedGasConsumption = if (alreadyAccessed) G_sreset else G_sreset + G_cold_account_access
val expectedGasConsumption = if (alreadyAccessed) G_sreset else G_sreset + G_cold_sload

val stackIn = Stack.empty().push(value).push(offset)
val stateIn = getProgramStateGen(
Expand All @@ -244,4 +251,50 @@ class OpCodeGasSpecPostEip2929 extends AnyFunSuite with OpCodeTesting with Match
verifyGas(expectedGasConsumption, stateIn, stateOut, allowOOG = false)
}
}

// Testcases described in https://gist.github.com/holiman/174548cad102096858583c6fbbb0649a
test("Gas metering after Magneto hard fork (EIP-2929)") {
val eip2929Table = Table[String, BigInt](
("code", "gasUsed"),
("60013f5060023b506003315060f13f5060f23b5060f3315060f23f5060f33b5060f1315032315030315000", 8653),
("60006000600060ff3c60006000600060ff3c600060006000303c00", 2835),
("60015450601160015560116002556011600255600254600154", 44529),
("60008080808060046000f15060008080808060ff6000f15060008080808060ff6000fa50", 2869)
)

forAll(eip2929Table) { (code, gasUsed) =>
val defaultGaspool = 1000000
val senderAddr: Address = Address(0xcafebabeL)
val senderAcc: Account = Account(nonce = 1, balance = 1000000)
val defaultWorld: MockWorldState = MockWorldState().saveAccount(senderAddr, senderAcc)

val blockHeader = Blocks.ValidBlock.header.copy(
number = Fixtures.MagnetoBlockNumber
)

val vm = new TestVM
val context: PC = ProgramContext(
callerAddr = senderAddr,
originAddr = senderAddr,
recipientAddr = None,
gasPrice = 1,
startGas = defaultGaspool,
inputData = bEmpty,
value = 100,
endowment = 100,
doTransfer = true,
blockHeader = blockHeader,
callDepth = 0,
world = defaultWorld,
initialAddressesToDelete = Set(),
evmConfig = config,
originalWorld = defaultWorld
)

val env = ExecEnv(context, ByteString(Hex.decode(code)), context.originAddr)
val result = vm.exec(ProgramState(vm, context, env))

result.gasUsed shouldEqual gasUsed
}
}
}