nano_rpc 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 398fcb208cafcf1794eb86fa3b702c71c6f407269f8e6b5fc62f4aba01723962
-  data.tar.gz: 5f1aba5ff4388f0d38f27bde71e8f98d7828de87c19200a07cc55ead2c4b4420
+  metadata.gz: ab9b6be210c8fdb43aa96f222c19ad183399eaa2c90a8fc9f2eb2097c536ea73
+  data.tar.gz: 55d91925f916c4f6c1263c8fd3c20b6cf5f7f75ffdba0aff7190d88d35aac55b
 SHA512:
-  metadata.gz: cf3758cc36b0ac0056361f96a395b9cd436b5da8e442bdd98e5469b67c780761873f20dbd079ae4c6b226b00cda44eefe2546d6feb04b98b17e4ea8b0179a1c2
-  data.tar.gz: ae7d2e3f7027ac6ec9b284844ae61d965ed1337c374b12a34010c331983f319dc47c003e2d1f944fb77b5806ade679456bba66ec723853542a9eb32899651752
+  metadata.gz: 72abd38cbfd8d95a25b44ac5125e9dab3572d2833898e2ca3f29f9cdb6a581232920108686c3b4f3c4f6084a8b7688e0929cbe0682bd4211c7c0b2f3658f7d6a
+  data.tar.gz: f10b7c61cf10d6e7d7b91646cbbfda600a8dab1e513a7f027dc0a9d93e12a7f45c5fbeeea3376ac1b7d50f58cb85134663dc580bf7682a90ffd9ca9d67aab8b2

data/.rubocop.yml

@@ -1,7 +1,15 @@
 require: rubocop-rspec
+RSpec/ExampleLength:
+  Max: 8
+RSpec/MultipleExpectations:
+  Enabled: false
+RSpec/NestedGroups:
+  Max: 4
+RSpec/SubjectStub:
+  Enabled: false
 
 AllCops:
-  TargetRubyVersion: 2.5.3
+  TargetRubyVersion: 2.6.1
   Exclude:
     - bin/*
     - nano_rpc.gemspec

data/README.md

@@ -12,7 +12,8 @@ To run a Nano node locally, see [Nano Docker Docs](https://github.com/clemahieu/
 
 | Gem version | Nanocurrency version |
 |-------------|----------------------|
-| 0.24        | >= 17.0              |
+| 0.25        | >= 18.0              |
+| 0.24        | >= 17.0, < 18.0      |
 | 0.23        | >= 16.0, < 17.0      |
 | 0.20        | >= 15.0, < 16.0      |
 | 0.19        | >= 14.2, < 15.0      |

data/lib/nano_rpc.rb

@@ -13,9 +13,9 @@ require 'nano_rpc/methods/node_methods'
 require 'nano_rpc/methods/wallet_methods'
 
 require 'nano_rpc/proxy'
-require 'nano_rpc/proxies/account'
-require 'nano_rpc/proxies/accounts'
-require 'nano_rpc/proxies/wallet'
+require 'nano_rpc/account'
+require 'nano_rpc/accounts'
+require 'nano_rpc/wallet'
 
 require 'nano_rpc/node'
 require 'nano_rpc/errors'

data/lib/nano_rpc/errors.rb

@@ -9,5 +9,5 @@ module NanoRpc
   class InvalidRequest < Error; end
   class MissingParameters < Error; end
   class NodeConnectionFailure < Error; end
-  class NodeOpenTimeout < Error; end
+  class NodeTimeout < Error; end
 end

data/lib/nano_rpc/helpers/node_helper.rb

@@ -14,8 +14,12 @@ module NanoRpc::NodeHelper
     NanoRpc::Accounts.new(addresses, node: self)
   end
 
-  def create_wallet
-    NanoRpc::Wallet.new(wallet_create.wallet, node: self)
+  def clear_stats
+    stats_clear.success == ''
+  end
+
+  def create_wallet(seed: nil)
+    NanoRpc::Wallet.new(wallet_create(seed: seed).wallet, node: self)
   end
 
   def knano_from_raw(amount:)

data/lib/nano_rpc/helpers/wallet_helper.rb

@@ -39,8 +39,8 @@ module NanoRpc::WalletHelper
     password_change(password: new_password).changed == 1
   end
 
-  def change_seed(new_seed:)
-    wallet_change_seed(seed: new_seed).success == ''
+  def change_seed(new_seed:, count: 0)
+    wallet_change_seed(seed: new_seed, count: count).success == ''
   end
 
   def contains?(account:)
@@ -58,7 +58,7 @@ module NanoRpc::WalletHelper
   end
 
   def destroy
-    wallet_destroy == {}
+    wallet_destroy.destroyed == 1
   end
 
   def enter_password(password:)
@@ -74,6 +74,10 @@ module NanoRpc::WalletHelper
     wallet_frontiers.frontiers
   end
 
+  def history(modified_since: 0)
+    wallet_history(modified_since: modified_since).history
+  end
+
   def init_payment
     payment_init.status == 'Ready'
   end

data/lib/nano_rpc/methods/node_methods.rb

@@ -39,7 +39,8 @@ module NanoRpc::NodeMethods
       },
       bootstrap_status: {},
       chain: {
-        required: %i[block count]
+        required: %i[block count],
+        optional: %i[offset reverse]
       },
       confirmation_active: {},
       confirmation_history: {},
@@ -81,12 +82,15 @@ module NanoRpc::NodeMethods
       payment_wait: {
         required: %i[account amount timeout]
       },
-      peers: {},
+      peers: {
+        optional: %i[peer_details]
+      },
       pending_exists: {
         required: %i[hash]
       },
       process: {
-        required: %i[block]
+        required: %i[block],
+        optional: %i[force subtype]
       },
       rai_from_raw: {
         required: %i[amount]
@@ -108,12 +112,17 @@ module NanoRpc::NodeMethods
         required: %i[wallet]
       },
       search_pending_all: {},
+      sign: {
+        optional: %i[account hash key wallet]
+      },
       stats: {
         required: %i[type]
       },
+      stats_clear: {},
       stop: {},
       successors: {
-        required: %i[block count]
+        required: %i[block count],
+        optional: %i[offset reverse]
       },
       unchecked: {
         required: %i[count]
@@ -125,8 +134,11 @@ module NanoRpc::NodeMethods
       unchecked_keys: {
         required: %i[key count]
       },
+      uptime: {},
       version: {},
-      wallet_create: {},
+      wallet_create: {
+        optional: %i[seed]
+      },
       work_cancel: {
         required: %i[hash]
       },

data/lib/nano_rpc/methods/wallet_methods.rb

@@ -49,7 +49,8 @@ module NanoRpc::WalletMethods
         optional: %i[threshold]
       },
       wallet_change_seed: {
-        required: %i[seed]
+        required: %i[seed],
+        optional: %i[count]
       },
       wallet_contains: {
         required: %i[account]
@@ -57,6 +58,9 @@ module NanoRpc::WalletMethods
       wallet_destroy: {},
       wallet_export: {},
       wallet_frontiers: {},
+      wallet_history: {
+        optional: %i[modified_since]
+      },
       wallet_info: {},
       wallet_ledger: {},
       wallet_locked: {},
@@ -66,7 +70,8 @@ module NanoRpc::WalletMethods
       },
       wallet_representative: {},
       wallet_representative_set: {
-        required: %i[representative]
+        required: %i[representative],
+        optional: %i[update_existing_accounts]
       },
       wallet_republish: {
         required: %i[count]

data/lib/nano_rpc/node.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'rest-client'
+require 'http'
 require 'json'
 
 module NanoRpc
@@ -13,7 +13,7 @@ class NanoRpc::Node
   include NanoRpc::NodeMethods
   include NanoRpc::Proxy
 
-  attr_reader :host, :port, :auth, :headers, :node, :timeout
+  attr_reader :host, :port
 
   DEFAULT_TIMEOUT = 60
 
@@ -66,39 +66,29 @@ class NanoRpc::Node
   end
 
   def rpc_post(params)
-    response = rest_client_post(params)
-    ensure_status_success(response)
-    data = NanoRpc::Response.new(JSON[response&.body])
+    data = NanoRpc::Response.new(node_response(params))
     ensure_valid_response(data)
 
     data
   end
 
-  def request_headers
-    h = headers || {}
+  def headers
+    h = @headers || {}
     h['Content-Type'] = 'json'
-    h['Authorization'] = auth unless auth.nil?
+    h['Authorization'] = @auth if @auth
     h
   end
 
-  def rest_client_post(params)
-    execute_post(params)
-  rescue Errno::ECONNREFUSED
-    raise NanoRpc::NodeConnectionFailure,
-          "Node connection failure at #{url}"
-  rescue RestClient::Exceptions::OpenTimeout
-    raise NanoRpc::NodeOpenTimeout,
-          'Node failed to respond in time'
+  def node_response(params)
+    JSON[http_post(params).body.to_s]
   end
 
-  def execute_post(params)
-    RestClient::Request.execute(
-      method: :post,
-      url: url,
-      headers: request_headers,
-      payload: params.to_json,
-      timeout: timeout
-    )
+  def http_post(params)
+    HTTP.timeout(@timeout).post(url, headers: headers, body: params.to_json)
+  rescue HTTP::ConnectionError
+    raise NanoRpc::NodeConnectionFailure, "Node unreachable at #{url}"
+  rescue HTTP::TimeoutError
+    raise NanoRpc::NodeTimeout, "Node timeout after #{@timeout} seconds"
   end
 
   def url
@@ -109,15 +99,8 @@ class NanoRpc::Node
     end
   end
 
-  def ensure_status_success(response)
-    return if response&.code == 200
-    raise NanoRpc::BadRequest,
-          "Error response from node: #{JSON[response&.body]}"
-  end
-
   def ensure_valid_response(data)
     return unless data['error']
-    raise NanoRpc::InvalidRequest,
-          "Invalid request: #{data['error']}"
+    raise NanoRpc::InvalidRequest, "Invalid request: #{data['error']}"
   end
 end

data/lib/nano_rpc/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module NanoRpc
-  VERSION = '0.24.0'
+  VERSION = '0.25.0'
 end

data/nano_rpc.gemspec

@@ -34,5 +34,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov-rcov', '~> 0.2.3'
 
   spec.add_runtime_dependency 'hashie', '~> 3.6', '>= 3.6.0'
-  spec.add_runtime_dependency 'rest-client', '~> 2.0', '>= 2.0.2'
+  spec.add_runtime_dependency 'http', '~> 4.0', '>= 4.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nano_rpc
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Justin Craig-Kuhn (JCK)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2019-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -157,25 +157,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.6'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 4.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 4.0.5
 description: An RPC wrapper for Nano digital currency nodes. Arbitrary RPC access
   is provided along with proxy objects that expose helper methods.
 email:
@@ -194,6 +194,8 @@ files:
 - bin/console
 - bin/setup
 - lib/nano_rpc.rb
+- lib/nano_rpc/account.rb
+- lib/nano_rpc/accounts.rb
 - lib/nano_rpc/errors.rb
 - lib/nano_rpc/helpers/account_helper.rb
 - lib/nano_rpc/helpers/accounts_helper.rb
@@ -206,12 +208,10 @@ files:
 - lib/nano_rpc/methods/wallet_methods.rb
 - lib/nano_rpc/node.rb
 - lib/nano_rpc/numeric.rb
-- lib/nano_rpc/proxies/account.rb
-- lib/nano_rpc/proxies/accounts.rb
-- lib/nano_rpc/proxies/wallet.rb
 - lib/nano_rpc/proxy.rb
 - lib/nano_rpc/response.rb
 - lib/nano_rpc/version.rb
+- lib/nano_rpc/wallet.rb
 - nano_rpc.gemspec
 homepage: https://github.com/jcraigk/ruby_nano_rpc
 licenses:
@@ -232,8 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: RPC wrapper for Nano digital nodes written in Ruby