blockchain-lite 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d943d2cc505e7e01dbaf6fb364ca317d55d9563
-  data.tar.gz: 4ab4b023a57d9ef9794e6024035c6cf6f718afaa
+  metadata.gz: b722f05bc1278363432a4645667ea2f1f6beb135
+  data.tar.gz: ecb976219a2e0f7b9ff8ad90a8f7ebd60d9ba052
 SHA512:
-  metadata.gz: 4d10c42c537839b325d0ab9ebc59bd86238e985f9c549f5119b1b055bd5bf9d70a949ed51dd704082f07974408d40eb887fad1302148819d4fc6f9d63621de76
-  data.tar.gz: 612428a641e7e40ffab34c1c33f30a5b0e224e441479c68b551da1581c8e845f31d29624967a9c7915afce4ed6ce6f0aa421ae71f8a67924d37ea23349d55f9b
+  metadata.gz: d56f16148e7706e848183a94f4a6133f88b26591e34db1c3e024ab4dd0b8e7a5d94d8711101962bfc5108d52de8711ca9fe00dbf418a8bbb218dc01817d78ab9
+  data.tar.gz: 861642febb265b139bf25e4da9d305cbabf28be8797a918e9834ddf00204d68fa9cb70df5a302c88052ce550107d4680db44d41ecf0321dc6530ba7277775781

data/README.md

@@ -48,21 +48,21 @@ will pretty print (pp) something like:
   @hash               = "edbd4e11e69bc399a9ccd8faaea44fb27410fe8e3023bb9462450a0a9c4caa1b">,
  #<Block:0x1eec9a0
   @index              = 1,
-  @timestamp          = 2017-09-15 20:52:38,
+  @timestamp          = 2017-09-15 21:02:38,
   @transactions_count = 1,
   @transactions       = ["Transaction Data..."],
   @hash               = "eb8ecbf6d5870763ae246e37539d82e37052cb32f88bb8c59971f9978e437743",
   @previous_hash      = "edbd4e11e69bc399a9ccd8faaea44fb27410fe8e3023bb9462450a0a9c4caa1b">,
  #<Block:0x1eec838
   @index              = 2,
-  @timestamp          = 2017-09-15 20:52:38,
+  @timestamp          = 2017-09-15 21:12:38,
   @transactions_count = 1,
   @transactions       = ["Transaction Data..."],
   @hash               = "be50017ee4bbcb33844b3dc2b7c4e476d46569b5df5762d14ceba9355f0a85f4",
   @previous_hash      = "eb8ecbf6d5870763ae246e37539d82e37052cb32f88bb8c59971f9978e437743">,
  #<Block:0x1eec6d0
   @index              = 3,
-  @timestamp          = 2017-09-15 20:52:38
+  @timestamp          = 2017-09-15 21:22:38
   @transactions_count = 1,
   @transactions       = ["Transaction Data..."],
   @hash               = "5ee2981606328abfe0c3b1171440f0df746c1e1f8b3b56c351727f7da7ae5d8d",
@@ -100,10 +100,8 @@ class Block
 
   def calc_hash
     sha = Digest::SHA256.new
-    sha.update( @index.to_s +
-                @timestamp.to_s +
+    sha.update( @timestamp.to_s +
                 @transactions.to_s +
-                @transactions_count.to_s +
                 @previous_hash )
     sha.hexdigest
   end
@@ -123,6 +121,7 @@ class Block
   attr_reader :timestamp
   attr_reader :transactions_count
   attr_reader :transactions       
+  attr_reader :transactions_hash    ## merkle_root
   attr_reader :previous_hash
   attr_reader :nonce        ## proof of work if hash starts with leading zeros (00)
   attr_reader :hash
@@ -132,6 +131,7 @@ class Block
     @timestamp          = Time.now.utc    ## note: use coordinated universal time (utc)
     @transactions       = transactions
     @transactions_count = transactions.size
+    @transactions_hash  = MerkleTree.compute_root_for( transactions )
     @previous_hash      = previous_hash
     @nonce, @hash       = compute_hash_with_proof_of_work
   end
@@ -139,10 +139,8 @@ class Block
   def calc_hash
     sha = Digest::SHA256.new
     sha.update( @nonce.to_s +
-                @index.to_s +
                 @timestamp.to_s +
-                @transactions.to_s +
-                @transactions_count.to_s +
+                @transactions_hash +
                 @previous_hash )
     sha.hexdigest
   end

data/Rakefile

@@ -18,6 +18,7 @@ Hoe.spec 'blockchain-lite' do
   self.history_file = 'HISTORY.md'
 
   self.extra_deps = [
+    ['merkletree'],
   ]
 
   self.licenses = ['Public Domain']

data/lib/blockchain-lite.rb

@@ -9,6 +9,9 @@ require 'json'
 require 'uri'
 
 
+## 3rd party libs
+require 'merkletree'
+
 
 ## our own code
 require 'blockchain-lite/version'    # note: let version always go first

data/lib/blockchain-lite/basic/block.rb

@@ -30,10 +30,8 @@ class Block
 
   def calc_hash
     sha = Digest::SHA256.new
-    sha.update( @index.to_s +
-                @timestamp.to_s +
+    sha.update( @timestamp.to_s +
                 @transactions.to_s +
-                @transactions_count.to_s +
                 @previous_hash )
     sha.hexdigest
   end

data/lib/blockchain-lite/proof_of_work/block.rb

@@ -10,6 +10,7 @@ class Block
   attr_reader :timestamp
   attr_reader :transactions_count   # use alias - txn_count - why? why not?
   attr_reader :transactions         # use alias - txn       - why? why not?
+  attr_reader :transactions_hash    # use alias - merkle_root - why? why not?
   attr_reader :previous_hash
   attr_reader :nonce                # ("lucky" number used once) - proof of work if hash starts with leading zeros (00)
   attr_reader :hash
@@ -21,6 +22,9 @@ class Block
     @transactions       = transactions
     @transactions_count = transactions.size
 
+    ## todo: add empty array check to merkletree.compute why? why not?
+    @transactions_hash  = transactions.empty? ? '0' : MerkleTree.compute_root_for( transactions )
+
     @previous_hash = previous_hash
 
     ## note: use coordinated universal time (utc)
@@ -68,10 +72,8 @@ private
   def calc_hash_with_nonce( nonce=0 )
     sha = Digest::SHA256.new
     sha.update( nonce.to_s +
-                @index.to_s +
                 @timestamp.to_s +
-                @transactions.to_s +
-                @transactions_count.to_s +
+                @transactions_hash +
                 @previous_hash )
     sha.hexdigest
   end

data/lib/blockchain-lite/version.rb

@@ -4,7 +4,7 @@
 module BlockchainLite
 
   MAJOR = 1
-  MINOR = 2
+  MINOR = 3
   PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 

data/test/test_blockchain.rb

@@ -61,7 +61,10 @@ def test_wrap
   assert_equal true,  b.valid?
 
   ## corrupt data in block in chain
-  b2.instance_eval %{ @transactions=['XXXXXXX'] }
+  b2.instance_eval <<RUBY
+     @transactions      = ['xxxxxx']
+     @transactions_hash = MerkleTree.compute_root_for( @transactions )
+RUBY
 
   assert_equal true,   b.broken?
   assert_equal false,  b.valid?

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: blockchain-lite
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-17 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: merkletree
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement