peatio-coinpaymentnew 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15c446d380360e20a0edee5afd62d359d981be51
-  data.tar.gz: ad92f9e4f7d7f84225116446f20f7b44e1d82b2f
+  metadata.gz: 89cb0e3405cea75e5abcd3aa418743b6779b0673
+  data.tar.gz: 50491be28e5d7f2b96f038696175a23d2df3862d
 SHA512:
-  metadata.gz: b63546d3bb9293e2371fc065797cab9140c692bf4709362f0da6ac52d998236cb851257a775a748935c3c22aafae6fb2991b0fb6ca4ccd194a31f6f628b72dd9
-  data.tar.gz: 94739faea1e93d666e77e334771602785dac29d9bbb91a7a446a20dbe42f547532492a68b0f88cbefe751861178381451c9aa8155e25956b9fe96749f97c479c
+  metadata.gz: 61a1d5a62f4698313b97f6182042403bf398c937bbe15a2d2ff32d73cc622597e945fc5d9636e53a0a3ea235fe04648bf0576fdb8124e4014fe66a5c6b38edbd
+  data.tar.gz: 2df07c66ee90855ecdf4b91585fbc124a0f20ece5faa50b99af4408c2c1e3a3a9e62d3ecebe1e326a48132ec9edacae625d278ddfca36793458f58f445d13c48

data/lib/peatio/coinpaymentnew/client.rb

@@ -25,41 +25,11 @@ module Peatio
               { version: 1, key: @access_token }
             end
       
-            # def rest_api(verb, path, data = nil)
             def rest_api(args)
-              # args = [@endpoint.to_s + path]
-      
-              # if data
-              #   if %i[post put patch].include?(verb)
-              #     args << data.compact.to_json
-              #     args << { 'Content-Type' => 'application/json' }
-              #   else
-              #     args << data.compact
-              #     args << {}
-              #   end
-              # else
-              #   args << nil
-              #   args << {}
-              # end
               body = required_params.merge!(args)
-              # args.last['Accept']        = 'application/json'
-              # args.last['hmac'] = hmac(body)
-      
-              # body = required_params.merge!(cmd: caller[0][/`.*'/][1..-2]).merge!(args)
               response = HTTParty.post(@endpoint.to_s, body: body, headers: {'hmac' => hmac(body)})
               response['error'] == 'ok' ? Hashie::Mash.new(response['result']) : response['error']
       
-              # response = Faraday.send(verb, *args)
-              # response.assert_success!
-              # response = JSON.parse(response.body)
-              # response['error'].tap { |error| raise ResponseError.new(error) if error }
-              # response
-            rescue Faraday::Error => 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
             end
         end
     end

data/lib/peatio/coinpaymentnew/version.rb

@@ -2,6 +2,6 @@
 
 module Peatio
   module Coinpaymentnew
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

data/lib/peatio/coinpaymentnew/wallet.rb

@@ -30,56 +30,20 @@ module Peatio
         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
-          args = { cmd: 'get_deposit_address', currency: currency.code }.merge!(options)
-          response = client.rest_api(args)
-          { address: response['address'], secret: coinpayment_wallet_passphrase }
-        elsif options.dig(:pa_details, :address_id).blank?
-          args = { cmd: 'get_deposit_address', currency: currency.code }.merge!(options)
-          response = client.rest_api(args)
-          # response = client.rest_api(:post, "#{currency}/wallet/#{wallet_id}/address")
-          { address: response['address'], secret: coinpayment_wallet_passphrase, details: { address_id: response['address'] }}
-        end
+        args = { cmd: 'get_deposit_address', currency: currency.upcase }.merge!(options)
+        response = client.rest_api(args)
+        { address: response['address'] }
       rescue Coinpayment::Client::Error => e
         raise Peatio::Wallet::ClientError, e
       end
 
       def create_transaction!(transaction, options = {})
         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)
-        #   create_eth_transaction(transaction, options)
-        # else
-          amount = convert_to_base_unit(transaction.amount)
-
-          # if options[:subtract_fee].to_s == 'true'
-          #   fee = build_raw_transaction(transaction)
-          #   baseFeeInfo = fee['tx_fee']
-          #   # fee = baseFeeInfo.present? ? baseFeeInfo : fee.dig('txInfo','Fee')
-          #   amount -= fee.to_i
-          # end
-
-          args = { cmd: "create_transaction", amount: amount, currency1: "USD", currency2: currency.code, buyer_email: "joshirockstar007@gmail.com", address: normalize_address(transaction.to_address.to_s) }
-          response = client.rest_api(args)
-          # response = client.rest_api(:post, "#{currency_id}/wallet/#{wallet_id}/sendcoins", {
-          #                        address: normalize_address(transaction.to_address.to_s),
-          #                        amount: amount.to_s,
-          #                        walletPassphrase: coinpayment_wallet_passphrase,
-          #                        memo: xlm_memo(transaction.to_address.to_s)
-          # }.compact)
-
-          if response['feeString'].present?
-            fee = convert_from_base_unit(response['feeString'])
-            transaction.fee = fee
-          end
-
-          transaction.hash = normalize_txid(response['txn_id'])
-          transaction.fee_currency_id = erc20_currency_id
-          transaction
-        # end
+        amount = convert_to_base_unit(transaction.amount)
+        args = { cmd: "create_transaction", amount: amount, currency1: "USD", currency2: currency_id.upcase, buyer_email: "joshirockstar007@gmail.com", address: normalize_address(transaction.to_address.to_s) }
+        response = client.rest_api(args)
+        transaction.hash = normalize_txid(response['txn_id'])
+        transactio
       rescue Coinpayment::Client::Error => e
         raise Peatio::Wallet::ClientError, e
       end
@@ -88,13 +52,7 @@ module Peatio
       def build_raw_transaction(transaction)
         args = { cmd: "rates" }
         response = client.rest_api(args)
-        response[currency.code]
-        # 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
-        #   }]
-        # }.compact)
+        response[currency_id.upcase]
       end
 
       # def create_eth_transaction(transaction, options = {})
@@ -136,13 +94,7 @@ module Peatio
       def load_balance!
         args = { cmd: "balances" }
         response = client.rest_api(args)
-        response[currency.code]['balancef']
-        # 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
+        response[currency_id.upcase]['balancef']
       rescue Coinpayment::Client::Error => e
         raise Peatio::Wallet::ClientError, e
       end
@@ -155,27 +107,24 @@ module Peatio
       # end
 
       def trigger_webhook_event(request)
-        currency = @wallet.fetch(:testnet).present? ? 't' + @currency.fetch(:id) : @currency.fetch(:id)
-        if request.params['ipn_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
+        # currency = @wallet.fetch(:testnet).present? ? 't' + @currency.fetch(:id) : @currency.fetch(:id)
+        # if request.params['ipn_type'] == 'deposit'
+        #   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['ipn_type'] == 'transfer'
+        if request.params['ipn_type'] == 'deposit'
           transactions = fetch_transfer!(request.params['txn_id'])
           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
 
-      def register_webhooks!(url)
-        transfer_webhook(url)
-        address_confirmation_webhook(url)
-      end
+      # def register_webhooks!(url)
+      #   transfer_webhook(url)
+      #   address_confirmation_webhook(url)
+      # end
 
       # def fetch_address_id(address)
       #   currency = erc20_currency_id
@@ -188,64 +137,43 @@ module Peatio
       def fetch_transfer!(id)
         args = { cmd: "get_tx_info", txid: id }
         response = client.rest_api(args)
-        # response[currency.code]['balancef']
-        # 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?
-          #                 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 = define_transaction_state(response['status'])
-
-          # if response['outputs'].present?
-          #   output = response['outputs'].find { |out| out['address'] == to_address }
-          #   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(response['amountf']),
-            fee: 0,
-            fee_currency_id: response["coin"],
-            hash: normalize_txid(response['txid']),
-            to_address: response["payment_address"],
-            block_number: 0,
-            txout: 0,
-            status: state
-          )
-
-          transaction if transaction.valid?
-        # end.compact
+        state = define_transaction_state(response['status'])
+        transaction = Peatio::Transaction.new(
+          currency_id: @currency.fetch(:id),
+          amount: convert_from_base_unit(response['amountf']),
+          fee: 0,
+          fee_currency_id: response["coin"],
+          hash: normalize_txid(response['txid']),
+          to_address: response["payment_address"],
+          block_number: 0,
+          txout: 0,
+          status: state
+        )
+
+        transaction
       rescue Coinpayment::Client::Error => e
         raise Peatio::Wallet::ClientError, e
       end
 
-      def transfer_webhook(url)
-        client.rest_api(:post, "#{currency_id}/wallet/#{wallet_id}/webhooks", {
-          type: 'transfer',
-          allToken: true,
-          url: url,
-          label: "webhook for #{url}",
-          listenToFailureStates: false
-        })
-      end
+      # def transfer_webhook(url)
+      #   client.rest_api(:post, "#{currency_id}/wallet/#{wallet_id}/webhooks", {
+      #     type: 'transfer',
+      #     allToken: true,
+      #     url: url,
+      #     label: "webhook for #{url}",
+      #     listenToFailureStates: false
+      #   })
+      # end
 
-      def address_confirmation_webhook(url)
-        client.rest_api(:post, "#{currency_id}/wallet/#{wallet_id}/webhooks", {
-          type: 'address_confirmation',
-          allToken: true,
-          url: url,
-          label: "webhook for #{url}",
-          listenToFailureStates: false
-        })
-      end
+      # def address_confirmation_webhook(url)
+      #   client.rest_api(:post, "#{currency_id}/wallet/#{wallet_id}/webhooks", {
+      #     type: 'address_confirmation',
+      #     allToken: true,
+      #     url: url,
+      #     label: "webhook for #{url}",
+      #     listenToFailureStates: false
+      #   })
+      # end
 
       def parse_entries(entries)
         entries.map do |e|
@@ -258,8 +186,6 @@ module Peatio
         access_token = @wallet.fetch(:access_token) { raise Peatio::Wallet::MissingSettingError, :access_token }
         access_token2 = @wallet.fetch(:access_token2) { raise Peatio::Wallet::MissingSettingError, :access_token2 }
 
-        currency_code_prefix = @wallet.fetch(:testnet) ? 't' : ''
-        uri = uri.gsub(/\/+\z/, '') + '/' + currency_code_prefix
         @client ||= Client.new(uri, access_token, access_token2)
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: peatio-coinpaymentnew
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Harishankar Joshi
@@ -215,6 +215,9 @@ files:
 - peatio-coinpaymentnew-0.0.2.gem
 - peatio-coinpaymentnew-0.0.3.gem
 - peatio-coinpaymentnew-0.0.4.gem
+- peatio-coinpaymentnew-0.0.5.gem
+- peatio-coinpaymentnew-0.0.6.gem
+- peatio-coinpaymentnew-0.0.7.gem
 - peatio-coinpaymentnew.gemspec
 homepage: https://openware.com/
 licenses: