diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 46f2d0dfb4..841935f703 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -84,7 +84,7 @@ If you search `FormattedMessage` or `intl.formatMessage` in this project, you wi **Why?** -Each non-english language will be filled in the gaps with english. Even there maybe some un-translated content, it will always use english as defaultMessage. That why we don't need to provide a `defaultMessage` prop each time we render a `FormattedMessage` component. +Each non-english language will be filled in the gaps with english. Even though there may be some un-translated content, it will always use english as defaultMessage. That's why we don't need to provide a `defaultMessage` prop each time we render a `FormattedMessage` component. But in some cases, the `id` prop may not be static. For example, ```jsx diff --git a/README.md b/README.md index ff54a1afc7..c633877526 100644 --- a/README.md +++ b/README.md @@ -118,7 +118,7 @@ docker-compose pull docker-compose up -d ``` -Then go to http://localhost:8080 and you can use you Remix instance. +Then go to http://localhost:8080 and you can use your Remix instance. To fetch the docker-compose file without cloning this repo run: ``` diff --git a/apps/remix-ide-e2e/src/tests/recorder.test.ts b/apps/remix-ide-e2e/src/tests/recorder.test.ts index 7cdd2a08d1..f21df003a4 100644 --- a/apps/remix-ide-e2e/src/tests/recorder.test.ts +++ b/apps/remix-ide-e2e/src/tests/recorder.test.ts @@ -470,7 +470,7 @@ const liveModeScenario = { const testStorageForLiveMode = `// SPDX-License-Identifier: GPL-3.0 -pragma solidity >=0.7.0 <0.9.0; +pragma solidity >=0.8.2 <0.9.0; /** * @title Storage diff --git a/apps/remix-ide-e2e/src/tests/terminal.test.ts b/apps/remix-ide-e2e/src/tests/terminal.test.ts index d3953f54b4..8a32295678 100644 --- a/apps/remix-ide-e2e/src/tests/terminal.test.ts +++ b/apps/remix-ide-e2e/src/tests/terminal.test.ts @@ -584,7 +584,7 @@ contract OwnerTest { const scriptAutoExec = { contract: `// SPDX-License-Identifier: GPL-3.0 - pragma solidity >=0.7.0 <0.9.0; + pragma solidity >=0.8.2 <0.9.0; library lib { function test () public view returns (uint) { diff --git a/apps/remix-ide/src/app.js b/apps/remix-ide/src/app.js index 6c1ebf6801..303d06f8c0 100644 --- a/apps/remix-ide/src/app.js +++ b/apps/remix-ide/src/app.js @@ -343,7 +343,6 @@ class AppComponent { analysis, test, filePanel.remixdHandle, - filePanel.gitHandle, filePanel.hardhatHandle, filePanel.foundryHandle, filePanel.truffleHandle, diff --git a/apps/remix-ide/src/app/panels/file-panel.js b/apps/remix-ide/src/app/panels/file-panel.js index d6a3708269..2ff7a1da01 100644 --- a/apps/remix-ide/src/app/panels/file-panel.js +++ b/apps/remix-ide/src/app/panels/file-panel.js @@ -5,7 +5,6 @@ import React from 'react' // eslint-disable-line import { FileSystemProvider } from '@remix-ui/workspace' // eslint-disable-line import Registry from '../state/registry' import { RemixdHandle } from '../plugins/remixd-handle' -const { GitHandle } = require('../files/git-handle.js') const { HardhatHandle } = require('../files/hardhat-handle.js') const { FoundryHandle } = require('../files/foundry-handle.js') const { TruffleHandle } = require('../files/truffle-handle.js') @@ -52,7 +51,6 @@ module.exports = class Filepanel extends ViewPlugin { this.el.setAttribute('id', 'fileExplorerView') this.remixdHandle = new RemixdHandle(this.fileProviders.localhost, appManager) - this.gitHandle = new GitHandle() this.hardhatHandle = new HardhatHandle() this.foundryHandle = new FoundryHandle() this.truffleHandle = new TruffleHandle() diff --git a/apps/remix-ide/src/app/plugins/remixd-handle.tsx b/apps/remix-ide/src/app/plugins/remixd-handle.tsx index 35353d774d..62329cf327 100644 --- a/apps/remix-ide/src/app/plugins/remixd-handle.tsx +++ b/apps/remix-ide/src/app/plugins/remixd-handle.tsx @@ -6,7 +6,6 @@ import * as packageJson from '../../../../../package.json' import { version as remixdVersion } from '../../../../../libs/remixd/package.json' import { PluginManager } from '@remixproject/engine' import { AppModal, AlertModal } from '@remix-ui/app' -import { CopyToClipboard } from '@remix-ui/clipboard' const LOCALHOST = ' - connect to localhost - ' @@ -25,12 +24,6 @@ const profile = { authorContact: "" } -enum State { - ok, - cancel, - new -} - export class RemixdHandle extends WebsocketPlugin { localhostProvider: any appManager: PluginManager diff --git a/apps/remix-ide/src/app/tabs/locales/en/home.json b/apps/remix-ide/src/app/tabs/locales/en/home.json index 43f293e1c6..0b2c025b7f 100644 --- a/apps/remix-ide/src/app/tabs/locales/en/home.json +++ b/apps/remix-ide/src/app/tabs/locales/en/home.json @@ -12,10 +12,6 @@ "home.remixRewards": "REMIX REWARDS", "home.remixRewardsText1": "NFTs for our users!", "home.remixRewardsText2": "Remix Project rewards contributors, beta testers, and UX research participants with NFTs deployed on Optimism.", - "home.solidityDevSurveyHeader": "SOLIDITY DEVELOPER SURVEY 2022", - "home.solidityDevSurvey": "Help to collect feedback for the Solidity team. The survey takes roughly 10 minutes", - "home.solidityDevSurvey1": "Annual poll", - "home.surveyLink": "Take the Survey", "home.betaTesting": "BETA TESTING", "home.betaTestingText1": "Our community supports us.", "home.betaTestingText2": "You can join Beta Testing before each release of Remix IDE. Help us test now and get a handle on new features!", diff --git a/apps/remix-ide/src/app/tabs/locales/zh/home.json b/apps/remix-ide/src/app/tabs/locales/zh/home.json index 7a772e1a7b..3541ee6d66 100644 --- a/apps/remix-ide/src/app/tabs/locales/zh/home.json +++ b/apps/remix-ide/src/app/tabs/locales/zh/home.json @@ -12,10 +12,6 @@ "home.remixRewards": "REMIX 奖励", "home.remixRewardsText1": "给我们的用户提供的 NFT!", "home.remixRewardsText2": "Remix 会用部署在 Optimism 链上的 NFT 奖励贡献者、beta 测试者和用户体验研究参与者。Remix 奖励的持有者可以铸造第二个“Remixer”用户 NFT 徽章，以赠予他们选择的任何其他用户。", - "home.solidityDevSurveyHeader": "", - "home.solidityDevSurvey": "", - "home.solidityDevSurvey1": "", - "home.surveyLink": "", "home.betaTesting": "BETA 测试", "home.betaTestingText1": "我们的社区支持我们", "home.betaTestingText2": "每次 Remix IDE 发布版本之前，你都可以参与 Beta 测试。现在就来帮我们测试并且尝鲜新功能吧！", diff --git a/apps/remix-ide/src/assets/js/loader.js b/apps/remix-ide/src/assets/js/loader.js index 8f22b3db6c..2887ddcc17 100644 --- a/apps/remix-ide/src/assets/js/loader.js +++ b/apps/remix-ide/src/assets/js/loader.js @@ -15,6 +15,12 @@ if (domains[window.location.hostname]) { var u = "https://matomo.ethereum.org/"; _paq.push(['setTrackerUrl', u + 'matomo.php']) _paq.push(['setSiteId', domains[window.location.hostname]]) + // Send all of the Remix live tracking data to the secondary Matomo server + if (window.location.hostname === 'remix.ethereum.org') { + var secondaryTracker = 'https://remix-ethereum.matomo.cloud/matomo.php'; + var secondaryWebsiteId = 1; + _paq.push(['addTracker', secondaryTracker, secondaryWebsiteId]); + } var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0] g.type = 'text/javascript'; g.async = true; g.src = u + 'matomo.js'; s.parentNode.insertBefore(g, s) })() diff --git a/apps/remix-ide/src/remixAppManager.js b/apps/remix-ide/src/remixAppManager.js index 4d79ab2705..48e367c10c 100644 --- a/apps/remix-ide/src/remixAppManager.js +++ b/apps/remix-ide/src/remixAppManager.js @@ -190,7 +190,7 @@ class PluginLoader { constructor() { const queryParams = new QueryParams() - this.donotAutoReload = ['remixd', 'git'] // that would be a bad practice to force loading some plugins at page load. + this.donotAutoReload = ['remixd'] // that would be a bad practice to force loading some plugins at page load. this.loaders = {} this.loaders.localStorage = { set: (plugin, actives) => { diff --git a/babel.config.js b/babel.config.js index e31ff6f5b2..ad32f7a9d0 100644 --- a/babel.config.js +++ b/babel.config.js @@ -6,5 +6,8 @@ module.exports = { "@babel/plugin-proposal-class-properties", "@babel/plugin-proposal-nullish-coalescing-operator", ["@babel/plugin-proposal-private-property-in-object", { "loose": false }], - ["@babel/plugin-proposal-private-methods", { "loose": false }]] + ["@babel/plugin-proposal-private-methods", { "loose": false }], + ["@babel/plugin-transform-runtime", { + "regenerator": true + }]] } \ No newline at end of file diff --git a/libs/remix-debug/src/solidity-decoder/internalCallTree.ts b/libs/remix-debug/src/solidity-decoder/internalCallTree.ts index c194f5640c..4233ec9cbb 100644 --- a/libs/remix-debug/src/solidity-decoder/internalCallTree.ts +++ b/libs/remix-debug/src/solidity-decoder/internalCallTree.ts @@ -82,18 +82,22 @@ export class InternalCallTree { if (!compResult) { this.event.trigger('noCallTreeAvailable', []) } else { - buildTree(this, 0, scopeId, isCreation).then((result) => { - if (result.error) { - this.event.trigger('callTreeBuildFailed', [result.error]) - } else { - createReducedTrace(this, traceManager.trace.length - 1) - console.log('call tree build lasts ', (Date.now() - time) / 1000) - this.event.trigger('callTreeReady', [this.scopes, this.scopeStarts]) - } - }, (reason) => { - console.log('analyzing trace falls ' + reason) - this.event.trigger('callTreeNotReady', [reason]) - }) + try { + buildTree(this, 0, scopeId, isCreation).then((result) => { + if (result.error) { + this.event.trigger('callTreeBuildFailed', [result.error]) + } else { + createReducedTrace(this, traceManager.trace.length - 1) + console.log('call tree build lasts ', (Date.now() - time) / 1000) + this.event.trigger('callTreeReady', [this.scopes, this.scopeStarts]) + } + }, (reason) => { + console.log('analyzing trace falls ' + reason) + this.event.trigger('callTreeNotReady', [reason]) + }) + } catch (e) { + console.log(e) + } } }) } diff --git a/libs/remix-debug/src/solidity-decoder/solidityProxy.ts b/libs/remix-debug/src/solidity-decoder/solidityProxy.ts index 34bdcf5abf..462dad4d05 100644 --- a/libs/remix-debug/src/solidity-decoder/solidityProxy.ts +++ b/libs/remix-debug/src/solidity-decoder/solidityProxy.ts @@ -115,7 +115,7 @@ export class SolidityProxy { for (const source of generatedSources) { if (source.id === sourceLocation.file) return source.ast } - } else if (compilationResult.data.sources[file]) { + } else if (compilationResult.data.sources && compilationResult.data.sources[file]) { return compilationResult.data.sources[file].ast } return null 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 8dd8698d9d..369ff45351 100644 --- a/libs/remix-ui/home-tab/src/lib/components/homeTabFeatured.tsx +++ b/libs/remix-ui/home-tab/src/lib/components/homeTabFeatured.tsx @@ -36,17 +36,6 @@ function HomeTabFeatured() { autoPlaySpeed={15000} dotListClass="position-relative mt-2" > -
- -
-
-

-
- -
- _paq.push(['trackEvent', 'hometab', 'featuredSection', 'soliditySurvey'])} href="https://blog.soliditylang.org/2022/12/07/solidity-developer-survey-2022-announcement/"> -
-
diff --git a/libs/remix-ws-templates/src/templates/remixDefault/contracts/1_Storage.sol b/libs/remix-ws-templates/src/templates/remixDefault/contracts/1_Storage.sol index 6aa93223af..dd1e15d25e 100644 --- a/libs/remix-ws-templates/src/templates/remixDefault/contracts/1_Storage.sol +++ b/libs/remix-ws-templates/src/templates/remixDefault/contracts/1_Storage.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity >=0.7.0 <0.9.0; +pragma solidity >=0.8.2 <0.9.0; /** * @title Storage diff --git a/libs/remixd/src/services/foundryClient.ts b/libs/remixd/src/services/foundryClient.ts index 6def00becc..5f9fbc02e3 100644 --- a/libs/remixd/src/services/foundryClient.ts +++ b/libs/remixd/src/services/foundryClient.ts @@ -87,7 +87,6 @@ export class FoundryClient extends PluginClient { if (!fs.existsSync(join(this.cachePath, 'solidity-files-cache.json'))) return try { const cache = JSON.parse(await fs.readFile(join(this.cachePath, 'solidity-files-cache.json'), { encoding: 'utf-8' })) - // name of folders are file names for (const file of folderFiles) { const path = join(this.buildPath, file) // out/Counter.sol/ diff --git a/release-management.md b/release-management.md index c3802da892..eb6b6d99ea 100644 --- a/release-management.md +++ b/release-management.md @@ -16,10 +16,10 @@ During this phase the github project has to be filled with the issues that are g ## Release planning: Together with the team, the release manager will refine the list of issues and PRs that should be addressed during the release. -More generally and a non negligeable part of the planning is to properly ensure that bugs, issues that weren't totally identified in the roadmap, and the roadmap issues are still being processed as they should. +More generally and a non-negligible part of the planning is to properly ensure that bugs, issues that weren't totally identified in the roadmap, and the roadmap issues are still being processed as they should. During this phase, **all the current project issues have to be assigned.** -After the release planning each one of us have to specify the effort need for each issue (1 - 2 - 3 - 5 - 8 - 13) +After the release planning each one of us has to specify the effort need for each issue (1 - 2 - 3 - 5 - 8 - 13) ## Release planning - refinement meeting: This meeting happens a few days after the release planning meeting. @@ -37,7 +37,7 @@ Release managers will oversee the various aspects of a project before it is due The quality of the release needs to be reviewed before a project is officially launched. The release manager is in charge of ensuring manual testing is properly planned and done. During the feature freeze time, only the release manager has permission to merge pull requests. As staging should at this point be already deployed, this is to ensure that the release manager has enough visibility on the changes being applied. -Also that unit testing and e2e for new feaures have been included. +Also that unit testing and e2e for new features have been included. ## Deployment: After being quality checked, the project is ready to be deployed. @@ -57,14 +57,14 @@ The release manager is still responsible for ensuring a project is rolled out sm - Lead the daily standup meeting. - 10 minutes or more are reserved at the end of the daily standup meeting where the release manager update the team on the opened PRs (PRs which aim to be delivered in the planned release). - - Regular check for new filed issues, identify those that requires to be published (included in the release) - - In some really specific situation, it could be required to deploy intermediate releases (e.g critical bug fixes). + - Regular check for new filed issues, identify those that require to be published (included in the release) + - In some really specific situations, it could be required to deploy intermediate releases (e.g critical bug fixes). - Planning, refinement, retrospective meetings have to be organized by the release manager and any other required meetings. - - Release manager should feel free to implement new techniques and put their own finger print to their release, this could potentially benefit upcoming releases. + - Release manager should feel free to implement new techniques and put their own fingerprint to their release, this could potentially benefit upcoming releases. - During feature freeze, remix-beta should be updated every morning. - A meeting with Andy and Rob should be organized for ensuring the beta test results are properly handled. -## check list: +## checklist: ### pre release planning @@ -74,7 +74,7 @@ The release manager is still responsible for ensuring a project is rolled out sm - [ ] a release kickoff meeting with the team aiming to get input from everyone and modify the project accordingly. - [ ] 2-3 days span where team members estimate their issues. - [ ] a release planning meeting where we agree on the release scope (intermediate and/or classic release). -- [ ] after this meeting: all the issues / PR should have been qualified in term of effort and scope. +- [ ] after this meeting: all the issues / PR should have been qualified in terms of effort and scope. - [ ] after this meeting: date for feature freeze, QA period, and release date should be set in the project title. diff --git a/release-process.md b/release-process.md index 013b600964..3520ff6515 100644 --- a/release-process.md +++ b/release-process.md @@ -13,11 +13,11 @@ Once feature freeze is done, `remix_beta` should be updated latest to the master - `git checkout remix_beta` - `git pull origin remix_beta` - - `git reset --hard ` (`master-commit-hash` will be latest commid id from `master` branch) + - `git reset --hard ` (`master-commit-hash` will be latest commit id from `master` branch) - `git push -f origin remix_beta` ## Testing -Testing is performed after the Feature Freeze on `remix-beta.ethereum.org`. `build-qa-doc.js` script can be used to generate the list of QA tasks. Instructions to use the file are given in the file itself : https://github.com/ethereum/remix-project/blob/master/build-qa-doc.js#L18 . +Testing is performed after the Feature Freeze on `remix-beta.ethereum.org`. `build-qa-doc.js` script can be used to generate the list of QA tasks. Instructions to use the file are given in the file itself: https://github.com/ethereum/remix-project/blob/master/build-qa-doc.js#L18 . Once ready to run, it can be run using the Node.js: `node build-qa-doc.js` @@ -76,7 +76,7 @@ Updating the `remix_live` branch latest to the `remix_beta` runs the CircleCI bu - `git reset --hard ` or `` sometimes - `git push -f origin remix_live` - CircleCI will build automaticaly and remix.ethereum.org will be updated to the latest. + CircleCI will build automatically and remix.ethereum.org will be updated to the latest. ### Part 3. Upload zip file in GitHub release - Once CI is successful for `remix_live` branch, Go to https://github.com/ethereum/remix-live @@ -108,4 +108,4 @@ Updating the `remix_live` branch latest to the `remix_beta` runs the CircleCI bu ## Remix IDE Alpha Release -remix-alpha.ethereum.org is automaticaly updated every time a commit is pushed to `master` branch +remix-alpha.ethereum.org is automatically updated every time a commit is pushed to `master` branch diff --git a/team-best-practices.md b/team-best-practices.md index f0b4c43109..a05714dc5d 100644 --- a/team-best-practices.md +++ b/team-best-practices.md @@ -1,7 +1,7 @@ # Team best practices -This document aims to address contibutors best practices of the following repositories: +This document aims to address contributors best practices of the following repositories: - Remix Project: https://github.com/ethereum/remix-project - Remix Libraries: https://github.com/ethereum/remix-project/tree/master/libs @@ -48,7 +48,7 @@ Related links: ### 2) Group meetings: - - When a story / bug fix is divided in parts, there should be a kickstart meeting with all the developers involved, so that all the devs have an good overview / understanding on: + - When a story / bug fix is divided in parts, there should be a kickstart meeting with all the developers involved, so that all the devs have a good overview / understanding on: - How the story fits into the Ethereum tech. - How the backend (if any) works / will work (could be a smart contract). - How the frontend works / will work. @@ -73,7 +73,7 @@ Before starting coding, we should ensure all devs / contributors are aware of: - Prioritised list of PRs / issues are tracked in a GitHub Project, Remix IDE issues are managed by a prioritized backlog. - Every story can be executed by a single developer or a group of 2 or more developers (depending on the size and complexity) -- Each dev should take the part he/she feels the most confortable with. +- Each dev should take the part he/she feels the most comfortable with. - Later progress and discussion is updated directly on the issue or pull request (github). - When a developer or team decides on the story they want to work on (at the start of milestone for instance), they assign themselves to the issue. - Documentation update should be done together with the story, or an issue with the label "documentation" has to be created. @@ -122,7 +122,7 @@ Before starting coding, we should ensure all devs / contributors are aware of: # Milestone - A milestone should **only** contain items we are sure to finish. - - The end of a milestone trigger a new release. + - The end of a milestone triggers a new release. - Milestone items and duration should take in account time spent in bugs fixing and support. - The team should commit to the milestone duration. - If a dev finish early he/she can help other to push remaining tasks. @@ -133,7 +133,7 @@ Before starting coding, we should ensure all devs / contributors are aware of: # Milestone - Refinement meeting - - A meeting is organized 3 weeks after the beggining of a round. This aims to : + - A meeting is organized 3 weeks after the beginning of a round. This aims to : - list what is left to do. - identify any blocker. - agree on a release date (which can be earlier 1 week after the meeting and not later than 4 weeks after the meeting. @@ -170,7 +170,7 @@ Before starting coding, we should ensure all devs / contributors are aware of: ### 1) Bugs: - A critical bug should get the label `Blocker`, and every effort should be put to fix it. - Addressing a non critical and non planned bug can be done: - - After having notified in the `remix-dev` channel if the bug does not involves UX or public API changes. + - After having notified in the `remix-dev` channel if the bug does not involve UX or public API changes. - After a dev meeting (e.g the regular standup) if the bug involves any UX or public API changes. ### 2) Support: