zold 0.14.12 → 0.14.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eebbf694c3af2594b3ff82b988bfdc53a5c926f2
-  data.tar.gz: a10ed4895198184566d4495fa8ddc7a5d6fb42bb
+  metadata.gz: 15c46c2740b4034dae78391ab88d747116977858
+  data.tar.gz: 89bcbf8445379dddbff308e0dfb0a60fb11157e6
 SHA512:
-  metadata.gz: 2b064373631472b0ea87c017d662ba5886fc6a4258a60387431bc4cc71fd65b47de25c20f5aea3f3031680bc07d1c53d6ffd2de8523698be265794f8d96b5936
-  data.tar.gz: c39bd06b4edf7f3f520b7ed7732eb4130662354a0845897ac0087ac39684d9d8671da753d2bae087c68a4f02e5d158fa3c191ef67a4abf33e56caa57509bf5d6
+  metadata.gz: 1236cdbd4219b2b61dd11ffe556f26e867a2a91985d14c1d670ed2388393451e38fef70baefbaa0dd699c56b754798350a9e9afbdd116fdb7f5e21b0074ee586
+  data.tar.gz: ae55db8d0224a10c1facebf9a3e52dc2f7be2baf9285138af232b808bba340171f74335237abf0a13909e24bf772671016de48873ec04858d552c8fc44905975

data/lib/zold/http.rb

@@ -50,6 +50,10 @@ module Zold
     # production one.
     NETWORK_HEADER = 'X-Zold-Network'
 
+    # HTTP header we add, in order to inform the node about our
+    # protocol.
+    PROTOCOL_HEADER = 'X-Zold-Protocol'
+
     # @todo #98:30m/DEV The following two statements are seen as issues by rubocop
     #  raising a Lint/AmbiguousBlockAssociation offense. It is somthing
     #  that could be solved by changing the TargetRubyVersion in .rubocop.yml
@@ -119,7 +123,8 @@ module Zold
         'Connection': 'close',
         'Accept-Encoding': 'gzip'
       }
-      headers[Http::VERSION_HEADER] = VERSION
+      headers[Http::VERSION_HEADER] = Zold::VERSION
+      headers[Http::PROTOCOL_HEADER] = Zold::PROTOCOL.to_s
       headers[Http::NETWORK_HEADER] = network
       headers[Http::SCORE_HEADER] = score.reduced(4).to_text if score.valid? && !score.expired? && score.value > 3
       headers

data/lib/zold/node/async_entrance.rb

@@ -45,6 +45,17 @@ module Zold
       @mutex = Mutex.new
     end
 
+    def to_json
+      json = {
+        'queue': queue.count,
+        'pool.length': @pool.length,
+        'pool.running': @pool.running?
+      }
+      opts = queue
+      json['queue_age'] = opts.empty? ? 0 : Time.now - File.mtime(File.join(@dir, opts[0]))
+      @entrance.to_json.merge(json)
+    end
+
     def start
       @entrance.start do
         FileUtils.mkdir_p(@dir)
@@ -53,8 +64,8 @@ module Zold
         )
         AsyncEntrance::THREADS.times do
           @pool.post do
-            VerboseThread.new(@log).run(true) do
-              loop do
+            loop do
+              VerboseThread.new(@log).run(true) do
                 take
                 break if @pool.shuttingdown?
                 sleep Random.rand(100) / 100
@@ -77,14 +88,6 @@ module Zold
       end
     end
 
-    def to_json
-      @entrance.to_json.merge(
-        'queue': queue.count,
-        'pool.length': @pool.length,
-        'pool.running': @pool.running?
-      )
-    end
-
     def push(id, body)
       @mutex.synchronize do
         AtomicFile.new(File.join(@dir, id.to_s)).write(body)

data/lib/zold/node/front.rb

@@ -74,6 +74,11 @@ module Zold
           raise "Network name mismatch, you are in '#{header}', we are in '#{settings.network}'"
         end
       end
+      check_header(Http::PROTOCOL_HEADER) do |header|
+        if header != settings.protocol.to_s
+          raise "Protocol mismatch, you are in '#{header}', we are in '#{settings.protocol}'"
+        end
+      end
       check_header(Http::SCORE_HEADER) do |header|
         if settings.remotes.all.empty?
           settings.log.debug("#{request.url}: we are in standalone mode, won't update remotes")
@@ -98,7 +103,7 @@ module Zold
       headers['Cache-Control'] = 'no-cache'
       headers['Connection'] = 'close'
       headers['X-Zold-Version'] = settings.version
-      headers['X-Zold-Protocol'] = settings.protocol.to_s
+      headers[Http::PROTOCOL_HEADER] = settings.protocol.to_s
       headers['Access-Control-Allow-Origin'] = '*'
       headers[Http::SCORE_HEADER] = score.reduced(16).to_s
     end
@@ -161,6 +166,7 @@ module Zold
         wallets: settings.wallets.all.count,
         mtime: wallet.mtime.utc.iso8601,
         digest: wallet.digest,
+        balance: wallet.balance.to_i,
         body: AtomicFile.new(wallet.path).read
       }.to_json
     end

data/lib/zold/patch.rb

@@ -58,13 +58,24 @@ module Zold
         end
         @network = wallet.network
       end
-      if wallet.network != @network
-        raise "The wallet is from a different network '#{wallet.network}', ours is '#{@network}'"
+      unless wallet.network == @network
+        @log.error("The wallet is from a different network '#{wallet.network}', ours is '#{@network}'")
+        return
+      end
+      unless wallet.key == @key
+        @log.error('Public key mismatch')
+        return
+      end
+      unless wallet.id == @id
+        @log.error("Wallet ID mismatch, ours is #{@id}, theirs is #{wallet.id}")
+        return
       end
-      raise 'Public key mismatch' if wallet.key != @key
-      raise "Wallet ID mismatch: #{@id} != #{wallet.id}" if wallet.id != @id
       wallet.txns.each do |txn|
         next if @txns.find { |t| t == txn }
+        if @txns.find { |t| t.id == txn.id && t.bnf == txn.bnf }
+          @log.error("A transaction with the same ID #{t.id} and BNF #{t.bnf} already exists")
+          next
+        end
         if txn.amount.negative?
           dup = @txns.find { |t| t.id == txn.id && t.amount.negative? }
           if dup

data/lib/zold/txn.rb

@@ -110,27 +110,27 @@ module Zold
     def self.parse(line, idx = 0)
       regex = Regexp.new(
         '^' + [
-          '([0-9a-f]{4})',
-          '([0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z)',
-          '([0-9a-f]{16})',
-          "(#{Txn::RE_PREFIX})",
-          '([0-9a-f]{16})',
-          "(#{Txn::RE_DETAILS})",
-          '([A-Za-z0-9+/]+={0,3})?'
+          '(?<id>[0-9a-f]{4})',
+          '(?<date>[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z)',
+          '(?<amount>[0-9a-f]{16})',
+          "(?<prefix>#{Txn::RE_PREFIX})",
+          '(?<bnf>[0-9a-f]{16})',
+          "(?<details>#{Txn::RE_DETAILS})",
+          '(?<sign>[A-Za-z0-9+/]+={0,3})?'
         ].join(';') + '$'
       )
       clean = line.strip
-      raise "Invalid line ##{idx}: #{line.inspect} #{regex}" unless regex.match(clean)
-      parts = clean.split(';')
+      parts = regex.match(clean)
+      raise "Invalid line ##{idx}: #{line.inspect} #{regex}" unless parts
       txn = Txn.new(
-        Hexnum.parse(parts[0]).to_i,
-        Time.parse(parts[1]),
-        Amount.new(coins: Hexnum.parse(parts[2]).to_i),
-        parts[3],
-        Id.new(parts[4]),
-        parts[5]
+        Hexnum.parse(parts[:id]).to_i,
+        Time.parse(parts[:date]),
+        Amount.new(coins: Hexnum.parse(parts[:amount]).to_i),
+        parts[:prefix],
+        Id.new(parts[:bnf]),
+        parts[:details]
       )
-      txn.sign = parts[6]
+      txn.sign = parts[:sign]
       txn
     end
   end

data/lib/zold/version.rb

@@ -25,6 +25,6 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.14.12'
+  VERSION = '0.14.13'
   PROTOCOL = 2
 end

data/test/commands/test_fetch.rb

@@ -59,11 +59,18 @@ class TestFetch < Minitest::Test
       remotes.add('localhost', 80)
       remotes.add('localhost', 81)
       copies = home.copies(wallet)
-      Zold::Fetch.new(wallets: home.wallets, copies: copies.root, remotes: remotes, log: test_log).run(
-        ['fetch', '--ignore-score-weakness', wallet.id.to_s]
-      )
-      assert_equal(copies.all[0][:name], '1')
-      assert_equal(copies.all[0][:score], 0)
+      begin
+        retries ||= 0
+        Zold::Fetch.new(wallets: home.wallets, copies: copies.root, remotes: remotes, log: test_log).run(
+          ['fetch', '--ignore-score-weakness', wallet.id.to_s]
+        )
+      rescue StandardError => _
+        sleep 1
+        retry if (retries += 1) < 3
+      end
+      assert_equal(1, copies.all.count)
+      assert_equal('1', copies.all[0][:name])
+      assert_equal(0, copies.all[0][:score])
     end
   end
 end

data/test/test_zold.rb

@@ -50,7 +50,7 @@ class TestZold < Minitest::Test
               out << line
             end
             code = thr.value.to_i
-            assert_equal(0, code, f + out.join("\n"))
+            assert_equal(0, code, f + out.join)
           end
         end
       end

metadata

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