bech32 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1556fd0046c912f798c99efd7162f3afc6ca970d618d0ba44dd38c05ab88de75
-  data.tar.gz: fc267a9f2e3344f11f692f7749666ba099a5f5fd73326271c412bc1000fe8616
+  metadata.gz: b9dfad105c52c27a05e99b0576a46de13aac736914b8172b59766e393531857e
+  data.tar.gz: bdadf23d8b3ea58fbbc6c303ca657e6d151d4096cbb6dfc260d105c2d5b5869e
 SHA512:
-  metadata.gz: 21045a72a45ddf3640801ed9845fa61e758a6199cf492f64cee355bec019f5f0e0a62696e6061aa3479c30d6e566c3e63663f3c8a9838b1bc2ba0e860265f335
-  data.tar.gz: cfb2828365abd683dfeb0af311a583661cd2bc95d0c5af65a09f0d3b5d8cf38215cd95552f903667e4589764030b6a1da65473bc11f762262c63936a72340699
+  metadata.gz: 17c8acca310a4ebc24ba5e4b4f58132d79262ca73d6ebbe6b50952b2f0703c70b915b28500d866af86d3b9f715afdc614ddc2af9feb07d6de5fb16fff68dc16e
+  data.tar.gz: ae1ad3dd861bed9849878241ae9edac81d26980a4cf8a6e911ecb36b7bdc547756404347232aff5608d4b9f24d2b0f6ecfc0e6476c6f37855bfbc2ff0410a8e9

data/README.md

@@ -104,10 +104,14 @@ After installing the gem, the `bech32` command will be available. Encoding and d
 
 #### Encode
 
+The `encode` command takes `HRP`, `data`, and type (`bech32` or `bech32m`) as arguments and outputs a bech32/bech32m string.
+
     $ bech32 encode genesis 000409190707111719041a120308120a060c161408110d091b090009021b1e1d150e190215010d0a1603091e1f0b100609090d1a1c1a13030c120c0c0f1c020d1d1a0e170b1c17021018121e0a021c121a1c0d161b16131d1609130f1d13180f1e081d041d0a110f110d1313081c11100600180b000c08140c1e130e0f090c160e0018191e1d1c0016060c11101214121e19070d1a0c1c15020414001f10100c09090600181806001809080e180507021913031100030216141b100908160c1213120f1912011f07021c13190d1900170c1d1203040f071c1908050504130e080d0a100d130b03000a0a08191310090918120f11031104120c15180c15120a0f1919070c1c12060c1911091010120a0d191b040c1613020e1911081f000b1a0b0514150c1613010d0c1c030b17011805090119061e0b051e130c00030419000112030110181d011a000f020c0901080c1113060201041a0e1b060a15160506181c11140c1c1d0b1b14020c131e0b0f071519181e0b1f0e0a08170f1d0c05060e1c1b0e160c0f0a171d0b101a1a1f1417160e0d1414030e161b0a000709100d15020c000e010c00000000 bech32
     genesis1qyfe883hey6jrgj2xvk5g3dfmfqfzm7a4wez4pd2krf7ltsxffd6u6nrvjvv0uzda6whtuhzscj72zuj6udkmknakfn0anc07gaya2303dnngu3sxqctqvg5v7nw0fvkwqce7auqkxv3sj5j7e8d6vu4zy5qlssvffxqccxqcfgwc98zenr3qrzk5msfgkvjnj0ejpl8zunedeqhvajry08ueg99ynwgd2sdntrq22gensffcj03r3yjv4cv4j20ee8vujxve3fssj2demyvknzwe3glqt6t954vknpdvurthpc9fpex7t97nvqryeqpjrpscap6q0zvfpgv3nxzpy6wmx24k9xcu35vuatm5zvn7t084ec7tlw2gh0av9xwumwkv02hats66l5hkwd55rwkm2q8fsd4zvqwpvqqqqtdc6rp
 
-# Decode
+#### Decode
+
+The `decode` command takes bech32/bech32m string as arguments and outputs `HRP`, `data`, and type.
 
     $ bech32 decode genesis1qyfe883hey6jrgj2xvk5g3dfmfqfzm7a4wez4pd2krf7ltsxffd6u6nrvjvv0uzda6whtuhzscj72zuj6udkmknakfn0anc07gaya2303dnngu3sxqctqvg5v7nw0fvkwqce7auqkxv3sj5j7e8d6vu4zy5qlssvffxqccxqcfgwc98zenr3qrzk5msfgkvjnj0ejpl8zunedeqhvajry08ueg99ynwgd2sdntrq22gensffcj03r3yjv4cv4j20ee8vujxve3fssj2demyvknzwe3glqt6t954vknpdvurthpc9fpex7t97nvqryeqpjrpscap6q0zvfpgv3nxzpy6wmx24k9xcu35vuatm5zvn7t084ec7tlw2gh0av9xwumwkv02hats66l5hkwd55rwkm2q8fsd4zvqwpvqqqqtdc6rp
     HRP: genesis

data/exe/bech32

@@ -19,11 +19,15 @@ class CLI < Thor
   desc 'decode "bech32string"', 'Decoding bech32/bech32m string.'
   def decode(bech32_str)
     bech32 = Bech32.decode(bech32_str, bech32_str.length)
-    puts <<~EOS
-      HRP: #{bech32[0]}
-      DATA: #{bech32[1].pack('C*').unpack1('H*')}
-      TYPE: #{bech32[2] == Bech32::Encoding::BECH32 ? 'bech32' : 'bech32m'}
-    EOS
+    if bech32
+      puts <<~EOS
+        HRP: #{bech32[0]}
+        DATA: #{bech32[1].pack('C*').unpack1('H*')}
+        TYPE: #{bech32[2] == Bech32::Encoding::BECH32 ? 'bech32' : 'bech32m'}
+      EOS
+    else
+      puts 'Can not decode.'
+    end
   end
 
 end

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.0'
+  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.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Shigeyuki Azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-01 00:00:00.000000000 Z
+date: 2022-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor