peatio-bitgo 2.6.3 → 2.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20d80a146fee8a7c1589467c5dd7e2eb29797b31bc5f4568c0bc5ef404b92706
-  data.tar.gz: ca3c7ada85a2ab0e01c3abd2ecb28cd79cb368a6b5ec4c659eb27dba6f9b3742
+  metadata.gz: 2211b51065371d015f3adcd9edcad1e6222a39a2fd8bc86ebe9eb0ff88986108
+  data.tar.gz: 9e66976ae7c61e5afa145f958d0ada67e6f232a70f7b9d06e3891237309f8727
 SHA512:
-  metadata.gz: 063d9d8857083966a250daf77e4476c095b4b420b79f01a727006de559a7dba9dbdf4e3cfd057ef4fc734cd8dd79bfe2e659e5d6b6dc9dab37afca731d21ba8b
-  data.tar.gz: dd0d0752690f189809ccc531d6938c03af16e38b37b97a67066b0d993759ae81a6f7505136bdf498eab187e9913fc117490e61114df5ddf34ad01f85714013cc
+  metadata.gz: 3ea675bbcf7bd62678248ac5a1abd951e79f5a7bf00f4ce53cafec12571897dc55be601dc02979a6aad1148df5d0d3e840d97b7bfa8e1dfb83fd76dd5193a621
+  data.tar.gz: 139f9d18ee51b88cd4936eae40c7d70868ccc3984cc9cefcf06d2b5c75af73ecb551f4dba073aef03ec73afb1c74b895784e7486f1eb34929d08aab44b0511d3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    peatio-bitgo (2.6.3)
+    peatio-bitgo (2.6.8)
       activesupport (~> 5.2.3)
       better-faraday (~> 1.0.5)
       faraday (~> 0.17)
@@ -12,9 +12,9 @@ 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.6)
+      activesupport (= 5.2.6)
+    activesupport (5.2.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -28,19 +28,20 @@ GEM
     better-faraday (1.0.8)
       activesupport (>= 4.0, < 6.0)
       faraday (~> 0.12)
-    bunny (2.16.1)
+    bunny (2.18.0)
       amq-protocol (~> 2.3, >= 2.3.1)
+      sorted_set (~> 1, >= 1.0.2)
     byebug (11.1.3)
     clamp (1.3.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
-    connection_pool (2.2.3)
+    concurrent-ruby (1.1.9)
+    connection_pool (2.2.5)
     cookiejar (0.3.3)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    daemons (1.3.1)
+    daemons (1.4.0)
     diff-lcs (1.4.4)
-    em-http-request (1.1.6)
+    em-http-request (1.1.7)
       addressable (>= 2.3.4)
       cookiejar (!= 0.3.1)
       em-socksify (>= 0.3)
@@ -50,11 +51,11 @@ 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)
@@ -66,24 +67,24 @@ GEM
       multi_json (>= 1.0.0)
       rack (>= 1.0.0)
       websocket-driver (>= 0.5.1)
-    faye-websocket (0.11.0)
+    faye-websocket (0.11.1)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
     hashdiff (1.0.1)
     http_parser.rb (0.6.0)
-    i18n (1.8.5)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    jwt (2.2.2)
+    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.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.4)
       activemodel (> 5.2, <= 6.0.0)
       amqp
       bunny
@@ -107,6 +108,7 @@ GEM
     public_suffix (4.0.5)
     rack (2.2.3)
     rake (13.0.1)
+    rbtree (0.4.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -121,18 +123,22 @@ GEM
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
     safe_yaml (1.0.5)
-    thin (1.7.2)
+    set (1.0.1)
+    sorted_set (1.0.3)
+      rbtree
+      set (~> 1.0)
+    thin (1.8.1)
       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.3)
+    websocket-driver (0.7.5)
       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.3".freeze
+    VERSION = "2.6.8".freeze
   end
 end

data/lib/peatio/bitgo/wallet.rb

@@ -86,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 = true unless options.slice(:gas_price).present?
+
+        fee_estimate = fee_estimate(amount.to_s, hop)
+
+        if transaction.options.present? && transaction.options[:gas_price].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,
@@ -98,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 }.compact)
+      end
+
       def load_balance!
         if @currency.fetch(:options).slice(:erc20_contract_address).present?
           load_erc20_balance!
@@ -119,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
 
@@ -146,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?
@@ -158,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
           )
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peatio-bitgo
 version: !ruby/object:Gem::Version
-  version: 2.6.3
+  version: 2.6.8
 platform: ruby
 authors:
 - Nadia Ch., Maksym N.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-24 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.