eth 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3634eb14f8b7215034c3d182aaa6f1617062e723
-  data.tar.gz: abf2f132aa8eb36db20498fa762543ec5d243d81
+  metadata.gz: 44e92871d81caa7588db650518e11a2ba2901d5d
+  data.tar.gz: 2d5bc29ed89cb39d9a204095472842ad06d2b140
 SHA512:
-  metadata.gz: cfc6c93a18eb92381052080ecdfffeaf017cb119954642dba89d8dcf3fe8ee0f505f652c979c4a9b2067375acb4625a29b130b517f5dfaff0e76a8ea459dc4ab
-  data.tar.gz: 36b54f235dc2256dbd705c3cd7ea235095f9323f09b32f36903712363d687b21de4d553a74b4b92071898c1daf81a1459cd60d0c2675e403dbe03b034e381237
+  metadata.gz: 903c267557fbe7eaf3f46bc95069df9d86a1385e2e12f1fc84826bd7a5fc12b25f337fe7790b5f76a8758ed657c0b00b3382ed57333d8ac039bc0740bcebc161
+  data.tar.gz: 91e7c9fcde5106ab9e919fb0de40aa399f3def20275b7d14075213d24b618289d51f90c9c861a78bfa7e7d41f81a1cf9ea02aa0511c1c4367eb146f744e90fc2

data/.gitmodules

@@ -1,3 +1,3 @@
 [submodule "spec/fixtures/ethereum_tests"]
 	path = spec/fixtures/ethereum_tests
-	url = git@github.com:ethereum/tests.git
+	url = https://github.com/ethereum/tests

data/.travis.yml

@@ -1,5 +1,7 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.1
+  - 2.2.0
+  - 2.3.0
+  - 2.4.0
 before_install: gem install bundler -v 1.12.3

data/CHANGELOG.md

@@ -4,6 +4,11 @@ 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]
+
+### Changed
+- Tx#hash includes the '0x' hex prefix.
+
 ## [0.4.0]
 
 ### Added
@@ -13,7 +18,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 - Tx#data is configurable to return either hex or binary: `config.tx_data_hex = true`.
-- Tx#hash includes the '0x' hex prefix.
 - Tx#hex includes the '0x' hex prefix.
 - Key#address getter is prepended by '0x'.
 - Extract public key to address method into Utils.public_key_to_address.

data/README.md

@@ -1,4 +1,4 @@
-# Eth
+# Eth [![Travis-CI](https://travis-ci.org/se3000/ruby-eth.svg?branch=master)](https://travis-ci.org/se3000/ruby-eth) [![Code Climate](https://codeclimate.com/github/se3000/ruby-eth/badges/gpa.svg)](https://codeclimate.com/github/se3000/ruby-eth) [![Gitter](https://badges.gitter.im/ruby-eth/Lobby.svg)](https://gitter.im/ruby-eth/Lobby)
 
 A simple library to build and sign Ethereum transactions. Allows separataion of key and node management. Sign transactions and handle keys anywhere you can run ruby, boradcast transactions through any node.
 

data/eth.gemspec

@@ -19,13 +19,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  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.3"
+  spec.add_dependency 'digest-sha3', '~> 1.1'
+  spec.add_dependency 'ffi', '~> 1.0'
+  spec.add_dependency 'money-tree', '~> 0.9'
+  spec.add_dependency 'rlp', '~> 0.7.3'
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "pry", "~> 0.1"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency 'bundler', '~> 1.12'
+  spec.add_development_dependency 'pry', '~> 0.1'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
 end

data/lib/eth.rb

@@ -1,12 +1,16 @@
 require 'digest/sha3'
-require 'ethereum/base'
 require 'ffi'
 require 'money-tree'
 require 'rlp'
 
 module Eth
+  BYTE_ZERO = "\x00".freeze
+  UINT_MAX = 2**256 - 1
+
+  autoload :Gas, 'eth/gas'
   autoload :Key, 'eth/key'
   autoload :OpenSsl, 'eth/open_ssl'
+  autoload :Secp256k1, 'eth/secp256k1'
   autoload :Sedes, 'eth/sedes'
   autoload :Tx, 'eth/tx'
   autoload :Utils, 'eth/utils'
@@ -59,4 +63,7 @@ module Eth
       self.tx_data_hex = true
     end
   end
+
+  class ValidationError < StandardError; end
+  class InvalidTransaction < ValidationError; end
 end

data/lib/eth/gas.rb

@@ -0,0 +1,9 @@
+module Eth
+  class Gas
+
+    GTXCOST = 21000       # TX BASE GAS COST
+    GTXDATANONZERO = 68   # TX DATA NON ZERO BYTE GAS COST
+    GTXDATAZERO = 4       # TX DATA ZERO BYTE GAS COST
+
+  end
+end

data/lib/eth/key.rb

@@ -50,7 +50,7 @@ module Eth
 
     def valid_s?(signature)
       s_value = Utils.v_r_s_for(signature).last
-      s_value <= Ethereum::Base::SECP256K1_N/2 && s_value != 0
+      s_value <= Secp256k1::N/2 && s_value != 0
     end
 
   end

data/lib/eth/secp256k1.rb

@@ -0,0 +1,7 @@
+module Eth
+  class Secp256k1
+
+    N = 115792089237316195423570985008687907852837564279074904382605163141518161494337
+
+  end
+end

data/lib/eth/tx.rb

@@ -86,7 +86,7 @@ module Eth
     end
 
     def hash
-      Utils.bin_to_hex Utils.keccak256_rlp(self)
+      "0x#{Utils.bin_to_hex Utils.keccak256_rlp(self)}"
     end
     alias_method :id, :hash
 
@@ -116,20 +116,20 @@ module Eth
     end
 
     def check_transaction_validity
-      if [gas_price, gas_limit, value, nonce].max > Ethereum::Base::UINT_MAX
-        raise Ethereum::Base::InvalidTransaction, "Values way too high!"
+      if [gas_price, gas_limit, value, nonce].max > UINT_MAX
+        raise InvalidTransaction, "Values way too high!"
       elsif gas_limit < intrinsic_gas_used
-        raise Ethereum::Base::InvalidTransaction, "Gas limit too low"
+        raise InvalidTransaction, "Gas limit too low"
       end
     end
 
     def intrinsic_gas_used
-      num_zero_bytes = data_bin.count(Ethereum::Base::BYTE_ZERO)
+      num_zero_bytes = data_bin.count(BYTE_ZERO)
       num_non_zero_bytes = data_bin.size - num_zero_bytes
 
-      Ethereum::Base::GTXCOST +
-        Ethereum::Base::GTXDATAZERO * num_zero_bytes +
-        Ethereum::Base::GTXDATANONZERO * num_non_zero_bytes
+      Gas::GTXCOST +
+        Gas::GTXDATAZERO * num_zero_bytes +
+        Gas::GTXDATANONZERO * num_non_zero_bytes
     end
 
     def signature_hash

data/lib/eth/utils.rb

@@ -1,7 +1,6 @@
 module Eth
   module Utils
 
-    extend Ethereum::Base::Utils
     extend self
 
     def normalize_address(address)
@@ -17,27 +16,19 @@ module Eth
     end
 
     def bin_to_hex(string)
-      string.unpack("H*")[0]
+      RLP::Utils.encode_hex string
     end
 
     def hex_to_bin(string)
-      [string.sub(/\A0x/, '')].pack("H*")
+      RLP::Utils.decode_hex remove_hex_prefix(string)
     end
 
-    def base256_to_int(string)
-      string.bytes.inject do |result, byte|
-        result *= 256
-        result + byte
-      end
+    def base256_to_int(str)
+      RLP::Sedes.big_endian_int.deserialize str.sub(/\A(\x00)+/, '')
     end
 
     def int_to_base256(int)
-      bytes = []
-      while int > 0 do
-        bytes.unshift(int % 256)
-        int /= 256
-      end
-      bytes.pack('C*')
+      RLP::Sedes.big_endian_int.serialize int
     end
 
     def v_r_s_for(signature)
@@ -52,6 +43,10 @@ module Eth
       hex.match(/\A0x/) ? hex : "0x#{hex}"
     end
 
+    def remove_hex_prefix(s)
+      s[0,2] == '0x' ? s[2..-1] : s
+    end
+
     def bin_to_prefixed_hex(binary)
       prefix_hex bin_to_hex(binary)
     end
@@ -62,6 +57,46 @@ module Eth
       bin_to_prefixed_hex address_bytes
     end
 
+    def sha256(x)
+      Digest::SHA256.digest x
+    end
+
+    def keccak256(x)
+      Digest::SHA3.new(256).digest(x)
+    end
+
+    def keccak512(x)
+      Digest::SHA3.new(512).digest(x)
+    end
+
+    def keccak256_rlp(x)
+      keccak256 RLP.encode(x)
+    end
+
+    def ripemd160(x)
+      Digest::RMD160.digest x
+    end
+
+    def hash160(x)
+      ripemd160 sha256(x)
+    end
+
+    def zpad(x, l)
+      lpad x, BYTE_ZERO, l
+    end
+
+    def zunpad(x)
+      x.sub /\A\x00+/, ''
+    end
+
+    def zpad_int(n, l=32)
+      zpad encode_int(n), l
+    end
+
+    def zpad_hex(s, l=32)
+      zpad decode_hex(s), l
+    end
+
 
     private
 
@@ -70,5 +105,13 @@ module Eth
       symbol * (l - x.size) + x
     end
 
+    def encode_int(n)
+      unless n.is_a?(Integer) && n >= 0 && n <= UINT_MAX
+        raise ArgumentError, "Integer invalid or out of range: #{n}"
+      end
+
+      int_to_base256 n
+    end
+
   end
 end

data/lib/eth/version.rb

@@ -1,3 +1,3 @@
 module Eth
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: eth
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Steve Ellis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-29 00:00:00.000000000 Z
+date: 2017-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ethereum-base
+  name: digest-sha3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -142,8 +142,10 @@ files:
 - bin/setup
 - eth.gemspec
 - lib/eth.rb
+- lib/eth/gas.rb
 - lib/eth/key.rb
 - lib/eth/open_ssl.rb
+- lib/eth/secp256k1.rb
 - lib/eth/sedes.rb
 - lib/eth/tx.rb
 - lib/eth/utils.rb