base58 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33ccbcef765a46e1e856bc882fc45b75b727de51da69e5bece5e097bc39d1dbd
-  data.tar.gz: 7eb54e225d04709b747c16b1d741b645d7c42b2911dd5da83a4111104b00b26e
+  metadata.gz: c9b47376957f4dbd7b96af742f18a5a0acef4fbcd47d7df25d1063051d52cb3f
+  data.tar.gz: e358735d555fede75daa17a1e425738ebd6e7921a74be2e028a0f2d0b4e16e5a
 SHA512:
-  metadata.gz: d6cb74b302d8f367860fb85bfd0bdc842bb57064a2c852bd03e4fafe215fc850deb3efc4ae98ca21380c8f2939eb92f17886a4a29bcde37b77524292cdbd80fa
-  data.tar.gz: cb77134f325a5ed494727f1f2c5662e1332f57666ee824d74db8929ea7d04990823531b666c4cca3877633a30bc56b8ee75cf1b2d57a72c448c1ec268e57fd47
+  metadata.gz: 1349c672d885fe401e8d2c7f98d219394ec76d03116ffe9323ec49cc10648df453742951020fb5f2f68f2ed7a6ec1867cdd851d99a34cfa3b96163e24a9ebbaa
+  data.tar.gz: 88a6a954d7d49c22dc2fa81b15686b8c260b27acec06db06236987e8b12137e8a4335f912867d9cddfa32d11464484a30e97fbb9ef9319181c6afed6e77a58ac

data/CHANGELOG

@@ -1,3 +1,6 @@
+= 0.2.2 [2017-01-11]
+- Fix for incorrect encoding of leading-zeroes. Thanks to @joelnordell.
+
 = 0.2.1 [2017-01-08]
 - Bitcoin-style leading-zeroes encoding. Thanks to @joelnordell.
 

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/base58.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: base58 0.2.1 ruby lib
+# stub: base58 0.2.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "base58".freeze
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Douglas F Shearer".freeze]
-  s.date = "2018-01-08"
+  s.date = "2018-01-11"
   s.description = "Base58 is a Ruby library for converting ints or binaries to and from base58.".freeze
   s.email = "dougal.s@gmail.com".freeze
   s.extra_rdoc_files = [

data/lib/base58.rb

@@ -53,7 +53,7 @@ class Base58
       prefix = ''
     end
 
-    prefix + int_to_base58(binary_val.bytes.inject{|a,b|(a<<8)+b}, alphabet)
+    prefix + int_to_base58(binary_val.unpack('H*')[0].to_i(16), alphabet)
   end
 
   # Converts a base58 string to an ASCII-8BIT (binary) encoded string.
@@ -63,7 +63,16 @@ class Base58
     raise ArgumentError, 'Invalid alphabet selection.' unless ALPHABETS.include?(alphabet)
     nzeroes = base58_val.chars.find_index{|c| c != ALPHABETS[alphabet][0]} || base58_val.length-1
     prefix = nzeroes < 0 ? '' : '00' * nzeroes
-    [prefix + base58_to_int(base58_val, alphabet).to_s(16)].pack('H*')
+    [prefix + Private::int_to_hex(base58_to_int(base58_val, alphabet))].pack('H*')
+  end
+
+  module Private
+    def self.int_to_hex int
+      hex = int.to_s(16)
+      # The hex string must always consist of an even number of characters,
+      # otherwise the pack() parsing will be misaligned.
+      (hex.length % 2 == 0) ? hex : ('0'+hex)
+    end
   end
 
   class << self

data/test/test_base58.rb

@@ -531,7 +531,8 @@ EXAMPLES =  {
               "6hHHZB" => "\xCE\xE3\x15Y".force_encoding('BINARY'),
               "6hHKum" => "\xCE\xE3)\x00".force_encoding('BINARY'),
               "6hLgFW" => "\xCE\xEA\xAA(".force_encoding('BINARY'),
-              "6hBRKR" => "\xCE\xD1\x9Ek".force_encoding('BINARY')
+              "6hBRKR" => "\xCE\xD1\x9Ek".force_encoding('BINARY'),
+              "7xBSG3j7NgPksBpPnX1G7y19EuAy4swQexDoECfWdys" => "\x01\xAD<l'\xAF!\x96N\x93u\x93\xE2\xAF\x92p\x96=\x89n\xD7\x953\x17\x12\x8E\xBD\xA2\x04\x84~Z".force_encoding('BINARY')
     },
     :bitcoin => {
               "6Hknds" => "\xCE\xE99\x86".force_encoding('BINARY'),
@@ -539,7 +540,8 @@ EXAMPLES =  {
               "6Hiizc" => "\xCE\xE3\x15Y".force_encoding('BINARY'),
               "6HikVM" => "\xCE\xE3)\x00".force_encoding('BINARY'),
               "6HmGgw" => "\xCE\xEA\xAA(".force_encoding('BINARY'),
-              "6Hcrkr" => "\xCE\xD1\x9Ek".force_encoding('BINARY')
+              "6Hcrkr" => "\xCE\xD1\x9Ek".force_encoding('BINARY'),
+              "7Ycsh3K7oGpLTcQpNx1h7Z19fVbZ4TXqEYePfdFwDZT" => "\x01\xAD<l'\xAF!\x96N\x93u\x93\xE2\xAF\x92p\x96=\x89n\xD7\x953\x17\x12\x8E\xBD\xA2\x04\x84~Z".force_encoding('BINARY')
     },
     :ripple => {
               "aHk8d1" => "\xCE\xE99\x86".force_encoding('BINARY'),
@@ -547,7 +549,8 @@ EXAMPLES =  {
               "aH55zc" => "\xCE\xE3\x15Y".force_encoding('BINARY'),
               "aH5kVM" => "\xCE\xE3)\x00".force_encoding('BINARY'),
               "aHmGgA" => "\xCE\xEA\xAA(".force_encoding('BINARY'),
-              "aHciki" => "\xCE\xD1\x9Ek".force_encoding('BINARY')
+              "aHciki" => "\xCE\xD1\x9Ek".force_encoding('BINARY'),
+              "fYc16sKfoGFLTcQF4xr6fZr9CVbZhTXqNYePCdEADZT" => "\x01\xAD<l'\xAF!\x96N\x93u\x93\xE2\xAF\x92p\x96=\x89n\xD7\x953\x17\x12\x8E\xBD\xA2\x04\x84~Z".force_encoding('BINARY')
     }
   }
 
@@ -708,6 +711,15 @@ EXAMPLES =  {
     end
   end
 
+  def test_base58_to_binary_round_trip
+    BINARY_STRING_EXAMPLES.each do |alphabet, examples|
+      examples.each do |base_58, binary|
+        assert_equal base_58, Base58.binary_to_base58(Base58.base58_to_binary(base_58, alphabet), alphabet)
+        assert_equal binary,  Base58.base58_to_binary(Base58.binary_to_base58(binary,  alphabet), alphabet)
+      end
+    end
+  end
+
   def test_int_to_base58_all_alphabets
     EXAMPLES.each do |alphabet, examples|
       examples.each do |expected, integer|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: base58
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Douglas F Shearer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-08 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies: []
 description: Base58 is a Ruby library for converting ints or binaries to and from
   base58.