Merge branch 'master' of https://github.com/ethereum/remix-project

Author: STetsing

.circleci/config.yml

@@ -18,7 +18,9 @@ stats.json
 release
 .env
 .env.local
-
+.idea/
+.yalc/
+.yalc
 
 # compiled output
 /dist

.gitignore

@@ -1,6 +1,6 @@
 # Contributing
 
-Everyone is welcome to contribute to Remix's codebase and please join our [Discord](https://discord.gg/XcvfUpZPsG).
+Everyone is welcome to contribute to Remix's codebase and please join our [Discord](https://discord.gg/7RvvZ4KX9P).
 
 ## Development
 Remix libraries work closely with [Remix IDE](https://remix.ethereum.org). Each library has a README to explain its application.

CONTRIBUTING.md

@@ -12,7 +12,7 @@
 [![GitHub contributors](https://img.shields.io/github/contributors/ethereum/remix-project?style=flat&logo=github)](https://github.com/ethereum/remix-project/graphs/contributors)
 [![Awesome Remix](https://img.shields.io/badge/Awesome--Remix-resources-green?logo=awesomelists)](https://github.com/ethereum/awesome-remix)
 [![GitHub](https://img.shields.io/github/license/ethereum/remix-project)](https://github.com/ethereum/remix-project/blob/master/LICENSE)
-[![Discord](https://img.shields.io/badge/join-discord-brightgreen.svg?style=flat&logo=discord)](https://discord.gg/XcvfUpZPsG)
+[![Discord](https://img.shields.io/badge/join-discord-brightgreen.svg?style=flat&logo=discord)](https://discord.gg/7RvvZ4KX9P)
 [![X Follow](https://img.shields.io/twitter/follow/ethereumremix?style=flat&logo=x&color=green)](https://x.com/ethereumremix)
 
 </div>
@@ -267,4 +267,4 @@ parameters:
 - Curated list of Remix resources: https://github.com/ethereum/awesome-remix
 - Medium: https://medium.com/remix-ide
 - X: https://x.com/ethereumremix
-- Join Discord: https://discord.gg/XcvfUpZPsG
+- Join Discord: https://discord.gg/7RvvZ4KX9P

README.md

@@ -0,0 +1,103 @@
+#!/usr/bin/env bash
+# Usage: chrome-driver.sh [install_dir]
+# Determine install directory from first argument or ORB_PARAM_DRIVER_INSTALL_DIR
+INSTALL_DIR=${1:-${ORB_PARAM_DRIVER_INSTALL_DIR:-"./tmp/webdrivers"}}
+echo "Installing ChromeDriver into $INSTALL_DIR"
+
+# Determine the OS platform
+OS="$(uname)"
+
+if [ "$OS" == "Darwin" ]; then
+  # macOS systems
+  if [ -e "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" ]; then
+    version=$("/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" --version)
+    echo "Google Chrome version on macOS: $version"
+  else
+    echo "Google Chrome is not installed on your macOS."
+  fi
+elif [ "$OS" == "Linux" ]; then
+  # Linux systems
+  if command -v google-chrome >/dev/null; then
+    version=$(google-chrome --version)
+    echo "Google Chrome version on Linux: $version"
+  else
+    echo "Google Chrome is not installed on your Linux."
+    # exit without error
+    exit 0
+  fi
+else
+  echo "Unsupported OS."
+  exit 0
+fi
+
+MAJORVERSION=$(echo "$version" | grep -Eo '[0-9]+' | head -1)
+echo "CHROME DRIVER INSTALL $MAJORVERSION"
+
+# Determine target platform for ChromeDriver download
+case "$OS" in
+  Darwin)
+    if [[ "$(uname -m)" == "arm64" ]]; then
+      PLATFORM="mac-arm64"
+    else
+      PLATFORM="mac-x64"
+    fi
+    ;;
+  Linux)
+    PLATFORM="linux64"
+    ;;
+  *)
+    echo "Unsupported OS: $OS"; exit 1
+    ;;
+esac
+echo "Detected platform for download: $PLATFORM"
+
+# Determine ChromeDriver version and download URL
+if [ "$MAJORVERSION" -lt 115 ]; then
+  # Chrome <115: use storage.googleapis.com
+  CHROMEDRIVER_VERSION=$(curl -sS "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_${MAJORVERSION}" | tr -d '\r')
+  CHROMEDRIVER_DOWNLOAD_URL="https://chromedriver.storage.googleapis.com/${CHROMEDRIVER_VERSION}/chromedriver_${PLATFORM}.zip"
+else
+  # Chrome >=115: use Chrome for Testing JSON feed
+  FEED_URL="https://googlechromelabs.github.io/chrome-for-testing/latest-versions-per-milestone-with-downloads.json"
+  CHROMEDRIVER_VERSION=$(curl -sS "$FEED_URL" | jq -r ".milestones.\"$MAJORVERSION\".version")
+  CHROMEDRIVER_DOWNLOAD_URL=$(curl -sS "$FEED_URL" \
+    | jq -r ".milestones.\"$MAJORVERSION\".downloads.chromedriver[] \
+      | select(.platform==\"$PLATFORM\").url")
+fi
+
+echo "Matching ChromeDriver version: $CHROMEDRIVER_VERSION"
+echo "Downloading ChromeDriver from $CHROMEDRIVER_DOWNLOAD_URL"
+ 
+# Prepare install directory
+mkdir -p "$INSTALL_DIR"
+
+# Download and install ChromeDriver
+ZIP_PATH="${INSTALL_DIR}/chromedriver_${PLATFORM}.zip"
+curl -sS -o "$ZIP_PATH" "$CHROMEDRIVER_DOWNLOAD_URL"
+unzip -o "$ZIP_PATH" -d "$INSTALL_DIR"
+
+# Move the extracted chromedriver binary to the root of INSTALL_DIR
+EXTRACTED_DIR="${INSTALL_DIR}/chromedriver-${PLATFORM}"
+ALT_DIR="${INSTALL_DIR}/chromedriver_${PLATFORM}"
+
+if [ -f "${EXTRACTED_DIR}/chromedriver" ]; then
+  mv "${EXTRACTED_DIR}/chromedriver" "$INSTALL_DIR/chromedriver"
+elif [ -f "${ALT_DIR}/chromedriver" ]; then
+  mv "${ALT_DIR}/chromedriver" "$INSTALL_DIR/chromedriver"
+else
+  # Fallback: try to find chromedriver file inside any subdir
+  FOUND=$(find "$INSTALL_DIR" -type f -name chromedriver | head -n1)
+  if [ -n "$FOUND" ]; then
+    mv "$FOUND" "$INSTALL_DIR/chromedriver"
+  else
+    echo "Error: chromedriver binary not found"
+    exit 1
+  fi
+fi
+
+chmod +x "$INSTALL_DIR/chromedriver"
+# Cleanup extracted directory and zip
+rm -rf "$EXTRACTED_DIR"
+rm -f "$ZIP_PATH"
+
+echo "ChromeDriver installed at $INSTALL_DIR/chromedriver"

apps/remix-ide-e2e/chrome-driver.sh

@@ -1,31 +1,4 @@
 #!/bin/bash
-
-# Determine the OS platform
-OS="$(uname)"
-
-if [ "$OS" == "Darwin" ]; then
-  # macOS systems
-  if [ -e "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" ]; then
-    version=$("/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" --version)
-    echo "Google Chrome version on macOS: $version"
-  else
-    echo "Google Chrome is not installed on your macOS."
-  fi
-elif [ "$OS" == "Linux" ]; then
-  # Linux systems
-  if command -v google-chrome >/dev/null; then
-    version=$(google-chrome --version)
-    echo "Google Chrome version on Linux: $version"
-  else
-    echo "Google Chrome is not installed on your Linux."
-  fi
-else
-  echo "Unsupported OS."
-fi
-
-MAJORVERSION=$(echo "$version" | grep -Eo '[0-9]+\.' | head -1 | cut -d'.' -f1)
-echo "CHROME DRIVER INSTALL $MAJORVERSION"
-
 # Specify the directory to check
 directory="./tmp/webdrivers"
 
@@ -39,4 +12,6 @@ fi
 
 
 yarn init -y --cwd "$directory" || exit 1
-yarn add -D [email protected] geckodriver --cwd  "$directory" ||  yarn add -D [email protected] geckodriver --cwd  "$directory" || yarn add -D chromedriver geckodriver --cwd  "$directory" || exit 1
+yarn add -D geckodriver --cwd  "$directory" ||  exit 1
+
+bash apps/remix-ide-e2e/chrome-driver.sh || exit 1

apps/remix-ide-e2e/install-webdriver.sh

@@ -11,7 +11,7 @@ module.exports = {
   webdriver: {
     start_process: true,
     port: 9515,
-    server_path: './tmp/webdrivers/node_modules/chromedriver/bin/chromedriver',
+    server_path: './tmp/webdrivers/chromedriver',
   },
 
   test_settings: {

apps/remix-ide-e2e/nightwatch-chrome.ts

@@ -35,7 +35,7 @@ module.exports = {
         'javascriptEnabled': true,
         'acceptSslCerts': true,
         'moz:firefoxOptions': {
-          args: ['-width=2560', '-height=1440']
+          args: ['-width=2560', '-height=1440', '--devtools']
         }
       }
     },

apps/remix-ide-e2e/nightwatch-firefox.ts

@@ -3,8 +3,8 @@ import EventEmitter from 'events'
 
 class AddFile extends EventEmitter {
   command(this: NightwatchBrowser, name: string, content: NightwatchContractContent, readMeFile?:string): NightwatchBrowser {
-    if(!readMeFile)
-      readMeFile = 'README.txt' 
+    if (!readMeFile)
+      readMeFile = 'README.txt'
     this.api.perform((done) => {
       addFile(this.api, name, content, readMeFile, () => {
         done()
@@ -28,6 +28,10 @@ function addFile(browser: NightwatchBrowser, name: string, content: NightwatchCo
         browser.clickLaunchIcon('filePanel')
       }
     })
+    .execute(function () {
+      const container = document.querySelector('[data-test-id="virtuoso-scroller"]');
+      container.scrollTop = container.scrollHeight;
+    })
     .scrollInto(readmeSelector)
     .waitForElementVisible(readmeSelector)
     .click(readmeSelector).pause(1000) // focus on root directory
@@ -63,7 +67,7 @@ function addFile(browser: NightwatchBrowser, name: string, content: NightwatchCo
           })
           .setEditorValue(content.content)
           .getEditorValue((result) => {
-            if(result != content.content) {
+            if (result != content.content) {
               browser.setEditorValue(content.content)
             }
           })

apps/remix-ide-e2e/src/commands/addFile.ts

@@ -0,0 +1,52 @@
+import { NightwatchBrowser } from 'nightwatch'
+import EventEmitter from 'events'
+
+class AssistantAddCtx extends EventEmitter {
+  command(this: NightwatchBrowser, prompt: string): NightwatchBrowser {
+    this.api.perform((done) => {
+      selectCtx(this.api, prompt, () => {
+        done()
+        this.emit('complete')
+      })
+    })
+    return this
+  }
+}
+
+function selectCtx(browser: NightwatchBrowser, ctx: string, done: VoidFunction) {
+  browser
+    .waitForElementVisible('*[data-id="remix-ai-assistant"]')
+    .waitForElementVisible('*[data-id="composer-ai-add-context"]')
+    .click({
+      locateStrategy: 'xpath',
+      selector: '//*[@data-id="composer-ai-add-context"]'
+    })
+    .waitForElementVisible('*[data-id="currentFile-context-option"]')
+    .perform(async ()=> {
+      switch (ctx) {
+      case 'currentFile':
+        browser.click({
+          locateStrategy: 'xpath',
+          selector: '//*[@data-id="currentFile-context-option"]'
+        });
+        break;
+      case 'workspace':
+        browser.click({
+          locateStrategy: 'xpath',
+          selector: '//*[@data-id="workspace-context-option"]'
+        });
+        break;
+      case 'openedFiles':
+        browser.click({
+          locateStrategy: 'xpath',
+          selector: '//*[@data-id="allOpenedFiles-context-option"]'
+        });
+        break;
+      default:
+        break;
+      }
+    })
+  done()
+}
+
+module.exports = AssistantAddCtx;