Merge branch 'master' into remixd_terminal

3 years ago · 349387fafc
parent 0158ff6ae5 6da8557075
commit 349387fafc
15 changed files with 52 additions and 31 deletions
--- a/apps/debugger/src/app/debugger-api.ts
+++ b/apps/debugger/src/app/debugger-api.ts
@ -62,6 +62,10 @@ export const DebuggerApiMixin = (Base) => class extends Base {
    this.onEditorContentChangedListener = listener
  }

+  onEnvChanged (listener) {
+    this.onEnvChangedListener = listener
+  }
+
  onDebugRequested (listener) {
    this.onDebugRequestedListener = listener
  }
@ -126,6 +130,7 @@ export const DebuggerApiMixin = (Base) => class extends Base {
    this.on('editor', 'breakpointCleared', (fileName, row) => { if (this.onBreakpointClearedListener) this.onBreakpointClearedListener(fileName, row) })
    this.on('editor', 'breakpointAdded', (fileName, row) => { if (this.onBreakpointAddedListener) this.onBreakpointAddedListener(fileName, row) })
    this.on('editor', 'contentChanged', () => { if (this.onEditorContentChangedListener) this.onEditorContentChangedListener() })  
+    this.on('network', 'providerChanged', (provider) => { if (this.onEnvChangedListener) this.onEnvChangedListener(provider) })
  }

  onDeactivation () {
--- a/apps/debugger/src/app/debugger.ts
+++ b/apps/debugger/src/app/debugger.ts
@ -1,7 +1,7 @@
 import { PluginClient } from "@remixproject/plugin";
 import { createClient } from "@remixproject/plugin-webview";
 import { IDebuggerApi, RawLocation, Sources, Asts, LineColumnLocation, 
-  onBreakpointClearedListener, onBreakpointAddedListener, onEditorContentChanged, TransactionReceipt } from '@remix-ui/debugger-ui'
+  onBreakpointClearedListener, onBreakpointAddedListener, onEditorContentChanged, onEnvChangedListener, TransactionReceipt } from '@remix-ui/debugger-ui'
 import { DebuggerApiMixin, CompilerAbstract} from './debugger-api'

 export class DebuggerClientApi extends DebuggerApiMixin(PluginClient) {  
@ -18,6 +18,7 @@ export class DebuggerClientApi extends DebuggerApiMixin(PluginClient) {
  onBreakpointCleared: (listener: onBreakpointClearedListener) => void
  onBreakpointAdded: (listener: onBreakpointAddedListener) => void
  onEditorContentChanged: (listener: onEditorContentChanged) => void
+  onEnvChanged: (listener: onEnvChangedListener) => void
  discardHighlight: () => Promise<void>
  highlight: (lineColumnPos: LineColumnLocation, path: string) => Promise<void>
  fetchContractAndCompile: (address: string, currentReceipt: TransactionReceipt) => Promise<CompilerAbstract>
--- a/apps/remix-ide/src/blockchain/providers/injected.js
+++ b/apps/remix-ide/src/blockchain/providers/injected.js
@ -12,7 +12,7 @@ class InjectedProvider {

  newAccount (passwordPromptCb, cb) {
    passwordPromptCb((passphrase) => {
-      this.executionContext.web3().personal.newAccount(passphrase, cb)
+      this.executionContext.web3().eth.personal.newAccount(passphrase, cb)
    })
  }

--- a/apps/remix-ide/src/blockchain/providers/node.js
+++ b/apps/remix-ide/src/blockchain/providers/node.js
@ -10,7 +10,7 @@ class NodeProvider {

  getAccounts (cb) {
    if (this.config.get('settings/personal-mode')) {
-      return this.executionContext.web3().personal.getListAccounts(cb)
+      return this.executionContext.web3().eth.personal.getAccounts(cb)
    }
    return this.executionContext.web3().eth.getAccounts(cb)
  }
@ -20,7 +20,7 @@ class NodeProvider {
      return cb('Not running in personal mode')
    }
    passwordPromptCb((passphrase) => {
-      this.executionContext.web3().personal.newAccount(passphrase, cb)
+      this.executionContext.web3().eth.personal.newAccount(passphrase, cb)
    })
  }

--- a/libs/remix-analyzer/package.json
+++ b/libs/remix-analyzer/package.json
@ -1,6 +1,6 @@
 {
  "name": "@remix-project/remix-analyzer",
-  "version": "0.5.14",
+  "version": "0.5.15",
  "description": "Tool to perform static analysis on Solidity smart contracts",
  "main": "index.js",
  "types": ".index.d.ts",
@ -23,7 +23,7 @@
    "@ethereumjs/tx": "^3.3.0",
    "@ethereumjs/vm": "^5.5.0",
    "@remix-project/remix-astwalker": "^0.0.26",
-    "@remix-project/remix-lib": "^0.5.5",
+    "@remix-project/remix-lib": "^0.5.6",
    "async": "^2.6.2",
    "ethereumjs-util": "^7.0.10",
    "ethers": "^5.4.2",
@ -51,5 +51,5 @@
    "typescript": "^3.7.5"
  },
  "typings": "index.d.ts",
-  "gitHead": "df7abe1c219e361a947031d620f4ae6e3786a4d7"
+  "gitHead": "39700b7c076d53d0f857f341774a8448ea5c8da9"
 }
--- a/libs/remix-astwalker/package.json
+++ b/libs/remix-astwalker/package.json
@ -1,6 +1,6 @@
 {
  "name": "@remix-project/remix-astwalker",
-  "version": "0.0.35",
+  "version": "0.0.36",
  "description": "Tool to walk through Solidity AST",
  "main": "index.js",
  "scripts": {
@ -37,7 +37,7 @@
    "@ethereumjs/block": "^3.4.0",
    "@ethereumjs/tx": "^3.3.0",
    "@ethereumjs/vm": "^5.5.0",
-    "@remix-project/remix-lib": "^0.5.5",
+    "@remix-project/remix-lib": "^0.5.6",
    "@types/tape": "^4.2.33",
    "async": "^2.6.2",
    "ethereumjs-util": "^7.0.10",
@ -53,5 +53,5 @@
    "tap-spec": "^5.0.0"
  },
  "typings": "index.d.ts",
-  "gitHead": "df7abe1c219e361a947031d620f4ae6e3786a4d7"
+  "gitHead": "39700b7c076d53d0f857f341774a8448ea5c8da9"
 }
--- a/libs/remix-debug/package.json
+++ b/libs/remix-debug/package.json
@ -1,6 +1,6 @@
 {
  "name": "@remix-project/remix-debug",
-  "version": "0.5.5",
+  "version": "0.5.6",
  "description": "Tool to debug Ethereum transactions",
  "contributors": [
    {
@ -23,7 +23,7 @@
    "@ethereumjs/tx": "^3.3.0",
    "@ethereumjs/vm": "^5.5.0",
    "@remix-project/remix-astwalker": "^0.0.26",
-    "@remix-project/remix-lib": "^0.5.5",
+    "@remix-project/remix-lib": "^0.5.6",
    "async": "^2.6.2",
    "commander": "^2.19.0",
    "deep-equal": "^1.0.1",
@ -61,5 +61,5 @@
  },
  "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-debug#readme",
  "typings": "src/index.d.ts",
-  "gitHead": "df7abe1c219e361a947031d620f4ae6e3786a4d7"
+  "gitHead": "39700b7c076d53d0f857f341774a8448ea5c8da9"
 }
--- a/libs/remix-lib/package.json
+++ b/libs/remix-lib/package.json
@ -1,6 +1,6 @@
 {
  "name": "@remix-project/remix-lib",
-  "version": "0.5.5",
+  "version": "0.5.6",
  "description": "Library to various Remix tools",
  "contributors": [
    {
@ -53,5 +53,5 @@
  },
  "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-lib#readme",
  "typings": "src/index.d.ts",
-  "gitHead": "df7abe1c219e361a947031d620f4ae6e3786a4d7"
+  "gitHead": "39700b7c076d53d0f857f341774a8448ea5c8da9"
 }
--- a/libs/remix-simulator/package.json
+++ b/libs/remix-simulator/package.json
@ -1,6 +1,6 @@
 {
  "name": "@remix-project/remix-simulator",
-  "version": "0.2.5",
+  "version": "0.2.6",
  "description": "Ethereum IDE and tools for the web",
  "contributors": [
    {
@ -18,7 +18,7 @@
    "@ethereumjs/common": "^2.2.0",
    "@ethereumjs/tx": "^3.3.0",
    "@ethereumjs/vm": "^5.5.0",
-    "@remix-project/remix-lib": "^0.5.5",
+    "@remix-project/remix-lib": "^0.5.6",
    "ansi-gray": "^0.1.1",
    "async": "^3.1.0",
    "body-parser": "^1.18.2",
@ -66,5 +66,5 @@
  },
  "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-simulator#readme",
  "typings": "src/index.d.ts",
-  "gitHead": "df7abe1c219e361a947031d620f4ae6e3786a4d7"
+  "gitHead": "39700b7c076d53d0f857f341774a8448ea5c8da9"
 }
--- a/libs/remix-solidity/package.json
+++ b/libs/remix-solidity/package.json
@ -1,6 +1,6 @@
 {
  "name": "@remix-project/remix-solidity",
-  "version": "0.4.5",
+  "version": "0.4.6",
  "description": "Tool to load and run Solidity compiler",
  "main": "index.js",
  "types": "./index.d.ts",
@ -18,7 +18,7 @@
    "@ethereumjs/block": "^3.4.0",
    "@ethereumjs/tx": "^3.3.0",
    "@ethereumjs/vm": "^5.5.0",
-    "@remix-project/remix-lib": "^0.5.5",
+    "@remix-project/remix-lib": "^0.5.6",
    "async": "^2.6.2",
    "eslint-scope": "^5.0.0",
    "ethereumjs-util": "^7.0.10",
@ -59,5 +59,5 @@
  },
  "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-solidity#readme",
  "typings": "index.d.ts",
-  "gitHead": "df7abe1c219e361a947031d620f4ae6e3786a4d7"
+  "gitHead": "39700b7c076d53d0f857f341774a8448ea5c8da9"
 }
--- a/libs/remix-tests/package.json
+++ b/libs/remix-tests/package.json
@ -1,6 +1,6 @@
 {
  "name": "@remix-project/remix-tests",
-  "version": "0.2.5",
+  "version": "0.2.6",
  "description": "Tool to test Solidity smart contracts",
  "main": "src/index.js",
  "types": "./src/index.d.ts",
@ -39,9 +39,9 @@
    "@ethereumjs/common": "^2.2.0",
    "@ethereumjs/tx": "^3.3.0",
    "@ethereumjs/vm": "^5.5.0",
-    "@remix-project/remix-lib": "^0.5.5",
-    "@remix-project/remix-simulator": "^0.2.5",
-    "@remix-project/remix-solidity": "^0.4.5",
+    "@remix-project/remix-lib": "^0.5.6",
+    "@remix-project/remix-simulator": "^0.2.6",
+    "@remix-project/remix-solidity": "^0.4.6",
    "ansi-gray": "^0.1.1",
    "async": "^2.6.0",
    "axios": ">=0.21.1",
@ -77,5 +77,5 @@
    "typescript": "^3.3.1"
  },
  "typings": "src/index.d.ts",
-  "gitHead": "df7abe1c219e361a947031d620f4ae6e3786a4d7"
+  "gitHead": "39700b7c076d53d0f857f341774a8448ea5c8da9"
 }
--- a/libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx
+++ b/libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx
@ -31,7 +31,8 @@ export const DebuggerUI = (props: DebuggerUIProps) => {
    },
    toastMessage: '',
    validationError: '',
-    txNumberIsEmpty: true
+    txNumberIsEmpty: true,
+    isLocalNodeUsed: false
  })

  useEffect(() => {
@ -62,6 +63,17 @@ export const DebuggerUI = (props: DebuggerUIProps) => {
    }

    setEditor()
+
+    const providerChanged = () => {
+      debuggerModule.onEnvChanged((provider) => {
+        setState(prevState => {
+          const isLocalNodeUsed = provider !== 'vm' && provider !== 'injected'
+          return { ...prevState, isLocalNodeUsed: isLocalNodeUsed }
+        })
+      })
+    }
+
+    providerChanged()
  }, [state.debugger])

  const listenToEvents = (debuggerInstance, currentReceipt) => {
@ -289,7 +301,7 @@ export const DebuggerUI = (props: DebuggerUIProps) => {
            }} type="checkbox" title="Debug with generated sources" />
            <label data-id="debugGeneratedSourcesLabel" className="form-check-label custom-control-label" htmlFor="debugGeneratedSourcesInput">Use generated sources (from Solidity v0.7.2)</label>
          </div>
-          <div className="mt-2 mb-2 debuggerConfig custom-control custom-checkbox">
+          { state.isLocalNodeUsed && <div className="mt-2 mb-2 debuggerConfig custom-control custom-checkbox">
            <input className="custom-control-input" id="debugWithLocalNodeInput" onChange={({ target: { checked } }) => {
              setState(prevState => {
                return { ...prevState, opt: { ...prevState.opt, debugWithLocalNode: checked } }
@ -297,6 +309,7 @@ export const DebuggerUI = (props: DebuggerUIProps) => {
            }} type="checkbox" title="Force the debugger to use the current local node" />
            <label data-id="debugLocaNodeLabel" className="form-check-label custom-control-label" htmlFor="debugWithLocalNodeInput">Force using local node</label>
          </div>
+          }
          { state.validationError && <span className="w-100 py-1 text-danger validationError">{state.validationError}</span> }
        </div>
        <TxBrowser requestDebug={ requestDebug } unloadRequested={ unloadRequested } updateTxNumberFlag={ updateTxNumberFlag } transactionNumber={ state.txNumber } debugging={ state.debugging } />
--- a/libs/remix-ui/debugger-ui/src/lib/idebugger-api.ts
+++ b/libs/remix-ui/debugger-ui/src/lib/idebugger-api.ts
@ -46,6 +46,7 @@ export type onBreakpointClearedListener = (params: string, row: number) => void
 export type onBreakpointAddedListener = (params: string, row: number) => void
 export type onEditorContentChanged = () => void
 export type onDebugRequested = (hash: string) => void
+export type onEnvChangedListener = (provider: string) => void

 export interface IDebuggerApi {
    offsetToLineColumnConverter: { offsetToLineColumn: (sourceLocation: RawLocation, file: number, contents: Sources, asts: Asts) => Promise<LineColumnLocation> }
@ -57,6 +58,7 @@ export interface IDebuggerApi {
    onBreakpointCleared: (listener: onBreakpointClearedListener) => void
    onBreakpointAdded: (listener: onBreakpointAddedListener) => void
    onEditorContentChanged: (listener: onEditorContentChanged) => void
+    onEnvChanged: (listener: onEnvChangedListener) => void
    discardHighlight: () => Promise<void>
    highlight: (lineColumnPos: LineColumnLocation, path: string) => Promise<void>
    fetchContractAndCompile: (address: string, currentReceipt: TransactionReceipt) => Promise<CompilationOutput>
--- a/libs/remix-url-resolver/package.json
+++ b/libs/remix-url-resolver/package.json
@ -1,6 +1,6 @@
 {
  "name": "@remix-project/remix-url-resolver",
-  "version": "0.0.26",
+  "version": "0.0.27",
  "description": "Solidity import url resolver engine",
  "main": "index.js",
  "types": "./index.d.ts",
@ -42,5 +42,5 @@
    "typescript": "^3.1.6"
  },
  "typings": "index.d.ts",
-  "gitHead": "df7abe1c219e361a947031d620f4ae6e3786a4d7"
+  "gitHead": "39700b7c076d53d0f857f341774a8448ea5c8da9"
 }
--- a/libs/remixd/package.json
+++ b/libs/remixd/package.json
@ -1,6 +1,6 @@
 {
  "name": "@remix-project/remixd",
-  "version": "0.5.0",
+  "version": "0.5.1",
  "description": "remix server: allow accessing file system from remix.ethereum.org and start a dev environment (see help section)",
  "main": "index.js",
  "types": "./index.d.ts",