@lidofinance/lsv-cli 1.0.0-alpha.60 → 1.0.0-alpha.62

package/dist/providers/wallet.js

@@ -1,8 +1,10 @@
 import { readFileSync } from 'fs';
+import { program } from '../command/index.js';
 import { createPublicClient, createWalletClient, http, } from 'viem';
 import { privateKeyToAccount } from 'viem/accounts';
-import { Wallet } from 'ethers';
+import { Keystore } from 'ox';
 import { envs, getConfig, getChainId, getElUrl, getChain } from '../configs/index.js';
+import { createWalletConnectClient } from '../utils/index.js';
 const getPrivateKey = () => {
     const { PRIVATE_KEY, ACCOUNT_FILE, ACCOUNT_FILE_PASSWORD } = getConfig();
     const id = getChainId();
@@ -22,13 +24,27 @@ const getPrivateKey = () => {
         // eslint-disable-next-line @typescript-eslint/no-require-imports
         const file = readFileSync(ACCOUNT_FILE, 'utf-8');
         const fileContent = JSON.parse(file);
-        const privateKey = Wallet.fromEncryptedJsonSync(JSON.stringify(fileContent), ACCOUNT_FILE_PASSWORD).privateKey;
+        const kdfType = fileContent.crypto.kdf;
+        const [key] = Keystore[kdfType]({
+            password: ACCOUNT_FILE_PASSWORD,
+            ...fileContent.crypto.kdfparams,
+            salt: `0x${fileContent.crypto.kdfparams.salt}`,
+            iv: `0x${fileContent.crypto.cipherparams.iv}`,
+        });
+        const privateKey = Keystore.decrypt(fileContent, key);
         return privateKey;
     }
     throw new Error('Private key or encrypted account file is not provided');
 };
-export const getAccount = () => {
+export const getAccount = async () => {
     const id = getChainId();
+    if (program.opts().walletConnect) {
+        const walletConnectClient = await getWalletConnectClient();
+        if (!walletConnectClient.account) {
+            throw new Error('Wallet connect account is not found');
+        }
+        return walletConnectClient.account;
+    }
     const privateKey = getPrivateKey();
     if (!privateKey) {
         throw new Error(`Private key for ${id} chain is not set`);
@@ -41,12 +57,16 @@ export const getPublicClient = () => {
         transport: http(getElUrl()),
     });
 };
-export const getWalletWithAccount = () => {
-    const account = getAccount();
+export const getWalletWithAccount = async () => {
+    const account = await getAccount();
     return createWalletClient({
         account,
         chain: getChain(),
         transport: http(getElUrl()),
     });
 };
+export const getWalletConnectClient = async () => {
+    const walletConnectClient = await createWalletConnectClient();
+    return walletConnectClient;
+};
 //# sourceMappingURL=wallet.js.map

package/dist/providers/wallet.js.map

@@ -1 +1 @@
-{"version":3,"file":"wallet.js","sourceRoot":"","sources":["../../providers/wallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAClC,OAAO,EAEL,kBAAkB,EAClB,kBAAkB,EAClB,IAAI,GAEL,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE1E,MAAM,aAAa,GAAG,GAAG,EAAE;IACzB,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,qBAAqB,EAAE,GAAG,SAAS,EAAE,CAAC;IACzE,MAAM,EAAE,GAAG,UAAU,EAAE,CAAC;IAExB,IAAI,WAAW,IAAI,YAAY,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CACb,mFAAmF,CACpF,CAAC;IACJ,CAAC;IAED,IAAI,WAAW,EAAE,CAAC;QAChB,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,IAAI,IAAI,EAAE,CAAC,eAAe,EAAE,EAAE,CAAC,EAAE,CAAC;QAChC,OAAO,IAAI,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;IACnC,CAAC;IAED,IAAI,YAAY,EAAE,CAAC;QACjB,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;QAC3D,CAAC;QAED,iEAAiE;QACjE,MAAM,IAAI,GAAG,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QACjD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACrC,MAAM,UAAU,GAAG,MAAM,CAAC,qBAAqB,CAC7C,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAC3B,qBAAqB,CACtB,CAAC,UAAU,CAAC;QAEb,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;AAC3E,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,EAAE;IAC7B,MAAM,EAAE,GAAG,UAAU,EAAE,CAAC;IACxB,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;IAEnC,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,mBAAmB,EAAE,mBAAmB,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO,mBAAmB,CAAC,UAAqB,CAAC,CAAC;AACpD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,EAAE;IAClC,OAAO,kBAAkB,CAAC;QACxB,KAAK,EAAE,QAAQ,EAAE;QACjB,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;KAC5B,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAiB,EAAE;IACrD,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAC7B,OAAO,kBAAkB,CAAC;QACxB,OAAO;QACP,KAAK,EAAE,QAAQ,EAAE;QACjB,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;KAC5B,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"wallet.js","sourceRoot":"","sources":["../../providers/wallet.ts"],"names":[],"mappings":"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"}

package/dist/tests/utils/calculate-overview.test.js

@@ -7,7 +7,7 @@ describe('calculateOverview', () => {
             totalValue: big(1000),
             reserveRatioBP: 1000,
             liabilitySharesInStethWei: big(300),
-            forceRebalanceThresholdBP: 1100,
+            forcedRebalanceThresholdBP: 1100,
             withdrawableEther: big(200),
             balance: big(50),
             locked: big(80),

package/dist/tests/utils/calculate-overview.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"calculate-overview.test.js","sourceRoot":"","sources":["../../../tests/utils/calculate-overview.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvD,OAAO,EACL,iBAAiB,EACjB,QAAQ,EACR,WAAW,GACZ,MAAM,mCAAmC,CAAC;AAE3C,MAAM,GAAG,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAErC,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,IAAI,CAAC,mBAAmB,EAAE,GAAG,EAAE;QAC7B,MAAM,MAAM,GAAG,iBAAiB,CAAC;YAC/B,UAAU,EAAE,GAAG,CAAC,IAAI,CAAC;YACrB,cAAc,EAAE,IAAI;YACpB,yBAAyB,EAAE,GAAG,CAAC,GAAG,CAAC;YACnC,yBAAyB,EAAE,IAAI;YAC/B,iBAAiB,EAAE,GAAG,CAAC,GAAG,CAAC;YAC3B,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC;YAChB,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;YACf,wBAAwB,EAAE,GAAG,CAAC,EAAE,CAAC;YACjC,4BAA4B,EAAE,GAAG,CAAC,GAAG,CAAC;SACvC,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QAC9C,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrC,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE;QACpB,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,aAAa,EAAE,GAAG,EAAE;QACvB,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"calculate-overview.test.js","sourceRoot":"","sources":["../../../tests/utils/calculate-overview.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvD,OAAO,EACL,iBAAiB,EACjB,QAAQ,EACR,WAAW,GACZ,MAAM,mCAAmC,CAAC;AAE3C,MAAM,GAAG,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAErC,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,IAAI,CAAC,mBAAmB,EAAE,GAAG,EAAE;QAC7B,MAAM,MAAM,GAAG,iBAAiB,CAAC;YAC/B,UAAU,EAAE,GAAG,CAAC,IAAI,CAAC;YACrB,cAAc,EAAE,IAAI;YACpB,yBAAyB,EAAE,GAAG,CAAC,GAAG,CAAC;YACnC,0BAA0B,EAAE,IAAI;YAChC,iBAAiB,EAAE,GAAG,CAAC,GAAG,CAAC;YAC3B,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC;YAChB,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;YACf,wBAAwB,EAAE,GAAG,CAAC,EAAE,CAAC;YACjC,4BAA4B,EAAE,GAAG,CAAC,GAAG,CAAC;SACvC,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QAC9C,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrC,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE;QACpB,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,aAAa,EAAE,GAAG,EAAE;QACvB,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/tests/utils/health.test.js

@@ -5,7 +5,7 @@ describe('calculateHealth', () => {
         const res = calculateHealth({
             totalValue: 10n,
             liabilitySharesInStethWei: 5n,
-            forceRebalanceThresholdBP: 1000,
+            forcedRebalanceThresholdBP: 1000,
         });
         expect(res.isHealthy).toBe(true);
         expect(res.healthRatio).toBeGreaterThan(0);
@@ -14,7 +14,7 @@ describe('calculateHealth', () => {
         const res = calculateHealth({
             totalValue: 10n,
             liabilitySharesInStethWei: 0n,
-            forceRebalanceThresholdBP: 1000,
+            forcedRebalanceThresholdBP: 1000,
         });
         expect(res.healthRatio).toBe(Infinity);
     });

package/dist/tests/utils/health.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"health.test.js","sourceRoot":"","sources":["../../../tests/utils/health.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAEzE,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,IAAI,CAAC,cAAc,EAAE,GAAG,EAAE;QACxB,MAAM,GAAG,GAAG,eAAe,CAAC;YAC1B,UAAU,EAAE,GAAG;YACf,yBAAyB,EAAE,EAAE;YAC7B,yBAAyB,EAAE,IAAI;SAChC,CAAC,CAAC;QACH,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,4BAA4B,EAAE,GAAG,EAAE;QACtC,MAAM,GAAG,GAAG,eAAe,CAAC;YAC1B,UAAU,EAAE,GAAG;YACf,yBAAyB,EAAE,EAAE;YAC7B,yBAAyB,EAAE,IAAI;SAChC,CAAC,CAAC;QACH,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"health.test.js","sourceRoot":"","sources":["../../../tests/utils/health.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAEzE,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,IAAI,CAAC,cAAc,EAAE,GAAG,EAAE;QACxB,MAAM,GAAG,GAAG,eAAe,CAAC;YAC1B,UAAU,EAAE,GAAG;YACf,yBAAyB,EAAE,EAAE;YAC7B,0BAA0B,EAAE,IAAI;SACjC,CAAC,CAAC;QACH,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,4BAA4B,EAAE,GAAG,EAAE;QACtC,MAAM,GAAG,GAAG,eAAe,CAAC;YAC1B,UAAU,EAAE,GAAG;YACf,yBAAyB,EAAE,EAAE;YAC7B,0BAA0B,EAAE,IAAI;SACjC,CAAC,CAAC;QACH,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/tests/utils/ipfs.test.js

@@ -40,12 +40,21 @@ beforeEach(() => {
 });
 describe('ipfs helpers', () => {
     test('fetchIPFS parses JSON response', async () => {
+        const jsonData = '{"foo":1}';
+        const encoder = new TextEncoder();
+        const buffer = encoder.encode(jsonData).buffer;
+        const testCid = fakeCid.toString();
         global.fetch.mockResolvedValueOnce({
             ok: true,
-            text: async () => '{"foo":1}',
+            text: async () => jsonData,
+            arrayBuffer: async () => buffer,
         });
-        const res = await ipfs.fetchIPFS({ cid: '123' }, false);
-        expect(global.fetch).toHaveBeenCalledWith('https://ipfs.io/ipfs/123');
+        // Mock importer for calculateIPFSAddCID
+        importer.mockImplementationOnce(async function* () {
+            yield { cid: fakeCid };
+        });
+        const res = await ipfs.fetchIPFS({ cid: testCid }, false);
+        expect(global.fetch).toHaveBeenCalledWith(`https://ipfs.io/ipfs/${testCid}`);
         expect(res).toEqual({ foo: 1 });
         expect(logInfo).toHaveBeenCalled();
     });
@@ -78,19 +87,22 @@ describe('ipfs helpers', () => {
         await expect(ipfs.calculateIPFSAddCID(new Uint8Array())).rejects.toThrow('CID calculation failed');
     });
     test('fetchAndVerifyFile verifies CID', async () => {
-        jest
-            .spyOn(ipfs, 'fetchIPFSBuffer')
-            .mockResolvedValueOnce(new Uint8Array([1]));
+        const jsonData = '{"test":123}';
+        const encoder = new TextEncoder();
+        const fileContent = encoder.encode(jsonData);
+        jest.spyOn(ipfs, 'fetchIPFSBuffer').mockResolvedValueOnce(fileContent);
         jest.spyOn(ipfs, 'calculateIPFSAddCID').mockResolvedValueOnce(fakeCid);
         const res = await ipfs.fetchIPFSDirectAndVerify(fakeCid.toString());
-        expect(res).toEqual(new Uint8Array([1]));
+        expect(res.fileContent).toEqual(fileContent);
+        expect(res.json).toEqual({ test: 123 });
         expect(logTable).toHaveBeenCalled();
     });
     test('fetchAndVerifyFile throws on mismatch', async () => {
         const other = CID.parse('bafkreib3m4q5x2fr2di5m3lgvq4hzj4qkgjq2d0k8vh7y6xfxkrmwrkduy');
-        jest
-            .spyOn(ipfs, 'fetchIPFSBuffer')
-            .mockResolvedValueOnce(new Uint8Array([1]));
+        const jsonData = '{"test":456}';
+        const encoder = new TextEncoder();
+        const fileContent = encoder.encode(jsonData);
+        jest.spyOn(ipfs, 'fetchIPFSBuffer').mockResolvedValueOnce(fileContent);
         jest.spyOn(ipfs, 'calculateIPFSAddCID').mockResolvedValueOnce(other);
         await expect(ipfs.fetchIPFSDirectAndVerify(fakeCid.toString())).rejects.toThrow('CID mismatch');
     });

package/dist/tests/utils/ipfs.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"ipfs.test.js","sourceRoot":"","sources":["../../../tests/utils/ipfs.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ipfs.test.js","sourceRoot":"","sources":["../../../tests/utils/ipfs.test.ts"],"names":[],"mappings":"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"}

package/dist/types/common.d.ts

@@ -33,3 +33,7 @@ export type Deposit = {
     amount: bigint;
     depositDataRoot: Hex;
 };
+export type ValidatorTopUp = {
+    pubkey: Hex;
+    amount: bigint;
+};

package/dist/types/config.d.ts

@@ -9,6 +9,7 @@ export interface Config {
     CHAIN_ID: number;
     TOKEN_MANAGER?: Address;
     VOTING?: Address;
+    WALLET_CONNECT_PROJECT_ID?: string;
 }
 export type Vote = readonly [
     boolean,

package/dist/utils/arguments.d.ts

@@ -1,4 +1,4 @@
-import { Permit, RoleAssignment, Tier, Deposit } from '../types/index.js';
+import { Permit, RoleAssignment, Tier, Deposit, ValidatorTopUp } from '../types/index.js';
 import { Address } from 'viem';
 export declare const stringToBigIntArray: (value: string) => bigint[];
 export declare const stringToBigIntArrayWei: (value: string) => bigint[];
@@ -11,5 +11,7 @@ export declare const etherToWei: (value: string) => bigint;
 export declare const stringToNumber: (value: string) => number;
 export declare const parseTiers: (value: string) => Tier[];
 export declare const parseTier: (value: string) => Tier;
+export declare const parseDeposit: (str: string) => Deposit;
 export declare const parseDepositArray: (str: string) => Deposit[];
+export declare const parseValidatorTopUpArray: (str: string) => ValidatorTopUp[];
 export declare const stringToAddress: (value: string) => Address;

package/dist/utils/arguments.js

@@ -38,11 +38,33 @@ export const parseTiers = (value) => {
 export const parseTier = (value) => {
     return JSON.parse(value);
 };
+export const parseDeposit = (str) => {
+    const trimmed = str.trim();
+    if (!trimmed) {
+        return {};
+    }
+    const parsed = JSON.parse(trimmed, (key, value) => {
+        if (key === 'amount')
+            return BigInt(value) * BigInt(10 ** 9); // to wei
+        if (typeof value === 'string') {
+            return toHex(value);
+        }
+        return value;
+    });
+    // Convert keys to camelCase
+    const camelCased = {};
+    for (const key in parsed) {
+        const camelKey = toCamelCase(key);
+        camelCased[camelKey] = parsed[key];
+    }
+    return camelCased;
+};
 export const parseDepositArray = (str) => {
     const trimmed = str.trim();
     if (!trimmed) {
         return [];
     }
+    // eslint-disable-next-line sonarjs/no-identical-functions
     const parsed = JSON.parse(trimmed, (key, value) => {
         if (key === '')
             return value; // root array
@@ -64,6 +86,23 @@ export const parseDepositArray = (str) => {
     });
     return camelCased;
 };
+export const parseValidatorTopUpArray = (str) => {
+    const trimmed = str.trim();
+    if (!trimmed) {
+        return [];
+    }
+    const parsed = JSON.parse(trimmed, (key, value) => {
+        if (key === '')
+            return value; // root array
+        if (key === 'amount')
+            return BigInt(value);
+        if (typeof value === 'string') {
+            return toHex(value);
+        }
+        return value;
+    });
+    return parsed;
+};
 export const stringToAddress = (value) => {
     if (!isAddress(value)) {
         program.error('Address value must be a valid address', { exitCode: 1 });

package/dist/utils/arguments.js.map

@@ -1 +1 @@
-{"version":3,"file":"arguments.js","sourceRoot":"","sources":["../../utils/arguments.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"arguments.js","sourceRoot":"","sources":["../../utils/arguments.ts"],"names":[],"mappings":"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"}

package/dist/utils/calculate-overview-v2.d.ts

@@ -2,13 +2,15 @@ type OverviewArgs = {
     totalValue: bigint;
     reserveRatioBP: number;
     liabilitySharesInStethWei: bigint;
-    forceRebalanceThresholdBP: number;
+    forcedRebalanceThresholdBP: number;
     withdrawableEther: bigint;
     balance: bigint;
     locked: bigint;
-    nodeOperatorDisbursableFee: bigint;
+    nodeOperatorAccruedFee: bigint;
     totalMintingCapacityStethWei: bigint;
     unsettledLidoFees: bigint;
+    minimalReserve: bigint;
+    lastReportLiabilityInStethWei: bigint;
 };
 export declare const calculateOverviewV2: (args: OverviewArgs) => {
     healthRatio: number;

package/dist/utils/calculate-overview-v2.js

@@ -1,4 +1,3 @@
-import { parseEther } from 'viem';
 import { calculateHealth } from './health/calculate-health.js';
 const BASIS_POINTS = 10000n;
 const bigIntMax = (...args) => args.reduce((a, b) => (a > b ? a : b));
@@ -14,24 +13,22 @@ const ceilDiv = (numerator, denominator) => {
     return numerator % denominator === 0n ? result : result + 1n;
 };
 export const calculateOverviewV2 = (args) => {
-    const { totalValue, reserveRatioBP, liabilitySharesInStethWei, forceRebalanceThresholdBP, withdrawableEther, balance, locked, nodeOperatorDisbursableFee, totalMintingCapacityStethWei, unsettledLidoFees, } = args;
+    const { totalValue, reserveRatioBP, liabilitySharesInStethWei, forcedRebalanceThresholdBP, withdrawableEther, balance, locked, nodeOperatorAccruedFee, totalMintingCapacityStethWei, unsettledLidoFees, minimalReserve, lastReportLiabilityInStethWei, } = args;
     const { healthRatio, isHealthy } = calculateHealth({
         totalValue,
         liabilitySharesInStethWei,
-        forceRebalanceThresholdBP,
+        forcedRebalanceThresholdBP,
     });
     const availableToWithdrawal = withdrawableEther;
     const idleCapital = balance;
-    const totalLocked = locked + nodeOperatorDisbursableFee + unsettledLidoFees;
+    const totalLocked = locked + nodeOperatorAccruedFee + unsettledLidoFees;
     const RR = BigInt(reserveRatioBP);
     const oneMinusRR = BASIS_POINTS - RR;
     const liabilityDivOneMinusRR = oneMinusRR === 0n
         ? 0n
         : ceilDiv(liabilitySharesInStethWei * BASIS_POINTS, oneMinusRR);
-    const collateral = bigIntMax(parseEther('1'), liabilityDivOneMinusRR);
-    const recentlyRepaid = liabilityDivOneMinusRR <= parseEther('1')
-        ? bigIntMax(locked - parseEther('1'), 0n)
-        : bigIntMax(locked - liabilityDivOneMinusRR, 0n);
+    const collateral = bigIntMax(minimalReserve, liabilityDivOneMinusRR);
+    const recentlyRepaid = bigIntMax(lastReportLiabilityInStethWei - liabilitySharesInStethWei, 0n);
     const reservedByFormula = oneMinusRR === 0n
         ? 0n
         : ceilDiv(liabilitySharesInStethWei * BASIS_POINTS, oneMinusRR) -

package/dist/utils/calculate-overview-v2.js.map

@@ -1 +1 @@
-{"version":3,"file":"calculate-overview-v2.js","sourceRoot":"","sources":["../../utils/calculate-overview-v2.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"calculate-overview-v2.js","sourceRoot":"","sources":["../../utils/calculate-overview-v2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAiB/D,MAAM,YAAY,GAAG,MAAO,CAAC;AAE7B,MAAM,SAAS,GAAG,CAAC,GAAG,IAAc,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChF,MAAM,SAAS,GAAG,CAAC,GAAG,IAAc,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAEhF;;;;;GAKG;AACH,MAAM,OAAO,GAAG,CAAC,SAAiB,EAAE,WAAmB,EAAU,EAAE;IACjE,MAAM,MAAM,GAAG,SAAS,GAAG,WAAW,CAAC;IACvC,OAAO,SAAS,GAAG,WAAW,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,EAAE,CAAC;AAC/D,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,IAAkB,EAAE,EAAE;IACxD,MAAM,EACJ,UAAU,EACV,cAAc,EACd,yBAAyB,EACzB,0BAA0B,EAC1B,iBAAiB,EACjB,OAAO,EACP,MAAM,EACN,sBAAsB,EACtB,4BAA4B,EAC5B,iBAAiB,EACjB,cAAc,EACd,6BAA6B,GAC9B,GAAG,IAAI,CAAC;IAET,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,eAAe,CAAC;QACjD,UAAU;QACV,yBAAyB;QACzB,0BAA0B;KAC3B,CAAC,CAAC;IACH,MAAM,qBAAqB,GAAG,iBAAiB,CAAC;IAChD,MAAM,WAAW,GAAG,OAAO,CAAC;IAC5B,MAAM,WAAW,GAAG,MAAM,GAAG,sBAAsB,GAAG,iBAAiB,CAAC;IACxE,MAAM,EAAE,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;IAClC,MAAM,UAAU,GAAG,YAAY,GAAG,EAAE,CAAC;IACrC,MAAM,sBAAsB,GAC1B,UAAU,KAAK,EAAE;QACf,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,OAAO,CAAC,yBAAyB,GAAG,YAAY,EAAE,UAAU,CAAC,CAAC;IAEpE,MAAM,UAAU,GAAG,SAAS,CAAC,cAAc,EAAE,sBAAsB,CAAC,CAAC;IACrE,MAAM,cAAc,GAAG,SAAS,CAC9B,6BAA6B,GAAG,yBAAyB,EACzD,EAAE,CACH,CAAC;IAEF,MAAM,iBAAiB,GACrB,UAAU,KAAK,EAAE;QACf,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,OAAO,CAAC,yBAAyB,GAAG,YAAY,EAAE,UAAU,CAAC;YAC7D,yBAAyB,CAAC;IAChC,MAAM,QAAQ,GAAG,SAAS,CACxB,UAAU,GAAG,yBAAyB,EACtC,iBAAiB,CAClB,CAAC;IAEF,wBAAwB;IACxB,MAAM,gBAAgB,GACpB,4BAA4B,KAAK,EAAE;QACjC,CAAC,CAAC,CAAC;QACH,CAAC,CAAC,MAAM,CACJ,CAAC,CAAC,yBAAyB,GAAG,YAAY,CAAC;YACzC,4BAA4B,CAAC;YAC7B,IAAI,CACP,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;IAE/B,OAAO;QACL,WAAW;QACX,SAAS;QACT,qBAAqB;QACrB,WAAW;QACX,WAAW;QACX,UAAU;QACV,cAAc;QACd,gBAAgB;QAChB,QAAQ;QACR,4BAA4B;KAC7B,CAAC;AACJ,CAAC,CAAC"}

package/dist/utils/calculate-overview.d.ts

@@ -2,7 +2,7 @@ type OverviewArgs = {
     totalValue: bigint;
     reserveRatioBP: number;
     liabilitySharesInStethWei: bigint;
-    forceRebalanceThresholdBP: number;
+    forcedRebalanceThresholdBP: number;
     withdrawableEther: bigint;
     balance: bigint;
     locked: bigint;

package/dist/utils/calculate-overview.js

@@ -7,11 +7,11 @@ const bigIntMin = (...args) => args.reduce((a, b) => (a < b ? a : b));
 export const formatBP = (bp) => `${((Number(bp) / Number(BASIS_POINTS_DENOMINATOR)) * 100).toFixed(2)}%`;
 export const formatRatio = (r) => isFinite(r) ? `${r.toFixed(4)}%` : '∞';
 export const calculateOverview = (args) => {
-    const { totalValue, reserveRatioBP, liabilitySharesInStethWei, forceRebalanceThresholdBP, withdrawableEther, balance, locked, nodeOperatorUnclaimedFee, totalMintingCapacityStethWei, } = args;
+    const { totalValue, reserveRatioBP, liabilitySharesInStethWei, forcedRebalanceThresholdBP, withdrawableEther, balance, locked, nodeOperatorUnclaimedFee, totalMintingCapacityStethWei, } = args;
     const { healthRatio, isHealthy } = calculateHealth({
         totalValue,
         liabilitySharesInStethWei,
-        forceRebalanceThresholdBP,
+        forcedRebalanceThresholdBP,
     });
     const AvailableToWithdrawal = withdrawableEther;
     const idleCapital = balance;

package/dist/utils/calculate-overview.js.map

@@ -1 +1 @@
-{"version":3,"file":"calculate-overview.js","sourceRoot":"","sources":["../../utils/calculate-overview.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"calculate-overview.js","sourceRoot":"","sources":["../../utils/calculate-overview.ts"],"names":[],"mappings":"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"}

package/dist/utils/charts/blessed/charts-apr.js

@@ -24,9 +24,10 @@ export const fetchAprChartsData = async ({ cid, dashboard, limit = LIMIT, cacheU
     for (const r of history) {
         let fee = await cache.getNodeOperatorFeeRate(vault, r.blockNumber);
         if (fee === null) {
-            fee = await callReadMethodSilent(dashboardContract, 'nodeOperatorFeeRate', {
+            const feeRate = await callReadMethodSilent(dashboardContract, 'feeRate', {
                 blockNumber: BigInt(r.blockNumber),
             });
+            fee = BigInt(feeRate);
             await cache.setNodeOperatorFeeRate(vault, r.blockNumber, fee);
         }
         nodeOperatorFeeBPs.push(fee);

package/dist/utils/charts/blessed/charts-apr.js.map

@@ -1 +1 @@
-{"version":3,"file":"charts-apr.js","sourceRoot":"","sources":["../../../../utils/charts/blessed/charts-apr.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"charts-apr.js","sourceRoot":"","sources":["../../../../utils/charts/blessed/charts-apr.ts"],"names":[],"mappings":"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"}

package/dist/utils/charts/blessed/charts-rewards.js

@@ -21,9 +21,10 @@ export const fetchRewardsChartsData = async ({ cid, dashboard, limit = LIMIT, ca
     for (const r of history) {
         let fee = await cache.getNodeOperatorFeeRate(vault, r.blockNumber);
         if (fee === null) {
-            fee = await callReadMethodSilent(dashboardContract, 'nodeOperatorFeeRate', {
+            const feeRate = await callReadMethodSilent(dashboardContract, 'feeRate', {
                 blockNumber: BigInt(r.blockNumber),
             });
+            fee = BigInt(feeRate);
             await cache.setNodeOperatorFeeRate(vault, r.blockNumber, fee);
         }
         nodeOperatorFeeBPs.push(fee);

package/dist/utils/charts/blessed/charts-rewards.js.map

@@ -1 +1 @@
-{"version":3,"file":"charts-rewards.js","sourceRoot":"","sources":["../../../../utils/charts/blessed/charts-rewards.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"charts-rewards.js","sourceRoot":"","sources":["../../../../utils/charts/blessed/charts-rewards.ts"],"names":[],"mappings":"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"}

package/dist/utils/charts/blessed/datasets/prepare-metrics.d.ts

@@ -31,3 +31,7 @@ export declare const prepareNetStakingRewards: (history: VaultReport[], nodeOper
     values: string[];
     timestamp: number[];
 };
+export declare const prepareDailyLidoFees: (history: VaultReport[]) => {
+    values: string[];
+    timestamp: number[];
+};

package/dist/utils/charts/blessed/datasets/prepare-metrics.js

@@ -1,5 +1,5 @@
 import { formatEther } from 'viem';
-import { getBottomLine, getGrossStakingAPR, getNetStakingAPR, getCarrySpread, calculateLidoAPR, getGrossStakingRewards, getNodeOperatorRewards, getNetStakingRewards, } from '../../../index.js';
+import { getBottomLine, getGrossStakingAPR, getNetStakingAPR, getCarrySpread, calculateLidoAPR, getGrossStakingRewards, getNodeOperatorRewards, getNetStakingRewards, getDailyLidoFees, } from '../../../index.js';
 import { getRebaseRewardFromCache, getShareRateFromCache } from '../../../index.js';
 export const prepareBottomLine = async (history, nodeOperatorFeeBPs, vaultAddress) => {
     const bottomLine = [];
@@ -130,4 +130,18 @@ export const prepareNetStakingRewards = (history, nodeOperatorFeeBPs) => {
     }
     return { values: netStakingRewards, timestamp };
 };
+export const prepareDailyLidoFees = (history) => {
+    const dailyLidoFees = [];
+    const timestamp = [];
+    for (let i = 1; i < history.length; i++) {
+        const current = history[i];
+        const previous = history[i - 1];
+        if (!current || !previous)
+            continue;
+        const value = getDailyLidoFees(current, previous);
+        dailyLidoFees.push(String(formatEther(value)));
+        timestamp.push(current.timestamp);
+    }
+    return { values: dailyLidoFees, timestamp };
+};
 //# sourceMappingURL=prepare-metrics.js.map

package/dist/utils/charts/blessed/datasets/prepare-metrics.js.map

@@ -1 +1 @@
-{"version":3,"file":"prepare-metrics.js","sourceRoot":"","sources":["../../../../../utils/charts/blessed/datasets/prepare-metrics.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prepare-metrics.js","sourceRoot":"","sources":["../../../../../utils/charts/blessed/datasets/prepare-metrics.ts"],"names":[],"mappings":"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"}

package/dist/utils/charts/overview.d.ts

@@ -2,7 +2,7 @@ interface LiabilityOverview {
     totalValue: bigint;
     stETHLiability: bigint;
     reserveRatioBP: number;
-    forceRebalanceThresholdBP: number;
+    forcedRebalanceThresholdBP: number;
     stETHTotalMintingCapacity: bigint;
 }
 export declare const logLiabilityBar: (data: LiabilityOverview, barLength?: number) => void;

package/dist/utils/charts/overview.js

@@ -5,7 +5,7 @@ export const logLiabilityBar = (data, barLength = 68) => {
     const totalMintingCapacitySteth = parseFloat(formatEther(data.stETHTotalMintingCapacity));
     const liabilityPercentage = liabilitySteth / totalValueEth;
     const reserveRatioPercentage = data.reserveRatioBP / 10000;
-    const rebalanceThresholdPercentage = data.forceRebalanceThresholdBP / 10000;
+    const rebalanceThresholdPercentage = data.forcedRebalanceThresholdBP / 10000;
     const totalMintingCapacityPercentage = totalMintingCapacitySteth / totalValueEth;
     const positions = {
         liabilityEnd: Math.round(liabilityPercentage * barLength),

package/dist/utils/charts/overview.js.map

@@ -1 +1 @@
-{"version":3,"file":"overview.js","sourceRoot":"","sources":["../../../utils/charts/overview.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"overview.js","sourceRoot":"","sources":["../../../utils/charts/overview.ts"],"names":[],"mappings":"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"}