zold 0.16.24 → 0.16.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be5fb06b537fc4c9e80b30fadf5f6cd1e1a344e7604dfecdc1ac78ed46176063
-  data.tar.gz: 9fbb3d142ca8047324eac09dc35beac86ba0cca2c72649034de550c220553cc5
+  metadata.gz: eb543c3e1e0acee9fb72b9ad04a51453dfa417e0c030f4fe18291518d36ce0c2
+  data.tar.gz: 440c25b8260e36048f63b9ce59e19101375dace2514667efbc4e5df550b2a71a
 SHA512:
-  metadata.gz: 2c90d865cabb1b36ae83ed263f2779d725ff98a15fd93606a94ca088522853aea674f2b8a1142e865849b4f2fee2522275adcb8bc918a0a021ca992a6be78409
-  data.tar.gz: 9fa78df566ec34dd99ebfb8ae24160295232245a2e75ee55be033d5c53a77f897cb52ce1e28609d15b5187de2861b0766699734c471b4c73c93e12216cf035ae
+  metadata.gz: b459087e04fe5ebe18cd68024ee247c041e0c876b098f6dc25b4262ee501a61431aac6f76123d56fb5cf85c86afcedd7b1949480bbb5160fd87763766afe4032
+  data.tar.gz: 135ae329734d90f68df3716a29e61a1c0a5dce7ec7506d7f40630242ec68f948d241c7b362134962687d6d4331f679eebb031d20bdc7c73eafbd710b45c44fe1

data/.rultor.yml

@@ -6,6 +6,7 @@ install: |
   export GEM_HOME=~/.ruby
   export GEM_PATH=$GEM_HOME:$GEM_PATH
   sudo apt-get -y update
+  sudo apt-get -y install libcurl4-openssl-dev
   sudo gem install pdd
 release:
   script: |-

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
   - 2.3.1
   - 2.3.3
+  - 2.5.1
 cache: bundler
 branches:
   only:

data/README.md

@@ -339,7 +339,7 @@ Then:
 
 ```bash
 $ bundle update
-$ rake
+$ bundle exec rake
 ```
 
 The build has to be clean. If it's not, [submit an issue](https://github.com/zold-io/zold/issues).

data/bin/zold

@@ -63,129 +63,129 @@ unless ENV['RACK_ENV'] == 'test' || ARGV.find { |a| a == '--ignore-global-config
 end
 args += ARGV
 
-begin
-  opts = Slop.parse(args, strict: false, suppress_errors: true) do |o|
-    o.banner = "Usage: zold [options] command [arguments]
+opts = Slop.parse(args, strict: false, suppress_errors: true) do |o|
+  o.banner = "Usage: zold [options] command [arguments]
 Available commands:
-    #{Rainbow('remote').green} command [options]
-      Manage remote nodes
-    #{Rainbow('create').green} [options]
-      Creates a new wallet with a random ID
-    #{Rainbow('fetch').green} [ID...] [options]
-      Fetch wallet copies from remote nodes
-    #{Rainbow('clean').green} [ID...] [options]
-      Remove expired local copies
-    #{Rainbow('merge').green} [ID...] [options]
-      Merge remote copies with the HEAD
-    #{Rainbow('propagate').green} [ID...] [options]
-      Propagate transactions to receiving wallets
-    #{Rainbow('pull').green} [ID...] [options]
-      Fetch and then merge
-    #{Rainbow('remove').green} [ID...] [options]
-      Remove the wallet(s) from the local storage
-    #{Rainbow('show').green} [ID...] [options]
-      Show all available information about the wallet
-    #{Rainbow('pay').green} from to amount details [options]
-      Pay ZOLD from one wallet to another
-    #{Rainbow('invoice').green} ID [options]
-      Generate invoice unique ID for a payment
-    #{Rainbow('push').green} [ID...] [options]
-      Push all/some local wallets or the ones required
-    #{Rainbow('taxes').green} command [ID...] [options]
-      Pay taxes, check their status
-    #{Rainbow('node').green} [options]
-      Run node at the given TCP port
-    #{Rainbow('alias').green} [alias] [wallet ID]
-      Set an alias for a wallet
-    #{Rainbow('next').green} score
-      Generate next score from the provided one
-    #{Rainbow('score').green} [options]
-      Generate score for the given host and port
+  #{Rainbow('remote').green} command [options]
+    Manage remote nodes
+  #{Rainbow('create').green} [options]
+    Creates a new wallet with a random ID
+  #{Rainbow('fetch').green} [ID...] [options]
+    Fetch wallet copies from remote nodes
+  #{Rainbow('clean').green} [ID...] [options]
+    Remove expired local copies
+  #{Rainbow('merge').green} [ID...] [options]
+    Merge remote copies with the HEAD
+  #{Rainbow('propagate').green} [ID...] [options]
+    Propagate transactions to receiving wallets
+  #{Rainbow('pull').green} [ID...] [options]
+    Fetch and then merge
+  #{Rainbow('remove').green} [ID...] [options]
+    Remove the wallet(s) from the local storage
+  #{Rainbow('show').green} [ID...] [options]
+    Show all available information about the wallet
+  #{Rainbow('pay').green} from to amount details [options]
+    Pay ZOLD from one wallet to another
+  #{Rainbow('invoice').green} ID [options]
+    Generate invoice unique ID for a payment
+  #{Rainbow('push').green} [ID...] [options]
+    Push all/some local wallets or the ones required
+  #{Rainbow('taxes').green} command [ID...] [options]
+    Pay taxes, check their status
+  #{Rainbow('node').green} [options]
+    Run node at the given TCP port
+  #{Rainbow('alias').green} [alias] [wallet ID]
+    Set an alias for a wallet
+  #{Rainbow('next').green} score
+    Generate next score from the provided one
+  #{Rainbow('score').green} [options]
+    Generate score for the given host and port
 Available options:"
-    o.string '--home',
-      "Home directory (default: #{Dir.pwd})",
-      default: Dir.pwd
-    o.string '--network',
-      "The name of the network we work in (default: #{Zold::Wallet::MAIN_NETWORK})",
-      required: true,
-      default: Zold::Wallet::MAIN_NETWORK
-    o.bool '-h', '--help', 'Show these instructions'
-    o.bool '--trace', 'Show full stack trace in case of a problem'
-    o.bool '--memory-dump', 'Dump memory snapshot afterwards, to the console', default: false
-    o.bool '--skip-upgrades', 'Don\'t upgrade the storage', default: false
-    o.bool '--ignore-global-config', 'Don\'t read options from the ~/.zold file'
-    o.on '--no-colors', 'Disable colors in the ouput' do
-      Rainbow.enabled = false
-    end
-    o.on '--verbose', 'Enable extra logging information' do
-      log = Zold::Log::Verbose.new
-    end
-    o.on '-v', '--version', 'Show current version' do
-      log.info(Zold::VERSION)
-      exit
-    end
+  o.string '--home',
+    "Home directory (default: #{Dir.pwd})",
+    default: Dir.pwd
+  o.string '--network',
+    "The name of the network we work in (default: #{Zold::Wallet::MAIN_NETWORK})",
+    required: true,
+    default: Zold::Wallet::MAIN_NETWORK
+  o.bool '-h', '--help', 'Show these instructions'
+  o.bool '--trace', 'Show full stack trace in case of a problem'
+  o.bool '--memory-dump', 'Dump memory snapshot afterwards, to the console', default: false
+  o.bool '--skip-upgrades', 'Don\'t upgrade the storage', default: false
+  o.bool '--ignore-global-config', 'Don\'t read options from the ~/.zold file'
+  o.on '--no-colors', 'Disable colors in the ouput' do
+    Rainbow.enabled = false
   end
+  o.on '--verbose', 'Enable extra logging information' do
+    log = Zold::Log::Verbose.new
+  end
+  o.on '-v', '--version', 'Show current version' do
+    log.info(Zold::VERSION)
+    exit
+  end
+end
 
-  log = Zold::Log::Sync.new(log)
+log = Zold::Log::Sync.new(log)
 
-  log.debug("Gem location: #{File.dirname(File.dirname(__FILE__))}")
+log.debug("Gem location: #{File.dirname(File.dirname(__FILE__))}")
 
-  commands = opts.arguments.reject { |a| a.start_with?('-') }
-  command = commands[0]
+commands = opts.arguments.reject { |a| a.start_with?('-') }
+command = commands[0]
 
-  if command.nil?
-    raise 'A command required, try --help' unless opts.help?
-    log.info(opts.to_s)
-    exit
-  end
+if command.nil?
+  raise 'A command required, try --help' unless opts.help?
+  log.info(opts.to_s)
+  exit
+end
 
-  args = opts.arguments
-  args << '--help' if opts.help?
-  args << "--network=#{opts['network']}"
+args = opts.arguments
+args << '--help' if opts.help?
+args << "--network=#{opts['network']}"
 
-  home = File.expand_path(opts[:home])
-  FileUtils.mkdir_p(home)
-  Dir.chdir(home)
-  log.debug("Home directory: #{home}")
+home = File.expand_path(opts[:home])
+FileUtils.mkdir_p(home)
+Dir.chdir(home)
+log.debug("Home directory: #{home}")
 
-  zoldata = File.join(home, '.zoldata')
+zoldata = File.join(home, '.zoldata')
 
-  unless opts['skip-upgrades']
-    Zold::Upgrades.new(Zold::VersionFile.new(File.join(zoldata, 'version')), 'upgrades').run
-    # @todo #384:30min This is a workaround, move this code into Upgrades, somehow.
-    #  We should find a way to run these arbitrary scripts and pass arguments
-    #  to them. Each of them may need its own set of arguments.
-    require_relative '../upgrades/2'
-    Zold::UpgradeTo2.new(Dir.pwd, log).exec
-    require_relative '../upgrades/protocol_up'
-    Zold::ProtocolUp.new(Dir.pwd, log).exec
-    require_relative '../upgrades/rename_foreign_wallets'
-    Zold::RenameForeignWallets.new(Dir.pwd, opts['network'], log).exec
-    if command == 'node'
-      require_relative '../upgrades/move_wallets_into_tree'
-      Zold::MoveWalletsIntoTree.new(Dir.pwd, log).exec
-    end
+unless opts['skip-upgrades']
+  Zold::Upgrades.new(Zold::VersionFile.new(File.join(zoldata, 'version')), 'upgrades').run
+  # @todo #384:30min This is a workaround, move this code into Upgrades, somehow.
+  #  We should find a way to run these arbitrary scripts and pass arguments
+  #  to them. Each of them may need its own set of arguments.
+  require_relative '../upgrades/2'
+  Zold::UpgradeTo2.new(Dir.pwd, log).exec
+  require_relative '../upgrades/protocol_up'
+  Zold::ProtocolUp.new(Dir.pwd, log).exec
+  require_relative '../upgrades/rename_foreign_wallets'
+  Zold::RenameForeignWallets.new(Dir.pwd, opts['network'], log).exec
+  if command == 'node'
+    require_relative '../upgrades/move_wallets_into_tree'
+    Zold::MoveWalletsIntoTree.new(Dir.pwd, log).exec
   end
+end
 
-  wallets = Zold::SyncWallets.new(
-    Zold::CachedWallets.new(
-      command == 'node' ? Zold::TreeWallets.new(home) : Zold::Wallets.new(home)
-    ),
-    log: log
-  )
-  fremotes = File.join(zoldata, 'remotes')
-  remotes = Zold::Remotes.new(file: fremotes, network: opts['network'])
-  if File.exist?(fremotes)
-    log.debug("Remote nodes: #{remotes.all.count} total")
-  else
-    remotes.defaults
-    log.debug("Default remotes have been set: #{remotes.all.count} total")
-  end
-  copies = File.join(zoldata, 'copies')
+wallets = Zold::SyncWallets.new(
+  Zold::CachedWallets.new(
+    command == 'node' ? Zold::TreeWallets.new(home) : Zold::Wallets.new(home)
+  ),
+  log: log
+)
+fremotes = File.join(zoldata, 'remotes')
+remotes = Zold::Remotes.new(file: fremotes, network: opts['network'])
+if File.exist?(fremotes)
+  log.debug("Remote nodes: #{remotes.all.count} total")
+else
+  remotes.defaults
+  log.debug("Default remotes have been set: #{remotes.all.count} total")
+end
+copies = File.join(zoldata, 'copies')
 
-  log.debug("Network: #{opts['network']} (#{opts['network'] == Zold::Wallet::MAIN_NETWORK ? 'main' : 'test'} net)")
+log.debug("Network: #{opts['network']} (#{opts['network'] == Zold::Wallet::MAIN_NETWORK ? 'main' : 'test'} net)")
 
-  cmd = lambda do
+cmd = lambda do
+  begin
     case command
     when 'node'
       require_relative '../lib/zold/commands/node'
@@ -247,17 +247,21 @@ Available options:"
     else
       raise "Command '#{command}' is not supported"
     end
+    return 0
+  rescue StandardError => ex
+    log.error("#{ex.message} (#{ex.class.name})")
+    log.error(Backtrace.new(ex)) if opts['trace']
+    return -1
   end
+end
 
-  if opts['memory-dump']
-    MemoryProfiler.report(top: 20) { cmd.call }.pretty_print
-  else
-    cmd.call
-  end
-rescue StandardError => ex
-  log.error("#{ex.message} (#{ex.class.name})")
-  puts(Backtrace.new(ex)) if opts['trace']
-  exit -1
+code = 0
+if opts['memory-dump']
+  MemoryProfiler.report(top: 20) { code = cmd.call }.pretty_print
+else
+  code = cmd.call
 end
 
+exit(code) unless code.zero?
+
 log.debug("Successfully finished in #{Zold::Age.new(start)}")

data/lib/zold/cached_wallets.rb

@@ -53,8 +53,8 @@ module Zold
       @wallets.all
     end
 
-    def find(id)
-      @wallets.find(id) do |wallet|
+    def acq(id, exclusive: false)
+      @wallets.acq(id, exclusive: exclusive) do |wallet|
         yield @zache.get(id.to_s, lifetime: 5 * 60) { wallet }
       end
     end

data/lib/zold/commands/create.rb

@@ -61,7 +61,7 @@ Available options:"
 
     def create(id, opts)
       key = Zold::Key.new(file: opts['public-key'])
-      @wallets.find(id) do |wallet|
+      @wallets.acq(id, exclusive: true) do |wallet|
         wallet.init(id, key, network: opts['network'])
         @log.debug("Wallet #{Rainbow(wallet).green} created at #{@wallets.path}")
       end

data/lib/zold/commands/diff.rb

@@ -66,7 +66,7 @@ Available options:"
       cps.each do |c|
         patch.join(Wallet.new(c[:path]))
       end
-      before = @wallets.find(id) do |wallet|
+      before = @wallets.acq(id) do |wallet|
         IO.read(wallet.path)
       end
       after = ''

data/lib/zold/commands/fetch.rb

@@ -107,7 +107,7 @@ Available options:"
       size = r.http(uri + '/size').get
       r.assert_code(200, size)
       res = r.http(uri).get(timeout: 2 + size.body.to_i * 0.01 / 1024)
-      raise "Wallet #{id} not found" if res.code == '404'
+      raise "Wallet #{id} not found" if res.status == '404'
       r.assert_code(200, res)
       json = JsonPage.new(res.body, uri).to_hash
       score = Score.parse_json(json['score'])
@@ -130,7 +130,8 @@ Available options:"
         end
         copy = cps.add(IO.read(f), score.host, score.port, score.value)
         @log.info("#{r} returned #{wallet.mnemo} #{Age.new(json['mtime'])}/#{json['copies']}c \
-as copy ##{copy} in #{Age.new(start, limit: 4)}: #{Rainbow(score.value).green} (#{json['version']})")
+as copy ##{copy}/#{cps.all.count} in #{Age.new(start, limit: 4)}: \
+#{Rainbow(score.value).green} (#{json['version']})")
       end
       score.value
     end

data/lib/zold/commands/invoice.rb

@@ -61,13 +61,13 @@ Available options:"
     private
 
     def invoice(id, opts)
-      unless @wallets.find(id, &:exists?)
+      unless @wallets.acq(id, &:exists?)
         require_relative 'pull'
         Pull.new(wallets: @wallets, remotes: @remotes, copies: @copies, log: @log).run(
           ['pull', id.to_s, "--network=#{opts['network']}"]
         )
       end
-      inv = @wallets.find(id) do |wallet|
+      inv = @wallets.acq(id) do |wallet|
         "#{Prefixes.new(wallet).create(opts[:length])}@#{wallet.id}"
       end
       @log.info(inv)

data/lib/zold/commands/list.rb

@@ -21,6 +21,7 @@
 # SOFTWARE.
 
 require_relative '../log'
+require_relative '../amount'
 require_relative '../wallet'
 
 # LIST command.
@@ -36,13 +37,20 @@ module Zold
     end
 
     def run(_ = [])
+      total = 0
+      txns = 0
+      balance = Amount::ZERO
       @wallets.all.sort.each do |id|
-        @wallets.find(id) do |wallet|
+        total += 1
+        @wallets.acq(id) do |wallet|
           msg = wallet.mnemo
           msg += " (net:#{wallet.network})" if wallet.network != Wallet::MAIN_NETWORK
+          txns += wallet.txns.count
+          balance += wallet.balance
           @log.info(msg)
         end
       end
+      @log.info("#{total} wallets, #{txns} transactions, #{balance} in total")
     end
   end
 end

data/lib/zold/commands/merge.rb

@@ -76,7 +76,7 @@ Available options:"
         merge_one(opts, patch, wallet, name)
         score += c[:score]
       end
-      @wallets.find(id) do |wallet|
+      @wallets.acq(id, exclusive: true) do |wallet|
         start = Time.now
         if wallet.exists?
           merge_one(opts, patch, wallet, 'localhost')

data/lib/zold/commands/pay.rb

@@ -79,7 +79,7 @@ Available options:"
       amount = Amount.new(zld: mine[2].to_f)
       details = mine[3] || '-'
       taxes(id, opts)
-      @wallets.find(id) do |from|
+      @wallets.acq(id, exclusive: true) do |from|
         pay(from, invoice, amount, details, opts)
       end
       return if opts['skip-propagate']
@@ -90,7 +90,7 @@ Available options:"
     private
 
     def taxes(id, opts)
-      debt = @wallets.find(id) do |wallet|
+      debt = @wallets.acq(id) do |wallet|
         raise "Wallet #{id} doesn't exist, do 'zold pull' first" unless wallet.exists?
         Tax.new(wallet).in_debt? && !opts['dont-pay-taxes']
       end

data/lib/zold/commands/propagate.rb

@@ -63,14 +63,14 @@ Available options:"
       start = Time.now
       modified = []
       total = 0
-      network = @wallets.find(id, &:network)
-      @wallets.find(id, &:txns).select { |t| t.amount.negative? }.each do |t|
+      network = @wallets.acq(id, &:network)
+      @wallets.acq(id, &:txns).select { |t| t.amount.negative? }.each do |t|
         total += 1
         if t.bnf == id
           @log.error("Paying itself in #{id}? #{t}")
           next
         end
-        @wallets.find(t.bnf) do |target|
+        @wallets.acq(t.bnf, exclusive: true) do |target|
           unless target.exists?
             @log.debug("#{t.amount * -1} to #{t.bnf}: wallet is absent")
             next