and do not recover when not needed

NethermindEth · Jun 19, 2019 · a226852 · a226852
1 parent 403e729
commit a226852
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Nethermind/Nethermind.JsonRpc/Modules/Eth/EthModule.cs b/src/Nethermind/Nethermind.JsonRpc/Modules/Eth/EthModule.cs
@@ -468,7 +468,7 @@ public ResultWrapper<BlockForRpc> eth_getBlockByHash(Keccak blockHash, bool retu
             {
                 _readerWriterLockSlim.EnterReadLock();
                 var block = _blockchainBridge.FindBlock(blockHash, false);
-                if (block != null)
+                if (block != null && returnFullTransactionObjects)
                 {
                     _blockchainBridge.RecoverTxSenders(block);
                 }
@@ -492,7 +492,7 @@ public ResultWrapper<BlockForRpc> eth_getBlockByNumber(BlockParameter blockParam
                 }
 
                 var result = GetBlock(blockParameter, true, true);
-                if (result.Data != null)
+                if (result.Data != null && returnFullTransactionObjects)
                 {
                     _blockchainBridge.RecoverTxSenders(result.Data);
                 }
@@ -676,6 +676,8 @@ public ResultWrapper<BlockForRpc> eth_getUncleByBlockNumberAndIndex(BlockParamet
                 {
                     return ResultWrapper<BlockForRpc>.Fail($"Cannot find ommer for hash: {ommerHeader.Hash}", ErrorType.NotFound);
                 }
+
+                _blockchainBridge.RecoverTxSenders(ommer);
 
                 if (Logger.IsDebug) Logger.Debug($"eth_getUncleByBlockNumberAndIndex request {blockParameter}, index: {positionIndex}, result: {result}");
                 return ResultWrapper<BlockForRpc>.Success(new BlockForRpc(result.Data, false));