Merge branch 'master' into master

Author: Micah Zoltu

linker.js

@@ -2,7 +2,7 @@ var linkBytecode = function (bytecode, libraries) {
   // NOTE: for backwards compatibility support old compiler which didn't use file names
   var librariesComplete = {};
   for (var libraryName in libraries) {
-    if (typeof libraryName === 'object') {
+    if (typeof libraries[libraryName] === 'object') {
       // API compatible with the standard JSON i/o
       for (var lib in libraries[libraryName]) {
         librariesComplete[lib] = libraries[libraryName][lib];

package.json

@@ -1,6 +1,6 @@
 {
   "name": "solc",
-  "version": "0.4.20",
+  "version": "0.4.24",
   "description": "Solidity compiler",
   "main": "index.js",
   "types": "index.d.ts",
@@ -9,7 +9,7 @@
   },
   "scripts": {
     "lint": "semistandard",
-    "prepublish": "./downloadCurrentVersion.js && ./verifyVersion.js",
+    "prepublish": "node downloadCurrentVersion.js && node verifyVersion.js",
     "pretest": "npm run lint",
     "test": "tape ./test/index.js",
     "coverage": "istanbul cover node_modules/tape/bin/tape ./test/index.js",

test/package.js

@@ -456,6 +456,20 @@ tape('Linking', function (t) {
     st.end();
   });
 
+  t.test('link properly with two-level configuration (from standard JSON)', function (st) {
+    var input = {
+      'lib.sol': 'library L { function f() returns (uint) { return 7; } }',
+      'cont.sol': 'import "lib.sol"; contract x { function g() { L.f(); } }'
+    };
+    var output = solc.compile({sources: input});
+    var bytecode = getBytecode(output, 'cont.sol', 'x');
+    st.ok(bytecode);
+    st.ok(bytecode.length > 0);
+    bytecode = solc.linkBytecode(bytecode, { 'lib.sol': { 'L': '0x123456' } });
+    st.ok(bytecode.indexOf('_') < 0);
+    st.end();
+  });
+
   t.test('linker to fail with missing library', function (st) {
     var input = {
       'lib.sol': 'library L { function f() returns (uint) { return 7; } }',