liability-proof 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd1a3709646aa06e6baf39c31146b46f6b0cada3
-  data.tar.gz: 495c56c9e5a5e386183a19bf646966fd7c4287a5
+  metadata.gz: db5ca59224c57ebe11b02903e9dd708ae4886850
+  data.tar.gz: c95e4b04d3a91733924d48e8abd555f3451bde0d
 SHA512:
-  metadata.gz: 3790c82513fa9d484040e5b830372d6d8dd33c2dd8dd91007922cb553ca48042acedfc444467f2d2fe66afce31bb489d1c07ce56b0bb294eeef397c0ae040ecc
-  data.tar.gz: 86c04ed283e6e6fbfb54ed4e8f01e52122eed9832e6b04ea7bd3cdfc8df6e1955a79866a939f71a1a9037c2691313345206db94bdf3a1eb46a3024cec323ed85
+  metadata.gz: eb7225d8ef7cfe15823183e4c10850483b23cd5304c1e761772d55cfa631f0b62c8f43b1cdcad11913e2e646291ab82d518f33fe02f089ab4280098b066789be
+  data.tar.gz: 86f79282441b53e8ecd5718d223e6372a16c3e850b6627721fcc150d310b8fe6768c341d60c8ebd65907974184c43f2233f6efce722f290dcc870b17870bc0ea

data/bin/lproof

@@ -29,6 +29,10 @@ opt_parser = OptionParser.new do |opt|
     options[:partial_trees_dir] = d
   end
 
+  opt.on("-c", "--currency code", "Specify the currency code, used by root.json.") do |c|
+    options[:currency] = c
+  end
+
 end
 
 opt_parser.parse!

data/lib/liability-proof/tree/{interior_node.rb → internal_node.rb}

@@ -1,7 +1,7 @@
 module LiabilityProof
   class Tree
 
-    class InteriorNode < Struct.new(:left, :right, :sum, :hash)
+    class InternalNode < Struct.new(:left, :right, :sum, :hash)
       include ::LiabilityProof::Tree::Node
 
       def initialize(left, right)

data/lib/liability-proof/tree/node.rb

@@ -7,6 +7,10 @@ module LiabilityProof
         { 'sum' => sum_string, 'hash' => hash }
       end
 
+      def as_user_json
+        { 'sum' => sum_string, 'nonce' => nonce, 'user' => user }
+      end
+
       def sum_string
         decimal_to_digits sum
       end

data/lib/liability-proof/tree.rb

@@ -6,7 +6,7 @@ module LiabilityProof
 
     autoload :Node, 'liability-proof/tree/node'
     autoload :LeafNode, 'liability-proof/tree/leaf_node'
-    autoload :InteriorNode, 'liability-proof/tree/interior_node'
+    autoload :InternalNode, 'liability-proof/tree/internal_node'
 
     attr :root, :indices
 
@@ -16,18 +16,22 @@ module LiabilityProof
       @accounts    = accounts
       @root        = generate
       @indices     = Hash[index_leaves(@root)]
+
+      @currency    = options.delete(:currency) || 'BTC'
     end
 
     def root_json
       { 'root' => {
           'hash'  => root.hash,
-          'sum' => root.sum_string }}
+          'sum' => root.sum_string
+        },
+        'currency' => @currency,
+        'timestamp' => rfc822_format(Time.now)
+      }
     end
 
     def partial(user)
-      h = { 'data' => nil }
-      _partial user, @root, @indices[user].dup, h
-      h
+      _partial user, @root, @indices[user].dup, {}
     end
 
     def partial_json(user)
@@ -38,14 +42,7 @@ module LiabilityProof
 
     def _partial(user, node, index, acc)
       if node.is_a?(LeafNode)
-        acc['data'] = node.as_json
-
-        if node.user == user
-          acc['data'].merge!({
-            'user'  => user,
-            'nonce' => node.nonce
-          })
-        end
+        acc['data'] = node.user == user ? node.as_user_json : node.as_json
       else
         follow_direction = index.shift
         other_direction  = follow_direction == :left ? :right : :left
@@ -53,9 +50,11 @@ module LiabilityProof
         other_child      = node.send other_direction
 
         acc[other_direction.to_s]  = { 'data' => other_child.as_json }
-        acc[follow_direction.to_s] = { 'data' => nil }
+        acc[follow_direction.to_s] = {}
         _partial user, follow_child, index, acc[follow_direction.to_s]
       end
+
+      acc
     end
 
     def generate
@@ -80,7 +79,7 @@ module LiabilityProof
       parents = nodes.each_slice(2).map do |(left, right)|
         # if right is not nil, return combined interior node;
         # otherwise keep the left leaf node
-        right ? InteriorNode.new(left, right) : left
+        right ? InternalNode.new(left, right) : left
       end
 
       combine parents
@@ -98,5 +97,9 @@ module LiabilityProof
       end
     end
 
+    def rfc822_format(time)
+      time.strftime("%a, %d %b %Y %H:%M:%S %z")
+    end
+
   end
 end

data/lib/liability-proof/verifier.rb

@@ -58,7 +58,7 @@ module LiabilityProof
       else
         left  = reduce node['left']
         right = reduce node['right']
-        Tree::InteriorNode.new(left, right)
+        Tree::InternalNode.new(left, right)
       end
     end
 

data/lib/liability-proof/version.rb

@@ -1,3 +1,3 @@
 module LiabilityProof
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liability-proof
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Peatio Opensource
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -38,7 +38,7 @@ files:
 - lib/liability-proof/generator.rb
 - lib/liability-proof/pretty_printer.rb
 - lib/liability-proof/tree.rb
-- lib/liability-proof/tree/interior_node.rb
+- lib/liability-proof/tree/internal_node.rb
 - lib/liability-proof/tree/leaf_node.rb
 - lib/liability-proof/tree/node.rb
 - lib/liability-proof/verifier.rb