bech32 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cac2b45d824a91941a34bd8c0793f36f69d7a08b9f995bbd95f552e338cb805a
-  data.tar.gz: 306ca4f7390eb7c38c96ac56e36860638ec626096b249f12b1b7bc81387e00e8
+  metadata.gz: 975a0d606b86cdb7487afad52363ef284de471f1530cf7614b0a7db0728dc937
+  data.tar.gz: 1e3d9f3f389cbfd94a8af919a0ec842395605649138bdf3860ac9db2617e3939
 SHA512:
-  metadata.gz: 75e7f14e025bfc775f17f4e4a7d93d61c242d9f015b1a4e55072c0c01fafed745fb11de00d783379aea2360617fa0c5ad6c4d3ae0ad6df02d38bb3697e707eee
-  data.tar.gz: 845773d1776eebf9cc8552ab9b0e48653505b6157a21dd7e2e843da50a5bf222b68ec01c4fca1641b567caeae32c3009afbf1358ea401666c74aab6ec0a304e0
+  metadata.gz: ab8fdc36df45376ea1ec0e7d7553fb6309900d8db824998f327dbfe670451a00ec240bbd75fe59e1bdda2590981d174e0be086756e919582dad55ce5441fe5fb
+  data.tar.gz: 07bf7ac092a89c997932d380a57f30916baa809fd3adf2c86b7418e599949be6fc593b226bcdb7240247fde19d7f092ebdcdd82bfce154adde9d16b5de2df68e

data/.ruby-version

@@ -1 +1 @@
-2.5.0
+ruby-3.0.0

data/.travis.yml

@@ -1,7 +1,9 @@
 language: ruby
 rvm:
-  - 2.1
-  - 2.2.2
-  - 2.3.0
-  - 2.4.0
-  - 2.5.0
+  - 2.2.10
+  - 2.3.8
+  - 2.4.10
+  - 2.5.8
+  - 2.6.6
+  - 2.7.2
+  - 3.0.0

data/README.md

@@ -1,11 +1,15 @@
 # Bech32 [![Build Status](https://travis-ci.org/azuchi/bech32rb.svg?branch=master)](https://travis-ci.org/azuchi/bech32rb) [![Gem Version](https://badge.fury.io/rb/bech32.svg)](https://badge.fury.io/rb/bech32) [![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](LICENSE) <img src="http://segwit.co/static/public/images/logo.png" width="100">
 
-The implementation of the Bech32 encoder and decoder for Ruby.
+The implementation of the Bech32/Bech32m encoder and decoder for Ruby.
 
 Bech32 is checksummed base32 format that is used in following Bitcoin address format.
 
 https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki
 
+Bech32m is checksummed base32m format that is used in following Bitcoin address format.
+
+https://github.com/bitcoin/bips/blob/master/bip-0350.mediawiki
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -35,13 +39,15 @@ require 'bech32'
 Decode Bech32-encoded data into hrp part and data part.
 
 ```ruby
-hrp, data = Bech32.decode('BC1QW508D6QEJXTDG4Y5R3ZARVARY0C5XW7KV8F3T4')
+hrp, data, spec = Bech32.decode('BC1QW508D6QEJXTDG4Y5R3ZARVARY0C5XW7KV8F3T4')
 
 # hrp is human-readable part of Bech32 format
 'bc'
 
 # data is data part of Bech32 format
 [0, 14, 20, 15, 7, 13, 26, 0, 25, 18, 6, 11, 13, 8, 21, 4, 20, 3, 17, 2, 29, 3, 12, 29, 3, 4, 15, 24, 20, 6, 14, 30, 22]
+
+# spec is whether Bech32::Encoding::BECH32 or Bech32::Encoding::BECH32M
 ```
 
 Decode Bech32-encoded Segwit address into `Bech32::SegwitAddr` instance.
@@ -77,7 +83,7 @@ Encode Bech32 human-readable part and data part into Bech32 string.
 hrp = 'bc'
 data = [0, 14, 20, 15, 7, 13, 26, 0, 25, 18, 6, 11, 13, 8, 21, 4, 20, 3, 17, 2, 29, 3, 12, 29, 3, 4, 15, 24, 20, 6, 14, 30, 22]
 
-bech = Bech32.encode(hrp, data)
+bech = Bech32.encode(hrp, data, Bech32::Encoding::BECH32)
 => bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4
 ```
 

data/bech32.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/bech32.rb

@@ -1,44 +1,50 @@
 module Bech32
 
+  module Encoding
+    BECH32 = 1
+    BECH32M = 2
+  end
+
   autoload :SegwitAddr, 'bech32/segwit_addr'
 
   SEPARATOR = '1'
 
   CHARSET = %w(q p z r y 9 x 8 g f 2 t v d w 0 s 3 j n 5 4 k h c e 6 m u a 7 l)
 
+  BECH32M_CONST = 0x2bc830a3
+
   module_function
 
   # Returns the encoded Bech32 string.
   #
   #   require 'bech32'
   #
-  #   bech = Bech32.encode('bc', [])
+  #   bech = Bech32.encode('bc', [], Bech32::Encoding::BECH32)
   #
   #   <i>Generates:</i>
   #   'BC1QW508D6QEJXTDG4Y5R3ZARVARY0C5XW7KV8F3T4' # bech
   #
-  def encode(hrp, data)
-    checksummed = data + create_checksum(hrp, data)
+  def encode(hrp, data, spec)
+    checksummed = data + create_checksum(hrp, data, spec)
     hrp + SEPARATOR + checksummed.map{|i|CHARSET[i]}.join
   end
 
-  # Returns the Bach32 decoded hrp and data.
+  # Returns the Bech32 decoded hrp and data.
   #
   #   require 'bech32'
   #
   #   addr = 'BC1QW508D6QEJXTDG4Y5R3ZARVARY0C5XW7KV8F3T4'
-  #   hrp, data = Bech32.decode(addr)
+  #   hrp, data, spec = Bech32.decode(addr)
   #
   #   <i>Generates:</i>
   #   'bc' # hrp
   #   [0, 14, 20, 15, 7, 13, 26, 0, 25, 18, 6, 11, 13, 8, 21, 4, 20, 3, 17, 2, 29, 3, 12, 29, 3, 4, 15, 24, 20, 6, 14, 30, 22] # data
+  #   1 # spec see Bech32::Encoding
   #
   def decode(bech, max_length = 90)
-    # check invalid bytes
-    return nil if bech.scrub('?').include?('?')
     # check uppercase/lowercase
+    return nil if bech.bytes.index{|x| x < 33 || x > 126}
     return nil if (bech.downcase != bech && bech.upcase != bech)
-    bech.each_char{|c|return nil if c.ord < 33 || c.ord > 126}
     bech = bech.downcase
     # check data length
     pos = bech.rindex(SEPARATOR)
@@ -49,20 +55,30 @@ module Bech32
     hrp = bech[0..pos-1]
     data = bech[pos+1..-1].each_char.map{|c|CHARSET.index(c)}
     # check checksum
-    return nil unless verify_checksum(hrp, data)
-    [hrp, data[0..-7]]
+    spec = verify_checksum(hrp, data)
+    spec ? [hrp, data[0..-7], spec] : nil
   end
 
   # Returns computed checksum values of +hrp+ and +data+
-  def create_checksum(hrp, data)
+  def create_checksum(hrp, data, spec)
     values = expand_hrp(hrp) + data
-    polymod = polymod(values + [0, 0, 0, 0, 0, 0]) ^ 1
+    const = (spec == Bech32::Encoding::BECH32M ? Bech32::BECH32M_CONST : 1)
+    polymod = polymod(values + [0, 0, 0, 0, 0, 0]) ^ const
     (0..5).map{|i|(polymod >> 5 * (5 - i)) & 31}
   end
 
   # Verify a checksum given Bech32 string
+  # @param [String] hrp hrp part.
+  # @param [Array[Integer]] data data array.
+  # @return [Integer] spec
   def verify_checksum(hrp, data)
-    polymod(expand_hrp(hrp) + data) == 1
+    const = polymod(expand_hrp(hrp) + data)
+    case const
+    when 1
+      Encoding::BECH32
+    when BECH32M_CONST
+      Encoding::BECH32M
+    end
   end
 
   # Expand the hrp into values for checksum computation.
@@ -84,4 +100,4 @@ module Bech32
 
   private_class_method :polymod, :expand_hrp
 
-end
+end

data/lib/bech32/segwit_addr.rb

@@ -30,19 +30,21 @@ module Bech32
 
     # Returns segwit address string which generated from hrp, witness version and witness program.
     def addr
-      Bech32.encode(hrp, [ver] + convert_bits(prog, 8, 5))
+      spec = (ver == 0 ? Bech32::Encoding::BECH32 : Bech32::Encoding::BECH32M)
+      Bech32.encode(hrp, [ver] + convert_bits(prog, 8, 5), spec)
     end
 
     private
 
     def parse_addr(addr)
-      @hrp, data = Bech32.decode(addr)
+      @hrp, data, spec = Bech32.decode(addr)
       raise 'Invalid address.' if hrp.nil? || data[0].nil? || ![HRP_MAINNET, HRP_TESTNET, HRP_REGTEST].include?(hrp)
       @ver = data[0]
       raise 'Invalid witness version' if @ver > 16
       @prog = convert_bits(data[1..-1], 5, 8, false)
       raise 'Invalid witness program' if @prog.nil? || @prog.length < 2 || @prog.length > 40
       raise 'Invalid witness program with version 0' if @ver == 0 && (@prog.length != 20 && @prog.length != 32)
+      raise 'Witness version and encoding spec do not match' if (@ver == 0 && spec != Bech32::Encoding::BECH32) || (@ver != 0 && spec != Bech32::Encoding::BECH32M)
     end
 
     def convert_bits(data, from, to, padding=true)

data/lib/bech32/version.rb

@@ -1,3 +1,3 @@
 module Bech32
-  VERSION = "1.0.5"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: bech32
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Shigeyuki Azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-27 00:00:00.000000000 Z
+date: 2021-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -80,8 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: The implementation of Bech32 encoder and decoder.