@obolnetwork/obol-sdk 2.8.0 → 2.9.0

package/dist/esm/src/constants.js

@@ -1,6 +1,6 @@
 import pjson from '../package.json';
 import { FORK_MAPPING } from './types';
-import { HOLESKY_MULTICALL_BYTECODE, HOLESKY_OWR_FACTORY_BYTECODE, HOLESKY_SPLITMAIN_BYTECODE, HOODI_MULTICALL_BYTECODE, HOODI_OVM_FACTORY_BYTECODE, HOODI_OWR_FACTORY_BYTECODE, HOODI_SPLITMAIN_BYTECODE, HOODI_WAREHOUSE_BYTECODE, MAINNET_MULTICALL_BYTECODE, MAINNET_OVM_FACTORY_BYTECODE, MAINNET_OWR_FACTORY_BYTECODE, MAINNET_SPLITMAIN_BYTECODE, MAINNET_WAREHOUSE_BYTECODE, } from './bytecodes';
+import { HOLESKY_MULTICALL_BYTECODE, HOLESKY_OWR_FACTORY_BYTECODE, HOLESKY_SPLITMAIN_BYTECODE, HOODI_MULTICALL_BYTECODE, HOODI_OVM_FACTORY_BYTECODE, HOODI_OWR_FACTORY_BYTECODE, HOODI_SPLIT_V2_FACTORY_BYTECODE, HOODI_SPLITMAIN_BYTECODE, HOODI_WAREHOUSE_BYTECODE, MAINNET_MULTICALL_BYTECODE, MAINNET_OVM_FACTORY_BYTECODE, MAINNET_OWR_FACTORY_BYTECODE, MAINNET_SPLIT_V2_FACTORY_BYTECODE, MAINNET_SPLITMAIN_BYTECODE, MAINNET_WAREHOUSE_BYTECODE, } from './bytecodes';
 import * as dotenv from 'dotenv';
 dotenv.config();
 export const CONFLICT_ERROR_MSG = 'Conflict';
@@ -108,76 +108,84 @@ export const isChainSupportedForSplitters = (chainId) => {
 };
 export const CHAIN_CONFIGURATION = {
     [FORK_MAPPING['0x00000000']]: {
-        SPLITMAIN_ADDRESS: {
+        SPLITMAIN_CONTRACT: {
             address: '0x2ed6c4B5dA6378c7897AC67Ba9e43102Feb694EE',
             bytecode: MAINNET_SPLITMAIN_BYTECODE,
         },
-        MULTICALL_ADDRESS: {
+        MULTICALL_CONTRACT: {
             address: '0xeefba1e63905ef1d7acba5a8513c70307c1ce441',
             bytecode: MAINNET_MULTICALL_BYTECODE,
         },
-        OWR_FACTORY_ADDRESS: {
+        OWR_FACTORY_CONTRACT: {
             address: '0x119acd7844cbdd5fc09b1c6a4408f490c8f7f522',
             bytecode: MAINNET_OWR_FACTORY_BYTECODE,
         },
-        RETROACTIVE_FUNDING_ADDRESS: {
+        RETROACTIVE_FUNDING_CONTRACT: {
             address: '0xDe5aE4De36c966747Ea7DF13BD9589642e2B1D0d',
             bytecode: '',
         },
         // OVM and SplitV2 Contract Addresses
-        OVM_FACTORY_ADDRESS: {
+        OVM_FACTORY_CONTRACT: {
             address: '0xdfe2d8b26806583cf03b3cb623b0752f8670e93e',
             bytecode: MAINNET_OVM_FACTORY_BYTECODE,
         },
-        WAREHOUSE_ADDRESS: {
+        WAREHOUSE_CONTRACT: {
             address: '0x8fb66F38cF86A3d5e8768f8F1754A24A6c661Fb8',
             bytecode: MAINNET_WAREHOUSE_BYTECODE,
         },
+        SPLIT_V2_FACTORY_CONTRACT: {
+            address: '0x5cbA88D55Cec83caD5A105Ad40C8c9aF20bE21d1',
+            bytecode: MAINNET_SPLIT_V2_FACTORY_BYTECODE,
+        },
     },
     [FORK_MAPPING['0x01017000']]: {
-        SPLITMAIN_ADDRESS: {
+        SPLITMAIN_CONTRACT: {
             address: '0xfC8a305728051367797DADE6Aa0344E0987f5286',
             bytecode: HOLESKY_SPLITMAIN_BYTECODE,
         },
-        MULTICALL_ADDRESS: {
+        MULTICALL_CONTRACT: {
             address: '0xcA11bde05977b3631167028862bE2a173976CA11',
             bytecode: HOLESKY_MULTICALL_BYTECODE,
         },
-        OWR_FACTORY_ADDRESS: {
+        OWR_FACTORY_CONTRACT: {
             address: '0xc0961353fcc43a99e3041db07ac646720e116256',
             bytecode: HOLESKY_OWR_FACTORY_BYTECODE,
         },
-        RETROACTIVE_FUNDING_ADDRESS: {
+        RETROACTIVE_FUNDING_CONTRACT: {
             address: '0x43F641fA70e09f0326ac66b4Ef0C416EaEcBC6f5',
             bytecode: '',
         },
     },
     [FORK_MAPPING['0x10000910']]: {
-        SPLITMAIN_ADDRESS: {
+        SPLITMAIN_CONTRACT: {
             address: '0xc05ae267291705ac16F75283572294ed2a91CBc7',
             bytecode: HOODI_SPLITMAIN_BYTECODE,
         },
-        MULTICALL_ADDRESS: {
+        MULTICALL_CONTRACT: {
             address: '0xcA11bde05977b3631167028862bE2a173976CA11',
             bytecode: HOODI_MULTICALL_BYTECODE,
         },
-        OWR_FACTORY_ADDRESS: {
+        OWR_FACTORY_CONTRACT: {
             address: '0x9ff0c649d0bf5fe7efa4d72e94bed7302ed5c8d7',
             bytecode: HOODI_OWR_FACTORY_BYTECODE,
         },
-        RETROACTIVE_FUNDING_ADDRESS: {
+        RETROACTIVE_FUNDING_CONTRACT: {
             address: '0x43F641fA70e09f0326ac66b4Ef0C416EaEcBC6f5',
             bytecode: '',
         },
         // OVM and SplitV2 Contract Addresses
-        OVM_FACTORY_ADDRESS: {
+        OVM_FACTORY_CONTRACT: {
             address: '0x6F13d929C783a420AE4DC71C1dcc27A02038Ed09',
             bytecode: HOODI_OVM_FACTORY_BYTECODE,
         },
-        WAREHOUSE_ADDRESS: {
+        WAREHOUSE_CONTRACT: {
             address: '0x8fb66F38cF86A3d5e8768f8F1754A24A6c661Fb8',
             bytecode: HOODI_WAREHOUSE_BYTECODE,
         },
+        SPLIT_V2_FACTORY_CONTRACT: {
+            address: '0x5cbA88D55Cec83caD5A105Ad40C8c9aF20bE21d1',
+            bytecode: HOODI_SPLIT_V2_FACTORY_BYTECODE,
+        },
     },
 };
 export const DEFAULT_RETROACTIVE_FUNDING_REWARDS_ONLY_SPLIT = 1;

package/dist/esm/src/index.js

@@ -128,19 +128,19 @@ export class Client extends Base {
                 throw new Error(`Splitter configuration is not supported on ${this.chainId} chain`);
             }
             const chainConfig = CHAIN_CONFIGURATION[this.chainId];
-            if (!(chainConfig === null || chainConfig === void 0 ? void 0 : chainConfig.SPLITMAIN_ADDRESS)) {
-                throw new Error(`SPLITMAIN_ADDRESS is not configured for chain ${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_ADDRESS.address, this.signer.provider, chainConfig.SPLITMAIN_ADDRESS.bytecode);
-            const checkMulticallAddress = yield isContractAvailable(chainConfig.MULTICALL_ADDRESS.address, this.signer.provider, chainConfig.MULTICALL_ADDRESS.bytecode);
-            const checkOWRFactoryAddress = yield isContractAvailable(chainConfig.OWR_FACTORY_ADDRESS.address, this.signer.provider, chainConfig.OWR_FACTORY_ADDRESS.bytecode);
+            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: chainConfig.RETROACTIVE_FUNDING_ADDRESS.address,
+                account: chainConfig.RETROACTIVE_FUNDING_CONTRACT.address,
                 percentAllocation: validatedPayload.ObolRAFSplit,
             };
             const copiedSplitRecipients = [...validatedPayload.splitRecipients];
@@ -202,15 +202,15 @@ export class Client extends Base {
                 throw new Error(`Splitter configuration is not supported on ${this.chainId} chain`);
             }
             const chainConfig = CHAIN_CONFIGURATION[this.chainId];
-            if (!(chainConfig === null || chainConfig === void 0 ? void 0 : chainConfig.SPLITMAIN_ADDRESS)) {
-                throw new Error(`SPLITMAIN_ADDRESS is not configured for chain ${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_ADDRESS.address, this.signer.provider, chainConfig.SPLITMAIN_ADDRESS.bytecode);
+            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: chainConfig.RETROACTIVE_FUNDING_ADDRESS.address,
+                account: chainConfig.RETROACTIVE_FUNDING_CONTRACT.address,
                 percentAllocation: validatedPayload.ObolRAFSplit,
             };
             const copiedSplitRecipients = [...validatedPayload.splitRecipients];

package/dist/esm/src/schema.js

@@ -1,7 +1,6 @@
 import { ZeroAddress } from 'ethers';
 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';
-import { zeroAddress } from 'viem';
 export const operatorPayloadSchema = {
     type: 'object',
     properties: {
@@ -160,7 +159,7 @@ export const ovmBaseSplitPayload = {
     splitOwnerAddress: {
         type: 'string',
         pattern: '^0x[a-fA-F0-9]{40}$',
-        default: zeroAddress,
+        default: ZeroAddress,
     },
     principalThreshold: {
         type: 'number',
@@ -207,3 +206,30 @@ export const ovmTotalSplitPayloadSchema = {
         'OVMOwnerAddress',
     ],
 };
+export const ovmRequestWithdrawalPayloadSchema = {
+    type: 'object',
+    properties: {
+        ovmAddress: {
+            type: 'string',
+            pattern: '^0x[a-fA-F0-9]{40}$',
+        },
+        pubKeys: {
+            type: 'array',
+            minItems: 1,
+            items: {
+                type: 'string',
+                pattern: '^0x[a-fA-F0-9]{96}$', // 48 bytes = 96 hex chars + 0x prefix
+            },
+        },
+        amounts: {
+            type: 'array',
+            minItems: 1,
+            items: {
+                type: 'string',
+                pattern: '^[0-9]+$',
+            },
+        },
+    },
+    validateOVMRequestWithdrawalPayload: true,
+    required: ['ovmAddress', 'pubKeys', 'amounts'],
+};

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

@@ -7,19 +7,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { BrowserProvider, Contract, Interface, parseEther, ZeroAddress, } from 'ethers';
+import { Contract, Interface, parseEther, ZeroAddress } from 'ethers';
 import { OWRContract, OWRFactoryContract } from '../abi/OWR';
-import { OVMFactoryContract } from '../abi/OVMFactory';
+import { OVMFactoryContract, OVMContract } from '../abi/OVMFactory';
 import { splitMainEthereumAbi } from '../abi/SplitMain';
 import { MultiCallContract } from '../abi/Multicall';
-import { CHAIN_CONFIGURATION, CHAIN_PUBLIC_RPC_URL } from '../constants';
-import { SplitsClient } from '@0xsplits/splits-sdk';
-import { createPublicClient, createWalletClient, custom, http } from 'viem';
-import { hoodi, mainnet } from 'viem/chains';
-import { privateKeyToAccount } from 'viem/accounts';
+import { CHAIN_CONFIGURATION } from '../constants';
+import { splitV2FactoryAbi } from '../abi/splitV2FactoryAbi';
 const splitMainContractInterface = new Interface(splitMainEthereumAbi);
 const owrFactoryContractInterface = new Interface(OWRFactoryContract.abi);
 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];
@@ -46,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(getChainConfig(chainId).SPLITMAIN_ADDRESS.address, splitMainEthereumAbi, signer);
+        const splitMainContractInstance = new Contract(getChainConfig(chainId).SPLITMAIN_CONTRACT.address, splitMainEthereumAbi, signer);
         let predictedSplitterAddress;
         if (controllerAddress === ZeroAddress) {
             try {
@@ -147,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(getChainConfig(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()));
@@ -191,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(getChainConfig(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);
@@ -238,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: getChainConfig(chainId).SPLITMAIN_ADDRESS.address,
+        target: getChainConfig(chainId).SPLITMAIN_CONTRACT.address,
         callData: splitTxData,
     }, {
-        target: getChainConfig(chainId).OWR_FACTORY_ADDRESS.address,
+        target: getChainConfig(chainId).OWR_FACTORY_CONTRACT.address,
         callData: owrTxData,
     });
-    const multicallAddess = getChainConfig(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];
@@ -285,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 {
@@ -345,77 +344,45 @@ export const formatRecipientsForSplitV2 = (splitRecipients) => {
         percentAllocation: parseFloat(getPercentAllocation(item).toString()),
     }));
 };
-export const createSplitsClient = (signer, chainId) => __awaiter(void 0, void 0, void 0, function* () {
-    const chain = chainId === 1 ? mainnet : hoodi;
-    const client = createPublicClient({
-        chain,
-        transport: http(CHAIN_PUBLIC_RPC_URL[chainId]),
-    });
-    // convert signer to walletClient
-    if (typeof window !== 'undefined' &&
-        signer.provider instanceof BrowserProvider) {
-        // For browser environment
-        const address = yield signer.getAddress();
-        const viemWalletClient = createWalletClient({
-            account: address,
-            chain,
-            transport: custom(window.ethereum),
-        });
-        return new SplitsClient({
-            publicClient: client,
-            walletClient: viemWalletClient,
-            chainId,
-        });
-    }
-    else {
-        // For non-browser environment, extract private key from signer
-        const signerPrivateKey = signer === null || signer === void 0 ? void 0 : signer.privateKey;
-        if (!signerPrivateKey) {
-            throw new Error('Signer private key not available');
-        }
-        const privateKey = signerPrivateKey.startsWith('0x')
-            ? signerPrivateKey
-            : `0x${signerPrivateKey}`;
-        const scriptAccount = privateKeyToAccount(privateKey);
-        const account = scriptAccount;
-        const viemWalletClient = createWalletClient({
-            account,
-            chain,
-            transport: http(CHAIN_PUBLIC_RPC_URL[chainId]),
-        });
-        return new SplitsClient({
-            publicClient: client,
-            walletClient: viemWalletClient,
-            chainId,
-        });
-    }
-});
+// 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;
+    var _z, _0;
     try {
-        const splitsClient = yield createSplitsClient(signer, chainId);
-        const response = yield splitsClient.splitV2.predictDeterministicAddress({
-            ownerAddress: splitOwnerAddress,
-            recipients,
-            distributorFeePercent,
-            salt,
-        });
-        return response.splitAddress;
+        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: ${(_z = error.message) !== null && _z !== void 0 ? _z : 'SplitV2 SDK call failed'}`);
+        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 splitsClient = yield createSplitsClient(signer, chainId);
-        const response = yield splitsClient.splitV2.isDeployed({
-            ownerAddress: splitOwnerAddress,
-            recipients,
-            distributorFeePercent,
-            salt,
-        });
-        return response.deployed;
+        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
@@ -423,17 +390,17 @@ export const isSplitV2Deployed = ({ splitOwnerAddress, recipients, distributorFe
     }
 });
 export const deployOVMContract = ({ OVMOwnerAddress, principalRecipient, rewardRecipient, principalThreshold, signer, chainId, }) => __awaiter(void 0, void 0, void 0, function* () {
-    var _0, _1, _2;
+    var _2, _3, _4;
     try {
         const chainConfig = getChainConfig(chainId);
-        if (!((_0 = chainConfig === null || chainConfig === void 0 ? void 0 : chainConfig.OVM_FACTORY_ADDRESS) === null || _0 === void 0 ? void 0 : _0.address)) {
+        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_ADDRESS.address, OVMFactoryContract.abi, signer);
+        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 = (_1 = receipt === null || receipt === void 0 ? void 0 : receipt.logs[1]) === null || _1 === void 0 ? void 0 : _1.topics[1];
+        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');
         }
@@ -441,59 +408,57 @@ export const deployOVMContract = ({ OVMOwnerAddress, principalRecipient, rewardR
         return ovmAddress;
     }
     catch (error) {
-        throw new Error(`Failed to deploy OVM contract: ${(_2 = error.message) !== null && _2 !== void 0 ? _2 : 'OVM deployment failed'}`);
+        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 _3, _4, _5, _6, _7;
+    var _5, _6, _7, _8, _9, _10, _11, _12, _13, _14;
     try {
         const chainConfig = getChainConfig(chainId);
-        if (!((_3 = chainConfig === null || chainConfig === void 0 ? void 0 : chainConfig.OVM_FACTORY_ADDRESS) === null || _3 === void 0 ? void 0 : _3.address)) {
+        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}`);
         }
-        const splitsClient = yield createSplitsClient(signer, 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 rewardsSplitTxData = yield splitsClient.splitV2.callData.createSplit({
-                recipients: rewardRecipients,
-                distributorFeePercent,
-                ownerAddress: splitOwnerAddress,
-                salt,
+            const splitParams = createSplitV2Params(rewardRecipients, distributorFeePercent);
+            const rewardsSplitTxData = encodeCreateSplitV2DeterministicTxData(splitParams, splitOwnerAddress, salt);
+            executeCalls.push({
+                target: chainConfig.SPLIT_V2_FACTORY_CONTRACT.address,
+                callData: rewardsSplitTxData,
             });
-            executeCalls.push(rewardsSplitTxData);
         }
         // Create principal split call data if needed (for total split scenario)
         if (principalSplitRecipients && !isPrincipalSplitDeployed) {
-            const principalSplitTxData = yield splitsClient.splitV2.callData.createSplit({
-                recipients: principalSplitRecipients,
-                distributorFeePercent,
-                salt,
-                ownerAddress: splitOwnerAddress,
+            const principalSplitParams = createSplitV2Params(principalSplitRecipients, distributorFeePercent);
+            const principalSplitTxData = encodeCreateSplitV2DeterministicTxData(principalSplitParams, splitOwnerAddress, salt);
+            executeCalls.push({
+                target: chainConfig.SPLIT_V2_FACTORY_CONTRACT.address,
+                callData: principalSplitTxData,
             });
-            executeCalls.push(principalSplitTxData);
         }
         // Create OVM call data
         const ovmTxData = encodeCreateOVMTxData(ovmArgs.OVMOwnerAddress, ovmArgs.principalRecipient, ovmArgs.rewardRecipient, ovmArgs.principalThreshold);
         executeCalls.push({
-            address: chainConfig.OVM_FACTORY_ADDRESS.address,
-            data: ovmTxData,
+            target: chainConfig.OVM_FACTORY_CONTRACT.address,
+            callData: ovmTxData,
         });
         // Execute multicall
-        const executeMultiCalls = yield splitsClient.splitV2.multicall({
-            calls: executeCalls,
-        });
+        const executeMultiCalls = yield multicall(executeCalls, signer, chainId);
         // Extract addresses from events
         let ovmAddress;
-        const eventCount = executeMultiCalls === null || executeMultiCalls === void 0 ? void 0 : executeMultiCalls.events.length;
-        if (eventCount === 2) {
-            ovmAddress = (_4 = executeMultiCalls === null || executeMultiCalls === void 0 ? void 0 : executeMultiCalls.events[0]) === null || _4 === void 0 ? void 0 : _4.address;
+        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 (eventCount === 5) {
-            ovmAddress = (_5 = executeMultiCalls === null || executeMultiCalls === void 0 ? void 0 : executeMultiCalls.events[3]) === null || _5 === void 0 ? void 0 : _5.address;
+        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 = (_6 = executeMultiCalls === null || executeMultiCalls === void 0 ? void 0 : executeMultiCalls.events[6]) === null || _6 === void 0 ? void 0 : _6.address;
+            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');
@@ -501,12 +466,16 @@ export const deployOVMAndSplitV2 = ({ ovmArgs, rewardRecipients, isRewardsSplitt
         return ovmAddress;
     }
     catch (error) {
-        throw new Error(`Failed to deploy OVM and SplitV2: ${(_7 = error.message) !== null && _7 !== void 0 ? _7 : 'Deployment failed'}`);
+        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];
@@ -515,3 +484,25 @@ const getChainConfig = (chainId) => {
     }
     return config;
 };
+/**
+ * Requests withdrawal from an OVM contract
+ * @param ovmAddress - The address of the OVM contract
+ * @param pubKeys - Array of validator public keys in bytes format
+ * @param amounts - Array of withdrawal amounts in wei (uint64)
+ * @param signer - The signer to use for the transaction
+ * @returns Promise that resolves to the transaction hash
+ */
+export const requestWithdrawalFromOVM = ({ ovmAddress, pubKeys, amounts, signer, }) => __awaiter(void 0, void 0, void 0, function* () {
+    var _15;
+    try {
+        // Convert string amounts to bigint
+        const bigintAmounts = amounts.map(amount => BigInt(amount));
+        const ovmContract = new Contract(ovmAddress, OVMContract.abi, signer);
+        const tx = yield ovmContract.requestWithdrawal(pubKeys, bigintAmounts);
+        const receipt = yield tx.wait();
+        return { txHash: receipt.hash };
+    }
+    catch (error) {
+        throw new Error(`Failed to request withdrawal from OVM: ${(_15 = error.message) !== null && _15 !== void 0 ? _15 : 'Request withdrawal failed'}`);
+    }
+});