fixing creator erc20 balance allocation (#319)

subgraph/mappings/dao-registry-mapping.ts

@@ -200,12 +200,6 @@ export function handleExtensionAdded(event: ExtensionAdded): void {
 
   let extension = Extension.load(daoExtensionId);
 
-  loadOrCreateExtensionEntity(
-    event.address,
-    event.params.extensionId,
-    event.params.extensionAddress
-  );
-
   if (extension == null) {
     extension = new Extension(daoExtensionId);
   }
@@ -216,6 +210,13 @@ export function handleExtensionAdded(event: ExtensionAdded): void {
   // create 1-1 relationship with extensions and its dao
   extension.tributeDao = daoAddress;
   extension.save();
+
+  loadOrCreateExtensionEntity(
+    event.address,
+    event.params.extensionId,
+    event.params.extensionAddress,
+    event.transaction.from
+  );
 }
 
 export function handleExtensionRemoved(event: ExtensionRemoved): void {

subgraph/mappings/extensions/bank-extension-mapping.ts

@@ -96,7 +96,7 @@ function internalTransfer(
   }
 }
 
-function internalERC20Balance(
+export function internalERC20Balance(
   daoAddress: Address,
   memberAddress: Address
 ): void {
@@ -112,10 +112,10 @@ function internalERC20Balance(
       Address.fromString(erc20Extension.extensionAddress.toHexString())
     );
 
-    // erc20 symbol
+    // erc20 token details
+    let name = erc20ExtensionRegistry.name();
     let symbol = erc20ExtensionRegistry.symbol();
     let totalSupply = erc20ExtensionRegistry.totalSupply();
-    let name = erc20ExtensionRegistry.name();
 
     let balance = erc20ExtensionRegistry.balanceOf(memberAddress);
 

subgraph/mappings/helpers/extension-entities.ts

@@ -6,12 +6,18 @@ import {
 } from "../../generated/templates";
 import { Bank, NFTCollection } from "../../generated/schema";
 
-import { BANK_EXTENSION_ID, NFT_EXTENSION_ID } from "./constants";
+import { internalERC20Balance } from "../extensions/bank-extension-mapping";
+import {
+  BANK_EXTENSION_ID,
+  NFT_EXTENSION_ID,
+  ERC20_EXTENSION_ID,
+} from "./constants";
 
 export function loadOrCreateExtensionEntity(
   daoAddress: Address,
   extensionId: Bytes,
-  extensionAddress: Address
+  extensionAddress: Address,
+  transactionFrom: Address
 ): void {
   if (BANK_EXTENSION_ID.toString() == extensionId.toHexString()) {
     log.info("INFO BANK_EXTENSION_ID, extensionId: {}", [
@@ -29,6 +35,12 @@ export function loadOrCreateExtensionEntity(
     NFTExtensionTemplate.create(extensionAddress);
 
     nft(daoAddress, extensionAddress);
+  } else if (ERC20_EXTENSION_ID.toString() == extensionId.toHexString()) {
+    log.info("INFO ERC20_EXTENSION_ID, extensionId: {}", [
+      extensionId.toHexString(),
+    ]);
+
+    erc20(daoAddress, transactionFrom);
   }
 }
 
@@ -65,3 +77,9 @@ function nft(daoAddress: Address, extensionAddress: Address): void {
     nftCollection.save();
   }
 }
+
+// if extension is an `erc20` assign to its dao, add creator with balance
+function erc20(daoAddress: Address, transactionFrom: Address): void {
+  // add creator to token holder entity with initial balance
+  internalERC20Balance(daoAddress, transactionFrom);
+}

subgraph/subgraph-deployer.ts

@@ -114,6 +114,8 @@ ${couponOnboardingYAML({
             file: ../build/contracts/VotingContract.json
           - name: IVoting
             file: ../build/contracts/IVoting.json
+          - name: ERC20Extension
+            file: ../build/contracts/ERC20Extension.json
         eventHandlers:
           - event: SubmittedProposal(bytes32,uint256)
             handler: handleSubmittedProposal

subgraph/subgraph-tests/helpers/YAML.ts

@@ -72,6 +72,8 @@ export const getYAML = ({ daoFactoryAddress }: GetYAMLType): string => {
             file: ../build/contracts/VotingContract.json
           - name: IVoting
             file: ../build/contracts/IVoting.json
+          - name: ERC20Extension
+            file: ../build/contracts/ERC20Extension.json
         eventHandlers:
           - event: SubmittedProposal(bytes32,uint256)
             handler: handleSubmittedProposal

subgraph/subgraph.yaml

@@ -9,9 +9,9 @@ dataSources:
     name: DaoFactory
     network: mainnet
     source:
-      address: "0x495654405E2f080E4EE7E892EBd5Ac21255197D5"
+      address: "0xfa6186d6058f619d2B81d4F33aE89AB9b8988026"
       abi: DaoFactory
-      startBlock: 34
+      startBlock: 17
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.4
@@ -66,6 +66,8 @@ templates:
           file: ../build/contracts/VotingContract.json
         - name: IVoting
           file: ../build/contracts/IVoting.json
+        - name: ERC20Extension
+          file: ../build/contracts/ERC20Extension.json
       eventHandlers:
         - event: SubmittedProposal(bytes32,uint256)
           handler: handleSubmittedProposal