Feature/jsonrpc

src/Nevermind/Ethereum.Blockchain.Test/BlockchainTestBase.cs

@@ -212,6 +212,7 @@ protected void RunTest(BlockchainTest test, Stopwatch stopwatch = null)
                 _multiDb,
                 _stateProviders[test.Network],
                 _storageProviders[test.Network],
+                new TransactionStore(),
                 _logger);
 
             IBlockchainProcessor blockchainProcessor = new BlockchainProcessor(

src/Nevermind/Nevermind.Blockchain.Test.Runner/FileLogger.cs

@@ -51,6 +51,16 @@ public void Log(string text)
             }
         }
 
+        public void Debug(string text)
+        {
+            Log(text);
+        }
+
+        public void Error(string text, Exception ex = null)
+        {
+            Log(ex != null ? $"{text}, Exception: {ex}" : text);
+        }
+
         public void Flush()
         {
             File.AppendAllText(_filePath, _buffer.ToString());

src/Nevermind/Nevermind.Blockchain/BlockProcessor.cs

@@ -37,6 +37,7 @@ public class BlockProcessor : IBlockProcessor
         private readonly IStateProvider _stateProvider;
         private readonly IStorageProvider _storageProvider;
         private readonly ILogger _logger;
+        private readonly ITransactionStore _transactionStore;
 
         private readonly IDifficultyCalculator _difficultyCalculator;
 
@@ -51,15 +52,15 @@ public BlockProcessor(
             ITransactionProcessor transactionProcessor,
             ISnapshotable db,
             IStateProvider stateProvider,
-            IStorageProvider storageProvider,
-            ILogger logger = null)
+            IStorageProvider storageProvider, ITransactionStore transactionStore, ILogger logger = null)
         {
             _logger = logger;
             _ethereumRelease = ethereumRelease;
             _blockStore = blockStore;
             _blockValidator = blockValidator;
             _stateProvider = stateProvider;
             _storageProvider = storageProvider;
+            _transactionStore = transactionStore;
             _difficultyCalculator = difficultyCalculator;
             _rewardCalculator = rewardCalculator;
             _transactionProcessor = transactionProcessor;
@@ -75,13 +76,16 @@ private void ProcessTransactions(Block block, List<Transaction> transactions)
             List<TransactionReceipt> receipts = new List<TransactionReceipt>(); // TODO: pool?
             for (int i = 0; i < transactions.Count; i++)
             {
+                var transaction = transactions[i];
                 if (block.Header.Number == 26)
                 {
 
                 }
 
                 _logger?.Log($"PROCESSING TRANSACTION {i}");
-                TransactionReceipt receipt = _transactionProcessor.Execute(transactions[i], block.Header);
+                _transactionStore.AddTransaction(transaction);
+                TransactionReceipt receipt = _transactionProcessor.Execute(transaction, block.Header);
+                _transactionStore.AddTransactionReceipt(transaction.Hash, receipt, block.Hash);
                 receipts.Add(receipt);
             }
 

src/Nevermind/Nevermind.Blockchain/BlockStore.cs

@@ -16,6 +16,8 @@
  * along with the Nethermind. If not, see <http://www.gnu.org/licenses/>.
  */
 using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
 using Nevermind.Core;
 using Nevermind.Core.Crypto;
 
@@ -50,6 +52,11 @@ public Block FindBlock(Keccak blockHash, bool mainChainOnly)
             return block;
         }
 
+        public Block FindBlock(BigInteger blockNumber)
+        {
+            return _mainChain.Values.FirstOrDefault(x => x.Header?.Number == blockNumber);
+        }
+
         public bool IsMainChain(Keccak blockHash)
         {
             return _mainChain.ContainsKey(blockHash);

src/Nevermind/Nevermind.Blockchain/BlockchainProcessor.cs

@@ -45,6 +45,7 @@ public BlockchainProcessor(
         }
 
         public Block HeadBlock { get; private set; }
+        public Block SuggestedBlock { get; private set; }
         public BigInteger TotalDifficulty { get; private set; }
         public BigInteger TotalTransactions { get; private set; }
 
@@ -90,6 +91,7 @@ public void Process(Rlp blockRlp)
             {
                 _logger?.Log("-------------------------------------------------------------------------------------");
                 Block suggestedBlock = Rlp.Decode<Block>(blockRlp);
+                SuggestedBlock = suggestedBlock;
                 BigInteger totalDifficulty = GetTotalDifficulty(suggestedBlock.Header);
                 BigInteger totalTransactions = GetTotalTransactions(suggestedBlock);
                 _logger?.Log($"TOTAL DIFFICULTY OF BLOCK {suggestedBlock.Header.Hash} ({suggestedBlock.Header.Number}) IS {totalDifficulty}");
@@ -172,9 +174,11 @@ public void Process(Rlp blockRlp)
                     // lower difficulty branch
                     _blockStore.AddBlock(suggestedBlock, false);
                 }
+                SuggestedBlock = null;
             }
             catch (InvalidBlockException ex)
             {
+                SuggestedBlock = null;
                 throw;
             }
         }

src/Nevermind/Nevermind.Blockchain/IBlockStore.cs

@@ -1,3 +1,6 @@
+
+using System.Numerics;
+
 /*
  * Copyright (c) 2018 Demerzel Solutions Limited
  * This file is part of the Nethermind library.
@@ -15,6 +18,7 @@
  * 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 Nevermind.Core;
 using Nevermind.Core.Crypto;
 
@@ -24,6 +28,7 @@ public interface IBlockStore
     {
         void AddBlock(Block block, bool isMainChain);
         Block FindBlock(Keccak blockHash, bool mainChainOnly);
+        Block FindBlock(BigInteger blockNumber);
         bool IsMainChain(Keccak blockHash);
         void MoveToMain(Keccak blockHash);
         void MoveToBranch(Keccak blockHash);

src/Nevermind/Nevermind.Blockchain/IBlockchainProcessor.cs

@@ -24,6 +24,8 @@ namespace Nevermind.Blockchain
     public interface IBlockchainProcessor
     {
         Block HeadBlock { get; }
+        //Currently processing block
+        Block SuggestedBlock { get; }
         BigInteger TotalDifficulty { get; }
         void Process(Rlp blockRlp); // TODO: potentially do not return anything
     }

src/Nevermind/Nevermind.Core/ConsoleLogger.cs

@@ -26,5 +26,15 @@ public void Log(string text)
         {
             Console.WriteLine(text);
         }
+
+        public void Debug(string text)
+        {
+            Log(text);
+        }
+
+        public void Error(string text, Exception ex = null)
+        {
+            Log(ex != null ? $"{text}, Exception: {ex}" : text);
+        }
     }
 }

src/Nevermind/Nevermind.Core/Crypto/PrivateKey.cs

@@ -26,12 +26,15 @@ public class PrivateKey
         private const int PrivateKeyLengthInBytes = 32;
         private PublicKey _publicKey;
 
-        public PrivateKey()
-            :this(Random.GeneratePrivateKey())
+        public PrivateKey() :this(Random.GeneratePrivateKey(), Guid.NewGuid())
         {
         }
 
-        public PrivateKey(Hex key)
+        public PrivateKey(Hex key) : this(key, Guid.NewGuid())
+        {
+        }
+
+        public PrivateKey(Hex key, Guid id)
         {
             if (key == null)
             {
@@ -44,6 +47,7 @@ public PrivateKey(Hex key)
             }
 
             Hex = key;
+            Id = id;
         }
 
         public Hex Hex { get; }
@@ -57,6 +61,8 @@ private PublicKey ComputePublicKey()
 
         public Address Address => PublicKey.Address;
 
+        public Guid Id { get; set; }
+
         public override string ToString()
         {
             return Hex.ToString(true);

src/Nevermind/Nevermind.Core/Crypto/Random.cs

@@ -24,7 +24,14 @@ public static class Random
 
         public static byte[] GeneratePrivateKey()
         {
-            byte[] bytes = new byte[32];
+            var bytes = new byte[32];
+            SecureRandom.GetBytes(bytes);
+            return bytes;
+        }
+
+        public static byte[] GenerateRandomBytes(int lenght)
+        {
+            var bytes = new byte[lenght];
             SecureRandom.GetBytes(bytes);
             return bytes;
         }

src/Nevermind/Nevermind.Core/Encoding/TransactionDecoder.cs

@@ -78,6 +78,7 @@ internal Transaction Decode(object[] data)
                 transaction.Signature = signature;
             }
 
+            transaction.RecomputeHash();
             return transaction;
         }
 

src/Nevermind/Nevermind.Core/Hex.cs

@@ -78,6 +78,11 @@ public bool Equals(Hex obj)
             return false;
         }
 
+        public byte[] ToBytes()
+        {
+            return _bytes ?? (_bytes = ToBytes(_hexString));
+        }
+
         public override string ToString()
         {
             return ToString(true);

src/Nevermind/Nevermind.Core/ILogger.cs

@@ -1,3 +1,6 @@
+
+using System;
+
 /*
  * Copyright (c) 2018 Demerzel Solutions Limited
  * This file is part of the Nethermind library.
@@ -21,5 +24,7 @@ namespace Nevermind.Core
     public interface ILogger
     {
         void Log(string text);
+        void Debug(string text);
+        void Error(string text, Exception ex = null);
     }
 }

src/Nevermind/Nevermind.Core/Transaction.cs

@@ -18,6 +18,7 @@
 
 using System.Numerics;
 using Nevermind.Core.Crypto;
+using Nevermind.Core.Encoding;
 
 namespace Nevermind.Core
 {
@@ -37,5 +38,11 @@ public class Transaction
         public bool IsMessageCall => Data != null;
         public bool IsTransfer => !IsContractCreation && !IsMessageCall;
         public bool IsValid { get; set; }
+        public Keccak Hash { get; set; }
+
+        public void RecomputeHash()
+        {
+            Hash = Keccak.Compute(Rlp.Encode(this));
+        }
     }
 }

src/Nevermind/Nevermind.Core/TransactionReceipt.cs

@@ -35,5 +35,6 @@ public class TransactionReceipt
         public long GasUsed { get; set; }
         public Bloom Bloom { get; set; }
         public LogEntry[] Logs { get; set; }
+        public Address Recipient { get; set; }
     }
 }

src/Nevermind/Nevermind.Evm/ITransactionProcessor.cs

@@ -1,3 +1,5 @@
+
+
 /*
  * Copyright (c) 2018 Demerzel Solutions Limited
  * This file is part of the Nethermind library.
@@ -17,6 +19,8 @@
  */
 
 using Nevermind.Core;
+using System.Linq;
+using System.Numerics;
 
 namespace Nevermind.Evm
 {

src/Nevermind/Nevermind.Evm/ITransactionStore.cs

@@ -0,0 +1,16 @@
+using Nevermind.Core;
+using Nevermind.Core.Crypto;
+
+namespace Nevermind.Evm
+{
+    public interface ITransactionStore
+    {
+        void AddTransaction(Transaction transaction);
+        void AddTransactionReceipt(Keccak transactionHash, TransactionReceipt transactionReceipt, Keccak blockhash);
+        Transaction GetTransaction(Keccak transactionHash);
+        TransactionReceipt GetTransactionReceipt(Keccak transactionHash);
+        bool WasProcessed(Keccak transactionHash);
+        //get hash of the block transaction was in
+        Keccak? GetBlockHash(Keccak transactionHash);
+    }
+}

src/Nevermind/Nevermind.Evm/Nevermind.Evm.csproj

@@ -75,6 +75,7 @@
     <Compile Include="InvalidInstructionException.cs" />
     <Compile Include="InvalidJumpDestinationException.cs" />
     <Compile Include="ITransactionProcessor.cs" />
+    <Compile Include="ITransactionStore.cs" />
     <Compile Include="IVirtualMachine.cs" />
     <Compile Include="Precompiles\EcAddPrecompiledContract.cs" />
     <Compile Include="Precompiles\EcMulPrecompiledContract.cs" />
@@ -98,6 +99,7 @@
     <Compile Include="StatusCode.cs" />
     <Compile Include="TransactionCollisionException.cs" />
     <Compile Include="TransactionProcessor.cs" />
+    <Compile Include="TransactionStore.cs" />
     <Compile Include="TransactionSubstate.cs" />
     <Compile Include="VirtualMachine.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

src/Nevermind/Nevermind.Evm/TransactionProcessor.cs

@@ -258,7 +258,7 @@ public TransactionReceipt Execute(
             _stateProvider.Commit();
 
             block.GasUsed += spentGas;
-            return BuildTransactionReceipt(statusCode, logEntries, block.GasUsed);
+            return BuildTransactionReceipt(statusCode, logEntries, block.GasUsed, recipient);
         }
 
         private long Refund(long gasLimit, long unspentGas, TransactionSubstate substate, Address sender, BigInteger gasPrice)
@@ -271,14 +271,15 @@ private long Refund(long gasLimit, long unspentGas, TransactionSubstate substate
             return spentGas;
         }
 
-        private TransactionReceipt BuildTransactionReceipt(byte statusCode, List<LogEntry> logEntries, long gasUsedSoFar)
+        private TransactionReceipt BuildTransactionReceipt(byte statusCode, List<LogEntry> logEntries, long gasUsedSoFar, Address recipient)
         {
             TransactionReceipt transactionReceipt = new TransactionReceipt();
             transactionReceipt.Logs = logEntries.ToArray();
             transactionReceipt.Bloom = BuildBloom(logEntries);
             transactionReceipt.GasUsed = gasUsedSoFar;
             transactionReceipt.PostTransactionState = _stateProvider.StateRoot;
             transactionReceipt.StatusCode = statusCode;
+            transactionReceipt.Recipient = recipient;
             return transactionReceipt;
         }