mirror of
https://github.com/eosswedenorg/antelope-keygen
synced 2026-07-03 11:53:41 +02:00
Merge branch 'develop' into l33t
# Conflicts: # src/main.cpp # src/string.cpp
This commit is contained in:
commit
e95470d57f
3 changed files with 9 additions and 1 deletions
|
|
@ -69,7 +69,8 @@ void cmd_search(int argc, char **argv) {
|
||||||
words.insert(words.end(), list.begin(), list.end());
|
words.insert(words.end(), list.begin(), list.end());
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
words = strsplitwords(strtolower(base58_strip(search)));
|
words = strsplitwords(strtolower(search));
|
||||||
|
base58_strip(words);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (argc > 1) {
|
if (argc > 1) {
|
||||||
|
|
|
||||||
|
|
@ -94,6 +94,12 @@ std::string& base58_strip(std::string &str) {
|
||||||
return str;
|
return str;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
strlist_t& base58_strip(strlist_t& list) {
|
||||||
|
|
||||||
|
std::transform(list.begin(), list.end(), list.begin(), [](std::string& str){ return base58_strip(str); });
|
||||||
|
return list;
|
||||||
|
}
|
||||||
|
|
||||||
static bool is_l33t(char ch, char& r) {
|
static bool is_l33t(char ch, char& r) {
|
||||||
|
|
||||||
// '1', '2', '3', '4', '5', '6', '7', '8', '9'
|
// '1', '2', '3', '4', '5', '6', '7', '8', '9'
|
||||||
|
|
|
||||||
|
|
@ -42,6 +42,7 @@ std::string& ltrim(std::string& str);
|
||||||
std::string& trim(std::string& str);
|
std::string& trim(std::string& str);
|
||||||
|
|
||||||
std::string& base58_strip(std::string &str);
|
std::string& base58_strip(std::string &str);
|
||||||
|
strlist_t& base58_strip(strlist_t& list);
|
||||||
|
|
||||||
strlist_t l33twords(const std::string& str);
|
strlist_t l33twords(const std::string& str);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue