zold 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28d39fb05a13cc3dc2a6856289b717c137e751dc
-  data.tar.gz: 42b2b142eb06e8f360b4d2f311bcf8c86aec7395
+  metadata.gz: 01a2323174e903dabb35708bfd1d0f756e930035
+  data.tar.gz: a4f6582b8e645cd480ab74e374cc5cefe3698034
 SHA512:
-  metadata.gz: 63424ca129a20ac442879e53255572e885c952c32d10bc5b5cddaaca33a04d3698cc0c8114f8b79479988295df8c5bbe6f4bbd65a7c7752d1cbc031768272e68
-  data.tar.gz: f91e1c18246b1dd7f6fe790ac71a43e4cbdf0c2eae9a718229e7cc4004aea419352986f3b1036ff750200ed40be1aed1a21e9c82aba40de67529d091bbf2dbdd
+  metadata.gz: 8e6c51f38a8f4d44c86c6cf1d2c02d3db2a1495504613c29676922a91bc03b325524b87d592dabdeb406fc9ca6906725de8666b805ea98731a7fe4271c950123
+  data.tar.gz: '0906447919a3f02950152613a65b19d648ca46cf480405659751ab6ab4eee1d08b01f8f1dfef2a60de4c5e55b17433913637daf37c0d7451f13e8320aa33c572'

data/.rubocop.yml

@@ -14,7 +14,7 @@ Layout/MultilineMethodCallIndentation:
 Metrics/AbcSize:
   Enabled: false
 Metrics/BlockLength:
-  Max: 50
+  Max: 100
 Metrics/ClassLength:
   Max: 200
 Style/EndOfLine:
@@ -24,4 +24,6 @@ Metrics/ParameterLists:
 Layout/AlignParameters:
   Enabled: false
 Metrics/PerceivedComplexity:
-  Max: 12
+  Max: 15
+Metrics/LineLength:
+  Max: 120

data/bin/zold

@@ -41,14 +41,16 @@ Encoding.default_internal = Encoding::UTF_8
 log = Zold::Log.new
 
 args = []
-config = File.expand_path('~/.zold')
-if File.exist?(config)
-  body = File.read(config)
-  extra = body.split(/[\r\n]+/).map(&:strip)
-  args += extra
-  log.debug("Found #{body.split(/\n/).length} lines in #{config}")
-else
-  log.debug("Default config file #{config} not found")
+unless ENV['RACK_ENV'] == 'test'
+  config = File.expand_path('~/.zold')
+  if File.exist?(config)
+    body = File.read(config)
+    extra = body.split(/[\r\n]+/).map(&:strip)
+    args += extra
+    log.debug("Found #{body.split(/\n/).length} lines in #{config}")
+  else
+    log.debug("Default config file #{config} not found")
+  end
 end
 args += ARGV
 
@@ -56,44 +58,38 @@ begin
   opts = Slop.parse(args, strict: false, suppress_errors: true) do |o|
     o.banner = "Usage: zold [options] command [arguments]
 Available commands:
-    #{Rainbow('remote').green}
+    #{Rainbow('remote').green} command [options]
       Manage remote nodes
-    #{Rainbow('create').green}
+    #{Rainbow('create').green} [options]
       Creates a new wallet with a random ID
-    #{Rainbow('fetch').green} [ID...]
+    #{Rainbow('fetch').green} [ID...] [options]
       Fetch wallet copies from remote nodes
-    #{Rainbow('clean').green} [ID...]
+    #{Rainbow('clean').green} [ID...] [options]
       Remove expired local copies
-    #{Rainbow('merge').green} [ID...]
+    #{Rainbow('merge').green} [ID...] [options]
       Merge remote copies with the HEAD
-    #{Rainbow('propagate').green} [ID...]
+    #{Rainbow('propagate').green} [ID...] [options]
       Propagate transactions to receiving wallets
-    #{Rainbow('pull').green} [ID...]
+    #{Rainbow('pull').green} [ID...] [options]
       Fetch and then merge
-    #{Rainbow('show').green} [ID...]
+    #{Rainbow('show').green} [ID...] [options]
       Show all available information about the wallet
-    #{Rainbow('pay').green} from to amount details
+    #{Rainbow('pay').green} from to amount details [options]
       Pay ZOLD from one wallet to another
-    #{Rainbow('invoice').green} ID
+    #{Rainbow('invoice').green} ID [options]
       Generate invoice unique ID for a payment
-    #{Rainbow('status').green}
-      Show status of local copies
-    #{Rainbow('push').green} [ID...]
+    #{Rainbow('push').green} [ID...] [options]
       Push all/some local wallets or the ones required
-    #{Rainbow('node').green} port
+    #{Rainbow('taxes').green} command [ID...] [options]
+      Pay taxes, check their status
+    #{Rainbow('node').green} [options]
       Run node at the given TCP port
-    #{Rainbow('score').green} host port strength
+    #{Rainbow('score').green} host port strength [options]
       Generate score for the given host and port
 Available options:"
     o.string '-d', '--dir',
       'The directory where wallets are stored (default: .)',
       default: Dir.pwd
-    o.string '--private-key',
-      'The location of RSA private key (default: ~/.ssh/id_rsa)',
-      default: '~/.ssh/id_rsa'
-    o.string '--public-key',
-      'The location of RSA public key (default: ~/.ssh/id_rsa.pub)',
-      default: '~/.ssh/id_rsa.pub'
     o.bool '-h', '--help', 'Show these instructions'
     o.bool '--trace', 'Show full stack trace in case of a problem'
     o.on '--no-colors', 'Disable colors in the ouput' do
@@ -129,11 +125,7 @@ Available options:"
     Zold::Node.new(log: log).run(args)
   when 'create'
     require_relative '../lib/zold/commands/create'
-    Zold::Create.new(
-      wallets: wallets,
-      pubkey: Zold::Key.new(file: opts['public-key']),
-      log: log
-    ).run(args)
+    Zold::Create.new(wallets: wallets, log: log).run(args)
   when 'remote'
     require_relative '../lib/zold/commands/remote'
     Zold::Remote.new(remotes: remotes, log: log).run(args)
@@ -142,11 +134,7 @@ Available options:"
     Zold::Invoice.new(wallets: wallets, log: log).run(args)
   when 'pay'
     require_relative '../lib/zold/commands/pay'
-    Zold::Pay.new(
-      wallets: wallets,
-      pvtkey: Zold::Key.new(file: opts['private-key']),
-      log: log
-    ).run(args)
+    Zold::Pay.new(wallets: wallets, log: log).run(args)
   when 'show'
     require_relative '../lib/zold/commands/show'
     Zold::Show.new(wallets: wallets, log: log).run(args)
@@ -170,23 +158,21 @@ Available options:"
     Zold::Fetch.new(remotes: remotes, copies: copies, log: log).run(args)
     require_relative '../lib/zold/commands/merge'
     Zold::Merge.new(wallets: wallets, copies: copies, log: log).run(args)
+  when 'taxes'
+    require_relative '../lib/zold/commands/taxes'
+    Zold::Taxes.new(wallets: wallets, log: log).run(args)
   when 'push'
     require_relative '../lib/zold/commands/push'
     Zold::Push.new(wallets: wallets, remotes: remotes, log: log).run(args)
   when 'score'
     require_relative '../lib/zold/score'
-    if args.length != 3
-      raise 'Exactly three args required: host, port, strength'
-    end
+    raise 'Exactly four args required: host, port, invoice, strength' if args.length != 4
     host = args[0]
-    raise "Invalid host name: #{host}" unless host =~ /[a-z0-9\.-]+/
     port = args[1].to_i
-    raise "Invalid TCP port: #{port}" if port <= 0 || port > 65535
-    strength = args[2].to_i
+    invoice = args[2]
+    strength = args[3].to_i
     raise "Invalid strength: #{strength}" if strength <= 0 || strength > 8
-    score = Zold::Score.new(
-      Time.now, host, port, strength: strength
-    )
+    score = Zold::Score.new(Time.now, host, port, invoice, strength: strength)
     loop do
       log.info(score.to_s)
       score = score.next

data/features/cli.feature

@@ -12,6 +12,6 @@ Feature: Command Line Processing
     Then Exit code is zero
 
   Scenario: Wallet can be created
-    When I run bin/zold with " --private-key id_rsa --public-key id_rsa.pub --trace create"
+    When I run bin/zold with "--trace create --public-key=id_rsa.pub"
     Then Exit code is zero
 

data/features/step_definitions/steps.rb

@@ -44,9 +44,7 @@ When(%r{^I run bin/zold with "([^"]*)"$}) do |arg|
 end
 
 Then(/^Stdout contains "([^"]*)"$/) do |txt|
-  unless @stdout.include?(txt)
-    raise "STDOUT doesn't contain '#{txt}':\n#{@stdout}"
-  end
+  raise "STDOUT doesn't contain '#{txt}':\n#{@stdout}" unless @stdout.include?(txt)
 end
 
 Then(/^Stdout is empty$/) do

data/features/support/env.rb

@@ -18,5 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+ENV['RACK_ENV'] = 'test'
+
 require 'simplecov'
 require_relative '../../lib/zold'

data/fixtures/scripts/push-and-pull.sh

@@ -9,7 +9,9 @@ port=`python -c 'import socket; s=socket.socket(); s.bind(("", 0)); print(s.gets
 
 mkdir server
 cd server
-zold --trace node --host=localhost --port=${port} --bind-port=${port} --threads=0 --standalone &
+zold --trace node --invoice=NOPREFIX@ffffffffffffffff \
+  --host=localhost --port=${port} --bind-port=${port} \
+  --threads=0 --standalone &
 pid=$!
 trap "kill -9 $pid" EXIT
 cd ..
@@ -23,10 +25,10 @@ zold --trace remote clean
 zold --trace remote add localhost ${port}
 zold --trace remote show
 
-zold --trace --public-key id_rsa.pub create 0000000000000000
-target=`zold --public-key id_rsa.pub create`
+zold --trace create --public-key=id_rsa.pub 0000000000000000
+target=`zold create --public-key=id_rsa.pub`
 invoice=`zold invoice ${target}`
-zold --trace --private-key id_rsa pay 0000000000000000 ${invoice} 14.99 'To save the world!'
+zold --trace pay --private-key=id_rsa 0000000000000000 ${invoice} 14.99 'To save the world!'
 zold --trace propagate 0000000000000000
 zold --trace show
 zold --trace show 0000000000000000

data/lib/zold/amount.rb

@@ -29,9 +29,9 @@ module Zold
   class Amount
     def initialize(coins: nil, zld: nil)
       raise 'You can\'t specify both coints and zld' if !coins.nil? && !zld.nil?
+      raise "Integer is required, while #{coins.class} provided: #{coins}" unless coins.nil? || coins.is_a?(Integer)
       @coins = coins unless coins.nil?
       @coins = (zld * 2**24).to_i unless zld.nil?
-      raise "Integer is required: #{@coins.class}" unless @coins.is_a?(Integer)
     end
 
     ZERO = Amount.new(coins: 0)
@@ -54,21 +54,35 @@ module Zold
     end
 
     def ==(other)
+      raise '== may only work with Amount' unless other.is_a?(Amount)
       @coins == other.to_i
     end
 
     def >(other)
+      raise '> may only work with Amount' unless other.is_a?(Amount)
       @coins > other.to_i
     end
 
     def <(other)
+      raise '< may only work with Amount' unless other.is_a?(Amount)
       @coins < other.to_i
     end
 
+    def <=(other)
+      raise '<= may only work with Amount' unless other.is_a?(Amount)
+      @coins <= other.to_i
+    end
+
     def +(other)
+      raise '+ may only work with Amount' unless other.is_a?(Amount)
       Amount.new(coins: @coins + other.to_i)
     end
 
+    def -(other)
+      raise '- may only work with Amount' unless other.is_a?(Amount)
+      Amount.new(coins: @coins - other.to_i)
+    end
+
     def zero?
       @coins.zero?
     end
@@ -77,8 +91,8 @@ module Zold
       @coins < 0
     end
 
-    def mul(m)
-      c = @coins * m
+    def *(other)
+      c = (@coins * other).to_i
       raise "Overflow, can't multiply #{@coins} by #{m}" if c > 2**63
       Amount.new(coins: c)
     end

data/lib/zold/commands/create.rb

@@ -29,9 +29,8 @@ require_relative '../id'
 module Zold
   # Create command
   class Create
-    def initialize(wallets:, pubkey:, log: Log::Quiet.new)
+    def initialize(wallets:, log: Log::Quiet.new)
       @wallets = wallets
-      @pubkey = pubkey
       @log = log
     end
 
@@ -39,6 +38,10 @@ module Zold
       opts = Slop.parse(args, help: true) do |o|
         o.banner = "Usage: zold create [options]
 Available options:"
+        o.string '--public-key',
+          'The location of RSA public key (default: ~/.ssh/id_rsa.pub)',
+          require: true,
+          default: '~/.ssh/id_rsa.pub'
         o.bool '--help', 'Print instructions'
       end
       if opts.help?
@@ -48,12 +51,12 @@ Available options:"
       create(opts.arguments.empty? ? Id.new : Id.new(opts.arguments[0]), opts)
     end
 
-    def create(id, _)
+    def create(id, opts)
       wallet = @wallets.find(id)
-      wallet.init(id, @pubkey)
+      key = Zold::Key.new(file: opts['public-key'])
+      wallet.init(id, key)
       @log.info(wallet.id)
-      @log.debug("Wallet #{Rainbow(wallet).green} \
-created at #{@wallets.path}")
+      @log.debug("Wallet #{Rainbow(wallet).green} created at #{@wallets.path}")
       wallet
     end
   end

data/lib/zold/commands/fetch.rb

@@ -67,8 +67,7 @@ Available options:"
       @remotes.all.each do |r|
         total += 1 if fetch_one(id, r, cps, opts)
       end
-      @log.debug("#{total} copies fetched, \
-there are #{cps.all.count} available locally")
+      @log.debug("#{total} copies fetched, there are #{cps.all.count} available locally")
     end
 
     def fetch_one(id, r, cps, opts)
@@ -80,34 +79,25 @@ there are #{cps.all.count} available locally")
       uri = URI("#{r[:home]}wallet/#{id}")
       res = Http.new(uri).get
       unless res.code == '200'
-        @log.error(
-          "#{address} #{Rainbow(res.code).red}/#{res.message} at #{uri}"
-        )
+        @log.error("#{address} #{Rainbow(res.code).red}/#{res.message} at #{uri}")
         return false
       end
       json = JSON.parse(res.body)
-      score = Score.new(
-        Time.parse(json['score']['time']),
-        r[:host],
-        r[:port],
-        json['score']['suffixes']
-      )
+      score = Score.parse_json(json['score'])
       unless score.valid?
-        @log.error("#{address} invalid score")
+        @log.error("#{address}: invalid score")
+        return false
+      end
+      if score.expired?
+        @log.error("#{address}: score expired")
         return false
       end
       if score.strength < Score::STRENGTH && !opts['ignore-score-weakness']
-        @log.error(
-          "#{address} score is too weak: #{score.strength} \
-(<#{Score::STRENGTH})"
-        )
+        @log.error("#{address} score is too weak: #{score.strength} (<#{Score::STRENGTH})")
         return false
       end
-      cps.add(json['body'], r[:host], r[:port], score.value)
-      @log.info(
-        "#{address} #{json['body'].length}b/\
-#{Rainbow(score.value).green} (v.#{json['version']})"
-      )
+      cps.add(json['body'], score.host, score.port, score.value)
+      @log.info("#{address} #{json['body'].length}b/#{Rainbow(score.value).green} (v.#{json['version']})")
       true
     end
   end

data/lib/zold/commands/node.rb

@@ -40,6 +40,8 @@ module Zold
     def run(args = [])
       opts = Slop.parse(args, help: true) do |o|
         o.banner = 'Usage: zold node [options]'
+        o.string '--invoice',
+          'The invoice you want to collect money to'
         o.integer '--port',
           "TCP port to open for the Net (default: #{Remotes::PORT})",
           default: Remotes::PORT
@@ -65,6 +67,7 @@ module Zold
         @log.info(opts.to_s)
         return
       end
+      raise '--invoice is mandatory' unless opts[:invoice]
       Zold::Front.set(:log, @log)
       Zold::Front.set(:logging, @log.debug?)
       FileUtils.mkdir_p(opts[:home])
@@ -75,18 +78,13 @@ module Zold
         AccessLog: []
       )
       if opts['standalone']
-        Zold::Front.set(:remotes, Remotes::Empty.new)
+        remotes = Remotes::Empty.new
+        @log.debug('Running in standalone mode!')
       else
-        Zold::Front.set(
-          :remotes,
-          Remotes.new(
-            File.join(opts[:home], '.zoldata/remotes')
-          )
-        )
+        remotes = Remotes.new(File.join(opts[:home], 'zold-remotes'))
       end
       wallets = Wallets.new(File.join(opts[:home], 'zold-wallets'))
       Zold::Front.set(:wallets, wallets)
-      remotes = Remotes.new(File.join(opts[:home], 'zold-remotes'))
       Zold::Front.set(:remotes, remotes)
       copies = File.join(opts[:home], 'zold-copies')
       Zold::Front.set(:copies, copies)
@@ -96,7 +94,7 @@ module Zold
         :entrance, Entrance.new(wallets, remotes, copies, address, log: @log)
       )
       Zold::Front.set(:port, opts['bind-port'])
-      farm = Farm.new(log: @log)
+      farm = Farm.new(opts[:invoice], log: @log)
       farm.start(
         opts[:host], opts[:port],
         threads: opts[:threads], strength: opts[:strength]

data/lib/zold/commands/pay.rb

@@ -28,9 +28,8 @@ require_relative '../log'
 module Zold
   # Money sending command
   class Pay
-    def initialize(wallets:, pvtkey:, log: Log::Quiet.new)
+    def initialize(wallets:, log: Log::Quiet.new)
       @wallets = wallets
-      @pvtkey = pvtkey
       @log = log
     end
 
@@ -43,6 +42,10 @@ Where:
     '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.string '--private-key',
+          'The location of RSA private key (default: ~/.ssh/id_rsa)',
+          require: true,
+          default: '~/.ssh/id_rsa'
         o.bool '--force',
           'Ignore all validations',
           default: false
@@ -68,12 +71,12 @@ Available options:"
         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"
+          raise "There is not enough funds in #{from} to send #{amount}, only #{payer.balance} left"
         end
       end
-      txn = from.sub(amount, invoice, @pvtkey, details)
-      @log.debug("#{amount} sent from #{from} to #{invoice}: #{details}")
+      key = Zold::Key.new(file: opts['private-key'])
+      txn = from.sub(amount, invoice, key, details)
+      @log.debug("#{amount} sent from #{from} to #{txn.bnf}: #{details}")
       @log.info(txn.id)
       txn
     end