Merge branch 'master' into whatsupdocs

package.json

@@ -1,6 +1,6 @@
 {
   "name": "remix-ide",
-  "version": "v0.8.7",
+  "version": "v0.8.8",
   "description": "Minimalistic browser-based Solidity IDE",
   "devDependencies": {
     "@babel/core": "^7.4.5",
@@ -75,7 +75,7 @@
     "yo-yoify": "^3.7.3"
   },
   "dependencies": {
-    "@remixproject/engine": "^0.1.15",
+    "@remixproject/engine": "^0.1.16",
     "http-server": "^0.11.1",
     "remixd": "0.1.8-alpha.7",
     "standard": "^8.5.0"

src/app/components/vertical-icons.js

@@ -310,7 +310,7 @@ export class VerticalIcons extends Plugin {
     </div>
     `
 
-    this.iconKind['compile'] = yo`
+    this.iconKind['compiler'] = yo`
     <div id='compileIcons'>
     </div>
     `
@@ -349,7 +349,7 @@ export class VerticalIcons extends Plugin {
       <div class=${css.icons}>
         ${home}
         ${this.iconKind['fileexplorer']}
-        ${this.iconKind['compile']}
+        ${this.iconKind['compiler']}
         ${this.iconKind['udapp']}
         ${this.iconKind['testing']}
         ${this.iconKind['analysis']}

src/app/files/fileManager.js

@@ -23,7 +23,8 @@ const profile = {
   icon: 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPHN2ZyB3aWR0aD0iMTc5MiIgaGVpZ2h0PSIxNzkyIiB2aWV3Qm94PSIwIDAgMTc5MiAxNzkyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxwYXRoIGQ9Ik0xNjk2IDM4NHE0MCAwIDY4IDI4dDI4IDY4djEyMTZxMCA0MC0yOCA2OHQtNjggMjhoLTk2MHEtNDAgMC02OC0yOHQtMjgtNjh2LTI4OGgtNTQ0cS00MCAwLTY4LTI4dC0yOC02OHYtNjcycTAtNDAgMjAtODh0NDgtNzZsNDA4LTQwOHEyOC0yOCA3Ni00OHQ4OC0yMGg0MTZxNDAgMCA2OCAyOHQyOCA2OHYzMjhxNjgtNDAgMTI4LTQwaDQxNnptLTU0NCAyMTNsLTI5OSAyOTloMjk5di0yOTl6bS02NDAtMzg0bC0yOTkgMjk5aDI5OXYtMjk5em0xOTYgNjQ3bDMxNi0zMTZ2LTQxNmgtMzg0djQxNnEwIDQwLTI4IDY4dC02OCAyOGgtNDE2djY0MGg1MTJ2LTI1NnEwLTQwIDIwLTg4dDQ4LTc2em05NTYgODA0di0xMTUyaC0zODR2NDE2cTAgNDAtMjggNjh0LTY4IDI4aC00MTZ2NjQwaDg5NnoiLz48L3N2Zz4=',
   permission: true,
   version: packageJson.version,
-  methods: ['getFolder', 'getCurrentFile', 'getFile', 'setFile', 'switchFile']
+  methods: ['getFolder', 'getCurrentFile', 'getFile', 'setFile', 'switchFile'],
+  kind: 'file-system'
 }
 
 // File System profile

src/app/tabs/compile-tab.js

@@ -27,7 +27,7 @@ const profile = {
   displayName: 'Solidity compiler',
   icon: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAACXBIWXMAAASdAAAEnQF8NGuhAAAAB3RJTUUH4wQMDx84DVYryQAAAjBJREFUSMe1102ITmEUB/DfO4aZRuM7otQgqSlCFmIhSRaSJClWs9BY2RAba1tLZTGxmbJWImFsWBhhZONzpJSEaJhhPl6bM/V2ux/vnTtz6untPvc857z/8/E/z61pXnZjHeoFejcwUWSs1qTTFjzHOP7l2PqCAVxuxmAzcgbLsSQH8SQ+YxM6igzOa8LpMvSH4dYI43iK3nDs17AND6oiPt+Qs3qgTso4fjU8r0Z3Fcfd6E0505nYe52olyn0VAn1FaxM2W/HSETgN76l6HREet6URbwPe3LeLw5k73OK7UDZdmrBIJYWROse3hak8gluJ1+0ZhyYwlNsLyCMHjOUvFCfij+Q19vmwjFcy9D5gUdVHDdDmY8xP3HmULDUnCGGswmnL3Oc7sBxsygDUeVDaMvR68fDnKItPSROBNo+/M3QOYwtwWq9s4n6ajBWltyJqAziVQbjlZpO03IzZ8CfDpab7vmJGKP3q14E8mQR7qaAaMdJvKiS4zw5lxG5MVyoWlxZshFHI8RpazP2lgl1DRdjAmVxdR070VVAUIM4Uqa4PuFg6LSlrFVRQJ3hIG2NY1fZUH/Asxy0a+L3a07H9M20nYZjmE8mnK5omNWTWJgCYhTHZup4BAuwPjHDNyT0/iTuYbXo7XdVqvpWA/fWI7dpF4exhufvwWSVmGv66ro10HdlVPpokEkd+/FzNobEQKBY23AuuWpx4xzCxyKDrSXI4nrkPO+DrA2XmjH2H8KUd4MWwdIJAAAAAElFTkSuQmCC',
   description: 'Compile solidity contracts',
-  kind: 'compile',
+  kind: 'compiler',
   permission: true,
   location: 'sidePanel',
   documentation: 'https://remix-ide.readthedocs.io/en/latest/solidity_editor.html',

src/app/tabs/network-module.js

@@ -6,7 +6,8 @@ export const profile = {
   name: 'network',
   description: 'Manage the network (mainnet, ropsten, goerli...) and the provider (web3, vm, injected)',
   methods: ['getNetworkProvider', 'getEndpoint', 'detectNetwork', 'addNetwork', 'removeNetwork'],
-  version: packageJson.version
+  version: packageJson.version,
+  kind: 'network'
 }
 
 // Network API has :

src/app/tabs/theme-module.js

@@ -21,7 +21,8 @@ const profile = {
   name: 'theme',
   events: ['themeChanged'],
   methods: ['switchTheme', 'getThemes', 'currentTheme'],
-  version: packageJson.version
+  version: packageJson.version,
+  kind: 'theme'
 }
 
 export class ThemeModule extends Plugin {

src/remixAppManager.js

@@ -84,7 +84,7 @@ export class RemixAppManager extends PluginEngine {
       },
       url: 'https://remix-vyper-plugin.surge.sh',
       description: 'Compile vyper contracts',
-      kind: 'compile',
+      kind: 'compiler',
       icon: 'data:image/svg+xml;base64,PHN2ZyBpZD0iRmxhdF9Mb2dvIiBkYXRhLW5hbWU9IkZsYXQgTG9nbyIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgMjA0OCAxNzczLjYyIj4gIDx0aXRsZT52eXBlci1sb2dvLWZsYXQ8L3RpdGxlPiAgPHBvbHlsaW5lIHBvaW50cz0iMTAyNCA4ODYuODEgNzY4IDEzMzAuMjIgMTAyNCAxNzczLjYyIDEyODAgMTMzMC4yMiAxMDI0IDg4Ni44MSIgc3R5bGU9ImZpbGw6IzMzMyIvPiAgPHBvbHlsaW5lIHBvaW50cz0iMTI4MCA0NDMuNDEgMTAyNCA4ODYuODEgMTI4MCAxMzMwLjIyIDE1MzYgODg2LjgxIDEyODAgNDQzLjQxIiBzdHlsZT0iZmlsbDojNjY2Ii8+ICA8cG9seWxpbmUgcG9pbnRzPSI3NjggNDQzLjQxIDUxMiA4ODYuODEgNzY4IDEzMzAuMjIgMTAyNCA4ODYuODEgNzY4IDQ0My40MSIgc3R5bGU9ImZpbGw6IzY2NiIvPiAgPHBvbHlsaW5lIHBvaW50cz0iMTUzNiAwIDEyODAgNDQzLjQxIDE1MzYgODg2LjgxIDE3OTIgNDQzLjQxIDE1MzYgMCIgc3R5bGU9ImZpbGw6IzhjOGM4YyIvPiAgPHBvbHlsaW5lIHBvaW50cz0iMTE1MiAyMjEuNyA4OTYgMjIxLjcgNzY4IDQ0My40MSAxMDI0IDg4Ni44MSAxMjgwIDQ0My40MSAxMTUyIDIyMS43IiBzdHlsZT0iZmlsbDojOGM4YzhjIi8+ICA8cG9seWxpbmUgcG9pbnRzPSI1MTIgMCAyNTYgNDQzLjQxIDUxMiA4ODYuODEgNzY4IDQ0My40MSA1MTIgMCIgc3R5bGU9ImZpbGw6IzhjOGM4YyIvPiAgPHBvbHlsaW5lIHBvaW50cz0iMjA0OCAwIDE1MzYgMCAxNzkyIDQ0My40IDIwNDggMCIgc3R5bGU9ImZpbGw6I2IyYjJiMiIvPiAgPHBvbHlsaW5lIHBvaW50cz0iNTEyIDAgMCAwIDI1NiA0NDMuNCA1MTIgMCIgc3R5bGU9ImZpbGw6I2IyYjJiMiIvPjwvc3ZnPg==',
       location: 'sidePanel'
     }
@@ -135,7 +135,7 @@ export class RemixAppManager extends PluginEngine {
       notifications: {
         'solidity': ['compilationFinished']
       },
-      version: '0.1.0-beta',
+      version: '0.1.0',
       url: 'https://remix-mythx-plugin.surge.sh',
       description: 'Perform Static and Dynamic Security Analysis using the MythX Cloud Service',
       icon: 'https://remix-mythx-plugin.surge.sh/logo.png',
@@ -237,6 +237,31 @@ export class RemixAppManager extends PluginEngine {
       icon: 'https://remix-flattener.netlify.com/logo.svg',
       location: 'sidePanel'
     }
+    const ethpm = {
+      name: 'ethPM',
+      displayName: 'ethPM',
+      events: [],
+      methods: [],
+      notifications: {
+        solidity: ['compilationFinished']
+      },
+      url: 'https://ethpm.surge.sh',
+      description: 'Generate and import ethPM packages.',
+      documentation: 'https://docs.ethpm.com/ethpm-developer-guide/ethpm-and-remix-ide',
+      icon: 'https://ethpm.surge.sh/ethpmlogo.png',
+      location: 'mainPanel'
+    }
+    const zokrates = {
+      name: 'Zokrates',
+      displayName: 'ZoKrates',
+      description: 'ZoKrates will compile your program to an intermediate representation and run a trusted setup protocol to generate proving and verifying keys.',
+      methods: [],
+      events: [],
+      version: '0.1.0-alpha',
+      url: 'https://zokrates.blockchain-it.hr',
+      icon: 'https://zokrates.blockchain-it.hr/zokrates.svg',
+      location: 'sidePanel'
+    }
     return [
       new IframePlugin(pipeline),
       new IframePlugin(vyper),
@@ -250,7 +275,9 @@ export class RemixAppManager extends PluginEngine {
       new IframePlugin(libraTools),
       new IframePlugin(oneClickDapp),
       new IframePlugin(gasProfiler),
-      new IframePlugin(flattener)
+      new IframePlugin(flattener),
+      new IframePlugin(ethpm),
+      new IframePlugin(zokrates)
     ]
   }
 }