Merge remote-tracking branch 'origin/main' into dev

Author: dbeal-eth

examples/router-architecture/src/Greeter.sol

@@ -16,3 +16,4 @@ contract Greeter {
     emit NewGreeting(_greeting);
   }
 }
+# some extra comment

packages/cli/src/commands/verify.ts

@@ -44,7 +44,7 @@ export async function verify(packageRef: string, cliSettings: CliSettings, chain
     getMainLoader(cliSettings)
   );
 
-  const etherscanApi = cliSettings.etherscanApiUrl || getChainById(chainId)?.blockExplorers?.default.apiUrl;
+  const etherscanApi = cliSettings.etherscanApiUrl || 'https://api.etherscan.io/api';
 
   if (!etherscanApi) {
     throw new Error(
@@ -60,6 +60,8 @@ export async function verify(packageRef: string, cliSettings: CliSettings, chain
 
   const guids: { [c: string]: string } = {};
 
+  const verifiedAddresses = new Set<string>();
+
   const verifyPackage = async (deployData: DeploymentInfo) => {
     const miscData = await runtime.readBlob(deployData.miscUrl);
 
@@ -74,6 +76,13 @@ export async function verify(packageRef: string, cliSettings: CliSettings, chain
     for (const c in outputs.contracts) {
       const contractInfo = outputs.contracts[c];
 
+      // simple safeguard to ensure we dont keep trying to verify the same contract multiple times
+      if (verifiedAddresses.has(contractInfo.address)) {
+        continue;
+      } else {
+        verifiedAddresses.add(contractInfo.address);
+      }
+
       // contracts can either be imported by just their name, or by a full path.
       // technically it may be more correct to just load by the actual name of the `artifact` property used, but that is complicated
       debug('finding contract:', contractInfo.sourceName, contractInfo.contractName);
@@ -92,7 +101,7 @@ export async function verify(packageRef: string, cliSettings: CliSettings, chain
         continue;
       }
 
-      if (await isVerified(contractInfo.address, etherscanApi, cliSettings.etherscanApiKey)) {
+      if (await isVerified(contractInfo.address, etherscanApi, cliSettings.etherscanApiKey, chainId)) {
         log(`✅ ${c}: Contract source code already verified`);
         await sleep(500);
         continue;
@@ -105,6 +114,7 @@ export async function verify(packageRef: string, cliSettings: CliSettings, chain
 
         const reqData: { [k: string]: string } = {
           apikey: cliSettings.etherscanApiKey,
+          chainid: chainId.toString(),
           module: 'contract',
           action: 'verifysourcecode',
           contractaddress: contractInfo.address,

packages/cli/src/util/verify.ts

@@ -37,9 +37,10 @@ export type EtherscanGetSourceCodeResponse = EtherscanGetSourceCodeNotOkResponse
  * @returns True if the contract is verified, false otherwise.
  */
 
-export async function isVerified(address: string, apiUrl: string, apiKey: string): Promise<boolean> {
+export async function isVerified(address: string, apiUrl: string, apiKey: string, chainId: number): Promise<boolean> {
   const parameters = new URLSearchParams({
     apikey: apiKey,
+    chainid: chainId.toString(),
     module: 'contract',
     action: 'getsourcecode',
     address,