zold 0.11.15 → 0.11.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca4077a7a79a8ff6e6cc6ca27ebeda18571a3b7a
-  data.tar.gz: b5259cec4a2a73e33be07e387466a3b020d30be7
+  metadata.gz: 741133a152a47f10deca486c7f68ab98927cb721
+  data.tar.gz: eecf1c370e17a0dea43cf298477234f88d6d5813
 SHA512:
-  metadata.gz: 4251510624adf3efade782f91cf3ba44bccbd1dfd2561da972253abbd3ab0aff08940c57a66e642a25ea5d42c706167d892babb1871bf8fbe25f684a4fd48da9
-  data.tar.gz: 27a737d9cccff7cd12c97ff096b69860ee0542f01f2a33908d05bbce0828429d847b6ca12c1d71c03f3273ed83196cfccc18f056a71ec4c972cdef605c829342
+  metadata.gz: 8b91d87cf98800345481d0296514a29650df203d345acf732f87246589d92c654612d87f727864b208ba566ed93427c439305c721c1a9801c494a43797fe2c30
+  data.tar.gz: 4b15be2214801ddf880f0686494dbe8a93c867ce60d597764aac6c3e1ba8e5232b7e289f357bf1aaf3d82575555cca9aabbb1c3b2f73da490f9116ac077ec9ee

data/README.md

@@ -136,6 +136,46 @@ Yes, you can run many nodes with the same wallet ID.
 Yes, you can use `--threads` command line argument for your node
 and the number of threads will be as big as you wish.
 
+## JSON Details
+
+When you open up the front web page of your node, you will see a JSON document
+with a lot of technical details. Here is the explanation of the majority of them:
+
+`version` is the current version of the running software.
+The node is supposed to update update itself automatically (if you run it via `zold-nohup`)
+every time it discovers another node with a higher version.
+
+`score` is the current score your node is exposing to the network now.
+All other nodes are using this information in order to decide how much
+they can trust your node with the information it provides, about wallets.
+The higher the score, the better.
+
+  * `value` is the amount of suffixes the score contains; this is the
+    number all other nodes rely on.
+
+  * `host` is the host name of the node, it must be equal to the public
+    IP or domain name of the node; it is provided in `--host` command line
+    option of `zold-nohup`.
+
+  * `port` is the TCP port number, which usually is equal to 4096;
+    it is provided in `--port` command line option.
+
+  * `invoice` is the address of your wallet, where the system
+    will send you rewards for keeping the node online and some
+    users will pay taxes; it is provided in `--invoice` command line option.
+
+  * `time` is the ISO-8601 UTC date and time of when your node
+    started to calculate the score.
+
+  * `strength` is the amount of tailing zeros the hash contains.
+
+  * `hash` is the SHA-256 hash of the score text.
+
+  * `minutes` is the age of the score, in minutes since the moment
+    it was created.
+
+To be continued...
+
 ## How to Contribute
 
 It is a Ruby command line gem. First, install

data/fixtures/scripts/push-and-pull.sh

@@ -33,6 +33,7 @@ zold pay --private-key=id_rsa 0000000000000000 ${invoice} 14.99 'To save the wor
 zold propagate 0000000000000000
 zold show
 zold show 0000000000000000
+zold taxes debt 0000000000000000
 
 zold remote show
 zold push 0000000000000000 --sync

data/lib/zold/commands/node.rb

@@ -123,6 +123,7 @@ module Zold
             sleep(60)
             require_relative 'remote'
             Remote.new(remotes: remotes, log: @log, farm: farm).run(%w[remote add b1.zold.io 80 --force])
+            Remote.new(remotes: remotes, log: @log, farm: farm).run(%w[remote trim])
             Remote.new(remotes: remotes, log: @log, farm: farm).run(%w[remote update --reboot])
             @log.info("Regular update of remote nodes succeeded, total=#{remotes.all.count}")
           end

data/lib/zold/commands/taxes.rb

@@ -70,7 +70,7 @@ Available options:"
       when 'debt'
         raise 'At least one wallet ID is required' unless mine[1]
         mine[1..-1].each do |id|
-          debt(@wallets.find(Id.new(id), opts))
+          debt(@wallets.find(Id.new(id)), opts)
         end
       when 'pay'
         raise 'At least one wallet ID is required' unless mine[1]

data/lib/zold/patch.rb

@@ -56,8 +56,11 @@ module Zold
           (txn.id <= max ||
           @txns.find { |t| t.id == txn.id } ||
           @txns.map(&:amount).inject(&:+) < txn.amount)
-        unless Signature.new.valid?(@key, wallet.id, txn)
-          raise "Invalid RSA signature at transaction ##{txn.id} of #{wallet.id}"
+        if !txn.amount.negative? && !txn.sign.empty?
+          raise "RSA signature is redundant at ##{txn.id} of #{wallet.id}: #{txn.to_text}"
+        end
+        if txn.amount.negative? && !Signature.new.valid?(@key, wallet.id, txn)
+          raise "Invalid RSA signature at transaction ##{txn.id} of #{wallet.id}: #{txn.to_text}"
         end
         @txns << txn
       end

data/lib/zold/txn.rb

@@ -83,9 +83,11 @@ module Zold
     end
 
     def inverse(bnf)
+      raise 'You can\'t reverse a positive transaction' unless amount.negative?
       t = clone
       t.amount = amount * -1
       t.bnf = bnf
+      t.sign = ''
       t
     end
 

data/lib/zold/version.rb

@@ -23,5 +23,5 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.11.15'.freeze
+  VERSION = '0.11.16'.freeze
 end

data/test/commands/test_propagate.rb

@@ -0,0 +1,48 @@
+# Copyright (c) 2018 Yegor Bugayenko
+#
+# 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 'minitest/autorun'
+require_relative '../test__helper'
+require_relative '../fake_home'
+require_relative '../../lib/zold/amount'
+require_relative '../../lib/zold/commands/propagate'
+require_relative '../../lib/zold/commands/pay'
+
+# PROPAGATE test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+class TestPropagate < Minitest::Test
+  def test_propagates_wallet
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet
+      friend = home.create_wallet
+      amount = Zold::Amount.new(zld: 14.95)
+      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: test_log).run(
+        ['pay', wallet.id.to_s, friend.id.to_s, amount.to_zld, '--force', '--private-key=fixtures/id_rsa']
+      )
+      Zold::Propagate.new(wallets: home.wallets, log: test_log).run(
+        ['merge', wallet.id.to_s]
+      )
+      assert(amount, friend.balance)
+      assert('', friend.txns[0].sign)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.11.15
+  version: 0.11.16
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -370,6 +370,7 @@ files:
 - test/commands/test_merge.rb
 - test/commands/test_node.rb
 - test/commands/test_pay.rb
+- test/commands/test_propagate.rb
 - test/commands/test_push.rb
 - test/commands/test_remote.rb
 - test/commands/test_show.rb
@@ -440,6 +441,7 @@ test_files:
 - test/commands/test_merge.rb
 - test/commands/test_node.rb
 - test/commands/test_pay.rb
+- test/commands/test_propagate.rb
 - test/commands/test_push.rb
 - test/commands/test_remote.rb
 - test/commands/test_show.rb