sibit 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae183604ee6f09fa79e8f857ce4a50d519d8601414ac7dbc719e951e880ca25a
-  data.tar.gz: 1642d87a24d1262027d1310e472afbdf39578df6e2298bd472882720f2681fa5
+  metadata.gz: 45ecd94da9a09da7f98b1997ec5a4bc809586fd0df18ffc5e83f3868fb57cf1d
+  data.tar.gz: bc0cbf54e5606685cf7c6729c49b5eadbc6b5590d7942cd880e4fd82daa5c1d6
 SHA512:
-  metadata.gz: b33923c39c53ac6bb6d5da80465d3ccee850426d5e6ada0beee6e5f094e42e9db8afce5a892a9c99853366272a1197dd9c0a38fdbcf73f48b84c512466745308
-  data.tar.gz: 3eb142b889f41a114e166ef1d1308fa1baf17acfdf685881aabf0d6c55306ac7f571e79369ed4dc11bfe8a636bccbae68db2ff9a7d66a4629d9c37db37844dd4
+  metadata.gz: 2049ad467b90e2b87d7f4149aa5d79d86810fc3b0fa56b278e17a7de3c9e3613c38eb53fb82fe3f5d8a68184921fadc04c9d3e3433c912034afe411e3509cd22
+  data.tar.gz: 3e15a316137cb4d01c8b9a1dd3339865920fe7006fdd52e31bf79ea284160eaeda73283414f75eeaad6805d27933b3b1538cdf71eda4566e7233da92ccf7ec6a

data/lib/sibit/version.rb

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

data/lib/sibit.rb

@@ -128,7 +128,8 @@ class Sibit
     utxos = get_json(
       "/unspent?active=#{sources.keys.join('|')}&limit=1000"
     )['unspent_outputs']
-    info("#{utxos.count} UTXOs found (value/confirmations at tx_hash):")
+    info("#{utxos.count} UTXOs found, these will be used \
+(value/confirmations at tx_hash):")
     utxos.each do |utxo|
       unspent += utxo['value']
       builder.input do |i|
@@ -139,22 +140,33 @@ class Sibit
         i.signature_key(key(sources[address]))
       end
       size += 180
-      info("  #{utxo['value']}/#{utxo['confirmations']} at #{utxo['tx_hash_big_endian']}")
+      info("  #{num(utxo['value'])}/#{utxo['confirmations']} at #{utxo['tx_hash_big_endian']}")
       break if unspent > satoshi
     end
-    raise Error, "Not enough funds to send #{amount}, only #{unspent} left" if unspent < satoshi
+    if unspent < satoshi
+      raise Error, "Not enough funds to send #{num(amount)}, only #{num(unspent)} left"
+    end
     builder.output(satoshi, target)
     f = mfee(fee, size)
     tx = builder.tx(
       input_value: unspent,
-      leave_fee: f,
+      leave_fee: true,
+      extra_fee: f - Bitcoin.network[:min_tx_fee],
       change_address: change
     )
-    info("A new Bitcoin transaction #{tx.hash} prepared; #{tx.in.count} inputs; \
-#{tx.out.count} outputs; fee is #{f}; size is #{size}; unspent is #{unspent}; \
-amount is #{satoshi}; target address is #{target}; change address is #{change}:
-  #{tx.inputs.map { |i| " in: #{i.prev_out.bth}:#{i.prev_out_index}" }.join("\n  ")}
-  #{tx.outputs.map { |o| "out: #{o.script.bth}:#{o.value}" }.join("\n  ")}")
+    info("A new Bitcoin transaction #{tx.hash} prepared:
+  #{tx.in.count} input#{tx.in.count > 1 ? 's' : ''}:
+    #{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)}" }.join("\n    ")}
+  Fee required: #{num(f)} satoshi
+  Min tx fee: #{num(Bitcoin.network[:min_tx_fee])} satoshi
+  Fee left: #{num(unspent - tx.outputs.map(&:value).inject(&:+))} satoshi
+  Tx size: #{num(size)} bytes
+  Unspent: #{num(unspent)} satoshi
+  Amount: #{num(satoshi)} satoshi
+  Target address: #{target}
+  Change address is #{change}")
     post_tx(tx.to_payload.bth)
     tx.hash
   end
@@ -177,6 +189,10 @@ amount is #{satoshi}; target address is #{target}; change address is #{change}:
 
   private
 
+  def num(int)
+    int.to_s.gsub(/\d(?=(...)+$)/, '\0,')
+  end
+
   # Convert text to amount.
   def satoshi(amount)
     return amount if amount.is_a?(Integer)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sibit
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-13 00:00:00.000000000 Z
+date: 2019-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace