peatio-bitgo 2.6.7 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '062810d1807c29ab63130d8bb190de25c2cab3f482829e0abdff61cae4187422'
-  data.tar.gz: cb04bdf39f57405c46fb7903db410a55eb269bac1f19300422812c88ea052dae
+  metadata.gz: e0a23b303c27e33702466a81aadeea6e1fd2520ec68775ee5b70398ed9439518
+  data.tar.gz: 5248c0f5746772e67f4080758f5e017ddf7a7a69d14f73e41bb3a18a38400ac5
 SHA512:
-  metadata.gz: b40f51251f29accdcee17938e1dda4c74ccb362dd85664faf979366164f629d80b659de3bd01d95763b3f6629591a95d6fafc97e380ac1eff5f9b080e5b4560b
-  data.tar.gz: e2f7372b54ba702d1a845c80e4e3f85daa580c177bcfdcb65bfbbde27f1eeabafa1b8d321b63e91fac9b71c76311a07912d0af1db3be439ad75dc8f06a619154
+  metadata.gz: 6b96e9340b72203e6188320980dd0dac3e560ba4db37d6629edb7e22f4b17f21fe5dd6e889dea9c98399fb29a791715f6d3f0585fc44e68a6f843a0b84296da3
+  data.tar.gz: aca2516464d376318cab6e0382ea72f93731a6b7b8224bf361fd4b96342a98e634bf9dcaf81168b3e281d9a1f24187e442636ab6d38bbe5fa3a2333460c1ebac

data/Gemfile.lock

@@ -1,45 +1,47 @@
 PATH
   remote: .
   specs:
-    peatio-bitgo (2.6.7)
-      activesupport (~> 5.2.3)
-      better-faraday (~> 1.0.5)
-      faraday (~> 0.17)
+    peatio-bitgo (3.1.0)
+      activesupport (~> 6.1.0)
+      better-faraday (~> 2.0.1)
+      faraday (~> 1.10)
       memoist (~> 0.16.0)
-      net-http-persistent (~> 3.0.1)
-      peatio (>= 0.6.3)
+      net-http-persistent (~> 4.0.1)
+      peatio (>= 3.1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.4.4)
-      activesupport (= 5.2.4.4)
-    activesupport (5.2.4.4)
+    activemodel (6.1.7.2)
+      activesupport (= 6.1.7.2)
+    activesupport (6.1.7.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)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     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.17.0)
+    better-faraday (2.0.1)
+      activesupport (>= 4.0, < 7.0)
+      faraday (>= 1.0, < 3.0)
+    bunny (2.20.3)
       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.8)
-    connection_pool (2.2.5)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.3.0)
     cookiejar (0.3.3)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    daemons (1.4.0)
-    diff-lcs (1.4.4)
+    crack (0.4.5)
+      rexml
+    daemons (1.4.1)
+    diff-lcs (1.5.0)
     em-http-request (1.1.7)
       addressable (>= 2.3.4)
       cookiejar (!= 0.3.1)
@@ -50,14 +52,33 @@ 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.3)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
+      http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    faraday (0.17.4)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.13.1)
-      faraday (>= 0.7.4, < 1.0)
+    faraday (1.10.3)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
     faye (1.4.0)
       cookiejar (>= 0.3.0)
       em-http-request (>= 1.1.6)
@@ -66,81 +87,88 @@ 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.10)
+    http_parser.rb (0.8.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    jwt (2.2.3)
+    jwt (2.7.0)
     memoist (0.16.2)
     method_source (1.0.0)
-    minitest (5.14.4)
-    mocha (1.11.2)
+    minitest (5.17.0)
+    mocha (1.16.1)
     multi_json (1.15.0)
-    multipart-post (2.1.1)
-    mysql2 (0.5.3)
-    net-http-persistent (3.0.1)
+    multipart-post (2.3.0)
+    mysql2 (0.5.5)
+    net-http-persistent (4.0.1)
       connection_pool (~> 2.2)
-    peatio (2.6.3)
-      activemodel (> 5.2, <= 6.0.0)
+    peatio (3.1.1)
+      activemodel (> 5.2)
       amqp
       bunny
       clamp
       em-synchrony (~> 1.0)
       em-websocket
       eventmachine
-      faraday_middleware (~> 0.13.1)
+      faraday (~> 1.10)
       faye (~> 1.2)
       jwt
       mysql2
       prometheus-client
       thin
-    prometheus-client (2.1.0)
-    pry (0.13.1)
+    prometheus-client (4.0.0)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
+    pry-byebug (3.8.0)
       byebug (~> 11.0)
-      pry (~> 0.13.0)
-    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.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+      pry (~> 0.10)
+    public_suffix (5.0.1)
+    rack (2.2.6.2)
+    rake (13.0.6)
+    rbtree (0.4.6)
+    rexml (3.2.5)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.1)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    safe_yaml (1.0.5)
-    thin (1.8.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    ruby2_keywords (0.0.5)
+    set (1.0.3)
+    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.9)
-      thread_safe (~> 0.1)
-    webmock (3.8.3)
-      addressable (>= 2.3.6)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    webmock (3.18.1)
+      addressable (>= 2.8.0)
       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)
