HF round 2

Author: vub

ethereum/config.py

@@ -62,7 +62,8 @@
     CHILD_DAO_LIST = map(utils.normalize_address, child_dao_list),
     DAO_WITHDRAWER = utils.normalize_address('0xbf4ed7b27f1d666546e30d74d50d173d20bca754'),
     # Anti-DoS fork
-    ANTI_DOS_FORK_BLKNUM = 2457000,
+    ANTI_DOS_FORK_BLKNUM = 2463000,
+    CLEARING_FORK_BLKNUM = 2**98,
     # Default consensus strategy: ethash, poa, casper, pbft
     CONSENSUS_STRATEGY = 'ethash',
     # Serenity fork

ethereum/opcodes.py

@@ -11,7 +11,7 @@
     0x07: ['SMOD', 2, 1, 5],
     0x08: ['ADDMOD', 3, 1, 8],
     0x09: ['MULMOD', 3, 1, 8],
-    0x0a: ['EXP', 2, 1, 10],
+    0x0a: ['EXP', 2, 1, 10], # soon 80
     0x0b: ['SIGNEXTEND', 2, 1, 5],
     0x10: ['LT', 2, 1, 3],
     0x11: ['GT', 2, 1, 3],
@@ -26,7 +26,7 @@
     0x1a: ['BYTE', 2, 1, 3],
     0x20: ['SHA3', 2, 1, 30],
     0x30: ['ADDRESS', 0, 1, 2],
-    0x31: ['BALANCE', 1, 1, 20],
+    0x31: ['BALANCE', 1, 1, 20], # now 400
     0x32: ['ORIGIN', 0, 1, 2],
     0x33: ['CALLER', 0, 1, 2],
     0x34: ['CALLVALUE', 0, 1, 2],
@@ -36,8 +36,8 @@
     0x38: ['CODESIZE', 0, 1, 2],
     0x39: ['CODECOPY', 3, 0, 3],
     0x3a: ['GASPRICE', 0, 1, 2],
-    0x3b: ['EXTCODESIZE', 1, 1, 20],
-    0x3c: ['EXTCODECOPY', 4, 0, 20],
+    0x3b: ['EXTCODESIZE', 1, 1, 20], # now 700
+    0x3c: ['EXTCODECOPY', 4, 0, 20], # now 700
     0x40: ['BLOCKHASH', 1, 1, 20],
     0x41: ['COINBASE', 0, 1, 2],
     0x42: ['TIMESTAMP', 0, 1, 2],
@@ -48,8 +48,8 @@
     0x51: ['MLOAD', 1, 1, 3],
     0x52: ['MSTORE', 2, 0, 3],
     0x53: ['MSTORE8', 2, 0, 3],
-    0x54: ['SLOAD', 1, 1, 50],
-    0x55: ['SSTORE', 2, 0, 0],
+    0x54: ['SLOAD', 1, 1, 50], # 200 now
+    0x55: ['SSTORE', 2, 0, 0], # actual cost 5000-20000 depending on circumstance
     0x56: ['JUMP', 1, 0, 8],
     0x57: ['JUMPI', 2, 0, 10],
     0x58: ['PC', 0, 1, 2],
@@ -61,16 +61,16 @@
     0xa2: ['LOG2', 4, 0, 1125],
     0xa3: ['LOG3', 5, 0, 1500],
     0xa4: ['LOG4', 6, 0, 1875],
-    0xe1: ['SLOADBYTES', 3, 0, 50],
-    0xe2: ['SSTOREBYTES', 3, 0, 0],
-    0xe3: ['SSIZE', 1, 1, 50],
+    0xe1: ['SLOADBYTES', 3, 0, 50], # to be discontinued
+    0xe2: ['SSTOREBYTES', 3, 0, 0], # to be discontinued
+    0xe3: ['SSIZE', 1, 1, 50], # to be discontinued
     0xf0: ['CREATE', 3, 1, 32000],
-    0xf1: ['CALL', 7, 1, 40],
-    0xf2: ['CALLCODE', 7, 1, 40],
+    0xf1: ['CALL', 7, 1, 40], # 700 now
+    0xf2: ['CALLCODE', 7, 1, 40], # 700 now
     0xf3: ['RETURN', 2, 0, 0],
-    0xf4: ['DELEGATECALL', 6, 1, 40],
+    0xf4: ['DELEGATECALL', 6, 1, 40], # 700 now
     0xf5: ['CALLBLACKBOX', 7, 1, 40],
-    0xff: ['SUICIDE', 1, 0, 0],
+    0xff: ['SUICIDE', 1, 0, 0], # 5000 now
 }
 
 for i in range(1, 33):
@@ -132,3 +132,4 @@
 CALL_CHILD_LIMIT_NUM = 63
 CALL_CHILD_LIMIT_DENOM = 64
 SUICIDE_SUPPLEMENTAL_GAS = 5000
+EXP_SUPPLEMENTAL_GAS = 70

ethereum/state.py

@@ -21,6 +21,7 @@
 
 ACCOUNT_SPECIAL_PARAMS = ('nonce', 'balance', 'code', 'storage', 'deleted')
 ACCOUNT_OUTPUTTABLE_PARAMS = ('nonce', 'balance', 'code')
+BLANK_HASH = utils.sha3(b'')
 
 @lru_cache(1024)
 def get_block(db, blockhash):
@@ -197,6 +198,8 @@ def set_storage_data (self, addr, k, v):
         self.set_storage(addr, k, encode_int(v) if isinstance(v, (int, long)) and k not in ACCOUNT_SPECIAL_PARAMS else v)
 
     def account_exists(self, addr):
+        if self.is_CLEARING():
+            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
         elif self.cache[addr].get('deleted', False):
@@ -248,7 +251,10 @@ def commit(self):
             if addr in self.modified or True:
                 if not acct.deleted:
                     acct._cached_rlp = None
-                    self.trie.update(addr, rlp.encode(acct))
+                    if self.is_CLEARING() and acct.is_blank():
+                        self.trie.delete(addr)
+                    else:
+                        self.trie.update(addr, rlp.encode(acct))
                 else:
                     self.trie.delete(addr)
         self.cache = {}
@@ -272,6 +278,9 @@ def del_account(self, address):
         for param in ACCOUNT_OUTPUTTABLE_PARAMS:
             self.set_storage(address, param, getattr(blank_acct, param))
         self.reset_storage(address)
+        self.set_balance(address, 0)
+        self.set_nonce(address, 0)
+        self.set_code(address, '')
         self.set_storage(address, 'deleted', True)
 
     def add_log(self, log):
@@ -445,6 +454,9 @@ 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_DAO(self, at_fork_height=False):
         return self._is_X_fork('DAO', at_fork_height)
 
@@ -529,3 +541,6 @@ def blank_account(cls, db, initial_nonce=0):
         o = cls(initial_nonce, 0, trie.BLANK_ROOT, code_hash, db)
         o._mutable = True
         return o
+
+    def is_blank(self):
+        return self.nonce == 0 and self.balance == 0 and self.storage == trie.BLANK_ROOT and self.code_hash == BLANK_HASH

ethereum/state_transition.py

@@ -430,6 +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.blockhash_store = state.config['METROPOLIS_BLOCKHASH_STORE']
         self.snapshot = state.snapshot
         self.revert = state.revert
@@ -476,6 +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.blockhash_store = state.config['METROPOLIS_BLOCKHASH_STORE']
         self.snapshot = state.snapshot
         self.revert = state.revert

ethereum/vm.py

@@ -289,6 +289,8 @@ 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():
+                    expfee += opcodes.EXP_SUPPLEMENTAL_GAS * (1 + nbytes)
                 if compustate.gas < expfee:
                     compustate.gas = 0
                     return vm_exception('OOG EXPONENT')
@@ -577,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)) * opcodes.GCALLNEWACCOUNT + \
+            extra_gas = (not ext.account_exists(to)) * (value > 0 or not ext.post_clearing_hardfork()) * opcodes.GCALLNEWACCOUNT + \
                 (value > 0) * opcodes.GCALLVALUETRANSFER + \
                 ext.post_anti_dos_hardfork() * opcodes.CALL_SUPPLEMENTAL_GAS
             submsg_gas = gas + opcodes.GSTIPEND * (value > 0)
@@ -687,12 +689,12 @@ def vm_execute(ext, msg, code):
         elif op == 'SUICIDE':
             to = utils.encode_int(stk.pop())
             to = ((b'\x00' * (32 - len(to))) + to)[12:]
+            xfer = ext.get_balance(msg.to)
             if ext.post_anti_dos_hardfork():
                 extra_gas = opcodes.SUICIDE_SUPPLEMENTAL_GAS + \
-                    (not ext.account_exists(to)) * opcodes.GCALLNEWACCOUNT
+                    (not ext.account_exists(to)) * (xfer > 0 or not ext.post_clearing_hardfork()) * opcodes.GCALLNEWACCOUNT
                 if not eat_gas(compustate, extra_gas):
                     return vm_exception("OUT OF GAS")
-            xfer = ext.get_balance(msg.to)
             ext.set_balance(to, ext.get_balance(to) + xfer)
             ext.set_balance(msg.to, 0)
             ext.add_suicide(msg.to)