nano_rpc 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d161d743c5ec1f860437f0c90189ed939280bc090f135cbacd7f9c442404000
-  data.tar.gz: ff48c6fdd7cbf214ff0d967e5fdf924ad6c51aa5a803dfbe3f92c343d453a19e
+  metadata.gz: 51594de4d5c25a44368e84aea129bfe04cc01f28654efdd70101a77b86361111
+  data.tar.gz: 3dcedfce43a868796ea107807a4a196cd4e78d5416ebaae4289d3911fbbb8a88
 SHA512:
-  metadata.gz: a71a9d9558fb9abdca9484158761567edb522cf29322e36a764811c5b669e3eeb086f3d3125ca94d3de862e45b8cf071a1bd3fb48f1534c6251ccd0f0f4f32b4
-  data.tar.gz: c928cd95666dd0e84e67f71275e6d475947c90da9c89a82cfb1ae6f4193c87a9686c1dec3ba004c722373f20f3dca857c4c285c7fc652c64d61792d8552a4e41
+  metadata.gz: 5df2f32a0c02eada1f18af7d460de1d01b1e9cf762091168047855cba46f002dbcda51f42c662ff29a1dbddc31ac14b0dbe1725d9602a57e2726bab4f650f214
+  data.tar.gz: d0cdd6a9ba34c543f8cd7039abc6e0cc368ea862e2770cfceb2f49c9cb8af538570eea14d870c7dc1aab1012fe359ee92970df819ac5b9a8c0e59351f61b8191

data/lib/nano_rpc.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 require 'nano_rpc/version'
+require 'nano_rpc/helpers/application_helper'
+require 'nano_rpc/helpers/account_helper'
+require 'nano_rpc/helpers/accounts_helper'
+require 'nano_rpc/helpers/node_helper'
+require 'nano_rpc/helpers/wallet_helper'
 require 'nano_rpc/client'
 require 'nano_rpc/errors'
 require 'nano_rpc/proxy'
 require 'nano_rpc/response'
-require 'nano_rpc/helpers/application_helper'
-require 'nano_rpc/helpers/account_proxy_helper'
-require 'nano_rpc/helpers/accounts_proxy_helper'
-require 'nano_rpc/helpers/node_proxy_helper'
-require 'nano_rpc/helpers/wallet_proxy_helper'
 require 'nano_rpc/proxies/account'
 require 'nano_rpc/proxies/accounts'
 require 'nano_rpc/proxies/node'

data/lib/nano_rpc/client.rb

@@ -8,6 +8,8 @@ module Nano
   end
 
   class Client
+    include Nano::ApplicationHelper
+
     attr_accessor :host, :port
 
     def initialize(host: 'localhost', port: 7076)
@@ -15,6 +17,11 @@ module Nano
       @port = port
     end
 
+    # Condense host/port on object inspection
+    def inspect
+      "#{inspect_prefix}, @url=\"#{@host}:#{port}\">"
+    end
+
     def call(action, params = {})
       args = { action: action }
       args.merge!(params) if params.is_a?(Hash)

data/lib/nano_rpc/helpers/{account_proxy_helper.rb → account_helper.rb}

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-module Nano::AccountProxyHelper
+module Nano::AccountHelper
   include Nano::ApplicationHelper
 
   def balance
@@ -10,9 +10,9 @@ module Nano::AccountProxyHelper
     account_block_count.block_count
   end
 
-  def history(opts)
+  def history(*args)
     account_history(
-      count: opts_pluck(opts, :count)
+      pluck_argument(args, :count)
     ).history
   end
 
@@ -26,15 +26,15 @@ module Nano::AccountProxyHelper
 
   def move(from:, to:)
     account_move(
-      wallet: wallet_seed(to),
-      source: wallet_seed(from),
+      wallet: object_to_value(to),
+      source: object_to_value(from),
       accounts: [address]
     ).moved == 1
   end
 
   def wallet_work_set(wallet:, work:)
     work_set(
-      wallet: wallet_seed(wallet),
+      wallet: object_to_value(wallet),
       work: work
     ).success == ''
   end
@@ -53,9 +53,9 @@ module Nano::AccountProxyHelper
   end
   alias blocks_pending pending_blocks
 
-  def remove(opts)
+  def remove(*args)
     account_remove(
-      wallet: wallet_seed(opts_pluck(opts, :wallet))
+      pluck_argument(args, :wallet)
     ).removed == 1
   end
 
@@ -65,7 +65,7 @@ module Nano::AccountProxyHelper
 
   def representative_set(wallet:, representative:)
     account_representative_set(
-      wallet: wallet_seed(wallet),
+      wallet: object_to_value(wallet),
       representative: representative
     ).set == 1
   end

data/lib/nano_rpc/helpers/{accounts_proxy_helper.rb → accounts_helper.rb}

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-module Nano::AccountsProxyHelper
+module Nano::AccountsHelper
   include Nano::ApplicationHelper
 
   def balances
@@ -25,8 +25,8 @@ module Nano::AccountsProxyHelper
 
   def move(from:, to:)
     account_move(
-      source: wallet_seed(from),
-      wallet: wallet_seed(to)
+      source: object_to_value(from),
+      wallet: object_to_value(to)
     ).moved == 1
   end
 

data/lib/nano_rpc/helpers/application_helper.rb

@@ -2,19 +2,26 @@
 module Nano::ApplicationHelper
   private
 
-  def opts_pluck(opts, key)
-    opts.is_a?(Hash) ? opts[key] : opts
+  def pluck_argument(args, key, arg_key = nil)
+    k = arg_key || key
+    arg = args.first
+    v = arg.is_a?(Hash) ? arg[key] : arg
+    { k => object_to_value(v) }
   end
 
-  def wallet_seed(wallet)
-    wallet.is_a?(Nano::Wallet) ? wallet.seed : wallet
+  def object_to_value(arg)
+    if arg.is_a?(Nano::Wallet)
+      arg.seed
+    elsif arg.is_a?(Nano::Account)
+      arg.address
+    elsif arg.is_a?(Nano::Accounts)
+      arg.addresses
+    else
+      arg
+    end
   end
 
-  def account_address(account)
-    account.is_a?(Nano::Account) ? account.address : account
-  end
-
-  def accounts_addresses(accounts)
-    accounts.is_a?(Nano::Accounts) ? accounts.addresses : accounts
+  def inspect_prefix
+    "#<#{self.class}:#{format('0x00%x', object_id << 1)}"
   end
 end

data/lib/nano_rpc/helpers/node_helper.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+module Nano::NodeHelper
+  include Nano::ApplicationHelper
+
+  def account_containing_block(*args)
+    block_account(pluck_argument(args, :hash)).account
+  end
+
+  def create_wallet
+    Nano::Wallet.new(wallet_create.wallet)
+  end
+
+  def knano_from_raw(*args)
+    krai_from_raw(pluck_argument(args, :amount)).amount
+  end
+
+  def knano_to_raw(*args)
+    krai_to_raw(pluck_argument(args, :amount)).amount
+  end
+
+  def mnano_from_raw(*args)
+    mrai_from_raw(pluck_argument(args, :amount)).amount
+  end
+
+  def mnano_to_raw(*args)
+    mrai_to_raw(pluck_argument(args, :amount)).amount
+  end
+
+  def nano_from_raw(*args)
+    rai_from_raw(pluck_argument(args, :amount)).amount
+  end
+
+  def nano_to_raw(*args)
+    rai_to_raw(pluck_argument(args, :amount)).amount
+  end
+
+  def num_frontiers
+    frontier_count['count']
+  end
+
+  def pending_exists?(*args)
+    pending_exists(pluck_argument(args, :hash)).exists == 1
+  end
+
+  def total_supply
+    available_supply.available
+  end
+
+  def work_valid?(work:, hash:)
+    work_validate(work: work, hash: hash).valid == 1
+  end
+end

data/lib/nano_rpc/helpers/{wallet_proxy_helper.rb → wallet_helper.rb}

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
-module Nano::WalletProxyHelper
+module Nano::WalletHelper
   include Nano::ApplicationHelper
 
-  def account_work(opts)
-    work_get(
-      account: account_address(opts_pluck(opts, :account))
-    ).work
+  def account_work(*args)
+    work_get(pluck_argument(args, :account)).work
   end
 
   def accounts
+    return [] unless account_list.accounts.size.positive?
     Nano::Accounts.new(account_list.accounts)
   end
 
@@ -32,22 +31,20 @@ module Nano::WalletProxyHelper
     payment_begin.account
   end
 
-  def change_password(opts)
+  def change_password(*args)
     password_change(
-      password: opts_pluck(opts, :new_password)
+      pluck_argument(args, :new_password, :password)
     ).changed == 1
   end
 
-  def change_seed(opts)
+  def change_seed(*args)
     wallet_change_seed(
-      seed: opts_pluck(opts, :new_seed)
+      pluck_argument(args, :new_seed, :seed)
     ).success == ''
   end
 
-  def contains?(opts)
-    wallet_contains(
-      account: account_address(opts_pluck(opts, :account))
-    ).exists == 1
+  def contains?(*args)
+    wallet_contains(pluck_argument(args, :account)).exists == 1
   end
 
   def create_account(work: true)
@@ -62,10 +59,8 @@ module Nano::WalletProxyHelper
     wallet_destroy
   end
 
-  def enter_password(opts)
-    password_enter(
-      password: opts_pluck(opts, :password)
-    ).valid == 1
+  def enter_password(*args)
+    password_enter(pluck_argument(args, :password)).valid == 1
   end
 
   def export
@@ -86,16 +81,14 @@ module Nano::WalletProxyHelper
 
   def move_accounts(to:, accounts:)
     account_move(
-      wallet: wallet_seed(to),
+      wallet: object_to_value(to),
       source: seed,
-      accounts: accounts_addresses(accounts)
+      accounts: object_to_value(accounts)
     ).moved == 1
   end
 
-  def password_valid?(opts)
-    password_valid(
-      password: opts_pluck(opts, :password)
-    ).valid == 1
+  def password_valid?(*args)
+    password_valid(pluck_argument(args, :password)).valid == 1
   end
 
   def pending_balance
@@ -123,44 +116,42 @@ module Nano::WalletProxyHelper
 
   def receive_block(account:, block:)
     receive(
-      account: account_address(account),
+      account: object_to_value(account),
       block: block
     ).block
   end
 
-  def remove_account(opts)
-    account_remove(
-      account: account_address(opts_pluck(opts, :account))
-    ).removed == 1
+  def remove_account(*args)
+    account_remove(pluck_argument(args, :account)).removed == 1
   end
 
   def representative
     wallet_representative.representative
   end
 
-  def republish(opts)
-    wallet_republish(count: opts_pluck(opts, :count)).blocks
+  def republish(*args)
+    wallet_republish(pluck_argument(args, :count)).blocks
   end
 
   def account_work_set(account:, work:)
     work_set(
-      account: account_address(account),
+      account: object_to_value(account),
       work: work
     ).success == ''
   end
   alias set_account_work account_work_set
 
-  def representative_set(opts)
+  def representative_set(*args)
     wallet_representative_set(
-      representative: opts_pluck(opts, :representative)
+      pluck_argument(args, :representative)
     ).set == 1
   end
   alias set_representative representative_set
 
   def send_nano(from:, to:, amount:, work: nil)
     send_currency(
-      source: wallet_seed(from),
-      destination: wallet_seed(to),
+      source: object_to_value(from),
+      destination: object_to_value(to),
       amount: amount,
       work: work
     ).block

data/lib/nano_rpc/proxies/account.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 class Nano::Account
   include Nano::Proxy
-  include Nano::AccountProxyHelper
+  include Nano::AccountHelper
 
-  attr_accessor :address
+  attr_reader :address
 
   def initialize(address = nil, opts = {})
     unless address.is_a?(String)
@@ -31,7 +31,6 @@ class Nano::Account
   proxy_method :delegators
   proxy_method :delegators_count
   proxy_method :frontiers, required: %i[count]
-  proxy_method :frontier_count
   proxy_method :ledger,
                required: %i[count],
                optional: %i[representative weight pending sorting]

data/lib/nano_rpc/proxies/accounts.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 class Nano::Accounts
   include Nano::Proxy
-  include Nano::AccountsProxyHelper
+  include Nano::AccountsHelper
 
-  attr_accessor :addresses
+  attr_reader :addresses
 
   def initialize(addresses = nil, opts = {})
     unless addresses.is_a?(Array)

data/lib/nano_rpc/proxies/node.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 class Nano::Node
   include Nano::Proxy
-  include Nano::NodeProxyHelper
+  include Nano::NodeHelper
 
   proxy_method :available_supply
   proxy_method :block, required: %i[hash]
@@ -17,6 +17,7 @@ class Nano::Node
   proxy_method :bootstrap_any
   proxy_method :chain, required: %i[block count]
   proxy_method :deterministic_key, required: %i[seed index]
+  proxy_method :frontier_count
   proxy_method :history, required: %i[hash count]
   proxy_method :keepalive, required: %i[address port]
   proxy_method :key_create

data/lib/nano_rpc/proxies/wallet.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 class Nano::Wallet
   include Nano::Proxy
-  include Nano::WalletProxyHelper
+  include Nano::WalletHelper
 
-  attr_accessor :seed
+  attr_reader :seed
 
   def initialize(seed = nil, opts = {})
     unless seed.is_a?(String)
@@ -15,6 +15,11 @@ class Nano::Wallet
     super(opts)
   end
 
+  # Hide secret seed on object inspection
+  def inspect
+    "#{inspect_prefix}, @client=#{@client.inspect}>"
+  end
+
   proxy_params wallet: :seed
 
   proxy_method :account_create, optional: %i[work]

data/lib/nano_rpc/proxy.rb

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 module Nano::Proxy
+  include Nano::ApplicationHelper
+
   attr_accessor :client
 
   def initialize(opts = {})
     @client = opts[:client] || Nano.client
+    self.class.proxy_methods.each { |m| define_proxy_method(m) }
   end
 
   def self.included(base)
@@ -24,42 +27,33 @@ module Nano::Proxy
     def proxy_methods
       proxy_method_def.keys.sort
     end
-
-    def methods
-      (super + proxy_methods).sort
-    end
   end
 
   def proxy_methods
     self.class.proxy_methods
   end
 
-  def methods
-    (super + proxy_methods).sort
-  end
-
   private
 
-  def method_missing(m, *args, &_block)
-    return super unless methods.include?(m)
-    define_proxy_method(m)
-    send(m, args.first)
-  end
-
-  def respond_to_missing?(m, include_private = false)
-    methods.include?(m) || super
-  end
-
   def define_proxy_method(m)
-    self.class.send(:define_method, method_alias(m)) do |call_args = {}|
+    self.class.send(:define_method, method_alias(m)) do |*args|
       @m = m
-      @call_args = call_args
+      @call_args = hashify_args(args)
 
       validate_params!
       execute_call
     end
   end
 
+  def hashify_args(args)
+    if args.first.is_a?(Hash)
+      args.first
+    else
+      (args[1].is_a?(Hash) ? args[1] : {})
+        .merge!(pluck_argument(args, required_params.first))
+    end
+  end
+
   def execute_call
     expose_nested_data(@client.call(@m, @call_args))
   end

data/lib/nano_rpc/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Nano
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nano_rpc
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Justin Craig-Kuhn (JCK)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2018-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -154,11 +154,11 @@ files:
 - lib/nano_rpc.rb
 - lib/nano_rpc/client.rb
 - lib/nano_rpc/errors.rb
-- lib/nano_rpc/helpers/account_proxy_helper.rb
-- lib/nano_rpc/helpers/accounts_proxy_helper.rb
+- lib/nano_rpc/helpers/account_helper.rb
+- lib/nano_rpc/helpers/accounts_helper.rb
 - lib/nano_rpc/helpers/application_helper.rb
-- lib/nano_rpc/helpers/node_proxy_helper.rb
-- lib/nano_rpc/helpers/wallet_proxy_helper.rb
+- lib/nano_rpc/helpers/node_helper.rb
+- lib/nano_rpc/helpers/wallet_helper.rb
 - lib/nano_rpc/proxies/account.rb
 - lib/nano_rpc/proxies/accounts.rb
 - lib/nano_rpc/proxies/node.rb

data/lib/nano_rpc/helpers/node_proxy_helper.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-module Nano::NodeProxyHelper
-  include Nano::ApplicationHelper
-
-  def account_containing_block(opts)
-    block_account(opts_hash(opts)).account
-  end
-
-  def available_nano
-    available_supply.available
-  end
-
-  def create_wallet
-    Nano::Wallet.new(wallet_create.wallet)
-  end
-
-  def pending_exists?(opts)
-    pending_exists(opts_hash(opts)).exists == 1
-  end
-
-  def work_valid?(work:, hash:)
-    work_validate(work: work, hash: hash).valid == 1
-  end
-
-  private
-
-  def opts_hash(opts)
-    { hash: opts_pluck(opts, :hash) }
-  end
-end