peatio-nexbit 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a82ea55c191482e1d753cb610ca3a3ca91bcc08e6eb3a40c8ab0ed13992c1b44
-  data.tar.gz: 59a0bde26769ec15dc2fcfaa8bc6994587b241fce4a254145cc4aac8c499dcf6
+  metadata.gz: 13ff7fb6158882cd96c628152920a9ce24568d3bf889e6fc1c3942800972c78c
+  data.tar.gz: 8ad637e6d4228a8d60d483ee73dcc116a29b030f06810db5ef232f9b9b13072a
 SHA512:
-  metadata.gz: 5e44e3d307ec6d334b69e907242fc86574c3d38066662a7010fa77e8125960d3acc00ae6a77d8e4b65969ca72ea330f9c4ee0d247f0e13955c8bf2f88e27b5f3
-  data.tar.gz: 3acc9945551f5c2294ce2d7300e5f2d8f4c543f0f34b9a4ec31996f0393a865f02433663ea09d80f71efc9d9d403f2aa1fc508ae1112d3d2e450f4de56a4097a
+  metadata.gz: 2bb54d4ba7be7b7d058ccdfbeb0bc7628708055c078263df987aca25d1a36e5863950fcf35dd41fbdc91b5a03180b70421cf68c095f1df61a7e212bbe2aa16a0
+  data.tar.gz: 16d31ceab3543fd72b0b9577105dc3b1120d6d3264cdfde31b34f2ce87be562702a9980baef98dff433598a4ab6087b3dc795f1cd1c51baebeae6068a9cec797

data/lib/peatio/nexbit/blockchain.rb

@@ -1,82 +1,85 @@
-module Nexbit
-  # 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
+module Peatio
+  module Nexbit
+    # TODO: Processing of unconfirmed transactions from mempool isn't supported now.
+    class Blockchain < Peatio::Blockchain::Abstract
 
-    def initialize(custom_features = {})
-      @features = DEFAULT_FEATURES.merge(custom_features).slice(*SUPPORTED_FEATURES)
-      @settings = {}
-    end
+      DEFAULT_FEATURES = {case_sensitive: true, cash_addr_format: false}.freeze
 
-    def configure(settings = {})
-      # Clean client state during configure.
-      @client = nil
-      @settings.merge!(settings.slice(*SUPPORTED_SETTINGS))
-    end
+      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])
+      def fetch_block!(block_number)
+        block_hash = client.json_rpc(:getblockhash, [block_number])
 
-      client.json_rpc(:getblock, [block_hash, 2])
-        .fetch('tx').each_with_object([]) do |tx, txs_array|
+        client.json_rpc(:getblock, [block_hash, 2])
+          .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 Nexbit::Client::Error => e
-      raise Peatio::Blockchain::ClientError, e
-    end
+      rescue Client::Error => e
+        raise Peatio::Blockchain::ClientError, e
+      end
 
-    def latest_block_number
-      client.json_rpc(:getblockcount)
-    rescue Nexbit::Client::Error => e
-      raise Peatio::Blockchain::ClientError, e
-    end
+      def latest_block_number
+        client.json_rpc(:getblockcount)
+      rescue Client::Error => e
+        raise Peatio::Blockchain::ClientError, e
+      end
 
-    def load_balance_of_address!(address, _currency_id)
-      address_with_balance = client.json_rpc(:listaddressgroupings)
-                                   .flatten(1)
-                                   .find { |addr| addr[0] == address }
+      def load_balance_of_address!(address, _currency_id)
+        address_with_balance = client.json_rpc(:listaddressgroupings)
+                                 .flatten(1)
+                                 .find { |addr| addr[0] == address }
 
-      if address_with_balance.blank?
-        raise Peatio::Blockchain::UnavailableAddressBalanceError, address
-      end
+        if address_with_balance.blank?
+          raise Peatio::Blockchain::UnavailableAddressBalanceError, address
+        end
 
-      address_with_balance[1].to_d
-    rescue Nexbit::Client::Error => e
-      raise Peatio::Blockchain::ClientError, e
-    end
+        address_with_balance[1].to_d
+      rescue Client::Error => e
+        raise Peatio::Blockchain::ClientError, e
+      end
 
-    private
+      private
 
-    def build_transaction(tx_hash)
-      tx_hash.fetch('vout')
-        .select do |entry|
+      def build_transaction(tx_hash)
+        tx_hash.fetch('vout')
+          .select do |entry|
           entry.fetch('value').to_d > 0 &&
-          entry['scriptPubKey'].has_key?('addresses')
+            entry['scriptPubKey'].has_key?('addresses')
         end
-        .each_with_object([]) do |entry, formatted_txs|
+          .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|
-              formatted_txs << no_currency_tx.merge(currency_id: currency_id)
-            end
+          # Build transaction for each currency belonging to blockchain.
+          settings_fetch(:currencies).pluck(:id).each do |currency_id|
+            formatted_txs << no_currency_tx.merge(currency_id: currency_id)
+          end
         end
-    end
+      end
 
-    def client
-      @client ||= Nexbit::Client.new(settings_fetch(:server))
-    end
+      def client
+        @client ||= Client.new(settings_fetch(:server))
+      end
 
-    def settings_fetch(key)
-      @settings.fetch(key) { raise Peatio::Blockchain::MissingSettingError, key.to_s }
+      def settings_fetch(key)
+        @settings.fetch(key) { raise Peatio::Blockchain::MissingSettingError, key.to_s }
+      end
     end
   end
 end

data/lib/peatio/nexbit/client.rb

@@ -1,48 +1,61 @@
-module Nexbit
-  class Client
-    Error = Class.new(StandardError)
+require 'memoist'
+require 'faraday'
+require 'better-faraday'
 
-    class ConnectionError < Error; end
+module Peatio
+  module Nexbit
+    class Client
+      Error = Class.new(StandardError)
+      class ConnectionError < Error; end
 
-    class ResponseError < Error
-      def initialize(code, msg)
-        super "#{msg} (#{code})"
+      class ResponseError < Error
+        def initialize(code, msg)
+          @code = code
+          @msg = msg
+        end
+
+        def message
+          "#{@msg} (#{@code})"
+        end
       end
-    end
 
-    extend Memoist
+      extend Memoist
 
-    def initialize(endpoint, idle_timeout: 5)
-      @json_rpc_endpoint = URI.parse(endpoint)
-      @idle_timeout = idle_timeout
-    end
+      def initialize(endpoint)
+        @json_rpc_endpoint = URI.parse(endpoint)
+      end
 
-    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_success!
-      response = JSON.parse(response.body)
-      response['error'].tap { |error| raise ResponseError.new(error['code'], error['message']) if error }
-      response.fetch('result')
-    rescue Faraday::Error => e
-      raise ConnectionError, e
-    rescue StandardError => e
-      raise Error, e
-    end
+      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 { |e| raise ResponseError.new(e['code'], e['message']) if e }
+        response.fetch('result')
+      rescue => e
+        if e.is_a?(Error)
+          raise e
+        elsif e.is_a?(Faraday::Error)
+          raise ConnectionError, e
+        else
+          raise Error, e
+        end
+      end
 
-    private
+      private
 
-    def connection
-      @connection ||= Faraday.new(@json_rpc_endpoint) do |f|
-        f.adapter :net_http_persistent, pool_size: 5, idle_timeout: @idle_timeout
-      end.tap do |connection|
-        unless @json_rpc_endpoint.user.blank?
-          connection.basic_auth(@json_rpc_endpoint.user, @json_rpc_endpoint.password)
+      def connection
+        Faraday.new(@json_rpc_endpoint).tap do |connection|
+          unless @json_rpc_endpoint.user.blank?
+            connection.basic_auth(@json_rpc_endpoint.user,
+                                  @json_rpc_endpoint.password)
+          end
         end
       end
+      memoize :connection
     end
   end
 end

data/lib/peatio/nexbit/version.rb

@@ -1,5 +1,5 @@
 module Peatio
   module Nexbit
-    VERSION = "0.1.4".freeze
+    VERSION = "0.1.5".freeze
   end
 end

data/lib/peatio/nexbit/wallet.rb

@@ -1,58 +1,60 @@
-module Nexbit
-  class Wallet < Peatio::Wallet::Abstract
-
-    def initialize(settings = {})
-      @settings = settings
-    end
-
-    def configure(settings = {})
-      # Clean client state during configure.
-      @client = nil
-
-      @settings.merge!(settings.slice(*SUPPORTED_SETTINGS))
-
-      @wallet = @settings.fetch(:wallet) do
-        raise Peatio::Wallet::MissingSettingError, :wallet
-      end.slice(:uri, :address)
-
-      @currency = @settings.fetch(:currency) do
-        raise Peatio::Wallet::MissingSettingError, :currency
-      end.slice(:id, :base_factor, :options)
-    end
-
-    def create_address!(_options = {})
-      { address: client.json_rpc(:getnewaddress) }
-    rescue Nexbit::Client::Error => e
-      raise Peatio::Wallet::ClientError, e
-    end
-
-    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.
-                             ])
-      transaction.hash = txid
-      transaction
-    rescue Nexbit::Client::Error => e
-      raise Peatio::Wallet::ClientError, e
-    end
-
-    def load_balance!
-      client.json_rpc(:getbalance).to_d
-
-    rescue Nexbit::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, idle_timeout: 1)
+module Peatio
+  module Nexbit
+    class Wallet < Peatio::Wallet::Abstract
+
+      def initialize(settings = {})
+        @settings = settings
+      end
+
+      def configure(settings = {})
+        # Clean client state during configure.
+        @client = nil
+
+        @settings.merge!(settings.slice(*SUPPORTED_SETTINGS))
+
+        @wallet = @settings.fetch(:wallet) do
+          raise Peatio::Wallet::MissingSettingError, :wallet
+        end.slice(:uri, :address)
+
+        @currency = @settings.fetch(:currency) do
+          raise Peatio::Wallet::MissingSettingError, :currency
+        end.slice(:id, :base_factor, :options)
+      end
+
+      def create_address!(_options = {})
+        { address: client.json_rpc(:getnewaddress) }
+      rescue Nexbit::Client::Error => e
+        raise Peatio::Wallet::ClientError, e
+      end
+
+      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.
+                               ])
+        transaction.hash = txid
+        transaction
+      rescue Nexbit::Client::Error => e
+        raise Peatio::Wallet::ClientError, e
+      end
+
+      def load_balance!
+        client.json_rpc(:getbalance).to_d
+
+      rescue Nexbit::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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: peatio-nexbit
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - BitBD
@@ -231,7 +231,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Gem for extending Peatio plugable system with Nexbit implementation.