phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 14:59:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Split out bech32 separator char to header

Browse source
This commit is contained in:
Lőrinc 2024-08-10 09:39:20 +02:00
parent e8f72aefd2
commit c1a5d5c100
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/bech32.cpp
View file

@ -364,7 +364,7 @@ std::string Encode(Encoding encoding, const std::string& hrp, const data& values
std::string ret; std::string ret;
ret.reserve(hrp.size() + 1 + values.size() + CHECKSUM_SIZE); ret.reserve(hrp.size() + 1 + values.size() + CHECKSUM_SIZE);
ret += hrp; ret += hrp;
ret += '1'; ret += SEPARATOR;
for (const uint8_t& i : values) ret += CHARSET[i]; for (const uint8_t& i : values) ret += CHARSET[i];
for (const uint8_t& i : CreateChecksum(encoding, hrp, values)) ret += CHARSET[i]; for (const uint8_t& i : CreateChecksum(encoding, hrp, values)) ret += CHARSET[i];
return ret; return ret;
@ -374,7 +374,7 @@ std::string Encode(Encoding encoding, const std::string& hrp, const data& values
DecodeResult Decode(const std::string& str, CharLimit limit) { DecodeResult Decode(const std::string& str, CharLimit limit) {
std::vector<int> errors; std::vector<int> errors;
if (!CheckCharacters(str, errors)) return {}; if (!CheckCharacters(str, errors)) return {};
size_t pos = str.rfind('1'); size_t pos = str.rfind(SEPARATOR);
if (str.size() > limit) return {}; if (str.size() > limit) return {};
if (pos == str.npos || pos == 0 || pos + CHECKSUM_SIZE >= str.size()) { if (pos == str.npos || pos == 0 || pos + CHECKSUM_SIZE >= str.size()) {
return {}; return {};
@ -413,7 +413,7 @@ std::pair<std::string, std::vector<int>> LocateErrors(const std::string& str, Ch
return std::make_pair("Invalid character or mixed case", std::move(error_locations)); return std::make_pair("Invalid character or mixed case", std::move(error_locations));
} }
size_t pos = str.rfind('1'); size_t pos = str.rfind(SEPARATOR);
if (pos == str.npos) { if (pos == str.npos) {
return std::make_pair("Missing separator", std::vector<int>{}); return std::make_pair("Missing separator", std::vector<int>{});
} }

4
src/bech32.h
View file

@ -21,8 +21,8 @@
namespace bech32 namespace bech32
{ {
/** The Bech32 and Bech32m checksum size */ static constexpr size_t CHECKSUM_SIZE = 6;
constexpr size_t CHECKSUM_SIZE = 6; static constexpr char SEPARATOR = '1';
enum class Encoding { enum class Encoding {
INVALID, //!< Failed decoding INVALID, //!< Failed decoding