Merge pull request #166 from Rashmi-278/new-fixes

New fixes
metagov · Oct 29, 2023 · f4ea43f · f4ea43f
2 parents b0776fe + 6a2b03e
commit f4ea43f
Show file tree

Hide file tree

Showing 28 changed files with 9,500 additions and 3,089 deletions.
diff --git a/Implementations/Subgraph/daostar/build/EIP4824Index/EIP4824Index.wasm b/Implementations/Subgraph/daostar/build/EIP4824Index/EIP4824Index.wasm
diff --git a/Implementations/Subgraph/daostar/build/schema.graphql b/Implementations/Subgraph/daostar/build/schema.graphql
@@ -11,6 +11,8 @@ type RegistrationInstance @entity {
     proposalsURI: String
     governanceURI: String
     activityLogURI: String
+    managerAddress: String
+    contractsRegistryURI: String
 }
 
 type RegistrationNetwork @entity {

diff --git a/Implementations/Subgraph/daostar/build/subgraph.yaml b/Implementations/Subgraph/daostar/build/subgraph.yaml
@@ -6,7 +6,7 @@ features:
 templates:
   - name: EIP4824Registration
     kind: ethereum/contract
-    network: optimism
+    network: chapel
     source:
       abi: EIP4824Registration
     mapping:
@@ -25,11 +25,11 @@ templates:
 dataSources:
   - kind: ethereum
     name: EIP4824Index
-    network: optimism
+    network: chapel
     source:
       abi: EIP4824Index
       address: "0x18CbB356cd64193b1a0CA49911fc72CB3D02a5E4"
-      startBlock: 109109991
+      startBlock: 32947350
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.6

diff --git a/Implementations/Subgraph/daostar/generated/schema.ts b/Implementations/Subgraph/daostar/generated/schema.ts
@@ -15,11 +15,6 @@ export class RegistrationInstance extends Entity {
   constructor(id: string) {
     super();
     this.set("id", Value.fromString(id));
-
-    this.set("registrationAddress", Value.fromBytes(Bytes.empty()));
-    this.set("daoAddress", Value.fromBytes(Bytes.empty()));
-    this.set("daoURI", Value.fromString(""));
-    this.set("registrationNetwork", Value.fromString(""));
   }
 
   save(): void {
@@ -34,6 +29,12 @@ export class RegistrationInstance extends Entity {
     }
   }
 
+  static loadInBlock(id: string): RegistrationInstance | null {
+    return changetype<RegistrationInstance | null>(
+      store.get_in_block("RegistrationInstance", id)
+    );
+  }
+
   static load(id: string): RegistrationInstance | null {
     return changetype<RegistrationInstance | null>(
       store.get("RegistrationInstance", id)
@@ -42,7 +43,11 @@ export class RegistrationInstance extends Entity {
 
   get id(): string {
     let value = this.get("id");
-    return value!.toString();
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toString();
+    }
   }
 
   set id(value: string) {
@@ -51,7 +56,11 @@ export class RegistrationInstance extends Entity {
 
   get registrationAddress(): Bytes {
     let value = this.get("registrationAddress");
-    return value!.toBytes();
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toBytes();
+    }
   }
 
   set registrationAddress(value: Bytes) {
@@ -60,7 +69,11 @@ export class RegistrationInstance extends Entity {
 
   get daoAddress(): Bytes {
     let value = this.get("daoAddress");
-    return value!.toBytes();
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toBytes();
+    }
   }
 
   set daoAddress(value: Bytes) {
@@ -69,7 +82,11 @@ export class RegistrationInstance extends Entity {
 
   get daoURI(): string {
     let value = this.get("daoURI");
-    return value!.toString();
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toString();
+    }
   }
 
   set daoURI(value: string) {
@@ -95,7 +112,11 @@ export class RegistrationInstance extends Entity {
 
   get registrationNetwork(): string {
     let value = this.get("registrationNetwork");
-    return value!.toString();
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toString();
+    }
   }
 
   set registrationNetwork(value: string) {
@@ -203,14 +224,46 @@ export class RegistrationInstance extends Entity {
       this.set("activityLogURI", Value.fromString(<string>value));
     }
   }
+
+  get managerAddress(): string | null {
+    let value = this.get("managerAddress");
+    if (!value || value.kind == ValueKind.NULL) {
+      return null;
+    } else {
+      return value.toString();
+    }
+  }
+
+  set managerAddress(value: string | null) {
+    if (!value) {
+      this.unset("managerAddress");
+    } else {
+      this.set("managerAddress", Value.fromString(<string>value));
+    }
+  }
+
+  get contractsRegistryURI(): string | null {
+    let value = this.get("contractsRegistryURI");
+    if (!value || value.kind == ValueKind.NULL) {
+      return null;
+    } else {
+      return value.toString();
+    }
+  }
+
+  set contractsRegistryURI(value: string | null) {
+    if (!value) {
+      this.unset("contractsRegistryURI");
+    } else {
+      this.set("contractsRegistryURI", Value.fromString(<string>value));
+    }
+  }
 }
 
 export class RegistrationNetwork extends Entity {
   constructor(id: string) {
     super();
     this.set("id", Value.fromString(id));
-
-    this.set("chainId", Value.fromString(""));
   }
 
   save(): void {
@@ -225,6 +278,12 @@ export class RegistrationNetwork extends Entity {
     }
   }
 
+  static loadInBlock(id: string): RegistrationNetwork | null {
+    return changetype<RegistrationNetwork | null>(
+      store.get_in_block("RegistrationNetwork", id)
+    );
+  }
+
   static load(id: string): RegistrationNetwork | null {
     return changetype<RegistrationNetwork | null>(
       store.get("RegistrationNetwork", id)
@@ -233,36 +292,53 @@ export class RegistrationNetwork extends Entity {
 
   get id(): string {
     let value = this.get("id");
-    return value!.toString();
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toString();
+    }
   }
 
   set id(value: string) {
     this.set("id", Value.fromString(value));
   }
 
-  get registrations(): Array<string> | null {
-    let value = this.get("registrations");
+  get registrations(): RegistrationInstanceLoader {
+    return new RegistrationInstanceLoader(
+      "RegistrationNetwork",
+      this.get("id")!.toString(),
+      "registrations"
+    );
+  }
+
+  get chainId(): string {
+    let value = this.get("chainId");
     if (!value || value.kind == ValueKind.NULL) {
-      return null;
+      throw new Error("Cannot return null for a required field.");
     } else {
-      return value.toStringArray();
+      return value.toString();
     }
   }
 
-  set registrations(value: Array<string> | null) {
-    if (!value) {
-      this.unset("registrations");
-    } else {
-      this.set("registrations", Value.fromStringArray(<Array<string>>value));
-    }
+  set chainId(value: string) {
+    this.set("chainId", Value.fromString(value));
   }
+}
 
-  get chainId(): string {
-    let value = this.get("chainId");
-    return value!.toString();
+export class RegistrationInstanceLoader extends Entity {
+  _entity: string;
+  _field: string;
+  _id: string;
+
+  constructor(entity: string, id: string, field: string) {
+    super();
+    this._entity = entity;
+    this._id = id;
+    this._field = field;
   }
 
-  set chainId(value: string) {
-    this.set("chainId", Value.fromString(value));
+  load(): RegistrationInstance[] {
+    let value = store.loadRelated(this._entity, this._id, this._field);
+    return changetype<RegistrationInstance[]>(value);
   }
 }