@mapprotocol/common-contracts 0.4.0 → 0.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mapprotocol/common-contracts",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "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.js

@@ -27,7 +27,17 @@ async function verify(hre, opts) {
 // EVM verification via hardhat-verify
 // ============================================================
 async function verifyEvm(hre, opts) {
-    const contractPath = opts.contractPath || `contracts/${opts.contractName}.sol:${opts.contractName}`;
+    // Resolve contractPath from hardhat artifact (authoritative) instead of guessing
+    let contractPath = opts.contractPath;
+    if (!contractPath) {
+        try {
+            const artifact = await hre.artifacts.readArtifact(opts.contractName);
+            contractPath = `${artifact.sourceName}:${opts.contractName}`;
+        }
+        catch {
+            contractPath = `contracts/${opts.contractName}.sol:${opts.contractName}`;
+        }
+    }
     console.log(`verifying ${opts.contractName} at ${opts.address} ...`);
     try {
         await hre.run("verify:verify", {
@@ -76,9 +86,10 @@ async function verifyTron(hre, opts) {
     }
     else {
         console.log(`generating flatten for ${opts.contractName}...`);
+        let sourcePath = "";
         try {
             const artifact = await hre.artifacts.readArtifact(opts.contractName);
-            const sourcePath = artifact.sourceName;
+            sourcePath = artifact.sourceName;
             let flattenedSource = await hre.run("flatten:get-flattened-sources", {
                 files: [sourcePath],
             });
@@ -88,7 +99,8 @@ async function verifyTron(hre, opts) {
             console.log(`flatten saved to: ${flattenPath}`);
         }
         catch (e) {
-            console.log(`flatten failed, generate manually: forge flatten contracts/${opts.contractName}.sol`);
+            const hint = sourcePath || `contracts/${opts.contractName}.sol`;
+            console.log(`flatten failed, generate manually: npx hardhat flatten ${hint} > ${flattenPath}`);
             return;
         }
     }

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

@@ -49,7 +49,16 @@ export async function verify(hre: any, opts: VerifyOptions): Promise<void> {
 // ============================================================
 
 async function verifyEvm(hre: any, opts: VerifyOptions): Promise<void> {
-    const contractPath = opts.contractPath || `contracts/${opts.contractName}.sol:${opts.contractName}`;
+    // Resolve contractPath from hardhat artifact (authoritative) instead of guessing
+    let contractPath = opts.contractPath;
+    if (!contractPath) {
+        try {
+            const artifact = await hre.artifacts.readArtifact(opts.contractName);
+            contractPath = `${artifact.sourceName}:${opts.contractName}`;
+        } catch {
+            contractPath = `contracts/${opts.contractName}.sol:${opts.contractName}`;
+        }
+    }
 
     console.log(`verifying ${opts.contractName} at ${opts.address} ...`);
 
@@ -103,9 +112,10 @@ async function verifyTron(hre: any, opts: VerifyOptions): Promise<void> {
         console.log(`using existing flatten: ${flattenPath}`);
     } else {
         console.log(`generating flatten for ${opts.contractName}...`);
+        let sourcePath = "";
         try {
             const artifact = await hre.artifacts.readArtifact(opts.contractName);
-            const sourcePath = artifact.sourceName;
+            sourcePath = artifact.sourceName;
             let flattenedSource = await hre.run("flatten:get-flattened-sources", {
                 files: [sourcePath],
             });
@@ -114,7 +124,8 @@ async function verifyTron(hre: any, opts: VerifyOptions): Promise<void> {
             fs.writeFileSync(flattenPath, flattenedSource);
             console.log(`flatten saved to: ${flattenPath}`);
         } catch (e) {
-            console.log(`flatten failed, generate manually: forge flatten contracts/${opts.contractName}.sol`);
+            const hint = sourcePath || `contracts/${opts.contractName}.sol`;
+            console.log(`flatten failed, generate manually: npx hardhat flatten ${hint} > ${flattenPath}`);
             return;
         }
     }