sibit 0.27.0 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8969169f4a0ed8a12f015d3e66cd7a4e74cf2e3e1210828370eab0dc2680b99
-  data.tar.gz: 296a09009b913387406c1f285916b6a33ef3fd1871c07951f703e1f187937f9a
+  metadata.gz: 7846df06f5fbb2cae2ee00122f75f640901fc2d2d5321d810ae0848ee56c01e2
+  data.tar.gz: 1ff75f919747d146c038c8cdfcc2cefbbd5dbf45136a5102691740ab7224dbd2
 SHA512:
-  metadata.gz: de21c1b789b8bc2c4671e303aa8c613fb9d6b88b9a28ba7787d82212cbda08cad277c74d2c655c14dd21e3f462ad5b9a26275da3f45fc246fa8e837d177cf743
-  data.tar.gz: c737bc8c538266bb00c2be64c0604da1035065a6fe1a0fa094be0f6180c46ab5df9f3483d577511c45d43b215423fd0c04971e54bcfacb4f8a945c93182cace1
+  metadata.gz: 892d1c222af88708788f791a8508c7622f3e148190c7aa2cf4a8c6fbb3a47fdd2dd78ebd0190512fb11c0a512ac4d474153c2467bf54a4cb4f7afa260d732b1f
+  data.tar.gz: b9d78f193a4e81d5c9659528927c6526f6d2413f65303bd016b6fdd220c0afac25c0555f05ddeaf34ab5e0d9fd257ba8d0f5f70b31667eeb1ebc549cab232bc6

data/Gemfile

@@ -9,7 +9,7 @@ gemspec
 # gem 'debase', '0.2.4.1', require: false
 
 gem 'aruba', '~>2.2', require: false
-gem 'cucumber', '~>9.1', require: false
+gem 'cucumber', '~>10.0', require: false
 gem 'logger', '~>1.7', require: false
 gem 'minitest', '~>6.0', require: false
 gem 'minitest-reporters', '~>1.7', require: false

data/Gemfile.lock

@@ -24,37 +24,38 @@ GEM
       thor (~> 1.0)
     ast (2.4.3)
     backtrace (0.4.1)
+    base64 (0.3.0)
     bigdecimal (4.0.1)
     builder (3.3.0)
     contracts (0.17.3)
     crack (1.0.1)
       bigdecimal
       rexml
-    cucumber (9.2.1)
+    cucumber (10.2.0)
+      base64 (~> 0.2)
       builder (~> 3.2)
-      cucumber-ci-environment (> 9, < 11)
-      cucumber-core (> 13, < 14)
-      cucumber-cucumber-expressions (~> 17.0)
-      cucumber-gherkin (> 24, < 28)
-      cucumber-html-formatter (> 20.3, < 22)
-      cucumber-messages (> 19, < 25)
+      cucumber-ci-environment (> 9, < 12)
+      cucumber-core (> 15, < 17)
+      cucumber-cucumber-expressions (> 17, < 20)
+      cucumber-html-formatter (> 21, < 23)
       diff-lcs (~> 1.5)
+      logger (~> 1.6)
       mini_mime (~> 1.1)
       multi_test (~> 1.1)
-      sys-uname (~> 1.2)
-    cucumber-ci-environment (10.0.1)
-    cucumber-core (13.0.3)
-      cucumber-gherkin (>= 27, < 28)
-      cucumber-messages (>= 20, < 23)
-      cucumber-tag-expressions (> 5, < 7)
-    cucumber-cucumber-expressions (17.1.0)
+      sys-uname (~> 1.3)
+    cucumber-ci-environment (11.0.0)
+    cucumber-core (16.1.1)
+      cucumber-gherkin (> 36, < 40)
+      cucumber-messages (> 31, < 33)
+      cucumber-tag-expressions (> 6, < 9)
+    cucumber-cucumber-expressions (18.0.1)
       bigdecimal
-    cucumber-gherkin (27.0.0)
-      cucumber-messages (>= 19.1.4, < 23)
-    cucumber-html-formatter (21.15.1)
-      cucumber-messages (> 19, < 28)
-    cucumber-messages (22.0.0)
-    cucumber-tag-expressions (6.1.2)
+    cucumber-gherkin (37.0.1)
+      cucumber-messages (>= 31, < 32)
+    cucumber-html-formatter (22.3.0)
+      cucumber-messages (> 23, < 33)
+    cucumber-messages (31.1.0)
+    cucumber-tag-expressions (8.1.0)
     date (3.5.1)
     diff-lcs (1.6.2)
     docile (1.4.1)
