sibit 0.30.0 → 0.30.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 630864e9ab6ffc8c64cca7cd4e4a413f1924b756bf126c103630ff2a05146ecb
-  data.tar.gz: 68e15a268fc7caf94ebc9d824212daab7f4c823e282db75abfec1b1c747ab53e
+  metadata.gz: 7463ec26890a5bd8515ce96c92190a50edaf46f5b94aed0a1b54261f0d63ca65
+  data.tar.gz: 71be0a78c7bfcfffdebc6daa2c63a570d561b5e6e923f0d600e2791c2856cac5
 SHA512:
-  metadata.gz: 87245d26c76ed83e20606a99217fdf81f7c3952cda04efe3b8578908166fff04d73beb41a8ce9a723c6f535a12a67aea561b819aeb72535a93443d52dce6225f
-  data.tar.gz: 0d777da50586ea0edc315536dfab3333ed3babbeb815d054120609a55610dd5fe90b38e80c93387f368071031c453b32e1f26c7fb079526806d3f5882a1924de
+  metadata.gz: ae0606a033a0506be0d3f397a0ac81bf51db53e7c35671256642764e2dcca358d95cbb9517c67c0a49f0621110926760154ea1c1c885d4aa5b6a2a32792078ff
+  data.tar.gz: 21a0bf5f5e27f3c22ceb82f2432d3b3fdd8a4ae1181cbdad383d34f081024c4802b6c83c2a7f51c1205728ccede22c8e45c8498f2d74ffd04282f828b29b4c54

data/Gemfile.lock

@@ -3,10 +3,12 @@ PATH
   specs:
     sibit (0.0.0)
       backtrace (~> 0.3)
+      decoor (~> 0.1)
+      elapsed (~> 0.2)
       iri (~> 0.5)
-      json (~> 2)
+      json (~> 2.18)
       loog (~> 0.6)
-      openssl (>= 2.0)
+      openssl (~> 3.0)
       retriable_proxy (~> 1.0)
       slop (~> 4.6)
 
@@ -57,6 +59,7 @@ GEM
     cucumber-messages (31.1.0)
     cucumber-tag-expressions (8.1.0)
     date (3.5.1)
+    decoor (0.1.0)
     diff-lcs (1.6.2)
     docile (1.4.1)
     elapsed (0.2.1)
@@ -75,7 +78,6 @@ GEM
       logger (~> 1.0)
     memoist3 (1.0.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.9)
     minitest (6.0.1)
       prism (~> 1.5)
     minitest-reporters (1.7.1)
@@ -84,10 +86,11 @@ GEM
       minitest (>= 5.0)
       ruby-progressbar
     multi_test (1.1.0)
-    nokogiri (1.18.10)
-      mini_portile2 (~> 2.8.2)
+    nokogiri (1.18.10-arm64-darwin)
       racc (~> 1.4)
-    openssl (4.0.0)
+    nokogiri (1.18.10-x86_64-linux-gnu)
+      racc (~> 1.4)
+    openssl (3.3.2)
     os (1.1.4)
     parallel (1.27.0)
     parser (3.3.10.0)

data/README.md

@@ -91,13 +91,13 @@ If everything looks correct, remove the `--dry` and run again,
 To use an HTTPS proxy for all requests:
 
 ```bash
-$ sibit --proxy=host:port balance 1PfsYNygsuVL8fvBarJNQnHytkg4rGih1U
+sibit --proxy=host:port balance 1PfsYNygsuVL8fvBarJNQnHytkg4rGih1U
 ```
 
 The proxy address may include authentication credentials:
 
 ```bash
-$ sibit --proxy=user:password@host:port balance 1PfsYNygsuVL8fvBarJNQnHytkg4rGih1U
+sibit --proxy=user:password@host:port balance 1PfsYNygsuVL8fvBarJNQnHytkg4rGih1U
 ```
 
 All operations are performed through the [Blockchain API].

data/bin/sibit

@@ -18,10 +18,13 @@ require_relative '../lib/sibit/blockchain'
 require_relative '../lib/sibit/blockchair'
 require_relative '../lib/sibit/btc'
 require_relative '../lib/sibit/cex'
+require_relative '../lib/sibit/dry'
 require_relative '../lib/sibit/fake'
 require_relative '../lib/sibit/firstof'
 require_relative '../lib/sibit/version'
 
+log = Loog::REGULAR
+
 opts =
   begin
     Slop.parse(ARGV, strict: true, help: true) do |o|
@@ -43,7 +46,7 @@ Options are:"
       )
       o.bool '--dry', 'Don\'t send a real payment, run in a read-only mode'
       o.bool '--help', 'Read this: https://github.com/yegor256/sibit' do
-        puts o
+        log.info(o)
         exit
       end
       o.bool '--verbose', 'Print all possible debug messages'
@@ -62,35 +65,36 @@ Options are:"
     raise e.message
   end
 
+raise 'Try --help' if opts.arguments.empty?
+
 begin
-  raise 'Try --help' if opts.arguments.empty?
-  log = opts[:verbose] ? Loog::VERBOSE : Loog::NULL
+  log = Loog::VERBOSE if opts[:verbose]
   http = opts[:proxy] ? Sibit::HttpProxy.new(opts[:proxy]) : Sibit::Http.new
   apis = opts[:api].map(&:downcase).map do |a|
-    api = nil
     case a
     when 'blockchain'
-      api = Sibit::Blockchain.new(http: http, log: log, dry: opts[:dry])
+      Sibit::Blockchain.new(http: http, log: log)
     when 'btc'
-      api = Sibit::Btc.new(http: http, log: log, dry: opts[:dry])
+      Sibit::Btc.new(http: http, log: log)
     when 'bitcoinchain'
-      api = Sibit::Bitcoinchain.new(http: http, log: log, dry: opts[:dry])
+      Sibit::Bitcoinchain.new(http: http, log: log)
     when 'blockchair'
-      api = Sibit::Blockchair.new(http: http, log: log, dry: opts[:dry])
+      Sibit::Blockchair.new(http: http, log: log)
     when 'cex'
-      api = Sibit::Cex.new(http: http, log: log, dry: opts[:dry])
+      Sibit::Cex.new(http: http, log: log)
     when 'fake'
-      api = Sibit::Fake.new
+      Sibit::Fake.new
     else
       raise Sibit::Error, "Unknown API \"#{a}\""
     end
-    api = RetriableProxy.for_object(api, on: Sibit::Error) if opts[:attempts] > 1
-    api
   end
-  sibit = Sibit.new(log: log, api: Sibit::FirstOf.new(apis, log: log, verbose: true))
+  api = Sibit::FirstOf.new(apis, log: log, verbose: true)
+  api = Sibit::Dry.new(api, log: log) if opts[:dry]
+  api = RetriableProxy.for_object(api, on: Sibit::Error) if opts[:attempts] > 1
+  sibit = Sibit.new(log: log, api: api)
   case opts.arguments[0]
   when 'price'
-    puts sibit.price
+    log.info(sibit.price)
   when 'fees'
     fees = sibit.fees
     text = %i[S M L XL].map do |m|
@@ -98,19 +102,19 @@ begin
       usd = sat * sibit.price / 100_000_000
       "#{m}: #{sat}sat / $#{format('%<usd>.02f', usd: usd)}"
     end.join("\n")
-    puts text
+    log.info(text)
   when 'latest'
-    puts sibit.latest
+    log.info(sibit.latest)
   when 'generate'
-    puts sibit.generate
+    log.info(sibit.generate)
   when 'create'
     pvt = opts.arguments[1]
     raise 'Private key argument is required' if pvt.nil?
-    puts sibit.create(pvt)
+    log.info(sibit.create(pvt))
   when 'balance'
     address = opts.arguments[1]
     raise 'Address argument is required' if address.nil?
-    puts sibit.balance(address)
+    log.info(sibit.balance(address))
   when 'pay'
     amount = opts.arguments[1]
     raise 'Amount argument is required' if amount.nil?
@@ -124,20 +128,22 @@ begin
     raise 'Target argument is required' if target.nil?
     change = opts.arguments[5]
     raise 'Change argument is required' if change.nil?
-    puts sibit.pay(
-      amount, fee,
-      sources.split(','),
-      target, change,
-      skip_utxo: opts['skip-utxo']
+    log.info(
+      sibit.pay(
+        amount, fee,
+        sources.split(','),
+        target, change,
+        skip_utxo: opts['skip-utxo']
+      )
     )
   else
     raise "Command #{opts.arguments[0]} is not supported"
   end
 rescue StandardError => e
   if opts[:verbose]
-    puts Backtrace.new(e)
+    log.error(Backtrace.new(e))
   else
-    puts "ERROR: #{e.message}"
+    log.error(e.message)
   end
   exit(255)
 end

data/lib/sibit/bestof.rb

@@ -92,10 +92,10 @@ class Sibit::BestOf
       # Just ignore it
     rescue Sibit::Error => e
       errors << e
-      @log.info("The API #{api.class.name} failed at #{method}(): #{e.message}") if @verbose
+      @log.debug("The API #{api.class.name} failed at #{method}(): #{e.message}") if @verbose
     end
     if results.empty?
-      errors.each { |e| @log.info(Backtrace.new(e).to_s) }
+      errors.each { |e| @log.debug(Backtrace.new(e).to_s) }
       raise Sibit::Error, "No APIs out of #{@list.length} managed to succeed at #{method}(): \
 #{@list.map { |a| a.class.name }.join(', ')}"
     end

data/lib/sibit/bitcoinchain.rb

@@ -19,10 +19,9 @@ require_relative 'version'
 # License:: MIT
 class Sibit::Bitcoinchain
   # Constructor.
-  def initialize(log: Loog::NULL, http: Sibit::Http.new, dry: false)
+  def initialize(log: Loog::NULL, http: Sibit::Http.new)
     @http = http
     @log = log
-    @dry = dry
   end
 
   # Current price of BTC in USD (float returned).
@@ -43,8 +42,8 @@ class Sibit::Bitcoinchain
     raise Sibit::Error, "Block #{hash} not found" if block.nil?
     nxt = block['next_block']
     nxt = nil if nxt == '0000000000000000000000000000000000000000000000000000000000000000'
-    @log.info("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?
+    @log.debug("The block #{hash} is the latest, there is no next block") if nxt.nil?
+    @log.debug("The next block of #{hash} is #{nxt}") unless nxt.nil?
     nxt
   end
 
@@ -56,12 +55,12 @@ class Sibit::Bitcoinchain
     )[0]
     b = json['balance']
     if b.nil?
-      @log.info("The balance of #{address} is not visible")
+      @log.debug("The balance of #{address} is not visible")
       return 0
     end
     b *= 100_000_000
     b = b.to_i
-    @log.info("The balance of #{address} is #{b} satoshi (#{json['transactions']} txns)")
+    @log.debug("The balance of #{address} is #{b} satoshi (#{json['transactions']} txns)")
     b
   end
 
@@ -75,7 +74,7 @@ class Sibit::Bitcoinchain
     hash = Sibit::Json.new(http: @http, log: @log).get(
       Iri.new('https://api-r.bitcoinchain.com/v1/status')
     )['hash']
-    @log.info("The latest block hash is #{hash}")
+    @log.debug("The latest block hash is #{hash}")
     hash
   end
 

data/lib/sibit/blockchain.rb

@@ -22,10 +22,9 @@ require_relative 'version'
 # License:: MIT
 class Sibit::Blockchain
   # Constructor.
-  def initialize(log: Loog::NULL, http: Sibit::Http.new, dry: false)
+  def initialize(log: Loog::NULL, http: Sibit::Http.new)
     @http = http
     @log = log
-    @dry = dry
   end
 
   # Current price of BTC in USD (float returned).
@@ -35,7 +34,7 @@ class Sibit::Blockchain
     )[currency]
     raise Error, "Unrecognized currency #{currency}" if h.nil?
     price = h['15m']
-    @log.info("The price of BTC is #{price} USD")
+    @log.debug("The price of BTC is #{price} USD")
     price
   end
 
@@ -47,9 +46,9 @@ class Sibit::Blockchain
     # )
     # nxt = json['next_block'][0]
     # if nxt.nil?
-    #   @log.info("There is no block after #{hash}")
+    #   @log.debug("There is no block after #{hash}")
     # else
-    #   @log.info("The next block of #{hash} is #{nxt}")
+    #   @log.debug("The next block of #{hash} is #{nxt}")
     # end
     # nxt
   end
@@ -60,7 +59,7 @@ class Sibit::Blockchain
       Iri.new('https://blockchain.info/rawblock').append(hash)
     )
     h = json['height']
-    @log.info("The height of #{hash} is #{h}")
+    @log.debug("The height of #{hash} is #{h}")
     h
   end
 
@@ -71,7 +70,7 @@ class Sibit::Blockchain
       accept: [200, 500]
     )
     b = json['final_balance']
-    @log.info("The balance of #{address} is #{b} satoshi (#{json['n_tx']} txns)")
+    @log.debug("The balance of #{address} is #{b} satoshi (#{json['n_tx']} txns)")
     b
   end
 
@@ -80,8 +79,12 @@ class Sibit::Blockchain
     json = Sibit::Json.new(http: @http, log: @log).get(
       Iri.new('https://api.blockchain.info/mempool/fees')
     )
-    @log.info("Current recommended Bitcoin fees: \
-    #{json['regular']}/#{json['priority']}/#{json['limits']['max']} sat/byte")
+    @log.debug(
+      [
+        'Currently recommended Bitcoin fees: ',
+        "#{json['regular']}/#{json['priority']}/#{json['limits']['max']} sat/byte"
+      ].join
+    )
     {
       S: json['regular'] / 3,
       M: json['regular'],
@@ -108,7 +111,6 @@ class Sibit::Blockchain
 
   # Push this transaction (in hex format) to the network.
   def push(hex)
-    return if @dry
     Sibit::Json.new(http: @http, log: @log).post(
       Iri.new('https://blockchain.info/pushtx'),
       hex
@@ -120,7 +122,7 @@ class Sibit::Blockchain
     hash = Sibit::Json.new(http: @http, log: @log).get(
       Iri.new('https://blockchain.info/latestblock')
     )['hash']
-    @log.info("The latest block hash is #{hash}")
+    @log.debug("The latest block hash is #{hash}")
     hash
   end
 

data/lib/sibit/blockchair.rb

@@ -20,11 +20,10 @@ require_relative 'version'
 # License:: MIT
 class Sibit::Blockchair
   # Constructor.
-  def initialize(key: nil, log: Loog::NULL, http: Sibit::Http.new, dry: false)
+  def initialize(key: nil, log: Loog::NULL, http: Sibit::Http.new)
     @key = key
     @http = http
     @log = log
-    @dry = dry
   end
 
   # Current price of BTC in USD (float returned).
@@ -49,12 +48,12 @@ class Sibit::Blockchair
       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")
+      @log.debug("Address #{address} not found")
       return 0
     end
     a = json['address']
     b = a['balance']
-    @log.info("The balance of #{address} is #{b} satoshi")
+    @log.debug("The balance of #{address} is #{b} satoshi")
     b
   end
 
@@ -79,7 +78,7 @@ class Sibit::Blockchair
       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")
+    @log.debug("Transaction (#{hex.length} in hex) has been pushed to Blockchair")
   end
 
   # This method should fetch a Blockchain block and return as a hash.

data/lib/sibit/btc.rb

@@ -21,10 +21,9 @@ require_relative 'version'
 # License:: MIT
 class Sibit::Btc
   # Constructor.
-  def initialize(log: Loog::NULL, http: Sibit::Http.new, dry: false)
+  def initialize(log: Loog::NULL, http: Sibit::Http.new)
     @http = http
     @log = log
-    @dry = dry
   end
 
   # Current price of BTC in USD (float returned).
@@ -37,21 +36,21 @@ class Sibit::Btc
     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)")
+      @log.debug("The balance of #{address} is zero (not found)")
       return 0
     end
     data = json['data']
     if data.nil?
-      @log.info("The balance of #{address} is probably zero (not found)")
+      @log.debug("The balance of #{address} is probably zero (not found)")
       return 0
     end
     txns = data['list']
     if txns.nil?
-      @log.info("The balance of #{address} is probably zero (not found)")
+      @log.debug("The balance of #{address} is probably zero (not found)")
       return 0
     end
     balance = txns.sum { |tx| tx['value'] } || 0
-    @log.info("The balance of #{address} is #{balance}, total txns: #{txns.count}")
+    @log.debug("The balance of #{address} is #{balance}, total txns: #{txns.count}")
     balance
   end
 
@@ -64,8 +63,8 @@ class Sibit::Btc
     raise Sibit::Error, "The block #{hash} not found" if data.nil?
     nxt = data['next_block_hash']
     nxt = nil if nxt == '0000000000000000000000000000000000000000000000000000000000000000'
-    @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?
+    @log.debug("In BTC.com the block #{hash} is the latest, there is no next block") if nxt.nil?
+    @log.debug("The next block of #{hash} is #{nxt}") unless nxt.nil?
     nxt
   end
 
@@ -78,7 +77,7 @@ class Sibit::Btc
     raise Sibit::Error, "The block #{hash} not found" if data.nil?
     h = data['height']
     raise Sibit::Error, "The block #{hash} found but the height is absent" if h.nil?
-    @log.info("The height of #{hash} is #{h}")
+    @log.debug("The height of #{hash} is #{h}")
     h
   end
 
@@ -94,7 +93,7 @@ class Sibit::Btc
     data = json['data']
     raise Sibit::Error, 'The latest block not found' if data.nil?
     hash = data['hash']
-    @log.info("The hash of the latest block is #{hash}")
+    @log.debug("The hash of the latest block is #{hash}")
     hash
   end
 

data/lib/sibit/cex.rb

@@ -18,10 +18,9 @@ require_relative 'json'
 # License:: MIT
 class Sibit::Cex
   # Constructor.
-  def initialize(log: Loog::NULL, http: Sibit::Http.new, dry: false)
+  def initialize(log: Loog::NULL, http: Sibit::Http.new)
     @http = http
     @log = log
-    @dry = dry
   end
 
   # Current price of BTC in USD (float returned).
@@ -30,7 +29,7 @@ class Sibit::Cex
       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}")
+    @log.debug("The price of BTC is #{p} #{currency}")
     p
   end
 

data/lib/sibit/cryptoapis.rb

@@ -19,11 +19,10 @@ require_relative 'version'
 # License:: MIT
 class Sibit::Cryptoapis
   # Constructor.
-  def initialize(key, log: Loog::NULL, http: Sibit::Http.new, dry: false)
+  def initialize(key, log: Loog::NULL, http: Sibit::Http.new)
     @key = key
     @http = http
     @log = log
-    @dry = dry
   end
 
   # Current price of BTC in USD (float returned).
@@ -37,8 +36,8 @@ class Sibit::Cryptoapis
       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?
-    @log.info("The next block of #{hash} is #{nxt}") unless nxt.nil?
+    @log.debug("The block #{hash} is the latest, there is no next block") if nxt.nil?
+    @log.debug("The next block of #{hash} is #{nxt}") unless nxt.nil?
     nxt
   end
 
@@ -49,7 +48,7 @@ class Sibit::Cryptoapis
       headers: headers
     )['payload']
     h = json['height']
-    @log.info("The height of #{hash} is #{h}")
+    @log.debug("The height of #{hash} is #{h}")
     h
   end
 
@@ -60,7 +59,7 @@ class Sibit::Cryptoapis
       headers: headers
     )['payload']
     b = (json['balance'].to_f * 100_000_000).to_i
-    @log.info("The balance of #{address} is #{b} satoshi")
+    @log.debug("The balance of #{address} is #{b} satoshi")
     b
   end
 
@@ -75,7 +74,7 @@ class Sibit::Cryptoapis
       Iri.new('https://api.cryptoapis.io/v1/bc/btc/mainnet/blocks/latest'),
       headers: headers
     )['payload']['hash']
-    @log.info("The latest block hash is #{hash}")
+    @log.debug("The latest block hash is #{hash}")
     hash
   end
 

data/lib/sibit/dry.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+# SPDX-FileCopyrightText: Copyright (c) 2019-2025 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
+
+require 'decoor'
+require 'loog'
+
+# Dry mode decorator for API classes.
+#
+# Wraps any API object and prevents push() from sending transactions.
+# All other methods are delegated to the wrapped API unchanged.
+#
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2019-2025 Yegor Bugayenko
+# License:: MIT
+class Sibit::Dry
+  def initialize(api, log: Loog::NULL)
+    @api = api
+    @log = log
+  end
+
+  decoor(:api)
+
+  def push(_hex)
+    @log.debug('Transaction not pushed, dry mode is ON')
+    nil
+  end
+end

data/lib/sibit/firstof.rb

@@ -88,7 +88,7 @@ class Sibit::FirstOf
     done = false
     result = nil
     @list.each do |api|
-      @log.info("Calling #{api.class.name}##{method}()...")
+      @log.debug("Calling #{api.class.name}##{method}()...")
       begin
         result = yield api
         done = true
@@ -97,11 +97,11 @@ class Sibit::FirstOf
         # Just ignore it
       rescue Sibit::Error => e
         errors << e
-        @log.info("The API #{api.class.name} failed at #{method}(): #{e.message}") if @verbose
+        @log.debug("The API #{api.class.name} failed at #{method}(): #{e.message}") if @verbose
       end
     end
     unless done
-      errors.each { |e| @log.info(Backtrace.new(e).to_s) }
+      errors.each { |e| @log.debug(Backtrace.new(e).to_s) }
       raise Sibit::Error, "No APIs out of #{@list.length} managed to succeed at #{method}(): \
 #{@list.map { |a| a.class.name }.join(', ')}"
     end

data/lib/sibit/json.rb

@@ -4,6 +4,7 @@
 # SPDX-License-Identifier: MIT
 
 require 'cgi'
+require 'elapsed'
 require 'json'
 require 'loog'
 require 'uri'
@@ -30,52 +31,55 @@ class Sibit::Json
   # This method will also log the process and will validate the
   # response for correctness.
   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}" if uri.query}",
-      {
-        'Accept' => 'application/json',
-        'User-Agent' => user_agent,
-        'Accept-Charset' => 'UTF-8',
-        'Accept-Encoding' => ''
-      }.merge(headers)
-    )
-    unless accept.include?(res.code.to_i)
-      raise Sibit::Error, "Failed to retrieve #{uri} (#{res.code}): #{res.body}"
+    ret = nil
+    elapsed(@log) do
+      uri = URI(address.to_s)
+      res = @http.client(uri).get(
+        "#{uri.path.empty? ? '/' : uri.path}#{"?#{uri.query}" if uri.query}",
+        {
+          'Accept' => 'application/json',
+          'User-Agent' => user_agent,
+          'Accept-Charset' => 'UTF-8',
+          'Accept-Encoding' => ''
+        }.merge(headers)
+      )
+      unless accept.include?(res.code.to_i)
+        raise Sibit::Error, "Failed to retrieve #{uri} (#{res.code}): #{res.body}"
+      end
+      ret =
+        begin
+          JSON.parse(res.body)
+        rescue JSON::ParserError => e
+          raise Sibit::Error, "Can't parse JSON: #{e.message}"
+        end
+      throw :"GET #{uri}: #{res.code}/#{length(res.body.length)}"
     end
-    @log.info("GET #{uri}: #{res.code}/#{length(res.body.length)} in #{age(start)}")
-    JSON.parse(res.body)
-  rescue JSON::ParserError => e
-    raise Sibit::Error, "Can't parse JSON: #{e.message}"
+    ret
   end
 
   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)}",
-      {
-        'Accept' => 'text/plain',
-        'User-Agent' => user_agent,
-        'Accept-Charset' => 'UTF-8',
-        'Accept-Encoding' => '',
-        'Content-Type' => 'application/x-www-form-urlencoded'
-      }.merge(headers)
-    )
-    unless res.code == '200'
-      raise Sibit::Error, "Failed to post tx to #{uri}: #{res.code}\n#{res.body}"
+    elapsed(@log) do
+      res = @http.client(uri).post(
+        "#{uri.path}?#{uri.query}",
+        "tx=#{CGI.escape(body)}",
+        {
+          'Accept' => 'text/plain',
+          'User-Agent' => user_agent,
+          'Accept-Charset' => 'UTF-8',
+          'Accept-Encoding' => '',
+          'Content-Type' => 'application/x-www-form-urlencoded'
+        }.merge(headers)
+      )
+      unless res.code == '200'
+        raise Sibit::Error, "Failed to post tx to #{uri}: #{res.code}\n#{res.body}"
+      end
+      throw :"POST #{uri}: #{res.code}"
     end
-    @log.info("POST #{uri}: #{res.code} in #{age(start)}")
   end
 
   private
 
-  def age(start)
-    "#{((Time.now - start) * 1000).round}ms"
-  end
-
   def length(bytes)
     if bytes > 1024 * 1024
       "#{bytes / (1024 * 1024)}mb"

data/lib/sibit/version.rb

@@ -9,5 +9,5 @@
 # License:: MIT
 class Sibit
   # Current version of the library.
-  VERSION = '0.30.0'
+  VERSION = '0.30.2'
 end

data/lib/sibit.rb

@@ -4,11 +4,11 @@
 # SPDX-License-Identifier: MIT
 
 require 'loog'
-require_relative 'sibit/bitcoin/base58'
-require_relative 'sibit/bitcoin/key'
-require_relative 'sibit/bitcoin/script'
-require_relative 'sibit/bitcoin/tx'
-require_relative 'sibit/bitcoin/txbuilder'
+require_relative 'sibit/base58'
+require_relative 'sibit/key'
+require_relative 'sibit/script'
+require_relative 'sibit/tx'
+require_relative 'sibit/txbuilder'
 require_relative 'sibit/blockchain'
 require_relative 'sibit/version'
 
@@ -49,7 +49,7 @@ class Sibit
   # Generates new Bitcoin private key and returns in Hash160 format.
   def generate
     key = Key.generate.priv
-    @log.info("Bitcoin private key generated: #{key[0..8]}...")
+    @log.debug("Bitcoin private key generated: #{key[0..8]}...")
     key
   end
 
@@ -100,17 +100,17 @@ class Sibit
   # +change+: the address where the change has to be sent to
   def pay(amount, fee, sources, target, change, skip_utxo: [])
     p = price('USD')
-    sources = sources.map { |k| [Key.new(k).addr, k] }.to_h
+    sources = sources.to_h { |k| [Key.new(k).addr, k] }
     satoshi = satoshi(amount)
     builder = TxBuilder.new
     unspent = 0
     size = 100
     utxos = @api.utxos(sources.keys)
-    @log.info("#{utxos.count} UTXOs found, these will be used \
+    @log.debug("#{utxos.count} UTXOs found, these will be used \
 (value/confirmations at tx_hash):")
     utxos.each do |utxo|
       if skip_utxo.include?(utxo[:hash])
-        @log.info("UTXO skipped: #{utxo[:hash]}")
+        @log.debug("UTXO skipped: #{utxo[:hash]}")
         next
       end
       unspent += utxo[:value]
@@ -124,7 +124,7 @@ class Sibit
         i.signature_key(key(k))
       end
       size += 180
-      @log.info(
+      @log.debug(
         "  #{num(utxo[:value], p)}/#{utxo[:confirmations]} at #{utxo[:hash]}"
       )
       break if unspent > satoshi
@@ -132,11 +132,14 @@ class Sibit
     if unspent < satoshi
       raise Error, "Not enough funds to send #{num(satoshi, p)}, only #{num(unspent, p)} left"
     end
-    builder.output(satoshi, target)
     f = mfee(fee, size)
-    satoshi += f if f.negative?
+    if f.negative?
+      satoshi += f
+      f = -f
+    end
     raise Error, "The fee #{f.abs} covers the entire amount" if satoshi.zero?
     raise Error, "The fee #{f.abs} is bigger than the amount #{satoshi}" if satoshi.negative?
+    builder.output(satoshi, target)
     tx = builder.tx(
       input_value: unspent,
       leave_fee: true,
@@ -144,7 +147,7 @@ class Sibit
       change_address: change
     )
     left = unspent - tx.outputs.sum(&:value)
-    @log.info("A new Bitcoin transaction #{tx.hash} prepared:
+    @log.debug("A new Bitcoin transaction #{tx.hash} prepared:
   #{tx.in.count} input#{'s' if tx.in.count > 1}:
     #{tx.inputs.map { |i| " in: #{i.prev_out.unpack1('H*')}:#{i.prev_out_index}" }.join("\n    ")}
   #{tx.out.count} output#{'s' if tx.out.count > 1}:
@@ -186,10 +189,10 @@ class Sibit
       json = @api.block(block)
       if json[:orphan]
         steps = 4
-        @log.info("Orphan block found at #{block}, moving #{steps} steps back...")
+        @log.debug("Orphan block found at #{block}, moving #{steps} steps back...")
         steps.times do
           block = json[:previous]
-          @log.info("Moved back to #{block}")
+          @log.debug("Moved back to #{block}")
           json = @api.block(block)
         end
         next
@@ -203,34 +206,34 @@ class Sibit
           hash = "#{t[:hash]}:#{i}"
           satoshi = o[:value]
           if yield(address, hash, satoshi)
-            @log.info("Bitcoin tx found at #{hash} for #{satoshi} sent to #{address}")
+            @log.debug("Bitcoin tx found at #{hash} for #{satoshi} sent to #{address}")
           end
         end
         checked += 1
       end
       count += 1
-      @log.info("We checked #{checked} txns and #{checked_outputs} outputs \
+      @log.debug("We checked #{checked} txns and #{checked_outputs} outputs \
 in block #{block} (by #{json[:provider]})")
       block = json[:next]
       begin
         if block.nil?
-          @log.info("The next_block is empty in #{json[:hash]}, this may be the end...")
+          @log.debug("The next_block is empty in #{json[:hash]}, this may be the end...")
           block = @api.next_of(json[:hash])
         end
       rescue Sibit::Error => e
-        @log.info("Failed to get the next_of(#{json[:hash]}), quitting: #{e.message}")
+        @log.debug("Failed to get the next_of(#{json[:hash]}), quitting: #{e.message}")
         break
       end
       if block.nil?
-        @log.info("The block #{json[:hash]} is definitely the end of Blockchain, we stop.")
+        @log.debug("The block #{json[:hash]} is definitely the end of Blockchain, we stop.")
         break
       end
       if count >= max
-        @log.info("Too many blocks (#{count}) in one go, let's get back to it next time")
+        @log.debug("Too many blocks (#{count}) in one go, let's get back to it next time")
         break
       end
     end
-    @log.info("Scanned from #{start} to #{json[:hash]} (#{count} blocks)")
+    @log.debug("Scanned from #{start} to #{json[:hash]} (#{count} blocks)")
     json[:hash]
   end
 
@@ -256,7 +259,7 @@ in block #{block} (by #{json[:provider]})")
 
   # Calculates a fee in satoshi for the transaction of the specified size.
   # The +fee+ argument could be a number in satoshi, in which case it will
-  # be returned as is, or a string like "XL" or "S", in which case the
+  # be returned as is, or a string like "XL" or "S-", in which case the
   # fee will be calculated using the +size+ argument (which is the size
   # of the transaction in bytes).
   def mfee(fee, size)
@@ -269,7 +272,9 @@ in block #{block} (by #{json[:provider]})")
     end
     sat = fees[fee.to_sym]
     raise Error, "Can't understand the fee: #{fee.inspect}" if sat.nil?
-    mul * sat * size
+    f = mul * sat * size
+    @log.debug("Fee calculated as #{mul} * #{sat} * #{size} = #{f}")
+    f
   end
 
   # Make key from private key string in Hash160.

data/sibit.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   if s.respond_to? :required_rubygems_version=
     s.required_rubygems_version = Gem::Requirement.new('>= 0')
   end
-  s.required_ruby_version = '>= 2.5'
+  s.required_ruby_version = '>= 3.0'
   s.name = 'sibit'
   s.version = Sibit::VERSION
   s.license = 'MIT'
@@ -30,10 +30,12 @@ Gem::Specification.new do |s|
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
   s.add_dependency 'backtrace', '~> 0.3'
+  s.add_dependency 'decoor', '~> 0.1'
+  s.add_dependency 'elapsed', '~> 0.2'
   s.add_dependency 'iri', '~> 0.5'
-  s.add_dependency 'json', '~> 2'
+  s.add_dependency 'json', '~> 2.18'
   s.add_dependency 'loog', '~> 0.6'
-  s.add_dependency 'openssl', '>= 2.0'
+  s.add_dependency 'openssl', '~> 3.0'
   s.add_dependency 'retriable_proxy', '~> 1.0'
   s.add_dependency 'slop', '~> 4.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sibit
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.30.2
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -23,6 +23,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: decoor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: elapsed
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: iri
   requirement: !ruby/object:Gem::Requirement
@@ -43,14 +71,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.18'
 - !ruby/object:Gem::Dependency
   name: loog
   requirement: !ruby/object:Gem::Requirement
@@ -69,16 +97,16 @@ dependencies:
   name: openssl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: retriable_proxy
   requirement: !ruby/object:Gem::Requirement
@@ -133,24 +161,25 @@ files:
 - features/step_definitions/steps.rb
 - features/support/env.rb
 - lib/sibit.rb
+- lib/sibit/base58.rb
 - lib/sibit/bestof.rb
-- lib/sibit/bitcoin/base58.rb
-- lib/sibit/bitcoin/key.rb
-- lib/sibit/bitcoin/script.rb
-- lib/sibit/bitcoin/tx.rb
-- lib/sibit/bitcoin/txbuilder.rb
 - lib/sibit/bitcoinchain.rb
 - lib/sibit/blockchain.rb
 - lib/sibit/blockchair.rb
 - lib/sibit/btc.rb
 - lib/sibit/cex.rb
 - lib/sibit/cryptoapis.rb
+- lib/sibit/dry.rb
 - lib/sibit/error.rb
 - lib/sibit/fake.rb
 - lib/sibit/firstof.rb
 - lib/sibit/http.rb
 - lib/sibit/httpproxy.rb
 - lib/sibit/json.rb
+- lib/sibit/key.rb
+- lib/sibit/script.rb
+- lib/sibit/tx.rb
+- lib/sibit/txbuilder.rb
 - lib/sibit/version.rb
 - logo.svg
 - sibit.gemspec
@@ -166,7 +195,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="