txcatcher 0.2.12 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64f9df050f56bb5c1000fb6387ea5061cdfca0ccdd7b436c410e8112697b5037
-  data.tar.gz: 8ed9f267daf2e026da62d06f434108a482f04396b56a0720edba408dcaac65a2
+  metadata.gz: 38bad27a4120b50cb51ce9071239676b1219f1177ab977090b1e57a192b8ac66
+  data.tar.gz: 187e7f7905bee995a8ac341d899d7d7cf00efbd05b5f32696f82f456dc8d024d
 SHA512:
-  metadata.gz: d48c5e18ffc7ae2820eafa8895f5105ce5d3ee85e00e3d2b89f87c19a4e6f373cd52e98a676feb4bafdca6c1472f789aa53403c46a729a95b9580cbc50de7389
-  data.tar.gz: 65ca8a80766944dc6bd3abbe02310944226ea063d76c5d14dc6c8dae6dadc30a782696d9c13b4c07fe392d7c628a52d47fc9080652b09bfb07c7b996805557c1
+  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.12
+0.2.14

data/lib/txcatcher/catcher.rb

@@ -105,8 +105,10 @@ 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.
+        })
+        # 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

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

@@ -193,7 +193,7 @@ module TxCatcher
         d.rbf_transaction_ids.push(d.transaction_id)
         d.transaction_id = self.id
         d.save
-      end
+      end if tx
     end
 
     def to_json
@@ -225,7 +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, "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/txcatcher.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name = "txcatcher".freeze
-  s.version = "0.2.12"
+  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.12
+  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.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: An lightweight version of Bitpay's Insight, allows to check Bitcoin/Litecoin