txcatcher 0.1.100 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1086c9abb33b98018483d2188efe2318d2c5e326a73eec1bf91056c48dce84e2
-  data.tar.gz: 8f39e9d6aad3ed2717c36fa4e276b3aba59ee5b3248d8d1396007fd5606615ae
+  metadata.gz: 9bf1548d64396f39c3f5dd29ce44c08db1cf0a8b7a561621964d93157afb2736
+  data.tar.gz: c84ec5f6b8c02b5edc5c37bc53550079ad80ff899778959d59b7162f8bedd62b
 SHA512:
-  metadata.gz: d282ba132fa8a3a08a4a4a11840e46a2609eea837595a4c47432697cdbb5d105fdba690acff8c5b2c442bb357cbf1618bed68916b02fecb6f37157f6e23f5ef9
-  data.tar.gz: 35fd9704e8f5ec349a3fe1e5f3c4acc8c900fdb0c3d99590ed5c9640a24acdd0672c5bf78bdedfd3d7f724ead52ab0b225f8f0c4df95fa03e403493ba0107515
+  metadata.gz: c753e7883e49dbd218424f43e3edde6431bbec2a9d3817991424933c38515f27c118bfd65ac7778a725ed08a0becb6e93a6ee7330ecf0b7fa607f9c397d4f25a
+  data.tar.gz: 4bba3d57d20cddad92b8221984df9d8913e46cbbbda3db744529e5e4f577a8327e99b390d5c8a94ed60b3691070562d71478f41666284d20e68d36d2e89985de

data/VERSION

@@ -1 +1 @@
-0.1.100
+0.2.0

data/lib/txcatcher/bitcoin_rpc.rb

@@ -27,6 +27,21 @@ class BitcoinRPC
     http.request(request).body
   end
 
+  def get_block_transactions(block_height)
+    TxCatcher::LOGGER.report "--- checking transactions in block #{block_height}"
+    block_hash = self.getblockhash(block_height)
+    TxCatcher.rpc_node.getblock(block_hash)
+  end
+
+  def get_blocks(limit=100)
+    blocks = []
+    limit.times do |i|
+      height = TxCatcher.current_block_height - i
+      blocks << get_block_transactions(height)
+    end
+    blocks
+  end
+
   class JSONRPCError < RuntimeError
     attr_accessor :data
     def initialize(data)

data/lib/txcatcher/models/transaction.rb

@@ -44,33 +44,35 @@ 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,dont_save=false)
-
-      # This calculates the approximate number of blocks to check.
-      # So, for example, if transaction is less than 10 minutes old,
-      # there's probably no reason to try and check more than 2-3 blocks back.
-      # However, to make absolute sure, we always bump up this number for 10 blocks.
-      # Over larger periods of time, the avg block per minute value should even out, so
-      # it's probably going to be fine either way.
-      created_minutes_ago = ((self.created_at - Time.now).to_i/60)
-      blocks_to_check = (created_minutes_ago / 10).abs + 10
+    def update_block_height!(dont_save: false, blocks: nil)
       return self.block_height if self.block_height
-      blocks_to_check = limit if blocks_to_check > limit
+      blocks = TxCatcher.rpc_node.get_blocks(blocks_to_check_for_inclusion_if_unconfirmed) unless blocks
 
-      i = 0
-      while i <= blocks_to_check
-        block_hash = TxCatcher.rpc_node.getblockhash(TxCatcher.current_block_height - i)
-        block      = TxCatcher.rpc_node.getblock(block_hash)
-        i += 1
-        LOGGER.report "--- checking block #{TxCatcher.current_block_height - i} for tx #{self.txid}"
+      for block in blocks 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
           return block["height"].to_i
+        else
+          return nil
         end
       end
     end
 
+    # This calculates the approximate number of blocks to check.
+    # So, for example, if transaction is less than 10 minutes old,
+    # there's probably no reason to try and check more than 2-3 blocks back.
+    # However, to make absolute sure, we always bump up this number by 10 blocks.
+    # Over larger periods of time, the avg block per minute value should even out, so
+    # it's probably going to be fine either way.
+    def blocks_to_check_for_inclusion_if_unconfirmed(limit=100)
+      return false if self.block_height
+      created_minutes_ago = ((self.created_at - Time.now).to_i/60)
+      blocks_to_check = (created_minutes_ago / 10).abs + 10
+      blocks_to_check = limit if blocks_to_check > limit
+      blocks_to_check
+    end
+
     private
 
       def parse_transaction

data/lib/txcatcher/server.rb

@@ -1,3 +1,4 @@
+require 'ruby-prof'
 module TxCatcher
 
   class Server < Goliath::API
@@ -9,9 +10,12 @@ module TxCatcher
       begin
         return route_for(uri)
       rescue BitcoinRPC::JSONRPCError => e
+        puts e.to_s
+        puts e.backtrace.join("\n")
         return [400, {}, { error: e.data }.to_json]
       rescue Exception => e
-        p e.backtrace
+        puts e.to_s
+        puts e.backtrace.join("\n")
         return [500, {}, { error: e.to_s }.to_json]
       end
     end
@@ -72,6 +76,7 @@ module TxCatcher
       newly_confirmed_txs_to_update = []
 
       transactions = model.deposits.map { |d| d.transaction }
+      transactions.sort!                { |t1,t2| t2.created_at <=> t1.created_at }
       utxos = transactions.map do |t|
         outs = t.tx_hash["vout"].select { |out| out["scriptPubKey"]["addresses"] == [addr] }
         outs.map! do |out|
@@ -84,8 +89,10 @@ module TxCatcher
         outs
       end.flatten
 
+      blocks = TxCatcher.rpc_node.get_blocks(unconfirmed_txs_to_update.first.blocks_to_check_for_inclusion_if_unconfirmed)
+
       unconfirmed_txs_to_update = unconfirmed_txs_to_update.map do |t|
-        tx_block_height = t.update_block_height!(100,:dont_save)
+        tx_block_height = t.update_block_height!(dont_save: true, blocks: blocks)
         if tx_block_height && tx_block_height > 0
           newly_confirmed_txs_to_update << t
           nil

data/spec/models/transaction_spec.rb

@@ -27,8 +27,8 @@ RSpec.describe TxCatcher::Transaction do
   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).and_return("blockhash123")
-    expect(TxCatcher.rpc_node).to receive(:getblock).and_return({ "height" => "123", "tx" => [@transaction.txid], "hash" => "blockhash123"})
+    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.update_block_height!
     expect(@transaction.block_height).to eq(123)
   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.100 ruby lib
+# stub: txcatcher 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "txcatcher".freeze
-  s.version = "0.1.100"
+  s.version = "0.2.0"
 
   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.100
+  version: 0.2.0
 platform: ruby
 authors:
 - Roman Snitko