txcatcher 0.2.8 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2e24688c0b712c8752c126180e4ccdc7508bb51d83273c0ee95975ee683c45b
-  data.tar.gz: 0fc259dc40b77ff6f3ad51d31a389b6ad6c290e50e00fdd29b45dc9c0aff8706
+  metadata.gz: 38bad27a4120b50cb51ce9071239676b1219f1177ab977090b1e57a192b8ac66
+  data.tar.gz: 187e7f7905bee995a8ac341d899d7d7cf00efbd05b5f32696f82f456dc8d024d
 SHA512:
-  metadata.gz: fa710896fdaa6ff9a504e73168eef31eec3a69ba4b583817c7dce9132f8c1924e1579437a47162a8c1a5643dc366d54ef08cc9b41e102d6e0f738d291c9c3855
-  data.tar.gz: 0cd0b9f730fc45229c7a9547d19a4299b2a103549c7687e0b144f9e042e2ccdbb9d82960de72de154eb95c55f494c2e44ae202c1939d64f3522eef7f176e41b5
+  metadata.gz: fe46bcb16a750f4a03aa77f0034fac4fc8e072ce7960b8ce3a4ad82ea361b2a5464908b7d2ca2e0a6b5a9bccf98447a018e968b90b6b6eced1c20d64ecf5ba12
+  data.tar.gz: 97cbcab71ce183f75675e074a474af8824a9757242d4a1e5e02e6135b54950ae9c3e1e6a5d5bc47272951faf7488d97ab3ff2d5d4bcec3e5e0d068737280e2cd

data/Gemfile.lock

@@ -93,4 +93,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.2.14

data/lib/txcatcher/catcher.rb

@@ -106,11 +106,14 @@ module TxCatcher
           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 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!
-        end
+        # Update RBF transactions and deposits if a transaction a with lower fee
+        # (no associated deposit) got accidentally confirmed.
+        @queue["hashblock"] << (Proc.new {
+          TxCatcher::Transaction.where(block_height: height).exclude(rbf_next_transaction_id: nil).each do |t|
+            t.force_deposit_association_on_rbf!
+          end
+        })
+
       end
 
   end # class Catcher

data/lib/txcatcher/cleaner.rb

@@ -51,7 +51,7 @@ module TxCatcher
 
       def clean_transactions(n)
         transactions = Transaction.order(Sequel.asc(:created_at))
-        transactions.where(Sequel.~(protected: true)) if Config.protected_transactions
+        transactions = transactions.where(Sequel.~(protected: true)) if Config.protected_transactions
 
         t = n/100
         t = 1 if t == 0

data/lib/txcatcher/initializer.rb

@@ -105,15 +105,15 @@ module TxCatcher
           "#{File.dirname(ConfigFile.path)}/#{db_config[:db_path]}"
         end
       else
-        db_config[:db_name]
+        db_config[:db_path] || db_config[:db_name]
       end
 
       TxCatcher.db_connection = Sequel.connect(
         "#{db_config[:adapter]}://"                                                   +
         "#{db_config[:user]}#{(":" if db_config[:user])}"                             +
         "#{db_config[:password]}#{("@" if db_config[:user] || db_config[:password])}" +
-        "#{db_config[:host]}#{(":" if db_config[:port])}"                             +
-        "#{db_config[:port]}#{("/" if db_config[:host] || db_config[:port])}"         +
+        "#{db_config[:host] || "localhost"}"                                          +
+        ":#{db_config[:port]}#{("/" if db_config[:host] || db_config[:port])}"        +
         "#{db_name}"
       )
     end

data/lib/txcatcher/logger.rb

@@ -30,7 +30,7 @@ module TxCatcher
 
     private
 
-      def report_to_stdout(message, log_level, data: nil, timestamp: timestamp, newline: "\n")
+      def report_to_stdout(message, log_level, data: nil, timestamp: false, 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]
@@ -55,7 +55,7 @@ module TxCatcher
         end
       end
 
-      def report_to_sentry(e, log_level, data: nil, timestamp: timestamp, newline: true)
+      def report_to_sentry(e, log_level, data: nil, timestamp: false, 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

@@ -180,7 +180,7 @@ module TxCatcher
     end
 
     # Sometimes, even though an RBF transaction with higher fee was broadcasted,
-    # miners accept one the lower-fee transactions instead. However, in txcatcher database, the
+    # miners accept the lower-fee transaction instead. However, in txcatcher database, the
     # deposits are already associated with the latest transaction. In this case,
     # we need to find the deposits in the DB set their transaction_id field to current transaction id.
     def force_deposit_association_on_rbf!
@@ -189,8 +189,11 @@ module TxCatcher
         tx = tx.rbf_next_transaction
       end
       tx.deposits.each do |d|
-        d.update(transaction_id: self.id)
-      end
+        d.rbf_transaction_ids.delete(self.id)
+        d.rbf_transaction_ids.push(d.transaction_id)
+        d.transaction_id = self.id
+        d.save
+      end if tx
     end
 
     def to_json
@@ -222,6 +225,7 @@ module TxCatcher
       def validate
         super
         validates_unique :txid
+        #errors.add(:base, "Duplicate transaction listed as RBF") if self.rbf_previous_transaction&.txid && self&.txid && self.rbf_previous_transaction&.txid == self&.txid
         errors.add(:base, "No outputs for this transaction") if !self.rbf? && self.deposits.empty?
       end
 

data/lib/txcatcher/server.rb

@@ -23,10 +23,10 @@ module TxCatcher
         utxo(path)
       elsif path.start_with? "/addr/"
         address(path)
-      elsif path.start_with? "/tx/"
-        tx(path)
       elsif path.start_with? "/tx/send"
         broadcast_tx(params["rawtx"])
+      elsif path.start_with? "/tx/"
+        tx(path)
       elsif path.start_with? "/feerate"
         feerate(params["blocks_target"] || 2)
       elsif path == "/" || path.empty?

data/spec/catcher_spec.rb

@@ -8,78 +8,118 @@ require_relative '../lib/txcatcher/catcher'
 
 RSpec.describe TxCatcher::Catcher do
 
-  before(:all) do
-    @tx_sock     = ZMQ::Context.create.socket(ZMQ::PUB)
-    @block_sock  = ZMQ::Context.create.socket(ZMQ::PUB)
+  # None of the unit tests here should require a running bitcoind
+  describe "(unit tests that require bitcoind to test)" do
 
-    @tx_sock.bind("ipc:///tmp/bitcoind_test.rawtx")
-    @block_sock.bind("ipc:///tmp/bitcoind_test.hashblock")
+    before(:all) do
+      @tx_sock     = ZMQ::Context.create.socket(ZMQ::PUB)
+      @block_sock  = ZMQ::Context.create.socket(ZMQ::PUB)
 
-    @hextx = File.read(File.dirname(__FILE__) + "/fixtures/transaction.txt").strip
-    @rawtx = unhexlify(File.read(File.dirname(__FILE__) + "/fixtures/transaction.txt"))
-    @catcher = TxCatcher::Catcher.new(name: "bitcoind_test")
-    sleep 1
-  end
+      @tx_sock.bind("ipc:///tmp/bitcoind_test.rawtx")
+      @block_sock.bind("ipc:///tmp/bitcoind_test.hashblock")
 
-  after(:all) do
-    @catcher.close_all_connections
-    @tx_sock.unbind("ipc:///tmp/bitcoind_test.rawtx")
-    @block_sock.unbind('ipc:///tmp/bitcoind_test.hashblock')
-  end
+      @hextx = File.read(File.dirname(__FILE__) + "/fixtures/transaction.txt").strip
+      @rawtx = unhexlify(File.read(File.dirname(__FILE__) + "/fixtures/transaction.txt"))
+      @catcher = TxCatcher::Catcher.new(name: "bitcoind_test")
+      sleep 1
+    end
 
-  after(:each) do
-    @catcher.sockets["rawtx"][:last_message] = nil
-    @catcher.sockets["hashblock"][:last_message] = nil
-  end
+    after(:all) do
+      @catcher.close_all_connections
+      @tx_sock.unbind("ipc:///tmp/bitcoind_test.rawtx")
+      @block_sock.unbind('ipc:///tmp/bitcoind_test.hashblock')
+    end
 
-  it "creates a new transaction in the DB" do
-    @tx_sock.send_strings(['rawtx', @rawtx])
-    i = 0
-    until (tx = TxCatcher::Transaction.last) || i > 3
-      sleep 1
-      i+=1
+    after(:each) do
+      @catcher.sockets["rawtx"][:last_message] = nil
+      @catcher.sockets["hashblock"][:last_message] = nil
     end
-    expect(tx.hex).to eq(@hextx)
-  end
 
-  it "updates transactions block height upon receiving a new block " do
-    transaction = TxCatcher::Transaction.create(hex: @hextx)
-    expect(TxCatcher.rpc_node).to receive(:getblock).at_least(:once).and_return({ "height" => TxCatcher.current_block_height + 1, "tx" => [transaction.txid]})
+    it "creates a new transaction in the DB" do
+      @tx_sock.send_strings(['rawtx', @rawtx])
+      i = 0
+      until (tx = TxCatcher::Transaction.last) || i > 3
+        sleep 1
+        i+=1
+      end
+      expect(tx.hex).to eq(@hextx)
+    end
 
-    @block_sock.send_strings(["hashblock", 'hello'])
+    it "updates transactions block height upon receiving a new block " do
+      transaction = TxCatcher::Transaction.create(hex: @hextx)
+      expect(TxCatcher.rpc_node).to receive(:getblock).at_least(:once).and_return({ "height" => TxCatcher.current_block_height + 1, "tx" => [transaction.txid]})
 
-    i = 0
-    begin
-      sleep 1 and i += 1
-    end until @catcher.sockets["hashblock"][:last_message] || i > 3
+      @block_sock.send_strings(["hashblock", 'hello'])
 
-    expect(transaction.reload.block_height).to eq(TxCatcher.current_block_height)
-  end
+      i = 0
+      begin
+        sleep 1 and i += 1
+      end until @catcher.sockets["hashblock"][:last_message] || i > 3
+
+      expect(transaction.reload.block_height).to eq(TxCatcher.current_block_height)
+    end
+
+    it "ignores validation errors" do
+      tx = eval File.read(File.dirname(__FILE__) + "/fixtures/transaction_decoded_no_outputs.txt")
+      expect(TxCatcher.rpc_node).to receive(:decoderawtransaction).at_least(:once).and_return(tx)
+      @tx_sock.send_strings(["rawtx", @rawtx])
 
-  it "ignores validation errors" do
-    tx = eval File.read(File.dirname(__FILE__) + "/fixtures/transaction_decoded_no_outputs.txt")
-    expect(TxCatcher.rpc_node).to receive(:decoderawtransaction).at_least(:once).and_return(tx)
-    @tx_sock.send_strings(["rawtx", @rawtx])
+      i = 0
+      begin
+        sleep 1 and i += 1
+      end until @catcher.sockets["rawtx"][:last_message] || i > 3
 
-    i = 0
-    begin
-      sleep 1 and i += 1
-    end until @catcher.sockets["rawtx"][:last_message] || i > 3
+      expect(File.exists?(ERRFILE)).to be_falsey
+    end
+
+    it "logs all other errors" do
+      sleep 1
+      expect(TxCatcher.rpc_node).to receive(:decoderawtransaction).at_least(:once).and_raise(StandardError)
+      @tx_sock.send_strings(["rawtx", @rawtx])
+
+      i = 0
+      begin
+        sleep 1 and i += 1
+      end until @catcher.sockets["rawtx"][:last_message] || i > 3
+      expect(File.read(ERRFILE)).not_to be_empty
+    end
 
-    expect(File.exists?(ERRFILE)).to be_falsey
   end
 
-  it "logs all other errors" do
+
+  it "updates deposits association with an RBF tx if a transaction with lower fee gets confirmed" do
+
+    class TxCatcher::Transaction
+      def assign_tx_hash(h)
+        @tx_hash = h
+      end
+    end
+
+    class CatcherStub < TxCatcher::Catcher
+      def listen_to_zeromq_channels(channel);end
+    end
+
+    hextx = File.read(File.dirname(__FILE__) + "/fixtures/transaction.txt").strip
+    tx1 = TxCatcher::Transaction.create(hex: hextx)
+    deposits = tx1.deposits
+    rbf_tx_hash = tx1.tx_hash
+    rbf_tx_hash["txid"] = "rbftxid1"
+    rbf_tx_hash["locktime"] = "1"
+    tx2 = TxCatcher::Transaction.new(hex: hextx)
+    tx2.assign_tx_hash(rbf_tx_hash)
+    tx2.save
+
+    catcher = CatcherStub.new(name: "bitcoind_test")
+    allow(TxCatcher.rpc_node).to receive(:getblock).and_return({ "tx" => [tx1.txid], "height" => 123 })
+    catcher.send(:handle_hashblock, "new block")
     sleep 1
-    expect(TxCatcher.rpc_node).to receive(:decoderawtransaction).at_least(:once).and_raise(StandardError)
-    @tx_sock.send_strings(["rawtx", @rawtx])
-
-    i = 0
-    begin
-      sleep 1 and i += 1
-    end until @catcher.sockets["rawtx"][:last_message] || i > 3
-    expect(File.read(ERRFILE)).not_to be_empty
-  end
 
+    deposits.each do |d|
+      expect(d.reload.transaction_id).to eq(tx1.id)
+    end
+
+    expect(tx1.reload.deposits.map(&:id)).to eq(deposits.map(&:id))
+    expect(tx2.reload.deposits.map(&:id)).to eq([])
+  end
 
 end

data/spec/models/transaction_spec.rb

@@ -82,11 +82,15 @@ RSpec.describe TxCatcher::Transaction do
     rbf_tx.assign_tx_hash(rbf_tx_hash)
     rbf_tx.save
 
+    expect(rbf_tx.reload.deposits.size).to eq(2)
+    expect(@transaction.reload.deposits.size).to eq(0)
+
     @transaction.reload.force_deposit_association_on_rbf!
     expect(rbf_tx.reload.deposits).to be_empty
     expect(@transaction.reload.deposits.map(&:id)).to eq(deposit_ids)
+
     @transaction.deposits.each do |d|
-      expect(d.rbf_transaction_ids).to eq([@transaction.id])
+      expect(d.rbf_transaction_ids).to eq([rbf_tx.id])
     end
 
   end
@@ -96,7 +100,7 @@ RSpec.describe TxCatcher::Transaction 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!
+      @transaction.update_block_height!
       expect(@transaction.block_height).to eq(123)
     end
 

data/txcatcher.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name = "txcatcher".freeze
-  s.version = "0.2.8"
+  s.version = "0.2.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Roman Snitko".freeze]
   s.date = "2018-10-02"
-  s.description = "Ccurrently, the only job of this gem is to collect all new Bitcoin/Litecoin transactions, store them in a DB, index addresses.".freeze
+  s.description = "Currently, the only job of this gem is to collect all new Bitcoin/Litecoin transactions, store them in a DB, index addresses.".freeze
   s.email = "roman.snitko@gmail.com".freeze
   s.executables = ["txcatcher".freeze, "txcatcher-monitor".freeze]
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: txcatcher
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.14
 platform: ruby
 authors:
 - Roman Snitko
@@ -136,7 +136,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Ccurrently, the only job of this gem is to collect all new Bitcoin/Litecoin
+description: Currently, the only job of this gem is to collect all new Bitcoin/Litecoin
   transactions, store them in a DB, index addresses.
 email: roman.snitko@gmail.com
 executables:
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: An lightweight version of Bitpay's Insight, allows to check Bitcoin/Litecoin