@obolnetwork/obol-sdk 2.11.2 → 2.11.4

package/dist/cjs/src/constants.js

@@ -160,7 +160,7 @@ exports.CHAIN_CONFIGURATION = {
         },
         // OVM and SplitV2 Contract Addresses
         OVM_FACTORY_CONTRACT: {
-            address: '0xdfe2d8b26806583cf03b3cb623b0752f8670e93e',
+            address: '0xA755669f314022ED2158e93867af5183E88370fe',
             bytecode: bytecodes_1.MAINNET_OVM_FACTORY_BYTECODE,
         },
         WAREHOUSE_CONTRACT: {
@@ -198,6 +198,10 @@ exports.CHAIN_CONFIGURATION = {
         EOA_WITHDRAWAL_CONTRACT: {
             address: '0x00000961Ef480Eb55e80D19ad83579A64c007002',
         },
+        OVM_FACTORY_CONTRACT: {
+            address: '0x4B157b79277E44D12C234680ACE17Db028075EA5',
+            bytecode: bytecodes_1.HOLESKY_OVM_FACTORY_BYTECODE,
+        },
     },
     [types_1.FORK_MAPPING['0x10000910']]: {
         SPLITMAIN_CONTRACT: {
@@ -218,7 +222,7 @@ exports.CHAIN_CONFIGURATION = {
         },
         // OVM and SplitV2 Contract Addresses
         OVM_FACTORY_CONTRACT: {
-            address: '0x6F13d929C783a420AE4DC71C1dcc27A02038Ed09',
+            address: '0x885E7D97E3987BA57EF0d693C508d675e4Bf82FC',
             bytecode: bytecodes_1.HOODI_OVM_FACTORY_BYTECODE,
         },
         WAREHOUSE_CONTRACT: {

package/dist/cjs/src/splits/splitHelpers.js

@@ -12,14 +12,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.depositWithMulticall3 = exports.requestWithdrawalFromOVM = exports.deployOVMAndSplitV2 = exports.deployOVMContract = exports.isSplitV2Deployed = exports.predictSplitV2Address = exports.formatRecipientsForSplitV2 = exports.multicall3 = exports.getOWRTranches = exports.deploySplitterAndOWRContracts = exports.deploySplitterContract = exports.handleDeployOWRAndSplitter = exports.predictSplitterAddress = exports.formatSplitRecipients = void 0;
 const ethers_1 = require("ethers");
 const OWR_1 = require("../abi/OWR");
-const OVMFactory_1 = require("../abi/OVMFactory");
+const OVM_1 = require("../abi/OVM");
 const SplitMain_1 = require("../abi/SplitMain");
 const constants_1 = require("../constants");
 const splitV2FactoryAbi_1 = require("../abi/splitV2FactoryAbi");
 const Multicall3_1 = require("../abi/Multicall3");
 const splitMainContractInterface = new ethers_1.Interface(SplitMain_1.splitMainEthereumAbi);
 const owrFactoryContractInterface = new ethers_1.Interface(OWR_1.OWRFactoryContract.abi);
-const ovmFactoryContractInterface = new ethers_1.Interface(OVMFactory_1.OVMFactoryContract.abi);
+const ovmFactoryContractInterface = new ethers_1.Interface(OVM_1.OVMFactoryContract.abi);
 const splitV2FactoryInterface = new ethers_1.Interface(splitV2FactoryAbi_1.splitV2FactoryAbi);
 // Helper function to extract common recipient formatting logic
 const formatRecipientsCommon = (recipients) => {
@@ -409,7 +409,7 @@ const deployOVMContract = ({ OVMOwnerAddress, principalRecipient, rewardRecipien
         if (!((_2 = chainConfig === null || chainConfig === void 0 ? void 0 : chainConfig.OVM_FACTORY_CONTRACT) === null || _2 === void 0 ? void 0 : _2.address)) {
             throw new Error(`OVM Factory not configured for chain ${chainId}`);
         }
-        const ovmFactoryContract = new ethers_1.Contract(chainConfig.OVM_FACTORY_CONTRACT.address, OVMFactory_1.OVMFactoryContract.abi, signer);
+        const ovmFactoryContract = new ethers_1.Contract(chainConfig.OVM_FACTORY_CONTRACT.address, OVM_1.OVMFactoryContract.abi, signer);
         const tx = yield ovmFactoryContract.createObolValidatorManager(OVMOwnerAddress, principalRecipient, rewardRecipient, principalThreshold * constants_1.ETHER_TO_GWEI);
         const receipt = yield tx.wait();
         // Extract OVM address from logs
@@ -511,7 +511,7 @@ const requestWithdrawalFromOVM = ({ ovmAddress, pubKeys, amounts, withdrawalFees
     try {
         // Convert string amounts to bigint
         const bigintAmounts = amounts.map(amount => BigInt(amount));
-        const ovmContract = new ethers_1.Contract(ovmAddress, OVMFactory_1.OVMContract.abi, signer);
+        const ovmContract = new ethers_1.Contract(ovmAddress, OVM_1.OVMContract.abi, signer);
         const tx = yield ovmContract.requestWithdrawal(pubKeys, bigintAmounts, {
             value: BigInt(withdrawalFees),
         });
@@ -533,7 +533,7 @@ exports.requestWithdrawalFromOVM = requestWithdrawalFromOVM;
  */
 const depositWithMulticall3 = ({ ovmAddress, deposits, signer, chainId, }) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const ovmContract = new ethers_1.Contract(ovmAddress, OVMFactory_1.OVMContract.abi, signer);
+        const ovmContract = new ethers_1.Contract(ovmAddress, OVM_1.OVMContract.abi, signer);
         const chainConfig = getChainConfig(chainId);
         const multicall3Address = chainConfig.MULTICALL3_CONTRACT.address;
         const multiCall3ContractInstance = new ethers_1.Contract(multicall3Address, Multicall3_1.MultiCall3Contract.abi, signer);

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

@@ -149,19 +149,12 @@ const verifyDVV1X8 = (clusterLock) => {
         }
         // Check deposit amounts match exactly if they are defined
         const depositAmounts = clusterLock.cluster_definition.deposit_amounts;
-        if (depositAmounts !== null) {
+        if (!!depositAmounts && 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])) {
+            // Check that partialDepositAmounts includes all unique elements of depositAmounts
+            const uniqueDepositAmounts = [...new Set(depositAmounts.map(Number))];
+            const partialAmountsSet = new Set(partialDepositAmounts.map(Number));
+            if (!uniqueDepositAmounts.every(amount => partialAmountsSet.has(amount))) {
                 return false;
             }
         }

package/dist/cjs/test/eoa/eoa.spec.js

@@ -101,7 +101,7 @@ describe('EOA', () => {
             {
                 pubkey: '0x123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456',
                 withdrawal_credentials: '0x1234567890123456789012345678901234567890123456789012345678901234',
-                deposit_data_root: "0x7f7f280756b8d5fe06ae922e5a20afb708c0f00d8954caede4c262795d956c01",
+                deposit_data_root: '0x7f7f280756b8d5fe06ae922e5a20afb708c0f00d8954caede4c262795d956c01',
                 signature: '0x121234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012000000000000000000',
                 amount: '32000000000000000000', // 32 ETH in wei
             },
@@ -143,14 +143,14 @@ describe('EOA', () => {
                 {
                     pubkey: '0x123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456',
                     withdrawal_credentials: '0x1234567890123456789012345678901234567890123456789012345678901234',
-                    deposit_data_root: "0x7f7f280756b8d5fe06ae922e5a20afb708c0f00d8954caede4c262795d956c01",
+                    deposit_data_root: '0x7f7f280756b8d5fe06ae922e5a20afb708c0f00d8954caede4c262795d956c01',
                     signature: '0x121234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012000000000000000000',
                     amount: '32000000000000000000',
                 },
                 {
                     pubkey: '0xabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdcd',
                     withdrawal_credentials: '0xabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcd',
-                    deposit_data_root: "0x7f7f280756b8d5fe06ae922e5a20afb708c0f00d8954caede4c262795d956c01",
+                    deposit_data_root: '0x7f7f280756b8d5fe06ae922e5a20afb708c0f00d8954caede4c262795d956c01',
                     signature: '0x121234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012000000000000000000',
                     amount: '16000000000000000000',
                 },

package/dist/esm/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@obolnetwork/obol-sdk",
-    "version": "2.11.2",
+    "version": "2.11.4",
     "description": "A package for creating Distributed Validators using the Obol API.",
     "bugs": {
         "url": "https://github.com/obolnetwork/obol-sdk/issues"