sibit 0.31.0 → 0.32.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7d8d002bcff6bcb41fc9dcd1a4a4ebd2d622460a23777e36da39406e4de8684
-  data.tar.gz: 91d217414aec0258cd458dbbae530738e2efc211f3d259888413a0532554d203
+  metadata.gz: c756b3d04936258f2bfa46b7a385fbb3f5f9ca696728dc2895504b1f5691e65c
+  data.tar.gz: 3d88e0ab75c369c989dfaf360a4b332ac0d5e7479f8e9657734d710e58b712ee
 SHA512:
-  metadata.gz: '099247f1d77cdb32d500e5798f7480b03ce48279d198c059e410f35ca9bb1fc345ee5b6f8342aa8b4ac9982079c9ec0848a26ae8201bb35af04f9bed67f9d2bc'
-  data.tar.gz: 16c9a7c880dc2bb401383bb5e0593fdfcafcdc7ebd77cfe19a7bc0509be14f8e7946b0a663bcd3e71826e60d93296533104a1d094bd25fb0955a1bdc181f6442
+  metadata.gz: 4c385350b69515c9a92a32901afd99685dca40cfc38f85be613e7527421b29481a838eceb6cc21ec1bdce70deee2b8d295806118c8039f7bb78a3fd80547ac70
+  data.tar.gz: acba7a669a53cbb92918751723e9d09a690b1f4e927f275d97633d9e538317bd4c00a355326ee0aa0fbd11a873a41fdf721570f32d73d56ef40fdc489d132b10

data/REUSE.toml

