liability-proof 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4797e8b0a6476b62e63295f314d67be4d6e38720
-  data.tar.gz: 62cae3a120745d3cd0c374ce6090f14061dbc3c8
+  metadata.gz: cd1a3709646aa06e6baf39c31146b46f6b0cada3
+  data.tar.gz: 495c56c9e5a5e386183a19bf646966fd7c4287a5
 SHA512:
-  metadata.gz: b2377f8e93174f8ada47fa7bc3a4eac28c6d657253e4726de973011a7bb3bb74e5c2cd78ee9c78ca764506d2e8c9f4de5f8d604abb9928ba28c77b766eb6da11
-  data.tar.gz: fc588a9d2eb4c957c18c85d9fc754460f068f635eec771787eb860bd21f4ff5a88d6c86e8f83f4bec8c7e2d6bba789accfd431bd061fde2c66999f5812d6a042
+  metadata.gz: 3790c82513fa9d484040e5b830372d6d8dd33c2dd8dd91007922cb553ca48042acedfc444467f2d2fe66afce31bb489d1c07ce56b0bb294eeef397c0ae040ecc
+  data.tar.gz: 86c04ed283e6e6fbfb54ed4e8f01e52122eed9832e6b04ea7bd3cdfc8df6e1955a79866a939f71a1a9037c2691313345206db94bdf3a1eb46a3024cec323ed85

data/README.markdown

@@ -1,6 +1,8 @@
 Liability Proof
 ===============
 
+[![Build Status](https://travis-ci.org/peatio/liability-proof.png?branch=master)](https://travis-ci.org/peatio/liability-proof)
+
 If you're not familiar with *liability proof* or *the Merkle approach*, check this page: [Proving Your Bitcoin Reserves](https://iwilcox.me.uk/2014/proving-bitcoin-reserves). Basically, every mordern exchanges should prove they really hold the bitcoins/money they claim to.
 
 ### Requirements ###
@@ -21,11 +23,6 @@ As command line tool:
     # https://github.com/olalonde/blind-liability-proof#serialized-data-formats-work-in-progress--draft
     lproof generate -f accounts.json
 
-    # Use -F switch to save numbers as Float instead of String. Save numbers as
-    # String preserve precision well, but some other verification tools doesn't
-    # work well with it, so -F is provided for compatibility only.
-    lproof generate -f accounts.json -F
-
     # Verify specified partial tree is valid, i.e. the root node calculated from
     # from the partial tree matches the root node in root.json
     lproof verify -r root.json -f partial_trees/jan.json

data/bin/lproof

@@ -29,20 +29,6 @@ opt_parser = OptionParser.new do |opt|
     options[:partial_trees_dir] = d
   end
 
-  options[:use_float] = false
-  opt.on("-F", "--use-float", "Print numbers as Float number instead of String in json files. This option is only provided to generating data in compatible format with some verification tools, don't use it unless neccessary. Default to false.") do |f|
-    options[:use_float] = true
-  end
-
-  options[:float_nonce] = false
-  opt.on("--float-nonce", "Use float number as nonce. This option is only provided for compatibility with some verification tools. Default to false.") do |f|
-    options[:float_nonce] = true
-  end
-
-  opt.on("-b", "--blp-format", "Generate json in blind-liability-proof format. Default to false.") do |f|
-    options[:use_float]   = true
-    options[:float_nonce] = true
-  end
 end
 
 opt_parser.parse!

data/lib/liability-proof.rb

@@ -12,7 +12,7 @@ module LiabilityProof
   module_function
 
   def sha256_base64(message)
-    Base64.encode64(OpenSSL::Digest::SHA256.new.digest(message)).strip
+    OpenSSL::Digest::SHA256.new.digest(message).unpack('H*').first
   end
 
 end

data/lib/liability-proof/pretty_printer.rb

@@ -37,9 +37,9 @@ module LiabilityProof
     def lable(node)
       if data = node['data']
         if data['user']
-          "#{data['user']}, #{data['nonce']}, #{data['value']}"
+          "#{data['user']}, #{data['nonce']}, #{data['sum']}"
         else
-          "#{data['value']}, #{data['hash']}"
+          "#{data['sum']}, #{data['hash']}"
         end
       else
         ''

data/lib/liability-proof/tree.rb

@@ -13,9 +13,6 @@ module LiabilityProof
     def initialize(accounts, options={})
       raise ArgumentError, 'accounts is empty' unless accounts && accounts.size > 0
 
-      @use_float   = options.delete(:use_float)
-      @float_nonce = options.delete(:float_nonce)
-
       @accounts    = accounts
       @root        = generate
       @indices     = Hash[index_leaves(@root)]
@@ -24,7 +21,7 @@ module LiabilityProof
     def root_json
       { 'root' => {
           'hash'  => root.hash,
-          'value' => root.formatted_value(@use_float) }}
+          'sum' => root.sum_string }}
     end
 
     def partial(user)
@@ -41,7 +38,7 @@ module LiabilityProof
 
     def _partial(user, node, index, acc)
       if node.is_a?(LeafNode)
