wallet_validator 0.3.2 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50fda8e35d98d0fecd2ac6f98cda91092635f638d5853032e913f46d43c02b75
-  data.tar.gz: df7dd9eb4291bfae711c57f95e2aaeb777ebf028bef9bb0ea297e02cceb5b3b4
+  metadata.gz: f7bc70af1b4caba253c84ea04705eff11c6002215cafd2d5b071b9326ca6c07e
+  data.tar.gz: 3d7cc423b308d129efbfb7057f2e0d15f1ed9e761f4f617aa76681d425d7ac32
 SHA512:
-  metadata.gz: 16197423414f5438763315bb3257ee3279c5add961efdcd8ad1fd052d24cad7bf8ff49703ac7e221864fb73a8f4e7677a54d782955982e13defdc0e69973f7a2
-  data.tar.gz: 3bce9a5ae845aa0724835a840efcfafce23ffe656d4e5d0622bd02ff90080c10354f30768ad95d955b9b6d919ac82941bfc61880164528de5e4e45f6021f4920
+  metadata.gz: 78305694a1d3c3b61481ecfc3d3c4383dc2aa3177e6e1290c5171d2dbecafb6fc05c129ef6e5736cc795c55aa4816f08ad96def395ed49916a8f98e6bf969324
+  data.tar.gz: 99b17c3eff2ca7489c451419999f8adf0b9b61b13c39f2a6c5efb565f4a5bc2c6e19c6e11d70424ea2c48fc14c63f8cd70cedc15d4f55e039ac8973f32b51495

data/Gemfile

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

data/Gemfile.lock

@@ -1,13 +1,20 @@
 PATH
   remote: .
   specs:
-    wallet_validator (0.3.1)
+    wallet_validator (0.4.1)
 
 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-sha3 (1.1.0)
+    method_source (1.0.0)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rake (12.3.3)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -27,7 +34,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  base58
+  cbor
   digest-sha3
+  pry
   rake (~> 12.0)
   rspec (~> 3.0)
   wallet_validator!

data/lib/wallet_validator/ada.rb

@@ -1,3 +1,6 @@
+require "pry"
+require "cbor"
+require 'zlib'
 
 module WalletValidator
   class Ada < Btc
@@ -17,11 +20,31 @@ 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?
+      begin
+        decoded_baase58 = Crypto::Base58.base58_to_binary(address, "ADA")
+
+        tagged, valid_crc = CBOR.decode(decoded_baase58)
+
+        return false if !valid_crc.is_a?(Numeric)
+
+        crc = Zlib::crc32(tagged.value)
+
+        return crc == valid_crc
+      rescue
+        return false
+      end
+    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/base58.rb

@@ -3,10 +3,16 @@ module Crypto
     ALPHABET = {
       :flickr => "123456789abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ", # This is the default
       :ripple => "rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz",
+      :cardano => "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"
     }.freeze
 
     def self.base58_to_binary(base58_val, currency)
-      alphabet = currency.downcase == "xrp" ? ALPHABET[:ripple] : ALPHABET[:flickr]
+      alphabet = case currency.downcase
+                  when "xrp"
+                    ALPHABET[:ripple]
+                  else
+                    ALPHABET[:flickr]
+                  end
 
       nzeroes = nil
       base58_val.chars.each_with_index do |c, index|
@@ -26,7 +32,14 @@ module Crypto
     end
 
     def self.base58_to_int(base58_val, currency)
-      alphabet = currency.downcase == "xrp" ? ALPHABET[:ripple] : ALPHABET[:flickr]
+      alphabet = case currency.downcase
+                  when "xrp"
+                    ALPHABET[:ripple]
+                  when "ada"
+                    ALPHABET[:cardano]
+                  else
+                    ALPHABET[:flickr]
+                  end
 
       int_val = 0
       base58_val.reverse.split(//).each_with_index do |char, index|

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.2"
+  VERSION = "0.4.2"
 end

metadata

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