sibit 0.34.1 → 0.34.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 469905d53f542975d0fe59c8b429289423762f4b36aca8b703928d54f5ba394f
-  data.tar.gz: c68a4237d70f25a11ea2e98c36d76c7b0917a6355353e6d23c22336eedd94f31
+  metadata.gz: 9fab8abde581e74b8a0aa55666754632639f070361cefdf3a2fb5766b6c8cf59
+  data.tar.gz: 87f523aa5a0dab63bf34e85b5de55afa9983333cf7202a4c6b062174b3e6289d
 SHA512:
-  metadata.gz: f5aa717192c0417c572226c3a0f79924f61e5d70b0bc84efe53d0cc760c16515f3cd6ef63b00de57e4228dbcd82fdb60a269f35df858b0c1ff8bec81006db6bc
-  data.tar.gz: fe9f402e207051f02e31b54d0a4e41cca76efd2a0260fbc6dfb3fb69f1aa543af2a9af6045590bd653c6c26472c97fdb6d5ba3a8b5a98f4ca282e351d88f53ee
+  metadata.gz: 130efd165f0f20537dca059b0ad4c88022294a020b66be1c0d598c5c0789fec9b56088c52ae680cdd4864adc33b953d81696b7929514125d2d9ed31fbd755d10
+  data.tar.gz: e5209eda4d7a20d157c0512a229d57e907879cb02b581c8f1afd1d81c335fdbbce3c9a723b77d8d3881d5c6d9881b0a986aeb48ba7e1d4d6c98d06970ffa6446

data/Gemfile.lock

@@ -83,7 +83,7 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     iri (0.11.8)
-    json (2.21.1)
+    json (2.21.2)
     language_server-protocol (3.17.0.6)
     lint_roller (1.1.0)
     logger (1.7.0)
@@ -144,8 +144,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.7)
-    rubocop (1.88.2)
-      json (~> 2.3)
+    rubocop (1.90.0)
+      json (>= 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
       parallel (>= 1.10)
@@ -158,16 +158,16 @@ GEM
     rubocop-ast (1.50.0)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
-    rubocop-elegant (0.7.1)
+    rubocop-elegant (0.8.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.75)
     rubocop-minitest (0.40.0)
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.38.0, < 2.0)
-    rubocop-performance (1.26.1)
+    rubocop-performance (1.27.0)
       lint_roller (~> 1.1)
-      rubocop (>= 1.75.0, < 2.0)
+      rubocop (>= 1.89.0, < 2.0)
       rubocop-ast (>= 1.47.1, < 2.0)
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
@@ -191,7 +191,7 @@ GEM
     unicode-display_width (3.2.0)
       unicode-emoji (~> 4.1)
     unicode-emoji (4.2.0)
-    webmock (3.26.2)
+    webmock (3.26.4)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

data/lib/sibit/bin.rb

@@ -145,10 +145,21 @@ class Sibit
         end
     end
 
+    def proxy
+      addr = options[:proxy] || ENV.fetch('SIBIT_PROXY', nil)
+      return if addr.nil?
+      if options[:proxy]
+        log.debug("Proxy found in the --proxy command line option (#{addr.length} symbols)")
+      else
+        log.debug("Proxy found in the SIBIT_PROXY env variable (#{addr.length} symbols)")
+      end
+      addr
+    end
+
     def client(dry: false)
-      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
+      addr = proxy
+      http = addr ? Sibit::HttpProxy.new(addr) : Sibit::Http.new
+      log.debug("Using proxy at #{http}") if addr
       api = Sibit::FirstOf.new(
         options[:api].flat_map { |a| a.split(',') }.map(&:downcase).map do |a|
           case a

data/lib/sibit/httpproxy.rb

@@ -19,7 +19,13 @@ class Sibit
       @user, @password, @host, @port = parse(addr)
     end
 
-    attr_reader :host
+    def to_s
+      [
+        "#{@host}:#{@port}",
+        @user ? " as #{@user}" : '',
+        @password ? ", password #{'*' * @password.length}" : ''
+      ].join
+    end
 
     def client(uri)
       http = Net::HTTP.new(uri.host, uri.port, @host, Integer(@port, 10), @user, @password)

data/lib/sibit/tx.rb

@@ -24,9 +24,10 @@ class Sibit
 
     attr_reader :inputs, :outputs
 
-    def initialize
+    def initialize(network: :mainnet)
       @inputs = []
       @outputs = []
+      @network = network
     end
 
     def add_input(hash:, index:, script:, key:, value: 0)
@@ -34,7 +35,7 @@ class Sibit
     end
 
     def add_output(value, address)
-      @outputs << Output.new(value, address)
+      @outputs << Output.new(value, address, @network)
     end
 
     def hash
@@ -103,20 +104,33 @@ class Sibit
     class Output
       attr_reader :value
 
-      def initialize(value, address)
+      def initialize(value, address, network = :mainnet)
         @value = value
         @address = address
+        @network = network
       end
 
       def script
         return segwit_script if segwit?
-        return p2pkh_script if %w[00 6f].include?(version)
-        return p2sh_script if %w[05 c4].include?(version)
-        raise(Sibit::Error, "Address '#{@address}' has an unsupported version byte 0x#{version}")
+        return p2pkh_script if version == (@network == :mainnet ? '00' : '6f')
+        return p2sh_script if version == (@network == :mainnet ? '05' : 'c4')
+        raise(
+          Sibit::Error,
+          "Address '#{@address}' has version byte 0x#{version}, " \
+          "which does not belong to the #{@network} network"
+        )
       end
 
       def segwit?
-        @address.downcase.start_with?('bc1', 'tb1', 'bcrt1')
+        down = @address.downcase
+        return true if down.start_with?(*(@network == :mainnet ? ['bc1'] : %w[tb1 bcrt1]))
+        if down.start_with?(*(@network == :mainnet ? %w[tb1 bcrt1] : ['bc1']))
+          raise(
+            Sibit::Error,
+            "Address '#{@address}' is a Bech32 address of a different network than #{@network}"
+          )
+        end
+        false
       end
 
       def script_hex

data/lib/sibit/txbuilder.rb

@@ -20,9 +20,10 @@ class Sibit
   class TxBuilder
     DUST = 546
 
-    def initialize
+    def initialize(network = :mainnet)
       @inputs = []
       @outputs = []
+      @network = network
     end
 
     def input
@@ -36,7 +37,7 @@ class Sibit
     end
 
     def tx(input_value:, leave_fee:, extra_fee:, change_address:)
-      txn = Tx.new
+      txn = Tx.new(network: @network)
       @inputs.each do |inp|
         txn.add_input(
           hash: inp.prev_out_hash,

data/lib/sibit/version.rb

@@ -8,5 +8,5 @@
 # Copyright:: Copyright (c) 2019-2026 Yegor Bugayenko
 # License:: MIT
 class Sibit
-  VERSION = '0.34.1' unless defined?(VERSION)
+  VERSION = '0.34.3' unless defined?(VERSION)
 end

data/lib/sibit.rb

@@ -152,7 +152,7 @@ class Sibit
         [pub, k.priv]
       end
     satoshi = satoshi(amount)
-    builder = TxBuilder.new
+    builder = TxBuilder.new(network)
     unspent = 0
     size = 100
     utxos = @api.utxos(sources.keys).sort_by { |u| [u[:hash], u[:index]] }

metadata

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