@@ -6,6 +6,7 @@ version = 1
 path = [
     ".DS_Store",
     ".gitattributes",
+    ".gitleaksignore",
     ".gitignore",
     ".pdd",
     "**.json",

data/bin/sibit

@@ -24,6 +24,10 @@ require_relative '../lib/sibit/fake'
 require_relative '../lib/sibit/firstof'
 require_relative '../lib/sibit/version'
 
+VERBOSE = !ARGV.include?('--quiet') &&
+          (ARGV.include?('--verbose') || ENV.fetch('SIBIT_VERBOSE', nil))
+LOG = VERBOSE ? Loog::VERBOSE : Loog::REGULAR
+
 # Command-line interface for Sibit.
 # Provides commands to interact with the Bitcoin network.
 class Bin < Thor
@@ -33,6 +37,7 @@ class Bin < Thor
   class_option :dry, type: :boolean, default: false,
                      desc: "Don't send a real payment, run in a read-only mode"
   class_option :verbose, type: :boolean, default: false, desc: 'Print all possible debug messages'
+  class_option :quiet, type: :boolean, default: false, desc: 'Print only informative messages'
   class_option :api, type: :array, default: %w[blockchain btc bitcoinchain blockchair cex],
                      desc: 'Ordered List of APIs to use, e.g. "blockchain,btc,bitcoinchain"'
 
@@ -47,7 +52,7 @@ class Bin < Thor
 
   desc 'price', 'Get current price of BTC in USD'
   def price
-    log.info(client.price)
+    LOG.info(client.price)
   end
 
   desc 'fees', 'Get currently recommended transaction fees'
@@ -59,39 +64,45 @@ class Bin < Thor
       usd = sat * sibit.price / 100_000_000
       "#{m}: #{sat}sat / $#{format('%<usd>.02f', usd: usd)}"
     end.join("\n")
-    log.info(text)
+    LOG.info(text)
   end
 
   desc 'latest', 'Get hash of the latest block'
   def latest
-    log.info(client.latest)
+    LOG.info(client.latest)
   end
 
   desc 'generate', 'Generate a new private key'
   def generate
-    log.info(client.generate)
+    LOG.info(client.generate)
   end
 
   desc 'create KEY', 'Create a public Bitcoin address from the private key'
   def create(key)
-    log.debug("Private key provided: #{key.ellipsized(8).inspect}")
-    log.info(client.create(key))
+    LOG.debug("Private key provided: #{key.ellipsized(8).inspect}")
+    LOG.info(client.create(key))
   end
 
   desc 'balance ADDRESS', 'Check the balance of the Bitcoin address'
   def balance(address)
-    log.info(client.balance(address))
+    LOG.info(client.balance(address))
   end
 
-  desc 'pay AMOUNT FEE SOURCES TARGET CHANGE', 'Send a new Bitcoin transaction'
+  desc 'pay AMOUNT FEE SOURCES TARGET CHANGE',
+       'Send a new Bitcoin transaction (AMOUNT can be "MAX" to use full balance)'
   option :skip_utxo, type: :array, default: [],
                      desc: 'List of UTXO that must be skipped while paying'
   option :yes, type: :boolean, default: false,
                desc: 'Skip confirmation prompt and send the payment immediately'
   def pay(amount, fee, sources, target, change)
-    amount = amount.to_i if /^[0-9]+$/.match?(amount)
+    keys = sources.split(',')
+    if amount.upcase == 'MAX'
+      addrs = keys.map { |k| Sibit::Key.new(k).bech32 }
+      amount = addrs.sum { |a| client.balance(a) }
+    end
+    amount = amount.to_i if amount.is_a?(String) && /^[0-9]+$/.match?(amount)
     fee = fee.to_i if /^[0-9]+$/.match?(fee)
-    args = [amount, fee, sources.split(','), target, change]
+    args = [amount, fee, keys, target, change]
     kwargs = { skip_utxo: options[:skip_utxo] }
     unless options[:yes] || options[:dry]
       client(dry: true).pay(*args, **kwargs)
@@ -99,55 +110,54 @@ class Bin < Thor
       answer = $stdin.gets&.strip&.downcase
       raise Sibit::Error, 'Payment cancelled by user' unless answer == 'yes'
     end
-    log.info(client.pay(*args, **kwargs))
+    LOG.info(client.pay(*args, **kwargs))
   end
 
   desc 'version', 'Print program version'
   def version
-    log.info(Sibit::VERSION)
+    LOG.info(Sibit::VERSION)
   end
 
   private
 
-  def log
-    @log ||= options[:verbose] ? Loog::VERBOSE : Loog::REGULAR
-  end
-
   def client(dry: false)
-    http = options[:proxy] ? Sibit::HttpProxy.new(options[:proxy]) : Sibit::Http.new
+    proxy = options[:proxy] || ENV.fetch('SIBIT_PROXY', nil)
+    http = proxy ? Sibit::HttpProxy.new(proxy) : Sibit::Http.new
+    LOG.debug("Using proxy at #{http.host}") if proxy
     apis = options[:api].flat_map { |a| a.split(',') }.map(&:downcase).map do |a|
       case a
       when 'blockchain'
-        Sibit::Blockchain.new(http: http, log: log)
+        Sibit::Blockchain.new(http: http, log: LOG)
       when 'btc'
-        Sibit::Btc.new(http: http, log: log)
+        Sibit::Btc.new(http: http, log: LOG)
       when 'bitcoinchain'
-        Sibit::Bitcoinchain.new(http: http, log: log)
+        Sibit::Bitcoinchain.new(http: http, log: LOG)
       when 'blockchair'
-        Sibit::Blockchair.new(http: http, log: log)
+        Sibit::Blockchair.new(http: http, log: LOG)
       when 'cex'
-        Sibit::Cex.new(http: http, log: log)
+        Sibit::Cex.new(http: http, log: LOG)
       when 'fake'
         Sibit::Fake.new
       else
         raise Sibit::Error, "Unknown API \"#{a}\""
       end
     end
-    api = Sibit::FirstOf.new(apis, log: log, verbose: true)
-    api = Sibit::Dry.new(api, log: log) if options[:dry] || dry
+    api = Sibit::FirstOf.new(apis, log: LOG, verbose: true)
+    api = Sibit::Dry.new(api, log: LOG) if options[:dry] || dry
     api = RetriableProxy.for_object(api, on: Sibit::Error) if options[:attempts] > 1
-    Sibit.new(log: log, api: api)
+    Sibit.new(log: LOG, api: api)
   end
 end
 
-begin
-  Bin.start(ARGV)
-rescue StandardError => e
-  log = ARGV.include?('--verbose') ? Loog::VERBOSE : Loog::REGULAR
-  if ARGV.include?('--verbose')
-    log.error(Backtrace.new(e))
-  else
-    log.error(e.message)
+if __FILE__ == $PROGRAM_NAME
+  begin
+    Bin.start(ARGV)
+  rescue StandardError => e
+    if VERBOSE
+      LOG.error(Backtrace.new(e))
+    else
+      LOG.error(e.message)
+    end
+    exit(255)
   end
-  exit(255)
 end

data/lib/sibit/httpproxy.rb

@@ -19,6 +19,8 @@ class Sibit
       @user, @password, @host, @port = parse(addr)
     end
 
+    attr_reader :host
+
     def client(uri)
       http = Net::HTTP.new(uri.host, uri.port, @host, @port.to_i, @user, @password)
       http.use_ssl = true

data/lib/sibit/version.rb

@@ -9,5 +9,5 @@
 # License:: MIT
 class Sibit
   # Current version of the library.
-  VERSION = '0.31.0' unless defined?(VERSION)
+  VERSION = '0.32.1' unless defined?(VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sibit
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.32.1
 platform: ruby
 authors:
 - Yegor Bugayenko