peatio-bitgo 1.1.3 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8308298f5cd4459b9d14ce7d7a142c8684d19ceb60f4f48656cbc3acfcf39d58
-  data.tar.gz: fceb8e50206eb0bf641fb1e52f6741328d3019388211297f8b76c6cdff8fa406
+  metadata.gz: 4253a3ca3970f150214e76a1a31fd3f7d09bc8fbb181abd790048278859c9fcb
+  data.tar.gz: 0fa8a23a04582bc62ca5959a616410b30b1438d2bb1d2d30da317ec2928e4071
 SHA512:
-  metadata.gz: 06f8b0f3352e04437ccfd8ed8e9260b78a6c7af2b80350ebe1c6ee2f97fbf109a353a62d1c2ceee31e4c57b30ad666f7f5697fa80420de755618bd8985709e67
-  data.tar.gz: 61568aa6be7fe158d0b34245b7dd35cba09972f7e63102fdf9e08d355c15691646d4f992288d17e2a778eb657f646af350bd89844568748cd351d264d75bdd4d
+  metadata.gz: fb144800c2f5732e2a19191882157d04ce0f0fd76b7fa1134d3eae3988b9e95df8b2bee3c622355f25558ac545a2f3d924ffbcecec2415f553ac67ecc04479cc
+  data.tar.gz: 3a92e09b6b1e900790caa6aa028fd1a8251012eb45b23a8c3bac151f8b2f2d6e49cdb6915d04a57ed60b0fc85384d10073e5b2031cdd88548e9910e3e7a90b3c

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    peatio-bitgo (1.1.3)
+    peatio-bitgo (2.5.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,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.1)
+    amq-protocol (2.3.2)
     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.15.0)
+    bunny (2.16.1)
       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)
+    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.3)
       safe_yaml (~> 1.0.0)
     daemons (1.3.1)
-    diff-lcs (1.3)
-    em-http-request (1.1.5)
+    diff-lcs (1.4.4)
+    em-http-request (1.1.6)
       addressable (>= 2.3.4)
       cookiejar (!= 0.3.1)
       em-socksify (>= 0.3)
@@ -54,36 +54,36 @@ 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.4.0)
       cookiejar (>= 0.3.0)
-      em-http-request (>= 0.3.0)
+      em-http-request (>= 1.1.6)
       eventmachine (>= 0.12.0)
-      faye-websocket (>= 0.9.1)
+      faye-websocket (>= 0.11.0)
       multi_json (>= 1.0.0)
       rack (>= 1.0.0)
       websocket-driver (>= 0.5.1)
-    faye-websocket (0.10.9)
+    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.8.2)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    jwt (2.2.1)
+    jwt (2.2.2)
     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)
+    multi_json (1.15.0)
     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
@@ -97,29 +97,29 @@ GEM
       mysql2
       prometheus-client
       thin
-    prometheus-client (2.0.0)
-    pry (0.13.0)
+    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.13.0)
-    public_suffix (4.0.4)
-    rack (2.2.2)
+    public_suffix (4.0.5)
+    rack (2.2.3)
     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.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+    rspec-support (3.9.3)
     safe_yaml (1.0.5)
     thin (1.7.2)
       daemons (~> 1.0, >= 1.0.9)
@@ -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.3)
       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.3"
+    VERSION = "2.5.1"
   end
 end

data/lib/peatio/bitgo/wallet.rb

@@ -1,6 +1,8 @@
 module Peatio
   module Bitgo
     class Wallet < Peatio::Wallet::Abstract
+      TIME_DIFFERENCE_IN_MINUTES = 10
+      XLM_MEMO_TYPES = { 'memoId': 'id', 'memoText': 'text', 'memoHash': 'hash', 'memoReturn': 'return' }
 
       def initialize(settings = {})
         @settings = settings
@@ -24,10 +26,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 +42,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)
@@ -52,7 +58,7 @@ module Peatio
           end
 
           txid = client.rest_api(:post, "#{currency_id}/wallet/#{wallet_id}/sendcoins", {
-                                 address: transaction.to_address.to_s,
+                                 address: normalize_address(transaction.to_address.to_s),
                                  amount: amount.to_s,
                                  walletPassphrase: bitgo_wallet_passphrase,
                                  memo: xlm_memo(transaction.to_address.to_s)
@@ -77,6 +83,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 +91,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 +117,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 +134,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 +184,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}",
@@ -206,19 +222,25 @@ module Peatio
       end
 
       def xlm_memo(address)
-        if @currency.fetch(:id) == 'xlm'
-            {
-              type: "id",
-              value: "#{memo_id_from(address)}"
-            }
-        end
+        build_xlm_memo(address) if @currency.fetch(:id) == 'xlm'
       end
 
-      def memo_id_from(address)
-        memo_id = address.partition('memoId=').last
-        memo_id = 0 if memo_id.empty?
+      def build_xlm_memo(address)
+        case address.split('?').last.split('=').first
+        when 'memoId'
+          memo_value_from(address, 'memoId')
+        when 'memoText'
+          memo_value_from(address, 'memoText')
+        when 'memoHash'
+          memo_value_from(address, 'memoHash')
+        when 'memoReturn'
+          memo_value_from(address, 'memoReturn')
+        end
+      end
 
-        memo_id
+      def memo_value_from(address, type)
+        memo_value = address.partition(type + '=').last
+        return { type: XLM_MEMO_TYPES[type.to_sym], value: memo_value } if memo_value.present?
       end
 
       def currency_id
@@ -233,6 +255,14 @@ module Peatio
         @wallet.fetch(:wallet_id)
       end
 
+      def normalize_address(address)
+        if @currency.fetch(:id) == 'xlm'
+          address.split('?').first
+        else
+          address
+        end
+      end
+
       def normalize_txid(txid)
         txid.downcase
       end
@@ -251,9 +281,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.5.1
 platform: ruby
 authors:
 - Nadia Ch., Maksym N.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2020-08-24 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