Rewrite fulfilled requests handling#1040
Merged
Merged
Conversation
tgflynn
approved these changes
Sep 25, 2016
tgflynn
left a comment
tgflynn
left a comment
There was a problem hiding this comment.
Looks good except for a couple of minor points.
utACK
| return it != mapFulfilledRequests.end() && | ||
| it->second.find(strRequest) != it->second.end() && | ||
| it->second[strRequest] > GetTime(); | ||
| } |
There was a problem hiding this comment.
Does 2 lookups on the strRequest map when one would suffice.
| { | ||
| LOCK(cs_mapFulfilledRequests); | ||
| mapFulfilledRequests[addr][strRequest] = GetTime() + Params().FulfilledRequestExpireTime(); | ||
| } |
| std::string ToString() const; | ||
| }; | ||
|
|
||
| #endif |
There was a problem hiding this comment.
You might want to add a private do nothing copy constructor and assignment operator to prevent copying this object, since copying the mutex would probably not be good.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Turned out that current implementation doesn't really help to mitigate abuse - when connection is closed CNode object is destroyed and removed from nodes vector meaning that all "fulfilled" info is gone too. Such info wasn't preserved on wallet shutdown either so client wasn't able to prevent banning of itself by other nodes. Basically the whole thing wasn't working.
This PR implements a separate manager for fulfilled requests
CNetFulfilledRequestManagerwhich fixes issues described above. This also removes testnet/mainnet specific logic for such cases by introducing additional chain paramnFulfilledRequestExpireTime(60 minutes for mainnet, 5 minutes for testnet).