From ef0ca6e3c55bf665a7cf5687f14bcb7a4023262a Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Mon, 27 Jan 2025 09:32:59 +0100 Subject: [PATCH 01/12] foundry test fix --- apps/remix-ide-e2e/src/tests/remixd.test.ts | 2 +- apps/remixdesktop/test/tests/app/foundry.test.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/remix-ide-e2e/src/tests/remixd.test.ts b/apps/remix-ide-e2e/src/tests/remixd.test.ts index 31dc3c686b..6a0dedd582 100644 --- a/apps/remix-ide-e2e/src/tests/remixd.test.ts +++ b/apps/remix-ide-e2e/src/tests/remixd.test.ts @@ -527,7 +527,7 @@ async function installFoundry(): Promise { server.stdout.on('data', function (data) { console.log(data.toString()) if ( - data.toString().includes("foundryup: done!") + data.toString().includes("foundryup: use - chisel 0.3.0") ) { console.log('resolving') resolve() diff --git a/apps/remixdesktop/test/tests/app/foundry.test.ts b/apps/remixdesktop/test/tests/app/foundry.test.ts index 3aa370882a..f4d2615f93 100644 --- a/apps/remixdesktop/test/tests/app/foundry.test.ts +++ b/apps/remixdesktop/test/tests/app/foundry.test.ts @@ -89,7 +89,7 @@ async function installFoundry(): Promise { server.stdout.on('data', function (data) { console.log(data.toString()) if ( - data.toString().includes("foundryup: done!") + data.toString().includes("foundryup: use - chisel 0.3.0") ) { console.log('resolving') resolve() From 272092e8fd19b55589bb84febac76f07db14e11a Mon Sep 17 00:00:00 2001 From: lianahus Date: Thu, 23 Jan 2025 09:18:00 +0100 Subject: [PATCH 02/12] removing Solidity survey --- .../home-tab/src/lib/components/homeTabFeatured.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/remix-ui/home-tab/src/lib/components/homeTabFeatured.tsx b/libs/remix-ui/home-tab/src/lib/components/homeTabFeatured.tsx index b20e7e5039..2c9bbaab34 100644 --- a/libs/remix-ui/home-tab/src/lib/components/homeTabFeatured.tsx +++ b/libs/remix-ui/home-tab/src/lib/components/homeTabFeatured.tsx @@ -50,8 +50,8 @@ function HomeTabFeatured(props:HomeTabFeaturedProps) { autoPlaySpeed={10000} dotListClass="position-relative mt-2" > -
@@ -83,7 +83,7 @@ function HomeTabFeatured(props:HomeTabFeaturedProps) {

- + }
From 09a9305f39bb6b104a6a91aba2a4ed34ab9862d6 Mon Sep 17 00:00:00 2001 From: lianahus Date: Wed, 15 Jan 2025 14:07:07 +0100 Subject: [PATCH 03/12] track script runner track compile general (optional to use) --- .../src/app/tabs/script-runner-ui.tsx | 6 ++---- .../scriptrunner/src/lib/script-runner-ui.tsx | 19 ++++++++++++++----- .../src/lib/compiler-container.tsx | 1 + 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/apps/remix-ide/src/app/tabs/script-runner-ui.tsx b/apps/remix-ide/src/app/tabs/script-runner-ui.tsx index 7e108c71ca..dd79bc79e5 100644 --- a/apps/remix-ide/src/app/tabs/script-runner-ui.tsx +++ b/apps/remix-ide/src/app/tabs/script-runner-ui.tsx @@ -71,7 +71,6 @@ export class ScriptRunnerUIPlugin extends ViewPlugin { }) this.plugin.on('fileManager', 'fileSaved', async (file: string) => { - if (file === configFileName && this.enableCustomScriptRunner) { await this.loadCustomConfig() this.renderComponent() @@ -114,7 +113,8 @@ export class ScriptRunnerUIPlugin extends ViewPlugin { activateCustomScriptRunner={this.activateCustomScriptRunner.bind(this)} saveCustomConfig={this.saveCustomConfig.bind(this)} openCustomConfig={this.openCustomConfig.bind(this)} - loadScriptRunner={this.selectScriptRunner.bind(this)} /> + loadScriptRunner={this.selectScriptRunner.bind(this)} + /> ) } @@ -184,7 +184,6 @@ export class ScriptRunnerUIPlugin extends ViewPlugin { this.setIsLoading(config.name, false) this.renderComponent() return result - } async execute(script: string, filePath: string) { @@ -289,7 +288,6 @@ export class ScriptRunnerUIPlugin extends ViewPlugin { } } } - } async openCustomConfig() { diff --git a/libs/remix-ui/scriptrunner/src/lib/script-runner-ui.tsx b/libs/remix-ui/scriptrunner/src/lib/script-runner-ui.tsx index 52692be16f..a241f2713d 100644 --- a/libs/remix-ui/scriptrunner/src/lib/script-runner-ui.tsx +++ b/libs/remix-ui/scriptrunner/src/lib/script-runner-ui.tsx @@ -5,6 +5,7 @@ import { faCaretDown, faCaretRight, faCheck, faExclamationCircle, faRedoAlt, faT import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { CustomScriptRunner } from "./custom-script-runner"; import { CustomTooltip } from "@remix-ui/helper"; +const _paq = (window._paq = window._paq || []) // eslint-disable-line export interface ScriptRunnerUIProps { loadScriptRunner: (config: ProjectConfiguration) => void; @@ -62,12 +63,18 @@ export const ScriptRunnerUI = (props: ScriptRunnerUIProps) => {
} {!config.isLoading && config.errorStatus && config.error && -
loadScriptRunner(config)} className="pointer px-2"> +
{ + loadScriptRunner(config) + _paq.push(['trackEvent', 'scriptRunnerPlugin', 'loadScriptRunnerConfig', config.name]) + }} + className="pointer px-2" + >
} {!config.isLoading && !config.errorStatus && !config.error &&
loadScriptRunner(config)} className="pointer px-2"> - {activeConfig && activeConfig.name !== config.name ? + { activeConfig && activeConfig.name !== config.name ? : } @@ -87,7 +94,9 @@ export const ScriptRunnerUI = (props: ScriptRunnerUIProps) => { ))} -
))} + +
)) + } {enableCustomScriptRunner && { publishedConfigurations={configurations.filter((config) => config.publish)} />} - ); -}; + ) +} diff --git a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx index 244e83b799..3396d89434 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx +++ b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx @@ -486,6 +486,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => { compileIcon.current.classList.remove('remixui_spinningIcon') compileIcon.current.classList.remove('remixui_bouncingIcon') if (!state.autoCompile || (state.autoCompile && state.matomoAutocompileOnce)) { + _paq.push(['trackEvent', 'compiler', 'compiled', 'solCompilationFinishedTriggeredByUser') _paq.push(['trackEvent', 'compiler', 'compiled', 'with_config_file_' + state.useFileConfiguration]) _paq.push(['trackEvent', 'compiler', 'compiled', 'with_version_' + _retrieveVersion()]) if (state.autoCompile && state.matomoAutocompileOnce) { From d3693fc7414e41398b4e6ee1f957e299e2cd05f1 Mon Sep 17 00:00:00 2001 From: lianahus Date: Wed, 15 Jan 2025 14:16:10 +0100 Subject: [PATCH 04/12] renamed theme switch tracker --- apps/remix-ide/src/app/tabs/locale-module.js | 1 + apps/remix-ide/src/app/tabs/theme-module.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/remix-ide/src/app/tabs/locale-module.js b/apps/remix-ide/src/app/tabs/locale-module.js index f4b3252df1..5ce5048ab1 100644 --- a/apps/remix-ide/src/app/tabs/locale-module.js +++ b/apps/remix-ide/src/app/tabs/locale-module.js @@ -77,6 +77,7 @@ export class LocaleModule extends Plugin { const next = localeCode || this.active // Name if (next === this.active) return // --> exit out of this method _paq.push(['trackEvent', 'localeModule', 'switchTo', next]) + const nextLocale = this.locales[next] // Locale if (!this.forced) this._deps.config.set('settings/locale', next) diff --git a/apps/remix-ide/src/app/tabs/theme-module.js b/apps/remix-ide/src/app/tabs/theme-module.js index 53bb7f542d..fb9cfd6cff 100644 --- a/apps/remix-ide/src/app/tabs/theme-module.js +++ b/apps/remix-ide/src/app/tabs/theme-module.js @@ -118,7 +118,7 @@ export class ThemeModule extends Plugin { } const next = themeName || this.active // Name if (next === this.active) return // --> exit out of this method - _paq.push(['trackEvent', 'themeModule', 'switchTo', next]) + _paq.push(['trackEvent', 'themeModule', 'switchThemeTo', next]) const nextTheme = this.themes[next] // Theme if (!this.forced) this._deps.config.set('settings/theme', next) document.getElementById('theme-link') ? document.getElementById('theme-link').remove() : null From feeac1ba8b396f9dcbadabc73758d8015918e19a Mon Sep 17 00:00:00 2001 From: lianahus Date: Thu, 23 Jan 2025 08:51:39 +0100 Subject: [PATCH 05/12] fixed switches --- .../providers/style/environment-explorer.css | 2 +- .../grid-view/src/lib/remix-ui-grid-cell.css | 3 --- .../grid-view/src/lib/remix-ui-grid-cell.tsx | 21 ++++++++++--------- .../src/lib/compiler-container.tsx | 2 +- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/apps/remix-ide/src/app/providers/style/environment-explorer.css b/apps/remix-ide/src/app/providers/style/environment-explorer.css index 2feb936719..372a80aaba 100644 --- a/apps/remix-ide/src/app/providers/style/environment-explorer.css +++ b/apps/remix-ide/src/app/providers/style/environment-explorer.css @@ -1,5 +1,5 @@ .EECellStyle { - min-height: 6rem; + min-height: 7rem; max-width: 12rem; min-width: 12rem; } diff --git a/libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.css b/libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.css index c2b8e78828..00454ec7ce 100644 --- a/libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.css +++ b/libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.css @@ -27,9 +27,6 @@ .remixui_grid_cell_pin { width: 1rem; height: 1rem; - position: relative; - right: 2.1rem; - top: 4.7rem; background: transparent; z-index: 1000; } diff --git a/libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.tsx b/libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.tsx index 60dcab66a5..99b3254b4b 100644 --- a/libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.tsx +++ b/libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.tsx @@ -86,7 +86,7 @@ export const RemixUIGridCell = (props: RemixUIGridCellProps) => { { anyEnabled &&
- - { filterCon.showPin && } + { props.tagList &&
{ Object.keys(props.tagList).map((key) => ( filterCon.keyValueMap[props.tagList[key]]?.enabled && ( diff --git a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx index 3396d89434..1854646896 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx +++ b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx @@ -486,7 +486,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => { compileIcon.current.classList.remove('remixui_spinningIcon') compileIcon.current.classList.remove('remixui_bouncingIcon') if (!state.autoCompile || (state.autoCompile && state.matomoAutocompileOnce)) { - _paq.push(['trackEvent', 'compiler', 'compiled', 'solCompilationFinishedTriggeredByUser') + _paq.push(['trackEvent', 'compiler', 'compiled', 'solCompilationFinishedTriggeredByUser']) _paq.push(['trackEvent', 'compiler', 'compiled', 'with_config_file_' + state.useFileConfiguration]) _paq.push(['trackEvent', 'compiler', 'compiled', 'with_version_' + _retrieveVersion()]) if (state.autoCompile && state.matomoAutocompileOnce) { From c3a88b392a14d2a70a573c7181fb08caeac13e3c Mon Sep 17 00:00:00 2001 From: lianahus Date: Mon, 27 Jan 2025 09:39:12 +0100 Subject: [PATCH 06/12] lint --- libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.tsx b/libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.tsx index 99b3254b4b..9b1d718da6 100644 --- a/libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.tsx +++ b/libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.tsx @@ -121,7 +121,7 @@ export const RemixUIGridCell = (props: RemixUIGridCellProps) => { >}
- + { props.tagList &&
{ Object.keys(props.tagList).map((key) => ( filterCon.keyValueMap[props.tagList[key]]?.enabled && ( From a92b8aa830067f879c96b41e301bc3174b87e551 Mon Sep 17 00:00:00 2001 From: lianahus Date: Mon, 27 Jan 2025 12:00:12 +0100 Subject: [PATCH 07/12] same height for cells --- apps/remix-ide/src/app/providers/style/environment-explorer.css | 2 +- libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/remix-ide/src/app/providers/style/environment-explorer.css b/apps/remix-ide/src/app/providers/style/environment-explorer.css index 372a80aaba..8e69456504 100644 --- a/apps/remix-ide/src/app/providers/style/environment-explorer.css +++ b/apps/remix-ide/src/app/providers/style/environment-explorer.css @@ -1,5 +1,5 @@ .EECellStyle { - min-height: 7rem; + min-height: 8rem; max-width: 12rem; min-width: 12rem; } diff --git a/libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.tsx b/libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.tsx index 9b1d718da6..d1b0190390 100644 --- a/libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.tsx +++ b/libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.tsx @@ -87,7 +87,7 @@ export const RemixUIGridCell = (props: RemixUIGridCellProps) => {
- { !props.hideTitle &&
+ { !props.hideTitle &&
{ props.logo ? props.logoURL !== '' ? From 8cec441389c88571b0f28c216f050c52f0b85966 Mon Sep 17 00:00:00 2001 From: aniket-engg Date: Mon, 27 Jan 2025 18:37:10 +0530 Subject: [PATCH 08/12] publish libs --- libs/ghaction-helper/package.json | 8 ++++---- libs/remix-analyzer/package.json | 8 ++++---- libs/remix-astwalker/package.json | 6 +++--- libs/remix-debug/package.json | 12 ++++++------ libs/remix-lib/package.json | 4 ++-- libs/remix-simulator/package.json | 6 +++--- libs/remix-solidity/package.json | 6 +++--- libs/remix-tests/package.json | 10 +++++----- libs/remix-url-resolver/package.json | 4 ++-- libs/remix-ws-templates/package.json | 4 ++-- libs/remixd/package.json | 2 +- 11 files changed, 35 insertions(+), 35 deletions(-) diff --git a/libs/ghaction-helper/package.json b/libs/ghaction-helper/package.json index e5f1e55389..3db00ed619 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.42", + "version": "0.1.43", "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.48", + "@remix-project/remix-solidity": "^0.5.49", "@types/chai": "^4.3.4", "typescript": "^4.9.3" }, "dependencies": { "@ethereum-waffle/chai": "^3.4.4", - "@remix-project/remix-simulator": "^0.2.62", + "@remix-project/remix-simulator": "^0.2.63", "chai": "^4.3.7", "ethers": "^5.7.2", "web3": "^4.1.1" }, "types": "./src/index.d.ts", - "gitHead": "baa8abc9b912288b7a2546bedc717a9229f652c4" + "gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551" } \ No newline at end of file diff --git a/libs/remix-analyzer/package.json b/libs/remix-analyzer/package.json index 0910832f0a..9bda03e259 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.71", + "version": "0.5.72", "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.92", - "@remix-project/remix-lib": "^0.5.69", + "@remix-project/remix-astwalker": "^0.0.93", + "@remix-project/remix-lib": "^0.5.70", "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": "baa8abc9b912288b7a2546bedc717a9229f652c4", + "gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551", "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 9382a9003d..9d24820510 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.92", + "version": "0.0.93", "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.69", + "@remix-project/remix-lib": "^0.5.70", "@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": "baa8abc9b912288b7a2546bedc717a9229f652c4", + "gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551", "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 2c385f3ec3..7dc8e0c507 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.62", + "version": "0.5.63", "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.92", - "@remix-project/remix-lib": "^0.5.69", - "@remix-project/remix-simulator": "^0.2.62", - "@remix-project/remix-solidity": "^0.5.48", + "@remix-project/remix-astwalker": "^0.0.93", + "@remix-project/remix-lib": "^0.5.70", + "@remix-project/remix-simulator": "^0.2.63", + "@remix-project/remix-solidity": "^0.5.49", "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": "baa8abc9b912288b7a2546bedc717a9229f652c4", + "gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551", "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 101fef7923..6a0e2b3484 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.69", + "version": "0.5.70", "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": "baa8abc9b912288b7a2546bedc717a9229f652c4", + "gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551", "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 6151383671..e1ce6bfc72 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.62", + "version": "0.2.63", "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.69", + "@remix-project/remix-lib": "^0.5.70", "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": "baa8abc9b912288b7a2546bedc717a9229f652c4", + "gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551", "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 9f8170c08b..be9838cb9b 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.48", + "version": "0.5.49", "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.69", + "@remix-project/remix-lib": "^0.5.70", "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": "baa8abc9b912288b7a2546bedc717a9229f652c4" + "gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551" } \ No newline at end of file diff --git a/libs/remix-tests/package.json b/libs/remix-tests/package.json index 5c7edc1e42..cab15ebaa0 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.62", + "version": "0.2.63", "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.69", - "@remix-project/remix-simulator": "^0.2.62", - "@remix-project/remix-solidity": "^0.5.48", + "@remix-project/remix-lib": "^0.5.70", + "@remix-project/remix-simulator": "^0.2.63", + "@remix-project/remix-solidity": "^0.5.49", "@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": "baa8abc9b912288b7a2546bedc717a9229f652c4" + "gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551" } \ No newline at end of file diff --git a/libs/remix-url-resolver/package.json b/libs/remix-url-resolver/package.json index 57b368e350..a14bc260c2 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.91", + "version": "0.0.92", "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": "baa8abc9b912288b7a2546bedc717a9229f652c4" + "gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551" } \ No newline at end of file diff --git a/libs/remix-ws-templates/package.json b/libs/remix-ws-templates/package.json index 3da2144d9b..e9f6efaa57 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.56", + "version": "1.0.57", "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": "baa8abc9b912288b7a2546bedc717a9229f652c4" + "gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551" } \ No newline at end of file diff --git a/libs/remixd/package.json b/libs/remixd/package.json index f984bfcc9e..c6006fe2b0 100644 --- a/libs/remixd/package.json +++ b/libs/remixd/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remixd", - "version": "0.6.42", + "version": "0.6.43", "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", From 6ba4dc7bacb41e748075602d92bea2d678644173 Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Mon, 27 Jan 2025 17:43:40 +0100 Subject: [PATCH 09/12] flaky test --- .circleci/config.yml | 4 ++-- apps/remix-ide-e2e/src/tests/terminal.test.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4ac8815bdf..7dd8d1be4a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2.1 parameters: run_flaky_tests: type: boolean - default: false + default: true orbs: browser-tools: circleci/browser-tools@1.4.4 win: circleci/windows@5.0 @@ -786,7 +786,7 @@ workflows: script: ["flaky.sh"] job: ["nogroup"] jobsize: ["1"] - parallelism: [1] + parallelism: [5] build_all: unless: << pipeline.parameters.run_flaky_tests >> jobs: diff --git a/apps/remix-ide-e2e/src/tests/terminal.test.ts b/apps/remix-ide-e2e/src/tests/terminal.test.ts index 77bb44f548..95c977b566 100644 --- a/apps/remix-ide-e2e/src/tests/terminal.test.ts +++ b/apps/remix-ide-e2e/src/tests/terminal.test.ts @@ -195,7 +195,7 @@ module.exports = { .journalChildIncludes('inside getOwner', { shouldHaveOnlyOneOccurrence: true }) }, - 'Emit 2 similar events and check the filtering is done properly #group4': function (browser: NightwatchBrowser) { + 'Emit 2 similar events and check the filtering is done properly #flaky #group4': function (browser: NightwatchBrowser) { let addressRef: string browser .addFile('contracts/contract_with_event.sol', { content: contract_with_event }) From 673c5fbf2a1bb300afe3a87e3d3a4c7ca24293d6 Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Mon, 27 Jan 2025 17:57:19 +0100 Subject: [PATCH 10/12] move test --- apps/remix-ide-e2e/src/tests/terminal.test.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/remix-ide-e2e/src/tests/terminal.test.ts b/apps/remix-ide-e2e/src/tests/terminal.test.ts index 95c977b566..441d734b18 100644 --- a/apps/remix-ide-e2e/src/tests/terminal.test.ts +++ b/apps/remix-ide-e2e/src/tests/terminal.test.ts @@ -195,7 +195,7 @@ module.exports = { .journalChildIncludes('inside getOwner', { shouldHaveOnlyOneOccurrence: true }) }, - 'Emit 2 similar events and check the filtering is done properly #flaky #group4': function (browser: NightwatchBrowser) { + 'Emit 2 similar events and check the filtering is done properly #flaky #group11': function (browser: NightwatchBrowser) { let addressRef: string browser .addFile('contracts/contract_with_event.sol', { content: contract_with_event }) @@ -204,7 +204,6 @@ module.exports = { .clickLaunchIcon('solidity') .click('*[data-id="compilerContainerCompileBtn"]') .clickLaunchIcon('udapp') - .click('*[data-id="deployAndRunClearInstances"]') .selectContract('Example') .createContract('') .getAddressAtPosition(0, (address) => { From db6c4e30feba622a9ec1e3a7366c0edc8831307b Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Mon, 27 Jan 2025 18:10:24 +0100 Subject: [PATCH 11/12] turn off flaky --- .circleci/config.yml | 2 +- apps/remix-ide-e2e/src/tests/terminal.test.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7dd8d1be4a..eac6fb8b18 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2.1 parameters: run_flaky_tests: type: boolean - default: true + default: false orbs: browser-tools: circleci/browser-tools@1.4.4 win: circleci/windows@5.0 diff --git a/apps/remix-ide-e2e/src/tests/terminal.test.ts b/apps/remix-ide-e2e/src/tests/terminal.test.ts index 441d734b18..e16676e181 100644 --- a/apps/remix-ide-e2e/src/tests/terminal.test.ts +++ b/apps/remix-ide-e2e/src/tests/terminal.test.ts @@ -195,7 +195,7 @@ module.exports = { .journalChildIncludes('inside getOwner', { shouldHaveOnlyOneOccurrence: true }) }, - 'Emit 2 similar events and check the filtering is done properly #flaky #group11': function (browser: NightwatchBrowser) { + 'Emit 2 similar events and check the filtering is done properly #group11': function (browser: NightwatchBrowser) { let addressRef: string browser .addFile('contracts/contract_with_event.sol', { content: contract_with_event }) From 2b9a1e3fe2322dd9747a4fc912144fbbae2de57f Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Mon, 27 Jan 2025 18:11:12 +0100 Subject: [PATCH 12/12] reset --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index eac6fb8b18..4ac8815bdf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -786,7 +786,7 @@ workflows: script: ["flaky.sh"] job: ["nogroup"] jobsize: ["1"] - parallelism: [5] + parallelism: [1] build_all: unless: << pipeline.parameters.run_flaky_tests >> jobs: