txcatcher 0.1.91 → 0.1.92

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '018191cd3df5c7c6d7814adac0940b256e5d8425'
-  data.tar.gz: '0567816356fa64b8f78c5a78f9582940ad9d5e4b'
+  metadata.gz: d7db3d79b8553c6d6c0e10e7e5f948feaa99d533
+  data.tar.gz: f991f5dedf6392f3cc0905a87d9be417e8164998
 SHA512:
-  metadata.gz: 32a773c62f5e4ddebc35e45caf101e8e5c8341011016518cbcf9fb966f17af7baabab09aaf8b8e5d11144241e6b37a82f95148de6d271d32e0a42005700d55df
-  data.tar.gz: 2161853bbc4505aa14816239d43c3fa258b0e7ded1a05f317bc61e3fb74aab9d61a1fdcd2be6c4f84d0605210571eb3459ae56fb7b03b8be875f6024c51c9d0f
+  metadata.gz: 2d586ebaec43d73e0dcbb68606ddfc369aca3128f1a7efaebe17784dd87b10c86a80d34291a57a59ec430afe30d96876e9a4ac48e7b9fb31b96f2287a87cb393
+  data.tar.gz: 928fe120265c415886a46a832fd1e527fa4db0fdde5a04eaf64478020107f2e1375fa8c158e38ad7b78941bfe694a3ce60fb5348cf21e7dd685542105d0307b5

data/VERSION

@@ -1 +1 @@
-0.1.91
+0.1.92

data/bin/txcatcher-monitor

@@ -76,7 +76,7 @@ def send_alert(subject, text)
 
 end
 
-def latest_output_addr
+def latest_output_addr(i=0)
 
   response = Faraday.get do |req|
     req.url TxCatcher::Config["monitor"]["blockchain_source_url"]
@@ -86,8 +86,8 @@ def latest_output_addr
   txs = JSON.parse(response.body)
 
   txs.each do |tx|
-    if tx["outputs"] && tx["outputs"].first["addresses"]
-      tx["outputs"].first["addresses"].each do |addr|
+    if tx["outputs"] && tx["outputs"][i]["addresses"]
+      tx["outputs"][i]["addresses"].each do |addr|
         # Blockcypher returns old Litecoin P2SH addresses which start with 3, which
         # txcatcher doesn't support. Let's just ignore them.
         if addr[0] != "3" || !TxCatcher::Config["monitor"]["ignore_3_litecoin_addr"]
@@ -125,13 +125,21 @@ read_config_file
 
 response = nil
 attempts = 0
+addr     = nil
 while attempts < 3 && (response.nil? || response.empty?)
   attempts += 1
   begin
 
-    addr     = latest_output_addr
-    response = fetch_txcatcher_response(addr)
+    # if address is the same as in the previous attempt, let's try a different address.
+    addr_index = 0
+    begin
+      a = latest_output_addr(addr_index)
+      addr_index += 1
+    end until addr != a || addr_index > 5
+    addr = a
+
     url      = TxCatcher::Config["monitor"]["txcatcher_url"] + "/addr/#{addr}/utxo"
+    response = fetch_txcatcher_response(addr)
 
     if response.empty?
       LOGGER.report("Checked #{url}, got empty response, attempt #{attempts}", :error)
@@ -147,7 +155,7 @@ while attempts < 3 && (response.nil? || response.empty?)
     if attempts >= 3
       send_alert(
         "TxCatcher monitor error",
-        "While checking #{TxCatcher::Config["monitor"]["txcatcher_url"]} response, got the following error\n\n" +
+        "While checking #{url} response, got the following error\n\n" +
         "#{e.to_s}\n\n#{e.backtrace.join("\n")}"
       )
     else

data/db/schema.rb

@@ -1,16 +1,14 @@
 Sequel.migration do
   change do
-    create_table(:addresses, :ignore_index_errors=>true) do
-      primary_key :id
-      String :address, :size=>255
-      Integer :received, :default=>0
+    create_table(:addresses) do
+      String :address, :size=>255, :null=>false
       
-      index [:address]
+      primary_key [:address]
     end
     
     create_table(:deposits, :ignore_index_errors=>true) do
       primary_key :id
-      Integer :amount, :null=>false
+      Bignum :amount, :null=>false
       Integer :transaction_id
       Integer :address_id
       
@@ -22,14 +20,12 @@ Sequel.migration do
       Integer :version, :default=>0, :null=>false
     end
     
-    create_table(:transactions, :ignore_index_errors=>true) do
-      primary_key :id
-      String :txid, :size=>255
-      String :hex, :text=>true
-      Integer :amount
-      Integer :block_height
+    create_table(:transactions) do
+      String :txid, :size=>255, :null=>false
+      DateTime :created_at
+      TrueClass :protected, :default=>false
       
-      index [:txid]
+      primary_key [:txid]
     end
   end
 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.91 ruby lib
+# stub: txcatcher 0.1.92 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "txcatcher".freeze
-  s.version = "0.1.91"
+  s.version = "0.1.92"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: txcatcher
 version: !ruby/object:Gem::Version
-  version: 0.1.91
+  version: 0.1.92
 platform: ruby
 authors:
 - Roman Snitko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-09 00:00:00.000000000 Z
+date: 2018-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: goliath
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: An lightweight version of Bitpay's Insight, allows to check Bitcoin/Litecoin