Merge branch 'master' of https://github.com/NethermindEth/nethermind

Author: tkstanczak

src/Nethermind/Nethermind.JsonRpc.Test/JsonRpcServiceTests.cs

@@ -72,6 +72,15 @@ public void GetBlockByNumberTest()
             Assert.AreEqual((BigInteger)2, (response.Result as BlockForRpc)?.Number);
         }
 
+        [Test]
+        public void Eth_module_populates_size_when_returning_block_data()
+        {
+            IEthModule ethModule = Substitute.For<IEthModule>();
+            ethModule.eth_getBlockByNumber(Arg.Any<BlockParameter>(), true).ReturnsForAnyArgs(x => ResultWrapper<BlockForRpc>.Success(new BlockForRpc(Build.A.Block.WithNumber(2).TestObject, true)));
+            JsonRpcResponse response = TestRequest(ethModule, "eth_getBlockByNumber", "0x1b4", "true");
+            Assert.AreEqual(513L, (response.Result as BlockForRpc)?.Size);
+        }
+        
         [Test]
         public void CanHandleOptionalArguments()
         {

src/Nethermind/Nethermind.JsonRpc/Modules/Eth/BlockForRpc.cs

@@ -23,12 +23,15 @@
 using Nethermind.Core.Crypto;
 using Nethermind.Core.Encoding;
 using Nethermind.Core.Extensions;
+using Nethermind.Dirichlet.Numerics;
 using Nethermind.JsonRpc.Data;
 
 namespace Nethermind.JsonRpc.Modules.Eth
 {
     public class BlockForRpc
     {
+        private BlockDecoder _blockDecoder = new BlockDecoder();
+        
         public BlockForRpc(Block block, bool includeFullTransactionData)
         {
             Number = block.Number;
@@ -45,7 +48,7 @@ public BlockForRpc(Block block, bool includeFullTransactionData)
             Difficulty = block.Difficulty;
             TotalDifficulty = block.TotalDifficulty ?? 0;
             ExtraData = block.ExtraData;
-            Size = BigInteger.Zero;
+            Size = Size =  _blockDecoder.GetLength(block, RlpBehaviors.None);
             GasLimit = block.GasLimit;
             GasUsed = block.GasUsed;
             Timestamp = block.Timestamp;
@@ -64,13 +67,13 @@ public BlockForRpc(Block block, bool includeFullTransactionData)
         public Keccak StateRoot { get; set; }
         public Keccak ReceiptsRoot { get; set; }
         public Address Miner { get; set; }
-        public BigInteger Difficulty { get; set; }
-        public BigInteger TotalDifficulty { get; set; }
+        public UInt256 Difficulty { get; set; }
+        public UInt256 TotalDifficulty { get; set; }
         public byte[] ExtraData { get; set; }
-        public BigInteger Size { get; set; }
-        public BigInteger GasLimit { get; set; }
-        public BigInteger GasUsed { get; set; }
-        public BigInteger Timestamp { get; set; }
+        public long Size { get; set; }
+        public long GasLimit { get; set; }
+        public long GasUsed { get; set; }
+        public UInt256 Timestamp { get; set; }
         public IEnumerable<object> Transactions { get; set; }
         public IEnumerable<Keccak> Uncles { get; set; }
     }