bitcoin-ruby 0.0.5 → 0.0.6

data/spec/bitcoin/performance/storage_spec.rb

@@ -0,0 +1,41 @@
+# encoding: ascii-8bit
+
+require_relative '../spec_helper'
+require_relative '../helpers/fake_blockchain'
+require 'benchmark'
+
+[
+ [:sequel, :postgres]
+].compact.each do |options|
+
+  next  unless storage = setup_db(*options)
+
+  describe "#{storage.backend_name} block storage" do
+
+    before do
+      @store = storage
+      @store.reset
+      @store.log.level = :error
+      @fake_chain = FakeBlockchain.new 10
+    end
+
+    it "block storage" do
+      blocks = (0..10).to_a.map{|i|  @fake_chain.block(i) }
+
+      bm = Benchmark.measure do
+        bm = Benchmark.bm do |b|
+          blocks.each.with_index do |blk,i|
+            b.report("storing fake block ##{i}") do
+              depth, chain = @store.new_block blk
+              chain.should == 0
+            end
+          end
+        end
+      end
+      puts '-'*80
+      puts "TOTAL #{bm.format}"
+    end
+
+
+  end
+end

data/spec/bitcoin/protocol/addr_spec.rb

@@ -40,11 +40,13 @@ describe 'Bitcoin::Protocol::Addr' do
   end
 
   it 'initalize time, service and port' do
-    addr = Bitcoin::Protocol::Addr.new(nil)
-    t = Time.now.to_i; (t-10..t+10).include?(addr[:time]).should == true
-    addr[:service]  .should == 1
-    addr[:port]     .should == Bitcoin.network[:default_port]
-    addr[:ip]       .should == "127.0.0.1"
+    Time.freeze do
+      addr = Bitcoin::Protocol::Addr.new(nil)
+      addr[:time].should == Time.now.to_i
+      addr[:service]  .should == 1
+      addr[:port]     .should == Bitcoin.network[:default_port]
+      addr[:ip]       .should == "127.0.0.1"
+    end
   end
 
   it 'addr payload' do

data/spec/bitcoin/protocol/aux_pow_spec.rb

@@ -7,6 +7,7 @@ include Bitcoin
 describe Bitcoin::Protocol::AuxPow do
 
   before do
+    Bitcoin.network = :namecoin
     @data = fixtures_file("rawblock-auxpow.bin")
     @blk = P::Block.new(@data)
     @aux_pow = @blk.aux_pow

data/spec/bitcoin/protocol/block_spec.rb

@@ -19,6 +19,7 @@ describe 'Bitcoin::Protocol::Block' do
       '131025' => fixtures_file('rawblock-131025.bin'),
       # block 26478:  000000000214a3f06ee99a033a7f2252762d6a18d27c3cd8c8fe2278190da9f3
       'testnet-26478' => fixtures_file('rawblock-testnet-26478.bin'),
+      'testnet-265322' => fixtures_file('rawblock-testnet-265322.bin'),
     }
   end
 
@@ -193,4 +194,9 @@ describe 'Bitcoin::Protocol::Block' do
     block.bip34_block_height.should == 197657
   end
 
+  it 'should work with huge block version' do
+    Bitcoin::P::Block.new(@blocks['testnet-265322']).hash.should ==
+      "0000000000014b351588a177be099e39afd4962cd3d58e9ab5cbe45a9cf83c8a"
+  end
+
 end

data/spec/bitcoin/protocol/tx_spec.rb

@@ -49,6 +49,23 @@ describe 'Tx' do
     tx.binary_hash.should == "\xB4\x02-\x9F\xE5(\xFB\x90pP\x01\x16K\f\xC3\xA8\xF5\xA1\x9C\xB8\xED\x02\xBF\xD4\xFC,\xB6%f\xD1\x9Dn"
   end
 
+  it '#normalized_hash' do
+    tx = Tx.new( @payload[0] )
+    tx.normalized_hash.size.should == 64
+    tx.normalized_hash.should == "402e30100b6937cc13828ca096377c93afc0ff227ad2f249245e5b1db9123a39"
+
+    new_tx = JSON.parse(tx.to_json)
+    script =  Bitcoin::Script.from_string(new_tx['in'][0]['scriptSig'])
+    script.chunks[0].bitcoin_pushdata = Bitcoin::Script::OP_PUSHDATA2
+    script.chunks[0].bitcoin_pushdata_length = script.chunks[0].bytesize
+    new_tx['in'][0]['scriptSig'] = script.to_string
+    new_tx = Bitcoin::P::Tx.from_hash(new_tx)
+
+    new_tx.hash.should != tx.hash
+    new_tx.normalized_hash.size.should == 64
+    new_tx.normalized_hash.should == "402e30100b6937cc13828ca096377c93afc0ff227ad2f249245e5b1db9123a39"
+  end
+
   it '#to_payload' do
     tx = Tx.new( @payload[0] )
     tx.to_payload.size.should == @payload[0].size
@@ -183,6 +200,53 @@ describe 'Tx' do
     outpoint_tx = Bitcoin::P::Tx.from_json(fixtures_file('tx-a6ce7081addade7676cd2af75c4129eba6bf5e179a19c40c7d4cf6a5fe595954.json'))
     outpoint_tx.hash.should == "a6ce7081addade7676cd2af75c4129eba6bf5e179a19c40c7d4cf6a5fe595954"
     tx.verify_input_signature(0, outpoint_tx).should == true
+
+    # drop OP_CODESEPARATOR in subscript for signature_hash_for_input
+    tx = Bitcoin::P::Tx.from_json(fixtures_file('tx-46224764c7870f95b58f155bce1e38d4da8e99d42dbb632d0dd7c07e092ee5aa.json'))
+    tx.hash.should == "46224764c7870f95b58f155bce1e38d4da8e99d42dbb632d0dd7c07e092ee5aa"
+    outpoint_tx = Bitcoin::P::Tx.from_json(fixtures_file('tx-bc7fd132fcf817918334822ee6d9bd95c889099c96e07ca2c1eb2cc70db63224.json'))
+    outpoint_tx.hash.should == "bc7fd132fcf817918334822ee6d9bd95c889099c96e07ca2c1eb2cc70db63224"
+    tx.verify_input_signature(0, outpoint_tx).should == true
+
+    # drop OP_CODESEPARATOR in subscript for signature_hash_for_input
+    tx = Bitcoin::P::Tx.from_json(fixtures_file('tx-aab7ef280abbb9cc6fbaf524d2645c3daf4fcca2b3f53370e618d9cedf65f1f8.json'))
+    tx.hash.should == "aab7ef280abbb9cc6fbaf524d2645c3daf4fcca2b3f53370e618d9cedf65f1f8"
+    outpoint_tx = Bitcoin::P::Tx.from_json(fixtures_file('tx-326882a7f22b5191f1a0cc9962ca4b878cd969cf3b3a70887aece4d801a0ba5e.json'))
+    outpoint_tx.hash.should == "326882a7f22b5191f1a0cc9962ca4b878cd969cf3b3a70887aece4d801a0ba5e"
+    tx.verify_input_signature(0, outpoint_tx).should == true
+
+    # drop multisig OP_CODESEPARATOR in subscript for signature_hash_for_input
+    tx = Bitcoin::P::Tx.from_json(fixtures_file('tx-6327783a064d4e350c454ad5cd90201aedf65b1fc524e73709c52f0163739190.json'))
+    tx.hash.should == "6327783a064d4e350c454ad5cd90201aedf65b1fc524e73709c52f0163739190"
+    outpoint_tx = Bitcoin::P::Tx.from_json(fixtures_file('tx-a955032f4d6b0c9bfe8cad8f00a8933790b9c1dc28c82e0f48e75b35da0e4944.json'))
+    outpoint_tx.hash.should == "a955032f4d6b0c9bfe8cad8f00a8933790b9c1dc28c82e0f48e75b35da0e4944"
+    tx.verify_input_signature(0, outpoint_tx).should == true
+
+    # drop multisig OP_CODESEPARATOR in subscript for signature_hash_for_input when used in ScriptSig
+    tx = Bitcoin::P::Tx.from_json(fixtures_file('tx-eb3b82c0884e3efa6d8b0be55b4915eb20be124c9766245bcc7f34fdac32bccb.json'))
+    tx.hash.should == "eb3b82c0884e3efa6d8b0be55b4915eb20be124c9766245bcc7f34fdac32bccb"
+    outpoint_tx = Bitcoin::P::Tx.from_json(fixtures_file('tx-b8fd633e7713a43d5ac87266adc78444669b987a56b3a65fb92d58c2c4b0e84d.json'))
+    outpoint_tx.hash.should == "b8fd633e7713a43d5ac87266adc78444669b987a56b3a65fb92d58c2c4b0e84d"
+    tx.verify_input_signature(1, outpoint_tx).should == true
+
+    # OP_DUP OP_HASH160
+    tx = Bitcoin::P::Tx.from_json(fixtures_file('tx-5df1375ffe61ac35ca178ebb0cab9ea26dedbd0e96005dfcee7e379fa513232f.json'))
+    tx.hash.should == "5df1375ffe61ac35ca178ebb0cab9ea26dedbd0e96005dfcee7e379fa513232f"
+    outpoint_tx = Bitcoin::P::Tx.from_json(fixtures_file('tx-b5b598de91787439afd5938116654e0b16b7a0d0f82742ba37564219c5afcbf9.json'))
+    outpoint_tx.hash.should == "b5b598de91787439afd5938116654e0b16b7a0d0f82742ba37564219c5afcbf9"
+    tx.verify_input_signature(0, outpoint_tx).should == true
+    outpoint_tx = Bitcoin::P::Tx.from_json(fixtures_file('tx-ab9805c6d57d7070d9a42c5176e47bb705023e6b67249fb6760880548298e742.json'))
+    outpoint_tx.hash.should == "ab9805c6d57d7070d9a42c5176e47bb705023e6b67249fb6760880548298e742"
+    tx.verify_input_signature(1, outpoint_tx).should == true
+
+    # testnet3 e335562f7e297aadeed88e5954bc4eeb8dc00b31d829eedb232e39d672b0c009
+    tx = Bitcoin::P::Tx.from_json(fixtures_file('tx-e335562f7e297aadeed88e5954bc4eeb8dc00b31d829eedb232e39d672b0c009.json'))
+    tx.hash.should == "e335562f7e297aadeed88e5954bc4eeb8dc00b31d829eedb232e39d672b0c009"
+    prev_txs = {}
+    tx.in.map{|i| i.previous_output }.uniq.each{|i| prev_txs[i] = Bitcoin::P::Tx.from_json(fixtures_file("tx-#{i}.json")) }
+    tx.in.each.with_index{|i,idx|
+      tx.verify_input_signature(idx, prev_txs[i.previous_output]).should == true
+    }
   end
 
   it '#sign_input_signature' do
@@ -244,6 +308,95 @@ describe 'Tx' do
     prev_tx.hash.should == "52250a162c7d03d2e1fbc5ebd1801a88612463314b55102171c5b5d817d2d7b2"
     #File.open("rawtx-#{prev_tx.hash}.json",'wb'){|f| f.print prev_tx.to_json }
   end
+  
+  it "#legacy_sigops_count" do
+    Tx.new(@payload[0]).legacy_sigops_count.should == 2
+    Tx.new(@payload[1]).legacy_sigops_count.should == 2
+    Tx.new(@payload[2]).legacy_sigops_count.should == 2
+    
+    # Test sig ops count in inputs too.
+    tx = Tx.new
+    txin = TxIn.new
+    txin.script_sig = Bitcoin::Script.from_string("10 OP_CHECKMULTISIGVERIFY OP_CHECKSIGVERIFY").to_binary
+    tx.add_in(txin)
+    txout = TxOut.new
+    txout.pk_script = Bitcoin::Script.from_string("5 OP_CHECKMULTISIG OP_CHECKSIG").to_binary
+    tx.add_out(txout)
+    tx.legacy_sigops_count.should == (20 + 1 + 20 + 1)
+    
+  end
+  
+  describe "Tx - is_final?" do
+    it "should be final if lock_time == 0" do
+      tx = Tx.new
+      tx.lock_time = 0
+      tx.is_final?(0,0).should == true
+      
+      # even if has non-final input:
+      txin = TxIn.new
+      txin.sequence = "\x01\x00\x00\x00"
+      tx.add_in(txin)
+      tx.is_final?(0,0).should == true
+    end
+    
+    it "should be final if lock_time is below block_height" do
+      tx = Tx.new
+      txin = TxIn.new
+      txin.sequence = "\x01\x00\x00\x00"
+      tx.add_in(txin)
+      tx.lock_time = 6543
+      tx.is_final?(6000,0).should == false
+      tx.is_final?(6543,0).should == false # when equal to block height, still not final
+      tx.is_final?(6544,0).should == true
+      tx.is_final?(9999,0).should == true
+    end
+    
+    it "should be final if lock_time is below timestamp" do
+      tx = Tx.new
+      txin = TxIn.new
+      txin.sequence = "\xff\xff\xff\xff"
+      tx.add_in(txin)
+      txin = TxIn.new
+      txin.sequence = "\x01\x00\x00\x00"
+      tx.add_in(txin)
+      tx.lock_time = Bitcoin::LOCKTIME_THRESHOLD # when equal, interpreted as threshold
+      tx.is_final?(0,Bitcoin::LOCKTIME_THRESHOLD - 1).should == false
+      tx.is_final?(0,Bitcoin::LOCKTIME_THRESHOLD).should == false # when equal to timestamp, still not final
+      tx.is_final?(0,Bitcoin::LOCKTIME_THRESHOLD + 1).should == true
+      
+      tx.lock_time = Bitcoin::LOCKTIME_THRESHOLD + 666
+      tx.is_final?(0,Bitcoin::LOCKTIME_THRESHOLD + 1).should == false
+      tx.is_final?(0,Bitcoin::LOCKTIME_THRESHOLD + 666).should == false # when equal to timestamp, still not final
+      tx.is_final?(0,Bitcoin::LOCKTIME_THRESHOLD + 667).should == true
+    end
+    
+    it "should be final if all inputs are finalized regardless of lock_time" do
+      tx = Tx.new
+      txin = TxIn.new
+      txin.sequence = "\xff\xff\xff\xff"
+      tx.add_in(txin)
+      txin = TxIn.new
+      txin.sequence = "\xff\xff\xff\xff"
+      tx.add_in(txin)
+      
+      tx.lock_time = 6543
+      tx.is_final?(6000,0).should == true
+      tx.is_final?(6543,0).should == true
+      tx.is_final?(6544,0).should == true
+      tx.is_final?(9999,0).should == true
+      
+      tx.lock_time = Bitcoin::LOCKTIME_THRESHOLD
+      tx.is_final?(0,Bitcoin::LOCKTIME_THRESHOLD - 1).should == true
+      tx.is_final?(0,Bitcoin::LOCKTIME_THRESHOLD).should == true
+      tx.is_final?(0,Bitcoin::LOCKTIME_THRESHOLD + 1).should == true
+      
+      tx.lock_time = Bitcoin::LOCKTIME_THRESHOLD + 666
+      tx.is_final?(0,Bitcoin::LOCKTIME_THRESHOLD + 1).should == true
+      tx.is_final?(0,Bitcoin::LOCKTIME_THRESHOLD + 666).should == true
+      tx.is_final?(0,Bitcoin::LOCKTIME_THRESHOLD + 667).should == true
+    end
+    
+  end
 
   it '#calculate_minimum_fee' do
     tx = Tx.new( fixtures_file('rawtx-b5d4e8883533f99e5903ea2cf001a133a322fa6b1370b18a16c57c946a40823d.bin') )
@@ -254,6 +407,23 @@ describe 'Tx' do
     tx.minimum_block_fee.should == 10_000
   end
 
+  it '#calculate_minimum_fee for litecoin' do
+    tx = Tx.from_json(fixtures_file('litecoin-tx-f5aa30f574e3b6f1a3d99c07a6356ba812aabb9661e1d5f71edff828cbd5c996.json'))
+    tx.minimum_relay_fee.should == 0
+    tx.minimum_block_fee.should == 30_000
+    Bitcoin.network = :litecoin # change to litecoin
+    tx.minimum_relay_fee.should == 0
+    tx.minimum_block_fee.should == 5_900_000
+  end
+
+  it "should compare transactions" do
+    tx1 = Tx.new( @payload[0] )
+    tx2 = Tx.new( @payload[1] )
+    (tx1 == Bitcoin::P::Tx.from_json(tx1.to_json)).should == true
+    (tx1 == tx2).should == false
+    (tx1 == nil).should == false
+  end
+
   describe "Tx - BIP Scripts" do
 
     it "should do OP_CHECKMULTISIG" do
@@ -266,6 +436,11 @@ describe 'Tx' do
       tx      = Tx.from_json( fixtures_file('rawtx-ba1ff5cd66713133c062a871a8adab92416f1e38d17786b2bf56ac5f6ffdfdf5.json') )
       prev_tx = Tx.from_json( fixtures_file("rawtx-de35d060663750b3975b7997bde7fb76307cec5b270d12fcd9c4ad98b279c28c.json") )
       tx.verify_input_signature(0, prev_tx).should == true
+
+      # checkmultisig for testnet3 tx: 2c63aa814701cef5dbd4bbaddab3fea9117028f2434dddcdab8339141e9b14d1 input index 1
+      tx      = Tx.from_json( fixtures_file('tx-2c63aa814701cef5dbd4bbaddab3fea9117028f2434dddcdab8339141e9b14d1.json') )
+      prev_tx = Tx.from_json( fixtures_file("tx-19aa42fee0fa57c45d3b16488198b27caaacc4ff5794510d0c17f173f05587ff.json") )
+      tx.verify_input_signature(1, prev_tx).should == true
     end
 
     it "should do P2SH with inner OP_CHECKMULTISIG (BIP 0016)" do
@@ -294,6 +469,14 @@ describe 'Tx' do
       tx.verify_input_signature(0, prev_tx).should == true
     end
 
-  end
+    it "should do OP_CHECKMULTISIG with OP_0 used as a pubkey" do
+      tx = Bitcoin::P::Tx.from_json(fixtures_file('tx-6606c366a487bff9e412d0b6c09c14916319932db5954bf5d8719f43f828a3ba.json'))
+      tx.hash.should == "6606c366a487bff9e412d0b6c09c14916319932db5954bf5d8719f43f828a3ba"
+      prev_tx = Bitcoin::P::Tx.from_json(fixtures_file('tx-4142ee4877eb116abf955a7ec6ef2dc38133b793df762b76d75e3d7d4d8badc9.json'))
+      prev_tx.hash.should == "4142ee4877eb116abf955a7ec6ef2dc38133b793df762b76d75e3d7d4d8badc9"
+      tx.verify_input_signature(0, prev_tx).should == true
+    end
 
+  end
+  
 end

data/spec/bitcoin/protocol/txin_spec.rb

@@ -14,5 +14,32 @@ describe 'TxIn' do
     end
   end
 
+  it "should compare txins" do
+    i1 = Tx.new(fixtures_file('rawtx-01.bin')).in[0]
+    i1_1 = TxIn.new(i1.prev_out, i1.prev_out_index, i1.script_sig_length, i1.script_sig)
+    i2 = Tx.new(fixtures_file('rawtx-02.bin')).in[0]
+
+    (i1 == i1).should == true
+    (i1 == i1_1).should == true
+    (i1 == i2).should == false
+    (i1 == nil).should == false
+  end
+  
+  it "should be final only when sequence == 0xffffffff" do
+    txin = TxIn.new
+    txin.is_final?.should == true
+    txin.sequence.should == TxIn::DEFAULT_SEQUENCE
+    
+    txin.sequence = "\x01\x00\x00\x00"
+    txin.is_final?.should == false
+    
+    txin.sequence = "\x00\x00\x00\x00"
+    txin.is_final?.should == false
+
+    txin.sequence = "\xff\xff\xff\xff"
+    txin.is_final?.should == true
+  end
+  
+
 end
 

data/spec/bitcoin/protocol/txout_spec.rb

@@ -0,0 +1,27 @@
+# encoding: ascii-8bit
+
+require_relative '../spec_helper.rb'
+
+include Bitcoin::Protocol
+
+describe 'TxOut' do
+
+  it '#initialize without specifying script_sig_length' do
+    key = Bitcoin::Key.generate
+    tx_out = TxOut.new(12345, Bitcoin::Script.from_string("OP_DUP OP_HASH160 #{key.hash160} OP_EQUALVERIFY OP_CHECKSIG").to_payload)
+    lambda { tx_out.to_payload }.should.not.raise
+  end
+
+  it "should compare txouts" do
+    o1 = Tx.new(fixtures_file('rawtx-01.bin')).out[0]
+    o1_1 = TxOut.new(o1.value, o1.pk_script)
+    o2 = Tx.new(fixtures_file('rawtx-02.bin')).out[0]
+
+    (o1 == o1).should == true
+    (o1 == o1_1).should == true
+    (o1 == o2).should == false
+    (o1 == nil).should == false
+  end
+
+end
+

data/spec/bitcoin/script/opcodes_spec.rb

@@ -358,6 +358,15 @@ describe "Bitcoin::Script OPCODES" do
       [[1, 0],  [1,1]],
     ].each{|stack, expected|
       op(:pick, stack).should == expected
+      @script.invalid?.should == false
+    }
+
+    [
+      [[0],  [0]],
+      [[-1],  [-1]],
+    ].each{|stack, expected|
+      op(:pick, stack).should == expected
+      @script.invalid?.should == true
     }
   end
 
@@ -367,9 +376,26 @@ describe "Bitcoin::Script OPCODES" do
       [[1, 0],  [1]],
     ].each{|stack, expected|
       op(:roll, stack).should == expected
+      @script.invalid?.should == false
+    }
+
+    [
+      [[0],  [0]],
+      [[-1],  [-1]],
+    ].each{|stack, expected|
+      op(:roll, stack).should == expected
+      @script.invalid?.should == true
     }
   end
 
+  it "should do op_2rot" do
+    op(:"2rot", [-1,0,1,2,3,4,5,6]).should == [-1, 0, 3, 4, 5, 6, 1, 2]
+    @script.invalid?.should == false
+
+    op(:"2rot", [2,3,4,5,6]).should == [2, 3, 4, 5, 6]
+    @script.invalid?.should == true
+  end
+
   it "should do op_rot" do
     op(:rot, [22, 21, 20]).should == [21, 20, 22]
     op(:rot, [21, 20]).should == [21, 20]
@@ -443,6 +469,9 @@ describe "Bitcoin::Script OPCODES" do
       "1 OP_DUP OP_IF OP_ELSE OP_ENDIF",
       "1 OP_IF 1 OP_ELSE OP_ENDIF",
       "0 OP_IF OP_ELSE 1 OP_ENDIF",
+      "beef OP_IF 1 OP_ELSE 0 OP_ENDIF",
+      "0 OP_NOTIF 1 OP_ELSE 0 OP_ENDIF",
+      "beef OP_NOTIF 0 OP_ELSE 1 OP_ENDIF",
     ].each{|script|
       Bitcoin::Script.from_string(script).run.should == true
     }
@@ -487,6 +516,11 @@ describe "Bitcoin::Script OPCODES" do
     }
     @script.op_checksig(verify_callback).should == [1]
 
+    @script.stack = [signature + hash_type, intger_pubkey=1]
+    verify_callback = proc{|pub,sig,hash_type|
+      pub.is_a?(String)
+    }
+    @script.op_checksig(verify_callback).should == [1]
 
     @script.stack = [signature + hash_type, pubkey]
     verify_callback = proc{|pub,sig,hash_type|
@@ -523,8 +557,8 @@ describe "Bitcoin::Script OPCODES" do
   def run_script(string, hash)
     script = Bitcoin::Script.from_string(string)
     script.run do |pk, sig, hash_type|
-      k = Bitcoin::Key.new nil, pk.unpack("H*")[0]
-      k.verify(hash, sig) rescue false
+      k = Bitcoin::Key.new(nil, pk.unpack("H*")[0]) rescue false
+      k && k.verify(hash, sig) rescue false
     end == true
   end
 
@@ -593,6 +627,12 @@ describe "Bitcoin::Script OPCODES" do
     script = "0 #{sig1} f0f0f0f0 #{sig3} 3 #{k1.pub} #{k2.pub} #{k3.pub} 3 OP_CHECKMULTISIG"
     run_script(script, "foobar").should == false
 
+    script = "0 #{sig1} f0f0f0f0 #{sig3} 3 #{k1.pub} #{k2.pub} #{k3.pub} 3 OP_CHECKMULTISIG OP_NOT"
+    run_script(script, "foobar").should == true
+
+    script = "1 1 1 1 1 OP_CHECKMULTISIG OP_NOT"
+    run_script(script, "foobar").should == true
+
     # mainnet tx output: 514c46f0b61714092f15c8dfcb576c9f79b3f959989b98de3944b19d98832b58
     script = "0 #{sig1} 1 0 #{k1.pub} OP_SWAP OP_1ADD OP_CHECKMULTISIG"
     run_script(script, "foobar").should == true
@@ -632,6 +672,12 @@ describe "Bitcoin::Script OPCODES" do
     address = "3CkxTG25waxsmd13FFgRChPuGYba3ar36B"
     script = Bitcoin::Script.new(Bitcoin::Script.to_address_script(address))
     script.type.should == :p2sh
+
+    inner_script = Bitcoin::Script.from_string("0 OP_NOT").raw.unpack("H*")[0]
+    script_hash = Bitcoin.hash160(inner_script)
+    script = Bitcoin::Script.from_string("#{inner_script} OP_HASH160 #{script_hash} OP_EQUAL")
+    script.is_p2sh?.should == true
+    run_script(script.to_string, "foobar").should == true
   end
 
   it "should skip OP_EVAL" do
@@ -681,7 +727,19 @@ describe "Bitcoin::Script OPCODES" do
       "0 OP_0NOTEQUAL 0 OP_EQUAL",
       "2 82 OP_ADD 0 OP_EQUAL",
     ].each{|script|
-      Bitcoin::Script.from_string(script).run.should == true
+      parsed_script = Bitcoin::Script.from_string(script)
+      result = parsed_script.run
+      #p [script, parsed_script, parsed_script.debug result]
+      result.should == true
+    }
+
+    [
+      "ffffff7f ffffff7f OP_ADD ffffff7f OP_ADD OP_TRUE"
+    ].each{|script|
+      parsed_script = Bitcoin::Script.from_string(script)
+      result = parsed_script.run
+      #p [script, parsed_script, parsed_script.debug result]
+      result.should == false
     }
   end
 
@@ -699,4 +757,17 @@ describe "Bitcoin::Script OPCODES" do
     }
   end
 
+  it "check before casting and mark bad cases invalid" do
+    s = Bitcoin::Script.from_string("OP_NOT") # tries to pop off an element from the empty stack here.
+    s.run.should == false
+    s.invalid?.should == true
+  end
+
+  it "should do OP_CHECKSIGVERIFY and OP_CHECKMULTISIGVERIFY" do
+    tx1 = Bitcoin::P::Tx.new("0100000001a3fe4396b575690095bfc088d864aa971c99f65e2d893b48e0b26b1b60a28754000000006a47304402201ddfc8e3f825add9f42c0ce76dc5709cf76871e7ee6c97aae11d7db7f829b3f202201c3043515bfcf3d77845c8740ce4ccb4bda3f431da64f2596ee0ea2dfb727a5c01210328a5915165382c9b119d10d313c5781d98a7de79225f3c58e7fa115660ba90e0ffffffff0270f305000000000017a914ca164de1946bf0146ed1f32413df0efb0e1c730f87005d8806000000001976a91437c1d63690e00845663f3de661fef981c08e8de588ac00000000".htb)
+    tx2 = Bitcoin::P::Tx.new("0100000001a1c5263304aa47f8e4e8a8dbca33e525667f7f0d84390c5a92d49eccbe5b970f00000000fde50152483045022100fbc7ccd87ad2384a4d8823d3cf36d839bb6acca3d80a9ed9c51c784b7bdf1e430220305fcb1660219fcc340935000aa92dd02684b763177b8a3c1be094c919af323701473044022008f66d2e31175cdefbd7461afb5f9946e5dcb8173d1a2d3ef837f1c810695d160220250354de77b4a919b87910aa203ecec54bd1006d2dad2fcac06a54f39a9d39a101514d4f0176519c6375522103b124c48bbff7ebe16e7bd2b2f2b561aa53791da678a73d2777cc1ca4619ab6f72103ad6bb76e00d124f07a22680e39debd4dc4bdb1aa4b893720dd05af3c50560fdd52af67529c63552103b124c48bbff7ebe16e7bd2b2f2b561aa53791da678a73d2777cc1ca4619ab6f721025098a1d5a338592bf1e015468ec5a8fafc1fc9217feb5cb33597f3613a2165e9210360cfabc01d52eaaeb3976a5de05ff0cfa76d0af42d3d7e1b4c233ee8a00655ed2103f571540c81fd9dbf9622ca00cfe95762143f2eab6b65150365bb34ac533160432102bc2b4be1bca32b9d97e2d6fb255504f4bc96e01aaca6e29bfa3f8bea65d8865855af672103ad6bb76e00d124f07a22680e39debd4dc4bdb1aa4b893720dd05af3c50560fddada820a4d933888318a23c28fb5fc67aca8530524e2074b1d185dbf5b4db4ddb0642848868685174519c6351670068000000000170f30500000000001976a914bce2fe0e49630a996cb9fe611e6b9b7d1e4dc21188acb4ff6153".htb)
+    tx2.verify_input_signature(0, tx1).should == true
+  end
+
+
 end