peatio-bitgo 1.1.2 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3562bf66638262a55143d4586f07f5946a9dea93fa2dc7efbb57e7b5cab26ca3
-  data.tar.gz: da0c1795b7df4f31a89437634a92e2cc4049b9c0dad21db8763bb4ebe1fd27b3
+  metadata.gz: fce3c54f47f8933c24b2fef521c89acd4ead3ed48fa49c183fb9f67fb3f042a5
+  data.tar.gz: 999ec62e379696270429caf760e02c95a078727539b9f5bb42cbd31435987109
 SHA512:
-  metadata.gz: 13b857602c498e74b48f0e671321d146fa55c2ce59eca63e3a2ca74775432e9d8957f19f780dc241ca6919a4654652678088bdb30f4285eb697e0d0447bda623
-  data.tar.gz: 79ba6ba0074fc9beffa667ebcc1fa9c2ead7c416785e664e8f2f73a0f14ca826f8b857401a700cccd088034ea0ed4bcadd18417ddcd718a159ad266df526aed9
+  metadata.gz: 30f38ef6aadce408ecf0cd4a4ec04333175f8eee4ca17a07445149dd6e4d31739836917dd3e7d7645dd2f86c7ab7b750c376dda9c0bc9b4e1b35821157543578
+  data.tar.gz: 369b7c7d44c01743f8d32ed77d29f89462873ba1c0383dbc5c66ac67e372098be2a822a937ee9cb736a5ffd390b63f5c07d81aa981b8ff9c2d124ffe378e099f

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    peatio-bitgo (1.1.1)
+    peatio-bitgo (2.5.0)
       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,35 +12,35 @@ 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)
       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
     better-faraday (1.0.8)
       activesupport (>= 4.0, < 6.0)
       faraday (~> 0.12)
-    bunny (2.14.4)
-      amq-protocol (~> 2.3, >= 2.3.0)
+    bunny (2.15.0)
+      amq-protocol (~> 2.3, >= 2.3.1)
     byebug (11.1.1)
     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.4)
+    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.3)
+    peatio (2.6.1)
       activemodel (> 5.2, <= 6.0.0)
       amqp
       bunny
@@ -104,7 +104,7 @@ GEM
     pry-byebug (3.9.0)
       byebug (~> 11.0)
       pry (~> 0.13.0)
-    public_suffix (4.0.3)
+    public_suffix (4.0.4)
     rack (2.2.2)
     rake (13.0.1)
     rspec (3.9.0)
@@ -126,15 +126,15 @@ GEM
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
     thread_safe (0.3.6)
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     webmock (3.8.3)
       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/version.rb

@@ -1,5 +1,5 @@
 module Peatio
   module Bitgo
-    VERSION = "1.1.2"
+    VERSION = "2.5.0"
   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,13 +82,15 @@ 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,
           amount: amount.to_s,
           walletPassphrase: bitgo_wallet_passphrase,
           gas: options.fetch(:gas_limit).to_i,
-          gasPrice: options.fetch(:gas_price).to_i
+          gasPrice: options.fetch(:gas_price).to_i,
+          hop: hop
         }.compact).fetch('txid')
 
         transaction.hash = normalize_txid(txid)
@@ -109,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
 
@@ -125,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}")
@@ -167,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}",
@@ -250,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.2
+  version: 2.5.0
 platform: ruby
 authors:
 - Nadia Ch., Maksym N.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-20 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