Added revert opcode declaration

Author: vub

ethereum/new_statetest_utils.py

@@ -11,7 +11,7 @@
 from ethereum.slogging import LogRecorder, configure_logging, set_level
 config_string = ':info,eth.vm.log:trace,eth.vm.op:trace,eth.vm.stack:trace,eth.vm.exit:trace,eth.pb.msg:trace,eth.pb.tx:debug'
 
-# configure_logging(config_string=config_string)
+configure_logging(config_string=config_string)
 
 fake_headers = {}
 
@@ -128,6 +128,10 @@ def verify_state_test(test):
             continue
         print("Testing for %s" % config_name)
         for result in results:
+            print("Checking for values: g %d v %d d %s" % (
+                  parse_int_or_hex(test["transaction"]['gasLimit'][result["indexes"]["gas"]]),
+                  parse_int_or_hex(test["transaction"]['value'][result["indexes"]["value"]]),
+                  test["transaction"]['data'][result["indexes"]["data"]]))
             computed = compute_state_test_unit(_state, test["transaction"], result["indexes"], configs[config_name])
             if computed["hash"] != result["hash"]:
                 raise Exception("Hash mismatch, computed: %s, supplied: %s" % (computed["hash"], result["hash"]))

ethereum/opcodes.py

@@ -70,6 +70,7 @@
     0xf3: ['RETURN', 2, 0, 0],
     0xf4: ['DELEGATECALL', 6, 1, 40], # 700 now
     0xf5: ['CALLBLACKBOX', 7, 1, 40],
+    0xfd: ['REVERT', 2, 0, 0],
     0xff: ['SUICIDE', 1, 0, 0], # 5000 now
 }
 

ethereum/state_transition.py

@@ -262,16 +262,18 @@ def rp(what, actual, target):
     log_tx.debug("TX APPLIED", result=result, gas_remained=gas_remained,
                  data=data)
 
+    gas_used = tx.startgas - gas_remained
+
     if not result:  # 0 = OOG failure in both cases
         log_tx.debug('TX FAILED', reason='out of gas',
                      startgas=tx.startgas, gas_remained=gas_remained)
         state.gas_used += tx.startgas
-        state.delta_balance(state.block_coinbase, tx.gasprice * tx.startgas)
+        state.delta_balance(tx.sender, tx.gasprice * gas_remained)
+        state.delta_balance(state.block_coinbase, tx.gasprice * gas_used)
         output = b''
         success = 0
     else:
         log_tx.debug('TX SUCCESS', data=data)
-        gas_used = tx.startgas - gas_remained
         state.refunds += len(set(state.suicides)) * opcodes.GSUICIDEREFUND
         if state.refunds > 0:
             log_tx.debug('Refunding', gas_refunded=min(state.refunds, gas_used // 2))

ethereum/vm.py

@@ -163,6 +163,10 @@ def peaceful_exit(cause, gas, data, **kargs):
     log_vm_exit.trace('EXIT', cause=cause, **kargs)
     return 1, gas, data
 
+def revert(gas, data, **kargs):
+    log_vm_exit.trace('REVERT', **kargs)
+    return 0, gas, data
+
 code_cache = {}
 
 
@@ -571,7 +575,7 @@ def vm_execute(ext, msg, code):
                     compustate.gas = compustate.gas - ingas + gas
                 else:
                     stk.append(0)
-                    compustate.gas -= ingas
+                    compustate.gas = compustate.gas - ingas + gas
             else:
                 stk.append(0)
         elif op == 'CALL':
@@ -689,6 +693,13 @@ def vm_execute(ext, msg, code):
             if not mem_extend(mem, compustate, op, s0, s1):
                 return vm_exception('OOG EXTENDING MEMORY')
             return peaceful_exit('RETURN', compustate.gas, mem[s0: s0 + s1])
+        elif op == 'REVERT':
+            if not ext.post_metropolis_hardfork():
+                return vm_exception('Opcode not yet enabled')
+            s0, s1 = stk.pop(), stk.pop()
+            if not mem_extend(mem, compustate, op, s0, s1):
+                return vm_exception('OOG EXTENDING MEMORY')
+            return revert(compustate.gas, mem[s0: s0 + s1])
         elif op == 'SUICIDE':
             to = utils.encode_int(stk.pop())
             to = ((b'\x00' * (32 - len(to))) + to)[12:]
@@ -701,7 +712,6 @@ def vm_execute(ext, msg, code):
             ext.set_balance(to, ext.get_balance(to) + xfer)
             ext.set_balance(msg.to, 0)
             ext.add_suicide(msg.to)
-            print('suiciding %s %s %d' % (msg.to, to, xfer))
             return 1, compustate.gas, []
 
         # assert utils.is_numeric(compustate.gas)