peatio-bitgo 2.6.2 → 2.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 863d387c7b57c73ce93ec4157f024f866ae5535605c4e65806b2becfe9251015
-  data.tar.gz: 59513ea996a0a5fb87abe27492d8944b7ce2d8557a89f75814622f437b189ffd
+  metadata.gz: '062810d1807c29ab63130d8bb190de25c2cab3f482829e0abdff61cae4187422'
+  data.tar.gz: cb04bdf39f57405c46fb7903db410a55eb269bac1f19300422812c88ea052dae
 SHA512:
-  metadata.gz: f9b4ea980fe2f0fa19c4f10991b3017d0e4cbff8273fe411c945d0a82004578ec1b12fd9d31f8081544a914509bd92d246083c36cd9444b75ab82f591f7a8cd8
-  data.tar.gz: 2987a6430253bb2e6882980760f5a14423b102f47d8b3daa07d8daaa094c6ec41cfb443fe4fe39471a1be647855096608176d0caf547a2e41876ebe57c5c685f
+  metadata.gz: b40f51251f29accdcee17938e1dda4c74ccb362dd85664faf979366164f629d80b659de3bd01d95763b3f6629591a95d6fafc97e380ac1eff5f9b080e5b4560b
+  data.tar.gz: e2f7372b54ba702d1a845c80e4e3f85daa580c177bcfdcb65bfbbde27f1eeabafa1b8d321b63e91fac9b71c76311a07912d0af1db3be439ad75dc8f06a619154

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    peatio-bitgo (2.6.2)
+    peatio-bitgo (2.6.7)
       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.3)
-      activesupport (= 5.2.4.3)
-    activesupport (5.2.4.3)
+    activemodel (5.2.4.4)
+      activesupport (= 5.2.4.4)
+    activesupport (5.2.4.4)
       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.17.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.3)
+    byebug (11.1.3)
+    clamp (1.3.2)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.8)
+    connection_pool (2.2.5)
     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.6)
+    daemons (1.4.0)
+    diff-lcs (1.4.4)
+    em-http-request (1.1.7)
       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.1)
+    em-websocket (0.5.2)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
-    faraday (0.17.3)
+    faraday (0.17.4)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
-    faye (1.3.0)
+    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.3)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    jwt (2.2.1)
+    jwt (2.2.3)
     memoist (0.16.2)
     method_source (1.0.0)
-    minitest (5.14.1)
+    minitest (5.14.4)
     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.6.1)
+    peatio (2.6.3)
       activemodel (> 5.2, <= 6.0.0)
       amqp
       bunny
@@ -97,42 +97,42 @@ 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)
+    thin (1.8.0)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
     thread_safe (0.3.6)
-    tzinfo (1.2.7)
+    tzinfo (1.2.9)
       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.2)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
 

data/lib/peatio/bitgo/version.rb

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

data/lib/peatio/bitgo/wallet.rb

@@ -2,6 +2,7 @@ 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' }
 
       DEFAULT_FEATURES = { skip_deposit_collection: false }.freeze
 
@@ -60,7 +61,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)
@@ -85,7 +86,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?
+        hop = options.slice(:erc20_contract_address).present? ? false : true
+
+        fee_estimate = fee_estimate(amount.to_s, hop)
+
+        if transaction.options.present?
+          options[:gas_price] = transaction.options[:gas_price]
+        else
+          options[:gas_price] = fee_estimate['minGasPrice'].to_i
+        end
 
         txid = client.rest_api(:post, "#{currency_id}/wallet/#{wallet_id}/sendcoins", {
           address: transaction.to_address.to_s,
@@ -97,9 +106,14 @@ module Peatio
         }.compact).fetch('txid')
 
         transaction.hash = normalize_txid(txid)
+        transaction.options = options
         transaction
       end
 
+      def fee_estimate(amount, hop)
+        client.rest_api(:get, "#{erc20_currency_id}/tx/fee", {amount: amount, hop: hop})
+      end
+
       def load_balance!
         if @currency.fetch(:options).slice(:erc20_contract_address).present?
           load_erc20_balance!
@@ -118,16 +132,21 @@ module Peatio
         raise Peatio::Wallet::ClientError, e
       end
 
-      def trigger_webhook_event(event)
+      def trigger_webhook_event(request)
         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['type'] == 'address_confirmation'
-          address_id = fetch_address_id(event['address'])
-          return { address_id: address_id, currency_id: currency_id }
+        if request.params['type'] == 'transfer'
+          return unless currency == request.params['coin'] &&
+                        @wallet.fetch(:wallet_id) == request.params['wallet']
+        else
+          return unless @wallet.fetch(:wallet_id) == request.params['walletId']
+        end
+
+        if request.params['type'] == 'transfer'
+          transactions = fetch_transfer!(request.params['transfer'])
+          return transactions
+        elsif request.params['type'] == 'address_confirmation'
+          address_id = fetch_address_id(request.params['address'])
+          return { address_id: address_id, address: request.params['address'], currency_id: currency_id }
         end
       end
 
@@ -145,7 +164,6 @@ module Peatio
       end
 
       def fetch_transfer!(id)
-        # TODO: Add Rspecs for this one
         response = client.rest_api(:get, "#{currency_id}/wallet/#{wallet_id}/transfer/#{id}")
         parse_entries(response['entries']).map do |entry|
           to_address =  if response.dig('coinSpecific', 'memo').present?
@@ -157,14 +175,18 @@ module Peatio
                         end
           state = define_transaction_state(response['state'])
 
+          if response['outputs'].present?
+            output = response['outputs'].find { |out| out['address'] == to_address }
+            txout = output['index'] if output.present?
+          end
+
           transaction = Peatio::Transaction.new(
             currency_id: @currency.fetch(:id),
             amount: convert_from_base_unit(entry['valueString']),
             hash: normalize_txid(response['txid']),
             to_address: to_address,
             block_number: response['height'],
-            # TODO: Add sendmany support
-            txout: 0,
+            txout: txout.to_i,
             status: state
           )
 
@@ -224,19 +246,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
@@ -251,6 +279,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peatio-bitgo
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.6.7
 platform: ruby
 authors:
 - Nadia Ch., Maksym N.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2021-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Gem for extending Peatio plugable system with Bitgo implementation.