ruby-ethereum 0.9.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5bb5984fa505665549b339e92d7101d0dfb7df6
-  data.tar.gz: 929f70cd50796bb629913c9c844d4485a1e1781d
+  metadata.gz: 8c18a40778f44a8f514e98f791b5a5238fc5e5f8
+  data.tar.gz: 0589c28717d274a533bb50612b6dd0fc14e99e0a
 SHA512:
-  metadata.gz: 7d713f2fc56919c88bfbfe00fee13e04944b74d3a290ea6080a4b3cd71491498805f4a39f37c2730ed94670658158613c120b2c7a28543546903b8357140111e
-  data.tar.gz: 9d477e58606c86fbdd6d56e4b63ef0dcce0d59d80d7f1ce093c1e949689c77970d35ffe229cccc000cedd309ea9c49b2050262ffe7397bd9f00a3c8b9ad82326
+  metadata.gz: 889d80e5709de13b79b5877003c943f8d8d114fec8d42788f8835b8c935920535eee15c0be0d899853fba6d5c0075530aa3269bc745f5410f7a238ba084723ad
+  data.tar.gz: 9a1b4ba43049ae72d983cf9ba48d551dd21a54c01d5bc481828360b0b4abf6ff2dcdb1f7175673d9805cc8a4e3e30156e603be9a3aef27b31e181b5e95c8d84c

data/README.md

@@ -1,5 +1,7 @@
 # ruby-ethereum
 
+[![Join the chat at https://gitter.im/janx/ruby-ethereum](https://badges.gitter.im/janx/ruby-ethereum.svg)](https://gitter.im/janx/ruby-ethereum?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 A Ruby implementation of [Ethereum](https://ethereum.org).
 
 ## Install Secp256k1

data/lib/ethereum/abi/contract_translator.rb

@@ -140,12 +140,6 @@ module Ethereum
         o
       end
 
-      private
-
-      def logger
-        @logger ||= Logger.new 'eth.abi.contract_translator'
-      end
-
       def method_id(name, encode_types)
         Utils.big_endian_to_int Utils.keccak256(get_sig(name, encode_types))[0,4]
       end
@@ -154,6 +148,12 @@ module Ethereum
         Utils.big_endian_to_int Utils.keccak256(get_sig(name, encode_types))
       end
 
+      private
+
+      def logger
+        @logger ||= Logger.new 'eth.abi.contract_translator'
+      end
+
       def get_sig(name, encode_types)
         "#{name}(#{encode_types.map {|x| canonical_name(x) }.join(',')})"
       end

data/lib/ethereum/block.rb

@@ -38,6 +38,7 @@ module Ethereum
         blk = RLP.decode env.db.get(hash), sedes: Block, env: env
         CachedBlock.create_cached blk
       end
+      lru_cache :find, 1024
 
       def verify(block, parent)
         block2 = RLP.decode RLP.encode(block), sedes: Block, env: parent.env, parent: parent
@@ -175,13 +176,17 @@ module Ethereum
         start_alloc.each do |addr, data|
           addr = Utils.normalize_address addr
 
-          block.set_balance addr, data[:wei] if data[:wei]
-          block.set_balance addr, data[:balance] if data[:balance]
-          block.set_code addr, data[:code] if data[:code]
-          block.set_nonce addr, data[:nonce] if data[:nonce]
+          block.set_balance addr, Utils.parse_int_or_hex(data[:wei]) if data[:wei]
+          block.set_balance addr, Utils.parse_int_or_hex(data[:balance]) if data[:balance]
+          block.set_code addr, Utils.decode_hex(Utils.remove_0x_head(data[:code])) if data[:code]
+          block.set_nonce addr, Utils.parse_int_or_hex(data[:nonce]) if data[:nonce]
 
           if data[:storage]
-            data[:storage].each {|k, v| block.set_storage_data addr, k, v }
+            data[:storage].each do |k, v|
+              k = Utils.big_endian_to_int Utils.decode_hex(Utils.remove_0x_head(k))
+              v = Utils.big_endian_to_int Utils.decode_hex(Utils.remove_0x_head(v))
+              block.set_storage_data addr, k, v
+            end
           end
 
         end
@@ -228,7 +233,7 @@ module Ethereum
       making = options.has_key?(:making) ? options.delete(:making) : false
 
       raise ArgumentError, "No Env object given" unless env.instance_of?(Env)
-      raise ArgumentError, "No database object given" unless env.db.is_a?(DB::BaseDB)
+      raise ArgumentError, "No database object given. db=#{env.db}" unless env.db.is_a?(DB::BaseDB)
 
       @env = env
       @db = env.db
@@ -329,6 +334,10 @@ module Ethereum
       @transaction_count.times.map {|i| get_transaction(i) }
     end
 
+    def uncles_hash
+      Utils.keccak256_rlp(uncles)
+    end
+
     ##
     # Validate the uncles of this block.
     #
@@ -810,6 +819,7 @@ module Ethereum
       loop do
         begin
           receipts.push get_receipt(i)
+          i += 1
         rescue IndexError
           return receipts
         end
@@ -1105,6 +1115,27 @@ module Ethereum
     end
     alias :inspect :to_s
 
+    def validate_transaction(tx)
+      raise UnsignedTransactionError.new(tx) unless tx.sender
+
+      acct_nonce = get_nonce tx.sender
+      raise InvalidNonce, "#{tx}: nonce actual: #{tx.nonce} target: #{acct_nonce}" if acct_nonce != tx.nonce
+
+      min_gas = get_intrinsic_gas tx
+      raise InsufficientStartGas, "#{tx}: startgas actual: #{tx.startgas} target: #{min_gas}" if tx.startgas < min_gas
+
+      total_cost = tx.value + tx.gasprice * tx.startgas
+      balance = get_balance tx.sender
+      raise InsufficientBalance, "#{tx}: balance actual: #{balance} target: #{total_cost}" if balance < total_cost
+
+      accum_gas = gas_used + tx.startgas
+      raise BlockGasLimitReached, "#{tx}: gaslimit actual: #{accum_gas} target: #{gas_limit}" if accum_gas > gas_limit
+
+      tx.check_low_s if number >= config[:homestead_fork_blknum]
+
+      true
+    end
+
     private
 
     def logger
@@ -1181,28 +1212,7 @@ module Ethereum
       raise ValueError, "Extra data cannot exceed #{config[:max_extradata_length]} bytes" if header.extra_data.size > config[:max_extradata_length]
       raise ValueError, "Coinbase cannot be empty address" if header.coinbase.false?
       raise ValueError, "State merkle root of block #{self} not found in database" unless @state.root_hash_valid?
-      raise ValueError, "PoW check failed" if !genesis? && nonce.true? && !header.check_pow
-    end
-
-    def validate_transaction(tx)
-      raise UnsignedTransactionError.new(tx) unless tx.sender
-
-      acct_nonce = get_nonce tx.sender
-      raise InvalidNonce, "#{tx}: nonce actual: #{tx.nonce} target: #{acct_nonce}" if acct_nonce != tx.nonce
-
-      min_gas = get_intrinsic_gas tx
-      raise InsufficientStartGas, "#{tx}: startgas actual: #{tx.startgas} target: #{min_gas}" if tx.startgas < min_gas
-
-      total_cost = tx.value + tx.gasprice * tx.startgas
-      balance = get_balance tx.sender
-      raise InsufficientBalance, "#{tx}: balance actual: #{balance} target: #{total_cost}" if balance < total_cost
-
-      accum_gas = gas_used + tx.startgas
-      raise BlockGasLimitReached, "#{tx}: gaslimit actual: #{accum_gas} target: #{gas_limit}" if accum_gas > gas_limit
-
-      tx.check_low_s if number >= config[:homestead_fork_blknum]
-
-      true
+      raise InvalidNonce, "PoW check failed" if !genesis? && nonce.true? && !header.check_pow
     end
 
     ##

data/lib/ethereum/cached_block.rb

@@ -1,3 +1,4 @@
+# -*- encoding : ascii-8bit -*-
 module Ethereum
   module CachedBlock
 

data/lib/ethereum/chain.rb

@@ -9,7 +9,7 @@ module Ethereum
 
     HEAD_KEY = 'HEAD'.freeze
 
-    attr :env, :index, :head_candidate
+    attr :env, :db, :index, :head_candidate, :genesis
 
     ##
     # @param env [Ethereum::Env] configuration of the chain

data/lib/ethereum/db.rb

@@ -4,3 +4,4 @@ require 'ethereum/db/base_db'
 require 'ethereum/db/ephem_db'
 require 'ethereum/db/overlay_db'
 require 'ethereum/db/refcount_db'
+require 'ethereum/db/level_db'

data/lib/ethereum/db/base_db.rb

@@ -2,7 +2,7 @@
 
 module Ethereum
   module DB
-    class BaseDB
+    module BaseDB
       attr :db
     end
   end

data/lib/ethereum/db/ephem_db.rb

@@ -2,14 +2,19 @@
 
 module Ethereum
   module DB
-    class EphemDB < BaseDB
+    class EphemDB
+      include BaseDB
 
       def initialize
         @db = {}
       end
 
       def get(k)
-        @db[k] or raise KeyError, k.inspect
+        if has_key?(k)
+          @db[k]
+        else
+          raise KeyError, k.inspect
+        end
       end
 
       def put(k, v)

data/lib/ethereum/db/level_db.rb

@@ -0,0 +1,129 @@
+# -*- encoding : ascii-8bit -*-
+
+require 'leveldb'
+
+module Ethereum
+  module DB
+    class LevelDB
+      include BaseDB
+
+      # FIXME: workaround, because leveldb gem doesn't allow put empty string
+      EMPTY_STRING = Utils.keccak256('').freeze
+
+      def initialize(dbfile)
+        logger.info "opening LevelDB", path: dbfile
+
+        @dbfile = dbfile
+        reopen
+
+        @commit_counter = 0
+        @uncommited = {}
+      end
+
+      def reopen
+        @db = ::LevelDB::DB.new @dbfile
+      end
+
+      def get(k)
+        logger.trace 'getting entry', key: Utils.encode_hex(k)[0,8]
+
+        if @uncommited.has_key?(k)
+          raise KeyError, 'key not in db' unless @uncommited[k]
+          logger.trace "from uncommited"
+          return @uncommited[k]
+        end
+
+        logger.trace "from db"
+        raise KeyError, k.inspect unless @db.exists?(k)
+        v = @db.get(k)
+        o = decompress v
+        @uncommited[k] = o
+
+        o
+      end
+
+      def put(k, v)
+        logger.trace 'putting entry', key: Utils.encode_hex(k)[0,8], size: v.size
+        @uncommited[k] = v
+      end
+
+      def commit
+        logger.debug "committing", db: self
+
+        @db.batch do |b|
+          @uncommited.each do |k, v|
+            if v
+              b.put k, compress(v)
+            else
+              b.delete k
+            end
+          end
+        end
+        logger.debug 'committed', db: self, num: @uncommited.size
+        @uncommited = {}
+      end
+
+      def delete(k)
+        logger.trace 'deleting entry', key: key
+        @uncommited[k] = nil
+      end
+
+      def has_key?(k)
+        get(k)
+        true
+      rescue KeyError
+        false
+      end
+      alias :include? :has_key?
+
+      def ==(other)
+        other.instance_of?(self.class) && db == other.db
+      end
+
+      def to_s
+        "<DB at #{@db} uncommited=#{@uncommited.size}>"
+      end
+      alias inspect to_s
+
+      def inc_refcount(k, v)
+        put k, v
+      end
+
+      def dec_refcount(k)
+        # do nothing
+      end
+
+      def revert_refcount_changes(epoch)
+        # do nothing
+      end
+
+      def commit_refcount_changes(epoch)
+        # do nothing
+      end
+
+      def cleanup(epoch)
+        # do nothing
+      end
+
+      def put_temporarily(k, v)
+        inc_refcount(k, v)
+        dec_refcount(k)
+      end
+
+      private
+
+      def logger
+        @logger ||= Logger.new 'db.leveldb'
+      end
+
+      def decompress(x)
+        x == EMPTY_STRING ? '' : x
+      end
+
+      def compress(x)
+        x.empty? ? EMPTY_STRING : x
+      end
+
+    end
+  end
+end

data/lib/ethereum/db/overlay_db.rb

@@ -5,7 +5,8 @@ module Ethereum
     ##
     # Used for making temporary objects.
     #
-    class OverlayDB < BaseDB
+    class OverlayDB
+      include BaseDB
 
       def initialize(db)
         @db = db

data/lib/ethereum/db/refcount_db.rb

@@ -2,19 +2,23 @@
 
 module Ethereum
   module DB
-    class RefcountDB < BaseDB
+    class RefcountDB
+      include BaseDB
 
       DEATH_ROW_OFFSET = 2**62
 
       ZERO_ENCODED = Utils.encode_int(0)
       ONE_ENCODED = Utils.encode_int(1)
 
+      attr_accessor :ttl
+
       def initialize(db)
         @db = db
         @journal = []
         @death_row = []
         @kv = @db.respond_to?(:kv) ? @db.kv : nil
-        @ttl = 500
+
+        self.ttl = 500
       end
 
       ##
@@ -57,7 +61,7 @@ module Ethereum
         raise AssertError, "refcount must be greater than zero!" unless refcount > 0
 
         @journal.push [node_object[0], k]
-        new_refcount = Utils.encode(refcount-1)
+        new_refcount = Utils.encode_int(refcount-1)
         ref_put k, RLP.encode([new_refcount, node_object[1]])
 
         @death_row.push k if new_refcount == ZERO_ENCODED
@@ -100,14 +104,14 @@ module Ethereum
         logger.debug "#{pruned} nodes successfully pruned"
 
         @db.delete "deathrow:#{epoch}" rescue nil
-        @db.delete "journal:#{epoch-@ttl}" rescue nil
+        @db.delete "journal:#{epoch - ttl}" rescue nil
       end
 
       ##
       # Commit changes to the journal and death row to the database.
       #
       def commit_refcount_changes(epoch)
-        timeout_epoch = epoch + @ttl
+        timeout_epoch = epoch + ttl
         death_row_nodes = RLP.decode(@db.get("deathrow:#{timeout_epoch}")) rescue []
 
         @death_row.each do |node_key|
@@ -127,7 +131,7 @@ module Ethereum
         @db.put "deathrow:#{timeout_epoch}", RLP.encode(death_row_nodes)
 
         journal = RLP.decode(@db.get("journal:#{epoch}")) rescue []
-        journal.extend @journal
+        journal.concat @journal
         @journal = []
         @db.put "journal:#{epoch}", RLP.encode(journal)
       end
@@ -136,7 +140,7 @@ module Ethereum
       # Revert changes made during an epoch
       #
       def revert_refcount_changes(epoch)
-        timeout_epoch = epoch + @ttl
+        timeout_epoch = epoch + ttl
 
         @db.delete("deathrow:#{timeout_epoch}") rescue nil
 
@@ -166,7 +170,11 @@ module Ethereum
       end
 
       def ref_get(k)
-        @db.get ref_key(k)
+        if has_key?(k)
+          @db.get ref_key(k)
+        else
+          raise KeyError, k.inspect
+        end
       end
 
       def ref_put(k, v)

data/lib/ethereum/ethash.rb

@@ -67,6 +67,7 @@ module Ethereum
 
         c
       end
+      lru_cache :get_cache, 5
 
       def hashimoto_light(blknum, cache, mining_hash, bin_nonce)
         nonce = Utils.big_endian_to_int(bin_nonce)

data/lib/ethereum/ffi/openssl.rb

@@ -1,4 +1,4 @@
-# encoding: ascii-8bit
+# -*- encoding : ascii-8bit -*-
 
 require 'ffi'
 

data/lib/ethereum/tester/language.rb

@@ -8,10 +8,18 @@ module Ethereum
         def all
           return @all if @all
 
-          @all = {
-            serpent: Serpent,
-            solidity: SolidityWrapper.solc_path && SolidityWrapper
-          }
+          @all = {}
+
+          begin
+            require 'serpent'
+            @all[:serpent] = Serpent
+          rescue LoadError
+            # do nothing
+          end
+
+          if SolidityWrapper.solc_path
+            @all[:solidity] = SolidityWrapper
+          end
 
           @all
         end

data/lib/ethereum/tester/solidity_wrapper.rb

@@ -38,10 +38,10 @@ module Ethereum
           names
         end
 
-        def combined(code)
+        def combined(code, format='bin')
           out = Tempfile.new 'solc_output_'
 
-          pipe = IO.popen([solc_path, '--add-std', '--optimize', '--combined-json', 'abi,bin,devdoc,userdoc'], 'w', [:out, :err] => out)
+          pipe = IO.popen([solc_path, '--add-std', '--optimize', '--combined-json', "abi,#{format},devdoc,userdoc"], 'w', [:out, :err] => out)
           pipe.write code
           pipe.close_write
           raise CompileError, 'compilation failed' unless $?.success?
@@ -66,15 +66,25 @@ module Ethereum
         ##
         # Returns binary of last contract in code.
         #
-        def compile(code, contract_name='')
-          sorted_contracts = combined code
+        def compile(code, contract_name='', format='bin')
+          sorted_contracts = combined code, format
           if contract_name.true?
             idx = sorted_contracts.map(&:first).index(contract_name)
           else
             idx = -1
           end
 
-          Utils.decode_hex sorted_contracts[idx][1]['bin']
+          output = sorted_contracts[idx][1][format]
+          case format
+          when 'bin'
+            Utils.decode_hex output
+          when 'asm'
+            output['.code']
+          when 'opcodes'
+            output
+          else
+            raise ArgumentError
+          end
         end
 
         ##

data/lib/ethereum/utils.rb

@@ -187,5 +187,27 @@ module Ethereum
       keccak256_rlp([normalize_address(sender), nonce])[12..-1]
     end
 
+    def remove_0x_head(s)
+      s[0,2] == '0x' ? s[2..-1] : s
+    end
+
+    def parse_int_or_hex(s)
+      if s.is_a?(Numeric)
+        s
+      elsif s[0,2] == '0x'
+        big_endian_to_int decode_hex(normalize_hex_without_prefix(s))
+      else
+        s.to_i
+      end
+    end
+
+    def normalize_hex_without_prefix(s)
+      if s[0,2] == '0x'
+        (s.size % 2 == 1 ? '0' : '') + s[2..-1]
+      else
+        s
+      end
+    end
+
   end
 end

data/lib/ethereum/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : ascii-8bit -*-
 
 module Ethereum
-  VERSION = '0.9.1'
+  VERSION = '0.9.3'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ruby-ethereum
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.3
 platform: ruby
 authors:
 - Jan Xie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rlp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: ethash
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: lru_redux
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: leveldb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.9
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -164,20 +178,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 description: Ethereum's implementation in ruby.
 email:
 - jan.h.xie@gmail.com
@@ -207,6 +207,7 @@ files:
 - lib/ethereum/db.rb
 - lib/ethereum/db/base_db.rb
 - lib/ethereum/db/ephem_db.rb
+- lib/ethereum/db/level_db.rb
 - lib/ethereum/db/overlay_db.rb
 - lib/ethereum/db/refcount_db.rb
 - lib/ethereum/env.rb
@@ -276,7 +277,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: Core library of the Ethereum project, ruby version.