Add reserved balance to transferrable balance

moonbeam-foundation · Aug 26, 2024 · f41c9da · f41c9da
1 parent d225201
commit f41c9da
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/packages/builder/src/balance/BalanceBuilder.ts b/packages/builder/src/balance/BalanceBuilder.ts
@@ -82,13 +82,7 @@ function system() {
           args: [address],
           transform: async (
             response: FrameSystemAccountInfo,
-          ): Promise<bigint> => {
-            const balance = response.data as PalletBalancesAccountData &
-              PalletBalancesAccountDataOld;
-            const frozen = balance.miscFrozen ?? balance.frozen;
-
-            return BigInt(balance.free.sub(frozen).toString());
-          },
+          ): Promise<bigint> => calculateSystemAccountBalance(response),
         }),
     }),
     accountEquilibrium: (): BalanceConfigBuilder => ({
@@ -139,13 +133,7 @@ function system() {
           args: [substrateAddress],
           transform: async (
             response: FrameSystemAccountInfo,
-          ): Promise<bigint> => {
-            const balance = response.data as PalletBalancesAccountData &
-              PalletBalancesAccountDataOld;
-            const frozen = balance.miscFrozen ?? balance.frozen;
-
-            return BigInt(balance.free.sub(frozen).toString());
-          },
+          ): Promise<bigint> => calculateSystemAccountBalance(response),
         });
       },
     }),
@@ -169,3 +157,14 @@ function tokens() {
     }),
   };
 }
+
+export async function calculateSystemAccountBalance(
+  response: FrameSystemAccountInfo,
+): Promise<bigint> {
+  const balance = response.data as PalletBalancesAccountData &
+    PalletBalancesAccountDataOld;
+
+  const frozen = balance.miscFrozen ?? balance.frozen;
+
+  return BigInt(balance.free.sub(frozen).add(balance.reserved).toString());
+}