Merge pull request #522 from ethereum/fixState1

src/solidity/solidityProxy.js

@@ -137,7 +137,7 @@ function contractNameFromCode (contracts, code, address) {
   var isCreation = traceHelper.isContractCreation(address)
   var byteProp = isCreation ? 'bytecode' : 'runtimeBytecode'
   for (var k in contracts) {
-    if ('0x' + contracts[k][byteProp].replace(util.swarmHashExtraction(), '') === code.replace(util.swarmHashExtraction(), '')) {
+    if (code.replace(util.swarmHashExtraction(), '').indexOf('0x' + contracts[k][byteProp].replace(util.swarmHashExtraction(), '')) === 0) {
       return k
     }
   }

src/ui/SolidityState.js

@@ -19,6 +19,8 @@ function SolidityState (_parent, _traceManager, _codeManager, _solidityProxy) {
   this.init()
   this.view
   this.stateVariablesByAddresses = {}
+  _parent.event.register('traceUnloaded', () => { this.stateVariablesByAddresses = {} })
+  _parent.event.register('newTraceLoaded', () => { this.stateVariablesByAddresses = {} })
 }
 
 SolidityState.prototype.render = function () {