FIX: add decode58-check to check if the address is ok

red · Jun 25, 2019 · aad65fb · aad65fb
1 parent d1b6647
commit aad65fb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/btc-ui.red b/btc-ui.red
@@ -156,10 +156,7 @@ context [
 
 	check-data: does [
 		input-addr: trim any [addr-to/text ""]
-		unless all [
-			26 <= length? input-addr
-			36 >= length? input-addr
-		][
+		unless btc-addr/decode58-check input-addr [
 			addr-to/text: copy "Invalid address"
 			return no
 		]

diff --git a/libs/btc-addr.red b/libs/btc-addr.red
@@ -27,6 +27,16 @@ btc-addr: context [
 		enbase/base data 58
 	]
 
+	decode58-check: function [data [string!]][
+		bin: debase/base data 58
+		if 4 >= len: length? bin [return none]
+		raw: copy/part bin len - 4
+		hash: copy/part skip bin len - 4 4
+		hash2: copy/part checksum checksum raw 'sha256 'sha256 4
+		if hash <> hash2 [return none]
+		raw
+	]
+
 	hash160: func [pubkey [binary!] return: [binary!]][
 		ripemd160 checksum pubkey 'sha256
 	]