bech32 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b6e0eb4edcadc4cbeeb612e0d085bb3caed330ed1c312c1d8465baec26a4923
-  data.tar.gz: ea2abc8eae17e2b503e091c71402a6f9dbd3f2be7ecd416eed3dcc08be3fccb6
+  metadata.gz: b9dfad105c52c27a05e99b0576a46de13aac736914b8172b59766e393531857e
+  data.tar.gz: bdadf23d8b3ea58fbbc6c303ca657e6d151d4096cbb6dfc260d105c2d5b5869e
 SHA512:
-  metadata.gz: 39d972ba715a32e90cda977d9a6c9a53f5648e760c0afcaf9edd83e1a94ce882a09d0d38d2781a691def7d8595d270d1293f96ae63df22dd981dc23ddaaf6e40
-  data.tar.gz: a463c2478f923f6b8b27123e5e1af24e0f6ebee5c0593fa02243311b1ca364db7d82ceea1375d9f5078e14cc3adf3bfa6eced482ea86045fa5ec1fc726fcbe47
+  metadata.gz: 17c8acca310a4ebc24ba5e4b4f58132d79262ca73d6ebbe6b50952b2f0703c70b915b28500d866af86d3b9f715afdc614ddc2af9feb07d6de5fb16fff68dc16e
+  data.tar.gz: ae1ad3dd861bed9849878241ae9edac81d26980a4cf8a6e911ecb36b7bdc547756404347232aff5608d4b9f24d2b0f6ecfc0e6476c6f37855bfbc2ff0410a8e9

data/lib/bech32/segwit_addr.rb

@@ -18,7 +18,7 @@ module Bech32
     # Returns segwit script pubkey which generated from witness version and witness program.
     def to_script_pubkey
       v = ver == 0 ? ver : ver + 0x50
-      ([v, prog.length].pack("CC") + prog.map{|p|[p].pack("C")}.join).unpack('H*').first
+      ([v, prog.length] + prog).pack('C*').unpack("H*").first
     end
 
     # parse script pubkey into witness version and witness program
@@ -31,7 +31,7 @@ module Bech32
     # Returns segwit address string which generated from hrp, witness version and witness program.
     def addr
       spec = (ver == 0 ? Bech32::Encoding::BECH32 : Bech32::Encoding::BECH32M)
-      Bech32.encode(hrp, [ver] + convert_bits(prog, 8, 5), spec)
+      Bech32.encode(hrp, [ver] + Bech32.convert_bits(prog, 8, 5), spec)
     end
 
     private
@@ -41,34 +41,11 @@ module Bech32
       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)
+      @prog = Bech32.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)
-      acc = 0
-      bits = 0
-      ret = []
-      maxv = (1 << to) - 1
-      max_acc = (1 << (from + to - 1)) - 1
-      data.each do |v|
-        return nil if v < 0 || (v >> from) != 0
-        acc = ((acc << from) | v) & max_acc
-        bits += from
-        while bits >= to
-          bits -= to
-          ret << ((acc >> bits) & maxv)
-        end
-      end
-      if padding
-        ret << ((acc << (to - bits)) & maxv) unless bits == 0
-      elsif bits >= from || ((acc << (to - bits)) & maxv) != 0
-        return nil
-      end
-      ret
-    end
-
   end
 end

data/lib/bech32/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bech32
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 end

data/lib/bech32.rb

@@ -86,6 +86,35 @@ module Bech32
     hrp.each_char.map{|c|c.ord >> 5} + [0] + hrp.each_char.map{|c|c.ord & 31}
   end
 
+  # Convert a +data+ where each byte is encoding +from+ bits to a byte slice where each byte is encoding +to+ bits.
+  # @param [Array] data
+  # @param [Integer] from
+  # @param [Integer] to
+  # @param [Boolean] padding
+  # @return [Array]
+  def convert_bits(data, from, to, padding=true)
+    acc = 0
+    bits = 0
+    ret = []
+    maxv = (1 << to) - 1
+    max_acc = (1 << (from + to - 1)) - 1
+    data.each do |v|
+      return nil if v < 0 || (v >> from) != 0
+      acc = ((acc << from) | v) & max_acc
+      bits += from
+      while bits >= to
+        bits -= to
+        ret << ((acc >> bits) & maxv)
+      end
+    end
+    if padding
+      ret << ((acc << (to - bits)) & maxv) unless bits == 0
+    elsif bits >= from || ((acc << (to - bits)) & maxv) != 0
+      return nil
+    end
+    ret
+  end
+
   # Compute Bech32 checksum
   def polymod(values)
     generator = [0x3b6a57b2, 0x26508e6d, 0x1ea119fa, 0x3d4233dd, 0x2a1462b3]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bech32
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Shigeyuki Azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-02 00:00:00.000000000 Z
+date: 2022-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor