onchain 3.05 → 3.06

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1a7afb78ad1d80015e3a8a67663d80967eb73da
-  data.tar.gz: 3743c11c1174a8aabac0f4f8e7fb66b09bac838d
+  metadata.gz: bac73b0c0032d9c02ae6cf5e3a4c7c111c1b4c5c
+  data.tar.gz: c0aef18a689aa33e9fa74db3f991ce015c1ca8ff
 SHA512:
-  metadata.gz: b272549c5750af3f327baae12d304c4afea9a1eabcd334f2de02c5c4d45a0f1d6a03d161b02526c387bcb1a0051b0df4a46db8e20fe2c3bcd07d59b5f787cd25
-  data.tar.gz: a4e2fe822837a83399524ba9adc1b354e36d6cbcb3b6cf2dd3530c5322816b546522aee042a890c54d5371282baad974ad298958f94d64b99f992351bb3a1c2d
+  metadata.gz: 6aaea261efdffacd19147e3471883fed20ef73f1dfa5e60bc27aaf2b78478aca2b185ae303e28ac67f8c30a77bd846fc8a7bdbcbb3db712b748a9740d4a5c6da
+  data.tar.gz: 21debc6e32a3eb923ff38781ba2ddbaaa806cb9686829afc0780743fd7aa91a94ed215170b1956d3be00f01b87be985164ca314a8659515704e3c3597f3bae50

data/lib/onchain.rb

@@ -3,8 +3,6 @@ require 'onchain/providers/blockchaininfo_api.rb'
 require 'onchain/providers/blockr_api.rb'
 require 'onchain/providers/insight_api.rb'
 require 'onchain/providers/bitcoind_api.rb'
-require 'onchain/sweeper.rb'
-require 'onchain/payments.rb'
 require 'onchain/transaction.rb'
 require 'money-tree'
 require 'bitcoin'

data/lib/onchain/providers/blockchaininfo_api.rb

@@ -129,7 +129,7 @@ class OnChain::BlockChain
 
     def blockinfo_get_transaction(txhash)
       base = "https://blockchain.info/rawtx/#{txhash}?format=hex"
-      return fetch_response(URI::encode(base))
+      return fetch_response(URI::encode(base), false)
     end
   
     def block_chain(cmd, address, params = "")

data/lib/onchain/transaction.rb

@@ -11,6 +11,7 @@ class OnChain::Transaction
       input_amount = 0
       # Let's add up the value of all the inputs.
       tx.in.each_with_index do |txin, index|
+      
         prev_hash = txin.to_hash['prev_out']['hash']
         prev_index = txin.to_hash['prev_out']['n']
         
@@ -116,6 +117,17 @@ class OnChain::Transaction
       
     end
     
+    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)
+      hash160 = Bitcoin.hash160(redemption_script)
+    
+      return Bitcoin.hash160_to_p2sh_address(hash160)
+    end
+    
     # Like create_single_address_transaction but for multi sig wallets.
     def create_transaction_with_fee(redemption_scripts, address, amount, fee_percent, fee_addr)
     
@@ -124,7 +136,7 @@ class OnChain::Transaction
       total_amount = amount + fee
       
       addresses = redemption_scripts.map { |rs| 
-        OnChain::Sweeper.generate_address_of_redemption_script(rs)
+        generate_address_of_redemption_script(rs)
       }
       
       unspents, indexes, change = OnChain::BlockChain.get_unspent_for_amount(addresses, total_amount)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onchain
 version: !ruby/object:Gem::Version
-  version: '3.05'
+  version: '3.06'
 platform: ruby
 authors:
 - Number 6
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -103,12 +103,10 @@ extra_rdoc_files: []
 files:
 - lib/onchain.rb
 - lib/onchain/block_chain.rb
-- lib/onchain/payments.rb
 - lib/onchain/providers/bitcoind_api.rb
 - lib/onchain/providers/blockchaininfo_api.rb
 - lib/onchain/providers/blockr_api.rb
 - lib/onchain/providers/insight_api.rb
-- lib/onchain/sweeper.rb
 - lib/onchain/transaction.rb
 homepage: https://github.com/onchain/onchain-gem
 licenses: []

data/lib/onchain/payments.rb

