Bal devnet 2

cspell.json

@@ -693,6 +693,7 @@
     "segmentations",
     "selfbalance",
     "selfdestruct",
+    "selfdestructs",
     "seqlock",
     "serialised",
     "serialises",
@@ -728,6 +729,7 @@
     "skylake",
     "slnx",
     "sload",
+    "slotnum",
     "smod",
     "somelabel",
     "Spmc",
@@ -856,6 +858,7 @@
     "upto",
     "upvoting",
     "vbmi",
+    "vectorised",
     "verifytrie",
     "verkle",
     "vitalik",

src/Nethermind/Ethereum.Test.Base/BlockchainTestBase.cs

@@ -87,9 +87,9 @@ protected async Task<EthereumTestResult> RunTest(BlockchainTest test, Stopwatch?
         bool isEngineTest = test.Blocks is null && test.EngineNewPayloads is not null;
 
         List<(ForkActivation Activation, IReleaseSpec Spec)> transitions =
-            isEngineTest ?
-            [((ForkActivation)0, test.Network)] :
-            [((ForkActivation)0, test.GenesisSpec), ((ForkActivation)1, test.Network)]; // genesis block is always initialized with Frontier
+        isEngineTest ?
+        [((ForkActivation)0, test.Network)] :
+        [((ForkActivation)0, test.GenesisSpec), ((ForkActivation)1, test.Network)]; // genesis block is always initialized with Frontier
 
         if (test.NetworkAfterTransition is not null)
         {
@@ -127,7 +127,6 @@ protected async Task<EthereumTestResult> RunTest(BlockchainTest test, Stopwatch?
         }
 
         IConfigProvider configProvider = new ConfigProvider();
-        // configProvider.GetConfig<IBlocksConfig>().PreWarmStateOnBlockProcessing = false;
         ContainerBuilder containerBuilder = new ContainerBuilder()
             .AddModule(new TestNethermindModule(configProvider))
             .AddSingleton(specProvider)

src/Nethermind/Ethereum.Test.Base/JsonToEthereumTest.cs

@@ -63,7 +63,8 @@ public static BlockHeader Convert(TestBlockHeaderJson? headerJson)
                 headerJson.BlobGasUsed is null ? null : (ulong)Bytes.FromHexString(headerJson.BlobGasUsed).ToUnsignedBigInteger(),
                 headerJson.ExcessBlobGas is null ? null : (ulong)Bytes.FromHexString(headerJson.ExcessBlobGas).ToUnsignedBigInteger(),
                 headerJson.ParentBeaconBlockRoot is null ? null : new Hash256(headerJson.ParentBeaconBlockRoot),
-                headerJson.RequestsHash is null ? null : new Hash256(headerJson.RequestsHash)
+                headerJson.RequestsHash is null ? null : new Hash256(headerJson.RequestsHash),
+                headerJson.SlotNumber is null ? null : (ulong)Bytes.FromHexString(headerJson.SlotNumber).ToUnsignedBigInteger()
             )
             {
                 Bloom = new Bloom(Bytes.FromHexString(headerJson.Bloom)),
@@ -119,6 +120,7 @@ public static BlockHeader Convert(TestBlockHeaderJson? headerJson)
                     ExcessBlobGas = executionPayload.ExcessBlobGas is null ? null : (ulong)Bytes.FromHexString(executionPayload.ExcessBlobGas).ToUnsignedBigInteger(),
                     ParentBeaconBlockRoot = parentBeaconBlockRoot is null ? null : new(parentBeaconBlockRoot),
                     Withdrawals = executionPayload.Withdrawals is null ? null : [.. executionPayload.Withdrawals.Select(x => Rlp.Decode<Withdrawal>(Bytes.FromHexString(x)))],
+                    SlotNumber = executionPayload.SlotNumber is null ? null : (ulong)Bytes.FromHexString(executionPayload.SlotNumber).ToUnsignedBigInteger(),
                     Transactions = [.. executionPayload.Transactions.Select(x => Bytes.FromHexString(x))],
                     ExecutionRequests = []
                 }, blobVersionedHashes, validationError, int.Parse(engineNewPayload.NewPayloadVersion ?? "4"), int.Parse(engineNewPayload.ForkChoiceUpdatedVersion ?? "3"));

src/Nethermind/Ethereum.Test.Base/TestBlockHeaderJson.cs

@@ -28,5 +28,6 @@ public class TestBlockHeaderJson
         public string? BlockAccessListHash { get; set; }
         public string? BlobGasUsed { get; set; }
         public string? ExcessBlobGas { get; set; }
+        public string? SlotNumber { get; set; }
     }
 }

src/Nethermind/Ethereum.Test.Base/TestEngineNewPayloadsJson.cs

@@ -31,6 +31,7 @@ public class ParamsExecutionPayload
             public string[] Transactions { get; set; }
             public string[]? Withdrawals { get; set; }
             public string? BlockAccessList { get; set; }
+            public string? SlotNumber { get; set; }
         }
     }
 }

src/Nethermind/Nethermind.Blockchain.Test/TransactionSelectorTests.cs

@@ -473,6 +473,41 @@ void AddTxs(int txCount, int blobsPerTx, int account, List<Transaction> txs, ref
         [TestCaseSource(nameof(EnoughShardBlobTransactionsSelectedTestCases))]
         [TestCaseSource(nameof(BlobTransactionOrderingTestCases))]
         public void Proper_transactions_selected(ProperTransactionsSelectedTestCase testCase)
+        {
+            IReadOnlyList<Transaction> selectedTransactions = SelectTransactions(testCase);
+            selectedTransactions.Should()
+                .BeEquivalentTo(testCase.ExpectedSelectedTransactions, o => o.WithStrictOrdering());
+        }
+
+        [Test]
+        public void Block_gas_budget_uses_pre_refund_value_for_sender_chain()
+        {
+            Transaction first = Build.A.Transaction.WithSenderAddress(TestItem.AddressA).WithNonce(1)
+                .WithGasPrice(10).WithGasLimit(30_000).SignedAndResolved(TestItem.PrivateKeyA).TestObject;
+            Transaction second = Build.A.Transaction.WithSenderAddress(TestItem.AddressA).WithNonce(2)
+                .WithGasPrice(10).WithGasLimit(30_000).SignedAndResolved(TestItem.PrivateKeyA).TestObject;
+
+            first.SpentGas = 10_000;
+            first.BlockGasUsed = 20_000;
+            second.SpentGas = 10_000;
+            second.BlockGasUsed = 20_000;
+
+            ProperTransactionsSelectedTestCase testCase = new()
+            {
+                ReleaseSpec = Berlin.Instance,
+                BaseFee = 0,
+                AccountStates = { { TestItem.AddressA, (1_000_000, 1) } },
+                Transactions = { first, second },
+                GasLimit = 30_000
+            };
+            testCase.ExpectedSelectedTransactions.Add(first);
+
+            IReadOnlyList<Transaction> selectedTransactions = SelectTransactions(testCase);
+            selectedTransactions.Should()
+                .BeEquivalentTo(testCase.ExpectedSelectedTransactions, o => o.WithStrictOrdering());
+        }
+
+        private static IReadOnlyList<Transaction> SelectTransactions(ProperTransactionsSelectedTestCase testCase)
         {
             IWorldState stateProvider = TestWorldStateFactory.CreateForTest();
             ISpecProvider specProvider = Substitute.For<ISpecProvider>();
@@ -549,11 +584,7 @@ Dictionary<AddressAsKey, Transaction[]> GroupTransactions(bool supportBlobs) =>
                 parentHeader = parentHeader.WithExcessBlobGas(0);
             }
 
-            IEnumerable<Transaction> selectedTransactions =
-                poolTxSource.GetTransactions(parentHeader.TestObject,
-                    testCase.GasLimit);
-            selectedTransactions.Should()
-                .BeEquivalentTo(testCase.ExpectedSelectedTransactions, o => o.WithStrictOrdering());
+            return poolTxSource.GetTransactions(parentHeader.TestObject, testCase.GasLimit).ToArray();
         }
 
         public class ProperTransactionsSelectedTestCase

src/Nethermind/Nethermind.Blockchain.Test/Validators/HeaderValidatorTests.cs

@@ -8,13 +8,15 @@
 using Nethermind.Consensus.Ethash;
 using Nethermind.Consensus.Validators;
 using Nethermind.Core;
+using Nethermind.Core.BlockAccessLists;
 using Nethermind.Core.Crypto;
 using Nethermind.Core.Specs;
 using Nethermind.Core.Test;
 using Nethermind.Core.Test.Builders;
 using Nethermind.Crypto;
 using Nethermind.Int256;
 using Nethermind.Logging;
+using Nethermind.Serialization.Rlp;
 using Nethermind.Specs;
 using Nethermind.Specs.Forks;
 using Nethermind.Specs.Test;
@@ -143,6 +145,52 @@ public void When_timestamp_same_as_parent()
         Assert.That(result, Is.False);
     }
 
