txcatcher 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e8a05764d26286691b2f3af9d1a11751024e56733be88316c85b8b7f6dc379d
-  data.tar.gz: ab2f81174dd468ed0b9e2e0af7bbf5a8cf2c4c6357d12e8d1e43d9dd7ffb964e
+  metadata.gz: bb9065445b439bf8fbb85b5d4d04af848908d7b7425c10d3035ab4dd1b58d63b
+  data.tar.gz: 7a3b3b10e2c1a94e7189354fae0ff0366a4fc17274edbac21d96ff321b59157d
 SHA512:
-  metadata.gz: fb55606e9b1df507effe4d9597e63d46c4ec28a03c422669b100f4dd121b9beb1a6ecbe59d3b7482d10ba83bbe5e4c9834aec0aedd722cbbc37d7434559a0d75
-  data.tar.gz: 5ac2408b1e027bd15d9103082494383400f298d82483647cc501becb723f128b3f46d0d02076ab24353911a0f844f9001d64204936bff9a24a1d694ebbb2f7ec
+  metadata.gz: 3e9d926e86745773f08798185220e2ad3d8551994f8e552fd61f60f223cb96ae9bff2838235893210c8f26161d4d42e6f2d911c66cf850db44db52a1604b968a
+  data.tar.gz: 655b824f663d94ef2346007bc6735a32065d14a1347ed56e85dcca8e9ed52611bb99add794c561a43865d89b4c5d719ceee094d4f332344825b61bbaa4fde25a

data/VERSION

@@ -1 +1 @@
-0.2.9
+0.2.10

data/lib/txcatcher/catcher.rb

@@ -105,12 +105,13 @@ module TxCatcher
           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 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.
-        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/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,7 +189,10 @@ module TxCatcher
         tx = tx.rbf_next_transaction
       end
       tx.deposits.each do |d|
-        d.update(transaction_id: self.id)
+        d.rbf_transaction_ids.delete(self.id)
+        d.rbf_transaction_ids.push(d.transaction_id)
+        d.transaction_id = self.id
+        d.save
       end
     end
 

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([2])
     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,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "txcatcher".freeze
-  s.version = "0.2.9"
+  s.version = "0.2.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: txcatcher
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Roman Snitko
@@ -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.0.8
 signing_key: 
 specification_version: 4
 summary: An lightweight version of Bitpay's Insight, allows to check Bitcoin/Litecoin