Eip 3607

src/Nethermind/Nethermind.AuRa.Test/Contract/TxPriorityContractTests.json

@@ -35,7 +35,8 @@
     "eip1344Transition": "0x0",
     "eip1706Transition": "0x0",
     "eip1884Transition": "0x0",
-    "eip2028Transition": "0x0"    
+    "eip2028Transition": "0x0",
+    "eip3607Transition": "0xFFFFFFFFFFFF"
   },
   "genesis": {
     "seal": {

src/Nethermind/Nethermind.Blockchain.Test/Producers/BlockProducerBaseTests.BaseFee.cs

@@ -66,9 +66,11 @@ private async Task<ScenarioBuilder> CreateTestBlockchainAsync(long gasLimit)
                     SingleReleaseSpecProvider spec = new(
                         new ReleaseSpec()
                         {
-                            IsEip1559Enabled = _eip1559Enabled, Eip1559TransitionBlock = _eip1559TransitionBlock
+                            IsEip1559Enabled = _eip1559Enabled, 
+                            Eip1559TransitionBlock = _eip1559TransitionBlock,
+                            IsEip155Enabled = true
                         }, 1);
-                    BlockBuilder blockBuilder = Core.Test.Builders.Build.A.Block.Genesis.WithGasLimit(gasLimit);
+                    BlockBuilder blockBuilder = Build.A.Block.Genesis.WithGasLimit(gasLimit);
                     _testRpcBlockchain = await TestRpcBlockchain.ForTest(SealEngineType.NethDev)
                         .WithGenesisBlockBuilder(blockBuilder)
                         .Build(spec);
@@ -132,7 +134,8 @@ private async Task<ScenarioBuilder> SendTransactionAsync(long gasLimit, UInt256
                     tx.Nonce = _currentNonce;
                     ++_currentNonce;
 
-                    await _testRpcBlockchain.TxSender.SendTransaction(tx, TxHandlingOptions.None);
+                    var (_, result) = await _testRpcBlockchain.TxSender.SendTransaction(tx, TxHandlingOptions.None);
+                    Assert.AreEqual(AddTxResult.Added, result);
                     return this;
                 }
 
@@ -302,7 +305,6 @@ public async Task BaseFee_should_decrease_when_we_send_transactions_below_gas_ta
         public async Task BaseFee_should_not_change_when_we_send_transactions_equal_gas_target()
         {
             long gasTarget = 3000000;
-            long gasLimit = Eip1559Constants.ElasticityMultiplier * gasTarget;
             BaseFeeTestScenario.ScenarioBuilder scenario = BaseFeeTestScenario.GoesLikeThis()
                 .WithEip1559TransitionBlock(6)
                 .CreateTestBlockchain(gasTarget)

src/Nethermind/Nethermind.Blockchain/Processing/BlockProcessor.BlockProductionTransactionPicker.cs

@@ -22,6 +22,7 @@
 using Nethermind.Evm;
 using Nethermind.Int256;
 using Nethermind.Logging;
+using Nethermind.Specs;
 using Nethermind.State;
 
 namespace Nethermind.Blockchain.Processing
@@ -67,14 +68,20 @@ public AddingTxEventArgs CanAddTransaction(Block block, Transaction currentTx, I
                     return args.Set(TxAction.Skip, "Transaction already in block");
                 }
 
+                IReleaseSpec spec = _specProvider.GetSpec(block.Number);
+                if (stateProvider.InvalidContractSender(spec, currentTx.SenderAddress))
+                {
+                    return args.Set(TxAction.Skip, $"Sender is contract");
+                }
+
                 UInt256 expectedNonce = stateProvider.GetNonce(currentTx.SenderAddress);
                 if (expectedNonce != currentTx.Nonce)
                 {
                     return args.Set(TxAction.Skip, $"Invalid nonce - expected {expectedNonce}");
                 }
 
                 UInt256 balance = stateProvider.GetBalance(currentTx.SenderAddress);
-                if (!HasEnoughFounds(currentTx, balance, args, block))
+                if (!HasEnoughFounds(currentTx, balance, args, block, spec))
                 {
                     return args;
                 }
@@ -83,9 +90,8 @@ public AddingTxEventArgs CanAddTransaction(Block block, Transaction currentTx, I
                 return args;
             }
 
-            private bool HasEnoughFounds(Transaction transaction, UInt256 senderBalance, AddingTxEventArgs e, Block block)
+            private bool HasEnoughFounds(Transaction transaction, UInt256 senderBalance, AddingTxEventArgs e, Block block, IReleaseSpec releaseSpec)
             {
-                IReleaseSpec releaseSpec = _specProvider.GetSpec(block.Number);
                 bool eip1559Enabled = releaseSpec.IsEip1559Enabled;
                 UInt256 transactionPotentialCost = transaction.CalculateTransactionPotentialCost(eip1559Enabled, block.BaseFeePerGas);
 

src/Nethermind/Nethermind.Consensus.AuRa/Contracts/TxPriorityContract.cs

@@ -54,14 +54,14 @@ public TxPriorityContract(
         }
 
         public Address[] GetSendersWhitelist(BlockHeader parentHeader) =>
-            Constant.Call<Address[]>(new CallInfo(parentHeader, nameof(GetSendersWhitelist), ContractAddress) {MissingContractResult = MissingSenderWhitelistResult});
+            Constant.Call<Address[]>(new CallInfo(parentHeader, nameof(GetSendersWhitelist), Address.SystemUser) {MissingContractResult = MissingSenderWhitelistResult});
 
         public Destination[] GetMinGasPrices(BlockHeader parentHeader) =>
-            Constant.Call<DestinationTuple[]>(new CallInfo(parentHeader, nameof(GetMinGasPrices), ContractAddress) {MissingContractResult = MissingPrioritiesResult})
+            Constant.Call<DestinationTuple[]>(new CallInfo(parentHeader, nameof(GetMinGasPrices), Address.SystemUser) {MissingContractResult = MissingPrioritiesResult})
                 .Select(x => Destination.FromAbiTuple(x, parentHeader.Number)).ToArray();
 
         public Destination[] GetPriorities(BlockHeader parentHeader) =>
-            Constant.Call<DestinationTuple[]>(new CallInfo(parentHeader, nameof(GetPriorities), ContractAddress) {MissingContractResult = MissingPrioritiesResult})
+            Constant.Call<DestinationTuple[]>(new CallInfo(parentHeader, nameof(GetPriorities), Address.SystemUser) {MissingContractResult = MissingPrioritiesResult})
                 .Select(x => Destination.FromAbiTuple(x, parentHeader.Number)).ToArray();
 
         public IEnumerable<Destination> PrioritySet(BlockHeader blockHeader, TxReceipt[] receipts)

src/Nethermind/Nethermind.Core.Test/Blockchain/TestBlockchain.cs

@@ -43,6 +43,7 @@
 using Nethermind.State.Repositories;
 using Nethermind.Db.Blooms;
 using Nethermind.Evm.TransactionProcessing;
+using Nethermind.Specs.Test;
 using Nethermind.Trie;
 using Nethermind.Trie.Pruning;
 using Nethermind.TxPool;
@@ -112,11 +113,11 @@ protected TestBlockchain()
 
         public static TransactionBuilder<Transaction> BuildSimpleTransaction => Builders.Build.A.Transaction.SignedAndResolved(TestItem.PrivateKeyA).To(AccountB);
 
-        protected virtual async Task<TestBlockchain> Build(ISpecProvider specProvider = null, UInt256? initialValues = null)
+        protected virtual async Task<TestBlockchain> Build(ISpecProvider? specProvider = null, UInt256? initialValues = null)
         {
             Timestamper = new ManualTimestamper(new DateTime(2020, 2, 15, 12, 50, 30, DateTimeKind.Utc));
             JsonSerializer = new EthereumJsonSerializer();
-            SpecProvider = specProvider ?? MainnetSpecProvider.Instance;
+            SpecProvider = new OverridableSpecProvider(specProvider ?? MainnetSpecProvider.Instance, s => new OverridableReleaseSpec(s) { IsEip3607Enabled = false });
             EthereumEcdsa = new EthereumEcdsa(ChainId.Mainnet, LogManager);
             DbProvider = await TestMemDbProvider.InitAsync();
             TrieStore = new TrieStore(StateDb.Innermost, LogManager);

src/Nethermind/Nethermind.Core.Test/Nethermind.Core.Test.csproj

@@ -24,6 +24,7 @@
     <ProjectReference Include="..\Nethermind.Blockchain\Nethermind.Blockchain.csproj" />
     <ProjectReference Include="..\Nethermind.Core\Nethermind.Core.csproj" />
     <ProjectReference Include="..\Nethermind.Network\Nethermind.Network.csproj" />
+    <ProjectReference Include="..\Nethermind.Specs.Test\Nethermind.Specs.Test.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="TestRopstenBlocks\*.*">

src/Nethermind/Nethermind.Core/AccountStateProviderExtensions.cs

@@ -0,0 +1,31 @@
+//  Copyright (c) 2021 Demerzel Solutions Limited
+//  This file is part of the Nethermind library.
+// 
+//  The Nethermind library is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU Lesser General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  The Nethermind library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//  GNU Lesser General Public License for more details.
+// 
+//  You should have received a copy of the GNU Lesser General Public License
+//  along with the Nethermind. If not, see <http://www.gnu.org/licenses/>.
+// 
+
+using Nethermind.Core.Crypto;
+using Nethermind.Core.Specs;
+
+namespace Nethermind.Core
+{
+    public static class AccountStateProviderExtensions
+    {
+        public static bool HasCode(this IAccountStateProvider stateProvider, Address address) =>
+            stateProvider.GetAccount(address).HasCode;
+
+        public static bool InvalidContractSender(this IAccountStateProvider stateProvider, IReleaseSpec spec, Address address) =>
+            spec.IsEip3607Enabled && stateProvider.HasCode(address);
+    }
+}

src/Nethermind/Nethermind.Core/IAccountStateProvider.cs

@@ -15,10 +15,12 @@
 //  along with the Nethermind. If not, see <http://www.gnu.org/licenses/>.
 // 
 
+using Nethermind.Core.Crypto;
+
 namespace Nethermind.Core
 {
     public interface IAccountStateProvider
     {
-        Account GetAccount(Address address);   
+        Account GetAccount(Address address);
     }
 }

src/Nethermind/Nethermind.Core/Specs/IReleaseSpec.cs

@@ -244,12 +244,17 @@ public interface IReleaseSpec
         /// Reject new contracts starting with the 0xEF byte 
         /// </summary>
         bool IsEip3541Enabled { get; }
-
+
+        /// <summary>
+        /// Reject transactions where senders have non-empty code hash
+        /// </summary>
+        bool IsEip3607Enabled { get; }
+
         /// <summary>
         /// Upgrade consensus to Proof-of-Stake
         /// </summary>
         bool IsEip3675Enabled { get; }
-        
+
         /// <summary>
         /// Should transactions be validated against chainId.
         /// </summary>

src/Nethermind/Nethermind.Evm.Test/Tracing/ProofTxTracerTests.cs

@@ -49,20 +49,33 @@ public void Can_trace_sender_recipient_miner()
         }
 
         [Test]
-        public void Can_trace_sender_recipient_miner_when_all_are_same()
+        public void Can_trace_sender_recipient_miner_when_miner_and_sender_are_same()
         {
             byte[] code = Prepare.EvmCode
                 .PushData(SampleHexData1)
                 .Done;
 
             SenderRecipientAndMiner addresses = new();
-            addresses.RecipientKey = SenderKey;
             addresses.MinerKey = SenderKey;
             (ProofTxTracer trace, _, _) = ExecuteAndTraceProofCall(addresses, code);
-            Assert.AreEqual(1, trace.Accounts.Count, "count");
+            Assert.AreEqual(2, trace.Accounts.Count, "count");
             Assert.True(trace.Accounts.Contains(Sender));
         }
 
+        [Test]
+        public void Can_trace_sender_recipient_miner_when_miner_and_recipient_are_same()
+        {
+            byte[] code = Prepare.EvmCode
+                .PushData(SampleHexData1)
+                .Done;
+
+            SenderRecipientAndMiner addresses = new();
+            addresses.MinerKey = addresses.RecipientKey;
+            (ProofTxTracer trace, _, _) = ExecuteAndTraceProofCall(addresses, code);
+            Assert.AreEqual(2, trace.Accounts.Count, "count");
+            Assert.True(trace.Accounts.Contains(Sender));
+        }        
+
         [Test]
         public void Can_trace_touch_only_null_accounts()
         {

src/Nethermind/Nethermind.Evm/TransactionProcessing/TransactionProcessor.cs

@@ -174,6 +174,13 @@ private void Execute(Transaction transaction, BlockHeader block, ITxTracer txTra
                 return;
             }
 
+            if (spec.IsEip3607Enabled && _stateProvider.HasCode(caller))
+            {
+                TraceLogInvalidTx(transaction, "SENDER_IS_CONTRACT");
+                QuickFail(transaction, block, txTracer, eip658NotEnabled, "sender has deployed code");
+                return;
+            }
+
             long intrinsicGas = IntrinsicGasCalculator.Calculate(transaction, spec);
             if (_logger.IsTrace) _logger.Trace($"Intrinsic gas calculated for {transaction.Hash}: " + intrinsicGas);
 

src/Nethermind/Nethermind.JsonRpc.Test/Modules/TestRpcBlockchain.cs

@@ -110,13 +110,13 @@ public Builder<T> WithGasPriceOracle(IGasPriceOracle gasPriceOracle)
                 return this;
             }
 
-            public async Task<T> Build(ISpecProvider specProvider = null, UInt256? initialValues = null)
+            public async Task<T> Build(ISpecProvider? specProvider = null, UInt256? initialValues = null)
             {
                 return (T)(await _blockchain.Build(specProvider, initialValues));
             }
         }
 
-        protected override async Task<TestBlockchain> Build(ISpecProvider specProvider = null, UInt256? initialValues = null)
+        protected override async Task<TestBlockchain> Build(ISpecProvider? specProvider = null, UInt256? initialValues = null)
         {
             BloomStorage bloomStorage = new(new BloomConfig(), new MemDb(), new InMemoryDictionaryFileStoreFactory());
             specProvider ??= new TestSpecProvider(Berlin.Instance) {ChainId = ChainId.Mainnet};

src/Nethermind/Nethermind.Mev.Test/TestBundlePool.cs

@@ -40,7 +40,7 @@ public TestBundlePool(IBlockTree blockTree,
             ISpecProvider specProvider,
             IMevConfig mevConfig,
             ILogManager logManager)
-            : base(blockTree, simulator, timestamper, txValidator, specProvider, mevConfig, logManager)
+            : base(blockTree, simulator, timestamper, txValidator, specProvider, mevConfig, new MockProvider(), logManager)
         {
         }
 
@@ -83,4 +83,9 @@ public TestBundlePool(IBlockTree blockTree,
             return null;
         }
     }
+
+    public class MockProvider : IAccountStateProvider
+    {
+        public Account GetAccount(Address address) => new Account(0);
+    }
 }

src/Nethermind/Nethermind.Mev/MevPlugin.cs

@@ -91,6 +91,7 @@ private BundlePool BundlePool
                         getFromApi.TxValidator!,
                         getFromApi.SpecProvider!,
                         _mevConfig,
+                        getFromApi.ChainHeadStateProvider!,
                         getFromApi.LogManager);
                 }
 

src/Nethermind/Nethermind.Mev/Source/BundlePool.cs

@@ -49,6 +49,7 @@ public class BundlePool : IBundlePool, ISimulatedBundleSource, IDisposable
         private readonly ITimestamper _timestamper;
         private readonly ITxValidator _txValidator;
         private readonly IMevConfig _mevConfig;
+        private readonly IAccountStateProvider _stateProvider;
         private readonly ISpecProvider _specProvider;
         private readonly IBlockTree _blockTree;
         private readonly IBundleSimulator _simulator;
@@ -68,11 +69,13 @@ public BundlePool(
             ITxValidator txValidator, 
             ISpecProvider specProvider,
             IMevConfig mevConfig,
+            IAccountStateProvider stateProvider,
             ILogManager logManager)
         {
             _timestamper = timestamper;
             _txValidator = txValidator;
             _mevConfig = mevConfig;
+            _stateProvider = stateProvider;
             _specProvider = specProvider;
             _blockTree = blockTree;
             _simulator = simulator;
@@ -175,8 +178,16 @@ private bool ValidateBundle(MevBundle bundle)
             IReleaseSpec spec = _specProvider.GetSpec(bundle.BlockNumber);
             for (int i = 0; i < bundle.Transactions.Count; i++)
             {
-                if (!_txValidator.IsWellFormed(bundle.Transactions[i], spec))
+                BundleTransaction tx = bundle.Transactions[i];
+
+                if (!_txValidator.IsWellFormed(tx, spec))
+                {
+                    return false;
+                }
+
+                if (_stateProvider.InvalidContractSender(spec, tx.SenderAddress!))
                 {
+                    if (_logger.IsDebug) _logger.Debug($"Bundle rejected, because transaction {tx.Hash} sender {tx.SenderAddress} is contract.");
                     return false;
                 }
             }

src/Nethermind/Nethermind.Serialization.Json/NullableBigIntegerConverter.cs

@@ -41,7 +41,7 @@ public override void WriteJson(JsonWriter writer, BigInteger? value, JsonSeriali
 
         public override BigInteger? ReadJson(JsonReader reader, Type objectType, BigInteger? existingValue, bool hasExistingValue, JsonSerializer serializer)
         {
-            if (reader.TokenType == JsonToken.Null)
+            if (reader.TokenType == JsonToken.Null || reader.Value is null)
             {
                 return null;
             }

src/Nethermind/Nethermind.Serialization.Json/NullableLongConvertercs.cs

@@ -46,7 +46,7 @@ public override void WriteJson(JsonWriter writer, long? value, JsonSerializer se
 
         public override long? ReadJson(JsonReader reader, Type objectType, long? existingValue, bool hasExistingValue, JsonSerializer serializer)
         {
-            if (reader.TokenType == JsonToken.Null)
+            if (reader.TokenType == JsonToken.Null || reader.Value is null)
             {
                 return null;
             }

src/Nethermind/Nethermind.Serialization.Json/NullableUInt256Converter.cs

@@ -47,7 +47,7 @@ public override void WriteJson(JsonWriter writer, UInt256? value, JsonSerializer
 
         public override UInt256? ReadJson(JsonReader reader, Type objectType, UInt256? existingValue, bool hasExistingValue, JsonSerializer serializer)
         {
-            if (reader.TokenType == JsonToken.Null)
+            if (reader.TokenType == JsonToken.Null || reader.Value is null)
             {
                 return null;
             }

src/Nethermind/Nethermind.Specs.Test/OverridableReleaseSpec.cs

@@ -21,15 +21,18 @@
 
 namespace Nethermind.Specs.Test
 {
-    /// <summary>Only for testing purposes.
-    // If we want to override only a few properties for tests based on different releases spec we can use this class.</summary>
+    /// <summary>
+    /// Only for testing purposes.
+    /// If we want to override only a few properties for tests based on different releases spec we can use this class.
+    /// </summary>
     public class OverridableReleaseSpec : IReleaseSpec
     {
         private readonly IReleaseSpec _spec;
 
         public OverridableReleaseSpec(IReleaseSpec spec)
         {
             _spec = spec;
+            IsEip3607Enabled = _spec.IsEip3607Enabled;
         }
 
         public string Name => "OverridableReleaseSpec";
@@ -123,6 +126,7 @@ public OverridableReleaseSpec(IReleaseSpec spec)
         public bool IsEip3529Enabled => _spec.IsEip3529Enabled;
 
         public bool IsEip3541Enabled => _spec.IsEip3541Enabled;
+        public bool IsEip3607Enabled { get; set; }
         public bool IsEip3675Enabled => _spec.IsEip3675Enabled;
 
         public bool IsEip158IgnoredAccount(Address address)