onchain 1.3.8 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4842e854a22d1510b4299e4410d1a28340be9838
-  data.tar.gz: 588ae51421710cf89725901bfccf7335bd4d0b8e
+  metadata.gz: f331e93b3b5c9a5f347417ba89075b2c8742368a
+  data.tar.gz: 5e18cd6bea2f7feb4ff434303152e925644cf1ac
 SHA512:
-  metadata.gz: eed0ff672c4173c3c2c5836fbbba6fe50118530f0bae073096f03d83509fea6e3ff38f3ed86b9c733758df8ae7cd55228f45ec535152f4ebf961c0660fd9f7f1
-  data.tar.gz: 84801fef500cd3a5cc4ae6922a17697148fd23eb2515ad27c43a279229945b5cdfabc9969760ae3871f8e3cf562577c8767369c47964136e2984cca32e44555a
+  metadata.gz: 3d674915a2a462c5b1879ba27504e168b45a284722935345376abc139d93b375664241435d221e7605baf079efcc8784537f37518655e2a94ab1ad728fc45e1f
+  data.tar.gz: d4591b69858b47db70c866fcd990831cb799cf7f3e6b40498ec2d643a193bebbe0ff436dba1c047fc1568c3a344200084744939661be2522fc8cf41acaf2df9f

data/lib/onchain/block_chain.rb

@@ -75,14 +75,6 @@ class OnChain::BlockChain
       return ret
     end
     
-    def get_history_for_addresses(addresses)
-      history = []
-      addresses.each do |address|
-        history << address_history(address)
-      end
-      return history
-    end
-    
     def get_balance_satoshi(address)
       return (get_balance(address).to_f * 100000000).to_i
     end
@@ -104,6 +96,10 @@ class OnChain::BlockChain
             next
           end
           
+          if supplier == :blockr and method_name == 'get_history_for_addresses'
+            next
+          end
+          
           available << supplier
         end
       end

data/lib/onchain/providers/blockchaininfo_api.rb

@@ -1,12 +1,28 @@
 class OnChain::BlockChain
   class << self
 
+    
+    def blockinfo_get_history_for_addresses(addresses)
+      history = []
+      addresses.each do |address|
+        res = blockinfo_address_history(address)
+        res.each do |r|
+          history << r
+        end
+      end
+      return history
+    end
   
     def blockinfo_address_history(address)
       
       base_url = "http://blockchain.info/address/#{address}?format=json"
       json = fetch_response(base_url, true)
       
+      blockinfo_parse_address_tx(address, json)
+    end
+    
+    def blockinfo_parse_address_tx(address, json)
+      
       hist = []
       if json.key?('txs')
         txs = json['txs']
@@ -40,6 +56,7 @@ class OnChain::BlockChain
       else
         'Error'
       end
+      return hist
     end
 
     def blockinfo_get_all_balances(addresses)

data/lib/onchain/providers/chaincom_api.rb

@@ -2,15 +2,26 @@ require 'chain'
 
 class OnChain::BlockChain
   class << self
-  
+
+    
+    def chaincom_get_history_for_addresses(addresses)
+      txs = Chain.get_addresses_transactions(addresses)
+      
+      return chaincom_parse_address_tx(addresses, txs)
+    end
+    
     def chaincom_address_history(address)
       
       txs = Chain.get_address_transactions(address)
       
+      return chaincom_parse_address_tx([address], txs)
+    end
+    
+    def chaincom_parse_address_tx(addresses, txs)
       hist = []
       txs.each do |tx|
         row = {}
-        row[:time] = tx["block_time"]
+        row[:time] = Date.parse(tx["block_time"]).to_s
         row[:addr] = {}
         row[:outs] = {}
         inputs = tx['inputs']
@@ -18,15 +29,15 @@ class OnChain::BlockChain
         recv = "Y"
         inputs.each do |input|
           row[:addr][input["addresses"][0]] = input["addresses"][0]
-          if input["addresses"][0] == address
+          if addresses.include? input["addresses"][0]
             recv = "N"
           end
         end
         tx["outputs"].each do |out|
           row[:outs][out["addresses"][0] ] = out["addresses"][0] 
-          if recv == "Y" and out["addresses"][0]  == address
+          if recv == "Y" and addresses.include? out["addresses"][0]
             val = val + out["value"].to_f / 100000000.0
-          elsif recv == "N" and out["addresses"][0]  != address
+          elsif recv == "N" and addresses.include? out["addresses"][0] 
             val = val + out["value"].to_f / 100000000.0
           end
         end

metadata

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