blockchain 1.0.2 → 1.1.1

data/lib/blockchain/createwallet.rb

@@ -1,39 +1,39 @@
-require 'json'
-require_relative 'util'
-
-module Blockchain
-
-	def self.create_wallet(password, api_code, priv: nil, label: nil, email: nil)
-
-		params = { 'password' => password, 'api_code' => api_code }
-		
-		if !priv.nil?
-			params['priv'] = priv
-		end
-		if !label.nil?
-			params['label'] = label
-		end
-		if !email.nil?
-			params['email'] = email
-		end
-		
-		response = Blockchain::call_api('api/v2/create_wallet', method: 'post', data: params)
-		json_response = JSON.parse(response)
-		return CreateWalletResponse.new(json_response['guid'],
-										json_response['address'],
-										json_response['link'])
-	end
-
-	class CreateWalletResponse
-		attr_reader :identifier
-		attr_reader :address
-		attr_reader :link
-
-		def initialize(identifier, address, link)
-			@identifier = identifier
-			@address = address
-			@link = link
-		end
-	end
-
+require 'json'
+require_relative 'util'
+
+module Blockchain
+
+	def self.create_wallet(password, api_code, priv: nil, label: nil, email: nil)
+
+		params = { 'password' => password, 'api_code' => api_code }
+		
+		if !priv.nil?
+			params['priv'] = priv
+		end
+		if !label.nil?
+			params['label'] = label
+		end
+		if !email.nil?
+			params['email'] = email
+		end
+		
+		response = Blockchain::call_api('api/v2/create_wallet', method: 'post', data: params)
+		json_response = JSON.parse(response)
+		return CreateWalletResponse.new(json_response['guid'],
+										json_response['address'],
+										json_response['link'])
+	end
+
+	class CreateWalletResponse
+		attr_reader :identifier
+		attr_reader :address
+		attr_reader :link
+
+		def initialize(identifier, address, link)
+			@identifier = identifier
+			@address = address
+			@link = link
+		end
+	end
+
 end

data/lib/blockchain/exchangerates.rb

@@ -1,47 +1,47 @@
-require 'json'
-require_relative 'util'
-
-module Blockchain
-	
-	class Currency
-		attr_reader :last
-		attr_reader :buy
-		attr_reader :sell
-		attr_reader :symbol
-		attr_reader :p15min
-
-		def initialize(last, buy, sell, symbol, p15min)
-			@last = last
-			@buy = buy
-			@sell = sell
-			@symbol = symbol
-			@p15min = p15min
-		end
-	end
-
-	def self.get_ticker(api_code = nil)
-		params = {}
-		if !api_code.nil? then params['api_code'] = api_code end
-		response = Blockchain::call_api('ticker', data: params)
-		json_response = JSON.parse(response)
-		
-		ticker = {}
-		json_response.each do |key,value|
-			json_ccy = json_response[key]
-			ccy = Currency.new(json_ccy['last'],
-								json_ccy['buy'],
-								json_ccy['sell'],
-								json_ccy['symbol'],
-								json_ccy['15m'])
-			ticker[key] = ccy
-		end
-		return ticker
-	end
-
-	def self.to_btc(ccy, value, api_code = nil)
-		params = { 'currency' => ccy, 'value' => value}
-		if !api_code.nil? then params['api_code'] = api_code end
-		return Blockchain::call_api('tobtc', data: params).to_f
-	end
-
+require 'json'
+require_relative 'util'
+
+module Blockchain
+	
+	class Currency
+		attr_reader :last
+		attr_reader :buy
+		attr_reader :sell
+		attr_reader :symbol
+		attr_reader :p15min
+
+		def initialize(last, buy, sell, symbol, p15min)
+			@last = last
+			@buy = buy
+			@sell = sell
+			@symbol = symbol
+			@p15min = p15min
+		end
+	end
+
+	def self.get_ticker(api_code = nil)
+		params = {}
+		if !api_code.nil? then params['api_code'] = api_code end
+		response = Blockchain::call_api('ticker', data: params)
+		json_response = JSON.parse(response)
+		
+		ticker = {}
+		json_response.each do |key,value|
+			json_ccy = json_response[key]
+			ccy = Currency.new(json_ccy['last'],
+								json_ccy['buy'],
+								json_ccy['sell'],
+								json_ccy['symbol'],
+								json_ccy['15m'])
+			ticker[key] = ccy
+		end
+		return ticker
+	end
+
+	def self.to_btc(ccy, value, api_code = nil)
+		params = { 'currency' => ccy, 'value' => value}
+		if !api_code.nil? then params['api_code'] = api_code end
+		return Blockchain::call_api('tobtc', data: params).to_f
+	end
+
 end

data/lib/blockchain/pushtx.rb

@@ -1,16 +1,16 @@
-require 'json'
-require_relative 'util'
-
-module Blockchain
-
-	def self.pushtx(tx, api_code = nil)
-		params = { 'tx' => tx }
-		
-		if !api_code.nil?
-			params['api_code'] = api_code
-		end
-		
-		Blockchain::call_api('pushtx', method: 'post', data: params)
-	end
-
+require 'json'
+require_relative 'util'
+
+module Blockchain
+
+	def self.pushtx(tx, api_code = nil)
+		params = { 'tx' => tx }
+		
+		if !api_code.nil?
+			params['api_code'] = api_code
+		end
+		
+		Blockchain::call_api('pushtx', method: 'post', data: params)
+	end
+
 end

data/lib/blockchain/receive.rb

@@ -1,32 +1,86 @@
-require 'json'
-require_relative 'util'
-
-module Blockchain
-
-	class ReceiveResponse
-		attr_reader :fee_percent
-		attr_reader :destination
-		attr_reader :input_address
-		attr_reader :callback_url
-		
-		def initialize(fee_percent, dest, input, callback)
-			@fee_percent = fee_percent
-			@destination = dest
-			@input_address = input
-			@callback_url = callback
-		end
-	end	
-
-	def self.receive(dest_addr, callback, api_code = nil)
-		params = { 'method' => 'create', 'address' => dest_addr, 'callback' => callback }
-		if !api_code.nil? then params['api_code'] = api_code end
-		resp = Blockchain::call_api('api/receive', method: 'post', data: params)
-		json_resp = JSON.parse(resp)
-		receive_response = ReceiveResponse.new(json_resp['fee_percent'],
-												json_resp['destination'],
-												json_resp['input_address'],
-												json_resp['callback_url'])
-		return receive_response
-	end
-
+require 'json'
+
+require_relative 'util'
+
+module Blockchain
+
+	class ReceiveResponse
+		attr_reader :fee_percent
+		attr_reader :destination
+		attr_reader :input_address
+		attr_reader :callback_url
+
+		def initialize(fee_percent, dest, input, callback)
+			@fee_percent = fee_percent
+			@destination = dest
+			@input_address = input
+			@callback_url = callback
+		end
+	end
+
+	def self.receive(dest_addr, callback, api_code = nil)
+		params = { 'method' => 'create', 'address' => dest_addr, 'callback' => callback }
+		if !api_code.nil? then params['api_code'] = api_code end
+		resp = Blockchain::call_api('api/receive', method: 'post', data: params)
+		json_resp = JSON.parse(resp)
+		receive_response = ReceiveResponse.new(json_resp['fee_percent'],
+												json_resp['destination'],
+												json_resp['input_address'],
+												json_resp['callback_url'])
+		return receive_response
+	end
+
+	module V2
+		class ReceiveResponse
+			attr_reader :address
+			attr_reader :index
+			attr_reader :callback_url
+
+			def initialize(address, index, callback)
+				@address = address
+				@index = index
+				@callback_url = callback
+			end
+		end
+
+		class LogEntry
+			attr_reader :callback_url
+			attr_reader :called_at
+			attr_reader :raw_response
+			attr_reader :response_code
+
+			def initialize(callback_url, called_at, raw_response, response_code)
+				@callback_url = callback_url
+				@called_at = called_at
+				@raw_response = raw_response
+				@response_code = response_code
+			end
+		end
+
+		def self.receive(xpub, callback, api_key)
+			params = { 'xpub' => xpub, 'callback' => callback, 'key' => api_key }
+			resp = Blockchain::call_api('v2/receive', method: 'get', data: params, base_url: 'https://api.blockchain.info/')
+			json_resp = JSON.parse(resp)
+			receive_response = ReceiveResponse.new(json_resp['address'],
+													json_resp['index'],
+													json_resp['callback'])
+			receive_response
+		end
+
+		def self.callback_log(callback, api_key = nil)
+			params = {'callback' => callback }
+			params['key'] = api_key unless api_key.nil?
+			resp = Blockchain::call_api('v2/receive/callback_log', method: 'get', data: params, base_url: 'https://api.blockchain.info/')
+			json_resp = JSON.parse(resp)
+			receive_response = json_resp.map do |entry|
+				LogEntry.new(entry['callback'],
+							entry['called_at'],
+							entry['raw_response'],
+							entry['response_code'])
+			end
+			receive_response
+		end
+	end
+
+
 end

data/lib/blockchain/statistics.rb

@@ -1,60 +1,60 @@
-require 'json'
-require_relative 'util'
-
-module Blockchain
-
-	def self.get_statistics(api_code = nil)
-		params = { 'format' => 'json' }
-		if !api_code.nil? then params['api_code'] = api_code end
-		response = Blockchain::call_api('stats', method: 'get', data: params)
-		json_response = JSON.parse(response)
-		return StatisticsResponse.new(json_response)
-	end
-
-	class StatisticsResponse
-			attr_reader :trade_volume_btc
-			attr_reader :miners_revenue_usd
-			attr_reader :btc_mined
-			attr_reader :trade_volume_usd
-			attr_reader :difficulty
-			attr_reader :minutes_between_blocks
-			attr_reader :number_of_transactions
-			attr_reader :hash_rate
-			attr_reader :timestamp
-			attr_reader :mined_blocks
-			attr_reader :blocks_size
-			attr_reader :total_fees_btc
-			attr_reader :total_btc_sent
-			attr_reader :estimated_btc_sent
-			attr_reader :total_btc
-			attr_reader :total_blocks
-			attr_reader :next_retarget
-			attr_reader :estimated_transaction_volume_usd
-			attr_reader :miners_revenue_btc
-			attr_reader :market_price_usd
-		
-		def initialize(s)
-			@trade_volume_btc = s['trade_volume_btc']
-			@miners_revenue_usd = s['miners_revenue_usd']
-			@btc_mined = s['n_btc_mined']
-			@trade_volume_usd = s['trade_volume_usd']
-			@difficulty = s['difficulty']
-			@minutes_between_blocks = s['minutes_between_blocks']
-			@number_of_transactions = s['n_tx']
-			@hash_rate = s['hash_rate']
-			@timestamp = s['timestamp']
-			@mined_blocks = s['n_blocks_mined']
-			@blocks_size = s['blocks_size']
-			@total_fees_btc = s['total_fees_btc']
-			@total_btc_sent = s['total_btc_sent']
-			@estimated_btc_sent = s['estimated_btc_sent']
-			@total_btc = s['totalbc']
-			@total_blocks = s['n_blocks_total']
-			@next_retarget = s['nextretarget']
-			@estimated_transaction_volume_usd = s['estimated_transaction_volume_usd']
-			@miners_revenue_btc = s['miners_revenue_btc']
-			@market_price_usd = s['market_price_usd']
-		end
-	end
-	
+require 'json'
+require_relative 'util'
+
+module Blockchain
+
+	def self.get_statistics(api_code = nil)
+		params = { 'format' => 'json' }
+		if !api_code.nil? then params['api_code'] = api_code end
+		response = Blockchain::call_api('stats', method: 'get', data: params)
+		json_response = JSON.parse(response)
+		return StatisticsResponse.new(json_response)
+	end
+
+	class StatisticsResponse
+			attr_reader :trade_volume_btc
+			attr_reader :miners_revenue_usd
+			attr_reader :btc_mined
+			attr_reader :trade_volume_usd
+			attr_reader :difficulty
+			attr_reader :minutes_between_blocks
+			attr_reader :number_of_transactions
+			attr_reader :hash_rate
+			attr_reader :timestamp
+			attr_reader :mined_blocks
+			attr_reader :blocks_size
+			attr_reader :total_fees_btc
+			attr_reader :total_btc_sent
+			attr_reader :estimated_btc_sent
+			attr_reader :total_btc
+			attr_reader :total_blocks
+			attr_reader :next_retarget
+			attr_reader :estimated_transaction_volume_usd
+			attr_reader :miners_revenue_btc
+			attr_reader :market_price_usd
+		
+		def initialize(s)
+			@trade_volume_btc = s['trade_volume_btc']
+			@miners_revenue_usd = s['miners_revenue_usd']
+			@btc_mined = s['n_btc_mined']
+			@trade_volume_usd = s['trade_volume_usd']
+			@difficulty = s['difficulty']
+			@minutes_between_blocks = s['minutes_between_blocks']
+			@number_of_transactions = s['n_tx']
+			@hash_rate = s['hash_rate']
+			@timestamp = s['timestamp']
+			@mined_blocks = s['n_blocks_mined']
+			@blocks_size = s['blocks_size']
+			@total_fees_btc = s['total_fees_btc']
+			@total_btc_sent = s['total_btc_sent']
+			@estimated_btc_sent = s['estimated_btc_sent']
+			@total_btc = s['totalbc']
+			@total_blocks = s['n_blocks_total']
+			@next_retarget = s['nextretarget']
+			@estimated_transaction_volume_usd = s['estimated_transaction_volume_usd']
+			@miners_revenue_btc = s['miners_revenue_btc']
+			@market_price_usd = s['market_price_usd']
+		end
+	end
+	
 end

data/lib/blockchain/util.rb

@@ -1,34 +1,35 @@
-require 'net/http'
-
-module Blockchain
-
-	class APIException < StandardError
-	end
-
-	BASE_URL = "https://blockchain.info/"
-	TIMEOUT_SECONDS = 10
-	
-	def self.call_api(resource, method: 'get', data: nil)
-		url = URI.parse(BASE_URL + resource)
-		http = Net::HTTP.new(url.host, url.port)
-		http.use_ssl = true
-		http.read_timeout = TIMEOUT_SECONDS
-		
-		request = nil
-		if method == 'get'
-			url.query = data.nil? ? nil : URI.encode_www_form(data)
-			request = Net::HTTP::Get.new(url.request_uri)
-		elsif method == 'post'
-			request = Net::HTTP::Post.new(url.request_uri)
-			request.content_type = 'application/x-www-form-urlencoded'
-			if data != nil then request.set_form_data(data) else {} end
-		end
-		
-		response = http.request(request)
-		if response.code != '200'
-			raise APIException, response.body
-		end
-		return response.body
-	end
-
+require 'net/http'
+
+module Blockchain
+
+	class APIException < StandardError
+	end
+
+	BASE_URL = "https://blockchain.info/"
+	TIMEOUT_SECONDS = 10
+	
+	def self.call_api(resource, method: 'get', data: nil, base_url: nil)
+		base_url ||= BASE_URL
+		url = URI.parse(base_url + resource)
+		http = Net::HTTP.new(url.host, url.port)
+		http.use_ssl = true
+		http.read_timeout = TIMEOUT_SECONDS
+		
+		request = nil
+		if method == 'get'
+			url.query = data.nil? ? nil : URI.encode_www_form(data)
+			request = Net::HTTP::Get.new(url.request_uri)
+		elsif method == 'post'
+			request = Net::HTTP::Post.new(url.request_uri)
+			request.content_type = 'application/x-www-form-urlencoded'
+			if data != nil then request.set_form_data(data) else {} end
+		end
+		
+		response = http.request(request)
+		if response.code != '200'
+			raise APIException, response.body
+		end
+		return response.body
+	end
+
 end