wallet: make the segregation height settable #3419
Merged
Conversation
This file contains 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
stoffu
reviewed
Mar 17, 2018
src/wallet/wallet2.cpp
Outdated
| @@ -2594,6 +2597,9 @@ bool wallet2::store_keys(const std::string& keys_file_name, const epee::wipeable | |||
| value2.SetInt(m_key_reuse_mitigation2 ? 1 : 0); | |||
| json.AddMember("key_reuse_mitigation2", value2, json.GetAllocator()); | |||
|
|
|||
| value2.SetInt(m_segregation_height); | |||
src/wallet/wallet2.cpp
Outdated
| @@ -125,6 +126,7 @@ namespace | |||
| dir /= ".shared-ringdb"; | |||
| return dir.string(); | |||
| } | |||
|
|
|||
src/simplewallet/simplewallet.cpp
Outdated
| const auto pwd_container = get_and_verify_password(); | ||
| if (pwd_container) | ||
| { | ||
| parse_bool_and_use(args[1], [&](bool r) { |
There was a problem hiding this comment.
The expected value isn't bool but uint64_t.
| return m_segregation_height; | ||
|
|
||
| static const bool use_dns = true; | ||
| if (use_dns) |
There was a problem hiding this comment.
Does this mean that those who don't want to use the DNS have to compile the code themselves?
There was a problem hiding this comment.
The user setting takes precedence
There was a problem hiding this comment.
I don't see the need for this if (use_dns) { ... }.
There was a problem hiding this comment.
This is because there will likely be a --no-dns flag
moneromooo-monero
force-pushed
the
segheight
branch
from
89167c5 to
c4122ac
Compare
stoffu
approved these changes
Mar 17, 2018
via user setting first, then DNS TXT record, hardcoded fallback
moneromooo-monero
force-pushed
the
segheight
branch
from
c4122ac to
1e393f4
Compare
fluffypony
added a commit
that referenced
this pull request
Mar 18, 2018
1e393f4 wallet: make the segregation height settable (moneromooo-monero)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
via user setting first, then DNS TXT record, hardcoded fallback