Merge branch 'master' into completion_enabled_default

.github/ISSUE_TEMPLATE/bug_report.md

@@ -25,8 +25,8 @@ If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
  - OS: [e.g. Windows, Linux or MacOS]
- - Browser [e.g. chrome, firefox]
- - Version [e.g. 22]
+ - Browser: [e.g. chrome, firefox]
+ - Version: [e.g. 22]
 
 **Additional context**
 Add any other context about the problem here.

apps/circuit-compiler/webpack.config.js

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

apps/contract-verification/src/app/app.tsx

@@ -13,6 +13,7 @@ import { CompilerAbstract } from '@remix-project/remix-solidity'
 import { useLocalStorage } from './hooks/useLocalStorage'
 import { getVerifier } from './Verifiers'
 import { ContractDropdownSelection } from './components/ContractDropdown'
+import { IntlProvider } from 'react-intl'
 
 const plugin = new ContractVerificationPluginClient()
 
@@ -32,11 +33,25 @@ const App = () => {
   const [proxyAddressError, setProxyAddressError] = useState('')
   const [abiEncodedConstructorArgs, setAbiEncodedConstructorArgs] = useState<string>('')
   const [abiEncodingError, setAbiEncodingError] = useState<string>('')
+  const [locale, setLocale] = useState<{ code: string; messages: any }>({
+    code: 'en',
+    messages: {}
+  })
 
   const timer = useRef(null)
 
   useEffect(() => {
     plugin.internalEvents.on('verification_activated', () => {
+
+      // @ts-ignore
+      plugin.call('locale', 'currentLocale').then((locale: any) => {
+        setLocale(locale)
+      })
+
+      // @ts-ignore
+      plugin.on('locale', 'localeChanged', (locale: any) => {
+        setLocale(locale)
+      })
       // Fetch compiler artefacts initially
       plugin.call('compilerArtefacts' as any, 'getAllCompilerAbstracts').then((obj: any) => {
         setCompilationOutput(obj)
@@ -143,11 +158,13 @@ const App = () => {
   }, [submittedContracts])
 
   return (
-    <AppContext.Provider value={{ themeType, setThemeType, clientInstance: plugin, settings, setSettings, chains, compilationOutput, submittedContracts, setSubmittedContracts }}>
-      <VerifyFormContext.Provider value={{ selectedChain, setSelectedChain, contractAddress, setContractAddress, contractAddressError, setContractAddressError, selectedContract, setSelectedContract, proxyAddress, setProxyAddress, proxyAddressError, setProxyAddressError, abiEncodedConstructorArgs, setAbiEncodedConstructorArgs, abiEncodingError, setAbiEncodingError }}>
-        <DisplayRoutes />
-      </VerifyFormContext.Provider>
-    </AppContext.Provider>
+    <IntlProvider locale={locale.code} messages={locale.messages}>
+      <AppContext.Provider value={{ themeType, setThemeType, clientInstance: plugin, settings, setSettings, chains, compilationOutput, submittedContracts, setSubmittedContracts }}>
+        <VerifyFormContext.Provider value={{ selectedChain, setSelectedChain, contractAddress, setContractAddress, contractAddressError, setContractAddressError, selectedContract, setSelectedContract, proxyAddress, setProxyAddress, proxyAddressError, setProxyAddressError, abiEncodedConstructorArgs, setAbiEncodedConstructorArgs, abiEncodingError, setAbiEncodingError }}>
+          <DisplayRoutes />
+        </VerifyFormContext.Provider>
+      </AppContext.Provider>
+    </IntlProvider>
   )
 }
 

apps/contract-verification/src/app/components/AccordionReceipt.tsx

@@ -97,32 +97,32 @@ const ReceiptsBody = ({ receipts }: { receipts: VerificationReceipt[] }) => {
           className="list-group-item d-flex flex-row align-items-center"
         >
           <CustomTooltip
-              placement="top"
-              tooltipClasses=" text-break"
-              tooltipTextClasses="text-capitalize"
-              tooltipText={`Status: ${receipt.status}${receipt.message ? `, Message: ${receipt.message}` : ''}`}
-            >
-              <span className="mr-2">
-                {['verified', 'partially verified', 'already verified'].includes(receipt.status) ?
-                  <i className="fas fa-check text-success px-1"></i> :
-                  receipt.status === 'fully verified' ?
-                    <i className="fas fa-check-double text-success px-1"></i> :
-                    receipt.status === 'failed' ?
-                      <i className="fas fa-xmark text-warning px-1"></i> :
-                      ['pending', 'awaiting implementation verification'].includes(receipt.status) ?
-                        <i className="fas fa-spinner fa-spin"></i> :
-                        <i className="fas fa-question"></i>
-                }
-              </span>
-            </CustomTooltip>
-            <div className="d-flex flex-row w-100 justify-content-between">
+            placement="top"
+            tooltipClasses=" text-break"
+            tooltipTextClasses="text-capitalize"
+            tooltipText={`Status: ${receipt.status}${receipt.message ? `, Message: ${receipt.message}` : ''}`}
+          >
+            <span className="mr-2">
+              {['verified', 'partially verified', 'already verified'].includes(receipt.status) ?
+                <i className="fas fa-check text-success px-1"></i> :
+                receipt.status === 'fully verified' ?
+                  <i className="fas fa-check-double text-success px-1"></i> :
+                  receipt.status === 'failed' ?
+                    <i className="fas fa-xmark text-warning px-1"></i> :
+                    ['pending', 'awaiting implementation verification'].includes(receipt.status) ?
+                      <i className="fas fa-spinner fa-spin"></i> :
+                      <i className="fas fa-question"></i>
+              }
+            </span>
+          </CustomTooltip>
+          <div className="d-flex flex-row w-100 justify-content-between">
             <CustomTooltip placement="top" tooltipClasses=" text-break" tooltipText={`API: ${receipt.verifierInfo.apiUrl}`}>
               <span className="font-weight-bold pr-2">{receipt.verifierInfo.name}</span>
             </CustomTooltip>
             <div className="ml-1">
               {!!receipt.lookupUrl && receipt.verifierInfo.name === 'Blockscout' ?
                 <CopyToClipboard classList="pr-0 py-0" tip="Copy code URL" content={receipt.lookupUrl} direction="top" /> :
-                !!receipt.lookupUrl && <a href={receipt.lookupUrl} target="_blank" className="fa fas fa-arrow-up-right-from-square"></a>
+                !!receipt.lookupUrl && <a href={receipt.lookupUrl} target="_blank" className="fa fas fa-arrow-up-right-from-square" rel="noreferrer"></a>
               }
             </div>
           </div>

apps/contract-verification/src/app/components/ConfigInput.tsx

@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from 'react'
 import { CustomTooltip } from '@remix-ui/helper'
+import { FormattedMessage, useIntl } from 'react-intl'
 
 interface ConfigInputProps {
   label: string
@@ -13,6 +14,7 @@ interface ConfigInputProps {
 export const ConfigInput: React.FC<ConfigInputProps> = ({ label, id, secret, initialValue, saveResult }) => {
   const [value, setValue] = useState(initialValue)
   const [enabled, setEnabled] = useState(false)
+  const intl = useIntl()
 
   // Reset state when initialValue changes
   useEffect(() => {
@@ -42,7 +44,7 @@ export const ConfigInput: React.FC<ConfigInputProps> = ({ label, id, secret, ini
           type={secret ? 'password' : 'text'}
           className={`form-control small w-100 ${!enabled ? 'bg-transparent pl-0 border-0' : ''}`}
           id={id}
-          placeholder={`Add ${label}`}
+          placeholder={intl.formatMessage({ id: "contract-verification.configInputPlaceholder" }, { label })}
           value={value}
           onChange={(e) => setValue(e.target.value)}
           disabled={!enabled}
@@ -51,10 +53,10 @@ export const ConfigInput: React.FC<ConfigInputProps> = ({ label, id, secret, ini
         { enabled ? (
           <>
             <button type="button" className="btn btn-primary btn-sm ml-2" onClick={handleSave}>
-              Save
+              <FormattedMessage id="contract-verification.configInputSaveButton" />
             </button>
             <button type="button" className="btn btn-secondary btn-sm ml-2" onClick={handleCancel}>
-              Cancel
+              <FormattedMessage id="contract-verification.configInputCancelButton" />
             </button>
           </>
         ) : (

apps/contract-verification/src/app/components/ConstructorArguments.tsx

@@ -3,6 +3,7 @@ import { ethers } from 'ethers'
 
 import { AppContext } from '../AppContext'
 import { ContractDropdownSelection } from './ContractDropdown'
+import { FormattedMessage } from 'react-intl'
 
 interface ConstructorArgumentsProps {
   abiEncodedConstructorArgs: string
@@ -102,7 +103,9 @@ export const ConstructorArguments: React.FC<ConstructorArgumentsProps> = ({ abiE
       <div className="d-flex py-1 align-items-center custom-control custom-checkbox">
         <input className="form-check-input custom-control-input" type="checkbox" id="toggleRawInputSwitch" checked={toggleRawInput} onChange={() => setToggleRawInput(!toggleRawInput)} />
         <label className="m-0 form-check-label custom-control-label" style={{ paddingTop: '2px' }} htmlFor="toggleRawInputSwitch">
-          Enter raw ABI-encoded constructor arguments
+          <FormattedMessage
+            id="contract-verification.constructorArgumentsToggleRawInput"
+          />
         </label>
       </div>
       {toggleRawInput ? (
@@ -122,7 +125,10 @@ export const ConstructorArguments: React.FC<ConstructorArgumentsProps> = ({ abiE
           {abiEncodedConstructorArgs && (
             <div>
               <label className="form-check-label" htmlFor="rawAbiEncodingResult">
-                ABI-encoded constructor arguments:
+                <FormattedMessage
+                  id="contract-verification.constructorArgumentsRawAbiEncodingResult"
+                  defaultMessage="ABI-encoded constructor arguments"
+                /> :
               </label>
               <textarea className="form-control" rows={5} disabled value={abiEncodedConstructorArgs} id="rawAbiEncodingResult" style={{ opacity: 0.5 }} />
             </div>

apps/contract-verification/src/app/components/ContractAddressInput.tsx

@@ -2,11 +2,11 @@ import React, { useEffect, useState, useContext } from 'react'
 import { ethers } from 'ethers/'
 
 interface ContractAddressInputProps {
-  label: string
+  label: string | any
   id: string
   contractAddress: string
   setContractAddress: (address: string) => void
-  contractAddressError: string
+  contractAddressError: string | any
   setContractAddressError: (error: string) => void
 }
 

apps/contract-verification/src/app/components/ContractDropdown.tsx

@@ -1,6 +1,7 @@
 import React, { useEffect, useState, useContext, Fragment } from 'react'
 import './ContractDropdown.css'
 import { AppContext } from '../AppContext'
+import { FormattedMessage } from 'react-intl'
 
 export interface ContractDropdownSelection {
   triggerFilePath: string
@@ -42,7 +43,7 @@ export const ContractDropdown: React.FC<ContractDropdownProps> = ({ label, id, s
 
   return (
     <div className="form-group">
-      <label htmlFor={id}>{label}</label>
+      <label htmlFor={id}><FormattedMessage id="contract-verification.contractDropdownLabel" defaultMessage={label} values={{ label }} /></label>
       <select value={selectedContract ? JSON.stringify(selectedContract) : ''}
         className={`form-control custom-select pr-4 ${!hasContracts ? 'disabled-cursor text-warning' : ''}`}
         id={id}
@@ -65,7 +66,7 @@ export const ContractDropdown: React.FC<ContractDropdownProps> = ({ label, id, s
             </optgroup>
           ))
         ) : (
-          <option>Compiled contract required</option>
+          <option value={''}><FormattedMessage id="contract-verification.contractDropDownDefaultText" defaultMessage={'Compiled contract required'} /></option>
         )}
       </select>
     </div>

apps/contract-verification/src/app/components/NavMenu.tsx

@@ -1,13 +1,15 @@
 import React from 'react'
 import { NavLink } from 'react-router-dom'
+import { useIntl, FormattedMessage } from 'react-intl'
 
 interface NavItemProps {
   to: string
   icon: JSX.Element
-  title: string
+  title: string | any
 }
 
 const NavItem: React.FC<NavItemProps> = ({ to, icon, title }) => {
+  const intl = useIntl()
   return (
     <NavLink
       data-id={`${title}Tab`}
@@ -24,11 +26,11 @@ const NavItem: React.FC<NavItemProps> = ({ to, icon, title }) => {
 
 export const NavMenu = () => {
   return (
-    <nav className="d-flex medium flex-row w-100" style={{backgroundColor: 'var(--body-bg)!important'}}>
-      <NavItem to="/" icon={<i className="fas fa-home"></i>} title="Verify" />
-      <NavItem to="/receipts" icon={<i className="fas fa-receipt"></i>} title="Receipts" />
-      <NavItem to="/lookup" icon={<i className="fas fa-search"></i>} title="Lookup" />
-      <NavItem to="/settings" icon={<i className="fas fa-cog"></i>} title="Settings" />
+    <nav className="d-flex medium flex-row w-100" style={{ backgroundColor: 'var(--body-bg)!important' }}>
+      <NavItem to="/" icon={<i className="fas fa-home"></i>} title={ <FormattedMessage id="contract-verification.verifyNavTitle" defaultMessage={'Verify'} /> } />
+      <NavItem to="/receipts" icon={<i className="fas fa-receipt"></i>} title={ <FormattedMessage id="contract-verification.receiptsNavTitle" defaultMessage={'Receipts'} /> } />
+      <NavItem to="/lookup" icon={<i className="fas fa-search"></i>} title={ <FormattedMessage id="contract-verification.lookupNavTitle" defaultMessage={'Lookup'} /> } />
+      <NavItem to="/settings" icon={<i className="fas fa-cog"></i>} title={ <FormattedMessage id="contract-verification.settingsNavTitle" defaultMessage={'Settings'} /> } />
     </nav>
   )
 }

apps/contract-verification/src/app/components/SearchableChainDropdown.tsx

@@ -2,14 +2,15 @@ import React, { useState, useEffect, useRef, useMemo } from 'react'
 import Fuse from 'fuse.js'
 import type { Chain } from '../types'
 import { AppContext } from '../AppContext'
+import { useIntl } from 'react-intl'
 
 function getChainDescriptor(chain: Chain): string {
   if (!chain) return ''
   return `${chain.title || chain.name} (${chain.chainId})`
 }
 
 interface DropdownProps {
-  label: string
+  label: string | any
   id: string
   setSelectedChain: (chain: Chain) => void
   selectedChain: Chain
@@ -18,6 +19,7 @@ interface DropdownProps {
 export const SearchableChainDropdown: React.FC<DropdownProps> = ({ label, id, setSelectedChain, selectedChain }) => {
   const { chains } = React.useContext(AppContext)
   const ethereumChainIds = [1, 11155111, 17000]
+  const intl = useIntl()
 
   // Add Ethereum chains to the head of the chains list. Sort the rest alphabetically
   const dropdownChains = useMemo(
@@ -90,7 +92,7 @@ export const SearchableChainDropdown: React.FC<DropdownProps> = ({ label, id, se
       {' '}
       {/* Add ref here */}
       <label htmlFor={id}>{label}</label>
-      <input type="text" value={searchTerm} onChange={handleInputChange} onClick={openDropdown} data-id="chainDropdownbox" placeholder="Select a chain" className="form-control" />
+      <input type="text" value={searchTerm} onChange={handleInputChange} onClick={openDropdown} data-id="chainDropdownbox" placeholder={intl.formatMessage({ id: "contract-verification.searchableChainDropdown", defaultMessage: "Select a chain" })} className="form-control" />
       <ul className="dropdown-menu show w-100 bg-light" style={{ maxHeight: '400px', overflowY: 'auto', display: isOpen ? 'initial' : 'none' }}>
         {filteredOptions.map((chain) => (
           <li key={chain.chainId} onClick={() => handleOptionClick(chain)} data-id={chain.chainId} className={`dropdown-item text-dark ${selectedChain?.chainId === chain.chainId ? 'active' : ''}`} style={{ cursor: 'pointer', whiteSpace: 'normal' }}>

apps/contract-verification/src/app/layouts/Default.tsx

@@ -4,8 +4,8 @@ import { NavMenu } from '../components/NavMenu'
 
 interface Props {
   from: string
-  title?: string
-  description?: string
+  title?: string | any
+  description?: string | any
 }
 
 export const DefaultLayout = ({ children, title, description }: PropsWithChildren<Props>) => {

apps/contract-verification/src/app/routes.tsx

@@ -3,14 +3,15 @@ import { HashRouter as Router, Route, Routes } from 'react-router-dom'
 
 import { VerifyView, ReceiptsView, LookupView, SettingsView } from './views'
 import { DefaultLayout } from './layouts'
+import { FormattedMessage } from 'react-intl'
 
 const DisplayRoutes = () => (
   <Router>
     <Routes>
       <Route
         path="/"
         element={
-          <DefaultLayout from="/" title="Verify" description="Verify compiled contracts on different verification services">
+          <DefaultLayout from="/" title="Verify" description={<FormattedMessage id="contract-verification.verifyDefaultLayout.description" defaultMessage="Verify compiled contracts on different verification services" />}>
             <VerifyView />
           </DefaultLayout>
         }
@@ -19,7 +20,7 @@ const DisplayRoutes = () => (
       <Route
         path="/receipts"
         element={
-          <DefaultLayout from="/" title="Receipts" description="Check the verification statuses of contracts submitted for verification">
+          <DefaultLayout from="/" title="Receipts" description={<FormattedMessage id="contract-verification.receiptsDefaultLayout.description" defaultMessage="Check the verification statuses of contracts submitted for verification" />}>
             <ReceiptsView />
           </DefaultLayout>
         }
@@ -28,7 +29,7 @@ const DisplayRoutes = () => (
       <Route
         path="/lookup"
         element={
-          <DefaultLayout from="/" title="Lookup" description="Search for verified contracts and download them to Remix">
+          <DefaultLayout from="/" title="Lookup" description={<FormattedMessage id="contract-verification.lookupDefaultLayout.description" defaultMessage="Lookup the verification status of a contract by its address" />}>
             <LookupView />
           </DefaultLayout>
         }
@@ -37,7 +38,7 @@ const DisplayRoutes = () => (
       <Route
         path="/settings"
         element={
-          <DefaultLayout from="/" title="Settings" description="Customize settings for each verification service and chain">
+          <DefaultLayout from="/" title="Settings" description={<FormattedMessage id="contract-verification.settingsDefaultLayout.description" defaultMessage="Configure the settings for the contract verification plugin" />}>
             <SettingsView />
           </DefaultLayout>
         }

apps/contract-verification/src/app/views/LookupView.tsx

@@ -9,6 +9,7 @@ import { useNavigate } from 'react-router-dom'
 import { VerifyFormContext } from '../VerifyFormContext'
 import { useSourcifySupported } from '../hooks/useSourcifySupported'
 import { CopyToClipboard } from '@remix-ui/clipboard'
+import { FormattedMessage } from 'react-intl'
 
 export const LookupView = () => {
   const { settings, clientInstance } = useContext(AppContext)
@@ -74,10 +75,10 @@ export const LookupView = () => {
   return (
     <>
       <form onSubmit={handleLookup}>
-        <SearchableChainDropdown label="Chain" id="network-dropdown" selectedChain={selectedChain} setSelectedChain={setSelectedChain} />
-        <ContractAddressInput label="Contract Address" id="contract-address" contractAddress={contractAddress} setContractAddress={setContractAddress} contractAddressError={contractAddressError} setContractAddressError={setContractAddressError} />
+        <SearchableChainDropdown label={<FormattedMessage id="contract-verification.searchableChainDropdownLabel" defaultMessage="Chain" />} id="network-dropdown" selectedChain={selectedChain} setSelectedChain={setSelectedChain} />
+        <ContractAddressInput label={<FormattedMessage id="contract-verification.contractAddressInput" defaultMessage="Contract Address" />} id="contract-address" contractAddress={contractAddress} setContractAddress={setContractAddress} contractAddressError={contractAddressError} setContractAddressError={setContractAddressError} />
         <button type="submit" className="btn w-100 btn-primary" disabled={submitDisabled}>
-          Lookup
+          <FormattedMessage id="contract-verification.lookupButton" defaultMessage="Lookup" />
         </button>
       </form>
       <div className="pt-3">