onchain 2.6 → 2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2193dbde4c0d67e834351acccd08a750e43fd728
-  data.tar.gz: 5c0198213f4943b4a9c227ebbc585a7badbf24d0
+  metadata.gz: 5fd37bc684d309bb9c0a1fdacfbb066e61bfc0d0
+  data.tar.gz: dd377843c1479db0d1fdc5c98692cf94ecc367f9
 SHA512:
-  metadata.gz: 0aee998b0737e7884dc33dd4e1d8d77b775e6d3e9a7d06f724cc277de77a7eb35d762c3ab53ab59961e6acda3891df010daaae0a9daf55426d6cd781b814748d
-  data.tar.gz: 808d0da5669a5b473e3359ee79a0973eb22774544ffa10b2b8bf5842fa5bcab47359db6fa271c4e5e65444b93d6566cdf18ea29d6300b8f85a35d6129c4d9d3a
+  metadata.gz: 821744ea8ad3475efd1275ce2088c830c173af33603998405be8b1d55ed749e687a472cd6dca18f870e4e6fcb1fb002eda10c0066c9cca2687bed145bba2c8c9
+  data.tar.gz: 92de84981941cbfb00e1a98b01877b4a8d1abf623c9677b1ac3080850c2a802c74bc916a052e0d2289e677a043959672ec3333b9042947455d6f921dca003f49

data/lib/onchain/block_chain.rb

@@ -81,7 +81,7 @@ class OnChain::BlockChain
       return ret
     end
     
-    def get_unspent_for_amount(addresses, amount_in_satoshi)
+    def get_unspent_for_amount(addresses, amount_in_satoshi, network = :bitcoin)
       
       unspents = []
       indexes = []
@@ -93,7 +93,7 @@ class OnChain::BlockChain
           break
         end
         
-        unspent_outs = get_unspent_outs(address)
+        unspent_outs = get_unspent_outs(address, network)
         
         unspent_outs.each do |spent|
 

data/lib/onchain/transaction.rb

@@ -40,7 +40,8 @@ class OnChain::Transaction
       return true
     end
     
-    def create_single_address_transaction(orig_addr, dest_addr, amount, fee_percent, fee_addr, min_fee_satoshi)
+    def create_single_address_transaction(orig_addr, dest_addr, amount, 
+      fee_percent, fee_addr, min_fee_satoshi, network = :bitcoin)
 
       tx = Bitcoin::Protocol::Tx.new
       
@@ -49,7 +50,7 @@ class OnChain::Transaction
       total_amount = amount + fee
       
       unspents, indexes, change = OnChain::BlockChain.get_unspent_for_amount(
-        [orig_addr], total_amount)
+        [orig_addr], total_amount, network)
       indexes = nil
     
       
@@ -60,17 +61,17 @@ class OnChain::Transaction
         txin.script_sig = OnChain.hex_to_bin(spent[2])
         tx.add_in(txin)
       end
-      txout = Bitcoin::Protocol::TxOut.new(amount, Bitcoin::Script.to_address_script(dest_addr))
+      txout = Bitcoin::Protocol::TxOut.new(amount, to_address_script(dest_addr, network))
   
       tx.add_out(txout)
       
       # Add wallet fee
-      add_fee_to_tx(fee, fee_addr, tx)
+      add_fee_to_tx(fee, fee_addr, tx, network)
     
       # Send the change back.
       if change > 0
         
-        txout = Bitcoin::Protocol::TxOut.new(change, Bitcoin::Script.to_address_script(orig_addr))
+        txout = Bitcoin::Protocol::TxOut.new(change, to_address_script(orig_addr, network))
   
         tx.add_out(txout)
       end
@@ -80,7 +81,19 @@ class OnChain::Transaction
       return OnChain::bin_to_hex(tx.to_payload), inputs_to_sign
     end
     
-    def add_fee_to_tx(fee, fee_addr, tx)
+    # The bitcoin ruby methods are not thread safe when switching between
+    # testnet and the bitcoin network.
+    def to_address_script(orig_addr, network = :bitcoin)
+      
+      # TODO add thread safety.
+      Bitcoin.network = network
+      address = Bitcoin::Script.to_address_script(orig_addr)
+      Bitcoin.network = :bitcoin
+      
+      return address
+    end
+    
+    def add_fee_to_tx(fee, fee_addr, tx, network = :bitcoin)
       
       # Add wallet fee
       if fee > 0 and (fee - 10000) > 0
@@ -91,12 +104,12 @@ class OnChain::Transaction
         # Check for affiliate
         if fee_addr.kind_of?(Array)
           affil_fee = fee / 2
-          txout1 = Bitcoin::Protocol::TxOut.new(affil_fee, Bitcoin::Script.to_address_script(fee_addr[0]))
-          txout2 = Bitcoin::Protocol::TxOut.new(affil_fee, Bitcoin::Script.to_address_script(fee_addr[1]))
+          txout1 = Bitcoin::Protocol::TxOut.new(affil_fee, to_address_script(fee_addr[0], network))
+          txout2 = Bitcoin::Protocol::TxOut.new(affil_fee, to_address_script(fee_addr[1], network))
           tx.add_out(txout1)
           tx.add_out(txout2)
         else
-          txout = Bitcoin::Protocol::TxOut.new(fee, Bitcoin::Script.to_address_script(fee_addr))
+          txout = Bitcoin::Protocol::TxOut.new(fee, to_address_script(fee_addr, network))
           tx.add_out(txout)
         end
       end

metadata

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