onchain 2.4 → 2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 034458f790aa11b634b8bb69124f656c0eda1f9b
-  data.tar.gz: 183a2755af1208eb7dc3c0a985986d4e5f592095
+  metadata.gz: 75e5c8220374d307aa3f82bdb6e216c06d2f587c
+  data.tar.gz: a889f8795cd4958e2f4ff95fb105e721d12857d3
 SHA512:
-  metadata.gz: 3b257a25e848762377438c1cde57b3fc9e34d2e2329c8f9b38ee3bae30b4238e9ff7282b85681096178b40935cee8593e66f5f291b7a77df9c44b10d99f5bc11
-  data.tar.gz: 2f4da8dda8a8b4476817a0491f01a64720f34a63868099936c72dcb464207138ca6b4815d94f3a6bd1e7b93277e00db3931d586c397abb95f28ab1ac53bb4858
+  metadata.gz: 9bd3003993dca0e2378427eeab184b2175acf477b89a0316bbd082f3c828d20867630792f2279f8093387198f7463d1fec8ec30e9b559439d5c8b2cffb633c5b
+  data.tar.gz: 2987be8bced4ef31dc15781f642f39f7b512ccf8db1385e20b0782ce571da1e1017099ac59d50cf0dd9149bddc02eaa89b1eb25a74ce0c3a1624208977ed9cdf

data/lib/onchain/transaction.rb

@@ -17,6 +17,7 @@ class OnChain::Transaction
         # Get the amount for the previous output
         prevhex = OnChain::BlockChain.get_transaction(prev_hash)
         prev_tx = Bitcoin::Protocol::Tx.new OnChain::hex_to_bin(prevhex)
+        
         input_amount += prev_tx.out[prev_index].value
         
         if ! orig_addresses.include? prev_tx.out[prev_index].parsed_script.get_hash160_address
@@ -24,6 +25,13 @@ class OnChain::Transaction
         end
       end
       
+      # subtract the the chnage amounts
+      tx.out.each do |txout|
+        if orig_addresses.include? txout.parsed_script.get_address
+          input_amount = input_amount - txout.value
+        end
+      end
+      
       tolerence = (amount * (1 + tolerence)) 
       if input_amount > tolerence
         raise "Transaction has more input value (#{input_amount}) than the tolerence #{tolerence}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onchain
 version: !ruby/object:Gem::Version
-  version: '2.4'
+  version: '2.5'
 platform: ruby
 authors:
 - Ian Purton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake