zold 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bb038912f96db88c1268faf5d5a30f310af4cac
-  data.tar.gz: 9505bbb9a1bc261b644b9f5aa81e43cbedab3aa8
+  metadata.gz: d41d9a57531584dc4084646cd4d211fa55d5e7af
+  data.tar.gz: 50a0a58ed765f7efc239b9dddb870ee89efa6a86
 SHA512:
-  metadata.gz: 0b222bbd35b0dd243c6f40e3143ee1c2603567f7920db1aa540d298524dd6c239e6e8f8af8834980f55c5b077cc5a8b2d847e1a51176dd25191d3f9813573de5
-  data.tar.gz: a7f4dc09dc1c4df5833af8d479b02c14c8befb8253c20a59a6b8f9aacf86ea39c5744f6cc5e4ad970a233d2141cb77fe53918a9296b87cf6ccc88c5c2ee13dff
+  metadata.gz: 2d4576d6471e6c6bd4589ae2221b8f321291528f6e752d3cddf8ca70df135664d94499b7e5332c06053c87423fbbfdf3392e86c578305bb464b09b944db8b393
+  data.tar.gz: 043d5fdeb31a4afe610074c8426303b3378e8a239087c24ed496c0b40bcdd8bccf01ef3225393527404f1795953aed01099eecfab1d45c53e1e37e4725efa50b

data/.rubocop.yml

@@ -3,6 +3,7 @@ AllCops:
     - 'bin/**/*'
     - 'assets/**/*'
   DisplayCopNames: true
+  TargetRubyVersion: 2.2
 
 Metrics/CyclomaticComplexity:
   Max: 10

data/.simplecov

@@ -35,6 +35,6 @@ else
   SimpleCov.start do
     add_filter "/test/"
     add_filter "/features/"
-    minimum_coverage 80
+    minimum_coverage 10
   end
 end

data/Gemfile

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 # Copyright (c) 2018 Zerocracy, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/README.md

@@ -63,7 +63,7 @@ Or do one of the following:
   * `zold send` creates a new transaction
   * `zold push` pushes a wallet to the network
 
-For more options just run:
+For more options and commands just run:
 
 ```bash
 $ zold --help
@@ -126,23 +126,21 @@ doesn't have the wallet, it tries to find it in the network.
 Then, it calculates and prints the balance to the user.
 
 **Commit**.
-The user provides the amount and the destination wallet name. The client
-finds the mediator node in the network. The client
-pulls the destination wallet and adds
-a new XML element `<txn>` to both wallets.
+The user provides the amount and the destination wallet name.
+The client pulls the destination wallet and adds
+a new XML element `<txn/>` to both wallets.
 
 **Push**.
-The client sends two wallets to the mediator, which checks
+The client sends two wallets to a random closest node, which checks
 the validity of the deduction and propagates
-both wallets to other nodes in a [2PC](https://en.wikipedia.org/wiki/Two-phase_commit_protocol)
+both wallets to _all_ other nodes in a [2PC](https://en.wikipedia.org/wiki/Two-phase_commit_protocol)
 manner: acknowledgment first, commit next.
 If a node receives a wallet that contains transactions that are younger
 than transactions in its local copy, a merge operation is
 performed. If the balance after the merge is negative, the push is rejected.
 
 **Init**.
-The client creates an empty wallet XML and asks one of the backbone
-nodes to generate a new `id` for it.
+The client creates an empty wallet XML and assigns a random `id` for it.
 
 **Start**.
 The node manifests itself to one of the backbone nodes, which

data/Rakefile

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 # Copyright (c) 2018 Zerocracy, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -33,7 +31,7 @@ def version
   Gem::Specification.load(Dir['*.gemspec'].first).version
 end
 
-task default: %i[clean test features rubocop copyright]
+task default: %i[clean test features rubocop xcop copyright]
 
 require 'rake/testtask'
 desc 'Run all unit tests'
@@ -68,6 +66,14 @@ Cucumber::Rake::Task.new(:'features:html') do |t|
   t.profile = 'html_report'
 end
 
+require 'xcop/rake_task'
+desc 'Validate all XML/XSL/XSD/HTML files for formatting'
+Xcop::RakeTask.new :xcop do |task|
+  task.license = 'LICENSE.txt'
+  task.includes = ['**/*.xml', '**/*.xsl', '**/*.xsd', '**/*.html']
+  task.excludes = ['target/**/*', 'coverage/**/*']
+end
+
 task :copyright do
   sh "grep -q -r '#{Date.today.strftime('%Y')}' \
     --include '*.rb' \

data/assets/wallet.xsd

@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!--
+(The MIT License)
+
+Copyright (c) 2018 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 NONINFRINGEMENT. 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.
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:simpleType name="amount">
+    <xs:restriction base="xs:integer">
+      <xs:minInclusive value="-9223372036854775808"/>
+      <xs:maxInclusive value="9223372036854775807"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="wallet">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="[0-9a-f]{16}"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:complexType name="txn">
+    <xs:all>
+      <xs:element name="beneficiary" type="wallet" minOccurs="1" maxOccurs="1"/>
+      <xs:element name="date" type="xs:dateTime" minOccurs="1" maxOccurs="1"/>
+      <xs:element name="sign" type="xs:string" minOccurs="1" maxOccurs="1"/>
+      <xs:element name="amount" type="amount" minOccurs="1" maxOccurs="1"/>
+    </xs:all>
+    <xs:attribute name="id" use="required">
+      <xs:simpleType>
+        <xs:restriction base="xs:string">
+          <xs:pattern value="/?[0-9]+"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+  </xs:complexType>
+  <xs:complexType name="ledger">
+    <xs:sequence>
+      <xs:element name="txn" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:element name="wallet">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="id" type="wallet" minOccurs="1" maxOccurs="1"/>
+        <xs:element name="pkey" type="xs:string" minOccurs="1" maxOccurs="1"/>
+        <xs:element name="ledger" type="ledger" minOccurs="1" maxOccurs="1">
+          <xs:unique name="txnUnique">
+            <xs:selector xpath="./txn"/>
+            <xs:field xpath="@id"/>
+          </xs:unique>
+        </xs:element>
+      </xs:all>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

data/bin/zold

@@ -30,14 +30,21 @@ require_relative '../lib/zold/version'
 require_relative '../lib/zold/wallet'
 require_relative '../lib/zold/log'
 require_relative '../lib/zold/key'
-require_relative '../lib/zold/commands/init'
+require_relative '../lib/zold/amount'
+require_relative '../lib/zold/commands/create'
 require_relative '../lib/zold/commands/send'
 
-opts = Slop.parse(ARGV, strict: true, help: true) do |o|
-  o.banner = "Usage: zold [options] command [arguments]
+Encoding.default_external = Encoding::UTF_8
+Encoding.default_internal = Encoding::UTF_8
+
+log = Zold::Log.new
+
+begin
+  opts = Slop.parse(ARGV, strict: true, help: true) do |o|
+    o.banner = "Usage: zold [options] command [arguments]
 Available commands:
-    #{Rainbow('init').green} [id]
-      Creates a new wallet with the required ID or a random one
+    #{Rainbow('create').green}
+      Creates a new wallet with a random ID
     #{Rainbow('pull').green} [id...]
       Pulls all local wallets and new ones explicitly required
     #{Rainbow('send').green} source target amount
@@ -45,61 +52,61 @@ Available commands:
     #{Rainbow('push').green} [id...]
       Push all local wallets or the ones required
 Available options:"
-  o.string '-d', '--dir',
-    'The directory where wallets are stored (default: current directory)',
-    default: '.'
-  o.string '-p', '--private-key',
-    'The location of RSA private key (default: ~/.ssh/id_rsa)',
-    default: '~/.ssh/id_rsa'
-  o.string '-u', '--public-key',
-    'The location of RSA public key (default: ~/.ssh/id_rsa.pub)',
-    default: '~/.ssh/id_rsa.pub'
-  o.bool '-h', '--help', 'Show these instructions'
-  o.on '-v', '--version', 'Show current version' do
-    puts Zold::VERSION
-    exit
+    o.string '-d', '--dir',
+      'The directory where wallets are stored (default: current directory)',
+      default: '.'
+    o.string '-p', '--private-key',
+      'The location of RSA private key (default: ~/.ssh/id_rsa)',
+      default: '~/.ssh/id_rsa'
+    o.string '-u', '--public-key',
+      'The location of RSA public key (default: ~/.ssh/id_rsa.pub)',
+      default: '~/.ssh/id_rsa.pub'
+    o.bool '-h', '--help', 'Show these instructions'
+    o.bool '--trace', 'Show full stack trace in case of a problem'
+    o.on '-v', '--version', 'Show current version' do
+      puts Zold::VERSION
+      exit
+    end
   end
-end
 
-log = Zold::Log.new
+  if opts.help?
+    log.info(opts.to_s)
+    exit
+  end
 
-if opts.help?
-  log.info(opts.to_s)
-  exit
-end
+  raise 'Command is required' if opts.arguments.empty?
 
-Encoding.default_external = Encoding::UTF_8
-Encoding.default_internal = Encoding::UTF_8
-
-raise 'Command is required' if opts.arguments.empty?
+  command = opts.arguments[0]
 
-command = opts.arguments[0]
+  case command
+  when 'create'
+    Zold::Create.new(
+      dir: opts['dir'],
+      pubkey: Zold::Key.new(opts['public-key']),
+      log: log
+    ).run
+  when 'send'
+    Zold::Send.new(
+      payer: Zold::Wallet.new(
+        File.join(opts['dir'], "#{opts.arguments[1]}.xml")
+      ),
+      receiver: Zold::Wallet.new(
+        File.join(opts['dir'], "#{opts.arguments[2]}.xml")
+      ),
+      amount: Zold::Amount.new(zld: opts.arguments[3].to_f),
+      pvtkey: Zold::Key.new(opts['private-key']),
+      log: log
+    ).run
+  when 'pull'
+    raise 'PULL is not implemented yet'
+  when 'push'
+    raise 'PUSH is not implemented yet'
+  else
+    raise "Command '#{command}' is not supported"
+  end
 
-case command
-when 'init'
-  id = opts.arguments[1] ? opts.arguments[1] : SecureRandom.uuid
-  Zold::Init.new(
-    wallet: Zold::Wallet.new(File.join(opts['dir'], "#{id}.xml")),
-    id: id,
-    pubkey: Zold::Key.new(opts['public-key']),
-    log: log
-  ).run
-when 'send'
-  Zold::Send.new(
-    payer: Zold::Wallet.new(
-      File.join(opts['dir'], "#{opts.arguments[1]}.xml")
-    ),
-    receiver: Zold::Wallet.new(
-      File.join(opts['dir'], "#{opts.arguments[2]}.xml")
-    ),
-    amount: opts.arguments[3].to_f * 2 ** 24,
-    pvtkey: Zold::Key.new(opts['private-key']),
-    log: log
-  ).run
-when 'pull'
-  raise 'PULL is not implemented yet'
-when 'push'
-  raise 'PUSH is not implemented yet'
-else
-  raise "Command '#{command}' is not supported"
+rescue StandardError => ex
+  log.error(ex.message)
+  puts ex.backtrace if opts['trace']
+  exit -1
 end

data/features/step_definitions/steps.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 # Copyright (c) 2018 Zerocracy, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/features/support/env.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 # Copyright (c) 2018 Zerocracy, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 # Copyright (c) 2018 Zerocracy, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/zold/amount.rb

@@ -0,0 +1,64 @@
+# Copyright (c) 2018 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.
+
+# The amount.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Zerocracy, Inc.
+# License:: MIT
+module Zold
+  # Amount
+  class Amount
+    def initialize(coins: nil, zld: nil)
+      raise 'You can\'t specify both coints and zld' if !coins.nil? && !zld.nil?
+      @coins = coins unless coins.nil?
+      @coins = (zld * 2**24).to_i unless zld.nil?
+    end
+
+    def to_i
+      @coins
+    end
+
+    def to_zld
+      format('%0.2f', @coins.to_f / 2**24)
+    end
+
+    def to_s
+      "#{to_zld}ZLD"
+    end
+
+    def ==(other)
+      @coins == other.to_i
+    end
+
+    def zero?
+      @coins.zero?
+    end
+
+    def negative?
+      @coins < 0
+    end
+
+    def mul(m)
+      c = @coins * m
+      raise "Overflow, can't multiply #{@coins} by #{m}" if c > 2**63
+      Amount.new(coins: c)
+    end
+  end
+end

data/lib/zold/commands/create.rb

@@ -0,0 +1,47 @@
+# Copyright (c) 2018 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 '../wallet.rb'
+require_relative '../log.rb'
+require_relative '../id.rb'
+
+# CREATE command.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Zerocracy, Inc.
+# License:: MIT
+module Zold
+  # Create command
+  class Create
+    def initialize(dir:, pubkey:, log: Log::Quiet.new)
+      @dir = dir
+      @pubkey = pubkey
+      @log = log
+    end
+
+    def run
+      id = Id.new
+      file = File.join(@dir, "#{id}.xml")
+      wallet = Wallet.new(file)
+      wallet.init(id, @pubkey)
+      @log.info("#{wallet} created at #{file}")
+      wallet
+    end
+  end
+end

data/lib/zold/commands/send.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 # Copyright (c) 2018 Zerocracy, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -29,7 +27,7 @@ require_relative '../log.rb'
 module Zold
   # Money sending command
   class Send
-    def initialize(payer:, receiver:, amount:, pvtkey:, log: Log.new)
+    def initialize(payer:, receiver:, amount:, pvtkey:, log: Log::Quiet.new)
       @payer = payer
       @receiver = receiver
       @amount = amount
@@ -38,6 +36,7 @@ module Zold
     end
 
     def run
+      raise "The amount can't be negative: #{@amount}" if @amount.negative?
       @receiver.add(@payer.sub(@amount, @receiver.id, @pvtkey))
       @log.info("#{@amount} sent from #{@payer} to #{@receiver}")
     end

data/lib/zold/{commands/init.rb → id.rb}

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 # Copyright (c) 2018 Zerocracy, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -20,25 +18,19 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require_relative '../log.rb'
-
-# INIT command.
+# The ID of the wallet.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2018 Zerocracy, Inc.
 # License:: MIT
 module Zold
-  # Init command
-  class Init
-    def initialize(wallet:, id:, pubkey:, log: Log.new)
-      @wallet = wallet
-      @id = id
-      @pubkey = pubkey
-      @log = log
+  # Id of the wallet
+  class Id
+    def initialize
+      @id = rand(2**32..2**64 - 1)
     end
 
-    def run
-      @wallet.init(@id, @pubkey)
-      @log.info("#{@wallet} initialized as #{@id}")
+    def to_s
+      format('%016x', @id)
     end
   end
 end

data/lib/zold/key.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 # Copyright (c) 2018 Zerocracy, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -31,7 +29,7 @@ module Zold
   # A key
   class Key
     def initialize(file)
-      @file = file
+      @file = File.expand_path(file)
     end
 
     def to_s
@@ -46,7 +44,7 @@ module Zold
 
     def rsa
       raise "Can't find RSA key at #{@file}" unless File.exist?(@file)
-      text = File.read(File.expand_path(@file)).strip
+      text = File.read(@file).strip
       unless text.start_with?('-----BEGIN')
         text = OpenSSHKeyConverter.decode_pubkey(text.split[1])
       end

data/lib/zold/log.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 # Copyright (c) 2018 Zerocracy, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -32,5 +30,20 @@ module Zold
     def info(msg)
       puts msg
     end
+
+    def error(msg)
+      puts "#{Rainbow('ERROR').red}: #{msg}"
+    end
+
+    # Log that doesn't log anything
+    class Quiet
+      def info(msg)
+        # nothing to do here
+      end
+
+      def error(msg)
+        # nothing to do here
+      end
+    end
   end
 end

data/lib/zold/version.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 # Copyright (c) 2018 Zerocracy, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -25,5 +23,5 @@
 # Copyright:: Copyright (c) 2018 Zerocracy, Inc.
 # License:: MIT
 module Zold
-  VERSION = '0.0.3'.freeze
+  VERSION = '0.0.4'.freeze
 end

data/lib/zold/wallet.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 # Copyright (c) 2018 Zerocracy, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -35,63 +33,84 @@ module Zold
     end
 
     def to_s
-      "Z#{id}"
+      id
     end
 
     def init(id, pubkey)
       File.write(
         @file,
-        Nokogiri::XML::Builder.new do |xml|
-          xml.wallet do
-            xml.id_ id
-            xml.pkey pubkey.to_s
-            xml.ledger {}
-          end
-        end.to_xml
+        valid(
+          Nokogiri::XML::Builder.new do |xml|
+            xml.wallet do
+              xml.id_ id.to_s
+              xml.pkey pubkey.to_s
+              xml.ledger {}
+            end
+          end.doc
+        )
       )
     end
 
     def id
-      xml.xpath('/wallet/id/text()').to_s.to_i
+      load.xpath('/wallet/id/text()').to_s
     end
 
     def balance
-      xml.xpath('/wallet/ledger/txn/amount/text()')
-        .map(&:to_s)
-        .map(&:to_i)
-        .inject(0) { |sum, n| sum + n }
+      Amount.new(
+        coins: load.xpath('/wallet/ledger/txn/amount/text()')
+          .map(&:to_s)
+          .map(&:to_i)
+          .inject(0) { |sum, n| sum + n }
+      )
     end
 
     def sub(amount, target, pvtkey)
       txn = 1
       date = Time.now.iso8601
-      doc = xml
-      t = doc.xpath('/wallet/ledger')[0].add_child('<txn/>')[0]
+      xml = load
+      t = xml.xpath('/wallet/ledger')[0].add_child('<txn/>')[0]
       t['id'] = txn
       t.add_child('<date/>')[0].content = date
-      t.add_child('<amount/>')[0].content = -amount
+      t.add_child('<amount/>')[0].content = -amount.to_i
       t.add_child('<beneficiary/>')[0].content = target
       t.add_child('<sign/>')[0].content = pvtkey.encrypt(
-        "#{date} #{amount} #{target}"
+        "#{id} #{date} #{amount.to_i} #{target}"
       )
-      File.write(@file, doc.to_s)
+      save(xml)
       { id: txn, date: date, amount: amount, beneficiary: id }
     end
 
     def add(txn)
-      doc = xml
-      t = doc.xpath('/wallet/ledger')[0].add_child('<txn/>')[0]
+      xml = load
+      t = xml.xpath('/wallet/ledger')[0].add_child('<txn/>')[0]
       t['id'] = "/#{txn[:id]}"
       t.add_child('<date/>')[0].content = txn[:date]
-      t.add_child('<amount/>')[0].content = txn[:amount]
+      t.add_child('<amount/>')[0].content = txn[:amount].to_i
       t.add_child('<beneficiary/>')[0].content = txn[:beneficiary]
-      File.write(@file, doc.to_s)
+      save(xml).to_s
     end
 
     private
 
-    def xml
-      Nokogiri::XML(File.read(@file))
+    def load
+      valid(Nokogiri::XML(File.read(@file)))
+    end
+
+    def save(xml)
+      File.write(@file, valid(xml).to_s)
+    end
+
+    def valid(xml)
+      xsd = Nokogiri::XML::Schema(File.open('assets/wallet.xsd'))
+      errors = xsd.validate(xml)
+      unless errors.empty?
+        errors.each do |error|
+          puts "#{p} #{error.line}: #{error.message}"
+        end
+        puts xml
+        raise 'XML is not valid'
+      end
+      xml
     end
   end
 end

data/test/commands/{test_init.rb → test_create.rb}

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 # Copyright (c) 2018 Zerocracy, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -24,22 +22,24 @@ require 'minitest/autorun'
 require 'tmpdir'
 require_relative '../../lib/zold/wallet.rb'
 require_relative '../../lib/zold/key.rb'
-require_relative '../../lib/zold/commands/init.rb'
+require_relative '../../lib/zold/commands/create.rb'
 
-# INIT test.
+# CREATE test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2018 Zerocracy, Inc.
 # License:: MIT
-class TestInit < Minitest::Test
-  def test_initializes_wallet
+class TestCreate < Minitest::Test
+  def test_creates_wallet
     Dir.mktmpdir 'test' do |dir|
-      wallet = Zold::Wallet.new(File.join(dir, 'source.xml'))
-      Zold::Init.new(
-        wallet: wallet,
-        id: 1,
+      wallet = Zold::Create.new(
+        dir: dir,
         pubkey: Zold::Key.new('fixtures/id_rsa.pub')
       ).run
       assert wallet.balance.zero?
+      assert(
+        File.exist?(File.join(dir, "#{wallet.id}.xml")),
+        "Wallet file not found: #{wallet.id}.xml"
+      )
     end
   end
 end

data/test/commands/test_send.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 # Copyright (c) 2018 Zerocracy, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -24,6 +22,7 @@ require 'minitest/autorun'
 require 'tmpdir'
 require_relative '../../lib/zold/wallet.rb'
 require_relative '../../lib/zold/key.rb'
+require_relative '../../lib/zold/id.rb'
 require_relative '../../lib/zold/commands/send.rb'
 
 # SEND test.
@@ -34,17 +33,18 @@ class TestSend < Minitest::Test
   def test_sends_from_wallet_to_wallet
     Dir.mktmpdir 'test' do |dir|
       source = Zold::Wallet.new(File.join(dir, 'source.xml'))
-      source.init(1, Zold::Key.new('fixtures/id_rsa.pub'))
+      source.init(Zold::Id.new, Zold::Key.new('fixtures/id_rsa.pub'))
       target = Zold::Wallet.new(File.join(dir, 'target.xml'))
-      target.init(2, Zold::Key.new('fixtures/id_rsa.pub'))
+      target.init(Zold::Id.new, Zold::Key.new('fixtures/id_rsa.pub'))
+      amount = Zold::Amount.new(zld: 14.95)
       Zold::Send.new(
         payer: source,
         receiver: target,
-        amount: 100,
+        amount: amount,
         pvtkey: Zold::Key.new('fixtures/id_rsa')
       ).run
-      assert source.balance == -100
-      assert target.balance == 100
+      assert source.balance == amount.mul(-1)
+      assert target.balance == amount
     end
   end
 end

data/test/test__helper.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 # Copyright (c) 2018 Zerocracy, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/test/test_amount.rb

@@ -0,0 +1,45 @@
+# Copyright (c) 2018 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_relative '../lib/zold/amount.rb'
+
+# Amount test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Zerocracy, Inc.
+# License:: MIT
+class TestAmount < Minitest::Test
+  def test_parses_zld
+    amount = Zold::Amount.new(zld: 14.95)
+    assert(
+      amount.to_s == '14.95ZLD',
+      "#{amount} is not equal to '14.95ZLD'"
+    )
+  end
+
+  def test_parses_coins
+    amount = Zold::Amount.new(coins: 900_000_000)
+    assert(
+      amount.to_s == '53.64ZLD',
+      "#{amount} is not equal to '53.64ZLD'"
+    )
+  end
+end

data/test/test_id.rb

@@ -0,0 +1,44 @@
+# Copyright (c) 2018 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_relative '../lib/zold/id.rb'
+
+# ID test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Zerocracy, Inc.
+# License:: MIT
+class TestId < Minitest::Test
+  def test_generates_new_id
+    50.times do
+      id = Zold::Id.new
+      assert id.to_s.length == 16
+    end
+  end
+
+  def test_generates_id_only_once
+    id = Zold::Id.new
+    before = id.to_s
+    5.times do
+      assert id.to_s == before
+    end
+  end
+end

data/test/test_key.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 # Copyright (c) 2018 Zerocracy, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/test/test_wallet.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 # Copyright (c) 2018 Zerocracy, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -23,7 +21,9 @@
 require 'minitest/autorun'
 require 'tmpdir'
 require_relative '../lib/zold/key.rb'
+require_relative '../lib/zold/id.rb'
 require_relative '../lib/zold/wallet.rb'
+require_relative '../lib/zold/amount.rb'
 
 # Wallet test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -34,10 +34,26 @@ class TestWallet < Minitest::Test
     Dir.mktmpdir 'test' do |dir|
       file = File.join(dir, 'source.xml')
       wallet = Zold::Wallet.new(file)
-      wallet.init(1, Zold::Key.new('fixtures/id_rsa.pub'))
-      amount = 123
+      wallet.init(Zold::Id.new, Zold::Key.new('fixtures/id_rsa.pub'))
+      amount = Zold::Amount.new(zld: 39.99)
       wallet.sub(amount, 100, Zold::Key.new('fixtures/id_rsa'))
-      assert wallet.balance == -amount
+      assert(
+        wallet.balance == amount.mul(-1),
+        "#{wallet.balance} is not equal to #{amount.mul(-1)}"
+      )
+    end
+  end
+
+  def test_initializes_it
+    Dir.mktmpdir 'test' do |dir|
+      file = File.join(dir, 'source.xml')
+      wallet = Zold::Wallet.new(file)
+      id = Zold::Id.new.to_s
+      wallet.init(id, Zold::Key.new('fixtures/id_rsa.pub'))
+      assert(
+        wallet.id == id,
+        "#{wallet.id} is not equal to #{id}"
+      )
     end
   end
 end

data/test/test_zold.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 # Copyright (c) 2018 Zerocracy, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/zold.gemspec

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 # Copyright (c) 2018 Zerocracy, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -31,8 +29,8 @@ Gem::Specification.new do |s|
   if s.respond_to? :required_rubygems_version=
     s.required_rubygems_version = Gem::Requirement.new('>= 0')
   end
-  s.rubygems_version = '2.2.2'
-  s.required_ruby_version = '>= 1.9.3'
+  s.rubygems_version = '2.2'
+  s.required_ruby_version = '>= 2.2'
   s.name = 'zold'
   s.version = Zold::VERSION
   s.license = 'MIT'
@@ -47,14 +45,15 @@ Gem::Specification.new do |s|
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
   s.add_runtime_dependency 'nokogiri', '~>1.8'
+  s.add_runtime_dependency 'rainbow', '~>3.0'
   s.add_runtime_dependency 'slop', '~>4.4'
-  s.add_runtime_dependency 'rainbow', '~>2.2'
-  s.add_development_dependency 'rake', '12.0.0'
   s.add_development_dependency 'codecov', '0.1.10'
-  s.add_development_dependency 'rdoc', '4.2.0'
   s.add_development_dependency 'cucumber', '1.3.17'
   s.add_development_dependency 'minitest', '5.5.0'
-  s.add_development_dependency 'rubocop', '~>0.49.0'
-  s.add_development_dependency 'rubocop-rspec', '1.5.1'
+  s.add_development_dependency 'rake', '12.0.0'
+  s.add_development_dependency 'rdoc', '4.2.0'
   s.add_development_dependency 'rspec-rails', '3.1.0'
+  s.add_development_dependency 'rubocop', '~>0.52.0'
+  s.add_development_dependency 'rubocop-rspec', '1.5.1'
+  s.add_development_dependency 'xcop', '~>0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-02 00:00:00.000000000 Z
+date: 2018-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -25,117 +25,131 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: slop
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '4.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '4.4'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: codecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: 0.1.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: 0.1.10
 - !ruby/object:Gem::Dependency
-  name: codecov
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.10
+        version: 1.3.17
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.10
+        version: 1.3.17
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.5.0
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.17
+        version: 12.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.17
+        version: 12.0.0
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.5.0
+        version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.5.0
+        version: 4.2.0
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: 0.52.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: 0.52.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -151,19 +165,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: xcop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0.5'
 description: Non-blockchain cryptocurrency
 email: yegor256@gmail.com
 executables:
@@ -187,6 +201,7 @@ files:
 - README.md
 - Rakefile
 - appveyor.yml
+- assets/wallet.xsd
 - bin/zold
 - cucumber.yml
 - features/cli.feature
@@ -196,15 +211,19 @@ files:
 - fixtures/id_rsa
 - fixtures/id_rsa.pub
 - lib/zold.rb
-- lib/zold/commands/init.rb
+- lib/zold/amount.rb
+- lib/zold/commands/create.rb
 - lib/zold/commands/send.rb
+- lib/zold/id.rb
 - lib/zold/key.rb
 - lib/zold/log.rb
 - lib/zold/version.rb
 - lib/zold/wallet.rb
-- test/commands/test_init.rb
+- test/commands/test_create.rb
 - test/commands/test_send.rb
 - test/test__helper.rb
+- test/test_amount.rb
+- test/test_id.rb
 - test/test_key.rb
 - test/test_wallet.rb
 - test/test_zold.rb
@@ -222,7 +241,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -239,9 +258,11 @@ test_files:
 - features/gem_package.feature
 - features/step_definitions/steps.rb
 - features/support/env.rb
-- test/commands/test_init.rb
+- test/commands/test_create.rb
 - test/commands/test_send.rb
 - test/test__helper.rb
+- test/test_amount.rb
+- test/test_id.rb
 - test/test_key.rb
 - test/test_wallet.rb
 - test/test_zold.rb