bitcoin-ruby 0.0.3 → 0.0.4

data/.travis.yml

@@ -1,4 +1,10 @@
 language: ruby
 rvm:
   - 1.9.3
-  - 2.0.0
+  - 2.0.0
+before_script:
+  - psql -c 'create database bitcoin_test;' -U postgres
+  - mysql -e 'create database bitcoin_test;'
+env:
+  - TEST_DB_POSTGRES="postgres://postgres@localhost/bitcoin_test"
+  - TEST_DB_MYSQL="mysql:/bitcoin_test"

data/README.rdoc

@@ -240,6 +240,11 @@ or, if you want to run a single spec
 
  ruby spec/bitcoin/bitcoin_spec.rb
 
+To test the postgres/mysql storage backend, create a database and set it as an environment variable:
+
+ echo "create database bitcoin_test" | psql
+ TEST_DB_POSTGRES="postgres:/bitcoin_test" rake bacon
+
 If you make changes to the code or add functionality, please also add specs.
 
 == Development

data/lib/bitcoin/script.rb

@@ -1035,15 +1035,17 @@ class Bitcoin::Script
   # TODO: validate signature order
   # TODO: take global opcode count
   def op_checkmultisig(check_callback)
+    return invalid if @stack.size < 1
     n_pubkeys = pop_int
     return invalid  unless (0..20).include?(n_pubkeys)
-    return invalid  unless @stack.last(n_pubkeys).all?{|e| e.is_a?(String) && e != '' }
-    #return invalid  if ((@op_count ||= 0) += n_pubkeys) > 201
+    #return invalid  if (nOpCount += n_pubkeys) > 201
+    return invalid if @stack.size < n_pubkeys
     pubkeys = pop_string(n_pubkeys)
 
+    return invalid if @stack.size < 1
     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 != '' }
+    return invalid if n_sigs < 0 || n_sigs > n_pubkeys
+    return invalid if @stack.size < n_sigs
     sigs = drop_sigs = pop_string(n_sigs)
 
     @stack.pop if @stack[-1] && cast_to_bignum(@stack[-1]) == 0 # remove OP_0 from stack
@@ -1055,14 +1057,20 @@ class Bitcoin::Script
       script_code, drop_sigs = nil, nil
     end
 
-    valid_sigs = 0
-    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)
-      }}
+    success = true
+    while success && n_sigs > 0
+      sig, pub = sigs.pop, pubkeys.pop
+      signature, hash_type = parse_sig(sig)
+      if check_callback.call(pub, signature, hash_type, drop_sigs, script_code)
+        n_sigs -= 1
+      else
+        sigs << sig
+      end
+      n_pubkeys -= 1
+      success = false if n_sigs > n_pubkeys
+    end
 
-    @stack << ((valid_sigs >= n_sigs) ? 1 : (invalid; 0))
+    @stack << (success ? 1 : (invalid; 0))
   end
 
   # op_eval: https://en.bitcoin.it/wiki/BIP_0012

data/lib/bitcoin/storage/sequel/migrations/001_base_schema.rb

@@ -3,7 +3,7 @@ Sequel.migration do
 
   up do
 
-    $stdout.puts "Running migration #{__FILE__}"
+    @log.info { "Running migration #{__FILE__}" }
 
     binary = adapter_scheme == :postgres ? :bytea : :varchar
 

data/lib/bitcoin/storage/sequel/migrations/002_tx.rb

@@ -2,7 +2,7 @@ Sequel.migration do
 
   up do
 
-    $stdout.puts "Running migration #{__FILE__}"
+    @log.info { "Running migration #{__FILE__}" }
 
     next  if tables.include?(:tx)
 
@@ -40,11 +40,6 @@ Sequel.migration do
       column :type, :int, :null => false, :index => true
     end
 
-    create_view(:unconfirmed,
-      "SELECT * FROM tx WHERE NOT EXISTS " +
-      "(SELECT 1 FROM blk_tx WHERE blk_tx.tx_id = tx.id)" +
-      "ORDER BY tx.id DESC")
-
   end
 
 end

data/lib/bitcoin/storage/sequel/migrations/003_change_txin_script_sig_to_blob.rb

@@ -2,7 +2,7 @@ Sequel.migration do
 
   up do
 
-    $stdout.puts "Running migration #{__FILE__}"
+    @log.info { "Running migration #{__FILE__}" }
 
     if adapter_scheme == :postgres
       add_column :txin, :tmp_script_sig, :bytea

data/lib/bitcoin/storage/sequel/migrations/004_change_txin_prev_out_to_blob.rb

@@ -0,0 +1,18 @@
+Sequel.migration do
+
+  up do
+
+    @log.info { "Running migration #{__FILE__}" }
+
+    if adapter_scheme == :postgres
+      add_column :txin, :tmp_prev_out, :bytea
+      self[:txin].where.update("tmp_prev_out = prev_out::bytea")
+      drop_column :txin, :prev_out
+      add_column :txin, :prev_out, :bytea, index: true
+      self[:txin].where.update("prev_out = tmp_prev_out")
+      drop_column :txin, :tmp_prev_out
+    end
+
+  end
+
+end

data/lib/bitcoin/storage/storage.rb

@@ -101,6 +101,7 @@ module Bitcoin::Storage
         migrations_path = File.join(File.dirname(__FILE__), "#{backend_name}/migrations")
         Sequel.extension :migration
         unless Sequel::Migrator.is_current?(@db, migrations_path)
+          log = @log; @db.instance_eval { @log = log }
           Sequel::Migrator.run(@db, migrations_path)
           unless (v = @db[:schema_info].first) && v[:magic] && v[:backend]
             @db[:schema_info].update(

data/lib/bitcoin/storage/utxo/migrations/001_base_schema.rb

@@ -3,7 +3,7 @@ Sequel.migration do
 
   up do
 
-    $stdout.puts "Running migration #{__FILE__}"
+    @log.info { "Running migration #{__FILE__}" }
 
     binary = adapter_scheme == :postgres ? :bytea : :varchar
 

data/lib/bitcoin/storage/utxo/migrations/002_utxo.rb

@@ -2,7 +2,7 @@ Sequel.migration do
 
   up do
 
-    $stdout.puts "Running migration #{__FILE__}"
+    @log.info { "Running migration #{__FILE__}" }
 
     create_table :utxo do
       primary_key :id

data/lib/bitcoin/version.rb

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

data/spec/bitcoin/script/opcodes_spec.rb

@@ -542,6 +542,12 @@ describe "Bitcoin::Script OPCODES" do
     script = "0 #{sig1} #{sig2} 2 #{k1.pub} #{k2.pub} 2 OP_CHECKMULTISIG"
     run_script(script, "foobar").should == true
 
+    script = "0 #{sig2} #{sig1} 2 #{k1.pub} #{k2.pub} 2 OP_CHECKMULTISIG"
+    run_script(script, "foobar").should == false
+
+    script = "0 #{sig1} #{sig2} 2 #{k2.pub} #{k1.pub} 2 OP_CHECKMULTISIG"
+    run_script(script, "foobar").should == false
+
     script = "0 #{sig1} #{sig2} 2 #{k1.pub} #{k2.pub} #{k3.pub} 3 OP_CHECKMULTISIG"
     run_script(script, "foobar").should == true
 

data/spec/bitcoin/spec_helper.rb

@@ -102,3 +102,24 @@ rescue LoadError
 end
 Bacon.summary_on_exit
 require 'minitest/mock'
+
+require 'sequel'
+def setup_db backend, db = nil, conf = {}
+  uri = case db
+        when :sqlite
+          "sqlite:/"
+        when :postgres
+          ENV["TEST_DB_POSTGRES"].dup rescue nil
+        when :mysql
+          ENV["TEST_DB_MYSQL"].dup rescue nil
+        end
+  if [:postgres, :mysql].include?(db)
+    unless uri
+      puts "Skipping #{db} tests"  
+      return nil
+    end
+    db = Sequel.connect(uri)
+    db.drop_table(*db.tables, cascade: true)
+  end
+  Bitcoin::Storage.send(backend, conf.merge(db: uri, log_level: :warn))
+end

data/spec/bitcoin/storage/reorg_spec.rb

@@ -4,23 +4,30 @@ require_relative '../spec_helper'
 
 include Bitcoin::Builder
 
+Bitcoin.network = :testnet
 
+Bitcoin::Validation::Block::RETARGET = 10
 
-[ { :name => :utxo, :db => 'sqlite:/', :index_all_addrs => true },
-  { :name => :sequel, :db => 'sqlite:/' } ] .each do |configuration|
+[
+ [:utxo, :sqlite, index_all_addrs: true],
+ [:sequel, :sqlite], # [:sequel, :postgres],
+ [:utxo, :postgres, index_all_addrs: true],
+ [:sequel, :mysql],
+ [:utxo, :mysql, index_all_addrs: true],
+].compact.each do |options|
 
-  describe "reorg (#{configuration[:name].capitalize}Store)" do
+  next  unless storage = setup_db(*options)
+
+  describe "reorg (#{options[0]} - #{options[1]})" do
 
   def balance addr
     @store.get_balance(Bitcoin.hash160_from_address(addr))
   end
 
   before do
-    Bitcoin.network = :testnet
-    @store = Bitcoin::Storage.send(configuration[:name], configuration)
+    @store = storage
     @store.reset
     def @store.in_sync?; true; end
-    @store.log.level = :warn
     Bitcoin.network[:proof_of_work_limit] = Bitcoin.encode_compact_bits("ff"*32)
     @key = Bitcoin::Key.generate
     @block0 = create_block "00"*32, false, [], @key
@@ -33,8 +40,6 @@ include Bitcoin::Builder
     @store.reset
     time = Time.now.to_i - 3000*600
 
-    Bitcoin::Validation::Block::RETARGET = 10
-
     # create genesis block
     block = create_block "00"*32, false, [], @key, 50e8, {time: time}
     Bitcoin.network[:genesis_hash] = block.hash
@@ -187,6 +192,7 @@ include Bitcoin::Builder
     balance("1NiEGXeURREqqMjCvjCeZn6SwEBZ9AdVet").should == 1000000000
     balance("1KXFNhNtrRMfgbdiQeuJqnfD7dR4PhniyJ").should == 0
     balance("1JyMKvPHkrCQd8jQrqTR1rBsAd1VpRhTiE").should == 14000000000
+    Bitcoin.network = :testnet
     class Bitcoin::Validation::Block
       def difficulty
         return true  if Bitcoin.network_name == :testnet3

data/spec/bitcoin/storage/storage_spec.rb

@@ -8,21 +8,28 @@ include Bitcoin::Storage::Backends
 include Bitcoin::Builder
 include Bitcoin::Validation
 
-[ { :name => :dummy },
-  { :name => :utxo, :db => 'sqlite:/', :index_all_addrs => true },
-  { :name => :sequel, :db => 'sqlite:/' } ].each do |configuration|
+Bitcoin::network = :testnet
+[
+ [:dummy],
+ [:sequel, :sqlite],
+ [:utxo, :sqlite, index_all_addrs: true],
+ [:sequel, :postgres],
+ [:utxo, :postgres, index_all_addrs: true],
+ [:sequel, :mysql],
+ [:utxo, :mysql, index_all_addrs: true],
+].compact.each do |options|
 
-  describe "Bitcoin::Storage::Backends::#{configuration[:name].capitalize}Store" do
+  next  unless storage = setup_db(*options)
+
+  describe "Storage::Backends::#{options[0].to_s.capitalize}Store (#{options[1]})" do
 
     before do
       class Bitcoin::Validation::Block; def difficulty; true; end; end
       Bitcoin.network[:proof_of_work_limit] = Bitcoin.encode_compact_bits("ff"*32)
 
-      Bitcoin::network = :testnet
-      @store = Bitcoin::Storage.send(configuration[:name], configuration)
+      @store = storage
       def @store.in_sync?; true; end
       @store.reset
-      @store.log.level = 4
 
       @store.store_block(P::Block.new(fixtures_file('testnet/block_0.bin')))
       @store.store_block(P::Block.new(fixtures_file('testnet/block_1.bin')))
@@ -48,7 +55,7 @@ include Bitcoin::Validation
     end
 
     it "should get backend name" do
-      @store.backend_name.should == configuration[:name].to_s
+      @store.backend_name.should == options[0].to_s
     end
 
     it "should get depth" do

data/spec/bitcoin/storage/validation_spec.rb

@@ -6,18 +6,27 @@ include Bitcoin::Builder
 include Bitcoin::Storage
 include Bitcoin::Validation
 
-[ { :name => :utxo, :db => 'sqlite:/', :index_all_addrs => true },
-  { :name => :sequel, :db => 'sqlite:/' } ].each do |configuration|
+Bitcoin.network = :spec
 
-  describe "block rules (#{configuration[:name].capitalize}Store)" do
+[
+ [:sequel, :sqlite],
+ [:utxo, :sqlite, index_all_addrs: true],
+ [:sequel, :postgres],
+ [:utxo, :postgres, index_all_addrs: true],
+ [:sequel, :mysql],
+ [:utxo, :mysql, index_all_addrs: true],
+].compact.each do |options|
+
+  next  unless storage = setup_db(*options)
+
+  describe "block rules (#{options[0]} - #{options[1]})" do
 
   def balance addr
     @store.get_balance(Bitcoin.hash160_from_address(addr))
   end
 
   before do
-    Bitcoin.network = :spec
-    @store = Bitcoin::Storage.send(configuration[:name], configuration)
+    @store = storage
     @store.reset
     @store.log.level = :warn
     Bitcoin.network[:proof_of_work_limit] = Bitcoin.encode_compact_bits("f"*64)
@@ -147,11 +156,11 @@ include Bitcoin::Validation
 
 end
 
-describe "transaction rules (#{configuration[:name].capitalize}Store)" do
+describe "transaction rules (#{options[0]} - #{options[1]})" do
 
   before do
     Bitcoin.network = :spec
-    @store = Bitcoin::Storage.send(configuration[:name], configuration)
+    @store = storage
     @store.reset
     @store.log.level = :warn
 
@@ -247,7 +256,7 @@ describe "transaction rules (#{configuration[:name].capitalize}Store)" do
   end
   
   it "15. Using the referenced output transactions to get input values, check that each input value, as well as the sum, are in legal money range" do
-    @store.db[@store.class.name =~ /Utxo/ ? :utxo : :txout].where(id: 2).update(value: 22e14)
+    @store.db[@store.class.name =~ /Utxo/ ? :utxo : :txout].order(:id).reverse.limit(1).update(value: 22e14)
     check_tx(@tx, [:input_values, [22e14, 21e14]])
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitcoin-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies: []
 description: This is a ruby library for interacting with the bitcoin protocol/network
 email:
@@ -93,6 +93,7 @@ files:
 - lib/bitcoin/storage/sequel/migrations/001_base_schema.rb
 - lib/bitcoin/storage/sequel/migrations/002_tx.rb
 - lib/bitcoin/storage/sequel/migrations/003_change_txin_script_sig_to_blob.rb
+- lib/bitcoin/storage/sequel/migrations/004_change_txin_prev_out_to_blob.rb
 - lib/bitcoin/storage/sequel/sequel_store.rb
 - lib/bitcoin/storage/storage.rb
 - lib/bitcoin/storage/utxo/migrations/001_base_schema.rb