zold 0.26.12 → 0.26.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6dc7d4af444b77c367d8ae9dd1567223dc38efb345d93084b98f66697caaee4
-  data.tar.gz: fbd00ded5906db327cac77b11ccbc2364fa84941e8064d2db140074086b43b02
+  metadata.gz: 9fea2bb24b6779c8bcf92b092ccdf770165f0dd26fabe8381c67428e8ed8c6b3
+  data.tar.gz: 2daa71cade79a0a8c6b047a5eab74ee58222da232fdc3fe465c625c21effa194
 SHA512:
-  metadata.gz: 13ce38068af52530bab8a9df87aaba5e10886b8e640145554f051c48d984ef02261d2ed329d16630feac7c79e96c3c2067634fa8272a66054b76d236d2309ba7
-  data.tar.gz: cd79e35eba174c346ba0f68f35f180174dc872df2c73179c95189be63b81f1bf59f532462a38e8395aae6e0c9208bd139cca62f1c8cb9b5844ce3a8f4c207eef
+  metadata.gz: 487269eca1122c24548464355049b8507baf71a759e30f8063b4f4f629c47d563658233ac86c8feb30fc55f66b9e69fffce34d3f38683541c9f1ea1f30394f50
+  data.tar.gz: 1361b2c745f127b73f7b871808ebf1f13a3b17fa96f835703ea242775b134a62e7ff55f4b450746ff28d97f1c47ec4e11faf8cc5ad4270644e866c2d29eded3c

data/README.md

@@ -312,7 +312,9 @@ Now you are ready to create a wallet:
 
 ```ruby
 require 'zold/commands/create'
-Zold::Create.new(wallets: wallets).run(['create', '--public-key=/tmp/id_rsa.pub'])
+Zold::Create.new(wallets: wallets, remotes: remotes).run(
+  ['create', '--public-key=/tmp/id_rsa.pub', '--skip-test']
+)
 ```
 
 Here `--public-key=/tmp/id_rsa.pub` points to the absolute location of

data/bin/zold

@@ -212,7 +212,7 @@ cmd = lambda do
       Zold::Node.new(wallets: wallets, remotes: remotes, copies: copies, log: log).run(args)
     when 'create'
       require_relative '../lib/zold/commands/create'
-      Zold::Create.new(wallets: wallets, log: log).run(args)
+      Zold::Create.new(wallets: wallets, remotes: remotes, log: log).run(args)
     when 'remote'
       require_relative '../lib/zold/commands/remote'
       Zold::Remote.new(remotes: remotes, log: log).run(args)

data/lib/zold/commands/create.rb

@@ -37,8 +37,9 @@ module Zold
   class Create
     prepend ThreadBadge
 
-    def initialize(wallets:, log: Log::NULL)
+    def initialize(wallets:, remotes:, log: Log::NULL)
       @wallets = wallets
+      @remotes = remotes
       @log = log
     end
 
@@ -50,6 +51,9 @@ Available options:"
           'The location of RSA public key (default: ~/.ssh/id_rsa.pub)',
           require: true,
           default: File.expand_path('~/.ssh/id_rsa.pub')
+        o.bool '--skip-test',
+          'Don\'t check whether this wallet ID is available',
+          default: false
         o.string '--network',
           "The name of the network (default: #{Wallet::MAINET}",
           require: true,
@@ -57,11 +61,25 @@ Available options:"
         o.bool '--help', 'Print instructions'
       end
       mine = Args.new(opts, @log).take || return
-      create(mine.empty? ? Id.new : Id.new(mine[0]), opts)
+      create(mine.empty? ? create_id(opts) : Id.new(mine[0]), opts)
     end
 
     private
 
+    def create_id(opts)
+      loop do
+        id = Id.new
+        return id if opts['skip-test']
+        found = false
+        @remotes.iterate(@log) do |r|
+          head = r.http("/wallet/#{id}/digest").get
+          found = true if head.status == 200
+        end
+        return id unless found
+        @log.info("Wallet ID #{id} is already occupied, will try another one...")
+      end
+    end
+
     def create(id, opts)
       key = Zold::Key.new(file: opts['public-key'])
       @wallets.acq(id, exclusive: true) do |wallet|

data/lib/zold/node/async_entrance.rb

@@ -98,7 +98,7 @@ module Zold
       unless exists?(id, body)
         loop do
           uuid = SecureRandom.uuid
-          file = File.join(@dir, "#{id}-#{uuid}")
+          file = File.join(@dir, "#{id}-#{uuid}#{Wallet::EXT}")
           next if File.exist?(file)
           IO.write(file, body)
           @queue << { id: id, file: file }

data/lib/zold/node/front.rb

@@ -275,10 +275,6 @@ this is not a normal behavior, you may want to report a bug to our GitHub reposi
       fetch { |w| w.age.to_s }
     end
 
-    get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/age} do
-      fetch { |w| w.age.to_s }
-    end
-
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/txns} do
       fetch { |w| w.txns.count.to_s }
     end

data/lib/zold/patch.rb

@@ -126,9 +126,12 @@ with a new one \"#{txn.to_text}\" from #{wallet.mnemo}")
             end
           end
           if @wallets.acq(txn.bnf, &:exists?) && !@wallets.acq(txn.bnf) { |p| p.includes_negative?(txn.id, wallet.id) }
-            @log.debug("The beneficiary #{@wallets.acq(txn.bnf, &:mnemo)} of #{@id} \
+            yield(txn)
+            unless @wallets.acq(txn.bnf) { |p| p.includes_negative?(txn.id, wallet.id) }
+              @log.debug("The beneficiary #{@wallets.acq(txn.bnf, &:mnemo)} of #{@id} \
 doesn't have this transaction: \"#{txn.to_text}\"")
-            next
+              next
+            end
           end
         end
         @txns << txn

data/lib/zold/version.rb

@@ -25,7 +25,7 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.26.12'
+  VERSION = '0.26.13'
   PROTOCOL = 2
   REPO = 'zold-io/zold'
 end

data/test/commands/test_create.rb

@@ -35,8 +35,8 @@ class TestCreate < Zold::Test
   def test_creates_wallet
     Dir.mktmpdir do |dir|
       wallets = Zold::Wallets.new(dir)
-      id = Zold::Create.new(wallets: wallets, log: test_log).run(
-        ['create', '--public-key=fixtures/id_rsa.pub']
+      id = Zold::Create.new(wallets: wallets, remotes: nil, log: test_log).run(
+        ['create', '--public-key=fixtures/id_rsa.pub', '--skip-test']
       )
       wallets.acq(id) do |wallet|
         assert(wallet.balance.zero?)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.26.12
+  version: 0.26.13
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -773,7 +773,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.26.12!
+  Thanks for installing Zold 0.26.13!
     Study our White Paper: https://papers.zold.io/wp.pdf
     Read our blog posts: https://blog.zold.io
     Try ZLD online wallet at: https://wts.zold.io