sibit 0.27.1 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 731731c7fc499008d0a0fd713a84f8b416d55163674e6c2e45783436a283720d
-  data.tar.gz: f4b5d3b5119381ffdf4c764a1f4e82b4eb06f3b66135070b33ebffc43e523ec3
+  metadata.gz: 7846df06f5fbb2cae2ee00122f75f640901fc2d2d5321d810ae0848ee56c01e2
+  data.tar.gz: 1ff75f919747d146c038c8cdfcc2cefbbd5dbf45136a5102691740ab7224dbd2
 SHA512:
-  metadata.gz: f4b72bfda3a91eeb48eaf97b1badaba49d0cceaf4e935fe3b3ee983217b920602ad9935f1b2f70b881b08c9ed0f946b11be93abd606642d293846657f359c473
-  data.tar.gz: 2e4e84c22a4be9f275d53c5003ccbf5feaba4813546624c590cf853938e958b7e934c60d2924c9ed4e8f8ed301923df89edf337676fb4a231bb0f9ebe2b3c9c9
+  metadata.gz: 892d1c222af88708788f791a8508c7622f3e148190c7aa2cf4a8c6fbb3a47fdd2dd78ebd0190512fb11c0a512ac4d474153c2467bf54a4cb4f7afa260d732b1f
+  data.tar.gz: b9d78f193a4e81d5c9659528927c6526f6d2413f65303bd016b6fdd220c0afac25c0555f05ddeaf34ab5e0d9fd257ba8d0f5f70b31667eeb1ebc549cab232bc6

data/README.md

@@ -61,33 +61,34 @@ $ sibit balance 1PfsYNygsuVL8fvBarJNQnHytkg4rGih1U
 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'
@@ -168,13 +170,13 @@ gem install sibit
 ```
 
 It should work.
-If it doesn't, submit an issue and I will try to help.
+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.
+Make sure your build is green before you contribute your pull request.
+You need to have [Ruby] 2.3+ and [Bundler] installed.
 Then:
 
 ```bash

data/bin/sibit

@@ -24,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(
@@ -63,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
@@ -126,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.1'
+  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.1
+  version: 0.28.0
 platform: ruby
 authors:
 - Yegor Bugayenko