add proxy support to graph add

Author: YaroShkvorets

packages/cli/src/commands/add.ts

@@ -88,7 +88,9 @@ export default class AddCommand extends Command {
 
     let startBlock = startBlockFlag ? parseInt(startBlockFlag).toString() : startBlockFlag;
     let contractName = contractNameFlag || DEFAULT_CONTRACT_NAME;
-    let ethabi = null;
+
+    let ethabi: EthereumABI | null = null;
+    let implAddress = null;
 
     if (sourcifyContractInfo) {
       startBlock ??= sourcifyContractInfo.startBlock;
@@ -112,6 +114,36 @@ export default class AddCommand extends Command {
           ),
         );
         if (!ethabi) throw Error;
+        const isProxy = ethabi.callFunctionSignatures()?.includes('upgradeTo(address)');
+        if (isProxy) {
+          const impl = await retryWithPrompt(() =>
+            withSpinner(
+              'Fetching proxy implementation address...',
+              'Failed to fetch proxy implementation address',
+              'Warning fetching proxy implementation address',
+              () => contractService.getProxyImplementation(network, address),
+            ),
+          );
+          if (impl) {
+            const useImplementation = await prompt.confirm(
+              `Proxy contract detected. Index implementation contract at ${impl}?`,
+              true,
+            );
+
+            if (useImplementation) {
+              implAddress = impl;
+              ethabi = await retryWithPrompt(() =>
+                withSpinner(
+                  'Fetching implementation contract ABI...',
+                  'Failed to fetch implementation ABI',
+                  'Warning fetching implementation ABI',
+                  () => contractService.getABI(EthereumABI, network, implAddress!),
+                ),
+              );
+            }
+            if (!ethabi) throw Error;
+          }
+        }
       } catch (error) {
         // we cannot ask user to do prompt in test environment
         if (process.env.NODE_ENV !== 'test') {
@@ -136,10 +168,15 @@ export default class AddCommand extends Command {
         }
       }
     }
+    if (!ethabi) {
+      this.error('Failed to load ABI', { exit: 1 });
+    }
 
     try {
       if (isLocalHost) throw Error; // Triggers user prompting without waiting for Etherscan lookup to fail
-      startBlock ||= Number(await contractService.getStartBlock(network, address)).toString();
+      startBlock ||= Number(
+        await contractService.getStartBlock(network, implAddress ?? address),
+      ).toString();
     } catch (error) {
       // we cannot ask user to do prompt in test environment
       if (process.env.NODE_ENV !== 'test') {
@@ -166,7 +203,8 @@ export default class AddCommand extends Command {
       if (isLocalHost) throw Error; // Triggers user prompting without waiting for Etherscan lookup to fail
       if (contractName === DEFAULT_CONTRACT_NAME) {
         contractName =
-          (await contractService.getContractName(network, address)) ?? DEFAULT_CONTRACT_NAME;
+          (await contractService.getContractName(network, implAddress ?? address)) ??
+          DEFAULT_CONTRACT_NAME;
       }
     } catch (error) {
       // not asking user to do prompt in test environment
@@ -266,8 +304,6 @@ export default class AddCommand extends Command {
       'Warning during codegen',
       async () => await system.run(yarn ? 'yarn codegen' : 'npm run codegen'),
     );
-
-    this.exit(0);
   }
 }
 

packages/cli/src/commands/init.ts

@@ -648,38 +648,42 @@ async function processInitForm(
           initDebugger.extend('processInitForm')("abiFromEtherscan len: '%s'", abiFromApi?.name);
         } else {
           abiFromApi = initAbi;
-          const isProxy =
-            abiFromApi?.callFunctions().some(entry => entry.get('name') === 'implementation') ??
-            false;
-          initDebugger.extend('processInitForm')('isProxy: %O', isProxy);
-          if (isProxy) {
-            const impl = await retryWithPrompt(() =>
-              withSpinner(
-                'Fetching proxy implementation address...',
-                'Failed to fetch proxy implementation address',
-                'Warning fetching proxy implementation address',
-                () => contractService.getProxyImplementation(network.id, address),
-              ),
+        }
+
+        const isProxy =
+          abiFromApi
+            ?.callFunctions()
+            .some(
+              entry => entry.get('name') === 'implementation' || entry.get('name') === 'upgradeTo',
+            ) ?? false;
+        initDebugger.extend('processInitForm')('isProxy: %O', isProxy);
+
+        if (isProxy) {
+          const impl = await retryWithPrompt(() =>
+            withSpinner(
+              'Fetching proxy implementation address...',
+              'Failed to fetch proxy implementation address',
+              'Warning fetching proxy implementation address',
+              () => contractService.getProxyImplementation(network.id, address),
+            ),
+          );
+          initDebugger.extend('processInitForm')("proxyImplementation: '%s'", impl);
+          if (impl) {
+            const useImplementation = await prompt.confirm(
+              `Proxy contract detected. Index implementation contract at ${impl}?`,
+              true,
             );
-            initDebugger.extend('processInitForm')("proxyImplementation: '%s'", impl);
-            if (impl) {
-              const useImplementation = await prompt.confirm(
-                `Proxy contract detected. Index implementation contract at ${impl}?`,
-                true,
-              );
 
-              if (useImplementation) {
-                implAddress = impl;
-                abiFromApi = await retryWithPrompt(() =>
-                  withSpinner(
-                    'Fetching implementation contract ABI...',
-                    'Failed to fetch implementation ABI',
-                    'Warning fetching implementation ABI',
-                    () =>
-                      contractService.getABI(protocolInstance.getABI(), network.id, implAddress!),
-                  ),
-                );
-              }
+            if (useImplementation) {
+              implAddress = impl;
+              abiFromApi = await retryWithPrompt(() =>
+                withSpinner(
+                  'Fetching implementation contract ABI...',
+                  'Failed to fetch implementation ABI',
+                  'Warning fetching implementation ABI',
+                  () => contractService.getABI(protocolInstance.getABI(), network.id, implAddress!),
+                ),
+              );
             }
           }
         }
@@ -1338,7 +1342,7 @@ async function addAnotherContract(
       name: 'contract',
       initial: ProtocolContract.identifierName(),
       required: true,
-      message: () => `\nContract ${ProtocolContract.identifierName()}`,
+      message: () => `Contract ${ProtocolContract.identifierName()}`,
       validate: value => {
         const { valid, error } = validateContract(value, ProtocolContract);
         return valid ? true : error;