onchain 2.3 → 2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e0ae65d6e54cbc4599ea2ccb949acc9a2482ced
-  data.tar.gz: b71e1ebe3e447b7663e171bbf8de786e91e1cf53
+  metadata.gz: 034458f790aa11b634b8bb69124f656c0eda1f9b
+  data.tar.gz: 183a2755af1208eb7dc3c0a985986d4e5f592095
 SHA512:
-  metadata.gz: 1e95e29074f81ac939a68bdb16ff3d03a63dfcf5c2a9a50333c75932c386431f295d263d2c38bb1991210732e8cc39939b9babb961de719350bfe0eccbac1f19
-  data.tar.gz: 33581e5f053abf20126df74cce178e927afeabb4e363e295ed413b9e0065012d6f6f579cd49ee5553328b152a8435b09a6239aacfd6355734adaadc188af5e60
+  metadata.gz: 3b257a25e848762377438c1cde57b3fc9e34d2e2329c8f9b38ee3bae30b4238e9ff7282b85681096178b40935cee8593e66f5f291b7a77df9c44b10d99f5bc11
+  data.tar.gz: 2f4da8dda8a8b4476817a0491f01a64720f34a63868099936c72dcb464207138ca6b4815d94f3a6bd1e7b93277e00db3931d586c397abb95f28ab1ac53bb4858

data/lib/onchain/providers/blockchaininfo_api.rb

@@ -126,6 +126,11 @@ class OnChain::BlockChain
       end
       return bal
     end
+
+    def blockinfo_get_transaction(txhash)
+      base = "https://blockchain.info/rawtx/#{txhash}?format=hex"
+      return fetch_response(URI::encode(base))
+    end
   
     def block_chain(cmd, address, params = "")
       base_url = "https://blockchain.info/#{cmd}/#{address}?format=json" + params

data/lib/onchain/providers/blockr_api.rb

@@ -101,6 +101,11 @@ class OnChain::BlockChain
         cache_write(addr, bal, BALANCE_CACHE_FOR)
       end
     end
+
+    def blockr_get_transaction(txhash)
+      base = "https://blockr.io/api/v1/tx/raw/" + txhash
+      return fetch_response(URI::encode(base))['data']['tx']['hex']
+    end
   
     def blockr(cmd, address, params = "")
 

data/lib/onchain/transaction.rb

@@ -1,6 +1,37 @@
 class OnChain::Transaction
   class << self
     
+    # Check a transactions inputs only spend enough to cover fees and amount
+    # Basically if onchain creates an incorrect transaction the client
+    # can identify it here.
+    def check_integrity(txhex, amount, orig_addresses, dest_addr, tolerence)
+      
+      tx = Bitcoin::Protocol::Tx.new OnChain::hex_to_bin(txhex)
+      
+      input_amount = 0
+      # Let's add up the value of all the inputs.
+      tx.in.each_with_index do |txin, index|
+        prev_hash = txin.to_hash['prev_out']['hash']
+        prev_index = txin.to_hash['prev_out']['n']
+        
+        # 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
+          raise "One of the inputs is not from from our list of valid originating addresses"
+        end
+      end
+      
+      tolerence = (amount * (1 + tolerence)) 
+      if input_amount > tolerence
+        raise "Transaction has more input value (#{input_amount}) than the tolerence #{tolerence}"
+      end
+      
+      return true
+    end
+    
     def create_single_address_transaction(orig_addr, dest_addr, amount, fee_percent, fee_addr, min_fee_satoshi)
 
       tx = Bitcoin::Protocol::Tx.new
@@ -11,6 +42,7 @@ class OnChain::Transaction
       
       unspents, indexes, change = OnChain::BlockChain.get_unspent_for_amount(
         [orig_addr], total_amount)
+      indexes = nil
     
       
       # Process the unpsent outs.
@@ -66,7 +98,7 @@ class OnChain::Transaction
     # Like create_single_address_transaction but for multi sig wallets.
     def create_transaction_with_fee(redemption_scripts, address, amount, fee_percent, fee_addr)
     
-      fee = calculate_fee(amount, fee_percent)
+      fee = calculate_fee(amount, fee_percent, 10000)
   
       total_amount = amount + fee
       

metadata

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