txcatcher 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f29602463f10ef91c91d32eef97b9a587f9005b7e63c1d4d5fb13585299f3c82
-  data.tar.gz: 0b698f2d3528a4ba5395828079904fdf67574d0bdea8660c7583092cf1f903e1
+  metadata.gz: a2e24688c0b712c8752c126180e4ccdc7508bb51d83273c0ee95975ee683c45b
+  data.tar.gz: 0fc259dc40b77ff6f3ad51d31a389b6ad6c290e50e00fdd29b45dc9c0aff8706
 SHA512:
-  metadata.gz: 2e1a21f9973c1cf4703228958522ffe1d4dd7e7a641aa3cdcbda0df8d825552833bfe7e3d926672d3de8565ab5b85d049fe61fcb70b5bf748e41124a9e1d74ec
-  data.tar.gz: 5b9613759bd60fc5a36c2b7a8d7647cc81400928224eaf099abaae66ea4f2b72489d267f1e01df22eee5d49efb7830a7b3609fc07a02b5c0d6c4c618d70b6bfd
+  metadata.gz: fa710896fdaa6ff9a504e73168eef31eec3a69ba4b583817c7dce9132f8c1924e1579437a47162a8c1a5643dc366d54ef08cc9b41e102d6e0f738d291c9c3855
+  data.tar.gz: 0cd0b9f730fc45229c7a9547d19a4299b2a103549c7687e0b144f9e042e2ccdbb9d82960de72de154eb95c55f494c2e44ae202c1939d64f3522eef7f176e41b5

data/Gemfile.lock

@@ -1,19 +1,19 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     async-rack (0.5.1)
       rack (~> 1.1)
     aws-eventstream (1.0.3)
-    aws-partitions (1.196.0)
-    aws-sdk-core (3.62.0)
+    aws-partitions (1.269.0)
+    aws-sdk-core (3.89.1)
       aws-eventstream (~> 1.0, >= 1.0.2)
-      aws-partitions (~> 1.0)
+      aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ses (1.25.0)
-      aws-sdk-core (~> 3, >= 3.61.1)
+    aws-sdk-ses (1.27.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.1.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
@@ -26,9 +26,9 @@ GEM
       addressable (>= 2.1.1)
       eventmachine (>= 0.12.9)
     eventmachine (1.2.7)
-    faraday (0.15.4)
+    faraday (1.0.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.11.1)
+    ffi (1.12.1)
     ffi-rzmq (2.0.7)
       ffi-rzmq-core (>= 1.0.7)
     ffi-rzmq-core (1.0.7)
@@ -48,32 +48,32 @@ GEM
     http_parser.rb (0.6.0)
     jmespath (1.4.0)
     log4r (1.1.10)
-    multi_json (1.13.1)
+    multi_json (1.14.1)
     multipart-post (2.1.1)
-    public_suffix (3.1.1)
-    rack (1.6.11)
+    public_suffix (4.0.3)
+    rack (1.6.12)
     rack-accept-media-types (0.9)
     rack-contrib (1.8.0)
       rack (~> 1.4)
     rack-respond_to (0.9.8)
       rack-accept-media-types (>= 0.6)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    sentry-raven (2.11.0)
-      faraday (>= 0.7.6, < 1.0)
-    sequel (5.23.0)
-    sqlite3 (1.4.1)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    sentry-raven (1.1.0)
+      faraday (>= 0.7.6)
+    sequel (5.28.0)
+    sqlite3 (1.4.2)
 
 PLATFORMS
   ruby

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.8

data/lib/txcatcher/bitcoin_rpc.rb

@@ -7,10 +7,29 @@ require 'json'
 
 class BitcoinRPC
 
+  class NoTxIndexErorr < StandardError;end
+
   def initialize(service_url)
     @uri = URI.parse(service_url)
   end
 
+  def txindex_enabled?
+    return @tx_index_enabled unless @tx_index_enabled.nil?
+    begin
+      txid = self.get_block_transactions(self.getblockcount-1000)["tx"].first
+      self.getrawtransaction(txid, 1)
+      TxCatcher::LOGGER.report "Pruning is off, -txindex enabled, can perform RPC requests to check block_height for transactions, that's much more reliable!"
+      return @tx_index_enabled = true
+    rescue BitcoinRPC::JSONRPCError => e
+      if e.message.include?("pruned data") || e.message.include?("-txindex")
+        TxCatcher::LOGGER.report "WARNING: Pruning is ON, will NOT be able to use RPC requests to check block_height for transactions!", :warn
+        return @tx_index_enabled = false
+      else
+        raise e
+      end
+    end
+  end
+
   def method_missing(name, *args)
     post_body = { 'method' => name, 'params' => args, 'id' => 'jsonrpc' }.to_json
     resp = JSON.parse( http_post_request(post_body) )

data/lib/txcatcher/catcher.rb

@@ -81,36 +81,32 @@ module TxCatcher
       end
 
       def handle_rawtx(txhex)
-        LOGGER.report "received tx hex: #{txhex[0..50]}..."
         @queue["rawtx"] << ( Proc.new {
           tx = TxCatcher::Transaction.new(hex: txhex)
+          tx.assign_transaction_attrs
           begin
-            LOGGER.report "tx #{tx.txid} caught (id: #{tx.id}), deposits (outputs):"
             tx.save
           rescue Sequel::ValidationFailed => e
-            if tx.errors[:txid].include?("is already taken")
-              LOGGER.report "  it's already in DB, no need to save it!"
-            else
+            if !tx.errors[:txid] || !tx.errors[:txid].include?("is already taken")
               raise e
             end
           end
-          tx.deposits.each do |d|
-            LOGGER.report "  id: #{d.id}, addr: #{d.address.address}, amount: #{CryptoUnit.new(Config["currency"], d.amount, from_unit: :primary).to_standart}"
-          end
         })
       end
 
       def handle_hashblock(block_hex)
-        block_hash   = TxCatcher.rpc_node.getblock(block_hex)
-        transactions = block_hash["tx"]
-        height       = TxCatcher.current_block_height = block_hash["height"].to_i
-        LOGGER.report "*** Block #{height} mined, transactions received:\n  #{transactions.join("  \n")}"
+        block_hash             = TxCatcher.rpc_node.getblock(block_hex)
+        block_transactions_ids = block_hash["tx"]
+        height                 = TxCatcher.current_block_height = block_hash["height"].to_i
+        LOGGER.report "*** Block #{height} mined, transactions received:\n  #{block_transactions_ids.join("\n\s\s")}"
         @queue["hashblock"] << ( Proc.new {
-          existing_transactions   = Transaction.where(txid: transactions).map(&:txid)
-          LOGGER.report "*** Block #{height} mined, transactions received:\n  #{transactions.join("  \n")}"
-          Transaction.where(txid: transactions).update(block_height: height)
+          existing_transactions       = Transaction.where(txid: block_transactions_ids)
+          existing_transactions_ids   = existing_transactions.map(&:txid)
+          undetected_transactions_ids = block_transactions_ids - existing_transactions_ids
+          undetected_transactions_ids.each { |txid| Transaction.create_from_rpc(txid) }
+          Transaction.where(txid: existing_transactions_ids).update(block_height: height)
         })
-        # Update RBF transactions and deposits if a transaction with lower fee (no associated deposit) got
+        # Update RBF transactions and deposits if a transaction a with lower fee (no associated deposit) got
         # accidentally confirmed.
         TxCatcher::Transaction.where(block_height: height).exclude(rbf_next_transaction_id: nil).each do |t|
           t.force_deposit_association_on_rbf!

data/lib/txcatcher/initializer.rb

@@ -123,6 +123,7 @@ module TxCatcher
       n = TxCatcher::Config.rpcnode
       print "Checking #{n["name"]} RPC connection... "
       TxCatcher.rpc_node = BitcoinRPC.new("http://#{n["user"]}:#{n["password"]}@#{n["host"]}:#{n["port"]}")
+      TxCatcher.rpc_node.txindex_enabled?
 
       i = 0 # try to connect to RPC 100 times before exiting with error
       until TxCatcher.current_block_height

data/lib/txcatcher/logger.rb

@@ -20,34 +20,42 @@ module TxCatcher
     end
 
 
-    def report(message, log_level=:info, data: nil, timestamp: false)
+    def report(message, log_level=:info, data: nil, timestamp: false, newline: "\n")
       @reporters.each do |out|
         if LOG_LEVELS[log_level] >= LOG_LEVELS[Config["logger"]["#{out}_level"].to_sym]
-          send("report_to_#{out}", message, log_level, data: data, timestamp: timestamp)
+          send("report_to_#{out}", message, log_level, data: data, timestamp: timestamp, newline: newline)
         end
       end
     end
 
     private
 
-      def report_to_stdout(message, log_level, data: nil, timestamp: timestamp)
-        $stdout.print prepare_message(message, timestamp: timestamp) + "\n"
-        $stdout.print "  additional data: #{data.to_s}\n" if data
-        $stdout.print(@error_log_delimiter) if LOG_LEVELS[log_level] >= LOG_LEVELS[:error]
+      def report_to_stdout(message, log_level, data: nil, timestamp: timestamp, newline: "\n")
+        $stdout.print prepare_message(message, timestamp: timestamp)
+        $stdout.print "\n  additional data: #{data.to_s}" if data
+        if LOG_LEVELS[log_level] >= LOG_LEVELS[:error]
+          $stdout.print(@error_log_delimiter)
+        elsif newline
+          $stdout.print newline
+        end
       end
 
-      def report_to_logfile(message, log_level, data: nil, timestamp: true) # always gonna be forcing timestamp to be true here
+      def report_to_logfile(message, log_level, data: nil, timestamp: true, newline: true) # always gonna be forcing timestamp to be true here
         fn = LOG_LEVELS[log_level] >= LOG_LEVELS[:error] ? @error_log_file_name : @log_file_name
         fn = TxCatcher::Config.config_dir + "/#{fn}"
 
         File.open(fn, "a") do |f|
-          f.print "#{prepare_message(message, timestamp: true)}\n"
-          f.print "  additional data: #{data.to_s}\n" if data
-          f.print(@error_log_delimiter) if LOG_LEVELS[log_level] >= LOG_LEVELS[:error]
+          f.print "#{prepare_message(message, timestamp: true)}"
+          f.print "\n  additional data: #{data.to_s}\n" if data
+          if LOG_LEVELS[log_level] >= LOG_LEVELS[:error]
+            f.print(@error_log_delimiter)
+          elsif newline
+            f.print newline
+          end
         end
       end
 
-      def report_to_sentry(e, log_level, data: nil, timestamp: timestamp)
+      def report_to_sentry(e, log_level, data: nil, timestamp: timestamp, newline: true)
         return unless TxCatcher::Config["logger"]["sentry_dsn"]
         data ||= {}
         data.merge!(environment: Config["environment"], host: Config["host"], currency: Config["currency"])

data/lib/txcatcher/models/transaction.rb

@@ -5,23 +5,36 @@ module TxCatcher
     plugin :validation_helpers
     one_to_many :deposits
 
-    def self.find_or_catch(txid)
+    attr_accessor :manual_rpc_request
+
+    def self.find_or_create_from_rpc(txid)
       if tx = self.where(txid: txid).first
+        tx.update_block_height!
         tx
       else
-        self.catch(txid)
+        self.create_from_rpc(txid)
       end
     end
 
-    def self.catch(txid)
-      if txhex = TxCatcher.rpc_node.getrawtransaction(txid)
-        LOGGER.report "received tx hex: #{txhex[0..50]}... (fetched via manual RPC request)"
-        tx = self.new(hex: txhex)
+    def self.create_from_rpc(txid)
+      raise BitcoinRPC::NoTxIndexErorr, "Cannot create transaction from RPC request, (txid: #{txid}) please use -txindex and don't use pruning" unless TxCatcher.rpc_node.txindex_enabled?
+      if tx_from_rpc = TxCatcher.rpc_node.getrawtransaction(txid, 1)
+        tx = self.new(hex: tx_from_rpc["hex"], txid: txid)
+        tx.manual_rpc_request = true
+        tx.update_block_height(confirmations: tx_from_rpc["confirmations"])
         tx.save
         tx
       end
     end
 
+    def log_the_catch!
+      manual_rpc_request_caption = (self.manual_rpc_request ? " (fetched via a manual RPC request) " : " ")
+      LOGGER.report "tx #{self.txid} caught#{manual_rpc_request_caption}and saved to DB (id: #{self.id}), deposits (outputs):"
+      self.deposits.each do |d|
+        LOGGER.report "  id: #{d.id}, addr: #{d.address.address}, amount: #{CryptoUnit.new(Config["currency"], d.amount, from_unit: :primary).to_standart}"
+      end
+    end
+
     # Updates only those transactions that have changed
     def self.update_all(transactions)
       transactions_to_update = transactions.select { |t| !t.column_changes.empty? }
@@ -57,13 +70,15 @@ module TxCatcher
           d.rbf_transaction_ids = d.rbf_transaction_ids.uniq
         end
         d.save
-        self.rbf_previous_transaction&.update(rbf_next_transaction_id: self.id)
       end
+      self.rbf_previous_transaction&.update(rbf_next_transaction_id: self.id)
+      self.log_the_catch!
     end
 
     def tx_hash
-      @tx_hash ||= parse_transaction
+      @tx_hash ||= TxCatcher.rpc_node.decoderawtransaction(self.hex)
     end
+    alias :parse_transaction :tx_hash
 
     def confirmations
       if self.block_height
@@ -73,19 +88,48 @@ module TxCatcher
       end
     end
 
-    # Queries rpc node to check whether the transaction has been included in any of the blocks,
-    # but only if current block_height is nil.
-    def check_block_height!(dont_save: false, blocks: nil)
-      return self.block_height if self.block_height
-      blocks = TxCatcher.rpc_node.get_blocks(blocks_to_check_for_inclusion_if_unconfirmed) unless blocks
+    def update_block_height(confirmations: nil)
+      return false if self.block_height
+      if TxCatcher.rpc_node.txindex_enabled? || !confirmations.nil?
+        update_block_height_from_rpc(confirmations: confirmations)
+      else
+        self.update_block_height_from_latest_blocks
+      end
+
+    end
 
+    def update_block_height!(confirmations: nil)
+      return false if self.block_height
+      self.update_block_height(confirmations: confirmations)
+      self.save if self.column_changed?(:block_height)
+    end
+
+    # Checks the last n blocks to see if current transaction has been included in any of them,
+    # This is for cases when -txindex is not enabled and you can't make an RPC query for a particular
+    # txid, which would be more reliable.
+    def update_block_height_from_latest_blocks
+      blocks = TxCatcher.rpc_node.get_blocks(blocks_to_check_for_inclusion_if_unconfirmed) unless blocks
       for block in blocks.values do
         if block["tx"] && block["tx"].include?(self.txid)
           LOGGER.report "tx #{self.txid} block height updated to #{block["height"]}"
-          self.update(block_height: block["height"]) if !dont_save
+          self.block_height = block["height"].to_i
           return block["height"].to_i
+        end
+      end
+    end
+
+    # Directly queries the RPC, fetches transaction confirmations number and calculates
+    # the block_height. Of confirmations number is provided, doesn't do the RPC request
+    # (used in Transaction.create_from_rpc).
+    def update_block_height_from_rpc(confirmations: nil)
+      begin
+        confirmations ||= TxCatcher.rpc_node.getrawtransaction(self.txid, 1)["confirmations"]
+        self.block_height = confirmations && confirmations > 0 ? TxCatcher.current_block_height - confirmations + 1 : nil
+      rescue BitcoinRPC::JSONRPCError => e 
+        if e.message.include?("No such mempool or blockchain transaction") && self.rbf?
+          LOGGER.report "tx #{self.txid} is an RBF transcation with a lower fee, bitcoin RPC says it's not in the mempool anymore. No need to check for confirmations", :warn
         else
-          return nil
+          raise e
         end
       end
     end
@@ -128,7 +172,7 @@ module TxCatcher
     end
 
     def input_hexes
-      @input_hexes ||= self.tx_hash["vin"].map { |input| input["scriptSig"]["hex"] }.compact.sort
+      @input_hexes ||= self.tx_hash["vin"].select { |input| !input["scriptSig"].nil? }.map { |input| input["scriptSig"]["hex"] }.compact.sort
     end
 
     def output_addresses
@@ -150,34 +194,30 @@ module TxCatcher
     end
 
     def to_json
-      #self.tx_hash.to_json
       self.tx_hash.merge(confirmations: self.confirmations, block_height: self.block_height).to_json
     end
 
-    private
-
-      def parse_transaction
-        TxCatcher.rpc_node.decoderawtransaction(self.hex)
-      end
+    def assign_transaction_attrs
+      self.txid         = self.tx_hash["txid"]         unless self.txid
+      self.block_height = self.tx_hash["block_height"] unless self.block_height
+      # In order to be able to identify RBF - those are normally transactions with
+      # identical inputs and outputs - we hash inputs and outputs that hash serves
+      # as an identifier that we store in our DB and thus can search all
+      # previous transactions which the current transaction might be an RBF transaction to.
+      #
+      # A few comments:
+      #
+      # 1. Although an RBF transaction may techinically have different outputs as per
+      #    protocol specification, it is true in most cases that outputs will also be
+      #    the same (that's how most wallets implement RBF). Thus,
+      #    we're also incorporating outputs into the hashed value.
+      #
+      # 2. For inputs, we're using input hexes, because pruned bitcoin-core
+      #    doesn't provide addresses.
+      self.inputs_outputs_hash ||= Digest::SHA256.hexdigest((self.input_hexes + self.output_addresses).join(""))
+    end
 
-      def assign_transaction_attrs
-        self.txid = self.tx_hash["txid"] unless self.txid
-        # In order to be able to identify RBF - those are normally transactions with
-        # identical inputs and outputs - we hash inputs and outputs that hash serves
-        # as an identifier that we store in our DB and thus can search all
-        # previous transactions which the current transaction might be an RBF transaction to.
-        #
-        # A few comments:
-        #
-        # 1. Although an RBF transaction may techinically have different outputs as per
-        #    protocol specification, it is true in most cases that outputs will also be
-        #    the same (that's how most wallets implement RBF). Thus,
-        #    we're also incorporating outputs into the hashed value.
-        #
-        # 2. For inputs, we're using input hexes, because pruned bitcoin-core
-        #    doesn't provide addresses.
-        self.inputs_outputs_hash ||= Digest::SHA256.hexdigest((self.input_hexes + self.output_addresses).join(""))
-      end
+    private
 
       def validate
         super

data/lib/txcatcher/server.rb

@@ -50,7 +50,7 @@ module TxCatcher
         deposits = deposits.map do |d|
           t = d.transaction
           t.update(protected: true) unless t.protected
-          t.check_block_height!(dont_save: true)
+          t.update_block_height
           result = {
             txid:          t.txid,
             amount:        d.amount_in_btc,
@@ -73,8 +73,8 @@ module TxCatcher
       addr = path.last
 
       address  = Address.find_or_create(address: addr)
-      return [200, {}, "{}"] unless address.deposits.empty?
       deposits = Deposit.where(address_id: address.id).limit(params["limit"] || 100).eager(:transaction)
+      return [200, {}, "{}"] if address.deposits.empty?
 
       transactions = deposits.map { |d| d.transaction }
       transactions.sort!          { |t1,t2| t2.created_at <=> t1.created_at }
@@ -82,7 +82,7 @@ module TxCatcher
       transactions.each do |t|
         # If we see a transaction with 0 confirmations, let's check if it got any news confirmations
         # by querying Bitcoind RPC.
-        t.check_block_height!(dont_save: true) if t.confirmations == 0
+        t.update_block_height_from_rpc if t.confirmations == 0
         # If still not confirmed, let's make it protected so it's not deleted during cleanup.
         t.protected = true if t.confirmations == 0
       end
@@ -109,10 +109,10 @@ module TxCatcher
     def tx(path)
       path = path.sub(/\?.*/, '').split("/").delete_if { |i| i.empty? }
       txid = path.last
-      tx = Transaction.find_or_catch(txid)
-      tx = Transaction.where(txid: txid).first
+      tx = Transaction.find_or_create_from_rpc(txid)
 
-      if tx && !tx.deposits.empty?
+      if tx && (!tx.deposits.empty? || tx.rbf?)
+        tx.update_block_height! if tx.block_height.nil?
         return [200, {}, tx.to_json]
       else
         return [404, {}, "Transaction not found"]

data/spec/models/transaction_spec.rb

@@ -32,13 +32,6 @@ RSpec.describe TxCatcher::Transaction do
     expect(TxCatcher::Transaction.where(txid: transaction.txid).count).to eq(1)
   end
 
-  it "updates block height by making manual requests to RPC and searching if tx is included in one of the previous blocks" do
-    expect(TxCatcher.rpc_node).to receive(:getblockhash).exactly(10).times.and_return("blockhash123")
-    expect(TxCatcher.rpc_node).to receive(:getblock).exactly(10).times.and_return({ "height" => "123", "tx" => [@transaction.txid], "hash" => "blockhash123"})
-    @transaction.check_block_height!
-    expect(@transaction.block_height).to eq(123)
-  end
-
   it "updates multiple records at once" do
     transaction1 = TxCatcher::Transaction.create(hex: @hextx, txid: "123")
     transaction2 = TxCatcher::Transaction.create(hex: @hextx, txid: "1234")
@@ -98,4 +91,15 @@ RSpec.describe TxCatcher::Transaction do
 
   end
 
+  describe "updating block height" do
+
+    it "updates block height by searching if tx is included in one of the previous blocks" do
+      expect(TxCatcher.rpc_node).to receive(:getblockhash).exactly(10).times.and_return("blockhash123")
+      expect(TxCatcher.rpc_node).to receive(:getblock).exactly(10).times.and_return({ "height" => "123", "tx" => [@transaction.txid], "hash" => "blockhash123"})
+      @transaction.check_block_height!
+      expect(@transaction.block_height).to eq(123)
+    end
+
+  end
+
 end

data/txcatcher.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "txcatcher".freeze
-  s.version = "0.2.6"
+  s.version = "0.2.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -29,7 +29,6 @@ Gem::Specification.new do |s|
     "db/migrations/003_create_deposits.rb",
     "db/migrations/004_add_timestamps_to_transactions.rb",
     "db/migrations/005_add_protected_flag_to_transactions.rb",
-    "db/schema.rb",
     "lib/tasks/db.rake",
     "lib/txcatcher.rb",
     "lib/txcatcher/bitcoin_rpc.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: txcatcher
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors:
 - Roman Snitko
@@ -162,7 +162,6 @@ files:
 - db/migrations/003_create_deposits.rb
 - db/migrations/004_add_timestamps_to_transactions.rb
 - db/migrations/005_add_protected_flag_to_transactions.rb
-- db/schema.rb
 - lib/tasks/db.rake
 - lib/txcatcher.rb
 - lib/txcatcher/bitcoin_rpc.rb

data/db/schema.rb

@@ -1,31 +0,0 @@
-Sequel.migration do
-  change do
-    create_table(:addresses) do
-      String :address, :size=>255, :null=>false
-      
-      primary_key [:address]
-    end
-    
-    create_table(:deposits, :ignore_index_errors=>true) do
-      primary_key :id
-      Bignum :amount, :null=>false
-      Integer :transaction_id
-      Integer :address_id
-      
-      index [:address_id]
-      index [:transaction_id]
-    end
-    
-    create_table(:schema_info) do
-      Integer :version, :default=>0, :null=>false
-    end
-    
-    create_table(:transactions) do
-      String :txid, :size=>255, :null=>false
-      DateTime :created_at
-      TrueClass :protected, :default=>false
-      
-      primary_key [:txid]
-    end
-  end
-end