Merge branch 'master' into mixins

apps/remix-ide/src/app.js

@@ -119,8 +119,6 @@ class AppComponent {
     this.engine = new RemixEngine()
     this.engine.register(appManager);
 
-
-
     const matomoDomains = {
       'remix-alpha.ethereum.org': 27,
       'remix-beta.ethereum.org': 25,
@@ -450,7 +448,11 @@ class AppComponent {
               if (
                 this.appManager.pluginLoader.current === 'queryParams' &&
                 this.workspace.length > 0
-              ) { this.menuicons.select(this.workspace[this.workspace.length - 1]) }
+              ) {
+                this.menuicons.select(this.workspace[this.workspace.length - 1])
+              } else {
+                this.appManager.call('tabs', 'focus', 'home')
+              }
             }
 
             if (params.call) {
@@ -484,19 +486,16 @@ class AppComponent {
                 }
               }
             }
-
-
           })
           .catch(console.error)
       }
       const loadedElement = document.createElement('span')
       loadedElement.setAttribute('data-id', 'apploaded')
       document.body.appendChild(loadedElement)
-
     })
+
     // activate solidity plugin
     this.appManager.activatePlugin(['solidity', 'udapp', 'deploy-libraries', 'link-libraries', 'openzeppelin-proxy'])
-    // Load and start the service who manager layout and frame
   }
 }
 

apps/remix-ide/src/app/providers/abstract-provider.tsx

@@ -13,7 +13,8 @@ export type JsonDataRequest = {
 export type JsonDataResult = {
   id: number,
   jsonrpc: string // version
-  result: any
+  result?: any,
+  error?: any,
 }
 
 export type RejectRequest = (error: Error) => void

apps/remix-ide/src/app/providers/injected-provider.tsx

@@ -57,14 +57,21 @@ export class InjectedProvider extends Plugin implements IProvider {
     // This will be displayed on UI tooltip as 'cannot get account list: Environment Updated !!'
     if (!this.provider) {
       this.call('notification', 'toast', 'No injected provider (e.g Metamask) has been found.')
-      return reject(new Error('no injected provider found.'))
+      return resolve({ jsonrpc: '2.0', error: 'no injected provider found', id: data.id })
     }
     try {
       if ((window as any) && typeof (window as any).ethereum.request === "function") (window as any).ethereum.request({ method: "eth_requestAccounts" });
-      const resultData = await this.provider.currentProvider.send(data.method, data.params)
-      resolve({ jsonrpc: '2.0', result: resultData.result, id: data.id })
+      let resultData = await this.provider.currentProvider.send(data.method, data.params)
+      if (resultData) {
+        if (resultData.jsonrpc && resultData.jsonrpc === '2.0') {
+          resultData = resultData.result
+        }
+        resolve({ jsonrpc: '2.0', result: resultData, id: data.id })
+      } else {
+        resolve({ jsonrpc: '2.0', error: 'no return data provided', id: data.id })
+      }
     } catch (error) {
-      reject(error)
+      resolve({ jsonrpc: '2.0', error: error.message, id: data.id })
     }
   }
 }

apps/remix-ide/src/app/providers/mainnet-vm-fork-provider.tsx

@@ -15,7 +15,7 @@ export class MainnetForkVMProvider extends BasicVMProvider {
     }, blockchain)
     this.blockchain = blockchain
     this.fork = 'london'
-    this.nodeUrl = 'https://rpc.archivenode.io/e50zmkroshle2e2e50zm0044i7ao04ym'
+    this.nodeUrl = 'https://mainnet.infura.io/v3/08b2a484451e4635a28b3d8234f24332'
     this.blockNumber = 'latest'
   }
 

apps/remix-ide/src/index.html

@@ -26,7 +26,7 @@
 	<meta http-equiv="X-UA-Compatible" content="chrome=1">
 	<title>Remix - Ethereum IDE</title>
 	<link rel="stylesheet" href="assets/css/pygment_trac.css">
-	<link rel="icon" type="x-icon" href="assets/img/icon.png">
+	<link rel="icon" type="x-icon" href="assets/img/remix-logo-blue.png">
 	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/intro.js/4.1.0/introjs.min.css">
 	<link rel="stylesheet" integrity="ha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf"
 		crossorigin="anonymous" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css">

apps/remix-ide/src/webpack.index.html

@@ -1,45 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-
-<head>
-	<meta charset="utf-8">
-	<!--
-		The MIT License (MIT)
-		Copyright (c) 2014, 2015, 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
-		in the Software without restriction, including without limitation the rights
-		to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-		copies of the Software, and to permit persons to whom the Software is
-		furnished to do so, subject to the following conditions:
-		The above copyright notice and this permission notice shall be included in
-		all copies or substantial portions of the Software.
-		THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-		IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-		FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-		AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-		LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-		OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-		THE SOFTWARE.
-		-->
-	<meta http-equiv="X-UA-Compatible" content="chrome=1">
-	<title>Remix - Ethereum IDE</title>
-	<link rel="stylesheet" href="assets/css/pygment_trac.css">
-	<link rel="icon" type="x-icon" href="assets/img/icon.png">
-	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/intro.js/4.1.0/introjs.min.css">
-	<link rel="stylesheet" integrity="ha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf"
-		crossorigin="anonymous" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css">
-	<script src="assets/js/browserfs.min.js"></script>
-	<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
-	<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/intro.js/2.7.0/introjs.min.css">
-</head>
-
-<body>
-
-	<div id="root"></div>
-	<script src="https://kit.fontawesome.com/41dd021e94.js" crossorigin="anonymous"></script>
-	<script type="text/javascript" src="assets/js/intro.min.js"></script>
-</body>
-
-</html>

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

@@ -1,7 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 // eslint-disable-next-line @nrwl/nx/enforce-module-boundaries
-import BasicLogo from 'libs/remix-ui/vertical-icons-panel/src/lib/components/BasicLogo'
-import { ThemeContext } from '../themeContext'
 import React, { useEffect, useState, useRef, useContext } from 'react'
 import { FormattedMessage, useIntl } from 'react-intl'
 import { CustomTooltip } from '@remix-ui/helper'
@@ -21,7 +19,6 @@ function HomeTabTitle() {
     searchDisable: true
   })
 
-  const themeFilter = useContext(ThemeContext)
   const searchInputRef = useRef(null)
   const remiAudioEl = useRef(null)
   const intl = useIntl()
@@ -52,13 +49,12 @@ function HomeTabTitle() {
 
   return (
     <div className="px-2 pb-2 pt-2 d-flex flex-column border-bottom" id="hTTitleSection">
-      
       <div className="d-flex py-2 justify-content-between">
         <div className='d-flex justify-content-start'>
-        <span className="h-80 text-uppercase" style={{ fontSize: 'xx-large', fontFamily: "Noah, sans-serif" }}>Remix</span>
+          <span className="h-80 text-uppercase" style={{ fontSize: 'xx-large', fontFamily: "Noah, sans-serif" }}>Remix</span>
           <div className="ml-2 d-flex">
             <div onClick={() => playRemi()} >
-              <img className="" src="assets/img/guitarRemiCroped.webp" style={{height: "3rem"}} alt=""></img>
+              <img className="" src="assets/img/guitarRemiCroped.webp" style={{ height: "3rem" }} alt=""></img>
             </div>
             <audio
               id="remiAudio"
@@ -68,7 +64,7 @@ function HomeTabTitle() {
             ></audio>
           </div>
         </div>
-        <span className="d-flex flex-nowrap">
+        <span className="d-flex flex-nowrap align-self-end">
           <CustomTooltip
             placement={'top'}
             tooltipId="overlay-tooltip"
@@ -81,10 +77,9 @@ function HomeTabTitle() {
                 openLink("https://www.youtube.com/channel/UCjTUPyFEr2xDGN6Cg8nKDaA")
                 _paq.push(['trackEvent', 'hometab', 'socialMedia', 'youtube'])
               }}
-              className="border-0 h-100 btn fab fa-youtube p-1 pl-2">
+              className="border-0 px-1 h-100 btn fab fa-youtube">
             </button>
           </CustomTooltip>
-
           <CustomTooltip
             placement={'top'}
             tooltipId="overlay-tooltip"
@@ -97,10 +92,9 @@ function HomeTabTitle() {
                 openLink("https://twitter.com/EthereumRemix")
                 _paq.push(['trackEvent', 'hometab', 'socialMedia', 'twitter'])
               }}
-              className="border-0 p-1 h-100 pl-2 btn fab fa-twitter">
+              className="border-0 px-1 h-100 btn fab fa-twitter">
             </button>
           </CustomTooltip>
-
           <CustomTooltip
             placement={'top'}
             tooltipId="overlay-tooltip"
@@ -113,10 +107,9 @@ function HomeTabTitle() {
                 openLink("https://www.linkedin.com/company/ethereum-remix/")
                 _paq.push(['trackEvent', 'hometab', 'socialmedia', 'linkedin'])
               }}
-              className="border-0 p-1 h-100 pl-2 btn fa fa-linkedin">
+              className="border-0 px-1 h-100 btn fa fa-linkedin">
             </button>
           </CustomTooltip>
-
           <CustomTooltip
             placement={'top'}
             tooltipId="overlay-tooltip"
@@ -129,7 +122,7 @@ function HomeTabTitle() {
                 openLink("https://medium.com/remix-ide")
                 _paq.push(['trackEvent', 'hometab', 'socialmedia', 'medium'])
               }}
-              className="border-0 p-1 h-100 pl-2 btn fab fa-medium">
+              className="border-0 h-100 px-1 btn fab fa-medium">
             </button>
           </CustomTooltip>
 
@@ -145,7 +138,7 @@ function HomeTabTitle() {
                 openLink("https://discord.gg/mh9hFCKkEq")
                 _paq.push(['trackEvent', 'hometab', 'socialmedia', 'discord'])
               }}
-              className="border-0 h-100 p-1 pr-2 btn fab fa-discord">
+              className="border-0 h-100 pl-1 pr-0 btn fab fa-discord">
             </button>
           </CustomTooltip>
         </span>

libs/remix-ui/solidity-compiler/src/lib/css/style.css

@@ -137,7 +137,7 @@
 .remixui_log {
   display: flex;
   flex-direction: column;
-  margin-bottom: 5%;
+  margin-bottom: 0.5rem;
   overflow: visible;
 }
 .remixui_key {