zold 0.29.27 → 0.29.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 295768d109f5ff2f7362a0f7b30f4aeb2d8fc67c58816556472c8d9da2909677
-  data.tar.gz: '086008d6b389610f95e9a7a681c8e7401df0b6db97186c948037afb60c55bde6'
+  metadata.gz: 8fc5f47657b08c4e98a026b0b71def6da39a322e3f24666614a4f35d7f4580aa
+  data.tar.gz: da6bac2fdec7446e025e96ba6df2ada4a41122152eabf1f3748a0c80628d4fec
 SHA512:
-  metadata.gz: 165a28b79bc5da4e965190c4ce6c912acef541fcbee0cacbe6af6b0fc3be89d10467fc75375e41f18a223be414e5d6970637e7d3c7bb52475ce38f0488db012c
-  data.tar.gz: b86173d3d67c9013526df001165af3dab752bc2fe46d5c519cabd0a7114472d2619337f31f7762195a7ff24b95588abb7d563f186a6b7547e8f19e4d80c92a10
+  metadata.gz: c5c081dd571630428327bc2ae02ff0a47bab44e4d288f6ca6bfe9852cad9dd1c5300183f8c00b26de7e167af62281dcb3fc1c38691e1f656e02a3405d54fac44
+  data.tar.gz: 787d7d4d98ff67a4b26297ed3e1a3ec7dd5993e012585f2ac4755e5c69543cfb70f328497801cedb100576b3f1d70fb6ef13e71564c88d766ecb54659662d63d

data/.github/CODE_OF_CONDUCT.md

@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at github@zold.io. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

data/.github/CONTRIBUTING.md

@@ -0,0 +1,11 @@
+Just send a pull request and call it a day.
+
+Don't forget to run this, beforehand:
+
+```
+bundle exec rake
+```
+
+Only if the build is green, you send us your pull request.
+
+Thanks!

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

data/.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

data/.rubocop.yml

@@ -5,12 +5,16 @@ AllCops:
   DisplayCopNames: true
   TargetRubyVersion: 2.5
 
+Lint/ToJSON:
+  Enabled: false
+Layout/AlignArguments:
+  Enabled: false
 Style/ClassAndModuleChildren:
   Enabled: false
 Layout/EmptyLineAfterGuardClause:
   Enabled: false
 Metrics/CyclomaticComplexity:
-  Max: 30
+  Max: 33
 Metrics/MethodLength:
   Enabled: false
 Layout/MultilineMethodCallIndentation:
@@ -30,7 +34,7 @@ Metrics/ParameterLists:
 Layout/AlignParameters:
   Enabled: false
 Metrics/PerceivedComplexity:
-  Max: 34
+  Max: 36
 Metrics/LineLength:
   Max: 120
 Style/MultilineBlockChain:

data/README.md

@@ -15,20 +15,39 @@
 
 [![Yard Docs](http://img.shields.io/badge/yard-docs-blue.svg)](http://rubydoc.info/github/zold-io/zold/master/frames)
 [![Maintainability](https://api.codeclimate.com/v1/badges/2861728929db934eb376/maintainability)](https://codeclimate.com/github/zold-io/zold/maintainability)
+[![Hits-of-Code](https://hitsofcode.com/github/zold-io/zold)](https://hitsofcode.com/github/zold-io/zold)
 
-**NOTICE**: It's an experiment and a very early draft! Please, feel free to
-submit your ideas and/or pull requests.
+To understand what Zold cryptocurrency is about you may want
+to watch [this video](https://youtu.be/5A9uBwMow0M) first. Then, you may
+want to read [this blog](https://blog.zold.io/2018/07/08/mission.html) post.
+Then, you have to read the [Green Paper](https://papers.zold.io/green-paper.pdf)
+(just four pages). In a nutshell, Zold is a cryptocurrency with the following
+features:
 
-Here is the [White Paper](https://papers.zold.io/wp.pdf).
+  * No Blockchain
+  * No General Ledger
+  * Very fast, because de-centralized
+  * 100 times cheaper than Bitcoin
+  * Proof-of-work
+  * Unique consensus protocol
+  * Pre-mined with total capacity of 2 billion ZLD
+  * Anonymous
+  * Written in Ruby
+
+More details you can find in the [White Paper](https://papers.zold.io/wp.pdf).
+
+You can also find us at the [Bitcointalk](https://bitcointalk.org/index.php?topic=5095078) forum.
 
 Join our [Telegram group](https://t.me/zold_io) to discuss it all live.
 
 The license is [MIT](https://github.com/zold-io/zold/blob/master/LICENSE.txt).
 
-The web wallet is here: [wts.zold.io](https://wts.zold.io).
-
 ## How to Use
 
+You can try the web wallet [here](https://wts.zold.io), but the best way
+to use Zold is through the command line tool, which has all the features
+and should remind you Git, if you are a programmer.
+
 First, install [Ruby 2.3+](https://www.ruby-lang.org/en/documentation/installation/),
 [Rubygems](https://rubygems.org/pages/download), and
 the [gem](https://rubygems.org/gems/zold).
@@ -190,7 +209,7 @@ 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
+## Front-end 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:
@@ -271,6 +290,88 @@ To be continued...
 
 `hours_alive` is the time in hours your server is alive without a reboot.
 
+## HTTP RESTful API
+
+Well, maybe it's not purely RESTful, but each node has a simple
+set of HTTP entry points, which you can use to retrieve information
+about wallets, node status, log details, and some other things. Here
+is a more or less complete list of them:
+
+  * `GET /`: returns the JSON explained above
+
+  * `GET /score`: returns the text presentation of the current Score
+
+  * `GET /version`: returns the version of the software
+
+  * `GET /protocol`: returns the protocol ID
+
+  * `GET /wallet/ID`: returns the JSON with wallet details
+
+  * `GET /wallet/ID/balance`: returns wallet balance in zents (text/plain)
+
+  * `GET /wallet/ID/key`: returns wallet public RSA key
+
+  * `GET /wallet/ID/mtime`: returns ISO-8601 time of wallet file modification
+
+  * `GET /wallet/ID/size`: returns the size of the wallet file in bytes
+
+  * `GET /wallet/ID/age`: returns the age of the wallet, in seconds
+
+  * `GET /wallet/ID/txns`: returns the amount of transactions in the wallet
+
+  * `GET /wallet/ID/debt`: returns the tax debt of the wallet in zents
+
+  * `GET /wallet/ID/digest`: returns SHA-256 digest of the wallet file
+
+  * `GET /wallet/ID/mnemo`: returns the mnemo short string of the wallet
+
+  * `GET /wallet/ID/txns.json`: returns the full list of transactions in the wallet in JSON document
+
+  * `GET /wallet/ID.txt`: returns the text presentation of the wallet
+
+  * `GET /wallet/ID.html`: returns the HTML presentation of the wallet
+
+  * `GET /wallet/ID.bin`: returns the entire wallet file
+
+  * `GET /wallet/ID/copies`: returns the list of copies of the wallet
+
+  * `GET /wallet/ID/copy/NAME`: returns the entire content of a single copy of the wallet
+
+  * `PUT /wallet/ID`: accepts a new content of the wallet, in order to
+    modify the one stored on the server (PUSH operation)
+
+  * `GET /wallets`: returns the list of all wallets maintained by the node,
+    in plain text, separated by EOL
+
+  * `GET /remotes`: returns the list of remote nodes in JSON
+
+  * `GET /ledger`: returns the list of recently visible transactions
+
+  * `GET /ledger.json`: returns the list of recently visible transactions, in JSON
+
+There are a few other entry points, which exist most for debugging purposes,
+they may not be supported by alternative implementations of the node software:
+
+  * `GET /pid`: returns the process ID of the software
+
+  * `GET /trace`: returns the entire log of the node
+
+  * `GET /farm`: returns the statistics of the Farm
+
+  * `GET /metronome`: returns the statistics of the Metronome
+
+  * `GET /threads`: returns the statistics of all Ruby threads
+
+  * `GET /ps`: returns the statistics of all currently running Unix processes
+
+  * `GET /queue`: returns the statistics of the node queue
+
+  * `GET /journal`: returns the journal, in HTML
+
+  * `GET /journal/item?id=ID`: returns the content of a single journal entry
+
+There could be other entry points, not documented here.
+
 ## SDK
 
 Here is how you use Zold SDK from your Ruby app. First, you should

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

@@ -1 +1 @@
-1,0.0.0.0,4096,10,NOW,M
+1,0.0.0.0,4096,10,NOW,

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

@@ -0,0 +1,6 @@
+test
+2
+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-01-01T01:01:01Z;ffffffe000000000;qJkKMWUC;146b852f2d9ad984;test;j9ozyBTjJ90TK1u3o4m6ueLWspbXCgEWhLYNQ8B9EonQ9bIsl19DbdsPwyY5M3o8dSefDOwsA9OE48x9ncyh3n/BSYKSUHzSrU1RmVLR2+hveEzwGKPZleUzurDbKZA06MuuP46KDv3uhJ9OjX6szVwBqHorxoJ0zyqRtRdjKop7gqTVbyIIGOM5fu4lx3KhdWJLzD0sN75rdCmuF2yw/V2D+AdkB+84C+rTjp4x9bUr5zIinQtAYn8AJbdpk/3CLHWR/RhqFdUmQrQlgLile016bfkKg8l2S7HufrKdGNVThuoOrpTKZV+prctV2f8/2XANrHoVrtT5y3aENXfvlvYMQYqJsOl8wvLtQEts4pwtQBOdKUC4i82aZW/3lkQr9T8JPoyIthmm8AoOAx6RU0ccDckarDYAg1t5nYA/wK+fBDFkwIwUoI6zkvmwpUCI6/Wf9smF69H+FQNi8OrH0MaO0nzh7zFxgpFKaJAGumEvGPtA7rY3zYZ0P4lK9QnIa887p8WgA7YCN9/WieY71DINfMjVRwC7kxCa7LqNtOlXyp2pMJzWGWGbZH/SF6HpeIMbq7J0yUrdyLz8OwgLk5Wzuv/mht+mvhbI54mZixs4MawAXs9kTPmqGIRpMFvqLmD6GtKEltKuHGnAs4QSFjMmWbGG0WS98TztzFMpLG0=

data/fixtures/merge/negative_overwriting/146b852f2d9ad984.z

@@ -0,0 +1,6 @@
+test
+2
+146b852f2d9ad984
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyevqT0h4CcDkA4jeC+u0ITqULIyKD4HlUTyoOl8QK6BqDZ5oc4jCIGHgVfwdRVhKdUukWb7AUIVPVf76qepNZLwQ8UGtEwk+nCfq0/4u4zlCr78ZMmpIbdme5a6rXjiB3TE8UVgTPROx5EecazKXcvgmqfl7o98QBkqSKVqvIHzED5wADQzxjmGMmLWP8aTs0/6v4NG7wXJnMEJ0QYf845HMjpiXlNgldU1M1gTCM/8RJJaGjbEOax8HWj4n7LnqPHL5wtSe0CI6BzQsm9lEHUyywMW+SleCc5yponz5ZPzVkMYIzvO36BqykeZ0AXJyE5JfMoljJXG5bJX4tMhvIDVlZDlDh07vd11x3qJEtKB0c/hYcUmrUMAr0jZXBjv+MVq3WMVMClrMDyc1LMmrGh7Jp4hyugYRmrRAiTiZvmd2MaVB16sU91aiDHo90MefQ+RTwGO0YDNDzW1jW0qEYlfXZQGALWDWnyP1h1qzu4SaWrp4Chnt5OmwV67gxUw/VKQekTaiN7/ApeB5wXakrZiuIITi39865qqkkjDWVrRneqF0YDZz1S7eOIZ3OJvCi5OMU1nTTxaycVofolVmfGZlWROS9ENj2gVk9RQLX9xBXC1Vk4C/U7bIPDhk+nMHaDriuTNlmRPwMa6Flj1A9cLDUFPu7F0rDv3iqJkKMWUCAwEAAQ==
+
+0001;2019-05-14T14:34:56Z;0000001000000000;v4NG7wXJ;0123456789abcdef;test;

data/fixtures/merge/negative_overwriting/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.new(zld: -16.0), wallet.balance)

data/fixtures/merge/negative_overwriting/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;2019-05-14T14:34:56Z;fffffff000000000;v4NG7wXJ;146b852f2d9ad984;test;NSOdJUTYidOne3T0VranU9H8Lb4weJQ1KYhMu7MfFTIiUWXc56O4c/cRIikjQ+EFsneFtYBEHs0TH2oevndGyrHcHkBkmsMRWD0ujYFD27oWEuOX828dYM/vjn7q1ggb9XTJN3kEKnrP8zbfVzJotsh2I9ctNByGoy33ecGfYtv7pFfcUItjd6SbYmGGOCt/Jf4/I5p+pgW2xGjG75jRMQ1Gh40aWGHfOxi38HyUqSr9pcymerbUaEKpFrk8+CJ3LbCUN9Ve2WYIwIZd9POpN2PH+aF+syzEv2Yj7LDTfkLQHLzIJJqtCJvSXeqKgVKQLmtkjgHDX6aTyb8w7+NJ2Mkjq6mREny8qbJnwLi+d7Pl+fFCArP3kFBULKQDzqe7sA8+xew6Dq8kVZWoBtuPFusMhBu7rq573waOcj6ZiW7tKww0abTGe96KUNssMhyF4alHvXQ0b7orK6l2DOBV/JDlgP5mEu2mOJ8Y81peCMNa1m8Y+AgrGijrm5aqk0JHjGH2hVRrHPZcyyO+msoLe7vP5umpf4DuMBMPgGZQc5Sqpc8wuSgD+XaiSVKv1Nr/gQYp2oZbGXnGl47reCvy1lJr2kBzLIWIPdrZIGh7iVy/DFcvw+t7wvoOm1fEfVfDgl04yHwNOiUOLKNlfGFliWJoCJ+sJv5DztHpDEKLBv4=

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

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

data/fixtures/merge/negative_overwriting/opts

@@ -0,0 +1,2 @@
+--verbose
+--allow-negative-balance

data/lib/zold/commands/fetch.rb

@@ -138,7 +138,7 @@ run 'zold remote update' or use --tolerate-quorum=1"
         end
       end
       @log.info("#{done.value} copies of #{id} fetched in #{Age.new(start)} with the total score of \
-#{total.value} from #{nodes.value} nodes (#{masters.value} master nodes)")
+#{total.value} from #{nodes.value - masters.value}+#{masters.value}m nodes")
       list = cps.all.map do |c|
         "  ##{c[:name]}: #{c[:score]} #{c[:total]}n #{Wallet.new(c[:path]).mnemo} \
 #{Size.new(File.size(c[:path]))}/#{Age.new(File.mtime(c[:path]))}#{c[:master] ? ' master' : ''}"

data/lib/zold/commands/merge.rb

@@ -65,7 +65,7 @@ Available options:"
           default: false
         o.integer '--depth',
           'How many levels down we try to pull other wallets if their confirmations are required (default: 0)',
-          default: 1
+          default: 0
         o.bool '--allow-negative-balance',
           'Don\'t check for the negative balance of the wallet after the merge',
           default: false
@@ -124,7 +124,7 @@ Available options:"
         wallet = Wallet.new(c[:path])
         baseline = idx.zero? && (c[:master] || opts['edge-baseline']) && !opts['no-baseline']
         name = "#{c[:name]}/#{idx}/#{c[:score]}#{baseline ? '/baseline' : ''}"
-        merge_one(opts, patch, wallet, name, baseline: baseline)
+        merge_one(opts, patch, wallet, name, baseline: baseline, master: c[:master])
         score += c[:score]
       end
       @wallets.acq(id) do |w|
@@ -152,11 +152,11 @@ into #{@wallets.acq(id, &:mnemo)} in #{Age.new(start, limit: 0.1 + cps.count * 0
       modified
     end
 
-    def merge_one(opts, patch, wallet, name, baseline: false)
+    def merge_one(opts, patch, wallet, name, baseline: false, master: false)
       start = Time.now
-      @log.debug("Building a patch for #{wallet.id} from remote copy ##{name} with #{wallet.mnemo}...")
+      @log.debug("Adding copy ##{name}#{master ? ' (master)' : ''} to the patch #{wallet.mnemo}...")
       if opts['depth'].positive?
-        patch.join(wallet, ledger: opts['ledger'], baseline: baseline) do |txn|
+        patch.join(wallet, ledger: opts['ledger'], baseline: baseline, master: master) do |txn|
           trusted = IO.read(opts['trusted']).split(',')
           if trusted.include?(txn.bnf.to_s)
             @log.debug("Won't PULL #{txn.bnf} since it is already trusted, among #{trusted.count} others")
@@ -176,7 +176,7 @@ into #{@wallets.acq(id, &:mnemo)} in #{Age.new(start, limit: 0.1 + cps.count * 0
           true
         end
       else
-        patch.join(wallet, ledger: opts['ledger'], baseline: baseline) do |txn|
+        patch.join(wallet, ledger: opts['ledger'], baseline: baseline, master: master) do |txn|
           @log.debug("Paying wallet #{txn.bnf} is incomplete but there is not enough depth to PULL: #{txn.to_text}")
           false
         end

data/lib/zold/commands/node.rb

@@ -457,9 +457,13 @@ the node won\'t connect to the network like that; try to do "zold remote reset"
       end
       require_relative 'routines/spread'
       metronome.add(Routines::Spread.new(opts, @wallets, @remotes, @copies, log: @log))
+      require_relative 'routines/retire'
+      metronome.add(Routines::Retire.new(opts, log: @log))
       if @remotes.master?(host, port)
         require_relative 'routines/reconcile'
         metronome.add(Routines::Reconcile.new(opts, @wallets, @remotes, @copies, "#{host}:#{port}", log: @log))
+      else
+        @log.info('This is not master, no need to reconcile')
       end
       @log.info('Metronome started (use --no-metronome to disable it)')
       metronome

data/lib/zold/commands/pay.rb

@@ -148,6 +148,7 @@ the difference is #{(amount - from.balance).to_i} zents"
         @log.debug("Keygap \"#{'*' * opts['keygap'].length}\" injected into the RSA private key")
       end
       key = Zold::Key.new(text: pem)
+      from.refurbish
       txn = from.sub(amount, invoice, key, details, time: Txn.parse_time(opts['time']))
       @log.debug("#{amount} sent from #{from} to #{txn.bnf}: #{details}")
       @log.debug("Don't forget to do 'zold push #{from}'")

data/lib/zold/commands/push.rb

@@ -31,6 +31,7 @@ require_relative '../thread_pool'
 require_relative '../hands'
 require_relative '../age'
 require_relative '../size'
+require_relative '../tax'
 require_relative '../log'
 require_relative '../id'
 require_relative '../http'
@@ -98,6 +99,9 @@ Available options:"
       @wallets.acq(id) do |wallet|
         raise "The wallet #{id} is absent at #{wallet.path}" unless wallet.exists?
       end
+      if @wallets.acq(id) { |w| Tax.new(w).in_debt? }
+        @log.info("Taxes in #{id} are not paid, most likely the wallet won't be accepted by any node")
+      end
       start = Time.now
       total = Concurrent::AtomicFixnum.new
       nodes = Concurrent::AtomicFixnum.new
@@ -121,7 +125,7 @@ Available options:"
 run 'zold remote update' or use --tolerate-quorum=1"
         end
       end
-      @log.info("Push finished to #{done.value} nodes (#{masters.value} master nodes) \
+      @log.info("Push finished to #{done.value - masters.value}+#{masters.value}m nodes \
 out of #{nodes.value} in #{Age.new(start)}, total score for #{id} is #{total.value}")
     end
 

data/lib/zold/commands/remote.rb

@@ -261,7 +261,8 @@ Available options:"
         @remotes.remove(r[:host], r[:port]) if !opts['masters-too'] || !r[:master]
         @log.debug("#{r[:host]}:#{r[:port]} removed because of #{r[:errors]} errors (over #{opts['tolerate']})")
       end
-      @log.info("The list of #{all.count} remotes trimmed down to #{@remotes.all.count} nodes")
+      @log.info("The list of #{all.count} remotes trimmed down to #{@remotes.all.count} nodes \
+(#{@remotes.all.count { |r| r[:master] }} masters)")
     end
 
     def update(opts)
@@ -299,7 +300,9 @@ Available options:"
       if total.zero?
         @log.info("The list of remotes is #{Rainbow('empty').red}, run 'zold remote reset'!")
       else
-        @log.info("There are #{total} known remotes with the overall score of \
+        @log.info("There are #{total} known remotes \
+(#{@remotes.all.count { |r| r[:master] }} masters) \
+with the overall score of \
 #{@remotes.all.map { |r| r[:score] }.inject(&:+)}, after update in #{Age.new(st)}")
       end
     end
@@ -354,7 +357,8 @@ it's recommended to reboot, but I don't do it because of --never-reboot")
         @remotes.remove(r[:host], r[:port])
         @log.debug("Remote #{r[:host]}:#{r[:port]}/#{r[:score]}/#{r[:errors]}e removed from the list")
       end
-      @log.info("#{@remotes.all.count} best remote nodes were selected to stay in the list")
+      @log.info("#{@remotes.all.count} best remote nodes were selected to stay in the list \
+(#{@remotes.all.count { |r| r[:master] }} masters)")
     end
 
     def terminate

data/lib/zold/commands/routines/reconcile.rb

@@ -48,10 +48,15 @@ class Zold::Routines::Reconcile
       next if r.to_mnemo == @address
       res = r.http('/wallets').get
       r.assert_code(200, res)
-      res.body.strip.split("\n").compact
+      missing = res.body.strip.split("\n").compact
         .select { |i| /^[a-f0-9]{16}$/.match?(i) }
         .reject { |i| @wallets.acq(Zold::Id.new(i), &:exists?) }
-        .each { |i| pull(i) }
+      missing.each { |i| pull(i) }
+      if missing.empty?
+        log.info("Nothing to reconcile with #{r}, we are good at #{@address}")
+      else
+        @log.info("Reconcile routine pulled #{missing.count} wallets from #{r}")
+      end
     end
   end
 

data/lib/zold/commands/routines/reconnect.rb

@@ -44,16 +44,31 @@ class Zold::Routines::Reconnect
     score = @farm.best[0]
     args << "--ignore-node=#{Shellwords.escape("#{score.host}:#{score.port}")}" if score
     cmd.run(args + ['masters']) unless @opts['routine-immediately']
-    all = @remotes.all
-    return if @opts['routine-immediately'] && all.empty?
+    return if @opts['routine-immediately'] && @remotes.all.empty?
     cmd.run(args + ['select'])
-    if all.count < Zold::Remotes::MAX_NODES / 2 ||
-      all.any? { |r| r[:errors] > Zold::Remotes::TOLERANCE } || (step % 10).zero?
-      cmd.run(args + ['update'] + (@opts['never-reboot'] ? [] : ['--reboot']))
+    if (step % 10).zero?
+      @log.info("It is round ##{step}, time to update the list of remotes")
+      update(cmd, args)
+    end
+    if @remotes.all.any? { |r| r[:errors] > Zold::Remotes::TOLERANCE }
+      @log.info('There are a few remote nodes with too many errors, it\'s time to update')
+      update(cmd, args)
+    else
+      @log.debug("All #{@remotes.all.count} remote nodes are still more or less error-free, won't update")
+    end
+    if @remotes.all.count < Zold::Remotes::MAX_NODES / 2
+      @log.info("There are just #{@remotes.all.count} remotes in the list, time to update")
+      update(cmd, args)
     end
     cmd.run(args + ['trim'])
     cmd.run(args + ['select'])
     @log.info("Reconnected, there are #{@remotes.all.count} remote notes: \
 #{@remotes.all.map { |r| "#{r[:host]}:#{r[:port]}/#{r[:score]}/#{r[:errors]}" }.join(', ')}")
   end
+
+  private
+
+  def update(cmd, args)
+    cmd.run(args + ['update'] + (@opts['never-reboot'] ? [] : ['--reboot']))
+  end
 end

data/lib/zold/commands/routines/retire.rb

@@ -0,0 +1,48 @@
+# 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 'shellwords'
+require_relative '../routines'
+require_relative '../remote'
+require_relative '../../node/farm'
+
+# Kill the node if it's too old.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+class Zold::Routines::Retire
+  def initialize(opts, log: Log::NULL)
+    @opts = opts
+    @log = log
+    @start = Time.now
+  end
+
+  def exec(step = 0)
+    sleep(60) unless @opts['routine-immediately']
+    days = 4
+    return if step < days * 24 * 60 && Time.now - @start < days * 24 * 60 * 60
+    return if @opts['never-reboot']
+    @log.info("We are too old, step ##{step}, it's time to retire (use --never-reboot to avoid this)")
+    require_relative '../../node/front'
+    Zold::Front.stop!
+  end
+end

data/lib/zold/gem.rb

@@ -36,7 +36,7 @@ module Zold
       JsonPage.new(
         Http.new(uri: 'https://rubygems.org/api/v1/versions/zold/latest.json').get.body
       ).to_hash['version']
-    rescue StandardError => _
+    rescue StandardError => _e
       '0.0.0'
     end
   end

data/lib/zold/node/farm.rb

@@ -167,7 +167,7 @@ at #{host}:#{port}, strength is #{@strength}")
       loop do
         begin
           s << @pipeline.pop(true)
-        rescue ThreadError => _
+        rescue ThreadError
           sleep(0.25)
         end
         s.compact!

data/lib/zold/node/farmers.rb

@@ -111,7 +111,7 @@ for #{score.value}/#{score.strength} at #{score.host}:#{score.port}")
               begin
                 buffer << stdout.read_nonblock(16 * 1024)
                 # rubocop:disable Lint/HandleExceptions
-              rescue IO::WaitReadable => _
+              rescue IO::WaitReadable
                 # rubocop:enable Lint/HandleExceptions
                 # nothing to do here
               rescue StandardError => e

data/lib/zold/node/front.rb

@@ -232,6 +232,7 @@ this is not a normal behavior, you may want to report a bug to our GitHub reposi
         total_mem: total_mem,
         threads: "#{Thread.list.select { |t| t.status == 'run' }.count}/#{Thread.list.count}",
         wallets: total_wallets,
+        journal: DirItems.new(settings.journal_dir).fetch.count,
         remotes: all_remotes.count,
         nscore: all_remotes.map { |r| r[:score] }.inject(&:+) || 0,
         farm: settings.farm.to_json,

data/lib/zold/patch.rb

@@ -69,7 +69,10 @@ module Zold
     # The "baseline" flag, when set to TRUE, means that we should NOT validate
     # the presence of positive incoming transactions in their correspondent
     # wallets. We shall just trust them.
-    def join(wallet, ledger: '/dev/null', baseline: false)
+    #
+    # If the "master" flag is set, this copy is coming from a master node
+    # and we should allow it to overwrite negative transactions.
+    def join(wallet, ledger: '/dev/null', baseline: false, master: false)
       if @id.nil?
         @id = wallet.id
         @key = wallet.key
@@ -95,11 +98,16 @@ module Zold
         seen += 1
         if txn.amount.negative?
           dup = @txns.find { |t| t.id == txn.id && t.amount.negative? }
-          if dup
+          if dup && !master
             @log.error("An attempt to overwrite existing transaction #{dup.to_text.inspect} \
 with a new one #{txn.to_text.inspect} from #{wallet.mnemo}")
             next
           end
+          if dup && master
+            @log.debug("An overwrite to the existing transaction #{dup.to_text.inspect} \
+is coming from a master node: #{txn.to_text.inspect} from #{wallet.mnemo}")
+            @txns.reject! { |t| t.id == txn.id && t.amount.negative? }
+          end
           unless Signature.new(@network).valid?(@key, wallet.id, txn)
             @log.error("Invalid RSA signature at the transaction ##{txn.id} of #{wallet.id}: #{txn.to_text.inspect}")
             next

data/lib/zold/remotes.rb

@@ -34,6 +34,7 @@ require_relative 'http'
 require_relative 'hands'
 require_relative 'thread_pool'
 require_relative 'node/farm'
+require_relative 'commands/fetch'
 
 # The list of remotes.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -118,7 +119,12 @@ at #{response.headers['X-Zold-Path']}"
     MAX_NODES = 16
 
     # Default nodes and their ports
-    MASTERS = CSV.read(File.expand_path(File.join(File.dirname(__FILE__), '../../resources/masters')))
+    MASTERS = CSV.read(File.expand_path(File.join(File.dirname(__FILE__), '../../resources/masters'))).map do |r|
+      {
+        host: r[0].strip,
+        port: r[1].to_i
+      }
+    end.freeze
     private_constant :MASTERS
 
     # Empty, for standalone mode
@@ -168,9 +174,9 @@ at #{response.headers['X-Zold-Path']}"
     def masters
       MASTERS.each do |r|
         if block_given?
-          next unless yield(r[0], r[1].to_i)
+          next unless yield(r[:host], r[:port])
         end
-        add(r[0], r[1].to_i)
+        add(r[:host], r[:port])
       end
     end
 
@@ -255,7 +261,7 @@ at #{response.headers['X-Zold-Path']}"
     end
 
     def master?(host, port)
-      !MASTERS.find { |r| r[0] == host && r[1].to_i == port }.nil?
+      !MASTERS.find { |r| r[:host] == host && r[:port] == port }.nil?
     end
 
     private

data/lib/zold/version.rb

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

data/test/commands/routines/test_reconnect.rb

@@ -36,7 +36,8 @@ class TestReconnect < Zold::Test
     Dir.mktmpdir do |dir|
       remotes = Zold::Remotes.new(file: File.join(dir, 'remotes.csv'))
       remotes.clean
-      stub_request(:get, 'http://b1.zold.io:80/remotes').to_return(status: 404)
+      remotes.add('localhost', 4096)
+      stub_request(:get, 'http://localhost:4096/remotes').to_return(status: 404)
       opts = { 'never-reboot' => true, 'routine-immediately' => true }
       routine = Zold::Routines::Reconnect.new(opts, remotes, log: test_log)
       routine.exec

data/test/commands/routines/test_retire.rb

@@ -0,0 +1,40 @@
+# 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 'minitest/autorun'
+require 'tmpdir'
+require 'webmock/minitest'
+require_relative '../../test__helper'
+require_relative '../../../lib/zold/remotes'
+require_relative '../../../lib/zold/commands/routines/retire.rb'
+
+# Retire test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+class TestRetire < Zold::Test
+  def test_retires
+    opts = { 'never-reboot' => false, 'routine-immediately' => true }
+    routine = Zold::Routines::Retire.new(opts, log: test_log)
+    routine.exec(10 * 24 * 60)
+  end
+end

data/test/commands/test_node.rb

@@ -56,7 +56,7 @@ class TestNode < Zold::Test
             wallets: wallets, copies: copies.root,
             remotes: remotes, log: test_log
           ).run(['fetch', '--ignore-score-weakness', '--tolerate-edges', '--tolerate-quorum=1'])
-        rescue StandardError => _
+        rescue StandardError => _e
           sleep 1
           retry if (retries += 1) < 3
         end

data/test/commands/test_pay.rb

@@ -107,8 +107,9 @@ class TestPay < Zold::Test
     FakeHome.new(log: test_log).run do |home|
       wallet = home.create_wallet
       amount = Zold::Amount.new(zld: 2.0)
+      wallets = home.wallets
       Threads.new(10).assert do
-        Zold::Pay.new(wallets: home.wallets, copies: home.dir, remotes: home.remotes, log: test_log).run(
+        Zold::Pay.new(wallets: wallets, copies: home.dir, remotes: home.remotes, log: test_log).run(
           [
             'pay', '--force', '--private-key=fixtures/id_rsa',
             wallet.id.to_s, 'NOPREFIX@dddd0000dddd0000', amount.to_zld, '-'

data/test/node/test_front.rb

@@ -64,6 +64,7 @@ class FrontTest < Zold::Test
       assert_equal('zold-io/zold', json['repo'])
       assert(json['pid'].positive?, json)
       assert(json['cpus'].positive?, json)
+      assert(!json['journal'].negative?, json)
       assert(json['memory'].positive?, json)
       assert(!json['load'].negative?, json)
       assert(json['wallets'].positive?, json)

data/zold.gemspec

@@ -62,18 +62,18 @@ and suggests a different architecture for digital wallet maintenance.'
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
   s.add_runtime_dependency 'backtrace', '>=0.3'
-  s.add_runtime_dependency 'concurrent-ruby', '1.1.3'
-  s.add_runtime_dependency 'diffy', '3.2.1'
+  s.add_runtime_dependency 'concurrent-ruby', '1.1.5'
+  s.add_runtime_dependency 'diffy', '3.3.0'
   s.add_runtime_dependency 'futex', '>=0.8.5'
   s.add_runtime_dependency 'get_process_mem', '~>0.2'
   s.add_runtime_dependency 'haml', '5.0.4'
-  s.add_runtime_dependency 'json', '2.1.0'
-  s.add_runtime_dependency 'memory_profiler', '0.9.12'
-  s.add_runtime_dependency 'mimic', '0.4.2'
+  s.add_runtime_dependency 'json', '2.2.0'
+  s.add_runtime_dependency 'memory_profiler', '0.9.13'
+  s.add_runtime_dependency 'mimic', '0.4.4'
   s.add_runtime_dependency 'openssl', '2.1.2'
   s.add_runtime_dependency 'rainbow', '3.0.0'
   s.add_runtime_dependency 'semantic', '1.6.1'
-  s.add_runtime_dependency 'sinatra', '2.0.4'
+  s.add_runtime_dependency 'sinatra', '2.0.5'
   s.add_runtime_dependency 'slop', '4.6.2'
   s.add_runtime_dependency 'sys-proctable', '1.2.1'
   s.add_runtime_dependency 'thin', '1.7.2'
@@ -83,19 +83,19 @@ and suggests a different architecture for digital wallet maintenance.'
   s.add_runtime_dependency 'usagewatch_ext', '0.2.1'
   s.add_runtime_dependency 'zache', '>=0.12'
   s.add_runtime_dependency 'zold-score', '0.4.6'
-  s.add_development_dependency 'codecov', '0.1.13'
+  s.add_development_dependency 'codecov', '0.1.14'
   s.add_development_dependency 'cucumber', '3.1.2'
   s.add_development_dependency 'guard', '2.15.0'
   s.add_development_dependency 'guard-minitest', '2.4.6'
   s.add_development_dependency 'minitest', '5.11.3'
   s.add_development_dependency 'minitest-fail-fast', '0.1.0'
   s.add_development_dependency 'minitest-hooks', '1.5.0'
-  s.add_development_dependency 'rake', '12.3.1'
+  s.add_development_dependency 'rake', '12.3.2'
   s.add_development_dependency 'random-port', '0.3.1'
-  s.add_development_dependency 'rdoc', '4.3.0'
-  s.add_development_dependency 'rspec-rails', '3.8.1'
-  s.add_development_dependency 'rubocop', '0.62.0'
-  s.add_development_dependency 'rubocop-rspec', '1.31.0'
-  s.add_development_dependency 'webmock', '3.4.2'
+  s.add_development_dependency 'rdoc', '6.1.1'
+  s.add_development_dependency 'rspec-rails', '3.8.2'
+  s.add_development_dependency 'rubocop', '0.69.0'
+  s.add_development_dependency 'rubocop-rspec', '1.33.0'
+  s.add_development_dependency 'webmock', '3.5.1'
   s.add_development_dependency 'xcop', '>=0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.29.27
+  version: 0.29.28
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-20 00:00:00.000000000 Z
+date: 2019-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.1.5
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: futex
   requirement: !ruby/object:Gem::Requirement
@@ -100,42 +100,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: memory_profiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.9.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.9.13
 - !ruby/object:Gem::Dependency
   name: mimic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: openssl
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
@@ -324,14 +324,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.13
+        version: 0.1.14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.13
+        version: 0.1.14
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -422,14 +422,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.3.1
+        version: 12.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.3.1
+        version: 12.3.2
 - !ruby/object:Gem::Dependency
   name: random-port
   requirement: !ruby/object:Gem::Requirement
@@ -450,70 +450,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 6.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 6.1.1
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.8.1
+        version: 3.8.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.8.1
+        version: 3.8.2
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.62.0
+        version: 0.69.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.62.0
+        version: 0.69.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.31.0
+        version: 1.33.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.31.0
+        version: 1.33.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 3.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 3.5.1
 - !ruby/object:Gem::Dependency
   name: xcop
   requirement: !ruby/object:Gem::Requirement
@@ -550,7 +550,11 @@ extra_rdoc_files:
 files:
 - ".0pdd.yml"
 - ".gitattributes"
+- ".github/CODE_OF_CONDUCT.md"
+- ".github/CONTRIBUTING.md"
 - ".github/ISSUE_TEMPLATE.md"
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".pdd"
@@ -600,6 +604,12 @@ files:
 - fixtures/merge/missed_wallets/copies/0123456789abcdef/1.zc
 - fixtures/merge/missed_wallets/copies/0123456789abcdef/scores.zc
 - fixtures/merge/missed_wallets/opts
+- fixtures/merge/negative_overwriting/0123456789abcdef.z
+- fixtures/merge/negative_overwriting/146b852f2d9ad984.z
+- fixtures/merge/negative_overwriting/assert.rb
+- fixtures/merge/negative_overwriting/copies/0123456789abcdef/1.zc
+- fixtures/merge/negative_overwriting/copies/0123456789abcdef/scores.zc
+- fixtures/merge/negative_overwriting/opts
 - fixtures/merge/negatives_in_between/0000000000000000.z
 - fixtures/merge/negatives_in_between/0123456789abcdef.z
 - fixtures/merge/negatives_in_between/assert.rb
@@ -664,6 +674,7 @@ files:
 - lib/zold/commands/routines/gc.rb
 - lib/zold/commands/routines/reconcile.rb
 - lib/zold/commands/routines/reconnect.rb
+- lib/zold/commands/routines/retire.rb
 - lib/zold/commands/routines/spread.rb
 - lib/zold/commands/show.rb
 - lib/zold/commands/taxes.rb
@@ -721,6 +732,7 @@ files:
 - test/commands/routines/test_gc.rb
 - test/commands/routines/test_reconcile.rb
 - test/commands/routines/test_reconnect.rb
+- test/commands/routines/test_retire.rb
 - test/commands/test_alias.rb
 - test/commands/test_calculate.rb
 - test/commands/test_clean.rb
@@ -801,7 +813,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.29.27!
+  Thanks for installing Zold 0.29.28!
     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
@@ -836,6 +848,7 @@ test_files:
 - test/commands/routines/test_gc.rb
 - test/commands/routines/test_reconcile.rb
 - test/commands/routines/test_reconnect.rb
+- test/commands/routines/test_retire.rb
 - test/commands/test_alias.rb
 - test/commands/test_calculate.rb
 - test/commands/test_clean.rb