ethlite 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ee22cabcf4a413047cd733de839213fefe59ea3a45ddc353f9dd7675f416e28
-  data.tar.gz: c16a6e278a4102061f6efbf7908171ab04653108b2abd4c9d8507ab7bba46324
+  metadata.gz: 5dea4d9654501b9b1fa7a86477a0b509e7722975fdf29ce3c95e060750d917f7
+  data.tar.gz: 25b082b2803cb0404b39cab23b62740c716680f22d3f61825e364f9dfd387640
 SHA512:
-  metadata.gz: 356dd2d7d825fe42d30e94d48b58d8a737ee0cd274e1329c9425341d953e0654ac1a34d789c5f98ca52706b3f1f0702a7d4a418d758a76856410ae72f1bc1b1a
-  data.tar.gz: 0512f202e3b4eefb7a2115158036cd4e11813ef37f0b4df3a9e8269b50f90d8c2fa8d6ae6cade9caf9a49a96b30556ef28e2afa5d8debfe8d2ebf95c221b64a0
+  metadata.gz: 6c28f0334a44bdbb3c2b4d2f375b94ff9ee643a49aa66953eac3bcd471a78398f2c89f8f8b150f64a1d64d19c2a47590f793b4c88ab7c41c045330a44a85a06b
+  data.tar.gz: 45ff4d1b251eb7273f8fa1034b92bb2a95164796268e2d0a69d26f3567e7b806163ab7d851ef8d314d75bb61845d0117ae56fd7af089098ff43e3940dc1c7b2d

data/Manifest.txt

@@ -2,6 +2,8 @@ CHANGELOG.md
 Manifest.txt
 README.md
 Rakefile
+lib/digest/keccak256.rb
+lib/digest/sha3.rb
 lib/ethlite.rb
 lib/ethlite/abi/abi_coder.rb
 lib/ethlite/abi/constant.rb

data/Rakefile

@@ -20,7 +20,7 @@ Hoe.spec 'ethlite' do
 
   self.extra_deps = [
     ['cocos'],
-    ['keccak'],
+    ## ['keccak'],  -- try using bundled ruby version for now
     ['rlp'],
   ]
 

data/lib/digest/keccak256.rb

@@ -0,0 +1,111 @@
+###
+#  use a "vendor" bundled   keccak 256 in all ruby (no c-extensions required)
+#
+#   see  https://github.com/evtaylor/keccak256
+
+
+
+## require 'digest'
+
+
+module Digest
+  class Keccak256 < Digest::Class
+    PILN = [10,  7, 11, 17, 18,  3,  5, 16,
+             8, 21, 24,  4, 15, 23, 19, 13,
+            12,  2, 20, 14, 22,  9,  6,  1]
+
+    ROTC = [ 1,  3,  6, 10, 15, 21, 28, 36,
+            45, 55,  2, 14, 27, 41, 56,  8,
+            25, 43, 62, 18, 39, 61, 20, 44]
+
+    RNDC = [0x0000000000000001, 0x0000000000008082, 0x800000000000808a,
+            0x8000000080008000, 0x000000000000808b, 0x0000000080000001,
+            0x8000000080008081, 0x8000000000008009, 0x000000000000008a,
+            0x0000000000000088, 0x0000000080008009, 0x000000008000000a,
+            0x000000008000808b, 0x800000000000008b, 0x8000000000008089,
+            0x8000000000008003, 0x8000000000008002, 0x8000000000000080,
+            0x000000000000800a, 0x800000008000000a, 0x8000000080008081,
+            0x8000000000008080, 0x0000000080000001, 0x8000000080008008]
+
+    def initialize
+      @size = 256 / 8
+      @buffer = ''
+    end
+
+    def << s
+      @buffer << s
+      self
+    end
+    alias update <<
+
+    def reset
+      @buffer.clear
+      self
+    end
+
+    def finish
+      s = Array.new 25, 0
+      width = 200 - @size * 2
+      padding = "\x01"
+
+      buffer = @buffer
+      buffer << padding << "\0" * (width - buffer.size % width)
+      buffer[-1] = (buffer[-1].ord | 0x80).chr
+
+      0.step buffer.size - 1, width do |j|
+        quads = buffer[j, width].unpack 'Q*'
+        (width / 8).times do |i|
+          s[i] ^= quads[i]
+        end
+
+        keccak s
+      end
+
+      s.pack('Q*')[0, @size]
+    end
+
+    private
+    def keccak s
+      24.times.each_with_object [] do |round, a|
+        # Theta
+        5.times do |i|
+          a[i] = s[i] ^ s[i + 5] ^ s[i + 10] ^ s[i + 15] ^ s[i + 20]
+        end
+
+        5.times do |i|
+          t = a[(i + 4) % 5] ^ rotate(a[(i + 1) % 5], 1)
+          0.step 24, 5 do |j|
+            s[j + i] ^= t
+          end
+        end
+
+        # Rho Pi
+        t = s[1]
+        24.times do |i|
+          j = PILN[i]
+          a[0] = s[j]
+          s[j] = rotate t, ROTC[i]
+          t = a[0]
+        end
+
+        # Chi
+        0.step 24, 5 do |j|
+          5.times do |i|
+            a[i] = s[j + i]
+          end
+
+          5.times do |i|
+            s[j + i] ^= ~a[(i + 1) % 5] & a[(i + 2) % 5]
+          end
+        end
+
+        # Iota
+        s[0] ^= RNDC[round]
+      end
+    end
+
+    def rotate x, y
+      (x << y | x >> 64 - y) & (1 << 64) - 1
+    end
+  end
+end

data/lib/digest/sha3.rb

@@ -0,0 +1,108 @@
+###
+#  use a "vendor" bundled   sha3 in all ruby (no c-extensions required)
+#
+#   see  https://github.com/havenwood/sha3-pure-ruby/blob/master/lib/sha3-pure-ruby.rb
+
+
+## require 'digest'
+
+module Digest
+  class SHA3 < Digest::Class
+    PILN = [10,  7, 11, 17, 18,  3,  5, 16,
+             8, 21, 24,  4, 15, 23, 19, 13,
+            12,  2, 20, 14, 22,  9,  6,  1]
+
+    ROTC = [ 1,  3,  6, 10, 15, 21, 28, 36,
+            45, 55,  2, 14, 27, 41, 56,  8,
+            25, 43, 62, 18, 39, 61, 20, 44]
+
+    RNDC = [0x0000000000000001, 0x0000000000008082, 0x800000000000808a,
+            0x8000000080008000, 0x000000000000808b, 0x0000000080000001,
+            0x8000000080008081, 0x8000000000008009, 0x000000000000008a,
+            0x0000000000000088, 0x0000000080008009, 0x000000008000000a,
+            0x000000008000808b, 0x800000000000008b, 0x8000000000008089,
+            0x8000000000008003, 0x8000000000008002, 0x8000000000000080,
+            0x000000000000800a, 0x800000008000000a, 0x8000000080008081,
+            0x8000000000008080, 0x0000000080000001, 0x8000000080008008]
+
+    def initialize hash_size = 512
+      @size = hash_size / 8
+      @buffer = ''
+    end
+
+    def << s
+      @buffer << s
+      self
+    end
+    alias update <<
+
+    def reset
+      @buffer.clear
+      self
+    end
+
+    def finish
+      s = Array.new 25, 0
+      width = 200 - @size * 2
+
+      buffer = @buffer
+      buffer << "\x06" << "\0" * (width - buffer.size % width)
+      buffer[-1] = (buffer[-1].ord | 0x80).chr
+
+      0.step buffer.size - 1, width do |j|
+        quads = buffer[j, width].unpack 'Q*'
+        (width / 8).times do |i|
+          s[i] ^= quads[i]
+        end
+
+        keccak s
+      end
+
+      s.pack('Q*')[0, @size]
+    end
+
+    private
+    def keccak s
+      24.times.each_with_object [] do |round, a|
+        # Theta
+        5.times do |i|
+          a[i] = s[i] ^ s[i + 5] ^ s[i + 10] ^ s[i + 15] ^ s[i + 20]
+        end
+
+        5.times do |i|
+          t = a[(i + 4) % 5] ^ rotate(a[(i + 1) % 5], 1)
+          0.step 24, 5 do |j|
+            s[j + i] ^= t
+          end
+        end
+
+        # Rho Pi
+        t = s[1]
+        24.times do |i|
+          j = PILN[i]
+          a[0] = s[j]
+          s[j] = rotate t, ROTC[i]
+          t = a[0]
+        end
+
+        # Chi
+        0.step 24, 5 do |j|
+          5.times do |i|
+            a[i] = s[j + i]
+          end
+
+          5.times do |i|
+            s[j + i] ^= ~a[(i + 1) % 5] & a[(i + 2) % 5]
+          end
+        end
+
+        # Iota
+        s[0] ^= RNDC[round]
+      end
+    end
+
+    def rotate x, y
+      (x << y | x >> 64 - y) & (1 << 64) - 1
+    end
+  end
+end

data/lib/ethlite/abi/utils.rb

@@ -11,13 +11,17 @@ module Abi
     #
     def keccak256(x)
       # Digest::SHA3.new(256).digest(x)
-      Digest::Keccak.digest(x, 256)
+      ## Digest::Keccak.digest(x, 256)
+      Digest::Keccak256.digest( x )
     end
 
+=begin
+  ## check where required / in use - what for?
     def keccak512(x)
       # Digest::SHA3.new(512).digest(x)
       Digest::Keccak.digest(x, 512)
     end
+=end
 
     def keccak256_rlp(x)
       keccak256 RLP.encode(x)

data/lib/ethlite/version.rb

@@ -3,7 +3,7 @@
 module Ethlite
   MAJOR = 0
   MINOR = 2
-  PATCH = 0
+  PATCH = 1
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/lib/ethlite.rb

@@ -10,9 +10,12 @@ require 'openssl'
 require 'digest'
 
 ## 3rd party gems
-require 'digest/keccak'     ## gem keccak - see https://rubygems.org/gems/keccak
 require 'rlp'               ## gem rlp    - see https://rubygems.org/gems/rlp
 
+##  bundled require 'digest/keccak'     ## gem keccak - see https://rubygems.org/gems/keccak
+require 'digest/keccak256'
+
+
 
 
 ## our own code

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ethlite
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Gerald Bauer
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: keccak
-  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: rlp
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +86,8 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
+- lib/digest/keccak256.rb
+- lib/digest/sha3.rb
 - lib/ethlite.rb
 - lib/ethlite/abi/abi_coder.rb
 - lib/ethlite/abi/constant.rb