+    [Test, MaxTime(Timeout.MaxTestTime)]
+    public void When_slot_number_same_as_parent()
+    {
+        // Arrange: Same setup as above
+        TestSpecProvider specProvider = new(Amsterdam.Instance);
+        _validator = new HeaderValidator(_blockTree, Always.Valid, specProvider,
+            new OneLoggerLogManager(new(_testLogger)));
+
+        BlockAccessList emptyBal = new();
+        byte[] emptyEncodedBal = Rlp.Encode(emptyBal).Bytes;
+        _parentBlock = Build.A.Block
+            .WithNumber(5)
+            .WithSlotNumber(10)
+            .WithBlobGasUsed(0)
+            .WithExcessBlobGas(0)
+            .WithEmptyRequestsHash()
+            .WithBlockAccessList(emptyBal)
+            .WithEncodedBlockAccessList(emptyEncodedBal)
+            .WithBlockAccessListHash(Keccak.OfAnEmptySequenceRlp)
+            .TestObject;
+
+        _block = Build.A.Block
+            .WithParent(_parentBlock)
+            .WithNumber(_parentBlock.Number + 1)
+            .WithSlotNumber(10)
+            .WithBlobGasUsed(0)
+            .WithExcessBlobGas(0)
+            .WithEmptyRequestsHash()
+            .WithBlockAccessList(emptyBal)
+            .WithBlockAccessListHash(Keccak.OfAnEmptySequenceRlp)
+            .WithEncodedBlockAccessList(emptyEncodedBal)
+            .TestObject;
+
+        _block.Header.Hash = _block.CalculateHash();
+
+        // Act
+        bool result = _validator.Validate(_block.Header, _parentBlock.Header, false, out string? error);
+
+        using (Assert.EnterMultipleScope())
+        {
+            // Assert
+            Assert.That(result, Is.False);
+            Assert.That(error, Is.EqualTo("InvalidSlotNumber: Slot number in header must exceed parent."));
+        }
+    }
+
     [Test, MaxTime(Timeout.MaxTestTime)]
     public void When_extra_data_too_long()
     {

src/Nethermind/Nethermind.Blockchain/Tracing/AccessTxTracer.cs

@@ -16,13 +16,13 @@ public class AccessTxTracer(params Address[] addressesToOptimize) : TxTracer
     public override bool IsTracingReceipt => true;
     public override bool IsTracingAccess => true;
 
-    public override void MarkAsSuccess(Address recipient, GasConsumed gasSpent, byte[] output, LogEntry[] logs,
+    public override void MarkAsSuccess(Address recipient, in GasConsumed gasSpent, byte[] output, LogEntry[] logs,
         Hash256? stateRoot = null)
     {
         GasSpent += gasSpent.SpentGas;
     }
 
-    public override void MarkAsFailed(Address recipient, GasConsumed gasSpent, byte[] output, string? error,
+    public override void MarkAsFailed(Address recipient, in GasConsumed gasSpent, byte[] output, string? error,
         Hash256? stateRoot = null)
     {
         GasSpent += gasSpent.SpentGas;

src/Nethermind/Nethermind.Blockchain/Tracing/AlwaysCancelTxTracer.cs

@@ -46,9 +46,9 @@ public static AlwaysCancelTxTracer Instance
     public bool IsTracingFees => true;
     public bool IsTracingLogs => true;
 
-    public void MarkAsSuccess(Address recipient, GasConsumed gasSpent, byte[] output, LogEntry[] logs, Hash256? stateRoot = null) => throw new OperationCanceledException(ErrorMessage);
+    public void MarkAsSuccess(Address recipient, in GasConsumed gasSpent, byte[] output, LogEntry[] logs, Hash256? stateRoot = null) => throw new OperationCanceledException(ErrorMessage);
 
-    public void MarkAsFailed(Address recipient, GasConsumed gasSpent, byte[] output, string? error, Hash256? stateRoot = null) => throw new OperationCanceledException(ErrorMessage);
+    public void MarkAsFailed(Address recipient, in GasConsumed gasSpent, byte[] output, string? error, Hash256? stateRoot = null) => throw new OperationCanceledException(ErrorMessage);
 
     public void StartOperation(int pc, Instruction opcode, long gas, in ExecutionEnvironment env, int codeSection = 0, int functionDepth = 0) => throw new OperationCanceledException(ErrorMessage);
 

src/Nethermind/Nethermind.Blockchain/Tracing/BlockReceiptsTracer.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Runtime.InteropServices;
 using Nethermind.Core;
 using Nethermind.Core.Crypto;
@@ -33,9 +34,9 @@ public class BlockReceiptsTracer : IBlockTracer, ITxTracer, IJournal<int>, ITxTr
     public bool IsTracingFees => _currentTxTracer.IsTracingFees;
     public bool IsTracingLogs => _currentTxTracer.IsTracingLogs;
 
-    public void MarkAsSuccess(Address recipient, GasConsumed gasSpent, byte[] output, LogEntry[] logs, Hash256? stateRoot = null)
+    public void MarkAsSuccess(Address recipient, in GasConsumed gasSpent, byte[] output, LogEntry[] logs, Hash256? stateRoot = null)
     {
-        _txReceipts.Add(BuildReceipt(recipient, gasSpent.SpentGas, StatusCode.Success, logs, stateRoot));
+        _txReceipts.Add(BuildReceipt(recipient, gasSpent, StatusCode.Success, logs, stateRoot));
 
         // hacky way to support nested receipt tracers
         if (_otherTracer is ITxTracer otherTxTracer)
@@ -49,9 +50,9 @@ public void MarkAsSuccess(Address recipient, GasConsumed gasSpent, byte[] output
         }
     }
 
-    public void MarkAsFailed(Address recipient, GasConsumed gasSpent, byte[] output, string? error, Hash256? stateRoot = null)
+    public void MarkAsFailed(Address recipient, in GasConsumed gasSpent, byte[] output, string? error, Hash256? stateRoot = null)
     {
-        _txReceipts.Add(BuildFailedReceipt(recipient, gasSpent.SpentGas, error, stateRoot));
+        _txReceipts.Add(BuildFailedReceipt(recipient, gasSpent, error, stateRoot));
 
         // hacky way to support nested receipt tracers
         if (_otherTracer is ITxTracer otherTxTracer)
@@ -65,28 +66,51 @@ public void MarkAsFailed(Address recipient, GasConsumed gasSpent, byte[] output,
         }
     }
 
-    protected TxReceipt BuildFailedReceipt(Address recipient, long gasSpent, string error, Hash256? stateRoot)
+    protected TxReceipt BuildFailedReceipt(Address recipient, in GasConsumed gasSpent, string error, Hash256? stateRoot)
     {
         TxReceipt receipt = BuildReceipt(recipient, gasSpent, StatusCode.Failure, [], stateRoot);
         receipt.Error = error;
         return receipt;
     }
 
-    protected virtual TxReceipt BuildReceipt(Address recipient, long spentGas, byte statusCode, LogEntry[] logEntries, Hash256? stateRoot)
+    /// <summary>
+    /// Updates cumulative gas tracking for both block and receipt accounting.
+    /// EIP-7778: Block gas uses pre-refund values for gas limit accounting,
+    /// while receipt gas uses post-refund values (what users actually pay).
+    /// </summary>
+    /// <returns>The cumulative post-refund gas for receipts</returns>
+    protected long UpdateCumulativeGasTracking(in GasConsumed gasConsumed)
     {
+        // Track cumulative block gas for restore (pre-refund)
+        long cumulativeBlockGas = (_cumulativeBlockGasPerTx.Count > 0 ? _cumulativeBlockGasPerTx[^1] : 0) + gasConsumed.EffectiveBlockGas;
+        _cumulativeBlockGasPerTx.Add(cumulativeBlockGas);
+
+        // Track cumulative receipt gas (post-refund)
+        _cumulativeReceiptGas += gasConsumed.SpentGas;
+
+        Debug.Assert(_txReceipts.Count + 1 == _cumulativeBlockGasPerTx.Count,
+            "Receipt and gas tracking lists must remain synchronized");
+
+        return _cumulativeReceiptGas;
+    }
+
+    protected virtual TxReceipt BuildReceipt(Address recipient, in GasConsumed gasConsumed, byte statusCode, LogEntry[] logEntries, Hash256? stateRoot)
+    {
+        long cumulativeReceiptGas = UpdateCumulativeGasTracking(gasConsumed);
+
         Transaction transaction = CurrentTx!;
         TxReceipt txReceipt = new()
         {
             Logs = logEntries,
             TxType = transaction.Type,
             // Bloom calculated in parallel with other receipts
-            GasUsedTotal = Block.GasUsed,
+            GasUsedTotal = cumulativeReceiptGas,  // Post-refund cumulative
             StatusCode = statusCode,
             Recipient = transaction.IsContractCreation ? null : recipient,
             BlockHash = Block.Hash,
             BlockNumber = Block.Number,
             Index = _currentIndex,
-            GasUsed = spentGas,
+            GasUsed = gasConsumed.SpentGas,  // Post-refund for this tx
             Sender = transaction.SenderAddress,
             ContractAddress = transaction.IsContractCreation ? recipient : null,
             TxHash = transaction.Hash,
@@ -198,6 +222,8 @@ public void ReportFees(UInt256 fees, UInt256 burntFees)
     private ITxTracer _currentTxTracer = NullTxTracer.Instance;
     protected int _currentIndex { get; private set; }
     private readonly List<TxReceipt> _txReceipts = new();
+    private readonly List<long> _cumulativeBlockGasPerTx = new();  // Track pre-refund block gas for restore
+    private long _cumulativeReceiptGas;  // Track cumulative post-refund gas for receipts
     protected Transaction? CurrentTx;
     public ReadOnlySpan<TxReceipt> TxReceipts => CollectionsMarshal.AsSpan(_txReceipts);
     public TxReceipt LastReceipt => _txReceipts[^1];
@@ -210,13 +236,20 @@ public void ReportFees(UInt256 fees, UInt256 burntFees)
     public void Restore(int snapshot)
     {
         int numToRemove = _txReceipts.Count - snapshot;
-
-        for (int i = 0; i < numToRemove; i++)
+        if (numToRemove > 0)
         {
-            _txReceipts.RemoveAt(_txReceipts.Count - 1);
+            _txReceipts.RemoveRange(snapshot, numToRemove);
+            _cumulativeBlockGasPerTx.RemoveRange(snapshot, numToRemove);
         }
 
-        Block.Header.GasUsed = _txReceipts.Count > 0 ? _txReceipts[^1].GasUsedTotal : 0;
+        Debug.Assert(_txReceipts.Count == _cumulativeBlockGasPerTx.Count,
+            "Receipt and gas tracking lists must remain synchronized after restore");
+
+        // Restore block gas from tracking (pre-refund)
+        Block.Header.GasUsed = _cumulativeBlockGasPerTx.Count > 0 ? _cumulativeBlockGasPerTx[^1] : 0;
+
+        // Restore receipt gas from remaining receipts (post-refund)
+        _cumulativeReceiptGas = _txReceipts.Count > 0 ? _txReceipts[^1].GasUsedTotal : 0;
     }
 
     public void ReportReward(Address author, string rewardType, UInt256 rewardValue) =>
@@ -227,6 +260,8 @@ public void StartNewBlockTrace(Block block)
         Block = block;
         _currentIndex = 0;
         _txReceipts.Clear();
+        _cumulativeBlockGasPerTx.Clear();
+        _cumulativeReceiptGas = 0;
 
         _otherTracer.StartNewBlockTrace(block);
     }

src/Nethermind/Nethermind.Blockchain/Tracing/CallOutputTracer.cs

@@ -20,7 +20,7 @@ public class CallOutputTracer : TxTracer
 
     public byte StatusCode { get; set; }
 
-    public override void MarkAsSuccess(Address recipient, GasConsumed gasSpent, byte[] output, LogEntry[] logs,
+    public override void MarkAsSuccess(Address recipient, in GasConsumed gasSpent, byte[] output, LogEntry[] logs,
         Hash256? stateRoot = null)
     {
         GasSpent = gasSpent.SpentGas;
@@ -29,7 +29,7 @@ public override void MarkAsSuccess(Address recipient, GasConsumed gasSpent, byte
         StatusCode = Evm.StatusCode.Success;
     }
 
-    public override void MarkAsFailed(Address recipient, GasConsumed gasSpent, byte[] output, string? error,
+    public override void MarkAsFailed(Address recipient, in GasConsumed gasSpent, byte[] output, string? error,
         Hash256? stateRoot = null)
     {
         GasSpent = gasSpent.SpentGas;

src/Nethermind/Nethermind.Blockchain/Tracing/EstimateGasTracer.cs

@@ -42,15 +42,15 @@ public EstimateGasTracer()
 
     public bool TopLevelRevert { get; private set; }
 
-    public override void MarkAsSuccess(Address recipient, GasConsumed gasSpent, byte[] output, LogEntry[] logs,
+    public override void MarkAsSuccess(Address recipient, in GasConsumed gasSpent, byte[] output, LogEntry[] logs,
         Hash256? stateRoot = null)
     {
         GasSpent = gasSpent.SpentGas;
         ReturnValue = output;
         StatusCode = Evm.StatusCode.Success;
     }
 
-    public override void MarkAsFailed(Address recipient, GasConsumed gasSpent, byte[] output, string? error,
+    public override void MarkAsFailed(Address recipient, in GasConsumed gasSpent, byte[] output, string? error,
         Hash256? stateRoot = null)
     {
         GasSpent = gasSpent.SpentGas;