fix near handling

Author: YaroShkvorets

packages/cli/src/command-helpers/contracts.ts

@@ -12,7 +12,7 @@ export class ContractService {
 
   private async fetchFromEtherscan(url: string): Promise<any | null> {
     const result = await fetch(url).catch(_error => {
-      throw new Error(`Etherscan API is unreachable`);
+      throw new Error(`Contract API is unreachable`);
     });
     let json: any = {};
 
@@ -25,7 +25,7 @@ export class ContractService {
     }
 
     logger(
-      'Failed to fetch from etherscan: [%s] %s (%s)\n%O',
+      'Failed to fetch from contract API: [%s] %s (%s)\n%O',
       result.status,
       result.statusText,
       result.url,
@@ -75,12 +75,12 @@ export class ContractService {
 
     let errors: string[] = [];
     return await withSpinner(
-      `Fetching ABI from Etherscan`,
-      `Failed to fetch ABI from Etherscan`,
-      `Warnings while fetching ABI from Etherscan`,
+      `Fetching ABI from contract API`,
+      `Failed to fetch ABI from contract API`,
+      `Warnings while fetching ABI from contract API`,
       async () => {
         if (!urls.length) {
-          throw new Error(`No Etherscan API available`);
+          throw new Error(`No contract API available for ${networkId} in the registry`);
         }
         for (const url of urls) {
           try {
@@ -107,12 +107,12 @@ export class ContractService {
     const urls = this.getEtherscanUrls(networkId);
 
     return await withSpinner(
-      `Fetching Start Block`,
-      `Failed to fetch Start Block`,
-      `Warnings while fetching deploy contract transaction from Etherscan`,
+      `Fetching start block`,
+      `Failed to fetch start block`,
+      `Warnings while fetching deploy contract transaction from contract API`,
       async () => {
         if (!urls.length) {
-          throw new Error(`No Etherscan API available`);
+          throw new Error(`No contract API available for ${networkId} in the registry`);
         }
         for (const url of urls) {
           try {
@@ -146,12 +146,12 @@ export class ContractService {
     const urls = this.getEtherscanUrls(networkId);
 
     return await withSpinner(
-      `Fetching Contract Name`,
-      `Failed to fetch Contract Name`,
-      `Warnings while fetching contract name from Etherscan`,
+      `Fetching contract name`,
+      `Failed to fetch contract name`,
+      `Warnings while fetching contract name from contract API`,
       async () => {
         if (!urls.length) {
-          throw new Error(`No Etherscan API available`);
+          throw new Error(`No contract API available for ${networkId} in the registry`);
         }
         for (const url of urls) {
           try {
@@ -179,7 +179,7 @@ export class ContractService {
   private async fetchTransactionByHash(networkId: string, txHash: string) {
     const urls = this.getRpcUrls(networkId);
     if (!urls.length) {
-      throw new Error(`No JSON-RPC available`);
+      throw new Error(`No JSON-RPC available for ${networkId} in the registry`);
     }
     for (const url of urls) {
       try {

packages/cli/src/commands/init.ts

@@ -496,9 +496,6 @@ async function processInitForm(
         if (name === 'cosmos') {
           return 'Cosmos chains only supported via substreams';
         }
-        if (name === 'near') {
-          return 'Near chains only supported via substreams';
-        }
         return true;
       },
     });
@@ -543,40 +540,34 @@ async function processInitForm(
           (!protocolInstance.hasContract() && !isComposedSubgraph),
         initial: initContract,
         validate: async (value: string) => {
-          if (isComposedSubgraph) {
-            return value.startsWith('Qm') ? true : 'Subgraph deployment ID must start with Qm';
-          }
-
           if (initFromExample !== undefined || !protocolInstance.hasContract()) {
             return true;
           }
-
-          const protocolContract = protocolInstance.getContract();
-          if (!protocolContract) {
-            return 'Contract not found.';
+          if (isComposedSubgraph) {
+            return value.startsWith('Qm') ? true : 'Subgraph deployment ID must start with Qm';
           }
-          // Validate whether the contract is valid
-          const { valid, error } = validateContract(value, protocolContract);
 
+          const { valid, error } = validateContract(value, protocolInstance.getContract()!);
           return valid ? true : error;
         },
         result: async (address: string) => {
-          if (initFromExample !== undefined || isSubstreams || initAbiPath || isComposedSubgraph) {
+          if (
+            initFromExample !== undefined ||
+            initAbiPath ||
+            protocolInstance.name !== 'ethereum' // we can only validate against Etherscan API
+          ) {
             initDebugger("value: '%s'", address);
             return address;
           }
 
-          const ABI = protocolInstance.getABI();
-
-          // Try loading the ABI from Etherscan, if none was provided
+          // If ABI is not provided, try to fetch it from Etherscan API
           if (protocolInstance.hasABIs() && !initAbi) {
             abiFromEtherscan = await retryWithPrompt(() =>
-              contractService.getABI(ABI, networkId, address),
+              contractService.getABI(protocolInstance.getABI(), networkId, address),
             );
           }
-          // If startBlock is not set, try to load it.
+          // If startBlock is not provided, try to fetch it from Etherscan API
           if (!initStartBlock) {
-            // Load startBlock for this contract
             const startBlock = await retryWithPrompt(() =>
               contractService.getStartBlock(networkId, address),
             );
@@ -585,9 +576,8 @@ async function processInitForm(
             }
           }
 
-          // If contract name is not set, try to load it.
+          // If contract name is not provided, try to fetch it from Etherscan API
           if (!initContractName) {
-            // Load contract name for this contract
             const contractName = await retryWithPrompt(() =>
               contractService.getContractName(networkId, address),
             );