sibit 0.29.1 → 0.30.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16d749128c92e0a715c1545d8cb6aa6a41a4afcbd7fc39db0e708fa87ea7383d
-  data.tar.gz: c522bc105501aedd9f3ef6140ac99bb1b18cec23fc060ff8dd6ceed4d4e69dff
+  metadata.gz: 1dd376cf7257a4cf89035007b18896c215315cacacf9f5d228afc27c9f279cb3
+  data.tar.gz: a610165efa18b499479a81816086e8ddad79399ee6d2e0d780594f5b38c18e91
 SHA512:
-  metadata.gz: 854ede7b60a6cd9e1334341b14f1b712e002b23499a5a192d61b53380b68d3203f4d7c3d0aaa87499d59a885190345e776410e1eb133f26f85b8aaac260772ed
-  data.tar.gz: f99cee0f4d8615d0a39ee7609c697b4238e0e867193934564d5f2d29cfffe454b630b8da0f4e7f1bda9620d57d395bdf4b365614cf318c6079b808dab330cc2f
+  metadata.gz: 588b35b318760b910ba00f2ed13af88ba325f59e21191faab27d7596771d54c9f4e5a6d419d80e6a3e6f4594a1089bfaf58ef107ccf7e78f738aa9258c181a19
+  data.tar.gz: b347020232596daa847f6b3398f9cdaa7ad56ea6b03cf157377a8652922d93e7df33c18d639f1ee6bd324254fd453e24fb2992a8cea76ec00b3814ecc6081ae6

data/Gemfile.lock

@@ -3,6 +3,7 @@ PATH
   specs:
     sibit (0.0.0)
       backtrace (~> 0.3)
+      decoor (~> 0.1)
       iri (~> 0.5)
       json (~> 2)
       loog (~> 0.6)
@@ -57,6 +58,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 +77,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,8 +85,9 @@ 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)
+    nokogiri (1.18.10-x86_64-linux-gnu)
       racc (~> 1.4)
     openssl (4.0.0)
     os (1.1.4)

data/README.md

@@ -88,6 +88,18 @@ It is recommended to run it with `--dry --verbose` options first,
 If everything looks correct, remove the `--dry` and run again,
   the transaction is pushed to the network.
 
+To use an HTTPS proxy for all requests:
+
+```bash
+sibit --proxy=host:port balance 1PfsYNygsuVL8fvBarJNQnHytkg4rGih1U
+```
+
+The proxy address may include authentication credentials:
+
+```bash
+sibit --proxy=user:password@host:port balance 1PfsYNygsuVL8fvBarJNQnHytkg4rGih1U
+```
+
 All operations are performed through the [Blockchain API].
 Transactions are pushed to the Bitcoin network via [this relay].
 

data/bin/sibit

@@ -12,11 +12,13 @@ require 'retriable_proxy'
 require 'slop'
 require_relative '../lib/sibit'
 require_relative '../lib/sibit/http'
+require_relative '../lib/sibit/httpproxy'
 require_relative '../lib/sibit/bitcoinchain'
 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'
@@ -61,32 +63,33 @@ 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
   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

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).

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).
@@ -108,7 +107,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

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).

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).

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).

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).

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.info("Transaction not pushed, dry mode is ON (#{@origin.class.name})")
+    nil
+  end
+end

data/lib/sibit/http.rb

@@ -20,22 +20,4 @@ class Sibit
       http
     end
   end
-
-  # This HTTP client with proxy.
-  #
-  # Author:: Yegor Bugayenko (yegor256@gmail.com)
-  # Copyright:: Copyright (c) 2019-2025 Yegor Bugayenko
-  # License:: MIT
-  class HttpProxy
-    def initialize(addr)
-      @host, @port = addr.split(':')
-    end
-
-    def client(uri)
-      http = Net::HTTP.new(uri.host, uri.port, @host, @port.to_i)
-      http.use_ssl = true
-      http.read_timeout = 240
-      http
-    end
-  end
 end

data/lib/sibit/httpproxy.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+# SPDX-FileCopyrightText: Copyright (c) 2019-2025 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
+
+require 'net/http'
+
+# Sibit main class.
+class Sibit
+  # HTTP client with proxy.
+  #
+  # Accepts proxy address in format: host:port or user:password@host:port
+  #
+  # Author:: Yegor Bugayenko (yegor256@gmail.com)
+  # Copyright:: Copyright (c) 2019-2025 Yegor Bugayenko
+  # License:: MIT
+  class HttpProxy
+    def initialize(addr)
+      @user, @password, @host, @port = parse(addr)
+    end
+
+    def client(uri)
+      http = Net::HTTP.new(uri.host, uri.port, @host, @port.to_i, @user, @password)
+      http.use_ssl = true
+      http.read_timeout = 240
+      http
+    end
+
+    private
+
+    def parse(addr)
+      if addr.include?('@')
+        auth, hostport = addr.split('@')
+        user, password = auth.split(':')
+        host, port = hostport.split(':')
+        [user, password, host, port]
+      else
+        host, port = addr.split(':')
+        [nil, nil, host, port]
+      end
+    end
+  end
+end

data/lib/sibit/version.rb

@@ -9,5 +9,5 @@
 # License:: MIT
 class Sibit
   # Current version of the library.
-  VERSION = '0.29.1'
+  VERSION = '0.30.1'
 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'
 
@@ -100,7 +100,7 @@ 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

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,6 +30,7 @@ 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 'iri', '~> 0.5'
   s.add_dependency 'json', '~> 2'
   s.add_dependency 'loog', '~> 0.6'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sibit
 version: !ruby/object:Gem::Version
-  version: 0.29.1
+  version: 0.30.1
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -23,6 +23,20 @@ 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: iri
   requirement: !ruby/object:Gem::Requirement
@@ -133,23 +147,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
@@ -165,7 +181,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:
   - - ">="