hotfix: issue when integration contract has 0 shares

kilnfi · Dec 6, 2023 · 198fdbf · 198fdbf
1 parent 62c79ae
commit 198fdbf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/ERC20.mapping.ts b/src/ERC20.mapping.ts
@@ -211,15 +211,20 @@ export function _recomputeERC20TotalUnderlyingSupply(erc20Address: Address): Big
   while (multipool != null) {
     const pool = vPool.load(multipool.pool);
     const poolBalance = PoolBalance.load(multipool.shares);
+    if (poolBalance == null) {
+      ++idx;
+      multipool = MultiPool.load(externalEntityUUID(erc20Address, [idx.toString()]));
+      continue;
+    }
     totalUnderlyingSupply = totalUnderlyingSupply.plus(
       _computeEthAfterCommission(
-        poolBalance!.amount,
+        poolBalance.amount,
         pool!.totalSupply,
         pool!.totalUnderlyingSupply,
-        multipool.injectedEth,
-        multipool.exitedEth,
-        multipool.fees,
-        multipool.commissionPaid
+        multipool!.injectedEth,
+        multipool!.exitedEth,
+        multipool!.fees,
+        multipool!.commissionPaid
       )
     );
     ++idx;
@@ -237,7 +242,7 @@ export function handleSetFee(event: SetFee): void {
 
   if (multiPool != null) {
     const poolBalance = PoolBalance.load(multiPool.shares);
-    if (poolBalance!.amount.gt(BigInt.zero())) {
+    if (poolBalance != null && poolBalance!.amount.gt(BigInt.zero())) {
       const earnedBeforeFeeUpdate = _computeIntegratorCommissionEarned(
         poolBalance!.amount,
         pool!.totalSupply,

diff --git a/src/vPool.mapping.ts b/src/vPool.mapping.ts
@@ -246,7 +246,7 @@ export function handleTransfer(event: Transfer): void {
   toBalance.amount = toBalance.amount.plus(event.params.value);
 
   saveOrEraseBalance(fromBalance, event);
-  if (toBalance.address != Address.zero()) {
+  if (toBalance.address.notEqual(Address.zero())) {
     saveOrEraseBalance(toBalance, event);
   }