diff --git a/.github/workflows/pr-reminder.yml b/.github/workflows/pr-reminder.yml index 8e00ba0b32..d841471ec9 100644 --- a/.github/workflows/pr-reminder.yml +++ b/.github/workflows/pr-reminder.yml @@ -14,4 +14,4 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }} - freeze-date: '2024-01-29T18:00:00Z' + freeze-date: '2024-02-12T18:00:00Z' diff --git a/apps/circuit-compiler/src/app/components/feedback.tsx b/apps/circuit-compiler/src/app/components/feedback.tsx index 5b61794281..9fe7bc3d23 100644 --- a/apps/circuit-compiler/src/app/components/feedback.tsx +++ b/apps/circuit-compiler/src/app/components/feedback.tsx @@ -45,8 +45,7 @@ export function CompilerFeedback ({ feedback, filePathToId, hideWarnings, openEr
handleAskGPT(response) } />
@@ -54,7 +53,6 @@ export function CompilerFeedback ({ feedback, filePathToId, hideWarnings, openEr
{ handleAskGPT(response) }} />
diff --git a/apps/circuit-compiler/src/app/components/feedbackAlert.tsx b/apps/circuit-compiler/src/app/components/feedbackAlert.tsx index 48e57fab31..3edf89cc20 100644 --- a/apps/circuit-compiler/src/app/components/feedbackAlert.tsx +++ b/apps/circuit-compiler/src/app/components/feedbackAlert.tsx @@ -3,7 +3,7 @@ import { FeedbackAlertProps } from '../types' import { RenderIf } from '@remix-ui/helper' import {CopyToClipboard} from '@remix-ui/clipboard' -export function FeedbackAlert ({ message, location, askGPT }: FeedbackAlertProps) { +export function FeedbackAlert ({ message, askGPT }: FeedbackAlertProps) { const [ showAlert, setShowAlert] = useState(true) const handleCloseAlert = () => { @@ -14,9 +14,6 @@ export function FeedbackAlert ({ message, location, askGPT }: FeedbackAlertProps <> { message } - - { location } -
@@ -24,7 +21,10 @@ export function FeedbackAlert ({ message, location, askGPT }: FeedbackAlertProps - ASK GPT + { + e.stopPropagation() + askGPT() + }}>ASK GPT
diff --git a/apps/circuit-compiler/src/app/types/index.ts b/apps/circuit-compiler/src/app/types/index.ts index add4806427..fc78c3a237 100644 --- a/apps/circuit-compiler/src/app/types/index.ts +++ b/apps/circuit-compiler/src/app/types/index.ts @@ -72,7 +72,6 @@ export type CompilerReport = { export type FeedbackAlertProps = { message: string, - location: string, askGPT: () => void } diff --git a/apps/remix-ide/src/app/tabs/locales/en/panel.json b/apps/remix-ide/src/app/tabs/locales/en/panel.json index c9ad7d8d05..013a68e199 100644 --- a/apps/remix-ide/src/app/tabs/locales/en/panel.json +++ b/apps/remix-ide/src/app/tabs/locales/en/panel.json @@ -4,6 +4,7 @@ "panel.documentation": "Documentation", "panel.description": "Description", "panel.maintainedByRemix": "Maintained by Remix", + "panel.maintainedExternally": "Not maintained by Remix", "panel.pluginInfo": "Plugin info", "panel.linkToDoc": "Link to documentation", "panel.makeAnissue": "Make an issue" diff --git a/apps/remix-ide/src/app/tabs/locales/en/pluginManager.json b/apps/remix-ide/src/app/tabs/locales/en/pluginManager.json index b4991edf7c..f6de5d5e42 100644 --- a/apps/remix-ide/src/app/tabs/locales/en/pluginManager.json +++ b/apps/remix-ide/src/app/tabs/locales/en/pluginManager.json @@ -33,6 +33,7 @@ "pluginManager.ok": "OK", "pluginManager.cancel": "Cancel", "pluginManager.maintainedByRemix": "Maintained by Remix", + "pluginManager.maintainedExternally": "Not maintained by Remix", "pluginManager.linkToDoc": "Link to documentation", "pluginManager.versionAlpha": "Version Alpha", "pluginManager.versionBeta": "Version Beta", diff --git a/libs/ghaction-helper/package.json b/libs/ghaction-helper/package.json index 99ca2ddf93..ee415e405c 100644 --- a/libs/ghaction-helper/package.json +++ b/libs/ghaction-helper/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/ghaction-helper", - "version": "0.1.20", + "version": "0.1.21", "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.26", + "@remix-project/remix-solidity": "^0.5.27", "@types/chai": "^4.3.4", "typescript": "^4.9.3" }, "dependencies": { "@ethereum-waffle/chai": "^3.4.4", - "@remix-project/remix-simulator": "^0.2.40", + "@remix-project/remix-simulator": "^0.2.41", "chai": "^4.3.7", "ethers": "^5.7.2", "web3": "^4.1.1" }, "types": "./src/index.d.ts", - "gitHead": "157dfed16b362e8c8a729d541a3b5b0cbf147844" + "gitHead": "24416dcc55a6c0d26ee589ec10e4fce98daf2aca" } \ No newline at end of file diff --git a/libs/remix-analyzer/package.json b/libs/remix-analyzer/package.json index 09aa697e87..4c9a3e3fa1 100644 --- a/libs/remix-analyzer/package.json +++ b/libs/remix-analyzer/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-analyzer", - "version": "0.5.49", + "version": "0.5.50", "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": "^4.1.1", "@ethereumjs/util": "^8.0.5", "@ethereumjs/vm": "^6.4.1", - "@remix-project/remix-astwalker": "^0.0.70", - "@remix-project/remix-lib": "^0.5.47", + "@remix-project/remix-astwalker": "^0.0.71", + "@remix-project/remix-lib": "^0.5.48", "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": "157dfed16b362e8c8a729d541a3b5b0cbf147844", + "gitHead": "24416dcc55a6c0d26ee589ec10e4fce98daf2aca", "main": "./src/index.js" } \ No newline at end of file diff --git a/libs/remix-astwalker/package.json b/libs/remix-astwalker/package.json index d60d44cce3..baee8905ef 100644 --- a/libs/remix-astwalker/package.json +++ b/libs/remix-astwalker/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-astwalker", - "version": "0.0.70", + "version": "0.0.71", "description": "Tool to walk through Solidity AST", "main": "src/index.js", "scripts": { @@ -37,7 +37,7 @@ "@ethereumjs/tx": "^4.1.1", "@ethereumjs/util": "^8.0.5", "@ethereumjs/vm": "^6.4.1", - "@remix-project/remix-lib": "^0.5.47", + "@remix-project/remix-lib": "^0.5.48", "@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": "157dfed16b362e8c8a729d541a3b5b0cbf147844", + "gitHead": "24416dcc55a6c0d26ee589ec10e4fce98daf2aca", "types": "./src/index.d.ts" } \ No newline at end of file diff --git a/libs/remix-debug/package.json b/libs/remix-debug/package.json index 9d59b82013..766d8144e4 100644 --- a/libs/remix-debug/package.json +++ b/libs/remix-debug/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-debug", - "version": "0.5.40", + "version": "0.5.41", "description": "Tool to debug Ethereum transactions", "contributors": [ { @@ -26,10 +26,10 @@ "@ethereumjs/tx": "^4.1.1", "@ethereumjs/util": "^8.0.5", "@ethereumjs/vm": "^6.4.1", - "@remix-project/remix-astwalker": "^0.0.70", - "@remix-project/remix-lib": "^0.5.47", - "@remix-project/remix-simulator": "^0.2.40", - "@remix-project/remix-solidity": "^0.5.26", + "@remix-project/remix-astwalker": "^0.0.71", + "@remix-project/remix-lib": "^0.5.48", + "@remix-project/remix-simulator": "^0.2.41", + "@remix-project/remix-solidity": "^0.5.27", "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": "157dfed16b362e8c8a729d541a3b5b0cbf147844", + "gitHead": "24416dcc55a6c0d26ee589ec10e4fce98daf2aca", "types": "./src/index.d.ts" } \ No newline at end of file diff --git a/libs/remix-lib/package.json b/libs/remix-lib/package.json index 6ef8f9fb7a..e61e74a26a 100644 --- a/libs/remix-lib/package.json +++ b/libs/remix-lib/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-lib", - "version": "0.5.47", + "version": "0.5.48", "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": "157dfed16b362e8c8a729d541a3b5b0cbf147844", + "gitHead": "24416dcc55a6c0d26ee589ec10e4fce98daf2aca", "types": "./src/index.d.ts" } \ No newline at end of file diff --git a/libs/remix-simulator/package.json b/libs/remix-simulator/package.json index eb75ec0a44..bb62895a69 100644 --- a/libs/remix-simulator/package.json +++ b/libs/remix-simulator/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-simulator", - "version": "0.2.40", + "version": "0.2.41", "description": "Ethereum IDE and tools for the web", "contributors": [ { @@ -22,7 +22,7 @@ "@ethereumjs/tx": "^4.1.1", "@ethereumjs/util": "^8.0.5", "@ethereumjs/vm": "^6.4.1", - "@remix-project/remix-lib": "^0.5.47", + "@remix-project/remix-lib": "^0.5.48", "ansi-gray": "^0.1.1", "async": "^3.1.0", "body-parser": "^1.18.2", @@ -70,6 +70,6 @@ }, "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-simulator#readme", "typings": "src/index.d.ts", - "gitHead": "157dfed16b362e8c8a729d541a3b5b0cbf147844", + "gitHead": "24416dcc55a6c0d26ee589ec10e4fce98daf2aca", "types": "./src/index.d.ts" } \ No newline at end of file diff --git a/libs/remix-solidity/package.json b/libs/remix-solidity/package.json index 4cc9dde35d..43ef21624e 100644 --- a/libs/remix-solidity/package.json +++ b/libs/remix-solidity/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-solidity", - "version": "0.5.26", + "version": "0.5.27", "description": "Tool to load and run Solidity compiler", "main": "src/index.js", "types": "src/index.d.ts", @@ -19,7 +19,7 @@ "@ethereumjs/tx": "^4.1.1", "@ethereumjs/util": "^8.0.5", "@ethereumjs/vm": "^6.4.1", - "@remix-project/remix-lib": "^0.5.47", + "@remix-project/remix-lib": "^0.5.48", "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": "157dfed16b362e8c8a729d541a3b5b0cbf147844" + "gitHead": "24416dcc55a6c0d26ee589ec10e4fce98daf2aca" } \ No newline at end of file diff --git a/libs/remix-tests/package.json b/libs/remix-tests/package.json index 1d20c5af16..a2980f4d16 100644 --- a/libs/remix-tests/package.json +++ b/libs/remix-tests/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-tests", - "version": "0.2.40", + "version": "0.2.41", "description": "Tool to test Solidity smart contracts", "main": "src/index.js", "types": "./src/index.d.ts", @@ -41,9 +41,9 @@ "@ethereumjs/tx": "^4.1.1", "@ethereumjs/util": "^8.0.5", "@ethereumjs/vm": "^6.4.1", - "@remix-project/remix-lib": "^0.5.47", - "@remix-project/remix-simulator": "^0.2.40", - "@remix-project/remix-solidity": "^0.5.26", + "@remix-project/remix-lib": "^0.5.48", + "@remix-project/remix-simulator": "^0.2.41", + "@remix-project/remix-solidity": "^0.5.27", "@remix-project/remix-url-resolver": "^0.0.42", "ansi-gray": "^0.1.1", "async": "^2.6.0", @@ -78,5 +78,5 @@ "typescript": "^3.3.1" }, "typings": "src/index.d.ts", - "gitHead": "157dfed16b362e8c8a729d541a3b5b0cbf147844" + "gitHead": "24416dcc55a6c0d26ee589ec10e4fce98daf2aca" } \ No newline at end of file diff --git a/libs/remix-ui/clipboard/src/lib/copy-to-clipboard/copy-to-clipboard.tsx b/libs/remix-ui/clipboard/src/lib/copy-to-clipboard/copy-to-clipboard.tsx index dd301671b6..c8a857c9f1 100644 --- a/libs/remix-ui/clipboard/src/lib/copy-to-clipboard/copy-to-clipboard.tsx +++ b/libs/remix-ui/clipboard/src/lib/copy-to-clipboard/copy-to-clipboard.tsx @@ -44,6 +44,7 @@ export const CopyToClipboard = (props: ICopyToClipboard) => { content = getContent && getContent() copyData() } + e.stopPropagation() e.preventDefault() } diff --git a/libs/remix-ui/home-tab/src/lib/components/pluginButton.tsx b/libs/remix-ui/home-tab/src/lib/components/pluginButton.tsx index a0d22eb061..ca27c846c4 100644 --- a/libs/remix-ui/home-tab/src/lib/components/pluginButton.tsx +++ b/libs/remix-ui/home-tab/src/lib/components/pluginButton.tsx @@ -30,11 +30,14 @@ function PluginButton({imgPath, envID, envText, callback, l2, description, remix {l2 && } - {remixMaintained && ( + {remixMaintained ? ( }> - - )} + ) + : (}> + + ) + } ) } diff --git a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css index a7fa9b4da4..4ceded21fc 100644 --- a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css +++ b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css @@ -102,7 +102,7 @@ right: 180px; } .remixui_home_maintainedLabel { - top: 120px; + top: 118px; right: 180px; } diff --git a/libs/remix-ui/panel/src/lib/plugins/panel-header.tsx b/libs/remix-ui/panel/src/lib/plugins/panel-header.tsx index 4f9c358010..6037ef5838 100644 --- a/libs/remix-ui/panel/src/lib/plugins/panel-header.tsx +++ b/libs/remix-ui/panel/src/lib/plugins/panel-header.tsx @@ -35,11 +35,14 @@ const RemixUIPanelHeader = (props: RemixPanelProps) => {
- {plugin?.profile?.maintainedBy?.toLowerCase() === 'remix' && ( + {plugin?.profile?.maintainedBy?.toLowerCase() === 'remix' ? ( }> - - )} + ) + : (}> + + ) + }
} tooltipId="pluginInfoTooltip" tooltipClasses="text-nowrap"> diff --git a/libs/remix-ui/plugin-manager/src/lib/components/ActivePluginCard.tsx b/libs/remix-ui/plugin-manager/src/lib/components/ActivePluginCard.tsx index a8fb287d01..2c0b61c9a8 100644 --- a/libs/remix-ui/plugin-manager/src/lib/components/ActivePluginCard.tsx +++ b/libs/remix-ui/plugin-manager/src/lib/components/ActivePluginCard.tsx @@ -17,7 +17,7 @@ function ActivePluginCard({profile, buttonText, deactivatePlugin}: PluginCardPro
{profile.displayName || profile.name} - {profile?.maintainedBy?.toLowerCase() == 'remix' && ( + {profile?.maintainedBy?.toLowerCase() == 'remix' ? ( } > - - )} + ) + : (} + > + + ) + } {profile.documentation && (
{profile.displayName || profile.name} - {profile?.maintainedBy?.toLowerCase() == 'remix' && ( + {profile?.maintainedBy?.toLowerCase() == 'remix' ? ( } > - - )} + ) + : (} + > + + ) + } {profile.documentation && ( { }) plugin.on('fileManager', 'rootFolderChanged', async (path: string) => { - console.log('rootFolderChanged', path) rootFolderChanged(path) }) diff --git a/libs/remix-url-resolver/package.json b/libs/remix-url-resolver/package.json index 30fd994846..0609c7ddba 100644 --- a/libs/remix-url-resolver/package.json +++ b/libs/remix-url-resolver/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-url-resolver", - "version": "0.0.69", + "version": "0.0.70", "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": "157dfed16b362e8c8a729d541a3b5b0cbf147844" + "gitHead": "24416dcc55a6c0d26ee589ec10e4fce98daf2aca" } \ No newline at end of file diff --git a/libs/remix-ws-templates/package.json b/libs/remix-ws-templates/package.json index ec1e874909..6b511fa801 100644 --- a/libs/remix-ws-templates/package.json +++ b/libs/remix-ws-templates/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-ws-templates", - "version": "1.0.34", + "version": "1.0.35", "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": "157dfed16b362e8c8a729d541a3b5b0cbf147844" + "gitHead": "24416dcc55a6c0d26ee589ec10e4fce98daf2aca" } \ No newline at end of file diff --git a/libs/remixd/package.json b/libs/remixd/package.json index bb809402b1..8272a24d2d 100644 --- a/libs/remixd/package.json +++ b/libs/remixd/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remixd", - "version": "0.6.23", + "version": "0.6.24", "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", diff --git a/package.json b/package.json index 573453a700..d7f06e9ded 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "remix-project", - "version": "0.42.0-dev", + "version": "0.43.0-dev", "license": "MIT", "description": "Ethereum Remix Monorepo", "main": "index.js", diff --git a/releaseDetails.json b/releaseDetails.json index 0dfc52a9a7..e6cf4b7620 100644 --- a/releaseDetails.json +++ b/releaseDetails.json @@ -1,10 +1,10 @@ { - "version": "v0.40.0", + "version": "v0.42.0", "title": "RELEASE HIGHLIGHTS", - "highlight1": "Circom v2.1.6 support", - "highlight2": "Improved & stable support for Vyper development", - "highlight3": "New workspace template: Uniswap HookBook MultiSigSwapHook", + "highlight1": "Ask GPT for circom ZKP compiler errors/warnings", + "highlight2": "Default Solidity compiler set to 0.8.24 with support of 'Cancun' EVM", + "highlight3": "Workspace Template 'Uniswap v4 Periphery' renamed to 'Uniswap v4 Template'", "highlight4": "", "more": "Read More", - "moreLink": "https://medium.com/remix-ide/remix-release-v0-40-0-17668192db64" + "moreLink": "https://medium.com/remix-ide/remix-release-v0-42-0-56ec48a49ae0" } \ No newline at end of file