zold 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e31ddf85f51ef24b3ca8bb69bab3142e78499d01
-  data.tar.gz: 2ad719e700e8a691bd56a9fad9558baaafcfe49f
+  metadata.gz: 7a7e5d899910c588ba9fff4987a7341ecb245dad
+  data.tar.gz: d1c940ba9d95d8d57e588fb1a6675f9117e86a4b
 SHA512:
-  metadata.gz: 0fef444d304c65a3af45b222fe6def9c74601e622a31e6dd772484d0ce1b1748068c84fc420448157186b32635000b79f0ea87f99735b79a78f6f09192d7baf1
-  data.tar.gz: 01e70165f45a89d4aa336410374d15d8da8ad560152f23d3dc8907547669cae09fe25928933d7197ada4fadb9596f47706e3486063e0e42131265d6a176e03f6
+  metadata.gz: ca614449c84d77fe0b5bce135e33168955bf4f71ee62172a6d01e88cb72890ee04e0128ec86f8f98590d943c5eb325f0db1daa26f2d795002f04b31aae7e7600
+  data.tar.gz: 12cbff8839076e9314eee7805f3c75d09f3f22ed64516a1ad964d2018ef637cc0ebd249495eca8b86c48530d031704d3d8f299c03b201e91496371e9c2e7ef7d

data/lib/zold/commands/check.rb

@@ -36,23 +36,19 @@ module Zold
     end
 
     def run
-      clean = true
       @wallet.income do |t|
         bnf = Pull.new(
           wallet: @wallets.find(Id.new(t[:beneficiary])),
           log: @log
         ).run
-        clean = bnf.check(t[:id], t[:amount], @wallet.id)
-        next if clean
-        @log.error("Txn ##{t[:id]} for #{t[:amount]} is absent at #{bnf.id}")
-        break
+        bnf.check(t[:id], t[:amount], @wallet.id)
       end
-      if clean
-        @log.info("The #{@wallet} is clean")
-      else
-        @log.error("The #{@wallet} is compromised")
+      balance = @wallet.balance
+      if balance.negative? && !@wallet.root?
+        raise "Negative balance of #{@wallet} is not allowed: #{balance}"
       end
-      clean
+      @log.info("The #{@wallet} is clean")
+      true
     end
   end
 end

data/lib/zold/id.rb

@@ -29,6 +29,12 @@ module Zold
       @id = id.nil? ? rand(2**32..2**64 - 1) : Integer("0x#{id}", 16)
     end
 
+    ROOT = Id.new('0000000000000000')
+
+    def==(other)
+      to_s == other.to_s
+    end
+
     def to_s
       format('%016x', @id)
     end

data/lib/zold/version.rb

@@ -23,5 +23,5 @@
 # Copyright:: Copyright (c) 2018 Zerocracy, Inc.
 # License:: MIT
 module Zold
-  VERSION = '0.0.6'.freeze
+  VERSION = '0.0.7'.freeze
 end

data/lib/zold/wallet.rb

@@ -72,8 +72,12 @@ module Zold
       ver
     end
 
+    def root?
+      id == Id::ROOT
+    end
+
     def id
-      load.xpath('/wallet/id/text()').to_s
+      Id.new(load.xpath('/wallet/id/text()').to_s)
     end
 
     def balance
@@ -114,13 +118,18 @@ module Zold
     def check(id, amount, beneficiary)
       xml = load
       txn = xml.xpath("/wallet/ledger/txn[@id='#{id}']")[0]
-      Amount.new(coins: txn.xpath('amount/text()')[0].to_s.to_i).mul(-1) ==
-        amount &&
-        txn.xpath('beneficiary/text()')[0].to_s == beneficiary &&
-        Key.new(text: xml.xpath('/wallet/pkey/text()')[0].to_s).verify(
-          txn.xpath('sign/text()')[0].to_s,
-          "#{id} #{amount.to_i} #{beneficiary}"
-        )
+      xamount = Amount.new(
+        coins: txn.xpath('amount/text()')[0].to_s.to_i
+      ).mul(-1)
+      raise "#{xamount} != #{amount}" if xamount != amount
+      xbeneficiary = Id.new(txn.xpath('beneficiary/text()')[0].to_s)
+      raise "#{xbeneficiary} != #{beneficiary}" if xbeneficiary != beneficiary
+      data = "#{id} #{amount.to_i} #{beneficiary}"
+      valid = Key.new(text: xml.xpath('/wallet/pkey/text()')[0].to_s).verify(
+        txn.xpath('sign/text()')[0].to_s, data
+      )
+      raise "Signature is not confirming this data: '#{data}'" unless valid
+      true
     end
 
     def income

data/test/node/test_front.rb

@@ -51,7 +51,7 @@ class FrontTest < Minitest::Test
 
   def test_pushes_a_wallet
     Dir.mktmpdir 'test' do |dir|
-      id = Zold::Id.new
+      id = Zold::Id::ROOT
       file = File.join(dir, "#{id}.xml")
       wallet = Zold::Wallet.new(file)
       wallet.init(id, Zold::Key.new(file: 'fixtures/id_rsa.pub'))

data/test/test_id.rb

@@ -47,4 +47,8 @@ class TestId < Minitest::Test
     id = Zold::Id.new(hex)
     assert(id.to_s == hex, "#{id} is not equal to #{hex}")
   end
+
+  def test_compares_two_ids
+    assert Zold::Id.new(Zold::Id::ROOT.to_s) == Zold::Id.new('0000000000000000')
+  end
 end

metadata

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