@sparkdotfi/abi-cli 0.2.0-20260129.3777b30a → 0.2.0-20260317.e49bd3f1

package/dist/src/abi-registry/abi-fetcher/AbiFetcherClient.js

@@ -26,12 +26,22 @@ export class AbiFetcherClient {
         return result.abi;
     }
 }
-async function loadAbiUsingWhatsAbi(args) {
-    const { address, domain, client, etherscanApiKey } = args;
-    const loader = new whatsabi.loaders.EtherscanV2ABILoader({
+function createAbiLoader(domain, etherscanApiKey) {
+    // Etherscan v2 API's contract/getabi module is broken for Gnosis (returns "Unknown Exception"),
+    // so we use Blockscout directly for Gnosis.
+    if (domain === 'gnosis') {
+        return new whatsabi.loaders.BlockscoutABILoader({
+            baseURL: 'https://gnosis.blockscout.com/api',
+        });
+    }
+    return new whatsabi.loaders.EtherscanV2ABILoader({
         apiKey: etherscanApiKey,
         chainId: domainToChainId[domain],
     });
+}
+async function loadAbiUsingWhatsAbi(args) {
+    const { address, domain, client, etherscanApiKey } = args;
+    const loader = createAbiLoader(domain, etherscanApiKey);
     const data = await lazyPipe(() => whatsabi.autoload(address, {
         provider: client,
         followProxies: true,
@@ -44,7 +54,8 @@ async function loadAbiUsingWhatsAbi(args) {
     if (data.abi.length === 0) {
         throw new Error(`Abi not found for ${domain}:${address}`);
     }
-    if (!data.abiLoadedFrom || !data.abiLoadedFrom.name.toLowerCase().includes('etherscan')) {
+    const loaderName = data.abiLoadedFrom?.name.toLowerCase() ?? '';
+    if (!data.abiLoadedFrom || !(loaderName.includes('etherscan') || loaderName.includes('blockscout'))) {
         throw new Error(`Abi not found for ${domain}:${address}`);
     }
     return data;

package/dist/src/abi-registry/getAbiForContract.js

@@ -12,10 +12,49 @@ export function getAbiForContract(abiRegistry, config, name) {
     }));
     assert(instances.length > 0);
     const rootAbi = instances[0].abi;
-    const rootAbiStringified = JSON.stringify(rootAbi);
+    const rootNormalized = normalizeAbiForComparison(rootAbi);
     const notMatchingAbi = instances.find(({ abi }) => {
-        return JSON.stringify(abi) !== rootAbiStringified;
+        return normalizeAbiForComparison(abi) !== rootNormalized;
     });
     assert(!notMatchingAbi, `Found not matching abis: ${notMatchingAbi?.name}`);
     return rootAbi;
 }
+/**
+ * Normalizes an ABI for comparison by removing source-specific differences:
+ * - Strips `internalType` fields (compiler metadata, not part of ABI spec)
+ * - Sorts entries by type + name for consistent ordering
+ * Different ABI sources (Etherscan, Blockscout) may return the same ABI with cosmetic differences.
+ */
+function normalizeAbiForComparison(abi) {
+    const normalized = abi.map((entry) => {
+        const clone = structuredClone(entry);
+        // Constructors and fallback/receive without stateMutability are implicitly "nonpayable"
+        if ((clone.type === 'constructor' || clone.type === 'fallback' || clone.type === 'receive') &&
+            !clone.stateMutability) {
+            clone.stateMutability = 'nonpayable';
+        }
+        return normalizeAbiEntry(clone);
+    });
+    normalized.sort((a, b) => {
+        const typeCmp = (a.type ?? '').localeCompare(b.type ?? '');
+        if (typeCmp !== 0)
+            return typeCmp;
+        return (a.name ?? '').localeCompare(b.name ?? '');
+    });
+    return JSON.stringify(normalized);
+}
+function normalizeAbiEntry(obj) {
+    if (Array.isArray(obj)) {
+        return obj.map(normalizeAbiEntry);
+    }
+    if (obj !== null && typeof obj === 'object') {
+        const result = {};
+        for (const key of Object.keys(obj).sort()) {
+            if (key === 'internalType')
+                continue;
+            result[key] = normalizeAbiEntry(obj[key]);
+        }
+        return result;
+    }
+    return obj;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sparkdotfi/abi-cli",
-  "version": "0.2.0-20260129.3777b30a",
+  "version": "0.2.0-20260317.e49bd3f1",
   "engines": {
     "node": ">=22.0.0"
   },