peatio-bitgo 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77fecc938decb7012e77db67d8334287226c3a3761d0fa6f075c0e93119418d8
-  data.tar.gz: fb16e7373708ebdf0b08fa85580d335853f64164854cad3ea1744a09277c15b1
+  metadata.gz: 3562bf66638262a55143d4586f07f5946a9dea93fa2dc7efbb57e7b5cab26ca3
+  data.tar.gz: da0c1795b7df4f31a89437634a92e2cc4049b9c0dad21db8763bb4ebe1fd27b3
 SHA512:
-  metadata.gz: b5a7d4d96979e76c524ba8b5e67304cb497d3f911ed05873b20bbe2df94bda0bd192d7f3896e8437e86889db41844a4b56cbd04246dd71d7058dcf9be7c188c5
-  data.tar.gz: b86529c189d9399b28b35d493c8db850c9fc6187f50508d9df3131be329b9097fdc2431edbcc579275eda2d2f0cdef31f7455644dc7fc0d81f3ef39cb19b3382
+  metadata.gz: 13b857602c498e74b48f0e671321d146fa55c2ce59eca63e3a2ca74775432e9d8957f19f780dc241ca6919a4654652678088bdb30f4285eb697e0d0447bda623
+  data.tar.gz: 79ba6ba0074fc9beffa667ebcc1fa9c2ead7c416785e664e8f2f73a0f14ca826f8b857401a700cccd088034ea0ed4bcadd18417ddcd718a159ad266df526aed9

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.1"
+    VERSION = "1.1.2"
   end
 end

data/lib/peatio/bitgo/wallet.rb

@@ -54,7 +54,8 @@ module Peatio
           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)
@@ -129,15 +130,13 @@ module Peatio
         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),
@@ -193,8 +192,8 @@ module Peatio
         @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
@@ -205,6 +204,22 @@ module Peatio
         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
@@ -234,6 +249,17 @@ module Peatio
         end
         x.to_i
       end
+
+      def define_transaction_state(state)
+        case state
+        when 'unconfrimed'
+          'pending'
+        when 'confirmed'
+          'success'
+        when 'failed','rejected'
+          'failed'
+        end
+      end
     end
   end
 end

metadata

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