onchain 1.3.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1df1d9f8e5f45a7a7c62c4af34d239203c976a92
-  data.tar.gz: 757c03fd2a78f94ce2f2445b401ab3247facdd4e
+  metadata.gz: c374489d69f07c18eedd7d3e2575c8eaa887d8e0
+  data.tar.gz: 48c3f1239dd7eeb28768aa63a78668dbb56f1561
 SHA512:
-  metadata.gz: 12a947e15cb74473389e57f09c00f689536eb4ea47552a36259eb41b3a10011fe7028099ee569f2a05dd7c645f3076b9138393dbded5c16924badde61c8b1243
-  data.tar.gz: ff955c293ef7a2c9944f95caf32ba3f2163c2f11a1b777234d8de0a5194d1761497d78b7994560ce50db3a2e1e0fe0796adc401d21326c7fd36d73acc3bff298
+  metadata.gz: 5977e86a3b52e628b42f59bac2638a251a44cbb7abffbd7409e3ada411db0eb89304a0e63f5d69604e7e6d7d298c88d6eccbe380527d810585c2b07abfd47cfa
+  data.tar.gz: c36abc4382cf2281461f33bfd04add32caba20ab4d8d4dd7003ce98d41722dda892cb4c2e018233aa976e04f5ebca7d180b1dbe781bc21de10a0f25faad2f24b

data/lib/onchain/sweeper.rb

@@ -5,6 +5,13 @@ class OnChain::Sweeper
     # i.e. derive the path.
     def multi_sig_address_from_mpks(mpks, path)
       
+      rs = generate_redemption_script_from_mpks(mpks, path)
+      
+      return generate_address_of_redemption_script(rs)
+    end
+    
+    def generate_redemption_script_from_mpks(mpks, path)
+      
       addresses = []
       mpks.each do |mpk|
         master = MoneyTree::Node.from_serialized_address(mpk)
@@ -12,9 +19,7 @@ class OnChain::Sweeper
         addresses << m.public_key.to_hex
       end
       
-      rs = generate_redemption_script(addresses)
-      
-      return generate_address_of_redemption_script(rs)
+      return generate_redemption_script(addresses)
     end
 
     def generate_redemption_script(addresses)
@@ -91,7 +96,7 @@ class OnChain::Sweeper
       return incoming_coins, block_height_now
     end
 
-    def create_payment_tx_from_sweep(incoming, destination_address)
+    def create_payment_tx_from_sweep(incoming, destination_address, mpks)
         
       tx = Bitcoin::Protocol::Tx.new
       total_amount = 0
@@ -99,10 +104,12 @@ class OnChain::Sweeper
       incoming.each do |output|
         
         txin = Bitcoin::Protocol::TxIn.new
+        
+        rs = generate_redemption_script_from_mpks(mpks, output[1])
 
         txin.prev_out = output[3].scan(/../).map { |x| x.hex }.pack('c*').reverse
         txin.prev_out_index = output[4]
-        txin.script = Bitcoin::Script.binary_from_string(output[5])
+        txin.script = OnChain.hex_to_bin(rs)
     
         tx.add_in(txin)
         
@@ -110,7 +117,7 @@ class OnChain::Sweeper
         
       end
       
-      total_amount = total_amount - 100000
+      total_amount = total_amount - 10000
       
       if total_amount < 0
         return "Not enough coins to create a transaction."
@@ -123,7 +130,9 @@ class OnChain::Sweeper
   
       tx.add_out(txout)
       
-      return tx
+      paths = incoming.map { |i| i[1] }
+      
+      return OnChain.bin_to_hex(tx.to_payload), paths
     end
     
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onchain
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.2
 platform: ruby
 authors:
 - Ian Purton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2014-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake