allowing tx sender recovery on JSON RPC requests asking for transactions

Author: tkstanczak

src/Nethermind/Nethermind.DataMarketplace.Infrastructure/NdmModule.cs

@@ -77,7 +77,8 @@ public static IServices Init(RequiredServices services)
                 filterStore,
                 filterManager,
                 services.Wallet,
-                state.TransactionProcessor);
+                state.TransactionProcessor,
+                services.Ecdsa);
             var dataHeaderRlpDecoder = new DataHeaderDecoder();
             var encoder = new AbiEncoder();
             var depositService = new DepositService(blockchainBridge, encoder, services.Wallet, config,
@@ -167,7 +168,7 @@ public class RequiredServices
             public IReceiptStorage ReceiptStorage { get; }
             public IWallet Wallet { get; }
             public ITimestamp Timestamp { get; }
-            public IEcdsa Ecdsa { get; }
+            public IEthereumEcdsa Ecdsa { get; }
             public IKeyStore KeyStore { get; }
             public IRpcModuleProvider RpcModuleProvider { get; }
             public IJsonSerializer JsonSerializer { get; }
@@ -183,7 +184,7 @@ public RequiredServices(IConfigProvider configProvider, IConfigManager configMan
                 string baseDbPath, IDbProvider rocksProvider, IMongoProvider mongoProvider, ILogManager logManager,
                 IBlockProcessor blockProcessor, IBlockTree blockTree, ITxPool transactionPool,
                 ITxPoolInfoProvider transactionPoolInfoProvider, ISpecProvider specProvider, 
-                IReceiptStorage receiptStorage, IWallet wallet, ITimestamp timestamp, IEcdsa ecdsa,
+                IReceiptStorage receiptStorage, IWallet wallet, ITimestamp timestamp, IEthereumEcdsa ecdsa,
                 IKeyStore keyStore, IRpcModuleProvider rpcModuleProvider, IJsonSerializer jsonSerializer,
                 ICryptoRandom cryptoRandom, IEnode enode, INdmConsumerChannelManager ndmConsumerChannelManager,
                 INdmDataPublisher ndmDataPublisher, IGrpcService grpcService, EthRequestService ethRequestService,

src/Nethermind/Nethermind.DataMarketplace.Initializers/INdmInitializer.cs

@@ -42,7 +42,7 @@ public interface INdmInitializer
         Task<INdmCapabilityConnector> InitAsync(IConfigProvider configProvider, IDbProvider dbProvider,
             string baseDbPath, IBlockProcessor blockProcessor, IBlockTree blockTree, ITxPool txPool,
             ITxPoolInfoProvider txPoolInfoProvider, ISpecProvider specProvider, IReceiptStorage receiptStorage,
-            IWallet wallet, ITimestamp timestamp, IEcdsa ecdsa, IRpcModuleProvider rpcModuleProvider,
+            IWallet wallet, ITimestamp timestamp, IEthereumEcdsa ecdsa, IRpcModuleProvider rpcModuleProvider,
             IKeyStore keyStore, IJsonSerializer jsonSerializer, ICryptoRandom cryptoRandom, IEnode enode,
             INdmConsumerChannelManager consumerChannelManager, INdmDataPublisher dataPublisher,
             IGrpcService grpcService, INodeStatsManager nodeStatsManager, IProtocolsManager protocolsManager,

src/Nethermind/Nethermind.DataMarketplace.Initializers/NdmInitializer.cs

@@ -55,7 +55,7 @@ public class NdmInitializer : INdmInitializer
         public virtual async Task<INdmCapabilityConnector> InitAsync(IConfigProvider configProvider,
             IDbProvider dbProvider, string baseDbPath, IBlockProcessor blockProcessor, IBlockTree blockTree,
             ITxPool txPool, ITxPoolInfoProvider txPoolInfoProvider, ISpecProvider specProvider,
-            IReceiptStorage receiptStorage, IWallet wallet, ITimestamp timestamp, IEcdsa ecdsa,
+            IReceiptStorage receiptStorage, IWallet wallet, ITimestamp timestamp, IEthereumEcdsa ecdsa,
             IRpcModuleProvider rpcModuleProvider, IKeyStore keyStore, IJsonSerializer jsonSerializer,
             ICryptoRandom cryptoRandom, IEnode enode, INdmConsumerChannelManager consumerChannelManager,
             INdmDataPublisher dataPublisher, IGrpcService grpcService, INodeStatsManager nodeStatsManager,
@@ -88,7 +88,7 @@ public virtual async Task<INdmCapabilityConnector> InitAsync(IConfigProvider con
             Address consumerAddress, Address providerAddress)> PreInitAsync(
             IConfigProvider configProvider, IDbProvider dbProvider, string baseDbPath, IBlockProcessor blockProcessor,
             IBlockTree blockTree, ITxPool txPool, ITxPoolInfoProvider txPoolInfoProvider, ISpecProvider specProvider,
-            IReceiptStorage receiptStorage, IWallet wallet, ITimestamp timestamp, IEcdsa ecdsa,
+            IReceiptStorage receiptStorage, IWallet wallet, ITimestamp timestamp, IEthereumEcdsa ecdsa,
             IRpcModuleProvider rpcModuleProvider, IKeyStore keyStore, IJsonSerializer jsonSerializer,
             ICryptoRandom cryptoRandom, IEnode enode, INdmConsumerChannelManager consumerChannelManager,
             INdmDataPublisher dataPublisher, IGrpcService grpcService, bool enableUnsecuredDevWallet,

src/Nethermind/Nethermind.DataMarketplace.Test/ContractInteractionTest.cs

@@ -184,6 +184,15 @@ public BlockchainBridge(TransactionProcessor processor, IReleaseSpec spec)
             public BlockHeader BestSuggested { get; }
             public long BestKnown { get; }
             public bool IsSyncing { get; }
+            public void RecoverTxSenders(Block block)
+            {
+                throw new NotImplementedException();
+            }
+
+            public void RecoverTxSender(Transaction tx, long blockNumber)
+            {
+                throw new NotImplementedException();
+            }
 
             public Block FindBlock(Keccak blockHash, bool mainChainOnly)
             {

src/Nethermind/Nethermind.Facade/BlockchainBridge.cs

@@ -48,6 +48,7 @@ public class BlockchainBridge : IBlockchainBridge
         private readonly IReceiptStorage _receiptStorage;
         private readonly IStorageProvider _storageProvider;
         private readonly ITransactionProcessor _transactionProcessor;
+        private readonly IEthereumEcdsa _ecdsa;
         private readonly ITxPoolInfoProvider _transactionPoolInfoProvider;
 
         public BlockchainBridge(
@@ -61,7 +62,8 @@ public BlockchainBridge(
             IFilterStore filterStore,
             IFilterManager filterManager,
             IWallet wallet,
-            ITransactionProcessor transactionProcessor)
+            ITransactionProcessor transactionProcessor,
+            IEthereumEcdsa ecdsa)
         {
             _stateReader = stateReader ?? throw new ArgumentNullException(nameof(stateReader));
             _stateProvider = stateProvider ?? throw new ArgumentNullException(nameof(stateProvider));
@@ -74,6 +76,7 @@ public BlockchainBridge(
             _filterManager = filterManager ?? throw new ArgumentException(nameof(filterManager));
             _wallet = wallet ?? throw new ArgumentException(nameof(wallet));
             _transactionProcessor = transactionProcessor ?? throw new ArgumentException(nameof(transactionProcessor));
+            _ecdsa = ecdsa ?? throw new ArgumentNullException(nameof(ecdsa));
         }
 
         public IReadOnlyCollection<Address> GetWalletAccounts()
@@ -267,6 +270,19 @@ public int NewPendingTransactionFilter()
         public FilterLog[] GetLogFilterChanges(int filterId) => _filterManager.PollLogs(filterId);
         public Keccak[] GetBlockFilterChanges(int filterId) => _filterManager.PollBlockHashes(filterId);
 
+        public void RecoverTxSenders(Block block)
+        {
+            for (int i = 0; i < block.Transactions.Length; i++)
+            {
+                RecoverTxSender(block.Transactions[i], block.Number);
+            }
+        }
+
+        public void RecoverTxSender(Transaction tx, long blockNumber)
+        {
+            tx.SenderAddress = _ecdsa.RecoverAddress(tx, blockNumber);
+        }
+        
         public Keccak[] GetPendingTransactionFilterChanges(int filterId) =>
             _filterManager.PollPendingTransactionHashes(filterId);
     }

src/Nethermind/Nethermind.Facade/IBlockchainBridge.cs

@@ -40,6 +40,10 @@ public interface IBlockchainBridge
         long BestKnown { get; }
         bool IsSyncing { get; }
 
+        void RecoverTxSenders(Block block);
+
+        void RecoverTxSender(Transaction tx, long blockNumber);
+        
         Block FindBlock(Keccak blockHash, bool mainChainOnly);
         Block FindBlock(long blockNumber);
         Block RetrieveHeadBlock();

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

@@ -468,6 +468,11 @@ public ResultWrapper<BlockForRpc> eth_getBlockByHash(Keccak blockHash, bool retu
             {
                 _readerWriterLockSlim.EnterReadLock();
                 var block = _blockchainBridge.FindBlock(blockHash, false);
+                if (block != null)
+                {
+                    _blockchainBridge.RecoverTxSenders(block);
+                }
+                
                 return ResultWrapper<BlockForRpc>.Success(new BlockForRpc(block, returnFullTransactionObjects));
             }
             finally
@@ -486,7 +491,12 @@ public ResultWrapper<BlockForRpc> eth_getBlockByNumber(BlockParameter blockParam
                     return ResultWrapper<BlockForRpc>.Fail("Incorrect head block");
                 }
 
-                var result = GetBlock(blockParameter, true);
+                var result = GetBlock(blockParameter, true, true);
+                if (result.Data != null)
+                {
+                    _blockchainBridge.RecoverTxSenders(result.Data);
+                }
+
                 return result.Result.ResultType == ResultType.Failure
                     ? ResultWrapper<BlockForRpc>.Fail(result.Result.Error, result.ErrorType)
                     : ResultWrapper<BlockForRpc>.Success(result.Data == null ? null : new BlockForRpc(result.Data, returnFullTransactionObjects));
@@ -508,6 +518,7 @@ public ResultWrapper<TransactionForRpc> eth_getTransactionByHash(Keccak transact
                     return ResultWrapper<TransactionForRpc>.Success(null);
                 }
 
+                _blockchainBridge.RecoverTxSender(transaction, receipt.BlockNumber);
                 var transactionModel = new TransactionForRpc(receipt.BlockHash, receipt.BlockNumber, receipt.Index, transaction);
                 if (Logger.IsTrace) Logger.Trace($"eth_getTransactionByHash request {transactionHash}, result: {transactionModel.Hash}");
                 return ResultWrapper<TransactionForRpc>.Success(transactionModel);
@@ -535,6 +546,8 @@ public ResultWrapper<TransactionForRpc> eth_getTransactionByBlockHashAndIndex(Ke
                 }
 
                 var transaction = block.Transactions[(int) positionIndex];
+                _blockchainBridge.RecoverTxSender(transaction, block.Number);
+                
                 var transactionModel = new TransactionForRpc(block.Hash, block.Number, (int) positionIndex, transaction);
 
                 if (Logger.IsDebug) Logger.Debug($"eth_getTransactionByBlockHashAndIndex request {blockHash}, index: {positionIndex}, result: {transactionModel.Hash}");
@@ -569,6 +582,8 @@ public ResultWrapper<TransactionForRpc> eth_getTransactionByBlockNumberAndIndex(
 
                 Block block = result.Data;
                 var transaction = block.Transactions[(int) positionIndex];
+                _blockchainBridge.RecoverTxSender(transaction, block.Number);
+                
                 var transactionModel = new TransactionForRpc(block.Hash, block.Number, (int) positionIndex, transaction);
 
                 if (Logger.IsDebug) Logger.Debug($"eth_getTransactionByBlockNumberAndIndex request {blockParameter}, index: {positionIndex}, result: {transactionModel.Hash}");
@@ -879,7 +894,7 @@ private ResultWrapper<byte[]> GetStorage(Address address, BigInteger index, Bloc
             return GetAccountStorage(address, index, block.Data.Header.StateRoot);
         }
 
-        private ResultWrapper<Core.Block> GetBlock(BlockParameter blockParameter, bool allowNulls = false)
+        private ResultWrapper<Core.Block> GetBlock(BlockParameter blockParameter, bool allowNulls = false, bool recoverTxSenders = false)
         {
             switch (blockParameter.Type)
             {

src/Nethermind/Nethermind.Mining.Test/Nethermind.Mining.Test.csproj

@@ -24,9 +24,4 @@
       <Name>Nethermind.Mining</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="NSubstitute, Version=3.1.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca">
-      <HintPath>..\..\..\..\..\Users\tksta\.nuget\packages\nsubstitute\3.1.0\lib\netstandard1.3\NSubstitute.dll</HintPath>
-    </Reference>
-  </ItemGroup>
 </Project>

src/Nethermind/Nethermind.Runner/Runners/EthereumRunner.cs

@@ -117,7 +117,6 @@ public class EthereumRunner : IRunner
         private PrivateKey _nodeKey;
         private ChainSpec _chainSpec;
         private ICryptoRandom _cryptoRandom = new CryptoRandom();
-        private IEcdsa _ecdsa = new Ecdsa();
         private IJsonSerializer _jsonSerializer = new UnforgivingJsonSerializer();
         private IJsonSerializer _ethereumJsonSerializer = new EthereumJsonSerializer();
         private CancellationTokenSource _runnerCancellation;
@@ -278,7 +277,8 @@ private void RegisterJsonRpcModules()
                 filterStore,
                 filterManager,
                 _wallet,
-                rpcState.TransactionProcessor);
+                rpcState.TransactionProcessor,
+                _ethereumEcdsa);
 
             AlternativeChain debugChain = new AlternativeChain(_blockTree, _blockValidator, _rewardCalculator, _specProvider, rpcDbProvider, _recoveryStep, _logManager, NullTxPool.Instance, NullReceiptStorage.Instance);
             IReadOnlyDbProvider debugDbProvider = new ReadOnlyDbProvider(_dbProvider, false);
@@ -850,7 +850,7 @@ private async Task InitPeer()
                 if (_logger.IsInfo) _logger.Info($"Initializing NDM...");
                 var capabilityConnector = await _ndmInitializer.InitAsync(_configProvider, _dbProvider,
                     _initConfig.BaseDbPath, _blockProcessor, _blockTree, _txPool, _txPoolInfoProvider, _specProvider,
-                    _receiptStorage, _wallet, _timestamp, _ecdsa, _rpcModuleProvider, _keyStore, _jsonSerializer,
+                    _receiptStorage, _wallet, _timestamp, _ethereumEcdsa, _rpcModuleProvider, _keyStore, _jsonSerializer,
                     _cryptoRandom, _enode, _ndmConsumerChannelManager, _ndmDataPublisher, _grpcService,
                     _nodeStatsManager, _protocolsManager, protocolValidator, _messageSerializationService,
                     _initConfig.EnableUnsecuredDevWallet, _logManager);
@@ -889,11 +889,11 @@ private void InitDiscovery()
 
             var privateKeyProvider = new SameKeyGenerator(_nodeKey);
             var discoveryMessageFactory = new DiscoveryMessageFactory(_timestamp);
-            var nodeIdResolver = new NodeIdResolver(_ecdsa);
+            var nodeIdResolver = new NodeIdResolver(_ethereumEcdsa);
 
             IDiscoveryMsgSerializersProvider msgSerializersProvider = new DiscoveryMsgSerializersProvider(
                 _messageSerializationService,
-                _ecdsa,
+                _ethereumEcdsa,
                 privateKeyProvider,
                 discoveryMessageFactory,
                 nodeIdResolver);

src/Nethermind/Nethermind.sln.DotSettings

@@ -45,6 +45,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Hardfork/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Hashimoto/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=hashrate/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Initializers/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=intra/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ISZERO/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Jint/@EntryIndexedValue">True</s:Boolean>