sibit 0.32.3 → 0.32.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 196fa93e65ec890ca33a83d3d56358f311d57933e20432e61b5e3df32ae8515d
-  data.tar.gz: 0d02c5a2f773d84dbd13c614c6e52533e88a88dff5c07e4ff304650311ce5a22
+  metadata.gz: '0721649ca64aee7e164f1ebffef396e8227a9011bb2e3ca6d392dcbbbcf80965'
+  data.tar.gz: d26bb44f64aa20fc6e44eab1fe2cfc5f7bfb6b7c02615abbc3c5002161d94ebc
 SHA512:
-  metadata.gz: b62032df000f92c6e58147224c5055c3db2ac1798308022899b0e5a5706b691deb9b948733514bcbbac80e70b2ea9f31e085a1da9557a37fd60076240face315
-  data.tar.gz: 21601d77cf209b9980caef8567321f018efe4442eec5caa96f2e791865519c7499d3f7c64111c01823e90ffeb2ed808608fc7e3387c3fda47d3056612a13449c
+  metadata.gz: 8896cc874ca2a200a4000d8ed4f8b8a93134d1b3326c0051588dad3ce3edf7c59e58bbfc9f4a8a8d1fc820d1b32aa7a70211f2f3b5e638e862b15767c98ffa60
+  data.tar.gz: 6b8eb51d3f7c2cb61090db5dc7aabeecb99d6400a385883ea2cf9d6340ea39a44a50ac164b88e922e2df204bffe9070c8e68a9b37213923a4b997630c97fda6f

data/features/cli.feature

@@ -24,6 +24,14 @@ Feature: Command Line Processing
     When I run bin/sibit with "create 46feba063e9b59a8ae0dba68abd39a3cb8f52089e776576d6eb1bb5bfec123d1"
     Then Exit code is zero
 
+  Scenario: Bitcoin address can be created with base58 option at the end
+    When I run bin/sibit with "create 46feba063e9b59a8ae0dba68abd39a3cb8f52089e776576d6eb1bb5bfec123d1 --base58"
+    Then Exit code is zero
+
+  Scenario: Bitcoin address can be created with base58 option before command
+    When I run bin/sibit with "--base58 create 46feba063e9b59a8ae0dba68abd39a3cb8f52089e776576d6eb1bb5bfec123d1"
+    Then Exit code is zero
+
   Scenario: Bitcoin balance can be checked
     When I run bin/sibit with "balance 1MZT1fa6y8H9UmbZV6HqKF4UY41o9MGT5f --verbose --api=blockchain,btc"
     Then Exit code is zero
@@ -36,3 +44,8 @@ Feature: Command Line Processing
     When I run bin/sibit with "pay --help"
     Then Exit code is zero
     And Stdout contains "--skip-utxo"
+
+  Scenario: Unknown option shows error message
+    When I run bin/sibit with "generate --foo"
+    Then Exit code is not zero
+    And Stdout contains "Unknown option"

data/features/step_definitions/steps.rb

@@ -27,7 +27,7 @@ end
 
 When(%r{^I run bin/sibit with "([^"]*)"$}) do |arg|
   home = File.join(File.dirname(__FILE__), '../..')
-  @stdout = `ruby -I#{home}/lib #{home}/bin/sibit #{arg}`
+  @stdout = `ruby -I#{home}/lib #{home}/bin/sibit #{arg} 2>&1`
   @exitstatus = $CHILD_STATUS.exitstatus
 end
 

data/lib/sibit/bin.rb

@@ -20,6 +20,8 @@ class Sibit
   #   Sibit::Bin.start(['price'])
   #   Sibit::Bin.start(['balance', '1A1zP1eP5QGefi2DMPTfTL5SLmv7DivfNa'])
   class Bin < Thor
+    stop_on_unknown_option!
+
     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'
@@ -29,14 +31,21 @@ class Sibit
     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"'
+    class_option :base58, type: :boolean, default: false,
+      desc: 'Use base58 address format instead of bech32'
 
     def self.exit_on_failure?
       true
     end
 
     def self.handle_argument_error(command, error, args, _arity)
-      raise error unless args.include?('--help') || args.include?('-h')
-      new.help(command.name)
+      return new.help(command.name) if args.include?('--help') || args.include?('-h')
+      unknown = args.find { |a| a.start_with?('-') }
+      if unknown
+        warn "Unknown option: #{unknown}"
+        exit 1
+      end
+      raise error
     end
 
     desc 'price', 'Get current price of BTC in USD'
@@ -69,7 +78,8 @@ class Sibit
     desc 'create KEY', 'Create a public Bitcoin address from the private key'
     def create(key)
       log.debug("Private key provided: #{key.ellipsized(8).inspect}")
-      log.info(client.create(key))
+      k = Sibit::Key.new(key)
+      log.info(options[:base58] ? k.base58 : k.bech32)
     end
 
     desc 'balance ADDRESS', 'Check the balance of the Bitcoin address'
@@ -82,8 +92,6 @@ class Sibit
       '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 :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'
     def pay(amount, fee, sources, target, change)

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.3' unless defined?(VERSION)
+  VERSION = '0.32.5' unless defined?(VERSION)
 end

metadata

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