bitcoin-ruby 0.0.2 → 0.0.3

data/.gitignore

@@ -9,7 +9,6 @@ tmp/
 log/
 rdoc/
 coverage/
-*.yml
 *.conf
 *.db
 .rbx/

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0

data/README.rdoc

@@ -1,4 +1,4 @@
-= Bitcoin-ruby
+= Bitcoin-ruby {<img src="https://api.travis-ci.org/lian/bitcoin-ruby.png?branch=master" />}[http://travis-ci.org/lian/bitcoin-ruby]
 
 This is a ruby library for interacting with the bitcoin protocol/network.
 
@@ -30,7 +30,7 @@ We assume you already have a ruby 1.9 or 2.0 compatible interpreter and rubygems
 
 if you want to have it available system-wide, just build the gem and install it:
 
- gem build bitcoin-ruby.gemspec && gem install bitcoin-ruby-0.0.1.gem
+ gem build bitcoin-ruby.gemspec && gem install bitcoin-ruby-0.0.2.gem
 
 now you can just call +bitcoin_node+ from anywhere.
 
@@ -45,6 +45,9 @@ intentionally kept to a minimum, so nobody has to install unneeded dependencies.
 * +gir_ffi+ for the gui
 * +bacon+ to run the specs
 
+If you would like to install using Bundler, put it in your Gemfile and run bundle install
+ gem 'bitcoin-ruby', git: 'https://github.com/lian/bitcoin-ruby', branch: 'master', require: 'bitcoin'
+
 == Client
 
 There is a node which connects to the network and downloads

data/lib/bitcoin.rb

@@ -112,7 +112,15 @@ module Bitcoin
     end
 
     def hash160_to_address(hex)
-      hex = address_version + hex
+      encode_address hex, address_version
+    end
+
+    def hash160_to_p2sh_address(hex)
+      encode_address hex, p2sh_version
+    end
+
+    def encode_address(hex, version)
+      hex = version + hex
       encode_base58(hex + checksum(hex))
     end
 
@@ -448,7 +456,7 @@ module Bitcoin
       :retarget_interval => 2016,
       :retarget_time => 1209600, # 2 weeks
       :max_money => 21_000_000 * COIN,
-      :min_tx_fee => 50_000,
+      :min_tx_fee => 10_000,
       :min_relay_tx_fee => 10_000,
       :dns_seeds => [
         "seed.bitcoin.sipa.be",
@@ -492,7 +500,13 @@ module Bitcoin
       :proof_of_work_limit => 0x1d07fff8,
       :alert_pubkeys => ["04302390343f91cc401d56d68b123028bf52e5fca1939df127f63c6467cdf9c8e2c14b61104cf817d0b780da337893ecc4aaff1309e536162dabbdb45200ca2b0a"],
       :known_nodes => [],
-      :checkpoints => {}
+      :checkpoints => {},
+      :coinbase_maturity => 100,
+      :retarget_interval => 2016,
+      :retarget_time => 1209600, # 2 weeks
+      :max_money => 21_000_000 * COIN,
+      :min_tx_fee => 10_000,
+      :min_relay_tx_fee => 10_000,
     },
 
     :testnet3 => {
@@ -507,7 +521,7 @@ module Bitcoin
       :retarget_interval => 2016,
       :retarget_time => 1209600, # 2 weeks
       :max_money => 21_000_000 * COIN,
-      :min_tx_fee => 50_000,
+      :min_tx_fee => 10_000,
       :min_relay_tx_fee => 10_000,
       :dns_seeds => [
         "testnet-seed.bitcoin.petertodd.org",
@@ -529,7 +543,7 @@ module Bitcoin
       :magic_head => "\xfb\xc0\xb6\xdb",
       :address_version => "30",
       :p2sh_version => "05",
-      :privkey_version => "ef",
+      :privkey_version => "b0",
       :default_port => 9333,
       :protocol_version => 60002,
       :max_money => 84_000_000 * COIN,

data/lib/bitcoin/ffi/openssl.rb

@@ -8,7 +8,11 @@ Bitcoin.require_dependency :ffi, exit: false, message: "Skipping FFI needed for
 module Bitcoin
 module OpenSSL_EC
   extend FFI::Library
-  ffi_lib 'ssl'
+  if FFI::Platform.windows?
+    ffi_lib 'libeay32', 'ssleay32'
+  else
+    ffi_lib 'ssl'
+  end
 
   NID_secp256k1 = 714
   POINT_CONVERSION_COMPRESSED = 2

data/lib/bitcoin/protocol/tx.rb

@@ -219,32 +219,33 @@ module Bitcoin
         @validator ||= Bitcoin::Validation::Tx.new(self, store, block)
       end
 
-      def minimum_relay_fee; calculate_minimum_fee(1_000, true, :relay); end
-      def minimum_block_fee; calculate_minimum_fee(1_000, true, :block); end
+      DEFAULT_BLOCK_PRIORITY_SIZE = 27000
 
-      def calculate_minimum_fee(block_size=1, allow_free=true, mode=:block)
-        base_fee       = (mode == :relay) ? Bitcoin.network[:min_relay_tx_fee] : Bitcoin.network[:min_tx_fee]
-        tx_size        = to_payload.bytesize
-        new_block_size = block_size + tx_size
-        min_fee       = (1 + tx_size / 1_000) * base_fee
+      def minimum_relay_fee; calculate_minimum_fee(allow_free=true, :relay); end
+      def minimum_block_fee; calculate_minimum_fee(allow_free=true, :block); end
+
+      def calculate_minimum_fee(allow_free=true, mode=:block)
+        # Base fee is either nMinTxFee or nMinRelayTxFee
+        base_fee  = (mode == :relay) ? Bitcoin.network[:min_relay_tx_fee] : Bitcoin.network[:min_tx_fee]
+        tx_size   = to_payload.bytesize
+        min_fee   = (1 + tx_size / 1_000) * base_fee
 
         if allow_free
-          if block_size == 1
-            min_fee = 0 if tx_size < 10_000
-          else
-            min_fee = 0 if new_block_size < 27_000
-          end
+          # There is a free transaction area in blocks created by most miners,
+          # * If we are relaying we allow transactions up to DEFAULT_BLOCK_PRIORITY_SIZE - 1000
+          #   to be considered to fall into this category. We don't want to encourage sending
+          #   multiple transactions instead of one big transaction to avoid fees.
+          # * If we are creating a transaction we allow transactions up to 1,000 bytes
+          #   to be considered safe and assume they can likely make it into this section.
+          min_fee = 0 if tx_size < (mode == :block ? 1_000 : DEFAULT_BLOCK_PRIORITY_SIZE - 1_000)
         end
 
-        if min_fee < base_fee
+        # This code can be removed after enough miners have upgraded to version 0.9.
+        # Until then, be safe when sending and require a fee if any output is less than CENT
+        if min_fee < base_fee && mode == :block
           outputs.each{|output| (min_fee = base_fee; break) if output.value < Bitcoin::CENT }
         end
 
-        if block_size != 1 && new_block_size >= (Bitcoin::MAX_BLOCK_SIZE_GEN/2)
-          #return Bitcoin::network[:max_money] if new_block_size >= Bitcoin::MAX_BLOCK_SIZE_GEN
-          min_fee *= Bitcoin::MAX_BLOCK_SIZE_GEN / (Bitcoin::MAX_BLOCK_SIZE_GEN - new_block_size)
-        end
-
         min_fee = Bitcoin::network[:max_money] unless min_fee.between?(0, Bitcoin::network[:max_money])
         min_fee
       end

data/lib/bitcoin/protocol/txin.rb

@@ -31,6 +31,8 @@ module Bitcoin
       def initialize *args
         @prev_out, @prev_out_index, @script_sig_length,
         @script_sig, @sequence = *args
+        @script_sig_length ||= 0
+        @script_sig ||= ''
         @sequence ||= DEFAULT_SEQUENCE
       end
 

data/lib/bitcoin/script.rb

@@ -992,8 +992,14 @@ class Bitcoin::Script
   def op_checksig(check_callback)
     return invalid if @stack.size < 2
     pubkey = @stack.pop
+    #return (@stack << 0) unless Bitcoin::Script.is_canonical_pubkey?(pubkey) # only for isStandard
     drop_sigs      = [ @stack[-1] ]
-    sig, hash_type = parse_sig(@stack.pop)
+
+    signature = cast_to_string(@stack.pop)
+    #return (@stack << 0) unless Bitcoin::Script.is_canonical_signature?(signature) # only for isStandard
+    return (@stack << 0) if signature == ""
+
+    sig, hash_type = parse_sig(signature)
 
     if inner_p2sh?
       script_code = @inner_script_code || to_binary_without_signatures(drop_sigs)
@@ -1038,9 +1044,9 @@ class Bitcoin::Script
     n_sigs = pop_int
     return invalid  unless (0..n_pubkeys).include?(n_sigs)
     return invalid  unless @stack.last(n_sigs).all?{|e| e.is_a?(String) && e != '' }
-    sigs = (drop_sigs = pop_string(n_sigs)).map{|s| parse_sig(s) }
+    sigs = drop_sigs = pop_string(n_sigs)
 
-    @stack.pop if @stack[-1] == '' # remove OP_NOP from stack
+    @stack.pop if @stack[-1] && cast_to_bignum(@stack[-1]) == 0 # remove OP_0 from stack
 
     if inner_p2sh?
       script_code = @inner_script_code || to_binary_without_signatures(drop_sigs)
@@ -1050,8 +1056,10 @@ class Bitcoin::Script
     end
 
     valid_sigs = 0
-    sigs.each{|sig, hash_type| pubkeys.each{|pubkey|
-        valid_sigs += 1  if check_callback.call(pubkey, sig, hash_type, drop_sigs, script_code)
+    sigs.each{|sig| pubkeys.each{|pubkey|
+        next if sig == ""
+        signature, hash_type = parse_sig(sig)
+        valid_sigs += 1  if check_callback.call(pubkey, signature, hash_type, drop_sigs, script_code)
       }}
 
     @stack << ((valid_sigs >= n_sigs) ? 1 : (invalid; 0))
@@ -1081,6 +1089,27 @@ class Bitcoin::Script
     true
   end
 
+
+  SIGHASH_TYPE = { all: 1, none: 2, single: 3, anyonecanpay: 128 }
+
+  def self.is_canonical_signature?(sig)
+    return false if sig.bytesize < 9 # Non-canonical signature: too short
+    return false if sig.bytesize > 73 # Non-canonical signature: too long
+
+    s = sig.unpack("C*")
+
+    hash_type = s[-1] & (~(SIGHASH_TYPE[:anyonecanpay]))
+    return false if hash_type < SIGHASH_TYPE[:all]   ||  hash_type > SIGHASH_TYPE[:single] # Non-canonical signature: unknown hashtype byte
+
+    return false if s[0] != 0x30 # Non-canonical signature: wrong type
+    return false if s[1] != s.size-3 # Non-canonical signature: wrong length marker
+
+    # TODO: add/port rest from bitcoind
+
+    true
+  end
+
+
   private
 
   def parse_sig(sig)

data/lib/bitcoin/storage/storage.rb

@@ -276,14 +276,13 @@ module Bitcoin::Storage
       def get_locator pointer = get_head
         if @locator
           locator, head = @locator
-          if head == get_head
+          if head == pointer
             return locator
           end
         end
 
         return [("\x00"*32).hth]  if get_depth == -1
-        locator = []
-        step = 1
+        locator, step, orig_pointer = [], 1, pointer
         while pointer && pointer.hash != Bitcoin::network[:genesis_hash]
           locator << pointer.hash
           depth = pointer.depth - step
@@ -294,7 +293,7 @@ module Bitcoin::Storage
           step *= 2  if locator.size > 10
         end
         locator << Bitcoin::network[:genesis_hash]
-        @locator = [locator, get_head]
+        @locator = [locator, orig_pointer]
         locator
       end
 

data/lib/bitcoin/version.rb

@@ -1,3 +1,3 @@
 module Bitcoin
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/bitcoin/bitcoin_spec.rb

@@ -24,6 +24,16 @@ describe 'Bitcoin Address/Hash160/PubKey' do
       .should == "1A1zP1eP5QGefi2DMPTfTL5SLmv7DivfNa"
   end
 
+  it 'bitcoin p2sh address from bitcoin-hash160' do
+    Bitcoin::network = :testnet
+    Bitcoin.hash160_to_p2sh_address("d11e2f2f385efeecd30f867f1d55c0bc8a27f29e")
+      .should == "2NCJwNct2SVE5VwdrPXmnek59kCfdgCpxeF"
+
+    Bitcoin::network = :bitcoin
+    Bitcoin.hash160_to_p2sh_address("d11e2f2f385efeecd30f867f1d55c0bc8a27f29e")
+      .should == "3LkjJswzq2ijJA1JiQ9v2o5tXrTTvPtAMe"
+  end
+
   it 'bitcoin-hash160 from bitcoin-address' do
     Bitcoin::network = :testnet
     Bitcoin.hash160_from_address("mpXwg4jMtRhuSpVq4xS3HFHmCmWp9NyGKt")

data/spec/bitcoin/fixtures/tx-9fb65b7304aaa77ac9580823c2c06b259cc42591e5cce66d76a81b6f51cc5c28.json

@@ -0,0 +1,23 @@
+{
+  "hash":"9fb65b7304aaa77ac9580823c2c06b259cc42591e5cce66d76a81b6f51cc5c28",
+  "ver":1,
+  "vin_sz":1,
+  "vout_sz":1,
+  "lock_time":0,
+  "size":235,
+  "in":[
+    {
+      "prev_out":{
+        "hash":"a6ce7081addade7676cd2af75c4129eba6bf5e179a19c40c7d4cf6a5fe595954",
+        "n":0
+      },
+      "scriptSig":"ca42095840735e89283fec298e62ac2ddea9b5f34a8cbb7097ad965b87568100 1b1b01dc829177da4a14551d2fc96a9db00c6501edfa12f22cd9cefd335c227f 3045022100940a7a74d00d590dc6743c8d7416475845611047bed013db2c4f80c96261576a02202b223572a37c2eee65fefabf701b2f39e3df2cba5d136eef0485d9a24f49c0aa01 0"
+    }
+  ],
+  "out":[
+    {
+      "value":"0.00160000",
+      "scriptPubKey":"03611f9a45c18f28f06f19076ad571c344c82ce8fcfe34464cf8085217a2d294a6 OP_CHECKSIG"
+    }
+  ]
+}

data/spec/bitcoin/fixtures/tx-a6ce7081addade7676cd2af75c4129eba6bf5e179a19c40c7d4cf6a5fe595954.json

@@ -0,0 +1,30 @@
+{
+  "hash":"a6ce7081addade7676cd2af75c4129eba6bf5e179a19c40c7d4cf6a5fe595954",
+  "ver":1,
+  "vin_sz":2,
+  "vout_sz":1,
+  "lock_time":0,
+  "size":461,
+  "in":[
+    {
+      "prev_out":{
+        "hash":"4c1497075bfa37eb7a78493b948f9a66b65b81e55ebf8d79d504c5e03857fb8d",
+        "n":0
+      },
+      "scriptSig":"30450221009d124bdcf2aff61d649219ba3b8cc7f637e79f810b7da3ed6df8bdf6c025ddc0022004b7e3d1e4ca92bd8ece38fda3d698bdfa8ab89720fce6df6c014d83e25fe00001"
+    },
+    {
+      "prev_out":{
+        "hash":"2bba9900c0fe67ada751be0e3444be6bb696f473fe84b5b7b0d8f93df6c2b833",
+        "n":0
+      },
+      "scriptSig":"3045022100f665b25b0b14a2aca111dbc52ad1467b9cce69e822f6b7faba2091670b082d1b02202a360069da73a2b3aeb87d7c5645b91fc594e3067f24daefad0596e9ef18d0f801 1b1b01dc829177da4a14551d2fc96a9db00c6501edfa12f22cd9cefd335c227f"
+    }
+  ],
+  "out":[
+    {
+      "value":"0.00170000",
+      "scriptPubKey":"02085c6600657566acc2d6382a47bc3f324008d2aa10940dd7705a48aa2a5a5e33 OP_CHECKSIG OP_SWAP 03f5d0fb955f95dd6be6115ce85661db412ec6a08abcbfce7da0ba8297c6cc0ec4 OP_CHECKSIG OP_SWAP 3 OP_PICK OP_SHA256 d68df9e32a147cffa36193c6f7c43a1c8c69cda530e1c6db354bfabdcfefaf3c OP_EQUAL 3 OP_PICK OP_SHA256 f531f3041d3136701ea09067c53e7159c8f9b2746a56c3d82966c54bbc553226 OP_EQUAL OP_BOOLAND 4 OP_PICK OP_SIZE OP_NIP 20 22 OP_WITHIN OP_BOOLAND 3 OP_PICK OP_SIZE OP_NIP 20 22 OP_WITHIN OP_BOOLAND OP_IF 3 OP_PICK OP_SIZE OP_NIP 3 OP_PICK OP_SIZE OP_NIP OP_EQUAL OP_PICK OP_ELSE OP_BOOLAND OP_ENDIF"
+    }
+  ]
+}

data/spec/bitcoin/protocol/tx_spec.rb

@@ -176,6 +176,13 @@ describe 'Tx' do
     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
+
+    # OP_CHECKSIG with OP_0 from mainnet a6ce7081addade7676cd2af75c4129eba6bf5e179a19c40c7d4cf6a5fe595954 output 0
+    tx = Bitcoin::P::Tx.from_json(fixtures_file('tx-9fb65b7304aaa77ac9580823c2c06b259cc42591e5cce66d76a81b6f51cc5c28.json'))
+    tx.hash.should == "9fb65b7304aaa77ac9580823c2c06b259cc42591e5cce66d76a81b6f51cc5c28"
+    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
   end
 
   it '#sign_input_signature' do
@@ -243,8 +250,8 @@ describe 'Tx' do
     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
+    tx.minimum_relay_fee.should == 0
+    tx.minimum_block_fee.should == 10_000
   end
 
   describe "Tx - BIP Scripts" do

data/spec/bitcoin/protocol/txin_spec.rb

@@ -0,0 +1,18 @@
+# encoding: ascii-8bit
+
+require_relative '../spec_helper.rb'
+
+include Bitcoin::Protocol
+
+describe 'TxIn' do
+
+  describe '#initialize without specifying script_sig_length and script_sig' do
+    it 'still creates a serializable TxIn' do
+      prev_tx = Tx.new fixtures_file('rawtx-01.bin')
+      tx_in = TxIn.new prev_tx.binary_hash, 0
+      lambda { tx_in.to_payload }.should.not.raise
+    end
+  end
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitcoin-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies: []
 description: This is a ruby library for interacting with the bitcoin protocol/network
 email:
@@ -24,6 +24,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - COPYING
 - Gemfile
 - README.rdoc
@@ -184,6 +185,8 @@ files:
 - spec/bitcoin/fixtures/tx-313897799b1e37e9ecae15010e56156dddde4e683c96b0e713af95272c38aee0.json
 - spec/bitcoin/fixtures/tx-3da75972766f0ad13319b0b461fd16823a731e44f6e9de4eb3c52d6a6fb6c8ae.json
 - spec/bitcoin/fixtures/tx-44b833074e671120ba33106877b49e86ece510824b9af477a3853972bcd8d06a.json
+- spec/bitcoin/fixtures/tx-9fb65b7304aaa77ac9580823c2c06b259cc42591e5cce66d76a81b6f51cc5c28.json
+- spec/bitcoin/fixtures/tx-a6ce7081addade7676cd2af75c4129eba6bf5e179a19c40c7d4cf6a5fe595954.json
 - spec/bitcoin/fixtures/tx-d3d77d63709e47d9ef58f0b557800115a6b676c6a423012fbb96f45d8fcef830.json
 - spec/bitcoin/fixtures/txdp-1.txt
 - spec/bitcoin/fixtures/txdp-2-signed.txt
@@ -201,6 +204,7 @@ files:
 - spec/bitcoin/protocol/notfound_spec.rb
 - spec/bitcoin/protocol/ping_spec.rb
 - spec/bitcoin/protocol/tx_spec.rb
+- spec/bitcoin/protocol/txin_spec.rb
 - spec/bitcoin/protocol/version_spec.rb
 - spec/bitcoin/script/opcodes_spec.rb
 - spec/bitcoin/script/script_spec.rb
@@ -318,6 +322,8 @@ test_files:
 - spec/bitcoin/fixtures/tx-313897799b1e37e9ecae15010e56156dddde4e683c96b0e713af95272c38aee0.json
 - spec/bitcoin/fixtures/tx-3da75972766f0ad13319b0b461fd16823a731e44f6e9de4eb3c52d6a6fb6c8ae.json
 - spec/bitcoin/fixtures/tx-44b833074e671120ba33106877b49e86ece510824b9af477a3853972bcd8d06a.json
+- spec/bitcoin/fixtures/tx-9fb65b7304aaa77ac9580823c2c06b259cc42591e5cce66d76a81b6f51cc5c28.json
+- spec/bitcoin/fixtures/tx-a6ce7081addade7676cd2af75c4129eba6bf5e179a19c40c7d4cf6a5fe595954.json
 - spec/bitcoin/fixtures/tx-d3d77d63709e47d9ef58f0b557800115a6b676c6a423012fbb96f45d8fcef830.json
 - spec/bitcoin/fixtures/txdp-1.txt
 - spec/bitcoin/fixtures/txdp-2-signed.txt
@@ -335,6 +341,7 @@ test_files:
 - spec/bitcoin/protocol/notfound_spec.rb
 - spec/bitcoin/protocol/ping_spec.rb
 - spec/bitcoin/protocol/tx_spec.rb
+- spec/bitcoin/protocol/txin_spec.rb
 - spec/bitcoin/protocol/version_spec.rb
 - spec/bitcoin/script/opcodes_spec.rb
 - spec/bitcoin/script/script_spec.rb