nanook 0.7.0 → 1.0.0

data/lib/nanook/wallet_account.rb

@@ -1,15 +1,30 @@
 class Nanook
   class WalletAccount
 
-    def initialize(wallet, account, rpc)
+    UNITS = [:raw, :nano]
+    DEFAULT_UNIT = :nano
+
+    def initialize(rpc, wallet, account)
+      @rpc = rpc
       @wallet = wallet
       @account = account
-      @rpc = rpc
 
       # An object to delegate account methods that don't
       # expect a wallet param in the RPC call, to allow this
       # class to support all methods that can be called on Nanook::Account
-      @nanook_account_instance = Nanook::Account.new(account, rpc)
+      @nanook_account_instance = Nanook::Account.new(@rpc, @account)
+
+      # Wallet instance to call contains? on to check account
+      # is in wallet
+      @nanook_wallet_instance = Nanook::Wallet.new(@rpc, @wallet)
+
+      if @account
+        account_must_belong_to_wallet!
+      end
+    end
+
+    def account_id
+      @account
     end
 
     def create
@@ -19,15 +34,32 @@ class Nanook
 
     def destroy
       wallet_required!
-      account_required!
-      rpc(:account_remove)[:removed] == 1
+      (rpc(:account_remove)[:removed] == 1).tap do |success|
+        @known_valid_accounts.delete(@account) if success
+      end
+    end
+
+    def inspect # :nodoc:
+      "#{self.class.name}(wallet_id: #{wallet_id}, account_id: #{account_id}, object_id: \"#{"0x00%x" % (object_id << 1)}\")"
     end
 
-    def pay(to:, amount:, id:)
+    def pay(to:, amount:, unit: DEFAULT_UNIT, id:)
       wallet_required!
-      account_required!
 
-      raw = Nanook::Util.NANO_to_raw(amount)
+      unless UNITS.include?(unit)
+        raise ArgumentError.new("Unsupported unit: #{unit}")
+      end
+
+      # Check that to: account is valid
+      unless Nanook::Account.new(@rpc, to).exists?
+        raise ArgumentError.new("To account does not exist (#{to})")
+      end
+
+      raw = if unit.to_sym.eql?(:nano)
+        Nanook::Util.NANO_to_raw(amount)
+      else
+        amount
+      end
 
       # account is called source, so don't use the normal rpc method
       p = {
@@ -38,13 +70,18 @@ class Nanook
         id: id
       }
 
-      @rpc.call(:send, p)[:block]
+      response = @rpc.call(:send, p)
+
+      if response.has_key?(:error)
+        return response[:error]
+      end
+
+      response[:block]
     end
 
     # Returns false if no block to receive
     def receive(block=nil)
       wallet_required!
-      account_required!
 
       if block.nil?
         _receive_without_block
@@ -53,6 +90,10 @@ class Nanook
       end
     end
 
+    def wallet_id
+      @wallet
+    end
+
     # Any method of Nanook::Account can be called on this class too
     def method_missing(m, *args, &block)
       if @nanook_account_instance.respond_to?(m)
@@ -97,10 +138,21 @@ class Nanook
       end
     end
 
-    def account_required!
+    def account_must_belong_to_wallet!
       if @account.nil?
         raise ArgumentError.new("Account must be present")
       end
+
+      @known_valid_accounts ||= []
+
+      # validate account is in wallet
+      return if @known_valid_accounts.include?(@account)
+
+      if @nanook_wallet_instance.contains?(@account)
+        @known_valid_accounts << @account
+      else
+        raise ArgumentError.new("Account does not exist in wallet. Account: #{@account}, wallet: #{@wallet}")
+      end
     end
 
   end

data/lib/nanook/work_peer.rb

@@ -13,6 +13,10 @@ class Nanook
       rpc(:work_peers_clear).has_key?(:success)
     end
 
+    def inspect # :nodoc:
+      "#{self.class.name}(object_id: \"#{"0x00%x" % (object_id << 1)}\")"
+    end
+
     def list
       rpc(:work_peers)[:work_peers]
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanook
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Luke Duncalfe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -133,6 +133,7 @@ files:
 - ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -140,6 +141,190 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- docs/0.7.0/apple-touch-icon.png
+- docs/0.7.0/classes/Nanook.html
+- docs/0.7.0/classes/Nanook/Account.html
+- docs/0.7.0/classes/Nanook/Block.html
+- docs/0.7.0/classes/Nanook/Error.html
+- docs/0.7.0/classes/Nanook/Key.html
+- docs/0.7.0/classes/Nanook/Node.html
+- docs/0.7.0/classes/Nanook/Rpc.html
+- docs/0.7.0/classes/Nanook/Util.html
+- docs/0.7.0/classes/Nanook/Wallet.html
+- docs/0.7.0/classes/Nanook/WalletAccount.html
+- docs/0.7.0/classes/Nanook/WorkPeer.html
+- docs/0.7.0/created.rid
+- docs/0.7.0/css/github.css
+- docs/0.7.0/css/main.css
+- docs/0.7.0/css/panel.css
+- docs/0.7.0/css/reset.css
+- docs/0.7.0/favicon.ico
+- docs/0.7.0/files/README_md.html
+- docs/0.7.0/files/lib/nanook/account_rb.html
+- docs/0.7.0/files/lib/nanook/block_rb.html
+- docs/0.7.0/files/lib/nanook/error_rb.html
+- docs/0.7.0/files/lib/nanook/key_rb.html
+- docs/0.7.0/files/lib/nanook/node_rb.html
+- docs/0.7.0/files/lib/nanook/rpc_rb.html
+- docs/0.7.0/files/lib/nanook/util_rb.html
+- docs/0.7.0/files/lib/nanook/version_rb.html
+- docs/0.7.0/files/lib/nanook/wallet_account_rb.html
+- docs/0.7.0/files/lib/nanook/wallet_rb.html
+- docs/0.7.0/files/lib/nanook/work_peer_rb.html
+- docs/0.7.0/files/lib/nanook_rb.html
+- docs/0.7.0/i/arrow-down.svg
+- docs/0.7.0/i/arrow-right.svg
+- docs/0.7.0/i/search.svg
+- docs/0.7.0/i/tree_bg.svg
+- docs/0.7.0/index.html
+- docs/0.7.0/js/highlight.pack.js
+- docs/0.7.0/js/jquery-1.3.2.min.js
+- docs/0.7.0/js/main.js
+- docs/0.7.0/js/navigation.js
+- docs/0.7.0/js/search_index.js
+- docs/0.7.0/js/searchdoc.js
+- docs/0.7.0/js/searcher.js
+- docs/0.7.0/panel/index.html
+- docs/0.7.0/panel/links.html
+- docs/0.7.0/panel/tree.js
+- docs/0.8.0/apple-touch-icon.png
+- docs/0.8.0/classes/Nanook.html
+- docs/0.8.0/classes/Nanook/Account.html
+- docs/0.8.0/classes/Nanook/Block.html
+- docs/0.8.0/classes/Nanook/Error.html
+- docs/0.8.0/classes/Nanook/Key.html
+- docs/0.8.0/classes/Nanook/Node.html
+- docs/0.8.0/classes/Nanook/Rpc.html
+- docs/0.8.0/classes/Nanook/Util.html
+- docs/0.8.0/classes/Nanook/Wallet.html
+- docs/0.8.0/classes/Nanook/WalletAccount.html
+- docs/0.8.0/classes/Nanook/WorkPeer.html
+- docs/0.8.0/created.rid
+- docs/0.8.0/css/github.css
+- docs/0.8.0/css/main.css
+- docs/0.8.0/css/panel.css
+- docs/0.8.0/css/reset.css
+- docs/0.8.0/favicon.ico
+- docs/0.8.0/files/README_md.html
+- docs/0.8.0/files/lib/nanook/account_rb.html
+- docs/0.8.0/files/lib/nanook/block_rb.html
+- docs/0.8.0/files/lib/nanook/error_rb.html
+- docs/0.8.0/files/lib/nanook/key_rb.html
+- docs/0.8.0/files/lib/nanook/node_rb.html
+- docs/0.8.0/files/lib/nanook/rpc_rb.html
+- docs/0.8.0/files/lib/nanook/util_rb.html
+- docs/0.8.0/files/lib/nanook/version_rb.html
+- docs/0.8.0/files/lib/nanook/wallet_account_rb.html
+- docs/0.8.0/files/lib/nanook/wallet_rb.html
+- docs/0.8.0/files/lib/nanook/work_peer_rb.html
+- docs/0.8.0/files/lib/nanook_rb.html
+- docs/0.8.0/i/arrow-down.svg
+- docs/0.8.0/i/arrow-right.svg
+- docs/0.8.0/i/search.svg
+- docs/0.8.0/i/tree_bg.svg
+- docs/0.8.0/index.html
+- docs/0.8.0/js/highlight.pack.js
+- docs/0.8.0/js/jquery-1.3.2.min.js
+- docs/0.8.0/js/main.js
+- docs/0.8.0/js/navigation.js
+- docs/0.8.0/js/search_index.js
+- docs/0.8.0/js/searchdoc.js
+- docs/0.8.0/js/searcher.js
+- docs/0.8.0/panel/index.html
+- docs/0.8.0/panel/links.html
+- docs/0.8.0/panel/tree.js
+- docs/1.0.0/apple-touch-icon.png
+- docs/1.0.0/classes/Nanook.html
+- docs/1.0.0/classes/Nanook/Account.html
+- docs/1.0.0/classes/Nanook/Block.html
+- docs/1.0.0/classes/Nanook/Error.html
+- docs/1.0.0/classes/Nanook/Key.html
+- docs/1.0.0/classes/Nanook/Node.html
+- docs/1.0.0/classes/Nanook/Rpc.html
+- docs/1.0.0/classes/Nanook/Util.html
+- docs/1.0.0/classes/Nanook/Wallet.html
+- docs/1.0.0/classes/Nanook/WalletAccount.html
+- docs/1.0.0/classes/Nanook/WorkPeer.html
+- docs/1.0.0/created.rid
+- docs/1.0.0/css/github.css
+- docs/1.0.0/css/main.css
+- docs/1.0.0/css/panel.css
+- docs/1.0.0/css/reset.css
+- docs/1.0.0/favicon.ico
+- docs/1.0.0/files/README_md.html
+- docs/1.0.0/files/lib/nanook/account_rb.html
+- docs/1.0.0/files/lib/nanook/block_rb.html
+- docs/1.0.0/files/lib/nanook/error_rb.html
+- docs/1.0.0/files/lib/nanook/key_rb.html
+- docs/1.0.0/files/lib/nanook/node_rb.html
+- docs/1.0.0/files/lib/nanook/rpc_rb.html
+- docs/1.0.0/files/lib/nanook/util_rb.html
+- docs/1.0.0/files/lib/nanook/version_rb.html
+- docs/1.0.0/files/lib/nanook/wallet_account_rb.html
+- docs/1.0.0/files/lib/nanook/wallet_rb.html
+- docs/1.0.0/files/lib/nanook/work_peer_rb.html
+- docs/1.0.0/files/lib/nanook_rb.html
+- docs/1.0.0/i/arrow-down.svg
+- docs/1.0.0/i/arrow-right.svg
+- docs/1.0.0/i/search.svg
+- docs/1.0.0/i/tree_bg.svg
+- docs/1.0.0/index.html
+- docs/1.0.0/js/highlight.pack.js
+- docs/1.0.0/js/jquery-1.3.2.min.js
+- docs/1.0.0/js/main.js
+- docs/1.0.0/js/navigation.js
+- docs/1.0.0/js/search_index.js
+- docs/1.0.0/js/searchdoc.js
+- docs/1.0.0/js/searcher.js
+- docs/1.0.0/panel/index.html
+- docs/1.0.0/panel/links.html
+- docs/1.0.0/panel/tree.js
+- docs/apple-touch-icon.png
+- docs/classes/Nanook.html
+- docs/classes/Nanook/Account.html
+- docs/classes/Nanook/Block.html
+- docs/classes/Nanook/Error.html
+- docs/classes/Nanook/Key.html
+- docs/classes/Nanook/Node.html
+- docs/classes/Nanook/Rpc.html
+- docs/classes/Nanook/Util.html
+- docs/classes/Nanook/Wallet.html
+- docs/classes/Nanook/WalletAccount.html
+- docs/classes/Nanook/WorkPeer.html
+- docs/created.rid
+- docs/css/github.css
+- docs/css/main.css
+- docs/css/panel.css
+- docs/css/reset.css
+- docs/favicon.ico
+- docs/files/README_md.html
+- docs/files/lib/nanook/account_rb.html
+- docs/files/lib/nanook/block_rb.html
+- docs/files/lib/nanook/error_rb.html
+- docs/files/lib/nanook/key_rb.html
+- docs/files/lib/nanook/node_rb.html
+- docs/files/lib/nanook/rpc_rb.html
+- docs/files/lib/nanook/util_rb.html
+- docs/files/lib/nanook/version_rb.html
+- docs/files/lib/nanook/wallet_account_rb.html
+- docs/files/lib/nanook/wallet_rb.html
+- docs/files/lib/nanook/work_peer_rb.html
+- docs/files/lib/nanook_rb.html
+- docs/i/arrow-down.svg
+- docs/i/arrow-right.svg
+- docs/i/search.svg
+- docs/i/tree_bg.svg
+- docs/index.html
+- docs/js/highlight.pack.js
+- docs/js/jquery-1.3.2.min.js
+- docs/js/main.js
+- docs/js/navigation.js
+- docs/js/search_index.js
+- docs/js/searchdoc.js
+- docs/js/searcher.js
+- docs/panel/index.html
+- docs/panel/links.html
+- docs/panel/tree.js
 - img/qr.png
 - lib/nanook.rb
 - lib/nanook/account.rb
@@ -174,7 +359,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby library for managing a nano currency node, including making and receiving