@obolnetwork/obol-sdk 2.7.0 → 2.8.1

package/dist/esm/src/index.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { v4 as uuidv4 } from 'uuid';
 import { Base } from './base.js';
-import { CONFLICT_ERROR_MSG, CreatorConfigHashSigningTypes, Domain, DKG_ALGORITHM, CONFIG_VERSION, OperatorConfigHashSigningTypes, EnrSigningTypes, TERMS_AND_CONDITIONS_VERSION, TermsAndConditionsSigningTypes, DEFAULT_BASE_VERSION, TERMS_AND_CONDITIONS_HASH, AVAILABLE_SPLITTER_CHAINS, CHAIN_CONFIGURATION, DEFAULT_RETROACTIVE_FUNDING_REWARDS_ONLY_SPLIT, OBOL_SDK_EMAIL, } from './constants.js';
+import { CONFLICT_ERROR_MSG, CreatorConfigHashSigningTypes, Domain, DKG_ALGORITHM, CONFIG_VERSION, OperatorConfigHashSigningTypes, EnrSigningTypes, TERMS_AND_CONDITIONS_VERSION, TermsAndConditionsSigningTypes, DEFAULT_BASE_VERSION, TERMS_AND_CONDITIONS_HASH, CHAIN_CONFIGURATION, DEFAULT_RETROACTIVE_FUNDING_REWARDS_ONLY_SPLIT, OBOL_SDK_EMAIL, isChainSupportedForSplitters, } from './constants.js';
 import { ConflictError } from './errors.js';
 import { clusterConfigOrDefinitionHash } from './verification/common.js';
 import { validatePayload } from './ajv.js';
@@ -18,6 +18,7 @@ import { deploySplitterContract, formatSplitRecipients, handleDeployOWRAndSplitt
 import { isContractAvailable } from './utils.js';
 import { Incentives } from './incentives/incentives.js';
 import { Exit } from './exits/exit.js';
+import { ObolSplits } from './splits/splits.js';
 export * from './types.js';
 export * from './services.js';
 export * from './verification/signature-validator.js';
@@ -25,6 +26,7 @@ export * from './verification/common.js';
 export * from './constants.js';
 export { Incentives } from './incentives/incentives.js';
 export { Exit } from './exits/exit.js';
+export { ObolSplits } from './splits/splits.js';
 /**
  * Obol sdk Client can be used for creating, managing and activating distributed validators.
  */
@@ -47,6 +49,7 @@ export class Client extends Base {
             provider !== null && provider !== void 0 ? provider : (signer && 'provider' in signer ? signer.provider : undefined);
         this.incentives = new Incentives(this.signer, this.chainId, this.request.bind(this), this.provider);
         this.exit = new Exit(this.chainId, this.provider);
+        this.splits = new ObolSplits(this.signer, this.chainId, this.provider);
     }
     /**
      * Accepts Obol terms and conditions to be able to create or update data.
@@ -121,19 +124,23 @@ export class Client extends Base {
                 recoveryAddress,
             }, rewardsSplitterPayloadSchema);
             // Check if we allow splitters on this chainId
-            if (!AVAILABLE_SPLITTER_CHAINS.includes(this.chainId)) {
+            if (!isChainSupportedForSplitters(this.chainId)) {
                 throw new Error(`Splitter configuration is not supported on ${this.chainId} chain`);
             }
-            const checkSplitMainAddress = yield isContractAvailable(CHAIN_CONFIGURATION[this.chainId].SPLITMAIN_ADDRESS.address, this.signer.provider, CHAIN_CONFIGURATION[this.chainId].SPLITMAIN_ADDRESS.bytecode);
-            const checkMulticallAddress = yield isContractAvailable(CHAIN_CONFIGURATION[this.chainId].MULTICALL_ADDRESS.address, this.signer.provider, CHAIN_CONFIGURATION[this.chainId].MULTICALL_ADDRESS.bytecode);
-            const checkOWRFactoryAddress = yield isContractAvailable(CHAIN_CONFIGURATION[this.chainId].OWR_FACTORY_ADDRESS.address, this.signer.provider, CHAIN_CONFIGURATION[this.chainId].OWR_FACTORY_ADDRESS.bytecode);
+            const chainConfig = CHAIN_CONFIGURATION[this.chainId];
+            if (!(chainConfig === null || chainConfig === void 0 ? void 0 : chainConfig.SPLITMAIN_CONTRACT)) {
+                throw new Error(`SPLITMAIN_CONTRACT is not configured for chain ${this.chainId}`);
+            }
+            const checkSplitMainAddress = yield isContractAvailable(chainConfig.SPLITMAIN_CONTRACT.address, this.signer.provider, chainConfig.SPLITMAIN_CONTRACT.bytecode);
+            const checkMulticallAddress = yield isContractAvailable(chainConfig.MULTICALL_CONTRACT.address, this.signer.provider, chainConfig.MULTICALL_CONTRACT.bytecode);
+            const checkOWRFactoryAddress = yield isContractAvailable(chainConfig.OWR_FACTORY_CONTRACT.address, this.signer.provider, chainConfig.OWR_FACTORY_CONTRACT.bytecode);
             if (!checkMulticallAddress ||
                 !checkSplitMainAddress ||
                 !checkOWRFactoryAddress) {
                 throw new Error(`Something isn not working as expected, check this issue with obol-sdk team on ${OBOL_SDK_EMAIL}`);
             }
             const retroActiveFundingRecipient = {
-                account: CHAIN_CONFIGURATION[this.chainId].RETROACTIVE_FUNDING_ADDRESS.address,
+                account: chainConfig.RETROACTIVE_FUNDING_CONTRACT.address,
                 percentAllocation: validatedPayload.ObolRAFSplit,
             };
             const copiedSplitRecipients = [...validatedPayload.splitRecipients];
@@ -191,15 +198,19 @@ export class Client extends Base {
                 controllerAddress,
             }, totalSplitterPayloadSchema);
             // Check if we allow splitters on this chainId
-            if (!AVAILABLE_SPLITTER_CHAINS.includes(this.chainId)) {
+            if (!isChainSupportedForSplitters(this.chainId)) {
                 throw new Error(`Splitter configuration is not supported on ${this.chainId} chain`);
             }
-            const checkSplitMainAddress = yield isContractAvailable(CHAIN_CONFIGURATION[this.chainId].SPLITMAIN_ADDRESS.address, this.signer.provider, CHAIN_CONFIGURATION[this.chainId].SPLITMAIN_ADDRESS.bytecode);
+            const chainConfig = CHAIN_CONFIGURATION[this.chainId];
+            if (!(chainConfig === null || chainConfig === void 0 ? void 0 : chainConfig.SPLITMAIN_CONTRACT)) {
+                throw new Error(`SPLITMAIN_CONTRACT is not configured for chain ${this.chainId}`);
+            }
+            const checkSplitMainAddress = yield isContractAvailable(chainConfig.SPLITMAIN_CONTRACT.address, this.signer.provider, chainConfig.SPLITMAIN_CONTRACT.bytecode);
             if (!checkSplitMainAddress) {
                 throw new Error(`Something isn not working as expected, check this issue with obol-sdk team on ${OBOL_SDK_EMAIL}`);
             }
             const retroActiveFundingRecipient = {
-                account: CHAIN_CONFIGURATION[this.chainId].RETROACTIVE_FUNDING_ADDRESS.address,
+                account: chainConfig.RETROACTIVE_FUNDING_CONTRACT.address,
                 percentAllocation: validatedPayload.ObolRAFSplit,
             };
             const copiedSplitRecipients = [...validatedPayload.splitRecipients];

package/dist/esm/src/schema.js

@@ -1,5 +1,5 @@
 import { ZeroAddress } from 'ethers';
-import { DEFAULT_RETROACTIVE_FUNDING_REWARDS_ONLY_SPLIT, DEFAULT_RETROACTIVE_FUNDING_TOTAL_SPLIT, } from './constants';
+import { DEFAULT_RETROACTIVE_FUNDING_REWARDS_ONLY_SPLIT, DEFAULT_RETROACTIVE_FUNDING_TOTAL_SPLIT, PRINCIPAL_THRESHOLD, } from './constants';
 import { VALID_DEPOSIT_AMOUNTS, VALID_NON_COMPOUNDING_AMOUNTS } from './ajv';
 export const operatorPayloadSchema = {
     type: 'object',
@@ -137,3 +137,72 @@ export const rewardsSplitterPayloadSchema = {
     validateRewardsSplitRecipients: true,
     required: ['splitRecipients', 'principalRecipient', 'etherAmount'],
 };
+export const ovmBaseSplitPayload = {
+    rewardSplitRecipients: {
+        type: 'array',
+        items: {
+            type: 'object',
+            properties: {
+                address: {
+                    type: 'string',
+                    pattern: '^0x[a-fA-F0-9]{40}$',
+                },
+                percentAllocation: { type: 'number' },
+            },
+            required: ['address', 'percentAllocation'],
+        },
+    },
+    OVMOwnerAddress: {
+        type: 'string',
+        pattern: '^0x[a-fA-F0-9]{40}$',
+    },
+    splitOwnerAddress: {
+        type: 'string',
+        pattern: '^0x[a-fA-F0-9]{40}$',
+        default: ZeroAddress,
+    },
+    principalThreshold: {
+        type: 'number',
+        minimum: 16,
+        default: PRINCIPAL_THRESHOLD,
+    },
+    distributorFeePercent: {
+        type: 'number',
+        minimum: 0,
+        maximum: 10,
+        default: 0,
+    },
+};
+export const ovmRewardsSplitPayloadSchema = {
+    type: 'object',
+    properties: Object.assign(Object.assign({}, ovmBaseSplitPayload), { principalRecipient: {
+            type: 'string',
+            pattern: '^0x[a-fA-F0-9]{40}$',
+        } }),
+    validateOVMRewardsSplitRecipients: true,
+    required: ['rewardSplitRecipients', 'OVMOwnerAddress', 'principalRecipient'],
+};
+export const ovmTotalSplitPayloadSchema = {
+    type: 'object',
+    properties: Object.assign(Object.assign({}, ovmBaseSplitPayload), { principalSplitRecipients: {
+            type: 'array',
+            items: {
+                type: 'object',
+                properties: {
+                    address: {
+                        type: 'string',
+                        pattern: '^0x[a-fA-F0-9]{40}$',
+                    },
+                    percentAllocation: { type: 'number' },
+                },
+                required: ['address', 'percentAllocation'],
+            },
+        } }),
+    validateOVMRewardsSplitRecipients: true,
+    validateOVMTotalSplitRecipients: true,
+    required: [
+        'rewardSplitRecipients',
+        'principalSplitRecipients',
+        'OVMOwnerAddress',
+    ],
+};

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

@@ -9,17 +9,34 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { Contract, Interface, parseEther, ZeroAddress } from 'ethers';
 import { OWRContract, OWRFactoryContract } from '../abi/OWR';
+import { OVMFactoryContract } from '../abi/OVMFactory';
 import { splitMainEthereumAbi } from '../abi/SplitMain';
 import { MultiCallContract } from '../abi/Multicall';
 import { CHAIN_CONFIGURATION } from '../constants';
+import { splitV2FactoryAbi } from '../abi/splitV2FactoryAbi';
 const splitMainContractInterface = new Interface(splitMainEthereumAbi);
 const owrFactoryContractInterface = new Interface(OWRFactoryContract.abi);
-export const formatSplitRecipients = (recipients) => {
+const ovmFactoryContractInterface = new Interface(OVMFactoryContract.abi);
+const splitV2FactoryInterface = new Interface(splitV2FactoryAbi);
+// Helper function to extract common recipient formatting logic
+const formatRecipientsCommon = (recipients) => {
+    const copiedRecipients = [...recipients];
+    // Handle both SplitRecipient and SplitV2Recipient types
+    const getAddress = (item) => item.account || item.address;
+    const getPercentAllocation = (item) => item.percentAllocation;
     // Has to be sorted when passed
-    recipients.sort((a, b) => a.account.localeCompare(b.account));
-    const accounts = recipients.map(item => item.account);
-    const percentAllocations = recipients.map(recipient => {
-        const splitTostring = (recipient.percentAllocation * 1e4).toFixed(0);
+    copiedRecipients.sort((a, b) => getAddress(a).localeCompare(getAddress(b)));
+    return {
+        sortedRecipients: copiedRecipients,
+        getAddress,
+        getPercentAllocation,
+    };
+};
+export const formatSplitRecipients = (recipients) => {
+    const { sortedRecipients, getAddress, getPercentAllocation } = formatRecipientsCommon(recipients);
+    const accounts = sortedRecipients.map(item => getAddress(item));
+    const percentAllocations = sortedRecipients.map(recipient => {
+        const splitTostring = (getPercentAllocation(recipient) * 1e4).toFixed(0);
         return parseInt(splitTostring);
     });
     return { accounts, percentAllocations };
@@ -27,7 +44,7 @@ export const formatSplitRecipients = (recipients) => {
 export const predictSplitterAddress = ({ signer, accounts, percentAllocations, chainId, distributorFee, controllerAddress, }) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b, _c;
     try {
-        const splitMainContractInstance = new Contract(CHAIN_CONFIGURATION[chainId].SPLITMAIN_ADDRESS.address, splitMainEthereumAbi, signer);
+        const splitMainContractInstance = new Contract(getChainConfig(chainId).SPLITMAIN_CONTRACT.address, splitMainEthereumAbi, signer);
         let predictedSplitterAddress;
         if (controllerAddress === ZeroAddress) {
             try {
@@ -128,7 +145,7 @@ export const handleDeployOWRAndSplitter = ({ signer, isSplitterDeployed, predict
 const createOWRContract = ({ owrArgs, signer, chainId, }) => __awaiter(void 0, void 0, void 0, function* () {
     var _g, _h, _j, _k, _l;
     try {
-        const OWRFactoryInstance = new Contract(CHAIN_CONFIGURATION[chainId].OWR_FACTORY_ADDRESS.address, OWRFactoryContract.abi, signer);
+        const OWRFactoryInstance = new Contract(getChainConfig(chainId).OWR_FACTORY_CONTRACT.address, OWRFactoryContract.abi, signer);
         let tx;
         try {
             tx = yield OWRFactoryInstance.createOWRecipient(owrArgs.recoveryAddress, owrArgs.principalRecipient, owrArgs.predictedSplitterAddress, parseEther(owrArgs.amountOfPrincipalStake.toString()));
@@ -172,7 +189,7 @@ const createOWRContract = ({ owrArgs, signer, chainId, }) => __awaiter(void 0, v
 export const deploySplitterContract = ({ signer, accounts, percentAllocations, chainId, distributorFee, controllerAddress, }) => __awaiter(void 0, void 0, void 0, function* () {
     var _m, _o, _p, _q, _r;
     try {
-        const splitMainContractInstance = new Contract(CHAIN_CONFIGURATION[chainId].SPLITMAIN_ADDRESS.address, splitMainEthereumAbi, signer);
+        const splitMainContractInstance = new Contract(getChainConfig(chainId).SPLITMAIN_CONTRACT.address, splitMainEthereumAbi, signer);
         let tx;
         try {
             tx = yield splitMainContractInstance.createSplit(accounts, percentAllocations, distributorFee, controllerAddress);
@@ -219,14 +236,13 @@ export const deploySplitterAndOWRContracts = ({ owrArgs, splitterArgs, signer, c
     const splitTxData = encodeCreateSplitTxData(splitterArgs.accounts, splitterArgs.percentAllocations, splitterArgs.distributorFee, splitterArgs.controllerAddress);
     const owrTxData = encodeCreateOWRecipientTxData(owrArgs.recoveryAddress, owrArgs.principalRecipient, owrArgs.predictedSplitterAddress, owrArgs.amountOfPrincipalStake);
     executeCalls.push({
-        target: CHAIN_CONFIGURATION[chainId].SPLITMAIN_ADDRESS.address,
+        target: getChainConfig(chainId).SPLITMAIN_CONTRACT.address,
         callData: splitTxData,
     }, {
-        target: CHAIN_CONFIGURATION[chainId].OWR_FACTORY_ADDRESS.address,
+        target: getChainConfig(chainId).OWR_FACTORY_CONTRACT.address,
         callData: owrTxData,
     });
-    const multicallAddess = CHAIN_CONFIGURATION[chainId].MULTICALL_ADDRESS.address;
-    const executeMultiCalls = yield multicall(executeCalls, signer, multicallAddess);
+    const executeMultiCalls = yield multicall(executeCalls, signer, chainId);
     const splitAddressData = (_s = executeMultiCalls === null || executeMultiCalls === void 0 ? void 0 : executeMultiCalls.logs[0]) === null || _s === void 0 ? void 0 : _s.topics[1];
     const formattedSplitterAddress = '0x' + (splitAddressData === null || splitAddressData === void 0 ? void 0 : splitAddressData.slice(26, 66));
     const owrAddressData = (_t = executeMultiCalls === null || executeMultiCalls === void 0 ? void 0 : executeMultiCalls.logs[1]) === null || _t === void 0 ? void 0 : _t.topics[1];
@@ -266,9 +282,11 @@ export const getOWRTranches = ({ owrAddress, signer, }) => __awaiter(void 0, voi
         throw new Error(`Unexpected error in getOWRTranches: ${(_v = error.message) !== null && _v !== void 0 ? _v : 'Unknown error while fetching OWR tranche data'}`);
     }
 });
-export const multicall = (calls, signer, multicallAddress) => __awaiter(void 0, void 0, void 0, function* () {
+export const multicall = (calls, signer, chainId) => __awaiter(void 0, void 0, void 0, function* () {
     var _w, _x, _y;
     try {
+        const chainConfig = getChainConfig(chainId);
+        const multicallAddress = chainConfig.MULTICALL_CONTRACT.address;
         const multiCallContractInstance = new Contract(multicallAddress, MultiCallContract.abi, signer);
         let tx;
         try {
@@ -315,3 +333,154 @@ const encodeCreateOWRecipientTxData = (recoveryAddress, principalRecipient, rewa
         parseEther(amountOfPrincipalStake.toString()),
     ]);
 };
+// OVM and SplitV2 Helper Functions
+// Helper function to format recipients specifically for SplitV2 (returns SplitV2Recipient[])
+export const formatRecipientsForSplitV2 = (splitRecipients) => {
+    const { sortedRecipients, getAddress, getPercentAllocation } = formatRecipientsCommon(splitRecipients);
+    return sortedRecipients
+        .filter(item => getAddress(item) !== '')
+        .map(item => ({
+        address: getAddress(item),
+        percentAllocation: parseFloat(getPercentAllocation(item).toString()),
+    }));
+};
+// Helper function to create SplitV2 parameters
+const createSplitV2Params = (recipients, distributorFeePercent) => {
+    const addresses = recipients.map(r => r.address);
+    const allocations = recipients.map(r => Math.floor(r.percentAllocation * 1e4)); // Convert to basis points
+    const totalAllocation = allocations.reduce((sum, allocation) => sum + allocation, 0);
+    return {
+        recipients: addresses,
+        allocations,
+        totalAllocation,
+        distributionIncentive: distributorFeePercent,
+    };
+};
+export const predictSplitV2Address = ({ splitOwnerAddress, recipients, distributorFeePercent, salt, signer, chainId, }) => __awaiter(void 0, void 0, void 0, function* () {
+    var _z, _0;
+    try {
+        const chainConfig = getChainConfig(chainId);
+        if (!((_z = chainConfig === null || chainConfig === void 0 ? void 0 : chainConfig.SPLIT_V2_FACTORY_CONTRACT) === null || _z === void 0 ? void 0 : _z.address)) {
+            throw new Error(`SplitV2 Factory not configured for chain ${chainId}`);
+        }
+        const splitV2FactoryContract = new Contract(chainConfig.SPLIT_V2_FACTORY_CONTRACT.address, splitV2FactoryAbi, signer);
+        const splitParams = createSplitV2Params(recipients, distributorFeePercent);
+        const predictedAddress = yield splitV2FactoryContract['predictDeterministicAddress((address[],uint256[],uint256,uint16),address,bytes32)'](splitParams, splitOwnerAddress, salt);
+        return predictedAddress;
+    }
+    catch (error) {
+        throw new Error(`Failed to predict SplitV2 address: ${(_0 = error.message) !== null && _0 !== void 0 ? _0 : 'SplitV2 contract call failed'}`);
+    }
+});
+export const isSplitV2Deployed = ({ splitOwnerAddress, recipients, distributorFeePercent, salt, signer, chainId, }) => __awaiter(void 0, void 0, void 0, function* () {
+    var _1;
+    try {
+        const chainConfig = getChainConfig(chainId);
+        if (!((_1 = chainConfig === null || chainConfig === void 0 ? void 0 : chainConfig.SPLIT_V2_FACTORY_CONTRACT) === null || _1 === void 0 ? void 0 : _1.address)) {
+            throw new Error(`SplitV2 Factory not configured for chain ${chainId}`);
+        }
+        const splitV2FactoryContract = new Contract(chainConfig.SPLIT_V2_FACTORY_CONTRACT.address, splitV2FactoryAbi, signer);
+        const splitParams = createSplitV2Params(recipients, distributorFeePercent);
+        const [, exists] = yield splitV2FactoryContract.isDeployed(splitParams, splitOwnerAddress, salt);
+        return exists;
+    }
+    catch (error) {
+        // If the check fails, assume it's not deployed
+        return false;
+    }
+});
+export const deployOVMContract = ({ OVMOwnerAddress, principalRecipient, rewardRecipient, principalThreshold, signer, chainId, }) => __awaiter(void 0, void 0, void 0, function* () {
+    var _2, _3, _4;
+    try {
+        const chainConfig = getChainConfig(chainId);
+        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 Contract(chainConfig.OVM_FACTORY_CONTRACT.address, OVMFactoryContract.abi, signer);
+        const tx = yield ovmFactoryContract.createObolValidatorManager(OVMOwnerAddress, principalRecipient, rewardRecipient, principalThreshold);
+        const receipt = yield tx.wait();
+        // Extract OVM address from logs
+        const ovmAddressLog = (_3 = receipt === null || receipt === void 0 ? void 0 : receipt.logs[1]) === null || _3 === void 0 ? void 0 : _3.topics[1];
+        if (!ovmAddressLog) {
+            throw new Error('Failed to extract OVM address from transaction logs');
+        }
+        const ovmAddress = '0x' + ovmAddressLog.slice(26, 66);
+        return ovmAddress;
+    }
+    catch (error) {
+        throw new Error(`Failed to deploy OVM contract: ${(_4 = error.message) !== null && _4 !== void 0 ? _4 : 'OVM deployment failed'}`);
+    }
+});
+export const deployOVMAndSplitV2 = ({ ovmArgs, rewardRecipients, isRewardsSplitterDeployed, distributorFeePercent, salt, signer, chainId, principalSplitRecipients, isPrincipalSplitDeployed, splitOwnerAddress, }) => __awaiter(void 0, void 0, void 0, function* () {
+    var _5, _6, _7, _8, _9, _10, _11, _12, _13, _14;
+    try {
+        const chainConfig = getChainConfig(chainId);
+        if (!((_5 = chainConfig === null || chainConfig === void 0 ? void 0 : chainConfig.OVM_FACTORY_CONTRACT) === null || _5 === void 0 ? void 0 : _5.address)) {
+            throw new Error(`OVM Factory not configured for chain ${chainId}`);
+        }
+        if (!((_6 = chainConfig === null || chainConfig === void 0 ? void 0 : chainConfig.SPLIT_V2_FACTORY_CONTRACT) === null || _6 === void 0 ? void 0 : _6.address)) {
+            throw new Error(`SplitV2 Factory not configured for chain ${chainId}`);
+        }
+        const executeCalls = [];
+        if (rewardRecipients && !isRewardsSplitterDeployed) {
+            // Create rewards split call data
+            const splitParams = createSplitV2Params(rewardRecipients, distributorFeePercent);
+            const rewardsSplitTxData = encodeCreateSplitV2DeterministicTxData(splitParams, splitOwnerAddress, salt);
+            executeCalls.push({
+                target: chainConfig.SPLIT_V2_FACTORY_CONTRACT.address,
+                callData: rewardsSplitTxData,
+            });
+        }
+        // Create principal split call data if needed (for total split scenario)
+        if (principalSplitRecipients && !isPrincipalSplitDeployed) {
+            const principalSplitParams = createSplitV2Params(principalSplitRecipients, distributorFeePercent);
+            const principalSplitTxData = encodeCreateSplitV2DeterministicTxData(principalSplitParams, splitOwnerAddress, salt);
+            executeCalls.push({
+                target: chainConfig.SPLIT_V2_FACTORY_CONTRACT.address,
+                callData: principalSplitTxData,
+            });
+        }
+        // Create OVM call data
+        const ovmTxData = encodeCreateOVMTxData(ovmArgs.OVMOwnerAddress, ovmArgs.principalRecipient, ovmArgs.rewardRecipient, ovmArgs.principalThreshold);
+        executeCalls.push({
+            target: chainConfig.OVM_FACTORY_CONTRACT.address,
+            callData: ovmTxData,
+        });
+        // Execute multicall
+        const executeMultiCalls = yield multicall(executeCalls, signer, chainId);
+        // Extract addresses from events
+        let ovmAddress;
+        const logsCount = ((_7 = executeMultiCalls === null || executeMultiCalls === void 0 ? void 0 : executeMultiCalls.logs) === null || _7 === void 0 ? void 0 : _7.length) || 0;
+        if (logsCount === 2) {
+            ovmAddress = '0x' + ((_9 = (_8 = executeMultiCalls === null || executeMultiCalls === void 0 ? void 0 : executeMultiCalls.logs[1]) === null || _8 === void 0 ? void 0 : _8.topics[1]) === null || _9 === void 0 ? void 0 : _9.slice(26, 66));
+        }
+        else if (logsCount === 5) {
+            ovmAddress = '0x' + ((_11 = (_10 = executeMultiCalls === null || executeMultiCalls === void 0 ? void 0 : executeMultiCalls.logs[4]) === null || _10 === void 0 ? void 0 : _10.topics[1]) === null || _11 === void 0 ? void 0 : _11.slice(26, 66));
+        }
+        else {
+            ovmAddress = '0x' + ((_13 = (_12 = executeMultiCalls === null || executeMultiCalls === void 0 ? void 0 : executeMultiCalls.logs[7]) === null || _12 === void 0 ? void 0 : _12.topics[1]) === null || _13 === void 0 ? void 0 : _13.slice(26, 66));
+        }
+        if (!ovmAddress) {
+            throw new Error('Failed to extract contract addresses from multicall events');
+        }
+        return ovmAddress;
+    }
+    catch (error) {
+        throw new Error(`Failed to deploy OVM and SplitV2: ${(_14 = error.message) !== null && _14 !== void 0 ? _14 : 'Deployment failed'}`);
+    }
+});
+const encodeCreateOVMTxData = (OVMOwnerAddress, principalRecipient, rewardRecipient, principalThreshold) => {
+    return ovmFactoryContractInterface.encodeFunctionData('createObolValidatorManager', [OVMOwnerAddress, principalRecipient, rewardRecipient, principalThreshold]);
+};
+const encodeCreateSplitV2DeterministicTxData = (splitParams, splitOwnerAddress, salt) => {
+    // creatorAddress can be kept as default https://docs.splits.org/sdk/splits-v2#createsplit
+    return splitV2FactoryInterface.encodeFunctionData('createSplitDeterministic', [splitParams, splitOwnerAddress, ZeroAddress, salt]);
+};
+// Helper function to safely get chain configuration
+const getChainConfig = (chainId) => {
+    const config = CHAIN_CONFIGURATION[chainId];
+    if (!config) {
+        throw new Error(`Chain configuration not found for chain ID ${chainId}`);
+    }
+    return config;
+};