@mapprotocol/common-contracts 0.4.1 → 0.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mapprotocol/common-contracts",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "Common contracts for MAP Protocol",
   "main": "typechain-types/index.js",
   "types": "typechain-types/index.d.ts",

package/utils/dist/factory.js

@@ -71,7 +71,8 @@ async function evmDeployByFactory(ethers, salt, bytecode, constructorArgs = "0x"
     if (code === "0x")
         throw new Error("factory not deployed on this chain");
     const saltHash = ethers.keccak256(ethers.toUtf8Bytes(salt));
-    const predicted = await factory.getAddress(saltHash);
+    // Use getFunction: ethers v6 Contract has a built-in getAddress() that shadows the ABI method
+    const predicted = await factory.getFunction("getAddress")(saltHash);
     const existingCode = await ethers.provider.getCode(predicted);
     if (existingCode !== "0x") {
         console.log(`already deployed at ${predicted}`);
@@ -98,7 +99,8 @@ async function evmDeployByFactory(ethers, salt, bytecode, constructorArgs = "0x"
 async function evmGetFactoryAddress(ethers, salt) {
     const factory = new ethers.Contract(EVM_FACTORY, EVM_FACTORY_ABI, await ethers.provider);
     const saltHash = ethers.keccak256(ethers.toUtf8Bytes(salt));
-    return factory.getAddress(saltHash);
+    // Use getFunction: ethers v6 Contract has a built-in getAddress() that shadows the ABI method
+    return factory.getFunction("getAddress")(saltHash);
 }
 // ============================================================
 // Tron Factory (CREATE2, tronweb)

package/utils/dist/verifier.d.ts

@@ -17,6 +17,13 @@ export interface VerifyOptions {
     compiler?: string;
     optimizer?: boolean;
     optimizerRuns?: number;
+    /**
+     * Reuse an existing verify-output/<contract>_flatten.sol instead of regenerating it.
+     * Off by default: the flatten is always regenerated from current source, because a
+     * cached file keyed only on the contract name silently verifies STALE source after
+     * the contract changes. Only enable this when you intentionally hand-edited the flatten.
+     */
+    reuseFlatten?: boolean;
 }
 /**
  * Unified contract verification — auto-routes to EVM (hardhat verify) or Tron (TronScan API)

package/utils/dist/verifier.js

@@ -81,8 +81,8 @@ async function verifyTron(hre, opts) {
     // Generate flattened source
     const outputDir = path.join(process.cwd(), "verify-output");
     const flattenPath = path.join(outputDir, `${opts.contractName}_flatten.sol`);
-    if (fs.existsSync(flattenPath)) {
-        console.log(`using existing flatten: ${flattenPath}`);
+    if (opts.reuseFlatten && fs.existsSync(flattenPath)) {
+        console.log(`reusing existing flatten: ${flattenPath}`);
     }
     else {
         console.log(`generating flatten for ${opts.contractName}...`);

package/utils/factory.ts

@@ -76,7 +76,8 @@ export async function evmDeployByFactory(
     if (code === "0x") throw new Error("factory not deployed on this chain");
 
     const saltHash = ethers.keccak256(ethers.toUtf8Bytes(salt));
-    const predicted = await factory.getAddress(saltHash);
+    // Use getFunction: ethers v6 Contract has a built-in getAddress() that shadows the ABI method
+    const predicted = await factory.getFunction("getAddress")(saltHash);
 
     const existingCode = await ethers.provider.getCode(predicted);
     if (existingCode !== "0x") {
@@ -108,7 +109,8 @@ export async function evmDeployByFactory(
 export async function evmGetFactoryAddress(ethers: any, salt: string): Promise<string> {
     const factory = new ethers.Contract(EVM_FACTORY, EVM_FACTORY_ABI, await ethers.provider);
     const saltHash = ethers.keccak256(ethers.toUtf8Bytes(salt));
-    return factory.getAddress(saltHash);
+    // Use getFunction: ethers v6 Contract has a built-in getAddress() that shadows the ABI method
+    return factory.getFunction("getAddress")(saltHash);
 }
 
 // ============================================================

package/utils/verifier.ts

@@ -29,6 +29,13 @@ export interface VerifyOptions {
     compiler?: string;           // override solc version (auto-read from build-info if omitted)
     optimizer?: boolean;         // override optimizer enabled (auto-read from build-info if omitted)
     optimizerRuns?: number;      // override optimizer runs (auto-read from build-info if omitted)
+    /**
+     * Reuse an existing verify-output/<contract>_flatten.sol instead of regenerating it.
+     * Off by default: the flatten is always regenerated from current source, because a
+     * cached file keyed only on the contract name silently verifies STALE source after
+     * the contract changes. Only enable this when you intentionally hand-edited the flatten.
+     */
+    reuseFlatten?: boolean;
 }
 
 /**
@@ -108,8 +115,8 @@ async function verifyTron(hre: any, opts: VerifyOptions): Promise<void> {
     const outputDir = path.join(process.cwd(), "verify-output");
     const flattenPath = path.join(outputDir, `${opts.contractName}_flatten.sol`);
 
-    if (fs.existsSync(flattenPath)) {
-        console.log(`using existing flatten: ${flattenPath}`);
+    if (opts.reuseFlatten && fs.existsSync(flattenPath)) {
+        console.log(`reusing existing flatten: ${flattenPath}`);
     } else {
         console.log(`generating flatten for ${opts.contractName}...`);
         let sourcePath = "";