onchain 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49b42c93865c3b3eefc04fe602688c83f1258276
-  data.tar.gz: 52c1908b9da43e4e895b8aff732b21e08a48a96a
+  metadata.gz: ca958c4252ca9f068ac5df9f81af86e77de79626
+  data.tar.gz: 737de01dc291cabf7482cb9e8cf615ca1d7680ae
 SHA512:
-  metadata.gz: 3f94f83d9ab3f9d80e677295ade5e2001e22f9fdff31c824863abd318508751c22690756bef692bb97ee2d81611d1c164e47acc81f765a69460c05c98eb8a564
-  data.tar.gz: 0983bc72478e28ffbec912b02365a73dd40ccb4e55bf3d729c427e02e27ed67ef02a861faef3acb77426672af30b5db0cf49f64e9995220cdf48fabc692806a1
+  metadata.gz: 07b53ce9964d06414eb86f019e7450ea61cc848b6ceb9b8beb0d2c0ff758946260638db15163c8630f191a45d72b25000ba3c3c3730b83c24fe4efb5d88f495b
+  data.tar.gz: 6f20cec8401bad068e0f088e4ca70994004bee2d658ca97cf0cbbd1248811391a738aaa2fcba11150b2bc20bac10e787605d09f50fc4e048a3d010a47220055c

data/lib/onchain/providers/chaincom_api.rb

@@ -1,4 +1,5 @@
 require 'chain'
+require 'time'
 
 class OnChain::BlockChain
   class << self
@@ -21,7 +22,7 @@ class OnChain::BlockChain
       hist = []
       txs.each do |tx|
         row = {}
-        row[:time] = Date.parse(tx["block_time"]).to_s
+        row[:time] = Time.parse(tx["block_time"]).to_i
         row[:addr] = {}
         row[:outs] = {}
         

data/lib/onchain/sweeper.rb

@@ -5,14 +5,14 @@ class OnChain::Sweeper
     
     # Turn a bunch of master keys into a redemption scriopt
     # i.e. derive the path.
-    def multi_sig_address_from_mpks(mpks, path)
+    def multi_sig_address_from_mpks(minimum_sigs, mpks, path)
       
-      rs = generate_redemption_script_from_mpks(mpks, path)
+      rs = generate_redemption_script_from_mpks(minimum_sigs, mpks, path)
       
       return generate_address_of_redemption_script(rs)
     end
     
-    def generate_redemption_script_from_mpks(mpks, path)
+    def generate_redemption_script_from_mpks(minimum_sigs, mpks, path)
       
       addresses = []
       mpks.each do |mpk|
@@ -21,23 +21,12 @@ class OnChain::Sweeper
         addresses << m.public_key.to_hex
       end
       
-      return generate_redemption_script(addresses)
+      return generate_redemption_script(minimum_sigs, addresses)
     end
 
-    def generate_redemption_script(addresses)
-    
-      rs = (80 + addresses.length).to_s(16) 
-    
-      addresses.each do |address|
-        rs = rs + (address.length / 2).to_s(16)
-        rs = rs + address
-      end
-    
-      rs = rs + (80 + addresses.length).to_s(16) 
-    
-      rs = rs + 'ae'
-    
-      return rs
+    def generate_redemption_script(minimum_sigs, addresses)
+      address, redeem_script = Bitcoin.pubkeys_to_p2sh_multisig_address(minimum_sigs, *addresses)
+      return redeem_script.hth
     end
   
     def generate_address_of_redemption_script(redemption_script)
@@ -52,7 +41,7 @@ class OnChain::Sweeper
     
     # With a bunch of HD wallet paths, build a transaction
     # That pays all the coins to a certain address
-    def sweep(mpks, path, limit, last_block_checked)
+    def sweep(minimum_sigs, mpks, path, limit, last_block_checked)
       
       block_height_now = get_block_height
       
@@ -60,7 +49,7 @@ class OnChain::Sweeper
       # Get all the addresses we are interested in.
       for i in 0..limit do
         r = path.sub('#{index}', i.to_s)
-        a = multi_sig_address_from_mpks(mpks, r)
+        a = multi_sig_address_from_mpks(minimum_sigs, mpks, r)
         # store address as lookup for path.
         to_sweep[a] = r
       end
@@ -98,7 +87,7 @@ class OnChain::Sweeper
       return incoming_coins, block_height_now
     end
 
-    def create_payment_tx_from_sweep(incoming, destination_address, mpks)
+    def create_payment_tx_from_sweep(minimum_sigs, incoming, destination_address, mpks)
         
       tx = Bitcoin::Protocol::Tx.new
       total_amount = 0
@@ -107,7 +96,7 @@ class OnChain::Sweeper
         
         txin = Bitcoin::Protocol::TxIn.new
         
-        rs = generate_redemption_script_from_mpks(mpks, output[1])
+        rs = generate_redemption_script_from_mpks(minimum_sigs, mpks, output[1])
 
         txin.prev_out = OnChain.hex_to_bin(output[3]).reverse
         txin.prev_out_index = output[4]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onchain
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Ian Purton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake