ruby-ethereum 0.9.6 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b148ff5fc474e2b43055a78679a76e13911534ed
-  data.tar.gz: 8d19a27b24c3e44c6826418c6062d5d5feccc5c4
+  metadata.gz: 924077d29477e9f46eb1db5e877d50064b8763f8
+  data.tar.gz: 16e19c8bcda8230a4051e97fcd0953175bd103aa
 SHA512:
-  metadata.gz: 1bc3e0f52812048175c9e939ae8250f7a8086365970df3779ff0edfdd6a4faf88015c53365b8e72160739455fd5b2b9ea3c806140a2d6d1f6e8c7fbf0a302c39
-  data.tar.gz: 9e4c2c2a1182e11a4064a59fe4c8d50c6b51a1b5dcbb79d1407200156b919b6c1d4a7589fc7be4e74eea10859199d94301da44788eee470f7f3e5e08eab876c9
+  metadata.gz: 916783bdd8651f67a07897cb4fceb5f8cb75ef272aab5b432c3b17c318285861dbb6a369c8f99f4d3a42755166824e5e002cb870bb2e8a257181a1f1080e35c8
+  data.tar.gz: 751ab5b00e1e89c318ac77138714acc6df7bc09fad6ea355b2ddbd85da1679603e56c607a05f040b2924cd9f870f53ada872e427ac22ce439eb5db74cf9d7085

data/lib/ethereum/abi/contract_translator.rb

@@ -12,17 +12,22 @@ module Ethereum
         end
 
         @contract = {
+          fallback_data: nil,
           constructor_data: nil,
           function_data: {},
           event_data: {}
         }
 
         contract_interface.each do |desc|
-          encode_types = desc['inputs'].map {|e| e['type'] }
-          signature = desc['inputs'].map {|e| [e['type'], e['name']] }
-
-          # type can be omitted, defaulting to function
           type = desc['type'] || 'function'
+          encode_types = []
+          signature = []
+
+          if type != 'fallback' && desc.has_key?('inputs')
+            encode_types = desc['inputs'].map {|e| e['type'] }
+            signature = desc['inputs'].map {|e| [e['type'], e['name']] }
+          end
+
           case type
           when 'function'
             name = basename desc['name']
@@ -32,7 +37,8 @@ module Ethereum
               encode_types: encode_types,
               decode_types: decode_types,
               is_constant: desc.fetch('constant', false),
-              signature: signature
+              signature: signature,
+              payable: desc.fetch('payable', false)
             }
           when 'event'
             name = basename desc['name']
@@ -51,6 +57,11 @@ module Ethereum
               encode_types: encode_types,
               signature: signature
             }
+          when 'fallback'
+            raise ValueError, "Only one fallback function is supported." if @contract[:fallback_data]
+            @contract[:fallback_data] = {
+              payable: desc['payable']
+            }
           else
             raise ValueError, "Unknown interface type: #{type}"
           end

data/lib/ethereum/db/level_db.rb

@@ -25,15 +25,15 @@ module Ethereum
       end
 
       def get(k)
-        logger.trace 'getting entry', key: Utils.encode_hex(k)[0,8]
+        logger.debug '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"
+          logger.debug "from uncommited"
           return @uncommited[k]
         end
 
-        logger.trace "from db"
+        logger.debug "from db"
         raise KeyError, k.inspect unless @db.exists?(k)
         v = @db.get(k)
         o = decompress v
@@ -43,7 +43,7 @@ module Ethereum
       end
 
       def put(k, v)
-        logger.trace 'putting entry', key: Utils.encode_hex(k)[0,8], size: v.size
+        logger.debug 'putting entry', key: Utils.encode_hex(k)[0,8], size: v.size
         @uncommited[k] = v
       end
 
@@ -64,7 +64,7 @@ module Ethereum
       end
 
       def delete(k)
-        logger.trace 'deleting entry', key: key
+        logger.debug 'deleting entry', key: key
         @uncommited[k] = nil
       end
 

data/lib/ethereum/db/refcount_db.rb

@@ -34,14 +34,14 @@ module Ethereum
         new_refcount = Utils.encode_int(refcount+1)
         ref_put k, RLP.encode([new_refcount, v])
 
-        if Logger.trace?(logger.name)
+        if logger.trace?
           logger.trace "increasing #{Utils.encode_hex(k)}=#{v} to #{refcount+1}"
         end
       rescue
         ref_put k, RLP.encode([ONE_ENCODED, v])
         @journal.push [ZERO_ENCODED, k]
 
-        if Logger.trace?(logger.name)
+        if logger.trace?
           logger.trace "increasing #{Utils.encode_hex(k)}=#{v} to 1"
         end
       end
@@ -54,7 +54,7 @@ module Ethereum
         node_object = RLP.decode ref_get(k)
         refcount = Utils.decode_int node_object[0]
 
-        if Logger.trace?(logger.name)
+        if logger.trace?
           logger.trace "decreasing #{Utils.encode_hex(k)} to #{refcount-1}"
         end
 

data/lib/ethereum/env.rb

@@ -61,7 +61,10 @@ module Ethereum
 
       dao_fork_blknum: 1920000,
       child_dao_list: Utils.child_dao_list.map {|addr| Utils.normalize_address addr },
-      dao_withdrawer: Utils.normalize_address('0xbf4ed7b27f1d666546e30d74d50d173d20bca754')
+      dao_withdrawer: Utils.normalize_address('0xbf4ed7b27f1d666546e30d74d50d173d20bca754'),
+
+      anti_dos_fork_blknum: 2457000,
+      clearing_fork_blknum: 2**100
     }.freeze
 
     attr :db, :config, :global_config

data/lib/ethereum/external_call.rb

@@ -80,6 +80,10 @@ module Ethereum
       @block.number >= @block.config[:homestead_fork_blknum]
     end
 
+    def post_anti_dos_hardfork
+      @block.number >= @block.config[:anti_dos_fork_blknum]
+    end
+
     def post_metropolis_hardfork
       @block.number >= @block.config[:metropolis_fork_blknum]
     end
@@ -147,9 +151,13 @@ module Ethereum
     def apply_msg(msg, code=nil)
       code ||= get_code msg.code_address
 
-      log_msg.debug "MSG APPLY",  sender: Utils.encode_hex(msg.sender), to: Utils.encode_hex(msg.to), gas: msg.gas, value: msg.value, data: Utils.encode_hex(msg.data.extract_all)
-      log_state.trace "MSG PRE STATE SENDER", account: Utils.encode_hex(msg.sender), balance: get_balance(msg.sender), state: log_storage(msg.sender)
-      log_state.trace "MSG PRE STATE RECIPIENT", account: Utils.encode_hex(msg.to), balance: get_balance(msg.to), state: log_storage(msg.to)
+      if log_msg.trace?
+        log_msg.debug "MSG APPLY",  sender: Utils.encode_hex(msg.sender), to: Utils.encode_hex(msg.to), gas: msg.gas, value: msg.value, data: Utils.encode_hex(msg.data.extract_all)
+        if log_state.trace?
+          log_state.trace "MSG PRE STATE SENDER", account: Utils.encode_hex(msg.sender), balance: get_balance(msg.sender), state: log_storage(msg.sender)
+          log_state.trace "MSG PRE STATE RECIPIENT", account: Utils.encode_hex(msg.to), balance: get_balance(msg.to), state: log_storage(msg.to)
+        end
+      end
 
       # snapshot before execution
       snapshot = self.snapshot
@@ -169,9 +177,13 @@ module Ethereum
         res, gas, dat = VM.execute self, msg, code
       end
 
-      log_msg.trace "MSG APPLIED", gas_remained: gas, sender: msg.sender, to: msg.to, data: dat
-      log_state.trace "MSG POST STATE SENDER", account: Utils.encode_hex(msg.sender), balance: get_balance(msg.sender), state: log_storage(msg.sender)
-      log_state.trace "MSG POST STATE RECIPIENT", account: Utils.encode_hex(msg.to), balance: get_balance(msg.to), state: log_storage(msg.to)
+      if log_msg.trace?
+        log_msg.trace "MSG APPLIED", gas_remained: gas, sender: msg.sender, to: msg.to, data: dat
+        if log_state.trace?
+          log_state.trace "MSG POST STATE SENDER", account: Utils.encode_hex(msg.sender), balance: get_balance(msg.sender), state: log_storage(msg.sender)
+          log_state.trace "MSG POST STATE RECIPIENT", account: Utils.encode_hex(msg.to), balance: get_balance(msg.to), state: log_storage(msg.to)
+        end
+      end
 
       if res == 0
         log_msg.debug 'REVERTING'

data/lib/ethereum/fast_vm.rb

@@ -57,7 +57,7 @@ module Ethereum
         s.gas -= gas
 
         ops.each do |op|
-          if Logger.trace?(log_vm_exit.name)
+          if log_vm_exit.trace?
             trace_data = {
               stack: s.stack.map(&:to_s),
               inst: op,
@@ -573,12 +573,16 @@ module Ethereum
     end
 
     def vm_exception(error, **kwargs)
-      log_vm_exit.trace('EXCEPTION', cause: error, **kwargs)
+      if log_vm_exit.trace?
+        log_vm_exit.trace('EXCEPTION', cause: error, **kwargs)
+      end
       return 0, 0, []
     end
 
     def peaceful_exit(cause, gas, data, **kwargs)
-      log_vm_exit.trace('EXIT', cause: cause, **kwargs)
+      if log_vm_exit.trace?
+        log_vm_exit.trace('EXIT', cause: cause, **kwargs)
+      end
       return 1, gas, data
     end
 

data/lib/ethereum/opcodes.rb

@@ -127,5 +127,12 @@ module Ethereum
     GCALLNEWACCOUNT = 25000
     GSUICIDEREFUND = 24000
 
+    SLOAD_SUPPLEMENTAL_GAS = 150
+    CALL_SUPPLEMENTAL_GAS = 660
+    EXTCODELOAD_SUPPLEMENTAL_GAS = 680
+    BALANCE_SUPPLEMENTAL_GAS = 380
+    CALL_CHILD_LIMIT_NUM = 63
+    CALL_CHILD_LIMIT_DENOM = 64
+    SUICIDE_SUPPLEMENTAL_GAS = 5000
   end
 end

data/lib/ethereum/tester/solidity_wrapper.rb

@@ -310,6 +310,8 @@ module Ethereum
         end
 
         def which(cmd)
+          return ENV['SOLC_BINARY'] if ENV['SOLC_BINARY']
+
           exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
           ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
             exts.each { |ext|

data/lib/ethereum/version.rb

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

data/lib/ethereum/vm.rb

@@ -33,7 +33,6 @@ module Ethereum
       steps = 0
       _prevop = nil
 
-      timestamp = Time.now
       loop do
         return peaceful_exit('CODE OUT OF RANGE', s.gas, []) if s.pc >= processed_code.size
 
@@ -50,7 +49,7 @@ module Ethereum
         # only to decide which features get logged in 'eth.vm.op', i.e.
         # tracing can not be activated by activating a sub like
         # 'eth.vm.op.stack'.
-        if Logger.trace?(log_vm_exit.name)
+        if log_vm_exit.trace?
           trace_data = {
             stack: s.stack.map(&:to_s),
             gas: s.gas + fee,
@@ -211,6 +210,9 @@ module Ethereum
           when :ADDRESS
             stk.push Utils.coerce_to_int(msg.to)
           when :BALANCE
+            if ext.post_anti_dos_hardfork
+              return vm_exception('OUT OF GAS') unless eat_gas(s, Opcodes::BALANCE_SUPPLEMENTAL_GAS)
+            end
             s0 = stk.pop
             addr = Utils.coerce_addr_to_hex(s0 % 2**160)
             stk.push ext.get_balance(addr)
@@ -249,10 +251,16 @@ module Ethereum
           when :GASPRICE
             stk.push ext.tx_gasprice
           when :EXTCODESIZE
+            if ext.post_anti_dos_hardfork
+              return vm_exception('OUT OF GAS') unless eat_gas(s, Opcodes::EXTCODELOAD_SUPPLEMENTAL_GAS)
+            end
             addr = stk.pop
             addr = Utils.coerce_addr_to_hex(addr % 2**160)
             stk.push (ext.get_code(addr) || Constant::BYTE_EMPTY).size
           when :EXTCODECOPY
+            if ext.post_anti_dos_hardfork
+              return vm_exception('OUT OF GAS') unless eat_gas(s, Opcodes::EXTCODELOAD_SUPPLEMENTAL_GAS)
+            end
             addr, mstart, cstart, size = stk.pop, stk.pop, stk.pop, stk.pop
             addr = Utils.coerce_addr_to_hex(addr % 2**160)
             extcode = ext.get_code(addr) || Constant::BYTE_EMPTY
@@ -308,6 +316,9 @@ module Ethereum
             return vm_exception('OOG EXTENDING MEMORY') unless mem_extend(mem, s, s0, 1)
             mem[s0] = s1 % 256
           when :SLOAD
+            if ext.post_anti_dos_hardfork
+              return vm_exception('OUT OF GAS') unless eat_gas(s, Opcodes::SLOAD_SUPPLEMENTAL_GAS)
+            end
             s0 = stk.pop
             stk.push ext.get_storage_data(msg.to, s0)
           when :SSTORE
@@ -385,7 +396,9 @@ module Ethereum
 
           data = mem.safe_slice(mstart, msz)
           ext.log(msg.to, topics, Utils.int_array_to_bytes(data))
-          log_log.trace('LOG', to: msg.to, topics: topics, data: data)
+          if log_log.trace?
+            log_log.trace('LOG', to: msg.to, topics: topics, data: data)
+          end
         elsif op == :CREATE
           value, mstart, msz = stk.pop, stk.pop, stk.pop
 
@@ -393,15 +406,20 @@ module Ethereum
 
           if ext.get_balance(msg.to) >= value && msg.depth < 1024
             cd = CallData.new mem, mstart, msz
-            create_msg = Message.new(msg.to, Constant::BYTE_EMPTY, value, s.gas, cd, depth: msg.depth+1)
+
+            ingas = s.gas
+            if ext.post_anti_dos_hardfork
+              ingas = max_call_gas(ingas)
+            end
+            create_msg = Message.new(msg.to, Constant::BYTE_EMPTY, value, ingas, cd, depth: msg.depth+1)
 
             o, gas, addr = ext.create create_msg
             if o.true?
               stk.push Utils.coerce_to_int(addr)
-              s.gas = gas
+              s.gas -= (ingas - gas)
             else
               stk.push 0
-              s.gas = 0
+              s.gas -= ingas
             end
           else
             stk.push(0)
@@ -415,12 +433,17 @@ module Ethereum
 
           to = Utils.zpad_int(to)[12..-1] # last 20 bytes
           extra_gas = (ext.account_exists(to) ? 0 : 1) * Opcodes::GCALLNEWACCOUNT +
-            (value > 0 ? 1 : 0) * Opcodes::GCALLVALUETRANSFER
+            (value > 0 ? 1 : 0) * Opcodes::GCALLVALUETRANSFER +
+            (ext.post_anti_dos_hardfork ? 1 : 0) * Opcodes::CALL_SUPPLEMENTAL_GAS
+          if ext.post_anti_dos_hardfork
+            return vm_exception('OUT OF GAS', needed: extra_gas) if s.gas < extra_gas
+            gas = [gas, max_call_gas(s.gas-extra_gas)].min
+          else
+            return vm_exception('OUT OF GAS', needed: gas+extra_gas) if s.gas < gas+extra_gas
+          end
+
           submsg_gas = gas + Opcodes::GSTIPEND * (value > 0 ? 1 : 0)
           total_gas = gas + extra_gas
-
-          return vm_exception('OUT OF GAS', needed: total_gas) if s.gas < total_gas
-
           if ext.get_balance(msg.to) >= value && msg.depth < 1024
             s.gas -= total_gas
 
@@ -454,12 +477,17 @@ module Ethereum
           return vm_exception('OOG EXTENDING MEMORY') unless mem_extend(mem, s, memin_start, memin_sz)
           return vm_exception('OOG EXTENDING MEMORY') unless mem_extend(mem, s, memout_start, memout_sz)
 
-          extra_gas = (value > 0 ? 1 : 0) * Opcodes::GCALLVALUETRANSFER
+          extra_gas = (value > 0 ? 1 : 0) * Opcodes::GCALLVALUETRANSFER +
+            (ext.post_anti_dos_hardfork ? 1 : 0) * Opcodes::CALL_SUPPLEMENTAL_GAS
+          if ext.post_anti_dos_hardfork
+            return vm_exception('OUT OF GAS', needed: extra_gas) if s.gas < extra_gas
+            gas = [gas, max_call_gas(s.gas-extra_gas)].min
+          else
+            return vm_exception('OUT OF GAS', needed: gas+extra_gas) if s.gas < gas+extra_gas
+          end
+
           submsg_gas = gas + Opcodes::GSTIPEND * (value > 0 ? 1 : 0)
           total_gas = gas + extra_gas
-
-          return vm_exception('OUT OF GAS', needed: total_gas) if s.gas < total_gas
-
           if ext.get_balance(msg.to) >= value && msg.depth < 1024
             s.gas -= total_gas
 
@@ -496,6 +524,12 @@ module Ethereum
           s0 = stk.pop
           to = Utils.zpad_int(s0)[12..-1] # last 20 bytes
 
+          if ext.post_anti_dos_hardfork
+            extra_gas = Opcodes::SUICIDE_SUPPLEMENTAL_GAS +
+              (ext.account_exists(to) ? 0 : 1) * Opcodes::GCALLNEWACCOUNT
+            return vm_exception('OUT OF GAS') unless eat_gas(s, extra_gas)
+          end
+
           xfer = ext.get_balance(msg.to)
           ext.set_balance(to, ext.get_balance(to)+xfer)
           ext.set_balance(msg.to, 0)
@@ -550,12 +584,16 @@ module Ethereum
     end
 
     def vm_exception(error, **kwargs)
-      log_vm_exit.trace('EXCEPTION', cause: error, **kwargs)
+      if log_vm_exit.trace?
+        log_vm_exit.trace('EXCEPTION', cause: error, **kwargs)
+      end
       return 0, 0, []
     end
 
     def peaceful_exit(cause, gas, data, **kwargs)
-      log_vm_exit.trace('EXIT', cause: cause, **kwargs)
+      if log_vm_exit.trace?
+        log_vm_exit.trace('EXIT', cause: cause, **kwargs)
+      end
       return 1, gas, data
     end
 
@@ -602,5 +640,19 @@ module Ethereum
       sz * Opcodes::GMEMORY + sz**2 / Opcodes::GQUADRATICMEMDENOM
     end
 
+    def eat_gas(s, amount)
+      if s.gas < amount
+        s.gas = 0
+        false
+      else
+        s.gas -= amount
+        true
+      end
+    end
+
+    def max_call_gas(gas)
+      gas - (gas / Opcodes::CALL_CHILD_LIMIT_DENOM)
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-ethereum
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.10.0
 platform: ruby
 authors:
 - Jan Xie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-18 00:00:00.000000000 Z
+date: 2016-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rlp
@@ -98,16 +98,16 @@ dependencies:
   name: block_logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: leveldb
   requirement: !ruby/object:Gem::Requirement