mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-12-08 11:44:14 +01:00
refactor: Model the bech32 charlimit as an Enum
Bech32(m) was defined with a 90 character limit so that certain guarantees for error detection could be made for segwit addresses. However, there is nothing about the encoding scheme itself that requires a limit and in practice bech32(m) has been used without the 90 char limit (e.g. lightning invoices). Further, increasing the character limit doesn't do away with error detection, it simply lessons the guarantees. Model charlimit as an Enum, so that if a different address scheme is using bech32(m), the character limit for that address scheme can be used, rather than always using the 90 charlimit defined for segwit addresses. upate comment
This commit is contained in:
@@ -370,11 +370,12 @@ std::string Encode(Encoding encoding, const std::string& hrp, const data& values
|
||||
}
|
||||
|
||||
/** Decode a Bech32 or Bech32m string. */
|
||||
DecodeResult Decode(const std::string& str) {
|
||||
DecodeResult Decode(const std::string& str, CharLimit limit) {
|
||||
std::vector<int> errors;
|
||||
if (!CheckCharacters(str, errors)) return {};
|
||||
size_t pos = str.rfind('1');
|
||||
if (str.size() > 90 || pos == str.npos || pos == 0 || pos + 7 > str.size()) {
|
||||
if (str.size() > limit) return {};
|
||||
if (pos == str.npos || pos == 0 || pos + 7 > str.size()) {
|
||||
return {};
|
||||
}
|
||||
data values(str.size() - 1 - pos);
|
||||
@@ -397,12 +398,12 @@ DecodeResult Decode(const std::string& str) {
|
||||
}
|
||||
|
||||
/** Find index of an incorrect character in a Bech32 string. */
|
||||
std::pair<std::string, std::vector<int>> LocateErrors(const std::string& str) {
|
||||
std::pair<std::string, std::vector<int>> LocateErrors(const std::string& str, CharLimit limit) {
|
||||
std::vector<int> error_locations{};
|
||||
|
||||
if (str.size() > 90) {
|
||||
error_locations.resize(str.size() - 90);
|
||||
std::iota(error_locations.begin(), error_locations.end(), 90);
|
||||
if (str.size() > limit) {
|
||||
error_locations.resize(str.size() - limit);
|
||||
std::iota(error_locations.begin(), error_locations.end(), static_cast<int>(limit));
|
||||
return std::make_pair("Bech32 string too long", std::move(error_locations));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user