fix: calculations (#42)

* fix: calculations

* ci: update artifacts [skip ci]

* fix: updated packages

* fix: removed ssv-keys

* ci: update artifacts [skip ci]

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Author: sumbat-ssvlabs

dist/api/based-apps-api/index.d.ts

@@ -2,10 +2,6 @@ import { APIs } from '..';
 import { StrategyWeight } from '../../types/weights';
 import { Address } from 'viem';
 export declare const getValidatorsBalance: (apis: APIs, args: Parameters<APIs["bam"]["getValidatorsByAccount"]>[0]) => Promise<{
-    account: string;
-    validators: never[];
-    balance: string;
-} | {
     account: string;
     validators: `0x${string}`[];
     balance: bigint;
@@ -44,10 +40,6 @@ export declare const getBasedAppsAPI: (apis: APIs) => {
     getValidatorsBalance: (args: import('../../graphql/bam/graphql').Exact<{
         account: import('../../graphql/bam/graphql').Scalars["String"]["input"];
     }>) => Promise<{
-        account: string;
-        validators: never[];
-        balance: string;
-    } | {
         account: string;
         validators: `0x${string}`[];
         balance: bigint;

dist/libs/api/index.d.ts

@@ -31,10 +31,6 @@ export declare const createBasedAppsAPI: (apis: APIs) => {
     getValidatorsBalance: (args: import('../../graphql/bam/graphql').Exact<{
         account: import('../../graphql/bam/graphql').Scalars["String"]["input"];
     }>) => Promise<{
-        account: string;
-        validators: never[];
-        balance: string;
-    } | {
         account: string;
         validators: `0x${string}`[];
         balance: bigint;

dist/main.js

@@ -31343,7 +31343,7 @@ const getValidatorsBalance = async (apis, args) => {
     return {
       account: args.account,
       validators: [],
-      balance: "0"
+      balance: 0n
     };
   const chunks = chunk(validators, 500);
   const results = await Promise.all(
@@ -31467,12 +31467,13 @@ const getDelegatedBalances = async (apis, args) => {
   const bAppTotalDelegatedBalances = await Promise.all(
     bAppDelegators.strategies.map(async (strategy) => {
       const delegation = (await Promise.all(
-        strategy.strategy.owner.delegators.map(
-          (d) => getValidatorsBalance(apis, {
+        strategy.strategy.owner.delegators.map(async (d) => {
+          const data = await getValidatorsBalance(apis, {
             account: d.delegator.id
-          })
-        )
-      )).reduce((acc, balance) => acc + BigInt(balance.balance), 0n);
+          });
+          return data.balance * BigInt(d.percentage) / 10000n;
+        })
+      )).reduce((acc, balance) => acc + balance, 0n);
       return {
         strategyId: strategy.strategy.id,
         delegation

dist/utils/keyshares.d.ts

@@ -1,5 +1,17 @@
 import { Operator } from '../types/operator';
-import { KeySharesItem } from 'ssv-keys';
+export interface KeySharesItem {
+    data: {
+        publicKey: string;
+        operators: Array<{
+            id: number;
+            operatorKey: string;
+        }>;
+    };
+    payload: {
+        operatorIds: number[];
+    };
+    error: Error | null;
+}
 export declare const isKeySharesItem: (item: unknown) => item is KeySharesItem;
 export declare enum KeysharesValidationErrors {
     OperatorDoesNotExist = 0,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ssv-labs/bapps-sdk",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "author": "SSV.Labs",
   "description": "ssv labs based apps sdk",
   "keywords": [
@@ -70,9 +70,9 @@
     "@rollup/rollup-darwin-x64": "4.45.0",
     "@types/eslint-plugin-prettier": "3.1.3",
     "@types/lodash-es": "4.17.12",
-    "@types/node": "24.0.13",
-    "@typescript-eslint/eslint-plugin": "8.36.0",
-    "@typescript-eslint/parser": "8.36.0",
+    "@types/node": "24.0.14",
+    "@typescript-eslint/eslint-plugin": "8.37.0",
+    "@typescript-eslint/parser": "8.37.0",
     "@vitest/coverage-v8": "3.2.4",
     "@vitest/ui": "3.2.4",
     "commitizen": "4.3.1",
@@ -115,7 +115,6 @@
     "dotenv": "17.2.0",
     "graphql-request": "7.2.0",
     "lodash-es": "4.17.21",
-    "ssv-keys": "1.2.1",
     "viem": "2.31.7",
     "zod": "4.0.5"
   },

pnpm-lock.yaml

@@ -14,6 +14,7 @@ import {
   ensureNoKeysharesErrors,
   ensureValidatorsUniqueness,
   isKeySharesItem,
+  KeySharesItem,
   KeysharesValidationError,
   validateConsistentOperatorIds,
   validateConsistentOperatorPublicKeys,
@@ -22,7 +23,6 @@ import { sortNumbers } from '@/utils/number'
 import { decodeOperatorPublicKey, getOperatorIds } from '@/utils/operator'
 import { tryCatch } from '@/utils/try-catch'
 import urlJoin from '@/utils/url-join'
-import type { KeySharesItem } from 'ssv-keys'
 import { encodeAbiParameters, parseEther } from 'viem'
 import { describe, expect, test, vi } from 'vitest'
 

src/__tests__/utils.test.ts

@@ -14,7 +14,7 @@ export const getValidatorsBalance = async (
     return {
       account: args.account,
       validators: [],
-      balance: '0',
+      balance: 0n,
     }
 
   const chunks = chunk(validators, 500)
@@ -195,13 +195,14 @@ export const getDelegatedBalances = async (
     bAppDelegators.strategies.map(async (strategy) => {
       const delegation = (
         await Promise.all(
-          strategy.strategy.owner.delegators.map((d) =>
-            getValidatorsBalance(apis, {
+          strategy.strategy.owner.delegators.map(async (d) => {
+            const data = await getValidatorsBalance(apis, {
               account: d.delegator.id,
-            }),
-          ),
+            })
+            return (data.balance * BigInt(d.percentage)) / 10000n
+          }),
         )
-      ).reduce((acc, balance) => acc + BigInt(balance.balance), 0n)
+      ).reduce((acc, balance) => acc + balance, 0n)
 
       return {
         strategyId: strategy.strategy.id,

src/api/based-apps-api/index.ts

@@ -7,4 +7,4 @@ interface ImportMetaEnv {
 
 interface ImportMeta {
   readonly env: ImportMetaEnv
-} 
+}

src/env.d.ts

@@ -1,7 +1,20 @@
 import type { Operator } from '@/types/operator'
 import { sortNumbers } from '@/utils/number'
 import { getOperatorIds } from '@/utils/operator'
-import type { KeySharesItem } from 'ssv-keys'
+
+export interface KeySharesItem {
+  data: {
+    publicKey: string
+    operators: Array<{
+      id: number
+      operatorKey: string
+    }>
+  }
+  payload: {
+    operatorIds: number[]
+  }
+  error: Error | null
+}
 
 export const isKeySharesItem = (item: unknown): item is KeySharesItem => {
   return (