peatio-bitgo 2.5.2 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acdc8edfa1495b5fe9d11d0396c34c36e086dd4594289745e66c506a61b72194
-  data.tar.gz: ec04b54eb43a007e4e0bd02c9ec3efbc333b76da239b876ba73c251ac23563a4
+  metadata.gz: 274572ccfc7d17e3150b4271d2872fda747aff0684a50e21c8bb74382e0c437f
+  data.tar.gz: f90adec7c757956565af265400011033a73902348ee1a1d98393ea51e83e2ab1
 SHA512:
-  metadata.gz: 44d662cd396e174301f130c25e2904fef5f1cfcbd47aa9090c81ed65a6b1422682ebf78ef80c8d9c34008763252b9432cc6aef72748f615361d94da0bb77bccd
-  data.tar.gz: 40ba65fa72eeaf02f69153a394a8ac4a177f50ea06ed4ce86217209865c82d6e37e8d6c13c5056d877dd40719bd53ffbe2d3331e2faf14383a39aa00dffefa78
+  metadata.gz: 58ec57b436b4e5d43d71d3b6db335e36cb4e0c49fac46a9495c2bfdfc1bcf3909577ba1367641bc3a3357adb2779bb515270d285662fdfa9ed0cef62526c49b7
+  data.tar.gz: 8fc3e3d276680e91140264bc3ab9d32648632598484dd23ddebdb36d4b79612eb14a585d902ac12585a8b92831e4db4712b3d6444e6ef0ed12c932fab98ae71a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    peatio-bitgo (2.5.2)
+    peatio-bitgo (2.6.0)
       activesupport (~> 5.2.3)
       better-faraday (~> 1.0.5)
       faraday (~> 0.17)
@@ -12,35 +12,35 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.4.5)
-      activesupport (= 5.2.4.5)
-    activesupport (5.2.4.5)
+    activemodel (5.2.4.2)
+      activesupport (= 5.2.4.2)
+    activesupport (5.2.4.2)
       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.2)
+    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.17.0)
+    bunny (2.15.0)
       amq-protocol (~> 2.3, >= 2.3.1)
-    byebug (11.1.3)
-    clamp (1.3.2)
-    coderay (1.1.3)
-    concurrent-ruby (1.1.8)
-    connection_pool (2.2.3)
+    byebug (11.1.1)
+    clamp (1.3.1)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.6)
+    connection_pool (2.2.2)
     cookiejar (0.3.3)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     daemons (1.3.1)
-    diff-lcs (1.4.4)
-    em-http-request (1.1.7)
+    diff-lcs (1.3)
+    em-http-request (1.1.5)
       addressable (>= 2.3.4)
       cookiejar (!= 0.3.1)
       em-socksify (>= 0.3)
@@ -50,40 +50,40 @@ GEM
       eventmachine (>= 1.0.0.beta.4)
     em-synchrony (1.0.6)
       eventmachine (>= 1.0.0.beta.1)
-    em-websocket (0.5.2)
+    em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
-    faraday (0.17.4)
+    faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
-    faye (1.4.0)
+    faye (1.2.5)
       cookiejar (>= 0.3.0)
-      em-http-request (>= 1.1.6)
+      em-http-request (>= 0.3.0)
       eventmachine (>= 0.12.0)
-      faye-websocket (>= 0.11.0)
+      faye-websocket (>= 0.9.1)
       multi_json (>= 1.0.0)
       rack (>= 1.0.0)
       websocket-driver (>= 0.5.1)
-    faye-websocket (0.11.0)
+    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.8.9)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    jwt (2.2.2)
+    jwt (2.2.1)
     memoist (0.16.2)
     method_source (1.0.0)
-    minitest (5.14.4)
+    minitest (5.14.0)
     mocha (1.11.2)
-    multi_json (1.15.0)
+    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.6.3)
+    peatio (2.4.4)
       activemodel (> 5.2, <= 6.0.0)
       amqp
       bunny
@@ -97,44 +97,44 @@ GEM
       mysql2
       prometheus-client
       thin
-    prometheus-client (2.1.0)
-    pry (0.13.1)
+    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.13.0)
-    public_suffix (4.0.5)
-    rack (2.2.3)
+    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.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    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.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
+    rspec-support (3.9.2)
     safe_yaml (1.0.5)
-    thin (1.8.0)
+    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.9)
+    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.3)
+    websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
+    websocket-extensions (0.1.4)
 
 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)
@@ -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/version.rb

@@ -1,5 +1,5 @@
 module Peatio
   module Bitgo
-    VERSION = "2.5.2"
+    VERSION = "2.6.0".freeze
   end
 end

data/lib/peatio/bitgo/wallet.rb

@@ -1,8 +1,6 @@
 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
@@ -26,14 +24,10 @@ module Peatio
       def create_address!(options = {})
         currency = erc20_currency_id
         options.deep_symbolize_keys!
-
-        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
-
+        if options.dig(:pa_details,:address_id).present?
           response = client.rest_api(:get, "#{currency}/wallet/#{wallet_id}/address/#{options.dig(:pa_details, :address_id)}")
           { address: response['address'], secret: bitgo_wallet_passphrase }
-        elsif options.dig(:pa_details, :address_id).blank?
+        else
           response = client.rest_api(:post, "#{currency}/wallet/#{wallet_id}/address")
           { address: response['address'], secret: bitgo_wallet_passphrase, details: { address_id: response['id'] }}
         end
@@ -58,7 +52,7 @@ module Peatio
           end
 
           txid = client.rest_api(:post, "#{currency_id}/wallet/#{wallet_id}/sendcoins", {
-                                 address: normalize_address(transaction.to_address.to_s),
+                                 address: transaction.to_address.to_s,
                                  amount: amount.to_s,
                                  walletPassphrase: bitgo_wallet_passphrase,
                                  memo: xlm_memo(transaction.to_address.to_s)
@@ -117,15 +111,14 @@ module Peatio
       end
 
       def trigger_webhook_event(event)
-        currency = @wallet.fetch(:testnet).present? ? 't' + @currency.fetch(:id) : @currency.fetch(:id)
-        return unless currency == event['coin'] && @wallet.fetch(:wallet_id) == event['wallet']
+        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']
 
         if event['type'] == 'transfer'
           transactions = fetch_transfer!(event['transfer'])
           return { transfers: transactions }
-        elsif event['type'] == 'address_confirmation'
-          address_id = fetch_address_id(event['address'])
-          return { address_id: address_id, currency_id: currency_id }
+        elsif event['address_confirmation']
+          # TODO Add Address confirmation
         end
       end
 
@@ -134,14 +127,6 @@ 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}")
@@ -161,7 +146,8 @@ module Peatio
             hash: normalize_txid(response['txid']),
             to_address: to_address,
             block_number: response['height'],
-            txout: response['index'].to_i,
+            # TODO: Add sendmany support
+            txout: 0,
             status: state
           )
 
@@ -183,7 +169,7 @@ module Peatio
 
       def address_confirmation_webhook(url)
         client.rest_api(:post, "#{currency_id}/wallet/#{wallet_id}/webhooks", {
-          type: 'address_confirmation',
+          type: 'address_confirmation_webhook',
           allToken: true,
           url: url,
           label: "webhook for #{url}",
@@ -221,25 +207,19 @@ module Peatio
       end
 
       def xlm_memo(address)
-        build_xlm_memo(address) if @currency.fetch(:id) == 'xlm'
-      end
-
-      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')
+        if @currency.fetch(:id) == 'xlm'
+            {
+              type: "id",
+              value: "#{memo_id_from(address)}"
+            }
         end
       end
 
-      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?
+      def memo_id_from(address)
+        memo_id = address.partition('memoId=').last
+        memo_id = 0 if memo_id.empty?
+
+        memo_id
       end
 
       def currency_id
@@ -254,14 +234,6 @@ 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
@@ -280,13 +252,9 @@ 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 'unconfirmed'
+        when 'unconfrimed'
           'pending'
         when 'confirmed'
           'success'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peatio-bitgo
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.6.0
 platform: ruby
 authors:
 - Nadia Ch., Maksym N.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2020-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport