add link references

src/app/execution/txFormat.js

@@ -156,18 +156,21 @@ module.exports = {
     }
   },
 
-  linkLibraryStandard: function (libraryName, address, contract) {
-    var bytecode = contract.evm.bytecode.object
-    for (var file in contract.evm.bytecode.linkReferences) {
-      for (var libName in contract.evm.bytecode.linkReferences[file]) {
+  linkLibraryStandardFromlinkReferences: function (libraryName, address, bytecode, linkReferences) {
+    for (var file in linkReferences) {
+      for (var libName in linkReferences[file]) {
         if (libraryName === libName) {
-          bytecode = this.setLibraryAddress(address, bytecode, contract.evm.bytecode.linkReferences[file][libName])
+          bytecode = this.setLibraryAddress(address, bytecode, linkReferences[file][libName])
         }
       }
     }
     return bytecode
   },
 
+  linkLibraryStandard: function (libraryName, address, contract) {
+    return this.linkLibraryStandardFromlinkReferences(libraryName, address, contract.evm.bytecode.object, contract.evm.bytecode.linkReferences)
+  },
+
   setLibraryAddress: function (address, bytecodeToLink, positions) {
     if (positions) {
       for (var pos of positions) {

src/app/tabs/run-tab.js

@@ -303,12 +303,13 @@ function makeRecorder (appAPI, appEvents) {
         var accounts = obj.accounts || []
         var options = obj.options
         var abis = obj.abis
+        var linkReferences = obj.linkReferences || {}
       } catch (e) {
         return modalDialogCustom.alert('Invalid Scenario File, please try again')
       }
       if (txArray.length) {
         noInstancesText.style.display = 'none'
-        recorder.run(txArray, accounts, options, abis, (abi, address, contractName) => {
+        recorder.run(txArray, accounts, options, abis, linkReferences, (abi, address, contractName) => {
           instanceContainer.appendChild(appAPI.udapp().renderInstanceFromABI(abi, address, contractName))
         })
       }

src/recorder.js

@@ -17,7 +17,7 @@ class Recorder {
     var self = this
     self._api = opts.api
     self.event = new EventManager()
-    self.data = { _listen: true, _replay: false, journal: [], _createdContracts: {}, _createdContractsReverse: {}, _usedAccounts: {}, _abis: {}, _contractABIReferences: {} }
+    self.data = { _listen: true, _replay: false, journal: [], _createdContracts: {}, _createdContractsReverse: {}, _usedAccounts: {}, _abis: {}, _contractABIReferences: {}, _linkReferences: {} }
     opts.events.executioncontext.register('contextChanged', () => {
       self.clearAll()
     })
@@ -37,6 +37,14 @@ class Recorder {
             record.abi = sha3
             record.contractName = payLoad.contractName
             record.bytecode = payLoad.contractBytecode
+            record.linkReferences = selectedContract.object.evm.bytecode.linkReferences
+            if (Object.keys(record.linkReferences).length) {
+              for (var file in record.linkReferences) {
+                for (var lib in record.linkReferences[file]) {
+                  self.data._linkReferences[lib] = '<address>'
+                }
+              }
+            }
             self.data._abis[sha3] = abi
 
             this.data._contractABIReferences[timestamp] = sha3
@@ -140,6 +148,7 @@ class Recorder {
         var stampB = B.timestamp
         return stampA - stampB
       }),
+      linkReferences: self.data._linkReferences,
       abis: self.data._abis
     }
   }
@@ -150,12 +159,15 @@ class Recorder {
     */
   clearAll () {
     var self = this
+    self.data._listen = true
+    self.data._replay = false
     self.data.journal = []
     self.data._createdContracts = {}
     self.data._createdContractsReverse = {}
     self.data._usedAccounts = {}
     self.data._abis = {}
     self.data._contractABIReferences = {}
+    self.data._linkReferences = {}
   }
 
   /**
@@ -167,7 +179,7 @@ class Recorder {
     * @param {Function} newContractFn
     *
     */
-  run (records, accounts, options, abis, newContractFn) {
+  run (records, accounts, options, abis, linkReferences, newContractFn) {
     var self = this
     self.setListen(false)
     self._api.logMessage('Running transactions ...')
@@ -178,6 +190,14 @@ class Recorder {
         modal.alert('cannot find ABI for ' + tx.record.abi + '.  Execution stopped)')
         return
       }
+      /* Resolve Library */
+      if (record.linkReferences) {
+        for (var k in linkReferences) {
+          var link = linkReferences[k]
+          tx.record.bytecode = format.linkLibraryStandardFromlinkReferences(k, link.replace('0x', ''), tx.record.bytecode, tx.record.linkReferences)
+        }
+      }
+      /* Encode params */
       var fnABI
       if (tx.record.type === 'constructor') {
         fnABI = txHelper.getConstructorInterface(abi)