Use TryGetValue to halve Dictionary lookups

src/Nethermind/Nethermind.Cli/Modules/CliModuleLoader.cs

@@ -93,14 +93,15 @@ private void LoadModule(CliModuleBase module)
                 }
 
                 ObjectInstance instance;
-                if (!_objects.ContainsKey(objectName))
+                if (!_objects.TryGetValue(objectName, out ObjectInstance? value))
                 {
                     instance = _engine.JintEngine.Object.Construct(Arguments.Empty);
                     _engine.JintEngine.SetValue(objectName, instance);
-                    _objects[objectName] = instance;
+                    value = instance;
+                    _objects[objectName] = value;
                 }
 
-                instance = _objects[objectName];
+                instance = value;
                 var @delegate = CreateDelegate(methodInfo, module);
                 DelegateWrapper nativeDelegate = new DelegateWrapper(_engine.JintEngine, @delegate);
 

src/Nethermind/Nethermind.Cli/NodeManager.cs

@@ -44,12 +44,13 @@ public NodeManager(ICliEngine cliEngine, IJsonSerializer serializer, ICliConsole
         public void SwitchUri(Uri uri)
         {
             CurrentUri = uri.ToString();
-            if (!_clients.ContainsKey(uri))
+            if (!_clients.TryGetValue(uri, out IJsonRpcClient? value))
             {
-                _clients[uri] = new BasicJsonRpcClient(uri, _serializer, _logManager);
+                value = new BasicJsonRpcClient(uri, _serializer, _logManager);
+                _clients[uri] = value;
             }
 
-            _currentClient = _clients[uri];
+            _currentClient = value;
         }
 
         public void SwitchClient(IJsonRpcClient client)

src/Nethermind/Nethermind.Consensus.Clique/SnapshotManager.cs

@@ -274,8 +274,8 @@ private Snapshot Apply(Snapshot original, List<BlockHeader> headers, ulong epoch
 
                 // Resolve the authorization key and check against signers
                 Address signer = header.Author;
-                if (!snapshot.Signers.ContainsKey(signer)) throw new InvalidOperationException("Unauthorized signer");
-                if (HasSignedRecently(snapshot, number, signer)) throw new InvalidOperationException($"Recently signed (trying to sign {number} when last signed {snapshot.Signers[signer]} with {snapshot.Signers.Count} signers)");
+                if (!snapshot.Signers.TryGetValue(signer, out var value)) throw new InvalidOperationException("Unauthorized signer");
+                if (HasSignedRecently(snapshot, number, signer)) throw new InvalidOperationException($"Recently signed (trying to sign {number} when last signed {value} with {snapshot.Signers.Count} signers)");
 
                 snapshot.Signers[signer] = number;
 
@@ -353,25 +353,24 @@ private Snapshot Apply(Snapshot original, List<BlockHeader> headers, ulong epoch
 
         private bool Cast(Snapshot snapshot, Address address, bool authorize)
         {
-            if (!snapshot.Tally.ContainsKey(address))
+            if (!snapshot.Tally.TryGetValue(address, out Tally? value))
             {
-                snapshot.Tally[address] = new Tally(authorize);
+                value = new Tally(authorize);
+                snapshot.Tally[address] = value;
             }
 
             // Ensure the vote is meaningful
             if (!IsValidVote(snapshot, address, authorize)) return false;
-
-            // Cast the vote into tally
-            snapshot.Tally[address].Votes++;
+            value.Votes++;
             return true;
         }
 
         private bool Uncast(Snapshot snapshot, Address address, bool authorize)
         {
             // If there's no tally, it's a dangling vote, just drop
-            if (!snapshot.Tally.ContainsKey(address)) return true;
+            if (!snapshot.Tally.TryGetValue(address, out Tally? value)) return true;
 
-            Tally tally = snapshot.Tally[address];
+            Tally tally = value;
             // Ensure we only revert counted votes
             if (tally.Authorize != authorize) return false;
 

src/Nethermind/Nethermind.Consensus.Ethash/HintBasedCache.cs

@@ -55,12 +55,13 @@ public void Hint(Guid guid, long start, long end)
                 throw new InvalidOperationException("Hint too wide");
             }
 
-            if (!_epochsPerGuid.ContainsKey(guid))
+            if (!_epochsPerGuid.TryGetValue(guid, out HashSet<uint>? value))
             {
-                _epochsPerGuid[guid] = new HashSet<uint>();
+                value = new HashSet<uint>();
+                _epochsPerGuid[guid] = value;
             }
 
-            HashSet<uint> epochForGuid = _epochsPerGuid[guid];
+            HashSet<uint> epochForGuid = value;
             uint currentMin = uint.MaxValue;
             uint currentMax = 0;
             foreach (uint alreadyCachedEpoch in epochForGuid.ToList())
@@ -78,12 +79,12 @@ public void Hint(Guid guid, long start, long end)
                 if (alreadyCachedEpoch < startEpoch || alreadyCachedEpoch > endEpoch)
                 {
                     epochForGuid.Remove(alreadyCachedEpoch);
-                    if (!_epochRefs.ContainsKey(alreadyCachedEpoch))
+                    if (!_epochRefs.TryGetValue(alreadyCachedEpoch, out var epochValue))
                     {
                         throw new InvalidAsynchronousStateException("Epoch ref missing");
                     }
 
-                    _epochRefs[alreadyCachedEpoch] = _epochRefs[alreadyCachedEpoch] - 1;
+                    _epochRefs[alreadyCachedEpoch] = epochValue - 1;
                     if (_epochRefs[alreadyCachedEpoch] == 0)
                     {
                         // _logger.Warn($"Removing data set for epoch {alreadyCachedEpoch}");
@@ -99,15 +100,15 @@ public void Hint(Guid guid, long start, long end)
                 for (long i = startEpoch; i <= endEpoch; i++)
                 {
                     uint epoch = (uint)i;
-                    if (!epochForGuid.Contains(epoch))
+                    if (epochForGuid.Add(epoch))
                     {
-                        epochForGuid.Add(epoch);
-                        if (!_epochRefs.ContainsKey(epoch))
+                        if (!_epochRefs.TryGetValue(epoch, out var epochValue))
                         {
-                            _epochRefs[epoch] = 0;
+                            epochValue = 0;
+                            _epochRefs[epoch] = epochValue;
                         }
 
-                        _epochRefs[epoch] = _epochRefs[epoch] + 1;
+                        _epochRefs[epoch] = epochValue + 1;
                         if (_epochRefs[epoch] == 1)
                         {
                             // _logger.Warn($"Building data set for epoch {epoch}");

src/Nethermind/Nethermind.Core/Collections/LinkedHashSet.cs

@@ -10,7 +10,7 @@ namespace Nethermind.Core.Collections
 {
     public class LinkedHashSet<T> : ISet<T>, IReadOnlySet<T> where T : notnull
     {
-        private readonly IDictionary<T, LinkedListNode<T>> _dict;
+        private readonly Dictionary<T, LinkedListNode<T>> _dict;
         private readonly LinkedList<T> _list;
 
         public LinkedHashSet(int initialCapacity)
@@ -71,7 +71,7 @@ public void IntersectWith(IEnumerable<T>? other)
 
             T[] ts = new T[Count];
             CopyTo(ts, 0);
-            ISet<T> set = other.ToHashSet();
+            HashSet<T> set = other.ToHashSet();
             foreach (T t in this.ToArray())
             {
                 if (!set.Contains(t))
@@ -106,7 +106,7 @@ public bool IsProperSupersetOf(IEnumerable<T>? other)
         {
             if (other is null) throw new ArgumentNullException(nameof(other));
 
-            ISet<T> set = other.ToHashSet();
+            HashSet<T> set = other.ToHashSet();
             int otherCount = set.Count;
             if (Count > otherCount)
             {
@@ -134,7 +134,7 @@ public bool IsSubsetOf(IEnumerable<T>? other)
         {
             if (other is null) throw new ArgumentNullException(nameof(other));
 
-            ISet<T> set = other.ToHashSet();
+            HashSet<T> set = other.ToHashSet();
             return this.All(t => set.Contains(t));
         }
 
@@ -167,7 +167,7 @@ public void SymmetricExceptWith(IEnumerable<T> other)
             T[] ts = new T[Count];
             CopyTo(ts, 0);
 
-            ISet<T> set = other.ToHashSet();
+            HashSet<T> set = other.ToHashSet();
             for (int index = 0; index < ts.Length; index++)
             {
                 T t = ts[index];
@@ -201,7 +201,7 @@ public void UnionWith(IEnumerable<T>? other)
 
         public int Count => _dict.Count;
 
-        public bool IsReadOnly => _dict.IsReadOnly;
+        public bool IsReadOnly => false;
 
         void ICollection<T>.Add(T item)
         {

src/Nethermind/Nethermind.Evm/Tracing/ParityStyle/ParityLikeTxTracer.cs

@@ -320,13 +320,13 @@ public override void ReportBalanceChange(Address address, UInt256? before, UInt2
                 throw new InvalidOperationException($"{nameof(ParityLikeTxTracer)} did not expect state change report.");
             }
 
-            if (!_trace.StateChanges.ContainsKey(address))
+            if (!_trace.StateChanges.TryGetValue(address, out ParityAccountStateChange? value))
             {
                 _trace.StateChanges[address] = new ParityAccountStateChange();
             }
             else
             {
-                before = _trace.StateChanges[address].Balance?.Before ?? before;
+                before = value.Balance?.Before ?? before;
             }
 
             _trace.StateChanges[address].Balance = new ParityStateChange<UInt256?>(before, after);
@@ -339,45 +339,45 @@ public override void ReportCodeChange(Address address, byte[] before, byte[] aft
                 throw new InvalidOperationException($"{nameof(ParityLikeTxTracer)} did not expect state change report.");
             }
 
-            if (!_trace.StateChanges.ContainsKey(address))
+            if (!_trace.StateChanges.TryGetValue(address, out ParityAccountStateChange? value))
             {
                 _trace.StateChanges[address] = new ParityAccountStateChange();
             }
             else
             {
-                before = _trace.StateChanges[address].Code?.Before ?? before;
+                before = value.Code?.Before ?? before;
             }
 
             _trace.StateChanges[address].Code = new ParityStateChange<byte[]>(before, after);
         }
 
         public override void ReportNonceChange(Address address, UInt256? before, UInt256? after)
         {
-            if (!_trace.StateChanges!.ContainsKey(address))
+            if (!_trace.StateChanges!.TryGetValue(address, out ParityAccountStateChange? value))
             {
                 _trace.StateChanges[address] = new ParityAccountStateChange();
             }
             else
             {
-                before = _trace.StateChanges[address].Nonce?.Before ?? before;
+                before = value.Nonce?.Before ?? before;
             }
 
             _trace.StateChanges[address].Nonce = new ParityStateChange<UInt256?>(before, after);
         }
 
         public override void ReportStorageChange(in StorageCell storageCell, byte[] before, byte[] after)
         {
-            if (!_trace.StateChanges!.ContainsKey(storageCell.Address))
+            if (!_trace.StateChanges!.TryGetValue(storageCell.Address, out ParityAccountStateChange? value))
             {
-                _trace.StateChanges[storageCell.Address] = new ParityAccountStateChange();
+                value = new ParityAccountStateChange();
+                _trace.StateChanges[storageCell.Address] = value;
             }
 
-            Dictionary<UInt256, ParityStateChange<byte[]>> storage =
-                _trace.StateChanges[storageCell.Address].Storage ?? (_trace.StateChanges[storageCell.Address].Storage = new Dictionary<UInt256, ParityStateChange<byte[]>>());
+            Dictionary<UInt256, ParityStateChange<byte[]>> storage = value.Storage ?? (value.Storage = new Dictionary<UInt256, ParityStateChange<byte[]>>());
 
-            if (storage.TryGetValue(storageCell.Index, out ParityStateChange<byte[]> value))
+            if (storage.TryGetValue(storageCell.Index, out ParityStateChange<byte[]> change))
             {
-                before = value.Before ?? before;
+                before = change.Before ?? before;
             }
 
             storage[storageCell.Index] = new ParityStateChange<byte[]>(before, after);

src/Nethermind/Nethermind.Network/P2P/Session.cs

@@ -572,12 +572,13 @@ public void AddProtocolHandler(IProtocolHandler handler)
         private AdaptiveCodeResolver GetOrCreateResolver()
         {
             string key = string.Join(":", _protocols.Select(p => p.Key).OrderBy(x => x).ToArray());
-            if (!_resolvers.ContainsKey(key))
+            if (!_resolvers.TryGetValue(key, out AdaptiveCodeResolver? value))
             {
-                _resolvers[key] = new AdaptiveCodeResolver(_protocols);
+                value = new AdaptiveCodeResolver(_protocols);
+                _resolvers[key] = value;
             }
 
-            return _resolvers[key];
+            return value;
         }
 
         public override string ToString()

src/Nethermind/Nethermind.Overseer.Test/Framework/TestBuilder.cs

@@ -209,7 +209,7 @@ public TestBuilder StartNode(string name, string baseConfigFile, string key = nu
 
         private NethermindProcessWrapper GetOrCreateNode(string name, string baseConfigFile, string key)
         {
-            if (!Nodes.ContainsKey(name))
+            if (!Nodes.TryGetValue(name, out NethermindProcessWrapper value))
             {
                 string bootnodes = string.Empty;
                 foreach ((_, NethermindProcessWrapper process) in Nodes)
@@ -227,11 +227,12 @@ private NethermindProcessWrapper GetOrCreateNode(string name, string baseConfigF
                 int p2pPort = _startPort + _nodeCounter;
                 int httpPort = _startHttpPort + _nodeCounter;
                 TestContext.WriteLine($"Creating {name} at {p2pPort}, http://localhost:{httpPort}");
-                Nodes[name] = _processBuilder.Create(name, _runnerDir, configPath, dbDir, httpPort, p2pPort, nodeKey, bootnodes);
+                value = _processBuilder.Create(name, _runnerDir, configPath, dbDir, httpPort, p2pPort, nodeKey, bootnodes);
+                Nodes[name] = value;
                 _nodeCounter++;
             }
 
-            return Nodes[name];
+            return value;
         }
 
         private string GetNodeKey(string key)

src/Nethermind/Nethermind.State/PersistentStorageProvider.cs

@@ -70,7 +70,7 @@ protected override byte[] GetCurrentValue(in StorageCell storageCell) =>
         /// <returns></returns>
         public byte[] GetOriginal(in StorageCell storageCell)
         {
-            if (!_originalValues.ContainsKey(storageCell))
+            if (!_originalValues.TryGetValue(storageCell, out var value))
             {
                 throw new InvalidOperationException("Get original should only be called after get within the same caching round");
             }
@@ -86,7 +86,7 @@ public byte[] GetOriginal(in StorageCell storageCell)
                 }
             }
 
-            return _originalValues[storageCell];
+            return value;
         }
 
 
@@ -224,13 +224,13 @@ public void CommitTrees(long blockNumber)
 
         private StorageTree GetOrCreateStorage(Address address)
         {
-            if (!_storages.ContainsKey(address))
+            if (!_storages.TryGetValue(address, out StorageTree? value))
             {
                 StorageTree storageTree = _storageTreeFactory.Create(address, _trieStore, _stateProvider.GetStorageRoot(address), StateRoot, _logManager);
                 return _storages[address] = storageTree;
             }
 
-            return _storages[address];
+            return value;
         }
 
         private byte[] LoadFromTree(in StorageCell storageCell)

src/Nethermind/Nethermind.State/Proofs/AccountProofCollector.cs

@@ -181,18 +181,19 @@ public void VisitBranch(TrieNode node, TrieVisitContext trieVisitContext)
                     }
                     else
                     {
-                        if (!_storageNodeInfos.ContainsKey(childHash))
+                        if (!_storageNodeInfos.TryGetValue(childHash, out StorageNodeInfo? value))
                         {
-                            _storageNodeInfos[childHash] = new StorageNodeInfo();
+                            value = new StorageNodeInfo();
+                            _storageNodeInfos[childHash] = value;
                         }
 
                         if (!bumpedIndexes.Contains((byte)childIndex))
                         {
                             bumpedIndexes.Add((byte)childIndex);
-                            _storageNodeInfos[childHash].PathIndex = _pathTraversalIndex + 1;
+                            value.PathIndex = _pathTraversalIndex + 1;
                         }
 
-                        _storageNodeInfos[childHash].StorageIndices.Add(storageIndex);
+                        value.StorageIndices.Add(storageIndex);
                         _nodeToVisitFilter.Add(childHash);
                     }
                 }

src/Nethermind/Nethermind.Synchronization/FastBlocks/FastHeadersSyncFeed.cs

@@ -25,7 +25,7 @@ namespace Nethermind.Synchronization.FastBlocks
 {
     public class HeadersSyncFeed : ActivatedSyncFeed<HeadersSyncBatch?>
     {
-        private readonly IDictionary<ulong, IDictionary<long, ulong>> _historicalOverrides = new Dictionary<ulong, IDictionary<long, ulong>>()
+        private readonly Dictionary<ulong, IDictionary<long, ulong>> _historicalOverrides = new Dictionary<ulong, IDictionary<long, ulong>>()
         {
             // Kovan has some wrong difficulty in early blocks before using proper AuRa difficulty calculation
             // In order to support that we need to support another pivot

src/Nethermind/Nethermind.Synchronization/FastSync/TreeSync.cs

@@ -973,12 +973,13 @@ private void AddDependency(Hash256 dependency, DependentItem dependentItem)
         {
             lock (_dependencies)
             {
-                if (!_dependencies.ContainsKey(dependency))
+                if (!_dependencies.TryGetValue(dependency, out HashSet<DependentItem>? value))
                 {
-                    _dependencies[dependency] = new HashSet<DependentItem>(DependentItemComparer.Instance);
+                    value = new HashSet<DependentItem>(DependentItemComparer.Instance);
+                    _dependencies[dependency] = value;
                 }
 
-                _dependencies[dependency].Add(dependentItem);
+                value.Add(dependentItem);
             }
         }