@graphprotocol/graph-cli 0.94.0-alpha-20250109043757-c53ef95047eaf4833353c30dc2d1f6cbb9fc13e4 → 0.94.0

package/CHANGELOG.md

@@ -1,22 +1,35 @@
 # @graphprotocol/graph-cli
 
-## 0.94.0-alpha-20250109043757-c53ef95047eaf4833353c30dc2d1f6cbb9fc13e4
+## 0.94.0
 
 ### Minor Changes
 
-- [#1888](https://github.com/graphprotocol/graph-tooling/pull/1888)
-  [`99d296f`](https://github.com/graphprotocol/graph-tooling/commit/99d296f67c1c49a6b894e737478f34920465948c)
-  Thanks [@YaroShkvorets](https://github.com/YaroShkvorets)! - Add EIP-1967/OpenZeppelin proxy
-  contracts support. When proxy contract is detected, user is given an option to use ABI of the
-  implementation contract.
+- [#1892](https://github.com/graphprotocol/graph-tooling/pull/1892)
+  [`b4564a7`](https://github.com/graphprotocol/graph-tooling/commit/b4564a71134c310dee983f6eff613b953bf481be)
+  Thanks [@YaroShkvorets](https://github.com/YaroShkvorets)! - handle tuple[] and address[] for
+  event parameters - #949
 
 ### Patch Changes
 
+- [#1891](https://github.com/graphprotocol/graph-tooling/pull/1891)
+  [`d1fa5e0`](https://github.com/graphprotocol/graph-tooling/commit/d1fa5e0e34a92f24db29d3def26e133e87e7bdde)
+  Thanks [@YaroShkvorets](https://github.com/YaroShkvorets)! - fix bug with duplicate IDs - #1604
+
+- [#1889](https://github.com/graphprotocol/graph-tooling/pull/1889)
+  [`e085e39`](https://github.com/graphprotocol/graph-tooling/commit/e085e39e48cd0241277ede246aa2b7833e6a91f3)
+  Thanks [@YaroShkvorets](https://github.com/YaroShkvorets)! - fix confusing "no error" message when
+  pressing Escape on prompts
+
 - [#1879](https://github.com/graphprotocol/graph-tooling/pull/1879)
   [`f6079a6`](https://github.com/graphprotocol/graph-tooling/commit/f6079a68c016e8d9864f2fc94526a60d4b21eb69)
   Thanks [@McAronDev](https://github.com/McAronDev)! - fix bug with missing Graft type in SpS
   manifest definition
 
+- [#1884](https://github.com/graphprotocol/graph-tooling/pull/1884)
+  [`93d87a8`](https://github.com/graphprotocol/graph-tooling/commit/93d87a8c6912b87ed8dbdce0e1b4d2765bc1df39)
+  Thanks [@YaroShkvorets](https://github.com/YaroShkvorets)! - `graph init`: fix tests generation
+  for events with [][] params #1878
+
 ## 0.93.3
 
 ### Patch Changes

package/dist/codegen/util.d.ts

@@ -11,4 +11,7 @@ export declare const unrollTuple: ({ path, value, }: {
     path: string[];
     index: number;
     value: any;
-}) => any;
+}) => {
+    path: string[];
+    type: string;
+}[];

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

@@ -10,6 +10,5 @@ export declare class ContractService {
     getABI(ABICtor: typeof ABI, networkId: string, address: string): Promise<ABI>;
     getStartBlock(networkId: string, address: string): Promise<string>;
     getContractName(networkId: string, address: string): Promise<string>;
-    getProxyImplementation(networkId: string, address: string): Promise<string>;
     private fetchTransactionByHash;
 }

package/dist/command-helpers/contracts.js

@@ -122,48 +122,6 @@ export class ContractService {
         }
         throw new Error(`Failed to fetch contract name for ${address}`);
     }
-    async getProxyImplementation(networkId, address) {
-        const urls = this.getRpcUrls(networkId);
-        if (!urls.length) {
-            throw new Error(`No JSON-RPC available for ${networkId} in the registry`);
-        }
-        const EIP_1967_SLOT = '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc';
-        const OPEN_ZEPPELIN_SLOT = '0x7050c9e0f4ca769c69bd3a8ef740bc37934f8e2c036e5a723fd8ee048ed3f8c3';
-        const getStorageAt = async (url, slot) => {
-            const response = await fetch(url, {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({
-                    jsonrpc: '2.0',
-                    method: 'eth_getStorageAt',
-                    params: [address, slot, 'latest'],
-                    id: 1,
-                }),
-            });
-            const json = await response.json();
-            if (json?.result) {
-                const impl = '0x' + json.result.slice(-40);
-                if (impl !== '0x0000000000000000000000000000000000000000') {
-                    return impl;
-                }
-            }
-            return null;
-        };
-        for (const url of urls) {
-            for (const slot of [EIP_1967_SLOT, OPEN_ZEPPELIN_SLOT]) {
-                try {
-                    const impl = await getStorageAt(url, slot);
-                    if (impl) {
-                        return impl;
-                    }
-                }
-                catch (error) {
-                    logger(`Failed to fetch proxy implementation from ${url}: ${error}`);
-                }
-            }
-        }
-        throw new Error(`No implementation address found`);
-    }
     async fetchTransactionByHash(networkId, txHash) {
         const urls = this.getRpcUrls(networkId);
         if (!urls.length) {
@@ -191,6 +149,6 @@ export class ContractService {
                 logger(`Failed to fetch tx ${txHash} from ${url}: ${error}`);
             }
         }
-        throw new Error(`Failed to fetch tx ${txHash}`);
+        throw new Error(`JSON-RPC is unreachable`);
     }
 }

package/dist/commands/add.js

@@ -4,7 +4,6 @@ import { Args, Command, Errors, Flags } from '@oclif/core';
 import { ContractService } from '../command-helpers/contracts.js';
 import * as DataSourcesExtractor from '../command-helpers/data-sources.js';
 import { updateNetworksFile } from '../command-helpers/network.js';
-import { checkForProxy } from '../command-helpers/proxy.js';
 import { loadRegistry } from '../command-helpers/registry.js';
 import { retryWithPrompt } from '../command-helpers/retry.js';
 import { generateDataSource, writeABI, writeMapping, writeSchema, writeTestsFiles, } from '../command-helpers/scaffold.js';
@@ -62,7 +61,6 @@ export default class AddCommand extends Command {
         let startBlock = startBlockFlag ? parseInt(startBlockFlag).toString() : startBlockFlag;
         let contractName = contractNameFlag || DEFAULT_CONTRACT_NAME;
         let ethabi = null;
-        let implAddress = null;
         if (abi) {
             ethabi = EthereumABI.load(contractName, abi);
         }
@@ -73,18 +71,12 @@ export default class AddCommand extends Command {
                 ethabi = await retryWithPrompt(() => withSpinner('Fetching ABI from contract API...', 'Failed to fetch ABI', 'Warning fetching ABI', () => contractService.getABI(EthereumABI, network, address)));
                 if (!ethabi)
                     throw Error;
-                const { implementationAbi, implementationAddress } = await checkForProxy(contractService, network, address, ethabi);
-                if (implementationAddress) {
-                    implAddress = implementationAddress;
-                    ethabi = implementationAbi;
-                }
-                if (!ethabi)
-                    throw Error;
             }
             catch (error) {
                 // we cannot ask user to do prompt in test environment
                 if (process.env.NODE_ENV !== 'test') {
-                    const { abi: abiFile } = await prompt.ask([
+                    const { abi: abiFile } = await prompt
+                        .ask([
                         {
                             type: 'input',
                             name: 'abi',
@@ -99,24 +91,23 @@ export default class AddCommand extends Command {
                                 }
                             },
                         },
-                    ]);
+                    ])
+                        .catch(() => this.exit(1)); // properly handle ESC
                     ethabi = EthereumABI.load(contractName, abiFile);
                 }
             }
         }
-        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, implAddress ?? address)).toString();
+            startBlock ||= Number(await contractService.getStartBlock(network, address)).toString();
         }
         catch (error) {
             // we cannot ask user to do prompt in test environment
             if (process.env.NODE_ENV !== 'test') {
                 // If we can't get the start block, we'll just leave it out of the manifest
-                const { startBlock: userInputStartBlock } = await prompt.ask([
+                const { startBlock: userInputStartBlock } = await prompt
+                    .ask([
                     {
                         type: 'input',
                         name: 'startBlock',
@@ -127,7 +118,8 @@ export default class AddCommand extends Command {
                             return value;
                         },
                     },
-                ]);
+                ])
+                    .catch(() => this.exit(1));
                 startBlock = userInputStartBlock;
             }
         }
@@ -136,14 +128,14 @@ export default class AddCommand extends Command {
                 throw Error; // Triggers user prompting without waiting for Etherscan lookup to fail
             if (contractName === DEFAULT_CONTRACT_NAME) {
                 contractName =
-                    (await contractService.getContractName(network, implAddress ?? address)) ??
-                        DEFAULT_CONTRACT_NAME;
+                    (await contractService.getContractName(network, address)) ?? DEFAULT_CONTRACT_NAME;
             }
         }
         catch (error) {
             // not asking user to do prompt in test environment
             if (process.env.NODE_ENV !== 'test') {
-                const { contractName: userInputContractName } = await prompt.ask([
+                const { contractName: userInputContractName } = await prompt
+                    .ask([
                     {
                         type: 'input',
                         name: 'contractName',
@@ -154,7 +146,8 @@ export default class AddCommand extends Command {
                             return value;
                         },
                     },
-                ]);
+                ])
+                    .catch(() => this.exit(1));
                 contractName = userInputContractName;
             }
         }
@@ -196,6 +189,7 @@ export default class AddCommand extends Command {
             });
         }
         await withSpinner('Running codegen', 'Failed to run codegen', 'Warning during codegen', async () => await system.run(yarn ? 'yarn codegen' : 'npm run codegen'));
+        this.exit(0);
     }
 }
 const getEntities = (manifest) => {

package/dist/commands/auth.js

@@ -20,7 +20,8 @@ export default class AuthCommand extends Command {
     async run() {
         const { args: { 'deploy-key': initialDeployKey }, } = await this.parse(AuthCommand);
         const { node } = chooseNodeUrl({});
-        const { deployKey } = await prompt.ask([
+        const { deployKey } = await prompt
+            .ask([
             {
                 type: 'input',
                 name: 'deployKey',
@@ -30,7 +31,8 @@ export default class AuthCommand extends Command {
                 skip: this.validateStudioDeployKey(initialDeployKey),
                 validate: value => this.validateStudioDeployKey(value) || `Invalid Subgraph Studio deploy key: ${value}`,
             },
-        ]);
+        ])
+            .catch(() => this.exit(1));
         try {
             await saveDeployKey(node, deployKey);
             print.success(`Deploy key set for ${node}`);

package/dist/commands/deploy.js

@@ -87,7 +87,8 @@ export default class DeployCommand extends Command {
     };
     async run() {
         const { args: { 'subgraph-name': subgraphNameArg, 'subgraph-manifest': manifest }, flags: { 'deploy-key': deployKeyFlag, 'access-token': accessToken, 'version-label': versionLabelFlag, ipfs, headers, node: nodeFlag, 'output-dir': outputDir, 'skip-migrations': skipMigrations, watch, 'debug-fork': debugFork, network, 'network-file': networkFile, 'ipfs-hash': ipfsHash, }, } = await this.parse(DeployCommand);
-        const { subgraphName } = await prompt.ask([
+        const { subgraphName } = await prompt
+            .ask([
             {
                 type: 'input',
                 name: 'subgraphName',
@@ -96,7 +97,8 @@ export default class DeployCommand extends Command {
                 initial: subgraphNameArg,
                 required: true,
             },
-        ]);
+        ])
+            .catch(() => this.exit(1));
         const { node } = chooseNodeUrl({
             node: nodeFlag,
         });
@@ -124,7 +126,8 @@ export default class DeployCommand extends Command {
             };
         }
         // Ask for label if not on hosted service
-        const { versionLabel } = await prompt.ask([
+        const { versionLabel } = await prompt
+            .ask([
             {
                 type: 'input',
                 name: 'versionLabel',
@@ -133,7 +136,8 @@ export default class DeployCommand extends Command {
                 skip: () => !!versionLabelFlag,
                 required: true,
             },
-        ]);
+        ])
+            .catch(() => this.exit(1));
         const deploySubgraph = async (ipfsHash) => {
             const spinner = print.spin(`Deploying to Graph node ${requestUrl}`);
             client.request('subgraph_deploy', {

package/dist/commands/init.js

@@ -10,7 +10,6 @@ import { DEFAULT_IPFS_URL } from '../command-helpers/ipfs.js';
 import { initNetworksConfig } from '../command-helpers/network.js';
 import { chooseNodeUrl } from '../command-helpers/node.js';
 import { PromptManager } from '../command-helpers/prompt-manager.js';
-import { checkForProxy } from '../command-helpers/proxy.js';
 import { loadRegistry } from '../command-helpers/registry.js';
 import { retryWithPrompt } from '../command-helpers/retry.js';
 import { generateScaffold, writeScaffold } from '../command-helpers/scaffold.js';
@@ -464,27 +463,18 @@ async function processInitForm({ abi: initAbi, abiPath: initAbiPath, directory:
                     return address;
                 }
                 // If ABI is not provided, try to fetch it from Etherscan API
-                let implAddress = undefined;
                 if (protocolInstance.hasABIs() && !initAbi) {
                     abiFromApi = await retryWithPrompt(() => withSpinner('Fetching ABI from contract API...', 'Failed to fetch ABI', 'Warning fetching ABI', () => contractService.getABI(protocolInstance.getABI(), network.id, address)));
-                    initDebugger.extend('processInitForm')("ABI: '%s'", abiFromApi?.name);
-                    if (abiFromApi) {
-                        const { implementationAbi, implementationAddress } = await checkForProxy(contractService, network.id, address, abiFromApi);
-                        if (implementationAddress) {
-                            implAddress = implementationAddress;
-                            abiFromApi = implementationAbi;
-                            initDebugger.extend('processInitForm')("Impl ABI: '%s', Impl Address: '%s'", abiFromApi?.name, implAddress);
-                        }
-                    }
+                    initDebugger.extend('processInitForm')("abiFromEtherscan len: '%s'", abiFromApi?.name);
                 }
                 // If startBlock is not provided, try to fetch it from Etherscan API
                 if (!initStartBlock) {
-                    startBlock = await retryWithPrompt(() => withSpinner('Fetching start block from contract API...', 'Failed to fetch start block', 'Warning fetching start block', () => contractService.getStartBlock(network.id, implAddress ?? address)));
+                    startBlock = await retryWithPrompt(() => withSpinner('Fetching start block from contract API...', 'Failed to fetch start block', 'Warning fetching start block', () => contractService.getStartBlock(network.id, address)));
                     initDebugger.extend('processInitForm')("startBlockFromEtherscan: '%s'", startBlock);
                 }
                 // If contract name is not provided, try to fetch it from Etherscan API
                 if (!initContractName) {
-                    contractName = await retryWithPrompt(() => withSpinner('Fetching contract name from contract API...', 'Failed to fetch contract name', 'Warning fetching contract name', () => contractService.getContractName(network.id, implAddress ?? address)));
+                    contractName = await retryWithPrompt(() => withSpinner('Fetching contract name from contract API...', 'Failed to fetch contract name', 'Warning fetching contract name', () => contractService.getContractName(network.id, address)));
                     initDebugger.extend('processInitForm')("contractNameFromEtherscan: '%s'", contractName);
                 }
                 source = address;
@@ -720,9 +710,10 @@ Subgraph ${subgraphName} created in ${relativeDir}
 Make sure to visit the documentation on https://thegraph.com/docs/ for further information.`);
 }
 async function initSubgraphFromExample({ fromExample, subgraphName, directory, skipInstall, skipGit, }, { commands, }) {
-    let overwrite = false;
     if (filesystem.exists(directory)) {
-        overwrite = await prompt.confirm('Directory already exists, do you want to initialize the subgraph here (files will be overwritten) ?', false);
+        const overwrite = await prompt
+            .confirm('Directory already exists, do you want to initialize the subgraph here (files will be overwritten) ?', false)
+            .catch(() => false);
         if (!overwrite) {
             this.exit(1);
         }
@@ -746,7 +737,7 @@ async function initSubgraphFromExample({ fromExample, subgraphName, directory, s
             if (!filesystem.exists(exampleSubgraphPath)) {
                 return { result: false, error: `Example not found: ${fromExample}` };
             }
-            filesystem.copy(exampleSubgraphPath, directory, { overwrite });
+            filesystem.copy(exampleSubgraphPath, directory, { overwrite: true });
             return true;
         }
         finally {
@@ -811,9 +802,13 @@ async function initSubgraphFromExample({ fromExample, subgraphName, directory, s
 }
 async function initSubgraphFromContract({ protocolInstance, subgraphName, directory, abi, network, source, indexEvents, contractName, node, startBlock, spkgPath, skipInstall, skipGit, ipfsUrl, }, { commands, addContract, }) {
     const isComposedSubgraph = protocolInstance.isComposedSubgraph();
-    if (filesystem.exists(directory) &&
-        !(await prompt.confirm('Directory already exists, do you want to initialize the subgraph here (files will be overwritten) ?', false))) {
-        this.exit(1);
+    if (filesystem.exists(directory)) {
+        const overwrite = await prompt
+            .confirm('Directory already exists, do you want to initialize the subgraph here (files will be overwritten) ?', false)
+            .catch(() => false);
+        if (!overwrite) {
+            this.exit(1);
+        }
     }
     let entities;
     if (isComposedSubgraph) {
@@ -890,10 +885,12 @@ async function initSubgraphFromContract({ protocolInstance, subgraphName, direct
             this.exit(1);
         }
         while (addContract) {
-            addContract = await addAnotherContract.bind(this)({
+            addContract = await addAnotherContract
+                .bind(this)({
                 protocolInstance,
                 directory,
-            });
+            })
+                .catch(() => false);
         }
     }
     printNextSteps.bind(this)({ subgraphName, directory }, { commands });
@@ -917,7 +914,7 @@ async function addAnotherContract({ protocolInstance, directory, }) {
             name: 'contract',
             initial: ProtocolContract.identifierName(),
             required: true,
-            message: () => `Contract ${ProtocolContract.identifierName()}`,
+            message: () => `\nContract ${ProtocolContract.identifierName()}`,
             validate: value => {
                 const { valid, error } = validateContract(value, ProtocolContract);
                 return valid ? true : error;

package/dist/commands/publish.js

@@ -51,7 +51,8 @@ export default class PublishCommand extends Command {
      * Prompt the user to open up the browser to continue publishing the subgraph
      */
     async publishWithBrowser({ ipfsHash, webapp, subgraphId, protocolNetwork, apiKey, }) {
-        const { openBrowser } = await prompt.ask([
+        const { openBrowser } = await prompt
+            .ask([
             {
                 type: 'confirm',
                 name: 'openBrowser',
@@ -59,7 +60,8 @@ export default class PublishCommand extends Command {
                 initial: true,
                 required: true,
             },
-        ]);
+        ])
+            .catch(() => this.exit(1));
         if (!openBrowser) {
             this.exit(0);
         }

package/dist/protocols/ethereum/codegen/abi.js

@@ -220,7 +220,7 @@ export default class AbiCodeGenerator {
             name = parentType === 'event' ? `param${index}` : `value${index}`;
         }
         const tupleIdentifier = parentClass + tsCodegen.namedType(name).capitalize();
-        const tupleClassName = tupleIdentifier + 'Struct';
+        const tupleClassName = tupleIdentifier + (parentField === 'outputValues' ? 'Output' : '') + 'Struct';
         let tupleClasses = [];
         const isTupleType = util.isTupleType(type);
         const returnValue = typesCodegen.ethereumToAsc(parentType === 'tuple'

package/dist/protocols/ethereum/scaffold/mapping.js

@@ -27,7 +27,7 @@ export const generatePlaceholderHandlers = ({ abi, events, contractName, }) => `
       entity.count = entity.count + BigInt.fromI32(1)
 
       // Entity fields can be set based on event parameters
-      ${generateEventFieldAssignments(event, contractName).slice(0, 2).join('\n')}
+      ${generateEventFieldAssignments(event, contractName).assignments.slice(0, 2).join('\n')}
 
       // Entities can be written to the store with \`.save()\`
       entity.save()

package/dist/scaffold/ethereum.test.js

@@ -51,7 +51,28 @@ const TEST_CALLABLE_FUNCTIONS = [
         outputs: [{ type: 'tuple', components: [{ type: 'uint256' }] }],
     },
 ];
-const TEST_ABI = new ABI('Contract', undefined, immutable.fromJS([TEST_EVENT, OVERLOADED_EVENT, TEST_CONTRACT, ...TEST_CALLABLE_FUNCTIONS]));
+const TEST_TUPLE_ARRAY_EVENT = {
+    name: 'TupleArrayEvent',
+    type: 'event',
+    inputs: [
+        {
+            name: 'tupleArray',
+            type: 'tuple[]',
+            components: [
+                { name: 'field1', type: 'uint256' },
+                { name: 'field2', type: 'address' },
+            ],
+        },
+        { name: 'addressArray', type: 'address[]' },
+    ],
+};
+const TEST_ABI = new ABI('Contract', undefined, immutable.fromJS([
+    TEST_EVENT,
+    OVERLOADED_EVENT,
+    TEST_TUPLE_ARRAY_EVENT,
+    TEST_CONTRACT,
+    ...TEST_CALLABLE_FUNCTIONS,
+]));
 const protocol = new Protocol('ethereum');
 const scaffoldOptions = {
     protocol,
@@ -82,6 +103,9 @@ describe('Ethereum subgraph scaffolding', () => {
     test('Mapping (for indexing events)', async () => {
         expect(await scaffoldWithIndexEvents.generateMapping()).toMatchSnapshot();
     });
+    test('Mapping handles tuple array type conversion', async () => {
+        expect(await scaffold.generateMapping()).toMatchSnapshot();
+    });
     test('Test Files (default)', async () => {
         const files = await scaffoldWithIndexEvents.generateTests();
         const testFile = files?.['contract.test.ts'];

package/dist/scaffold/mapping.d.ts

@@ -1,8 +1,21 @@
-export declare const generateFieldAssignment: (key: string[], value: string[]) => string;
-export declare const generateFieldAssignments: ({ index, input }: {
+/**
+ * Map of value types that need to be changetype'd to their corresponding AssemblyScript type
+ */
+export declare const VALUE_TYPECAST_MAP: Record<string, string>;
+export declare const generateFieldAssignment: (key: string[], value: string[], type: string) => {
+    assignment: string;
+    imports: string[];
+};
+export declare const generateFieldAssignments: ({ index, input, }: {
     index: number;
     input: any;
-}) => any;
+}) => {
+    assignments: string[];
+    imports: string[];
+};
 export declare const renameNameIfNeeded: (name: string) => string;
-export declare const generateEventFieldAssignments: (event: any, _contractName: string) => any;
+export declare const generateEventFieldAssignments: (event: any, _contractName: string) => {
+    assignments: string[];
+    imports: string[];
+};
 export declare const generateEventIndexingHandlers: (events: any[], contractName: string) => string;

package/dist/scaffold/mapping.js

@@ -1,10 +1,37 @@
 import * as util from '../codegen/util.js';
-export const generateFieldAssignment = (key, value) => `entity.${key.join('_')} = event.params.${value.join('.')}`;
-export const generateFieldAssignments = ({ index, input }) => input.type === 'tuple'
-    ? util
-        .unrollTuple({ value: input, index, path: [input.name || `param${index}`] })
-        .map(({ path }) => generateFieldAssignment(path, path))
-    : generateFieldAssignment([(input.mappedName ?? input.name) || `param${index}`], [input.name || `param${index}`]);
+/**
+ * Map of value types that need to be changetype'd to their corresponding AssemblyScript type
+ */
+export const VALUE_TYPECAST_MAP = {
+    'address[]': 'Bytes[]',
+    'tuple[]': 'Bytes[]',
+};
+export const generateFieldAssignment = (key, value, type) => {
+    let rightSide = `event.params.${value.join('.')}`;
+    const imports = [];
+    if (type in VALUE_TYPECAST_MAP) {
+        const castTo = VALUE_TYPECAST_MAP[type];
+        rightSide = `changetype<${castTo}>(${rightSide})`;
+        imports.push(castTo.replace('[]', ''));
+    }
+    return {
+        assignment: `entity.${key.join('_')} = ${rightSide}`,
+        imports,
+    };
+};
+export const generateFieldAssignments = ({ index, input, }) => {
+    const fields = input.type === 'tuple'
+        ? util
+            .unrollTuple({ value: input, index, path: [input.name || `param${index}`] })
+            .map(({ path, type }) => generateFieldAssignment(path, path, type))
+        : [
+            generateFieldAssignment([(input.mappedName ?? input.name) || `param${index}`], [input.name || `param${index}`], input.type),
+        ];
+    return {
+        assignments: fields.map(a => a.assignment),
+        imports: fields.map(a => a.imports).flat(),
+    };
+};
 /**
  * Map of input names that are reserved so we do not use them as field names to avoid conflicts
  * see https://github.com/graphprotocol/graph-tooling/issues/710
@@ -19,17 +46,23 @@ export const renameNameIfNeeded = (name) => {
 };
 export const generateEventFieldAssignments = (event, _contractName) => event.inputs.reduce((acc, input, index) => {
     input.mappedName = renameNameIfNeeded(input.name);
-    return acc.concat(generateFieldAssignments({ input, index }));
-}, []);
-export const generateEventIndexingHandlers = (events, contractName) => `
-  import { ${events.map(event => `${event._alias} as ${event._alias}Event`)}} from '../generated/${contractName}/${contractName}'
-  import { ${events.map(event => event._alias)} } from '../generated/schema'
-
-  ${events
-    .map(event => `
+    const { assignments, imports } = generateFieldAssignments({ input, index });
+    return {
+        assignments: acc.assignments.concat(assignments),
+        imports: acc.imports.concat(imports),
+    };
+}, { assignments: [], imports: [] });
+export const generateEventIndexingHandlers = (events, contractName) => {
+    const eventFieldAssignments = events.map(event => ({
+        event,
+        ...generateEventFieldAssignments(event, contractName),
+    }));
+    const allImports = [...new Set(eventFieldAssignments.map(({ imports }) => imports).flat())];
+    const eventHandlers = eventFieldAssignments.map(({ event, assignments }) => {
+        return `
   export function handle${event._alias}(event: ${event._alias}Event): void {
     let entity = new ${event._alias}(event.transaction.hash.concatI32(event.logIndex.toI32()))
-    ${generateEventFieldAssignments(event, contractName).join('\n')}
+    ${assignments.join('\n')}
 
     entity.blockNumber = event.block.number
     entity.blockTimestamp = event.block.timestamp
@@ -37,6 +70,15 @@ export const generateEventIndexingHandlers = (events, contractName) => `
 
     entity.save()
   }
-    `)
-    .join('\n')}
+    `;
+    });
+    return `
+  import { ${events.map(event => `${event._alias} as ${event._alias}Event`)}} from '../generated/${contractName}/${contractName}'
+  import { ${events.map(event => event._alias)} } from '../generated/schema'
+  ${allImports.length > 0
+        ? `import { ${allImports.join(', ')} } from '@graphprotocol/graph-ts'`
+        : ''}
+
+  ${eventHandlers.join('\n')}
 `;
+};

package/dist/scaffold/schema.d.ts

@@ -13,6 +13,6 @@ export declare const generateEventFields: ({ index, input, protocolName, }: {
     index: number;
     input: any;
     protocolName: string;
-}) => any;
+}) => string[];
 export declare const generateEventType: (event: any, protocolName: string, contractName: string | undefined) => string;
 export declare const generateExampleEntityType: (protocol: Protocol, events: any[]) => string;

package/dist/scaffold/tests.js

@@ -97,7 +97,13 @@ const isNativeType = (type) => {
     const natives = [/i32/, /string/, /boolean/];
     return natives.some(rx => rx.test(type));
 };
-const fetchArrayInnerType = (type) => type.match(/Array<(.*?)>/);
+// get inner type: Array<T> -> T, Array<Array<T>> -> T
+const fetchArrayInnerType = (type) => {
+    const match = type.match(/Array<(.+)>/);
+    if (!match)
+        return null;
+    return fetchArrayInnerType(match[1]) || match;
+};
 // Generates the example test.ts file
 const generateExampleTest = (contract, event, indexEvents, importTypes) => {
     const entity = indexEvents ? String(event._alias) : 'ExampleEntity';

package/dist/tsconfig.build.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/constants.ts","../src/debug.ts","../src/fetch.ts","../src/index.ts","../src/migrations.ts","../src/schema.ts","../src/subgraph.ts","../src/type-generator.ts","../src/utils.ts","../src/version.ts","../src/watcher.ts","../src/codegen/schema.test.ts","../src/codegen/schema.ts","../src/codegen/template.ts","../src/codegen/typescript.ts","../src/codegen/util.test.ts","../src/codegen/util.ts","../src/codegen/types/conversions.ts","../src/codegen/types/index.test.ts","../src/codegen/types/index.ts","../src/command-helpers/auth.ts","../src/command-helpers/compiler.test.ts","../src/command-helpers/compiler.ts","../src/command-helpers/contracts.test.ts","../src/command-helpers/contracts.ts","../src/command-helpers/data-sources.ts","../src/command-helpers/file-resolver.test.ts","../src/command-helpers/file-resolver.ts","../src/command-helpers/fs.ts","../src/command-helpers/ipfs.ts","../src/command-helpers/jsonrpc.ts","../src/command-helpers/network.test.ts","../src/command-helpers/network.ts","../src/command-helpers/node.ts","../src/command-helpers/prompt-manager.ts","../src/command-helpers/proxy.test.ts","../src/command-helpers/proxy.ts","../src/command-helpers/registry.ts","../src/command-helpers/retry.ts","../src/command-helpers/scaffold.ts","../src/command-helpers/sort.test.ts","../src/command-helpers/sort.ts","../src/command-helpers/spinner.ts","../src/command-helpers/subgraph.ts","../src/command-helpers/version.test.ts","../src/command-helpers/version.ts","../src/commands/add.ts","../src/commands/auth.ts","../src/commands/binary-install.d.ts","../src/commands/build.ts","../src/commands/clean.ts","../src/commands/codegen.ts","../src/commands/create.ts","../src/commands/deploy.ts","../src/commands/init.ts","../src/commands/local.ts","../src/commands/publish.ts","../src/commands/remove.ts","../src/commands/test.ts","../src/compiler/asc.ts","../src/compiler/index.ts","../src/migrations/mapping_api_version_0_0_1.ts","../src/migrations/mapping_api_version_0_0_2.ts","../src/migrations/mapping_api_version_0_0_3.ts","../src/migrations/mapping_api_version_0_0_4.ts","../src/migrations/mapping_api_version_0_0_5.ts","../src/migrations/spec_version_0_0_2.ts","../src/migrations/spec_version_0_0_3.ts","../src/migrations/util/load-manifest.ts","../src/migrations/util/versions.ts","../src/protocols/contract.ts","../src/protocols/file_template.ts","../src/protocols/index.ts","../src/protocols/subgraph.ts","../src/protocols/arweave/subgraph.ts","../src/protocols/arweave/scaffold/manifest.ts","../src/protocols/arweave/scaffold/mapping.ts","../src/protocols/cosmos/subgraph.ts","../src/protocols/cosmos/scaffold/manifest.ts","../src/protocols/cosmos/scaffold/mapping.ts","../src/protocols/ethereum/abi.ts","../src/protocols/ethereum/contract.ts","../src/protocols/ethereum/subgraph.ts","../src/protocols/ethereum/type-generator.ts","../src/protocols/ethereum/codegen/abi.test.ts","../src/protocols/ethereum/codegen/abi.ts","../src/protocols/ethereum/codegen/template.ts","../src/protocols/ethereum/scaffold/manifest.ts","../src/protocols/ethereum/scaffold/mapping.ts","../src/protocols/near/contract.ts","../src/protocols/near/subgraph.ts","../src/protocols/near/scaffold/manifest.ts","../src/protocols/near/scaffold/mapping.ts","../src/protocols/subgraph/subgraph.ts","../src/protocols/subgraph/scaffold/manifest.ts","../src/protocols/subgraph/scaffold/mapping.ts","../src/protocols/substreams/subgraph.ts","../src/protocols/substreams/scaffold/manifest.ts","../src/scaffold/cosmos.test.ts","../src/scaffold/ethereum.test.ts","../src/scaffold/get-docker-file.ts","../src/scaffold/get-git-ignore.ts","../src/scaffold/index.ts","../src/scaffold/mapping.ts","../src/scaffold/near.test.ts","../src/scaffold/schema.ts","../src/scaffold/tests.ts","../src/validation/contract.ts","../src/validation/index.ts","../src/validation/manifest.ts","../src/validation/schema.test.ts","../src/validation/schema.ts"],"version":"5.7.2"}
+{"root":["../src/constants.ts","../src/debug.ts","../src/fetch.ts","../src/index.ts","../src/migrations.ts","../src/schema.ts","../src/subgraph.ts","../src/type-generator.ts","../src/utils.ts","../src/version.ts","../src/watcher.ts","../src/codegen/schema.test.ts","../src/codegen/schema.ts","../src/codegen/template.ts","../src/codegen/typescript.ts","../src/codegen/util.test.ts","../src/codegen/util.ts","../src/codegen/types/conversions.ts","../src/codegen/types/index.test.ts","../src/codegen/types/index.ts","../src/command-helpers/auth.ts","../src/command-helpers/compiler.test.ts","../src/command-helpers/compiler.ts","../src/command-helpers/contracts.test.ts","../src/command-helpers/contracts.ts","../src/command-helpers/data-sources.ts","../src/command-helpers/file-resolver.test.ts","../src/command-helpers/file-resolver.ts","../src/command-helpers/fs.ts","../src/command-helpers/ipfs.ts","../src/command-helpers/jsonrpc.ts","../src/command-helpers/network.test.ts","../src/command-helpers/network.ts","../src/command-helpers/node.ts","../src/command-helpers/prompt-manager.ts","../src/command-helpers/registry.ts","../src/command-helpers/retry.ts","../src/command-helpers/scaffold.ts","../src/command-helpers/sort.test.ts","../src/command-helpers/sort.ts","../src/command-helpers/spinner.ts","../src/command-helpers/subgraph.ts","../src/command-helpers/version.test.ts","../src/command-helpers/version.ts","../src/commands/add.ts","../src/commands/auth.ts","../src/commands/binary-install.d.ts","../src/commands/build.ts","../src/commands/clean.ts","../src/commands/codegen.ts","../src/commands/create.ts","../src/commands/deploy.ts","../src/commands/init.ts","../src/commands/local.ts","../src/commands/publish.ts","../src/commands/remove.ts","../src/commands/test.ts","../src/compiler/asc.ts","../src/compiler/index.ts","../src/migrations/mapping_api_version_0_0_1.ts","../src/migrations/mapping_api_version_0_0_2.ts","../src/migrations/mapping_api_version_0_0_3.ts","../src/migrations/mapping_api_version_0_0_4.ts","../src/migrations/mapping_api_version_0_0_5.ts","../src/migrations/spec_version_0_0_2.ts","../src/migrations/spec_version_0_0_3.ts","../src/migrations/util/load-manifest.ts","../src/migrations/util/versions.ts","../src/protocols/contract.ts","../src/protocols/file_template.ts","../src/protocols/index.ts","../src/protocols/subgraph.ts","../src/protocols/arweave/subgraph.ts","../src/protocols/arweave/scaffold/manifest.ts","../src/protocols/arweave/scaffold/mapping.ts","../src/protocols/cosmos/subgraph.ts","../src/protocols/cosmos/scaffold/manifest.ts","../src/protocols/cosmos/scaffold/mapping.ts","../src/protocols/ethereum/abi.ts","../src/protocols/ethereum/contract.ts","../src/protocols/ethereum/subgraph.ts","../src/protocols/ethereum/type-generator.ts","../src/protocols/ethereum/codegen/abi.test.ts","../src/protocols/ethereum/codegen/abi.ts","../src/protocols/ethereum/codegen/template.ts","../src/protocols/ethereum/scaffold/manifest.ts","../src/protocols/ethereum/scaffold/mapping.ts","../src/protocols/near/contract.ts","../src/protocols/near/subgraph.ts","../src/protocols/near/scaffold/manifest.ts","../src/protocols/near/scaffold/mapping.ts","../src/protocols/subgraph/subgraph.ts","../src/protocols/subgraph/scaffold/manifest.ts","../src/protocols/subgraph/scaffold/mapping.ts","../src/protocols/substreams/subgraph.ts","../src/protocols/substreams/scaffold/manifest.ts","../src/scaffold/cosmos.test.ts","../src/scaffold/ethereum.test.ts","../src/scaffold/get-docker-file.ts","../src/scaffold/get-git-ignore.ts","../src/scaffold/index.ts","../src/scaffold/mapping.ts","../src/scaffold/near.test.ts","../src/scaffold/schema.ts","../src/scaffold/tests.ts","../src/validation/contract.ts","../src/validation/index.ts","../src/validation/manifest.ts","../src/validation/schema.test.ts","../src/validation/schema.ts"],"version":"5.7.2"}

package/oclif.manifest.json

@@ -1011,5 +1011,5 @@
       ]
     }
   },
-  "version": "0.94.0-alpha-20250109043757-c53ef95047eaf4833353c30dc2d1f6cbb9fc13e4"
+  "version": "0.94.0"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.94.0-alpha-20250109043757-c53ef95047eaf4833353c30dc2d1f6cbb9fc13e4",
+  "version": "0.94.0",
   "type": "module",
   "description": "CLI for building for and deploying to The Graph",
   "license": "(Apache-2.0 OR MIT)",

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

@@ -1,7 +0,0 @@
-import EthereumABI from '../protocols/ethereum/abi.js';
-import { ContractService } from './contracts.js';
-export interface CheckForProxyResult {
-    implementationAbi: EthereumABI | null;
-    implementationAddress: string | null;
-}
-export declare function checkForProxy(contractService: ContractService, network: string, address: string, abi: EthereumABI): Promise<CheckForProxyResult>;

package/dist/command-helpers/proxy.js

@@ -1,25 +0,0 @@
-import { prompt } from 'gluegun';
-import EthereumABI from '../protocols/ethereum/abi.js';
-import { retryWithPrompt } from './retry.js';
-import { withSpinner } from './spinner.js';
-export async function checkForProxy(contractService, network, address, abi) {
-    let implementationAddress = null;
-    let implementationAbi = null;
-    const maybeProxy = abi.callFunctionSignatures()?.includes('upgradeTo(address)');
-    if (maybeProxy) {
-        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. Use implementation contract ABI at ${impl}?`, true)
-                .catch(() => false);
-            if (useImplementation) {
-                implementationAddress = impl;
-                implementationAbi = await retryWithPrompt(() => withSpinner('Fetching implementation contract ABI...', 'Failed to fetch implementation ABI', 'Warning fetching implementation ABI', () => contractService.getABI(EthereumABI, network, implementationAddress)));
-            }
-        }
-    }
-    return {
-        implementationAbi,
-        implementationAddress,
-    };
-}

package/dist/command-helpers/proxy.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/command-helpers/proxy.test.js

@@ -1,64 +0,0 @@
-import { prompt } from 'gluegun';
-import { describe, expect, it, vi } from 'vitest';
-import EthereumABI from '../protocols/ethereum/abi.js';
-import { ContractService } from './contracts.js';
-import { checkForProxy } from './proxy.js';
-import { loadRegistry } from './registry.js';
-// Mock gluegun's prompt
-vi.mock('gluegun', async () => {
-    const actual = await vi.importActual('gluegun');
-    return {
-        ...actual,
-        prompt: {
-            confirm: vi.fn().mockResolvedValue(true),
-        },
-    };
-});
-describe('Proxy detection', async () => {
-    const NETWORK = 'mainnet';
-    const registry = await loadRegistry();
-    const contractService = new ContractService(registry);
-    const testCases = [
-        {
-            name: 'USDC',
-            type: 'EIP-1967 Upgradeable',
-            address: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
-            implementationAddress: '0x43506849d7c04f9138d1a2050bbf3a0c054402dd',
-            expectedFunctions: ['mint(address,uint256)', 'configureMinter(address,uint256)'],
-        },
-        {
-            name: 'BUSD',
-            type: 'OpenZeppelin Unstructured Storage',
-            address: '0x4Fabb145d64652a948d72533023f6E7A623C7C53',
-            implementationAddress: '0x2A3F1A37C04F82aA274f5353834B2d002Db91015',
-            expectedFunctions: ['reclaimBUSD()', 'claimOwnership()'],
-        },
-        {
-            name: 'Gelato',
-            type: 'EIP-2535 Diamond Pattern (not supported)',
-            address: '0x3caca7b48d0573d793d3b0279b5f0029180e83b6',
-            implementationAddress: null,
-            expectedFunctions: [],
-        },
-    ];
-    for (const testCase of testCases) {
-        it(`should handle ${testCase.name} ${testCase.type} Proxy`, async () => {
-            const abi = await contractService.getABI(EthereumABI, NETWORK, testCase.address);
-            expect(abi).toBeDefined();
-            const { implementationAddress, implementationAbi } = await checkForProxy(contractService, NETWORK, testCase.address, abi);
-            expect(implementationAddress === testCase.implementationAddress);
-            const implFunctions = implementationAbi?.callFunctionSignatures();
-            for (const expectedFunction of testCase.expectedFunctions) {
-                expect(implFunctions).toContain(expectedFunction);
-            }
-        });
-    }
-    it('should handle when user declines to use implementation', async () => {
-        vi.mocked(prompt.confirm).mockResolvedValueOnce(false);
-        const abi = await contractService.getABI(EthereumABI, NETWORK, testCases[0].address);
-        expect(abi).toBeDefined();
-        const { implementationAddress, implementationAbi } = await checkForProxy(contractService, NETWORK, testCases[0].address, abi);
-        expect(implementationAddress).toBeNull();
-        expect(implementationAbi).toBeNull();
-    });
-});