wallet_validator 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c77b7cf19f5ed3cfe8ea6355ca3f7907e5803d0ea215838a55d2fca60fbd3f1
-  data.tar.gz: b8bc279fa50fa6b24dea8028bbb16d4e0ad6655c7e3b0a36551ef704bfd4b732
+  metadata.gz: 430bb1c8e7832cf491c7642d2b96b87633e495b52507d95224460ddbf0bb84c2
+  data.tar.gz: 7dc17614a55cb15e5474213f4e44dfae29f7ad379796d267967f42d1d84f08ff
 SHA512:
-  metadata.gz: fa5e7fc8b4243be8be3bb74313635409262ba2cb32e3ed2485b0b3a5f04685bde4fba8c3ed85d7c63aff056acb2db0a6df5c2583f1ce6de11ed1a97193248d98
-  data.tar.gz: a439d8234bf091e0f6040b0f2ec31f483021d06abe3c15dac3ec75c5ac9f55095c14549f846f0b77d9e57413a1c26c2fc5503a25835602ed2fb813fba10244e0
+  metadata.gz: 696552c3e4a11edce426cf87d8f30edb7be113377a5ae626687b88e054cc0213081aee06291af1c53e59e458a45408e3a4e44f85fa8cd463f8e59ca1d84652b1
+  data.tar.gz: 0dfc1143a027549803106e5afe24488154d0e1d31d023352521db32ce2fb86ef364f78dfe638fa2f8041ffd7d96bcd6a18ca0e611b86490453de83b7b722a5e1

data/Gemfile

@@ -5,5 +5,4 @@ gemspec
 
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"
-gem "pry"
-gem "digest-sha3"
+gem "digest-sha3"

data/Gemfile.lock

@@ -1,13 +1,17 @@
 PATH
   remote: .
   specs:
-    wallet_validator (0.2.0)
+    wallet_validator (0.3.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    base58 (0.2.3)
+    cbor (0.5.9.6)
     coderay (1.1.3)
     diff-lcs (1.4.4)
+    digest-crc (0.6.4)
+      rake (>= 12.0.0, < 14.0.0)
     digest-sha3 (1.1.0)
     method_source (1.0.0)
     pry (0.14.1)
@@ -32,6 +36,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  base58
+  cbor
+  digest-crc
   digest-sha3
   pry
   rake (~> 12.0)

data/lib/wallet_validator/ada.rb

@@ -1,4 +1,3 @@
-
 module WalletValidator
   class Ada < Btc
     CURRENCY_ATTR = {
@@ -17,11 +16,19 @@ module WalletValidator
     }.freeze
 
     def valid?
-      Crypto::Bech32.valid?(address, attribute["bech32"]["hrp"], attribute["bech32"]["separator"], attribute["bech32"]["length_check"])
+      valid_address_v1? || valid_address_shelley?
     end
 
     private
 
+    def valid_address_v1?
+      address.start_with?("DdzFFzCqrhs")
+    end
+
+    def valid_address_shelley?
+      Crypto::Bech32.valid?(address, attribute["bech32"]["hrp"], attribute["bech32"]["separator"])
+    end
+
     def attribute
       is_testnet && CURRENCY_ATTR["testnet"] ? CURRENCY_ATTR["testnet"] : CURRENCY_ATTR["main"]
     end

data/lib/wallet_validator/bch.rb

@@ -12,16 +12,20 @@ module WalletValidator
     def valid?
       match = address.match(/^(.+):(.+)$/)
 
-      return false unless match[1] == is_testnet ? "bchtest" : "bitcoincash"
+      if match
+        return false unless match[1] == is_testnet ? "bchtest" : "bitcoincash"
 
-      prefix = is_testnet ? [2, 3, 8, 20, 5, 19, 20, 0] : [2, 9, 20, 3, 15, 9, 14, 3, 1, 19, 8, 0]
-      raw_payload = match[2].split("").map { |m| Crypto::Bech32::CHARSET.index(m) }
-      return false if bch_polymod(prefix + raw_payload) != 0 # raise "Address checksum invalid: #{cashaddress}"
+        prefix = is_testnet ? [2, 3, 8, 20, 5, 19, 20, 0] : [2, 9, 20, 3, 15, 9, 14, 3, 1, 19, 8, 0]
+        raw_payload = match[2].split("").map { |m| Crypto::Bech32::CHARSET.index(m) }
+        return false if bch_polymod(prefix + raw_payload) != 0 # raise "Address checksum invalid: #{cashaddress}"
 
-      payload = bch_convert_bits(raw_payload[0..-9], 5, 8, false)
-      return false if payload.empty? # raise "Converted payload was empty"
+        payload = bch_convert_bits(raw_payload[0..-9], 5, 8, false)
+        return false if payload.empty? # raise "Converted payload was empty"
 
-      return true
+        return true
+      else
+        Btc.new(@address, @is_testnet).valid?
+      end
     end
 
     private

data/lib/wallet_validator/bnb.rb

@@ -8,20 +8,18 @@ module WalletValidator
         "bech32" => {
           "hrp" => "bnb", # hrp
           "separator" => "1", # separator
-          "length_check" => [38] # length check
         },
       },
       "testnet" => {
         "bech32" => {
           "hrp" => "tbnb", # hrp
           "separator" => "1", # separator
-          "length_check" => [38] # length check
         }
       }
     }.freeze
 
     def valid?
-      Crypto::Bech32.valid?(address, attribute["bech32"]["hrp"], attribute["bech32"]["separator"], attribute["bech32"]["length_check"])
+      Crypto::Bech32.valid?(address, attribute["bech32"]["hrp"], attribute["bech32"]["separator"])
     end
 
     private

data/lib/wallet_validator/btc.rb

@@ -37,7 +37,7 @@ module WalletValidator
 
       if filter_def
         # false時繼續往下
-        return true if Crypto::Bech32.valid?(address, filter_def["hrp"], filter_def["separator"], filter_def["length_check"])
+        return true if Crypto::Bech32.valid?(address, filter_def["hrp"], filter_def["separator"])
       end
 
       filter = attribute["filter"]

data/lib/wallet_validator/crypto/bech32.rb

@@ -1,16 +1,13 @@
 module Crypto
   module Bech32
-    LENGTH_CHECK_SET = [39, 59, 98].freeze
     CHARSET = "qpzry9x8gf2tvdw0s3jn54khce6mua7l".split(//)
     GENERATOR = [0x3b6a57b2, 0x26508e6d, 0x1ea119fa, 0x3d4233dd, 0x2a1462b3].freeze
 
-    def self.valid?(address, hrp, separator, length_set = LENGTH_CHECK_SET)
-      length_set ||= LENGTH_CHECK_SET # 歸正
+    def self.valid?(address, hrp, separator)
       address = address.downcase.strip
 
       match = address.match(/^#{hrp}#{separator}([\da-z]+)$/)
       return false if !match
-      return false if !length_set.include?(match[1].length)
 
       pos = address.rindex(separator)
       return false if pos.nil? || pos < 1 || pos + 7 > address.length || address.length > 108

data/lib/wallet_validator/version.rb

@@ -1,3 +1,3 @@
 module WalletValidator
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/wallet_validator.rb

@@ -1,4 +1,3 @@
-require "pry"
 require "wallet_validator/config"
 
 require "wallet_validator/crypto/bech32"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wallet_validator
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Nic
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-05 00:00:00.000000000 Z
+date: 2021-10-22 00:00:00.000000000 Z
 dependencies: []
 description: Write a longer description or delete this line.
 email: