From e8e518d9917892a3bef4088a213ec9e9cc9f9161 Mon Sep 17 00:00:00 2001
From: Mario Micklisch <mario@favo.org>
Date: Thu, 12 Sep 2024 09:04:50 +0200
Subject: [PATCH] Add support for sustainability proofs v2

https://github.com/vechain/vebetterdao-contracts/pull/18
---
 generated/schema.ts | 237 ++++++++++++++++++++++++++++++--------------
 src/RewardsPool.ts  | 146 +++++++++++++++++++++------
 subgraph.graphql    |  87 +++++++++++-----
 3 files changed, 342 insertions(+), 128 deletions(-)

diff --git a/generated/schema.ts b/generated/schema.ts
index d7ec0be..437bc5c 100644
--- a/generated/schema.ts
+++ b/generated/schema.ts
@@ -7526,6 +7526,32 @@ export class SustainabilityProof extends Entity {
     }
   }
 
+  get reward(): BigInt {
+    let value = this.get("reward");
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toBigInt();
+    }
+  }
+
+  set reward(value: BigInt) {
+    this.set("reward", Value.fromBigInt(value));
+  }
+
+  get transaction(): string {
+    let value = this.get("transaction");
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toString();
+    }
+  }
+
+  set transaction(value: string) {
+    this.set("transaction", Value.fromString(value));
+  }
+
   get carbon(): BigInt {
     let value = this.get("carbon");
     if (!value || value.kind == ValueKind.NULL) {
@@ -7578,8 +7604,8 @@ export class SustainabilityProof extends Entity {
     this.set("wasteMass", Value.fromBigInt(value));
   }
 
-  get wasteItems(): BigInt {
-    let value = this.get("wasteItems");
+  get plastic(): BigInt {
+    let value = this.get("plastic");
     if (!value || value.kind == ValueKind.NULL) {
       throw new Error("Cannot return null for a required field.");
     } else {
@@ -7587,12 +7613,12 @@ export class SustainabilityProof extends Entity {
     }
   }
 
-  set wasteItems(value: BigInt) {
-    this.set("wasteItems", Value.fromBigInt(value));
+  set plastic(value: BigInt) {
+    this.set("plastic", Value.fromBigInt(value));
   }
 
-  get people(): BigInt {
-    let value = this.get("people");
+  get timber(): BigInt {
+    let value = this.get("timber");
     if (!value || value.kind == ValueKind.NULL) {
       throw new Error("Cannot return null for a required field.");
     } else {
@@ -7600,12 +7626,12 @@ export class SustainabilityProof extends Entity {
     }
   }
 
-  set people(value: BigInt) {
-    this.set("people", Value.fromBigInt(value));
+  set timber(value: BigInt) {
+    this.set("timber", Value.fromBigInt(value));
   }
 
-  get biodiversity(): BigInt {
-    let value = this.get("biodiversity");
+  get educationTime(): BigInt {
+    let value = this.get("educationTime");
     if (!value || value.kind == ValueKind.NULL) {
       throw new Error("Cannot return null for a required field.");
     } else {
@@ -7613,12 +7639,12 @@ export class SustainabilityProof extends Entity {
     }
   }
 
-  set biodiversity(value: BigInt) {
-    this.set("biodiversity", Value.fromBigInt(value));
+  set educationTime(value: BigInt) {
+    this.set("educationTime", Value.fromBigInt(value));
   }
 
-  get plastic(): BigInt {
-    let value = this.get("plastic");
+  get treesPlanted(): BigInt {
+    let value = this.get("treesPlanted");
     if (!value || value.kind == ValueKind.NULL) {
       throw new Error("Cannot return null for a required field.");
     } else {
@@ -7626,12 +7652,12 @@ export class SustainabilityProof extends Entity {
     }
   }
 
-  set plastic(value: BigInt) {
-    this.set("plastic", Value.fromBigInt(value));
+  set treesPlanted(value: BigInt) {
+    this.set("treesPlanted", Value.fromBigInt(value));
   }
 
-  get timber(): BigInt {
-    let value = this.get("timber");
+  get wasteItems(): BigInt {
+    let value = this.get("wasteItems");
     if (!value || value.kind == ValueKind.NULL) {
       throw new Error("Cannot return null for a required field.");
     } else {
@@ -7639,12 +7665,12 @@ export class SustainabilityProof extends Entity {
     }
   }
 
-  set timber(value: BigInt) {
-    this.set("timber", Value.fromBigInt(value));
+  set wasteItems(value: BigInt) {
+    this.set("wasteItems", Value.fromBigInt(value));
   }
 
-  get reward(): BigInt {
-    let value = this.get("reward");
+  get people(): BigInt {
+    let value = this.get("people");
     if (!value || value.kind == ValueKind.NULL) {
       throw new Error("Cannot return null for a required field.");
     } else {
@@ -7652,21 +7678,34 @@ export class SustainabilityProof extends Entity {
     }
   }
 
-  set reward(value: BigInt) {
-    this.set("reward", Value.fromBigInt(value));
+  set people(value: BigInt) {
+    this.set("people", Value.fromBigInt(value));
   }
 
-  get transaction(): string {
-    let value = this.get("transaction");
+  get biodiversity(): BigInt {
+    let value = this.get("biodiversity");
     if (!value || value.kind == ValueKind.NULL) {
       throw new Error("Cannot return null for a required field.");
     } else {
-      return value.toString();
+      return value.toBigInt();
     }
   }
 
-  set transaction(value: string) {
-    this.set("transaction", Value.fromString(value));
+  set biodiversity(value: BigInt) {
+    this.set("biodiversity", Value.fromBigInt(value));
+  }
+
+  get version(): i32 {
+    let value = this.get("version");
+    if (!value || value.kind == ValueKind.NULL) {
+      return 0;
+    } else {
+      return value.toI32();
+    }
+  }
+
+  set version(value: i32) {
+    this.set("version", Value.fromI32(value));
   }
 }
 
@@ -7807,8 +7846,8 @@ export class AccountSustainability extends Entity {
     this.set("wasteMass", Value.fromBigInt(value));
   }
 
-  get wasteItems(): BigInt {
-    let value = this.get("wasteItems");
+  get plastic(): BigInt {
+    let value = this.get("plastic");
     if (!value || value.kind == ValueKind.NULL) {
       throw new Error("Cannot return null for a required field.");
     } else {
@@ -7816,12 +7855,12 @@ export class AccountSustainability extends Entity {
     }
   }
 
-  set wasteItems(value: BigInt) {
-    this.set("wasteItems", Value.fromBigInt(value));
+  set plastic(value: BigInt) {
+    this.set("plastic", Value.fromBigInt(value));
   }
 
-  get people(): BigInt {
-    let value = this.get("people");
+  get timber(): BigInt {
+    let value = this.get("timber");
     if (!value || value.kind == ValueKind.NULL) {
       throw new Error("Cannot return null for a required field.");
     } else {
@@ -7829,12 +7868,12 @@ export class AccountSustainability extends Entity {
     }
   }
 
-  set people(value: BigInt) {
-    this.set("people", Value.fromBigInt(value));
+  set timber(value: BigInt) {
+    this.set("timber", Value.fromBigInt(value));
   }
 
-  get biodiversity(): BigInt {
-    let value = this.get("biodiversity");
+  get educationTime(): BigInt {
+    let value = this.get("educationTime");
     if (!value || value.kind == ValueKind.NULL) {
       throw new Error("Cannot return null for a required field.");
     } else {
@@ -7842,12 +7881,12 @@ export class AccountSustainability extends Entity {
     }
   }
 
-  set biodiversity(value: BigInt) {
-    this.set("biodiversity", Value.fromBigInt(value));
+  set educationTime(value: BigInt) {
+    this.set("educationTime", Value.fromBigInt(value));
   }
 
-  get plastic(): BigInt {
-    let value = this.get("plastic");
+  get treesPlanted(): BigInt {
+    let value = this.get("treesPlanted");
     if (!value || value.kind == ValueKind.NULL) {
       throw new Error("Cannot return null for a required field.");
     } else {
@@ -7855,12 +7894,12 @@ export class AccountSustainability extends Entity {
     }
   }
 
-  set plastic(value: BigInt) {
-    this.set("plastic", Value.fromBigInt(value));
+  set treesPlanted(value: BigInt) {
+    this.set("treesPlanted", Value.fromBigInt(value));
   }
 
-  get timber(): BigInt {
-    let value = this.get("timber");
+  get wasteItems(): BigInt {
+    let value = this.get("wasteItems");
     if (!value || value.kind == ValueKind.NULL) {
       throw new Error("Cannot return null for a required field.");
     } else {
@@ -7868,8 +7907,34 @@ export class AccountSustainability extends Entity {
     }
   }
 
-  set timber(value: BigInt) {
-    this.set("timber", Value.fromBigInt(value));
+  set wasteItems(value: BigInt) {
+    this.set("wasteItems", Value.fromBigInt(value));
+  }
+
+  get people(): BigInt {
+    let value = this.get("people");
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toBigInt();
+    }
+  }
+
+  set people(value: BigInt) {
+    this.set("people", Value.fromBigInt(value));
+  }
+
+  get biodiversity(): BigInt {
+    let value = this.get("biodiversity");
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toBigInt();
+    }
+  }
+
+  set biodiversity(value: BigInt) {
+    this.set("biodiversity", Value.fromBigInt(value));
   }
 }
 
@@ -7968,6 +8033,19 @@ export class AppSustainability extends Entity {
     this.set("reward", Value.fromBigInt(value));
   }
 
+  get participantsCount(): BigInt {
+    let value = this.get("participantsCount");
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toBigInt();
+    }
+  }
+
+  set participantsCount(value: BigInt) {
+    this.set("participantsCount", Value.fromBigInt(value));
+  }
+
   get carbon(): BigInt {
     let value = this.get("carbon");
     if (!value || value.kind == ValueKind.NULL) {
@@ -8020,8 +8098,8 @@ export class AppSustainability extends Entity {
     this.set("wasteMass", Value.fromBigInt(value));
   }
 
-  get wasteItems(): BigInt {
-    let value = this.get("wasteItems");
+  get plastic(): BigInt {
+    let value = this.get("plastic");
     if (!value || value.kind == ValueKind.NULL) {
       throw new Error("Cannot return null for a required field.");
     } else {
@@ -8029,12 +8107,12 @@ export class AppSustainability extends Entity {
     }
   }
 
-  set wasteItems(value: BigInt) {
-    this.set("wasteItems", Value.fromBigInt(value));
+  set plastic(value: BigInt) {
+    this.set("plastic", Value.fromBigInt(value));
   }
 
-  get people(): BigInt {
-    let value = this.get("people");
+  get timber(): BigInt {
+    let value = this.get("timber");
     if (!value || value.kind == ValueKind.NULL) {
       throw new Error("Cannot return null for a required field.");
     } else {
@@ -8042,12 +8120,12 @@ export class AppSustainability extends Entity {
     }
   }
 
-  set people(value: BigInt) {
-    this.set("people", Value.fromBigInt(value));
+  set timber(value: BigInt) {
+    this.set("timber", Value.fromBigInt(value));
   }
 
-  get biodiversity(): BigInt {
-    let value = this.get("biodiversity");
+  get educationTime(): BigInt {
+    let value = this.get("educationTime");
     if (!value || value.kind == ValueKind.NULL) {
       throw new Error("Cannot return null for a required field.");
     } else {
@@ -8055,12 +8133,12 @@ export class AppSustainability extends Entity {
     }
   }
 
-  set biodiversity(value: BigInt) {
-    this.set("biodiversity", Value.fromBigInt(value));
+  set educationTime(value: BigInt) {
+    this.set("educationTime", Value.fromBigInt(value));
   }
 
-  get plastic(): BigInt {
-    let value = this.get("plastic");
+  get treesPlanted(): BigInt {
+    let value = this.get("treesPlanted");
     if (!value || value.kind == ValueKind.NULL) {
       throw new Error("Cannot return null for a required field.");
     } else {
@@ -8068,12 +8146,12 @@ export class AppSustainability extends Entity {
     }
   }
 
-  set plastic(value: BigInt) {
-    this.set("plastic", Value.fromBigInt(value));
+  set treesPlanted(value: BigInt) {
+    this.set("treesPlanted", Value.fromBigInt(value));
   }
 
-  get timber(): BigInt {
-    let value = this.get("timber");
+  get wasteItems(): BigInt {
+    let value = this.get("wasteItems");
     if (!value || value.kind == ValueKind.NULL) {
       throw new Error("Cannot return null for a required field.");
     } else {
@@ -8081,12 +8159,12 @@ export class AppSustainability extends Entity {
     }
   }
 
-  set timber(value: BigInt) {
-    this.set("timber", Value.fromBigInt(value));
+  set wasteItems(value: BigInt) {
+    this.set("wasteItems", Value.fromBigInt(value));
   }
 
-  get participantsCount(): BigInt {
-    let value = this.get("participantsCount");
+  get people(): BigInt {
+    let value = this.get("people");
     if (!value || value.kind == ValueKind.NULL) {
       throw new Error("Cannot return null for a required field.");
     } else {
@@ -8094,8 +8172,21 @@ export class AppSustainability extends Entity {
     }
   }
 
-  set participantsCount(value: BigInt) {
-    this.set("participantsCount", Value.fromBigInt(value));
+  set people(value: BigInt) {
+    this.set("people", Value.fromBigInt(value));
+  }
+
+  get biodiversity(): BigInt {
+    let value = this.get("biodiversity");
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toBigInt();
+    }
+  }
+
+  set biodiversity(value: BigInt) {
+    this.set("biodiversity", Value.fromBigInt(value));
   }
 }
 
diff --git a/src/RewardsPool.ts b/src/RewardsPool.ts
index 72c6708..ae63904 100644
--- a/src/RewardsPool.ts
+++ b/src/RewardsPool.ts
@@ -200,38 +200,106 @@ function generateSustainabilityProofFromJson(id: string, proofObject: TypedMap<s
     proof.water = constants.BIGINT_ZERO
     proof.energy = constants.BIGINT_ZERO
     proof.wasteMass = constants.BIGINT_ZERO
+    proof.plastic = constants.BIGINT_ZERO
+    proof.timber = constants.BIGINT_ZERO
+    proof.educationTime = constants.BIGINT_ZERO
+    proof.treesPlanted = constants.BIGINT_ZERO
+
+    // deprecated entries
     proof.wasteItems = constants.BIGINT_ZERO
     proof.people = constants.BIGINT_ZERO
     proof.biodiversity = constants.BIGINT_ZERO
-    proof.plastic = constants.BIGINT_ZERO
-    proof.timber = constants.BIGINT_ZERO
+    proof.version = 0
 
-    if (proofObject.isSet("proof") && proofObject.get("proof")!.kind === JSONValueKind.OBJECT) {
-        const proofData = proofObject.get("proof")!.toObject()
-        if (proofData.isSet('proof_type')) { proof.proofType = proofData.get("proof_type")!.toString() }
-        if (proofData.isSet('proof_data')) { proof.proofData = proofData.get("proof_data")!.toString() }
-    }
+    /**
+     * Proof Version 2
+     *
+     * Introduced with https://github.com/vechain/vebetterdao-contracts/pull/18 
+     *
+     * Example JSON:
+     * {
+     *     version: 2,
+     *     description: 'The description of the action',
+     *     proof: { image: 'https://image.png', link: 'https://twitter.com/tweet/1' },
+     *     impact: { carbon: 100, water: 200 }
+     * }
+     */
+    if (proofObject.isSet("version") && proofObject.get("version")!.kind === JSONValueKind.NUMBER && proofObject.get("version")!.toI64() == 2) {
+        proof.version = 2
+
+        if (proofObject.isSet("proof") && proofObject.get("proof")!.kind === JSONValueKind.OBJECT) {
+            const proofData = proofObject.get("proof")!.toObject()
+            if (proofData.isSet('image')) {
+                proof.proofType = "image"
+                proof.proofData = proofData.get("image")!.toString()
+            }
+            if (proofData.isSet('link')) {
+                proof.proofType = "link"
+                proof.proofData = proofData.get("link")!.toString()
+            }
+            if (proofData.isSet('video')) {
+                proof.proofType = "video"
+                proof.proofData = proofData.get("video")!.toString()
+            }
+            if (proofData.isSet('text')) {
+                proof.proofType = "text"
+                proof.proofData = proofData.get("text")!.toString()
+            }
+        }
 
-    if (proofObject.isSet("metadata") && proofObject.get("metadata")!.kind === JSONValueKind.OBJECT) {
-        const metadata = proofObject.get("metadata")!.toObject()
-        if (metadata.isSet('description')) { proof.description = metadata.get("description")!.toString() }
-        if (metadata.isSet('additional_info')) { proof.additionalInfo = metadata.get("additional_info")!.toString() }
-    }
+        if (proofObject.isSet("description") && proofObject.get("description")!.kind === JSONValueKind.STRING) {
+            proof.description = proofObject.get("description")!.toString()
+        }
 
-    if (proofObject.isSet("impact") && proofObject.get("impact")!.kind === JSONValueKind.OBJECT) {
-        const impact = proofObject.get("impact")!.toObject()
-
-        if (impact.isSet('carbon') && impact.get('carbon')!.kind === JSONValueKind.STRING && isDigitsOnly(impact.get('carbon')!.toString())) { proof.carbon = bigInt.fromString(impact.get('carbon')!.toString()) }
-        if (impact.isSet('water') && impact.get('water')!.kind === JSONValueKind.STRING && isDigitsOnly(impact.get('water')!.toString())) { proof.water = bigInt.fromString(impact.get('water')!.toString()) }
-        if (impact.isSet('energy') && impact.get('energy')!.kind === JSONValueKind.STRING && isDigitsOnly(impact.get('energy')!.toString())) { proof.energy = bigInt.fromString(impact.get('energy')!.toString()) }
-        if (impact.isSet('waste_mass') && impact.get('waste_mass')!.kind === JSONValueKind.STRING && isDigitsOnly(impact.get('waste_mass')!.toString())) { proof.wasteMass = bigInt.fromString(impact.get('waste_mass')!.toString()) }
-        if (impact.isSet('waste_items') && impact.get('waste_items')!.kind === JSONValueKind.STRING && isDigitsOnly(impact.get('waste_items')!.toString())) { proof.wasteItems = bigInt.fromString(impact.get('waste_items')!.toString()) }
-        if (impact.isSet('people') && impact.get('people')!.kind === JSONValueKind.STRING && isDigitsOnly(impact.get('people')!.toString())) { proof.people = bigInt.fromString(impact.get('people')!.toString()) }
-        if (impact.isSet('biodiversity') && impact.get('biodiversity')!.kind === JSONValueKind.STRING && isDigitsOnly(impact.get('biodiversity')!.toString())) { proof.biodiversity = bigInt.fromString(impact.get('biodiversity')!.toString()) }
-        if (impact.isSet('plastic') && impact.get('plastic')!.kind === JSONValueKind.STRING && isDigitsOnly(impact.get('plastic')!.toString())) { proof.plastic = bigInt.fromString(impact.get('plastic')!.toString()) }
-        if (impact.isSet('timber') && impact.get('timber')!.kind === JSONValueKind.STRING && isDigitsOnly(impact.get('timber')!.toString())) { proof.timber = bigInt.fromString(impact.get('timber')!.toString()) }
+        // not part of the official spec, but kept as backwards compatibility
+        if (proofObject.isSet("additional_info") && proofObject.get("additional_info")!.kind === JSONValueKind.STRING) {
+            proof.additionalInfo = proofObject.get("additional_info")!.toString()
+        }
+
+        if (proofObject.isSet("impact") && proofObject.get("impact")!.kind === JSONValueKind.OBJECT) {
+            const impact = proofObject.get("impact")!.toObject()
+
+            if (impact.isSet('carbon') && impact.get('carbon')!.kind === JSONValueKind.NUMBER) { proof.carbon = impact.get('carbon')!.toBigInt() } 
+            if (impact.isSet('water') && impact.get('water')!.kind === JSONValueKind.NUMBER) { proof.water = impact.get('water')!.toBigInt() }
+            if (impact.isSet('energy') && impact.get('energy')!.kind === JSONValueKind.NUMBER) { proof.energy = impact.get('energy')!.toBigInt() }
+            if (impact.isSet('waste_mass') && impact.get('waste_mass')!.kind === JSONValueKind.NUMBER) { proof.wasteMass = impact.get('waste_mass')!.toBigInt() }
+            if (impact.isSet('plastic') && impact.get('plastic')!.kind === JSONValueKind.NUMBER) { proof.plastic = impact.get('plastic')!.toBigInt() }
+            if (impact.isSet('timber') && impact.get('timber')!.kind === JSONValueKind.NUMBER) { proof.timber = impact.get('timber')!.toBigInt() }
+            if (impact.isSet('education_time') && impact.get('education_time')!.kind === JSONValueKind.NUMBER) { proof.educationTime = impact.get('education_time')!.toBigInt() }
+            if (impact.isSet('trees_planted') && impact.get('trees_planted')!.kind === JSONValueKind.NUMBER) { proof.treesPlanted = impact.get('trees_planted')!.toBigInt() }
+        }
     }
 
+    // default proof is version 1
+    else {
+        proof.version = 1
+
+        if (proofObject.isSet("proof") && proofObject.get("proof")!.kind === JSONValueKind.OBJECT) {
+            const proofData = proofObject.get("proof")!.toObject()
+            if (proofData.isSet('proof_type')) { proof.proofType = proofData.get("proof_type")!.toString() }
+            if (proofData.isSet('proof_data')) { proof.proofData = proofData.get("proof_data")!.toString() }
+        }
+
+        if (proofObject.isSet("metadata") && proofObject.get("metadata")!.kind === JSONValueKind.OBJECT) {
+            const metadata = proofObject.get("metadata")!.toObject()
+            if (metadata.isSet('description')) { proof.description = metadata.get("description")!.toString() }
+            if (metadata.isSet('additional_info')) { proof.additionalInfo = metadata.get("additional_info")!.toString() }
+        }
+
+        if (proofObject.isSet("impact") && proofObject.get("impact")!.kind === JSONValueKind.OBJECT) {
+            const impact = proofObject.get("impact")!.toObject()
+
+            if (impact.isSet('carbon') && impact.get('carbon')!.kind === JSONValueKind.STRING && isDigitsOnly(impact.get('carbon')!.toString())) { proof.carbon = bigInt.fromString(impact.get('carbon')!.toString()) }
+            if (impact.isSet('water') && impact.get('water')!.kind === JSONValueKind.STRING && isDigitsOnly(impact.get('water')!.toString())) { proof.water = bigInt.fromString(impact.get('water')!.toString()) }
+            if (impact.isSet('energy') && impact.get('energy')!.kind === JSONValueKind.STRING && isDigitsOnly(impact.get('energy')!.toString())) { proof.energy = bigInt.fromString(impact.get('energy')!.toString()) }
+            if (impact.isSet('waste_mass') && impact.get('waste_mass')!.kind === JSONValueKind.STRING && isDigitsOnly(impact.get('waste_mass')!.toString())) { proof.wasteMass = bigInt.fromString(impact.get('waste_mass')!.toString()) }
+            if (impact.isSet('waste_items') && impact.get('waste_items')!.kind === JSONValueKind.STRING && isDigitsOnly(impact.get('waste_items')!.toString())) { proof.wasteItems = bigInt.fromString(impact.get('waste_items')!.toString()) }
+            if (impact.isSet('people') && impact.get('people')!.kind === JSONValueKind.STRING && isDigitsOnly(impact.get('people')!.toString())) { proof.people = bigInt.fromString(impact.get('people')!.toString()) }
+            if (impact.isSet('biodiversity') && impact.get('biodiversity')!.kind === JSONValueKind.STRING && isDigitsOnly(impact.get('biodiversity')!.toString())) { proof.biodiversity = bigInt.fromString(impact.get('biodiversity')!.toString()) }
+            if (impact.isSet('plastic') && impact.get('plastic')!.kind === JSONValueKind.STRING && isDigitsOnly(impact.get('plastic')!.toString())) { proof.plastic = bigInt.fromString(impact.get('plastic')!.toString()) }
+            if (impact.isSet('timber') && impact.get('timber')!.kind === JSONValueKind.STRING && isDigitsOnly(impact.get('timber')!.toString())) { proof.timber = bigInt.fromString(impact.get('timber')!.toString()) }
+        }
+    }
     return proof
 }
 
@@ -243,14 +311,19 @@ function updateAppSustainability(sustainabilityId: string, proof: Sustainability
     appSustainability.water = proof.water
     appSustainability.energy = proof.energy
     appSustainability.wasteMass = proof.wasteMass
-    appSustainability.wasteItems = proof.wasteItems
-    appSustainability.people = proof.people
-    appSustainability.biodiversity = proof.biodiversity
     appSustainability.plastic = proof.plastic
     appSustainability.timber = proof.timber
     appSustainability.timestamp = proof.timestamp
     appSustainability.app = proof.app
     appSustainability.account = proof.account
+    appSustainability.educationTime = proof.educationTime
+    appSustainability.treesPlanted = proof.treesPlanted
+
+    // deprecated entries
+    appSustainability.wasteItems = proof.wasteItems
+    appSustainability.people = proof.people
+    appSustainability.biodiversity = proof.biodiversity
+
 
     const app = App.load(proof.app)!
     appSustainability.participantsCount = app.participantsCount
@@ -271,14 +344,18 @@ function updateAccountSustainability(proof: SustainabilityProof): boolean {
         accountSustainability.water = constants.BIGINT_ZERO
         accountSustainability.energy = constants.BIGINT_ZERO
         accountSustainability.wasteMass = constants.BIGINT_ZERO
-        accountSustainability.wasteItems = constants.BIGINT_ZERO
-        accountSustainability.people = constants.BIGINT_ZERO
-        accountSustainability.biodiversity = constants.BIGINT_ZERO
         accountSustainability.plastic = constants.BIGINT_ZERO
         accountSustainability.timber = constants.BIGINT_ZERO
+        accountSustainability.educationTime = constants.BIGINT_ZERO
+        accountSustainability.treesPlanted = constants.BIGINT_ZERO
         accountSustainability.account = proof.account
         accountSustainability.app = proof.app
 
+        // deprecated entries
+        accountSustainability.wasteItems = constants.BIGINT_ZERO
+        accountSustainability.people = constants.BIGINT_ZERO
+        accountSustainability.biodiversity = constants.BIGINT_ZERO
+
         isNewParticipant = true
     }
 
@@ -287,11 +364,16 @@ function updateAccountSustainability(proof: SustainabilityProof): boolean {
     accountSustainability.water = accountSustainability.water.plus(proof.water)
     accountSustainability.energy = accountSustainability.energy.plus(proof.energy)
     accountSustainability.wasteMass = accountSustainability.wasteMass.plus(proof.wasteMass)
+    accountSustainability.plastic = accountSustainability.plastic.plus(proof.plastic)
+    accountSustainability.timber = accountSustainability.timber.plus(proof.timber)
+    accountSustainability.educationTime = accountSustainability.educationTime.plus(proof.educationTime)
+    accountSustainability.treesPlanted = accountSustainability.treesPlanted.plus(proof.treesPlanted)
+
+    // deprecated entries
     accountSustainability.wasteItems = accountSustainability.wasteItems.plus(proof.wasteItems)
     accountSustainability.people = accountSustainability.people.plus(proof.people)
     accountSustainability.biodiversity = accountSustainability.biodiversity.plus(proof.biodiversity)
-    accountSustainability.plastic = accountSustainability.plastic.plus(proof.plastic)
-    accountSustainability.timber = accountSustainability.timber.plus(proof.timber)
+
     accountSustainability.save()
 
     return isNewParticipant
diff --git a/subgraph.graphql b/subgraph.graphql
index a655c94..7f911e2 100644
--- a/subgraph.graphql
+++ b/subgraph.graphql
@@ -709,17 +709,27 @@ type SustainabilityProof @entity(immutable: true) {
   proofData: String
   description: String
   additionalInfo: String
+
+  reward: BigInt!
+  transaction: Transaction!
+
   carbon: BigInt!
   water: BigInt!
   energy: BigInt!
   wasteMass: BigInt!
+  plastic: BigInt!
+  timber: BigInt!
+  educationTime: BigInt!
+  treesPlanted: BigInt!
+
+  """
+  deprecated entries
+  """
   wasteItems: BigInt!
   people: BigInt!
   biodiversity: BigInt!
-  plastic: BigInt!
-  timber: BigInt!
-  reward: BigInt!
-  transaction: Transaction!
+
+  version: Int!
 }
 
 type AccountSustainability @entity {
@@ -731,11 +741,17 @@ type AccountSustainability @entity {
   water: BigInt!
   energy: BigInt!
   wasteMass: BigInt!
+  plastic: BigInt!
+  timber: BigInt!
+  educationTime: BigInt!
+  treesPlanted: BigInt!
+
+  """
+  deprecated entries
+  """
   wasteItems: BigInt!
   people: BigInt!
   biodiversity: BigInt!
-  plastic: BigInt!
-  timber: BigInt!
 }
 
 type AppSustainability @entity(immutable: true, timeseries: true) {
@@ -744,16 +760,23 @@ type AppSustainability @entity(immutable: true, timeseries: true) {
   account: Account!
   timestamp: Timestamp!
   reward: BigInt!
+  participantsCount: BigInt!
+
   carbon: BigInt!
   water: BigInt!
   energy: BigInt!
   wasteMass: BigInt!
+  plastic: BigInt!
+  timber: BigInt!
+  educationTime: BigInt!
+  treesPlanted: BigInt!
+
+  """
+  deprecated entries
+  """
   wasteItems: BigInt!
   people: BigInt!
   biodiversity: BigInt!
-  plastic: BigInt!
-  timber: BigInt!
-  participantsCount: BigInt!
 }
 
 type StatsAppSustainability
@@ -768,13 +791,10 @@ type StatsAppSustainability
   water: BigInt! @aggregate(fn: "sum", arg: "water", cumulative: false)
   energy: BigInt! @aggregate(fn: "sum", arg: "energy", cumulative: false)
   wasteMass: BigInt! @aggregate(fn: "sum", arg: "wasteMass", cumulative: false)
-  wasteItems: BigInt!
-    @aggregate(fn: "sum", arg: "wasteItems", cumulative: false)
-  people: BigInt! @aggregate(fn: "sum", arg: "people", cumulative: false)
-  biodiversity: BigInt!
-    @aggregate(fn: "sum", arg: "biodiversity", cumulative: false)
   plastic: BigInt! @aggregate(fn: "sum", arg: "plastic", cumulative: false)
   timber: BigInt! @aggregate(fn: "sum", arg: "timber", cumulative: false)
+  educationTime: BigInt! @aggregate(fn: "sum", arg: "educationTime", cumulative: false)
+  treesPlanted: BigInt! @aggregate(fn: "sum", arg: "treesPlanted", cumulative: false)
 
   actionsTotal: BigInt! @aggregate(fn: "count", cumulative: true)
   carbonTotal: BigInt! @aggregate(fn: "sum", arg: "carbon", cumulative: true)
@@ -782,13 +802,25 @@ type StatsAppSustainability
   energyTotal: BigInt! @aggregate(fn: "sum", arg: "energy", cumulative: true)
   wasteMassTotal: BigInt!
     @aggregate(fn: "sum", arg: "wasteMass", cumulative: true)
+  plasticTotal: BigInt! @aggregate(fn: "sum", arg: "plastic", cumulative: true)
+  timberTotal: BigInt! @aggregate(fn: "sum", arg: "timber", cumulative: true)
+  educationTimeTotal: BigInt! @aggregate(fn: "sum", arg: "educationTime", cumulative: true)
+  treesPlantedTotal: BigInt! @aggregate(fn: "sum", arg: "treesPlanted", cumulative: true)
+
+  """
+  deprecated entries
+  """
+  wasteItems: BigInt!
+    @aggregate(fn: "sum", arg: "wasteItems", cumulative: false)
+  people: BigInt! @aggregate(fn: "sum", arg: "people", cumulative: false)
+  biodiversity: BigInt!
+    @aggregate(fn: "sum", arg: "biodiversity", cumulative: false)
   wasteItemsTotal: BigInt!
     @aggregate(fn: "sum", arg: "wasteItems", cumulative: true)
   peopleTotal: BigInt! @aggregate(fn: "sum", arg: "people", cumulative: true)
   biodiversityTotal: BigInt!
     @aggregate(fn: "sum", arg: "biodiversity", cumulative: true)
-  plasticTotal: BigInt! @aggregate(fn: "sum", arg: "plastic", cumulative: true)
-  timberTotal: BigInt! @aggregate(fn: "sum", arg: "timber", cumulative: true)
+
 
   participantsCount: BigInt! @aggregate(fn: "max", arg: "participantsCount")
 }
@@ -805,13 +837,10 @@ type StatsAccountSustainability
   water: BigInt! @aggregate(fn: "sum", arg: "water", cumulative: false)
   energy: BigInt! @aggregate(fn: "sum", arg: "energy", cumulative: false)
   wasteMass: BigInt! @aggregate(fn: "sum", arg: "wasteMass", cumulative: false)
-  wasteItems: BigInt!
-    @aggregate(fn: "sum", arg: "wasteItems", cumulative: false)
-  people: BigInt! @aggregate(fn: "sum", arg: "people", cumulative: false)
-  biodiversity: BigInt!
-    @aggregate(fn: "sum", arg: "biodiversity", cumulative: false)
   plastic: BigInt! @aggregate(fn: "sum", arg: "plastic", cumulative: false)
   timber: BigInt! @aggregate(fn: "sum", arg: "timber", cumulative: false)
+  educationTime: BigInt! @aggregate(fn: "sum", arg: "educationTime", cumulative: false)
+  treesPlanted: BigInt! @aggregate(fn: "sum", arg: "treesPlanted", cumulative: false)
 
   actionsTotal: BigInt! @aggregate(fn: "count", cumulative: true)
   carbonTotal: BigInt! @aggregate(fn: "sum", arg: "carbon", cumulative: true)
@@ -819,11 +848,23 @@ type StatsAccountSustainability
   energyTotal: BigInt! @aggregate(fn: "sum", arg: "energy", cumulative: true)
   wasteMassTotal: BigInt!
     @aggregate(fn: "sum", arg: "wasteMass", cumulative: true)
+  plasticTotal: BigInt! @aggregate(fn: "sum", arg: "plastic", cumulative: true)
+  timberTotal: BigInt! @aggregate(fn: "sum", arg: "timber", cumulative: true)
+  educationTimeTotal: BigInt! @aggregate(fn: "sum", arg: "educationTime", cumulative: true)
+  treesPlantedTotal: BigInt! @aggregate(fn: "sum", arg: "treesPlanted", cumulative: true)
+
+  """
+  deprecated entries
+  """
+  wasteItems: BigInt!
+    @aggregate(fn: "sum", arg: "wasteItems", cumulative: false)
+  people: BigInt! @aggregate(fn: "sum", arg: "people", cumulative: false)
+  biodiversity: BigInt!
+    @aggregate(fn: "sum", arg: "biodiversity", cumulative: false)
   wasteItemsTotal: BigInt!
     @aggregate(fn: "sum", arg: "wasteItems", cumulative: true)
   peopleTotal: BigInt! @aggregate(fn: "sum", arg: "people", cumulative: true)
   biodiversityTotal: BigInt!
     @aggregate(fn: "sum", arg: "biodiversity", cumulative: true)
-  plasticTotal: BigInt! @aggregate(fn: "sum", arg: "plastic", cumulative: true)
-  timberTotal: BigInt! @aggregate(fn: "sum", arg: "timber", cumulative: true)
+
 }
\ No newline at end of file