Merge remote-tracking branch 'origin/master' into swap_it

.gitignore

@@ -1,3 +1,4 @@
+.idea
 .vscode
 build
 node_modules

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014, 2015, 2016 the individual contributors
+Copyright (c) 2014, 2015, 2019 the individual contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package.json

@@ -158,9 +158,9 @@
     "pullremix": "git clone https://github.com/ethereum/remix",
     "linkremixlib": "cd node_modules && rm -rf remix-lib && ln -s ../../remix/remix-lib remix-lib && cd ..",
     "linkremixsolidity": "cd node_modules && rm -rf remix-solidity && ln -s ../../remix/remix-solidity remix-solidity && cd ..",
-    "linkremixsimulator": "cd node_modules && rm -rf remix-simulator && ln -s ../../remix/remix-simulator remix-simulator && cd ..",
     "linkremixtests": "cd node_modules && rm -rf remix-tests && ln -s ../../remix/remix-tests remix-tests && cd ..",
     "linkremixdebug": "cd node_modules && rm -rf remix-debug && ln -s ../../remix/remix-debug remix-debug && cd ..",
+    "linkremixanalyzer": "cd node_modules && rm -rf remix-analyzer && ln -s ../../remix/remix-analyzer remix-analyzer && cd ..",
     "build": "browserify src/index.js -o build/app.js --exclude solc",
     "build_debugger": "browserify src/app/debugger/remix-debugger/index.js -o src/app/debugger/remix-debugger/build/app.js",
     "browsertest": "sleep 5 && npm run nightwatch_local",

src/app/files/compiler-metadata.js

@@ -6,7 +6,7 @@ class CompilerMetadata {
   constructor (opts) {
     var self = this
     self._opts = opts
-    self.networks = ['VM:-', 'main:1', 'ropsten:3', 'rinkeby:4', 'kovan:42', 'Custom']
+    self.networks = ['VM:-', 'main:1', 'ropsten:3', 'rinkeby:4', 'kovan:42', 'görli:5', 'Custom']
   }
 
   syncContractMetadata () {

src/app/tabs/runTab/model/recorder.js

@@ -31,8 +31,8 @@ class Recorder {
         var record = { value, parameters: payLoad.funArgs }
         if (!to) {
           var abi = payLoad.contractABI
-          var sha3 = ethutil.bufferToHex(ethutil.sha3(abi))
-          record.abi = sha3
+          var keccak = ethutil.bufferToHex(ethutil.keccak(abi))
+          record.abi = keccak
           record.contractName = payLoad.contractName
           record.bytecode = payLoad.contractBytecode
           record.linkReferences = payLoad.linkReferences
@@ -43,9 +43,9 @@ class Recorder {
               }
             }
           }
-          self.data._abis[sha3] = abi
+          self.data._abis[keccak] = abi
 
-          this.data._contractABIReferences[timestamp] = sha3
+          this.data._contractABIReferences[timestamp] = keccak
         } else {
           var creationTimestamp = this.data._createdContracts[to]
           record.to = `created{${creationTimestamp}}`

src/app/tabs/styles/tabbed-menu-styles.js

@@ -0,0 +1,42 @@
+const csjs = require('csjs-inject')
+const styles = require('../../ui/styles-guide/theme-chooser').chooser()
+
+const css = csjs`
+  .menu {
+    display: flex;
+    background-color: ${styles.rightPanel.BackgroundColor_Pre};
+    list-style: none;
+    margin: 0;
+    padding: 0;
+  }
+  .active {
+    background-color: ${styles.rightPanel.backgroundColor_Tab};
+    color: ${styles.appProperties.mainText_Color}
+  }
+  .options {
+    float: left;
+    padding-top: 0.7em;
+    min-width: 60px;
+    font-size: 0.9em;
+    cursor: pointer;
+    font-size: 1em;
+    text-align: center;
+  }
+  .optionViews {
+    background-color: ${styles.rightPanel.backgroundColor_Tab};
+    overflow: scroll;
+    height: 100%;
+  }
+  .optionViews > div {
+    display: none;
+  }
+  .optionViews .pre {
+    word-wrap: break-word;
+    background-color: ${styles.rightPanel.BackgroundColor_Pre};
+    border-radius: 3px;
+    display: inline-block;
+    padding: 0 0.6em;
+  }
+`
+
+module.exports = css