use remix plugin 0.3

apps/remix-ide-e2e/src/tests/pluginManager.test.ts

@@ -44,6 +44,7 @@ module.exports = {
     browser.waitForElementVisible('*[data-id="pluginManagerComponentPluginManager"]')
     .click('*[data-id="pluginManagerComponentPluginManager"]')
     .scrollAndClick('*[data-id="pluginManagerComponentActivateButtondebugger"]')
+    .pause(2000)
     .waitForElementVisible('*[data-id="pluginManagerComponentDeactivateButtondebugger"]')
     .scrollAndClick('*[data-id="pluginManagerComponentActivateButtonvyper"]')
     .waitForElementVisible('*[data-id="pluginManagerComponentDeactivateButtonvyper"]')
@@ -54,8 +55,11 @@ module.exports = {
   'Should deactivate plugins': function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('*[data-id="pluginManagerComponentPluginManager"]')
     .click('*[data-id="pluginManagerComponentPluginManager"]')
-    .scrollAndClick('*[data-id="pluginManagerComponentDeactivateButtondebugger"]')
+    .waitForElementVisible('*[data-id="pluginManagerComponentDeactivateButtondebugger"]')
+    .pause(2000)
+    .scrollAndClick('*[data-id="pluginManagerComponentDeactivateButtondebugger"]')   
     .waitForElementVisible('*[data-id="pluginManagerComponentActivateButtondebugger"]')
+    .waitForElementVisible('*[data-id="pluginManagerComponentDeactivateButtonvyper"]')
     .scrollAndClick('*[data-id="pluginManagerComponentDeactivateButtonvyper"]')
     .waitForElementVisible('*[data-id="pluginManagerComponentActivateButtonvyper"]')
   },

apps/remix-ide/src/app.js

@@ -231,14 +231,14 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
   const appManager = self.appManager
   const pluginLoader = appManager.pluginLoader
   const workspace = pluginLoader.get()
-  const engine = new Engine(appManager)
+  const engine = new Engine()
   engine.setPluginOption = ({ name, kind }) => {
     if (kind === 'provider') return {queueTimeout: 60000 * 2}
     if (name === 'LearnEth') return {queueTimeout: 60000}
     return {queueTimeout: 10000}
   }
-  await engine.onload()
-
+  engine.register(appManager)
+  
   // SERVICES
   // ----------------- import content servive ------------------------
   const contentImport = new CompilerImport()
@@ -398,17 +398,17 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
   await appManager.activatePlugin(['contentImport', 'theme', 'editor', 'fileManager', 'compilerMetadata', 'compilerArtefacts', 'network', 'web3Provider', 'offsetToLineColumnConverter'])
   await appManager.activatePlugin(['mainPanel', 'menuicons'])
   await appManager.activatePlugin(['sidePanel']) // activating  host plugin separately
-  await appManager.activatePlugin(['home', 'hiddenPanel', 'pluginManager', 'fileExplorers', 'settings', 'contextualListener', 'scriptRunner', 'terminal', 'fetchAndCompile'])
+  await appManager.activatePlugin(['home', 'hiddenPanel', 'pluginManager', 'fileExplorers', 'settings', 'contextualListener', 'terminal', 'fetchAndCompile'])
 
   const queryParams = new QueryParams()
   const params = queryParams.get()
 
   // Set workspace after initial activation
   if (Array.isArray(workspace)) {    
-    appManager.activatePlugin(workspace).then(() => {
+    appManager.activatePlugin(workspace).then(async () => {
       try {
         if (params.deactivate) {
-          appManager.deactivatePlugin(params.deactivate.split(','))
+          await appManager.deactivatePlugin(params.deactivate.split(','))
         }
       } catch (e) {
         console.log(e)
@@ -422,9 +422,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
         if (callDetails.length > 1) {
           toolTip(`initiating ${callDetails[0]} ...`)
           // @todo(remove the timeout when activatePlugin is on 0.3.0)
-          setTimeout(() => {
-            appManager.call(...callDetails).catch(console.error)
-          }, 5000)
+          appManager.call(...callDetails).catch(console.error)
         }
       }
     }).catch(console.error)    

apps/remix-ide/src/app/files/remixd-handle.js

@@ -1,5 +1,5 @@
 import isElectron from 'is-electron'
-import { WebsocketPlugin } from '@remixproject/engine'
+import { WebsocketPlugin } from '@remixproject/engine-web'
 import * as packageJson from '../../../../../package.json'
 var yo = require('yo-yo')
 var modalDialog = require('../ui/modaldialog')

apps/remix-ide/src/app/tabs/debugger-tab.js

@@ -61,7 +61,7 @@ class DebuggerTab extends ViewPlugin {
 
     this.renderComponent()
 
-    this.call('manager', 'activatePlugin', 'source-verification').catch(e => console.log(e.message))
+    this.call('manager', 'activatePlugin', 'source-verification').catch(e => console.error(e))
     // this.call('manager', 'activatePlugin', 'udapp')
 
     return this.el

apps/remix-ide/src/remixAppManager.js

@@ -1,5 +1,6 @@
 /* global localStorage, fetch */
-import { PluginManager, IframePlugin } from '@remixproject/engine'
+import { PluginManager } from '@remixproject/engine'
+import { IframePlugin } from '@remixproject/engine-web'
 import { EventEmitter } from 'events'
 import QueryParams from './lib/query-params'
 import { PermissionHandler } from './app/ui/persmission-handler'
@@ -28,11 +29,12 @@ export class RemixAppManager extends PluginManager {
     this.permissionHandler = new PermissionHandler()
   }
 
-  async canActivate (from, to) {
-    return canActivate(from.name)
+  async canActivatePlugin (from, to) {
+    return true // canActivate(from.name)
   }
 
-  async canDeactivate (from, to) {
+  async canDeactivatePlugin (from, to) {
+    console.log('canDeactivatePlugin', from, to)
     return from.name === 'manager'
   }
 
@@ -69,8 +71,8 @@ export class RemixAppManager extends PluginManager {
     this.event.emit('deactivate', plugin)
   }
 
-  onRegistration (plugin) {
-    this.event.emit('added', plugin.name)
+  onRegistration () {
+    console.log('manager has been registered')
   }
 
   async ensureActivated (apiName) {
@@ -105,8 +107,12 @@ export class RemixAppManager extends PluginManager {
       'description': 'Use an external wallet for transacting',
       'icon': 'data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjUxMiIgdmlld0JveD0iMCAwIDUxMiA1MTIiIHdpZHRoPSI1MTIiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxyYWRpYWxHcmFkaWVudCBpZD0iYSIgY3g9IjAlIiBjeT0iNTAlIiByPSIxMDAlIj48c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM1ZDlkZjYiLz48c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiMwMDZmZmYiLz48L3JhZGlhbEdyYWRpZW50PjxnIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+PHBhdGggZD0ibTI1NiAwYzE0MS4zODQ4OTYgMCAyNTYgMTE0LjYxNTEwNCAyNTYgMjU2cy0xMTQuNjE1MTA0IDI1Ni0yNTYgMjU2LTI1Ni0xMTQuNjE1MTA0LTI1Ni0yNTYgMTE0LjYxNTEwNC0yNTYgMjU2LTI1NnoiIGZpbGw9InVybCgjYSkiLz48cGF0aCBkPSJtNjQuNjkxNzU1OCAzNy43MDg4Mjk4YzUxLjUzMjgwNzItNTAuMjc4NDM5NyAxMzUuMDgzOTk0Mi01MC4yNzg0Mzk3IDE4Ni42MTY3OTkyIDBsNi4yMDIwNTcgNi4wNTEwOTA2YzIuNTc2NjQgMi41MTM5MjE4IDIuNTc2NjQgNi41ODk3OTQ4IDAgOS4xMDM3MTc3bC0yMS4yMTU5OTggMjAuNjk5NTc1OWMtMS4yODgzMjEgMS4yNTY5NjE5LTMuMzc3MSAxLjI1Njk2MTktNC42NjU0MjEgMGwtOC41MzQ3NjYtOC4zMjcwMjA1Yy0zNS45NTA1NzMtMzUuMDc1NDk2Mi05NC4yMzc5NjktMzUuMDc1NDk2Mi0xMzAuMTg4NTQ0IDBsLTkuMTQwMDI4MiA4LjkxNzU1MTljLTEuMjg4MzIxNyAxLjI1Njk2MDktMy4zNzcxMDE2IDEuMjU2OTYwOS00LjY2NTQyMDggMGwtMjEuMjE1OTk3My0yMC42OTk1NzU5Yy0yLjU3NjY0MDMtMi41MTM5MjI5LTIuNTc2NjQwMy02LjU4OTc5NTggMC05LjEwMzcxNzd6bTIzMC40OTM0ODUyIDQyLjgwODkxMTcgMTguODgyMjc5IDE4LjQyMjcyNjJjMi41NzY2MjcgMi41MTM5MTAzIDIuNTc2NjQyIDYuNTg5NzU5My4wMDAwMzIgOS4xMDM2ODYzbC04NS4xNDE0OTggODMuMDcwMzU4Yy0yLjU3NjYyMyAyLjUxMzk0MS02Ljc1NDE4MiAyLjUxMzk2OS05LjMzMDg0LjAwMDA2Ni0uMDAwMDEtLjAwMDAxLS4wMDAwMjMtLjAwMDAyMy0uMDAwMDMzLS4wMDAwMzRsLTYwLjQyODI1Ni01OC45NTc0NTFjLS42NDQxNi0uNjI4NDgxLTEuNjg4NTUtLjYyODQ4MS0yLjMzMjcxIDAtLjAwMDAwNC4wMDAwMDQtLjAwMDAwOC4wMDAwMDctLjAwMDAxMi4wMDAwMTFsLTYwLjQyNjk2ODMgNTguOTU3NDA4Yy0yLjU3NjYxNDEgMi41MTM5NDctNi43NTQxNzQ2IDIuNTEzOTktOS4zMzA4NDA4LjAwMDA5Mi0uMDAwMDE1MS0uMDAwMDE0LS4wMDAwMzA5LS4wMDAwMjktLjAwMDA0NjctLjAwMDA0NmwtODUuMTQzODY3NzQtODMuMDcxNDYzYy0yLjU3NjYzOTI4LTIuNTEzOTIxLTIuNTc2NjM5MjgtNi41ODk3OTUgMC05LjEwMzcxNjNsMTguODgyMzEyNjQtMTguNDIyNjk1NWMyLjU3NjYzOTMtMi41MTM5MjIyIDYuNzU0MTk5My0yLjUxMzkyMjIgOS4zMzA4Mzk3IDBsNjAuNDI5MTM0NyA1OC45NTgyNzU4Yy42NDQxNjA4LjYyODQ4IDEuNjg4NTQ5NS42Mjg0OCAyLjMzMjcxMDMgMCAuMDAwMDA5NS0uMDAwMDA5LjAwMDAxODItLjAwMDAxOC4wMDAwMjc3LS4wMDAwMjVsNjAuNDI2MTA2NS01OC45NTgyNTA4YzIuNTc2NTgxLTIuNTEzOTggNi43NTQxNDItMi41MTQwNzQzIDkuMzMwODQtLjAwMDIxMDMuMDAwMDM3LjAwMDAzNTQuMDAwMDcyLjAwMDA3MDkuMDAwMTA3LjAwMDEwNjNsNjAuNDI5MDU2IDU4Ljk1ODM1NDhjLjY0NDE1OS42Mjg0NzkgMS42ODg1NDkuNjI4NDc5IDIuMzMyNzA5IDBsNjAuNDI4MDc5LTU4Ljk1NzE5MjVjMi41NzY2NC0yLjUxMzkyMzEgNi43NTQxOTktMi41MTM5MjMxIDkuMzMwODM5IDB6IiBmaWxsPSIjZmZmIiBmaWxsLXJ1bGU9Im5vbnplcm8iIHRyYW5zZm9ybT0idHJhbnNsYXRlKDk4IDE2MCkiLz48L2c+PC9zdmc+',
       'location': 'mainPanel'
-    })
-    return plugins.map(plugin => new IframePlugin(plugin))
+    })    
+    return plugins.map(plugin => {
+      if (plugin.name === 'scriptRunner') {
+        plugin.url = 'ipfs://QmRWBCgCzKa1ixoVN9mvJACVuqWLRTRYS4sUJ9wzUBRHSf'
+      } 
+      return new IframePlugin(plugin) })
   }
 }
 

libs/remixd/package.json

@@ -32,10 +32,10 @@
   },
   "homepage": "https://github.com/ethereum/remix-project#readme",
   "dependencies": {
-    "@remixproject/plugin": "0.3.0-beta.5",
-    "@remixproject/plugin-api": "0.3.0-beta.5",
-    "@remixproject/plugin-utils": "0.3.0-beta.5",
-    "@remixproject/plugin-ws": "^0.3.0-beta.8",
+    "@remixproject/plugin": "^0.3.2",
+    "@remixproject/plugin-api": "^0.3.2",
+    "@remixproject/plugin-utils": "^0.3.2",
+    "@remixproject/plugin-ws": "^0.3.2",
     "axios": "^0.20.0",
     "chokidar": "^2.1.8",
     "commander": "^2.20.3",

package.json

@@ -127,16 +127,26 @@
     ]
   },
   "dependencies": {
-    "@remixproject/engine": "^0.2.3",
+    "@remixproject/engine": "^0.3.2",
+    "@remixproject/engine-web": "^0.3.2",
+    "@remixproject/plugin-ws": "^0.3.2",
+    "@remixproject/plugin": "^0.3.2",
+    "@remixproject/plugin-api": "^0.3.2",
+    "@remixproject/plugin-utils": "^0.3.2",
     "@types/jest": "^26.0.5",
     "@types/tape": "^4.2.33",
     "ansi-gray": "^0.1.1",
+    "axios": "^0.20.0",
     "change-case": "^4.1.1",
+    "chokidar": "^2.1.8",
     "color-support": "^1.1.3",
+    "commander": "^2.20.3",
     "ethereumjs-block": "^2.2.2",
     "ethereumjs-tx": "^2.1.2",
     "ethereumjs-vm": "4.1.3",
+    "fs-extra": "^3.0.1",
     "http-server": "^0.11.1",
+    "isbinaryfile": "^3.0.2",
     "merge": "^1.2.0",
     "npm-install-version": "^6.0.2",
     "react": "16.13.1",
@@ -145,15 +155,6 @@
     "signale": "^1.4.0",
     "time-stamp": "^2.2.0",
     "winston": "^3.3.3",
-    "@remixproject/plugin": "0.3.0-beta.5",
-    "@remixproject/plugin-api": "0.3.0-beta.5",
-    "@remixproject/plugin-utils": "0.3.0-beta.5",
-    "@remixproject/plugin-ws": "^0.3.0-beta.8",
-    "axios": "^0.20.0",
-    "chokidar": "^2.1.8",
-    "commander": "^2.20.3",
-    "fs-extra": "^3.0.1",
-    "isbinaryfile": "^3.0.2",
     "ws": "^7.3.0"
   },
   "devDependencies": {