peatio-bitgo 1.1.0 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a34d3e594f4aae64bc53a35b59dadd67910a9e3d815eee4e3dd9efa647390e4
-  data.tar.gz: 7aa28dfabb7d3d38c6fe97d8cd33a0f925c2aab1f96b264ae8cb2e771cd6148e
+  metadata.gz: 8ae724cff419d17080fe3eab88cf0f3f8d31c3d41e787f350d8b5773f93f2078
+  data.tar.gz: 434d994c43c8e60a29d71078098114412946c994467e0f1790db2c390d7dd651
 SHA512:
-  metadata.gz: 58e8eded29b3926165b4007c85034ac36f90c61bfba87b9d655cab1f14dc192e69dfe1bb1250c5e3e0a11c5e77ce43be9e4b5d7f10a34884be62a04371cbb18e
-  data.tar.gz: 0c2910b5e815efe56c0e1e46da0bf1e2b50d48571ca5a0f2aee4b2b9d55135a18755789d59045c1ae93ccad5b40358700b49f823ace670e117d7f7129f49b626
+  metadata.gz: 641b57188eebb0f220733bd31db3a6ec27d17a2329e66038e6d2c1f25986d571d67cd94e5f177518057e096efe9ad775c9afb68e64a82a222d43b21fd0c72f2b
+  data.tar.gz: 87ef8015868f4a01f34242d7b111a2d35ccf0144da50c859216dc611e028c9378c4cd310213463983ce4b5fcb8c9125fd01a2abbfcd8cbf2a996ca371d78b0e2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    peatio-bitgo (1.1.0)
+    peatio-bitgo (1.1.5)
       activesupport (~> 5.2.3)
       better-faraday (~> 1.0.5)
       faraday (~> 0.15.4)
@@ -12,75 +12,108 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.4.1)
-      activesupport (= 5.2.4.1)
-    activesupport (5.2.4.1)
+    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.0)
+    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.14.4)
-      amq-protocol (~> 2.3, >= 2.3.0)
+    bunny (2.15.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.2)
+    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)
+      addressable (>= 2.3.4)
+      cookiejar (!= 0.3.1)
+      em-socksify (>= 0.3)
+      eventmachine (>= 1.0.3)
+      http_parser.rb (>= 0.6.0)
+    em-socksify (0.3.2)
+      eventmachine (>= 1.0.0.beta.4)
+    em-synchrony (1.0.6)
+      eventmachine (>= 1.0.0.beta.1)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.13.1)
+      faraday (>= 0.7.4, < 1.0)
+    faye (1.2.5)
+      cookiejar (>= 0.3.0)
+      em-http-request (>= 0.3.0)
+      eventmachine (>= 0.12.0)
+      faye-websocket (>= 0.9.1)
+      multi_json (>= 1.0.0)
+      rack (>= 1.0.0)
+      websocket-driver (>= 0.5.1)
+    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.2)
       concurrent-ruby (~> 1.0)
     jwt (2.2.1)
     memoist (0.16.2)
-    method_source (0.9.2)
+    method_source (1.0.0)
     minitest (5.14.0)
     mocha (1.11.2)
+    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 (0.6.3)
+    peatio (2.4.4)
       activemodel (> 5.2, <= 6.0.0)
       amqp
       bunny
       clamp
+      em-synchrony (~> 1.0)
       em-websocket
       eventmachine
+      faraday_middleware (~> 0.13.1)
+      faye (~> 1.2)
       jwt
       mysql2
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.8.0)
+      prometheus-client
+      thin
+    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.10)
-    public_suffix (4.0.3)
-    rake (10.5.0)
+      pry (~> 0.13.0)
+    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.1)
       rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
@@ -88,13 +121,20 @@ GEM
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
     safe_yaml (1.0.5)
+    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.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    webmock (3.8.2)
+    webmock (3.8.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    websocket-driver (0.7.1)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.4)
 
 PLATFORMS
   ruby
@@ -104,7 +144,7 @@ DEPENDENCIES
   mocha (~> 1.8)
   peatio-bitgo!
   pry-byebug
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   webmock (~> 3.5)
 

data/configs/wallets.yml

@@ -13,9 +13,9 @@
     # Geth gateway client settings.
     uri:          http://127.0.0.1:8545
     secret:       'changeme'
-    bitgo_test_net: true
-    bitgo_access_token: 'v2x659261647b540ee3acda5c50ae4e878we323474eea5cbff9b9615139629'
-    bitgo_wallet_id: '5e5388ad80334347ceb3540c741d'
+    testnet: true
+    access_token: 'v2x659261647b540ee3acda5c50ae4e878we323474eea5cbff9b9615139629'
+    wallet_id: '5e5388ad80334347ceb3540c741d'
 
 - name:             Ethereum Hot Wallet
   blockchain_key:   eth-rinkeby
@@ -31,9 +31,9 @@
     # Geth gateway client settings.
     uri:          http://127.0.0.1:8545
     secret:       'test'
-    bitgo_test_net: true
-    bitgo_access_token: 'v2x659261647b540ee3acda5c50ae4e878we323474eea5cbff9b9615139629'
-    bitgo_wallet_id: '5e5388ad80334347ceb3540c741d'
+    testnet: true
+    access_token: 'v2x659261647b540ee3acda5c50ae4e878we323474eea5cbff9b9615139629'
+    wallet_id: '5e5388ad80334347ceb3540c741d'
 
 - name:             Ethereum Warm Wallet
   blockchain_key:   eth-rinkeby
@@ -49,6 +49,6 @@
     # Geth gateway client settings.
     uri:          http://127.0.0.1:8545
     secret:       'test'
-    bitgo_test_net: true
-    bitgo_access_token: 'v2x659261647b540ee3acda5c50ae4e878we323474eea5cbff9b9615139629'
-    bitgo_wallet_id: '5e5388ad80334347ceb3540c741d'
+    testnet: true
+    access_token: 'v2x659261647b540ee3acda5c50ae4e878we323474eea5cbff9b9615139629'
+    wallet_id: '5e5388ad80334347ceb3540c741d'

data/docs/configuration.md

@@ -0,0 +1,36 @@
+## Bitgo wallet configuration
+
+1. Login to your bitgo account
+2. Click in create wallet button
+![scheme](images/create_wallet.png)
+3. Choose wallet for appropriate currency
+![scheme](images/choose_wallet.png)
+4. Setup your wallet
+![scheme](images/setup_wallet.png)
+5. Put name of your wallet
+![scheme](images/wallet_name.png)
+6. Put password of your wallet
+![scheme](images/wallet_secret.png)
+P.S. You should save this password for future wallet configuration
+
+## Peatio BITGO wallet configuration
+
+1. Go to tower admin panel Settings -> Wallets -> Add wallet
+* Uri == Bitgo service URI
+* Secret == Wallet password
+* Bitgo Wallet Id
+![scheme](images/wallet_id.png)
+* Bitgo Access Token
+![scheme](images/wallet_access_token.png)
+![scheme](images/create_wallet_access_token.png)
+![scheme](images/access_token.png)
+
+## Webhook configuration
+
+![scheme](images/webhook.png)
+![scheme](images/webhook_creating.png)
+
+Where url should be "https://{host_url}/api/v2/peatio/public/webhooks/{event}"
+
+* For deposit wallets event should be 'deposit'
+* For hot wallets event should be 'withdraw'

data/lib/peatio/bitgo/client.rb

@@ -43,7 +43,11 @@ module Peatio
         response['error'].tap { |error| raise ResponseError.new(error) if error }
         response
       rescue Faraday::Error => e
-        raise ConnectionError, e
+        if e.is_a?(Faraday::ConnectionFailed) || e.is_a?(Faraday::TimeoutError)
+          raise ConnectionError, e
+        else
+          raise ConnectionError, JSON.parse(e.response.body)['message']
+        end
       rescue StandardError => e
         raise Error, e
       end

data/lib/peatio/bitgo/version.rb

@@ -1,5 +1,5 @@
 module Peatio
   module Bitgo
-    VERSION = "1.1.0"
+    VERSION = "1.1.5"
   end
 end

data/lib/peatio/bitgo/wallet.rb

@@ -1,6 +1,7 @@
 module Peatio
   module Bitgo
     class Wallet < Peatio::Wallet::Abstract
+      TIME_DIFFERENCE_IN_MINUTES = 10
 
       def initialize(settings = {})
         @settings = settings
@@ -14,7 +15,7 @@ module Peatio
 
         @wallet = @settings.fetch(:wallet) do
           raise Peatio::Wallet::MissingSettingError, :wallet
-        end.slice(:uri, :address, :secret, :bitgo_access_token, :bitgo_wallet_id, :bitgo_test_net)
+        end.slice(:uri, :address, :secret, :access_token, :wallet_id, :testnet)
 
          @currency = @settings.fetch(:currency) do
           raise Peatio::Wallet::MissingSettingError, :currency
@@ -22,11 +23,17 @@ module Peatio
       end
 
       def create_address!(options = {})
-        if options[:address_id].present?
-          response = client.rest_api(:get, "/wallet/#{bitgo_wallet_id}/address/#{options[:address_id]}")
+        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
+
+          response = client.rest_api(:get, "#{currency}/wallet/#{wallet_id}/address/#{options.dig(:pa_details, :address_id)}")
           { address: response['address'], secret: bitgo_wallet_passphrase }
-        else
-          response = client.rest_api(:post, "/wallet/#{bitgo_wallet_id}/address")
+        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
       rescue Bitgo::Client::Error => e
@@ -34,7 +41,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)
@@ -49,10 +56,11 @@ module Peatio
             amount -= fee.to_i
           end
 
-          txid = client.rest_api(:post, "/wallet/#{bitgo_wallet_id}/sendcoins", {
+          txid = client.rest_api(:post, "#{currency_id}/wallet/#{wallet_id}/sendcoins", {
                                  address: transaction.to_address.to_s,
                                  amount: amount.to_s,
-                                 walletPassphrase: bitgo_wallet_passphrase
+                                 walletPassphrase: bitgo_wallet_passphrase,
+                                 memo: xlm_memo(transaction.to_address.to_s)
           }.compact).fetch('txid')
 
           transaction.hash = normalize_txid(txid)
@@ -64,7 +72,7 @@ module Peatio
 
 
       def build_raw_transaction(transaction)
-        client.rest_api(:post, "/wallet/#{bitgo_wallet_id}/tx/build", {
+        client.rest_api(:post, "#{currency_id}/wallet/#{wallet_id}/tx/build", {
           recipients: [{
             address: transaction.to_address,
             amount: convert_to_base_unit(transaction.amount).to_s
@@ -74,14 +82,15 @@ module Peatio
 
       def create_eth_transaction(transaction, options = {})
         amount = convert_to_base_unit(transaction.amount)
-        amount -= options.fetch(:gas_limit).to_i * options.fetch(:gas_price).to_i if options.dig(:subtract_fee)
+        hop = true unless options.slice(:erc20_contract_address).present?
 
-        txid = client.rest_api(:post, "/wallet/#{bitgo_wallet_id}/sendcoins", {
+        txid = 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
+          gasPrice: options.fetch(:gas_price).to_i,
+          hop: hop
         }.compact).fetch('txid')
 
         transaction.hash = normalize_txid(txid)
@@ -89,21 +98,33 @@ module Peatio
       end
 
       def load_balance!
-        response = client.rest_api(:get, "/wallet/#{bitgo_wallet_id}")
-        convert_from_base_unit(response.fetch('balanceString'))
+        if @currency.fetch(:options).slice(:erc20_contract_address).present?
+          load_erc20_balance!
+        else
+          response = client.rest_api(:get, "#{currency_id}/wallet/#{wallet_id}")
+          convert_from_base_unit(response.fetch('balanceString'))
+        end
+      rescue Bitgo::Client::Error => e
+        raise Peatio::Wallet::ClientError, e
+      end
+
+      def load_erc20_balance!
+        response = client.rest_api(:get, "#{erc20_currency_id}/wallet/#{wallet_id}?allTokens=true")
+        convert_from_base_unit(response.dig('tokens', currency_id, 'balanceString'))
       rescue Bitgo::Client::Error => e
         raise Peatio::Wallet::ClientError, e
       end
 
       def trigger_webhook_event(event)
-        currency_id = @wallet.fetch(:bitgo_test_net).present? ? 't' + @currency.fetch(:id) : @currency.fetch(:id)
-        return unless currency_id == event['coin'] && @wallet.fetch(:bitgo_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['address_confirmation']
-          # TODO Add Address confirmation
+        elsif event['type'] == 'address_confirmation'
+          address_id = fetch_address_id(event['address'])
+          return { address_id: address_id}
         end
       end
 
@@ -112,20 +133,26 @@ 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, "/wallet/#{bitgo_wallet_id}/transfer/#{id}")
+        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?
-                          build_address(response.dig('coinSpecific', 'memo').first)
+                          memo = response.dig('coinSpecific', 'memo')
+                          memo_type = memo.kind_of?(Array) ? memo.first  : memo
+                          build_address(entry['address'], memo_type)
                         else
                           entry['address']
                         end
-          state = if response['state'] == 'unconfrimed'
-                    'pending'
-                  elsif response['state'] == 'confirmed'
-                    'success'
-                  end
+          state = define_transaction_state(response['state'])
 
           transaction = Peatio::Transaction.new(
             currency_id: @currency.fetch(:id),
@@ -145,7 +172,7 @@ module Peatio
       end
 
       def transfer_webhook(url)
-        client.rest_api(:post, "/wallet/#{bitgo_wallet_id}/webhooks", {
+        client.rest_api(:post, "#{currency_id}/wallet/#{wallet_id}/webhooks", {
           type: 'transfer',
           allToken: true,
           url: url,
@@ -155,8 +182,8 @@ module Peatio
       end
 
       def address_confirmation_webhook(url)
-        client.rest_api(:post, "/wallet/#{bitgo_wallet_id}/webhooks", {
-          type: 'address_confirmation_webhook',
+        client.rest_api(:post, "#{currency_id}/wallet/#{wallet_id}/webhooks", {
+          type: 'address_confirmation',
           allToken: true,
           url: url,
           label: "webhook for #{url}",
@@ -173,25 +200,52 @@ module Peatio
       private
 
       def client
-        currency_id = @currency.fetch(:id) { raise Peatio::Wallet::MissingSettingError, :id }
         uri = @wallet.fetch(:uri) { raise Peatio::Wallet::MissingSettingError, :uri }
-        access_token = @wallet.fetch(:bitgo_access_token) { raise Peatio::Wallet::MissingSettingError, :bitgo_access_token }
+        access_token = @wallet.fetch(:access_token) { raise Peatio::Wallet::MissingSettingError, :access_token }
 
-        currency_code_prefix = @wallet.fetch(:bitgo_test_net) ? 't' : ''
-        uri = uri.gsub(/\/+\z/, '') + '/' + currency_code_prefix + currency_id
+        currency_code_prefix = @wallet.fetch(:testnet) ? 't' : ''
+        uri = uri.gsub(/\/+\z/, '') + '/' + currency_code_prefix
         @client ||= Client.new(uri, access_token)
       end
 
-      def build_address(memo)
-        "#{memo['address']}?memoId=#{memo['value']}"
+      def build_address(address, memo)
+        "#{address}?memoId=#{memo['value']}"
+      end
+
+      # All these functions will have to be done with the coin set to eth or teth
+      # since that is the actual coin type being used.
+      def erc20_currency_id
+        return 'eth' if @currency.fetch(:options).slice(:erc20_contract_address).present?
+
+        currency_id
+      end
+
+      def xlm_memo(address)
+        if @currency.fetch(:id) == 'xlm'
+            {
+              type: "id",
+              value: "#{memo_id_from(address)}"
+            }
+        end
+      end
+
+      def memo_id_from(address)
+        memo_id = address.partition('memoId=').last
+        memo_id = 0 if memo_id.empty?
+
+        memo_id
+      end
+
+      def currency_id
+        @currency.fetch(:id) { raise Peatio::Wallet::MissingSettingError, :id }
       end
 
       def bitgo_wallet_passphrase
         @wallet.fetch(:secret)
       end
 
-      def bitgo_wallet_id
-        @wallet.fetch(:bitgo_wallet_id)
+      def wallet_id
+        @wallet.fetch(:wallet_id)
       end
 
       def normalize_txid(txid)
@@ -211,6 +265,21 @@ module Peatio
         end
         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'
+          'pending'
+        when 'confirmed'
+          'success'
+        when 'failed','rejected'
+          'failed'
+        end
+      end
     end
   end
 end

data/peatio-bitgo.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "mocha", "~> 1.8"
   spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "webmock", "~> 3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peatio-bitgo
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.5
 platform: ruby
 authors:
 - Nadia Ch., Maksym N.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-06 00:00:00.000000000 Z
+date: 2020-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -198,6 +198,19 @@ files:
 - configs/blockchains.yml
 - configs/currencies.yml
 - configs/wallets.yml
+- docs/configuration.md
+- docs/images/.DS_Store
+- docs/images/access_token.png
+- docs/images/choose_wallet.png
+- docs/images/create_wallet.png
+- docs/images/create_wallet_access_token.png
+- docs/images/setup_wallet.png
+- docs/images/wallet_access_token.png
+- docs/images/wallet_id.png
+- docs/images/wallet_name.png
+- docs/images/wallet_secret.png
+- docs/images/webhook.png
+- docs/images/webhook_creating.png
 - docs/integration.md
 - lib/peatio/bitgo.rb
 - lib/peatio/bitgo/blockchain.rb