onchain 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee92d471f0e4b5a367352fb5d99179688521efff
-  data.tar.gz: bb5df5cf76b8bb11613852bd7dcbba4cb8b61842
+  metadata.gz: 3d1afa67290306977f3fdbdcdbf501dc39941f09
+  data.tar.gz: 2d4c4c3a88040b23e9830930330e986515486f3d
 SHA512:
-  metadata.gz: a3ed132d84404a44f1c02de448d70b148b5b716155ee657058724254cabddd83979afd9073668c93afa474f5f513cbb15954eed6a5fa552f53c648c7e17969e5
-  data.tar.gz: 01feb04e55515ef58e7ec890d88d8c17b05ce401ebb85e850f163ad0b65ae9656f8bff9b618448f73d123e9546ff1a8128be67b5f3afaffd8e778d2a4f44dcd6
+  metadata.gz: 7afe5e34552e43ce01496792bc1785e1e5e7c7757ffa8ad49d51abcfdcc6f71826830860ef05988861802053e6ae7c721a729a4bc40102b9fdb0c716e3004a5b
+  data.tar.gz: 6428a5b15ec8671dfa812c2c49a57e93c6e245f0bf7214d177771fa354f1c1170311ee87a7130f0655f1eb9c5e574d8189c44e08d81917b5dad60a9094f05f78

data/lib/onchain/block_chain.rb

@@ -12,6 +12,16 @@ require 'json'
 # get_transactions(address)
 #
 class OnChain
+  class << self
+  
+    def bin_to_hex(bin)
+      return bin.unpack("H*")[0]
+    end
+  
+    def hex_to_bin(hex)
+      return hex.scan(/../).map { |x| x.hex }.pack('c*')
+    end
+  end
 end
 
 class OnChain::BlockChain

data/lib/onchain/payments.rb

@@ -5,16 +5,15 @@ class OnChain::Payments
     
     def get_address_from_redemption_script(redemption_script)
       
-      sbin = redemption_script.scan(/../).map { |x| x.hex }.pack('c*')
-      hex = sbin.unpack("H*")[0]
+      sbin = OnChain.hex_to_bin(redemption_script)
+      hex = OnChain.bin_to_hex(sbin)
       fund_address = Bitcoin.hash160_to_p2sh_address(Bitcoin.hash160(hex))
       
       return fund_address
     end
     
     def hex_to_script(hex)
-      sbin = hex.scan(/../).map { |x| x.hex }.pack('c*')
-      return Bitcoin::Script.new(sbin)
+      return Bitcoin::Script.new(OnChain::hex_to_bin(hex))
     end
     
     # With a bunch of HD wallet paths, build a transaction

data/lib/onchain/sweeper.rb

@@ -1,39 +1,78 @@
 class OnChain::Sweeper
   class << self
     
-    
-    # With a bunch of HD wallet paths, build a transaction
-    # That pays all the coins to a certain address
-    def sweep(paths, mpk, destination_address)
+    # Turn a bunch of master keys into a redemption scriopt
+    # i.e. derive the path.
+    def multi_sig_address_from_mpks(mpks, path)
       
-      master = MoneyTree::Node.from_serialized_address(mpk)
-      
-      tx = Bitcoin::Protocol::Tx.new
+      addresses = []
+      mpks.each do |mpk|
+        master = MoneyTree::Node.from_serialized_address(mpk)
+        m = master.node_for_path(path)
+        addresses << m.public_key.to_hex
+      end
       
-      amount = 0
+      rs = generate_redemption_script(addresses)
       
-      paths.each do |path|
+      return generate_address_of_redemption_script(rs)
+    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
+    end
+  
+    def generate_address_of_redemption_script(redemption_script)
+      hash160 = Bitcoin.hash160(redemption_script)
+    
+      return Bitcoin.hash160_to_p2sh_address(hash160)
+    end
+    
+    def get_block_height
+      return Chain.get_latest_block["height"].to_i
+    end
+    
+    # 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)
       
-        address = master.node_for_path(path).to_address
+      to_sweep = {}
+      # 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)
+        # store address as lookup for path.
+        to_sweep[a] = r
+      end
       
-        unspent = OnChain::BlockChain.get_unspent_outs(address)
+      incoming_coins = []
       
-        unspent.each do |spent|
-          txin = Bitcoin::Protocol::TxIn.new
-
-          txin.prev_out = spent[0]
-          txin.prev_out_index = spent[1]
-          amount += spent[3].to_i
+      to_sweep.each do |address, path|
+        txs = Chain.get_address_transactions(address)
         
-          tx.add_in(txin)
+        txs.each do |tx|
+          
+          if tx["block_height"].to_i > last_block_checked
+            addresses = tx["outputs"]["addresses"]
+            
+          else
+            break
+          end
+          
         end
       end
-
-      txout = Bitcoin::Protocol::TxOut.new(amount, Bitcoin::Script.from_string(
-        "OP_DUP OP_HASH160 #{destination_address} " + 
-        "OP_EQUALVERIFY OP_CHECKSIG").to_payload)
       
-      tx.add_out(txout)
     end
     
   end

metadata

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