Fix #496

daostack · Mar 15, 2020 · 40e8a6d · 40e8a6d
1 parent e275cfc
commit 40e8a6d
Show file tree

Hide file tree

Showing 6 changed files with 105 additions and 43 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/mappings/Controller/mapping.ts b/src/mappings/Controller/mapping.ts
@@ -69,6 +69,7 @@ function insertScheme(
     controllerScheme.numberOfPreBoostedProposals = BigInt.fromI32(0);
     controllerScheme.numberOfBoostedProposals = BigInt.fromI32(0);
     controllerScheme.numberOfExpiredInQueueProposals = BigInt.fromI32(0);
+    controllerScheme.isRegistered = true;
   }
   controllerScheme.dao = avatarAddress.toHex();
   controllerScheme.paramsHash = paramsHash;
@@ -91,11 +92,12 @@ function insertScheme(
   controllerScheme.save();
 }
 
-function deleteScheme(avatarAddress: Address, scheme: Address): void {
-  store.remove(
-    'ControllerScheme',
-    crypto.keccak256(concat(avatarAddress, scheme)).toHex(),
-  );
+function unregisterScheme(avatarAddress: Address, scheme: Address): void {
+  let controllerScheme = ControllerScheme.load(crypto.keccak256(concat(avatarAddress, scheme)).toHex());
+  if (controllerScheme != null) {
+    controllerScheme.isRegistered = false;
+    controllerScheme.save();
+  }
 }
 
 function insertOrganization(
@@ -215,7 +217,7 @@ export function handleRegisterScheme(event: RegisterScheme): void {
 export function handleUnregisterScheme(event: UnregisterScheme): void {
   let controller = Controller.bind(event.address);
   let avatar = controller.avatar();
-  deleteScheme(avatar, event.params._scheme);
+  unregisterScheme(avatar, event.params._scheme);
 
   let ent = new ControllerUnregisterScheme(eventId(event));
   ent.txHash = event.transaction.hash;

diff --git a/src/mappings/Controller/schema.graphql b/src/mappings/Controller/schema.graphql
@@ -28,6 +28,7 @@ type ControllerScheme @entity {
 	numberOfPreBoostedProposals: BigInt!
 	numberOfBoostedProposals: BigInt!
 	numberOfExpiredInQueueProposals: BigInt!
+	isRegistered: Boolean!
 }
 
 type ControllerGlobalConstraint @entity {

diff --git a/src/mappings/UController/mapping.ts b/src/mappings/UController/mapping.ts
@@ -54,6 +54,7 @@ function insertScheme(
      controllerScheme.numberOfPreBoostedProposals = BigInt.fromI32(0);
      controllerScheme.numberOfBoostedProposals = BigInt.fromI32(0);
      controllerScheme.numberOfExpiredInQueueProposals = BigInt.fromI32(0);
+     controllerScheme.isRegistered = true;
   }
   controllerScheme.dao = avatarAddress.toHex();
   controllerScheme.paramsHash = paramsHash;
@@ -75,11 +76,12 @@ function insertScheme(
   controllerScheme.save();
 }
 
-function deleteScheme(avatarAddress: Address, scheme: Address): void {
-  store.remove(
-    'ControllerScheme',
-    crypto.keccak256(concat(avatarAddress, scheme)).toHex(),
-  );
+function unregisterScheme(avatarAddress: Address, scheme: Address): void {
+  let controllerScheme = ControllerScheme.load(crypto.keccak256(concat(avatarAddress, scheme)).toHex());
+  if (controllerScheme != null) {
+    controllerScheme.isRegistered = false;
+    controllerScheme.save();
+  }
 }
 
 function insertOrganization(
@@ -200,7 +202,7 @@ export function handleRegisterScheme(event: RegisterScheme): void {
 }
 
 export function handleUnregisterScheme(event: UnregisterScheme): void {
-  deleteScheme(event.params._avatar, event.params._scheme);
+  unregisterScheme(event.params._avatar, event.params._scheme);
 
   let ent = new UControllerUnregisterScheme(eventId(event));
   ent.txHash = event.transaction.hash;