onchain 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e22f8353705d9cf0ae2c8809117b989b29196d37
-  data.tar.gz: b4a4a4e5b8a14348c48100b1b243300ec267135d
+  metadata.gz: 068b59667873048f533710cb2e04cdaa7d1703c3
+  data.tar.gz: 2f45540cbc3505d031fedb3dfce06318d14869ce
 SHA512:
-  metadata.gz: b5a0ee70ae399e72d2b6a4594329b4a9e57e9380ecdbf7db203c9d7ab81ea4ae0fd11c321e305d3c64404bead27e0dedb69a9c5039533d7042c179416683c06b
-  data.tar.gz: 9e29cce99b2d3d63a5c982befaaa6d45f5562bd27e92b9c45cf64c154765a11550869f582b75eb216e0961982e3499699a61919b6d50904e3cd6557a8378c95f
+  metadata.gz: 66f5b3b0ca2bacf7e8169dcaf97d5c81a33348fb967a8cdb9eee57ab4ae2c9edba693d0029b40ae6bec29ef0990767f46e96568d073b42ef30271bc9fc316e35
+  data.tar.gz: ff7e08551f0e199a654b8de6dd80289a1b5a8550310a63f53f937369a26f970134283c7743eb84f91351a505e5ed39a89bc649b9f6bf39b5de16498722b74353

data/lib/onchain/transaction.rb

@@ -51,10 +51,15 @@ class OnChain::Transaction
     def get_public_keys_from_script(script)
 
       if script.is_pubkey?
-        return [script.get_pubkey]
+        return [Bitcoin.hash160_to_address(script.get_pubkey)]
       end
       
-      return script.get_multisig_pubkeys
+      pubs = []
+      script.get_multisig_pubkeys.each do |pub|
+        pub_hex = OnChain.bin_to_hex(pub)
+        pubs << Bitcoin.hash160_to_address(Bitcoin.hash160(pub_hex))
+      end
+      return pubs
     end
     
     def get_inputs_to_sign(tx)
@@ -70,7 +75,7 @@ class OnChain::Transaction
           if inputs_to_sign[index] == nil
             inputs_to_sign[index] = {}
           end
-          inputs_to_sign[index][OnChain.bin_to_hex(key)] = {'hash' => OnChain::bin_to_hex(hash)}
+          inputs_to_sign[index][key] = {'hash' => OnChain::bin_to_hex(hash)}
         end
       end
       return inputs_to_sign
@@ -160,9 +165,10 @@ class OnChain::Transaction
         sigs = []
         
         rscript = Bitcoin::Script.new txin.script
-        rscript.get_multisig_pubkeys.each do |key|
+        
+        pub_keys = get_public_keys_from_script(rscript)
+        pub_keys.each do |hkey|
           
-          hkey = OnChain.bin_to_hex(key)
           if sig_list[index][hkey] != nil and sig_list[index][hkey]['sig'] != nil
             
             # Add the signature to the list.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onchain
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Ian Purton