diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptonote_core/checkpoints_create.cpp | 4 | ||||
| -rw-r--r-- | src/mnemonics/english.h | 46 | ||||
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 4 |
3 files changed, 29 insertions, 25 deletions
diff --git a/src/cryptonote_core/checkpoints_create.cpp b/src/cryptonote_core/checkpoints_create.cpp index 140f8dae3..4ac2f0e5b 100644 --- a/src/cryptonote_core/checkpoints_create.cpp +++ b/src/cryptonote_core/checkpoints_create.cpp @@ -125,9 +125,9 @@ bool load_checkpoints_from_dns(cryptonote::checkpoints& checkpoints) std::random_device rd; std::mt19937 gen(rd()); std::uniform_int_distribution<int> dis(0, dns_urls.size() - 1); - int first_index = dis(gen); + size_t first_index = dis(gen); - int cur_index = first_index; + size_t cur_index = first_index; do { records = tools::DNSResolver::instance().get_txt_record(dns_urls[cur_index], avail, valid); diff --git a/src/mnemonics/english.h b/src/mnemonics/english.h index 604228a8f..ae39d44fd 100644 --- a/src/mnemonics/english.h +++ b/src/mnemonics/english.h @@ -101,7 +101,7 @@ namespace Language "aided",
"ailments",
"aimless",
- "airdry",
+ "airport",
"aisle",
"ajar",
"akin",
@@ -115,7 +115,7 @@ namespace Language "almost",
"aloof",
"alpine",
- "alright",
+ "already",
"also",
"altitude",
"alumni",
@@ -171,7 +171,7 @@ namespace Language "athlete",
"atlas",
"atom",
- "atriums",
+ "atrium",
"attire",
"auburn",
"auctions",
@@ -320,11 +320,11 @@ namespace Language "comb",
"cool",
"copy",
+ "corrode",
"costume",
"cottage",
"cousin",
"cowl",
- "cozy",
"criminal",
"cube",
"cucumber",
@@ -470,8 +470,8 @@ namespace Language "enlist",
"enmity",
"enough",
- "enquiry",
"enraged",
+ "ensign",
"entrance",
"envy",
"epoxy",
@@ -527,7 +527,7 @@ namespace Language "fever",
"fewest",
"fiat",
- "fibers",
+ "fibula",
"fictional",
"fidget",
"fierce",
@@ -664,7 +664,7 @@ namespace Language "heron",
"hesitate",
"hexagon",
- "hiccups",
+ "hickory",
"hiding",
"highway",
"hijack",
@@ -728,7 +728,7 @@ namespace Language "initiate",
"injury",
"inkling",
- "inline",
+ "incline",
"inmate",
"innocent",
"inorganic",
@@ -758,7 +758,7 @@ namespace Language "jackets",
"jaded",
"jagged",
- "jailer",
+ "jailed",
"jamming",
"january",
"jargon",
@@ -830,7 +830,7 @@ namespace Language "large",
"last",
"later",
- "launchpad",
+ "launching",
"lava",
"lawsuit",
"layout",
@@ -849,7 +849,7 @@ namespace Language "lexicon",
"liar",
"library",
- "license",
+ "licks",
"lids",
"lied",
"lifestyle",
@@ -1073,7 +1073,7 @@ namespace Language "ouch",
"ought",
"ounce",
- "ourself",
+ "launchpad",
"oust",
"outbreak",
"oval",
@@ -1102,7 +1102,7 @@ namespace Language "payment",
"peaches",
"pebbles",
- "peckish",
+ "peculiar",
"pedantic",
"peeled",
"pegs",
@@ -1136,7 +1136,7 @@ namespace Language "playful",
"pledge",
"pliers",
- "plowing",
+ "plotting",
"plus",
"plywood",
"poaching",
@@ -1181,7 +1181,7 @@ namespace Language "quick",
"quote",
"rabbits",
- "racecar",
+ "racetrack",
"radar",
"rafts",
"rage",
@@ -1205,7 +1205,7 @@ namespace Language "refer",
"regular",
"reheat",
- "reignite",
+ "reinvest",
"rejoices",
"rekindle",
"relic",
@@ -1318,7 +1318,7 @@ namespace Language "silk",
"simplest",
"sincerely",
- "siphon",
+ "sipped",
"siren",
"situated",
"sixteen",
@@ -1380,6 +1380,7 @@ namespace Language "subtly",
"succeed",
"suddenly",
+ "suede",
"suffice",
"sugar",
"suitcase",
@@ -1398,7 +1399,6 @@ namespace Language "syllabus",
"symptoms",
"syndrome",
- "syphon",
"syringe",
"system",
"taboo",
@@ -1468,7 +1468,7 @@ namespace Language "touchy",
"towel",
"toxic",
- "toystore",
+ "toyed",
"trash",
"trendy",
"tribal",
@@ -1491,7 +1491,7 @@ namespace Language "tutor",
"tuxedo",
"twang",
- "tweezer",
+ "tweezers",
"twice",
"twofold",
"tycoon",
@@ -1558,7 +1558,7 @@ namespace Language "value",
"vampire",
"vane",
- "vapors",
+ "vapidly",
"vary",
"vastness",
"vats",
@@ -1602,7 +1602,7 @@ namespace Language "vulture",
"wade",
"waffle",
- "wagon",
+ "wagtail",
"waist",
"waking",
"wallets",
@@ -1633,7 +1633,7 @@ namespace Language "wield",
"wife",
"wiggle",
- "wilfully",
+ "wildly",
"winter",
"wipeout",
"wiring",
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 98515a945..4cb9cff21 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -212,6 +212,8 @@ bool simple_wallet::seed(const std::vector<std::string> &args/* = std::vector<st if (success) { success_msg_writer(true) << "\nPLEASE NOTE: the following 25 words can be used to recover access to your wallet. Please write them down and store them somewhere safe and secure. Please do not store them in your email or on file storage services outside of your immediate control.\n"; + boost::replace_nth(electrum_words, " ", 15, "\n"); + boost::replace_nth(electrum_words, " ", 7, "\n"); std::cout << electrum_words << std::endl; } else @@ -542,6 +544,8 @@ bool simple_wallet::new_wallet(const std::string &wallet_file, const std::string if (!two_random) { success_msg_writer(true) << "\nPLEASE NOTE: the following 25 words can be used to recover access to your wallet. Please write them down and store them somewhere safe and secure. Please do not store them in your email or on file storage services outside of your immediate control.\n"; + boost::replace_nth(electrum_words, " ", 15, "\n"); + boost::replace_nth(electrum_words, " ", 7, "\n"); std::cout << electrum_words << std::endl; } success_msg_writer() << "**********************************************************************"; |