zold 0.2 → 0.3

data/lib/zold/commands/pay.rb

@@ -19,7 +19,7 @@
 # SOFTWARE.
 
 require 'slop'
-require_relative '../log.rb'
+require_relative '../log'
 
 # PAY command.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -28,30 +28,53 @@ require_relative '../log.rb'
 module Zold
   # Money sending command
   class Pay
-    def initialize(payer:, receiver:, amount:,
-      pvtkey:, details: '-', log: Log::Quiet.new)
-      @payer = payer
-      @receiver = receiver
-      @amount = amount
+    def initialize(wallets:, pvtkey:, log: Log::Quiet.new)
+      @wallets = wallets
       @pvtkey = pvtkey
-      @details = details
       @log = log
     end
 
     def run(args = [])
-      opts = Slop.parse(args) do |o|
-        o.bool '--force', 'Ignore all validations'
+      opts = Slop.parse(args, help: true) do |o|
+        o.banner = "Usage: zold pay wallet invoice amount [details] [options]
+Where:
+    'wallet' is the sender's wallet ID
+    'invoice' is the beneficiary's invoice number, generated by 'zold invoice'
+    'amount' is the amount to pay, in ZLD, for example '14.95'
+    'details' is the optional text to attach to the payment
+Available options:"
+        o.bool '--force',
+          'Ignore all validations',
+          default: false
+        o.bool '--help', 'Print instructions'
       end
-      unless opts['force']
-        raise "The amount can't be negative: #{@amount}" if @amount.negative?
-        if !@payer.root? && @payer.balance < @amount
-          raise "There is not enough funds in #{@payer} to send #{@amount}, \
-  only #{@payer.balance} left"
+      if opts.help?
+        @log.info(opts.to_s)
+        return
+      end
+      raise 'Payer wallet ID is required' if opts.arguments[0].nil?
+      from = @wallets.find(Zold::Id.new(opts.arguments[0]))
+      raise 'Wallet doesn\'t exist, do \'fetch\' first' unless from.exists?
+      raise 'Recepient\'s invoice is required' if opts.arguments[1].nil?
+      invoice = opts.arguments[1]
+      raise 'Amount is required (in ZLD)' if opts.arguments[2].nil?
+      amount = Zold::Amount.new(zld: opts.arguments[2].to_f)
+      details = opts.arguments[3] ? opts.arguments[3] : '-'
+      pay(from, invoice, amount, details, opts)
+    end
+
+    def pay(from, invoice, amount, details, opts)
+      unless opts.force?
+        raise 'The amount can\'t be zero' if amount.zero?
+        raise "The amount can't be negative: #{amount}" if amount.negative?
+        if !from.root? && from.balance < @amount
+          raise "There is not enough funds in #{from} to send #{amount}, \
+  only #{payer.balance} left"
         end
       end
-      txn = @payer.sub(@amount, @receiver, @pvtkey, @details)
-      @log.debug("#{@amount} sent from #{@payer} to #{@receiver}: #{@details}")
-      @log.info(txn[:id])
+      txn = from.sub(amount, invoice, @pvtkey, details)
+      @log.debug("#{amount} sent from #{from} to #{invoice}: #{details}")
+      @log.info(txn.id)
       txn
     end
   end

data/lib/zold/commands/propagate.rb

@@ -18,9 +18,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require_relative '../log.rb'
-require_relative '../wallet.rb'
-require_relative '../wallets.rb'
+require_relative '../log'
+require_relative '../wallet'
+require_relative '../wallets'
+require_relative '../prefixes'
 
 # PROPAGATE command.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -29,25 +30,44 @@ require_relative '../wallets.rb'
 module Zold
   # PROPAGATE pulling command
   class Propagate
-    def initialize(wallet:, wallets:, log: Log::Quiet.new)
-      @wallet = wallet
+    def initialize(wallets:, log: Log::Quiet.new)
       @wallets = wallets
       @log = log
     end
 
-    def run(_ = [])
-      me = @wallet.id
-      @wallet.txns.select { |t| t[:amount].negative? }.each do |t|
-        target = @wallets.find(t[:bnf])
+    def run(args = [])
+      opts = Slop.parse(args, help: true) do |o|
+        o.banner = "Usage: zold propagate [ID...] [options]
+Available options:"
+        o.bool '--help', 'Print instructions'
+      end
+      if opts.help?
+        @log.info(opts.to_s)
+        return
+      end
+      raise 'At least one wallet ID is required' if opts.arguments.empty?
+      opts.arguments.each do |id|
+        propagate(@wallets.find(id), opts)
+      end
+    end
+
+    def propagate(wallet, _)
+      me = wallet.id
+      wallet.txns.select { |t| t.amount.negative? }.each do |t|
+        target = @wallets.find(t.bnf)
         unless target.exists?
-          @log.debug("#{t[:amount].mul(-1)} to #{t[:bnf]}: wallet is absent")
+          @log.debug("#{t.amount.mul(-1)} to #{t.bnf}: wallet is absent")
+          next
+        end
+        next if target.has?(t.id, me)
+        unless Prefixes.new(target).valid?(t.prefix)
+          @log.info("#{t.amount.mul(-1)} to #{t.bnf}: wrong prefix")
           next
         end
-        next if target.has?(t[:id], me)
-        target.add(t)
-        @log.info("#{t[:amount].mul(-1)} to #{t[:bnf]}")
+        target.add(t.inverse(me))
+        @log.info("#{t.amount.mul(-1)} to #{t.bnf}")
       end
-      @log.debug('Wallet propagated successfully')
+      @log.debug("Wallet #{me} propagated successfully")
     end
   end
 end

data/lib/zold/commands/push.rb

@@ -18,9 +18,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require 'slop'
 require 'net/http'
-require_relative '../log.rb'
-require_relative '../http.rb'
+require_relative '../log'
+require_relative '../id'
+require_relative '../http'
 
 # PUSH command.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -29,21 +31,37 @@ require_relative '../http.rb'
 module Zold
   # Wallet pushing command
   class Push
-    def initialize(wallet:, remotes:, log: Log::Quiet.new)
-      @wallet = wallet
+    def initialize(wallets:, remotes:, log: Log::Quiet.new)
+      @wallets = wallets
       @remotes = remotes
       @log = log
     end
 
-    def run(_ = [])
-      raise 'The wallet is absent' unless @wallet.exists?
+    def run(args = [])
+      opts = Slop.parse(args, help: true) do |o|
+        o.banner = "Usage: zold push [ID...] [options]
+Available options:"
+        o.bool '--help', 'Print instructions'
+      end
+      if opts.help?
+        @log.info(opts.to_s)
+        return
+      end
+      raise 'At least one wallet ID is required' if opts.arguments.empty?
+      opts.arguments.each do |id|
+        push(@wallets.find(Id.new(id)), opts)
+      end
+    end
+
+    def push(wallet, _)
+      raise 'The wallet is absent' unless wallet.exists?
       remote = @remotes.all[0]
-      uri = URI("#{remote[:home]}/wallet/#{@wallet.id}")
-      response = Http.new(uri).put(File.read(@wallet.path))
+      uri = URI("#{remote[:home]}/wallet/#{wallet.id}")
+      response = Http.new(uri).put(File.read(wallet.path))
       unless response.code == '200'
         raise "Failed to push to #{uri}: #{response.code}/#{response.message}"
       end
-      @log.info("The #{@wallet.id} pushed to #{uri}")
+      @log.info("The #{wallet.id} pushed to #{uri}")
     end
   end
 end

data/lib/zold/commands/remote.rb

@@ -18,14 +18,15 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require 'slop'
 require 'rainbow'
 require 'net/http'
 require 'json'
 require 'time'
-require_relative '../log.rb'
-require_relative '../http.rb'
-require_relative '../remotes.rb'
-require_relative '../score.rb'
+require_relative '../log'
+require_relative '../http'
+require_relative '../remotes'
+require_relative '../score'
 
 # REMOTE command.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -56,48 +57,60 @@ Available commands:
     #{Rainbow('remote update').green}
       Check each registered remote node for availability
 Available options:"
+        o.bool '--ignore-score-weakness',
+          'Don\'t complain when their score is too weak',
+          default: false
         o.bool '--help', 'Print instructions'
       end
       command = args[0]
       case command
       when 'show'
-        @remotes.all.each do |r|
-          score = Rainbow("/#{r[:score]}").color(r[:score] > 0 ? :green : :red)
-          @log.info(r[:host] + Rainbow(":#{r[:port]}").gray + score)
-        end
+        show
       when 'clean'
-        @remotes.clean
-        @log.debug('All remote nodes deleted')
+        clean
       when 'reset'
-        @remotes.reset
-        @log.debug('Remote nodes set back to default')
+        reset
       when 'add'
-        host = args[1]
-        port = args[2]
-        @remotes.add(host, port)
-        @log.info("#{host}:#{port}: added")
+        add(opts.arguments[1], opts.arguments[2].to_i)
       when 'remove'
-        host = args[1]
-        port = args[2]
-        @remotes.remove(host, port)
-        @log.info("#{host}:#{port}: removed")
+        remove(opts.arguments[1], opts.arguments[2].to_i)
       when 'update'
-        update
-        total = @remotes.all.size
-        if total.zero?
-          @log.debug("The list of remotes is #{Rainbow('empty').red}!")
-          @log.debug(
-            "Run 'zold remote add b1.zold.io 80` and then `zold update`"
-          )
-        else
-          @log.debug("There are #{total} known remotes")
-        end
+        update(opts)
       else
         @log.info(opts.to_s)
       end
     end
 
-    def update
+    def show
+      @remotes.all.each do |r|
+        score = Rainbow("/#{r[:score]}").color(r[:score] > 0 ? :green : :red)
+        @log.info(r[:host] + Rainbow(":#{r[:port]}").gray + score)
+      end
+    end
+
+    def clean
+      @remotes.clean
+      @log.debug('All remote nodes deleted')
+    end
+
+    def reset
+      @remotes.reset
+      @log.debug('Remote nodes set back to default')
+    end
+
+    def add(host, port)
+      @remotes.add(host, port)
+      @log.info("#{host}:#{port} added to the list")
+      @log.info("There are #{@remotes.all.count} remote nodes in the list")
+    end
+
+    def remove(host, port)
+      @remotes.remove(host, port)
+      @log.info("#{host}:#{port} removed from the list")
+      @log.info("There are #{@remotes.all.count} remote nodes in the list")
+    end
+
+    def update(opts)
       @remotes.all.each do |r|
         uri = URI("#{r[:home]}remotes")
         res = Http.new(uri).get
@@ -111,7 +124,7 @@ Available options:"
         begin
           json = JSON.parse(res.body)
         rescue JSON::ParserError => e
-          @remotes.remove(r[:host], r[:port])
+          remove(r[:host], r[:port])
           @log.info("#{Rainbow(r[:host]).red} \"#{e.message}\": #{res.body}")
           next
         end
@@ -120,19 +133,35 @@ Available options:"
           r[:port], json['score']['suffixes']
         )
         unless score.valid?
-          @remotes.remove(r[:host], r[:port])
+          remove(r[:host], r[:port])
           @log.info("#{Rainbow(r[:host]).red} invalid score")
           next
         end
+        if score.strength < Score::STRENGTH && !opts['ignore-score-weakness']
+          remove(r[:host], r[:port])
+          @log.info(
+            "#{Rainbow(r[:host]).red} score too weak: #{score.strength}"
+          )
+          next
+        end
         @remotes.rescore(r[:host], r[:port], score.value)
         json['all'].each do |s|
           unless @remotes.exists?(s['host'], s['port'])
-            run(['add', s['host'], s['port'].to_s])
+            add(s['host'], s['port'])
           end
         end
         @log.info("#{r[:host]}:#{r[:port]}: #{Rainbow(score.value).green} \
 (v.#{json['version']})")
       end
+      total = @remotes.all.size
+      if total.zero?
+        @log.debug("The list of remotes is #{Rainbow('empty').red}!")
+        @log.debug(
+          "Run 'zold remote add b1.zold.io 80` and then `zold update`"
+        )
+      else
+        @log.debug("There are #{total} known remotes")
+      end
     end
   end
 end

data/lib/zold/commands/show.rb

@@ -18,7 +18,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require_relative '../log.rb'
+require 'slop'
+require_relative '../log'
+require_relative '../id'
+require_relative '../amount'
 
 # SHOW command.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -27,18 +30,40 @@ require_relative '../log.rb'
 module Zold
   # Show command
   class Show
-    def initialize(wallet:, log: Log::Quiet.new)
-      @wallet = wallet
+    def initialize(wallets:, log: Log::Quiet.new)
+      @wallets = wallets
       @log = log
     end
 
-    def run(_ = [])
-      balance = @wallet.balance
-      @log.debug("The balance of #{@wallet} is #{balance}:")
-      @wallet.txns.each do |t|
-        @log.info("##{t[:id]} #{t[:date].utc.iso8601} \
-#{t[:amount]} #{t[:bnf]} #{t[:details]}")
+    def run(args = [])
+      opts = Slop.parse(args, help: true) do |o|
+        o.banner = "Usage: zold show [ID...] [options]
+Available options:"
+        o.bool '--help', 'Print instructions'
       end
+      if opts.help?
+        @log.info(opts.to_s)
+        return
+      end
+      if opts.arguments.empty?
+        require_relative 'list'
+        List.new(wallets: @wallets, log: @log).run(args)
+      else
+        total = Amount::ZERO
+        opts.arguments.each do |id|
+          total += show(@wallets.find(Id.new(id)), opts)
+        end
+        total
+      end
+    end
+
+    def show(wallet, _)
+      balance = wallet.balance
+      wallet.txns.each do |t|
+        @log.info("##{t.id} #{t.date.utc.iso8601} \
+#{t.amount} #{t.bnf} #{t.details}")
+      end
+      @log.info("The balance of #{wallet}: #{balance}")
       balance
     end
   end

data/lib/zold/copies.rb

@@ -32,6 +32,10 @@ module Zold
       @dir = dir
     end
 
+    def root
+      File.join(@dir, '..')
+    end
+
     def to_s
       File.basename(@dir)
     end

data/lib/zold/http.rb

@@ -20,7 +20,7 @@
 
 require 'rainbow'
 require 'net/http'
-require_relative 'score.rb'
+require_relative 'score'
 
 # HTTP page.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)

data/lib/zold/key.rb

@@ -29,17 +29,23 @@ module Zold
   # A key
   class Key
     def initialize(file: nil, text: nil)
-      unless file.nil?
-        path = File.expand_path(file)
-        raise "Can't find RSA key at #{file} (#{path})" unless File.exist?(path)
-        @body = File.read(path)
+      @body = lambda do
+        unless file.nil?
+          path = File.expand_path(file)
+          unless File.exist?(path)
+            raise "Can't find RSA key at #{file} (#{path})"
+          end
+          return File.read(path)
+        end
+        unless text.nil?
+          return [
+            '-----BEGIN PUBLIC KEY-----',
+            text.gsub(/(?<=\G.{64})/, "\n"),
+            '-----END PUBLIC KEY-----'
+          ].join("\n")
+        end
+        raise 'Either file or text must be set'
       end
-      return if text.nil?
-      @body = [
-        '-----BEGIN PUBLIC KEY-----',
-        text.gsub(/(?<=\G.{64})/, "\n"),
-        '-----END PUBLIC KEY-----'
-      ].join("\n")
     end
 
     def to_s
@@ -61,7 +67,7 @@ module Zold
     private
 
     def rsa
-      text = @body.strip
+      text = @body.call.strip
       unless text.start_with?('-----BEGIN')
         text = OpenSSHKeyConverter.decode_pubkey(text.split[1])
       end

data/lib/zold/node/farm.rb

@@ -39,6 +39,14 @@ module Zold
       @semaphore = Mutex.new
     end
 
+    def to_json
+      {
+        threads: @threads.count,
+        scores: @scores.size,
+        best: @best.count
+      }
+    end
+
     def start(host, port, strength: 8, threads: 8)
       @log.debug('Zero-threads farm won\'t score anything!') if threads.zero?
       @scores = Queue.new

data/lib/zold/node/front.rb

@@ -47,8 +47,9 @@ module Zold
     configure do
       set :bind, '0.0.0.0'
       set :logging, true
+      set :dump_errors, true
       set :start, Time.now
-      set :lock, Mutex.new
+      set :lock, true
       set :log, Log.new
       set :show_exceptions, false
       set :home, Dir.pwd
@@ -59,7 +60,9 @@ module Zold
     before do
       if request.env[Http::SCORE_HEADER]
         s = Score.parse(request.env[Http::SCORE_HEADER])
-        raise 'The score is invalid' if !s.valid? || s.value < 3
+        error(400, 'The score is invalid') unless s.valid?
+        error(400, 'The score is too small') if s.value < 3
+        error(400, 'The score is weak') if s.strength < Score::STRENGTH
         settings.remotes.add(s.host, s.port)
       end
     end
@@ -93,6 +96,7 @@ module Zold
         wallets: {
           total: wallets.all.count
         },
+        farm: settings.farm.to_json,
         date: `date  --iso-8601=seconds -u`.strip,
         age: Time.now - settings.start,
         home: 'https://www.zold.io'
@@ -117,7 +121,7 @@ module Zold
       request.body.rewind
       cps = copies(id)
       cps.add(request.body.read, 'remote', Remotes::PORT, 0)
-      Zold::Merge.new(wallet: wallet, copies: cps).run
+      Zold::Merge.new(wallets: wallets, copies: cps.root).run([id.to_s])
       "Success, #{wallet.id} balance is #{wallet.balance}"
     end
 
@@ -141,6 +145,12 @@ module Zold
       'Page not found'
     end
 
+    error 400 do
+      status 400
+      content_type 'text/plain'
+      env['sinatra.error'].message
+    end
+
     error do
       status 503
       e = env['sinatra.error']

data/lib/zold/patch.rb

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require_relative 'wallet.rb'
+require_relative 'wallet'
 
 # Patch.
 #
@@ -35,15 +35,15 @@ module Zold
     end
 
     def join(wallet)
-      negative = @txns.select { |t| t[:amount].negative? }
-      max = negative.empty? ? 0 : negative.max_by { |t| t[:id] }[:id]
+      negative = @txns.select { |t| t.amount.negative? }
+      max = negative.empty? ? 0 : negative.max_by(&:id).id
       wallet.txns.each do |txn|
-        next if @txns.find { |t| t[:id] == txn[:id] && t[:bnf] == txn[:bnf] }
+        next if @txns.find { |t| t == txn }
         next if
-          txn[:amount].negative? && !@txns.empty? &&
-          (txn[:id] <= max ||
-          @txns.find { |t| t[:id] == txn[:id] } ||
-          @txns.map { |t| t[:amount] }.inject(&:+) < txn[:amount])
+          txn.amount.negative? && !@txns.empty? &&
+          (txn.id <= max ||
+          @txns.find { |t| t.id == txn.id } ||
+          @txns.map(&:amount).inject(&:+) < txn.amount)
         next unless Signature.new.valid?(@key, txn)
         @txns << txn
       end

data/lib/zold/prefixes.rb

@@ -0,0 +1,53 @@
+# Copyright (c) 2018 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require_relative 'key'
+
+# Payment prefixes.
+#
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # Payment prefixes
+  class Prefixes
+    def initialize(wallet)
+      @wallet = wallet
+    end
+
+    def create(length)
+      raise "Length #{length} is too small" if length < 8
+      raise "Length #{length} is too big" if length > 32
+      key = body
+      start = Random.new.rand(key.length - length)
+      key[start..(start + length - 1)]
+    end
+
+    def valid?(prefix)
+      body.include?(prefix)
+    end
+
+    private
+
+    def body
+      @wallet.key.to_pub.gsub(/[^A-Z0-9a-z]/, '')
+    end
+  end
+end

data/lib/zold/remotes.rb

@@ -60,6 +60,9 @@ module Zold
     end
 
     def add(host, port = Remotes::PORT)
+      raise 'Port has to be of type Integer' unless port.is_a?(Integer)
+      raise 'Port can\'t be negative' if port < 0
+      raise 'Port can\'t be over 65536' if port > 0xffff
       list = load
       list << { host: host, port: port, score: 0 }
       list.uniq! { |r| "#{r[:host]}:#{r[:port]}" }
@@ -67,16 +70,19 @@ module Zold
     end
 
     def remove(host, port = Remotes::PORT)
+      raise 'Port has to be of type Integer' unless port.is_a?(Integer)
       list = load
       list.reject! { |r| r[:host] == host && r[:port] == port }
       save(list)
     end
 
     def score(host, port = Remotes::PORT)
+      raise 'Port has to be of type Integer' unless port.is_a?(Integer)
       load.find { |r| r[:host] == host && r[:port] == port }[:score]
     end
 
     def rescore(host, port, score)
+      raise 'Port has to be of type Integer' unless port.is_a?(Integer)
       list = load
       list.find do |r|
         r[:host] == host && r[:port] == port