onchain 2.7 → 2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fd37bc684d309bb9c0a1fdacfbb066e61bfc0d0
-  data.tar.gz: dd377843c1479db0d1fdc5c98692cf94ecc367f9
+  metadata.gz: 2703385de3ceefa777d64885f6a047f01f0b6bcf
+  data.tar.gz: 82aa03a8de7211bedf7cd825e86d907514b42636
 SHA512:
-  metadata.gz: 821744ea8ad3475efd1275ce2088c830c173af33603998405be8b1d55ed749e687a472cd6dca18f870e4e6fcb1fb002eda10c0066c9cca2687bed145bba2c8c9
-  data.tar.gz: 92de84981941cbfb00e1a98b01877b4a8d1abf623c9677b1ac3080850c2a802c74bc916a052e0d2289e677a043959672ec3333b9042947455d6f921dca003f49
+  metadata.gz: 95726ce6f2c934c1d089809b8af5ea125f422b9e4254398e1676f78163b225cc359ba6719b05fada9b6358ec41647d11ffabfe755c2f86ce2838a0fdbb4cc724
+  data.tar.gz: 6841cd228889544b0e6ab79f61b9a6e64c3c08882958115513ebd2b22872231a724e46e479a6ee63eba13bc3953aa552f452a8076e3da56d2c09a0323a99ebb0

data/lib/onchain/transaction.rb

@@ -223,17 +223,17 @@ class OnChain::Transaction
     # [0][034000....][:hash => '345435345...'] 
     # [0][02fee.....][:hash => '122133445....']
     # 
-    def create_transaction(redemption_scripts, address, amount_in_satoshi, miners_fee)
+    def create_transaction(redemption_scripts, address, amount_in_satoshi, miners_fee, network = :bitcoin)
     
       total_amount = miners_fee
   
       total_amount = total_amount + amount_in_satoshi
       
       addresses = redemption_scripts.map { |rs| 
-        OnChain::Sweeper.generate_address_of_redemption_script(rs)
+        generate_address_of_redemption_script(rs, network)
       }
       
-      unspents, indexes, change = OnChain::BlockChain.get_unspent_for_amount(addresses, total_amount)
+      unspents, indexes, change = OnChain::BlockChain.get_unspent_for_amount(addresses, total_amount, network)
       
       # OK, let's build a transaction.
       tx = Bitcoin::Protocol::Tx.new
@@ -254,7 +254,7 @@ class OnChain::Transaction
       #end
 
       txout = Bitcoin::Protocol::TxOut.new(amount_in_satoshi, 
-          Bitcoin::Script.to_address_script(address))
+          to_address_script(address, network))
   
       tx.add_out(txout)
       
@@ -264,7 +264,7 @@ class OnChain::Transaction
       if change > 0
       
         txout = Bitcoin::Protocol::TxOut.new(change, 
-          Bitcoin::Script.to_address_script(change_address))
+          to_address_script(change_address, network))
   
         tx.add_out(txout)
       end
@@ -273,6 +273,16 @@ class OnChain::Transaction
     
       return OnChain::bin_to_hex(tx.to_payload), inputs_to_sign
     end
+  
+    def generate_address_of_redemption_script(redemption_script, network = :bitcoin)
+      
+      Bitcoin.network = network
+      hash160 = Bitcoin.hash160(redemption_script)
+      addr =  Bitcoin.hash160_to_p2sh_address(hash160)
+      Bitcoin.network = :bitcoin
+      
+      return addr
+    end
     
     # Given a transaction in hex string format, apply
     # the given signature list to it.

metadata

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