keoken 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29d51ac3b604a27b5362f52d8f2ba9e3f81f65d0d2e0c3baa673ebfc258b93cf
-  data.tar.gz: 9882d25399c16a712b3696b0a14a72c2dc5309c72221cd7b27ecbf5a2d74dcd2
+  metadata.gz: 14e0efe0081278e084d03fe333a3dbc852dd5b6c219e7b4c45198c69944a24b0
+  data.tar.gz: a8c4681e653efe43ad9dd2aac60e8c168ab767c03226e0758bed791180bf4ca6
 SHA512:
-  metadata.gz: 66d5484853ad4caeb69ed2a7e5962458d28b5ec194ae11eae5ecfe0bd617baad8742512fc5cd5b7d2252a0ccff7b3e162b7cf8735edeb3e1bfaeace74d9a5e4c
-  data.tar.gz: a0cd9a77f78f8206156ebbdf7ccc83d592637517578482a1dc64f54277d9fcb91808cf98ffe74114f4fbb8faa70578a886695631df098548c980469711640c4b
+  metadata.gz: ec05b3fe77a60e3fe07dd94004d8c775e82e292e71736bcfb8b35323a604e69003adc30975124e2dbf6fdecb2955d193107fea5a8ed4edcb1d0b2389899acf13
+  data.tar.gz: 540bac210aae1f70ed8f25d5706cec7adcd4cd343efb18283a1616d64408c25d51a261c31006b623cbb76987da6b1d10ca176ca925b8f9b238d0e9df646fadc3

data/Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .
   specs:
-    keoken (0.2.5)
+    keoken (0.2.6)
       bitcoin-ruby (~> 0.0.18)
 
 GEM

data/lib/keoken/backend/base.rb

@@ -1,7 +1,7 @@
 module Keoken
   module Backend
     class Base
-      attr_accessor :inputs, :bitprim_transaction
+      attr_accessor :inputs, :bitprim_transaction, :total_inputs_amount
 
       def initialize
         @inputs = []
@@ -12,31 +12,30 @@ module Keoken
 
       def build_inputs(address)
         utxos = bitprim_transaction.utxos(address)
+        @total_inputs_amount = 0
         utxos.each do |utxo|
           txid = utxo['txid']
           transaction = bitprim_transaction.tx(txid)
           outputs = transaction['vout'].select do |vout|
             addresses = vout['scriptPubKey']['addresses']
-            if addresses
-              addresses.any? { |vout_address| vout_address == address }
-            end
+            addresses.any? { |vout_address| vout_address == address } if addresses
           end
           raise Keoken::Error::OutputNotFound if outputs.empty?
           output = outputs.first
+          amount = output['value'].sub!(/\./, '').sub!(/^0+/, '').to_i
           @inputs.push(
             tx_id: txid,
             position: output['n'],
             input_script: output['scriptPubKey']['hex'],
-            input_amount: output['value'].sub!(/\./, '').sub!(/^0+/, '').to_i
+            input_amount: amount
           )
+          @total_inputs_amount += amount
         end
       end
 
       def build_fee(type)
-        total = @inputs.map { |input| input[:input_amount].to_i }.inject(:+)
-        estimate_fee = @bitprim_transaction.estimate_fee.to_f
-        [total,
-         ((10 + 149 * @inputs.length + 35 * output_length(type)) * estimate_fee)
+        [@total_inputs_amount,
+         ((10 * @inputs.length + 35 * output_length(type)) * @bitprim_transaction.estimate_fee.to_f)
            .to_s[0..9].sub!(/\./, '').sub!(/0+/, '')]
       end
 

data/lib/keoken/version.rb

@@ -1,3 +1,3 @@
 module Keoken
-  VERSION = '0.2.6'.freeze
+  VERSION = '0.2.7'.freeze
 end

data/spec/keoken_spec.rb

@@ -114,7 +114,7 @@ describe Keoken do
         eq(
           [
             {
-              "value" => "0.08752190",
+              "value" => "0.08977831",
               "scriptPubKey" => "OP_DUP OP_HASH160 7bb97684cc43e2f8ea0ed1d50dddce3ebf800638 OP_EQUALVERIFY OP_CHECKSIG",
             },
             {
@@ -172,11 +172,11 @@ describe Keoken do
         eq(
           [
             {
-              "value" => "0.00269544",
+              "value" => "0.00117415",
               "scriptPubKey" => "OP_DUP OP_HASH160 4c2791f07c046ef21d688f12296f91ad7b44d2bb OP_EQUALVERIFY OP_CHECKSIG",
             },
             {
-              "value" => "0.08446911",
+              "value" => "0.08751169",
               "scriptPubKey" => "OP_DUP OP_HASH160 7bb97684cc43e2f8ea0ed1d50dddce3ebf800638 OP_EQUALVERIFY OP_CHECKSIG",
             },
             {
@@ -218,7 +218,7 @@ describe Keoken do
             [
               {
                 address: 'bitcoincash:qpxrq63y6kz2wphm2nfsh6z23yvjmz7avcc5wsgruw',
-                amount: '8757229',
+                amount: '8906080',
                 script_type: 'PAYTOADDRESS'
               },
               {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: keoken
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Bitex