digix-eth 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: da499545215301e15a8de2cdc5e9126fe64ea118
-  data.tar.gz: 01a0aa3dd050ee349b627904e95c98c96ba78b26
+SHA256:
+  metadata.gz: 43a5e80aa64d950c81657c85b61b4a0babc7851241f6d17d85034638f1bb6e9a
+  data.tar.gz: 3a5bb0b47309bd0b9f581eed6bce46586cc11dfa097c83eca69de2a74c9dc3c0
 SHA512:
-  metadata.gz: e1357b4a3db96ba745bba5f4962c88f8485fb9b987c291c57ebef94ffff7f19224b4a7c0f3884d3076dbdc7553de1ecd8302e27df1bdcb46cd4bc3afbfd30ad8
-  data.tar.gz: ecb0c0143f762b5528e1c137ee648ccb02d4e448ec989215bfd97b0736277e133fa4ff00fe9c86379b64d1751d568124a6da8c00a8efcbe2ea62a0f907009459
+  metadata.gz: da241931604056061eede8aa5b522fc1d3edba48114539259d58b018b279da6720aed6be4042e81ddfd5a1a14882f295f0a7a7e715991a10b2160a1cd9b786f2
+  data.tar.gz: 157c851f34a50f92d2114748658c2c4fce00126e423a8810932bac218097dd8aed887536d0d7f30b1b699a3e8e80d51d776cc586a78f8e0df0a7bf9675862960

data/lib/eth.rb

@@ -4,6 +4,7 @@ require 'money-tree'
 require 'rlp'
 require 'bitcoin'
 require 'rbnacl'
+require 'pry'
 require 'active_support'
 require 'active_support/core_ext'
 

data/lib/eth/key.rb

@@ -85,24 +85,6 @@ module Eth
       public_hex == OpenSsl.recover_compact(hash, signature)
     end
 
-    def get_signer_key(message, signature)
-      hash = message_hash(message)
-      signer_public_hex = OpenSsl.recover_compact(hash, signature)
-      signer_public_key = MoneyTree::PublicKey.new(signer_public_hex, compressed: false)
-      signer_key = Eth::Key.new
-      signer_key.public_key = signer_public_key
-      return signer_key
-    end
-
-    def verify_rpc_signature(message, signature, signer_address)
-      signer = get_signer_key(message, signature)
-      signer.address == signer_address 
-    end
-
-    def verify_rpc_signature_no_prefix(message, signature, signer_address)
-      prefixed_message = Eth::Utils.prefix_message(message)
-      verify_rpc_signature(prefixed_message, signature, signer_address) 
-    end
 
     private
 

data/lib/eth/open_ssl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # originally lifted from https://github.com/lian/bitcoin-ruby
 # thanks to everyone there for figuring this out
 
@@ -8,50 +10,101 @@ module Eth
     if FFI::Platform.windows?
       ffi_lib 'libeay32', 'ssleay32'
     else
-      ffi_lib ['libssl.so.1.0.0', 'ssl']
+      ffi_lib [
+        'libssl.so.1.1.0', 'libssl.so.1.1',
+        'libssl.so.1.0.0', 'libssl.so.10',
+        'ssl'
+      ]
     end
 
     NID_secp256k1 = 714
     POINT_CONVERSION_COMPRESSED = 2
     POINT_CONVERSION_UNCOMPRESSED = 4
 
-    attach_function :SSL_library_init, [], :int
-    attach_function :ERR_load_crypto_strings, [], :void
-    attach_function :SSL_load_error_strings, [], :void
-    attach_function :RAND_poll, [], :int
+    # OpenSSL 1.1.0 version as a numerical version value as defined in:
+    # https://www.openssl.org/docs/man1.1.0/man3/OpenSSL_version.html
+    VERSION_1_1_0_NUM = 0x10100000
+
+    # OpenSSL 1.1.0 engine constants, taken from:
+    # https://github.com/openssl/openssl/blob/2be8c56a39b0ec2ec5af6ceaf729df154d784a43/include/openssl/crypto.h
+    OPENSSL_INIT_ENGINE_RDRAND = 0x00000200
+    OPENSSL_INIT_ENGINE_DYNAMIC = 0x00000400
+    OPENSSL_INIT_ENGINE_CRYPTODEV = 0x00001000
+    OPENSSL_INIT_ENGINE_CAPI = 0x00002000
+    OPENSSL_INIT_ENGINE_PADLOCK = 0x00004000
+    OPENSSL_INIT_ENGINE_ALL_BUILTIN = (
+      OPENSSL_INIT_ENGINE_RDRAND |
+      OPENSSL_INIT_ENGINE_DYNAMIC |
+      OPENSSL_INIT_ENGINE_CRYPTODEV |
+      OPENSSL_INIT_ENGINE_CAPI |
+      OPENSSL_INIT_ENGINE_PADLOCK
+    )
+
+    # OpenSSL 1.1.0 load strings constant, taken from:
+    # https://github.com/openssl/openssl/blob/c162c126be342b8cd97996346598ecf7db56130f/include/openssl/ssl.h
+    OPENSSL_INIT_LOAD_SSL_STRINGS = 0x00200000
+
+    # This is the very first function we need to use to determine what version
+    # of OpenSSL we are interacting with.
+    begin
+      attach_function :OpenSSL_version_num, [], :ulong
+    rescue FFI::NotFoundError
+      attach_function :SSLeay, [], :long
+    end
+
+    # Returns the version of SSL present.
+    #
+    # @return [Integer] version number as an integer.
+    def self.version
+      if respond_to?(:OpenSSL_version_num)
+        OpenSSL_version_num()
+      else
+        SSLeay()
+      end
+    end
 
+    if version >= VERSION_1_1_0_NUM
+      # Initialization procedure for the library was changed in OpenSSL 1.1.0
+      attach_function :OPENSSL_init_ssl, %i[uint64 pointer], :int
+    else
+      attach_function :SSL_library_init, [], :int
+      attach_function :ERR_load_crypto_strings, [], :void
+      attach_function :SSL_load_error_strings, [], :void
+    end
+
+    attach_function :RAND_poll, [], :int
     attach_function :BN_CTX_free, [:pointer], :int
     attach_function :BN_CTX_new, [], :pointer
-    attach_function :BN_add, [:pointer, :pointer, :pointer], :int
-    attach_function :BN_bin2bn, [:pointer, :int, :pointer], :pointer
-    attach_function :BN_bn2bin, [:pointer, :pointer], :int
-    attach_function :BN_cmp, [:pointer, :pointer], :int
+    attach_function :BN_add, %i[pointer pointer pointer], :int
+    attach_function :BN_bin2bn, %i[pointer int pointer], :pointer
+    attach_function :BN_bn2bin, %i[pointer pointer], :int
+    attach_function :BN_cmp, %i[pointer pointer], :int
     attach_function :BN_dup, [:pointer], :pointer
     attach_function :BN_free, [:pointer], :int
-    attach_function :BN_mod_inverse, [:pointer, :pointer, :pointer, :pointer], :pointer
-    attach_function :BN_mod_mul, [:pointer, :pointer, :pointer, :pointer, :pointer], :int
-    attach_function :BN_mod_sub, [:pointer, :pointer, :pointer, :pointer, :pointer], :int
-    attach_function :BN_mul_word, [:pointer, :int], :int
+    attach_function :BN_mod_inverse, %i[pointer pointer pointer pointer], :pointer
+    attach_function :BN_mod_mul, %i[pointer pointer pointer pointer pointer], :int
+    attach_function :BN_mod_sub, %i[pointer pointer pointer pointer pointer], :int
+    attach_function :BN_mul_word, %i[pointer int], :int
     attach_function :BN_new, [], :pointer
     attach_function :BN_num_bits, [:pointer], :int
-    attach_function :BN_rshift, [:pointer, :pointer, :int], :int
-    attach_function :BN_set_word, [:pointer, :int], :int
+    attach_function :BN_rshift, %i[pointer pointer int], :int
+    attach_function :BN_set_word, %i[pointer int], :int
     attach_function :ECDSA_SIG_free, [:pointer], :void
-    attach_function :ECDSA_do_sign, [:pointer, :uint, :pointer], :pointer
-    attach_function :EC_GROUP_get_curve_GFp, [:pointer, :pointer, :pointer, :pointer, :pointer], :int
+    attach_function :ECDSA_do_sign, %i[pointer uint pointer], :pointer
+    attach_function :EC_GROUP_get_curve_GFp, %i[pointer pointer pointer pointer pointer], :int
     attach_function :EC_GROUP_get_degree, [:pointer], :int
-    attach_function :EC_GROUP_get_order, [:pointer, :pointer, :pointer], :int
+    attach_function :EC_GROUP_get_order, %i[pointer pointer pointer], :int
     attach_function :EC_KEY_free, [:pointer], :int
     attach_function :EC_KEY_get0_group, [:pointer], :pointer
     attach_function :EC_KEY_new_by_curve_name, [:int], :pointer
-    attach_function :EC_KEY_set_conv_form, [:pointer, :int], :void
-    attach_function :EC_KEY_set_private_key, [:pointer, :pointer], :int
-    attach_function :EC_KEY_set_public_key,  [:pointer, :pointer], :int
+    attach_function :EC_KEY_set_conv_form, %i[pointer int], :void
+    attach_function :EC_KEY_set_private_key, %i[pointer pointer], :int
+    attach_function :EC_KEY_set_public_key,  %i[pointer pointer], :int
     attach_function :EC_POINT_free, [:pointer], :int
-    attach_function :EC_POINT_mul, [:pointer, :pointer, :pointer, :pointer, :pointer, :pointer], :int
+    attach_function :EC_POINT_mul, %i[pointer pointer pointer pointer pointer pointer], :int
     attach_function :EC_POINT_new, [:pointer], :pointer
-    attach_function :EC_POINT_set_compressed_coordinates_GFp, [:pointer, :pointer, :pointer, :int, :pointer], :int
-    attach_function :i2o_ECPublicKey, [:pointer, :pointer], :uint
+    attach_function :EC_POINT_set_compressed_coordinates_GFp, %i[pointer pointer pointer int pointer], :int
+    attach_function :i2o_ECPublicKey, %i[pointer pointer], :uint
 
     class << self
       def BN_num_bytes(ptr)
@@ -59,14 +112,16 @@ module Eth
       end
 
       def sign_compact(hash, private_key, public_key_hex)
-        private_key = [private_key].pack("H*") if private_key.bytesize >= 64
+        private_key = [private_key].pack('H*') if private_key.bytesize >= 64
         pubkey_compressed = false
 
         init_ffi_ssl
         eckey = EC_KEY_new_by_curve_name(NID_secp256k1)
         priv_key = BN_bin2bn(private_key, private_key.bytesize, BN_new())
 
-        group, order, ctx = EC_KEY_get0_group(eckey), BN_new(), BN_CTX_new()
+        group = EC_KEY_get0_group(eckey)
+        order = BN_new()
+        ctx = BN_CTX_new()
         EC_GROUP_get_order(group, order, ctx)
 
         pub_key = EC_POINT_new(group)
@@ -82,32 +137,36 @@ module Eth
         BN_free(priv_key)
         EC_KEY_free(eckey)
 
-        buf, rec_id, head = FFI::MemoryPointer.new(:uint8, 32), nil, nil
-        r, s = signature.get_array_of_pointer(0, 2).map{|i| BN_bn2bin(i, buf); buf.read_string(BN_num_bytes(i)).rjust(32, "\x00") }
+        buf = FFI::MemoryPointer.new(:uint8, 32)
+        rec_id = nil
+        head = nil
+        r, s = signature.get_array_of_pointer(0, 2).map { |i| BN_bn2bin(i, buf); buf.read_string(BN_num_bytes(i)).rjust(32, "\x00") }
 
-        if signature.get_array_of_pointer(0, 2).all?{|i| BN_num_bits(i) <= 256 }
-          4.times{|i|
-            head = [ Eth.v_base + i ].pack("C")
+        if signature.get_array_of_pointer(0, 2).all? { |i| BN_num_bits(i) <= 256 }
+          4.times  do |i|
+            head = [Eth.v_base + i].pack('C')
             if public_key_hex == recover_public_key_from_signature(hash, [head, r, s].join, i, pubkey_compressed)
               rec_id = i; break
             end
-          }
+          end
         end
 
         ECDSA_SIG_free(signature)
 
-        [ head, [r,s] ].join if rec_id
+        [head, [r, s]].join if rec_id
       end
 
       def recover_public_key_from_signature(message_hash, signature, rec_id, is_compressed)
-        return nil if rec_id < 0 or signature.bytesize != 65
+        return nil if (rec_id < 0) || (signature.bytesize != 65)
+
         init_ffi_ssl
 
         signature = FFI::MemoryPointer.from_string(signature)
         r = BN_bin2bn(signature[1], 32, BN_new())
         s = BN_bin2bn(signature[33], 32, BN_new())
 
-        _n, i = 0, rec_id / 2
+        _n = 0
+        i = rec_id / 2
         eckey = EC_KEY_new_by_curve_name(NID_secp256k1)
 
         EC_KEY_set_conv_form(eckey, POINT_CONVERSION_COMPRESSED) if is_compressed
@@ -137,7 +196,10 @@ module Eth
         BN_rshift(e, e, 8 - (n & 7)) if 8 * message_hash.bytesize > n
 
         ctx = BN_CTX_new()
-        zero, rr, sor, eor = BN_new(), BN_new(), BN_new(), BN_new()
+        zero = BN_new()
+        rr = BN_new()
+        sor = BN_new()
+        eor = BN_new()
         BN_set_word(zero, 0)
         BN_mod_sub(e, zero, e, order, ctx)
         BN_mod_inverse(rr, r, order, ctx)
@@ -148,7 +210,7 @@ module Eth
         BN_CTX_free(ctx)
 
         bn_free_each r, s, order, x, field, e, zero, rr, sor, eor
-        [big_r, big_q].each{|j| EC_POINT_free(j) }
+        [big_r, big_q].each { |j| EC_POINT_free(j) }
 
         recover_public_hex eckey
       end
@@ -165,18 +227,26 @@ module Eth
 
       def init_ffi_ssl
         return if @ssl_loaded
-        SSL_library_init()
-        ERR_load_crypto_strings()
-        SSL_load_error_strings()
+
+        if version >= VERSION_1_1_0_NUM
+          OPENSSL_init_ssl(
+            OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_ENGINE_ALL_BUILTIN,
+            nil
+          )
+        else
+          SSL_library_init()
+          ERR_load_crypto_strings()
+          SSL_load_error_strings()
+        end
+
         RAND_poll()
         @ssl_loaded = true
       end
 
-
       private
 
       def bn_free_each(*list)
-        list.each{|j| BN_free(j) }
+        list.each { |j| BN_free(j) }
       end
 
       def recover_public_hex(eckey)
@@ -184,14 +254,13 @@ module Eth
         buf = FFI::MemoryPointer.new(:uint8, length)
         ptr = FFI::MemoryPointer.new(:pointer).put_pointer(0, buf)
         pub_hex = if i2o_ECPublicKey(eckey, ptr) == length
-          buf.read_string(length).unpack("H*")[0]
-        end
+                    buf.read_string(length).unpack('H*')[0]
+                  end
 
         EC_KEY_free(eckey)
 
         pub_hex
       end
     end
-
   end
 end

data/lib/eth/rpc_signer.rb

@@ -1,6 +1,7 @@
 module Eth
   class RpcSigner
 
+
     attr_accessor :key
 
     def initialize(key)
@@ -9,27 +10,17 @@ module Eth
 
     def sign_message(message)
       payload = Eth::Signature.new(message)
-      payload.signer = @key.address
-      payload.padded_message = Eth::Utils.prefix_message(message)
-      payload.hash = Eth::Utils.keccak256(payload.padded_message)
-      payload.signature = @key.sign_hash(payload.hash)
+      payload.prefixed_message = Eth::Utils.prefix_message(message)
+      payload.hash = Eth::Utils.keccak256(payload.prefixed_message)
+      payload.hash_hex = Eth::Utils.bin_to_prefixed_hex(payload.hash)
+      payload.signature = @key.sign(payload.prefixed_message)
+      payload.signature_hex = Eth::Utils.bin_to_prefixed_hex(payload.signature)
       payload.v, payload.r, payload.s = Eth::Utils.v_r_s_for(payload.signature)
-      payload.rpc_signature = Eth::Utils.zpad_int(payload.r, 32) + Eth::Utils.zpad_int(payload.s, 32) + [(payload.v - 27)].pack('C')
+      payload.rpc = Eth::Utils.zpad_int(payload.r, 32) + Eth::Utils.zpad_int(payload.s, 32) + [(payload.v - 27)].pack('C')
+      payload.rpc_hex = Eth::Utils.bin_to_prefixed_hex(payload.rpc)
       return payload
     end
 
-    class << self
-
-
-      def ecrecover_address(message_hash_hex, signature_hex)
-        message_hash = Eth::Utils.hex_to_bin(message_hash_hex)
-        signature = Eth::Utils.hex_to_bin(signature_hex)
-        public_key = Eth::OpenSsl.recover_compact(message_hash, signature) 
-        signer = Eth::Utils.public_key_to_address(public_key)
-        return signer
-      end
-    end
-
   end
 
 

data/lib/eth/signature.rb

@@ -1,43 +1,7 @@
-class String
-
-  def to_urlsafe_base64
-    if is_hex?
-      Base64.urlsafe_encode64(Eth::Utils.hex_to_bin(self))
-    else
-      Base64.urlsafe_encode64(self)
-    end
-  end
-
-  def from_urlsafe_base64
-    Base64.urlsafe_decode64(self)
-  end
-
-  def to_hex
-    if self.is_hex?
-      return self
-    else
-      Eth::Utils.bin_to_prefixed_hex(self)
-    end
-  end
-
-  def is_hex?
-    !self.gsub("0x", '')[/\H/]
-  end
-
-end
-
 module Eth
   class Signature
 
-    attr_accessor :message, 
-                  :signer, 
-                  :padded_message,
-                  :hash, 
-                  :signature, 
-                  :rpc_signature, 
-                  :v, 
-                  :r, 
-                  :s
+    attr_accessor :message, :signer, :prefixed_message, :hash, :hash_hex, :signature, :signature_hex, :rpc, :rpc_hex, :v, :r, :s
 
     def initialize(message)
       @message = message

data/lib/eth/utils.rb

@@ -37,21 +37,6 @@ module Eth
       RLP::Sedes.big_endian_int.serialize int
     end
 
-    def from_rpc_signature_hex(signature)
-      buffer = Eth::Utils.hex_to_bin(signature).bytes
-      if buffer.length != 65
-        raise ArgumentError.new('Invalid signature length')
-      end
-      v = buffer[64]
-      v += 27 if v < 27
-      r = buffer[0..32]
-      s = buffer[33..64]
-      signature = [v, r, s].flatten.pack('C*')
-      signature_hex = Eth::Utils.bin_to_prefixed_hex(signature)
-      payload = {v: v, r: r, s: s, signature: signature, signature_hex: signature_hex}
-      return payload
-    end
-
     def v_r_s_for(signature)
       [
         signature[0].bytes[0],

data/lib/eth/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Eth
-  VERSION = "0.5.6"
+  VERSION = '0.5.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: digix-eth
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Steve Ellis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2019-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: digest-sha3
@@ -221,8 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Simple API to sign Ethereum transactions.