diff --git a/tests/fuzz/corpora/fuzz-bech32/021c6a117bbeedd66c400e03186da32e9a7700e9 b/tests/fuzz/corpora/fuzz-bech32/021c6a117bbeedd66c400e03186da32e9a7700e9
new file mode 100644
index 000000000000..562a8a0a50a1
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/021c6a117bbeedd66c400e03186da32e9a7700e9 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/02ee66a79dd20a8990dd6a1737d49c46f1026a39 b/tests/fuzz/corpora/fuzz-bech32/02ee66a79dd20a8990dd6a1737d49c46f1026a39
deleted file mode 100644
index 60d91e84c578..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/02ee66a79dd20a8990dd6a1737d49c46f1026a39 and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/0498c0266912ccf9658ed070b58b07cbbe9dc98e b/tests/fuzz/corpora/fuzz-bech32/0498c0266912ccf9658ed070b58b07cbbe9dc98e
new file mode 100644
index 000000000000..b0fcd0ea78c5
--- /dev/null
+++ b/tests/fuzz/corpora/fuzz-bech32/0498c0266912ccf9658ed070b58b07cbbe9dc98e
@@ -0,0 +1 @@
+z
\ No newline at end of file
diff --git a/tests/fuzz/corpora/fuzz-bech32/0545d3433ff85218bedc9637a5d0c05a1e22e256 b/tests/fuzz/corpora/fuzz-bech32/0545d3433ff85218bedc9637a5d0c05a1e22e256
new file mode 100644
index 000000000000..40105d9ef57b
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/0545d3433ff85218bedc9637a5d0c05a1e22e256 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/0b17f78c3fa2bf1355be1ffc1fbb97306b52e1dd b/tests/fuzz/corpora/fuzz-bech32/0b17f78c3fa2bf1355be1ffc1fbb97306b52e1dd
deleted file mode 100644
index 0ebe6bc457eb..000000000000
--- a/tests/fuzz/corpora/fuzz-bech32/0b17f78c3fa2bf1355be1ffc1fbb97306b52e1dd
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/tests/fuzz/corpora/fuzz-bech32/0befe17906c8d15082f2778078a6111b65e3df5b b/tests/fuzz/corpora/fuzz-bech32/0befe17906c8d15082f2778078a6111b65e3df5b
new file mode 100644
index 000000000000..687489bb54fb
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/0befe17906c8d15082f2778078a6111b65e3df5b differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/0e2c9baad22efee09ed7363ce560e294e3b75835 b/tests/fuzz/corpora/fuzz-bech32/0e2c9baad22efee09ed7363ce560e294e3b75835
deleted file mode 100644
index 5001d7a5272a..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/0e2c9baad22efee09ed7363ce560e294e3b75835 and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/0e356ba505631fbf715758bed27d503f8b260e3a b/tests/fuzz/corpora/fuzz-bech32/0e356ba505631fbf715758bed27d503f8b260e3a
new file mode 100644
index 000000000000..35a038769b15
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/0e356ba505631fbf715758bed27d503f8b260e3a differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/10d9edc7c9a43b56ea4f2db112e0dd1a4e7a8114 b/tests/fuzz/corpora/fuzz-bech32/10d9edc7c9a43b56ea4f2db112e0dd1a4e7a8114
new file mode 100644
index 000000000000..ae6f7a69ef20
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/10d9edc7c9a43b56ea4f2db112e0dd1a4e7a8114 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/1105981442ee3fcf711fbfcd4d6f84b683a064c4 b/tests/fuzz/corpora/fuzz-bech32/1105981442ee3fcf711fbfcd4d6f84b683a064c4
deleted file mode 100644
index 0e3a86ae82a8..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/1105981442ee3fcf711fbfcd4d6f84b683a064c4 and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/152d5697cf81b4dbd192fda72b44141f6d8606b4 b/tests/fuzz/corpora/fuzz-bech32/152d5697cf81b4dbd192fda72b44141f6d8606b4
new file mode 100644
index 000000000000..e98a10ebccf3
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/152d5697cf81b4dbd192fda72b44141f6d8606b4 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/158b14393953e82e861b32f1cfa92ffa35910d33 b/tests/fuzz/corpora/fuzz-bech32/158b14393953e82e861b32f1cfa92ffa35910d33
new file mode 100644
index 000000000000..84bfe73be8bb
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/158b14393953e82e861b32f1cfa92ffa35910d33 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/19a736559867b3ee82a1757dd9ce1a073e1e1782 b/tests/fuzz/corpora/fuzz-bech32/19a736559867b3ee82a1757dd9ce1a073e1e1782
new file mode 100644
index 000000000000..d481706cd052
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/19a736559867b3ee82a1757dd9ce1a073e1e1782 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/19bde85eb4d7c840f12843e83908d16df6fb9056 b/tests/fuzz/corpora/fuzz-bech32/19bde85eb4d7c840f12843e83908d16df6fb9056
new file mode 100644
index 000000000000..efd757251175
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/19bde85eb4d7c840f12843e83908d16df6fb9056 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/1a16fa61ed2b8a2dc0359d8b50be5506749563ac b/tests/fuzz/corpora/fuzz-bech32/1a16fa61ed2b8a2dc0359d8b50be5506749563ac
new file mode 100644
index 000000000000..3a110c422d25
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/1a16fa61ed2b8a2dc0359d8b50be5506749563ac differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/1c6a806c33768f132e18db0e9acbcd88afcde98e b/tests/fuzz/corpora/fuzz-bech32/1c6a806c33768f132e18db0e9acbcd88afcde98e
new file mode 100644
index 000000000000..5255d478cb66
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/1c6a806c33768f132e18db0e9acbcd88afcde98e differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/1dac579df0bc0a8262031e67f251e570d6e1dc60 b/tests/fuzz/corpora/fuzz-bech32/1dac579df0bc0a8262031e67f251e570d6e1dc60
deleted file mode 100644
index d1efa9f696af..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/1dac579df0bc0a8262031e67f251e570d6e1dc60 and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/1e4af9645a3d193f0869b453a11e5393b98871dd b/tests/fuzz/corpora/fuzz-bech32/1e4af9645a3d193f0869b453a11e5393b98871dd
new file mode 100644
index 000000000000..cd37286faa0f
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/1e4af9645a3d193f0869b453a11e5393b98871dd differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/20e5df4f814a2e8b96ce34b23472932f99e90d79 b/tests/fuzz/corpora/fuzz-bech32/20e5df4f814a2e8b96ce34b23472932f99e90d79
new file mode 100644
index 000000000000..d71c16bc2f90
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/20e5df4f814a2e8b96ce34b23472932f99e90d79 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/21606223e87e2a1b4df86f939b4c8f790c79ab58 b/tests/fuzz/corpora/fuzz-bech32/21606223e87e2a1b4df86f939b4c8f790c79ab58
deleted file mode 100644
index 289ba03e7c70..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/21606223e87e2a1b4df86f939b4c8f790c79ab58 and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/220b09b54b3b0be74c907671dea29683f5871fe0 b/tests/fuzz/corpora/fuzz-bech32/220b09b54b3b0be74c907671dea29683f5871fe0
new file mode 100644
index 000000000000..604cb68c661d
--- /dev/null
+++ b/tests/fuzz/corpora/fuzz-bech32/220b09b54b3b0be74c907671dea29683f5871fe0
@@ -0,0 +1 @@
+k
\ No newline at end of file
diff --git a/tests/fuzz/corpora/fuzz-bech32/2459e028f53fdd476f4d3bd1bfb381d01aaa119c b/tests/fuzz/corpora/fuzz-bech32/2459e028f53fdd476f4d3bd1bfb381d01aaa119c
new file mode 100644
index 000000000000..adfff2e77dfa
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/2459e028f53fdd476f4d3bd1bfb381d01aaa119c differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/24d12148f924fb6740bd1f952e9e786db6158af4 b/tests/fuzz/corpora/fuzz-bech32/24d12148f924fb6740bd1f952e9e786db6158af4
new file mode 100644
index 000000000000..ab2b257656a2
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/24d12148f924fb6740bd1f952e9e786db6158af4 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/24fca7d248c865ee4f7d363e7c9f5dbcd5775d1c b/tests/fuzz/corpora/fuzz-bech32/24fca7d248c865ee4f7d363e7c9f5dbcd5775d1c
new file mode 100644
index 000000000000..6912ebe00ddd
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/24fca7d248c865ee4f7d363e7c9f5dbcd5775d1c differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/25bca1e5609578fedd0059c19ba933eb9ad3aeb0 b/tests/fuzz/corpora/fuzz-bech32/25bca1e5609578fedd0059c19ba933eb9ad3aeb0
new file mode 100644
index 000000000000..104ca9b51d66
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/25bca1e5609578fedd0059c19ba933eb9ad3aeb0 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/270f1090121a022c4211d93e80d779a17a1a4267 b/tests/fuzz/corpora/fuzz-bech32/270f1090121a022c4211d93e80d779a17a1a4267
deleted file mode 100644
index a394345fc53a..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/270f1090121a022c4211d93e80d779a17a1a4267 and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/271767702fdef3d373902ff019c62e99c4eca98c b/tests/fuzz/corpora/fuzz-bech32/271767702fdef3d373902ff019c62e99c4eca98c
new file mode 100644
index 000000000000..c1bd33ad50ac
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/271767702fdef3d373902ff019c62e99c4eca98c differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/27c425062030dc06d10b560cf13a36e732673347 b/tests/fuzz/corpora/fuzz-bech32/27c425062030dc06d10b560cf13a36e732673347
deleted file mode 100644
index f3b2c9082704..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/27c425062030dc06d10b560cf13a36e732673347 and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/2957f4da9ae7a4fa9c808d578116625512aa8b30 b/tests/fuzz/corpora/fuzz-bech32/2957f4da9ae7a4fa9c808d578116625512aa8b30
new file mode 100644
index 000000000000..cb764ab97194
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/2957f4da9ae7a4fa9c808d578116625512aa8b30 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/2c3389107e40b8e9d4f0f211e738d3e433c958bd b/tests/fuzz/corpora/fuzz-bech32/2c3389107e40b8e9d4f0f211e738d3e433c958bd
deleted file mode 100644
index 7c48532962b9..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/2c3389107e40b8e9d4f0f211e738d3e433c958bd and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/2f1707d5a0c149b48d2fe33ed617e04693a43e55 b/tests/fuzz/corpora/fuzz-bech32/2f1707d5a0c149b48d2fe33ed617e04693a43e55
deleted file mode 100644
index 684457aba706..000000000000
--- a/tests/fuzz/corpora/fuzz-bech32/2f1707d5a0c149b48d2fe33ed617e04693a43e55
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/tests/fuzz/corpora/fuzz-bech32/33663b46f30dd561af478d887e5a4aca04e2457a b/tests/fuzz/corpora/fuzz-bech32/33663b46f30dd561af478d887e5a4aca04e2457a
deleted file mode 100644
index 2ab149bb4ca5..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/33663b46f30dd561af478d887e5a4aca04e2457a and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/389d13b9fa72b40ce49bc90e9dd5107708ebb2c9 b/tests/fuzz/corpora/fuzz-bech32/389d13b9fa72b40ce49bc90e9dd5107708ebb2c9
new file mode 100644
index 000000000000..a3e28949fd4d
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/389d13b9fa72b40ce49bc90e9dd5107708ebb2c9 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/3b1f4f598285e06c32543dab60fc56b93053b883 b/tests/fuzz/corpora/fuzz-bech32/3b1f4f598285e06c32543dab60fc56b93053b883
deleted file mode 100644
index 54a55f3dc7ff..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/3b1f4f598285e06c32543dab60fc56b93053b883 and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/3b5bbae00a086e505229c619d23c1c880d711062 b/tests/fuzz/corpora/fuzz-bech32/3b5bbae00a086e505229c619d23c1c880d711062
deleted file mode 100644
index 3ca6dca503b4..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/3b5bbae00a086e505229c619d23c1c880d711062 and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/3d263568dc66b41755fe25b72dfcedda1702541f b/tests/fuzz/corpora/fuzz-bech32/3d263568dc66b41755fe25b72dfcedda1702541f
new file mode 100644
index 000000000000..2cb4b959cfa7
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/3d263568dc66b41755fe25b72dfcedda1702541f differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/402d79697def0e3c833480eb6ab78cc7d41bdbbb b/tests/fuzz/corpora/fuzz-bech32/402d79697def0e3c833480eb6ab78cc7d41bdbbb
new file mode 100644
index 000000000000..9302174cb7a4
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/402d79697def0e3c833480eb6ab78cc7d41bdbbb differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/42bbba4b18809c4610221ee32b7d1ce8d77f4ad1 b/tests/fuzz/corpora/fuzz-bech32/42bbba4b18809c4610221ee32b7d1ce8d77f4ad1
new file mode 100644
index 000000000000..23710c7fc26f
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/42bbba4b18809c4610221ee32b7d1ce8d77f4ad1 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/46243041b61da83ae65396bdc148d6c8d5c1e15b b/tests/fuzz/corpora/fuzz-bech32/46243041b61da83ae65396bdc148d6c8d5c1e15b
new file mode 100644
index 000000000000..a5c047312f62
--- /dev/null
+++ b/tests/fuzz/corpora/fuzz-bech32/46243041b61da83ae65396bdc148d6c8d5c1e15b
@@ -0,0 +1 @@
+ �'Q����
\ No newline at end of file
diff --git a/tests/fuzz/corpora/fuzz-bech32/495f3510514e3478a8a79fcce5d82d3f84070075 b/tests/fuzz/corpora/fuzz-bech32/495f3510514e3478a8a79fcce5d82d3f84070075
new file mode 100644
index 000000000000..69701dd05e2b
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/495f3510514e3478a8a79fcce5d82d3f84070075 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/498a34e26a4f0c0262c9d6bf503992256554f075 b/tests/fuzz/corpora/fuzz-bech32/498a34e26a4f0c0262c9d6bf503992256554f075
deleted file mode 100644
index 969c9a700746..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/498a34e26a4f0c0262c9d6bf503992256554f075 and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/4bb87f65279010361e7288c7ecb24be4461431c9 b/tests/fuzz/corpora/fuzz-bech32/4bb87f65279010361e7288c7ecb24be4461431c9
new file mode 100644
index 000000000000..c44b00b98aa2
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/4bb87f65279010361e7288c7ecb24be4461431c9 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/4e1551d5c12fd4040c6191b4de25f92d2ee92e66 b/tests/fuzz/corpora/fuzz-bech32/4e1551d5c12fd4040c6191b4de25f92d2ee92e66
deleted file mode 100644
index 093c208dd808..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/4e1551d5c12fd4040c6191b4de25f92d2ee92e66 and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/4e89eea7bf3064f317ff28d942c288f9d5a325d5 b/tests/fuzz/corpora/fuzz-bech32/4e89eea7bf3064f317ff28d942c288f9d5a325d5
new file mode 100644
index 000000000000..099dcbb97360
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/4e89eea7bf3064f317ff28d942c288f9d5a325d5 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/503d7b6cae7bd43b817c1bd3fc6e85ba797d70ba b/tests/fuzz/corpora/fuzz-bech32/503d7b6cae7bd43b817c1bd3fc6e85ba797d70ba
deleted file mode 100644
index c5a1a5571a00..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/503d7b6cae7bd43b817c1bd3fc6e85ba797d70ba and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/515dc748320bc5763ec208b4d3f60363c1520d94 b/tests/fuzz/corpora/fuzz-bech32/515dc748320bc5763ec208b4d3f60363c1520d94
new file mode 100644
index 000000000000..6274ccdf745f
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/515dc748320bc5763ec208b4d3f60363c1520d94 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/527c3ab1f03347bc397c1032eab6457696a00737 b/tests/fuzz/corpora/fuzz-bech32/527c3ab1f03347bc397c1032eab6457696a00737
deleted file mode 100644
index ce537eb02f42..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/527c3ab1f03347bc397c1032eab6457696a00737 and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/52cad972ca79b56756a7b8be08d6297ddc76d0d6 b/tests/fuzz/corpora/fuzz-bech32/52cad972ca79b56756a7b8be08d6297ddc76d0d6
new file mode 100644
index 000000000000..e18f79e22787
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/52cad972ca79b56756a7b8be08d6297ddc76d0d6 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/5537727ee4c949b898b17058da62e3432338bd5e b/tests/fuzz/corpora/fuzz-bech32/5537727ee4c949b898b17058da62e3432338bd5e
deleted file mode 100644
index 41bbb0ef54ec..000000000000
--- a/tests/fuzz/corpora/fuzz-bech32/5537727ee4c949b898b17058da62e3432338bd5e
+++ /dev/null
@@ -1 +0,0 @@
-:���:/����
\ No newline at end of file
diff --git a/tests/fuzz/corpora/fuzz-bech32/5851450502f36b32cacf3e9f3f4624959a07bca2 b/tests/fuzz/corpora/fuzz-bech32/5851450502f36b32cacf3e9f3f4624959a07bca2
new file mode 100644
index 000000000000..dafa6f6d9048
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/5851450502f36b32cacf3e9f3f4624959a07bca2 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/59078883b072a68cbd044f6afa0bb596ea084f37 b/tests/fuzz/corpora/fuzz-bech32/59078883b072a68cbd044f6afa0bb596ea084f37
new file mode 100644
index 000000000000..601ada969424
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/59078883b072a68cbd044f6afa0bb596ea084f37 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/5cbec81ab13976e77123d787cfea56d6cf2ebdce b/tests/fuzz/corpora/fuzz-bech32/5cbec81ab13976e77123d787cfea56d6cf2ebdce
new file mode 100644
index 000000000000..a5c0b0df852e
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/5cbec81ab13976e77123d787cfea56d6cf2ebdce differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/5e1889ac5f07a600ef6ac621f14f381d0b5c90cc b/tests/fuzz/corpora/fuzz-bech32/5e1889ac5f07a600ef6ac621f14f381d0b5c90cc
deleted file mode 100644
index d49a9265d1c6..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/5e1889ac5f07a600ef6ac621f14f381d0b5c90cc and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/6140e796c20f3058c423ab4da37957cab7324701 b/tests/fuzz/corpora/fuzz-bech32/6140e796c20f3058c423ab4da37957cab7324701
deleted file mode 100644
index b03a155ced7a..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/6140e796c20f3058c423ab4da37957cab7324701 and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/62f9df00484e07016cdf151fa78b4baa6d49e597 b/tests/fuzz/corpora/fuzz-bech32/62f9df00484e07016cdf151fa78b4baa6d49e597
deleted file mode 100644
index 3820ba488522..000000000000
--- a/tests/fuzz/corpora/fuzz-bech32/62f9df00484e07016cdf151fa78b4baa6d49e597
+++ /dev/null
@@ -1 +0,0 @@
-J
\ No newline at end of file
diff --git a/tests/fuzz/corpora/fuzz-bech32/634a601cb469d75c928952cc02991d49baf2807b b/tests/fuzz/corpora/fuzz-bech32/634a601cb469d75c928952cc02991d49baf2807b
new file mode 100644
index 000000000000..844c5f8d047f
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/634a601cb469d75c928952cc02991d49baf2807b differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/643902a150bf2a0e2cef37ef4426f25fb5796395 b/tests/fuzz/corpora/fuzz-bech32/643902a150bf2a0e2cef37ef4426f25fb5796395
deleted file mode 100644
index 9096fd4a3904..000000000000
--- a/tests/fuzz/corpora/fuzz-bech32/643902a150bf2a0e2cef37ef4426f25fb5796395
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/tests/fuzz/corpora/fuzz-bech32/645ce8326391d6541141ce2835e1fc57bd3c8780 b/tests/fuzz/corpora/fuzz-bech32/645ce8326391d6541141ce2835e1fc57bd3c8780
deleted file mode 100644
index 3f76d26088a0..000000000000
--- a/tests/fuzz/corpora/fuzz-bech32/645ce8326391d6541141ce2835e1fc57bd3c8780
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/tests/fuzz/corpora/fuzz-bech32/64cd55a380ce224b3dc5ac9d77ec13864d88d21e b/tests/fuzz/corpora/fuzz-bech32/64cd55a380ce224b3dc5ac9d77ec13864d88d21e
deleted file mode 100644
index 77e4f09e5d7b..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/64cd55a380ce224b3dc5ac9d77ec13864d88d21e and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/658d59d1af91df299311233c4c3fa9f3d39de60f b/tests/fuzz/corpora/fuzz-bech32/658d59d1af91df299311233c4c3fa9f3d39de60f
new file mode 100644
index 000000000000..4a0c7edd6dca
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/658d59d1af91df299311233c4c3fa9f3d39de60f differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/69ce800428c4977e1b654d9f202854b6be243902 b/tests/fuzz/corpora/fuzz-bech32/69ce800428c4977e1b654d9f202854b6be243902
new file mode 100644
index 000000000000..ce362661b058
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/69ce800428c4977e1b654d9f202854b6be243902 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/6dba3c058e2438db8fda6dd0de27291a58d61e46 b/tests/fuzz/corpora/fuzz-bech32/6dba3c058e2438db8fda6dd0de27291a58d61e46
new file mode 100644
index 000000000000..e716f0a333a6
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/6dba3c058e2438db8fda6dd0de27291a58d61e46 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/6dd1a802a1e8e933611910d40866ee89b82c67cc b/tests/fuzz/corpora/fuzz-bech32/6dd1a802a1e8e933611910d40866ee89b82c67cc
deleted file mode 100644
index 471cdc053987..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/6dd1a802a1e8e933611910d40866ee89b82c67cc and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/711ddb405deac715ac48dba22e2ef8106e5769a3 b/tests/fuzz/corpora/fuzz-bech32/711ddb405deac715ac48dba22e2ef8106e5769a3
new file mode 100644
index 000000000000..e46a4a9275bd
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/711ddb405deac715ac48dba22e2ef8106e5769a3 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/7328edb2d8db8e77dc367f2835685fc58a7e18f6 b/tests/fuzz/corpora/fuzz-bech32/7328edb2d8db8e77dc367f2835685fc58a7e18f6
new file mode 100644
index 000000000000..ab12630c7a92
--- /dev/null
+++ b/tests/fuzz/corpora/fuzz-bech32/7328edb2d8db8e77dc367f2835685fc58a7e18f6
@@ -0,0 +1 @@
+�0�O�
\ No newline at end of file
diff --git a/tests/fuzz/corpora/fuzz-bech32/7386e398fd764972796b71540aeb53ae73ccfc5a b/tests/fuzz/corpora/fuzz-bech32/7386e398fd764972796b71540aeb53ae73ccfc5a
deleted file mode 100644
index 2c1c121572b0..000000000000
--- a/tests/fuzz/corpora/fuzz-bech32/7386e398fd764972796b71540aeb53ae73ccfc5a
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/tests/fuzz/corpora/fuzz-bech32/757b7a6705e2b1e9120be26b50b0dbfe4fdd95ff b/tests/fuzz/corpora/fuzz-bech32/757b7a6705e2b1e9120be26b50b0dbfe4fdd95ff
deleted file mode 100644
index 2b33a23a6d2f..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/757b7a6705e2b1e9120be26b50b0dbfe4fdd95ff and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/05fe405753166f125559e7c9ac558654f107c7e9 b/tests/fuzz/corpora/fuzz-bech32/7722745105e9e02e8f1aaf17f7b3aac5c56cd805
similarity index 75%
rename from tests/fuzz/corpora/fuzz-bech32/05fe405753166f125559e7c9ac558654f107c7e9
rename to tests/fuzz/corpora/fuzz-bech32/7722745105e9e02e8f1aaf17f7b3aac5c56cd805
index 1b1cb4d44c57..ab2c6846789c 100644
Binary files a/tests/fuzz/corpora/fuzz-bech32/05fe405753166f125559e7c9ac558654f107c7e9 and b/tests/fuzz/corpora/fuzz-bech32/7722745105e9e02e8f1aaf17f7b3aac5c56cd805 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/77e4a0d435516a468aeeb5d831a96da91e725b6f b/tests/fuzz/corpora/fuzz-bech32/77e4a0d435516a468aeeb5d831a96da91e725b6f
new file mode 100644
index 000000000000..71e62fcf81b0
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/77e4a0d435516a468aeeb5d831a96da91e725b6f differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/790e7a0245c67bc86878901df8d9d1c42177cb80 b/tests/fuzz/corpora/fuzz-bech32/790e7a0245c67bc86878901df8d9d1c42177cb80
new file mode 100644
index 000000000000..bfe47c542e11
--- /dev/null
+++ b/tests/fuzz/corpora/fuzz-bech32/790e7a0245c67bc86878901df8d9d1c42177cb80
@@ -0,0 +1 @@
+(z):C>?R�
\ No newline at end of file
diff --git a/tests/fuzz/corpora/fuzz-bech32/7e2638cc2d359626e7d01c8ee3e905e16d1315e0 b/tests/fuzz/corpora/fuzz-bech32/7e2638cc2d359626e7d01c8ee3e905e16d1315e0
deleted file mode 100644
index 571b89610d9f..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/7e2638cc2d359626e7d01c8ee3e905e16d1315e0 and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/7ee9a3febe6225bb26a7e79ba186b8ccb676d538 b/tests/fuzz/corpora/fuzz-bech32/7ee9a3febe6225bb26a7e79ba186b8ccb676d538
deleted file mode 100644
index 872c53c1ba64..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/7ee9a3febe6225bb26a7e79ba186b8ccb676d538 and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/7f51c2725f7d8b541aba2b091fad5787b13e5926 b/tests/fuzz/corpora/fuzz-bech32/7f51c2725f7d8b541aba2b091fad5787b13e5926
deleted file mode 100644
index 7e2e227a4989..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/7f51c2725f7d8b541aba2b091fad5787b13e5926 and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/7fcc1126948196b55e2477bd5a672935ef3dabed b/tests/fuzz/corpora/fuzz-bech32/7fcc1126948196b55e2477bd5a672935ef3dabed
deleted file mode 100644
index 0852fb5417df..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/7fcc1126948196b55e2477bd5a672935ef3dabed and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/807d4cbe2e639c76b773c694356fd46a8cb57f8a b/tests/fuzz/corpora/fuzz-bech32/807d4cbe2e639c76b773c694356fd46a8cb57f8a
deleted file mode 100644
index 0bfa6c3290cf..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/807d4cbe2e639c76b773c694356fd46a8cb57f8a and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/85d7dddccf10dffce38bbb70a793efc13fdb7fa6 b/tests/fuzz/corpora/fuzz-bech32/85d7dddccf10dffce38bbb70a793efc13fdb7fa6
deleted file mode 100644
index 2b1a1b3ce4dc..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/85d7dddccf10dffce38bbb70a793efc13fdb7fa6 and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/8acd13bc9d2bf9898542646adf0d4dfb2ff6dcba b/tests/fuzz/corpora/fuzz-bech32/8acd13bc9d2bf9898542646adf0d4dfb2ff6dcba
new file mode 100644
index 000000000000..f68028ecee28
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/8acd13bc9d2bf9898542646adf0d4dfb2ff6dcba differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/8b0d8fde69dc97ec92166a1bc38aedd480068c96 b/tests/fuzz/corpora/fuzz-bech32/8b0d8fde69dc97ec92166a1bc38aedd480068c96
new file mode 100644
index 000000000000..29f7f91eb8fe
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/8b0d8fde69dc97ec92166a1bc38aedd480068c96 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/8bc4b2994863098ca375381b3fc3fd5dd4f86ce3 b/tests/fuzz/corpora/fuzz-bech32/8bc4b2994863098ca375381b3fc3fd5dd4f86ce3
new file mode 100644
index 000000000000..6be6ffcf83e6
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/8bc4b2994863098ca375381b3fc3fd5dd4f86ce3 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/8c687e27e3d13902ecff0284edccb611e19ddfc7 b/tests/fuzz/corpora/fuzz-bech32/8c687e27e3d13902ecff0284edccb611e19ddfc7
deleted file mode 100644
index 699903bcbe2a..000000000000
--- a/tests/fuzz/corpora/fuzz-bech32/8c687e27e3d13902ecff0284edccb611e19ddfc7
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/tests/fuzz/corpora/fuzz-bech32/8c73f0b41bca02c3c48c299e25c7029157948557 b/tests/fuzz/corpora/fuzz-bech32/8c73f0b41bca02c3c48c299e25c7029157948557
new file mode 100644
index 000000000000..b8fe01629a57
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/8c73f0b41bca02c3c48c299e25c7029157948557 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/8ca52c7b76653cc917a606c118465bd665300559 b/tests/fuzz/corpora/fuzz-bech32/8ca52c7b76653cc917a606c118465bd665300559
deleted file mode 100644
index 3e28c9cb2ca8..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/8ca52c7b76653cc917a606c118465bd665300559 and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/914e45764d370a62adbc922980ce382135a1680f b/tests/fuzz/corpora/fuzz-bech32/914e45764d370a62adbc922980ce382135a1680f
new file mode 100644
index 000000000000..69eb1d16f153
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/914e45764d370a62adbc922980ce382135a1680f differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/91d40a9c69af07cb4e29e9dd63ac749589797bac b/tests/fuzz/corpora/fuzz-bech32/91d40a9c69af07cb4e29e9dd63ac749589797bac
deleted file mode 100644
index acc333ea5f39..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/91d40a9c69af07cb4e29e9dd63ac749589797bac and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/94d2b847dcee5933470f64f3495dd7895341f8c2 b/tests/fuzz/corpora/fuzz-bech32/94d2b847dcee5933470f64f3495dd7895341f8c2
new file mode 100644
index 000000000000..731b974d5ba6
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/94d2b847dcee5933470f64f3495dd7895341f8c2 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/964c9483e63c34d7142da8c9684645f9c907e5fa b/tests/fuzz/corpora/fuzz-bech32/964c9483e63c34d7142da8c9684645f9c907e5fa
new file mode 100644
index 000000000000..600298b2d10c
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/964c9483e63c34d7142da8c9684645f9c907e5fa differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/999645960156bccd33a2fab1a1ab5ffdd1d714bb b/tests/fuzz/corpora/fuzz-bech32/999645960156bccd33a2fab1a1ab5ffdd1d714bb
deleted file mode 100644
index 432a4599d4d5..000000000000
--- a/tests/fuzz/corpora/fuzz-bech32/999645960156bccd33a2fab1a1ab5ffdd1d714bb
+++ /dev/null
@@ -1 +0,0 @@
-~����=
\ No newline at end of file
diff --git a/tests/fuzz/corpora/fuzz-bech32/99b5eba0e1ac1cea583f00fac1b8984b48f48828 b/tests/fuzz/corpora/fuzz-bech32/99b5eba0e1ac1cea583f00fac1b8984b48f48828
new file mode 100644
index 000000000000..1699029354b6
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/99b5eba0e1ac1cea583f00fac1b8984b48f48828 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/99daa246ef5100910483c69187db05abe55f3395 b/tests/fuzz/corpora/fuzz-bech32/99daa246ef5100910483c69187db05abe55f3395
deleted file mode 100644
index 64258479bb57..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/99daa246ef5100910483c69187db05abe55f3395 and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/9c2683cd246039399db7163bfc1eec5a37c7c78f b/tests/fuzz/corpora/fuzz-bech32/9c2683cd246039399db7163bfc1eec5a37c7c78f
deleted file mode 100644
index 90a2702398ea..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/9c2683cd246039399db7163bfc1eec5a37c7c78f and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/9c7a8c0df01b7dddf4a6b5248228f67d0fdad99f b/tests/fuzz/corpora/fuzz-bech32/9c7a8c0df01b7dddf4a6b5248228f67d0fdad99f
new file mode 100644
index 000000000000..4f7ed85fa8e1
--- /dev/null
+++ b/tests/fuzz/corpora/fuzz-bech32/9c7a8c0df01b7dddf4a6b5248228f67d0fdad99f
@@ -0,0 +1 @@
+(z):CJR�
\ No newline at end of file
diff --git a/tests/fuzz/corpora/fuzz-bech32/9da93dc2306d4c1a13eb023ffaeed937441000cc b/tests/fuzz/corpora/fuzz-bech32/9da93dc2306d4c1a13eb023ffaeed937441000cc
new file mode 100644
index 000000000000..3d10854adba7
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/9da93dc2306d4c1a13eb023ffaeed937441000cc differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/9dceefc7ed0cdbfd4b0942fc580ef047e034942f b/tests/fuzz/corpora/fuzz-bech32/9dceefc7ed0cdbfd4b0942fc580ef047e034942f
new file mode 100644
index 000000000000..eb0e154263e6
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/9dceefc7ed0cdbfd4b0942fc580ef047e034942f differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/a0f3f602a44e684e1b94688ca56cd2da6884d14f b/tests/fuzz/corpora/fuzz-bech32/a0f3f602a44e684e1b94688ca56cd2da6884d14f
new file mode 100644
index 000000000000..5f80213f6cb7
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/a0f3f602a44e684e1b94688ca56cd2da6884d14f differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/a5c3d8c7672b621704b04a5cc852afdc52b6d278 b/tests/fuzz/corpora/fuzz-bech32/a5c3d8c7672b621704b04a5cc852afdc52b6d278
deleted file mode 100644
index 1b226d3d640d..000000000000
--- a/tests/fuzz/corpora/fuzz-bech32/a5c3d8c7672b621704b04a5cc852afdc52b6d278
+++ /dev/null
@@ -1 +0,0 @@
-:���/:���/���
\ No newline at end of file
diff --git a/tests/fuzz/corpora/fuzz-bech32/a79291e92a97a1efadb7b9d96cf78b9e82e22581 b/tests/fuzz/corpora/fuzz-bech32/a79291e92a97a1efadb7b9d96cf78b9e82e22581
deleted file mode 100644
index ade17270c002..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/a79291e92a97a1efadb7b9d96cf78b9e82e22581 and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/a8972e8a0069a0d9d2781c399b8634cdfeec252d b/tests/fuzz/corpora/fuzz-bech32/a8972e8a0069a0d9d2781c399b8634cdfeec252d
new file mode 100644
index 000000000000..bcea0f3baad0
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/a8972e8a0069a0d9d2781c399b8634cdfeec252d differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/aea188cbabfe863dbffff50e0434af6009dcdabc b/tests/fuzz/corpora/fuzz-bech32/aea188cbabfe863dbffff50e0434af6009dcdabc
new file mode 100644
index 000000000000..ef59df751d21
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/aea188cbabfe863dbffff50e0434af6009dcdabc differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/af45e3625806e25dcf64ee8a2d6a67aec2368561 b/tests/fuzz/corpora/fuzz-bech32/af45e3625806e25dcf64ee8a2d6a67aec2368561
deleted file mode 100644
index 21be93633686..000000000000
--- a/tests/fuzz/corpora/fuzz-bech32/af45e3625806e25dcf64ee8a2d6a67aec2368561
+++ /dev/null
@@ -1 +0,0 @@
-:���/��
\ No newline at end of file
diff --git a/tests/fuzz/corpora/fuzz-bech32/af6ec1e8087e6a258fa3dcf957793709b654d1a6 b/tests/fuzz/corpora/fuzz-bech32/af6ec1e8087e6a258fa3dcf957793709b654d1a6
deleted file mode 100644
index 01c2c197d6be..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/af6ec1e8087e6a258fa3dcf957793709b654d1a6 and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/b00e309b6f13a47878400a31d5c0dbb116993abd b/tests/fuzz/corpora/fuzz-bech32/b00e309b6f13a47878400a31d5c0dbb116993abd
new file mode 100644
index 000000000000..afb59a836bce
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/b00e309b6f13a47878400a31d5c0dbb116993abd differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/b0e7982e5af757283c58eb7285b01463cc479664 b/tests/fuzz/corpora/fuzz-bech32/b0e7982e5af757283c58eb7285b01463cc479664
new file mode 100644
index 000000000000..7788e2c092ea
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/b0e7982e5af757283c58eb7285b01463cc479664 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/b0ef7e6d3214a88fad8fd88683fa8c2c6c6c6867 b/tests/fuzz/corpora/fuzz-bech32/b0ef7e6d3214a88fad8fd88683fa8c2c6c6c6867
new file mode 100644
index 000000000000..dc434ab84862
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/b0ef7e6d3214a88fad8fd88683fa8c2c6c6c6867 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/b3fc14f2487d1196a06c2cb30a81316784667807 b/tests/fuzz/corpora/fuzz-bech32/b3fc14f2487d1196a06c2cb30a81316784667807
deleted file mode 100644
index d5aae7adaa50..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/b3fc14f2487d1196a06c2cb30a81316784667807 and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/b88f0d04e2cd83a5f5a41454c1558617d9b65f4b b/tests/fuzz/corpora/fuzz-bech32/b88f0d04e2cd83a5f5a41454c1558617d9b65f4b
new file mode 100644
index 000000000000..a313f8d12940
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/b88f0d04e2cd83a5f5a41454c1558617d9b65f4b differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/c0ddc939d41b094799cb2a72fb8ff87a558a3f21 b/tests/fuzz/corpora/fuzz-bech32/c0ddc939d41b094799cb2a72fb8ff87a558a3f21
deleted file mode 100644
index 3d88e8d11a8e..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/c0ddc939d41b094799cb2a72fb8ff87a558a3f21 and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/c1e1d2788e08000083f0ffdfa5031cfd46fae530 b/tests/fuzz/corpora/fuzz-bech32/c1e1d2788e08000083f0ffdfa5031cfd46fae530
new file mode 100644
index 000000000000..e36803267969
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/c1e1d2788e08000083f0ffdfa5031cfd46fae530 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/c399fd2078a84da3a2ca672d2b517673bda5093b b/tests/fuzz/corpora/fuzz-bech32/c399fd2078a84da3a2ca672d2b517673bda5093b
new file mode 100644
index 000000000000..f0cd27241249
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/c399fd2078a84da3a2ca672d2b517673bda5093b differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/c4dbfd68c2498802293df057225a1dad92a0be90 b/tests/fuzz/corpora/fuzz-bech32/c4dbfd68c2498802293df057225a1dad92a0be90
new file mode 100644
index 000000000000..0a12d56315a7
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/c4dbfd68c2498802293df057225a1dad92a0be90 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/c56aea3b7aaabbd4ff1b4546fcad94f51b473cde b/tests/fuzz/corpora/fuzz-bech32/c56aea3b7aaabbd4ff1b4546fcad94f51b473cde
deleted file mode 100644
index da1eed18f989..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/c56aea3b7aaabbd4ff1b4546fcad94f51b473cde and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/c5c1caef0ca2830611fd8666653effff8a1ac88d b/tests/fuzz/corpora/fuzz-bech32/c5c1caef0ca2830611fd8666653effff8a1ac88d
new file mode 100644
index 000000000000..9c0ae3e1a1fb
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/c5c1caef0ca2830611fd8666653effff8a1ac88d differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/cdea55d4d3373b3236a005dd2128944f4cae1b80 b/tests/fuzz/corpora/fuzz-bech32/cdea55d4d3373b3236a005dd2128944f4cae1b80
deleted file mode 100644
index 92b0b92b8753..000000000000
--- a/tests/fuzz/corpora/fuzz-bech32/cdea55d4d3373b3236a005dd2128944f4cae1b80
+++ /dev/null
@@ -1 +0,0 @@
-[
\ No newline at end of file
diff --git a/tests/fuzz/corpora/fuzz-bech32/d0c7f156ef754d95f87f9032d44295c12045cce1 b/tests/fuzz/corpora/fuzz-bech32/d0c7f156ef754d95f87f9032d44295c12045cce1
new file mode 100644
index 000000000000..98066dd9571f
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/d0c7f156ef754d95f87f9032d44295c12045cce1 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/d2db54a1d0720da6ec9fa8a8d167ff18e838e10c b/tests/fuzz/corpora/fuzz-bech32/d2db54a1d0720da6ec9fa8a8d167ff18e838e10c
new file mode 100644
index 000000000000..f74844170d56
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/d2db54a1d0720da6ec9fa8a8d167ff18e838e10c differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/d7a1327d602c39e049ef2c2d887d282388ce16f3 b/tests/fuzz/corpora/fuzz-bech32/d7a1327d602c39e049ef2c2d887d282388ce16f3
new file mode 100644
index 000000000000..6ddc9e2fd68d
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/d7a1327d602c39e049ef2c2d887d282388ce16f3 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/d8b83ae8ea0a8663b1785fcbe03022cab529fa5f b/tests/fuzz/corpora/fuzz-bech32/d8b83ae8ea0a8663b1785fcbe03022cab529fa5f
new file mode 100644
index 000000000000..874149530c27
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/d8b83ae8ea0a8663b1785fcbe03022cab529fa5f differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/d9ad1d836b42385c2cd0a0cbf0491e33ed9cab3c b/tests/fuzz/corpora/fuzz-bech32/d9ad1d836b42385c2cd0a0cbf0491e33ed9cab3c
new file mode 100644
index 000000000000..8421fe35370d
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/d9ad1d836b42385c2cd0a0cbf0491e33ed9cab3c differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/dac531eca9ca0403bea12eed1021939e5dd9b8fd b/tests/fuzz/corpora/fuzz-bech32/dac531eca9ca0403bea12eed1021939e5dd9b8fd
new file mode 100644
index 000000000000..d44f5da8d417
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/dac531eca9ca0403bea12eed1021939e5dd9b8fd differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/dfcc0463830763ade80df61a37efc4f843932160 b/tests/fuzz/corpora/fuzz-bech32/dfcc0463830763ade80df61a37efc4f843932160
new file mode 100644
index 000000000000..b0fc40cbb4cc
--- /dev/null
+++ b/tests/fuzz/corpora/fuzz-bech32/dfcc0463830763ade80df61a37efc4f843932160
@@ -0,0 +1 @@
+��
\ No newline at end of file
diff --git a/tests/fuzz/corpora/fuzz-bech32/e07d213fe7c9d8af17564fe1ecdbb79fbc909a36 b/tests/fuzz/corpora/fuzz-bech32/e07d213fe7c9d8af17564fe1ecdbb79fbc909a36
deleted file mode 100644
index 62065e582581..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/e07d213fe7c9d8af17564fe1ecdbb79fbc909a36 and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/e0b2b5fee8c55d357c5c392a5a0721c211dbc74f b/tests/fuzz/corpora/fuzz-bech32/e0b2b5fee8c55d357c5c392a5a0721c211dbc74f
new file mode 100644
index 000000000000..c0d87f82b29d
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/e0b2b5fee8c55d357c5c392a5a0721c211dbc74f differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/e0b88a091a054fbb7735ff13a4ecf8d09d517d7b b/tests/fuzz/corpora/fuzz-bech32/e0b88a091a054fbb7735ff13a4ecf8d09d517d7b
new file mode 100644
index 000000000000..f263324e993c
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/e0b88a091a054fbb7735ff13a4ecf8d09d517d7b differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/e1d3b848e425f3f37d94e1804bc8248ef46826b8 b/tests/fuzz/corpora/fuzz-bech32/e1d3b848e425f3f37d94e1804bc8248ef46826b8
deleted file mode 100644
index 493f949ce4a9..000000000000
--- a/tests/fuzz/corpora/fuzz-bech32/e1d3b848e425f3f37d94e1804bc8248ef46826b8
+++ /dev/null
@@ -1 +0,0 @@
-8&
\ No newline at end of file
diff --git a/tests/fuzz/corpora/fuzz-bech32/e3a6a9f41947fbd8928300d6e594561999a491ea b/tests/fuzz/corpora/fuzz-bech32/e3a6a9f41947fbd8928300d6e594561999a491ea
new file mode 100644
index 000000000000..ab28560087e7
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/e3a6a9f41947fbd8928300d6e594561999a491ea differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/e40d960ba5fdf4846b37607eb8c0aa405a629c23 b/tests/fuzz/corpora/fuzz-bech32/e40d960ba5fdf4846b37607eb8c0aa405a629c23
deleted file mode 100644
index bb9c31701e7b..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/e40d960ba5fdf4846b37607eb8c0aa405a629c23 and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/e4166fab31af430e75f50e37488fbb95b769c084 b/tests/fuzz/corpora/fuzz-bech32/e4166fab31af430e75f50e37488fbb95b769c084
deleted file mode 100644
index 8aa02c3ab147..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/e4166fab31af430e75f50e37488fbb95b769c084 and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/e85f7e94ccfb3357baba320e923d9e023cfb0f9e b/tests/fuzz/corpora/fuzz-bech32/e85f7e94ccfb3357baba320e923d9e023cfb0f9e
deleted file mode 100644
index 74ea182c4e61..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/e85f7e94ccfb3357baba320e923d9e023cfb0f9e and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/eb248221b2baf50b7e62b8e2217a80676e5602d6 b/tests/fuzz/corpora/fuzz-bech32/eb248221b2baf50b7e62b8e2217a80676e5602d6
deleted file mode 100644
index e48437a6a985..000000000000
--- a/tests/fuzz/corpora/fuzz-bech32/eb248221b2baf50b7e62b8e2217a80676e5602d6
+++ /dev/null
@@ -1 +0,0 @@
-.-
\ No newline at end of file
diff --git a/tests/fuzz/corpora/fuzz-bech32/ebc3f2bc2a97828c7c6e0ad7d6d85725423d25d5 b/tests/fuzz/corpora/fuzz-bech32/ebc3f2bc2a97828c7c6e0ad7d6d85725423d25d5
deleted file mode 100644
index 4174b91b4320..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/ebc3f2bc2a97828c7c6e0ad7d6d85725423d25d5 and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/ee5754bdd3cd30a9656c63830e651eaae94acd44 b/tests/fuzz/corpora/fuzz-bech32/ee5754bdd3cd30a9656c63830e651eaae94acd44
deleted file mode 100644
index 94d6fb5c5bc5..000000000000
--- a/tests/fuzz/corpora/fuzz-bech32/ee5754bdd3cd30a9656c63830e651eaae94acd44
+++ /dev/null
@@ -1 +0,0 @@
-�
\ No newline at end of file
diff --git a/tests/fuzz/corpora/fuzz-bech32/f1134988e0959ebf4ec59f8d530b1f46febcd481 b/tests/fuzz/corpora/fuzz-bech32/f1134988e0959ebf4ec59f8d530b1f46febcd481
deleted file mode 100644
index 24412cb91231..000000000000
Binary files a/tests/fuzz/corpora/fuzz-bech32/f1134988e0959ebf4ec59f8d530b1f46febcd481 and /dev/null differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/f13bb7f6255685e2d8ada4567c4d6e6007e2e33f b/tests/fuzz/corpora/fuzz-bech32/f13bb7f6255685e2d8ada4567c4d6e6007e2e33f
new file mode 100644
index 000000000000..7fcb1952f9ac
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/f13bb7f6255685e2d8ada4567c4d6e6007e2e33f differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/f161371e6402e0f8cfcb5f7483ac280d76434718 b/tests/fuzz/corpora/fuzz-bech32/f161371e6402e0f8cfcb5f7483ac280d76434718
new file mode 100644
index 000000000000..c3d6445a945c
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/f161371e6402e0f8cfcb5f7483ac280d76434718 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/fad6ffb8727f7a1c87d1863dbf26588994aa4cdb b/tests/fuzz/corpora/fuzz-bech32/fad6ffb8727f7a1c87d1863dbf26588994aa4cdb
new file mode 100644
index 000000000000..a7a779f15834
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/fad6ffb8727f7a1c87d1863dbf26588994aa4cdb differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/faff54066a6a88449cdc94b6f730150ed44ed20a b/tests/fuzz/corpora/fuzz-bech32/faff54066a6a88449cdc94b6f730150ed44ed20a
new file mode 100644
index 000000000000..c035ed9c810f
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/faff54066a6a88449cdc94b6f730150ed44ed20a differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/fba3381c7646547ee3da792df548fd96283a0c56 b/tests/fuzz/corpora/fuzz-bech32/fba3381c7646547ee3da792df548fd96283a0c56
new file mode 100644
index 000000000000..7e5040d7a7ac
Binary files /dev/null and b/tests/fuzz/corpora/fuzz-bech32/fba3381c7646547ee3da792df548fd96283a0c56 differ
diff --git a/tests/fuzz/corpora/fuzz-bech32/fd7cd593a9afdf88105cf028a4b454479707cb16 b/tests/fuzz/corpora/fuzz-bech32/fd7cd593a9afdf88105cf028a4b454479707cb16
new file mode 100644
index 000000000000..a05b45420ac7
--- /dev/null
+++ b/tests/fuzz/corpora/fuzz-bech32/fd7cd593a9afdf88105cf028a4b454479707cb16
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/tests/fuzz/fuzz-bech32.c b/tests/fuzz/fuzz-bech32.c
index a397dc86efa5..9e92ef7eff40 100644
--- a/tests/fuzz/fuzz-bech32.c
+++ b/tests/fuzz/fuzz-bech32.c
@@ -1,6 +1,6 @@
#include "config.h"
#include <assert.h>
-
+#include <common/utils.h>
#include <common/bech32.h>
#include <stdint.h>
#include <string.h>
@@ -25,11 +25,11 @@ void run(const uint8_t *data, size_t size)
/* Buffer size is defined in each function's doc comment. */
benc = data[0] ? BECH32_ENCODING_BECH32 : BECH32_ENCODING_BECH32M;
bech32_str_cap = (size - 1) + strlen(hrp_inv) + 8;
- bech32_str = malloc(bech32_str_cap);
+ bech32_str = tal_arr(tmpctx, char, bech32_str_cap);
if (bech32_encode(bech32_str, hrp_inv, data + 1, size - 1,
bech32_str_cap, benc) == 1) {
- hrp_out = malloc(strlen(bech32_str) - 6);
- data_out = malloc(strlen(bech32_str) - 8);
+ hrp_out = tal_arr(tmpctx, char, strlen(bech32_str) - 6);
+ data_out = tal_arr(tmpctx, uint8_t, strlen(bech32_str) - 8);
benc_decoded = bech32_decode(hrp_out, data_out, &data_out_len,
bech32_str, bech32_str_cap);
@@ -37,22 +37,33 @@ void run(const uint8_t *data, size_t size)
assert(strcmp(hrp_inv, hrp_out) == 0);
assert(data_out_len == size - 1);
assert(memcmp(data_out, data + 1, data_out_len) == 0);
-
- free(hrp_out);
- free(data_out);
}
- free(bech32_str);
- data_out = malloc(size);
+ /* Convert data to 5-bit values (0-31) */
+ u8 *five_bit_data = tal_dup_arr(tmpctx, u8, data, size, 0);
+ for (size_t i = 0; i < size; i++)
+ five_bit_data[i] &= 0x1F;
- /* This is also used as part of sign and check message. */
- data_out_len = 0;
- bech32_convert_bits(data_out, &data_out_len, 8, data, size, 5, 1);
+ u8 *eight_bit_data = tal_arr(tmpctx, u8, size);
+ size_t eight_bit_len = 0;
+ /* Convert 5-to-8 without padding */
+ if (bech32_convert_bits(eight_bit_data, &eight_bit_len, 8,
+ five_bit_data, size, 5, 0)) {
+ u8 *five_bit_deconv = tal_arr(tmpctx, u8, size);
+ size_t five_bit_deconv_len = 0;
+ /* Convert 8-to-5 with padding */
+ if (bech32_convert_bits(five_bit_deconv, &five_bit_deconv_len, 5,
+ eight_bit_data, eight_bit_len, 8, 1)) {
+ assert(five_bit_deconv_len == size);
+ assert(memcmp(five_bit_data, five_bit_deconv, five_bit_deconv_len) == 0);
+ }
+ }
+
+ data_out = tal_arr(tmpctx, uint8_t, size);
data_out_len = 0;
- bech32_convert_bits(data_out, &data_out_len, 8, data, size, 5, 0);
- addr = malloc(73 + strlen(hrp_addr));
- for (int wit_version = 0; wit_version < 2; ++wit_version) {
+ addr = tal_arr(tmpctx, char, 73 + strlen(hrp_addr));
+ for (int wit_version = 0; wit_version <= 16; ++wit_version) {
if (segwit_addr_encode(addr, hrp_addr, wit_version, data,
size) == 0)
continue;
@@ -63,7 +74,6 @@ void run(const uint8_t *data, size_t size)
assert(data_out_len == size);
assert(memcmp(data_out, data, data_out_len) == 0);
}
- free(addr);
- free(data_out);
+ clean_tmpctx();
}