txcatcher 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 409a5a403f8319181f1cd59e48ea047c1dd21969521cdac7f5ca4720055ad2d3
-  data.tar.gz: e930dce76dcbd0d55900b4ac03c5d5038bd3fc3acddf382ca80326c0af428353
+  metadata.gz: 7d15212b3559d579704e262dc02ed9250a01e957c5b336a573f4a3499dd3bb00
+  data.tar.gz: f0f740d31b4e35e04d1fa65e664eb32fe73b1b1c3665f9e825bbb4640120096b
 SHA512:
-  metadata.gz: 230257b520d4cd70b32cda25abb86a25312d22ef853f3fb36f7497fb63ef3b02101ebab3b24be0a7046258b27704c7e436db234a4d9b167127eb14b038c0994c
-  data.tar.gz: dca18424e36eb7b166ad8331a0c0c5444edc713cef9dcf287b84b0a160eec7efa06d6177ae25f0743919b3c027db05b8713d38c55bf1cb9d554b05b010688efb
+  metadata.gz: 3fea87d4db4cf75cb92b9a86d96a52e430aa7fe219a2f636f1bab6cb9f3c344e11612bfb87bfcc3148e515769738cc92c37ec604be13e8c1c16299b0ffa845a2
+  data.tar.gz: 1257311dae7a0a84bce3057a69798a26e63b37e0aa4ee361e5aa44c13a6b1e3317c621710186d6089cca9bf30e67fb7b9488f2ec0b0f60b33a7a726500bcae2c

data/Gemfile

@@ -7,10 +7,11 @@ gem "crypto-unit"
 gem "sentry-raven"
 gem "aws-sdk-ses"
 gem "faraday"
+gem "rack"
+gem "async-rack", "0.5.1"
 
 group :development do
   gem "bundler"
-  gem "jeweler"
 end
 
 group :test do

data/Gemfile.lock

@@ -1,20 +1,24 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.4.0)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
     async-rack (0.5.1)
       rack (~> 1.1)
-    aws-partitions (1.68.0)
-    aws-sdk-core (3.17.0)
+    aws-eventstream (1.0.3)
+    aws-partitions (1.196.0)
+    aws-sdk-core (3.62.0)
+      aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1.0)
-      aws-sigv4 (~> 1.0)
+      aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ses (1.6.0)
-      aws-sdk-core (~> 3)
-      aws-sigv4 (~> 1.0)
-    aws-sigv4 (1.0.2)
+    aws-sdk-ses (1.25.0)
+      aws-sdk-core (~> 3, >= 3.61.1)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.1.0)
+      aws-eventstream (~> 1.0, >= 1.0.2)
     builder (3.2.3)
-    crypto-unit (0.3.3)
+    crypto-unit (0.3.4)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
@@ -24,21 +28,20 @@ GEM
     em-websocket (0.3.8)
       addressable (>= 2.1.1)
       eventmachine (>= 0.12.9)
-    eventmachine (1.2.5)
-    faraday (0.9.2)
+    eventmachine (1.2.7)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.21)
-    ffi-rzmq (2.0.5)
-      ffi-rzmq-core (>= 1.0.6)
-    ffi-rzmq-core (1.0.6)
+    ffi (1.11.1)
+    ffi-rzmq (2.0.7)
+      ffi-rzmq-core (>= 1.0.7)
+    ffi-rzmq-core (1.0.7)
       ffi
-    git (1.3.0)
-    github_api (0.16.0)
-      addressable (~> 2.4.0)
+    git (1.5.0)
+    github_api (0.18.2)
+      addressable (~> 2.4)
       descendants_tracker (~> 0.0.4)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 3.4)
-      mime-types (>= 1.16, < 3.0)
+      faraday (~> 0.8)
+      hashie (~> 3.5, >= 3.5.2)
       oauth2 (~> 1.0)
     goliath (1.0.6)
       async-rack
@@ -52,69 +55,69 @@ GEM
       rack (>= 1.2.2)
       rack-contrib
       rack-respond_to
-    hashie (3.5.7)
-    highline (1.7.10)
+    hashie (3.6.0)
+    highline (2.0.2)
     http_parser.rb (0.6.0)
-    jeweler (2.3.9)
+    jeweler (2.1.1)
       builder
-      bundler
+      bundler (>= 1.0)
       git (>= 1.2.5)
-      github_api (~> 0.16.0)
+      github_api
       highline (>= 1.6.15)
       nokogiri (>= 1.5.10)
-      psych
       rake
       rdoc
-      semver2
-    jmespath (1.3.1)
-    jwt (1.5.6)
+      semver
+    jmespath (1.4.0)
+    jwt (2.2.1)
     log4r (1.1.10)
-    mime-types (2.99.3)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     multi_json (1.13.1)
     multi_xml (0.6.0)
-    multipart-post (2.0.0)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
-    oauth2 (1.4.0)
-      faraday (>= 0.8, < 0.13)
-      jwt (~> 1.0)
+    multipart-post (2.1.1)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
+    oauth2 (1.4.1)
+      faraday (>= 0.8, < 0.16.0)
+      jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    psych (3.0.2)
-    rack (1.6.8)
+    pg (1.1.4)
+    public_suffix (3.1.1)
+    rack (1.6.11)
     rack-accept-media-types (0.9)
     rack-contrib (1.8.0)
       rack (~> 1.4)
     rack-respond_to (0.9.8)
       rack-accept-media-types (>= 0.6)
-    rake (12.3.0)
-    rdoc (6.0.1)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rake (12.3.3)
+    rdoc (6.1.1)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.2)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    semver2 (3.4.2)
-    sentry-raven (2.6.3)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.2)
+    semver (1.0.1)
+    sentry-raven (2.11.0)
       faraday (>= 0.7.6, < 1.0)
-    sequel (5.5.0)
-    sqlite3 (1.3.13)
+    sequel (5.23.0)
+    sqlite3 (1.4.1)
     thread_safe (0.3.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  async-rack (= 0.5.1)
   aws-sdk-ses
   bundler
   crypto-unit
@@ -122,10 +125,12 @@ DEPENDENCIES
   ffi-rzmq
   goliath
   jeweler
+  pg
+  rack
   rspec
   sentry-raven
   sequel
   sqlite3
 
 BUNDLED WITH
-   1.16.0
+   1.17.2

data/README.md

@@ -85,29 +85,26 @@ tracking both litecoin and bitcoin transactions:
     txcatcher -c ~/.txcatcher/litecoin_config.yml
     txcatcher -c ~/.txcatcher/bitcoin_config.yml
     
-Upstart script
+systemd & Upstart scripts
 -------------
-If running on Ubuntu, you may also want to create an upstart script, so here's an example (`/etc/init/txcatcher_btc.conf`):
+If running on Ubuntu, you may also want to create a systemd or an Upstart script, see templates:
 
-    start on started bitcoind
-    stop on shutdown
-    setuid deploy
-    respawn
-    respawn limit 10 90
+  * [systemd template for txcatcher](templates/systemd_script.service)
+  * [upstart template for txcatcher](templates/upstart_script)
 
-    env HOME="/home/deploy"
-    env RVM_WRAPPERS_PATH="/usr/local/rvm/gems/ruby-2.3.4/wrappers"
-    env TXCATCHER_CONFIG="/home/deploy/.txcatcher/config.yml"
-
-    exec ${RVM_WRAPPERS_PATH}/txcatcher -c ${TXCATCHER_CONFIG}
+Obviously, copy the file and place it into the appropriate dir:
+  * `/etc/services/txcatcher_btc_mainnet.service` for systemd
+  * `/etc/init.d/txcatcher_btc_mainnet` for upstart
   
  For this to work, you need a number of prerequisites:
  * create a `deploy` user, make sure rvm works with this user (rvm multi-user installation)
  * DO NOT daemonize the process in config.yml, set `daemonize: false` in `/home/deploy/.txcatcher/config.yml`
  * Generate rvm wrapper for txcatcher: https://rvm.io/deployment/init-d
- * Make sure your bitcoind or litecoind are also started with an upstart script: https://github.com/bitcoin/bitcoin/blob/0.13/contrib/init/bitcoind.conf
+ * Make sure that bitcoind (or litecoind) is running before starting txcatcher. This can be done
+   on system level so bitcoind always starts before txcatcher (see upstart or systemd documentation).
  
-You can then start and stop txcatcher with `start txcatcher_btc` and `stop txcatcher_btc`.
+You can then start and stop txcatcher with `sudo service txcatcher_btc start` and `sudo service txcatcher_btc stop`
+for systemd and `sudo start txcatcher_btc` and `sudo stop txcatcher_btc` for upstart.
 
 Running unit tests
 ------------------

data/Rakefile

@@ -11,18 +11,4 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
-  gem.name = "txcatcher"
-  gem.homepage = "http://github.com/snitko/txcatcher"
-  gem.license = "MIT"
-  gem.summary = %Q{An lightweight version of Bitpay's Insight, allows to check Bitcoin/Litecoin addresses}
-  gem.description = %Q{Ccurrently, the only job of this gem is to collect all new Bitcoin/Litecoin transactions, store them in a DB, index addresses.}
-  gem.email = "roman.snitko@gmail.com"
-  gem.authors = ["Roman Snitko"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
 Dir.glob('lib/tasks/*.rake').each { |r| load r }

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/txcatcher/catcher.rb

@@ -27,7 +27,7 @@ module TxCatcher
       def listen_to_zeromq_message(channel:, address:)
         @queue[channel] = Queue.new
 
-        # This thread is responsible for actions after the messages from ZeroMQ is parsed,
+        # This thread is responsible for actions after the message from ZeroMQ is parsed,
         # typically it's writing data to DB through the models. We start it
         # before we start listening to any messages from ZeroMQ.
         queue_thread = Thread.new do
@@ -62,12 +62,11 @@ module TxCatcher
           loop do
             topic   = []
             message = []
-            socket.recv_multipart(topic, message)
-            message
+            socket.recv_strings(message)
             if message[1]
-              message_hex                  = hexlify(message[1].copy_out_string).downcase
+              message_hex                  = hexlify(message[1]).downcase
               @sockets[key][:last_message] = message_hex
-              send("handle_#{channel}", message_hex)
+              send("handle_#{channel}", "#{message_hex}")
             end
           end
         end

data/lib/txcatcher/initializer.rb

@@ -123,7 +123,7 @@ module TxCatcher
       n = TxCatcher::Config.rpcnode
       print "Checking #{n["name"]} RPC connection... "
       TxCatcher.rpc_node = BitcoinRPC.new("http://#{n["user"]}:#{n["password"]}@#{n["host"]}:#{n["port"]}")
-      
+
       i = 0 # try to connect to RPC 100 times before exiting with error
       until TxCatcher.current_block_height
         begin

data/lib/txcatcher.rb

@@ -16,7 +16,7 @@ require_relative 'txcatcher/initializer'
 require_relative 'txcatcher/catcher'
 require_relative 'txcatcher/cleaner'
 
-include TxCatcher::Initializer
+extend TxCatcher::Initializer
 prepare
 
 require_relative 'txcatcher/models/transaction'

data/spec/catcher_spec.rb

@@ -11,17 +11,17 @@ RSpec.describe TxCatcher::Catcher do
   before(:all) do
     @tx_sock     = ZMQ::Context.create(1).socket(ZMQ::PUB)
     @block_sock  = ZMQ::Context.create(2).socket(ZMQ::PUB)
-    @tx_sock.bind("ipc:///tmp/bitcoind_test.rawtx")
-    @block_sock.bind("ipc:///tmp/bitcoind_test.hashblock")
+    @tx_sock.bind("ipc:///tmp/bitcoind.rawtx")
+    @block_sock.bind("ipc:///tmp/bitcoind.hashblock")
     @hextx = File.read(File.dirname(__FILE__) + "/fixtures/transaction.txt").strip
     @rawtx = unhexlify(File.read(File.dirname(__FILE__) + "/fixtures/transaction.txt"))
-    @catcher = TxCatcher::Catcher.new(name: "bitcoind_test")
+    @catcher = TxCatcher::Catcher.new(name: "bitcoind")
     sleep 1
   end
 
   after(:all) do
-    @tx_sock.unbind('ipc:///tmp/bitcoind_test.rawtx')
-    @block_sock.unbind('ipc:///tmp/bitcoind_test.hashblock')
+    @tx_sock.unbind('ipc:///tmp/bitcoind_testnet.rawtx')
+    @block_sock.unbind('ipc:///tmp/bitcoind_testnet.hashblock')
   end
 
   it "creates a new transaction in the DB" do

data/spec/spec_helper.rb

@@ -31,7 +31,7 @@ require_relative '../lib/txcatcher/models/deposit'
 
 def unhexlify(msg)
   msg.scan(/../).collect { |c| c.to_i(16).chr }.join
-end 
+end
 
 RSpec.configure do |config|
 

data/txcatcher.gemspec

@@ -6,7 +6,7 @@
 
 Gem::Specification.new do |s|
   s.name = "txcatcher".freeze
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   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.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Roman Snitko
@@ -207,8 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: An lightweight version of Bitpay's Insight, allows to check Bitcoin/Litecoin