txcatcher 0.1.99 → 0.1.100

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e158896889c01b48727dfd95eb5696a0944c6946de501b1ae0580fb0cfe4573a
-  data.tar.gz: 9c6e3b2906bbda3dfdd55fd26ecbd5e11a2cce85398ed58fc6e9092d31e6a84c
+  metadata.gz: 1086c9abb33b98018483d2188efe2318d2c5e326a73eec1bf91056c48dce84e2
+  data.tar.gz: 8f39e9d6aad3ed2717c36fa4e276b3aba59ee5b3248d8d1396007fd5606615ae
 SHA512:
-  metadata.gz: a79d5a88e5c01480febb6f663d66e7f3abf40ee39d616489b9101caaeed75d0165383143559bbad87444878d9f6ff67d7c84c1569e11349014a799b4a980143e
-  data.tar.gz: 99264405cdd1a7dde60fadb1d1b13cff00dc601cdf55c524538fbcccbabb8132dd819e0ce92642b8d710fcb5f7a671f7f0a82bf2ee33bda74512350d81ea02a5
+  metadata.gz: d282ba132fa8a3a08a4a4a11840e46a2609eea837595a4c47432697cdbb5d105fdba690acff8c5b2c442bb357cbf1618bed68916b02fecb6f37157f6e23f5ef9
+  data.tar.gz: 35fd9704e8f5ec349a3fe1e5f3c4acc8c900fdb0c3d99590ed5c9640a24acdd0672c5bf78bdedfd3d7f724ead52ab0b225f8f0c4df95fa03e403493ba0107515

data/VERSION

@@ -1 +1 @@
-0.1.99
+0.1.100

data/lib/txcatcher/models/transaction.rb

@@ -44,7 +44,7 @@ module TxCatcher
 
     # 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 update_block_height!(limit=100,dry_run=false)
+    def update_block_height!(limit=100,dont_save=false)
 
       # This calculates the approximate number of blocks to check.
       # So, for example, if transaction is less than 10 minutes old,
@@ -65,7 +65,7 @@ module TxCatcher
         LOGGER.report "--- checking block #{TxCatcher.current_block_height - i} for tx #{self.txid}"
         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 !dry_run
+          self.update(block_height: block["height"]) if !dont_save
           return block["height"].to_i
         end
       end

data/lib/txcatcher/server.rb

@@ -11,6 +11,7 @@ module TxCatcher
       rescue BitcoinRPC::JSONRPCError => e
         return [400, {}, { error: e.data }.to_json]
       rescue Exception => e
+        p e.backtrace
         return [500, {}, { error: e.to_s }.to_json]
       end
     end
@@ -66,25 +67,41 @@ module TxCatcher
       model = Address.where(address: addr).eager(deposits: :transactions).first
       return [200, {}, "{}"] unless model
 
-      txs_to_update = []
+      confirmed_txs_to_update       = []
+      unconfirmed_txs_to_update     = []
+      newly_confirmed_txs_to_update = []
+
       transactions = model.deposits.map { |d| d.transaction }
       utxos = transactions.map do |t|
         outs = t.tx_hash["vout"].select { |out| out["scriptPubKey"]["addresses"] == [addr] }
-        txs_to_update << t if outs.length > 0
         outs.map! do |out|
           out["confirmations"] = t.confirmations || 0
           out["txid"]          = t.txid
+          confirmed_txs_to_update   << t if out["confirmations"] > 0
+          unconfirmed_txs_to_update << t if out["confirmations"] == 0
           out
         end
         outs
       end.flatten
 
+      unconfirmed_txs_to_update = unconfirmed_txs_to_update.map do |t|
+        tx_block_height = t.update_block_height!(100,:dont_save)
+        if tx_block_height && tx_block_height > 0
+          newly_confirmed_txs_to_update << t
+          nil
+        else
+          t
+        end
+      end.compact
+
       # Update all txs after we map them. We don't use regular Transaction#update
       # in the #map loop above, because this will quickly get out of hand and result
       # in a gateway timeout, if there are a lot of transactions to be updated. Instead,
       # we collect all txs in an array and then update them in bulk here.
-      txs_to_update.map! { |t| [t.id, true, t.update_block_height!] }
-      TxCatcher.db_connection[:transactions].import([:id, :protected, :block_height], txs_to_update)
+      no_block_height_change_txs_ids = (confirmed_txs_to_update + unconfirmed_txs_to_update).map(&:id)
+      block_height_change_txs_ids = newly_confirmed_txs_to_update.map(&:id)
+      TxCatcher.db_connection[:transactions].where(id: no_block_height_change_txs_ids).update(protected: true)
+      TxCatcher.db_connection[:transactions].where(id: block_height_change_txs_ids).update(protected: true, block_height: TxCatcher.current_block_height)
 
       [200, {}, utxos.to_json]
     end

data/txcatcher.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: txcatcher 0.1.99 ruby lib
+# stub: txcatcher 0.1.100 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "txcatcher".freeze
-  s.version = "0.1.99"
+  s.version = "0.1.100"
 
   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.1.99
+  version: 0.1.100
 platform: ruby
 authors:
 - Roman Snitko