block_io 1.0.6 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0ac0a444bdd6e778287026a7d9e89ef91b25ddd
-  data.tar.gz: 7e9bb72332639245c289c04f474be22ea512eba9
+  metadata.gz: f9dc992c3a7aa1fc125e1eaf8b16d531318e31fd
+  data.tar.gz: fdf9ae723127d8688e55cdc0c1ffc9f0eb263bda
 SHA512:
-  metadata.gz: d06356ff689a5e4a8f30787d1683c2277b4237120daad993e4dac9b564c975d284427c8a147fe61194c1cef06cfb663cfff91bc26c0f86a8a42f3ee3aa58fa86
-  data.tar.gz: 36554afd1641aed6eee40442178a16d337a6174a263f559eefdaf7e63915edbe56a726d738bb8feaa4c69851b984e6b4106149070a13de1a81995de7be175118
+  metadata.gz: 2ed068c30ce271df8745e66288f050b97f5f3ec3f68f3087c88ed3b7068059e29503edc1043521bb55d56f80dfbb57491ce709033e36ef021e850775ee94501f
+  data.tar.gz: e9c4c14b3c2bbd292a20f8a018bd9089b20d5742115b0ebc9d6c2a707e4fac3583e1dc620fb4a580c5ab284b45a4ce3bc911dbd42ba6853930e93524d0e5e412

data/block_io.gemspec

@@ -21,8 +21,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 0"
   spec.add_runtime_dependency "ecdsa", "~> 1.2", '>= 1.2.0'
-  spec.add_runtime_dependency "httpclient", "~> 2.4", '>= 2.4.0'
-  spec.add_runtime_dependency "json", "~> 1.8", '>= 1.8.1'
-  spec.add_runtime_dependency "connection_pool", "~> 2.0", '>= 2.0.0'
+  spec.add_runtime_dependency "httpclient", "~> 2.8", '>= 2.8.0'
+  spec.add_runtime_dependency "oj", "~> 3.3", '>= 3.3.5'
+  spec.add_runtime_dependency "oj_mimic_json"
+  spec.add_runtime_dependency "connection_pool", "~> 2.2", '>= 2.2.1'
   spec.add_runtime_dependency "pbkdf2-ruby", '~> 0.2', '>= 0.2.1'
 end

data/examples/change.rb

@@ -0,0 +1,117 @@
+# 1. create an address (first_address), move all coins to it
+# 2. create an address (second_address), as the change address for the first_address
+# 3. send destination_amount to destination_address from first_address, and the rest of the coins to second_address
+# 4. archive first_address since it will no longer be used
+
+# execute with:
+#    $ DESTINATION_ADDRESS=AN_ADDRESS DESTINATION_AMOUNT=COINS_TO_SEND_TO_DESTINATION_ADDRESS API_KEY=TESTNET_API_KEY PIN=YOUR_SECRET_PIN ruby change.rb
+
+require 'block_io'
+require 'securerandom'
+require 'bigdecimal'
+
+# please use the Dogecoin/Bitcoin Testnet API key here
+BlockIo.set_options :api_key => ENV['API_KEY'], :pin => ENV['PIN'], :version => 2
+
+# create address A, and withdraw all coins to address A
+first_address_label = SecureRandom.hex(8) # the source address
+second_address_label = SecureRandom.hex(8) # the change address
+
+# let's fill up the first address with whatever coins exist in this account
+puts BlockIo.get_new_address(:label => first_address_label)
+
+available_balance = BigDecimal(BlockIo.get_balance()['data']['available_balance'])
+network_fee = BigDecimal('0.0')
+
+puts "Available Balance: #{available_balance.truncate(8).to_s('F')}"
+
+options = {:to_labels => first_address_label, :amounts => available_balance.to_s("F")}
+
+tries = 2 # retry twice at most
+
+begin
+  options[:amounts] = (available_balance - network_fee).truncate(8).to_s("F")
+  
+  response = BlockIo.get_network_fee_estimate(options)
+  network_fee = BigDecimal(response['data']['estimated_network_fee'])
+  
+  puts "Final Network Fee: #{network_fee.truncate(8).to_s('F')}"
+  
+  options[:amounts] = (available_balance - network_fee).truncate(8).to_s("F")
+rescue Exception => e
+  # extract the fee and subtract it from the available amount
+  
+  network_fee = BigDecimal(e.to_s.split(' ')[7])
+  puts "Estimated Network Fee: #{e.to_s.split(' ')[7]}"
+  
+  retry unless (tries -= 1).zero?
+  
+  raise Exception.new("UNABLE TO ESTIMATE NETWORK FEE")
+end
+
+# make the withdrawal
+puts BlockIo.withdraw(options)
+
+# all balance has been transferred to first_address_label
+
+# create the change address
+puts BlockIo.get_new_address(:label => second_address_label)
+
+destination_address = ENV['DESTINATION_ADDRESS']
+destination_amount = BigDecimal(ENV['DESTINATION_AMOUNT'])
+
+puts "Sending #{destination_amount} to #{destination_address}"
+
+available_balance = BigDecimal(BlockIo.get_balance(:labels => first_address_label)['data']['available_balance'])
+
+second_address = BlockIo.get_address_by_label(:label => second_address_label)['data']['address']
+
+options = {}
+
+tries = 2 # two tries to estimate the correct network fee
+
+network_fee = BigDecimal('0.0')
+
+to_addresses = []
+amounts = []
+
+# estimate the fee for this withdrawal
+begin
+  
+  change_amount = available_balance - destination_amount
+  
+  if change_amount - network_fee > 0 then
+    to_addresses = [destination_address, second_address]
+    amounts = [destination_amount.truncate(8).to_s("F"), (change_amount - network_fee).truncate(8).to_s("F")]
+  else
+    to_addresses = [destination_address]
+    amounts = [destination_amount.truncate(8).to_s("F")]
+  end
+  
+  response = BlockIo.get_network_fee_estimate(:from_labels => first_address_label, :to_addresses => to_addresses.join(','), :amounts => amounts.join(','))
+  network_fee = BigDecimal(response['data']['estimated_network_fee'])
+  
+  puts "Final Network Fee: #{network_fee.truncate(8).to_s('F')}"
+  
+rescue Exception => e
+  # extract the fee and subtract it from the available amount
+  
+  puts "Exception: #{e.to_s}"
+  
+  network_fee = BigDecimal(e.to_s.split(' ')[7])
+  puts "Estimated Network Fee: #{e.to_s.split(' ')[7]}"
+  
+  retry unless (tries -= 1).zero?
+  
+  raise Exception.new("UNABLE TO ESTIMATE NETWORK FEE")
+end
+
+# make the withdrawal + send change to change address
+
+puts BlockIo.withdraw(:from_labels => first_address_label, :to_addresses => to_addresses.join(','), :amounts => amounts.join(','))
+
+# archive the first address
+
+puts BlockIo.archive_address(:labels => first_address_label)
+
+

data/lib/block_io.rb

@@ -1,6 +1,6 @@
 require 'block_io/version'
 require 'httpclient'
-require 'json'
+require 'oj'
 require 'connection_pool'
 require 'ecdsa'
 require 'openssl'
@@ -24,7 +24,7 @@ module BlockIo
     @pin = args[:pin]
     @encryptionKey = Helper.pinToAesKey(@pin) if !@pin.nil?
 
-    @conn_pool = ConnectionPool.new(size: 5, timeout: 300) { HTTPClient.new }
+    @conn_pool = ConnectionPool.new(size: 1, timeout: 300) { h = HTTPClient.new; h.tcp_keepalive = true; h.ssl_config.ssl_version = :auto; h }
     
     @version = args[:version] || 2 # default version is 2
     
@@ -56,7 +56,7 @@ module BlockIo
 
     params = get_params(args)
 
-    params += "&pin=#{@pin}" if @version == 1 # Block.io handles the Secret PIN in the legacy API (v1)
+    params << "&pin=" << @pin if @version == 1 # Block.io handles the Secret PIN in the legacy API (v1)
 
     response = self.api_call([method_name, params])
     
@@ -74,21 +74,10 @@ module BlockIo
       # let's sign all the inputs we can
       inputs = response['data']['inputs']
 
-      inputs.each do |input|
-        # iterate over all signers
-        
-        input['signers'].each do |signer|
-          # if our public key matches this signer's public key, sign the data
-
-          signer['signed_data'] = key.sign(input['data_to_sign']) if signer['signer_public_key'] == key.public_key
-
-        end
-        
-      end
+      Helper.signData(inputs, [key])
 
       # the response object is now signed, let's stringify it and finalize this withdrawal
-
-      response = self.api_call(['sign_and_finalize_withdrawal',{:signature_data => response['data'].to_json}])
+      response = self.api_call(['sign_and_finalize_withdrawal',{:signature_data => Oj.dump(response['data'])}])
 
       # if we provided all the required signatures, this transaction went through
       # otherwise Block.io responded with data asking for more signatures
@@ -118,22 +107,10 @@ module BlockIo
 
       # let's sign all the inputs we can
       inputs = response['data']['inputs']
-
-      inputs.each do |input|
-        # iterate over all signers
-        
-        input['signers'].each do |signer|
-          # if our public key matches this signer's public key, sign the data
-
-          signer['signed_data'] = key.sign(input['data_to_sign']) if signer['signer_public_key'] == key.public_key
-
-        end
-        
-      end
+      Helper.signData(inputs, [key])
 
       # the response object is now signed, let's stringify it and finalize this withdrawal
-
-      response = self.api_call(['sign_and_finalize_sweep',{:signature_data => response['data'].to_json}])
+      response = self.api_call(['sign_and_finalize_sweep',{:signature_data => Oj.dump(response['data'])}])
 
       # if we provided all the required signatures, this transaction went through
       # otherwise Block.io responded with data asking for more signatures
@@ -154,11 +131,10 @@ module BlockIo
     @conn_pool.with do |hc|
       # prevent initiation of HTTPClients every time we make this call, use a connection_pool
 
-      hc.ssl_config.ssl_version = :TLSv1
       response = hc.post("#{@base_url.gsub('API_CALL',endpoint[0]).gsub('VERSION', 'v'+@version.to_s) + @api_key}", endpoint[1])
       
       begin
-        body = JSON.parse(response.body)
+        body = Oj.load(response.body)
         raise Exception.new(body['data']['error_message']) if !body['status'].eql?('success')
       rescue
         raise Exception.new('Unknown error occurred. Please report this.')
@@ -310,6 +286,39 @@ module BlockIo
   
   module Helper
     
+    def self.signData(inputs, keys)
+      # sign the given data with the given keys
+      # TODO loop is O(n^3), make it better
+
+      raise Exception.new('Keys object must be an array of keys, without at least one key inside it.') unless keys.is_a?(Array) and keys.size >= 1
+
+      i = 0
+      while i < inputs.size do
+        # iterate over all signers
+        input = inputs[i]
+
+        j = 0
+        while j < input['signers'].size do
+          # if our public key matches this signer's public key, sign the data
+          signer = inputs[i]['signers'][j]
+          
+          k = 0
+          while k < keys.size do
+            # sign for each key provided, if we can
+            key = keys[k]
+            signer['signed_data'] = key.sign(input['data_to_sign']) if signer['signer_public_key'] == key.public_key
+            k = k + 1
+          end
+
+          j = j + 1
+        end
+
+        i = i + 1
+      end
+
+      inputs
+    end
+
     def self.extractKey(encrypted_data, b64_enc_key)
       # passphrase is in plain text
       # encrypted_data is in base64, as it was stored on Block.io

data/lib/block_io/version.rb

@@ -1,3 +1,3 @@
 module BlockIo
-  VERSION = "1.0.6"
+  VERSION = "1.0.8"
 end

metadata

@@ -1,141 +1,155 @@
 --- !ruby/object:Gem::Specification
 name: block_io
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.8
 platform: ruby
 authors:
 - Atif Nazir
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2017-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ecdsa
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.4'
-    - - ">="
+        version: '2.8'
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.4'
-    - - ">="
+        version: '2.8'
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
-  name: json
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.8'
-    - - ">="
+        version: '3.3'
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 3.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.8'
-    - - ">="
+        version: '3.3'
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 3.3.5
+- !ruby/object:Gem::Dependency
+  name: oj_mimic_json
+  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'
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
+        version: '2.2'
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
+        version: '2.2'
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: pbkdf2-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.1
 description: This Ruby Gem is the official reference client for the Block.io payments
@@ -147,13 +161,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - block_io.gemspec
 - examples/basic.rb
+- examples/change.rb
 - examples/dtrust.rb
 - examples/sweeper.rb
 - lib/block_io.rb
@@ -168,17 +183,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: An easy to use Dogecoin, Bitcoin, Litecoin wallet API by Block.io. Sign up