Merge branch 'develop' into develop

Author: joeykrug

.travis.yml

@@ -23,7 +23,7 @@ before_install:
   - if [ -n "$SOLC_VERSION" ]; then sudo apt-get install -y tree unzip; fi
 install:
   - if [ -n "$SOLC_VERSION" ]; then /.$TRAVIS_BUILD_DIR/.travis/install_solc.sh; fi
-  - travis_retry pip install setuptools --upgrade
+  - travis_retry pip install pip setuptools --upgrade
   - travis_retry pip install tox
   - travis_retry pip install coverage
   - travis_retry pip install flake8

README.md

@@ -160,7 +160,7 @@ Contains the Transaction class, with the following methods and values:
 
 ### ethereum.tools.keys
 
-Creates encrypted private key storaes
+Creates encrypted private key storages
 
 * `decode_keystore_json(jsondata, password)` - returns the private key from an encrypted keystore object. NOTE: if you are loading from a file, the most convenient way to do this is `import json; key = decode_keystore_json(json.load(open('filename.json')), 'password')`
 * `make_keystore_json(key, pw, kdf='pbkdf2', cipher='aes-128-ctr')` - creates an encrypted keystore object for the key. Keeping `kdf` and `cipher` at their default values is recommended.

ethereum/abi.py

@@ -705,6 +705,7 @@ def enc(typ, arg):
         else:
             subtyp = base, sub, arrlist[:-1]
             o = b''
+            assert len(arg) == arrlist[-1][0], "Incorrect array size"
             for x in arg:
                 o += enc(subtyp, x)
             return o

ethereum/common.py

@@ -56,7 +56,7 @@ def calc_difficulty(parent, timestamp, config=default_config):
     return o
 
 # Given a parent state, initialize a block with the given arguments
-def mk_block_from_prevstate(chain, state=None, timestamp=None, coinbase='\x35'*20, extra_data='moo ha ha says the laughing cow.'):
+def mk_block_from_prevstate(chain, state=None, timestamp=None, coinbase=b'\x35'*20, extra_data='moo ha ha says the laughing cow.'):
     state = state or chain.state
     blk = Block(BlockHeader())
     now = timestamp or chain.time()
@@ -134,7 +134,7 @@ def set_execution_results(state, block):
     block.header.state_root = state.trie.root_hash
     block.header.gas_used = state.gas_used
     block.header.bloom = state.bloom
-    log.info('Block pre-sealed, %d gas used' % state.gas_used)
+    log.debug('Block pre-sealed, %d gas used' % state.gas_used)
 
 # Verify state root, receipt root, etc
 def verify_execution_results(state, block):

ethereum/fast_rlp.py

@@ -67,6 +67,25 @@ def consume_length_prefix(rlp, start):
         l = big_endian_to_int(rlp[start + 1:start + 1 + ll])
         return (list, l, start + 1 + ll)
 
+def optimized_decode_single(x, pos):
+    z = safe_ord(x[pos])
+    if z < 128:
+        return x[pos: pos + 1], 1
+    elif z < 184:
+        return x[pos + 1: pos + z - 127], z - 127
+    else:
+        ll = big_endian_to_int(x[pos + 1: pos + z - 182])
+        return x[pos + z - 182: pos + z - 182 + ll], z - 182 + ll
+
+def optimized_decode_list(rlp):
+    o, pos = [], 0
+    _typ, _len, pos = consume_length_prefix(rlp, pos)
+    while pos < len(rlp):
+        x, inc = optimized_decode_single(rlp, pos)
+        pos += inc
+        o.append(x)
+    return o
+
 #
 if sys.version_info.major == 2:
     encode_optimized = _encode_optimized

ethereum/messages.py

@@ -368,6 +368,11 @@ def create_contract(ext, msg):
         nonce = utils.encode_int(ext.get_nonce(msg.sender) - 1)
         msg.to = utils.mk_contract_address(msg.sender, nonce)
 
+    if ext.post_metropolis_hardfork() and (ext.get_nonce(msg.to) or len(ext.get_code(msg.to))):
+        log_msg.debug('CREATING CONTRACT ON TOP OF EXISTING CONTRACT')
+        return 0, 0, b''
+        
+
     b = ext.get_balance(msg.to)
     if b > 0:
         ext.set_balance(msg.to, b)
@@ -379,9 +384,6 @@ def create_contract(ext, msg):
     # assert not ext.get_code(msg.to)
     msg.data = vm.CallData([], 0, 0)
     snapshot = ext.snapshot()
-    if len(ext.get_code(msg.to)):
-        log_msg.debug('CREATING CONTRACT ON TOP OF EXISTING CONTRACT')
-    #     return 0, 0, b''
 
     ext.set_nonce(msg.to, 1 if ext.post_spurious_dragon_hardfork() else 0)
     res, gas, dat = _apply_msg(ext, msg, code)
@@ -393,7 +395,7 @@ def create_contract(ext, msg):
             # ext.set_code(msg.to, b'')
             return 1, gas, msg.to
         gcost = len(dat) * opcodes.GCONTRACTBYTE
-        if gas >= gcost and (len(dat) <= 24576 or not ext.post_anti_dos_hardfork()):
+        if gas >= gcost and (len(dat) <= 24576 or not ext.post_spurious_dragon_hardfork()):
             gas -= gcost
         else:
             dat = []

ethereum/meta.py

@@ -42,10 +42,10 @@ def apply_block(state, block):
 def make_head_candidate(chain, txqueue=None,
                         parent=None,
                         timestamp=None,
-                        coinbase='\x35'*20,
+                        coinbase=b'\x35'*20,
                         extra_data='moo ha ha says the laughing cow.',
                         min_gasprice=0):
-    log.info('Creating head candidate')
+    log.debug('Creating head candidate')
     if parent is None:
         temp_state = State.from_snapshot(chain.state.to_snapshot(root_only=True), chain.env)
     else:
@@ -65,5 +65,5 @@ def make_head_candidate(chain, txqueue=None,
     cs.finalize(temp_state, blk)
     # Set state root, receipt root, etc
     set_execution_results(temp_state, blk)
-    log.info('Created head candidate successfully')
+    log.debug('Created head candidate successfully')
     return blk, temp_state

ethereum/opcodes.py

@@ -61,9 +61,9 @@
     0xa2: ['LOG2', 4, 0, 1125],
     0xa3: ['LOG3', 5, 0, 1500],
     0xa4: ['LOG4', 6, 0, 1875],
-    0xe1: ['SLOADBYTES', 3, 0, 50], # to be discontinued
-    0xe2: ['SSTOREBYTES', 3, 0, 0], # to be discontinued
-    0xe3: ['SSIZE', 1, 1, 50], # to be discontinued
+    #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], # 700 now
     0xf2: ['CALLCODE', 7, 1, 40], # 700 now
@@ -143,4 +143,3 @@
 CALL_CHILD_LIMIT_NUM = 63
 CALL_CHILD_LIMIT_DENOM = 64
 SUICIDE_SUPPLEMENTAL_GAS = 5000
-

ethereum/pow/chain.py

@@ -22,7 +22,7 @@
 
 
 log = get_logger('eth.chain')
-config_string = ':info,eth.chain:debug'
+config_string = ':info'  #,eth.chain:debug'
 #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)
 
@@ -250,7 +250,7 @@ def add_block(self, block):
             return False
         # Is the block being added to the head?
         if block.header.prevhash == self.head_hash:
-            log.info('Adding to head', head=encode_hex(block.header.prevhash))
+            log.info('Adding to head', head=encode_hex(block.header.prevhash[:4]))
             self.state.deletes = []
             self.state.changed = {}
             try:
@@ -368,13 +368,13 @@ def add_block(self, block):
         self.db.put(b'changed:'+block.hash, b''.join([k.encode() if isinstance(k, str) else k for k in list(changed.keys())]))
         print('Saved %d address change logs' % len(changed.keys()))
         self.db.put(b'deletes:'+block.hash, b''.join(deletes))
-        print('Saved %d trie node deletes for block %d (%s)' % (len(deletes), block.number, utils.encode_hex(block.hash)))
+        log.debug('Saved %d trie node deletes for block %d (%s)' % (len(deletes), block.number, utils.encode_hex(block.hash)))
         # Delete old junk data
         old_block_hash = self.get_blockhash_by_number(block.number - self.max_history)
         if old_block_hash:
             try:
                 deletes = self.db.get(b'deletes:'+old_block_hash)
-                print('Deleting up to %d trie nodes' % (len(deletes) // 32))
+                log.debug('Deleting up to %d trie nodes' % (len(deletes) // 32))
                 rdb = RefcountDB(self.db)
                 for i in range(0, len(deletes), 32):
                     rdb.delete(deletes[i: i+32])

ethereum/slogging.py

@@ -312,12 +312,16 @@ def configure(config_string=None, log_json=False, log_file=None):
         if hasattr(logger, 'setLevel'):
             # Guard against `logging.PlaceHolder` instances
             logger.setLevel(logging.NOTSET)
-            logger.propagate = True
+            if config_string == ":{}".format(DEFAULT_LOGLEVEL):
+                logger.propagate = True
+            else:
+                logger.propagate = True
 
     for name_levels in config_string.split(','):
         name, _, level = name_levels.partition(':')
         logger = getLogger(name)
         logger.setLevel(level.upper())
+        logger.propagate = True
 
 configure_logging = configure