Merge branch 'master' into yann300-patch-66

Author: joeizang

libs/remix-core-plugin/src/lib/helpers/fetch-etherscan.ts

@@ -11,12 +11,52 @@ export const fetchContractFromEtherscan = async (plugin, endpoint: string | Netw
   if (!etherscanKey) etherscanKey = '2HKUX5ZVASZIKWJM8MIQVCRUVZ6JAWT531'
 
   if (etherscanKey) {
+    // Extract chain ID and build endpoint string once
+    let chainId = 1 // Default to Ethereum mainnet
+    let endpointStr: string
     if (typeof endpoint === 'object' && endpoint !== null && 'id' in endpoint && 'name' in endpoint) {
-      endpoint = endpoint.id == 1 ? 'api.etherscan.io' : 'api-' + endpoint.name + '.etherscan.io'
+      chainId = endpoint.id
+      const normalized = String(endpoint.name || '').toLowerCase()
+      endpointStr = endpoint.id == 1 ? 'api.etherscan.io' : 'api-' + normalized + '.etherscan.io'
+    } else {
+      endpointStr = endpoint as string
     }
     try {
-      data = await fetch('https://' + endpoint + '/api?module=contract&action=getsourcecode&address=' + contractAddress + '&apikey=' + etherscanKey)
-      data = await data.json()
+      // Prefer central V2 API host with chainid param (works across Etherscan-supported networks)
+      const v2CentralUrl = 'https://api.etherscan.io/v2/api?chainid=' + chainId + '&module=contract&action=getsourcecode&address=' + contractAddress + '&apikey=' + etherscanKey
+      let response = await fetch(v2CentralUrl)
+      const centralV2Status = response.status;
+      const centralV2StatusText = response.statusText;
+
+      // If central V2 not OK, try per-network V2, then per-network V1
+      if (!response.ok) {
+        const v2PerNetworkUrl = 'https://' + endpointStr + '/v2/api?chainid=' + chainId + '&module=contract&action=getsourcecode&address=' + contractAddress + '&apikey=' + etherscanKey
+        const v2PerNetworkResponse = await fetch(v2PerNetworkUrl)
+        const v2PerNetworkStatus = v2PerNetworkResponse.status;
+        const v2PerNetworkStatusText = v2PerNetworkResponse.statusText;
+        if (v2PerNetworkResponse.ok) {
+          response = v2PerNetworkResponse;
+        } else {
+          const v1Url = 'https://' + endpointStr + '/api?module=contract&action=getsourcecode&address=' + contractAddress + '&apikey=' + etherscanKey
+          const v1Response = await fetch(v1Url)
+          const v1Status = v1Response.status;
+          const v1StatusText = v1Response.statusText;
+          if (v1Response.ok) {
+            response = v1Response;
+          } else {
+            // All three endpoints failed, throw a descriptive error
+            throw new Error(
+              `All Etherscan API endpoints failed:\n` +
+              `Central V2: ${v2CentralUrl} [${centralV2Status} ${centralV2StatusText}]\n` +
+              `Per-network V2: ${v2PerNetworkUrl} [${v2PerNetworkStatus} ${v2PerNetworkStatusText}]\n` +
+              `Per-network V1: ${v1Url} [${v1Status} ${v1StatusText}]`
+            );
+          }
+        }
+      }
+
+      data = await response.json()
+
       // etherscan api doc https://docs.etherscan.io/api-endpoints/contracts
       if (data.message === 'OK' && data.status === "1") {
         if (data.result.length) {

libs/remix-ui/remix-ai-assistant/src/components/prompt.tsx

@@ -40,6 +40,8 @@ export interface PromptAreaProps {
   maximizePanel: () => Promise<void>
   aiMode: 'ask' | 'edit'
   setAiMode: React.Dispatch<React.SetStateAction<'ask' | 'edit'>>
+  isMaximized: boolean
+  setIsMaximized: React.Dispatch<React.SetStateAction<boolean>>
 }
 
 const _paq = (window._paq = window._paq || [])
@@ -77,7 +79,9 @@ export const PromptArea: React.FC<PromptAreaProps> = ({
   textareaRef,
   maximizePanel,
   aiMode,
-  setAiMode
+  setAiMode,
+  isMaximized,
+  setIsMaximized
 }) => {
 
   return (
@@ -155,7 +159,9 @@ export const PromptArea: React.FC<PromptAreaProps> = ({
             value={input}
             disabled={isStreaming}
             onFocus={() => {
-              maximizePanel()
+              if (!isMaximized) {
+                maximizePanel()
+              }
             }}
             onChange={e => {
               setInput(e.target.value)

libs/remix-ui/remix-ai-assistant/src/components/remix-ui-remix-ai-assistant.tsx

@@ -53,6 +53,7 @@ export const RemixUiRemixAiAssistant = React.forwardRef<
   const [isOllamaFailureFallback, setIsOllamaFailureFallback] = useState(false)
   const [aiMode, setAiMode] = useState<'ask' | 'edit'>('ask')
   const [themeTracker, setThemeTracker] = useState(null)
+  const [isMaximized, setIsMaximized] = useState(false)
 
   const historyRef = useRef<HTMLDivElement | null>(null)
   const modelBtnRef = useRef(null)
@@ -666,6 +667,7 @@ export const RemixUiRemixAiAssistant = React.forwardRef<
 
   const maximizePanel = async () => {
     await props.plugin.call('layout', 'maximisePinnedPanel')
+    setIsMaximized(true) // ensured that expansion of the panel is stateful
   }
 
   return (
@@ -759,6 +761,8 @@ export const RemixUiRemixAiAssistant = React.forwardRef<
           textareaRef={textareaRef}
           aiMode={aiMode}
           setAiMode={setAiMode}
+          isMaximized={isMaximized}
+          setIsMaximized={setIsMaximized}
         />
       </section>
     </div>