@@ -1,88 +0,0 @@
-class OnChain::Payments
-  class << self
-    
-    FEE = 50000
-    
-    def get_address_from_redemption_script(redemption_script)
-      
-      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)
-      return Bitcoin::Script.new(OnChain::hex_to_bin(hex))
-    end
-    
-    def create_payment_tx(redemption_script, payments)
-      
-      begin
-        
-        fund_address = get_address_from_redemption_script(redemption_script)
-        
-        tx = Bitcoin::Protocol::Tx.new
-      
-        total_amount = FEE  
-      
-        payments.each do |payment|
-          if payment[1].is_a?(String)
-            payment[1] = payment[1].to_i
-          end
-          total_amount = total_amount + payment[1]
-        end
-      
-        total_in_fund = OnChain::BlockChain.get_balance_satoshi(fund_address)
-        
-        # Do we have enough in the fund.
-        if(total_amount > total_in_fund)
-          return 'Balance is not enough to cover payment'
-        end
-        
-        # OK, let's get some inputs
-        amount_so_far = 0
-        unspent = OnChain::BlockChain.get_unspent_outs(fund_address)
-        unspent.each do |spent|
-
-          txin = Bitcoin::Protocol::TxIn.new
-
-          txin.prev_out = spent[0].scan(/../).map { |x| x.hex }.pack('c*').reverse
-          txin.prev_out_index = spent[1]
-          txin.script = hex_to_script(redemption_script).to_payload
-      
-          tx.add_in(txin)
-          
-          amount_so_far = amount_so_far + spent[3].to_i
-          if amount_so_far >= total_amount
-            next
-          end
-        end
-        change = amount_so_far - total_amount
-        
-        payments.each do |payment|
-          
-          txout = Bitcoin::Protocol::TxOut.new(payment[1], 
-            Bitcoin::Script.to_address_script(payment[0]))
-      
-          tx.add_out(txout)
-        end
-        
-        # Send the chnage back.
-        if total_in_fund > total_amount
-          
-          txout = Bitcoin::Protocol::TxOut.new(total_in_fund - total_amount, 
-            Bitcoin::Script.to_address_script(fund_address))
-      
-          tx.add_out(txout)
-        end
-        
-        return tx
-        
-      rescue Exception => e
-        return 'Unable to parse payment :: ' + e.to_s
-      end
-    end
-    
-  end
-end

data/lib/onchain/sweeper.rb

@@ -1,139 +0,0 @@
-require 'httparty'
-
-class OnChain::Sweeper
-  class << self
-    
-    # Turn a bunch of master keys into a redemption scriopt
-    # i.e. derive the path.
-    def multi_sig_address_from_mpks(minimum_sigs, 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(minimum_sigs, mpks, path)
-      
-      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
-      
-      return generate_redemption_script(minimum_sigs, addresses)
-    end
-
-    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)
-      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(minimum_sigs, mpks, path, limit, last_block_checked)
-      
-      block_height_now = get_block_height
-      
-      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(minimum_sigs, mpks, r)
-        # store address as lookup for path.
-        to_sweep[a] = r
-      end
-      
-      incoming_coins = []
-      
-      to_sweep.each do |address, path|
-        
-        txs = Chain.get_address_transactions(address)
-        
-        txs.each do |tx|
-          
-          block_height = tx["block_height"].to_i 
-          if block_height > last_block_checked
-            
-            tx["outputs"].each do |output|
-              output["addresses"].each do |address|
-                if to_sweep[address] != nil
-                  incoming_coins << [address, 
-                    to_sweep[address], 
-                    output["value"], 
-                    output["transaction_hash"], 
-                    output["output_index"], 
-                    output["script"]]
-                end
-              end
-            end
-            
-          else
-            break
-          end
-          
-        end
-      end
-      return incoming_coins, block_height_now
-    end
-
-    def create_payment_tx_from_sweep(minimum_sigs, incoming, destination_address, mpks)
-        
-      tx = Bitcoin::Protocol::Tx.new
-      total_amount = 0
-        
-      incoming.each do |output|
-        
-        txin = Bitcoin::Protocol::TxIn.new
-        
-        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]
-        txin.script = OnChain.hex_to_bin(rs)
-    
-        tx.add_in(txin)
-        
-        total_amount = total_amount + output[2].to_i
-        
-      end
-      
-      total_amount = total_amount - 10000
-      
-      if total_amount < 0
-        return "Not enough coins to create a transaction."
-      end
-      
-      # Add an output and we're done.
-      txout = Bitcoin::Protocol::TxOut.new(total_amount, 
-        Bitcoin::Script.to_address_script(destination_address))
-  
-      tx.add_out(txout)
-      
-      paths = incoming.map { |i| i[1] }
-      
-      return OnChain.bin_to_hex(tx.to_payload), paths
-    end
-    
-    def post_tx_for_signing(tx_hex, paths, address)
-      
-      return HTTParty.post('https://onchain.herokuapp.com/api/v1/transaction', 
-        :body => { :tx => tx_hex, 
-        :address => address,
-        :meta_data => paths.join(','),
-        :user_email => ENV['ONCHAIN_EMAIL'],
-        :user_token => ENV['ONCHAIN_TOKEN'] }) 
-    end
-    
-  end
-end