Merge branch 'master' into evmver-chainid-map

ethereum · Oct 24, 2024 · 10104bc · 10104bc
2 parents 60b8861 + bfbba68
commit 10104bc
Show file tree

Hide file tree

Showing 20 changed files with 119 additions and 90 deletions.
diff --git a/apps/contract-verification/src/app/components/NavMenu.tsx b/apps/contract-verification/src/app/components/NavMenu.tsx
@@ -11,7 +11,7 @@ const NavItem: React.FC<NavItemProps> = ({ to, icon, title }) => {
   return (
     <NavLink
       to={to}
-      className={({ isActive }) => 'text-decoration-none d-flex px-1 flex-column justify-content-center small ' + (isActive ? "bg-light" : "bg-transparent")}
+      className={({ isActive }) => 'text-decoration-none d-flex px-1 py-1 flex-column justify-content-center small ' + (isActive ? "bg-light border-top border-left border-right" : "border-0 bg-transparent")}
     >
       <span className=''>
         <span>{icon}</span>

diff --git a/apps/remix-ide/src/app/plugins/remixGuide.tsx b/apps/remix-ide/src/app/plugins/remixGuide.tsx
diff --git a/apps/remix-ide/src/remixAppManager.js b/apps/remix-ide/src/remixAppManager.js
@@ -83,7 +83,6 @@ let requiredModules = [
   'dgit',
   'pinnedPanel',
   'pluginStateLogger',
-  //'remixGuide',
   'environmentExplorer',
   'templateSelection',
   'matomo',
@@ -93,7 +92,7 @@ let requiredModules = [
 // dependentModules shouldn't be manually activated (e.g hardhat is activated by remixd)
 const dependentModules = ['foundry', 'hardhat', 'truffle', 'slither']
 
-const loadLocalPlugins = ['doc-gen', 'doc-viewer', 'etherscan', 'contract-verification', 'vyper', 'solhint', 'walletconnect', 'circuit-compiler', 'learneth', 'quick-dapp']
+const loadLocalPlugins = ['doc-gen', 'doc-viewer', 'contract-verification', 'vyper', 'solhint', 'walletconnect', 'circuit-compiler', 'learneth', 'quick-dapp']
 
 const partnerPlugins = ['cookbookdev']
 
@@ -138,7 +137,7 @@ export function isNative(name) {
     'circuit-compiler',
     'compilationDetails',
     'vyperCompilationDetails',
-    //'remixGuide',
+    'remixGuide',
     'environmentExplorer',
     'templateSelection',
     'walletconnect',
@@ -410,7 +409,8 @@ class PluginLoader {
       'compilationDetails',
       'walletconnect',
       'dapp-draft',
-      'solidityumlgen'
+      'solidityumlgen',
+      'remixGuide'
     ]
     this.loaders = {}
     this.loaders.localStorage = {

diff --git a/libs/ghaction-helper/package.json b/libs/ghaction-helper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/ghaction-helper",
-  "version": "0.1.38",
+  "version": "0.1.39",
   "description": "Solidity Tests GitHub Action Helper",
   "main": "src/index.js",
   "scripts": {
@@ -19,17 +19,17 @@
   },
   "homepage": "https://github.com/ethereum/remix-project#readme",
   "devDependencies": {
-    "@remix-project/remix-solidity": "^0.5.44",
+    "@remix-project/remix-solidity": "^0.5.45",
     "@types/chai": "^4.3.4",
     "typescript": "^4.9.3"
   },
   "dependencies": {
     "@ethereum-waffle/chai": "^3.4.4",
-    "@remix-project/remix-simulator": "^0.2.58",
+    "@remix-project/remix-simulator": "^0.2.59",
     "chai": "^4.3.7",
     "ethers": "^5.7.2",
     "web3": "^4.1.1"
   },
   "types": "./src/index.d.ts",
-  "gitHead": "1beb79ae8b8269ba42440169ae8674b82f2ef034"
+  "gitHead": "0875db01e67e48861e55a44fc8293e4c4bf58d91"
 }
diff --git a/libs/remix-analyzer/package.json b/libs/remix-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-analyzer",
-  "version": "0.5.67",
+  "version": "0.5.68",
   "description": "Tool to perform static analysis on Solidity smart contracts",
   "scripts": {
     "test": "./../../node_modules/.bin/ts-node --project ../../tsconfig.base.json --require tsconfig-paths/register ./../../node_modules/.bin/tape ./test/tests.ts"
@@ -25,8 +25,8 @@
     "@ethereumjs/tx": "5.4.0",
     "@ethereumjs/util": "9.1.0",
     "@ethereumjs/vm": "8.1.1",
-    "@remix-project/remix-astwalker": "^0.0.88",
-    "@remix-project/remix-lib": "^0.5.65",
+    "@remix-project/remix-astwalker": "^0.0.89",
+    "@remix-project/remix-lib": "^0.5.66",
     "async": "^2.6.2",
     "ethers": "^5.4.2",
     "ethjs-util": "^0.1.6",
@@ -50,6 +50,6 @@
     "typescript": "^3.7.5"
   },
   "typings": "src/index.d.ts",
-  "gitHead": "1beb79ae8b8269ba42440169ae8674b82f2ef034",
+  "gitHead": "0875db01e67e48861e55a44fc8293e4c4bf58d91",
   "main": "./src/index.js"
 }
diff --git a/libs/remix-astwalker/package.json b/libs/remix-astwalker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-astwalker",
-  "version": "0.0.88",
+  "version": "0.0.89",
   "description": "Tool to walk through Solidity AST",
   "main": "src/index.js",
   "scripts": {
@@ -37,7 +37,7 @@
     "@ethereumjs/tx": "5.4.0",
     "@ethereumjs/util": "9.1.0",
     "@ethereumjs/vm": "8.1.1",
-    "@remix-project/remix-lib": "^0.5.65",
+    "@remix-project/remix-lib": "^0.5.66",
     "@types/tape": "^4.2.33",
     "async": "^2.6.2",
     "ethers": "^5.4.2",
@@ -53,6 +53,6 @@
     "tap-spec": "^5.0.0"
   },
   "typings": "src/index.d.ts",
-  "gitHead": "1beb79ae8b8269ba42440169ae8674b82f2ef034",
+  "gitHead": "0875db01e67e48861e55a44fc8293e4c4bf58d91",
   "types": "./src/index.d.ts"
 }
diff --git a/libs/remix-debug/package.json b/libs/remix-debug/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-debug",
-  "version": "0.5.58",
+  "version": "0.5.59",
   "description": "Tool to debug Ethereum transactions",
   "contributors": [
     {
@@ -26,10 +26,10 @@
     "@ethereumjs/tx": "5.4.0",
     "@ethereumjs/util": "9.1.0",
     "@ethereumjs/vm": "8.1.1",
-    "@remix-project/remix-astwalker": "^0.0.88",
-    "@remix-project/remix-lib": "^0.5.65",
-    "@remix-project/remix-simulator": "^0.2.58",
-    "@remix-project/remix-solidity": "^0.5.44",
+    "@remix-project/remix-astwalker": "^0.0.89",
+    "@remix-project/remix-lib": "^0.5.66",
+    "@remix-project/remix-simulator": "^0.2.59",
+    "@remix-project/remix-solidity": "^0.5.45",
     "ansi-gray": "^0.1.1",
     "async": "^2.6.2",
     "color-support": "^1.1.3",
@@ -69,6 +69,6 @@
   },
   "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-debug#readme",
   "typings": "src/index.d.ts",
-  "gitHead": "1beb79ae8b8269ba42440169ae8674b82f2ef034",
+  "gitHead": "0875db01e67e48861e55a44fc8293e4c4bf58d91",
   "types": "./src/index.d.ts"
 }
diff --git a/libs/remix-lib/package.json b/libs/remix-lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-lib",
-  "version": "0.5.65",
+  "version": "0.5.66",
   "description": "Library to various Remix tools",
   "contributors": [
     {
@@ -55,6 +55,6 @@
   },
   "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-lib#readme",
   "typings": "src/index.d.ts",
-  "gitHead": "1beb79ae8b8269ba42440169ae8674b82f2ef034",
+  "gitHead": "0875db01e67e48861e55a44fc8293e4c4bf58d91",
   "types": "./src/index.d.ts"
 }
diff --git a/libs/remix-simulator/package.json b/libs/remix-simulator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-simulator",
-  "version": "0.2.58",
+  "version": "0.2.59",
   "description": "Ethereum IDE and tools for the web",
   "contributors": [
     {
@@ -23,7 +23,7 @@
     "@ethereumjs/util": "9.1.0",
     "@ethereumjs/vm": "8.1.1",
     "@metamask/eth-sig-util": "^7.0.2",
-    "@remix-project/remix-lib": "^0.5.65",
+    "@remix-project/remix-lib": "^0.5.66",
     "ansi-gray": "^0.1.1",
     "async": "^3.1.0",
     "body-parser": "^1.18.2",
@@ -71,6 +71,6 @@
   },
   "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-simulator#readme",
   "typings": "src/index.d.ts",
-  "gitHead": "1beb79ae8b8269ba42440169ae8674b82f2ef034",
+  "gitHead": "0875db01e67e48861e55a44fc8293e4c4bf58d91",
   "types": "./src/index.d.ts"
 }
diff --git a/libs/remix-solidity/package.json b/libs/remix-solidity/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-solidity",
-  "version": "0.5.44",
+  "version": "0.5.45",
   "description": "Tool to load and run Solidity compiler",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -19,7 +19,7 @@
     "@ethereumjs/tx": "5.4.0",
     "@ethereumjs/util": "9.1.0",
     "@ethereumjs/vm": "8.1.1",
-    "@remix-project/remix-lib": "^0.5.65",
+    "@remix-project/remix-lib": "^0.5.66",
     "async": "^2.6.2",
     "eslint-scope": "^5.0.0",
     "ethers": "^5.4.2",
@@ -57,5 +57,5 @@
   },
   "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-solidity#readme",
   "typings": "src/index.d.ts",
-  "gitHead": "1beb79ae8b8269ba42440169ae8674b82f2ef034"
+  "gitHead": "0875db01e67e48861e55a44fc8293e4c4bf58d91"
 }
diff --git a/libs/remix-tests/package.json b/libs/remix-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-tests",
-  "version": "0.2.58",
+  "version": "0.2.59",
   "description": "Tool to test Solidity smart contracts",
   "main": "src/index.js",
   "types": "./src/index.d.ts",
@@ -41,9 +41,9 @@
     "@ethereumjs/tx": "5.4.0",
     "@ethereumjs/util": "9.1.0",
     "@ethereumjs/vm": "8.1.1",
-    "@remix-project/remix-lib": "^0.5.65",
-    "@remix-project/remix-simulator": "^0.2.58",
-    "@remix-project/remix-solidity": "^0.5.44",
+    "@remix-project/remix-lib": "^0.5.66",
+    "@remix-project/remix-simulator": "^0.2.59",
+    "@remix-project/remix-solidity": "^0.5.45",
     "@remix-project/remix-url-resolver": "^0.0.42",
     "ansi-gray": "^0.1.1",
     "async": "^2.6.0",
@@ -89,5 +89,5 @@
     "@ethereumjs/trie": "6.2.1"
   },
   "typings": "src/index.d.ts",
-  "gitHead": "1beb79ae8b8269ba42440169ae8674b82f2ef034"
+  "gitHead": "0875db01e67e48861e55a44fc8293e4c4bf58d91"
 }
diff --git a/libs/remix-ui/home-tab/src/lib/components/homeTabFeatured.tsx b/libs/remix-ui/home-tab/src/lib/components/homeTabFeatured.tsx
@@ -18,6 +18,11 @@ function HomeTabFeatured(props:HomeTabFeaturedProps) {
     props.plugin.verticalIcons.select('LearnEth')
     _paq.push(['trackEvent', 'hometab', 'featuredSection', 'LearnEth'])
   }
+  const handleStartRemixGuide = async () => {
+    _paq.push(['trackEvent', 'hometab', 'featuredSection', 'watchOnRemixGuide'])
+    await props.plugin.appManager.activatePlugin(['remixGuide'])
+    await props.plugin.call('tabs', 'focus', 'remixGuide')
+  }
   return (
     <div className="pt-1 pl-2" id="hTFeaturedeSection">
       <div className="mb-2 remix_ui-carousel-container">
@@ -80,19 +85,18 @@ function HomeTabFeatured(props:HomeTabFeaturedProps) {
                   <div style={{ fontSize: '0.8rem', lineHeight: '1.25rem' }} className="mb-3">
                     <FormattedMessage id="home.learnEthPromoText" />
                   </div>
-                  <span
+                  <button
                     className="remixui_home_text btn-sm btn-secondary mt-2 text-decoration-none mb-3"
-                    style={{ cursor: 'pointer' }}
                     onClick={()=>handleStartLearneth()}
                   >
                     <FormattedMessage id="home.learnEthPromoButton" />
-                  </span>
+                  </button>
                 </div>
               </div>
               <div className="mr-1 pr-1 d-flex align-items-center justify-content-center h-100">
-                <a href="https://www.youtube.com/@EthereumRemix/videos" target="__blank">
+                <button className="btn" onClick={() => handleStartRemixGuide()}>
                   <img src={'assets/img/YouTubeLogo.webp'} className="remixui_carouselImage" alt=""></img>
-                </a>
+                </button>
                 <div className="h6 w-50 p-2 pl-4  align-self-center" style={{ flex: '1' }}>
                   <h5>
                     <FormattedMessage id="home.remixYouTube" />
@@ -103,14 +107,12 @@ function HomeTabFeatured(props:HomeTabFeaturedProps) {
                   <div style={{ fontSize: '0.8rem' }} className="mb-3">
                     <FormattedMessage id="home.remixYouTubeText2" />
                   </div>
-                  <a
+                  <button
                     className="remixui_home_text btn-sm btn-secondary mt-2 text-decoration-none mb-3"
-                    onClick={() => _paq.push(['trackEvent', 'hometab', 'featuredSection', 'youTubeMore'])}
-                    target="__blank"
-                    href="https://www.youtube.com/@EthereumRemix/videos"
+                    onClick={() => handleStartRemixGuide()}
                   >
                     <FormattedMessage id="home.remixYouTubeMore" />
-                  </a>
+                  </button>
                 </div>
               </div>
             </Carousel>

diff --git a/libs/remix-ui/home-tab/src/lib/components/homeTabFeaturedPlugins.tsx b/libs/remix-ui/home-tab/src/lib/components/homeTabFeaturedPlugins.tsx
@@ -122,7 +122,7 @@ function HomeTabFeaturedPlugins({ plugin }: HomeTabFeaturedPluginsProps) {
               description={intl.formatMessage({
                 id: 'home.codeAnalyizerPluginDesc'
               })}
-              remixMaintained={true}
+              maintainedBy='Remix'
               callback={() => startCodeAnalyzer()}
             />
             <PluginButton
@@ -132,31 +132,31 @@ function HomeTabFeaturedPlugins({ plugin }: HomeTabFeaturedPluginsProps) {
               description={intl.formatMessage({
                 id: 'home.learnEthPluginDesc'
               })}
-              remixMaintained={true}
+              maintainedBy='Remix'
               callback={() => startLearnEth()}
             />
             <PluginButton
               imgPath="assets/img/cookbook.webp"
               envID="cookbookLogo"
               envText="Cookbook"
               description={intl.formatMessage({ id: 'home.cookbookDesc' })}
-              remixMaintained={false}
+              maintainedBy="Cookbook"
               callback={() => startCookbook()}
             />
             <PluginButton
               imgPath="assets/img/solidityLogo.webp"
               envID="solidityLogo"
               envText="Solidity"
               description={intl.formatMessage({ id: 'home.solidityPluginDesc' })}
-              remixMaintained={true}
+              maintainedBy='Remix'
               callback={() => startSolidity()}
             />
             <PluginButton
               imgPath="assets/img/unitTesting.webp"
               envID="sUTLogo"
               envText="Solidity unit testing"
               description={intl.formatMessage({ id: 'home.unitTestPluginDesc' })}
-              remixMaintained={true}
+              maintainedBy='Remix'
               callback={() => startSolidityUnitTesting()}
             />
           </Carousel>

diff --git a/libs/remix-ui/home-tab/src/lib/components/pluginButton.tsx b/libs/remix-ui/home-tab/src/lib/components/pluginButton.tsx
@@ -10,10 +10,10 @@ interface PluginButtonProps {
   callback: any
   l2?: boolean
   description: string
-  remixMaintained?: boolean
+  maintainedBy?: string
 }
 
-function PluginButton({ imgPath, envID, envText, callback, l2, description, remixMaintained }: PluginButtonProps) {
+function PluginButton({ imgPath, envID, envText, callback, l2, description, maintainedBy }: PluginButtonProps) {
   const themeFilter = useContext(ThemeContext)
 
   return (
@@ -30,13 +30,17 @@ function PluginButton({ imgPath, envID, envText, callback, l2, description, remi
         </div>
       </button>
       {l2 && <label className="bg-light mx-1 px-1 mb-0 mx-2 position-absolute remixui_home_l2Label">L2</label>}
-      {remixMaintained ? (
+      { maintainedBy?.toLowerCase() === 'remix' ? (
         <CustomTooltip placement="bottom" tooltipId="overlay-tooltip-by-remix" tooltipText={<FormattedMessage id="home.maintainedByRemix" />}>
           <i className="bg-light text-success mx-1 px-1 mb-0 mx-2 position-absolute remixui_home_maintainedLabel fas fa-check"></i>
-        </CustomTooltip>)
-        : (<CustomTooltip placement="bottom" tooltipId="overlay-tooltip-external" tooltipText={<FormattedMessage id="panel.maintainedExternally" />}>
-          <i aria-hidden="true" className="bg-light mx-1 px-1 mb-0 mx-2 position-absolute remixui_home_maintainedLabel  text-warning far fa-exclamation-circle"></i>
-        </CustomTooltip>)
+        </CustomTooltip>) :
+        maintainedBy ?
+          (<CustomTooltip placement="bottom" tooltipId="overlay-tooltip-external" tooltipText={"Maintained by " + maintainedBy}>
+            <i aria-hidden="true" className="bg-light mx-1 px-1 mb-0 mx-2 position-absolute remixui_home_maintainedLabel text-secondary far fa-exclamation-circle"></i>
+          </CustomTooltip>)
+          : (<CustomTooltip placement="bottom" tooltipId="overlay-tooltip-external" tooltipText={<FormattedMessage id="panel.maintainedExternally" />}>
+            <i aria-hidden="true" className="bg-light mx-1 px-1 mb-0 mx-2 position-absolute remixui_home_maintainedLabel text-secondary far fa-exclamation-circle"></i>
+          </CustomTooltip>)
       }
     </div>
   )