Merge pull request #1042 from ethereum/staging

Quick Release
ethereum · May 30, 2023 · 964f9cb · 964f9cb
2 parents d62b630 + af3f617
commit 964f9cb
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 24 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/scripts/check-s3-backup.mjs b/scripts/check-s3-backup.mjs
@@ -37,42 +37,50 @@ const jobsWithArtifacts = [
   "verification-e2e-goerli",
 ];
 const circleCIJobsUrl = `https://circleci.com/api/v2/workflow/${workflowId}/job`;
+console.log("Fetching jobs from: ", circleCIJobsUrl);
 const circleCIJobsUrlResult = await fetch(circleCIJobsUrl);
 const circleCIJobsUrlJson = await circleCIJobsUrlResult.json();
-const jobIds = circleCIJobsUrlJson.items
-  .filter((job) => jobsWithArtifacts.includes(job.name))
-  .map((job) => job.id);
+const jobs = circleCIJobsUrlJson.items.filter((job) =>
+  jobsWithArtifacts.includes(job.name)
+);
 
 // for each job id get the artifact and check the existance on s3
 let existance = false;
-for (const jobId of jobIds) {
-  const circleCIArtifactVerifiedContractUrl = `https://dl.circleci.com/private/output/job/${jobId}/artifacts/0/verified-contracts/saved.json`;
+for (const job of jobs) {
+  console.log(`Checking job with name: ${job.name} and id: ${job.id}`);
+  const circleCIArtifactVerifiedContractUrl = `https://dl.circleci.com/private/output/job/${job.id}/artifacts/0/verified-contracts/saved.json`;
+  console.log("Fetching artifact from: ", circleCIArtifactVerifiedContractUrl);
   const circleCIArtifactVerifiedContractResult = await fetch(
     circleCIArtifactVerifiedContractUrl
   );
   const circleCIArtifactVerifiedContractJson =
     await circleCIArtifactVerifiedContractResult.json();
   const { deploymentAddress, deploymentChain } =
     circleCIArtifactVerifiedContractJson;
-  if (deploymentAddress && deploymentChain) {
-    try {
-      const s3Object = await bareBonesS3.send(
-        new GetObjectCommand({
-          Key: `stable/repository/contracts/full_match/${deploymentChain}/${deploymentAddress}/metadata.json`,
-          Bucket: "sourcify-backup-s3",
-        })
-      );
 
-      if (s3Object.ETag?.length > 0) {
-        existance = true;
-        break;
-      }
-    } catch (e) {
-      console.log(e);
-      console.log(
-        `not in backup: stable/repository/contracts/full_match/${deploymentChain}/${deploymentAddress}/metadata.json`
-      );
+  if (!deploymentAddress || !deploymentChain) {
+    throw new Error(
+      `Deployment address or chain not found in job ${job.id} with name ${job.name}. Deployment address: ${deploymentAddress}, Deployment chain: ${deploymentChain}`
+    );
+  }
+
+  try {
+    const s3Object = await bareBonesS3.send(
+      new GetObjectCommand({
+        Key: `stable/repository/contracts/full_match/${deploymentChain}/${deploymentAddress}/metadata.json`,
+        Bucket: "sourcify-backup-s3",
+      })
+    );
+
+    if (s3Object.ETag?.length > 0) {
+      existance = true;
+      break;
     }
+  } catch (e) {
+    console.log(e);
+    console.log(
+      `not in backup: stable/repository/contracts/full_match/${deploymentChain}/${deploymentAddress}/metadata.json`
+    );
   }
 }
 

diff --git a/src/sourcify-chains.ts b/src/sourcify-chains.ts
@@ -790,6 +790,14 @@ const sourcifyChainsExtensions: SourcifyChainsExtensionsObject = {
       "https://explorer.plexfinance.us/" + BLOCKSCOUT_SUFFIX,
     txRegex: getBlockscoutRegex(),
   },
+  "2000": {
+    // DogeChain Mainnet
+    supported: true,
+    monitored: false,
+    contractFetchAddress:
+      "https://explorer.dogechain.dog/" + BLOCKSCOUT_SUFFIX,
+    txRegex: getBlockscoutRegex(),
+  },
 };
 
 const sourcifyChainsMap: SourcifyChainMap = {};

diff --git a/test/chains/chain-tests.js b/test/chains/chain-tests.js
@@ -809,6 +809,15 @@ describe("Test Supported Chains", function () {
     ["shared/1_Storage.sol"],
     "shared/1_Storage.metadata.json"
   );
+
+  // DogeChain Mainnet
+  verifyContract(
+    "0x2a35F4AA0d3e417e8896E972f35dba4b39b6305e",
+    "2000",
+    "DogeChain Mainnet",
+    ["shared/1_Storage.sol"],
+    "shared/1_Storage.metadata.json"
+  );
 
   // Finally check if all the "supported: true" chains have been tested
   it("should have tested all supported chains", function (done) {

diff --git a/ui/public/index.html b/ui/public/index.html
@@ -31,6 +31,10 @@
         var u = "https://matomo.ethereum.org/";
         _paq.push(["setTrackerUrl", u + "matomo.php"]);
         _paq.push(["setSiteId", "30"]);
+        var secondaryTracker =
+          "https://ethereumfoundation.matomo.cloud/matomo.php";
+        var secondaryWebsiteId = "15";
+        _paq.push(["addTracker", secondaryTracker, secondaryWebsiteId]);
         var d = document,
           g = d.createElement("script"),
           s = d.getElementsByTagName("script")[0];