zold 0.14.5 → 0.14.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02756005fb2c93a0d5f761508fd96a03ced75595
-  data.tar.gz: eca849a45be0c29b8e5e11b7579ab16f15429388
+  metadata.gz: fe27c493a3594f3ad04a4d024d87c918c54a27c5
+  data.tar.gz: b862fc9b4598e823f994c8705407c66895a5f41a
 SHA512:
-  metadata.gz: 77f888f0178cf42099ed921f9de20843cedcbc2adb9ea313f42236ee90f20497ad515f9a9055809ee19ffa291bf2986f0daaab522ababca288be60a0f3bacd18
-  data.tar.gz: 211a846efc40001fce2ba874e874b9cb5d312873719b379a4aae14e93bae4ab86a90b9d828f1440acae2f16faf0b874c17461d078c48bdc973b5a54797154833
+  metadata.gz: 4ad796318f03c00a569968618259c56e366dd4ef142a3aea108a143085aa84b4f7a4280079db4d4434bf7eb40742ca56f8417628cbeef461b5749cc7add113a4
+  data.tar.gz: 3f48555b78d03a02664637dfee238e970e764844993341c6c1ed6521a212d285729366f8c73b9a32b23b6eb14c76ac0da9eb5f1701c1b260f5b2ca206058a7f4

data/lib/zold/commands/propagate.rb

@@ -71,7 +71,7 @@ Available options:"
           next
         end
         next if target.has?(t.id, me)
-        unless Prefixes.new(target).valid?(t.prefix)
+        unless target.prefix?(t.prefix)
           @log.error("#{t.amount * -1} to #{t.bnf}: wrong prefix")
           next
         end

data/lib/zold/metronome.rb

@@ -57,12 +57,13 @@ module Zold
             start = Time.now
             begin
               r.exec(step)
+              @log.info("Routine #{r.class.name} ##{step} done in #{(Time.now - start).round(2)}s")
             rescue StandardError => e
               @failures[r.class.name] = Backtrace.new(e).to_s
+              @log.error("Routine #{r.class.name} ##{step} failed in #{(Time.now - start).round(2)}s")
+              @log.error(Backtrace.new(e).to_s)
             end
             step += 1
-            @log.info("Routine #{r.class.name} ##{step} done in #{(Time.now - start).round(2)}s: \
-#{@threads.map { |t| "#{t.name}/#{t.status}" }.join(',')}")
             sleep(1)
           end
         end

data/lib/zold/node/front.rb

@@ -225,13 +225,6 @@ module Zold
         status 304
         return
       end
-      if before != after && before.length == after.length
-        settings.log.debug(
-          "Weird... the wallet #{id} is of the same length #{after.length}, but the content is different:\n" +
-          Diffy::Diff.new(before, after, context: 0).to_s
-        )
-      end
-      settings.log.info("Wallet #{id} is new: #{before.length}b != #{after.length}b")
       settings.entrance.push(id, after)
       JSON.pretty_generate(
         version: settings.version,

data/lib/zold/node/safe_entrance.rb

@@ -59,6 +59,10 @@ module Zold
       Tempfile.open(['', Wallet::EXTENSION]) do |f|
         File.write(f, body)
         wallet = Wallet.new(f.path)
+        wallet.refurbish
+        unless wallet.protocol == Zold::PROTOCOL
+          raise "The protocol mismatch, the wallet is in '#{wallet.protocol}', we are in '#{Zold::PROTOCOL}'"
+        end
         unless wallet.network == @network
           raise "The network name mismatch, the wallet is in '#{wallet.network}', we are in '#{@network}'"
         end

data/lib/zold/patch.rb

@@ -84,7 +84,7 @@ module Zold
             @log.error("RSA signature is redundant at ##{txn.id} of #{wallet.id}: #{txn.to_text}")
             next
           end
-          unless wallet.key.to_s.include?(txn.prefix)
+          unless wallet.prefix?(txn.prefix)
             @log.error("Payment prefix '#{txn.prefix}' doesn't match with the key of #{wallet.id}: #{txn.to_text}")
             next
           end

data/lib/zold/prefixes.rb

@@ -35,19 +35,14 @@ module Zold
     def create(length = 8)
       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]/, '')
+      key = @wallet.key.to_pub
+      prefix = ''
+      rnd = Random.new
+      until prefix =~ /^[a-zA-Z0-9]+$/
+        start = rnd.rand(key.length - length)
+        prefix = key[start..(start + length - 1)]
+      end
+      prefix
     end
   end
 end

data/lib/zold/version.rb

@@ -23,6 +23,6 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION  = '0.14.5'.freeze
+  VERSION  = '0.14.6'.freeze
   PROTOCOL = 2
 end

data/lib/zold/wallet.rb

@@ -134,6 +134,10 @@ module Zold
       !txns.find { |t| t.id == id && t.bnf == bnf }.nil?
     end
 
+    def prefix?(prefix)
+      key.to_pub.include?(prefix)
+    end
+
     def key
       Key.new(text: lines[3].strip)
     end

data/test/test_prefixes.rb

@@ -36,9 +36,11 @@ class TestPrefixes < Minitest::Test
       wallet = home.create_wallet
       prefixes = Zold::Prefixes.new(wallet)
       (8..32).each do |len|
-        prefix = prefixes.create(len)
-        assert_equal(len, prefix.length)
-        assert(prefixes.valid?(prefix))
+        50.times do
+          prefix = prefixes.create(len)
+          assert_equal(len, prefix.length)
+          assert(wallet.prefix?(prefix), "Prefix '#{prefix}' not found")
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.14.5
+  version: 0.14.6
 platform: ruby
 authors:
 - Yegor Bugayenko