sibit 0.32.2 → 0.32.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b5729226952c9b63bbe126e8f4471de9a69b5fe5cdd1735500901a39d957c43
-  data.tar.gz: 4c9fac6187bbb379fd4874e81abb26e23073878a73f6877d92566d89d666b231
+  metadata.gz: addf1c76d3af290c3cdbdaae049db0e9f81fab3b71aed128cd8d284b4b3377e5
+  data.tar.gz: d4654c29684e00847a317bf7203a295f018036438a3c64ac93ba6477c84e1a52
 SHA512:
-  metadata.gz: ad897361c466fef868dc4d526dbf5fc154d0d39039be448c34dceaef22e0622a08f8e2f2f6e98f9f8192a8e4f3955e92629c9b0bf6fabc71c5e748a4255a2c88
-  data.tar.gz: 3f9138f939d908f8c65f07fb10a70e9c02c900b8cc0a6edf827187ea59b97394a1b055e3baf4a539cb798e3662ec9bf4b680550159c3272c1758e04118be0443
+  metadata.gz: 4405e4c542199ea6a4e99e401cb33321ef6048a8d3e7ff424c99f31718d17e8d03928f9922afd80b02e33f1a447a6e7c0042c038226e50078a35b5c237e16801
+  data.tar.gz: 235aa484a4719cdab76cbff47da26b949b25513990b88b12096c8d7081bde1c8bb3331808e144e34b3f2302f1fe462896aff5a60d3a0fcc9a955d9525e58db57

data/lib/sibit/bin.rb

@@ -22,13 +22,13 @@ class Sibit
   class Bin < Thor
     class_option :proxy, type: :string, desc: 'HTTPS proxy for all requests, e.g. "localhost:3128"'
     class_option :attempts, type: :numeric, default: 1,
-                            desc: 'How many times should we try before failing'
+      desc: 'How many times should we try before failing'
     class_option :dry, type: :boolean, default: false,
-                       desc: "Don't send a real payment, run in a read-only mode"
+      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"'
+      desc: 'Ordered List of APIs to use, e.g. "blockchain,btc,bitcoinchain"'
 
     def self.exit_on_failure?
       true
@@ -77,22 +77,28 @@ class Sibit
       log.info(client.balance(address))
     end
 
-    desc 'pay AMOUNT FEE SOURCES TARGET CHANGE',
-         'Send a new Bitcoin transaction (AMOUNT can be "MAX" to use full balance)'
+    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'
+      desc: 'List of UTXO that must be skipped while paying'
+    option :base58, type: :boolean, default: false,
+      desc: 'Convert private addresses to public in base58'
     option :yes, type: :boolean, default: false,
-                 desc: 'Skip confirmation prompt and send the payment immediately'
+      desc: 'Skip confirmation prompt and send the payment immediately'
     def pay(amount, fee, sources, target, change)
       keys = sources.split(',')
       if amount.upcase == 'MAX'
-        addrs = keys.map { |k| Sibit::Key.new(k).bech32 }
+        addrs = keys.map do |k|
+          kk = Sibit::Key.new(k)
+          options[:base58] ? kk.base58 : kk.bech32
+        end
         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, keys, target, change]
-      kwargs = { skip_utxo: options[:skip_utxo] }
+      kwargs = { skip_utxo: options[:skip_utxo], base58: options[:base58] }
       unless options[:yes] || options[:dry]
         client(dry: true).pay(*args, **kwargs)
         print 'Do you confirm this payment? (yes/no): '

data/lib/sibit/key.rb

@@ -22,12 +22,23 @@ class Sibit
     MIN_PRIV = 0x01
     MAX_PRIV = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364140
 
+    SECP256K1_N = OpenSSL::BN.new(
+      'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141', 16
+    )
+
     attr_reader :network
 
     def self.generate(network: :mainnet)
       key = OpenSSL::PKey::EC.generate('secp256k1')
-      pvt = key.private_key.to_s(16).rjust(64, '0').downcase
-      new(pvt, network: network)
+      pvt = key.private_key
+      raise 'Invalid private key: zero' if pvt.zero?
+      raise 'Invalid private key: out of range' if pvt >= SECP256K1_N
+      raise 'Invalid public key: not on curve' unless key.public_key.on_curve?
+      hex = key.private_key.to_s(16).rjust(64, '0').downcase
+      raise 'Invalid private key encoding' unless hex.match?(/\A[0-9a-f]{64}\z/)
+      trip = OpenSSL::BN.new(hex, 16)
+      raise 'Private key serialization is lossy' unless trip == pvt
+      new(hex, network: network)
     end
 
     def initialize(privkey, network: nil)
@@ -49,11 +60,17 @@ class Sibit
 
     def bech32
       hrp = { mainnet: 'bc', testnet: 'tb', regtest: 'bcrt' }[@network]
-      Bech32.encode(hrp, 0, hash160(pub))
+      hex = pub
+      raise 'Invalid public key: not on curve' unless @key.public_key.on_curve?
+      raise 'Invalid public key format' unless hex.match?(/\A0[23][0-9a-f]{64}\z/)
+      Bech32.encode(hrp, 0, hash160(hex))
     end
 
     def base58
-      hash = hash160(pub)
+      hex = pub
+      raise 'Invalid public key: not on curve' unless @key.public_key.on_curve?
+      raise 'Invalid public key format' unless hex.match?(/\A0[23][0-9a-f]{64}\z/)
+      hash = hash160(hex)
       prefix = @network == :mainnet ? '00' : '6f'
       versioned = "#{prefix}#{hash}"
       checksum = Base58.new(versioned).check

data/lib/sibit/version.rb

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

data/lib/sibit.rb

@@ -103,18 +103,26 @@ class Sibit
   # +target+: the target address to send to
   # +change+: the address where the change has to be sent to
   # +network+: optional network override (:mainnet, :testnet, :regtest)
-  def pay(amount, fee, sources, target, change, skip_utxo: [], network: nil)
+  def pay(amount, fee, sources, target, change, skip_utxo: [], network: nil, base58: false)
     p = price('USD')
     keys = sources.map { |k| Key.new(k, network: network) }
     network = keys.first&.network || :mainnet
-    sources = keys.to_h { |k| [k.bech32, k.priv] }
+    sources = keys.to_h do |k|
+      pub =
+        if base58
+          k.base58
+        else
+          k.bech32
+        end
+      @log.debug("Private key #{k.priv.ellipsized(8).inspect} is public as #{pub}:")
+      [pub, k.priv]
+    end
     satoshi = satoshi(amount)
     builder = TxBuilder.new
     unspent = 0
     size = 100
     utxos = @api.utxos(sources.keys)
-    @log.debug("#{utxos.count} UTXOs found, these will be used \
-(value/confirmations at tx_hash):")
+    @log.debug("#{utxos.count} UTXOs found, these will be used (value/confirmations at tx_hash):")
     utxos.each do |utxo|
       if skip_utxo.include?(utxo[:hash])
         @log.debug("UTXO skipped: #{utxo[:hash]}")
@@ -224,8 +232,10 @@ class Sibit
         checked += 1
       end
       count += 1
-      @log.debug("We checked #{checked} txns and #{checked_outputs} outputs \
-in block #{block} (by #{json[:provider]})")
+      @log.debug(
+        "Checked #{checked} txns and #{checked_outputs} outputs " \
+        "in block #{block} (by #{json[:provider]})"
+      )
       block = json[:next]
       begin
         if block.nil?

metadata

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