sibit 0.30.4 → 0.30.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3d770048c5c19650ec325dd100d556c798c58d27ae06c120569161dc5ede087
-  data.tar.gz: b8b19fa66905fcd77379c4ebe6892ed6e5ee7ceece7ae1cc46f8921a50bb8a0e
+  metadata.gz: aa32d663437f956373254dfd5ee62d072a984a7848ef455d26d22727293199ef
+  data.tar.gz: 6a0464cb926cce844ec89e380352c9d0e94c97ffbd26a9609ecbcefd82ee9413
 SHA512:
-  metadata.gz: eb8af223383b416274d70182ab890d8d41540687112086510827f5b95f0a3ced72bd641d57fb7afd4bb43ff6c0ece6eb453dba8d4ff91f61d7097e069370f716
-  data.tar.gz: 2ec794eb825e11f3154c28f874e1fa6e6aadbe5be70510576a6c45768f5afba653561e1ade8e32ce3f8d1e32b64ea4b610892ec2a557b1504d377961358769b8
+  metadata.gz: 3711ea50589117bc03497b111c11f7509b7be90dd8656aa7938ae3a72e730a8f13b74a1706589ca224b883dfa2223875f9e5aa204865e58d7856dcfd28a6fd17
+  data.tar.gz: 8ed48713e2795903a90501fed8da5a48dda43d62c9e8a152e4200003cf4ca51903fc53d745068de5502faadedf69d76d99b3024742b7d0a164924df62d3796f4

data/Gemfile

@@ -10,6 +10,7 @@ gemspec
 
 gem 'aruba', '~>2.2', require: false
 gem 'cucumber', '~>10.0', require: false
+gem 'donce', '~>0.2', require: false
 gem 'logger', '~>1.7', require: false
 gem 'minitest', '~>6.0', require: false
 gem 'minitest-reporters', '~>1.7', require: false

data/Gemfile.lock

@@ -62,6 +62,10 @@ GEM
     decoor (0.1.0)
     diff-lcs (1.6.2)
     docile (1.4.1)
+    donce (0.2.4)
+      backtrace (~> 0.3)
+      os (~> 1.1)
+      qbash (~> 0.3)
     elapsed (0.2.1)
       loog (~> 0.6)
       tago (~> 0.1)
@@ -78,6 +82,7 @@ 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)
@@ -86,9 +91,8 @@ GEM
       minitest (>= 5.0)
       ruby-progressbar
     multi_test (1.1.0)
-    nokogiri (1.18.10-arm64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.18.10-x86_64-linux-gnu)
+    nokogiri (1.18.10)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     openssl (3.3.2)
     os (1.1.4)
@@ -182,6 +186,7 @@ PLATFORMS
 DEPENDENCIES
   aruba (~> 2.2)
   cucumber (~> 10.0)
+  donce (~> 0.2)
   logger (~> 1.7)
   minitest (~> 6.0)
   minitest-reporters (~> 1.7)

data/README.md

@@ -63,15 +63,18 @@ $ sibit pay AMOUNT FEE P1,P2,... TARGET CHANGE
 e87f138c9ebf5986151667719825c28458a28cc66f69fed4f1032a93b399fdf8
 ```
 
-Here,
-  `AMOUNT` is the amount of [satoshi] you are sending,
-  `FEE` is the [miner fee] you are ready to spend to get
+Here:
+
+* `AMOUNT` is the amount of [satoshi] you are sending (integer),
+  or `0.42BTC` if in bitcoins (with a suffix),
+* `FEE` is the [miner fee] you are ready to spend to get
   this transaction delivered (you can say `S`, `M`, `L`, or `XL` if you want it
   to be calculated automatically),
-  `P1,P2,...` is a comma-separated list
+* `P1,P2,...` is a comma-separated list
   of private keys `P` you are sending your coins from,
-  `TARGET` is the address you are sending to,
-  `CHANGE` is the address where the change goes.
+* `TARGET` is the address you are sending to,
+* `CHANGE` is the address where the change goes.
+
 The transaction hash is returned.
 Not all [UTXOs] may be used, but only the necessary amount of them.
 

data/lib/sibit/key.rb

@@ -21,6 +21,8 @@ class Sibit
     MIN_PRIV = 0x01
     MAX_PRIV = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364140
 
+    attr_reader :network
+
     def self.generate
       key = OpenSSL::PKey::EC.generate('secp256k1')
       pvt = key.private_key.to_s(16).rjust(64, '0').downcase
@@ -28,9 +30,10 @@ class Sibit
     end
 
     def initialize(privkey)
-      @privkey = privkey
+      @network = :mainnet
       @compressed = true
-      @key = build(privkey)
+      @privkey = decode(privkey)
+      @key = build(@privkey)
     end
 
     def priv
@@ -44,17 +47,18 @@ class Sibit
 
     def addr
       hash = hash160(pub)
-      versioned = "00#{hash}"
+      prefix = @network == :mainnet ? '00' : '6f'
+      versioned = "#{prefix}#{hash}"
       checksum = Base58.new(versioned).check
       Base58.new(versioned + checksum).encode
     end
 
     def sign(data)
-      @key.sign('SHA256', data)
+      @key.dsa_sign_asn1(data)
     end
 
     def verify(data, sig)
-      @key.verify('SHA256', sig, data)
+      @key.dsa_verify_asn1(data, sig)
     rescue OpenSSL::PKey::PKeyError
       false
     end
@@ -82,5 +86,15 @@ class Sibit
       bytes = [hex].pack('H*')
       Digest::RMD160.hexdigest(Digest::SHA256.digest(bytes))
     end
+
+    def decode(key)
+      return key if key.length == 64 && key.match?(/\A[0-9a-f]+\z/i)
+      raw = Base58.new(key).decode
+      version = raw[0, 2]
+      @network = version == '80' ? :mainnet : :testnet
+      body = raw[2..-9]
+      @compressed = body.length == 66 && body.end_with?('01')
+      @compressed ? body[0, 64] : body
+    end
   end
 end

data/lib/sibit/script.rb

@@ -25,8 +25,8 @@ class Sibit
       @bytes = [hex].pack('H*').bytes
     end
 
-    def address
-      return p2pkh_address if p2pkh?
+    def address(network = :mainnet)
+      return p2pkh_address(network) if p2pkh?
       nil
     end
 
@@ -46,10 +46,11 @@ class Sibit
 
     private
 
-    def p2pkh_address
+    def p2pkh_address(network)
       h = hash160
       return nil unless h
-      versioned = "00#{h}"
+      prefix = network == :mainnet ? '00' : '6f'
+      versioned = "#{prefix}#{h}"
       checksum = Base58.new(versioned).check
       Base58.new(versioned + checksum).encode
     end

data/lib/sibit/version.rb

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

data/lib/sibit.rb

@@ -18,7 +18,7 @@ require_relative 'sibit/version'
 # Copyright:: Copyright (c) 2019-2025 Yegor Bugayenko
 # License:: MIT
 class Sibit
-  # Minimium fee we must pay for transaction processing:
+  # Minimum fee we must pay for transaction processing:
   MIN_SATOSHI_PER_BYTE = 0.1
 
   # Constructor.
@@ -103,7 +103,9 @@ 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.to_h { |k| [Key.new(k).addr, k] }
+    keys = sources.map { |k| Key.new(k) }
+    network = keys.first&.network || :mainnet
+    sources = keys.to_h { |k| [k.addr, k.priv] }
     satoshi = satoshi(amount)
     builder = TxBuilder.new
     unspent = 0
@@ -116,12 +118,16 @@ class Sibit
         @log.debug("UTXO skipped: #{utxo[:hash]}")
         next
       end
+      unless utxo[:confirmations]&.positive?
+        @log.debug("UTXO with no confirmations: #{utxo[:hash]}")
+        next
+      end
       unspent += utxo[:value]
       builder.input do |i|
         i.prev_out(utxo[:hash])
         i.prev_out_index(utxo[:index])
         i.prev_out_script = script_hex(utxo[:script])
-        address = Script.new(script_hex(utxo[:script])).address
+        address = Script.new(script_hex(utxo[:script])).address(network)
         k = sources[address]
         raise Error, "UTXO arrived to #{address} is incorrect" unless k
         i.signature_key(key(k))
@@ -155,7 +161,7 @@ class Sibit
     #{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}:
     #{tx.outputs.map { |o| "out: #{o.script_hex} / #{num(o.value, p)}" }.join("\n    ")}
-  Min fee: #{num(MIN_SATOSHI_PER_BYTE, p)} s/byte
+  Min fee: #{num(MIN_SATOSHI_PER_BYTE, p)} /byte
   Fee requested: #{num(f, p)} as \"#{fee}\"
   Fee actually paid: #{num(left, p)}
   Tx size: #{size} bytes
@@ -276,7 +282,7 @@ in block #{block} (by #{json[:provider]})")
     sat = fees[fee.to_sym]
     raise Error, "Can't understand the fee: #{fee.inspect}" if sat.nil?
     f = mul * sat * size
-    @log.debug("Fee calculated as #{mul} * #{sat} * #{size} = #{f}")
+    @log.debug("Fee calculated as #{mul} * #{sat}s * #{size} = #{f}s")
     f
   end
 

metadata

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