-        acc['data'] = node.as_json(@use_float)
+        acc['data'] = node.as_json
 
         if node.user == user
           acc['data'].merge!({
@@ -55,7 +52,7 @@ module LiabilityProof
         follow_child     = node.send follow_direction
         other_child      = node.send other_direction
 
-        acc[other_direction.to_s]  = { 'data' => other_child.as_json(@use_float) }
+        acc[other_direction.to_s]  = { 'data' => other_child.as_json }
         acc[follow_direction.to_s] = { 'data' => nil }
         _partial user, follow_child, index, acc[follow_direction.to_s]
       end
@@ -64,22 +61,17 @@ module LiabilityProof
     def generate
       leaves = @accounts.map do |a|
         user  = a['user']
-        value = ::BigDecimal.new a['balance']
+        sum   = ::BigDecimal.new a['balance']
         nonce = a['nonce'] || generate_nonce
-        LeafNode.new(user, value, nonce)
+        LeafNode.new(user, sum, nonce)
       end
 
       combine leaves
     end
 
     def generate_nonce
-      if @float_nonce
-        # a float number like 0.123456789, for compatibility with blp
-        rand
-      else
-        # a 16 bytes random string encoded in 32 hex digits
-        OpenSSL::Random.random_bytes(16).unpack("H*").first
-      end
+      # a 16 bytes random string encoded in 32 hex digits
+      OpenSSL::Random.random_bytes(16).unpack("H*").first
     end
 
     def combine(nodes)

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

@@ -1,20 +1,20 @@
 module LiabilityProof
   class Tree
 
-    class InteriorNode < Struct.new(:left, :right, :value, :hash)
+    class InteriorNode < Struct.new(:left, :right, :sum, :hash)
       include ::LiabilityProof::Tree::Node
 
       def initialize(left, right)
         super(left, right)
 
-        self.value = left.value + right.value
+        self.sum = left.sum + right.sum
         self.hash  = generate_hash
       end
 
       private
 
       def generate_hash
-        LiabilityProof.sha256_base64 "#{value_string}#{left.hash}#{right.hash}"
+        LiabilityProof.sha256_base64 "#{sum_string}#{left.hash}#{right.hash}"
       end
 
     end

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

@@ -1,13 +1,13 @@
 module LiabilityProof
   class Tree
 
-    class LeafNode < Struct.new(:user, :value, :nonce, :hash)
+    class LeafNode < Struct.new(:user, :sum, :nonce, :hash)
       include ::LiabilityProof::Tree::Node
 
-      def initialize(user, value, nonce, hash=nil)
-        raise ArgumentError, "value must be BigDecimal" unless value.is_a?(BigDecimal)
+      def initialize(user, sum, nonce, hash=nil)
+        raise ArgumentError, "sum must be BigDecimal" unless sum.is_a?(BigDecimal)
 
-        super(user, value, nonce)
+        super(user, sum, nonce)
         self.hash  = hash || generate_hash
 
         if user && hash && nonce
@@ -19,7 +19,7 @@ module LiabilityProof
 
       # a sha256 hash encoded in 64 hex digits
       def generate_hash
-        LiabilityProof.sha256_base64 "#{user}|#{value_string}|#{nonce}"
+        LiabilityProof.sha256_base64 "#{user}|#{sum_string}|#{nonce}"
       end
 
     end

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

@@ -3,16 +3,23 @@ module LiabilityProof
 
     module Node
 
-      def as_json(use_float=false)
-        { 'value' => formatted_value(use_float), 'hash' => hash }
+      def as_json
+        { 'sum' => sum_string, 'hash' => hash }
       end
 
-      def value_string
-        value.to_s('F')
+      def sum_string
+        decimal_to_digits sum
       end
 
-      def formatted_value(use_float)
-        use_float ? value.to_f : value_string
+      def decimal_to_digits(d)
+        _, significant_digits, _, exponent = d.split
+        if d.zero?
+          '0'
+        elsif exponent >= significant_digits.size
+          d.to_i.to_s
+        else
+          d.to_s('F')
+        end
       end
 
     end

data/lib/liability-proof/verifier.rb

@@ -21,9 +21,7 @@ module LiabilityProof
     def match?
       partial_tree = partial_tree_json['partial_tree']
 
-      use_float = expect_root['value'].is_a?(Float)
-      @reduced_root = reduce(partial_tree).as_json(use_float)
-
+      @reduced_root = reduce(partial_tree).as_json
       @reduced_root == expect_root
     end
 
@@ -31,7 +29,7 @@ module LiabilityProof
       if match?
         puts "Partial tree verified successfully!\n\n"
         puts "User: #{@user_node.user}"
-        puts "Balance: #{@user_node.value_string}"
+        puts "Balance: #{@user_node.sum_string}"
       else
         raise "Mismatch! Expected root: #{expect_root.inspect}, calculated root: #{@reduced_root.inspect}"
       end
@@ -51,10 +49,10 @@ module LiabilityProof
     def reduce(node)
       if node['data']
         user  = node['data']['user']
-        value = ::BigDecimal.new node['data']['value'].to_s
+        sum   = ::BigDecimal.new node['data']['sum'].to_s
         nonce = node['data']['nonce']
         hash  = node['data']['hash']
-        leaf = Tree::LeafNode.new user, value, nonce, hash
+        leaf = Tree::LeafNode.new user, sum, nonce, hash
         @user_node = leaf if leaf.user
         leaf
       else

data/lib/liability-proof/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liability-proof
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Peatio Opensource
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print