zold 0.24.1 → 0.24.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd8af10e547ce516fb7605565eecedd43d5c2a518d20e9322bee2f487f30fe7d
-  data.tar.gz: 6538cd38132e668880d16b4a8175f1199a576cd61d8ca55eaeb93711c8e700a6
+  metadata.gz: b8d740810d7c8bd0686a665d824c67cb3bc8db247689fc5c686b8bece3f66a0a
+  data.tar.gz: 72109b1959e05e5d10c907efa6f6604091c98bef735904d56c242adaa11c0abf
 SHA512:
-  metadata.gz: 29ed97e7b51046c5ad3ebcdbe7576d41ed7b5b1d1b1c73ff98c2ec266f48f14d7cd005e52719b876f9acfa8f2fac3f74e07cc1b1a06bd76c02cd75148a4dba8a
-  data.tar.gz: 79e365ba3997f36592ed4bbe2f5a89a66689aede0f6d6a62019c8ef7e76ad932283c6ad03e38007062cf28a8b4db5f6583e2e57f3df2e7070ae0698f23d0671f
+  metadata.gz: 97cd7c7ac22d39688eaa33bd1b4eaf08734c8d3d5c644ba5293793eccb5808ac9f4a85301b7b6bb0ad78c5bb76a077ebe5987c1838d413fdf0142106de806684
+  data.tar.gz: d50fd2647a8d7cdfa7f58461a224f522e21050ff0656d9428e5674cecea77bbae83712f5eb5ce70d1f704b811224e4072f66365340af94cc66af248e64581c12

data/fixtures/merge/into_no_wallet/opts

@@ -0,0 +1 @@
+--shallow

data/fixtures/merge/legacy_negatives_stay/opts

@@ -0,0 +1 @@
+--verbose

data/fixtures/merge/random_expenses/opts

@@ -0,0 +1 @@
+--verbose

data/fixtures/merge/simple_case/opts

@@ -0,0 +1 @@
+--verbose

data/fixtures/merge/unconfirmed_income/0123456789abcdef.z

@@ -0,0 +1,4 @@
+test
+1
+0123456789abcdef
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnppnkzrCreiKaHF09XKS6bO+2274+wSGo+F8KHvVrNbqear/e09r9PB/P6bFdLoMh4Xc7p/7+NSEZLeu2Eg/dBkQLEb8M/zgkT4gBDGyETW/zusYHIznX/lgf0f8qleIQIIB/3Y7QpDztkamWYTKWlnmlrcQvCVB0uRRPm4ZMcMJouKR9n7E2DpL9eolKyOwr/JY08iJOuK3HuW6tRdvE+0x7I+wDprM65OH/PoArlfO5qnIGbeXwsEGRXt0w6a/ubPpeadFjPXotE7cT1SA4YSD1tWTIVm1ZWppOE967XoDIum6tzt5KfzDNRfs9GbCfO0BL235HxbO8I9rTlVLTKcNAiEe0CWolY9HR5pMaosOgZ6PB54InJEZJs4L2b10c+IlVUX1RSnwfFYg0vy5oqrYyqt7gnipl/06YW4PKIYc7TljogsEHf9Cz/kpEKzqDtsH2LrmjMNsbWiousvNHM+MPgcuMg8ZnwLKwDy9NWdI4XLTpg6hVRJNH9erZdfAO5tg/3ub3JLeJbyNo4Bd5f/Bnr5YN/9ahZ87kSpI7v0Qk94dR4hDPjstEcghyZ9RVUoN52+h1g83cd3cIqksJd0kifMCoBmObD013RSPQqNwr9GGU2JaJEm25Vq35dy2DHAkOQpUZVT8GNg9IM4qUDV0yagTN3bZyvuLWIgufb0CAwEAAQ==

data/fixtures/merge/unconfirmed_income/assert.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2018-2019 Zerocracy, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require_relative 'asserts'
+wallet = Zold::Wallet.new('0123456789abcdef.z')
+assert_equal(Zold::Amount::ZERO, wallet.balance)

data/fixtures/merge/unconfirmed_income/copies/0123456789abcdef/1.zc

@@ -0,0 +1,6 @@
+test
+1
+0123456789abcdef
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnppnkzrCreiKaHF09XKS6bO+2274+wSGo+F8KHvVrNbqear/e09r9PB/P6bFdLoMh4Xc7p/7+NSEZLeu2Eg/dBkQLEb8M/zgkT4gBDGyETW/zusYHIznX/lgf0f8qleIQIIB/3Y7QpDztkamWYTKWlnmlrcQvCVB0uRRPm4ZMcMJouKR9n7E2DpL9eolKyOwr/JY08iJOuK3HuW6tRdvE+0x7I+wDprM65OH/PoArlfO5qnIGbeXwsEGRXt0w6a/ubPpeadFjPXotE7cT1SA4YSD1tWTIVm1ZWppOE967XoDIum6tzt5KfzDNRfs9GbCfO0BL235HxbO8I9rTlVLTKcNAiEe0CWolY9HR5pMaosOgZ6PB54InJEZJs4L2b10c+IlVUX1RSnwfFYg0vy5oqrYyqt7gnipl/06YW4PKIYc7TljogsEHf9Cz/kpEKzqDtsH2LrmjMNsbWiousvNHM+MPgcuMg8ZnwLKwDy9NWdI4XLTpg6hVRJNH9erZdfAO5tg/3ub3JLeJbyNo4Bd5f/Bnr5YN/9ahZ87kSpI7v0Qk94dR4hDPjstEcghyZ9RVUoN52+h1g83cd3cIqksJd0kifMCoBmObD013RSPQqNwr9GGU2JaJEm25Vq35dy2DHAkOQpUZVT8GNg9IM4qUDV0yagTN3bZyvuLWIgufb0CAwEAAQ==
+
+0001;2018-06-22T07:38:23Z;0000020000000000;g6hVRJNH;0000000000000000;To help you;

data/fixtures/merge/unconfirmed_income/copies/0123456789abcdef/scores.zc

@@ -0,0 +1 @@
+1,0.0.0.0,4096,50,NOW,M

data/fixtures/merge/unconfirmed_income/opts

@@ -0,0 +1 @@
+--verbose

data/lib/zold/id.rb

@@ -31,7 +31,15 @@ module Zold
     PTN = Regexp.new('^[0-9a-fA-F]{16}$')
     private_constant :PTN
 
-    def initialize(id = format('%016x', rand(2**32..2**64 - 1)))
+    def self.generate_id
+      loop do
+        id = format('%016x', rand(2**32..2**64 - 1))
+        next if IO.read(File.join(__dir__, '../../resources/banned-wallets.csv')).include?("\"#{id}\"")
+        return id
+      end
+    end
+
+    def initialize(id = Id.generate_id)
       raise "Invalid wallet ID type: #{id.class.name}" unless id.is_a?(String)
       raise "Invalid wallet ID: #{id}" unless PTN.match?(id)
       @id = Integer("0x#{id}", 16)

data/lib/zold/node/front.rb

@@ -355,8 +355,10 @@ this is not a normal behavior, you may want to report a bug to our GitHub reposi
 
     put %r{/wallet/(?<id>[A-Fa-f0-9]{16})/?} do
       error(404, 'PUSH is disabled with --disable-push') if settings.opts['disable-fetch']
+      id = Id.new(params[:id])
+      ban(id)
       request.body.rewind
-      modified = settings.entrance.push(Id.new(params[:id]), request.body.read.to_s)
+      modified = settings.entrance.push(id, request.body.read.to_s)
       if modified.empty?
         status(304)
         return
@@ -521,9 +523,15 @@ time to stop; use --skip-oom to never quit")
       end
     end
 
+    def ban(id)
+      return unless IO.read(File.join(__dir__, '../../../resources/banned-wallets.csv')).include?("\"#{id}\"")
+      error(404, "The wallet #{id} is banned")
+    end
+
     def fetch(type = 'text/plain')
       error(404, 'FETCH is disabled with --disable-fetch') if settings.opts['disable-fetch']
       id = Id.new(params[:id])
+      ban(id)
       settings.wallets.acq(id) do |wallet|
         error(404, "Wallet ##{id} doesn't exist on the node") unless wallet.exists?
         content_type(type)

data/lib/zold/patch.rb

@@ -58,6 +58,13 @@ module Zold
     # Joins a new wallet on top of existing patch. An attempt is made to
     # copy as many transactions from the newcoming wallet to the existing
     # set of transactions, avoiding mistakes and duplicates.
+    #
+    # A block has to be given. It will be called, if a paying wallet is absent.
+    # The block will have to return either TRUE or FALSE. TRUE will mean that
+    # the paying wallet has to be present and we just tried to pull it. If it's
+    # not present, it's a failure, don't accept the transaction. FALSE will mean
+    # that the transaction should be accepted, even if the paying wallet is
+    # absent.
     def join(wallet, ledger: '/dev/null')
       if @id.nil?
         @id = wallet.id
@@ -109,16 +116,16 @@ with a new one \"#{txn.to_text}\" from #{wallet.mnemo}")
             @log.debug("Payment prefix '#{txn.prefix}' doesn't match with the key of #{wallet.id}: \"#{txn.to_text}\"")
             next
           end
-          if !@wallets.acq(txn.bnf, &:exists?) && yield(txn)
-            unless @wallets.acq(txn.bnf, &:exists?)
+          unless @wallets.acq(txn.bnf, &:exists?)
+            if yield(txn) && !@wallets.acq(txn.bnf, &:exists?)
               @log.error("Paying wallet #{txn.bnf} file is absent even after PULL: \"#{txn.to_text}\"")
               next
             end
-            unless @wallets.acq(txn.bnf) { |p| p.includes_negative?(txn.id, wallet.id) }
-              @log.debug("The beneficiary #{@wallets.acq(txn.bnf, &:mnemo)} of #{@id} \
+          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} \
 doesn't have this transaction: \"#{txn.to_text}\"")
-              next
-            end
+            next
           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.24.1'
+  VERSION = '0.24.2'
   PROTOCOL = 2
   REPO = 'zold-io/zold'
 end

data/resources/banned-wallets.csv

@@ -0,0 +1,24 @@
+"0894a904d32c0ba3"
+"0d8ed9bcb0573b63"
+"1702251695a4fc27"
+"1a88cccf77ee75b0"
+"2fe7c2ec2e60b046"
+"39d95edbb9a35d0a"
+"49713aba31100942"
+"502eaadb94d4d80c"
+"5721e29e9676112b"
+"6dd1d36a22e1a7f5"
+"85552d69c055b247"
+"8fcfc4efe9d6e8c5"
+"9611e7132261e099"
+"a76275aaf35abbcb"
+"b6d4dbfabc826e2d"
+"dfd3d50d159d2af0"
+"e3001d5f031f6467"
+"e71c61076cec4946"
+"ea361bfd3b45840c"
+"eb7b753cfa467881"
+"f02da7749c5a1031"
+"f18608d227b74af7"
+"f5b7c9d1afe6a45d"
+"ffac61007dadbd2b"

data/resources/banned-wallets.log

@@ -0,0 +1,36 @@
+This is pdfTeX, Version 3.14159265-2.6-1.40.17 (TeX Live 2016) (preloaded format=pdflatex 2016.5.22)  1 MAR 2019 15:42
+entering extended mode
+ \write18 enabled.
+ %&-line parsing enabled.
+**/Volumes/ssd2/code/zold/zold/resources/banned-wallets.csv
+(/Volumes/ssd2/code/zold/zold/resources/banned-wallets.csv
+LaTeX2e <2016/03/31>
+Babel <3.9r> and hyphenation patterns for 83 language(s) loaded.
+
+! LaTeX Error: Missing \begin{document}.
+
+See the LaTeX manual or LaTeX Companion for explanation.
+Type  H <return>  for immediate help.
+ ...                                              
+                                                  
+l.1 0
+     894a904d32c0ba3 (http://www.zold.io/ledger.html?wallet=0894a904d32c0ba3)
+? 
+! Emergency stop.
+ ...                                              
+                                                  
+l.1 0
+     894a904d32c0ba3 (http://www.zold.io/ledger.html?wallet=0894a904d32c0ba3)
+You're in trouble here.  Try typing  <return>  to proceed.
+If that doesn't work, type  X <return>  to quit.
+
+ 
+Here is how much of TeX's memory you used:
+ 8 strings out of 493014
+ 407 string characters out of 6133351
+ 53601 words of memory out of 5000000
+ 3648 multiletter control sequences out of 15000+600000
+ 3640 words of font info for 14 fonts, out of 8000000 for 9000
+ 1141 hyphenation exceptions out of 8191
+ 5i,0n,4p,133b,14s stack positions out of 5000i,500n,10000p,200000b,80000s
+!  ==> Fatal error occurred, no output PDF file produced!

data/test/commands/test_merge.rb

@@ -151,7 +151,7 @@ class TestMerge < Zold::Test
         copies = File.join(dir, 'copies')
         remotes = Zold::Remotes.new(file: File.join(dir, 'remotes'))
         Zold::Merge.new(wallets: wallets, remotes: remotes, copies: copies, log: test_log).run(
-          %w[merge 0123456789abcdef --shallow]
+          %w[merge 0123456789abcdef] + IO.read(File.join(dir, 'opts')).split("\n")
         )
         Dir.chdir(dir) do
           require File.join(dir, 'assert.rb')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.24.1
+  version: 0.24.2
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-25 00:00:00.000000000 Z
+date: 2019-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -571,27 +571,36 @@ files:
 - fixtures/merge/asserts.rb
 - fixtures/merge/id_rsa
 - fixtures/merge/id_rsa.pub
-- fixtures/merge/into-no-wallet/assert.rb
-- fixtures/merge/into-no-wallet/copies/0123456789abcdef/1.zc
-- fixtures/merge/into-no-wallet/copies/0123456789abcdef/scores.zc
-- fixtures/merge/legacy-negatives-stay/0123456789abcdef.z
-- fixtures/merge/legacy-negatives-stay/assert.rb
-- fixtures/merge/legacy-negatives-stay/copies/0123456789abcdef/1.zc
-- fixtures/merge/legacy-negatives-stay/copies/0123456789abcdef/scores.zc
-- fixtures/merge/random-expenses/0000000000000000.z
-- fixtures/merge/random-expenses/0123456789abcdef.z
-- fixtures/merge/random-expenses/assert.rb
-- fixtures/merge/random-expenses/copies/0123456789abcdef/1.zc
-- fixtures/merge/random-expenses/copies/0123456789abcdef/2.zc
-- fixtures/merge/random-expenses/copies/0123456789abcdef/3.zc
-- fixtures/merge/random-expenses/copies/0123456789abcdef/4.zc
-- fixtures/merge/random-expenses/copies/0123456789abcdef/5.zc
-- fixtures/merge/random-expenses/copies/0123456789abcdef/scores.zc
-- fixtures/merge/simple-case/0000000000000000.z
-- fixtures/merge/simple-case/0123456789abcdef.z
-- fixtures/merge/simple-case/assert.rb
-- fixtures/merge/simple-case/copies/0123456789abcdef/1.zc
-- fixtures/merge/simple-case/copies/0123456789abcdef/scores.zc
+- fixtures/merge/into_no_wallet/assert.rb
+- fixtures/merge/into_no_wallet/copies/0123456789abcdef/1.zc
+- fixtures/merge/into_no_wallet/copies/0123456789abcdef/scores.zc
+- fixtures/merge/into_no_wallet/opts
+- fixtures/merge/legacy_negatives_stay/0123456789abcdef.z
+- fixtures/merge/legacy_negatives_stay/assert.rb
+- fixtures/merge/legacy_negatives_stay/copies/0123456789abcdef/1.zc
+- fixtures/merge/legacy_negatives_stay/copies/0123456789abcdef/scores.zc
+- fixtures/merge/legacy_negatives_stay/opts
+- fixtures/merge/random_expenses/0000000000000000.z
+- fixtures/merge/random_expenses/0123456789abcdef.z
+- fixtures/merge/random_expenses/assert.rb
+- fixtures/merge/random_expenses/copies/0123456789abcdef/1.zc
+- fixtures/merge/random_expenses/copies/0123456789abcdef/2.zc
+- fixtures/merge/random_expenses/copies/0123456789abcdef/3.zc
+- fixtures/merge/random_expenses/copies/0123456789abcdef/4.zc
+- fixtures/merge/random_expenses/copies/0123456789abcdef/5.zc
+- fixtures/merge/random_expenses/copies/0123456789abcdef/scores.zc
+- fixtures/merge/random_expenses/opts
+- fixtures/merge/simple_case/0000000000000000.z
+- fixtures/merge/simple_case/0123456789abcdef.z
+- fixtures/merge/simple_case/assert.rb
+- fixtures/merge/simple_case/copies/0123456789abcdef/1.zc
+- fixtures/merge/simple_case/copies/0123456789abcdef/scores.zc
+- fixtures/merge/simple_case/opts
+- fixtures/merge/unconfirmed_income/0123456789abcdef.z
+- fixtures/merge/unconfirmed_income/assert.rb
+- fixtures/merge/unconfirmed_income/copies/0123456789abcdef/1.zc
+- fixtures/merge/unconfirmed_income/copies/0123456789abcdef/scores.zc
+- fixtures/merge/unconfirmed_income/opts
 - fixtures/scripts/_head.sh
 - fixtures/scripts/calculate-scores.sh
 - fixtures/scripts/distribute-wallet.sh
@@ -672,6 +681,8 @@ files:
 - lib/zold/version_file.rb
 - lib/zold/wallet.rb
 - lib/zold/wallets.rb
+- resources/banned-wallets.csv
+- resources/banned-wallets.log
 - resources/masters
 - resources/root.pub
 - test/commands/routines/test_audit.rb
@@ -753,7 +764,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.24.1!
+  Thanks for installing Zold 0.24.2!
     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