@obolnetwork/obol-sdk 2.4.5 → 2.5.0

package/dist/cjs/src/verification/signature-validator.js

@@ -20,9 +20,9 @@ const protocol_kit_1 = __importDefault(require("@safe-global/protocol-kit"));
 const constants_1 = require("../constants");
 const utils_1 = require("@safe-global/protocol-kit/dist/src/utils");
 const utils_2 = require("../utils");
-const validateAddressSignature = ({ address, token, data, chainId, }) => __awaiter(void 0, void 0, void 0, function* () {
+const validateAddressSignature = ({ address, token, data, chainId, safeRpcUrl, }) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const provider = (0, utils_2.getProvider)(chainId); // [TODO Hanan], should expect it from signer.provider, or passed in client
+        const provider = (0, utils_2.getProvider)(chainId, safeRpcUrl);
         if (provider) {
             const contractAddress = yield (0, utils_2.isContractAvailable)(address, provider);
             if (contractAddress) {
@@ -31,6 +31,7 @@ const validateAddressSignature = ({ address, token, data, chainId, }) => __await
                     data: data,
                     address,
                     chainId,
+                    safeRpcUrl,
                 });
             }
         }
@@ -54,11 +55,11 @@ const validateEOASignature = ({ token, data, address, }) => {
     }
 };
 exports.validateEOASignature = validateEOASignature;
-const validateSmartContractSignature = ({ token, data, address, chainId, }) => __awaiter(void 0, void 0, void 0, function* () {
+const validateSmartContractSignature = ({ token, data, address, chainId, safeRpcUrl, }) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const provider = constants_1.PROVIDER_MAP[chainId];
+        const safeProvider = safeRpcUrl !== null && safeRpcUrl !== void 0 ? safeRpcUrl : constants_1.PROVIDER_MAP[chainId];
         const protocolKit = yield protocol_kit_1.default.init({
-            provider,
+            provider: safeProvider,
             safeAddress: address,
         });
         const messageHash = (0, utils_1.hashTypedData)(data);

package/dist/cjs/src/verification/v1.8.0.js

@@ -147,6 +147,24 @@ const verifyDVV1X8 = (clusterLock) => {
         for (const element of validatorPublicShares) {
             pubShares.push((0, ssz_1.fromHexString)(element));
         }
+        // Check deposit amounts match exactly if they are defined
+        const depositAmounts = clusterLock.cluster_definition.deposit_amounts;
+        if (depositAmounts !== null) {
+            const partialDepositAmounts = validator.partial_deposit_data.map(d => d.amount);
+            if ((depositAmounts === null || depositAmounts === void 0 ? void 0 : depositAmounts.length) !== partialDepositAmounts.length) {
+                return false;
+            }
+            // Check that both arrays contain exactly the same elements
+            const sortedDepositAmounts = [...depositAmounts]
+                .map(Number)
+                .sort((a, b) => a - b);
+            const sortedPartialAmounts = [...partialDepositAmounts]
+                .map(Number)
+                .sort((a, b) => a - b);
+            if (!sortedDepositAmounts.every((amount, index) => amount === sortedPartialAmounts[index])) {
+                return false;
+            }
+        }
         // Deposit Data Verification
         for (const element of validator.partial_deposit_data) {
             const depositData = element;

package/dist/cjs/test/fixtures.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clusterLockWithCompoundingWithdrawals = exports.clusterLockV1X10 = exports.clusterLockWithSafe = exports.nullDepositAmountsClusterLockV1X8 = exports.clusterLockV1X8 = exports.clusterConfigV1X8 = exports.clusterLockV1X7 = exports.clusterConfigV1X7 = exports.clusterLockV1X6 = exports.enr = void 0;
+exports.clusterLockWithCompoundingWithdrawalss = exports.clusterLockWithCompoundingWithdrawals = exports.clusterLockV1X10 = exports.soloClusterConfigV1X10 = exports.clusterConfigV1X10 = exports.clusterLockWithSafe = exports.nullDepositAmountsClusterLockV1X8 = exports.clusterLockV1X8 = exports.clusterLockV1X7 = exports.clusterConfigV1X7 = exports.clusterLockV1X6 = exports.enr = void 0;
 exports.enr = 'enr:-HW4QLlrtMjFLGkFT1bwdGbvZQlH8hLi0M2g44JAxEYP3BZmYpcsy9Q56HPPD87fMucjvLv4-obEFacpsg0ehRilbHeAgmlkgnY0iXNlY3AyNTZrMaEDRaa5o2aSgqyFq_ERZcQTztrOij1mFtXX1bJuVI6ieak';
 // v1.6.0
 exports.clusterLockV1X6 = {
@@ -173,22 +173,6 @@ exports.clusterLockV1X7 = {
     ],
 };
 // v1.8.0
-exports.clusterConfigV1X8 = {
-    name: 'testSDK',
-    operators: [
-        { address: '0xC35CfCd67b9C27345a54EDEcC1033F2284148c81' },
-        { address: '0x33807D6F1DCe44b9C599fFE03640762A6F08C496' },
-        { address: '0xc6e76F72Ea672FAe05C357157CfC37720F0aF26f' },
-        { address: '0xf6fF1a7A14D01e86a175bA958d3B6C75f2213966' },
-    ],
-    validators: [
-        {
-            fee_recipient_address: '0x3CD4958e76C317abcEA19faDd076348808424F99',
-            withdrawal_address: '0xE0C5ceA4D3869F156717C66E188Ae81C80914a6e',
-        },
-    ],
-    deposit_amounts: ['8000000000', '16000000000', '8000000000'],
-};
 exports.clusterLockV1X8 = {
     cluster_definition: {
         name: 'xxxx',
@@ -510,6 +494,40 @@ exports.clusterLockWithSafe = {
         '0x4067921a5257efe4ceb103f2129faaa7a502781157b3b54e5efca559c558c2b43b89f30962e87df88fbf62250049a31888fcd62735d54b7553e5dc75c3b6ae0901',
     ],
 };
+exports.clusterConfigV1X10 = {
+    name: 'testSDK',
+    operators: [
+        { address: '0xC35CfCd67b9C27345a54EDEcC1033F2284148c81' },
+        { address: '0x33807D6F1DCe44b9C599fFE03640762A6F08C496' },
+        { address: '0xc6e76F72Ea672FAe05C357157CfC37720F0aF26f' },
+        { address: '0xf6fF1a7A14D01e86a175bA958d3B6C75f2213966' },
+    ],
+    validators: [
+        {
+            fee_recipient_address: '0x3CD4958e76C317abcEA19faDd076348808424F99',
+            withdrawal_address: '0xE0C5ceA4D3869F156717C66E188Ae81C80914a6e',
+        },
+    ],
+    deposit_amounts: ['8000000000', '32000000000', '8000000000'],
+    compounding: true,
+    target_gas_limit: 36000000,
+    consensus_protocol: '',
+};
+exports.soloClusterConfigV1X10 = {
+    name: 'testSDK',
+    operators: [
+        { address: '' },
+        { address: '' },
+        { address: '' },
+        { address: '' },
+    ],
+    validators: [
+        {
+            fee_recipient_address: '0x3CD4958e76C317abcEA19faDd076348808424F99',
+            withdrawal_address: '0xE0C5ceA4D3869F156717C66E188Ae81C80914a6e',
+        },
+    ],
+};
 exports.clusterLockV1X10 = {
     cluster_definition: {
         name: 'test',
@@ -774,3 +792,93 @@ exports.clusterLockWithCompoundingWithdrawals = {
         '0x3e2548c3c35df90bd7af34f9cc439e7ec4e4fa5619f74ca393bde8e05942dfde0c2e5d95249f478533fe11581b794e5de55446452e4dd1648c33b319a987461701',
     ],
 };
+exports.clusterLockWithCompoundingWithdrawalss = {
+    cluster_definition: {
+        name: 'test v1.10.0',
+        creator: {
+            address: '0xc6e76F72Ea672FAe05C357157CfC37720F0aF26f',
+            config_signature: '0x62b609c3a56439fe60785895d60a36912b85d50c14a41fce36795c65d6263bb207467a4d4be7dc292bfd1c636332b1c409feaec6ce2ae9488ae1ad622264a7a81c',
+        },
+        operators: [
+            {
+                address: '0xc6e76F72Ea672FAe05C357157CfC37720F0aF26f',
+                enr: 'enr:-HW4QLlrtMjFLGkFT1bwdGbvZQlH8hLi0M2g44JAxEYP3BZmYpcsy9Q56HPPD87fMucjvLv4-obEFacpsg0ehRilbHeAgmlkgnY0iXNlY3AyNTZrMaEDRaa5o2aSgqyFq_ERZcQTztrOij1mFtXX1bJuVI6ieak',
+                config_signature: '0x58c31787cf1f9680f736713f4ce039c8bf69467e5128edb2888d380451bd757367665c1ba04dc7656eb0b77eac39f776780710e603372f2a41bd40f4d297c7fa1c',
+                enr_signature: '0x4df48b8fc16deb2441022a019b72976524f4ce3dd674ee70561fb9eb52985d3b0d9528532d3e5be7a44548be27e9e96c5358b9f6756c7c7a97e2126f9c2c9b071b',
+            },
+            {
+                address: '0xa084D9095BcBdFe8014B68fa52D73DCeb16C5129',
+                enr: 'enr:-Iu4QNbiUUUwT18LynBbVPJhNxvzQsaSpUr40mQTWscnZaqKb6vAlvV8j-eDDR3E0wjMQumGRbGm2IAb5_k4bVWJiVGAgmlkgnY0gmlwhH8AAAGJc2VjcDI1NmsxoQPOiodUji0ohgJb5sNK1hgv8g6xO5_znZz3NkkBkyYyKIN0Y3CCDhqDdWRwgg4u',
+                config_signature: '0xc76b2f067a65c9cc6110ab99471b03f47545581e79164758114c98825d5440891843790ce92ca24ee7b3568b839cc88c2b3824587f8f260fca15bb852f69a3af1c',
+                enr_signature: '0x49e2a07424e412ed904fd47381c36203cb8c5575a31ba260b3f8420dc89a86fc0d7fbc087160a60690be2f6fb212423d467e212494992ab9a72f10319779a2cc1c',
+            },
+            {
+                address: '0xb1D2740Ee055693FE21bbCfc780729472C3f6B84',
+                enr: 'enr:-Iu4QJyserRukhG0Vgi2csu7GjpHYUGufNEbZ8Q7ZBrcZUb0KqpL5QzHonkh1xxHlxatTxrIcX_IS5J3SEWR_sa0ptGAgmlkgnY0gmlwhH8AAAGJc2VjcDI1NmsxoQMAUgEqczOjevyculnUIofhCj0DkgJudErM7qCYIvIkzIN0Y3CCDhqDdWRwgg4u',
+                config_signature: '0x8b0cea21e065d25faa3b9d3b9e8f497d3c2d8baf800a1c5ecbde64c041745b7e15131d28f7ab917bdcead3225dda16987f2fd160546e087987cbb483bd187cb11b',
+                enr_signature: '0x805f38269379087168900a37569f1108b9d4253a03c2650a4e8d69228cb4cc616b94988e4b218a8d47113063270c4a894e873a5070c7ef0f4d44ee3359eec51b1b',
+            },
+            {
+                address: '0x69D39e2d0Fb6fb80CCd5d49a75416cB7d1BC6DB6',
+                enr: 'enr:-HW4QKJTwXC6Chw6zbnA3HFZi6Jo0DkIgjKy4eUBpsSOGnAeWE6ChEjEyk_6R6Qrm7jI-iqfs3_HYxiKde8vFgvHHrCAgmlkgnY0iXNlY3AyNTZrMaECfFKQH4spdZCHqrKVz1Q02xYla6J_RQECDNNYBRWdzv8',
+                config_signature: '0x9e21c2308738fb17b38d1850b83312c25306c0bcbd575e0417e311d5fc1697807291328a299859df70ac3efb402207067dbb0559bc4fef4e6ca2fd77fa4c2a321c',
+                enr_signature: '0x3a6590600b2dc27b042aabd3fa4654f1064b42e8f850d1fac13394a6786463be2a2727623e4e9e98453113f7024e73d652d1c6288ef82ede7acbb08e25ff00751b',
+            },
+        ],
+        uuid: '34036642-9d45-4b6f-817d-f8d5aa0110d4',
+        version: 'v1.10.0',
+        timestamp: '2025-04-03T17:27:27.767Z',
+        num_validators: 1,
+        threshold: 3,
+        validators: [
+            {
+                fee_recipient_address: '0xc6e76F72Ea672FAe05C357157CfC37720F0aF26f',
+                withdrawal_address: '0xc6e76F72Ea672FAe05C357157CfC37720F0aF26f',
+            },
+        ],
+        dkg_algorithm: 'default',
+        fork_version: '0x10000910',
+        deposit_amounts: ['32000000000'],
+        consensus_protocol: 'abft',
+        target_gas_limit: 30000000,
+        compounding: true,
+        config_hash: '0xe6d2e8fe49d722f55ced8a028c62ffbde16a05bc74d7d9703b675ecc8c820b4b',
+        definition_hash: '0xb5d81494f98df23cdff33909888080054f1068c11bbee5ec39aeb95edfa3b37c',
+    },
+    distributed_validators: [
+        {
+            distributed_public_key: '0x8368525a657df38fd3d774a08f1a54f008ae3340e8441a2bbb2d2051a9a8f46d4eeb8610bbc088e7402cba6b138c7b70',
+            public_shares: [
+                '0xae455c727456238fadd7b84ded0f0fb700d0e2fa028fff34e3fc73d0279ee9a5aa9843f8af00c9518ea781d8d823cc0d',
+                '0x91a7cfa9682464dff7324c0907fdff41df3f2643fd97d30559d82fbbfa354dae1e3f9176d8562b5ab47d3460240004cb',
+                '0xac8c0ffdb9ea7ce63bbed67122123c86ffa669a5027da5f96ab85b68c3a491253ebf0308cf4e237ea4eaf8543064c8a8',
+                '0x85385ef7cf1b1d9cd648ceb45e92516ef9612c9830b0abf808ea7996ad9369764bb9ac27c3cd730497e12e394ab48d16',
+            ],
+            builder_registration: {
+                message: {
+                    fee_recipient: '0xc6e76f72ea672fae05c357157cfc37720f0af26f',
+                    gas_limit: 30000000,
+                    timestamp: 1742213400,
+                    pubkey: '0x8368525a657df38fd3d774a08f1a54f008ae3340e8441a2bbb2d2051a9a8f46d4eeb8610bbc088e7402cba6b138c7b70',
+                },
+                signature: '0xb73c4d55c17bdbbb53790fee3294ef2c69b2a6e4c700eb30603e437308005edacbe76591f917aa82cfcf60da2d669ccd101ae9b3dc4b1ae61ab7ad1794620adbdc0b4ea5f91fc5e790833537c610a57ccdc4c95ca53cb6dedec2be2ad8acf266',
+            },
+            partial_deposit_data: [
+                {
+                    pubkey: '0x8368525a657df38fd3d774a08f1a54f008ae3340e8441a2bbb2d2051a9a8f46d4eeb8610bbc088e7402cba6b138c7b70',
+                    withdrawal_credentials: '0x020000000000000000000000c6e76f72ea672fae05c357157cfc37720f0af26f',
+                    amount: '32000000000',
+                    signature: '0xa7c5c2417f5afd089b87df0eff10855b748d621749879b6087c8a1dbfcbb95aa79a2c8f4d637ecb283426b9c5af07c30080c19a245ea614ff3f609a92994e9a29f3c0f8c4bf1a4e7ef58615ff80586b40e36859c9fd935b68ae55670e29ea5d7',
+                },
+            ],
+        },
+    ],
+    signature_aggregate: '0x8b9f884ab3ab89d63f49437cae09e2b77757787f2c54bb52bc51df1d565bc6d63ef9fc4e0ea76bd72a58618651b827a611d8e96de238fad4616420b4cd393ad62428ac9db2e01a4e8dd8ae835845e7530f9e1b3b4ebf5ba2da3c77aec70d06b2',
+    lock_hash: '0xaf6b0d989fdd82f7f9683d62b9f797af129f9afae2a4b453a0bef1814b21ae5d',
+    node_signatures: [
+        '0xc059b3920fc107a909feb16217c7372911c5cb386954ed899b5d8e782d6d71e17a5dde1c2d4825b7c2b5edd63b4eb9c306afd4afd5dbce3f8db9c13d06d6cebf01',
+        '0x051a72e5f2a66a85aabd635a210350f82924350170981575f3cb67e7699791d7118ab7c284f10b52f3604a89aa0bc43ad2d2537a7b19b109610324926475d30900',
+        '0xa28a23de3703c3eeb9a091d4f47302a96079759baf1afca428cbd298b46c40fe103df0006dfd5a0ffd15ee7c5fa436d70d7a03d4537dd8292a6152734e5f689601',
+        '0x992ab5c73d30d10cc5c8f6d462ba387fd5a698e206b0dfdd0224d17117f85a2077fcaa62fd6d5170ff678249288fcd82877e2987ed5564df5dbd9d51370871c800',
+    ],
+};

package/dist/cjs/test/incentives.test.js

@@ -145,7 +145,7 @@ global.fetch = globals_1.jest.fn();
             .mockImplementation(() => __awaiter(void 0, void 0, void 0, function* () { return yield Promise.resolve(true); }));
         const result = yield clientInstance.incentives.isClaimed(mockIncentivesData.contract_address, mockIncentivesData.index);
         (0, globals_1.expect)(result).toBe(true);
-        (0, globals_1.expect)(incentivesHelpers.isClaimedFromMerkleDistributor).toHaveBeenCalledWith(clientInstance.incentives.chainId, mockIncentivesData.contract_address, mockIncentivesData.index, {});
+        (0, globals_1.expect)(incentivesHelpers.isClaimedFromMerkleDistributor).toHaveBeenCalledWith(mockIncentivesData.contract_address, mockIncentivesData.index, {});
     }));
     (0, globals_1.test)('isClaimed should return false when incentive is not claimed', () => __awaiter(void 0, void 0, void 0, function* () {
         globals_1.jest
@@ -172,7 +172,7 @@ global.fetch = globals_1.jest.fn();
             .mockImplementation(() => __awaiter(void 0, void 0, void 0, function* () { return yield Promise.resolve(true); }));
         const result = yield clientWithoutSigner.incentives.isClaimed(mockIncentivesData.contract_address, mockIncentivesData.index);
         (0, globals_1.expect)(result).toBe(true);
-        (0, globals_1.expect)(incentivesHelpers.isClaimedFromMerkleDistributor).toHaveBeenCalledWith(clientWithoutSigner.incentives.chainId, mockIncentivesData.contract_address, mockIncentivesData.index, provider);
+        (0, globals_1.expect)(incentivesHelpers.isClaimedFromMerkleDistributor).toHaveBeenCalledWith(mockIncentivesData.contract_address, mockIncentivesData.index, provider);
     }));
     (0, globals_1.test)('getIncentivesByAddress should make the correct API request', () => __awaiter(void 0, void 0, void 0, function* () {
         const mockAddress = '0x1234567890abcdef1234567890abcdef12345678';

package/dist/cjs/test/methods.test.js

@@ -38,7 +38,6 @@ const index_1 = require("../src/index");
 const fixtures_js_1 = require("./fixtures.js");
 const constants_1 = require("../src/constants");
 const base_1 = require("../src/base");
-const ajv_1 = require("../src/ajv");
 const msw_1 = require("msw");
 const node_1 = require("msw/node");
 const termsAndConditions_1 = require("../src/verification/termsAndConditions");
@@ -65,31 +64,31 @@ describe('Cluster Client', () => {
         clientInstance['request'] = jest
             .fn()
             .mockReturnValue(Promise.resolve({ config_hash: mockConfigHash }));
-        const configHash = yield clientInstance.createClusterDefinition(fixtures_js_1.clusterConfigV1X8);
+        const configHash = yield clientInstance.createClusterDefinition(fixtures_js_1.clusterConfigV1X10);
         expect(configHash).toEqual(mockConfigHash);
     }));
     test('acceptClusterDefinition should return cluster definition', () => __awaiter(void 0, void 0, void 0, function* () {
         clientInstance['request'] = jest
             .fn()
-            .mockReturnValue(Promise.resolve(fixtures_js_1.clusterLockV1X8.cluster_definition));
+            .mockReturnValue(Promise.resolve(fixtures_js_1.clusterLockV1X10.cluster_definition));
         const clusterDefinition = yield clientInstance.acceptClusterDefinition({
-            enr: fixtures_js_1.clusterLockV1X8.cluster_definition.operators[0].enr,
-            version: fixtures_js_1.clusterLockV1X8.cluster_definition.version,
-        }, fixtures_js_1.clusterLockV1X8.cluster_definition.config_hash);
-        expect(clusterDefinition).toEqual(fixtures_js_1.clusterLockV1X8.cluster_definition);
+            enr: fixtures_js_1.clusterLockV1X10.cluster_definition.operators[0].enr,
+            version: fixtures_js_1.clusterLockV1X10.cluster_definition.version,
+        }, fixtures_js_1.clusterLockV1X10.cluster_definition.config_hash);
+        expect(clusterDefinition).toEqual(fixtures_js_1.clusterLockV1X10.cluster_definition);
     }));
     test('createClusterDefinition should throw an error on invalid operators', () => __awaiter(void 0, void 0, void 0, function* () {
         clientInstance['request'] = jest
             .fn()
             .mockReturnValue(Promise.resolve({ config_hash: mockConfigHash }));
         try {
-            yield clientInstance.createClusterDefinition(Object.assign(Object.assign({}, fixtures_js_1.clusterConfigV1X8), { operators: [] }));
+            yield clientInstance.createClusterDefinition(Object.assign(Object.assign({}, fixtures_js_1.clusterConfigV1X10), { operators: [] }));
         }
         catch (error) {
-            expect(error.message).toEqual("Schema compilation errors', must NOT have fewer than 4 items");
+            expect(error.message).toEqual('Validation failed: /operators must pass "validateUniqueAddresses" keyword validation, /operators must NOT have fewer than 4 items');
         }
     }));
-    // cause we default to 32000000000
+    // cause we default to null
     test('createClusterDefinition should accept a configuration without deposit_amounts', () => __awaiter(void 0, void 0, void 0, function* () {
         clientInstance['request'] = jest
             .fn()
@@ -105,32 +104,27 @@ describe('Cluster Client', () => {
             yield clientInstance.createClusterDefinition(Object.assign(Object.assign({}, fixtures_js_1.clusterConfigV1X7), { deposit_amounts: ['34000000'] }));
         }
         catch (error) {
-            expect(error.message).toEqual('Schema compilation errors\', must pass "validDepositAmounts" keyword validation');
-        }
-    }));
-    test('validatePayload should throw an error on empty schema', () => __awaiter(void 0, void 0, void 0, function* () {
-        try {
-            (0, ajv_1.validatePayload)(Object.assign(Object.assign({}, fixtures_js_1.clusterConfigV1X8), { operators: [] }), '');
-        }
-        catch (error) {
-            expect(error.message).toEqual('schema must be object or boolean');
+            expect(error.message).toEqual('Validation failed: /deposit_amounts/0 must be equal to one of the allowed values, /deposit_amounts must match "then" schema');
         }
     }));
     test('getClusterdefinition should return cluster definition if config hash exist', () => __awaiter(void 0, void 0, void 0, function* () {
-        var _a;
         clientInstance['request'] = jest
             .fn()
-            .mockReturnValue(Promise.resolve(fixtures_js_1.clusterLockV1X8.cluster_definition));
-        const clusterDefinition = yield clientInstance.getClusterDefinition(fixtures_js_1.clusterLockV1X8.cluster_definition.config_hash);
-        expect((_a = clusterDefinition.deposit_amounts) === null || _a === void 0 ? void 0 : _a.length).toEqual(fixtures_js_1.clusterLockV1X8.cluster_definition.deposit_amounts.length);
-        expect(clusterDefinition.config_hash).toEqual(fixtures_js_1.clusterLockV1X8.cluster_definition.config_hash);
+            .mockReturnValue(Promise.resolve(fixtures_js_1.clusterLockV1X10.cluster_definition));
+        const clusterDefinition = yield clientInstance.getClusterDefinition(fixtures_js_1.clusterLockV1X10.cluster_definition.config_hash);
+        expect(clusterDefinition.deposit_amounts).toBeDefined();
+        expect(clusterDefinition.config_hash).toEqual(fixtures_js_1.clusterLockV1X10.cluster_definition.config_hash);
+        // Test for new fields
+        expect(clusterDefinition.compounding).toBeDefined();
+        expect(clusterDefinition.target_gas_limit).toBeDefined();
+        expect(clusterDefinition.consensus_protocol).toBeDefined();
     }));
     test('getClusterLock should return lockFile if exist', () => __awaiter(void 0, void 0, void 0, function* () {
         clientInstance['request'] = jest
             .fn()
-            .mockReturnValue(Promise.resolve(fixtures_js_1.clusterLockV1X8));
-        const clusterLock = yield clientInstance.getClusterLock(fixtures_js_1.clusterLockV1X8.cluster_definition.config_hash);
-        expect(clusterLock.lock_hash).toEqual(fixtures_js_1.clusterLockV1X8.lock_hash);
+            .mockReturnValue(Promise.resolve(fixtures_js_1.clusterLockV1X10));
+        const clusterLock = yield clientInstance.getClusterLock(fixtures_js_1.clusterLockV1X10.cluster_definition.config_hash);
+        expect(clusterLock.lock_hash).toEqual(fixtures_js_1.clusterLockV1X10.lock_hash);
     }));
     test('request method should set user agent header', () => __awaiter(void 0, void 0, void 0, function* () {
         const server = (0, node_1.setupServer)(msw_1.http.get('http://testexample.com/test', ({ request }) => {
@@ -165,9 +159,12 @@ describe('Cluster Client without a signer', () => {
     beforeAll(() => {
         jest.restoreAllMocks();
     });
+    beforeEach(() => {
+        jest.resetModules();
+    });
     test('createClusterDefinition should throw an error without signer', () => __awaiter(void 0, void 0, void 0, function* () {
         try {
-            yield clientInstance.createClusterDefinition(fixtures_js_1.clusterConfigV1X8);
+            yield clientInstance.createClusterDefinition(fixtures_js_1.clusterConfigV1X10);
         }
         catch (err) {
             expect(err.message).toEqual('Signer is required in createClusterDefinition');
@@ -176,9 +173,9 @@ describe('Cluster Client without a signer', () => {
     test('acceptClusterDefinition should throw an error without signer', () => __awaiter(void 0, void 0, void 0, function* () {
         try {
             yield clientInstance.acceptClusterDefinition({
-                enr: fixtures_js_1.clusterLockV1X8.cluster_definition.operators[0].enr,
-                version: fixtures_js_1.clusterLockV1X8.cluster_definition.version,
-            }, fixtures_js_1.clusterLockV1X8.cluster_definition.config_hash);
+                enr: fixtures_js_1.clusterLockV1X10.cluster_definition.operators[0].enr,
+                version: fixtures_js_1.clusterLockV1X10.cluster_definition.version,
+            }, fixtures_js_1.clusterLockV1X10.cluster_definition.config_hash);
         }
         catch (err) {
             expect(err.message).toEqual('Signer is required in acceptClusterDefinition');
@@ -187,16 +184,16 @@ describe('Cluster Client without a signer', () => {
     test('getClusterdefinition should return cluster definition if config hash exist', () => __awaiter(void 0, void 0, void 0, function* () {
         clientInstance['request'] = jest
             .fn()
-            .mockReturnValue(Promise.resolve(fixtures_js_1.clusterLockV1X8.cluster_definition));
-        const clusterDefinition = yield clientInstance.getClusterDefinition(fixtures_js_1.clusterLockV1X8.cluster_definition.config_hash);
-        expect(clusterDefinition.config_hash).toEqual(fixtures_js_1.clusterLockV1X8.cluster_definition.config_hash);
+            .mockReturnValue(Promise.resolve(fixtures_js_1.clusterLockV1X10.cluster_definition));
+        const clusterDefinition = yield clientInstance.getClusterDefinition(fixtures_js_1.clusterLockV1X10.cluster_definition.config_hash);
+        expect(clusterDefinition.config_hash).toEqual(fixtures_js_1.clusterLockV1X10.cluster_definition.config_hash);
     }));
     test('getClusterLock should return lockFile if exist', () => __awaiter(void 0, void 0, void 0, function* () {
         clientInstance['request'] = jest
             .fn()
-            .mockReturnValue(Promise.resolve(fixtures_js_1.clusterLockV1X8));
-        const clusterLock = yield clientInstance.getClusterLock(fixtures_js_1.clusterLockV1X8.cluster_definition.config_hash);
-        expect(clusterLock.lock_hash).toEqual(fixtures_js_1.clusterLockV1X8.lock_hash);
+            .mockReturnValue(Promise.resolve(fixtures_js_1.clusterLockV1X10));
+        const clusterLock = yield clientInstance.getClusterLock(fixtures_js_1.clusterLockV1X10.cluster_definition.config_hash);
+        expect(clusterLock.lock_hash).toEqual(fixtures_js_1.clusterLockV1X10.lock_hash);
     }));
     test.each([
         { version: 'v1.6.0', clusterLock: fixtures_js_1.clusterLockV1X6 },
@@ -219,6 +216,14 @@ describe('Cluster Client without a signer', () => {
         const isValidLock = yield (0, index_1.validateClusterLock)(clusterLock);
         expect(isValidLock).toEqual(true);
     }));
+    test('should return true on verified cluster lock with Safe wallet and safe rpc url', () => __awaiter(void 0, void 0, void 0, function* () {
+        process.env.RPC_HOLESKY = undefined;
+        /* eslint-disable @typescript-eslint/no-var-requires */
+        const { validateClusterLock: validateLockWithRpcUrl, } = require('../src/index');
+        const safeRpcUrl = 'https://ethereum-holesky-rpc.publicnode.com';
+        const isValidLock = yield validateLockWithRpcUrl(fixtures_js_1.clusterLockWithSafe, safeRpcUrl);
+        expect(isValidLock).toEqual(true);
+    }));
     test('validateCluster should return false for cluster with null deposit_amounts and incorrect partial_deposits', () => __awaiter(void 0, void 0, void 0, function* () {
         const partialDeposit = fixtures_js_1.nullDepositAmountsClusterLockV1X8.distributed_validators[0]
             .partial_deposit_data[0];
@@ -295,7 +300,7 @@ describe('createObolRewardsSplit', () => {
             });
         }
         catch (error) {
-            expect(error.message).toEqual('Schema compilation errors\', must pass "validateSplitRecipients" keyword validation');
+            expect(error.message).toEqual('Validation failed:  must pass "validateRewardsSplitRecipients" keyword validation');
         }
     }));
     test('should throw an error if ObolRAFSplit is less than 1', () => __awaiter(void 0, void 0, void 0, function* () {
@@ -308,7 +313,7 @@ describe('createObolRewardsSplit', () => {
             });
         }
         catch (error) {
-            expect(error.message).toEqual("Schema compilation errors', must be >= 1");
+            expect(error.message).toEqual('Validation failed:  must pass "validateRewardsSplitRecipients" keyword validation, /ObolRAFSplit must be >= 1');
         }
     }));
     it('should return the correct withdrawal and fee recipient addresses', () => __awaiter(void 0, void 0, void 0, function* () {
@@ -375,7 +380,7 @@ describe('createObolTotalSplit', () => {
             });
         }
         catch (error) {
-            expect(error.message).toEqual('Schema compilation errors\', must pass "validateSplitRecipients" keyword validation');
+            expect(error.message).toEqual('Validation failed:  must pass "validateTotalSplitRecipients" keyword validation');
         }
     }));
     test('should throw an error if ObolRAFSplit is less than 0.1', () => __awaiter(void 0, void 0, void 0, function* () {
@@ -386,13 +391,13 @@ describe('createObolTotalSplit', () => {
             });
         }
         catch (error) {
-            expect(error.message).toEqual("Schema compilation errors', must be >= 0.1");
+            expect(error.message).toEqual('Validation failed:  must pass "validateTotalSplitRecipients" keyword validation, /ObolRAFSplit must be >= 0.1');
         }
     }));
     it('should return the correct withdrawal and fee recipient addresses and ObolRAFSplit', () => __awaiter(void 0, void 0, void 0, function* () {
         const result = yield clientInstance.createObolTotalSplit({
             splitRecipients: mockSplitRecipients,
-            ObolRAFSplit: 0.5,
+            ObolRAFSplit: 0.1,
         });
         // 0xPredictedAddress and not 0xSplitterAddress since were mocking isContractAvailable response to be true
         expect(result).toEqual({

package/dist/esm/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@obolnetwork/obol-sdk",
-    "version": "2.4.5",
+    "version": "2.5.0",
     "description": "A package for creating Distributed Validators using the Obol API.",
     "bugs": {
         "url": "https://github.com/obolnetwork/obol-sdk/issues"
@@ -49,6 +49,8 @@
         "@safe-global/safe-core-sdk-types": "5.1.0",
         "@types/pdf-parse": "^1.1.4",
         "ajv": "^8.12.0",
+        "ajv-formats": "^3.0.1",
+        "ajv-keywords": "^5.1.0",
         "cross-fetch": "^3.1.5",
         "dotenv": "^16.4.7",
         "elliptic": "^6.5.4",
@@ -56,7 +58,7 @@
         "eslint-plugin-import": "^2.29.1",
         "eslint-plugin-n": "^16.6.2",
         "eslint-plugin-promise": "^6.1.1",
-        "ethers": "6.4.0",
+        "ethers": "^6.13.5",
         "nock": "^13.5.3",
         "pdf-parse": "^1.1.1",
         "semver": "^7.6.0",

package/dist/esm/src/ajv.js

@@ -1,53 +1,79 @@
-import Ajv from 'ajv';
+import addFormats from 'ajv-formats';
+import addKeywords from 'ajv-keywords';
 import { parseUnits } from 'ethers';
+import Ajv from 'ajv';
 import { DEFAULT_RETROACTIVE_FUNDING_REWARDS_ONLY_SPLIT, DEFAULT_RETROACTIVE_FUNDING_TOTAL_SPLIT, } from './constants';
-const validDepositAmounts = (data, deposits) => {
-    let sum = 0;
-    // from ether togwei is same as from gwei to wei
-    const maxDeposit = Number(parseUnits('32', 'gwei'));
-    const minDeposit = Number(parseUnits('1', 'gwei'));
-    for (const element of deposits) {
-        const amountInGWei = Number(element);
-        if (!Number.isInteger(amountInGWei) ||
-            amountInGWei > maxDeposit ||
-            amountInGWei < minDeposit) {
-            return false;
-        }
-        sum += amountInGWei;
+export const VALID_DEPOSIT_AMOUNTS = [
+    parseUnits('1', 'gwei').toString(),
+    parseUnits('32', 'gwei').toString(),
+    parseUnits('8', 'gwei').toString(),
+    parseUnits('256', 'gwei').toString(),
+];
+export const VALID_NON_COMPOUNDING_AMOUNTS = [
+    parseUnits('1', 'gwei').toString(),
+    parseUnits('32', 'gwei').toString(),
+];
+// They dont see defaults set in schema
+const validateRewardsSplitRecipients = (_, data) => {
+    var _a;
+    const obolRAFSplit = (_a = data.ObolRAFSplit) !== null && _a !== void 0 ? _a : DEFAULT_RETROACTIVE_FUNDING_REWARDS_ONLY_SPLIT;
+    const splitPercentage = data.splitRecipients.reduce((acc, curr) => acc + curr.percentAllocation, 0);
+    return splitPercentage + obolRAFSplit === 100;
+};
+const validateTotalSplitRecipients = (_, data) => {
+    var _a;
+    const obolRAFSplit = (_a = data.ObolRAFSplit) !== null && _a !== void 0 ? _a : DEFAULT_RETROACTIVE_FUNDING_TOTAL_SPLIT;
+    const splitPercentage = data.splitRecipients.reduce((acc, curr) => acc + curr.percentAllocation, 0);
+    return splitPercentage + obolRAFSplit === 100;
+};
+const validateUniqueAddresses = (_, operators) => {
+    if (!operators) {
+        return false;
     }
-    if (sum / minDeposit !== 32) {
+    if (operators.length < 4) {
         return false;
     }
-    else {
+    if (operators.every(op => op.address === '')) {
         return true;
     }
+    if (operators.some(op => op.address.length !== 42)) {
+        return false;
+    }
+    const addresses = operators.map(op => op.address);
+    const uniqueAddresses = new Set(addresses);
+    const isUnique = uniqueAddresses.size === addresses.length;
+    return isUnique;
 };
-const validateSplitRecipients = (_, data) => {
-    const splitPercentage = data.splitRecipients.reduce((acc, curr) => acc + curr.percentAllocation, 0);
-    const ObolRAFSplitParam = data.ObolRAFSplit
-        ? data.ObolRAFSplit
-        : 'principalRecipient' in data
-            ? DEFAULT_RETROACTIVE_FUNDING_REWARDS_ONLY_SPLIT
-            : DEFAULT_RETROACTIVE_FUNDING_TOTAL_SPLIT;
-    return splitPercentage + ObolRAFSplitParam === 100;
-};
+const ajv = new Ajv({
+    allErrors: true,
+    useDefaults: true,
+    strict: false,
+    $data: true,
+});
+addFormats(ajv);
+addKeywords(ajv, ['patternRequired']);
+ajv.addKeyword({
+    keyword: 'validateRewardsSplitRecipients',
+    validate: validateRewardsSplitRecipients,
+    schemaType: 'boolean',
+});
+ajv.addKeyword({
+    keyword: 'validateTotalSplitRecipients',
+    validate: validateTotalSplitRecipients,
+    schemaType: 'boolean',
+});
+ajv.addKeyword({
+    keyword: 'validateUniqueAddresses',
+    validate: validateUniqueAddresses,
+    schemaType: 'boolean',
+});
 export function validatePayload(data, schema) {
     var _a;
-    const ajv = new Ajv();
-    ajv.addKeyword({
-        keyword: 'validDepositAmounts',
-        validate: validDepositAmounts,
-        errors: true,
-    });
-    ajv.addKeyword({
-        keyword: 'validateSplitRecipients',
-        validate: validateSplitRecipients,
-        errors: true,
-    });
     const validate = ajv.compile(schema);
-    const isValid = validate(data);
-    if (!isValid) {
-        throw new Error(`Schema compilation errors', ${(_a = validate.errors) === null || _a === void 0 ? void 0 : _a[0].message}`);
+    const valid = validate(data);
+    if (!valid) {
+        const errors = (_a = validate.errors) === null || _a === void 0 ? void 0 : _a.map(e => `${e.instancePath} ${e.message}`).join(', ');
+        throw new Error(`Validation failed: ${errors}`);
     }
-    return isValid;
+    return data;
 }

package/dist/esm/src/constants.js

@@ -77,7 +77,7 @@ export const signEnrPayload = (payload, chainId) => {
     };
 };
 export const DKG_ALGORITHM = 'default';
-export const CONFIG_VERSION = 'v1.8.0';
+export const CONFIG_VERSION = 'v1.10.0';
 export const SDK_VERSION = pjson.version;
 export const DOMAIN_APPLICATION_BUILDER = '00000001';
 export const DOMAIN_DEPOSIT = '03000000';

package/dist/esm/src/incentiveHelpers.js

@@ -9,7 +9,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { Contract } from 'ethers';
 import { MerkleDistributorABI } from './abi/MerkleDistributorWithDeadline';
-import { getProvider } from './utils';
 export const claimIncentivesFromMerkleDistributor = (incentivesData) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const contract = new Contract(incentivesData.contractAddress, MerkleDistributorABI.abi, incentivesData.signer);
@@ -22,10 +21,9 @@ export const claimIncentivesFromMerkleDistributor = (incentivesData) => __awaite
         throw new Error(`Failed to claim incentives: ${error.message}`);
     }
 });
-export const isClaimedFromMerkleDistributor = (chainId, contractAddress, index, provider) => __awaiter(void 0, void 0, void 0, function* () {
+export const isClaimedFromMerkleDistributor = (contractAddress, index, provider) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const clientProvider = provider !== null && provider !== void 0 ? provider : getProvider(chainId);
-        const contract = new Contract(contractAddress, MerkleDistributorABI.abi, clientProvider);
+        const contract = new Contract(contractAddress, MerkleDistributorABI.abi, provider);
         const claimed = yield contract.isClaimed(BigInt(index));
         return claimed;
     }

package/dist/esm/src/incentives.js

@@ -92,7 +92,7 @@ export class Incentives {
      */
     isClaimed(contractAddress, index) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield isClaimedFromMerkleDistributor(this.chainId, contractAddress, index, this.provider);
+            return yield isClaimedFromMerkleDistributor(contractAddress, index, this.provider);
         });
     }
     /**