Merge branch 'master' into account-dropdown-refactor

CONTRIBUTING.md

@@ -58,7 +58,7 @@ Then, create a `index.js` file like this,
 import panelJson from './panel.json';
 import enJson from '../en';
 
-// There may have some un-translated content. Always fill in the gaps with EN JSON.
+// There may have some untranslated content. Always fill in the gaps with EN JSON.
 // No need for a defaultMessage prop when render a FormattedMessage component.
 export default Object.assign({}, enJson, {
   ...panelJson,
@@ -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 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.
+Each non-english language will be filled in the gaps with english. Even though there may be some untranslated 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

apps/remix-ide-e2e/src/tests/url.test.ts

@@ -340,5 +340,17 @@ module.exports = {
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf('contract Lock {') !== -1, 'content does contain "contract Lock {"')
       })      
-  }
+  },
+
+  'Load remix with an iframe plugin #group4': function (browser: NightwatchBrowser) {
+    browser
+      .url('http://127.0.0.1:8080?activate=contract-verification')
+      .refreshPage()
+      .waitForElementVisible(
+        {
+          selector: '//*[contains(@data-id, "sidePanelSwapitTitle") and text()="Contract Verification"]',
+          locateStrategy: 'xpath'
+        }
+      )
+    }
 }

apps/remix-ide/meetings.md

@@ -34,10 +34,10 @@ Each other native plugin can request a guided tour with:
 Other type of plugin may be able to the native plugin guided tour but we won't push this if the integration is not working out of the box. 
 We rather update the remix-plugin doc saying that `guided tour framework name` is the preferred one.
 
-## web site
+## website
 
-we commit to have a public web site for general info about us.
-It won't be a branded web site.
+we commit to have a public website for general info about us.
+It won't be a branded website.
 We are asking a designer for improving the Liana's logo.
 We don't need to have a framework (hugo, hexo) if that's too much overhead.
 @liana is testing out the easiest solution.
@@ -98,7 +98,7 @@ first steps :
 - put all the public link to the local package
 - basic electron wrapper
 
-## out reach beyond community
+## outreach beyond community
 
 We agree it is something interesting to explore, 
 It is not 100% dev tool nor remix so we should organize call with other people from EF at least

libs/README.md

@@ -30,8 +30,8 @@ Each library is an NPM package and has basic documentation about its usage in it
 
 ## Contributing
 
-Everyone is very welcome to contribute on Remix Project. Suggestions, issues, queries and feedbacks are our pleasure. Please reach us on [Gitter](https://gitter.im/ethereum/remix) in case of any query.
+Everyone is very welcome to contribute on Remix Project. Suggestions, issues, queries and feedback are our pleasure. Please reach us on [Gitter](https://gitter.im/ethereum/remix) in case of any query.
 
-For more information on the contributing in code, see our [contribution guidelines](https://github.com/ethereum/remix-project/blob/master/CONTRIBUTING.md).
+For more information on the contributing to the code, see our [contribution guidelines](https://github.com/ethereum/remix-project/blob/master/CONTRIBUTING.md).
 
 

libs/remix-ai-core/src/agents/codeExplainAgent.ts

@@ -1,4 +1,4 @@
-// interactive code explaining and highlight security vunerabilities
+// interactive code explaining and highlight security vulnerabilities
 import * as fs from 'fs';
 
 export class CodeExplainAgent {

libs/remix-ai-core/src/agents/securityAgent.ts

@@ -22,7 +22,7 @@ class SecurityAgent {
   }
 
   public getRecommendations(currentLine: string, numSuggestions: number = 3): string[] {
-    // process the code base highlighting security vunerabilities and deliver recommendations
+    // process the code base highlighting security vulnerabilities and deliver recommendations
     const suggestions: string[] = [];
     return suggestions;
   }

libs/remix-ai-core/src/prompts/promptBuilder.ts

@@ -9,7 +9,7 @@ export const PromptBuilder = (inst, answr, modelop) => {
 
 export const buildSolgptPromt = (userPrompt:string, modelOP:RemoteBackendOPModel) => {
   if (modelOP === undefined) {
-    console.log('WARNING: modelOP is undefined. Provide a valide model OP for chat history')
+    console.log('WARNING: modelOP is undefined. Provide a valid model OP for chat history')
     return userPrompt
   }
   if (ChatHistory.getHistory().length === 0){
@@ -27,4 +27,4 @@ export const buildSolgptPromt = (userPrompt:string, modelOP:RemoteBackendOPModel
     newPrompt = "sol-gpt " + newPrompt + PromptBuilder(parsedPrompt, "", modelOP)
     return newPrompt
   }
-}
+}

libs/remix-analyzer/src/solidity-analyzer/modules/selfdestruct.ts

@@ -6,7 +6,7 @@ import { AnalyzerModule, ModuleAlgorithm, ModuleCategory, ReportObj, ContractHLA
 
 export default class selfdestruct implements AnalyzerModule {
   name = 'Selfdestruct: '
-  description = 'Contracts using destructed contract can be broken'
+  description = 'Contracts using destroyed contract can be broken'
   category: ModuleCategory = category.SECURITY
   algorithm: ModuleAlgorithm = algorithm.HEURISTIC
   version: SupportedVersion = {

libs/remix-solidity/README.md

@@ -25,7 +25,7 @@
 ```
 `CompilerInput` can be used to form the [compiler input](https://github.com/ethereum/remix-project/blob/master/libs/remix-solidity/src/compiler/types.ts#L1) by passing the [options](https://github.com/ethereum/remix-project/blob/master/libs/remix-solidity/src/compiler/types.ts#L144)
 
-`Compiler` is a class containing various methods to perform compiler related actions. Have a look to `Compiler` interface:
+`Compiler` is a class containing various methods to perform compiler related actions. Have a look at `Compiler` interface:
 
 ```
 class Compiler {
@@ -135,7 +135,7 @@ class Compiler {
 
 Please feel free to open an issue or a pull request. 
 
-In case you want to add some code, do have a look to our contribution guidelnes [here](https://github.com/ethereum/remix-project/blob/master/CONTRIBUTING.md). Reach us on [Gitter](https://gitter.im/ethereum/remix) in case of any queries.   
+In case you want to add some code, do have a look to our contribution guidelines [here](https://github.com/ethereum/remix-project/blob/master/CONTRIBUTING.md). Reach us on [Gitter](https://gitter.im/ethereum/remix) in case of any queries.   
 
 ### License
 MIT © 2018-21 Remix Team

libs/remix-tests/README.md

@@ -269,7 +269,7 @@ For more details, see parameters' type definitions [here](src/types.ts).
 
 Please feel free to open an issue or a pull request. 
 
-In case you want to add a code, do have a look to our contribution guidelines [here](https://github.com/ethereum/remix-project/blob/master/CONTRIBUTING.md). Reach us in [Gitter](https://gitter.im/ethereum/remix) in case of any queries.
+In case you want to add a code, do have a look at our contribution guidelines [here](https://github.com/ethereum/remix-project/blob/master/CONTRIBUTING.md). Reach us in [Gitter](https://gitter.im/ethereum/remix) in case of any queries.
 
 ### License
 MIT © 2018-21 Remix Team

libs/remix-ws-templates/src/templates/rln/README.md

@@ -29,8 +29,8 @@ This generates a verification key (`./zk/build/verification_key.json`) and artif
 
 This script:
 
-- create a list of identity commitments and add it to a `IncrementalMerkleTree`. The tree is used to generate a merkle proof that a specified identity is actually in the tree (see`tree.createProof(0)`).
+- creates a list of identity commitments and add it to a `IncrementalMerkleTree`. The tree is used to generate a merkle proof that a specified identity is actually in the tree (see`tree.createProof(0)`).
 
 - generate a witness and a proof of execution with `messageId`equal to 0.
 
-- generating 2 proofs (two different messages) with the same `messageId` reveal the two points of the polynomial necessary to deduct the `identitySecret` (using `shamirRecovery`).
+- generating 2 proofs (two different messages) with the same `messageId` reveal the two points of the polynomial necessary to deduce the `identitySecret` (using `shamirRecovery`).

libs/remix-ws-templates/src/templates/semaphore/README.md

@@ -20,7 +20,7 @@ This generates a verification key (`./zk/build/verification_key.json`) and artif
 
 #### 3) execute the file `run_verification.ts`:
 This script:
-	- create a list of identity commitments and add it to a `IncrementalMerkleTree`. The tree is used to generate a merkle proof that a specified identity is actually in the tree  (see `tree.createProof(0)`).
-	- generate a witness and a proof of execution.
+	- creates a list of identity commitments and add it to a `IncrementalMerkleTree`. The tree is used to generate a merkle proof that a specified identity is actually in the tree  (see `tree.createProof(0)`).
+	- generates a witness and a proof of execution.
 	- verify that the proof is valid `(snarkjs.groth16.verify)`
 	- ultimately verify that the hash generated by the circom compiler is the same as the root hash for the Tree. `(proof1.root.toString() === publicSignals[0]`). This asserts that the identity provided to the circuit is actually part of that semaphore group.

libs/remixd/README.md

@@ -7,7 +7,7 @@
 
 `@remix-project/remixd` is an NPM module that intends to be used with [Remix IDE](https://remix.ethereum.org/) web and desktop applications. It establishes a two-way websocket connection between the local computer and Remix IDE for a particular project directory.
 
-`remixd` can be used to setup a development environment with other popular frameworks like Hardhat, Truffle, Slither etc.
+`remixd` can be used to set up a development environment with other popular frameworks like Hardhat, Truffle, Slither etc.
 
 More details are explained in the [documentation](https://remix-ide.readthedocs.io/en/latest/remixd.html).
 
@@ -71,13 +71,13 @@ The current user should have `read/write` access to the folder (at least `read`
 It is important to notice that changes made to the current file in `Remix IDE` are automatically saved to the local computer every 5000 ms. There is no `Save` action. But the `Ctrl-Z` (undo) can be used.
 
 Furthermore:
- - No copy of the shared folder are kept in the browser storage.
+ - No copy of the shared folder is kept in the browser storage.
  - Clicking on the new folder or new file icon under localhost will create a new file or folder in the shared folder.
  - If a folder does not contain any file, the folder will not be displayed in the explorer (that might change).
  - Symbolic links are not forwarded to Remix IDE.
 
 ## Ports Usage
-remixd creates a websocket connections with Remix IDE on different ports. Ports are defined according to specific purpose. Port usage details are as:
+remixd creates a websocket connection with Remix IDE on different ports. Ports are defined according to specific purposes. Port usage details are as:
 
 - **65520** : For `remixd` websocket listener, to share a project from local device with Remix IDE. Shared folder will be loaded in the Remix IDE File Explorer workspace named localhost [See more](https://remix-ide.readthedocs.io/en/latest/remixd.html)
 - **65522** : For `Hardhat` websocket listener, to enable the Hardhat Compilation using Remix IDE Solidity Compiler plugin, if shared folder is a Hardhat project [See more](https://remix-ide.readthedocs.io/en/latest/hardhat.html)

release-management.md

@@ -27,7 +27,7 @@ We check all the issues and associated effort and identify critical issues.
 e.g:
  - issues that'll need to be split.
  - issues that miss important information.
- - issues that are dependent on each others.
+ - issues that are dependent on each other.
  - issues that require different skills or that the team member is less available during this release.
 
 ## Configuring releases: