peatio-goldcoin 2.6.1 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a44b68aa25e27515c869b56433eba2a57eeb916871a9ce24c333efe45ab64a27
-  data.tar.gz: 9defd08215cb9fb5b3012c1a79694da41842176071e07980d47b7e59a29d979d
+  metadata.gz: 41051340cc25563221456f9ce0f24177b1618d99588555d6efd453cceff5730d
+  data.tar.gz: 1c4ee8560e044564be986f552ad040d086fa17269d3525fccbbed62e6a8a4829
 SHA512:
-  metadata.gz: 267070b8a93fbbffcd634829671d5d78fbb04d873d9d56f9c2c12d00a4ce17af156fe58455df22c3965213d4d0236d04eb033a513499f73ee2e674f105586753
-  data.tar.gz: 0d09f1add62bcef8cccfa4716eca2f95a1e098ac546f2d5940cec74a544cbe928f9fb4bde00a1f30e544161ef1b2d53ef2a48a2bcf5737e802de46934409551e
+  metadata.gz: c0c9d80b9cf1e21cfc6d47e587f5ae1b06651af93e3c63e369e931011c37240d6d474651d2166380eeefb77e234de6fb87782bf07afce6d6e69780c92af57fed
+  data.tar.gz: 5a5897f96ebfe092ea59285867553e3ebd44e1ef1a6d10e054d41e7571600dd87a9605e6891e51aa5748ea33d534026ebd436f73dcecd268e609a936e5d657c0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    peatio-goldcoin (2.6.1)
+    peatio-goldcoin (2.6.2)
       activesupport (~> 5.2.3)
       better-faraday (~> 1.0.5)
       faraday (~> 0.17)

data/lib/peatio/goldcoin/blockchain.rb

@@ -1,17 +1,17 @@
-# frozen_string_literal: true
 
 module Peatio
   module Goldcoin
     # TODO: Processing of unconfirmed transactions from mempool isn't supported now.
     class Blockchain < Peatio::Blockchain::Abstract
+
       DEFAULT_FEATURES = {case_sensitive: true, cash_addr_format: false}.freeze
 
-      def initialize(custom_features={})
+      def initialize(custom_features = {})
         @features = DEFAULT_FEATURES.merge(custom_features).slice(*SUPPORTED_FEATURES)
         @settings = {}
       end
 
-      def configure(settings={})
+      def configure(settings = {})
         # Clean client state during configure.
         @client = nil
         @settings.merge!(settings.slice(*SUPPORTED_SETTINGS))
@@ -20,15 +20,51 @@ module Peatio
       def fetch_block!(block_number)
         block_hash = client.json_rpc(:getblockhash, [block_number])
 
-        block_txs = client.json_rpc(:getblock, [block_hash])
-                          .fetch("tx").each_with_object([]) do |tx, txs_array|
+        client.json_rpc(:getblock, [block_hash])
+          .fetch('tx').each_with_object([]) do |tx, txs_array|
           txs = build_transaction(tx).map do |ntx|
             Peatio::Transaction.new(ntx.merge(block_number: block_number))
           end
           txs_array.append(*txs)
-        end
+        end.yield_self { |txs_array| Peatio::Block.new(block_number, txs_array) }
+      rescue Client::Error => e
+        raise Peatio::Blockchain::ClientError, e
+      end
 
-        Peatio::Block.new(block_number, block_txs)
+      def latest_block_number
+        client.json_rpc(:getblockcount)
+      rescue Client::Error => e
+        raise Peatio::Blockchain::ClientError, e
+      end
+
+module Peatio
+  module Goldcoin
+    # TODO: Processing of unconfirmed transactions from mempool isn't supported now.
+    class Blockchain < Peatio::Blockchain::Abstract
+
+      DEFAULT_FEATURES = {case_sensitive: true, cash_addr_format: false}.freeze
+
+      def initialize(custom_features = {})
+        @features = DEFAULT_FEATURES.merge(custom_features).slice(*SUPPORTED_FEATURES)
+        @settings = {}
+      end
+
+      def configure(settings = {})
+        # Clean client state during configure.
+        @client = nil
+        @settings.merge!(settings.slice(*SUPPORTED_SETTINGS))
+      end
+
+      def fetch_block!(block_number)
+        block_hash = client.json_rpc(:getblockhash, [block_number])
+
+        client.json_rpc(:getblock, [block_hash])
+          .fetch('tx').each_with_object([]) do |tx, txs_array|
+          txs = build_transaction(tx).map do |ntx|
+            Peatio::Transaction.new(ntx.merge(block_number: block_number))
+          end
+          txs_array.append(*txs)
+        end.yield_self { |txs_array| Peatio::Block.new(block_number, txs_array) }
       rescue Client::Error => e
         raise Peatio::Blockchain::ClientError, e
       end
@@ -41,10 +77,12 @@ module Peatio
 
       def load_balance_of_address!(address, _currency_id)
         address_with_balance = client.json_rpc(:listaddressgroupings)
-                                     .flatten(1)
-                                     .find {|addr| addr[0] == address }
+                                 .flatten(1)
+                                 .find { |addr| addr[0] == address }
 
-        raise Peatio::Blockchain::UnavailableAddressBalanceError, address if address_with_balance.blank?
+        if address_with_balance.blank?
+          raise Peatio::Blockchain::UnavailableAddressBalanceError, address
+        end
 
         address_with_balance[1].to_d
       rescue Client::Error => e
@@ -53,18 +91,18 @@ module Peatio
 
       private
 
-      def filter_vout(tx_hash)
-        tx_hash.fetch("vout").select do |entry|
-          entry.fetch("value").to_d.positive? && entry["scriptPubKey"].has_key?("addresses")
-        end
-      end
-
       def build_transaction(tx_hash)
-        filter_vout(tx_hash).each_with_object([]) do |entry, formatted_txs|
-          no_currency_tx = {hash: tx_hash["txid"], txout: entry["n"],
-                            to_address: entry["scriptPubKey"]["addresses"][0],
-                            amount: entry.fetch("value").to_d,
-                            status: "success"}
+        tx_hash.fetch('vout')
+          .select do |entry|
+          entry.fetch('value').to_d > 0 &&
+            entry['scriptPubKey'].has_key?('addresses')
+        end
+          .each_with_object([]) do |entry, formatted_txs|
+          no_currency_tx =
+            { hash: tx_hash['txid'], txout: entry['n'],
+              to_address: entry['scriptPubKey']['addresses'][0],
+              amount: entry.fetch('value').to_d,
+              status: 'success' }
 
           # Build transaction for each currency belonging to blockchain.
           settings_fetch(:currencies).pluck(:id).each do |currency_id|

data/lib/peatio/goldcoin/client.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "memoist"
-require "faraday"
-require "better-faraday"
+require 'memoist'
+require 'faraday'
+require 'better-faraday'
 
 module Peatio
   module Goldcoin
@@ -27,23 +27,38 @@ module Peatio
         @json_rpc_endpoint = URI.parse(endpoint)
       end
 
-      def json_rpc(method, params=[])
-        response = post(method, params)
-
+      def json_rpc(method, params = [])
+        response = connection.post \
+          '/',
+          { jsonrpc: '1.0', method: method, params: params }.to_json,
+          { 'Accept' => 'application/json',
+            'Content-Type' => 'application/json' }
         response.assert_2xx!
         response = JSON.parse(response.body)
-
-        response["error"].tap do |e|
-          raise ResponseError.new(e["code"], e["message"]) if e
+        response['error'].tap do |e|
+          raise ResponseError.new(e['code'], e['message']) if e
         end
-
-        response.fetch("result")
+        response.fetch('result')
       rescue Faraday::Error => e
         raise ConnectionError, e
       end
 
       private
 
+      def connection
+        @connection ||= Faraday.new(@json_rpc_endpoint) do |f|
+                          f.adapter :net_http_persistent, pool_size: 5
+                        end.tap do |connection|
+          unless @json_rpc_endpoint.user.blank?
+            connection.basic_auth(@json_rpc_endpoint.user,
+                                  @json_rpc_endpoint.password)
+          end
+        end
+      end
+    end
+  end
+end
+
       def post(method, params)
         connection.post("/", {jsonrpc: "1.0", method: method, params: params}.to_json,
                         "Accept" => "application/json", "Content-Type" => "application/json")

data/lib/peatio/goldcoin/version.rb

@@ -2,6 +2,6 @@
 
 module Peatio
   module Goldcoin
-    VERSION = "2.6.1".freeze
+    VERSION = "2.6.2".freeze
   end
 end

data/lib/peatio/goldcoin/wallet.rb

@@ -1,8 +1,7 @@
-# frozen_string_literal: true
-
 module Peatio
   module Goldcoin
     class Wallet < Peatio::Wallet::Abstract
+
       DEFAULT_FEATURES = { skip_deposit_collection: false }.freeze
 
       def initialize(custom_features = {})
@@ -10,35 +9,35 @@ module Peatio
         @settings = {}
       end
 
-      def configure(settings={})
+      def configure(settings = {})
         # Clean client state during configure.
         @client = nil
 
         @settings.merge!(settings.slice(*SUPPORTED_SETTINGS))
 
-        @wallet = @settings.fetch(:wallet) {
+        @wallet = @settings.fetch(:wallet) do
           raise Peatio::Wallet::MissingSettingError, :wallet
-        }.slice(:uri, :address)
+        end.slice(:uri, :address)
 
-        @currency = @settings.fetch(:currency) {
+        @currency = @settings.fetch(:currency) do
           raise Peatio::Wallet::MissingSettingError, :currency
-        }.slice(:id, :base_factor, :options)
+        end.slice(:id, :base_factor, :options)
       end
 
-      def create_address!(_options={})
-        {address: client.json_rpc(:getnewaddress)}
+      def create_address!(_options = {})
+        { address: client.json_rpc(:getnewaddress) }
       rescue Goldcoin::Client::Error => e
         raise Peatio::Wallet::ClientError, e
       end
 
-      def create_transaction!(transaction, options={})
+      def create_transaction!(transaction, options = {})
         txid = client.json_rpc(:sendtoaddress,
                                [
                                  transaction.to_address,
                                  transaction.amount,
-                                 "",
-                                 "",
-                                 options[:subtract_fee].to_s == "true" # subtract fee from transaction amount.
+                                 '',
+                                 '',
+                                 options[:subtract_fee].to_s == 'true' # subtract fee from transaction amount.
                                ])
         transaction.hash = txid
         transaction
@@ -46,6 +45,25 @@ module Peatio
         raise Peatio::Wallet::ClientError, e
       end
 
+      def load_balance!
+        client.json_rpc(:getbalance).to_d
+
+      rescue Goldcoin::Client::Error => e
+        raise Peatio::Wallet::ClientError, e
+      end
+
+      private
+
+      def client
+        uri = @wallet.fetch(:uri) { raise Peatio::Wallet::MissingSettingError, :uri }
+        @client ||= Client.new(uri)
+      end
+    end
+  end
+end
+
+      end
+
       def load_balance!
         client.json_rpc(:getbalance).to_d
       rescue Goldcoin::Client::Error => e

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: peatio-goldcoin
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.2
 platform: ruby
 authors:
 - D.H.