onchain 2.5 → 2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75e5c8220374d307aa3f82bdb6e216c06d2f587c
-  data.tar.gz: a889f8795cd4958e2f4ff95fb105e721d12857d3
+  metadata.gz: 2193dbde4c0d67e834351acccd08a750e43fd728
+  data.tar.gz: 5c0198213f4943b4a9c227ebbc585a7badbf24d0
 SHA512:
-  metadata.gz: 9bd3003993dca0e2378427eeab184b2175acf477b89a0316bbd082f3c828d20867630792f2279f8093387198f7463d1fec8ec30e9b559439d5c8b2cffb633c5b
-  data.tar.gz: 2987be8bced4ef31dc15781f642f39f7b512ccf8db1385e20b0782ce571da1e1017099ac59d50cf0dd9149bddc02eaa89b1eb25a74ce0c3a1624208977ed9cdf
+  metadata.gz: 0aee998b0737e7884dc33dd4e1d8d77b775e6d3e9a7d06f724cc277de77a7eb35d762c3ab53ab59961e6acda3891df010daaae0a9daf55426d6cd781b814748d
+  data.tar.gz: 808d0da5669a5b473e3359ee79a0973eb22774544ffa10b2b8bf5842fa5bcab47359db6fa271c4e5e65444b93d6566cdf18ea29d6300b8f85a35d6129c4d9d3a

data/lib/onchain/block_chain.rb

@@ -40,7 +40,14 @@ class OnChain::BlockChain
         end
       end
       
-      get_available_suppliers(method_name).each do |supplier|
+      network = :bitcoin
+      if  args.length > 0
+        if args[args.length - 1] == :testnet3
+          network = :testnet3
+        end
+      end
+      
+      get_available_suppliers(method_name, network).each do |supplier|
 
         real_method = "#{supplier.to_s}_#{method_name}"
         begin
@@ -109,11 +116,15 @@ class OnChain::BlockChain
       return (get_balance(address).to_f * 100000000).to_i
     end
     
-    def get_available_suppliers(method_name)
+    def get_available_suppliers(method_name, network)
       available = []
       ALL_SUPPLIERS.each do |supplier|
         if cache_read(supplier.to_s) == nil
           
+          if supplier == :blockinfo and network == :testnet3
+            next
+          end
+          
           if supplier == :blockinfo and method_name.to_s == 'send_tx'
             next
           end

data/lib/onchain/providers/blockr_api.rb

@@ -1,8 +1,15 @@
 class OnChain::BlockChain
   class << self
     
-    def blockr_send_tx(tx_hex)	
-      uri = URI.parse("http://btc.blockr.io/api/v1/tx/push")		
+    def get_url(network)
+      if network == :bitcoin
+        return "http://btc.blockr.io/api/v1/"
+      end
+      return "http://tbtc.blockr.io/api/v1/"
+    end
+    
+    def blockr_send_tx(tx_hex, network = :bitcoin)	
+      uri = URI.parse(get_url(network) + "tx/push")		
       http = Net::HTTP.new(uri.host, uri.port)		
 		
       request = Net::HTTP::Post.new(uri.request_uri)		
@@ -22,9 +29,9 @@ class OnChain::BlockChain
       return JSON.parse(ret)
     end
 
-    def blockr_get_balance(address)
+    def blockr_get_balance(address, network = :bitcoin)
       if cache_read(address) == nil
-        json = blockr('address/balance', address)
+        json = blockr('address/balance', address, network)
         if json.key?('data')
           bal = json['data']['balance'].to_f
           cache_write(address, bal, BALANCE_CACHE_FOR)
@@ -35,9 +42,9 @@ class OnChain::BlockChain
       return cache_read(address) 
     end
 
-    def blockr_get_address_info(address)
+    def blockr_get_address_info(address, network = :bitcoin)
       
-      json = blockr('address/balance', address)
+      json = blockr('address/balance', address, network)
       
       return { received: json[address]['total_received'], 
         balance: json[address]['final_balance'],
@@ -45,8 +52,8 @@ class OnChain::BlockChain
       
     end
 
-    def blockr_get_transactions(address)
-      base_url = "http://btc.blockr.io/api/v1/address/txs/#{address}"
+    def blockr_get_transactions(address, network = :bitcoin)
+      base_url = get_url(network) + "address/txs/#{address}"
       json = fetch_response(base_url, true)
       
       unspent = []
@@ -61,8 +68,8 @@ class OnChain::BlockChain
       return unspent
     end
 
-    def blockr_get_unspent_outs(address)
-      base_url = "http://btc.blockr.io/api/v1/address/unspent/#{address}"
+    def blockr_get_unspent_outs(address, network = :bitcoin)
+      base_url = get_url(network) + "address/unspent/#{address}"
       json = fetch_response(base_url, true)
       
       unspent = []
@@ -79,7 +86,7 @@ class OnChain::BlockChain
       return unspent
     end
 
-    def blockr_get_all_balances(addresses)
+    def blockr_get_all_balances(addresses, network = :bitcoin)
       
       addr = get_uncached_addresses(addresses)
       
@@ -87,7 +94,7 @@ class OnChain::BlockChain
         return
       end
       
-      base = "https://blockr.io/api/v1/address/balance/"
+      base = get_url(network) + "address/balance/"
       
       addr.each do |address|
         base = base + address + ','
@@ -102,14 +109,14 @@ class OnChain::BlockChain
       end
     end
 
-    def blockr_get_transaction(txhash)
-      base = "https://blockr.io/api/v1/tx/raw/" + txhash
+    def blockr_get_transaction(txhash, network = :bitcoin)
+      base = get_url(network) + "tx/raw/" + txhash
       return fetch_response(URI::encode(base))['data']['tx']['hex']
     end
   
-    def blockr(cmd, address, params = "")
+    def blockr(cmd, address, network, params = "")
 
-      base_url = "http://blockr.io/api/v1/#{cmd}/#{address}" + params
+      base_url = get_url(network) + "#{cmd}/#{address}" + params
       fetch_response(base_url, true)
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onchain
 version: !ruby/object:Gem::Version
-  version: '2.5'
+  version: '2.6'
 platform: ruby
 authors:
 - Ian Purton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake