sibit 0.31.0 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7d8d002bcff6bcb41fc9dcd1a4a4ebd2d622460a23777e36da39406e4de8684
-  data.tar.gz: 91d217414aec0258cd458dbbae530738e2efc211f3d259888413a0532554d203
+  metadata.gz: ccc8435725361e992237efffbe4f53e4f6698e8217cbac39ce0f08f8b407cb68
+  data.tar.gz: 8a787c829a4539a6b69be2764ef90b09e61b13797375b382e6a4df69826165cf
 SHA512:
-  metadata.gz: '099247f1d77cdb32d500e5798f7480b03ce48279d198c059e410f35ca9bb1fc345ee5b6f8342aa8b4ac9982079c9ec0848a26ae8201bb35af04f9bed67f9d2bc'
-  data.tar.gz: 16c9a7c880dc2bb401383bb5e0593fdfcafcdc7ebd77cfe19a7bc0509be14f8e7946b0a663bcd3e71826e60d93296533104a1d094bd25fb0955a1bdc181f6442
+  metadata.gz: 253013c5f6b978ea0db8ea3c2800aad241e2d277fbd743f21130dff952610b37fc27366ec8e67728dba64a97efbe1750c1dd7455faf991e856e8af5d06f52e88
+  data.tar.gz: ce524cedb5ae7420113a0d9f6526792f9c47dee863724e64adf7909b94aca0ede25cee286f203063ff65166e00c58512b6310f6ced1ee52a28bd7516ab563e9c

data/REUSE.toml

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

data/bin/sibit

@@ -24,6 +24,9 @@ require_relative '../lib/sibit/fake'
 require_relative '../lib/sibit/firstof'
 require_relative '../lib/sibit/version'
 
+VERBOSE = 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
@@ -83,15 +86,21 @@ class Bin < Thor
     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)
@@ -110,11 +119,13 @@ class Bin < Thor
   private
 
   def log
-    @log ||= options[:verbose] ? Loog::VERBOSE : Loog::REGULAR
+    LOG
   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'
@@ -140,14 +151,15 @@ class Bin < Thor
   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.0' 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.0
 platform: ruby
 authors:
 - Yegor Bugayenko