Merge branch 'master' into contract-verification-i18n

Author: joeizang

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing
 
-Everyone is welcome to contribute to Remix's codebase and please join our [Discord](https://discord.gg/mh9hFCKkEq).
+Everyone is welcome to contribute to Remix's codebase and please join our [Discord](https://discord.com/invite/nfv6ZYjAeP).
 
 ## Development
 Remix libraries work closely with [Remix IDE](https://remix.ethereum.org). Each library has a README to explain its application.
@@ -72,7 +72,7 @@ import panelJson from './panel.json';
 import enJson from '../en';
 
 // 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.
+// No need for a defaultMessage prop when rendering a FormattedMessage component.
 export default Object.assign({}, enJson, {
   ...panelJson,
 })

apps/circuit-compiler/src/app/services/circomPluginClient.ts

@@ -502,9 +502,9 @@ export class CircomPluginClient extends PluginClient {
           const exists = await this.call('fileManager', 'exists', path)
 
           if (exists) return path
-          else throw new Error(`Report path ${path} do no exist in the Remix FileSystem`)
+          else throw new Error(`Report path ${path} does not exist in the Remix FileSystem`)
         } else {
-          throw new Error(`Report path ${path} do no exist in the Remix FileSystem`)
+          throw new Error(`Report path ${path} does not exist in the Remix FileSystem`)
         }
       }
     }

apps/contract-verification/README.md

@@ -0,0 +1,19 @@
+# Contract Verification Plugin
+
+With this plugin, contracts written and compiled in Remix can be verified at Sourcify, Etherscan, Blockscout and Routescan at the same time. Besides that, the source code of any address can be fetched from the verifiers and added to the file editor.
+
+## Adding a new verification service
+
+Currently, the plugin supports Sourcify, Etherscan, Blockscout and Routescan. To add a new verifier, you need to make the following changes:
+
+In `./src/app/types/VerificationTypes.ts`, add the new verifier to the `VerifierIdentifier` type and the`VERIFIERS` array.
+
+In order to interact with the API of the verification service, you need to create a new class that extends the `AbstractVerifier` class. If your API is based on the Etherscan API, you can simply extend the `EtherscanVerifier` class. In this case, see the `RoutescanVerifier` and the `BlockscoutVerifier` for reference. All related classes are located in the `./src/app/Verifiers` directory.
+
+In `./src/app/Verifiers/index.ts`, add your new verifier to the `getVerifier` function. Validate any settings properties that are required by your verifier.
+
+In `./src/app/utils/default-apis.json`, you need to add default settings for your new verifier. If you can, simply add your defaults in the form of `{ [VerifierIdentifier]: { [chainId]: { apiUrl: [value], explorerUrl: [value] } } }`. If you need more flexibility, you might also want to change the `src/app/utils/default-settings.ts` file. See Routescan there for reference.
+
+Your new verifier will automatically be shown in the `VerifyView` and the `LookupView` since we added it to the `VERIFIERS` array. You only need to make a change to the `SettingsView` because the required settings depend on the verifier. There, add a new div block in the same format as the other verifiers. Only add the `ConfigInput` elements for the settings that your verifier needs to the div block.
+
+That's it! Your verification service should be able to verify contracts through Remix now.

apps/debugger/webpack.config.js

@@ -48,7 +48,7 @@ module.exports = composePlugins(withNx(), (config) => {
     })
   )
 
-  // souce-map loader
+  // source-map loader
   config.module.rules.push({
     test: /\.js$/,
     use: ['source-map-loader'],

apps/doc-viewer/webpack.config.js

@@ -28,7 +28,7 @@ module.exports = composePlugins(withNx(), withReact(), (config) => {
     new webpack.DefinePlugin({})
   )
 
-  // souce-map loader
+  // source-map loader
   config.module.rules.push({
     test: /\.js$/,
     use: ['source-map-loader'],

apps/remix-dapp/src/locales/en/udapp.json

@@ -133,7 +133,7 @@
   "udapp.contractCreation": "Contract Creation",
   "udapp.transactionFee": "Transaction is invalid. Max fee should not be less than Base fee",
   "udapp.title1": "Represents the part of the tx fee that goes to the miner.",
-  "udapp.title2": "Represents the maximum amount of fee that you will pay for this transaction. The minimun needs to be set to base fee.",
+  "udapp.title2": "Represents the maximum amount of fee that you will pay for this transaction. The minimum needs to be set to base fee.",
   "udapp.gasPrice": "Gas price",
   "udapp.gweiText": "visit {a} for current gas price info.",
   "udapp.maxTransactionFee": "Max transaction fee",

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

@@ -26,7 +26,7 @@ module.exports = {
       .assert.containsText('.sidepanel h6[data-id="sidePanelSwapitTitle"]', 'SOLIDITY COMPILER')
       .waitForElementNotVisible('.pinned-panel h6[data-id="sidePanelSwapitTitle"]')
   },
-  'Should pin a plugin while a another plugin is already pinned': function (browser: NightwatchBrowser) {
+  'Should pin a plugin while an another plugin is already pinned': function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('[data-id="movePluginToRight"]')
       .click('[data-id="movePluginToRight"]')
       .waitForElementVisible('[data-id="movePluginToLeft"]')

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

@@ -101,7 +101,7 @@ module.exports = {
         browser.assert.equal(content, 'testing')
       })
   },
-  'Should have a artifacts file with JSON test data #group1 #group3 #group5 #group7': function (browser: NightwatchBrowser) {
+  'Should have an artifacts file with JSON test data #group1 #group3 #group5 #group7': function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('*[data-id="remixIdeSidePanel"]', 5000)
       .click('*[data-id="treeViewLitreeViewItemtest_contracts/artifacts"]')
       .openFile('test_contracts/artifacts/Storage_metadata.json')
@@ -111,7 +111,7 @@ module.exports = {
         browser.assert.equal(metadata.test, 'data')
       })
   },
-  'Should have a empty workspace #group1 #group3 #group5 #group7': function (browser: NightwatchBrowser) {
+  'Should have an empty workspace #group1 #group3 #group5 #group7': function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('*[data-id="remixIdeSidePanel"]', 5000)
       .switchWorkspace('emptyspace')
   },

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

@@ -7,7 +7,7 @@ module.exports = {
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
     // this test suite also contribute testing https://github.com/ethereum/remix/pull/1497 and https://github.com/ethereum/remix-ide/pull/2898
     // quick explanation:
-    // the goal of https://github.com/ethereum/remix-ide/pull/2898 is to keep track of all the compiled contracts an not only the last one.
+    // the goal of https://github.com/ethereum/remix-ide/pull/2898 is to keep track of all the compiled contracts a not only the last one.
     // this introduce an issue: if 2 compiled contracts have the same name, the second one override the first which is not wanted.
     // fix's delivered by https://github.com/ethereum/remix/pull/1497: instead of getting contract by name,
     // which result in name clashing we process the whole contract object (which contain bytecode, deployedbytecode, ...)