fix: use pluginEntityId (the plugin address as a hex string)

packages/subgraph/schema.graphql

@@ -1,12 +1,12 @@
 interface IPlugin {
-  id: ID! # PluginInstallationEntityId
+  id: ID! # PluginEntityId
   dao: Dao!
   pluginAddress: Bytes!
 }
 
 # Types
 type MultisigPlugin implements IPlugin @entity {
-  id: ID! # PluginInstallationEntityId
+  id: ID! # PluginEntityId
   dao: Bytes!
   pluginAddress: Bytes!
 

packages/subgraph/src/osx/pluginSetupProcessor.ts

@@ -2,7 +2,7 @@ import {InstallationPrepared} from '../../generated/PluginSetupProcessor/PluginS
 import {MultisigPlugin} from '../../generated/schema';
 import {Plugin as PluginTemplate} from '../../generated/templates';
 import {PLUGIN_REPO_ADDRESS} from '../../imported/repo-address';
-import {generatePluginInstallationEntityId} from '@aragon/osx-commons-subgraph';
+import {generatePluginEntityId} from '@aragon/osx-commons-subgraph';
 import {Address, DataSourceContext, log} from '@graphprotocol/graph-ts';
 
 export function handleInstallationPrepared(event: InstallationPrepared): void {
@@ -17,34 +17,25 @@ export function handleInstallationPrepared(event: InstallationPrepared): void {
   }
 
   const dao = event.params.dao;
-  const plugin = event.params.plugin;
-
-  // Generate a unique ID for the plugin installation.
-  const installationId = generatePluginInstallationEntityId(dao, plugin);
-  // Log an error and exit if unable to generate the installation ID.
-  if (!installationId) {
-    log.error('Failed to generate installationId', [
-      dao.toHexString(),
-      plugin.toHexString(),
-    ]);
-    return;
-  }
-  // Load or create a new entry for the this plugin using the generated installation ID.
-  let pluginEntity = MultisigPlugin.load(installationId!);
+  const pluginAddress = event.params.plugin;
+
+  const pluginEntityId = generatePluginEntityId(pluginAddress);
+  let pluginEntity = MultisigPlugin.load(pluginEntityId);
+
   if (!pluginEntity) {
-    pluginEntity = new MultisigPlugin(installationId!);
+    pluginEntity = new MultisigPlugin(pluginEntityId);
   }
 
   // Set the DAO and plugin address for the plugin entity.
   pluginEntity.dao = dao;
-  pluginEntity.pluginAddress = plugin;
+  pluginEntity.pluginAddress = pluginAddress;
 
   // Initialize a context for the plugin data source to enable indexing from the moment of preparation.
   const context = new DataSourceContext();
   // Include the DAO address in the context for future reference.
   context.setString('daoAddress', dao.toHexString());
   // Deploy a template for the plugin to facilitate individual contract indexing.
-  PluginTemplate.createWithContext(plugin, context);
+  PluginTemplate.createWithContext(pluginAddress, context);
 
   pluginEntity.save();
 }

packages/subgraph/tests/osx/pluginSetupProcessor.test.ts

@@ -12,7 +12,10 @@ import {
   PLUGIN_SETUP_ID,
 } from '../utils/constants';
 import {createInstallationPreparedEvent} from '../utils/events';
-import {generatePluginInstallationEntityId} from '@aragon/osx-commons-subgraph';
+import {
+  generatePluginEntityId,
+  generatePluginInstallationEntityId,
+} from '@aragon/osx-commons-subgraph';
 import {Address, BigInt, Bytes, ethereum} from '@graphprotocol/graph-ts';
 import {assert, afterEach, clearStore, test, describe} from 'matchstick-as';
 
@@ -27,12 +30,11 @@ describe('OSx', () => {
         // Create event
         const daoAddress = DAO_ADDRESS;
         const pluginAddress = CONTRACT_ADDRESS;
-        const installationId = generatePluginInstallationEntityId(
-          Address.fromString(daoAddress),
+        const pluginEntityId = generatePluginEntityId(
           Address.fromString(pluginAddress)
         );
-        if (!installationId) {
-          throw new Error('Failed to get installationId');
+        if (!pluginEntityId) {
+          throw new Error('Failed to get pluginEntityId');
         }
         const setupId = PLUGIN_SETUP_ID;
         const versionTuple = new ethereum.Tuple();
@@ -76,7 +78,7 @@ describe('OSx', () => {
 
         handleInstallationPrepared(event1);
 
-        assert.notInStore('MultisigPlugin', installationId!);
+        assert.notInStore('MultisigPlugin', pluginEntityId!);
         assert.entityCount('MultisigPlugin', 0);
 
         const thisPluginRepoAddress = PLUGIN_REPO_ADDRESS;
@@ -98,9 +100,9 @@ describe('OSx', () => {
         assert.entityCount('MultisigPlugin', 1);
         assert.fieldEquals(
           'MultisigPlugin',
-          installationId!,
+          pluginEntityId!,
           'id',
-          installationId!
+          pluginEntityId!
         );
       });
     });