onchain 3.03 → 3.04

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd3dee9b9c3e89866a52611e36e4fec6c510675c
-  data.tar.gz: dfec0707b7aa380e6c6189f7065ada17b991dd93
+  metadata.gz: 08143eaa0088555db570b1753e35296579d39d9f
+  data.tar.gz: 93ae2b84fa4ab2d904e0f68b212ecacef8ddeab7
 SHA512:
-  metadata.gz: 4c363a289b43d919c7850de400ae48f3226fe8851cb770148b34ce084549cccb6f654538596a16bd0da586441273cc699696c2cc03772d23f7ef8e351aa31848
-  data.tar.gz: 3a16f3eabf4e6306c89ed07fcae622cfd5d481afbb86676b50142293d6a0e2e48d753df0d699eb474d818f34a5c8d46d29e1e793ad85f3da31f5b3696d0aa1f8
+  metadata.gz: 6d6b4389413c6cfeffe25004dd6a42de12d0aede7065dd519814fcbc7899f84274b88143f9bf5c6c4bb2ba3a30a6a9cf5c0e7bc561fa58b64eb58cb9d53384f8
+  data.tar.gz: b9de2baff98ffbef86cb849a47a592a0959327ccfb2c7629ae0bca8873611dc2316c09333d909e892d3e16fbe22a5641ad73efa41b43f2a16661e15aaf4e52cb

data/lib/onchain/block_chain.rb

@@ -62,17 +62,6 @@ 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.

data/lib/onchain/providers/bitcoind_api.rb

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

data/lib/onchain/providers/blockchaininfo_api.rb

@@ -8,6 +8,17 @@ 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)
       

data/lib/onchain/providers/blockr_api.rb

@@ -14,6 +14,17 @@ 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,6 +18,17 @@ 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)
       

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onchain
 version: !ruby/object:Gem::Version
-  version: '3.03'
+  version: '3.04'
 platform: ruby
 authors:
 - Number 6
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-09 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake