Made aragon-mainnet work and deployed

.gitignore

@@ -2,6 +2,7 @@ node_modules/
 
 # Compilation output
 dist/
+build/
 
 # Tests
 coverage

packages/connect-thegraph/subgraph/manifest/templates/APMFactory.template.yaml

@@ -7,7 +7,7 @@
     startBlock: {{startBlock}}
   mapping:
     kind: ethereum/events
-    apiVersion: 0.0.1
+    apiVersion: 0.0.5
     language: wasm/assemblyscript
     entities:
       - RegistryFactory

packages/connect-thegraph/subgraph/manifest/templates/DAOFactory.template.yaml

@@ -7,7 +7,7 @@
     startBlock: {{startBlock}}
   mapping:
     kind: ethereum/events
-    apiVersion: 0.0.1
+    apiVersion: 0.0.5
     language: wasm/assemblyscript
     entities:
       - App

packages/connect-thegraph/subgraph/manifest/templates/Kernel.template.yaml

@@ -16,7 +16,7 @@
     {{/startBlock}}
   mapping:
     kind: ethereum/events
-    apiVersion: 0.0.1
+    apiVersion: 0.0.5
     language: wasm/assemblyscript
     entities:
       - Organization

packages/connect-thegraph/subgraph/manifest/templates/Registry.template.yaml

@@ -16,7 +16,7 @@
     {{/startBlock}}
   mapping:
     kind: ethereum/events
-    apiVersion: 0.0.1
+    apiVersion: 0.0.5
     language: wasm/assemblyscript
     entities:
       - Registry

packages/connect-thegraph/subgraph/manifest/templates/subgraph.template.yaml

@@ -26,7 +26,7 @@ templates:
       abi: ACL
     mapping:
       kind: ethereum/events
-      apiVersion: 0.0.1
+      apiVersion: 0.0.5
       language: wasm/assemblyscript
       entities:
         - Organization
@@ -51,7 +51,7 @@ templates:
       abi: Repo
     mapping:
       kind: ethereum/events
-      apiVersion: 0.0.1
+      apiVersion: 0.0.5
       language: wasm/assemblyscript
       entities:
         - Repo

packages/connect-thegraph/subgraph/package.json

@@ -1,7 +1,7 @@
 {
   "name": "org-subgraph",
-  "version": "2.0.0",
-  "repository": "https://github.com/graphprotocol/aragon-network",
+  "version": "2.0.1",
+  "repository": "https://github.com/daviddavo/connect",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -22,8 +22,8 @@
     "deploy-xdai": "scripts/deploy.sh 1hive xdai"
   },
   "devDependencies": {
-    "@graphprotocol/graph-cli": "^0.19.0",
-    "@graphprotocol/graph-ts": "^0.19.0",
+    "@graphprotocol/graph-cli": "^0.71.0",
+    "@graphprotocol/graph-ts": "^0.35.0",
     "graphqlviz": "^3.1.0",
     "mustache": "^4.0.1"
   },

packages/connect-thegraph/subgraph/scripts/deploy.sh

@@ -4,12 +4,6 @@
 USER=$1
 NETWORK=$2
 
-# Require $GRAPHKEY to be set
-if [[ -z "${GRAPHKEY}" ]]; then
->&2 echo "Please set \$GRAPHKEY to your The Graph access token to run this command."
-exit 1
-fi
-
 # Build manifest
 echo ''
 echo '> Building manifest file subgraph.yaml'
@@ -21,15 +15,12 @@ echo '> Generating types'
 graph codegen
 
 # Prepare subgraph name
-FULLNAME=$USER/aragon-$NETWORK
+FULLNAME=aragon-$NETWORK
 if [ "$STAGING" ]; then
   FULLNAME=$FULLNAME-staging
 fi
 echo ''
 echo '> Deploying subgraph: '$FULLNAME
 
 # Deploy subgraph
-graph deploy $FULLNAME \
-  --ipfs https://api.thegraph.com/ipfs/ \
-  --node https://api.thegraph.com/deploy/ \
-  --access-token $GRAPHKEY
+graph deploy --studio $FULLNAME

packages/connect-thegraph/subgraph/src/mappings/acl.ts

@@ -24,7 +24,7 @@ export function handleSetPermission(event: SetPermissionEvent): void {
   const acl = AclContract.bind(event.address)
   const orgAddress = acl.kernel()
   const orgId = orgAddress.toHex()
-  const org = OrganizationEntity.load(orgId)
+  const org = OrganizationEntity.load(orgId)!
 
   const appAddress = event.params.app
   const roleHash = event.params.role

packages/connect-thegraph/subgraph/src/mappings/orgFactory.ts

@@ -1,7 +1,7 @@
 import { Address } from '@graphprotocol/graph-ts'
 
 // Import event types from the contract ABI
-import { DeployDAO as DeployDAOEvent } from '../../generated/DaoFactory/DAOFactory'
+import { DeployDAO as DeployDAOEvent } from '../../generated/DAOFactory/DAOFactory'
 
 // Import entity types from the schema
 import { OrgFactory as FactoryEntity } from '../../generated/schema'

packages/connect-thegraph/subgraph/src/mappings/repo.ts

@@ -69,33 +69,3 @@ function loadOrCreateVersion(
   return version!
 }
 
-function buildVersionId(repoId: string, semanticVersion: string): string {
-  return repoId.concat('-').concat(semanticVersion)
-}
-
-function loadOrCreateVersion(
-  repo: Address,
-  semanticVersion: string,
-  versionContractId: BigInt
-): VersionEntity {
-  const versionId = buildVersionId(repo.toHexString(), semanticVersion)
-  // create new version
-  let version = VersionEntity.load(versionId)
-  if (version === null) {
-    version = new VersionEntity(versionId)
-    version.semanticVersion = semanticVersion
-    version.codeAddress = Bytes.fromHexString(ZERO_ADDR) as Bytes
-    version.contentUri = ''
-
-    const repoContract = RepoContract.bind(repo)
-    const callVersionResult = repoContract.try_getByVersionId(versionContractId)
-    if (callVersionResult.reverted) {
-      log.info('get repo version by id reverted', [])
-    } else {
-      const versionData = callVersionResult.value
-      version.codeAddress = versionData.value1
-      version.contentUri = versionData.value2.toString()
-    }
-  }
-  return version!
-}