Skip to content

test: allow empty recipient code in state tests #328

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
zoowii merged 4 commits into from
Feb 3, 2026
Merged

test: allow empty recipient code in state tests #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
15a664c
test: allow empty recipient code in state tests
ZR74 Feb 3, 2026
ac02b14
fix: pre-validate EIP-1559/4844 tx rules in state tests
ZR74 Feb 3, 2026
f433ced
style: format check
ZR74 Feb 3, 2026
4f31d0d
fix: reject type 4 tx before prague
ZR74 Feb 3, 2026
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
155 changes: 126 additions & 29 deletions src/tests/evm_state_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

#include <algorithm>
#include <gtest/gtest.h>
#include <intx/intx.hpp>

using namespace zen::evm;
using namespace zen::utils;
Expand Down Expand Up @@ -62,8 +63,10 @@ TxIntrinsicCost computeTxIntrinsicCost(const evmc_revision Revision,
}
}

const int64_t AuthListCost = static_cast<int64_t>(PT.AuthorizationListSize) *
AuthorizationEmptyAccountCost;
const int64_t AuthListCost =
Revision >= EVMC_PRAGUE ? static_cast<int64_t>(PT.AuthorizationListSize) *
AuthorizationEmptyAccountCost
: 0;

int64_t InitcodeCost = 0;
if (IsCreateTx && Revision >= EVMC_SHANGHAI) {
Expand Down Expand Up @@ -173,10 +176,28 @@ ExecutionResult executeStateTest(const StateTestFixture &Fixture,
return Result;
};

auto MaybeReturnInvalid = [&](const std::string &Reason) {
if (!ExpectedResult.ExpectedException.empty()) {
return ExecutionResult{true, {}};
}
return MakeFailure(Reason + " for " + Fixture.TestName + " (" + Fork + ")");
};

try {
ParsedTransaction PT =
createTransactionFromIndex(*Fixture.Transaction, ExpectedResult);
const evmc_revision Revision = mapForkToRevision(Fork);

const bool HasAuthorizationListField =
Fixture.Transaction &&
Fixture.Transaction->HasMember("authorizationList") &&
(*Fixture.Transaction)["authorizationList"].IsArray();
const bool IsType4Tx = !ExpectedResult.ExpectedTxBytes.empty() &&
ExpectedResult.ExpectedTxBytes[0] == 0x04;
if (Revision < EVMC_PRAGUE && (HasAuthorizationListField || IsType4Tx)) {
return MaybeReturnInvalid("Type 4 transaction pre-fork");
}

const TxIntrinsicCost IntrinsicCost = computeTxIntrinsicCost(Revision, PT);

const bool IsCreateTx =
Expand All @@ -201,6 +222,104 @@ ExecutionResult executeStateTest(const StateTestFixture &Fixture,
" (" + Fork + ")");
}

// Validate EIP-1559/4844 transaction constraints before execution.
std::optional<evmc::uint256be> MaxFeePerGas;
std::optional<evmc::uint256be> MaxPriorityFeePerGas;
if (Fixture.Transaction) {
const auto &Tx = *Fixture.Transaction;
if (Tx.HasMember("gasPrice") && Tx["gasPrice"].IsString()) {
MaxFeePerGas = parseUint256(Tx["gasPrice"].GetString());
} else if (Tx.HasMember("maxFeePerGas") &&
Tx["maxFeePerGas"].IsString()) {
MaxFeePerGas = parseUint256(Tx["maxFeePerGas"].GetString());
}
if (Tx.HasMember("maxPriorityFeePerGas") &&
Tx["maxPriorityFeePerGas"].IsString()) {
MaxPriorityFeePerGas =
parseUint256(Tx["maxPriorityFeePerGas"].GetString());
}
}

const intx::uint256 BaseFee =
intx::be::load<intx::uint256>(Fixture.Environment.block_base_fee);
if (MaxFeePerGas) {
const intx::uint256 MaxFee = intx::be::load<intx::uint256>(*MaxFeePerGas);
if (MaxFee < BaseFee) {
return MaybeReturnInvalid("Max fee per gas below base fee");
}
if (MaxPriorityFeePerGas) {
const intx::uint256 MaxPriority =
intx::be::load<intx::uint256>(*MaxPriorityFeePerGas);
if (MaxPriority > MaxFee) {
return MaybeReturnInvalid("Max priority fee exceeds max fee");
}
}
}

const bool HasBlobFields =
Fixture.Transaction &&
((Fixture.Transaction->HasMember("maxFeePerBlobGas") &&
(*Fixture.Transaction)["maxFeePerBlobGas"].IsString()) ||
(Fixture.Transaction->HasMember("blobVersionedHashes") &&
(*Fixture.Transaction)["blobVersionedHashes"].IsArray()));
if (HasBlobFields) {
const size_t BlobCount = PT.BlobHashes.size();
if (BlobCount == 0) {
return MaybeReturnInvalid("Blob transaction has zero blobs");
}
const size_t MaxBlobs = (Revision >= EVMC_PRAGUE)
? static_cast<size_t>(9)
: static_cast<size_t>(6);
if (BlobCount > MaxBlobs) {
return MaybeReturnInvalid("Blob transaction has too many blobs");
}
for (const auto &Hash : PT.BlobHashes) {
if (Hash.bytes[0] != 0x01) {
return MaybeReturnInvalid("Invalid blob versioned hash");
}
}
if (!PT.MaxFeePerBlobGas) {
return MaybeReturnInvalid("Missing max fee per blob gas");
}
const intx::uint256 MaxBlobFee =
intx::be::load<intx::uint256>(*PT.MaxFeePerBlobGas);
const intx::uint256 BlobBaseFee =
intx::be::load<intx::uint256>(Fixture.Environment.blob_base_fee);
if (MaxBlobFee < BlobBaseFee) {
return MaybeReturnInvalid("Max fee per blob gas below base fee");
}
}

if (MaxFeePerGas) {
intx::uint256 SenderBalance = 0;
for (const auto &PA : Fixture.PreState) {
if (std::memcmp(PA.Address.bytes, PT.Message->sender.bytes, 20) == 0) {
SenderBalance = intx::be::load<intx::uint256>(PA.Account.balance);
break;
}
}

const intx::uint256 GasLimit = intx::uint256(TxGasLimit);
const intx::uint256 MaxFee = intx::be::load<intx::uint256>(*MaxFeePerGas);
const intx::uint256 Value =
intx::be::load<intx::uint256>(PT.Message->value);
intx::uint256 TotalCost = GasLimit * MaxFee + Value;

if (HasBlobFields && PT.MaxFeePerBlobGas) {
constexpr uint64_t BlobGasPerBlob = 131072;
const intx::uint256 BlobGas =
intx::uint256(PT.BlobHashes.size()) * intx::uint256(BlobGasPerBlob);
const intx::uint256 MaxBlobFee =
intx::be::load<intx::uint256>(*PT.MaxFeePerBlobGas);
TotalCost += BlobGas * MaxBlobFee;
}

if (SenderBalance < TotalCost) {
return MaybeReturnInvalid(
"Sender balance insufficient for upfront cost");
}
}

const int64_t ExecutionGasLimit = TxGasLimit - IntrinsicCost.Intrinsic;
PT.Message->gas = ExecutionGasLimit;

Expand All @@ -213,7 +332,7 @@ ExecutionResult executeStateTest(const StateTestFixture &Fixture,
precompile::isModExpPrecompile(PrecompileAddr) ||
precompile::isBlake2bPrecompile(PrecompileAddr, Revision);

// Find the target account (contract to call)
// Find the target account (contract to call) if present.
const ParsedAccount *TargetAccount = nullptr;
for (const auto &PA : Fixture.PreState) {
if (std::memcmp(PA.Address.bytes, PT.Message->recipient.bytes, 20) == 0) {
Expand All @@ -222,30 +341,6 @@ ExecutionResult executeStateTest(const StateTestFixture &Fixture,
}
}

if (!TargetAccount && !IsCreateTx && !IsPrecompile) {
if (!ExpectedResult.ExpectedException.empty()) {
return {true, {}};
}
if (DEBUG) {
std::cout << "No target account found for test: " << Fixture.TestName
<< std::endl;
}
return MakeFailure(
"Target account " +
evmc::hex(evmc::bytes_view(PT.Message->recipient.bytes, 20)) +
" not present in pre-state for " + Fixture.TestName + " (" + Fork +
")");
}

// Skip if no code to execute
if (!IsCreateTx && !IsPrecompile && TargetAccount->Account.code.empty()) {
if (DEBUG) {
std::cout << "No code to execute for test: " << Fixture.TestName
<< std::endl;
}
return {true, {}};
}

RuntimeConfig Config = buildRuntimeConfig();

auto HostPtr = std::make_unique<ZenMockedEVMHost>();
Expand Down Expand Up @@ -287,9 +382,12 @@ ExecutionResult executeStateTest(const StateTestFixture &Fixture,
} else if (IsPrecompile) {
ExecConfig.Bytecode = nullptr;
ExecConfig.BytecodeSize = 0;
} else {
} else if (TargetAccount) {
ExecConfig.Bytecode = TargetAccount->Account.code.data();
ExecConfig.BytecodeSize = TargetAccount->Account.code.size();
} else {
ExecConfig.Bytecode = nullptr;
ExecConfig.BytecodeSize = 0;
}
ExecConfig.Message = *PT.Message;
ExecConfig.Revision = Revision;
Expand Down Expand Up @@ -402,7 +500,6 @@ const std::vector<StateTestFixture> &getStateFixtures() {
std::cout << "Found " << JsonFiles.size() << " JSON test files in "
<< DEFAULT_TEST_DIR << std::endl;
}

for (const auto &FilePath : JsonFiles) {
auto FixturesFromFile = parseStateTestFile(FilePath);
for (auto &Fixture : FixturesFromFile) {
Expand Down
5 changes: 2 additions & 3 deletions src/tests/evm_test_host.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,8 @@ class ZenMockedEVMHost : public evmc::MockedHost {
const bool IsPrecompile =
precompile::isModExpPrecompile(PrecompileAddr) ||
precompile::isBlake2bPrecompile(PrecompileAddr, ActiveRevision);
if ((!Config.Bytecode || Config.BytecodeSize == 0) && !IsCreateTx &&
!IsPrecompile) {
Result.ErrorMessage = "Bytecode buffer is empty";
if (!Config.Bytecode && Config.BytecodeSize != 0) {
Result.ErrorMessage = "Bytecode buffer is null";
return Result;
}

Expand Down