peatio-nexbit 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 977d1c1c61e069772cf34646ac239be1e317de6cd5601b47440facede9249fe2
-  data.tar.gz: 2931f46f272cc4ddb87d539b2e35a23e14de766769eea95bde50be9e1a115eb4
+  metadata.gz: ff46d7b79a5e6df6ebab164f67cdb0f871feec60429524c1a436e8511290fa61
+  data.tar.gz: 90f29909ff30698347514c0d6125cab42e50dbad7b2ae4cba8543bc69baa97b7
 SHA512:
-  metadata.gz: a1c9f47c3ce88afbe9d44a5b5b3f1bf6bfc616ec7f61d19a370aaa3b929eeb20b96b746717013a095498b73e3d946822c8395e195c9dd026b5ab0320c37a4d4e
-  data.tar.gz: 1a731bfbeec4ea456b4b85dba46f2951c57e961f2cc3e2e96f9eaefe5274d237583c59e6176054037eef4707e35aa94b944234cab7b379951e845c8adf570079
+  metadata.gz: 437eef825cf2086705eafe6e732bf973c9fc81847ac7790c006feb1af73d7df4f512711ca2d642830da550b429cd6d65906e9a63843bcebbf29f9f4748f47d9e
+  data.tar.gz: 150936d3f69fe8f9cd9e39845a4b4f8154383cca9f311d586a260d65ba0a5e4788d168a88f2e00f0da6255c5bfc747317a30c47f04f4455303e7db4a98e800d9

data/lib/peatio/nexbit/blockchain.rb

@@ -1,85 +1,82 @@
+module Nexbit
+  # TODO: Processing of unconfirmed transactions from mempool isn't supported now.
+  class Blockchain < Peatio::Blockchain::Abstract
 
-module Peatio
-  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
 
-      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 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 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 Client::Error => e
-        raise Peatio::Blockchain::ClientError, e
-      end
+    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 latest_block_number
+      client.json_rpc(:getblockcount)
+    rescue Nexbit::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
-
-        address_with_balance[1].to_d
-      rescue Client::Error => e
-        raise Peatio::Blockchain::ClientError, e
+      if address_with_balance.blank?
+        raise Peatio::Blockchain::UnavailableAddressBalanceError, address
       end
 
-      private
+      address_with_balance[1].to_d
+    rescue Nexbit::Client::Error => e
+      raise Peatio::Blockchain::ClientError, e
+    end
+
+    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 ||= Client.new(settings_fetch(:server))
-      end
+    def client
+      @client ||= Nexbit::Client.new(settings_fetch(:server))
+    end
 
-      def settings_fetch(key)
-        @settings.fetch(key) { raise Peatio::Blockchain::MissingSettingError, key.to_s }
-      end
+    def settings_fetch(key)
+      @settings.fetch(key) { raise Peatio::Blockchain::MissingSettingError, key.to_s }
     end
   end
 end

data/lib/peatio/nexbit/client.rb

@@ -1,61 +1,48 @@
-require 'memoist'
-require 'faraday'
-require 'better-faraday'
+module Nexbit
+  class Client
+    Error = Class.new(StandardError)
 
-module Peatio
-  module Nexbit
-    class Client
-      Error = Class.new(StandardError)
-      class ConnectionError < Error; end
+    class ConnectionError < Error; end
 
-      class ResponseError < Error
-        def initialize(code, msg)
-          @code = code
-          @msg = msg
-        end
-
-        def message
-          "#{@msg} (#{@code})"
-        end
+    class ResponseError < Error
+      def initialize(code, msg)
+        super "#{msg} (#{code})"
       end
+    end
 
-      extend Memoist
+    extend Memoist
 
-      def initialize(endpoint)
-        @json_rpc_endpoint = URI.parse(endpoint)
-      end
+    def initialize(endpoint, idle_timeout: 5)
+      @json_rpc_endpoint = URI.parse(endpoint)
+      @idle_timeout = idle_timeout
+    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
+    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
 
-      private
+    private
 
-      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
+    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)
         end
       end
-      memoize :connection
     end
   end
 end

data/lib/peatio/nexbit/version.rb

@@ -1,5 +1,5 @@
 module Peatio
   module Nexbit
-    VERSION = "0.1.2".freeze
+    VERSION = "0.1.3".freeze
   end
 end

data/lib/peatio/nexbit/wallet.rb

@@ -1,60 +1,58 @@
-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
+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)
     end
   end
 end

data/peatio-nexbit.gemspec

@@ -16,6 +16,17 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+ if spec.respond_to?(:metadata)
+
+    spec.metadata["homepage_uri"] = spec.homepage
+    spec.metadata["source_code_uri"] = "https://github.com/ndexnetwork/peatio-ndex"
+    spec.metadata["changelog_uri"] = "https://github.com/ndexnetwork/peatio-ndex/blob/master/CHANGELOG.md"
+  else
+    raise "RubyGems 2.0 or newer is required to protect against " \
+      "public gem pushes."
+  end
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
@@ -27,9 +38,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "better-faraday", "~> 1.0.5"
   spec.add_dependency "faraday", "~> 0.15.4"
   spec.add_dependency "memoist", "~> 0.16.0"
-  spec.add_dependency "peatio", "~> 0.6.1"
+  spec.add_dependency "peatio", "~> 0.6.3"
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "mocha", "~> 1.8"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peatio-nexbit
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - BitBD
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-11 00:00:00.000000000 Z
+date: 2020-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -198,7 +198,10 @@ files:
 homepage: https://nexbit.io/
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://nexbit.io/
+  source_code_uri: https://github.com/ndexnetwork/peatio-ndex
+  changelog_uri: https://github.com/ndexnetwork/peatio-ndex/blob/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths: