Desktop metamask 2

.github/workflows/pr-reminder.yml

@@ -17,7 +17,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
-        freeze-date: '2025-05-19T18:00:00Z'
+        freeze-date: '2025-06-16T18:00:00Z'
     - name: Reminder for standup
       if: github.event.schedule == '55 8 * * 1-5'
       uses: Aniket-Engg/pr-reviews-reminder-action@master

.github/workflows/run-sut.yml

@@ -14,7 +14,7 @@ jobs:
         with:
           node-version: 20.0.0
       - name: Run SUT Action
-        uses: EthereumRemix/sol-test@v1
+        uses: EthereumRemix/sol-test@v1.2
         with:
           test-path: 'apps/remix-ide/contracts/tests'
           compiler-version: '0.8.15'

CONTRIBUTING.md

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

README.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/XvMmgehAMq)
+[![Discord](https://img.shields.io/badge/join-discord-brightgreen.svg?style=flat&logo=discord)](https://discord.gg/XcvfUpZPsG)
 [![X Follow](https://img.shields.io/twitter/follow/ethereumremix?style=flat&logo=x&color=green)](https://x.com/ethereumremix)
 
 </div>
@@ -208,10 +208,10 @@ module.exports = {
     init(browser, done) // , 'http://localhost:8080', false)
   },
 ```
-- change package JSON to locally run all group tests:
+- change package JSON to locally run all group tests (point to appropriate config file depending on environment):
 
 ```
-    "nightwatch_local_debugger": "yarn run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/debugger_*.spec.js --env=chrome",
+    "nightwatch_local_debugger": "yarn run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch-chrome.js dist/apps/remix-ide-e2e/src/tests/debugger_*.spec.js --env=chrome",
 ```
 
 - run the build script to build the test files if you want to run the locally
@@ -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/XvMmgehAMq
+- Join Discord: https://discord.gg/XcvfUpZPsG

apps/contract-verification/src/app/Verifiers/AbstractVerifier.ts

@@ -4,8 +4,8 @@ import type { LookupResponse, SubmittedContract, VerificationResponse } from '..
 // Optional function definitions
 export interface AbstractVerifier {
   verifyProxy?(submittedContract: SubmittedContract): Promise<VerificationResponse>
-  checkVerificationStatus?(receiptId: string): Promise<VerificationResponse>
-  checkProxyVerificationStatus?(receiptId: string): Promise<VerificationResponse>
+  checkVerificationStatus?(receiptId: string, chainId: string): Promise<VerificationResponse>
+  checkProxyVerificationStatus?(receiptId: string, chainId: string): Promise<VerificationResponse>
 }
 
 export abstract class AbstractVerifier {

apps/contract-verification/src/app/Verifiers/EtherscanVerifier.ts

@@ -47,7 +47,6 @@ export class EtherscanVerifier extends AbstractVerifier {
     // TODO: Handle version Vyper contracts. This relies on Solidity metadata.
     const metadata = JSON.parse(compilerAbstract.data.contracts[submittedContract.filePath][submittedContract.contractName].metadata)
     const formData = new FormData()
-    formData.append('chainId', submittedContract.chainId)
     formData.append('codeformat', 'solidity-standard-json-input')
     formData.append('sourceCode', compilerAbstract.input.toString())
     formData.append('contractaddress', submittedContract.address)
@@ -56,6 +55,7 @@ export class EtherscanVerifier extends AbstractVerifier {
     formData.append('constructorArguements', submittedContract.abiEncodedConstructorArgs?.replace('0x', '') ?? '')
 
     const url = new URL(this.apiUrl + '/api')
+    url.searchParams.append('chainid', submittedContract.chainId)
     url.searchParams.append('module', 'contract')
     url.searchParams.append('action', 'verifysourcecode')
     if (this.apiKey) {
@@ -98,6 +98,7 @@ export class EtherscanVerifier extends AbstractVerifier {
     formData.append('expectedimplementation', submittedContract.address)
 
     const url = new URL(this.apiUrl + '/api')
+    url.searchParams.append('chainid', submittedContract.chainId)
     url.searchParams.append('module', 'contract')
     url.searchParams.append('action', 'verifyproxycontract')
     if (this.apiKey) {
@@ -129,8 +130,9 @@ export class EtherscanVerifier extends AbstractVerifier {
     return { status: 'pending', receiptId: verificationResponse.result }
   }
 
-  async checkVerificationStatus(receiptId: string): Promise<VerificationResponse> {
+  async checkVerificationStatus(receiptId: string, chainId: string): Promise<VerificationResponse> {
     const url = new URL(this.apiUrl + '/api')
+    url.searchParams.append('chainid', chainId)
     url.searchParams.append('module', 'contract')
     url.searchParams.append('action', 'checkverifystatus')
     url.searchParams.append('guid', receiptId)
@@ -173,8 +175,9 @@ export class EtherscanVerifier extends AbstractVerifier {
     return { status: 'unknown', receiptId }
   }
 
-  async checkProxyVerificationStatus(receiptId: string): Promise<VerificationResponse> {
+  async checkProxyVerificationStatus(receiptId: string, chainId: string): Promise<VerificationResponse> {
     const url = new URL(this.apiUrl + '/api')
+    url.searchParams.append('chainid', chainId)
     url.searchParams.append('module', 'contract')
     url.searchParams.append('action', 'checkproxyverification')
     url.searchParams.append('guid', receiptId)
@@ -216,6 +219,7 @@ export class EtherscanVerifier extends AbstractVerifier {
 
   async lookup(contractAddress: string, chainId: string): Promise<LookupResponse> {
     const url = new URL(this.apiUrl + '/api')
+    url.searchParams.append('chainid', chainId)
     url.searchParams.append('module', 'contract')
     url.searchParams.append('action', 'getsourcecode')
     url.searchParams.append('address', contractAddress)

apps/contract-verification/src/app/app.tsx

@@ -123,9 +123,9 @@ const App = () => {
             try {
               let response: VerificationResponse
               if (receipt.isProxyReceipt) {
-                response = await verifier.checkProxyVerificationStatus(receiptId)
+                response = await verifier.checkProxyVerificationStatus(receiptId, contract.chainId)
               } else {
-                response = await verifier.checkVerificationStatus(receiptId)
+                response = await verifier.checkVerificationStatus(receiptId, contract.chainId)
               }
               const { status, message, lookupUrl } = response
               receipt.status = status

apps/contract-verification/src/app/utils/default-apis.json

@@ -4,144 +4,110 @@
     "explorerUrl": "https://repo.sourcify.dev"
   },
   "Etherscan": {
+    "apiUrl": "https://api.etherscan.io/v2",
     "1": {
-      "apiUrl": "https://api.etherscan.io",
       "explorerUrl": "https://etherscan.io"
     },
     "56": {
-      "apiUrl": "https://api.bscscan.com",
       "explorerUrl": "https://bscscan.com"
     },
     "137": {
-      "apiUrl": "https://api.polygonscan.com",
       "explorerUrl": "https://polygonscan.com"
     },
     "250": {
-      "apiUrl": "https://api.ftmscan.com",
       "explorerUrl": "https://ftmscan.com"
     },
     "42161": {
-      "apiUrl": "https://api.arbiscan.io",
       "explorerUrl": "https://arbiscan.io"
     },
     "43114": {
-      "apiUrl": "https://api.snowtrace.io",
       "explorerUrl": "https://snowtrace.io"
     },
     "1285": {
-      "apiUrl": "https://api-moonriver.moonscan.io",
       "explorerUrl": "https://moonscan.io"
     },
     "1284": {
-      "apiUrl": "https://api-moonbeam.moonscan.io",
       "explorerUrl": "https://moonscan.io"
     },
     "25": {
-      "apiUrl": "https://api.cronoscan.com",
       "explorerUrl": "https://cronoscan.com"
     },
     "199": {
-      "apiUrl": "https://api.bttcscan.com",
       "explorerUrl": "https://bttcscan.com"
     },
     "10": {
-      "apiUrl": "https://api-optimistic.etherscan.io",
       "explorerUrl": "https://optimistic.etherscan.io"
     },
     "42220": {
-      "apiUrl": "https://api.celoscan.io",
       "explorerUrl": "https://celoscan.io"
     },
     "288": {
-      "apiUrl": "https://api.bobascan.com",
       "explorerUrl": "https://bobascan.com"
     },
     "100": {
-      "apiUrl": "https://api.gnosisscan.io",
       "explorerUrl": "https://gnosisscan.io"
     },
     "1101": {
-      "apiUrl": "https://api-zkevm.polygonscan.com",
       "explorerUrl": "https://zkevm.polygonscan.com"
     },
     "59144": {
-      "apiUrl": "https://api.lineascan.build",
       "explorerUrl": "https://lineascan.build"
     },
     "8453": {
-      "apiUrl": "https://api.basescan.org",
       "explorerUrl": "https://basescan.org"
     },
     "534352": {
-      "apiUrl": "https://api.scrollscan.com",
       "explorerUrl": "https://scrollscan.com"
     },
     "17000": {
-      "apiUrl": "https://api-holesky.etherscan.io",
       "explorerUrl": "https://holesky.etherscan.io"
     },
     "11155111": {
-      "apiUrl": "https://api-sepolia.etherscan.io",
       "explorerUrl": "https://sepolia.etherscan.io"
     },
     "97": {
-      "apiUrl": "https://api-testnet.bscscan.com",
       "explorerUrl": "https://bscscan.com"
     },
     "80001": {
-      "apiUrl": "https://api-testnet.polygonscan.com",
       "explorerUrl": "https://polygonscan.com"
     },
     "4002": {
-      "apiUrl": "https://api-testnet.ftmscan.com",
       "explorerUrl": "https://ftmscan.com"
     },
     "421611": {
-      "apiUrl": "https://api-testnet.arbiscan.io",
       "explorerUrl": "https://arbiscan.io"
     },
     "42170": {
-      "apiUrl": "https://api-nova.arbiscan.io",
       "explorerUrl": "https://nova.arbiscan.io"
     },
     "43113": {
-      "apiUrl": "https://api-testnet.snowtrace.io",
       "explorerUrl": "https://snowtrace.io"
     },
     "1287": {
-      "apiUrl": "https://api-moonbase.moonscan.io",
       "explorerUrl": "https://moonscan.io"
     },
     "338": {
-      "apiUrl": "https://api-testnet.cronoscan.com",
       "explorerUrl": "https://cronoscan.com"
     },
     "1028": {
-      "apiUrl": "https://api-testnet.bttcscan.com",
       "explorerUrl": "https://bttcscan.com"
     },
     "44787": {
-      "apiUrl": "https://api-alfajores.celoscan.io",
       "explorerUrl": "https://alfajores.celoscan.io"
     },
     "2888": {
-      "apiUrl": "https://api-testnet.bobascan.com",
       "explorerUrl": "https://bobascan.com"
     },
     "84532": {
-      "apiUrl": "https://api-sepolia.basescan.org",
       "explorerUrl": "https://sepolia.basescan.org"
     },
     "1442": {
-      "apiUrl": "https://api-testnet-zkevm.polygonscan.com",
       "explorerUrl": "https://zkevm.polygonscan.com"
     },
     "59140": {
-      "apiUrl": "https://api-testnet.lineascan.build",
       "explorerUrl": "https://lineascan.build"
     },
     "534351": {
-      "apiUrl": "https://api-sepolia.scrollscan.com",
       "explorerUrl": "https://sepolia.scrollscan.com"
     }
   },

apps/contract-verification/src/app/utils/default-settings.ts

@@ -13,12 +13,15 @@ export function mergeChainSettingsWithDefaults(chainId: string, userSettings: Co
     let defaultsForVerifier: VerifierSettings
     if (verifierId === 'Sourcify') {
       defaultsForVerifier = DEFAULT_APIS['Sourcify']
+    } else if (verifierId === 'Etherscan') {
+      const apiUrl = DEFAULT_APIS['Etherscan'].apiUrl
+      const explorerUrl = DEFAULT_APIS['Etherscan'][chainId]?.explorerUrl
+      defaultsForVerifier = { apiUrl, explorerUrl }
     } else if (verifierId === 'Routescan') {
       const routescanDefaults = DEFAULT_APIS['Routescan']
 
       if (!routescanDefaults[chainId]) {
         defaultsForVerifier = {}
-
       } else {
         const explorerUrl = routescanDefaults[chainId]?.type === 'mainnet' ? routescanDefaults.mainnetExplorerUrl : routescanDefaults.testnetExplorerUrl
         const apiUrl = routescanDefaults.apiUrl.replace('${CHAIN_TYPE}', routescanDefaults[chainId]?.type).replace('${CHAIN_ID}', chainId)

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

@@ -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"