spurious dragon check

Author: Jan Xie

ethereum/state.py

@@ -198,7 +198,7 @@ def set_storage_data (self, addr, k, v):
         self.set_storage(addr, k, encode_int(v) if is_numeric(v) and k not in ACCOUNT_SPECIAL_PARAMS else v)
 
     def account_exists(self, addr):
-        if self.is_CLEARING():
+        if self.is_SPURIOUS_DRAGON():
             return self.get_nonce(addr) or self.get_balance(addr) or self.get_code(addr)
         if addr not in self.modified:
             o = self.trie.get(addr) != trie.BLANK_NODE
@@ -251,8 +251,7 @@ def commit(self, allow_empties=False):
             if addr in self.modified or True:
                 if not acct.deleted:
                     acct._cached_rlp = None
-                    # print 'moose', addr.encode('hex'), self.is_CLEARING(), acct.is_blank(), acct.nonce, acct.balance, repr(acct.code)
-                    if self.is_CLEARING() and acct.is_blank() and not allow_empties:
+                    if self.is_SPURIOUS_DRAGON() and acct.is_blank() and not allow_empties:
                         self.trie.delete(addr)
                     else:
                         self.trie.update(addr, rlp.encode(acct))
@@ -455,8 +454,8 @@ def is_SERENITY(self, at_fork_height=False):
     def is_ANTI_DOS(self, at_fork_height=False):
         return self._is_X_fork('ANTI_DOS', at_fork_height)
 
-    def is_CLEARING(self, at_fork_height=False):
-        return self._is_X_fork('CLEARING', at_fork_height)
+    def is_SPURIOUS_DRAGON(self, at_fork_height=False):
+        return self._is_X_fork('SPURIOUS_DRAGON', at_fork_height)
 
     def is_DAO(self, at_fork_height=False):
         return self._is_X_fork('DAO', at_fork_height)

ethereum/state_transition.py

@@ -430,7 +430,7 @@ def __init__(self, state, tx):
         self.post_metropolis_hardfork = lambda: state.is_METROPOLIS()
         self.post_serenity_hardfork = lambda: state.is_SERENITY()
         self.post_anti_dos_hardfork = lambda: state.is_ANTI_DOS()
-        self.post_clearing_hardfork = lambda: state.is_CLEARING()
+        self.post_spurious_dragon_hardfork = lambda: state.is_SPURIOUS_DRAGON()
         self.blockhash_store = state.config['METROPOLIS_BLOCKHASH_STORE']
         self.snapshot = state.snapshot
         self.revert = state.revert
@@ -477,7 +477,7 @@ def __init__(self, state):
         self.post_metropolis_hardfork = lambda: state.is_METROPOLIS()
         self.post_serenity_hardfork = lambda: state.is_SERENITY()
         self.post_anti_dos_hardfork = lambda: state.is_ANTI_DOS()
-        self.post_clearing_hardfork = lambda: state.is_CLEARING()
+        self.post_spurious_dragon_hardfork = lambda: state.is_SPURIOUS_DRAGON()
         self.blockhash_store = state.config['METROPOLIS_BLOCKHASH_STORE']
         self.snapshot = state.snapshot
         self.revert = state.revert

ethereum/vm.py

@@ -289,7 +289,7 @@ def vm_execute(ext, msg, code):
                 # calc n bytes to represent exponent
                 nbytes = len(utils.encode_int(exponent))
                 expfee = nbytes * opcodes.GEXPONENTBYTE
-                if ext.post_clearing_hardfork():
+                if ext.post_spurious_dragon_hardfork():
                     expfee += opcodes.EXP_SUPPLEMENTAL_GAS * nbytes
                 if compustate.gas < expfee:
                     compustate.gas = 0
@@ -579,7 +579,7 @@ def vm_execute(ext, msg, code):
                 return vm_exception('OOG EXTENDING MEMORY')
             to = utils.encode_int(to)
             to = ((b'\x00' * (32 - len(to))) + to)[12:]
-            extra_gas = (not ext.account_exists(to)) * (value > 0 or not ext.post_clearing_hardfork()) * opcodes.GCALLNEWACCOUNT + \
+            extra_gas = (not ext.account_exists(to)) * (value > 0 or not ext.post_spurious_dragon_hardfork()) * opcodes.GCALLNEWACCOUNT + \
                 (value > 0) * opcodes.GCALLVALUETRANSFER + \
                 ext.post_anti_dos_hardfork() * opcodes.CALL_SUPPLEMENTAL_GAS
             submsg_gas = gas + opcodes.GSTIPEND * (value > 0)
@@ -692,7 +692,7 @@ def vm_execute(ext, msg, code):
             xfer = ext.get_balance(msg.to)
             if ext.post_anti_dos_hardfork():
                 extra_gas = opcodes.SUICIDE_SUPPLEMENTAL_GAS + \
-                    (not ext.account_exists(to)) * (xfer > 0 or not ext.post_clearing_hardfork()) * opcodes.GCALLNEWACCOUNT
+                    (not ext.account_exists(to)) * (xfer > 0 or not ext.post_spurious_dragon_hardfork()) * opcodes.GCALLNEWACCOUNT
                 if not eat_gas(compustate, extra_gas):
                     return vm_exception("OUT OF GAS")
             ext.set_balance(to, ext.get_balance(to) + xfer)