Merge branch 'master' into filedecoratorplugin

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

@@ -200,7 +200,31 @@ module.exports = {
       .sendKeys('body', [browser.Keys.CONTROL, browser.Keys.SHIFT, 's'])
       .pause(15000)
       .journalLastChildIncludes('147')
-  }
+  },
+
+  'Should run a script which log transaction and block using web3.js and ethers #group7': function (browser: NightwatchBrowser) {
+    browser
+      .clickLaunchIcon('udapp')
+      .switchEnvironment('External Http Provider')
+      .waitForElementPresent('[data-id="basic-http-provider-modal-footer-ok-react"]')
+      .execute(() => {
+        (document.querySelector('*[data-id="basic-http-providerModalDialogContainer-react"] input[data-id="modalDialogCustomPromp"]') as any).focus()
+      }, [], () => {})
+      .setValue('[data-id="modalDialogCustomPromp"]', 'https://remix-goerli.ethdevops.io')
+      .modalFooterOKClick('basic-http-provider')
+      .clickLaunchIcon('filePanel')
+      .openFile('README.txt')
+      .addFile('scripts/log_tx_block.js', { content: scriptBlockAndTransaction } )
+      .pause(1000)
+      .executeScriptInTerminal('remix.execute(\'scripts/log_tx_block.js\')')
+      .pause(10000)
+      // check if the input of the transaction is being logged (web3 call)
+      .journalChildIncludes('0x775526410000000000000000000000000000000000000000000000000000000000000060464c0335b2f1609abd9de25141c0a3b49db516fc7375970dc737c32b986e88e3000000000000000000000000000000000000000000000000000000000000039e000000000000000000000000000000000000000000000000000000000000000602926b30b10e7a514d92bc71e085f5bff2687fac2856ae43ef7621bf1756fa370516d310bec5727543089be9a4d5f68471174ee528e95a2520b0ca36c2b6c6eb0000000000000000000000000000000000000000000000000000000000046f49036f5e4ea4dd042801c8841e3db8e654124305da0f11824fc1db60c405dbb39f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000')
+      // check if the logsBloom is being logged (web3 call)
+      .journalChildIncludes('0x00000000000000000000000000100000000000000000020000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000040000000060000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000100000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000001')
+      // check if the logsBloom is being logged (ethers.js call)
+      .journalChildIncludes('"hex":"0x025cd8"')
+    }
 }
 
 const asyncAwait = `
@@ -605,3 +629,17 @@ const scriptAutoExec = {
     })()
   `
 }
+
+const scriptBlockAndTransaction = `
+// Right click on the script name and hit "Run" to execute
+(async () => {
+    try {
+        web3.eth.getTransaction('0x022ccd55747677ac50f8d9dfd1bf5b843fa2f36438a28c1d0a0958e057bb3e2a').then(console.log)
+        web3.eth.getBlock('7367447').then(console.log);
+        let ethersProvider = new ethers.providers.Web3Provider(web3Provider)
+        ethersProvider.getBlock(7367447).then(console.log)
+    } catch (e) {
+        console.log(e.message)
+    }
+})()
+`

apps/remix-ide/src/blockchain/execution-context.js

@@ -156,7 +156,7 @@ export class ExecutionContext {
         return cb()
       } else {
         if (injectedProvider && injectedProvider._metamask && injectedProvider._metamask.isUnlocked) {
-          if (!await injectedProvider._metamask.isUnlocked()) this.call('notification', 'toast', 'Please make sure the injected provider is unlocked (e.g Metamask).')
+          if (!await injectedProvider._metamask.isUnlocked()) infoCb('Please make sure the injected provider is unlocked (e.g Metamask).')
         }
         this.askPermission()
         this.executionContext = context

apps/vyper/src/app/app.tsx

@@ -59,7 +59,7 @@ const App: React.FC = () => {
 
   function compilerUrl() {
     return state.environment === 'remote'
-      ? 'https://vyper.live/compile'
+      ? 'https://vyper.remixproject.org/compile'
       : state.localUrl
   }
 

libs/remix-ui/debugger-ui/src/lib/vm-debugger/global-variables.tsx

@@ -1,6 +1,7 @@
 import React from 'react' // eslint-disable-line
 import DropdownPanel from './dropdown-panel' // eslint-disable-line
 import { BN } from 'ethereumjs-util'
+import Web3 from 'web3'
 
 export const GlobalVariables = ({ block, receipt, tx }) => {
   // see https://docs.soliditylang.org/en/latest/units-and-global-variables.html#block-and-transaction-properties
@@ -17,7 +18,7 @@ export const GlobalVariables = ({ block, receipt, tx }) => {
     'tx.origin': tx.from
   }
   if (block.baseFeePerGas) {
-    globals['block.basefee'] = (new BN(block.baseFeePerGas.replace('0x', ''), 'hex')).toString(10) + ` Wei (${block.baseFeePerGas})`
+    globals['block.basefee'] = Web3.utils.toBN(block.baseFeePerGas).toString(10) + ` Wei (${block.baseFeePerGas})`
   }
 
   return (

libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx

@@ -237,7 +237,7 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
           <div>
             <i className="pl-4 text-danger fas fa-exclamation-triangle"></i>
             <span className="px-2 remixui_home_text text-danger mt-4 pt-4">
-              Scam Alert: Beware of online videos promoting "liquidity front runner bots".
+              Scam Alert: There are video tutorials going around that provide urls other than remix.ethereum.org, and could be scams. Also, beware of online videos promoting "liquidity front runner bots".
             </span>
             <a className="remixui_home_text" target="__blank" href="https://medium.com/remix-ide/remix-in-youtube-crypto-scams-71c338da32d">Learn more</a>
           </div>

libs/remix-ui/settings/src/lib/github-settings.tsx

@@ -51,7 +51,7 @@ export function GithubSettings (props: GithubSettingsProps) {
         <p className="">Go to github token page (link below) to create a new token and save it in Remix. Make sure this token has only \'create gist\' permission.</p>
         <p className="mb-1"><a className="text-primary" target="_blank" href="https://github.com/settings/tokens">https://github.com/settings/tokens</a></p>
         <div>
-          <label>TOKEN:</label>
+          <label className="mb-0 pb-0">TOKEN:</label>
           <div className="input-group text-secondary mb-0 h6">
             <input id="gistaccesstoken" data-id="settingsTabGistAccessToken" type="password" className="form-control" onChange={(e) => handleChangeTokenState(e)} value={ githubToken } />
             <div className="input-group-append">
@@ -60,13 +60,13 @@ export function GithubSettings (props: GithubSettingsProps) {
           </div>
         </div>
         <div>
-          <label>USERNAME:</label>
+          <label className="pt-2 mb-0 pb-0">USERNAME:</label>
           <div className="text-secondary mb-0 h6">
             <input id="githubusername" data-id="settingsTabGithubUsername" type="text" className="form-control" onChange={(e) => handleChangeUserNameState(e)} value={ githubUserName } />
           </div>
         </div>
         <div>
-          <label>EMAIL:</label>
+          <label className="pt-2 mb-0 pb-0">EMAIL:</label>
           <div className="text-secondary mb-0 h6">
             <input id="githubemail" data-id="settingsTabGithubEmail" type="text" className="form-control" onChange={(e) => handleChangeEmailState(e)} value={ githubEmail } />
             <div className="d-flex justify-content-end pt-2">

libs/remix-ui/settings/src/lib/remix-ui-settings.tsx

@@ -248,12 +248,12 @@ export const RemixUiSettings = (props: RemixUiSettingsProps) => {
     <div className="border-top">
       <div className="card-body pt-3 pb-2">
         <h6 className="card-title">{ swarmSettingsTitle }</h6>
-        <div className="pt-2 mb-1"><label>PRIVATE BEE ADDRESS:</label>
+        <div className="pt-2 pt-2 mb-0 pb-0"><label>PRIVATE BEE ADDRESS:</label>
           <div className="text-secondary mb-0 h6">
             <input id="swarmprivatebeeaddress" data-id="settingsPrivateBeeAddress" className="form-control" onChange={handleSavePrivateBeeAddress} value={ privateBeeAddress } />
           </div>
         </div>
-        <div className=""><label>POSTAGE STAMP ID:</label>
+        <div className="pt-2 mb-0 pb-0"><label>POSTAGE STAMP ID:</label>
           <div className="text-secondary mb-0 h6">
             <input id="swarmpostagestamp" data-id="settingsPostageStampId" className="form-control" onChange={handleSavePostageStampId} value={ postageStampId } />
             <div className="d-flex justify-content-end pt-2">
@@ -312,27 +312,27 @@ export const RemixUiSettings = (props: RemixUiSettingsProps) => {
     <div className="border-top">
     <div className="card-body pt-3 pb-2">
       <h6 className="card-title">{ ipfsSettingsText }</h6>
-      <div className="pt-2 mb-1"><label>IPFS HOST:</label>
+      <div className="pt-2 mb-0"><label>IPFS HOST:</label>
         <div className="text-secondary mb-0 h6">
           <input placeholder='e.g. ipfs.infura.io' id="settingsIpfsUrl" data-id="settingsIpfsUrl" className="form-control" onChange={handleSaveIpfsUrl} value={ ipfsUrl } />
         </div>
       </div>
-      <div className=""><label>IPFS PROTOCOL:</label>
+      <div className="pt-2 mb-0 pb-0"><label>IPFS PROTOCOL:</label>
         <div className="text-secondary mb-0 h6">
           <input placeholder='e.g. https' id="settingsIpfsProtocol" data-id="settingsIpfsProtocol" className="form-control" onChange={handleSaveIpfsProtocol} value={ ipfsProtocol } />
         </div>
       </div>
-      <div className=""><label>IPFS PORT:</label>
+      <div className="pt-2 mb-0 pb-0"><label>IPFS PORT:</label>
         <div className="text-secondary mb-0 h6">
           <input placeholder='e.g. 5001' id="settingsIpfsPort" data-id="settingsIpfsPort" className="form-control" onChange={handleSaveIpfsPort} value={ ipfsPort } />
         </div>
       </div>
-      <div className=""><label>IPFS PROJECT ID [ INFURA ]:</label>
+      <div className="pt-2 mb-0 pb-0"><label>IPFS PROJECT ID [ INFURA ]:</label>
         <div className="text-secondary mb-0 h6">
           <input id="settingsIpfsProjectId" data-id="settingsIpfsProjectId" className="form-control" onChange={handleSaveIpfsProjectId} value={ ipfsProjectId } />
         </div>
       </div>
-      <div className=""><label>IPFS PROJECT SECRET [ INFURA ]:</label>
+      <div className="pt-2 mb-0 pb-0"><label>IPFS PROJECT SECRET [ INFURA ]:</label>
         <div className="text-secondary mb-0 h6">
           <input id="settingsIpfsProjectSecret" data-id="settingsIpfsProjectSecret" className="form-control" type="password" onChange={handleSaveIpfsSecret} value={ ipfsProjectSecret } />
         </div>

libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx

@@ -543,17 +543,25 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
                 })
               } else if (Array.isArray(x.message)) {
                 return x.message.map((msg, i) => {
+                  if (!msg) msg = 'null'
                   if (React.isValidElement(msg)) {
                     return (
                       <div className="px-4 block" data-id="block" key={i}><span className={x.style}>{ msg }</span></div>
                     )
                   } else if (typeof msg === 'object') {
+                    let stringified
+                    try {
+                      stringified = JSON.stringify(msg)
+                    } catch (e) {
+                      console.error(e)
+                      stringified = '< value not displayable >'
+                    }
                     return (
-                      <div className={classNameBlock} data-id="block" key={i}><span className={x.style}>{ msg.value && typeof msg.value !== 'object' ? parse(msg.value) : JSON.stringify(msg) } </span></div>
+                      <div className={classNameBlock} data-id="block" key={i}><span className={x.style}>{ stringified } </span></div>
                     )
                   } else {
                     return (
-                      <div className={classNameBlock} data-id="block" key={i}><span className={x.style}>{msg? msg.toString() : null}</span></div>
+                      <div className={classNameBlock} data-id="block" key={i}><span className={x.style}>{msg ? msg.toString() : null}</span></div>
                     )
                   }
                 })

package.json

@@ -211,7 +211,7 @@
     "time-stamp": "^2.2.0",
     "ts-loader": "^9.2.6",
     "tslib": "^2.3.0",
-    "web3": "^1.5.1",
+    "web3": "^1.7.5",
     "winston": "^3.3.3",
     "ws": "^7.3.0"
   },