eth 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1aa11c555d957c6c8c55d2ea7268609d3f9736f3
-  data.tar.gz: 73b6328615458f16f7bbd5a5bcaf6720ce5c9178
+  metadata.gz: 31616ae94a3bcb7936694a979e1789f1e7cdb8be
+  data.tar.gz: 71821aeabc7dbc4ff6add09b97a01e06a7c44338
 SHA512:
-  metadata.gz: f199ecb42d65c41df74875767570780f2d92d248fa8c8352203744d8337401883ecb05cad4d09d8886412b9672beb2a320af4adf8c5c83b9a5cc74dc6dc56fb1
-  data.tar.gz: a90b8616b9ee5812a165ba685e24b8e9e1bfccc724cfb2c6ea5dfab9e9075b0e870a593a5aa0e33e704a61606cd8d8f8df48ece2ac8eac01acf22291a9c681fc
+  metadata.gz: 3bcafe0df121ace5b627daa94890aa2822db9f2fb73b940b5774cf300ede5499a96ded2a6403c5134ab82e8ce31d39ca64bc408062a28f0f009af02c9679e6d8
+  data.tar.gz: c4fa309b4924c2d21f402b2151d8dbf2170fe4791ddbdba0a6ca7a32a11325cc8e1f39b79692570beee84b8aece89a82c77eb6e492d9630f6f8c5033634ca5b9

data/README.md

@@ -48,6 +48,14 @@ Or decode an encoded raw transaction:
 tx = Eth::Tx.decode hex
 ```
 
+### Configure
+In order to prevent replay attacks, you must specify which Ethereum chain your transactions are created for. See [EIP 155](https://github.com/ethereum/EIPs/issues/155) for more detail.
+```
+Eth.configure do |config|
+  config.chain_id = 18 #defaults to 13
+end
+```
+
 Then sign the transaction:
 ```ruby
 tx.sign key
@@ -67,5 +75,4 @@ The gem is available as open source under the terms of the [MIT License](http://
 ## TODO
 - Better test suite.
 - Expose API for HD keys.
-- Separate out code pulled from [bitcoin-ruby](https://github.com/lian/bitcoin-ruby) and [ruby-ethereum](github.com/janx/ruby-ethereum) into their own gems to eliminate duplication.
 - Support signing with [libsecp256k1](https://github.com/bitcoin-core/secp256k1).

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "ethereum-tx"
+require "eth"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/eth.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ethereum-base", "~> 0.1.4"
   spec.add_dependency "ffi", "~> 1.0"
   spec.add_dependency "money-tree", "~> 0.9"
-  spec.add_dependency "rlp", "~> 0.7"
+  spec.add_dependency "rlp", "~> 0.7.3"
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "pry", "~> 0.1"

data/lib/eth.rb

@@ -5,6 +5,7 @@ require 'money-tree'
 require 'rlp'
 
 module Eth
+  REPLAYABLE_CHAIN_ID = 13
 
   autoload :Key, 'eth/key'
   autoload :OpenSsl, 'eth/open_ssl'
@@ -12,4 +13,40 @@ module Eth
   autoload :Tx, 'eth/tx'
   autoload :Utils, 'eth/utils'
 
+  class << self
+    def configure
+      yield(configuration)
+    end
+
+    def chain_id
+      (configuration.chain_id || REPLAYABLE_CHAIN_ID).to_i
+    end
+
+    def v_base
+      (chain_id * 2) + 1
+    end
+
+    def replayable_v_base
+      (REPLAYABLE_CHAIN_ID * 2) + 1
+    end
+
+    def prevent_replays?
+      chain_id != REPLAYABLE_CHAIN_ID
+    end
+
+    def replayable_v?(v)
+      [replayable_v_base, replayable_v_base + 1].include? v
+    end
+
+
+    private
+
+    def configuration
+      @configuration ||= Configuration.new
+    end
+  end
+
+  class Configuration
+    attr_accessor :chain_id
+  end
 end

data/lib/eth/key.rb

@@ -20,7 +20,7 @@ module Eth
       public_key.to_hex
     end
 
-    def to_address
+    def address
       Utils.bin_to_hex(Utils.keccak256(public_bytes[1..-1])[-20..-1])
     end
 

data/lib/eth/open_ssl.rb

@@ -1,6 +1,5 @@
-# lifted from https://github.com/lian/bitcoin-ruby
+# originally lifted from https://github.com/lian/bitcoin-ruby
 # thanks to everyone there for figuring this out
-# TODO: Pull shared code out into a separate library
 
 module Eth
   class OpenSsl
@@ -56,13 +55,8 @@ module Eth
 
     def self.BN_num_bytes(ptr); (BN_num_bits(ptr) + 7) / 8; end
 
-    # def self.sign_compact(hash, private_key, public_key_hex = nil, pubkey_compressed = nil)
     def self.sign_compact(hash, private_key, public_key_hex)
       private_key = [private_key].pack("H*") if private_key.bytesize >= 64
-      private_key_hex = private_key.unpack("H*")[0]
-
-      # public_key_hex = regenerate_key(private_key_hex).last unless public_key_hex
-      # pubkey_compressed = (public_key_hex[0..1] == "04" ? false : true) unless pubkey_compressed
       pubkey_compressed = false
 
       init_ffi_ssl
@@ -90,7 +84,7 @@ module Eth
 
       if signature.get_array_of_pointer(0, 2).all?{|i| BN_num_bits(i) <= 256 }
         4.times{|i|
-          head = [ 27 + i + (pubkey_compressed ? 4 : 0) ].pack("C")
+          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
@@ -107,7 +101,6 @@ module Eth
       init_ffi_ssl
 
       signature = FFI::MemoryPointer.from_string(signature)
-      #signature_bn = BN_bin2bn(signature, 65, BN_new())
       r = BN_bin2bn(signature[1], 32, BN_new())
       s = BN_bin2bn(signature[33], 32, BN_new())
 
@@ -168,14 +161,13 @@ module Eth
 
     def self.recover_compact(hash, signature)
       return false if signature.bytesize != 65
-      #i = signature.unpack("C")[0] - 27
-      #pubkey = recover_public_key_from_signature(hash, signature, (i & ~4), i >= 4)
 
       version = signature.unpack('C')[0]
-      return false if version < 27 or version > 34
+      v_base = Eth.replayable_v?(version) ? Eth.replayable_v_base : Eth.v_base
+      return false if version < v_base
 
-      compressed = (version >= 31) ? (version -= 4; true) : false
-      pubkey = recover_public_key_from_signature(hash, signature, version-27, compressed)
+      compressed = false
+      pubkey = recover_public_key_from_signature(hash, signature, (version - v_base), compressed)
     end
 
     def self.init_ffi_ssl

data/lib/eth/tx.rb

@@ -33,7 +33,11 @@ module Eth
     end
 
     def unsigned_encoded
-      RLP.encode self, sedes: Tx.exclude([:v, :r, :s])
+      RLP.encode(unsigned, sedes: sedes)
+    end
+
+    def signing_data
+      Utils.bin_to_hex unsigned_encoded
     end
 
     def encoded
@@ -104,5 +108,19 @@ module Eth
       Utils.keccak256 unsigned_encoded
     end
 
+    def unsigned
+      Tx.new to_h.merge(v: Eth.chain_id, r: 0, s: 0)
+    end
+
+    def sedes
+      if Eth.prevent_replays? && !(Eth.replayable_v? v)
+        self.class
+      else
+        UnsignedTx
+      end
+    end
+
   end
+
+  UnsignedTx = Tx.exclude([:v, :r, :s])
 end

data/lib/eth/version.rb

@@ -1,3 +1,3 @@
 module Eth
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eth
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Steve Ellis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ethereum-base
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simple API to sign Ethereum transactions.