bitcoin-ruby 0.0.1 → 0.0.2

data/spec/bitcoin/protocol/addr_spec.rb

@@ -1,3 +1,5 @@
+# encoding: ascii-8bit
+
 require_relative '../spec_helper.rb'
 
 describe 'Bitcoin::Protocol::Parser (addr)' do

data/spec/bitcoin/protocol/alert_spec.rb

@@ -1,3 +1,5 @@
+# encoding: ascii-8bit
+
 require_relative '../spec_helper.rb'
 
 describe 'Bitcoin::Protocol::Parser (alert)' do

data/spec/bitcoin/protocol/aux_pow_spec.rb

@@ -0,0 +1,44 @@
+# encoding: ascii-8bit
+
+require_relative '../spec_helper.rb'
+
+include Bitcoin
+
+describe Bitcoin::Protocol::AuxPow do
+
+  before do
+    @data = fixtures_file("rawblock-auxpow.bin")
+    @blk = P::Block.new(@data)
+    @aux_pow = @blk.aux_pow
+  end
+
+  it "should parse AuxPow" do
+    @aux_pow.should != nil
+    @aux_pow.block_hash.hth.should ==
+      "b42124fd99e67ddabe52ebbfcb30a82b8c74268a320b3c5e2311000000000000"
+    @aux_pow.branch.map(&:hth).should == [
+      "6d4febe909ffec61fb8e7bf24ef4444f070f74b208502285528a9686ba792fc2",
+      "d052728459450cec6ff81072c6bd3ec2fd186eaadb09429da7cab0be73646999",
+      "64c5e7e42a6cde585602fdfda6d7e5d9232db2c176a49278268cec09f3cfcb20",
+      "4e9406d6ce9ef751242bb9a63e7c2009746b3736c356ed5d738dadd6937531e4" ]
+    @aux_pow.mrkl_index.should == 0
+    @aux_pow.aux_branch.should == []
+    @aux_pow.aux_index.should == 0
+    @aux_pow.parent_block.hash.should ==
+      "00000000000011235e3c0b328a26748c2ba830cbbfeb52beda7de699fd2421b4"
+  end
+
+  it "#to_payload" do
+    @blk.to_payload.should == @data
+    P::Block.new(@blk.to_payload).to_payload.should == @data
+  end
+
+  it "#to_hash" do
+    P::Block.from_hash(@blk.to_hash).to_payload.should == @data
+  end
+
+  it "#to_json" do
+    P::Block.from_json(@blk.to_json).to_payload.should == @data
+  end
+
+  end

data/spec/bitcoin/protocol/block_spec.rb

@@ -1,39 +1,43 @@
+# encoding: ascii-8bit
+
 require_relative '../spec_helper.rb'
+include Bitcoin::Protocol
 
 describe 'Bitcoin::Protocol::Block' do
 
-  @blocks = {
-    # block 0:  00000000839a8e6886ab5951d76f411475428afc90947ee320161bbf18eb6048
-    '0' => fixtures_file('rawblock-0.bin'),
-    # block 1:  000000006a625f06636b8bb6ac7b960a8d03705d1ace08b1a19da3fdcc99ddbd
-    '1' => fixtures_file('rawblock-1.bin'),
-    # block 9:  000000008d9dc510f23c2657fc4f67bea30078cc05a90eb89e84cc475c080805
-    '9' => fixtures_file('rawblock-9.bin'),
-    # block 170:  00000000d1145790a8694403d4063f323d499e655c83426834d4ce2f8dd4a2ee
-    '170' => fixtures_file('rawblock-170.bin'),
-    # block 131025:  00000000000007d938dbdd433c5ae12a782de74abf7f566518bc2b2d0a1df145
-    '131025' => fixtures_file('rawblock-131025.bin'),
-    # block 26478:  000000000214a3f06ee99a033a7f2252762d6a18d27c3cd8c8fe2278190da9f3
-    'testnet-26478' => fixtures_file('rawblock-testnet-26478.bin'),
-  }
-
+  before do
+    @blocks = {
+      # block 0:  00000000839a8e6886ab5951d76f411475428afc90947ee320161bbf18eb6048
+      '0' => fixtures_file('rawblock-0.bin'),
+      # block 1:  000000006a625f06636b8bb6ac7b960a8d03705d1ace08b1a19da3fdcc99ddbd
+      '1' => fixtures_file('rawblock-1.bin'),
+      # block 9:  000000008d9dc510f23c2657fc4f67bea30078cc05a90eb89e84cc475c080805
+      '9' => fixtures_file('rawblock-9.bin'),
+      # block 170:  00000000d1145790a8694403d4063f323d499e655c83426834d4ce2f8dd4a2ee
+      '170' => fixtures_file('rawblock-170.bin'),
+      # block 131025:  00000000000007d938dbdd433c5ae12a782de74abf7f566518bc2b2d0a1df145
+      '131025' => fixtures_file('rawblock-131025.bin'),
+      # block 26478:  000000000214a3f06ee99a033a7f2252762d6a18d27c3cd8c8fe2278190da9f3
+      'testnet-26478' => fixtures_file('rawblock-testnet-26478.bin'),
+    }
+  end
 
   it '#new' do
     proc{
-      Bitcoin::Protocol::Block.new( nil )
-      @block = Bitcoin::Protocol::Block.new( @blocks['0'] )
+      Block.new( nil )
+      @block = Block.new( @blocks['0'] )
     }.should.not.raise Exception
 
     proc{
-      Bitcoin::Protocol::Block.new( @blocks['0'][0..20] )
+      Block.new( @blocks['0'][0..20] )
     }.should.raise Exception
 
-    block = Bitcoin::Protocol::Block.new(nil)
+    block = Block.new(nil)
     block.parse_data(@blocks['0']).should == true
     block.header_info[7].should == 215
     block.to_payload.should == @blocks['0']
 
-    block = Bitcoin::Protocol::Block.new(nil)
+    block = Block.new(nil)
     block.parse_data(@blocks['0'] + "AAAA").should == "AAAA"
     block.header_info[7].should == 215
     block.to_payload.should == @blocks['0']
@@ -45,7 +49,7 @@ describe 'Bitcoin::Protocol::Block' do
 
   it '#tx' do
     @block.tx.size.should == 1
-    @block.tx[0].is_a?(Bitcoin::Protocol::Tx).should == true
+    @block.tx[0].is_a?(Tx).should == true
     @block.tx[0].hash.should == "0e3e2357e806b6cdb1f70b54c3a3a17b6714ee1f0e68bebb44a74b1efd512098"
   end
 
@@ -55,31 +59,100 @@ describe 'Bitcoin::Protocol::Block' do
 
   it '#to_json' do
     @block.to_json.should == fixtures_file('rawblock-0.json')
-    Bitcoin::Protocol::Block.new( @blocks['1'] ).to_json.should == fixtures_file('rawblock-1.json')
-    Bitcoin::Protocol::Block.new( @blocks['131025'] ).to_json.should == fixtures_file('rawblock-131025.json')
-    Bitcoin::Protocol::Block.new( @blocks['testnet-26478'] ).to_json.should == fixtures_file('rawblock-testnet-26478.json')
-    Bitcoin::P::Block.from_json(@block.to_json).tx[0].in[0].sequence.should == "\xff\xff\xff\xff"
+    Block.new( @blocks['1'] ).to_json.should == fixtures_file('rawblock-1.json')
+    Block.new( @blocks['131025'] ).to_json.should == fixtures_file('rawblock-131025.json')
+    Block.new( @blocks['testnet-26478'] ).to_json.should == fixtures_file('rawblock-testnet-26478.json')
+    Block.from_json(@block.to_json).tx[0].in[0].sequence.should == "\xff\xff\xff\xff"
   end
 
   it '#to_payload' do
     @block.to_payload.should == @block.payload
-    Bitcoin::Protocol::Block.new( @block.to_payload ).to_payload.should == @block.payload
-    Bitcoin::Protocol::Block.new( @blocks['1'] ).to_payload.should == @blocks['1']
-    Bitcoin::Protocol::Block.new( @blocks['131025'] ).to_payload.should == @blocks['131025']
-    Bitcoin::Protocol::Block.new( @blocks['testnet-26478'] ).to_payload.should == @blocks['testnet-26478']
+    Block.new( @block.to_payload ).to_payload.should == @block.payload
+    Block.new( @blocks['1'] ).to_payload.should == @blocks['1']
+    Block.new( @blocks['131025'] ).to_payload.should == @blocks['131025']
+    Block.new( @blocks['testnet-26478'] ).to_payload.should == @blocks['testnet-26478']
   end
 
-  it '#from_json' do
-    block = Bitcoin::Protocol::Block.from_json(fixtures_file('rawblock-0.json'))
-    block.to_payload.should == @blocks['0']
-    block.tx[0].in[0].sequence.should == "\xff\xff\xff\xff"
-    Bitcoin::Protocol::Block.from_json(fixtures_file('rawblock-1.json')).to_payload.should == @blocks['1']
-
-    Bitcoin::Protocol::Block.from_json(fixtures_file('rawblock-131025.json'))
-      .to_payload.should == @blocks['131025']
+  describe "Block.from_json" do
+
+    it 'should load blocks from json' do
+      block = Block.from_json(fixtures_file('rawblock-0.json'))
+      block.to_payload.should == @blocks['0']
+      block.tx[0].in[0].sequence.should == "\xff\xff\xff\xff"
+      Block.from_json(fixtures_file('rawblock-1.json')).to_payload.should == @blocks['1']
+   
+      Block.from_json(fixtures_file('rawblock-131025.json'))
+        .to_payload.should == @blocks['131025']
+   
+      Block.from_json(fixtures_file('rawblock-testnet-26478.json'))
+        .to_payload.should == @blocks['testnet-26478']
+
+      # testnet3 block 0000000000ac85bb2530a05a4214a387e6be02b22d3348abc5e7a5d9c4ce8dab
+      block_raw = fixtures_file('block-testnet-0000000000ac85bb2530a05a4214a387e6be02b22d3348abc5e7a5d9c4ce8dab.bin')
+      Block.new(block_raw).to_payload.should == block_raw
+      # Block.from_json(Block.new(block_raw).to_json).to_payload.should == block_raw # slow test
+    end
+
+    it "should work with litecoin blocks" do
+      Bitcoin.network = :litecoin # change to litecoin
+      litecoin_block = "litecoin-genesis-block-12a765e31ffd4059bada1e25190f6e98c99d9714d334efa41a195a7e7e04bfe2"
+      Block.from_json(fixtures_file(litecoin_block + '.json'))
+        .to_payload.should == fixtures_file(litecoin_block + '.bin')
+
+      json = Block.new(fixtures_file(litecoin_block + '.bin')).to_json
+      Block.from_json(json)
+        .to_payload.should == fixtures_file(litecoin_block + '.bin')
+      Block.from_json(json).hash == litecoin_block.split("-").last
+
+      litecoin_block = "litecoin-block-80ca095ed10b02e53d769eb6eaf92cd04e9e0759e5be4a8477b42911ba49c78f"
+      Block.from_json(fixtures_file(litecoin_block + '.json'))
+        .to_payload.should == fixtures_file(litecoin_block + '.bin')
+
+      json = Block.new(fixtures_file(litecoin_block + '.bin')).to_json
+      Block.from_json(json)
+        .to_payload.should == fixtures_file(litecoin_block + '.bin')
+      Block.from_json(json).hash == litecoin_block.split("-").last
+      Bitcoin.network = :bitcoin
+    end
+
+    it "should work with freicoin blocks" do
+      Bitcoin.network = :freicoin # change to freicoin
+      freicoin_block = "freicoin-genesis-block-000000005b1e3d23ecfd2dd4a6e1a35238aa0392c0a8528c40df52376d7efe2c"
+      Block.from_json(fixtures_file(freicoin_block + '.json'))
+        .to_payload.should == fixtures_file(freicoin_block + '.bin')
+
+      json = Block.new(fixtures_file(freicoin_block + '.bin')).to_json
+      Block.from_json(json)
+        .to_payload.should == fixtures_file(freicoin_block + '.bin')
+      Block.from_json(json).hash == freicoin_block.split("-").last
+
+      freicoin_block = "freicoin-block-000000005d231b285e63af83edae2d8f5e50e70d396468643092b9239fd3be3c"
+      Block.from_json(fixtures_file(freicoin_block + '.json'))
+        .to_payload.should == fixtures_file(freicoin_block + '.bin')
+
+      json = Block.new(fixtures_file(freicoin_block + '.bin')).to_json
+      Block.from_json(json)
+        .to_payload.should == fixtures_file(freicoin_block + '.bin')
+      Block.from_json(json).hash == freicoin_block.split("-").last
+      Bitcoin.network = :bitcoin
+    end
+
+    it 'should check block hash' do
+      block = Block.from_json(fixtures_file('rawblock-0.json'))
+      h = block.to_hash
+      h['hash'][0] = "1"
+      -> { Block.from_hash(h) }.should.raise(Exception)
+        .message.should == "Block hash mismatch! Claimed: 10000000839a8e6886ab5951d76f411475428afc90947ee320161bbf18eb6048, Actual: 00000000839a8e6886ab5951d76f411475428afc90947ee320161bbf18eb6048"
+    end
+
+    it "should check merkle tree" do
+      block = Block.from_json(fixtures_file('rawblock-0.json'))
+      h = block.to_hash
+      h['tx'][0]['ver'] = 2
+      -> { Block.from_hash(h) }.should.raise(Exception)
+        .message.should.include?("Block merkle root mismatch!")
+    end
 
-    Bitcoin::Protocol::Block.from_json(fixtures_file('rawblock-testnet-26478.json'))
-      .to_payload.should == @blocks['testnet-26478']
   end
 
   it '#header_to_json' do
@@ -98,4 +171,26 @@ describe 'Bitcoin::Protocol::Block' do
     JSON
   end
 
+  it '#verify_mrkl_root' do
+    block0 = Block.from_json(fixtures_file('rawblock-0.json'))
+    block1 = Block.from_json(fixtures_file('rawblock-1.json'))
+    block0.tx.size.should == 1
+    block0.verify_mrkl_root.should == true
+    block0.tx << block.tx.last # test against CVE-2012-2459
+    block0.verify_mrkl_root.should == false
+    block0.tx = block1.tx
+    block0.verify_mrkl_root.should == false
+  end
+
+  it '#bip34_block_height' do
+    # block version 1
+    block = Block.from_json(fixtures_file('rawblock-131025.json'))
+    block.ver.should == 1
+    block.bip34_block_height.should == nil
+    # block version 2 (introduced by BIP_0034)
+    block = Block.from_json(fixtures_file('000000000000056b1a3d84a1e2b33cde8915a4b61c0cae14fca6d3e1490b4f98.json'))
+    block.ver.should == 2
+    block.bip34_block_height.should == 197657
+  end
+
 end

data/spec/bitcoin/protocol/getblocks_spec.rb

@@ -0,0 +1,32 @@
+# encoding: ascii-8bit
+
+require_relative '../spec_helper.rb'
+
+describe 'Bitcoin::Protocol::Parser (getblocks)' do
+
+  class Getblocks_Handler < Bitcoin::Protocol::Handler
+    attr_reader :version, :locator, :stop_hash
+    def on_getblocks(version, locator, stop_hash)
+      @version, @locator, @stop_hash = version, locator, stop_hash
+    end
+  end
+
+  before do
+    @parser = Bitcoin::Protocol::Parser.new( @handler = Getblocks_Handler.new )
+    @pkt = "f9beb4d9676574626c6f636b7300000065000000b3b7ad6e71110100026fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d61900000000006fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d61900000000000000000000000000000000000000000000000000000000000000000000000000".htb
+    @parser.parse(@pkt + "AAAA").should == "AAAA"
+  end
+
+  it 'parses getblocks' do
+    @handler.version.should == 70001
+    @handler.locator.should == [
+      "000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f",
+      "000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f" ]
+    @handler.stop_hash.should == "00"*32
+  end
+
+  it 'builds getblocks' do
+    Bitcoin::Protocol.getblocks_pkt(70001, @handler.locator).hth.should == @pkt.hth
+  end
+
+end

data/spec/bitcoin/protocol/inv_spec.rb

@@ -1,3 +1,5 @@
+# encoding: ascii-8bit
+
 require_relative '../spec_helper.rb'
 
 describe 'Bitcoin::Protocol::Parser - Inventory Vectors' do
@@ -5,10 +7,10 @@ describe 'Bitcoin::Protocol::Parser - Inventory Vectors' do
   class Test_Handler < Bitcoin::Protocol::Handler
     attr_reader :tx_inv
     attr_reader :block_inv
-    def on_inv_transaction(hash); (@tx_inv ||= []) << hth(hash); end
-    def on_get_transaction(hash); (@tx_inv ||= []) << hth(hash); end
-    def on_inv_block(hash); (@block_inv ||= []) << hth(hash); end
-    def on_get_block(hash); (@block_inv ||= []) << hth(hash); end
+    def on_inv_transaction(hash); (@tx_inv ||= []) << hash.hth; end
+    def on_get_transaction(hash); (@tx_inv ||= []) << hash.hth; end
+    def on_inv_block(hash); (@block_inv ||= []) << hash.hth; end
+    def on_get_block(hash); (@block_inv ||= []) << hash.hth; end
   end
 
 
@@ -89,13 +91,13 @@ describe 'Bitcoin::Protocol::Parser - Inventory Vectors' do
 
     locator_hashes = ["00000000068866924696f410b778911316f92035e9b69b62afa03573974fd750", "000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f"]
     stop_hash      = "0000000000000000000000000000000000000000000000000000000000000000"
-    pkt = Bitcoin::Protocol.getblocks_pkt( locator_hashes )
+    pkt = Bitcoin::Protocol.getblocks_pkt( Bitcoin.network[:protocol_version], locator_hashes )
 
     parser = Bitcoin::Protocol::Parser.new( handler = Test_Handler.new )
     parser.parse(pkt + "AAAA").should == "AAAA"
 
     handler.pkt.should == {
-      :version => Bitcoin.network[:magic_head],
+      :version => Bitcoin.network[:protocol_version],
       :locator_hashes => locator_hashes,
       :stop_hash => "0000000000000000000000000000000000000000000000000000000000000000"
     }
@@ -109,13 +111,13 @@ describe 'Bitcoin::Protocol::Parser - Inventory Vectors' do
 
     locator_hashes = ["00000000068866924696f410b778911316f92035e9b69b62afa03573974fd750", "000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f"]
     stop_hash      = "0000000000000000000000000000000000000000000000000000000000007e57"
-    pkt = Bitcoin::Protocol.getblocks_pkt( locator_hashes, stop_hash )
+    pkt = Bitcoin::Protocol.getblocks_pkt( Bitcoin.network[:protocol_version], locator_hashes, stop_hash )
 
     parser = Bitcoin::Protocol::Parser.new( handler = Test_Handler.new )
     parser.parse(pkt + "AAAA").should == "AAAA"
 
     handler.pkt.should == {
-      :version => Bitcoin.network[:magic_head],
+      :version => Bitcoin.network[:protocol_version],
       :locator_hashes => locator_hashes,
       :stop_hash => "0000000000000000000000000000000000000000000000000000000000007e57"
     }

data/spec/bitcoin/protocol/notfound_spec.rb

@@ -0,0 +1,31 @@
+# encoding: ascii-8bit
+
+require_relative '../spec_helper.rb'
+
+describe 'Bitcoin::Protocol::Parser (notfound)' do
+
+  class Notfound_Handler < Bitcoin::Protocol::Handler
+    attr_reader :notfound
+    def on_notfound(type, hash); (@notfound ||= []) << [type, hash.hth]; end
+  end
+
+  before do
+    @parser = Bitcoin::Protocol::Parser.new( @handler = Notfound_Handler.new )
+  end
+
+  it 'parses notfound block message' do
+    payload = "\x01\x01\x00\x00\x00:\xE2\x93bDJ\x01\xA9|\xDA>0\x8F\a\xA3L\n\xEF\x0E\xD2\xF2\xC6\xCE\xCA(\xD19}\x80*h+"
+    @parser.parse(Bitcoin::Protocol.pkt("notfound", payload) + "AAAA").should == "AAAA"
+    @handler.notfound.should == [
+      [:tx, "2b682a807d39d128cacec6f2d20eef0a4ca3078f303eda7ca9014a446293e23a"]
+    ]
+  end
+
+  it 'parses notfound tx message' do
+    payload = "\x01\x02\x00\x00\x00:\xE2\x93bDJ\x01\xA9|\xDA>0\x8F\a\xA3L\n\xEF\x0E\xD2\xF2\xC6\xCE\xCA(\xD19}\x80*h+"
+    @parser.parse(Bitcoin::Protocol.pkt("notfound", payload) + "AAAA").should == "AAAA"
+    @handler.notfound.should == [
+      [:block, "2b682a807d39d128cacec6f2d20eef0a4ca3078f303eda7ca9014a446293e23a"]
+    ]
+  end
+end

data/spec/bitcoin/protocol/ping_spec.rb

@@ -1,3 +1,5 @@
+# encoding: ascii-8bit
+
 require_relative '../spec_helper.rb'
 
 describe 'Bitcoin::Protocol::Parser (ping/pong)' do

data/spec/bitcoin/protocol/tx_spec.rb

@@ -1,3 +1,5 @@
+# encoding: ascii-8bit
+
 require_relative '../spec_helper.rb'
 
 include Bitcoin::Protocol
@@ -101,6 +103,10 @@ describe 'Tx' do
     tx = Tx.from_json( fixtures_file('rawtx-ba1ff5cd66713133c062a871a8adab92416f1e38d17786b2bf56ac5f6ffdfdf5.json') )
     Tx.new( tx.to_payload ).to_json.should == tx.to_json
     tx.hash.should == 'ba1ff5cd66713133c062a871a8adab92416f1e38d17786b2bf56ac5f6ffdfdf5'
+
+    # coinbase tx with non-default sequence
+    tx = Tx.from_json( json=fixtures_file('0961c660358478829505e16a1f028757e54b5bbf9758341a7546573738f31429.json'))
+    Tx.new( tx.to_payload ).to_json.should == json
   end
 
   it 'Tx.binary_from_json' do
@@ -127,6 +133,49 @@ describe 'Tx' do
     outpoint_tx.hash.should == '406b2b06bcd34d3c8733e6b79f7a394c8a431fbf4ff5ac705c93f4076bb77602'
 
     tx.verify_input_signature(0, outpoint_tx).should == true
+
+
+    tx = Bitcoin::Protocol::Tx.from_json(fixtures_file('0f24294a1d23efbb49c1765cf443fba7930702752aba6d765870082fe4f13cae.json'))
+    tx.hash.should == '0f24294a1d23efbb49c1765cf443fba7930702752aba6d765870082fe4f13cae'
+    outpoint_tx = Bitcoin::Protocol::Tx.from_json(fixtures_file('aea682d68a3ea5e3583e088dcbd699a5d44d4b083f02ad0aaf2598fe1fa4dfd4.json'))
+    outpoint_tx.hash.should == 'aea682d68a3ea5e3583e088dcbd699a5d44d4b083f02ad0aaf2598fe1fa4dfd4'
+    tx.verify_input_signature(0, outpoint_tx).should == true
+
+    # SIGHASH_ANYONECANPAY transaction
+    tx = Bitcoin::Protocol::Tx.from_json(fixtures_file('51bf528ecf3c161e7c021224197dbe84f9a8564212f6207baa014c01a1668e1e.json'))
+    tx.hash.should == '51bf528ecf3c161e7c021224197dbe84f9a8564212f6207baa014c01a1668e1e'
+    outpoint_tx = Bitcoin::Protocol::Tx.from_json(fixtures_file('761d8c5210fdfd505f6dff38f740ae3728eb93d7d0971fb433f685d40a4c04f6.json'))
+    outpoint_tx.hash.should == '761d8c5210fdfd505f6dff38f740ae3728eb93d7d0971fb433f685d40a4c04f6'
+    tx.verify_input_signature(0, outpoint_tx).should == true
+
+    # BIP12/OP_EVAL does't exist.
+    tx = Bitcoin::Protocol::Tx.from_json(fixtures_file('03d7e1fa4d5fefa169431f24f7798552861b255cd55d377066fedcd088fb0e99.json'))
+    tx.hash.should == '03d7e1fa4d5fefa169431f24f7798552861b255cd55d377066fedcd088fb0e99'
+    outpoint_tx = Bitcoin::Protocol::Tx.from_json(fixtures_file('f003f0c1193019db2497a675fd05d9f2edddf9b67c59e677c48d3dbd4ed5f00b.json'))
+    outpoint_tx.hash.should == 'f003f0c1193019db2497a675fd05d9f2edddf9b67c59e677c48d3dbd4ed5f00b'
+    tx.verify_input_signature(0, outpoint_tx).should == true
+
+    # (SIGHASH_ANYONECANPAY | SIGHASH_SINGLE) p2sh transaction
+    tx = Bitcoin::P::Tx.from_json(fixtures_file('7208e5edf525f04e705fb3390194e316205b8f995c8c9fcd8c6093abe04fa27d.json'))
+    tx.hash.should == "7208e5edf525f04e705fb3390194e316205b8f995c8c9fcd8c6093abe04fa27d"
+    outpoint_tx = Bitcoin::P::Tx.from_json(fixtures_file('3e58b7eed0fdb599019af08578effea25c8666bbe8e200845453cacce6314477.json'))
+    outpoint_tx.hash.should == "3e58b7eed0fdb599019af08578effea25c8666bbe8e200845453cacce6314477"
+    tx.verify_input_signature(0, outpoint_tx).should == true
+
+    # SIGHHASH_SINGLE - https://bitcointalk.org/index.php?topic=260595.0
+    tx = Bitcoin::P::Tx.from_json(fixtures_file('315ac7d4c26d69668129cc352851d9389b4a6868f1509c6c8b66bead11e2619f.json'))
+    tx.hash.should == "315ac7d4c26d69668129cc352851d9389b4a6868f1509c6c8b66bead11e2619f"
+    outpoint_tx = Bitcoin::P::Tx.from_json(fixtures_file('69216b8aaa35b76d6613e5f527f4858640d986e1046238583bdad79b35e938dc.json'))
+    outpoint_tx.hash.should == "69216b8aaa35b76d6613e5f527f4858640d986e1046238583bdad79b35e938dc"
+    tx.verify_input_signature(0, outpoint_tx).should == true
+    tx.verify_input_signature(1, outpoint_tx).should == true
+
+    # 0:1:01 <signature> 0:1:01 0:1:00 <pubkey> OP_SWAP OP_1ADD OP_CHECKMULTISIG
+    tx = Bitcoin::P::Tx.from_json(fixtures_file('cd874fa8cb0e2ec2d385735d5e1fd482c4fe648533efb4c50ee53bda58e15ae2.json'))
+    tx.hash.should == "cd874fa8cb0e2ec2d385735d5e1fd482c4fe648533efb4c50ee53bda58e15ae2"
+    outpoint_tx = Bitcoin::P::Tx.from_json(fixtures_file('514c46f0b61714092f15c8dfcb576c9f79b3f959989b98de3944b19d98832b58.json'))
+    outpoint_tx.hash.should == "514c46f0b61714092f15c8dfcb576c9f79b3f959989b98de3944b19d98832b58"
+    tx.verify_input_signature(0, outpoint_tx).should == true
   end
 
   it '#sign_input_signature' do
@@ -189,26 +238,17 @@ describe 'Tx' do
     #File.open("rawtx-#{prev_tx.hash}.json",'wb'){|f| f.print prev_tx.to_json }
   end
 
+  it '#calculate_minimum_fee' do
+    tx = Tx.new( fixtures_file('rawtx-b5d4e8883533f99e5903ea2cf001a133a322fa6b1370b18a16c57c946a40823d.bin') )
+    tx.minimum_relay_fee.should == 0
+    tx.minimum_block_fee.should == 0
+    tx = Tx.from_json(fixtures_file('bc179baab547b7d7c1d5d8d6f8b0cc6318eaa4b0dd0a093ad6ac7f5a1cb6b3ba.json'))
+    tx.minimum_relay_fee.should == 10_000
+    tx.minimum_block_fee.should == 50_000
+  end
 
   describe "Tx - BIP Scripts" do
 
-    it "should do OP_CHECKHASHVERIFY (BIP_0017)" do # https://en.bitcoin.it/wiki/BIP_0017
-      # scriptSig: [signatures...] OP_CODESEPARATOR 1 [pubkey1] [pubkey2] 2 OP_CHECKMULTISIG
-      # scriptPubKey: [20-byte-hash of {1 [pubkey1] [pubkey2] 2 OP_CHECKMULTISIG} ] OP_CHECKHASHVERIFY OP_DROP
-
-      tx = Tx.from_json(fixtures_file('bc179baab547b7d7c1d5d8d6f8b0cc6318eaa4b0dd0a093ad6ac7f5a1cb6b3ba.json'))
-      tx.hash.should == "bc179baab547b7d7c1d5d8d6f8b0cc6318eaa4b0dd0a093ad6ac7f5a1cb6b3ba"
-
-      prev_tx1 = Tx.from_json(fixtures_file('477fff140b363ec2cc51f3a65c0c58eda38f4d41f04a295bbd62babf25e4c590.json'))
-      prev_tx1.hash.should == "477fff140b363ec2cc51f3a65c0c58eda38f4d41f04a295bbd62babf25e4c590"
-
-      prev_tx2 = Tx.from_json(fixtures_file('0d0affb5964abe804ffe85e53f1dbb9f29e406aa3046e2db04fba240e63c7fdd.json'))
-      prev_tx2.hash.should == "0d0affb5964abe804ffe85e53f1dbb9f29e406aa3046e2db04fba240e63c7fdd"
-
-      tx.verify_input_signature(0, prev_tx1).should == true
-      tx.verify_input_signature(1, prev_tx2).should == true
-    end
-
     it "should do OP_CHECKMULTISIG" do
       # checkmultisig without checkhashverify
       tx = Tx.from_json(fixtures_file('23b397edccd3740a74adb603c9756370fafcde9bcc4483eb271ecad09a94dd63.json'))
@@ -221,6 +261,32 @@ describe 'Tx' do
       tx.verify_input_signature(0, prev_tx).should == true
     end
 
+    it "should do P2SH with inner OP_CHECKMULTISIG (BIP 0016)" do
+      tx = Tx.from_json(fixtures_file('3a17dace09ffb919ed627a93f1873220f4c975c1248558b18d16bce25d38c4b7.json'))
+      prev_tx = Tx.from_json(fixtures_file('35e2001b428891fefa0bfb73167c7360669d3cbd7b3aa78e7cad125ddfc51131.json'))
+      tx.verify_input_signature(0, prev_tx).should == true
+
+      tx = Tx.from_json(fixtures_file('bd1715f1abfdc62bea3f605bdb461b3ba1f2cca6ec0d73a18a548b7717ca8531.json'))
+      prev_tx = Tx.from_json(fixtures_file('ce5fad9b4ef094d8f4937b0707edaf0a6e6ceeaf67d5edbfd51f660eac8f398b.json'))
+      tx.verify_input_signature(1, prev_tx).should == true
+
+      # p2sh transaction with non-standard OP_CHECKMULTISIG inside found in testnet3 tx: d3d77d63709e47d9ef58f0b557800115a6b676c6a423012fbb96f45d8fcef830
+      tx = Bitcoin::P::Tx.from_json(fixtures_file('tx-d3d77d63709e47d9ef58f0b557800115a6b676c6a423012fbb96f45d8fcef830.json'))
+      tx.hash.should == "d3d77d63709e47d9ef58f0b557800115a6b676c6a423012fbb96f45d8fcef830"
+      prev_tx = Bitcoin::P::Tx.from_json(fixtures_file('tx-313897799b1e37e9ecae15010e56156dddde4e683c96b0e713af95272c38aee0.json'))
+      prev_tx.hash.should == "313897799b1e37e9ecae15010e56156dddde4e683c96b0e713af95272c38aee0"
+      tx.verify_input_signature(0, prev_tx).should == true
+    end
+
+    it "should do P2SH with inner OP_CHECKSIG" do
+      # p2sh transaction with non-standard OP_CHECKSIG inside found in testnet3 tx: 3da75972766f0ad13319b0b461fd16823a731e44f6e9de4eb3c52d6a6fb6c8ae
+      tx = Bitcoin::P::Tx.from_json(fixtures_file('tx-3da75972766f0ad13319b0b461fd16823a731e44f6e9de4eb3c52d6a6fb6c8ae.json'))
+      tx.hash.should == "3da75972766f0ad13319b0b461fd16823a731e44f6e9de4eb3c52d6a6fb6c8ae"
+      prev_tx = Bitcoin::P::Tx.from_json(fixtures_file('tx-44b833074e671120ba33106877b49e86ece510824b9af477a3853972bcd8d06a.json'))
+      prev_tx.hash.should == "44b833074e671120ba33106877b49e86ece510824b9af477a3853972bcd8d06a"
+      tx.verify_input_signature(0, prev_tx).should == true
+    end
+
   end
 
 end