eth 0.4.8 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7e801e6af9201a0653adfca521abd33b5f2dab92
-  data.tar.gz: e0ed95cce6e8f25091ec6253e18654d539e64b2a
+SHA256:
+  metadata.gz: c2145cbe87b192081aa7f1ef32e8e92669c089e61e6d9d7221a1f18885c7bbcd
+  data.tar.gz: c20ed4ac5450ad6cfae066f58e7bb7a193e6c6a4a29ce9a1d2be71f5d2cbaf7b
 SHA512:
-  metadata.gz: c3cfeb4cb2d190095452908c1d40b341b808e10c03711c4a96e556b381dec18a6ac92c19f0021a35b85574fdadeb6d7c185226aff356f297788faef18dabbab3
-  data.tar.gz: f07015333af071a10c5a59a254293902ac9afe6e72ddcc27d782e69f97a19afcdad6e651bb80e7ad33a9033f50503568d9e865414108dcacb4117b8cdb37e241
+  metadata.gz: 492fcfbda0bfebacc44d0b684350d3e73e68a8449461cc8fcd97364b0e4be06909c2eff0bc86da7f127aceb8b0109f4ad86edf716b65e0e00b701d7f29f17c4e
+  data.tar.gz: 2450ae894c0324ecefd737105cb47275406a816ba998423bd4562539c1c1278062f564b97b725dc050e1e2c192260f19daad2f4e6a67d5aa8505a68332dd51b2

data/CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+### Unreleased
+
+## [0.4.10]
+
+### Changed
+- Changed Eth::Configuration.default_chain_id back to .chain_id for dependent libraries.
+
+## [0.4.9]
+
+### Changed
+- [escoffon](https://github.com/escoffon) added support for chain IDs larger than 120.
+
 ## [0.4.8]
 
 ### Added

data/eth.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'ffi', '~> 1.0'
   spec.add_dependency 'money-tree', '~> 0.10.0'
   spec.add_dependency 'rlp', '~> 0.7.3'
-  spec.add_dependency 'scrypt', '~> 3.0.5'
+  spec.add_dependency 'scrypt', '~> 3.0.6'
 
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'pry', '~> 0.1'

data/lib/eth.rb

@@ -30,15 +30,7 @@ module Eth
     end
 
     def v_base
-      if chain_id
-        (chain_id * 2) + 35
-      else
-        replayable_chain_id
-      end
-    end
-
-    def prevent_replays?
-      !chain_id.nil?
+      replayable_chain_id
     end
 
     def replayable_v?(v)
@@ -49,6 +41,12 @@ module Eth
       !!configuration.tx_data_hex
     end
 
+    def chain_id_from_signature(signature)
+      return nil if Eth.replayable_v?(signature[:v])
+
+      cid = (signature[:v] - 35) / 2
+      (cid < 1) ? nil : cid
+    end
 
     private
 
@@ -61,6 +59,7 @@ module Eth
     attr_accessor :chain_id, :tx_data_hex
 
     def initialize
+      self.chain_id = nil
       self.tx_data_hex = true
     end
   end

data/lib/eth/tx.rb

@@ -20,13 +20,19 @@ module Eth
 
     def self.decode(data)
       data = Utils.hex_to_bin(data) if data.match(/\A(?:0x)?\h+\Z/)
-      deserialize(RLP.decode data)
+      txh = deserialize(RLP.decode data).to_h
+
+      txh[:chain_id] = Eth.chain_id_from_signature(txh)
+
+      self.new txh
     end
 
     def initialize(params)
       fields = {v: 0, r: 0, s: 0}.merge params
       fields[:to] = Utils.normalize_address(fields[:to])
 
+      self.chain_id = (params[:chain_id]) ? params.delete(:chain_id) : Eth.chain_id
+
       if params[:data]
         self.data = params.delete(:data)
         fields[:data_bin] = data_bin
@@ -37,7 +43,8 @@ module Eth
     end
 
     def unsigned_encoded
-      RLP.encode(unsigned, sedes: sedes)
+      us = unsigned
+      RLP.encode(us, sedes: us.sedes)
     end
 
     def signing_data
@@ -53,12 +60,13 @@ module Eth
     end
 
     def sign(key)
-      self.signature = key.sign(unsigned_encoded)
-      vrs = Utils.v_r_s_for signature
-      self.v = vrs[0]
+      sig = key.sign(unsigned_encoded)
+      vrs = Utils.v_r_s_for sig
+      self.v = (self.chain_id) ? ((self.chain_id * 2) + vrs[0] + 8) : vrs[0]
       self.r = vrs[1]
       self.s = vrs[2]
 
+      clear_signature
       self
     end
 
@@ -70,19 +78,28 @@ module Eth
     end
 
     def from
-      if signature
-        public_key = OpenSsl.recover_compact(signature_hash, signature)
+      if ecdsa_signature
+        public_key = OpenSsl.recover_compact(signature_hash, ecdsa_signature)
         Utils.public_key_to_address(public_key) if public_key
       end
     end
 
     def signature
       return @signature if @signature
-      self.signature = [
-        Utils.int_to_base256(v),
-        Utils.zpad_int(r),
-        Utils.zpad_int(s),
-      ].join if [v, r, s].all?
+      @signature = { v: v, r: r, s: s } if [v, r, s].all? && (v > 0)
+    end
+
+    def ecdsa_signature
+      return @ecdsa_signature if @ecdsa_signature
+
+      if [v, r, s].all? && (v > 0)
+        s_v = (self.chain_id) ? (v - (self.chain_id * 2) - 8) : v
+        @ecdsa_signature = [
+          Utils.int_to_base256(s_v),
+          Utils.zpad_int(r),
+          Utils.zpad_int(s),
+        ].join
+      end
     end
 
     def hash
@@ -106,13 +123,37 @@ module Eth
       Eth.tx_data_hex? ? self.data_hex=(string) : self.data_bin=(string)
     end
 
+    def chain_id
+      @chain_id
+    end
+
+    def chain_id=(cid)
+      if cid != @chain_id
+        self.v = 0
+        self.r = 0
+        self.s = 0
+
+        clear_signature
+      end
+
+      @chain_id = (cid == 0) ? nil : cid
+    end
+
+    def prevent_replays?
+      !self.chain_id.nil?
+    end
 
     private
 
+    def clear_signature
+      @signature = nil
+      @ecdsa_signature = nil
+    end
+
     def hash_keys
       keys = self.class.serializable_fields.keys
       keys.delete(:data_bin)
-      keys + [:data]
+      keys + [:data, :chain_id]
     end
 
     def check_transaction_validity
@@ -137,11 +178,13 @@ module Eth
     end
 
     def unsigned
-      Tx.new to_h.merge(v: Eth.chain_id, r: 0, s: 0)
+      Tx.new to_h.merge(v: (self.chain_id) ? self.chain_id : 0, r: 0, s: 0)
     end
 
+    protected
+
     def sedes
-      if Eth.prevent_replays? && !(Eth.replayable_v? v)
+      if self.prevent_replays? && !(Eth.replayable_v? v)
         self.class
       else
         UnsignedTx

data/lib/eth/version.rb

@@ -1,3 +1,3 @@
 module Eth
-  VERSION = "0.4.8"
+  VERSION = "0.4.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eth
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.10
 platform: ruby
 authors:
 - Steve Ellis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-05 00:00:00.000000000 Z
+date: 2018-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: digest-sha3
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: 3.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: 3.0.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Simple API to sign Ethereum transactions.