sibit 0.21.2 → 0.21.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 593c0f45e8be8a5469ad09ec98484016660f50b0ea96d7759c7f0b4b26888846
-  data.tar.gz: 4ff151ef6106f75130eff546a28f2559c0e6b6e2cc2d292db7283b318769d3f1
+  metadata.gz: c72b1319eee0a3b3dc8370b7dd1447109cfd96d86754b5a3aa3444986fb8f9e7
+  data.tar.gz: 7694b4e1284ac6d656b0794c7e58e5ed4d8be6eabd62e126608395f355986635
 SHA512:
-  metadata.gz: 2de6950c08eb3fccc207c46ee71220cac5cefffc942df930b607ac8db0d789b077877cb69444c7a7bfc8696b2704ec5d38af47d346f7b814d235cbcf199873f6
-  data.tar.gz: 8ea109679ddb4d0374ef766faacfc7bae6ed0d31f11b9f50e764493d896b03a7351169e80dfe0924479c5f30c03a9e91d04ad463a90d75e73fabc8558f94f0a1
+  metadata.gz: 60c20d72c1b6b6c37c785bb3c0252d5cf37ed9f55892e51ff8675c17ee8870d5f968dbeeb150efb10b959f7f3dc419a56e7f3a31531b76a4216b62654aea6323
+  data.tar.gz: 7da7246776833039f185b63c2829f387f4fa20f506ba5085d1746e31814d470a3064caf6928b125a2ec9d34226297a2cd6e50d2fd53cb898498cc022f4deec6c

data/lib/sibit/bitcoinchain.rb

@@ -20,13 +20,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'uri'
+require 'iri'
 require 'json'
-require_relative 'version'
+require 'uri'
 require_relative 'error'
-require_relative 'log'
 require_relative 'http'
 require_relative 'json'
+require_relative 'log'
+require_relative 'version'
 
 # Bitcoinchain.com API.
 #
@@ -56,7 +57,7 @@ class Sibit
     # Get hash of the block after this one.
     def next_of(hash)
       block = Sibit::Json.new(http: @http, log: @log).get(
-        URI("https://api-r.bitcoinchain.com/v1/block/#{hash}")
+        Iri.new('https://api-r.bitcoinchain.com/v1/block').append(hash)
       )[0]
       raise Sibit::Error, "Block #{hash} not found" if block.nil?
       nxt = block['next_block']
@@ -69,7 +70,7 @@ class Sibit
     # Gets the balance of the address, in satoshi.
     def balance(address)
       json = Sibit::Json.new(http: @http, log: @log).get(
-        URI("https://api-r.bitcoinchain.com/v1/address/#{address}"),
+        Iri.new('https://api-r.bitcoinchain.com/v1/address').append(address),
         accept: [200, 409]
       )[0]
       b = json['balance']
@@ -91,7 +92,7 @@ class Sibit
     # Gets the hash of the latest block.
     def latest
       hash = Sibit::Json.new(http: @http, log: @log).get(
-        URI('https://api-r.bitcoinchain.com/v1/status')
+        Iri.new('https://api-r.bitcoinchain.com/v1/status')
       )['hash']
       @log.info("The latest block hash is #{hash}")
       hash
@@ -111,11 +112,11 @@ class Sibit
     # an exception if the block is not found.
     def block(hash)
       head = Sibit::Json.new(http: @http, log: @log).get(
-        URI("https://api-r.bitcoinchain.com/v1/block/#{hash}")
+        Iri.new('https://api-r.bitcoinchain.com/v1/block').append(hash)
       )[0]
       raise Sibit::Error, "The block #{hash} is not found" if head.nil?
       txs = Sibit::Json.new(http: @http, log: @log).get(
-        URI("https://api-r.bitcoinchain.com/v1/block/txs/#{hash}")
+        Iri.new('https://api-r.bitcoinchain.com/v1/block/txs').append(hash)
       )
       nxt = head['next_block']
       nxt = nil if nxt == '0000000000000000000000000000000000000000000000000000000000000000'

data/lib/sibit/blockchain.rb

@@ -21,12 +21,13 @@
 # SOFTWARE.
 
 require 'bitcoin'
+require 'iri'
 require 'json'
 require 'uri'
-require_relative 'version'
 require_relative 'error'
 require_relative 'http'
 require_relative 'json'
+require_relative 'version'
 
 # Blockchain.info API.
 #
@@ -49,7 +50,7 @@ class Sibit
     # Current price of BTC in USD (float returned).
     def price(currency = 'USD')
       h = Sibit::Json.new(http: @http, log: @log).get(
-        URI('https://blockchain.info/ticker')
+        Iri.new('https://blockchain.info/ticker')
       )[currency]
       raise Error, "Unrecognized currency #{currency}" if h.nil?
       price = h['15m']
@@ -61,7 +62,7 @@ class Sibit
     def next_of(_hash)
       raise Sibit::NotSupportedError, 'next_of() in Blockchain API is broken, always returns NULL'
       # json = Sibit::Json.new(http: @http, log: @log).get(
-      #   URI("https://blockchain.info/rawblock/#{hash}")
+      #   Iri.new('https://blockchain.info/rawblock').append(hash)
       # )
       # nxt = json['next_block'][0]
       # if nxt.nil?
@@ -75,7 +76,7 @@ class Sibit
     # The height of the block.
     def height(hash)
       json = Sibit::Json.new(http: @http, log: @log).get(
-        URI("https://blockchain.info/rawblock/#{hash}")
+        Iri.new('https://blockchain.info/rawblock').append(hash)
       )
       h = json['height']
       @log.info("The height of #{hash} is #{h}")
@@ -85,7 +86,7 @@ class Sibit
     # Gets the balance of the address, in satoshi.
     def balance(address)
       json = Sibit::Json.new(http: @http, log: @log).get(
-        URI("https://blockchain.info/rawaddr/#{address}?limit=0"),
+        Iri.new('https://blockchain.info/rawaddr').append(address).add(limit: 0),
         accept: [200, 500]
       )
       b = json['final_balance']
@@ -102,7 +103,7 @@ class Sibit
     # of Bitcoin addresses.
     def utxos(sources)
       Sibit::Json.new(http: @http, log: @log).get(
-        URI("https://blockchain.info/unspent?active=#{sources.join('|')}&limit=1000")
+        Iri.new('https://blockchain.info/unspent').add(active: sources.join('|'), limit: 1000)
       )['unspent_outputs'].map do |u|
         {
           value: u['value'],
@@ -118,7 +119,7 @@ class Sibit
     def push(hex)
       return if @dry
       Sibit::Json.new(http: @http, log: @log).post(
-        URI('https://blockchain.info/pushtx'),
+        Iri.new('https://blockchain.info/pushtx'),
         hex
       )
     end
@@ -126,7 +127,7 @@ class Sibit
     # Gets the hash of the latest block.
     def latest
       hash = Sibit::Json.new(http: @http, log: @log).get(
-        URI('https://blockchain.info/latestblock')
+        Iri.new('https://blockchain.info/latestblock')
       )['hash']
       @log.info("The latest block hash is #{hash}")
       hash
@@ -135,7 +136,7 @@ class Sibit
     # This method should fetch a Blockchain block and return as a hash.
     def block(hash)
       json = Sibit::Json.new(http: @http, log: @log).get(
-        URI("https://blockchain.info/rawblock/#{hash}")
+        Iri.new('https://blockchain.info/rawblock').append(hash)
       )
       {
         hash: json['hash'],

data/lib/sibit/blockchair.rb

@@ -20,14 +20,15 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'uri'
-require 'json'
 require 'cgi'
-require_relative 'version'
+require 'iri'
+require 'json'
+require 'uri'
 require_relative 'error'
-require_relative 'log'
 require_relative 'http'
 require_relative 'json'
+require_relative 'log'
+require_relative 'version'
 
 # Blockchair.com API.
 #
@@ -64,7 +65,7 @@ class Sibit
     # Gets the balance of the address, in satoshi.
     def balance(address)
       json = Sibit::Json.new(http: @http, log: @log).get(
-        URI("https://api.blockchair.com/bitcoin/dashboards/address/#{address}?#{the_key}")
+        Iri.new('https://api.blockchair.com/bitcoin/dashboards/address').append(address).fragment(the_key)
       )['data'][address]
       if json.nil?
         @log.info("Address #{address} not found")
@@ -94,7 +95,7 @@ class Sibit
     # Push this transaction (in hex format) to the network.
     def push(hex)
       Sibit::Json.new(http: @http, log: @log).post(
-        URI("https://api.blockchair.com/bitcoin/push/transaction?#{the_key}"),
+        Iri.new('https://api.blockchair.com/bitcoin/push/transaction').fragment(the_key),
         "data=#{hex}"
       )
       @log.info("Transaction (#{hex.length} in hex) has been pushed to Blockchair")

data/lib/sibit/btc.rb

@@ -20,13 +20,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'uri'
+require 'iri'
 require 'json'
-require_relative 'version'
+require 'uri'
 require_relative 'error'
-require_relative 'log'
 require_relative 'http'
 require_relative 'json'
+require_relative 'log'
+require_relative 'version'
 
 # Btc.com API.
 #
@@ -52,7 +53,7 @@ class Sibit
 
     # Gets the balance of the address, in satoshi.
     def balance(address)
-      uri = URI("https://chain.api.btc.com/v3/address/#{address}/unspent")
+      uri = Iri.new('https://chain.api.btc.com/v3/address').append(address).append('unspent')
       json = Sibit::Json.new(http: @http, log: @log).get(uri)
       if json['err_no'] == 1
         @log.info("The balance of #{address} is zero (not found)")
@@ -76,13 +77,13 @@ class Sibit
     # Get hash of the block after this one.
     def next_of(hash)
       head = Sibit::Json.new(http: @http, log: @log).get(
-        URI("https://chain.api.btc.com/v3/block/#{hash}")
+        Iri.new('https://chain.api.btc.com/v3/block').append(hash)
       )
       data = head['data']
       raise Sibit::Error, "The block #{hash} not found" if data.nil?
       nxt = data['next_block_hash']
       nxt = nil if nxt == '0000000000000000000000000000000000000000000000000000000000000000'
-      @log.info("The block #{hash} is the latest, there is no next block") if nxt.nil?
+      @log.info("In BTC.com the block #{hash} is the latest, there is no next block") if nxt.nil?
       @log.info("The next block of #{hash} is #{nxt}") unless nxt.nil?
       nxt
     end
@@ -90,7 +91,7 @@ class Sibit
     # The height of the block.
     def height(hash)
       json = Sibit::Json.new(http: @http, log: @log).get(
-        URI("https://chain.api.btc.com/v3/block/#{hash}")
+        Iri.new('https://chain.api.btc.com/v3/block').append(hash)
       )
       data = json['data']
       raise Sibit::Error, "The block #{hash} not found" if data.nil?
@@ -107,7 +108,7 @@ class Sibit
 
     # Gets the hash of the latest block.
     def latest
-      uri = URI('https://chain.api.btc.com/v3/block/latest')
+      uri = Iri.new('https://chain.api.btc.com/v3/block/latest')
       json = Sibit::Json.new(http: @http, log: @log).get(uri)
       data = json['data']
       raise Sibit::Error, 'The latest block not found' if data.nil?
@@ -121,7 +122,7 @@ class Sibit
       txns = []
       sources.each do |hash|
         json = Sibit::Json.new(http: @http, log: @log).get(
-          URI("https://chain.api.btc.com/v3/address/#{hash}/unspent")
+          Iri.new('https://chain.api.btc.com/v3/address').append(hash).append('unspent')
         )
         data = json['data']
         raise Sibit::Error, "The address #{hash} not found" if data.nil?
@@ -129,7 +130,7 @@ class Sibit
         next if txns.nil?
         txns.each do |u|
           outs = Sibit::Json.new(http: @http, log: @log).get(
-            URI("https://chain.api.btc.com/v3/tx/#{u['tx_hash']}?verbose=3")
+            Iri.new('https://chain.api.btc.com/v3/tx').append(u['tx_hash']).add(verbose: 3)
           )['data']['outputs']
           outs.each_with_index do |o, i|
             next unless o['addresses'].include?(hash)
@@ -154,7 +155,7 @@ class Sibit
     # This method should fetch a Blockchain block and return as a hash.
     def block(hash)
       head = Sibit::Json.new(http: @http, log: @log).get(
-        URI("https://chain.api.btc.com/v3/block/#{hash}")
+        Iri.new('https://chain.api.btc.com/v3/block').append(hash)
       )
       data = head['data']
       raise Sibit::Error, "The block #{hash} not found" if data.nil?
@@ -177,7 +178,8 @@ class Sibit
       all = []
       loop do
         data = Sibit::Json.new(http: @http, log: @log).get(
-          URI("https://chain.api.btc.com/v3/block/#{hash}/tx?page=#{page}&pagesize=#{psize}")
+          Iri.new('https://chain.api.btc.com/v3/block')
+            .append(hash).append('tx').add(page: page, pagesize: psize)
         )['data']
         raise Sibit::Error, "The block #{hash} has no data at page #{page}" if data.nil?
         list = data['list']

data/lib/sibit/cex.rb

@@ -45,7 +45,7 @@ class Sibit
     # Current price of BTC in USD (float returned).
     def price(currency = 'USD')
       json = Sibit::Json.new(http: @http, log: @log).get(
-        URI("https://cex.io/api/last_price/BTC/#{currency}")
+        Iri.new('https://cex.io/api/last_price/BTC').append(currency)
       )
       p = json['lprice'].to_f
       @log.info("The price of BTC is #{p} #{currency}")

data/lib/sibit/cryptoapis.rb

@@ -20,13 +20,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'uri'
+require 'iri'
 require 'json'
-require_relative 'version'
+require 'uri'
 require_relative 'error'
-require_relative 'log'
 require_relative 'http'
 require_relative 'json'
+require_relative 'log'
+require_relative 'version'
 
 # Cryptoapis.io API.
 #
@@ -52,7 +53,7 @@ class Sibit
     # Get hash of the block after this one.
     def next_of(hash)
       nxt = Sibit::Json.new(http: @http, log: @log).get(
-        URI("https://api.cryptoapis.io/v1/bc/btc/mainnet/blocks/#{hash}"),
+        Iri.new('https://api.cryptoapis.io/v1/bc/btc/mainnet/blocks').append(hash),
         headers: headers
       )['payload']['hash']
       @log.info("The block #{hash} is the latest, there is no next block") if nxt.nil?
@@ -63,7 +64,7 @@ class Sibit
     # The height of the block.
     def height(hash)
       json = Sibit::Json.new(http: @http, log: @log).get(
-        URI("https://api.cryptoapis.io/v1/bc/btc/mainnet/blocks/#{hash}"),
+        Iri.new('https://api.cryptoapis.io/v1/bc/btc/mainnet/blocks').append(hash),
         headers: headers
       )['payload']
       h = json['height']
@@ -74,7 +75,7 @@ class Sibit
     # Gets the balance of the address, in satoshi.
     def balance(address)
       json = Sibit::Json.new(http: @http, log: @log).get(
-        URI("https://api.cryptoapis.io/v1/bc/btc/mainnet/address/#{address}"),
+        Iri.new('https://api.cryptoapis.io/v1/bc/btc/mainnet/address').append(address),
         headers: headers
       )['payload']
       b = (json['balance'].to_f * 100_000_000).to_i
@@ -90,7 +91,7 @@ class Sibit
     # Gets the hash of the latest block.
     def latest
       hash = Sibit::Json.new(http: @http, log: @log).get(
-        URI('https://api.cryptoapis.io/v1/bc/btc/mainnet/blocks/latest'),
+        Iri.new('https://api.cryptoapis.io/v1/bc/btc/mainnet/blocks/latest'),
         headers: headers
       )['payload']['hash']
       @log.info("The latest block hash is #{hash}")
@@ -105,7 +106,7 @@ class Sibit
     # Push this transaction (in hex format) to the network.
     def push(hex)
       Sibit::Json.new(http: @http, log: @log).post(
-        URI('https://api.cryptoapis.io/v1/bc/btc/testnet/txs/send'),
+        Iri.new('https://api.cryptoapis.io/v1/bc/btc/testnet/txs/send'),
         JSON.pretty_generate(hex: hex),
         headers: headers
       )
@@ -114,7 +115,7 @@ class Sibit
     # This method should fetch a Blockchain block and return as a hash.
     def block(hash)
       head = Sibit::Json.new(http: @http, log: @log).get(
-        URI("https://api.cryptoapis.io/v1/bc/btc/mainnet/blocks/#{hash}"),
+        Iri.new('https://api.cryptoapis.io/v1/bc/btc/mainnet/blocks').append(hash),
         headers: headers
       )['payload']
       {
@@ -141,12 +142,8 @@ class Sibit
       all = []
       loop do
         txns = Sibit::Json.new(http: @http, log: @log).get(
-          URI(
-            [
-              'https://api.cryptoapis.io/v1/bc/btc/mainnet/txs/block/',
-              "#{hash}?index=#{index}&limit=#{limit}"
-            ].join
-          ),
+          Iri.new('https://api.cryptoapis.io/v1/bc/btc/mainnet/txs/block/')
+            .append(hash).add(index: index, limit: limit),
           headers: headers
         )['payload'].map do |t|
           {

data/lib/sibit/earn.rb

@@ -20,12 +20,13 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require 'iri'
 require 'json'
 require 'uri'
-require_relative 'version'
 require_relative 'error'
 require_relative 'http'
 require_relative 'json'
+require_relative 'version'
 
 # Earn.com API.
 #
@@ -66,7 +67,7 @@ class Sibit
     # a hash: { S: 12, M: 45, L: 100, XL: 200 }
     def fees
       json = Sibit::Json.new(http: @http, log: @log).get(
-        URI('https://bitcoinfees.earn.com/api/v1/fees/recommended')
+        Iri.new('https://bitcoinfees.earn.com/api/v1/fees/recommended')
       )
       @log.info("Current recommended Bitcoin fees: \
 #{json['hourFee']}/#{json['halfHourFee']}/#{json['fastestFee']} sat/byte")

data/lib/sibit/json.rb

@@ -48,8 +48,9 @@ class Sibit
     # Send GET request to the HTTP and return JSON response.
     # This method will also log the process and will validate the
     # response for correctness.
-    def get(uri, headers: {}, accept: [200])
+    def get(address, headers: {}, accept: [200])
       start = Time.now
+      uri = URI(address.to_s)
       res = @http.client(uri).get(
         "#{uri.path.empty? ? '/' : uri.path}#{uri.query ? "?#{uri.query}" : ''}",
         {
@@ -66,8 +67,9 @@ class Sibit
       JSON.parse(res.body)
     end
 
-    def post(uri, body, headers: {})
+    def post(address, body, headers: {})
       start = Time.now
+      uri = URI(address.to_s)
       res = @http.client(uri).post(
         "#{uri.path}?#{uri.query}",
         "tx=#{CGI.escape(body)}",

data/lib/sibit/version.rb

@@ -26,5 +26,5 @@
 # License:: MIT
 class Sibit
   # Current version of the library.
-  VERSION = '0.21.2'
+  VERSION = '0.21.3'
 end

data/sibit.gemspec

@@ -50,6 +50,7 @@ and Ruby 2.3+.'
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
   s.add_runtime_dependency 'backtrace', '~> 0.3'
   s.add_runtime_dependency 'bitcoin-ruby', '0.0.19'
+  s.add_runtime_dependency 'iri', '~> 0.5'
   s.add_runtime_dependency 'json', '~> 2'
   s.add_runtime_dependency 'retriable_proxy', '1.0.2'
   s.add_runtime_dependency 'slop', '~> 4.6'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sibit
 version: !ruby/object:Gem::Version
-  version: 0.21.2
+  version: 0.21.3
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-21 00:00:00.000000000 Z
+date: 2020-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -38,6 +38,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.19
+- !ruby/object:Gem::Dependency
+  name: iri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement