From 5d10bf9c4dfce58938e96ff04e94264e29ea679f Mon Sep 17 00:00:00 2001
From: thetroyharris <troy@balancerlabs.dev>
Date: Mon, 11 Dec 2023 16:16:32 -0500
Subject: [PATCH 1/3] Add block number into the Swap entity.

---
 schema.graphql        | 3 ++-
 src/mappings/vault.ts | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/schema.graphql b/schema.graphql
index 6c2fd32b..533afd27 100644
--- a/schema.graphql
+++ b/schema.graphql
@@ -255,6 +255,7 @@ type Swap @entity(immutable: true) {
   poolId: Pool!
   userAddress: User!
   timestamp: Int!
+  block: BigInt!
   tx: Bytes!
 }
 
@@ -401,4 +402,4 @@ type ProtocolIdData @entity {
 type FXOracle @entity {
   id: ID! # FX oracle aggregator address
   tokens: [Bytes!]! # token addresses using this oracle
-}
\ No newline at end of file
+}
diff --git a/src/mappings/vault.ts b/src/mappings/vault.ts
index c528d398..3dc1bf7c 100644
--- a/src/mappings/vault.ts
+++ b/src/mappings/vault.ts
@@ -617,6 +617,7 @@ export function handleSwapEvent(event: SwapEvent): void {
 
   swap.timestamp = blockTimestamp;
   swap.tx = transactionHash;
+  swap.block = event.block.number;
   swap.save();
 
   // update pool swapsCount

From 9e566a577c104e9e1ad934089853a75af5670d1f Mon Sep 17 00:00:00 2001
From: thetroyharris <troy@balancerlabs.dev>
Date: Tue, 12 Dec 2023 10:42:38 -0500
Subject: [PATCH 2/3] Add block number to JoinExit entity.

---
 schema.graphql        | 1 +
 src/mappings/vault.ts | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/schema.graphql b/schema.graphql
index 533afd27..4d5f61e7 100644
--- a/schema.graphql
+++ b/schema.graphql
@@ -274,6 +274,7 @@ type JoinExit @entity(immutable: true) {
   user: User!
   timestamp: Int!
   tx: Bytes!
+  block: BigInt!
 }
 
 type LatestPrice @entity {
diff --git a/src/mappings/vault.ts b/src/mappings/vault.ts
index 3dc1bf7c..a0913826 100644
--- a/src/mappings/vault.ts
+++ b/src/mappings/vault.ts
@@ -190,6 +190,7 @@ function handlePoolJoined(event: PoolBalanceChanged): void {
   join.timestamp = blockTimestamp;
   join.tx = transactionHash;
   join.valueUSD = valueUSD;
+  join.block = event.block.number;
   join.save();
 
   let protocolFeeUSD = ZERO_BD;
@@ -329,6 +330,7 @@ function handlePoolExited(event: PoolBalanceChanged): void {
   exit.timestamp = blockTimestamp;
   exit.tx = transactionHash;
   exit.valueUSD = valueUSD;
+  exit.block = event.block.number;
   exit.save();
 
   let protocolFeeUSD = ZERO_BD;

From f7a855545b59acca7921290cb355a8d81afd43fd Mon Sep 17 00:00:00 2001
From: mendesfabio <ms.fabiomendes@gmail.com>
Date: Fri, 22 Dec 2023 13:48:52 -0300
Subject: [PATCH 3/3] add balancer snapshots and joins exits derived fields

---
 schema.graphql | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/schema.graphql b/schema.graphql
index 4d5f61e7..837791ed 100644
--- a/schema.graphql
+++ b/schema.graphql
@@ -3,6 +3,7 @@ type Balancer @entity {
   id: ID!
   poolCount: Int!
   pools: [Pool!] @derivedFrom(field: "vaultID")
+  snapshots: [BalancerSnapshot!] @derivedFrom(field: "vault")
 
   totalLiquidity: BigDecimal!
   totalSwapCount: BigInt!
@@ -22,16 +23,16 @@ type Pool @entity {
   oracleEnabled: Boolean!
   symbol: String
   name: String
-  
+
   "Indicates if a pool can be swapped against. Combines multiple sources, including offchain curation"
   swapEnabled: Boolean!
-  
+
   "The native swapEnabled boolean. internal to the pool. Only applies to Gyro, LBPs and InvestmentPools"
   swapEnabledInternal: Boolean
-  
+
   "External indication from an offchain permissioned actor"
   swapEnabledCurationSignal: Boolean
-  
+
   swapFee: BigDecimal!
   owner: Bytes
   isPaused: Boolean
@@ -53,6 +54,7 @@ type Pool @entity {
   tokensList: [Bytes!]!
 
   tokens: [PoolToken!] @derivedFrom(field: "poolId")
+  joinsExits: [JoinExit!] @derivedFrom(field: "pool")
   swaps: [Swap!] @derivedFrom(field: "poolId")
   shares: [PoolShare!] @derivedFrom(field: "poolId")
   snapshots: [PoolSnapshot!] @derivedFrom(field: "pool")