@@ -71,7 +72,7 @@ GEM
       logger (~> 1.0)
     memoist3 (1.0.0)
     mini_mime (1.1.5)
-    minitest (6.0.0)
+    minitest (6.0.1)
       prism (~> 1.5)
     minitest-reporters (1.7.1)
       ansi
@@ -96,7 +97,7 @@ GEM
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.3.1)
-    rdoc (7.0.2)
+    rdoc (7.0.3)
       erb
       psych (>= 4.0.0)
       tsort
@@ -109,7 +110,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.6)
-    rubocop (1.82.0)
+    rubocop (1.82.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -167,7 +168,7 @@ PLATFORMS
 
 DEPENDENCIES
   aruba (~> 2.2)
-  cucumber (~> 9.1)
+  cucumber (~> 10.0)
   logger (~> 1.7)
   minitest (~> 6.0)
   minitest-reporters (~> 1.7)

data/README.md

@@ -38,56 +38,57 @@ gem install sibit
 Then, you generate a [private key]:
 
 ```bash
-sibit generate
-E9873D79C6D87FC233AA332626A3A3FE
+$ sibit generate
+1461cc61c3b09d01d5c02b901577c9d052264e77043bddd3d222ab8a6f7e0db0
 ```
 
 Next, you create a new [address],
 using your private key:
 
 ```bash
-sibit create E9873D79C6D87FC233AA332626A3A3FE
-1CC3X2gu58d6wXUWMffpuzN9JAfTUWu4Kj
+$ sibit create 1461cc61c3b09d01d5c02b901577c9d052264e77043bddd3d222ab8a6f7e0db0
+1PfsYNygsuVL8fvBarJNQnHytkg4rGih1U
 ```
 
 To check the balance at the address (the result is in
 [satoshi]):
 
 ```bash
-sibit balance 1CC3X2gu58d6wXUWMffpuzN9JAfTUWu4Kj
+$ sibit balance 1PfsYNygsuVL8fvBarJNQnHytkg4rGih1U
 80988977
 ```
 
 To send a payment from a few addresses to a new address:
 
 ```bash
-sibit pay AMOUNT FEE A1:P1,A2:P2,... TARGET CHANGE
+$ 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
-this transaction delivered
-(you can say `S`, `M`, `L`, or `XL` if you want it
-to be calculated automatically),
-`A1:P1,A2:P2,...` is a comma-separated list
-of addresses `A` and private keys `P` you are sending your coins from,
-`TARGET` is the address you are sending to,
-`CHANGE` is the address where the change will be sent to.
-The transaction hash will be returned.
-Not all [UTXOs] will be used, but only the necessary amount of them.
-
-By default, the fee will be paid on top of the payment amount you are sending.
-Say, you are sending 0.5 BTC and the fee is 0.0001 BTC. Totally, you will
-spend 0.5001. However, you can make Sibit deduct the fee from the payment
-amount. In this case you should provide a negative amount of the fee
-or one of `-S`, `-M`, `-L`, `-XL`. You can also say `+S`, if you want the
-opposite, which is the default.
-
-It is recommended to run it with `--dry --verbose` options first, to see
-what's going to be sent to the network. If everything looks correct, remove
-the `--dry` and run again, the transaction will be pushed to the network.
+  `AMOUNT` is the amount of [satoshi] you are sending,
+  `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
+  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.
+The transaction hash is returned.
+Not all [UTXOs] may be used, but only the necessary amount of them.
+
+By default, the fee is paid on top of the payment amount you are sending.
+Say, you are sending 0.5 BTC and the fee is 0.0001 BTC.
+Totally, you spend 0.5001.
+However, you can make Sibit deduct the fee from the payment amount.
+In this case you should provide a negative amount
+  of the fee or one of `-S`, `-M`, `-L`, `-XL`.
+You can also say `+S`, if you want the opposite, which is the default.
+
+It is recommended to run it with `--dry --verbose` options first,
+  to see what's going to be sent to the network.
+If everything looks correct, remove the `--dry` and run again,
+  the transaction is pushed to the network.
 
 All operations are performed through the
 [Blockchain API].
@@ -105,7 +106,7 @@ pkey = sibit.generate
 address = sibit.create(pkey)
 balance = sibit.balance(address)
 target = sibit.create(pkey) # where to send coins to
-change = sibit.create(pkey) # where the change will be sent to
+change = sibit.create(pkey) # where the change goes
 tx = sibit.pay(10_000_000, 'XL', { address => pkey }, target, change)
 ```
 
@@ -133,10 +134,11 @@ require 'sibit/btc'
 sibit = Sibit.new(api: Sibit::Btc.new)
 ```
 
-You may also use a combination of APIs. This may be very useful since
-some APIs are not reliable and others don't have all the features required.
-You can provide an array of objects and they
-will be used one by one, until a successful response is obtained:
+You may also use a combination of APIs.
+This may be very useful since some APIs are not reliable
+  and others don't have all the features required.
+You can provide an array of objects and they are used one by one,
+  until a successful response is obtained:
 
 ```ruby
 require 'sibit'
@@ -167,14 +169,15 @@ gem install rake --no-document
 gem install sibit
 ```
 
-It should work. If it doesn't, submit an issue and I will try to help.
+It should work.
+If it doesn't, submit an issue and I can try to help.
 
 ## How to contribute
 
 Read [these guidelines].
-Make sure your build is green before you contribute
-your pull request. You will need to have [Ruby] 2.3+ and
-[Bundler] installed. Then:
+Make sure your build is green before you contribute your pull request.
+You need to have [Ruby] 2.3+ and [Bundler] installed.
+Then:
 
 ```bash
 bundle update

data/bin/sibit

@@ -9,7 +9,6 @@ $stdout.sync = true
 # see https://stackoverflow.com/a/6048451/187141
 require 'openssl'
 OpenSSL::SSL::VERIFY_PEER ||= OpenSSL::SSL::VERIFY_NONE
-puts OpenSSL::X509::DEFAULT_CERT_FILE
 
 require 'backtrace'
 require 'loog'
@@ -25,18 +24,18 @@ require_relative '../lib/sibit/fake'
 require_relative '../lib/sibit/firstof'
 require_relative '../lib/sibit/version'
 
-begin
+opts =
   begin
-    opts = Slop.parse(ARGV, strict: true, help: true) do |o|
+    Slop.parse(ARGV, strict: true, help: true) do |o|
       o.banner = "Usage (#{Sibit::VERSION}): sibit [options] command [args]
 Commands are:
-    price:    Get current price of BTC in USD
-    fees:     Get currently recommended transaction fees
-    latest:   Get hash of the latest block
-    generate: Generate a new private key
-    create:   Create a public Bitcoin address from the key
-    balance:  Check the balance of the Bitcoin address
-    pay:      Send a new Bitcoin transaction
+  price:    Get current price of BTC in USD
+  fees:     Get currently recommended transaction fees
+  latest:   Get hash of the latest block
+  generate: Generate a new private key
+  create:   Create a public Bitcoin address from the key
+  balance:  Check the balance of the Bitcoin address
+  pay:      Send a new Bitcoin transaction
 Options are:"
       o.string '--proxy', 'HTTPS proxy for all requests, e.g. "localhost:3128"'
       o.integer(
@@ -64,6 +63,8 @@ Options are:"
   rescue Slop::Error => e
     raise e.message
   end
+
+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
@@ -127,7 +128,7 @@ Options are:"
     raise 'Change argument is required' if change.nil?
     puts sibit.pay(
       amount, fee,
-      sources.split(',').map { |p| p.split(':') }.to_h,
+      sources.split(','),
       target, change,
       skip_utxo: opts['skip-utxo']
     )

data/lib/sibit/version.rb

@@ -9,5 +9,5 @@
 # License:: MIT
 class Sibit
   # Current version of the library.
-  VERSION = '0.27.0'
+  VERSION = '0.28.0'
 end

data/lib/sibit.rb

@@ -94,12 +94,12 @@ class Sibit
   #
   # +amount+: the amount either in satoshis or ending with 'BTC', like '0.7BTC'
   # +fee+: the miners fee in satoshis (as integer) or S/M/X/XL as a string
-  # +sources+: the hashmap of bitcoin addresses where the coins are now, with
-  # their addresses as keys and private keys as values
+  # +sources+: the list of private bitcoin keys where the coins are now
   # +target+: the target address to send to
   # +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| [Bitcoin::Key.new(k).addr, k] }.to_h
     satoshi = satoshi(amount)
     builder = Bitcoin::TxBuilder.new
     unspent = 0

metadata

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