txcatcher 0.1.82 → 0.1.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7518a090998953f9b02635bee16b9ac739a1c4ac
-  data.tar.gz: c08a48ffa8b4e0e2cdf2c4453afb36de9fa7021b
+  metadata.gz: c2490c3456737004783bc9d04fb086c0c13cabe5
+  data.tar.gz: 813de1fef0f9d0c28e5dbdcf227bab4ead700c24
 SHA512:
-  metadata.gz: 5c1e95aad5c87d63714184a95a52beb87718f4272c86eb513ce827651e76b428d044358a729405047f6ffab4a44f4f4193feea922cb760bc11889018ea62d2ea
-  data.tar.gz: eb99b5cdffafc0509c322997d1bd259a5aaf79e32f31cc81a07b77920ea868fe3c0993d788b448f4b6d82c11fe4ef0b10e9f9167517c8826f7dab66bfa7546cf
+  metadata.gz: 2ed2e03aee0673dc2a44774d7d4bd49d71ec70f9f6c60fca564bcb91d5a956ae730802deb208c55e16bf74f9a45c39c507b93f0088e2411f034c946fdcf6ff32
+  data.tar.gz: c420a2f8c1276a6379448a79461b7c181884cb7512ce29c0d8f0ddabe90083ac9e409cb3998c92292c646640213230eba9e596f5b069c6f911009326d0c4a084

data/Gemfile

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 gem "goliath"
 gem "sequel"
 gem "ffi-rzmq"
-gem "satoshi-unit"
+gem "crypto-unit"
 gem "sentry-raven"
 
 group :development do

data/Gemfile.lock

@@ -5,6 +5,7 @@ GEM
     async-rack (0.5.1)
       rack (~> 1.1)
     builder (3.2.3)
+    crypto-unit (0.3.3)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
@@ -93,7 +94,6 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    satoshi-unit (0.2.2)
     semver2 (3.4.2)
     sentry-raven (2.6.3)
       faraday (>= 0.7.6, < 1.0)
@@ -106,11 +106,11 @@ PLATFORMS
 
 DEPENDENCIES
   bundler
+  crypto-unit
   ffi-rzmq
   goliath
   jeweler
   rspec
-  satoshi-unit
   sentry-raven
   sequel
   sqlite3

data/VERSION

@@ -1 +1 @@
-0.1.82
+0.1.83

data/lib/txcatcher/catcher.rb

@@ -40,7 +40,7 @@ module TxCatcher
                 @queue[channel].pop.call
               rescue Sequel::ValidationFailed => e
                 Logger.report e, :warn, timestamp: true
-              rescue StandardError => e
+              rescue Exception => e
                 Logger.report e, :error, timestamp: true
               end
             end
@@ -76,13 +76,12 @@ module TxCatcher
 
       def handle_rawtx(txhex)
         Logger.report "received tx hex: #{txhex[0..50]}..."
-
         @queue["rawtx"] << ( Proc.new {
           tx = TxCatcher::Transaction.new(hex: txhex)
           tx.save
           Logger.report "tx #{tx.txid} saved (id: #{tx.id}), deposits (outputs):"
           tx.deposits.each do |d|
-            Logger.report "  id: #{d.id}, addr: #{d.address.address}, amount: #{Satoshi.new(d.amount, from_unit: :satoshi).to_btc}"
+            Logger.report "  id: #{d.id}, addr: #{d.address.address}, amount: #{CryptoUnit.new(Config["currency"], d.amount, from_unit: :primary).to_standart}"
           end
         })
       end

data/lib/txcatcher/models/address.rb

@@ -4,7 +4,7 @@ module TxCatcher
     one_to_many :deposits
 
     def received_in_btc
-      Satoshi.new(self.received, from_unit: :satoshi).to_btc
+      CryptoUnit.new(Config["currency"], self.received, from_unit: :primary).to_standart
     end
 
   end

data/lib/txcatcher/models/deposit.rb

@@ -15,7 +15,7 @@ module TxCatcher
     end
 
     def amount_in_btc
-      Satoshi.new(self.amount, from_unit: :satoshi).to_btc
+      CryptoUnit.new(Config["currency"], self.amount, from_unit: :primary).to_standart
     end
 
   end

data/lib/txcatcher/models/transaction.rb

@@ -10,7 +10,7 @@ module TxCatcher
       parse_transaction
       assign_transaction_attrs
       @tx_hash["vout"].uniq { |out| out["n"] }.each do |out|
-        amount = Satoshi.new(out["value"], from_unit: :btc).to_i if out["value"]
+        amount = CryptoUnit.new(Config["currency"], out["value"], from_unit: :standart).to_i if out["value"]
         address = out["scriptPubKey"]["addresses"]&.first
         # Do not create a new deposit unless it actually makes sense to create one
         if address && amount && amount > 0

data/lib/txcatcher/utils/crypto_unit.rb

@@ -0,0 +1,15 @@
+module TxCatcher
+
+  class CryptoUnit
+  
+    def self.new(type, amount, *args)
+      if type == :ltc || type == :litecoin
+        return LitoshiUnit.new(amount, *args)
+      else
+        return SatoshiUnit.new(amount, *args)
+      end
+    end
+
+  end
+
+end

data/lib/txcatcher.rb

@@ -2,11 +2,12 @@ require 'rubygems'
 require 'yaml'
 require 'json'
 require 'thread'
-require 'satoshi-unit'
+require 'crypto-unit'
 require 'sequel'
 require 'sentry-raven'
 Sequel.extension :migration
 
+require_relative 'txcatcher/utils/crypto_unit'
 require_relative 'txcatcher/utils/hash_string_to_sym_keys'
 require_relative 'txcatcher/bitcoin_rpc'
 require_relative 'txcatcher/config'

data/spec/config/config.yml.sample

@@ -22,12 +22,11 @@ logger:
   stdout_level: info
   logfile_level: info
   sentry_level: info
-  sentry:
-    dsn: null
-    client_dsn: null
+  sentry_dsn: null
 
-# zeromq: bitcoind
+zeromq: bitcoind
 max_db_transactions_stored: 10
 db_clean_period_seconds: 300
 protected_transactions: true
 environment: development
+currency: bitcoin

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'yaml'
 require 'json'
-require 'satoshi-unit'
+require 'crypto-unit'
 require 'sequel'
 require 'sentry-raven'
 Sequel.extension :migration
@@ -11,6 +11,7 @@ File.delete(db_file) if File.exists?(db_file)
 
 require_relative '../lib/txcatcher/logger'
 require_relative '../lib/txcatcher/utils/hash_string_to_sym_keys'
+require_relative '../lib/txcatcher/utils/crypto_unit'
 require_relative '../lib/txcatcher/config'
 require_relative '../lib/txcatcher/initializer'
 require_relative '../lib/txcatcher/bitcoin_rpc'

data/templates/config.yml

@@ -32,3 +32,4 @@ db_clean_period_seconds: 300
 server_port: 9498
 daemonize: false
 environment: production
+currency: bitcoin

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.82 ruby lib
+# stub: txcatcher 0.1.83 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "txcatcher"
-  s.version = "0.1.82"
+  s.version = "0.1.83"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: txcatcher
 version: !ruby/object:Gem::Version
-  version: 0.1.82
+  version: 0.1.83
 platform: ruby
 authors:
 - Roman Snitko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-02 00:00:00.000000000 Z
+date: 2018-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: goliath
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: satoshi-unit
+  name: crypto-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -149,6 +149,7 @@ files:
 - lib/txcatcher/models/deposit.rb
 - lib/txcatcher/models/transaction.rb
 - lib/txcatcher/server.rb
+- lib/txcatcher/utils/crypto_unit.rb
 - lib/txcatcher/utils/hash_string_to_sym_keys.rb
 - spec/catcher_spec.rb
 - spec/cleaner_spec.rb