zold 0.23.5 → 0.23.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8067a4751084cd631f09a99d4ce58f8cae3ee3d7186662bcaae2b871ad4922a5
-  data.tar.gz: d7ca7a6de3956c40b6f1c9a2c0b5512f44ab26737e02725a2b9895e9673b21e1
+  metadata.gz: a34afacddd1a7754e904735a1260ae2502c12fd814bcc99df8b2f473442b1d67
+  data.tar.gz: 17cfee268ef91e6e2cfdbdf0b8a9a221c9728baedb9daaf93244fc3a85a7b9d0
 SHA512:
-  metadata.gz: a37b34395f2bd295a58ca9a87ed52a1a6b156e3ce5cba27431e597003a067ffc204d6409e955aa6a6590abb3ca66579820f1ebcef4879c712d8090e2465f994f
-  data.tar.gz: 89dee647bf855e393aa19d22790dd76b25903ff84b3513e6118708b3393e74f9e9958f6a704d39e22b4322586ca004bf54597e81826ca6d3b35d3bc7f795d453
+  metadata.gz: 41b0e2d1c097cbb41588659b5baa5c0025bec91ae2f5fbb66a38678902bdbcff70dddc4194fb6c5ddad12ff83b024cc48d74802aebc948292f11d2f303181c2b
+  data.tar.gz: 07dd8014a170aa39ca0536564b66a4a7b2ea5321f6319d76d83c2f5ee3f4656cc66667a1a4ca58fc336e9b341844539626045bca631c7b1616ed6c2043dda322

data/README.md

@@ -127,19 +127,23 @@ If you are lost, run this:
 $ zold node --help
 ```
 
-You can run a node in a docker container also.
+You can run a node in a docker container also, using [yegor256/zold](https://hub.docker.com/r/yegor256/zold)
+built from this [Dockerfile](https://github.com/zold-io/zold/blob/master/Dockerfile).
 
 ```bash
-docker run -d -p 4096:4096 zold/zold:latest /node.sh --host=<your host IP> --invoice=5f96e731e48ae21f
+docker run -d -p 4096:4096 yegor256/zold /node.sh --host=<your host IP> --invoice=5f96e731e48ae21f
 ```
 
-To store zold data between container restarts create a volume or bind a directory from host
+To store zold data between container restarts create a volume or bind a directory from host:
 
 ```bash
-docker volume create zold 
-docker run -d -p 4096:4096 -v zold:/zold zold/zold:latest /node.sh --host=<your host IP> --invoice=5f96e731e48ae21f
+docker volume create zold
+docker run -d -p 4096:4096 -v zold:/zold yegor256/zold /node.sh --host=<your host IP> --invoice=5f96e731e48ae21f
 ```
 
+You may find this blog post useful:
+[How to Run Zold Node?](https://blog.zold.io/2019/01/10/how-to-run-node.html)
+
 ## Frequently Asked Questions
 
 > Where are my RSA private/public keys?

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

@@ -21,7 +21,7 @@ zold remote show
 zold --public-key=id_rsa.pub create 0000000000000000
 target=$(zold create --public-key=id_rsa.pub)
 invoice=$(zold invoice ${target})
-zold pay --private-key=id_rsa 0000000000000000 ${invoice} 14.99 'To save the world!'
+zold pay --private-key=id_rsa 0000000000000000 ${invoice} 14.99Z 'To save the world!'
 zold propagate
 zold propagate 0000000000000000
 zold show

data/fixtures/scripts/spread-wallets.sh

@@ -23,7 +23,7 @@ zold --home=${first} remote add 127.0.0.1 ${second}
 zold --home=${second} remote add 127.0.0.1 ${first}
 
 zold --public-key=id_rsa.pub create 0000000000000000
-zold pay --private-key=id_rsa 0000000000000000 NOPREFIX@aaaabbbbccccdddd 4.95 'To help you, dude!'
+zold pay --private-key=id_rsa 0000000000000000 NOPREFIX@aaaabbbbccccdddd 4000000z 'To help you, dude!'
 zold remote clean
 zold remote add 127.0.0.1 ${first}
 zold push 0000000000000000 --tolerate-edges --tolerate-quorum=1

data/lib/zold/commands/pay.rb

@@ -50,7 +50,7 @@ module Zold
 Where:
     'wallet' is the sender's wallet ID
     'target' is the beneficiary (either wallet ID or invoice number)'
-    'amount' is the amount to pay, in ZLD, for example '14.95'
+    'amount' is the amount to pay, for example: '14.95Z' (in ZLD) or '12345z' (in zents)
     'details' is the optional text to attach to the payment
 Available options:"
         o.string '--private-key',
@@ -93,7 +93,7 @@ Available options:"
         )
       end
       raise 'Amount is required (in ZLD) as the third argument' if mine[2].nil?
-      amount = Amount.new(zld: mine[2].to_f)
+      amount = amount(mine[2].strip)
       details = mine[3] || '-'
       taxes(id, opts)
       @wallets.acq(id, exclusive: true) do |from|
@@ -106,6 +106,12 @@ Available options:"
 
     private
 
+    def amount(txt)
+      return Amount.new(zents: txt.gsub(/z$/, '').to_i) if txt.end_with?('z')
+      return Amount.new(zld: txt.gsub(/Z$/, '').to_f) if txt.end_with?('Z')
+      Amount.new(zld: txt.to_f)
+    end
+
     def taxes(id, opts)
       debt = @wallets.acq(id) do |wallet|
         raise "Wallet #{id} doesn't exist, do 'zold pull' first" unless wallet.exists?
@@ -123,7 +129,8 @@ Available options:"
         raise 'The amount can\'t be zero' if amount.zero?
         raise "The amount can't be negative: #{amount}" if amount.negative?
         if !from.root? && from.balance < amount
-          raise "There is not enough funds in #{from} to send #{amount}, only #{from.balance} left"
+          raise "There is not enough funds in #{from} to send #{amount}, only #{from.balance} left; \
+the difference is #{(amount - from.balance).to_i} zents"
         end
       end
       key = Zold::Key.new(file: opts['private-key'])

data/lib/zold/commands/rebase.rb

@@ -71,8 +71,11 @@ Available options:"
           @log.debug("Paying wallet #{txn.bnf} file is absent: #{txn.to_text}")
           false
         end
-        patch.save(wallet.path, overwrite: true)
-        @log.debug("Wallet #{wallet.mnemo} rebased in #{Age.new(start)}")
+        if patch.save(wallet.path, overwrite: true)
+          @log.info("Wallet #{wallet.mnemo} rebased and modified in #{Age.new(start)}")
+        else
+          @log.debug("There is nothing to rebase in #{wallet.mnemo}, took #{Age.new(start)}")
+        end
       end
     end
   end

data/lib/zold/patch.rb

@@ -106,7 +106,7 @@ with a new one \"#{txn.to_text}\" from #{wallet.mnemo}")
             next
           end
           unless wallet.prefix?(txn.prefix)
-            @log.error("Payment prefix '#{txn.prefix}' doesn't match with the key of #{wallet.id}: \"#{txn.to_text}\"")
+            @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)
@@ -115,7 +115,7 @@ with a new one \"#{txn.to_text}\" from #{wallet.mnemo}")
               next
             end
             unless @wallets.acq(txn.bnf) { |p| p.includes_negative?(txn.id, wallet.id) }
-              @log.error("The beneficiary #{@wallets.acq(txn.bnf, &:mnemo)} of #{@id} \
+              @log.debug("The beneficiary #{@wallets.acq(txn.bnf, &:mnemo)} of #{@id} \
 doesn't have this transaction: \"#{txn.to_text}\"")
               next
             end

data/lib/zold/version.rb

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

data/test/commands/test_pay.rb

@@ -49,6 +49,14 @@ class TestPay < Zold::Test
         ]
       )
       assert_equal(amount * -1, source.balance)
+      Zold::Pay.new(wallets: home.wallets, copies: home.dir, remotes: home.remotes, log: test_log).run(
+        [
+          'pay', '--private-key=fixtures/id_rsa',
+          target.id.to_s, source.id.to_s, amount.to_zld, 'Refund'
+        ]
+      )
+      source.flush
+      assert_equal(Zold::Amount::ZERO, source.balance)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.23.5
+  version: 0.23.6
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-12 00:00:00.000000000 Z
+date: 2019-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -753,7 +753,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.23.5!
+  Thanks for installing Zold 0.23.6!
     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