sibit 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abe4c1faeac9709e415789d44665ea4085bbb8b32a17c24513f4253dc348ff06
-  data.tar.gz: eb36a0305ec3ec0a2a402ff2b82daa14e4a4033b9b9634b3e3f187da762316ee
+  metadata.gz: 6a410aaa9dcc78c30bde9cf5f0b38f5869a6b6b1bbb1a364b2a1ef603aceba72
+  data.tar.gz: cc2b8197a9b230607b376205029300aa68ff55ac409b4c7a1334f46417ea5069
 SHA512:
-  metadata.gz: ac511a6fc0ab21f688cd15785d0c6d802ad207d6a30c7229297d8da2e6bfae9304d8c50c69dee4e16589b52d870d50d2584ce08a912aa0c74b9e97e938d27429
-  data.tar.gz: e9a5dea41cd26bb9af6afa4d764e23ac61793b5c465827e687d467255237792295b3a6a59e5b4d8cdacd1d3382f457df8629b5f9ea9cd99ecc620eedd5090e26
+  metadata.gz: 3f28d118de6d6611298ebc0088c1583bf6a1d8ff99e0c46d9d37e19dfb896ae544a783933347ceb73a6335c8c88212ea73fee5cc81a136db854b903d79c68552
+  data.tar.gz: d3f3a9ee63757febd44c8b309a6edc605f360e116fdb45d6c07f769883ba05a496dd624f424fb44fb2deb13fe71593ed3d9d334ab5dcee17ba798b1b4750556c

data/.rultor.yml

@@ -1,6 +1,6 @@
 assets:
-  rubygems.yml: zerocracy/home#assets/rubygems.yml
-  s3cfg: zerocracy/home#assets/s3cfg
+  rubygems.yml: yegor256/home#assets/rubygems.yml
+  s3cfg: yegor256/home#assets/s3cfg
 install: |
   export GEM_HOME=~/.ruby
   export GEM_PATH=$GEM_HOME:$GEM_PATH

data/README.md

@@ -15,7 +15,9 @@
 [![Hits-of-Code](https://hitsofcode.com/github/yegor256/sibit)](https://hitsofcode.com/view/github/yegor256/sibit)
 
 To understand how Bitcoin protocol works, I recommend you watching
-this [short video](https://www.youtube.com/watch?v=IV9pRBq5A4g).
+this [short video](https://www.youtube.com/watch?v=IV9pRBq5A4g) and
+then reading this blog post of mine:
+[_Sibit Demonstrates How Bitcoin Works_](https://www.yegor256.com/2019/05/07/sibit-bitcoin-command-line-client.html).
 
 This is a simple Bitcoin client, to use from the command line
 or from your Ruby app. You don't need to run any Bitcoin software,

data/bin/sibit

@@ -32,6 +32,7 @@ begin
       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
@@ -61,6 +62,14 @@ Options are:"
   case opts.arguments[0]
   when 'price'
     puts sibit.price
+  when 'fees'
+    fees = sibit.fees
+    text = %i[S M L XL].map do |m|
+      sat = fees[m] * 250
+      usd = sat * sibit.price / 100_000_000
+      "#{m}: #{sat}sat / $#{format('%.02f', usd)}"
+    end.join("\n")
+    puts text
   when 'latest'
     puts sibit.latest
   when 'generate'

data/features/cli.feature

@@ -26,6 +26,10 @@ Feature: Command Line Processing
     When I run bin/sibit with "balance 1MZT1fa6y8H9UmbZV6HqKF4UY41o9MGT5f --verbose"
     Then Exit code is zero
 
+  Scenario: Bitcoin fees can be printed
+    When I run bin/sibit with "fees --verbose"
+    Then Exit code is zero
+
   Scenario: Bitcoin transaction can be sent
     When I run bin/sibit with "--verbose --dry pay 100000 S 1JvCsJtLmCxEk7ddZFnVkGXpr9uhxZPmJi:fd2333686f49d8647e1ce8d5ef39c304520b08f3c756b67068b30a3db217dcb2 1JvCsJtLmCxEk7ddZFnVkGXpr9uhxZPmJi 1JvCsJtLmCxEk7ddZFnVkGXpr9uhxZPmJi"
     Then Exit code is zero

data/lib/sibit/version.rb

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

data/lib/sibit.rb

@@ -123,6 +123,24 @@ class Sibit
     json['final_balance']
   end
 
+  # Get recommended fees, in satoshi per byte. The method returns
+  # a hash: { S: 12, M: 45, L: 100, XL: 200 }
+  def fees
+    json = JSON.parse(
+      Net::HTTP.get(
+        URI('https://bitcoinfees.earn.com/api/v1/fees/recommended')
+      )
+    )
+    info("Current recommended Bitcoin fees: \
+#{json['hourFee']}/#{json['halfHourFee']}/#{json['fastestFee']} sat/byte")
+    {
+      S: json['hourFee'] / 3,
+      M: json['hourFee'],
+      L: json['halfHourFee'],
+      XL: json['fastestFee']
+    }
+  end
+
   # Sends a payment and returns the transaction hash.
   #
   # If the payment can't be signed (the key is wrong, for example) or the
@@ -181,7 +199,6 @@ class Sibit
     #{tx.inputs.map { |i| " in: #{i.prev_out.bth}:#{i.prev_out_index}" }.join("\n    ")}
   #{tx.out.count} output#{tx.out.count > 1 ? 's' : ''}:
     #{tx.outputs.map { |o| "out: #{o.script.bth} / #{num(o.value, p)}" }.join("\n    ")}
-  Fee required: #{num(f, p)}
   Min tx fee: #{num(Bitcoin.network[:min_tx_fee], p)}
   Fee left: #{num(left, p)}
   Tx size: #{size} bytes
@@ -242,11 +259,9 @@ 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)
-    return 10 * size if fee == 'S'
-    return 50 * size if fee == 'M'
-    return 100 * size if fee == 'L'
-    return 250 * size if fee == 'XL'
-    raise Error, "Can't understand the fee: #{fee.inspect}"
+    sat = fees[fee.to_sym]
+    raise Error, "Can't understand the fee: #{fee.inspect}" if sat.nil?
+    sat * size
   end
 
   # Make key from private key string in Hash160.

data/test/test_sibit.rb

@@ -30,10 +30,22 @@ require_relative '../lib/sibit'
 # Copyright:: Copyright (c) 2019 Yegor Bugayenko
 # License:: MIT
 class TestSibit < Minitest::Test
+  def test_loads_fees
+    stub_request(
+      :get, 'https://bitcoinfees.earn.com/api/v1/fees/recommended'
+    ).to_return(body: '{"fastestFee":300,"halfHourFee":200,"hourFee":180}')
+    sibit = Sibit.new
+    fees = sibit.fees
+    assert_equal(60, fees[:S])
+    assert_equal(180, fees[:M])
+    assert_equal(200, fees[:L])
+    assert_equal(300, fees[:XL])
+  end
+
   def test_fetch_current_price
     stub_request(
       :get, 'https://blockchain.info/ticker'
-    ).to_return(status: 200, body: '{"USD" : {"15m" : 5160.04}}')
+    ).to_return(body: '{"USD" : {"15m" : 5160.04}}')
     sibit = Sibit.new
     price = sibit.price
     assert(!price.nil?)
@@ -62,7 +74,7 @@ class TestSibit < Minitest::Test
     stub_request(
       :get,
       'https://blockchain.info/rawaddr/1MZT1fa6y8H9UmbZV6HqKF4UY41o9MGT5f'
-    ).to_return(status: 200, body: '{"final_balance": 100}')
+    ).to_return(body: '{"final_balance": 100}')
     sibit = Sibit.new
     balance = sibit.balance('1MZT1fa6y8H9UmbZV6HqKF4UY41o9MGT5f')
     assert(balance.is_a?(Integer))
@@ -71,7 +83,6 @@ class TestSibit < Minitest::Test
 
   def test_get_latest_block
     stub_request(:get, 'https://blockchain.info/latestblock').to_return(
-      status: 200,
       body: '{"hash": "0000000000000538200a48202ca6340e983646ca088c7618ae82d68e0c76ef5a"}'
     )
     sibit = Sibit.new
@@ -80,9 +91,12 @@ class TestSibit < Minitest::Test
   end
 
   def test_send_payment
+    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(status: 200, body: '{"USD" : {"15m" : 5160.04}}')
+    ).to_return(body: '{"USD" : {"15m" : 5160.04}}')
     json = {
       unspent_outputs: [
         {
@@ -97,7 +111,7 @@ class TestSibit < Minitest::Test
     stub_request(
       :get,
       'https://blockchain.info/unspent?active=1JvCsJtLmCxEk7ddZFnVkGXpr9uhxZPmJi&limit=1000'
-    ).to_return(status: 200, body: JSON.pretty_generate(json))
+    ).to_return(body: JSON.pretty_generate(json))
     stub_request(:post, 'https://blockchain.info/pushtx').to_return(status: 200)
     sibit = Sibit.new
     target = sibit.create(sibit.generate)
@@ -117,14 +131,14 @@ class TestSibit < Minitest::Test
   def test_fail_if_not_enough_funds
     stub_request(
       :get, 'https://blockchain.info/ticker'
-    ).to_return(status: 200, body: '{"USD" : {"15m" : 5160.04}}')
+    ).to_return(body: '{"USD" : {"15m" : 5160.04}}')
     json = {
       unspent_outputs: []
     }
     stub_request(
       :get,
       'https://blockchain.info/unspent?active=1JvCsJtLmCxEk7ddZFnVkGXpr9uhxZPmJi&limit=1000'
-    ).to_return(status: 200, body: JSON.pretty_generate(json))
+    ).to_return(body: JSON.pretty_generate(json))
     sibit = Sibit.new
     target = sibit.create(sibit.generate)
     change = sibit.create(sibit.generate)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sibit
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-27 00:00:00.000000000 Z
+date: 2019-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace