bitcoinrb 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14d06b76233959dbd16e89459a109982612c8ec6e91b746328fac54bb0d6ddae
-  data.tar.gz: ca60bd4fb4f1075335a0806bfdb5cd829da3f2a2d0b3794012e55ee17c7d417c
+  metadata.gz: ab7cf06beb0cf2d36a34c86558f3432fe951416c493c70782e7b7e647bc4e7fb
+  data.tar.gz: a5e13cb5b79a0fd15f008405c5973326158d18d581fbc899f6bd6f9ded5b810a
 SHA512:
-  metadata.gz: d49893ec5f8819dc78c19974bd74e1cf2545a787e8861b212a2801e40135b3c0f22650e46df9d5089bbae47dd9c6b74ce13320763a4107633fce5a1355cbbc5b
-  data.tar.gz: b2d422ecfc721e2e41b87d089dd2e6727f564f1346ae8a05b7e0d0b16247f8ca4b4113190c92d6e6abedb6180c8373289773ee6648963a10dbe9f3b0f726f471
+  metadata.gz: a5acbb1325f300e0e726f09447cb3f7806a2ff82e5f8f0bbef3c3879540b83e350f48ae33d424cec86f5bc5062a5ef64120c8f8aa4278cfeb173cbec57d96078
+  data.tar.gz: ff5031d47259afb685e87ebfcb681efd6e041759943b5ce8753d69bd26763e87296ae3acadfa3eeee15e3e0ca20495f41e129e8c5ad6058017184c0460608df2

data/lib/bitcoin/ext_key.rb

@@ -126,7 +126,7 @@ module Bitcoin
       v = version
       case v
       when Bitcoin.chain_params.bip49_privkey_p2wpkh_p2sh_version
-        Bitcoin::Key::TYPES[:pw2pkh_p2sh]
+        Bitcoin::Key::TYPES[:p2wpkh_p2sh]
       when Bitcoin.chain_params.bip84_privkey_p2wpkh_version
         Bitcoin::Key::TYPES[:p2wpkh]
       when Bitcoin.chain_params.extended_privkey_version
@@ -280,7 +280,7 @@ module Bitcoin
       v = version
       case v
       when Bitcoin.chain_params.bip49_pubkey_p2wpkh_p2sh_version
-        Bitcoin::Key::TYPES[:pw2pkh_p2sh]
+        Bitcoin::Key::TYPES[:p2wpkh_p2sh]
       when Bitcoin.chain_params.bip84_pubkey_p2wpkh_version
         Bitcoin::Key::TYPES[:p2wpkh]
       when Bitcoin.chain_params.extended_pubkey_version

data/lib/bitcoin/key.rb

@@ -16,7 +16,7 @@ module Bitcoin
     attr_accessor :key_type
     attr_reader :secp256k1_module
 
-    TYPES = {uncompressed: 0x00, compressed: 0x01, p2pkh: 0x10, p2wpkh: 0x11, pw2pkh_p2sh: 0x12}
+    TYPES = {uncompressed: 0x00, compressed: 0x01, p2pkh: 0x10, p2wpkh: 0x11, p2wpkh_p2sh: 0x12}
 
     MIN_PRIV_KEY_MOD_ORDER = 0x01
     # Order of secp256k1's generator minus 1.

data/lib/bitcoin/merkle_tree.rb

@@ -14,11 +14,15 @@ module Bitcoin
     end
 
     def self.build_from_leaf(txids)
-      nodes = txids.each_slice(2).map{ |m|
-        left = Node.new(m[0])
-        right = Node.new(m[1] ? m[1] : m[0])
-        [left, right]
-      }.flatten
+      if txids.size == 1
+        nodes = [Node.new(txids.first)]
+      else
+        nodes = txids.each_slice(2).map{ |m|
+          left = Node.new(m[0])
+          right = Node.new(m[1] ? m[1] : m[0])
+          [left, right]
+        }.flatten
+      end
       new(build_initial_tree(nodes))
     end
 
@@ -103,7 +107,7 @@ module Bitcoin
       end
 
       def next_partial
-        return nil if root? && (flag.zero? || (left.partial? && right.partial?))
+        return nil if root? && (flag.zero? || (left.nil? && right.nil?) || (left.partial? && right.partial?))
         return parent.next_partial if flag.zero? || leaf?
         return left unless left.partial?
         self.right = left.dup unless right

data/lib/bitcoin/version.rb

@@ -1,3 +1,3 @@
 module Bitcoin
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitcoinrb
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-01 00:00:00.000000000 Z
+date: 2019-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ecdsa