+    zeitwerk (2.6.7)
 
 PLATFORMS
-  ruby
+  arm64-darwin-21
+  x86_64-linux
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.4.7)
   mocha (~> 1.8)
   peatio-bitgo!
   pry-byebug
@@ -149,4 +177,4 @@ DEPENDENCIES
   webmock (~> 3.5)
 
 BUNDLED WITH
-   1.17.3
+   2.4.7

data/lib/peatio/bitgo/client.rb

@@ -38,7 +38,7 @@ module Peatio
         args.last['Authorization'] = 'Bearer ' + @access_token
 
         response = Faraday.send(verb, *args)
-        response.assert_success!
+        response.assert_2xx!
         response = JSON.parse(response.body)
         response['error'].tap { |error| raise ResponseError.new(error) if error }
         response

data/lib/peatio/bitgo/version.rb

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

data/lib/peatio/bitgo/wallet.rb

@@ -60,14 +60,20 @@ module Peatio
             amount -= fee.to_i
           end
 
-          txid = client.rest_api(:post, "#{currency_id}/wallet/#{wallet_id}/sendcoins", {
+          response = client.rest_api(:post, "#{currency_id}/wallet/#{wallet_id}/sendcoins", {
                                  address: normalize_address(transaction.to_address.to_s),
                                  amount: amount.to_s,
                                  walletPassphrase: bitgo_wallet_passphrase,
                                  memo: xlm_memo(transaction.to_address.to_s)
-          }.compact).fetch('txid')
+          }.compact)
 
-          transaction.hash = normalize_txid(txid)
+          if response['feeString'].present?
+            fee = convert_from_base_unit(response['feeString'])
+            transaction.fee = fee
+          end
+
+          transaction.hash = normalize_txid(response['txid'])
+          transaction.fee_currency_id = erc20_currency_id
           transaction
         end
       rescue Bitgo::Client::Error => e
@@ -86,32 +92,38 @@ module Peatio
 
       def create_eth_transaction(transaction, options = {})
         amount = convert_to_base_unit(transaction.amount)
-        hop = options.slice(:erc20_contract_address).present? ? false : true
+        hop = true unless options.slice(:gas_price).present?
 
         fee_estimate = fee_estimate(amount.to_s, hop)
 
-        if transaction.options.present?
+        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", {
+        response = 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,
           hop: hop
-        }.compact).fetch('txid')
+        }.compact)
 
-        transaction.hash = normalize_txid(txid)
+        if response['feeString'].present?
+          fee = convert_from_base_unit(response['feeString'])
+          transaction.fee = fee
+        end
+
+        transaction.hash = normalize_txid(response['txid'])
+        transaction.fee_currency_id = erc20_currency_id
         transaction.options = options
         transaction
       end
 
       def fee_estimate(amount, hop)
-        client.rest_api(:get, "#{erc20_currency_id}/tx/fee", {amount: amount, hop: hop})
+        client.rest_api(:get, "#{erc20_currency_id}/tx/fee", { amount: amount, hop: hop }.compact)
       end
 
       def load_balance!
@@ -180,9 +192,15 @@ module Peatio
             txout = output['index'] if output.present?
           end
 
+          if response['feeString'].present?
+            fee = convert_from_base_unit(response['feeString']) / response['entries'].count
+          end
+
           transaction = Peatio::Transaction.new(
             currency_id: @currency.fetch(:id),
             amount: convert_from_base_unit(entry['valueString']),
+            fee: fee,
+            fee_currency_id: erc20_currency_id,
             hash: normalize_txid(response['txid']),
             to_address: to_address,
             block_number: response['height'],

data/peatio-bitgo.gemspec

@@ -23,14 +23,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport", "~> 5.2.3"
-  spec.add_dependency "better-faraday", "~> 1.0.5"
-  spec.add_dependency "faraday", "~> 0.17"
+  spec.add_dependency "activesupport", "~> 6.1.0"
+  spec.add_dependency "better-faraday", "~> 2.0.1"
+  spec.add_dependency "faraday", "~> 1.10"
   spec.add_dependency "memoist", "~> 0.16.0"
-  spec.add_dependency "peatio", ">= 0.6.3"
-  spec.add_dependency 'net-http-persistent', '~> 3.0.1'
+  spec.add_dependency "peatio", ">= 3.1.1"
+  spec.add_dependency 'net-http-persistent', '~> 4.0.1'
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", "~> 2.4.7"
   spec.add_development_dependency "mocha", "~> 1.8"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake", "~> 13.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peatio-bitgo
 version: !ruby/object:Gem::Version
-  version: 2.6.7
+  version: 3.1.0
 platform: ruby
 authors:
 - Nadia Ch., Maksym N.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-23 00:00:00.000000000 Z
+date: 2023-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: better-faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: memoist
   requirement: !ruby/object:Gem::Requirement
@@ -72,42 +72,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.4.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.4.7
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement