peatio-bitgo 1.1.4 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bf98903c7304e77f6cdc28f1f41c15a8bb8fb247e6edde49e146f0dc49c5690
-  data.tar.gz: 1848b2e16408c9d2ea516388e77fb6c16a314bbc5b4ae6c300da1f492e545c57
+  metadata.gz: 863d387c7b57c73ce93ec4157f024f866ae5535605c4e65806b2becfe9251015
+  data.tar.gz: 59513ea996a0a5fb87abe27492d8944b7ce2d8557a89f75814622f437b189ffd
 SHA512:
-  metadata.gz: 70a230d27976389a7eaeed25506bd1385508bb95fd82742487b39861b31854301856c65ef772ccc0a43d82359f37a9464fa70981254d42ebf80ead10acab6dd7
-  data.tar.gz: e4987b11326c0c8d1f7d2b7b58bb8c1fa8e1becc88772aff96d72d4e0b47b987e17e8930179b3b286ad76ee0dd43aebb6e3adaec9faa06ed32d4a1170e020a98
+  metadata.gz: f9b4ea980fe2f0fa19c4f10991b3017d0e4cbff8273fe411c945d0a82004578ec1b12fd9d31f8081544a914509bd92d246083c36cd9444b75ab82f591f7a8cd8
+  data.tar.gz: 2987a6430253bb2e6882980760f5a14423b102f47d8b3daa07d8daaa094c6ec41cfb443fe4fe39471a1be647855096608176d0caf547a2e41876ebe57c5c685f

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    peatio-bitgo (1.1.4)
+    peatio-bitgo (2.6.2)
       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,9 +12,9 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.4.2)
-      activesupport (= 5.2.4.2)
-    activesupport (5.2.4.2)
+    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)
@@ -34,13 +34,13 @@ GEM
     clamp (1.3.1)
     coderay (1.1.2)
     concurrent-ruby (1.1.6)
-    connection_pool (2.2.2)
+    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.5)
+    em-http-request (1.1.6)
       addressable (>= 2.3.4)
       cookiejar (!= 0.3.1)
       em-socksify (>= 0.3)
@@ -54,11 +54,11 @@ GEM
       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)
     faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
-    faye (1.2.5)
+    faye (1.3.0)
       cookiejar (>= 0.3.0)
       em-http-request (>= 0.3.0)
       eventmachine (>= 0.12.0)
@@ -71,19 +71,19 @@ GEM
       websocket-driver (>= 0.5.1)
     hashdiff (1.0.1)
     http_parser.rb (0.6.0)
-    i18n (1.8.2)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     jwt (2.2.1)
     memoist (0.16.2)
     method_source (1.0.0)
-    minitest (5.14.0)
+    minitest (5.14.1)
     mocha (1.11.2)
     multi_json (1.14.1)
     multipart-post (2.1.1)
     mysql2 (0.5.3)
     net-http-persistent (3.0.1)
       connection_pool (~> 2.2)
-    peatio (2.4.4)
+    peatio (2.6.1)
       activemodel (> 5.2, <= 6.0.0)
       amqp
       bunny
@@ -132,9 +132,9 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    websocket-driver (0.7.1)
+    websocket-driver (0.7.2)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
+    websocket-extensions (0.1.5)
 
 PLATFORMS
   ruby

data/lib/peatio/bitgo/client.rb

@@ -5,7 +5,7 @@ module Peatio
   module Bitgo
     class Client
       Error = Class.new(StandardError)
-      class ConnectionError < Error; end
+      ConnectionError = Class.new(Error)
 
       class ResponseError < Error
         def initialize(msg)
@@ -22,7 +22,7 @@ module Peatio
         args = [@endpoint.to_s + path]
 
         if data
-          if %i[ post put patch ].include?(verb)
+          if %i[post put patch].include?(verb)
             args << data.compact.to_json
             args << { 'Content-Type' => 'application/json' }
           else
@@ -48,8 +48,6 @@ module Peatio
         else
           raise ConnectionError, JSON.parse(e.response.body)['message']
         end
-      rescue StandardError => e
-        raise Error, e
       end
     end
   end

data/lib/peatio/bitgo/hooks.rb

@@ -9,7 +9,7 @@ module Peatio
           unless Gem::Requirement.new(BLOCKCHAIN_VERSION_REQUIREMENT)
                                  .satisfied_by?(Gem::Version.new(Peatio::Blockchain::VERSION))
             [
-              "Bitgo blockchain version requiremnt was not suttisfied by Peatio::Blockchain.",
+              "Bitgo blockchain version requirement was not satisfied by Peatio::Blockchain.",
               "Bitgo blockchain requires #{BLOCKCHAIN_VERSION_REQUIREMENT}.",
               "Peatio::Blockchain version is #{Peatio::Blockchain::VERSION}"
             ].join('\n').tap { |s| Kernel.abort s }
@@ -18,7 +18,7 @@ module Peatio
           unless Gem::Requirement.new(WALLET_VERSION_REQUIREMENT)
                                  .satisfied_by?(Gem::Version.new(Peatio::Wallet::VERSION))
             [
-              "Bitgo wallet version requiremnt was not suttisfied by Peatio::Wallet.",
+              "Bitgo wallet version requirement was not satisfied by Peatio::Wallet.",
               "Bitgo wallet requires #{WALLET_VERSION_REQUIREMENT}.",
               "Peatio::Wallet version is #{Peatio::Wallet::VERSION}"
             ].join('\n').tap { |s| Kernel.abort s }

data/lib/peatio/bitgo/version.rb

@@ -1,5 +1,5 @@
 module Peatio
   module Bitgo
-    VERSION = "1.1.4"
+    VERSION = "2.6.2".freeze
   end
 end

data/lib/peatio/bitgo/wallet.rb

@@ -1,9 +1,13 @@
 module Peatio
   module Bitgo
     class Wallet < Peatio::Wallet::Abstract
+      TIME_DIFFERENCE_IN_MINUTES = 10
 
-      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 = {})
@@ -24,10 +28,14 @@ module Peatio
       def create_address!(options = {})
         currency = erc20_currency_id
         options.deep_symbolize_keys!
-        if options.dig(:pa_details,:address_id).present?
+
+        if options.dig(:pa_details, :address_id).present? &&
+           options.dig(:pa_details, :updated_at).present? &&
+           time_difference_in_minutes(options.dig(:pa_details, :updated_at)) >= TIME_DIFFERENCE_IN_MINUTES
+
           response = client.rest_api(:get, "#{currency}/wallet/#{wallet_id}/address/#{options.dig(:pa_details, :address_id)}")
           { address: response['address'], secret: bitgo_wallet_passphrase }
-        else
+        elsif options.dig(:pa_details, :address_id).blank?
           response = client.rest_api(:post, "#{currency}/wallet/#{wallet_id}/address")
           { address: response['address'], secret: bitgo_wallet_passphrase, details: { address_id: response['id'] }}
         end
@@ -111,14 +119,15 @@ module Peatio
       end
 
       def trigger_webhook_event(event)
-        currency_id = @wallet.fetch(:testnet).present? ? 't' + @currency.fetch(:id) : @currency.fetch(:id)
-        return unless currency_id == event['coin'] && @wallet.fetch(:wallet_id) == event['wallet']
+        currency = @wallet.fetch(:testnet).present? ? 't' + @currency.fetch(:id) : @currency.fetch(:id)
+        return unless currency == event['coin'] && @wallet.fetch(:wallet_id) == event['wallet']
 
         if event['type'] == 'transfer'
           transactions = fetch_transfer!(event['transfer'])
           return { transfers: transactions }
-        elsif event['address_confirmation']
-          # TODO Add Address confirmation
+        elsif event['type'] == 'address_confirmation'
+          address_id = fetch_address_id(event['address'])
+          return { address_id: address_id, currency_id: currency_id }
         end
       end
 
@@ -127,6 +136,14 @@ module Peatio
         address_confirmation_webhook(url)
       end
 
+      def fetch_address_id(address)
+        currency = erc20_currency_id
+        client.rest_api(:get, "#{currency}/wallet/#{wallet_id}/address/#{address}")
+              .fetch('id')
+      rescue Bitgo::Client::Error => e
+        raise Peatio::Wallet::ClientError, e
+      end
+
       def fetch_transfer!(id)
         # TODO: Add Rspecs for this one
         response = client.rest_api(:get, "#{currency_id}/wallet/#{wallet_id}/transfer/#{id}")
@@ -169,7 +186,7 @@ module Peatio
 
       def address_confirmation_webhook(url)
         client.rest_api(:post, "#{currency_id}/wallet/#{wallet_id}/webhooks", {
-          type: 'address_confirmation_webhook',
+          type: 'address_confirmation',
           allToken: true,
           url: url,
           label: "webhook for #{url}",
@@ -252,9 +269,13 @@ module Peatio
         x.to_i
       end
 
+      def time_difference_in_minutes(updated_at)
+        (Time.now - updated_at)/60
+      end
+
       def define_transaction_state(state)
         case state
-        when 'unconfrimed'
+        when 'unconfirmed'
           'pending'
         when 'confirmed'
           'success'

data/peatio-bitgo.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 'net-http-persistent', '~> 3.0.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peatio-bitgo
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 2.6.2
 platform: ruby
 authors:
 - Nadia Ch., Maksym N.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-11 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