Merge branch 'main' into bugfix/add-flags-not-honored

Author: YaroShkvorets

.changeset/swift-jobs-count.md

@@ -0,0 +1,5 @@
+---
+'@graphprotocol/graph-cli': patch
+---
+
+fix generated example entity id uniqueness

.prettierignore

@@ -8,3 +8,4 @@ packages/cli/tests/cli/add
 packages/cli/config/TheGraphNetworksRegistry.json
 pnpm-lock.yaml
 website/src/graphql-env.d.ts
+renovate.json

package.json

@@ -23,6 +23,7 @@
     "lint:fix": "pnpm lint:prettier:fix && pnpm lint:eslint:fix",
     "lint:prettier": "prettier -c .",
     "lint:prettier:fix": "prettier . --write",
+    "lint:renovate": "npx --yes --package renovate -- renovate-config-validator",
     "release": "pnpm build && changeset publish",
     "test:cli": "pnpm --filter @graphprotocol/graph-cli test",
     "test:ts": "pnpm --filter @graphprotocol/graph-ts test",
@@ -32,7 +33,7 @@
     "@changesets/changelog-github": "^0.5.0",
     "@changesets/cli": "^2.27.10",
     "@eslint/js": "^9.16.0",
-    "@theguild/eslint-config": "0.13.1",
+    "@theguild/eslint-config": "0.13.2",
     "@theguild/prettier-config": "3.0.0",
     "@types/node": "^22.10.1",
     "eslint": "9.16.0",

packages/cli/package.json

@@ -39,7 +39,6 @@
     "@whatwg-node/fetch": "^0.10.1",
     "assemblyscript": "0.27.31",
     "binary-install": "^1.1.0",
-    "chalk": "5.3.0",
     "chokidar": "4.0.1",
     "debug": "4.3.7",
     "docker-compose": "1.1.0",
@@ -52,11 +51,9 @@
     "js-yaml": "4.1.0",
     "kubo-rpc-client": "^5.0.2",
     "open": "10.1.0",
-    "prettier": "3.4.2",
     "semver": "7.6.3",
     "tmp-promise": "3.0.3",
     "web3-eth-abi": "4.4.1",
-    "which": "5.0.0",
     "yaml": "2.6.1"
   },
   "devDependencies": {

packages/cli/src/compiler/index.ts

@@ -1,6 +1,5 @@
 import crypto from 'node:crypto';
 import path from 'node:path';
-import chalk from 'chalk';
 import fs from 'fs-extra';
 import * as toolbox from 'gluegun';
 import immutable from 'immutable';
@@ -138,7 +137,7 @@ export default class Compiler {
 
   completed(ipfsHashOrPath: string) {
     toolbox.print.info('');
-    toolbox.print.success(`Build completed: ${chalk.blue(ipfsHashOrPath)}`);
+    toolbox.print.success(`Build completed: ${toolbox.print.colors.blue(ipfsHashOrPath)}`);
     toolbox.print.info('');
   }
 

packages/cli/src/protocols/ethereum/scaffold/mapping.ts

@@ -11,7 +11,7 @@ export const generatePlaceholderHandlers = ({
   contractName: string;
 }) =>
   `
-  import { BigInt } from '@graphprotocol/graph-ts'
+  import { BigInt, Bytes } from '@graphprotocol/graph-ts'
   import { ${contractName}, ${events.map(event => event._alias)} }
     from '../generated/${contractName}/${contractName}'
   import { ExampleEntity } from '../generated/schema'
@@ -21,14 +21,15 @@ export const generatePlaceholderHandlers = ({
       index === 0
         ? `
     export function handle${event._alias}(event: ${event._alias}): void {
-      // Entities can be loaded from the store using a string ID; this ID
+      // Entities can be loaded from the store using an ID; this ID
       // needs to be unique across all entities of the same type
-      let entity = ExampleEntity.load(event.transaction.from)
+      const id = event.transaction.hash.concat(Bytes.fromByteArray(Bytes.fromBigInt(event.logIndex)));
+      let entity = ExampleEntity.load(id)
 
       // Entities only exist after they have been saved to the store;
       // \`null\` checks allow to create entities on demand
       if (!entity) {
-        entity = new ExampleEntity(event.transaction.from)
+        entity = new ExampleEntity(id)
 
         // Entity fields can be set using simple assignments
         entity.count = BigInt.fromI32(0)

packages/cli/src/scaffold/__snapshots__/ethereum.test.ts.snap

@@ -34,7 +34,7 @@ dataSources:
 `;
 
 exports[`Ethereum subgraph scaffolding > Mapping (default) 1`] = `
-"import { BigInt } from "@graphprotocol/graph-ts"
+"import { BigInt, Bytes } from "@graphprotocol/graph-ts"
 import {
   Contract,
   ExampleEvent,
@@ -43,14 +43,17 @@ import {
 import { ExampleEntity } from "../generated/schema"
 
 export function handleExampleEvent(event: ExampleEvent): void {
-  // Entities can be loaded from the store using a string ID; this ID
+  // Entities can be loaded from the store using an ID; this ID
   // needs to be unique across all entities of the same type
-  let entity = ExampleEntity.load(event.transaction.from)
+  const id = event.transaction.hash.concat(
+    Bytes.fromByteArray(Bytes.fromBigInt(event.logIndex))
+  )
+  let entity = ExampleEntity.load(id)
 
   // Entities only exist after they have been saved to the store;
   // \`null\` checks allow to create entities on demand
   if (!entity) {
-    entity = new ExampleEntity(event.transaction.from)
+    entity = new ExampleEntity(id)
 
     // Entity fields can be set using simple assignments
     entity.count = BigInt.fromI32(0)