peatio-ndc 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ec659bbb61d542ea3bd80a5ab799b6e1e623f46f74982f7b9100251126790f6
-  data.tar.gz: 37e6574e95a0b8b50bf8d728199652ec9150b0860dab2cff39ab61dfbcf4a3cf
+  metadata.gz: a03e52e0c58b810d748551008411f42e8c6873e1652a9e02508da335d1de0b04
+  data.tar.gz: 2936ca54a8e8da5bfe4063109b8a6737f20f42af9ab74c222b1d8e781ece2cf9
 SHA512:
-  metadata.gz: d0db6b3dad66efb4ee7bcc00e82bfe0ca377e8b1fd15ff9d802c2192991b869b268c633e9250926c238dde2be68cee4e6156d7ae30ed40ae065ce9ea4cc728aa
-  data.tar.gz: 5ee0d9c7f304222f3a43cb9b184ae2ddd9f3e063ad12e7fd26fc9986c5d55806aa4751a32ef23d6df1a8cb068ad912e2fb0e64dd0fa9a6d7ae8c10cdddb0ce5b
+  metadata.gz: 304d9c2495db3da4e713fbe67ac154639e4beecedcfeda05e1f0f65cc21bb4a89ae1766d8c8feba10ccb84dc998a5ff5418ea1662137a53be9958bf641886095
+  data.tar.gz: cfec5b5b58128f86b336a9b4770f00338439d68b28d5879943a1cd0a0d6da066b09ac35a6ca55260fe643b94ba8ab0e211423d3b357a66ec5ad4cdd19a12391d

data/Gemfile.lock

@@ -1,38 +1,40 @@
 PATH
   remote: .
   specs:
-    peatio-nexbit (0.1.1)
+    peatio-ndc (0.1.1)
       activesupport (~> 5.2.3)
       better-faraday (~> 1.0.5)
       faraday (~> 0.15.4)
       memoist (~> 0.16.0)
-      peatio (~> 0.6.1)
+      net-http-persistent (~> 3.0.1)
+      peatio (~> 0.6.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activesupport (5.2.3)
+    activemodel (5.2.4.2)
+      activesupport (= 5.2.4.2)
+    activesupport (5.2.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     amq-protocol (2.3.0)
     amqp (1.8.0)
       amq-protocol (>= 2.2.0)
       eventmachine
-    better-faraday (1.0.5)
+    better-faraday (1.0.8)
       activesupport (>= 4.0, < 6.0)
       faraday (~> 0.12)
-    bunny (2.14.2)
+    bunny (2.14.4)
       amq-protocol (~> 2.3, >= 2.3.0)
-    byebug (11.0.1)
-    clamp (1.3.0)
+    byebug (11.1.1)
+    clamp (1.3.1)
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
+    connection_pool (2.2.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
@@ -42,21 +44,21 @@ GEM
     eventmachine (1.2.7)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    hashdiff (0.3.9)
+    hashdiff (1.0.1)
     http_parser.rb (0.6.0)
-    i18n (1.6.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     jwt (2.2.1)
-    memoist (0.16.0)
-    metaclass (0.0.4)
-    method_source (0.9.2)
-    minitest (5.11.3)
-    mocha (1.8.0)
-      metaclass (~> 0.0.1)
+    memoist (0.16.2)
+    method_source (1.0.0)
+    minitest (5.14.0)
+    mocha (1.11.2)
     multipart-post (2.1.1)
-    mysql2 (0.5.2)
-    peatio (0.6.1)
-      activemodel (~> 5.2.3)
+    mysql2 (0.5.3)
+    net-http-persistent (3.0.1)
+      connection_pool (~> 2.2)
+    peatio (0.6.3)
+      activemodel (> 5.2, <= 6.0.0)
       amqp
       bunny
       clamp
@@ -64,47 +66,47 @@ GEM
       eventmachine
       jwt
       mysql2
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.7.0)
+    pry (0.13.0)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
       byebug (~> 11.0)
-      pry (~> 0.10)
-    public_suffix (3.0.3)
+      pry (~> 0.13.0)
+    public_suffix (4.0.3)
     rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
     safe_yaml (1.0.5)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    webmock (3.5.1)
+    webmock (3.8.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-      hashdiff
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 1.17)
   mocha (~> 1.8)
-  peatio-nexbit!
+  peatio-ndc!
   pry-byebug
   rake (~> 10.0)
   rspec (~> 3.0)
   webmock (~> 3.5)
 
 BUNDLED WITH
-   1.16.3
+   1.17.3

data/README.md

@@ -1,4 +1,5 @@
 # Peatio::NDC
+[![Gem Version](https://badge.fury.io/rb/peatio-ndc.svg)](https://badge.fury.io/rb/peatio-ndc)
 
 Peatio ndc plugin for nPro [peatio] stack
 

data/lib/peatio/ndc/blockchain.rb

@@ -1,82 +1,85 @@
-module Ndc
-  # 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 Ndc
+    # 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 Ndc::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 Ndc::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 Ndc::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 ||= Ndc::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/ndc/client.rb

@@ -1,48 +1,61 @@
-module Ndc
-  class Client
-    Error = Class.new(StandardError)
+require 'memoist'
+require 'faraday'
+require 'better-faraday'
 
-    class ConnectionError < Error; end
+module Peatio
+  module Ndc
+    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/ndc/hooks.rb

@@ -1,5 +1,5 @@
 module Peatio
-  module Ndc
+  module Nexbit
     module Hooks
       BLOCKCHAIN_VERSION_REQUIREMENT = "~> 1.0.0"
       WALLET_VERSION_REQUIREMENT = "~> 1.0.0"
@@ -9,8 +9,8 @@ module Peatio
           unless Gem::Requirement.new(BLOCKCHAIN_VERSION_REQUIREMENT)
                                  .satisfied_by?(Gem::Version.new(Peatio::Blockchain::VERSION))
             [
-              "Ndc blockchain version requiremnt was not suttisfied by Peatio::Blockchain.",
-              "Ndc blockchain requires #{BLOCKCHAIN_VERSION_REQUIREMENT}.",
+              "Nexbit blockchain version requiremnt was not suttisfied by Peatio::Blockchain.",
+              "Nexbit blockchain requires #{BLOCKCHAIN_VERSION_REQUIREMENT}.",
               "Peatio::Blockchain version is #{Peatio::Blockchain::VERSION}"
             ].join('\n').tap { |s| Kernel.abort s }
           end
@@ -18,21 +18,21 @@ module Peatio
           unless Gem::Requirement.new(WALLET_VERSION_REQUIREMENT)
                                  .satisfied_by?(Gem::Version.new(Peatio::Wallet::VERSION))
             [
-              "Ndc wallet version requiremnt was not suttisfied by Peatio::Wallet.",
-              "Ndc wallet requires #{WALLET_VERSION_REQUIREMENT}.",
+              "Nexbit wallet version requiremnt was not suttisfied by Peatio::Wallet.",
+              "Nexbit wallet requires #{WALLET_VERSION_REQUIREMENT}.",
               "Peatio::Wallet version is #{Peatio::Wallet::VERSION}"
             ].join('\n').tap { |s| Kernel.abort s }
           end
         end
 
         def register
-          Peatio::Blockchain.registry[:Ndc] = Ndc::Blockchain.new
-          Peatio::Wallet.registry[:ndcd] = Ndc::Wallet.new
+          Peatio::Blockchain.registry[:nexbit] = Nexbit::Blockchain.new
+          Peatio::Wallet.registry[:nexbitd] = Nexbit::Wallet.new
         end
       end
 
       if defined?(Rails::Railtie)
-        require "peatio/ndc/railtie"
+        require "peatio/nexbit/railtie"
       else
         check_compatibility
         register

data/lib/peatio/ndc/railtie.rb

@@ -1,5 +1,5 @@
 module Peatio
-  module Ndc
+  module Nexbit
     class Railtie < Rails::Railtie
       config.before_initialize do
         Hooks.check_compatibility

data/lib/peatio/ndc/version.rb

@@ -1,5 +1,5 @@
 module Peatio
   module Ndc
-    VERSION = "0.1.0".freeze
+    VERSION = "0.1.2".freeze
   end
 end

data/lib/peatio/ndc/wallet.rb

@@ -1,58 +1,60 @@
-module Ndc
-  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 Ndc::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 Ndc::Client::Error => e
-      raise Peatio::Wallet::ClientError, e
-    end
-
-    def load_balance!
-      client.json_rpc(:getbalance).to_d
-
-    rescue Ndc::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 Ndc
+    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 Ndc::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 Ndc::Client::Error => e
+        raise Peatio::Wallet::ClientError, e
+      end
+
+      def load_balance!
+        client.json_rpc(:getbalance).to_d
+
+      rescue Ndc::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

data/peatio-ndc.gemspec

@@ -39,6 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "faraday", "~> 0.15.4"
   spec.add_dependency "memoist", "~> 0.16.0"
   spec.add_dependency "peatio", "~> 0.6.3"
+  spec.add_dependency "net-http-persistent", "~> 3.0.1"
 
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "mocha", "~> 1.8"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: peatio-ndc
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - BitBD
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.3
+- !ruby/object:Gem::Dependency
+  name: net-http-persistent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement