adequate_crypto_address 0.1.9 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc3f7b31f03344b8164799a312194a5bb5dae5cf60534fd27b2b63ac2f34f71e
-  data.tar.gz: 1d27ef4e6b5bfe339bded354851535180d2253abc669201821d156f2d4ef2208
+  metadata.gz: 6fee1d177fb87fdb5e97bb27ac01606349f567b99bd1d7f1a2553c8d6a17e1de
+  data.tar.gz: 7968e28889bc532c2705322a5d15ddeaf386c82f13fc41114bca6df0d375c49f
 SHA512:
-  metadata.gz: 8a0605d3bf6f9a4a152d2a7eac314957c7144a866b8d15e102568cb620599aab118f7cbaa9ca0aad5a4c3c544abe3d547a5c5de7d05e0a225920c5e3a0036c70
-  data.tar.gz: 1bbcd35c29eaea4834b245cfeba3c335b430430e2e84a18a9e216ded2a3e679bb3e04b569b42fc48fcdf600b43b20dac3f03255cc1e9644b65fa090ca45dcaf7
+  metadata.gz: 62df3006c3a130904b82d42cad6b94259fc6461dbdcbae0f0e0227716fccf0200aa6d6b698c7ae76ffde13fc85b23df993f20ddd2444f8a6e12648320c051f2f
+  data.tar.gz: bd5e6981b62cd15be7ccac5c9604865fa272d9bec754f2ba8ef4ed0dff9b6c3d4f6d1c31648b14c4cb7b64e244869a3b8808c6bf851b72a84c2cc2362ccd20bf

data/Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
-gem 'coveralls', '>= 0.8.17', require: false
+gem 'coveralls', '>= 0.8.23', require: false
 gem 'pry', require: false
 
 gem 'rubocop-rspec'

data/Makefile

@@ -3,4 +3,4 @@ build:
 	gem build adequate_crypto_address.gemspec
 
 push:
-	gem push adequate_crypto_address-0.1.9.gem
+	gem push adequate_crypto_address-0.1.11.gem

data/adequate_crypto_address.gemspec

@@ -9,16 +9,17 @@ Gem::Specification.new do |spec|
   spec.version       = AdequateCryptoAddress::VERSION
   spec.authors       = ['vtm']
 
-  spec.summary     = 'A Ruby Library for dealing with validation cryptocurrency adresses.'
-  spec.description = 'A Ruby Library for dealing with validation cryptocurrency adresses.'
+  spec.summary     = 'Ruby helpers for validating cryptocurrency addresses.'
+  spec.description = 'Provides Ruby helpers to validate cryptocurrency addresses across common chains.'
   spec.homepage = 'https://github.com/vtm9/adequate_crypto_address'
 
   spec.license = 'MIT'
+  spec.required_ruby_version = '>= 3.0'
   spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.require_paths = ['lib']
 
   spec.add_dependency 'base58', '~> 0.2'
   spec.add_dependency 'keccak', '~> 1.3'
-  spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rspec', '~> 3.10'
+  spec.add_development_dependency 'rake', '~> 13.2'
+  spec.add_development_dependency 'rspec', '~> 3.13'
 end

data/lib/adequate_crypto_address/btc.rb

@@ -33,6 +33,8 @@ module AdequateCryptoAddress
         return :segwit_v0_keyhash if witness_version == 0 && witness_program.bytesize == 20
 
         return :segwit_v0_scripthash if witness_version == 0 && witness_program.bytesize == 32
+
+        return :taproot if witness_version == 1 && witness_program.bytesize == 32
       end
 
       base58_decoded = begin
@@ -72,6 +74,7 @@ module AdequateCryptoAddress
       length = program.size
       return nil if length < 2 || length > 40
       return nil if data[0] == 0 && length != 20 && length != 32
+      return nil if data[0] == 1 && length != 32
 
       program_hex = program.pack('C*').unpack('H*').first
       [data[0], program_hex]

data/lib/adequate_crypto_address/ltc.rb

@@ -3,6 +3,55 @@
 module AdequateCryptoAddress
   class Ltc < Altcoin
     ADDRESS_TYPES = { prod: %w[30 05 32], test: %w[6f c4 3a] }.freeze
+
+    private
+
+    def address_type
+      segwit_decoded = begin
+                         decode_segwit_address
+                       rescue StandardError
+                         nil
+                       end
+
+      if segwit_decoded
+        witness_version, witness_program_hex, hrp = segwit_decoded
+        witness_program = [witness_program_hex].pack('H*')
+
+        if witness_version == 0
+          return :prod if hrp == 'ltc' && [20, 32].include?(witness_program.bytesize)
+          return :test if hrp == 'tltc' && [20, 32].include?(witness_program.bytesize)
+        end
+
+        if witness_version == 1 && witness_program.bytesize == 32
+          return :prod if hrp == 'ltc'
+          return :test if hrp == 'tltc'
+        end
+      end
+
+      super
+    end
+
+    def decode_segwit_address
+      actual_hrp, data = Utils::Bech32.decode(address)
+
+      return nil if actual_hrp.nil?
+
+      length = data.size
+      return nil if length == 0 || length > 65
+      return nil unless %w[ltc tltc].include?(actual_hrp)
+      return nil if data[0] > 16
+
+      program = Utils::Bech32.convert_bits(data[1..-1], from_bits: 5, to_bits: 8, pad: false)
+      return nil if program.nil?
+
+      length = program.size
+      return nil if length < 2 || length > 40
+      return nil if data[0] == 0 && length != 20 && length != 32
+      return nil if data[0] == 1 && length != 32
+
+      program_hex = program.pack('C*').unpack('H*').first
+      [data[0], program_hex, actual_hrp]
+    end
   end
   Litecoin = Ltc
 end

data/lib/adequate_crypto_address/utils/bech32.rb

@@ -121,7 +121,9 @@ module AdequateCryptoAddress
           end
 
           return nil if have_lower && have_upper
-          return nil if chk != 1
+          
+          # Accept both Bech32 (chk == 1) and Bech32m (chk == 0x2bc830a3)
+          return nil unless chk == 1 || chk == 0x2bc830a3
 
           [hrp.pack('C*'), data]
         end

data/lib/adequate_crypto_address/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AdequateCryptoAddress
-  VERSION = '0.1.9'
+  VERSION = '0.1.11'
 end

data/spec/adequate_crypto_address_spec.rb

@@ -29,7 +29,12 @@ RSpec.describe(AdequateCryptoAddress) do
         expect(described_class).to be_valid('bc1qar0srrr7xfkvy5l643lydnw9re59gtzzwf5mdq', 'bitcoin')
         expect(described_class).to be_valid('bc1qar0srrr7xfkvy5l643lydnw9re59gtzzwf5mdq', 'bitcoin', :segwit_v0_keyhash)
         expect(described_class).to be_valid('bc1qc7slrfxkknqcq2jevvvkdgvrt8080852dfjewde450xdlk4ugp7szw5tk9', 'BTC')
-        expect(described_class).to be_valid('bc1qc7slrfxkknqcq2jevvvkdgvrt8080852dfjewde450xdlk4ugp7szw5tk9', 'bitcoin', 'segwit_v0_scripthash')
+        expect(described_class).to be_valid('bc1qc7slrfxkknqcq2jevvvkdgvrt8080852dfjewde450xdlk4ugp7szw5tk9', 'bitcoin', :segwit_v0_scripthash)
+      end
+
+      it 'validates taproot addresses' do
+        expect(described_class).to be_valid('bc1p5cyxnuxmeuwuvkwfem96lqzszd02n6xdcjrs20cac6yqjjwudpxqkedrcr', 'bitcoin')
+        expect(described_class).to be_valid('bc1p5cyxnuxmeuwuvkwfem96lqzszd02n6xdcjrs20cac6yqjjwudpxqkedrcr', 'BTC', :taproot)
       end
 
       it 'validates wrong addresses' do
@@ -46,6 +51,8 @@ RSpec.describe(AdequateCryptoAddress) do
         expect(described_class).not_to be_valid('bc1zw508d6qejxtdg4y5r3zarvaryvqyzf3du', 'bitcoin')
         expect(described_class).not_to be_valid('tb1qrp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3pjxtptv', 'Bitcoin')
         expect(described_class).not_to be_valid('bc1gmk9yu', 'bitcoin')
+        expect(described_class).not_to be_valid('bc1p5d7rjq7g6rdk2yhzks9smlqfpuecypus6uf4e9qrsssrwc09', 'bitcoin') # invalid checksum
+        expect(described_class).not_to be_valid('bc1p5d7rjq7g6rdk2yhzks9smlqfpuecypus6uf4e9qrsssrwc0', 'bitcoin') # too short
       end
     end
 
@@ -169,6 +176,8 @@ RSpec.describe(AdequateCryptoAddress) do
         expect(described_class).to be_valid('2MxKEf2su6FGAUfCEAHreGFQvEYrfYNHvL7', 'LTC', :test)
         expect(described_class).to be_valid('QW2SvwjaJU8LD6GSmtm1PHnBG2xPuxwZFy', 'LTC', :test)
         expect(described_class).to be_valid('QjpzxpbLp5pCGsCczMbfh1uhC3P89QZavY', 'LTC', :test)
+        expect(described_class).to be_valid('tltc1pxdvk48nchp45mcg8pcht5ss8ladtxnl7mkr96lrw93q79g407ufqmelwuu', 'LTC', :test)
+        expect(described_class).to be_valid('tltc1pxdvk48nchp45mcg8pcht5ss8ladtxnl7mkr96lrw93q79g407ufqmelwuu', 'LTC')
       end
 
       it 'validates wrong addresses' do
@@ -176,6 +185,8 @@ RSpec.describe(AdequateCryptoAddress) do
         expect(described_class).not_to be_valid('t1Y9yhDa5XEjgfnTgZoKddeSiEN1aoLkQxq', :zcash)
         expect(described_class).not_to be_valid('t3Yz22vK5z2LcKEdg16Yv4FFneEL1zg9ojd', :ZEC)
         expect(described_class).not_to be_valid('t2YNzUUx8mWBCRYPRezvA363EYXyEpHokyi', :zcash, :test)
+        expect(described_class).not_to be_valid('tltc1pxdvk48nchp45mcg8pcht5ss8ladtxnl7mkr96lrw93q79g407ufqmelwuu', 'LTC', :prod)
+        expect(described_class).not_to be_valid('tltc1Pxdvk48nchp45mcg8pcht5ss8ladtxnl7mkr96lrw93q79g407ufqmelwuu', 'LTC')
       end
     end
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: adequate_crypto_address
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.11
 platform: ruby
 authors:
 - vtm
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-14 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base58
@@ -44,30 +43,30 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
-description: A Ruby Library for dealing with validation cryptocurrency adresses.
-email:
+        version: '3.13'
+description: Provides Ruby helpers to validate cryptocurrency addresses across common
+  chains.
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -105,7 +104,6 @@ homepage: https://github.com/vtm9/adequate_crypto_address
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -113,15 +111,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
-summary: A Ruby Library for dealing with validation cryptocurrency adresses.
+summary: Ruby helpers for validating cryptocurrency addresses.
 test_files: []