From 1b58a960da7040d17fce1e374d05ffc14947afec Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Mon, 15 Apr 2024 16:14:38 +0200 Subject: polyseed fix tobtoht: Since only the composed languages are broken, it could also be that canonical composition is producing weird output. Try dumping whatever seed string is being fed to polyseed_decode to hex and we should be able to tell. Or try removing UTF8PROC_LUMP from utf8_nfc --- patches/monero/0001-polyseed.patch | 5 +++-- patches/wownero/0002-polyseed-support.patch | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'patches') diff --git a/patches/monero/0001-polyseed.patch b/patches/monero/0001-polyseed.patch index 855a2dc..9e3c061 100644 --- a/patches/monero/0001-polyseed.patch +++ b/patches/monero/0001-polyseed.patch @@ -1,8 +1,9 @@ From bf347a3c80f0e0647176752867a54ae9ecedb580 Mon Sep 17 00:00:00 2001 -From: Czarek Nakamoto +From: tobtoht Date: Tue, 12 Mar 2024 09:42:37 +0100 Subject: [PATCH 1/8] polyseed +Co-authored-by: Czarek Nakamoto --- .github/workflows/build.yml | 4 +- .gitmodules | 6 + @@ -533,7 +534,7 @@ index 000000000..b26f37574 + static size_t utf8_nfc(const char* str, polyseed_str norm) { + // Note: UTF8PROC_LUMP is used here to replace the ideographic space with a regular space for Japanese phrases + // to allow wallets to split on ' '. -+ return utf8_norm(str, norm, (utf8proc_option_t)(UTF8PROC_NULLTERM | UTF8PROC_STABLE | UTF8PROC_COMPOSE | UTF8PROC_STRIPNA | UTF8PROC_LUMP)); ++ return utf8_norm(str, norm, (utf8proc_option_t)(UTF8PROC_NULLTERM | UTF8PROC_STABLE | UTF8PROC_COMPOSE | UTF8PROC_STRIPNA)); + } + + static size_t utf8_nfkd(const char* str, polyseed_str norm) { diff --git a/patches/wownero/0002-polyseed-support.patch b/patches/wownero/0002-polyseed-support.patch index 8c5c12e..698b5ef 100644 --- a/patches/wownero/0002-polyseed-support.patch +++ b/patches/wownero/0002-polyseed-support.patch @@ -1,8 +1,9 @@ From 33d611538efef134106f427c7ee5535d28d588f6 Mon Sep 17 00:00:00 2001 -From: Czarek Nakamoto +From: tobtoht Date: Tue, 26 Mar 2024 08:19:23 +0100 Subject: [PATCH 2/9] polyseed support +Co-authored-by: Czarek Nakamoto --- .github/workflows/build.yml | 4 +- .gitmodules | 6 + @@ -533,7 +534,7 @@ index 000000000..b26f37574 + static size_t utf8_nfc(const char* str, polyseed_str norm) { + // Note: UTF8PROC_LUMP is used here to replace the ideographic space with a regular space for Japanese phrases + // to allow wallets to split on ' '. -+ return utf8_norm(str, norm, (utf8proc_option_t)(UTF8PROC_NULLTERM | UTF8PROC_STABLE | UTF8PROC_COMPOSE | UTF8PROC_STRIPNA | UTF8PROC_LUMP)); ++ return utf8_norm(str, norm, (utf8proc_option_t)(UTF8PROC_NULLTERM | UTF8PROC_STABLE | UTF8PROC_COMPOSE | UTF8PROC_STRIPNA)); + } + + static size_t utf8_nfkd(const char* str, polyseed_str norm) { -- cgit v1.2.3