@graphprotocol/graph-cli 0.89.0-alpha-20241107203204-e816fce → 0.89.0

package/CHANGELOG.md

@@ -1,15 +1,27 @@
 # @graphprotocol/graph-cli
 
-## 0.89.0-alpha-20241107203204-e816fce
+## 0.89.0
 
 ### Minor Changes
 
 - [#1763](https://github.com/graphprotocol/graph-tooling/pull/1763)
-  [`e816fce`](https://github.com/graphprotocol/graph-tooling/commit/e816fceaffd8432dacbbbd7e2b1a2d2fddbf0cdd)
-  Thanks [@alinobrasil](https://github.com/alinobrasil)! - new chain urls
+  [`58dbd28`](https://github.com/graphprotocol/graph-tooling/commit/58dbd2845b9e336bb06d7cee09929a92db7f2cf5)
+  Thanks [@alinobrasil](https://github.com/alinobrasil)! - Add new chain: Lens testnet
 
 ### Patch Changes
 
+- [#1759](https://github.com/graphprotocol/graph-tooling/pull/1759)
+  [`1d4217a`](https://github.com/graphprotocol/graph-tooling/commit/1d4217a506b38307ad0d750a9abe37bffa0a734d)
+  Thanks [@0237h](https://github.com/0237h)! - Refactor debug log for failed Etherscan ABI lookups
+
+- [#1764](https://github.com/graphprotocol/graph-tooling/pull/1764)
+  [`0b4cfe9`](https://github.com/graphprotocol/graph-tooling/commit/0b4cfe91091a86a0871d486f91754ea87f302b3e)
+  Thanks [@adamazad](https://github.com/adamazad)! - chore(rpcs): update gnosis chain RPC endpoint
+
+- [#1766](https://github.com/graphprotocol/graph-tooling/pull/1766)
+  [`d2fda94`](https://github.com/graphprotocol/graph-tooling/commit/d2fda940ace2b719354df9da43890c559ebfd3a8)
+  Thanks [@0237h](https://github.com/0237h)! - Improve ABI file path validation
+
 - [#1761](https://github.com/graphprotocol/graph-tooling/pull/1761)
   [`baf36b4`](https://github.com/graphprotocol/graph-tooling/commit/baf36b42bc531f3aee2709c2f55682a7ec44e5ac)
   Thanks [@alinobrasil](https://github.com/alinobrasil)! - update soneium-testnet blockexplorer url

package/dist/command-helpers/abi.d.ts

@@ -3,7 +3,6 @@ export declare const loadAbiFromEtherscan: (ABICtor: typeof ABI, network: string
 export declare const loadStartBlockForContract: (network: string, address: string) => Promise<string>;
 export declare const loadContractNameForAddress: (network: string, address: string) => Promise<string>;
 export declare const fetchDeployContractTransactionFromEtherscan: (network: string, address: string) => Promise<string>;
-export declare const fetchContractCreationHashWithRetry: (url: string, retryCount: number) => Promise<any>;
 export declare const fetchTransactionByHashFromRPC: (network: string, transactionHash: string) => Promise<any>;
 export declare const fetchSourceCodeFromEtherscan: (network: string, address: string) => Promise<any>;
 export declare const getContractNameForAddress: (network: string, address: string) => Promise<string>;

package/dist/command-helpers/abi.js

@@ -3,24 +3,35 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadAbiFromBlockScout = exports.getStartBlockForContract = exports.getContractNameForAddress = exports.fetchSourceCodeFromEtherscan = exports.fetchTransactionByHashFromRPC = exports.fetchContractCreationHashWithRetry = exports.fetchDeployContractTransactionFromEtherscan = exports.loadContractNameForAddress = exports.loadStartBlockForContract = exports.loadAbiFromEtherscan = void 0;
+exports.loadAbiFromBlockScout = exports.getStartBlockForContract = exports.getContractNameForAddress = exports.fetchSourceCodeFromEtherscan = exports.fetchTransactionByHashFromRPC = exports.fetchDeployContractTransactionFromEtherscan = exports.loadContractNameForAddress = exports.loadStartBlockForContract = exports.loadAbiFromEtherscan = void 0;
 const immutable_1 = __importDefault(require("immutable"));
 const constants_1 = require("../constants");
 const debug_1 = __importDefault(require("../debug"));
 const fetch_1 = __importDefault(require("../fetch"));
 const spinner_1 = require("./spinner");
 const logger = (0, debug_1.default)('graph-cli:abi-helpers');
+const fetchFromEtherscan = async (url) => {
+    const result = await (0, fetch_1.default)(url);
+    let json = {};
+    if (result.ok) {
+        json = await result.json().catch(error => {
+            throw new Error(`Failed to read JSON response from Etherscan: ${error}`);
+        });
+        // Etherscan returns a JSON object that has a `status`, a `message` and
+        // a `result` field. The `status` is '0' in case of errors and '1' in
+        // case of success
+        if (json.status === '1')
+            return json;
+    }
+    logger('Failed to fetchFromEtherscan: [%s] %s (%s)\n%O', result.status, result.statusText, result.url, json);
+    return null;
+};
 const loadAbiFromEtherscan = async (ABICtor, network, address) => await (0, spinner_1.withSpinner)(`Fetching ABI from Etherscan`, `Failed to fetch ABI from Etherscan`, `Warnings while fetching ABI from Etherscan`, async () => {
     const scanApiUrl = getEtherscanLikeAPIUrl(network);
-    const result = await (0, fetch_1.default)(`${scanApiUrl}?module=contract&action=getabi&address=${address}`);
-    const json = await result.json();
-    // Etherscan returns a JSON object that has a `status`, a `message` and
-    // a `result` field. The `status` is '0' in case of errors and '1' in
-    // case of success
-    if (json.status === '1') {
+    const json = await fetchFromEtherscan(`${scanApiUrl}?module=contract&action=getabi&address=${address}`);
+    if (json)
         return new ABICtor('Contract', undefined, immutable_1.default.fromJS(JSON.parse(json.result)));
-    }
-    throw new Error('ABI not found, try loading it from a local file');
+    throw new Error('Try loading it from a local file');
 });
 exports.loadAbiFromEtherscan = loadAbiFromEtherscan;
 const loadStartBlockForContract = async (network, address) => await (0, spinner_1.withSpinner)(`Fetching Start Block`, `Failed to fetch Start Block`, `Warnings while fetching deploy contract transaction from Etherscan`, async () => {
@@ -33,8 +44,8 @@ const loadContractNameForAddress = async (network, address) => await (0, spinner
 exports.loadContractNameForAddress = loadContractNameForAddress;
 const fetchDeployContractTransactionFromEtherscan = async (network, address) => {
     const scanApiUrl = getEtherscanLikeAPIUrl(network);
-    const json = await (0, exports.fetchContractCreationHashWithRetry)(`${scanApiUrl}?module=contract&action=getcontractcreation&contractaddresses=${address}`, 5);
-    if (json.status === '1') {
+    const json = await fetchFromEtherscan(`${scanApiUrl}?module=contract&action=getcontractcreation&contractaddresses=${address}`);
+    if (json) {
         const hash = json.result[0].txHash;
         logger('Successfully fetchDeployContractTransactionFromEtherscan. txHash: %s', hash);
         return hash;
@@ -42,24 +53,6 @@ const fetchDeployContractTransactionFromEtherscan = async (network, address) =>
     throw new Error(`Failed to fetch deploy contract transaction`);
 };
 exports.fetchDeployContractTransactionFromEtherscan = fetchDeployContractTransactionFromEtherscan;
-const fetchContractCreationHashWithRetry = async (url, retryCount) => {
-    let json;
-    for (let i = 0; i < retryCount; i++) {
-        try {
-            const result = await (0, fetch_1.default)(url);
-            json = await result.json();
-            if (json.status !== '0') {
-                return json;
-            }
-        }
-        catch (error) {
-            logger('Failed to fetchContractCreationHashWithRetry: %O', error);
-            /* empty */
-        }
-    }
-    throw new Error(`Failed to fetch contract creation transaction hash`);
-};
-exports.fetchContractCreationHashWithRetry = fetchContractCreationHashWithRetry;
 const fetchTransactionByHashFromRPC = async (network, transactionHash) => {
     let json;
     const RPCURL = getPublicRPCEndpoint(network);
@@ -90,12 +83,12 @@ const fetchTransactionByHashFromRPC = async (network, transactionHash) => {
 exports.fetchTransactionByHashFromRPC = fetchTransactionByHashFromRPC;
 const fetchSourceCodeFromEtherscan = async (network, address) => {
     const scanApiUrl = getEtherscanLikeAPIUrl(network);
-    const result = await (0, fetch_1.default)(`${scanApiUrl}?module=contract&action=getsourcecode&address=${address}`);
-    const json = await result.json();
-    if (json.status === '1') {
+    const json = await fetchFromEtherscan(`${scanApiUrl}?module=contract&action=getsourcecode&address=${address}`);
+    // Have to check that the SourceCode response is not empty due to Etherscan API bug responding with
+    // 1 - OK on non-valid contracts.
+    if (json.result[0].SourceCode)
         return json;
-    }
-    throw new Error('Failed to fetch contract source code');
+    throw new Error(`Failed to fetch contract source code: ${json.result[0].ABI}`);
 };
 exports.fetchSourceCodeFromEtherscan = fetchSourceCodeFromEtherscan;
 const getContractNameForAddress = async (network, address) => {
@@ -324,7 +317,7 @@ const getPublicRPCEndpoint = (network) => {
         case 'goerli':
             return 'https://rpc.ankr.com/eth_goerli';
         case 'gnosis':
-            return 'https://safe-transaction.gnosis.io';
+            return 'https://rpc.gnosischain.com';
         case 'mainnet':
             return 'https://rpc.ankr.com/eth';
         case 'matic':

package/dist/commands/init.js

@@ -491,32 +491,24 @@ async function processInitForm({ protocol: initProtocol, abi: initAbi, abiPath:
                 type: 'input',
                 name: 'abi',
                 message: 'ABI file (path)',
-                initial: initAbi,
+                initial: initAbiPath,
                 skip: () => !protocolInstance.hasABIs() ||
                     initFromExample !== undefined ||
                     abiFromEtherscan !== undefined ||
-                    isSubstreams ||
-                    !!initAbiPath,
+                    isSubstreams,
                 validate: async (value) => {
                     if (initFromExample || abiFromEtherscan || !protocolInstance.hasABIs()) {
                         return true;
                     }
                     const ABI = protocolInstance.getABI();
-                    if (initAbiPath) {
-                        try {
-                            loadAbiFromFile(ABI, initAbiPath);
-                            return true;
-                        }
-                        catch (e) {
-                            this.error(e.message);
-                        }
-                    }
+                    if (initAbiPath)
+                        value = initAbiPath;
                     try {
                         loadAbiFromFile(ABI, value);
                         return true;
                     }
                     catch (e) {
-                        this.error(e.message);
+                        return e.message;
                     }
                 },
                 result: async (value) => {
@@ -524,14 +516,8 @@ async function processInitForm({ protocol: initProtocol, abi: initAbi, abiPath:
                         return null;
                     }
                     const ABI = protocolInstance.getABI();
-                    if (initAbiPath) {
-                        try {
-                            return loadAbiFromFile(ABI, initAbiPath);
-                        }
-                        catch (e) {
-                            return e.message;
-                        }
-                    }
+                    if (initAbiPath)
+                        value = initAbiPath;
                     try {
                         return loadAbiFromFile(ABI, value);
                     }

package/dist/protocols/ethereum/abi.js

@@ -124,7 +124,13 @@ class ABI {
         return undefined;
     }
     static load(name, file) {
-        const data = JSON.parse(fs_extra_1.default.readFileSync(file).toString());
+        let data;
+        try {
+            data = JSON.parse(fs_extra_1.default.readFileSync(file).toString());
+        }
+        catch (e) {
+            throw Error(`Could not parse ABI: ${e}`);
+        }
         const abi = ABI.normalized(data);
         if (abi === null || abi === undefined) {
             throw Error(`No valid ABI in file: ${path_1.default.relative(process.cwd(), file)}`);

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.89.0-alpha-20241107203204-e816fce",
+  "version": "0.89.0",
   "commands": {
     "add": {
       "id": "add",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.89.0-alpha-20241107203204-e816fce",
+  "version": "0.89.0",
   "description": "CLI for building for and deploying to The Graph",
   "license": "(Apache-2.0 OR MIT)",
   "engines": {