Merge pull request #199 from ethereum/standardwrapper-link

Link bytecode if libraries were supplied in compileStandardWrapper

Author: axic

linker.js

@@ -2,11 +2,20 @@ 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) {
-    var parsed = libraryName.match(/^([^:]*):?(.*)$/);
-    if (parsed) {
-      librariesComplete[parsed[2]] = libraries[libraryName];
+    if (typeof libraryName === 'object') {
+      // API compatible with the standard JSON i/o
+      for (var lib in libraries[libraryName]) {
+        librariesComplete[lib] = libraries[libraryName][lib];
+        librariesComplete[libraryName + ':' + lib] = libraries[libraryName][lib];
+      }
+    } else {
+      // backwards compatible API for early solc-js verisons
+      var parsed = libraryName.match(/^([^:]*):?(.*)$/);
+      if (parsed) {
+        librariesComplete[parsed[2]] = libraries[libraryName];
+      }
+      librariesComplete[libraryName] = libraries[libraryName];
     }
-    librariesComplete[libraryName] = libraries[libraryName];
   }
 
   for (libraryName in librariesComplete) {

translate.js

@@ -59,7 +59,7 @@ function translateGasEstimates (gasEstimates) {
   return gasEstimatesTranslated;
 }
 
-function translateJsonCompilerOutput (output) {
+function translateJsonCompilerOutput (output, libraries) {
   var ret = {};
 
   ret['errors'] = [];
@@ -110,13 +110,13 @@ function translateJsonCompilerOutput (output) {
       'evm': {
         'legacyAssembly': contractInput['assembly'],
         'bytecode': {
-          'object': contractInput['bytecode'],
+          'object': linker.linkBytecode(contractInput['bytecode'], libraries),
           'opcodes': contractInput['opcodes'],
           'sourceMap': contractInput['srcmap'],
           'linkReferences': linker.findLinkReferences(contractInput['bytecode'])
         },
         'deployedBytecode': {
-          'object': contractInput['runtimeBytecode'],
+          'object': linker.linkBytecode(contractInput['runtimeBytecode'], libraries),
           'sourceMap': contractInput['srcmapRuntime'],
           'linkReferences': linker.findLinkReferences(contractInput['runtimeBytecode'])
         },

wrapper.js

@@ -135,6 +135,12 @@ function setupMethods (soljson) {
       return sources;
     }
 
+    function librariesSupplied (input) {
+      if (input['settings'] !== null) {
+        return input['settings']['libraries'];
+      }
+    }
+
     function translateOutput (output) {
       output = translate.translateJsonCompilerOutput(JSON.parse(output));
       if (output == null) {
@@ -148,17 +154,20 @@ function setupMethods (soljson) {
       return formatFatalError('Failed to process sources');
     }
 
+    // Try linking if libraries were supplied
+    var libraries = librariesSupplied(input);
+
     // Try to wrap around old versions
     if (compileJSONCallback !== null) {
-      return translateOutput(compileJSONCallback(JSON.stringify({ 'sources': sources }), isOptimizerEnabled(input), readCallback));
+      return translateOutput(compileJSONCallback(JSON.stringify({ 'sources': sources }), isOptimizerEnabled(input), readCallback), libraries);
     }
 
     if (compileJSONMulti !== null) {
-      return translateOutput(compileJSONMulti(JSON.stringify({ 'sources': sources }), isOptimizerEnabled(input)));
+      return translateOutput(compileJSONMulti(JSON.stringify({ 'sources': sources }), isOptimizerEnabled(input)), libraries);
     }
 
     // Try our luck with an ancient compiler
-    return translateOutput(compileJSON(sources[Object.keys(sources)[0]], isOptimizerEnabled(input)));
+    return translateOutput(compileJSON(sources[Object.keys(sources)[0]], isOptimizerEnabled(input)), libraries);
   };
 
   var version = soljson.cwrap('version', 'string', []);