zold 0.13.41 → 0.13.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfad31c18d9d2a2cd394ad6048f510f0fd641829
-  data.tar.gz: 015adb1359b0b211176952d87bd273083a4e75e5
+  metadata.gz: af5c3740f905dabd3a8e7454e7b0bf65d9c3472b
+  data.tar.gz: 91b089acdcca61e29768a8b2a31cc8f046d71ef4
 SHA512:
-  metadata.gz: d5f085be6e9bb8fcdda41456aa2b45b23ea0202ef31c418190b34cec2e4a09f62e7c3f84d562e3933f827e0dd4909a7185bef76bf050566c42b88b62ed24767f
-  data.tar.gz: 122dba33d6bbc9de48af9e588873d7d5f7b00b7be6dcd9bedff4281bd3fcde478b0df38138a5785fb0e56a24783511d65762c1cbbd2f2074a59197945f249c3b
+  metadata.gz: 90ce9c75f3b34aa7d6eac595eea885977875721c5bc258dbdd8b8f851182ed80e7968ea4722e068670f93e97f162d8507e6dc53f758456c54cf74a7aab56bfa6
+  data.tar.gz: de73f91cf870c7bc3b8236e297e7e93a5f9f2e9ec37c4db7fa9b1ad56aafbc8c3e32a92a944d3f57b461916992671fb5650581ce4eed64ad1d2c34eeac939605

data/lib/zold/commands/push.rb

@@ -88,7 +88,8 @@ Available options:"
       content = AtomicFile.new(wallet.path).read
       response = r.http("/wallet/#{wallet.id}#{opts['sync'] ? '?sync=true' : ''}").put(content)
       if response.code == '304'
-        @log.info("#{r}: same version of #{wallet.id} there, in #{(Time.now - start).round(2)}s")
+        @log.info("#{r}: same version #{content.length}b/#{wallet.txns.count}t \
+of #{wallet.id} there, in #{(Time.now - start).round(2)}s")
         return 0
       end
       r.assert_code(200, response)

data/lib/zold/node/front.rb

@@ -167,7 +167,22 @@ module Zold
       wallet = settings.wallets.find(id)
       error 404 unless wallet.exists?
       content_type 'text/plain'
-      wallet.key.to_s.to_s
+      wallet.key.to_s
+    end
+
+    get %r{/wallet/(?<id>[A-Fa-f0-9]{16})\.txt} do
+      id = Id.new(params[:id])
+      wallet = settings.wallets.find(id)
+      error 404 unless wallet.exists?
+      content_type 'text/plain'
+      [
+        wallet.network,
+        wallet.version,
+        wallet.id.to_s,
+        wallet.key.to_s,
+        '',
+        wallet.txns.map(&:to_text).join("\n")
+      ].join("\n")
     end
 
     put %r{/wallet/(?<id>[A-Fa-f0-9]{16})/?} do

data/lib/zold/patch.rb

@@ -74,8 +74,10 @@ module Zold
             @log.error("An attempt to overwrite #{dup.to_text} with this: #{txn.to_text}")
             next
           end
-          if @txns.map(&:amount).map(&:to_i).inject(&:+).to_i < txn.amount.to_i * -1 && !wallet.root?
-            @log.error("Transaction ##{txn.id} attempts to make the balance of #{wallet.id} negative: #{txn.to_text}")
+          balance = @txns.map(&:amount).map(&:to_i).inject(&:+).to_i
+          if balance < txn.amount.to_i * -1 && !wallet.root?
+            @log.error("Transaction ##{txn.id} attempts to make the balance of \
+#{wallet.id}/#{Amount.new(coins: balance).to_zld}/#{@txns.size} negative: #{txn.to_text}")
             next
           end
           unless Signature.new.valid?(@key, wallet.id, txn)

data/lib/zold/version.rb

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

metadata

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