hashtastic 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93a14f1cad9f8acd97b774aff0a17a9645fbe4c58e9ff436b558aaee2bb3ee7c
-  data.tar.gz: d503ccccdfe7902945b342e9c95c3d6b84eb1dbc23b9a7087b17904011846eab
+  metadata.gz: a898d7fa1b1f5188d55a073cc4db58dc2b462fabad86d9798abd2e29620f9600
+  data.tar.gz: bb55e244d752b738d09e72205c680efb9799aacf52123c899acba5d51ab022ea
 SHA512:
-  metadata.gz: 212807d96c812105679a1c0f6325a38598202d98c9e2ce2f0ceeafce54a59e41fdb050cc8d864507c09f80719bb120e878aa92c03df3f6cd93a55887ab863890
-  data.tar.gz: 809e52a76d93323944578e19db72f9f48a1195438e1bb18ec97cb701c67973e8fadd41ab2bc339df13f7bb38e3ee3fbfb41b4da2653657a43656f15131b16f58
+  metadata.gz: e949ae465b4ae7e0cb59d2b1d6aa077dcc386707f115efeb66ef62220bd7fbf255007722b7173f6e6890f0c4f179a3252d27a262bd674d4c8107a2a044159a6a
+  data.tar.gz: ef1fd8c18bfb65ce033bf7da0c97ba98a1cc3691ee02136d3d3194acf6d8848d47f7165202054ede2095278760ee9c8176759b6dc47cf68c181aa2af4e9ac0de

data/CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.3.1] - 2019-08-05
+### Added:
+- Validate hex input
+
+### Fixed:
+- Prefix '0x' with hexdigest
+
+### Changed:
+- Move verify to class method of MerkleTree
 
 ## [0.3.0] - 2019-08-05
 ### Added:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hashtastic (0.3.0)
+    hashtastic (0.3.1)
       activesupport (~> 5.0)
       digest-sha3 (~> 1.1)
 

data/lib/hashtastic.rb

@@ -5,6 +5,7 @@ require 'active_support/all'
 require 'hashtastic/utils'
 require 'hashtastic/list_hasher'
 require 'hashtastic/dictionary_values_hasher'
+require 'hashtastic/merkle_tree/invalid_hex_format_error'
 require 'hashtastic/ethereum_sha3'
 require 'hashtastic/dictionary_hasher'
 require 'hashtastic/digester'

data/lib/hashtastic/dictionary_hasher.rb

@@ -10,7 +10,7 @@ module Hashtastic
 
         hasher.update(encoded_message)
 
-        hasher.hexdigest
+        "0x#{hasher.hexdigest}"
       end
 
       private

data/lib/hashtastic/list_hasher.rb

@@ -11,7 +11,7 @@ module Hashtastic
         hasher.update(value.to_s)
       end
 
-      hasher.hexdigest
+      "0x#{hasher.hexdigest}"
     end
   end
 end

data/lib/hashtastic/merkle_tree/invalid_hex_format_error.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class InvalidHexFormat < StandardError
+  def initialize(leaf)
+    super("invalid hex format, prefix '0x' is required or input is not a hex value: #{leaf}")
+  end
+end

data/lib/hashtastic/merkle_tree/merkle_tree.rb

@@ -2,9 +2,29 @@
 
 module Hashtastic
   class MerkleTree
+    class << self
+      def verify(proof:, root:, leaf:, hashfunc: EthereumSHA3)
+        proof.each { |hex| validate_hex(hex) }
+
+        computed_hash =
+          proof.reduce(leaf) do |acc, element|
+            combined = [acc, element].map { |h| Utils.hex_to_ascii(h) }.sort.join
+
+            hashfunc.call(combined)
+          end
+
+        computed_hash == root
+      end
+
+      def validate_hex(hex)
+        raise ArgumentError, hex unless Utils.hex?(hex)
+      end
+    end
+
     attr_reader :layers, :leafs
 
     def initialize(leafs, hashfunc = EthereumSHA3)
+      leafs.each { |leaf| self.class.validate_hex(leaf) }
       @hashfunc = hashfunc
       @leafs = leafs.sort.uniq
       @layers = LayersCreator.call(@leafs, hashfunc)
@@ -27,21 +47,12 @@ module Hashtastic
       end
     end
 
+    private
+
     def pair_element(index, layer)
       pair_index = index.even? ? index + 1 : index - 1
 
       return layer[pair_index] if pair_index < layer.length
     end
-
-    def verify(proof:, root:, leaf:)
-      computed_hash =
-        proof.reduce(leaf) do |acc, element|
-          combined = [acc, element].map { |h| Utils.hex_to_ascii(h) }.sort.join
-
-          @hashfunc.call(combined)
-        end
-
-      computed_hash == root
-    end
   end
 end

data/lib/hashtastic/utils.rb

@@ -8,6 +8,13 @@ module Hashtastic
 
         [value].pack('H*')
       end
+
+      def hex?(value)
+        pattern = /^[[:xdigit:]]+$/
+        return false if value[0..1] != '0x'
+
+        return value[2..-1].match?(pattern)
+      end
     end
   end
 end

data/lib/hashtastic/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hashtastic
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hashtastic
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - lucidity
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-05 00:00:00.000000000 Z
+date: 2019-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -133,6 +133,7 @@ files:
 - lib/hashtastic/digester.rb
 - lib/hashtastic/ethereum_sha3.rb
 - lib/hashtastic/list_hasher.rb
+- lib/hashtastic/merkle_tree/invalid_hex_format_error.rb
 - lib/hashtastic/merkle_tree/layers_creator.rb
 - lib/hashtastic/merkle_tree/leaf_not_found_error.rb
 - lib/hashtastic/merkle_tree/merkle_tree.rb