txcatcher 0.1.93 → 0.1.94

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: a4736918a4d5ce4b459d1fe6b7c13599b761ae9a
4
- data.tar.gz: d2c55d4de1e480a521b94e196e893a5e80107bf8
2
+ SHA256:
3
+ metadata.gz: 700f2c2e13d542db56b5b6f42cf2128eb15e87c7590bb6a04794b3b1aefdee22
4
+ data.tar.gz: f56dc595d4c02404f62f9ca9e7c303937dd7e8b2115c4e4e1d851cd614d6aad5
5
5
  SHA512:
6
- metadata.gz: 844452261a87b9ebafc4e9b1989e0adcc0df7e199e0aa1dd6aed2bf6e12f736b455c36df6434066ec862f78f7a8f1f64ce1f62d9a80f1bead62f89cea70a4831
7
- data.tar.gz: b2fa81ebe3a22f05e7f721284eb1498585b652039aef84f9f3fdac06072acfdfcd03636508760abadcc93dc9fff3d441d0a93883cc099f6388eed18345fb6043
6
+ metadata.gz: fbc5a3c962542796dc4c13efe314cf536f4b9f5110e1fa853fdebc6d2c25157076ca6d4f050b424f408469e316cb133e594a93f738c6fd299b2d535a5228420c
7
+ data.tar.gz: 8c406af7ab9a2de02edb0411e1b3ee544f38ade6a3c8d2f750ce2aa1f19ca967851ec3db1a39baef1fda01dc691cc6e03c0b08248499c5c9f3be48f3f2a24cb5
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.1.93
1
+ 0.1.94
@@ -118,7 +118,7 @@ def latest_output_addr(i=0)
118
118
 
119
119
  end
120
120
 
121
- def fetch_txcatcher_response(addr, sleep_time: 3)
121
+ def fetch_txcatcher_response(addr, sleep_time:)
122
122
  response = {}
123
123
  3.times do
124
124
  sleep sleep_time # let's wait, perhaps txcatcher hasn't caught up
@@ -152,6 +152,11 @@ while attempts < 3 && (response.nil? || response.empty?)
152
152
  attempts += 1
153
153
  begin
154
154
 
155
+ <<<<<<< HEAD
156
+ addr = latest_output_addr
157
+ response = fetch_txcatcher_response(addr, sleep_time: TxCatcher::Config["monitor"]["retry_sleep_time"])
158
+ url = TxCatcher::Config["monitor"]["txcatcher_url"] + "/addr/#{addr}/utxo"
159
+ =======
155
160
  # if address is the same as in the previous attempt, let's try a different address.
156
161
  addr_index = 0
157
162
  begin
@@ -162,6 +167,7 @@ while attempts < 3 && (response.nil? || response.empty?)
162
167
  addr = a
163
168
 
164
169
  response = fetch_txcatcher_response(addr)
170
+ >>>>>>> 1f649915f3c64ee2275140881e856296f37985e1
165
171
 
166
172
  if response.empty?
167
173
  LOGGER.report("Checked #{url}, got empty response, attempt #{attempts}", :error)
data/txcatcher.gemspec CHANGED
@@ -2,11 +2,11 @@
2
2
  # DO NOT EDIT THIS FILE DIRECTLY
3
3
  # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
4
4
  # -*- encoding: utf-8 -*-
5
- # stub: txcatcher 0.1.93 ruby lib
5
+ # stub: txcatcher 0.1.94 ruby lib
6
6
 
7
7
  Gem::Specification.new do |s|
8
- s.name = "txcatcher".freeze
9
- s.version = "0.1.93"
8
+ s.name = "txcatcher"
9
+ s.version = "0.1.94"
10
10
 
11
11
  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
12
12
  s.require_paths = ["lib".freeze]
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: txcatcher
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.93
4
+ version: 0.1.94
5
5
  platform: ruby
6
6
  authors:
7
7
  - Roman Snitko
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-05-04 00:00:00.000000000 Z
11
+ date: 2018-07-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: goliath
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
208
208
  version: '0'
209
209
  requirements: []
210
210
  rubyforge_project:
211
- rubygems_version: 2.6.14
211
+ rubygems_version: 2.7.6
212
212
  signing_key:
213
213
  specification_version: 4
214
214
  summary: An lightweight version of Bitpay's Insight, allows to check Bitcoin/Litecoin