sibit 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a410aaa9dcc78c30bde9cf5f0b38f5869a6b6b1bbb1a364b2a1ef603aceba72
-  data.tar.gz: cc2b8197a9b230607b376205029300aa68ff55ac409b4c7a1334f46417ea5069
+  metadata.gz: 8fa2a41b4b9d7893fac773a90d7a9fcb3866339aa616b7a8e291d53bed50618f
+  data.tar.gz: d4f81c3c74df3927c5fec8dce9c7218cbf0a76d8cf6d1094ea2474aadd7e4525
 SHA512:
-  metadata.gz: 3f28d118de6d6611298ebc0088c1583bf6a1d8ff99e0c46d9d37e19dfb896ae544a783933347ceb73a6335c8c88212ea73fee5cc81a136db854b903d79c68552
-  data.tar.gz: d3f3a9ee63757febd44c8b309a6edc605f360e116fdb45d6c07f769883ba05a496dd624f424fb44fb2deb13fe71593ed3d9d334ab5dcee17ba798b1b4750556c
+  metadata.gz: 4ebf4d8cf70cef85a6d9d914cdec60cfa5c0164b8e7070f37e245d7b92267cf4fd6d1dd59ba6ff843c309861cbe5df2c19ec31af4a06874ad9e7b6a1191b371b
+  data.tar.gz: 6a9c5fca263fbec6b2aa61075c33314de00a0b22397d04662e135be46fbd556b699f21e3a4d856d43b9fcadb31eb306cb20134900125e91a3e0d9371fd1c676e

data/.rubocop.yml

@@ -18,7 +18,7 @@ Layout/MultilineMethodCallIndentation:
 Metrics/ParameterLists:
   Max: 6
 Metrics/ClassLength:
-  Max: 200
+  Max: 250
 Metrics/AbcSize:
   Enabled: false
 Metrics/BlockLength:

data/README.md

@@ -1,9 +1,9 @@
 <img src="/logo.png" width="64px"/>
 
-[![EO principles respected here](http://www.elegantobjects.org/badge.svg)](http://www.elegantobjects.org)
+[![EO principles respected here](https://www.elegantobjects.org/badge.svg)](https://www.elegantobjects.org)
 [![Managed by Zerocracy](https://www.0crat.com/badge/C3RFVLU72.svg)](https://www.0crat.com/p/C3RFVLU72)
 [![DevOps By Rultor.com](http://www.rultor.com/b/yegor256/sibit)](http://www.rultor.com/p/yegor256/sibit)
-[![We recommend RubyMine](http://www.elegantobjects.org/rubymine.svg)](https://www.jetbrains.com/ruby/)
+[![We recommend RubyMine](https://www.elegantobjects.org/rubymine.svg)](https://www.jetbrains.com/ruby/)
 
 [![Build Status](https://travis-ci.org/yegor256/sibit.svg)](https://travis-ci.org/yegor256/sibit)
 [![Build status](https://ci.appveyor.com/api/projects/status/tbeaa0d4dk38xdb5?svg=true)](https://ci.appveyor.com/project/yegor256/sibit)
@@ -79,6 +79,13 @@ The transaction hash will be returned.
 Not all [UTXOs](https://en.wikipedia.org/wiki/Unspent_transaction_output)
 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.

data/lib/sibit/version.rb

@@ -26,5 +26,5 @@
 # License:: MIT
 class Sibit
   # Current version of the library.
-  VERSION = '0.11.0'
+  VERSION = '0.12.0'
 end

data/lib/sibit.rb

@@ -161,6 +161,8 @@ class Sibit
   def pay(amount, fee, sources, target, change)
     p = price
     satoshi = satoshi(amount)
+    f = mfee(fee, size_of(amount, sources))
+    satoshi -= f if f.negative?
     builder = Bitcoin::Builder::TxBuilder.new
     unspent = 0
     size = 100
@@ -259,9 +261,14 @@ class Sibit
   def mfee(fee, size)
     return fee.to_i if fee.is_a?(Integer)
     raise Error, 'Fee should either be a String or Integer' unless fee.is_a?(String)
+    mul = 1
+    if fee.start_with?('+', '-')
+      mul = -1 if fee.start_with?('-')
+      fee = fee[1..-1]
+    end
     sat = fees[fee.to_sym]
     raise Error, "Can't understand the fee: #{fee.inspect}" if sat.nil?
-    sat * size
+    mul * sat * size
   end
 
   # Make key from private key string in Hash160.
@@ -296,6 +303,30 @@ class Sibit
     end
   end
 
+  # Calculate an approximate size of the transaction.
+  def size_of(amount, sources)
+    satoshi = satoshi(amount)
+    builder = Bitcoin::Builder::TxBuilder.new
+    unspent = 0
+    size = 100
+    utxos = get_json(
+      "/unspent?active=#{sources.keys.join('|')}&limit=1000"
+    )['unspent_outputs']
+    utxos.each do |utxo|
+      unspent += utxo['value']
+      builder.input do |i|
+        i.prev_out(utxo['tx_hash_big_endian'])
+        i.prev_out_index(utxo['tx_output_n'])
+        i.prev_out_script = [utxo['script']].pack('H*')
+        address = Bitcoin::Script.new([utxo['script']].pack('H*')).get_address
+        i.signature_key(key(sources[address]))
+      end
+      size += 180
+      break if unspent > satoshi
+    end
+    size
+  end
+
   def info(msg)
     if @log.respond_to?(:info)
       @log.info(msg)

data/test/test_sibit.rb

@@ -129,6 +129,9 @@ class TestSibit < Minitest::Test
   end
 
   def test_fail_if_not_enough_funds
+    stub_request(
+      :get, 'https://bitcoinfees.earn.com/api/v1/fees/recommended'
+    ).to_return(body: '{"fastestFee":300,"halfHourFee":200,"hourFee":180}')
     stub_request(
       :get, 'https://blockchain.info/ticker'
     ).to_return(body: '{"USD" : {"15m" : 5160.04}}')
@@ -144,7 +147,7 @@ class TestSibit < Minitest::Test
     change = sibit.create(sibit.generate)
     assert_raises Sibit::Error do
       sibit.pay(
-        '0.0001BTC', 'XL',
+        '0.0001BTC', '-XL',
         {
           '1JvCsJtLmCxEk7ddZFnVkGXpr9uhxZPmJi' =>
           'fd2333686f49d8647e1ce8d5ef39c304520b08f3c756b67068b30a3db217dcb2'

metadata

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