peatio-thought 2.4.0 → 2.6.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1add76b96637690473fdf4854d17c6b2d32f2c6f6687f9388969ba52d10c68b4
-  data.tar.gz: 7879b55634d80b26f28dbed9d0a5afd44e1f73b939b423da2f53b1f2288d9c24
+  metadata.gz: 3863bcba08ebff661b9bcd89a85b17dc3af9ed90ea3dafe80ae8fa57edf97e4f
+  data.tar.gz: 0a7f7d64cdd64c8aae0b9dc296685305335b12f763f04af5c6fa248cdc3c7ec7
 SHA512:
-  metadata.gz: 9c1ae5f26117fe38958458570c23e11fb2ea75b8268f22f7dd4da2af90f5ebbf389e34a8b8fcffd5a96e4690f34cf5ab2248539f04bfbd2d71e3de6aa2835685
-  data.tar.gz: f6f01b1940b719f450bfd634cf4dbcc87f777872c38c006f23b599cf371f3f4480b3ca450560d2d1c50706eca23da1803edbc77d662235956d0a9e8c5be5ecf3
+  metadata.gz: b1a1f9a61d6ef4e994a9ee80d571382e8988f3777f527d7132e2ba4152a1a4a47ab80d935cf120b5e107e99d1ea9ce938c9b6c3e3fc6e103c6fb243f0ca2f9d5
+  data.tar.gz: 589c25150d4d1673855f196570a6f3cb761fa4aade4d30bcb57a7873e91f1e1ec975edc34349d563b34abf64930501616229f9a1735f215a70fa99f2ced5d5cb

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    peatio-thought (2.4.0)
+    peatio-thought (2.6.7.1)
       activesupport (~> 5.2.3)
       better-faraday (~> 1.0.5)
-      faraday (~> 0.15.4)
+      faraday (~> 0.17)
       memoist (~> 0.16.0)
       net-http-persistent (~> 3.0.1)
       peatio (>= 0.6.3)
@@ -12,134 +12,179 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activesupport (5.2.3)
+    activemodel (5.2.4.4)
+      activesupport (= 5.2.4.4)
+    activesupport (5.2.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    amq-protocol (2.3.0)
+    amq-protocol (2.3.2)
     amqp (1.8.0)
       amq-protocol (>= 2.2.0)
       eventmachine
-    ast (2.4.0)
+    ast (2.4.1)
     better-faraday (1.0.8)
       activesupport (>= 4.0, < 6.0)
       faraday (~> 0.12)
-    bunny (2.14.3)
-      amq-protocol (~> 2.3, >= 2.3.0)
-    byebug (11.0.1)
-    clamp (1.3.1)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.5)
-    connection_pool (2.2.2)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.3)
+    bunny (2.17.0)
+      amq-protocol (~> 2.3, >= 2.3.1)
+    byebug (11.1.3)
+    clamp (1.3.2)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.7)
+    connection_pool (2.2.3)
+    cookiejar (0.3.3)
+    crack (0.4.4)
+    daemons (1.3.1)
+    diff-lcs (1.4.4)
     docile (1.3.2)
-    em-websocket (0.5.1)
+    em-http-request (1.1.7)
+      addressable (>= 2.3.4)
+      cookiejar (!= 0.3.1)
+      em-socksify (>= 0.3)
+      eventmachine (>= 1.0.3)
+      http_parser.rb (>= 0.6.0)
+    em-socksify (0.3.2)
+      eventmachine (>= 1.0.0.beta.4)
+    em-synchrony (1.0.6)
+      eventmachine (>= 1.0.0.beta.1)
+    em-websocket (0.5.2)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
-    faraday (0.15.4)
+    faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
-    hashdiff (1.0.0)
+    faraday_middleware (0.13.1)
+      faraday (>= 0.7.4, < 1.0)
+    faye (1.4.0)
+      cookiejar (>= 0.3.0)
+      em-http-request (>= 1.1.6)
+      eventmachine (>= 0.12.0)
+      faye-websocket (>= 0.11.0)
+      multi_json (>= 1.0.0)
+      rack (>= 1.0.0)
+      websocket-driver (>= 0.5.1)
+    faye-websocket (0.11.0)
+      eventmachine (>= 0.12.0)
+      websocket-driver (>= 0.5.1)
+    hashdiff (1.0.1)
     http_parser.rb (0.6.0)
-    i18n (1.7.0)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    irb (1.0.0)
+    io-console (0.5.6)
+    irb (1.2.7)
+      reline (>= 0.1.5)
     jaro_winkler (1.5.4)
-    json (2.2.0)
-    jwt (2.2.1)
-    memoist (0.16.1)
-    metaclass (0.0.4)
-    method_source (0.9.2)
-    minitest (5.13.0)
-    mocha (1.9.0)
-      metaclass (~> 0.0.1)
+    jwt (2.2.2)
+    memoist (0.16.2)
+    method_source (1.0.0)
+    minitest (5.14.2)
+    mocha (1.11.2)
+    multi_json (1.15.0)
     multipart-post (2.1.1)
-    mysql2 (0.5.2)
+    mysql2 (0.5.3)
     net-http-persistent (3.0.1)
       connection_pool (~> 2.2)
-    parallel (1.19.0)
-    parser (2.6.5.0)
-      ast (~> 2.4.0)
-    peatio (0.6.3)
+    parallel (1.20.0)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
+    peatio (2.6.2)
       activemodel (> 5.2, <= 6.0.0)
       amqp
       bunny
       clamp
+      em-synchrony (~> 1.0)
       em-websocket
       eventmachine
+      faraday_middleware (~> 0.13.1)
+      faye (~> 1.2)
       jwt
       mysql2
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.7.0)
+      prometheus-client
+      thin
+    prometheus-client (2.1.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
       byebug (~> 11.0)
-      pry (~> 0.10)
-    public_suffix (4.0.1)
+      pry (~> 0.13.0)
+    public_suffix (4.0.6)
+    rack (2.2.3)
     rainbow (3.0.0)
-    rake (10.5.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    rake (13.0.1)
+    reline (0.1.8)
+      io-console (~> 0.5)
+    rexml (3.2.4)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
-    rubocop (0.76.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
+    rubocop (0.82.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-github (0.13.0)
-      rubocop (~> 0.70)
-      rubocop-performance (~> 1.3.0)
-    rubocop-performance (1.3.0)
-      rubocop (>= 0.68.0)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-github (0.16.0)
+      rubocop (<= 0.82.0)
+      rubocop-performance (~> 1.0)
+      rubocop-rails (~> 2.0)
+    rubocop-performance (1.7.1)
+      rubocop (>= 0.82.0)
+    rubocop-rails (2.6.0)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 0.82.0)
     ruby-progressbar (1.10.1)
-    safe_yaml (1.0.5)
-    simplecov (0.17.1)
+    simplecov (0.19.1)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.3)
+    thin (1.8.0)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0, >= 1.0.4)
+      rack (>= 1, < 3)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.8)
       thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
-    webmock (3.7.6)
+    unicode-display_width (1.7.0)
+    webmock (3.10.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    websocket-driver (0.7.3)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.17)
+  bundler (~> 2.1.3)
   irb
   mocha (~> 1.8)
   peatio-thought!
   pry-byebug
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   rubocop-github
   simplecov
   webmock (~> 3.5)
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

data/lib/peatio/thought/blockchain.rb

@@ -28,10 +28,11 @@ module Peatio
           txs_array.append(*txs)
         end
 
-        Peatio::Block.new(block_number, block_txs)
-      rescue Client::Error => e
-        raise Peatio::Blockchain::ClientError, e
-      end
+        Peatio::Block.new(block_number, txs_array)
+    rescue Client::Error => e
+      raise Peatio::Blockchain::ClientError, e
+    end
+
 
       def latest_block_number
         client.json_rpc(:getblockcount)
@@ -44,42 +45,42 @@ module Peatio
                                      .flatten(1)
                                      .find {|addr| addr[0] == address }
 
-        raise Peatio::Blockchain::UnavailableAddressBalanceError, address if address_with_balance.blank?
-
-        address_with_balance[1].to_d
-      rescue Client::Error => e
-        raise Peatio::Blockchain::ClientError, e
-      end
-
-      private
-
-      def filter_vout(tx_hash)
-        tx_hash.fetch("vout").select do |entry|
-          entry.fetch("value").to_d.positive? && entry["scriptPubKey"].has_key?("addresses")
-        end
-      end
-
-      def build_transaction(tx_hash)
-        filter_vout(tx_hash).each_with_object([]) do |entry, formatted_txs|
-          no_currency_tx = {hash: tx_hash["txid"], txout: entry["n"],
-                            to_address: entry["scriptPubKey"]["addresses"][0],
-                            amount: entry.fetch("value").to_d,
-                            status: "success"}
-
-          # Build transaction for each currency belonging to blockchain.
-          settings_fetch(:currencies).pluck(:id).each do |currency_id|
-            formatted_txs << no_currency_tx.merge(currency_id: currency_id)
-          end
-        end
-      end
-
-      def client
-        @client ||= Client.new(settings_fetch(:server))
-      end
-
-      def settings_fetch(key)
-        @settings.fetch(key) { raise Peatio::Blockchain::MissingSettingError, key.to_s }
-      end
-    end
-  end
-end
+                                     raise Peatio::Blockchain::UnavailableAddressBalanceError, address if address_with_balance.blank?
+
+                                       address_with_balance[1].to_d
+                                     rescue Client::Error => e
+                                       raise Peatio::Blockchain::ClientError, e
+                                     end
+
+                                     private
+
+                                     def filter_vout(tx_hash)
+                                       tx_hash.fetch("vout").select do |entry|
+                                         entry.fetch("value").to_d.positive? && entry["scriptPubKey"].has_key?("addresses")
+                                       end
+                                     end
+
+                                     def build_transaction(tx_hash)
+                                       filter_vout(tx_hash).each_with_object([]) do |entry, formatted_txs|
+                                         no_currency_tx = {hash: tx_hash["txid"], txout: entry["n"],
+                                                           to_address: entry["scriptPubKey"]["addresses"][0],
+                                                           amount: entry.fetch("value").to_d,
+                                                           status: "success"}
+
+                                         # Build transaction for each currency belonging to blockchain.
+                                         settings_fetch(:currencies).pluck(:id).each do |currency_id|
+                                           formatted_txs << no_currency_tx.merge(currency_id: currency_id)
+                                         end
+                                       end
+                                     end
+
+                                     def client
+                                       @client ||= Client.new(settings_fetch(:server))
+                                     end
+
+                                     def settings_fetch(key)
+                                       @settings.fetch(key) { raise Peatio::Blockchain::MissingSettingError, key.to_s }
+                                     end
+                                   end
+                                 end
+                               end

data/lib/peatio/thought/client.rb

@@ -1,71 +1,56 @@
 # frozen_string_literal: true
 
-require "memoist"
-require "faraday"
-require "better-faraday"
+require 'memoist'
+require 'faraday'
+require 'better-faraday'
 
 module Peatio
   module Thought
     class Client
-      Error = Class.new(StandardError)
-      class ConnectionError < Error; end
+	Error = Class.new(StandardError)
 
-      class ResponseError < Error
-        def initialize(code, msg)
-          @code = code
-          @msg = msg
-        end
-
-        def message
-          "#{@msg} (#{@code})"
-        end
-      end
+    class ConnectionError < Error; end
 
-      extend Memoist
-
-      def initialize(endpoint)
-        @json_rpc_endpoint = URI.parse(endpoint)
+    class ResponseError < Error
+      def initialize(code, msg)
+        super "#{msg} (#{code})"
       end
+    end
 
-      def json_rpc(method, params=[])
-        response = post(method, params)
-
-        response.assert_2xx!
-        response = JSON.parse(response.body)
+    extend Memoist
 
-        response["error"].tap do |e|
-          raise ResponseError.new(e["code"], e["message"]) if e
-        end
-
-        response.fetch("result")
-      rescue StandardError => e
-        case e
-        when Faraday::Error
-          raise ConnectionError, e
-        when Error
-          raise e
-        else
-          raise Error, e
-        end
-      end
+    def initialize(endpoint, idle_timeout: 5)
+      @json_rpc_endpoint = URI.parse(endpoint)
+      @idle_timeout = idle_timeout
+    end
 
-      private
+    def json_rpc(method, params = [])
+      response = connection.post \
+        '/',
+        {jsonrpc: '1.0', method: method, params: params}.to_json,
+        {'Accept' => 'application/json',
+         'Content-Type' => 'application/json'}
+      response.assert_success!
+      response = JSON.parse(response.body)
+      response['error'].tap { |error| raise ResponseError.new(error['code'], error['message']) if error }
+      response.fetch('result')
+    rescue Faraday::Error => e
+      raise ConnectionError, e
+    rescue StandardError => e
+      raise Error, e
+    end
 
-      def post(method, params)
-        connection.post("/", {jsonrpc: "1.0", method: method, params: params}.to_json,
-                        "Accept" => "application/json", "Content-Type" => "application/json")
-      end
+    private
 
-      def connection
-        @connection ||= Faraday.new(@json_rpc_endpoint) do |f|
-          f.adapter :net_http_persistent, pool_size: 5
-        end.tap do |connection|
-          unless @json_rpc_endpoint.user.blank?
-            connection.basic_auth(@json_rpc_endpoint.user,
-                                  @json_rpc_endpoint.password)
-          end
+    def connection
+      @connection ||= Faraday.new(@json_rpc_endpoint) do |f|
+        f.adapter :net_http_persistent, pool_size: 5, idle_timeout: @idle_timeout
+      end.tap do |connection|
+        unless @json_rpc_endpoint.user.blank?
+          connection.basic_auth(@json_rpc_endpoint.user, @json_rpc_endpoint.password)
         end
       end
     end
   end
 end
+end

data/lib/peatio/thought/hooks.rb

@@ -28,8 +28,8 @@ module Peatio
         end
 
         def register
-          Peatio::Blockchain.registry[:thought] = Thought::Blockchain.new
-          Peatio::Wallet.registry[:thoughtd] = Thought::Wallet.new
+          Peatio::Blockchain.registry[:thought] = Thought::Blockchain
+          Peatio::Wallet.registry[:thoughtd] = Thought::Wallet
         end
       end
 

data/lib/peatio/thought/version.rb

@@ -2,6 +2,6 @@
 
 module Peatio
   module Thought
-    VERSION = "2.4.0"
+    VERSION = "2.6.7.1"
   end
 end

data/lib/peatio/thought/wallet.rb

@@ -3,8 +3,11 @@
 module Peatio
   module Thought
     class Wallet < Peatio::Wallet::Abstract
-      def initialize(settings={})
-        @settings = settings
+      DEFAULT_FEATURES = { skip_deposit_collection: false }.freeze
+
+      def initialize(custom_features = {})
+        @features = DEFAULT_FEATURES.merge(custom_features).slice(*SUPPORTED_FEATURES)
+        @settings = {}
       end
 
       def configure(settings={})

data/peatio-thought.gemspec

@@ -38,16 +38,16 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activesupport", "~> 5.2.3"
   spec.add_dependency "better-faraday", "~> 1.0.5"
-  spec.add_dependency "faraday", "~> 0.15.4"
+  spec.add_dependency "faraday", "~> 0.17"
   spec.add_dependency "memoist", "~> 0.16.0"
   spec.add_dependency "peatio", ">= 0.6.3"
   spec.add_dependency 'net-http-persistent', '~> 3.0.1'
 
-  spec.add_development_dependency "bundler", "~> 1.17"
+  spec.add_development_dependency "bundler", "~> 2.1.3"
   spec.add_development_dependency "irb"
   spec.add_development_dependency "mocha", "~> 1.8"
   spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rubocop-github"
   spec.add_development_dependency "simplecov"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peatio-thought
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.6.7.1
 platform: ruby
 authors:
 - Andrew@Thought
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-06 00:00:00.000000000 Z
+date: 2020-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.4
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.4
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: memoist
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.1.3
 - !ruby/object:Gem::Dependency
   name: irb
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement