@graphprotocol/graph-cli 0.45.0-rc-20230404031804-6e0a3c0 → 0.45.0

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @graphprotocol/graph-cli
 
-## 0.45.0-rc-20230404031804-6e0a3c0
+## 0.45.0
 
 ### Minor Changes
 
@@ -110,6 +110,12 @@
   - Updated dependency [`glob@9.3.4` ↗︎](https://www.npmjs.com/package/glob/v/9.3.4) (from `7.1.6`,
     in `dependencies`)
 
+- [#1246](https://github.com/graphprotocol/graph-tooling/pull/1246)
+  [`8e1409f`](https://github.com/graphprotocol/graph-tooling/commit/8e1409fbd04fa9e34fbc7d49160d9888ef74aebb)
+  Thanks [@dimitrovmaksim](https://github.com/dimitrovmaksim)! - Fixes `graph add` overwriting the
+  event names in `subgraph.yaml` and the ABI file when existing contracts have events with the same
+  name.
+
 - [#1207](https://github.com/graphprotocol/graph-tooling/pull/1207)
   [`ad275b3`](https://github.com/graphprotocol/graph-tooling/commit/ad275b31e635dab03cfefda00617ef9f612b01c0)
   Thanks [@saihaj](https://github.com/saihaj)! - bring back short hand for version and help

package/dist/commands/add.js

@@ -69,9 +69,9 @@ class AddCommand extends core_1.Command {
             // If we can't get the start block, we'll just leave it out of the manifest
             // TODO: Ask the user for the start block
         }
+        await (0, scaffold_1.writeABI)(ethabi, contractName);
         const { collisionEntities, onlyCollisions, abiData } = updateEventNamesOnCollision(ethabi, entities, contractName, mergeEntities);
         ethabi.data = abiData;
-        await (0, scaffold_1.writeABI)(ethabi, contractName);
         await (0, scaffold_1.writeSchema)(ethabi, protocol, result.getIn(['schema', 'file']), collisionEntities, contractName);
         await (0, scaffold_1.writeMapping)(ethabi, protocol, contractName, collisionEntities);
         await (0, scaffold_1.writeTestsFiles)(ethabi, protocol, contractName);
@@ -168,7 +168,7 @@ const updateEventNamesOnCollision = (ethabi, entities, contractName, mergeEntiti
                     continue;
                 }
                 else {
-                    dataRow.set('name', `${contractName}${dataRow.get('name')}`);
+                    dataRow.set('collision', true);
                 }
             }
             else {

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

@@ -22,7 +22,9 @@ const mapping = ({ abi, contractName }) => `
       language: wasm/assemblyscript
       entities:
         ${(0, schema_1.abiEvents)(abi)
-    .map(event => `- ${event.get('_alias')}`)
+    .map(event => `- ${event.get('collision')
+    ? `${contractName}${event.get('_alias')}`
+    : event.get('_alias')}`)
     .join('\n        ')}
       abis:
         - name: ${contractName}

package/dist/scaffold/schema.js

@@ -63,13 +63,13 @@ const generateEventFields = ({ index, input, protocolName, }) => input.type == '
         }),
     ];
 exports.generateEventFields = generateEventFields;
-const generateEventType = (event, protocolName, subgraphName) => {
-    return `type ${event._alias} @entity(immutable: true) {
+const generateEventType = (event, protocolName, contractName) => {
+    return `type ${event.collision ? `${contractName}${event._alias}` : event._alias} @entity(immutable: true) {
         id: Bytes!
         ${event.inputs
         .reduce((acc, input, index) => {
         if (Object.values(mapping_1.INPUT_NAMES_BLACKLIST).includes(input.name)) {
-            input.name = (0, mapping_1.renameInput)(input.name, subgraphName ?? 'contract');
+            input.name = (0, mapping_1.renameInput)(input.name, contractName ?? 'contract');
         }
         return acc.concat((0, exports.generateEventFields)({ input, index, protocolName }));
     }, [])

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.45.0-rc-20230404031804-6e0a3c0",
+  "version": "0.45.0",
   "commands": {
     "add": {
       "id": "add",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.45.0-rc-20230404031804-6e0a3c0",
+  "version": "0.45.0",
   "description": "CLI for building for and deploying to The Graph",
   "license": "(Apache-2.0 OR MIT)",
   "engines": {
@@ -75,6 +75,7 @@
   "scripts": {
     "build": "tsc -b tsconfig.build.json && oclif manifest && copyfiles -u 1 src/**/*.graphql dist/ && chmod +x ./dist/bin.js",
     "test": "jest --verbose",
+    "test:add": "jest tests/cli/add.test.ts --verbose",
     "test:init": "jest tests/cli/init.test.ts --verbose",
     "test:validation": "jest tests/cli/validation.test.ts --verbose",
     "type-check": "tsc --noEmit"