@graphprotocol/graph-cli 0.61.0-alpha-20231106135106-bbe3519 → 0.61.0

package/CHANGELOG.md

@@ -1,11 +1,20 @@
 # @graphprotocol/graph-cli
 
-## 0.61.0-alpha-20231106135106-bbe3519
+## 0.61.0
 
 ### Minor Changes
 
+- [#1491](https://github.com/graphprotocol/graph-tooling/pull/1491)
+  [`326b303`](https://github.com/graphprotocol/graph-tooling/commit/326b30340ed5d922bfde995c9ff68e0899ac4cb3)
+  Thanks [@YaroShkvorets](https://github.com/YaroShkvorets)! - add etherscan api retries to
+  `graph init` wizard
+
+- [#1489](https://github.com/graphprotocol/graph-tooling/pull/1489)
+  [`031fca8`](https://github.com/graphprotocol/graph-tooling/commit/031fca87fb163a69a06653f7822f4738452a91aa)
+  Thanks [@saihaj](https://github.com/saihaj)! - Arbitrum Sepolia support
+
 - [#1493](https://github.com/graphprotocol/graph-tooling/pull/1493)
-  [`bbe3519`](https://github.com/graphprotocol/graph-tooling/commit/bbe3519799a3b848af22f6f118e9a5b1e7da115f)
+  [`f5f974d`](https://github.com/graphprotocol/graph-tooling/commit/f5f974d63416ba845c45c50b2931c9beffcca3a1)
   Thanks [@incrypto32](https://github.com/incrypto32)! - Fix codegen issues when using derived
   loaders with Bytes as ID's
 

package/dist/command-helpers/abi.js

@@ -47,8 +47,7 @@ const fetchContractCreationHashWithRetry = async (url, retryCount) => {
             /* empty */
         }
     }
-    throw new Error(`Failed to fetch contract creation transaction hash
-  `);
+    throw new Error(`Failed to fetch contract creation transaction hash`);
 };
 exports.fetchContractCreationHashWithRetry = fetchContractCreationHashWithRetry;
 const fetchTransactionByHashFromRPC = async (network, transactionHash) => {
@@ -108,6 +107,8 @@ const getEtherscanLikeAPIUrl = (network) => {
             return `https://api.arbiscan.io/api`;
         case 'arbitrum-goerli':
             return `https://api-goerli.arbiscan.io/api`;
+        case 'arbitrum-sepolia':
+            return `https://api-sepolia.arbiscan.io/api`;
         case 'bsc':
             return `https://api.bscscan.com/api`;
         case 'base-testnet':
@@ -172,6 +173,8 @@ const getPublicRPCEndpoint = (network) => {
             return 'https://goerli-rollup.arbitrum.io/rpc';
         case 'arbitrum-one':
             return 'https://arb1.arbitrum.io/rpc';
+        case 'arbitrum-sepolia':
+            return `https://sepolia-rollup.arbitrum.io/rpc`;
         case 'aurora':
             return 'https://rpc.mainnet.aurora.dev';
         case 'aurora-testnet':

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

@@ -1,4 +1,4 @@
-export declare const allowedStudioNetworks: readonly ["mainnet", "rinkeby", "goerli", "gnosis", "chapel", "optimism-goerli", "clover", "fantom", "matic", "fantom-testnet", "arbitrum-goerli", "fuji", "celo-alfajores", "mumbai", "aurora-testnet", "near-testnet", "optimism", "optimism-goerli", "theta-testnet-001", "osmo-test-4", "base-testnet", "base", "celo", "arbitrum-one", "avalanche", "zksync-era", "zksync-era-testnet", "sepolia", "polygon-zkevm-testnet", "polygon-zkevm", "scroll-sepolia", "scroll"];
+export declare const allowedStudioNetworks: readonly ["mainnet", "rinkeby", "goerli", "gnosis", "chapel", "optimism-goerli", "clover", "fantom", "matic", "fantom-testnet", "arbitrum-goerli", "fuji", "celo-alfajores", "mumbai", "aurora-testnet", "near-testnet", "optimism", "optimism-goerli", "theta-testnet-001", "osmo-test-4", "base-testnet", "base", "celo", "arbitrum-one", "arbitrum-sepolia", "avalanche", "zksync-era", "zksync-era-testnet", "sepolia", "polygon-zkevm-testnet", "polygon-zkevm", "scroll-sepolia", "scroll"];
 export declare const validateStudioNetwork: ({ studio, product, network, }: {
     studio?: string | boolean | undefined;
     product?: string | undefined;

package/dist/command-helpers/studio.js

@@ -26,6 +26,7 @@ exports.allowedStudioNetworks = [
     'base',
     'celo',
     'arbitrum-one',
+    'arbitrum-sepolia',
     'avalanche',
     'zksync-era',
     'zksync-era-testnet',

package/dist/commands/init.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -7,6 +30,7 @@ const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const gluegun_1 = require("gluegun");
+const toolbox = __importStar(require("gluegun"));
 const core_1 = require("@oclif/core");
 const abi_1 = require("../command-helpers/abi");
 const network_1 = require("../command-helpers/network");
@@ -321,6 +345,25 @@ async function processFromExampleInitForm({ directory: initDirectory, subgraphNa
         this.error(e, { exit: 1 });
     }
 }
+async function retryWithPrompt(func) {
+    for (;;) {
+        try {
+            return await func();
+        }
+        catch (_) {
+            const { retry } = await toolbox.prompt.ask({
+                type: 'confirm',
+                name: 'retry',
+                message: 'Do you want to retry?',
+                initial: true,
+            });
+            if (!retry) {
+                break;
+            }
+        }
+    }
+    return undefined;
+}
 async function processInitForm({ protocol: initProtocol, product: initProduct, studio: initStudio, node: initNode, abi: initAbi, abiPath: initAbiPath, directory: initDirectory, contract: initContract, indexEvents: initIndexEvents, fromExample: initFromExample, network: initNetwork, subgraphName: initSubgraphName, contractName: initContractName, startBlock: initStartBlock, allowSimpleName: initAllowSimpleName, spkgPath: initSpkgPath, }) {
     let abiFromEtherscan = undefined;
     try {
@@ -443,27 +486,19 @@ async function processInitForm({ protocol: initProtocol, product: initProduct, s
                     const ABI = protocolInstance.getABI();
                     // Try loading the ABI from Etherscan, if none was provided
                     if (protocolInstance.hasABIs() && !initAbi) {
-                        try {
-                            if (network === 'poa-core') {
-                                // TODO: this variable is never used anywhere, what happens?
-                                // abiFromBlockScout = await loadAbiFromBlockScout(ABI, network, value)
-                            }
-                            else {
-                                abiFromEtherscan = await (0, abi_1.loadAbiFromEtherscan)(ABI, network, value);
-                            }
+                        if (network === 'poa-core') {
+                            abiFromEtherscan = await retryWithPrompt(() => (0, abi_1.loadAbiFromBlockScout)(ABI, network, value));
                         }
-                        catch (e) {
-                            // noop
+                        else {
+                            abiFromEtherscan = await retryWithPrompt(() => (0, abi_1.loadAbiFromEtherscan)(ABI, network, value));
                         }
                     }
                     // If startBlock is not set, try to load it.
                     if (!initStartBlock) {
-                        try {
-                            // Load startBlock for this contract
-                            initStartBlock = Number(await (0, abi_1.loadStartBlockForContract)(network, value)).toString();
-                        }
-                        catch (error) {
-                            // noop
+                        // Load startBlock for this contract
+                        const startBlock = await retryWithPrompt(() => (0, abi_1.loadStartBlockForContract)(network, value));
+                        if (startBlock) {
+                            initStartBlock = Number(startBlock).toString();
                         }
                     }
                     return value;

package/dist/protocols/index.js

@@ -114,6 +114,7 @@ class Protocol {
                 'mbase',
                 'arbitrum-one',
                 'arbitrum-goerli',
+                'arbitrum-sepolia',
                 'optimism',
                 'optimism-goerli',
                 'aurora',

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.61.0-alpha-20231106135106-bbe3519",
+  "version": "0.61.0",
   "commands": {
     "add": {
       "id": "add",
@@ -627,6 +627,7 @@
             "mbase",
             "arbitrum-one",
             "arbitrum-goerli",
+            "arbitrum-sepolia",
             "optimism",
             "optimism-goerli",
             "aurora",

package/package.json

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