txcatcher 0.1.92 → 0.1.93

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7db3d79b8553c6d6c0e10e7e5f948feaa99d533
-  data.tar.gz: f991f5dedf6392f3cc0905a87d9be417e8164998
+  metadata.gz: a4736918a4d5ce4b459d1fe6b7c13599b761ae9a
+  data.tar.gz: d2c55d4de1e480a521b94e196e893a5e80107bf8
 SHA512:
-  metadata.gz: 2d586ebaec43d73e0dcbb68606ddfc369aca3128f1a7efaebe17784dd87b10c86a80d34291a57a59ec430afe30d96876e9a4ac48e7b9fb31b96f2287a87cb393
-  data.tar.gz: 928fe120265c415886a46a832fd1e527fa4db0fdde5a04eaf64478020107f2e1375fa8c158e38ad7b78941bfe694a3ce60fb5348cf21e7dd685542105d0307b5
+  metadata.gz: 844452261a87b9ebafc4e9b1989e0adcc0df7e199e0aa1dd6aed2bf6e12f736b455c36df6434066ec862f78f7a8f1f64ce1f62d9a80f1bead62f89cea70a4831
+  data.tar.gz: b2fa81ebe3a22f05e7f721284eb1498585b652039aef84f9f3fdac06072acfdfcd03636508760abadcc93dc9fff3d441d0a93883cc099f6388eed18345fb6043

data/VERSION

@@ -1 +1 @@
-0.1.92
+0.1.93

data/bin/txcatcher-monitor

@@ -78,15 +78,34 @@ end
 
 def latest_output_addr(i=0)
 
-  response = Faraday.get do |req|
-    req.url TxCatcher::Config["monitor"]["blockchain_source_url"]
-    req.options.timeout = 5
-    req.options.open_timeout = 5
+  txs      = nil
+  attempts = 0
+  until txs || attempts > 10
+    attempts += 1
+    begin
+      response = Faraday.get do |req|
+        req.url TxCatcher::Config["monitor"]["blockchain_source_url"]
+        req.options.timeout = 5
+        req.options.open_timeout = 5
+      end
+    rescue StandardError => e
+      LOGGER.report(e, :error, data: { attempt: attempts })
+      if attempts >= 10
+        send_alert(
+          "TxCatcher monitor error",
+          "Tried fetching new txs from #{TxCatcher::Config["monitor"]["blockchain_source_url"]}, got the following error\n\n" +
+          "#{e.to_s}\n\n#{e.backtrace.join("\n")}"
+        )
+        return nil
+      else
+        sleep 15
+      end
+    end
+    txs = JSON.parse(response.body) if response
   end
-  txs = JSON.parse(response.body)
 
   txs.each do |tx|
-    if tx["outputs"] && tx["outputs"][i]["addresses"]
+    if tx["outputs"] && tx["outputs"][i] && 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.
@@ -127,6 +146,9 @@ response = nil
 attempts = 0
 addr     = nil
 while attempts < 3 && (response.nil? || response.empty?)
+
+  url = TxCatcher::Config["monitor"]["txcatcher_url"] + "/addr/#{addr}/utxo"
+
   attempts += 1
   begin
 
@@ -134,11 +156,11 @@ while attempts < 3 && (response.nil? || response.empty?)
     addr_index = 0
     begin
       a = latest_output_addr(addr_index)
+      exit unless a # error already sent in latest_output_addr, so just exit.
       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?

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.92 ruby lib
+# stub: txcatcher 0.1.93 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "txcatcher".freeze
-  s.version = "0.1.92"
+  s.version = "0.1.93"
 
   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.92
+  version: 0.1.93
 platform: ruby
 authors:
 - Roman Snitko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-25 00:00:00.000000000 Z
+date: 2018-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: goliath