onchain 3.2 → 3.03

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0bc0fc8d8b7082068ab1899627eb832a53c48e2
-  data.tar.gz: b763d83ae49eba7e5559f16fdb1bc0a3b8d74213
+  metadata.gz: fd3dee9b9c3e89866a52611e36e4fec6c510675c
+  data.tar.gz: dfec0707b7aa380e6c6189f7065ada17b991dd93
 SHA512:
-  metadata.gz: 37c694e32b6aa2c1827d6ecf2c6cc59565f5418ba580cec2e237435c2c0507057dfc6ad41fc0bf49e793053564a1c9e604bcbab79449b39d3cf0b21d08d8587a
-  data.tar.gz: 4050a0cdf2c75c1774ff75d804b64fd7772664475c3314d25143a390426f9b02f9a9e6365aa06c3a67f99654088da4bf19d38275ee747ccad23fcc2d4c2ac9b4
+  metadata.gz: 4c363a289b43d919c7850de400ae48f3226fe8851cb770148b34ce084549cccb6f654538596a16bd0da586441273cc699696c2cc03772d23f7ef8e351aa31848
+  data.tar.gz: 3a16f3eabf4e6306c89ed07fcae622cfd5d481afbb86676b50142293d6a0e2e48d753df0d699eb474d818f34a5c8d46d29e1e793ad85f3da31f5b3696d0aa1f8

data/lib/onchain.rb

@@ -3,11 +3,13 @@ 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 'onchain/exchange_rates.rb'
 require 'money-tree'
 require 'bitcoin'
 
+
 # Setup the bitcoin gem for zcash
 module Bitcoin
 

data/lib/onchain/block_chain.rb

@@ -62,6 +62,17 @@ class OnChain::BlockChain
       end
       
     end
+
+    def get_history_for_addresses(addresses, network = :bitcoin)
+      history = []
+      addresses.each do |address|
+        res = address_history(address, network)
+        res.each do |r|
+          history << r
+        end
+      end
+      return history
+    end
     
     # Given a list of addresses, return those
     # that don't have balances in the cahce.
@@ -107,7 +118,7 @@ class OnChain::BlockChain
     end
     
     def get_balance_satoshi(address, network = :bitcoin)
-      return (get_balance(address, network).to_f * 100000000).to_i
+      return (get_balance(address, network = :bitcoin).to_f * 100000000).to_i
     end
     
     def get_available_suppliers(method_name, network)
@@ -123,7 +134,7 @@ class OnChain::BlockChain
             next
           end
           
-          if supplier == :insight and ! [:bitcoin].include? network
+          if supplier == :insight and ! [:bitcoin, :testnet3].include? network
             next
           end
           
@@ -147,10 +158,6 @@ class OnChain::BlockChain
             next
           end
           
-          if supplier == :insight and method_name.to_s == 'get_address_info'
-            next
-          end
-          
           if supplier == :blockr and network == :bitcoin and method_name.to_s == 'get_history_for_addresses'
             next
           end

data/lib/onchain/payments.rb

@@ -0,0 +1,88 @@
+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/providers/bitcoind_api.rb

@@ -5,45 +5,14 @@ class OnChain::BlockChain
      
     # Get last 20 transactions  
     def bitcoind_address_history(address, network = :bitcoin)
-      
-      if cache_read(network.to_s + ' history ' + address) == nil  
-        result = execute_remote_command('searchrawtransactions ' + address + ' 1 0 20 0', network)
-        cache_write(network.to_s + ' history ' + address, result, BALANCE_CACHE_FOR)
-      end
-      
-      result = cache_read(network.to_s + ' history ' + address)
+        
+      result = execute_remote_command('searchrawtransactions ' + address + ' 1 0 20 0', network)
       
       json = JSON.parse result 
       
       return parse_bitcoind_address_tx(address, json, network)
         
     end
-
-    def bitcoind_get_history_for_addresses(addresses, network = :bitcoin)
-      
-      commands  = []
-      if cache_read(network.to_s + ' history ' + addresses[0]) == nil
-        addresses.each do |address|
-          commands << 'searchrawtransactions ' + address + ' 1 0 20 0'
-        end
-        histories = OnChain::BlockChain.execute_remote_command(commands, :zclassic)
-        
-        index = 0
-        histories.each_line do |history|
-          cache_write(network.to_s + ' history ' + addresses[index], history, BALANCE_CACHE_FOR)
-          index = index + 1
-        end
-      end
-      
-      history = []
-      addresses.each do |address|
-        res = bitcoind_address_history(address, network)
-        res.each do |r|
-          history << r
-        end
-      end
-      return history
-    end
     
     def parse_bitcoind_address_tx(address, json, network)
       
@@ -86,10 +55,12 @@ class OnChain::BlockChain
     
     def bitcoind_send_tx(tx_hex, network = :bitcoin)
       
-      execute_remote_command('sendrawtransaction ' + tx_hex, network)
+      remote = execute_remote_command('sendrawtransaction ' + tx_hex, network)
+      
+      #res = JSON.parse(remote)
 
-      mess = 'Sent'
-      stat = 'Sent'
+      mess = 'Unknown'
+      stat = 'Unknown'
       tx_hash = 'Unknown'
       
       ret = "{\"status\":\"#{stat}\",\"data\":\"#{tx_hash}\",\"code\":200,\"message\":\"#{mess}\"}"	
@@ -98,14 +69,21 @@ class OnChain::BlockChain
 
     def bitcoind_get_balance(address, network = :bitcoin)
       
-      if cache_read(network.to_s + ' ' + address) == nil
+      if cache_read(address) == nil
       
-        bal = execute_remote_command('getallbalance ' + address + ' 0', network)
+        outs = bitcoind_get_unspent_outs(address, network)
         
-        cache_write(network.to_s + ' ' + address, bal.to_f, BALANCE_CACHE_FOR)
+        puts outs.to_s
+        
+        bal = 0
+        outs.each do |out|
+          bal += out[3].to_i
+        end
+        
+        cache_write(address, bal, BALANCE_CACHE_FOR)
       end
       
-      bal = cache_read(network.to_s + ' ' + address)
+      bal = cache_read(address)
       if bal.class == Fixnum
         bal = bal.to_f
       end
@@ -115,22 +93,6 @@ class OnChain::BlockChain
 
     def bitcoind_get_all_balances(addresses, network = :bitcoin)
       
-      
-      # if first address is missing get them all.
-      commands  = []
-      if cache_read(network.to_s + ' ' + addresses[0]) == nil
-        addresses.each do |address|
-          commands << 'getallbalance ' + address + ' 0'
-        end
-        balances = OnChain::BlockChain.execute_remote_command(commands, :zclassic)
-        
-        index = 0
-        balances.each_line do |line|
-          cache_write(network.to_s + ' ' + addresses[index], line.to_f, BALANCE_CACHE_FOR)
-          index = index + 1
-        end
-      end
-      
       addresses.each do |address|
         bitcoind_get_balance(address, network)
       end
@@ -138,7 +100,7 @@ class OnChain::BlockChain
 
     def bitcoind_get_unspent_outs(address, network = :bitcoin)
         
-      result = execute_remote_command('listallunspent ' + address + ' 1 0', network)
+      result = execute_remote_command('listallunspent ' + address + ' 1', network)
       
       json = JSON.parse result
       
@@ -162,34 +124,24 @@ class OnChain::BlockChain
     
     # Run the command via ssh. For this to work you need
     # to create the follwing ENV vars.
-    def execute_remote_command(commands, network)
+    def execute_remote_command(cmd, network)
 
       host = ENV[network.to_s.upcase + '_HOST']
       username = ENV[network.to_s.upcase + '_USER']
       password = ENV[network.to_s.upcase + '_PASSWORD']
-      prefix = ENV[network.to_s.upcase + '_CLI_CMD'] 
+      cmd = ENV[network.to_s.upcase + '_CLI_CMD'] + ' ' + cmd 
 
       stdout  = ""
+      stderr = ""
       begin
         Net::SSH.start(host, username, 
           :password => password,
           :auth_methods => [ 'password' ],
           :number_of_password_prompts => 0)  do |ssh|
-          
-          if ! commands.is_a?(Array)
-            commands = [commands]
-          end
-          
-          commands.each do |command|
-            
-            cmdout = ""
-            
-            ssh.exec! prefix + ' '+ command do |channel, stream, data|
-              cmdout << data if stream == :stdout
-            end
             
-            stdout << cmdout.tr("\n","")
-            stdout << "\n"
+          ssh.exec! cmd do |channel, stream, data|
+            stdout << data if stream == :stdout
+            stderr << data if stream == :stderr
           end
         end
       rescue Timeout::Error

data/lib/onchain/providers/blockchaininfo_api.rb

@@ -8,17 +8,6 @@ class OnChain::BlockChain
       
       blockinfo_parse_address_tx(address, json)
     end
-
-    def blockinfo_get_history_for_addresses(addresses, network = :bitcoin)
-      history = []
-      addresses.each do |address|
-        res = blockinfo_address_history(address, network)
-        res.each do |r|
-          history << r
-        end
-      end
-      return history
-    end
     
     def blockinfo_parse_address_tx(address, json)
       
@@ -92,7 +81,7 @@ class OnChain::BlockChain
       end
     end
 
-    def blockinfo_get_unspent_outs(address, network = :bitcoin)
+    def blockinfo_get_unspent_outs(address)
       base_url = "https://blockchain.info/unspent?active=#{address}"
       json = fetch_response(base_url, true)
       
@@ -129,7 +118,7 @@ class OnChain::BlockChain
 
     def blockinfo_get_transaction(txhash)
       base = "https://blockchain.info/rawtx/#{txhash}?format=hex"
-      return fetch_response(URI::encode(base), false)
+      return fetch_response(URI::encode(base))
     end
   
     def block_chain(cmd, address, params = "")

data/lib/onchain/providers/blockr_api.rb

@@ -14,17 +14,6 @@ class OnChain::BlockChain
         
         return parse_address_tx(address, json, network)
     end
-
-    def blockr_get_history_for_addresses(addresses, network = :bitcoin)
-      history = []
-      addresses.each do |address|
-        res = blockr_address_history(address, network)
-        res.each do |r|
-          history << r
-        end
-      end
-      return history
-    end
     
     def parse_address_tx(address, json, network)
       

data/lib/onchain/providers/insight_api.rb

@@ -18,17 +18,6 @@ class OnChain::BlockChain
       return parse_insight_address_tx(address, json, network)
         
     end
-
-    def insight_get_history_for_addresses(addresses, network = :bitcoin)
-      history = []
-      addresses.each do |address|
-        res = insight_address_history(address, network)
-        res.each do |r|
-          history << r
-        end
-      end
-      return history
-    end
     
     def parse_insight_address_tx(address, json, network)
       

data/lib/onchain/sweeper.rb

@@ -0,0 +1,139 @@
+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

data/lib/onchain/transaction.rb

@@ -11,7 +11,6 @@ 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']
         
@@ -117,17 +116,6 @@ 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)
     
@@ -136,7 +124,7 @@ class OnChain::Transaction
       total_amount = amount + fee
       
       addresses = redemption_scripts.map { |rs| 
-        generate_address_of_redemption_script(rs)
+        OnChain::Sweeper.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.2'
+  version: '3.03'
 platform: ruby
 authors:
 - Number 6
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-11 00:00:00.000000000 Z
+date: 2016-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: google_currency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Call 3rd party API's but also switch API's if a 3rd party is down
 email:
 - support@onchain.io
@@ -117,11 +103,12 @@ extra_rdoc_files: []
 files:
 - lib/onchain.rb
 - lib/onchain/block_chain.rb
-- lib/onchain/exchange_rates.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/exchange_rates.rb

@@ -1,87 +0,0 @@
-require 'httparty'
-require 'cgi'
-require 'money'
-require 'money/bank/google_currency'
-
-class OnChain::ExchangeRate
-
-  class << self
-    
-    BALANCE_RATE_FOR = 120
-
-    def bitcoin_exchange_rate(currency)
-      begin
-        ticker = "BTC-" + currency.to_s
-
-        if OnChain::BlockChain.cache_read(ticker) == nil
-          if currency == :USD 
-            begin
-              r = HTTParty.get("https://www.bitstamp.net/api/ticker/")    
-              j = JSON.parse r.response.body   
-              rate = j["last"]
-              OnChain::BlockChain.cache_write(ticker, rate, BALANCE_RATE_FOR)
-            rescue
-              r = HTTParty.get("https://blockchain.info/ticker")
-              j = JSON.parse r.response.body
-              OnChain::BlockChain.cache_write(ticker, j["USD"]["last"], BALANCE_RATE_FOR)
-            end
-
-          elsif currency == :EUR
-
-            Money.default_bank = Money::Bank::GoogleCurrency.new
-            
-            btc_usd = exchange_rate(:USD).to_f
-            
-            money = Money.new(1_00, "USD") 
-            
-            usd_eur = money.exchange_to(:EUR).to_f
-            
-            rate = usd_eur * btc_usd
-
-            OnChain::BlockChain.cache_write(ticker, rate.to_s, BALANCE_RATE_FOR)
-
-          elsif currency == :GBP
-
-            Money.default_bank = Money::Bank::GoogleCurrency.new
-            
-            btc_usd = exchange_rate(:USD).to_f
-            
-            money = Money.new(1_00, "USD") 
-            
-            usd_gbp = money.exchange_to(:GBP).to_f
-            
-            rate = usd_gbp * btc_usd
-
-            OnChain::BlockChain.cache_write(ticker, rate.to_s, BALANCE_RATE_FOR)
-
-          else
-            OnChain::BlockChain.cache_write(ticker, "0", BALANCE_RATE_FOR)
-          end
-
-        end
-        return OnChain::BlockChain.cache_read(ticker) 
-      rescue Exception => e
-        puts e.to_s
-        '0'
-      end
-
-    end
-    
-    def alt_exchange_rate(alt_currency)
-      
-      url = 'https://api.coinmarketcap.com/v1/ticker/' + alt_currency.to_s + '/'
-      
-      begin
-       resp = OnChain::BlockChain.fetch_response(url)
-       
-       return resp[0]['price_btc'].to_f
-      rescue => e
-        puts e.to_s
-        return 0.0
-      end
-      
-    end
-
-  end
-
-end