onchain 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da08e99a19308739fd1b094c0f49fdc77a3a3a47
-  data.tar.gz: e18db7ffc4b67db018bac4d56dca017027e60c3e
+  metadata.gz: 6014ed705855da5a183a1d54b75017fa0cd431a7
+  data.tar.gz: c6e04256160aa7fefe43988ca500445bc75b6381
 SHA512:
-  metadata.gz: 265ecdb23042caa3d317f15c7be60297298f52b1f19d5e9fa2fbc685bd21a4a29268ca85a6c62164db97aa65d44244d3821c70ec9359cd1def352fb008822a37
-  data.tar.gz: 1e8245a12f81f9f916769b426a58ff89189203cf2cb7f95fef680582ccdc970bd3fdcd7bb9ac37c27eca6b259dfaa5023aec14f7b087b2f403dcb1c82129c765
+  metadata.gz: 826d0fb3d913ac4b0c87bd0f39746ae4ca4225037a4e0888bca3144edd5eaf6c96c20a210b27f2585a5e86e0021d80113ace4247375a683e5cfd29cbf3ef568c
+  data.tar.gz: 57d80f07459e90b108654329bb7f047fdca060727007a467775dcabb04a3672f7c8a621b7288df49afc0e2cf9136242cf084886e5bc2eb689e9c4c45dd2daab3

data/lib/onchain/transaction.rb

@@ -24,6 +24,24 @@ class OnChain::Transaction
   
       tx.add_out(txout)
       
+      # Add wallet fee
+      add_fee_to_tx(fee, fee_addr, tx)
+    
+      # Send the change back.
+      if change > 0
+        
+        txout = Bitcoin::Protocol::TxOut.new(change, Bitcoin::Script.to_address_script(orig_addr))
+  
+        tx.add_out(txout)
+      end
+
+      inputs_to_sign = get_inputs_to_sign(tx)
+      
+      return OnChain::bin_to_hex(tx.to_payload), inputs_to_sign
+    end
+    
+    def add_fee_to_tx(fee, fee_addr, tx)
+      
       # Add wallet fee
       if fee > 0 and (fee - 10000) > 0
         
@@ -42,17 +60,55 @@ class OnChain::Transaction
           tx.add_out(txout)
         end
       end
+      
+    end
+    
+    # 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)
+  
+      total_amount = amount + fee
+      
+      addresses = redemption_scripts.map { |rs| 
+        OnChain::Sweeper.generate_address_of_redemption_script(rs)
+      }
+      
+      unspents, indexes, change = OnChain::BlockChain.get_unspent_for_amount(addresses, total_amount)
+      
+      # OK, let's build a transaction.
+      tx = Bitcoin::Protocol::Tx.new
+      
+      # Process the unpsent outs.
+      unspents.each_with_index do |spent, index|
+
+        script = redemption_scripts[indexes[index]]
+        
+        txin = Bitcoin::Protocol::TxIn.new([ spent[0] ].pack('H*').reverse, spent[1])
+        txin.script_sig = OnChain::hex_to_bin(script)
+        tx.add_in(txin)
+      end
+      
+      # Add wallet fee
+      add_fee_to_tx(fee, fee_addr, tx)
+
+      txout = Bitcoin::Protocol::TxOut.new(amount, Bitcoin::Script.to_address_script(address))
+  
+      tx.add_out(txout)
+      
+      change_address = addresses[0]
     
       # 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, 
+          Bitcoin::Script.to_address_script(change_address))
   
         tx.add_out(txout)
       end
 
-      inputs_to_sign = get_inputs_to_sign(tx)
-      
+      inputs_to_sign = get_inputs_to_sign tx
+    
       return OnChain::bin_to_hex(tx.to_payload), inputs_to_sign
     end
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onchain
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - Ian Purton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for various 3rd-party bitcoin APIs