WIP

Author: nicholaspai

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@across-protocol/contracts-v2",
-  "version": "2.1.0-beta.6",
+  "version": "2.1.0-beta.7",
   "author": "UMA Team",
   "license": "AGPL-3.0-only",
   "repository": {

scripts/processHardhatExport.ts

@@ -1,20 +1,29 @@
 import fs from "fs";
 import path from "path";
+import * as existingDeployments from "../deployments/deployments.json";
 
+export type Deployments = Record<string, Record<string, { address: string; blockNumber: number }>>;
 // Prunes the hardhat export file sent to the cache directory to only contain the deployment addresses of each contract
 // over the network of chains the Across v2 contracts are deployed on. Meant to be run as part of a publish process.
 export async function run(): Promise<void> {
   try {
     const deploymentExport = require("../cache/massExport.json");
     const castExport = deploymentExport as any;
     console.log("Generating exports on the following networks(if they have deployments)", Object.keys(castExport));
-    const processedOutput: { [chainId: string]: { [name: string]: { address: string; blockNumber: number } } } = {};
+    const processedOutput: Deployments = {};
     Object.keys(castExport).forEach((chainId) => {
       if (castExport[chainId][0])
         Object.keys(castExport[chainId][0].contracts).forEach((contractName) => {
           if (!processedOutput[chainId]) processedOutput[chainId] = {};
           const address = castExport[chainId][0]?.contracts[contractName].address;
           const blockNumber = findDeploymentBlockNumber(castExport[chainId][0].name, contractName);
+          const existingBlockNumber = (existingDeployments as Deployments)[chainId][contractName].blockNumber;
+          console.log(
+            `Not updating ${contractName} as it has a later block number set in deployments.json than the one in deployments/${contractName}.json`
+          );
+          const hasLaterBlockNumber = existingBlockNumber > blockNumber;
+          if (hasLaterBlockNumber) return; // If we have already found a later block number for this contract, then ignore this one.
+          // As its likely that we manually updated the `deployments` file and we don't want to override it.
           if (/.*_SpokePool/.test(contractName)) contractName = "SpokePool"; // Strip the network name from the spoke pool in the contractName.
           processedOutput[chainId][contractName] = { address, blockNumber };
         });