fix some other things

Author: pipermerriam

populus/packages/backends/index.py

@@ -207,5 +207,5 @@ def get_package_index_factory(self, web3):
 
         return web3.eth.contract(
             abi=package_index_abi,
-            base_contract_factory_class=BasePackageIndexFactory,
+            ContractFactoryClass=BasePackageIndexFactory,
         )

populus/packages/build.py

@@ -195,4 +195,14 @@ def construct_contract_type_object(contract_data,
         yield 'natspec', natspec
 
     if 'runtime_bytecode' in contract_data or 'bytecode' in contract_data:
-        yield 'compiler', contract_data['meta']
+        yield 'compiler', construct_compiler_object(contract_data['metadata'])
+
+
+@to_dict
+def construct_compiler_object(metadata):
+    yield 'type', 'solc'
+    yield 'version', metadata['compiler']['version']
+    yield 'settings', {
+        'optimize': metadata['settings']['optimizer']['enabled'],
+        'optimize_runs': metadata['settings']['optimizer']['runs'],
+    }

populus/utils/compile.py

@@ -164,9 +164,11 @@ def process_compiler_output(name_from_compiler, data_from_compiler):
     return contract_name, contract_data
 
 
-@to_dict
 def normalize_contract_metadata(metadata):
-    if is_string(metadata):
-        metadata = json.loads(metadata)
-
-    return metadata
+    # TODO: tests
+    if not metadata:
+        return None
+    elif is_string(metadata):
+        return json.loads(metadata)
+    else:
+        raise ValueError("Unknown metadata format '{0}'".format(metadata))