btcruby 1.1.4 → 1.1.5

data/spec/transaction_builder_spec.rb

@@ -2,7 +2,7 @@ require_relative 'spec_helper'
 describe BTC::TransactionBuilder do
 
   class SignerByKey
-    include TransactionBuilder::Signer
+    include BTC::TransactionBuilder::Signer
     def initialize(&block)
       @block = block
     end
@@ -12,7 +12,7 @@ describe BTC::TransactionBuilder do
   end
 
   class SignerBySignatureScript
-    include TransactionBuilder::Signer
+    include BTC::TransactionBuilder::Signer
     def initialize(&block)
       @block = block
     end
@@ -23,17 +23,17 @@ describe BTC::TransactionBuilder do
 
   describe "TransactionBuilder with no outputs" do
     before do
-      @builder = TransactionBuilder.new
+      @builder = BTC::TransactionBuilder.new
       @all_utxos = self.mock_utxos
 
       @builder.input_addresses = self.mock_addresses
-      @builder.provider = TransactionBuilder::Provider.new do |txb|
+      @builder.provider = BTC::TransactionBuilder::Provider.new do |txb|
         addrs = txb.public_addresses
         addrs.must_equal self.mock_addresses
         scripts = addrs.map{|a| a.script }.uniq
         @all_utxos.find_all{|utxo| scripts.include?(utxo.script) }
       end
-      @builder.change_address = Address.parse("1CBtcGivXmHQ8ZqdPgeMfcpQNJrqTrSAcG")
+      @builder.change_address = BTC::Address.parse("1CBtcGivXmHQ8ZqdPgeMfcpQNJrqTrSAcG")
     end
 
     it "should fill unspent_outputs using Provider" do
@@ -41,12 +41,12 @@ describe BTC::TransactionBuilder do
     end
 
     it "should have a default fee rate" do
-      @builder.fee_rate.must_equal Transaction::DEFAULT_FEE_RATE
+      @builder.fee_rate.must_equal BTC::Transaction::DEFAULT_FEE_RATE
     end
 
     it "should return a result" do
       result = @builder.build
-      result.class.must_equal TransactionBuilder::Result
+      result.class.must_equal BTC::TransactionBuilder::Result
     end
 
     it "should compose a fully-spending transaction when no outputs are given" do
@@ -64,7 +64,7 @@ describe BTC::TransactionBuilder do
     it "should have a reasonable fee" do
       result = @builder.build
       size = result.transaction.data.bytesize # size of unsigned transaction
-      result.fee.must_be :>=, (size / 1000)*Transaction::DEFAULT_FEE_RATE
+      result.fee.must_be :>=, (size / 1000)*BTC::Transaction::DEFAULT_FEE_RATE
       result.fee.must_be :<, 0.01 * BTC::COIN
     end
 
@@ -111,7 +111,7 @@ describe BTC::TransactionBuilder do
 
     it "should sign if signer provides a signature script" do
       @builder.signer = SignerBySignatureScript.new do |txin, txout|
-        Script.new << "signature" << "pubkey"
+        BTC::Script.new << "signature" << "pubkey"
       end
       result = @builder.build
       result.unsigned_input_indexes.must_equal []
@@ -126,7 +126,7 @@ describe BTC::TransactionBuilder do
     it "should include all prepended unspents AND all normal unspents" do
       @builder.prepended_unspent_outputs = [ BTC::TransactionOutput.new(
         value: 6_666_666,
-        script: Address.parse("3EktnHQD7RiAE6uzMj2ZifT9YgRrkSgzQX").script,
+        script: BTC::Address.parse("3EktnHQD7RiAE6uzMj2ZifT9YgRrkSgzQX").script,
         index: 0,
         transaction_hash: "some mock tx".hash256
       ) ]
@@ -141,18 +141,18 @@ describe BTC::TransactionBuilder do
 
   describe "TransactionBuilder with some outputs" do
     before do
-      @builder = TransactionBuilder.new
+      @builder = BTC::TransactionBuilder.new
       @all_utxos = self.mock_utxos
       @builder.input_addresses = self.mock_addresses
-      @builder.provider = TransactionBuilder::Provider.new do |txb|
+      @builder.provider = BTC::TransactionBuilder::Provider.new do |txb|
         addrs = txb.public_addresses
         addrs.must_equal self.mock_addresses
         scripts = addrs.map{|a| a.script }.uniq
         @all_utxos.find_all{|utxo| scripts.include?(utxo.script) }
       end
-      @builder.change_address = Address.parse("1CBtcGivXmHQ8ZqdPgeMfcpQNJrqTrSAcG")
-      @builder.outputs = [ TransactionOutput.new(value: 1000_500,
-                            script: Address.parse("1TipsuQ7CSqfQsjA9KU5jarSB1AnrVLLo").script) ]
+      @builder.change_address = BTC::Address.parse("1CBtcGivXmHQ8ZqdPgeMfcpQNJrqTrSAcG")
+      @builder.outputs = [ BTC::TransactionOutput.new(value: 1000_500,
+                            script: BTC::Address.parse("1TipsuQ7CSqfQsjA9KU5jarSB1AnrVLLo").script) ]
     end
 
     it "should fill unspent_outputs using provider" do
@@ -160,7 +160,7 @@ describe BTC::TransactionBuilder do
     end
 
     it "should have a default fee rate" do
-      @builder.fee_rate.must_equal Transaction::DEFAULT_FEE_RATE
+      @builder.fee_rate.must_equal BTC::Transaction::DEFAULT_FEE_RATE
     end
 
     it "should compose a minimal transaction to pay necessary amount" do
@@ -186,7 +186,7 @@ describe BTC::TransactionBuilder do
     it "should have a reasonable fee" do
       result = @builder.build
       size = result.transaction.data.bytesize # size of unsigned transaction
-      result.fee.must_be :>=, (size / 1000)*Transaction::DEFAULT_FEE_RATE
+      result.fee.must_be :>=, (size / 1000)*BTC::Transaction::DEFAULT_FEE_RATE
       result.fee.must_be :<, 0.01 * BTC::COIN
     end
 
@@ -219,7 +219,7 @@ describe BTC::TransactionBuilder do
     it "should include all prepended unspents and none of normal unspents if amount is covered" do
       @builder.prepended_unspent_outputs = [ BTC::TransactionOutput.new(
         value: 6_666_666,
-        script: Address.parse("3EktnHQD7RiAE6uzMj2ZifT9YgRrkSgzQX").script,
+        script: BTC::Address.parse("3EktnHQD7RiAE6uzMj2ZifT9YgRrkSgzQX").script,
         index: 0,
         transaction_hash: "some mock tx".hash256
       ) ]
@@ -231,7 +231,7 @@ describe BTC::TransactionBuilder do
     it "should include all prepended unspents and just enough of normal unspents" do
       @builder.prepended_unspent_outputs = [ BTC::TransactionOutput.new(
         value: @builder.outputs.first.value - (self.mock_utxos.first.value / 2),
-        script: Address.parse("3EktnHQD7RiAE6uzMj2ZifT9YgRrkSgzQX").script,
+        script: BTC::Address.parse("3EktnHQD7RiAE6uzMj2ZifT9YgRrkSgzQX").script,
         index: 0,
         transaction_hash: "some mock tx".hash256
       ) ]
@@ -243,54 +243,54 @@ describe BTC::TransactionBuilder do
 
   describe "TransactionBuilder edge cases" do
     before do
-      @builder = TransactionBuilder.new
+      @builder = BTC::TransactionBuilder.new
       @all_utxos = self.mock_utxos
       @builder.input_addresses = self.mock_addresses
-      @builder.provider = TransactionBuilder::Provider.new do |txb|
+      @builder.provider = BTC::TransactionBuilder::Provider.new do |txb|
         addrs = txb.public_addresses
         addrs.must_equal self.mock_addresses
         scripts = addrs.map{|a| a.script }.uniq
         @all_utxos.find_all{|utxo| scripts.include?(utxo.script) }
       end
-      @builder.change_address = Address.parse("1CBtcGivXmHQ8ZqdPgeMfcpQNJrqTrSAcG")
+      @builder.change_address = BTC::Address.parse("1CBtcGivXmHQ8ZqdPgeMfcpQNJrqTrSAcG")
     end
 
     it "should detect missing change address" do
       @builder.change_address = nil
       lambda do
         result = @builder.build
-      end.must_raise TransactionBuilder::MissingChangeAddressError
+      end.must_raise BTC::TransactionBuilder::MissingChangeAddressError
     end
 
     it "should detect missing unspents" do
       @builder.provider = nil
       lambda do
         result = @builder.build
-      end.must_raise TransactionBuilder::MissingUnspentOutputsError
+      end.must_raise BTC::TransactionBuilder::MissingUnspentOutputsError
     end
 
     it "should detect missing unspents" do
       @builder.unspent_outputs = [ ]
       lambda do
         result = @builder.build
-      end.must_raise TransactionBuilder::MissingUnspentOutputsError
+      end.must_raise BTC::TransactionBuilder::MissingUnspentOutputsError
     end
 
     it "should detect not enough unspents" do
-      @builder.outputs = [ TransactionOutput.new(value: 100*COIN, script: @builder.change_address.script) ]
+      @builder.outputs = [ BTC::TransactionOutput.new(value: 100*BTC::COIN, script: @builder.change_address.script) ]
       lambda do
         result = @builder.build
-      end.must_raise TransactionBuilder::InsufficientFundsError
+      end.must_raise BTC::TransactionBuilder::InsufficientFundsError
     end
 
     it "should detect not enough unspents because of change constraints" do
       @builder.dust_change = 0 # no coins are allowed to be lost
       @builder.minimum_change = 10000
       @builder.unspent_outputs = mock_utxos[0, 1]
-      @builder.outputs = [ TransactionOutput.new(value: 1000_00 - @builder.fee_rate - 10, script: @builder.change_address.script) ]
+      @builder.outputs = [ BTC::TransactionOutput.new(value: 1000_00 - @builder.fee_rate - 10, script: @builder.change_address.script) ]
       lambda do
         result = @builder.build
-      end.must_raise TransactionBuilder::InsufficientFundsError
+      end.must_raise BTC::TransactionBuilder::InsufficientFundsError
     end
 
     it "should forgo change if it's below dust level" do
@@ -299,7 +299,7 @@ describe BTC::TransactionBuilder do
       @builder.unspent_outputs = mock_utxos[0, 1]
       assumed_fee = 2590 #@builder.fee_rate # we assume we'll have sub-1K transaction
       amount = 1000_00 - assumed_fee - @builder.dust_change
-      @builder.outputs = [ TransactionOutput.new(value: amount, script: @builder.change_address.script) ]
+      @builder.outputs = [ BTC::TransactionOutput.new(value: amount, script: @builder.change_address.script) ]
 
       result = @builder.build
       result.fee.must_equal assumed_fee
@@ -312,8 +312,8 @@ describe BTC::TransactionBuilder do
 
   def mock_keys
     @mock_keys ||= [
-      Key.new(private_key: "Wallet1".sha256),
-      Key.new(private_key: "Wallet2".sha256)
+      BTC::Key.new(private_key: "Wallet1".sha256),
+      BTC::Key.new(private_key: "Wallet2".sha256)
     ]
   end
 
@@ -328,7 +328,7 @@ describe BTC::TransactionBuilder do
   def mock_utxos
     scripts = mock_addresses.map{|a| a.script }
     (0...32).map do |i|
-      TransactionOutput.new(value:  100_000,
+      BTC::TransactionOutput.new(value:  100_000,
                            script: scripts[i % scripts.size],
                  transaction_hash: ((16+i).to_s(16)*32).from_hex,
                             index: i)

data/spec/transaction_spec.rb

@@ -49,17 +49,17 @@ describe BTC::Transaction do
               raise "Bad test: input is an array of 3 items: #{test.inspect}" if input.size != 3
               previd, previndex, scriptstring = input
             
-              outpoint = Outpoint.new(transaction_id: previd, index: previndex)
+              outpoint = BTC::Outpoint.new(transaction_id: previd, index: previndex)
             
               mapprevOutScriptPubKeys[outpoint] = parse_script(scriptstring)
             end
           
-            tx = Transaction.new(hex: test[1])
+            tx = BTC::Transaction.new(hex: test[1])
             flags = parse_flags(test[2])
             
             if debug_filter(test)
               validation_proc = lambda do
-                validation_passed = Validation.new.check_transaction(tx, ValidationState.new)
+                validation_passed = BTC::Validation.new.check_transaction(tx, BTC::ValidationState.new)
                 if expected_result
                   validation_passed.must_equal expected_result
                 end
@@ -71,14 +71,14 @@ describe BTC::Transaction do
                     raise "Bad test: output script not found: #{test.inspect}" if !output_script
                     sig_script = txin.signature_script
                     if !sig_script
-                      sig_script = Script.new(data: txin.coinbase_data)
+                      sig_script = BTC::Script.new(data: txin.coinbase_data)
                     end
                     
-                    checker = TransactionSignatureChecker.new(transaction: tx, input_index: txin.index)
+                    checker = BTC::TransactionSignatureChecker.new(transaction: tx, input_index: txin.index)
                     plugins = []
-                    plugins << P2SHPlugin.new if (flags & ScriptFlags::SCRIPT_VERIFY_P2SH) != 0
-                    plugins << CLTVPlugin.new if (flags & ScriptFlags::SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY) != 0
-                    interpreter = ScriptInterpreter.new(
+                    plugins << BTC::P2SHPlugin.new if (flags & BTC::ScriptFlags::SCRIPT_VERIFY_P2SH) != 0
+                    plugins << BTC::CLTVPlugin.new if (flags & BTC::ScriptFlags::SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY) != 0
+                    interpreter = BTC::ScriptInterpreter.new(
                       flags: flags,
                       plugins: plugins,
                       signature_checker: checker,
@@ -190,7 +190,7 @@ describe BTC::Transaction do
     end
 
     it "should convert hash to/from id for TransactionOutput" do
-      txout = TransactionOutput.new
+      txout = BTC::TransactionOutput.new
       txout.transaction_hash = @txhash
       txout.transaction_id.must_equal @txid
       txout.transaction_id = "deadbeef"
@@ -201,11 +201,11 @@ describe BTC::Transaction do
 
   describe "Amounts calculation" do
     before do
-      @tx = Transaction.new
-      @tx.add_input(TransactionInput.new)
-      @tx.add_input(TransactionInput.new)
-      @tx.add_output(TransactionOutput.new(value: 123))
-      @tx.add_output(TransactionOutput.new(value: 50_000))
+      @tx = BTC::Transaction.new
+      @tx.add_input(BTC::TransactionInput.new)
+      @tx.add_input(BTC::TransactionInput.new)
+      @tx.add_output(BTC::TransactionOutput.new(value: 123))
+      @tx.add_output(BTC::TransactionOutput.new(value: 50_000))
     end
 
     it "should have good defaults" do
@@ -257,8 +257,8 @@ describe BTC::Transaction do
                 "2ac0ba2afa7ada4660bd38e27585aac7d4e6e435ffffffff02c0791817000000" +
                 "0017a914bd224370f93a2b0435ded92c7f609e71992008fc87ac7b4d1d000000" +
                 "001976a914450c22770eebb00d376edabe7bb548aa64aa235688ac00000000").from_hex
-      @tx = Transaction.new(hex: @txdata.to_hex)
-      @tx = Transaction.new(data: @txdata)
+      @tx = BTC::Transaction.new(hex: @txdata.to_hex)
+      @tx = BTC::Transaction.new(data: @txdata)
     end
 
     it "should decode inputs and outputs correctly" do
@@ -291,7 +291,7 @@ describe BTC::Transaction do
         "043304596050ca119efccada1dd7ca8e511a76d8e1ddb7ad050298d208455b8bcd09593d823ca252355bf0b41c2ac0ba2afa7ada4660bd38e27585aac7d4e6e435"
       ]
 
-      Diagnostics.current.trace do
+      BTC::Diagnostics.current.trace do
         BTC::Key.validate_script_signature(@tx.inputs.first.signature_script.to_a[0], verify_lower_s: true).must_equal true
       end
     end
@@ -304,7 +304,7 @@ describe BTC::Transaction do
                 "0000000000ffffffff130301e6040654188d181202119700de00000fccffffff" +
                 "ff0108230595000000001976a914ca6ecc7d4d671d8c5c964a48dbb0bc194407" +
                 "a30688ac00000000").from_hex
-      @tx = Transaction.new(data: @txdata)
+      @tx = BTC::Transaction.new(data: @txdata)
     end
 
     it "should encode coinbase inputs correctly" do

data/spec/wire_format_spec.rb

@@ -299,16 +299,16 @@ describe BTC::WireFormat do
   it "should encode/decode varint-prefixed arrays" do
 
     txs = [
-      Transaction.new,
-      Transaction.new(inputs:[TransactionInput.new]),
-      Transaction.new(outputs:[TransactionOutput.new])
+      BTC::Transaction.new,
+      BTC::Transaction.new(inputs:[BTC::TransactionInput.new]),
+      BTC::Transaction.new(outputs:[BTC::TransactionOutput.new])
     ]
-    data = WireFormat.encode_array(txs) {|t|t.data}
+    data = BTC::WireFormat.encode_array(txs) {|t|t.data}
     data.bytes[0].must_equal txs.size
     data.must_equal txs.inject("\x03".b){|d,t| d+t.data}
 
     stream = StringIO.new(data)
-    txs2 = WireFormat.read_array(stream: stream){ Transaction.new(stream: stream) }
+    txs2 = BTC::WireFormat.read_array(stream: stream){ BTC::Transaction.new(stream: stream) }
     txs2[0].data.must_equal txs[0].data
     txs2[1].data.must_equal txs[1].data
     txs2[2].data.must_equal txs[2].data

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: btcruby
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Oleg Andreev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi