peatio-bitgo 1.1.3 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8308298f5cd4459b9d14ce7d7a142c8684d19ceb60f4f48656cbc3acfcf39d58
-  data.tar.gz: fceb8e50206eb0bf641fb1e52f6741328d3019388211297f8b76c6cdff8fa406
+  metadata.gz: 6fd69cb9355753e4b4dfcd36af40b937c4dbf6b673e565ee2263dafd0f02dc97
+  data.tar.gz: 073411c6f80b338c7aafed028cf3ab13b4570bb825eda0c39c9ff6a6106af666
 SHA512:
-  metadata.gz: 06f8b0f3352e04437ccfd8ed8e9260b78a6c7af2b80350ebe1c6ee2f97fbf109a353a62d1c2ceee31e4c57b30ad666f7f5697fa80420de755618bd8985709e67
-  data.tar.gz: 61568aa6be7fe158d0b34245b7dd35cba09972f7e63102fdf9e08d355c15691646d4f992288d17e2a778eb657f646af350bd89844568748cd351d264d75bdd4d
+  metadata.gz: 7381d4c8ee6d975024a25184067ef83e77cb41cf541a21d2d7acb289b78747bc26f4ac377aed951ac61ff4bf1c60f2e95e6ad1272e2f9840ef3b8a7ba9573c10
+  data.tar.gz: 3df1fcd729d750b4fb37afb44b054a7a19e7d36c129786561a6832b7095dbeabd84796f331fcb1a11fe1721707c7647666bb6a6019be1f14842b3b27048895a1

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    peatio-bitgo (1.1.3)
+    peatio-bitgo (2.6.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)
@@ -54,7 +54,7 @@ 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)

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.3"
+    VERSION = "2.6.1".freeze
   end
 end

data/lib/peatio/bitgo/wallet.rb

@@ -1,6 +1,7 @@
 module Peatio
   module Bitgo
     class Wallet < Peatio::Wallet::Abstract
+      TIME_DIFFERENCE_IN_MINUTES = 10
 
       def initialize(settings = {})
         @settings = settings
@@ -24,10 +25,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
@@ -36,7 +41,7 @@ module Peatio
       end
 
       def create_transaction!(transaction, options = {})
-        currency_options = @currency.fetch(:options).slice(:gas_limit, :gas_price)
+        currency_options = @currency.fetch(:options).slice(:gas_limit, :gas_price, :erc20_contract_address)
 
         if currency_options[:gas_limit].present? && currency_options[:gas_price].present?
           options.merge!(currency_options)
@@ -77,6 +82,7 @@ module Peatio
 
       def create_eth_transaction(transaction, options = {})
         amount = convert_to_base_unit(transaction.amount)
+        hop = true unless options.slice(:erc20_contract_address).present?
 
         txid = client.rest_api(:post, "#{currency_id}/wallet/#{wallet_id}/sendcoins", {
           address: transaction.to_address.to_s,
@@ -84,7 +90,7 @@ module Peatio
           walletPassphrase: bitgo_wallet_passphrase,
           gas: options.fetch(:gas_limit).to_i,
           gasPrice: options.fetch(:gas_price).to_i,
-          hop: true
+          hop: hop
         }.compact).fetch('txid')
 
         transaction.hash = normalize_txid(txid)
@@ -110,14 +116,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
 
@@ -126,6 +133,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}")
@@ -168,7 +183,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}",
@@ -251,9 +266,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.3
+  version: 2.6.1
 platform: ruby
 authors:
 - Nadia Ch., Maksym N.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-07 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