Merge branch 'master' into updated-contributions

apps/remix-ide/src/app/plugins/remixAIPlugin.tsx

@@ -13,7 +13,7 @@ type chatRequestBufferT<T> = {
 
 const profile = {
   name: 'remixAI',
-  displayName: 'Remix AI',
+  displayName: 'RemixAI',
   methods: ['code_generation', 'code_completion',
     "solidity_answer", "code_explaining",
     "code_insertion", "error_explaining",

apps/remix-ide/src/app/tabs/locales/en/remixUiTabs.json

@@ -6,7 +6,7 @@
   "remixUiTabs.tooltipText5": "Explain the contract(s) in current file [BETA]",
   "remixUiTabs.tooltipText6": "Enable RemixAI Copilot [BETA]",
   "remixUiTabs.tooltipText7": "Disable RemixAI Copilot [BETA]",
-  "remixUiTabs.tooltipText8": "Remix AI Tools Documentation",
+  "remixUiTabs.tooltipText8": "RemixAI Tools Documentation",
   "remixUiTabs.tooltipText9": "Configure scripting dependencies",
   "remixUiTabs.tooltipTextDisabledCopilot": "To use RemixAI Copilot, choose a .sol file",
   "remixUiTabs.zoomOut": "Zoom out",

apps/remixdesktop/src/plugins/remixAIDektop.ts

@@ -50,7 +50,7 @@ class RemixAIDesktopPluginClient extends ElectronBasePluginClient {
   }
 
   async enable (){
-    console.log('Remix AI desktop plugin enabled')
+    console.log('RemixAI desktop plugin enabled')
     this.emit('enabled')
   }
 

libs/ghaction-helper/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/ghaction-helper",
-  "version": "0.1.39",
+  "version": "0.1.40",
   "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.45",
+    "@remix-project/remix-solidity": "^0.5.46",
     "@types/chai": "^4.3.4",
     "typescript": "^4.9.3"
   },
   "dependencies": {
     "@ethereum-waffle/chai": "^3.4.4",
-    "@remix-project/remix-simulator": "^0.2.59",
+    "@remix-project/remix-simulator": "^0.2.60",
     "chai": "^4.3.7",
     "ethers": "^5.7.2",
     "web3": "^4.1.1"
   },
   "types": "./src/index.d.ts",
-  "gitHead": "0875db01e67e48861e55a44fc8293e4c4bf58d91"
+  "gitHead": "bb66709c1db6c0f1c383f7075dd70fadf53a1caa"
 }

libs/remix-analyzer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-analyzer",
-  "version": "0.5.68",
+  "version": "0.5.69",
   "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.89",
-    "@remix-project/remix-lib": "^0.5.66",
+    "@remix-project/remix-astwalker": "^0.0.90",
+    "@remix-project/remix-lib": "^0.5.67",
     "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": "0875db01e67e48861e55a44fc8293e4c4bf58d91",
+  "gitHead": "bb66709c1db6c0f1c383f7075dd70fadf53a1caa",
   "main": "./src/index.js"
 }

libs/remix-astwalker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-astwalker",
-  "version": "0.0.89",
+  "version": "0.0.90",
   "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.66",
+    "@remix-project/remix-lib": "^0.5.67",
     "@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": "0875db01e67e48861e55a44fc8293e4c4bf58d91",
+  "gitHead": "bb66709c1db6c0f1c383f7075dd70fadf53a1caa",
   "types": "./src/index.d.ts"
 }

libs/remix-debug/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-debug",
-  "version": "0.5.59",
+  "version": "0.5.60",
   "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.89",
-    "@remix-project/remix-lib": "^0.5.66",
-    "@remix-project/remix-simulator": "^0.2.59",
-    "@remix-project/remix-solidity": "^0.5.45",
+    "@remix-project/remix-astwalker": "^0.0.90",
+    "@remix-project/remix-lib": "^0.5.67",
+    "@remix-project/remix-simulator": "^0.2.60",
+    "@remix-project/remix-solidity": "^0.5.46",
     "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": "0875db01e67e48861e55a44fc8293e4c4bf58d91",
+  "gitHead": "bb66709c1db6c0f1c383f7075dd70fadf53a1caa",
   "types": "./src/index.d.ts"
 }

libs/remix-lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-lib",
-  "version": "0.5.66",
+  "version": "0.5.67",
   "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": "0875db01e67e48861e55a44fc8293e4c4bf58d91",
+  "gitHead": "bb66709c1db6c0f1c383f7075dd70fadf53a1caa",
   "types": "./src/index.d.ts"
 }

libs/remix-simulator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-simulator",
-  "version": "0.2.59",
+  "version": "0.2.60",
   "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.66",
+    "@remix-project/remix-lib": "^0.5.67",
     "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": "0875db01e67e48861e55a44fc8293e4c4bf58d91",
+  "gitHead": "bb66709c1db6c0f1c383f7075dd70fadf53a1caa",
   "types": "./src/index.d.ts"
 }

libs/remix-solidity/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-solidity",
-  "version": "0.5.45",
+  "version": "0.5.46",
   "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.66",
+    "@remix-project/remix-lib": "^0.5.67",
     "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": "0875db01e67e48861e55a44fc8293e4c4bf58d91"
+  "gitHead": "bb66709c1db6c0f1c383f7075dd70fadf53a1caa"
 }

libs/remix-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-tests",
-  "version": "0.2.59",
+  "version": "0.2.60",
   "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.66",
-    "@remix-project/remix-simulator": "^0.2.59",
-    "@remix-project/remix-solidity": "^0.5.45",
+    "@remix-project/remix-lib": "^0.5.67",
+    "@remix-project/remix-simulator": "^0.2.60",
+    "@remix-project/remix-solidity": "^0.5.46",
     "@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": "0875db01e67e48861e55a44fc8293e4c4bf58d91"
+  "gitHead": "bb66709c1db6c0f1c383f7075dd70fadf53a1caa"
 }

libs/remix-ui/editor/src/lib/remix-ui-editor.tsx

@@ -829,7 +829,10 @@ export const EditorUI = (props: EditorUIProps) => {
         const file = await props.plugin.call('fileManager', 'getCurrentFile')
         const context = await props.plugin.call('fileManager', 'readFile', file)
         const message = intl.formatMessage({ id: 'editor.explainFunctionByAI' }, { content:context, currentFunction: currentFunction.current })
-        await props.plugin.call('remixAI' as any, 'chatPipe', 'code_explaining', message, context)
+        await props.plugin.call('popupPanel', 'showPopupPanel', true)
+        setTimeout(async () => {
+          await props.plugin.call('remixAI' as any, 'chatPipe', 'code_explaining', message, context)
+        }, 500)
         _paq.push(['trackEvent', 'ai', 'remixAI', 'explainFunction'])
       },
     }
@@ -850,7 +853,10 @@ export const EditorUI = (props: EditorUIProps) => {
         const selectedCode = editor.getModel().getValueInRange(editor.getSelection())
         const pipeMessage = intl.formatMessage({ id: 'editor.ExplainPipeMessage' }, { content:selectedCode })
 
-        await props.plugin.call('remixAI' as any, 'chatPipe', 'code_explaining', selectedCode, content, pipeMessage)
+        await props.plugin.call('popupPanel', 'showPopupPanel', true)
+        setTimeout(async () => {
+          await props.plugin.call('remixAI' as any, 'chatPipe', 'code_explaining', selectedCode, content, pipeMessage)
+        }, 500)
         _paq.push(['trackEvent', 'ai', 'remixAI', 'explainFunction'])
       },
     }

libs/remix-ui/remix-ai/src/lib/components/Default.tsx

@@ -49,7 +49,7 @@ export const Default = (props) => {
   const initialMessages: ChatItem[] = [
     {
       role: 'assistant',
-      message: 'Welcome to Remix AI! How can I assist you today?'
+      message: 'Welcome to RemixAI! How can I assist you today?'
     }
   ];
   const adapter = useAsStreamAdapter(send, []);
@@ -60,7 +60,7 @@ export const Default = (props) => {
       adapter={ adapter }
       personaOptions={{
         assistant: {
-          name: "Remix AI",
+          name: "RemixAI",
           tagline: "Your Web3 AI Assistant",
           avatar: assistantAvatar
         },

libs/remix-ui/remix-ai/src/lib/components/ModelSelection.tsx

@@ -6,7 +6,7 @@
 // The user can select a model from the dropdown list
 // the panel controlling the model selection can be hidden or shown
 // Once selected, the model is either loaded from the local storage or downloaded
-// the remix ai desktop plugin provided the interface for storing the model in the local storage after downloading
+// the RemixAI desktop plugin provided the interface for storing the model in the local storage after downloading
 
 import React, { useState, useEffect } from 'react';
 import { Select, Input, Button, Icon } from 'antd';

libs/remix-url-resolver/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-url-resolver",
-  "version": "0.0.88",
+  "version": "0.0.89",
   "description": "Solidity import url resolver engine",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -41,5 +41,5 @@
     "typescript": "^3.1.6"
   },
   "typings": "src/index.d.ts",
-  "gitHead": "0875db01e67e48861e55a44fc8293e4c4bf58d91"
+  "gitHead": "bb66709c1db6c0f1c383f7075dd70fadf53a1caa"
 }

libs/remix-ws-templates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-ws-templates",
-  "version": "1.0.53",
+  "version": "1.0.54",
   "description": "Create a Remix IDE workspace using different templates",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -24,5 +24,5 @@
     "ethers": "^5.4.2",
     "web3": "^4.1.1"
   },
-  "gitHead": "0875db01e67e48861e55a44fc8293e4c4bf58d91"
+  "gitHead": "bb66709c1db6c0f1c383f7075dd70fadf53a1caa"
 }

libs/remixd/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remixd",
-  "version": "0.6.39",
+  "version": "0.6.40",
   "description": "remix server: allow accessing file system from remix.ethereum.org and start a dev environment (see help section)",
   "main": "index.js",
   "types": "./index.d.ts",