peatio-bitcoincash 2.4.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4866ff4a33465bd9c2df41f1ca551ac40931814fbf386cc3b645eb816ed3a7e
-  data.tar.gz: 5b5b194fbae1d6177af698c82a608bdef3e75030bd2de6ffac1cb2c65be4aca3
+  metadata.gz: b5939f2a255d0f7ad89a188b9e4919f4220e4b938b005d333de0fe09e800f4e9
+  data.tar.gz: 329e6af472617f63e122b8159635ad7344660bf4d10f5b72b85e95bf788b5fd5
 SHA512:
-  metadata.gz: c3fd4c98b12b65b42663eaa8a541b11beff112ce0335dec2e1a74260b2f09a795dfe5c7c445523b70558eead8e783760323b8039e518a1d9e7045a46dac5ba35
-  data.tar.gz: f8b424ec7147a97bfddcd969ebfc1871e506a6b2c08ab3292b355e06b8220e81a399976154badfe5238d7c536a0c41ac66aa6dd6331c6df5f23a4cd1864e0f7f
+  metadata.gz: 00ca063953a35396cc209a72bc6492718bdaa2663df4183eeffed0352b1c2b0ef835e97158958df70ab90406e52bef8a8d02dc972ff3b8aef2bf5bf550fd9572
+  data.tar.gz: afb3b4598c9f626d565752abd6fec7bb5d8aa8d2b34fe2f652949ff5a828d35d8b764ce63f86c2759925f845d9363213ddab165d11db089227e416cd95beec3e

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    peatio-bitcoincash (2.4.0)
+    peatio-bitcoincash (2.6.1)
       activesupport (~> 5.2.3)
       better-faraday (~> 1.0.5)
       cash-addr (~> 0.2.0)
-      faraday (~> 0.15.4)
+      faraday (~> 0.17)
       memoist (~> 0.16.0)
       net-http-persistent (~> 3.0.1)
       peatio (>= 0.6.3)
@@ -13,16 +13,16 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activesupport (5.2.3)
+    activemodel (5.2.4.3)
+      activesupport (= 5.2.4.3)
+    activesupport (5.2.4.3)
       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.1)
     amqp (1.8.0)
       amq-protocol (>= 2.2.0)
       eventmachine
@@ -30,77 +30,115 @@ GEM
     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)
+    bunny (2.15.0)
+      amq-protocol (~> 2.3, >= 2.3.1)
+    byebug (11.1.1)
     cash-addr (0.2.0)
       base58 (~> 0.2.2)
     clamp (1.3.1)
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
-    connection_pool (2.2.2)
+    concurrent-ruby (1.1.6)
+    connection_pool (2.2.3)
+    cookiejar (0.3.3)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
+    daemons (1.3.1)
     diff-lcs (1.3)
+    em-http-request (1.1.6)
+      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.1)
       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.3.0)
+      cookiejar (>= 0.3.0)
+      em-http-request (>= 0.3.0)
+      eventmachine (>= 0.12.0)
+      faye-websocket (>= 0.9.1)
+      multi_json (>= 1.0.0)
+      rack (>= 1.0.0)
+      websocket-driver (>= 0.5.1)
+    faye-websocket (0.10.9)
+      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.3)
       concurrent-ruby (~> 1.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)
+    memoist (0.16.2)
+    method_source (1.0.0)
+    minitest (5.14.1)
+    mocha (1.11.2)
+    multi_json (1.14.1)
     multipart-post (2.1.1)
-    mysql2 (0.5.2)
+    mysql2 (0.5.3)
     net-http-persistent (3.0.1)
       connection_pool (~> 2.2)
-    peatio (0.6.3)
+    peatio (2.6.1)
       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.0.0)
+    pry (0.13.0)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
       byebug (~> 11.0)
-      pry (~> 0.10)
-    public_suffix (4.0.1)
-    rake (10.5.0)
+      pry (~> 0.13.0)
+    public_suffix (4.0.4)
+    rack (2.2.2)
+    rake (13.0.1)
     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)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
+    rspec-support (3.9.2)
     safe_yaml (1.0.5)
+    thin (1.7.2)
+      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.7)
       thread_safe (~> 0.1)
-    webmock (3.7.6)
+    webmock (3.8.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    websocket-driver (0.7.2)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
 
 PLATFORMS
   ruby
@@ -110,7 +148,7 @@ DEPENDENCIES
   mocha (~> 1.8)
   peatio-bitcoincash!
   pry-byebug
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   webmock (~> 3.5)
 

data/lib/peatio/bitcoincash/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'memoist'
 require 'faraday'
 require 'better-faraday'
@@ -6,7 +8,7 @@ module Peatio
   module Bitcoincash
     class Client
       Error = Class.new(StandardError)
-      class ConnectionError < Error; end
+      ConnectionError = Class.new(Error)
 
       class ResponseError < Error
         def initialize(code, msg)
@@ -29,20 +31,16 @@ module Peatio
         response = connection.post \
           '/',
           { jsonrpc: '1.0', method: method, params: params }.to_json,
-          { 'Accept'       => 'application/json',
+          { 'Accept' => 'application/json',
             'Content-Type' => 'application/json' }
         response.assert_2xx!
         response = JSON.parse(response.body)
-        response['error'].tap { |e| raise ResponseError.new(e['code'], e['message']) if e }
-        response.fetch('result')
-      rescue => e
-        if e.is_a?(Error)
-          raise e
-        elsif e.is_a?(Faraday::Error)
-          raise ConnectionError, e
-        else
-          raise Error, e
+        response['error'].tap do |e|
+          raise ResponseError.new(e['code'], e['message']) if e
         end
+        response.fetch('result')
+      rescue Faraday::Error => e
+        raise ConnectionError, e
       end
 
       private

data/lib/peatio/bitcoincash/hooks.rb

@@ -26,8 +26,8 @@ module Peatio
         end
 
         def register
-          Peatio::Blockchain.registry[:bitcoincash] = Bitcoincash::Blockchain.new
-          Peatio::Wallet.registry[:bitcoincashd] = Bitcoincash::Wallet.new
+          Peatio::Blockchain.registry[:bitcoincash] = Bitcoincash::Blockchain
+          Peatio::Wallet.registry[:bitcoincashd] = Bitcoincash::Wallet
         end
       end
 

data/lib/peatio/bitcoincash/version.rb

@@ -1,5 +1,5 @@
 module Peatio
   module Bitcoincash
-    VERSION = "2.4.0".freeze
+    VERSION = "2.6.1".freeze
   end
 end

data/lib/peatio/bitcoincash/wallet.rb

@@ -3,8 +3,11 @@ module Peatio
     class Wallet < Peatio::Wallet::Abstract
       include CashAddressFormat
 
-      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-bitcoincash.gemspec

@@ -25,7 +25,7 @@ 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 "cash-addr", '~> 0.2.0'
@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.17"
   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 "webmock", "~> 3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peatio-bitcoincash
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Dinesh Chohda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-16 00:00:00.000000000 Z
+date: 2020-06-10 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
@@ -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