@obolnetwork/obol-sdk 2.9.1 → 2.10.0

package/dist/cjs/package.json

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

package/dist/cjs/src/constants.js

@@ -171,6 +171,9 @@ exports.CHAIN_CONFIGURATION = {
             address: '0x5cbA88D55Cec83caD5A105Ad40C8c9aF20bE21d1',
             bytecode: bytecodes_1.MAINNET_SPLIT_V2_FACTORY_BYTECODE,
         },
+        EOA_WITHDRAWAL_CONTRACT: {
+            address: '0x00000961Ef480Eb55e80D19ad83579A64c007002',
+        },
     },
     [types_1.FORK_MAPPING['0x01017000']]: {
         SPLITMAIN_CONTRACT: {
@@ -189,6 +192,9 @@ exports.CHAIN_CONFIGURATION = {
             address: '0x43F641fA70e09f0326ac66b4Ef0C416EaEcBC6f5',
             bytecode: '',
         },
+        EOA_WITHDRAWAL_CONTRACT: {
+            address: '0x00000961Ef480Eb55e80D19ad83579A64c007002',
+        },
     },
     [types_1.FORK_MAPPING['0x10000910']]: {
         SPLITMAIN_CONTRACT: {
@@ -220,6 +226,9 @@ exports.CHAIN_CONFIGURATION = {
             address: '0x5cbA88D55Cec83caD5A105Ad40C8c9aF20bE21d1',
             bytecode: bytecodes_1.HOODI_SPLIT_V2_FACTORY_BYTECODE,
         },
+        EOA_WITHDRAWAL_CONTRACT: {
+            address: '0x00000961Ef480Eb55e80D19ad83579A64c007002',
+        },
     },
 };
 exports.DEFAULT_RETROACTIVE_FUNDING_REWARDS_ONLY_SPLIT = 1;

package/dist/cjs/src/eoa/eoa.js

@@ -0,0 +1,83 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EOA = void 0;
+const eoaHelpers_1 = require("./eoaHelpers");
+const ajv_1 = require("../ajv");
+const schema_1 = require("../schema");
+const constants_1 = require("../constants");
+/**
+ * EOA can be used for managing EOA (Externally Owned Account) operations like withdrawals.
+ * @class
+ * @internal Access it through Client.eoa.
+ * @example
+ * const obolClient = new Client(config);
+ * await obolClient.eoa.requestWithdrawal(EOAWithdrawalPayload);
+ */
+class EOA {
+    constructor(signer, chainId, provider) {
+        this.signer = signer;
+        this.chainId = chainId;
+        this.provider = provider;
+    }
+    /**
+     * Requests withdrawal from an EOA contract.
+     *
+     * This method allows requesting withdrawal of validator funds.
+     * The withdrawal request includes validator public key and corresponding withdrawal amount.
+     *
+     * @remarks
+     * **⚠️ Important:**  If you're storing the private key in an `.env` file, ensure it is securely managed
+     * and not pushed to version control.
+     *
+     * @param {EOAWithdrawalPayload} payload - Data needed to request withdrawal
+     * @returns {Promise<{txHash: string}>} Transaction hash of the withdrawal request
+     * @throws Will throw an error if the signer is not provided or the request fails
+     *
+     * An example of how to use requestWithdrawal:
+     * ```typescript
+     * const result = await client.eoa.requestWithdrawal({
+     *   pubkey: '0x123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456',
+     *   allocation: 32, // 32 ETH
+     *   requiredFee: '1' // in wei
+     * });
+     * console.log('Withdrawal requested:', result.txHash);
+     * ```
+     */
+    requestWithdrawal(payload) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.signer) {
+                throw new Error('Signer is required in requestWithdrawal');
+            }
+            if (!this.provider) {
+                throw new Error('Provider is required in requestWithdrawal');
+            }
+            const chainConfig = constants_1.CHAIN_CONFIGURATION[this.chainId];
+            if (!((_a = chainConfig === null || chainConfig === void 0 ? void 0 : chainConfig.EOA_WITHDRAWAL_CONTRACT) === null || _a === void 0 ? void 0 : _a.address)) {
+                throw new Error(`EOA withdrawal contract is not configured for chain ${this.chainId}`);
+            }
+            const validatedPayload = (0, ajv_1.validatePayload)(payload, schema_1.eoaWithdrawalPayloadSchema);
+            const withdrawalAddress = yield this.signer.getAddress();
+            return yield (0, eoaHelpers_1.submitEOAWithdrawalRequest)({
+                pubkey: validatedPayload.pubkey,
+                allocation: validatedPayload.allocation,
+                withdrawalAddress,
+                withdrawalContractAddress: chainConfig.EOA_WITHDRAWAL_CONTRACT.address,
+                requiredFee: validatedPayload.requiredFee,
+                chainId: this.chainId,
+                signer: this.signer,
+                provider: this.provider,
+            });
+        });
+    }
+}
+exports.EOA = EOA;

package/dist/cjs/src/eoa/eoaHelpers.js

@@ -0,0 +1,37 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.submitEOAWithdrawalRequest = void 0;
+const constants_1 = require("../constants");
+/**
+ * Helper function to submit withdrawal request for EOA
+ */
+function submitEOAWithdrawalRequest({ pubkey, allocation, withdrawalAddress, withdrawalContractAddress, requiredFee, chainId, signer, provider, }) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!withdrawalAddress)
+            throw new Error('No withdrawal address provided');
+        if (!allocation)
+            throw new Error('No allocation provided');
+        const amountInGwei = BigInt(Math.floor(Number(allocation) * constants_1.ETHER_TO_GWEI));
+        const data = `0x${pubkey.slice(2)}${amountInGwei.toString(16).padStart(16, '0')}`;
+        const { hash } = yield signer.sendTransaction({
+            to: withdrawalContractAddress,
+            chainId,
+            value: BigInt(requiredFee),
+            data: data,
+        });
+        const txResult = yield provider.getTransactionReceipt(hash);
+        if (!txResult)
+            return { txHash: null };
+        return { txHash: txResult === null || txResult === void 0 ? void 0 : txResult.hash };
+    });
+}
+exports.submitEOAWithdrawalRequest = submitEOAWithdrawalRequest;

package/dist/cjs/src/index.js

@@ -23,7 +23,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Client = exports.ObolSplits = exports.Exit = exports.Incentives = void 0;
+exports.Client = exports.EOA = exports.ObolSplits = exports.Exit = exports.Incentives = void 0;
 const uuid_1 = require("uuid");
 const base_js_1 = require("./base.js");
 const constants_js_1 = require("./constants.js");
@@ -36,6 +36,7 @@ const utils_js_1 = require("./utils.js");
 const incentives_js_1 = require("./incentives/incentives.js");
 const exit_js_1 = require("./exits/exit.js");
 const splits_js_1 = require("./splits/splits.js");
+const eoa_js_1 = require("./eoa/eoa.js");
 __exportStar(require("./types.js"), exports);
 __exportStar(require("./services.js"), exports);
 __exportStar(require("./verification/signature-validator.js"), exports);
@@ -47,6 +48,8 @@ var exit_js_2 = require("./exits/exit.js");
 Object.defineProperty(exports, "Exit", { enumerable: true, get: function () { return exit_js_2.Exit; } });
 var splits_js_2 = require("./splits/splits.js");
 Object.defineProperty(exports, "ObolSplits", { enumerable: true, get: function () { return splits_js_2.ObolSplits; } });
+var eoa_js_2 = require("./eoa/eoa.js");
+Object.defineProperty(exports, "EOA", { enumerable: true, get: function () { return eoa_js_2.EOA; } });
 /**
  * Obol sdk Client can be used for creating, managing and activating distributed validators.
  */
@@ -70,6 +73,7 @@ class Client extends base_js_1.Base {
         this.incentives = new incentives_js_1.Incentives(this.signer, this.chainId, this.request.bind(this), this.provider);
         this.exit = new exit_js_1.Exit(this.chainId, this.provider);
         this.splits = new splits_js_1.ObolSplits(this.signer, this.chainId, this.provider);
+        this.eoa = new eoa_js_1.EOA(this.signer, this.chainId, this.provider);
     }
     /**
      * Accepts Obol terms and conditions to be able to create or update data.

package/dist/cjs/src/schema.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ovmRequestWithdrawalPayloadSchema = exports.ovmTotalSplitPayloadSchema = exports.ovmRewardsSplitPayloadSchema = exports.ovmBaseSplitPayload = exports.rewardsSplitterPayloadSchema = exports.totalSplitterPayloadSchema = exports.definitionSchema = exports.operatorPayloadSchema = void 0;
+exports.eoaWithdrawalPayloadSchema = exports.ovmRequestWithdrawalPayloadSchema = exports.ovmTotalSplitPayloadSchema = exports.ovmRewardsSplitPayloadSchema = exports.ovmBaseSplitPayload = exports.rewardsSplitterPayloadSchema = exports.totalSplitterPayloadSchema = exports.definitionSchema = exports.operatorPayloadSchema = void 0;
 const ethers_1 = require("ethers");
 const constants_1 = require("./constants");
 const ajv_1 = require("./ajv");
@@ -240,3 +240,21 @@ exports.ovmRequestWithdrawalPayloadSchema = {
     validateOVMRequestWithdrawalPayload: true,
     required: ['ovmAddress', 'pubKeys', 'amounts', 'withdrawalFees'],
 };
+exports.eoaWithdrawalPayloadSchema = {
+    type: 'object',
+    properties: {
+        pubkey: {
+            type: 'string',
+            pattern: '^0x[a-fA-F0-9]{96}$', // 48 bytes = 96 hex chars + 0x prefix
+        },
+        allocation: {
+            type: 'number',
+            minimum: 0,
+        },
+        requiredFee: {
+            type: 'string',
+            pattern: '^[0-9]+$',
+        },
+    },
+    required: ['pubkey', 'allocation', 'requiredFee'],
+};

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

@@ -410,7 +410,7 @@ const deployOVMContract = ({ OVMOwnerAddress, principalRecipient, rewardRecipien
             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 tx = yield ovmFactoryContract.createObolValidatorManager(OVMOwnerAddress, principalRecipient, rewardRecipient, principalThreshold);
+        const tx = yield ovmFactoryContract.createObolValidatorManager(OVMOwnerAddress, principalRecipient, rewardRecipient, principalThreshold * constants_1.ETHER_TO_GWEI);
         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];
@@ -455,7 +455,7 @@ const deployOVMAndSplitV2 = ({ ovmArgs, rewardRecipients, isRewardsSplitterDeplo
             });
         }
         // Create OVM call data
-        const ovmTxData = encodeCreateOVMTxData(ovmArgs.OVMOwnerAddress, ovmArgs.principalRecipient, ovmArgs.rewardRecipient, ovmArgs.principalThreshold);
+        const ovmTxData = encodeCreateOVMTxData(ovmArgs.OVMOwnerAddress, ovmArgs.principalRecipient, ovmArgs.rewardRecipient, ovmArgs.principalThreshold * constants_1.ETHER_TO_GWEI);
         executeCalls.push({
             target: chainConfig.OVM_FACTORY_CONTRACT.address,
             callData: ovmTxData,

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

@@ -0,0 +1,87 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const eoa_1 = require("../../src/eoa/eoa");
+const eoaHelpers_1 = require("../../src/eoa/eoaHelpers");
+// Mock the helper function
+jest.mock('../../src/eoa/eoaHelpers', () => ({
+    submitEOAWithdrawalRequest: jest.fn(),
+}));
+describe('EOA', () => {
+    let eoa;
+    let mockSigner;
+    let mockProvider;
+    beforeEach(() => {
+        // Clear all mocks before each test
+        jest.clearAllMocks();
+        mockSigner = {
+            getAddress: jest
+                .fn()
+                .mockResolvedValue('0x1234567890123456789012345678901234567890'),
+        };
+        mockProvider = {
+            getNetwork: jest.fn().mockResolvedValue({ chainId: 1 }),
+        };
+        eoa = new eoa_1.EOA(mockSigner, 1, mockProvider);
+    });
+    describe('requestWithdrawal', () => {
+        it('should successfully request withdrawal', () => __awaiter(void 0, void 0, void 0, function* () {
+            const mockPayload = {
+                pubkey: '0x123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456',
+                allocation: 32,
+                requiredFee: '1',
+            };
+            const mockResult = {
+                txHash: '0xabcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890',
+            };
+            eoaHelpers_1.submitEOAWithdrawalRequest.mockResolvedValue(mockResult);
+            const result = yield eoa.requestWithdrawal(mockPayload);
+            expect(eoaHelpers_1.submitEOAWithdrawalRequest).toHaveBeenCalledWith({
+                pubkey: mockPayload.pubkey,
+                allocation: mockPayload.allocation,
+                withdrawalAddress: '0x1234567890123456789012345678901234567890',
+                withdrawalContractAddress: '0x00000961Ef480Eb55e80D19ad83579A64c007002',
+                requiredFee: mockPayload.requiredFee,
+                chainId: 1,
+                signer: mockSigner,
+                provider: mockProvider,
+            });
+            expect(result).toEqual(mockResult);
+        }));
+        it('should throw error when signer is not provided', () => __awaiter(void 0, void 0, void 0, function* () {
+            const eoaWithoutSigner = new eoa_1.EOA(undefined, 1, mockProvider);
+            const mockPayload = {
+                pubkey: '0x123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456',
+                allocation: 32,
+                requiredFee: '1',
+            };
+            yield expect(eoaWithoutSigner.requestWithdrawal(mockPayload)).rejects.toThrow('Signer is required in requestWithdrawal');
+        }));
+        it('should throw error when provider is not provided', () => __awaiter(void 0, void 0, void 0, function* () {
+            const eoaWithoutProvider = new eoa_1.EOA(mockSigner, 1, null);
+            const mockPayload = {
+                pubkey: '0x123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456',
+                allocation: 32,
+                requiredFee: '1',
+            };
+            yield expect(eoaWithoutProvider.requestWithdrawal(mockPayload)).rejects.toThrow('Provider is required in requestWithdrawal');
+        }));
+        it('should throw error when EOA withdrawal contract is not configured for chain', () => __awaiter(void 0, void 0, void 0, function* () {
+            const eoaUnsupportedChain = new eoa_1.EOA(mockSigner, 999, mockProvider);
+            const mockPayload = {
+                pubkey: '0x123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456',
+                allocation: 32,
+                requiredFee: '1',
+            };
+            yield expect(eoaUnsupportedChain.requestWithdrawal(mockPayload)).rejects.toThrow('EOA withdrawal contract is not configured for chain 999');
+        }));
+    });
+});

package/dist/esm/package.json

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

package/dist/esm/src/constants.js

@@ -137,6 +137,9 @@ export const CHAIN_CONFIGURATION = {
             address: '0x5cbA88D55Cec83caD5A105Ad40C8c9aF20bE21d1',
             bytecode: MAINNET_SPLIT_V2_FACTORY_BYTECODE,
         },
+        EOA_WITHDRAWAL_CONTRACT: {
+            address: '0x00000961Ef480Eb55e80D19ad83579A64c007002',
+        },
     },
     [FORK_MAPPING['0x01017000']]: {
         SPLITMAIN_CONTRACT: {
@@ -155,6 +158,9 @@ export const CHAIN_CONFIGURATION = {
             address: '0x43F641fA70e09f0326ac66b4Ef0C416EaEcBC6f5',
             bytecode: '',
         },
+        EOA_WITHDRAWAL_CONTRACT: {
+            address: '0x00000961Ef480Eb55e80D19ad83579A64c007002',
+        },
     },
     [FORK_MAPPING['0x10000910']]: {
         SPLITMAIN_CONTRACT: {
@@ -186,6 +192,9 @@ export const CHAIN_CONFIGURATION = {
             address: '0x5cbA88D55Cec83caD5A105Ad40C8c9aF20bE21d1',
             bytecode: HOODI_SPLIT_V2_FACTORY_BYTECODE,
         },
+        EOA_WITHDRAWAL_CONTRACT: {
+            address: '0x00000961Ef480Eb55e80D19ad83579A64c007002',
+        },
     },
 };
 export const DEFAULT_RETROACTIVE_FUNDING_REWARDS_ONLY_SPLIT = 1;

package/dist/esm/src/eoa/eoa.js

@@ -0,0 +1,79 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { submitEOAWithdrawalRequest } from './eoaHelpers';
+import { validatePayload } from '../ajv';
+import { eoaWithdrawalPayloadSchema } from '../schema';
+import { CHAIN_CONFIGURATION } from '../constants';
+/**
+ * EOA can be used for managing EOA (Externally Owned Account) operations like withdrawals.
+ * @class
+ * @internal Access it through Client.eoa.
+ * @example
+ * const obolClient = new Client(config);
+ * await obolClient.eoa.requestWithdrawal(EOAWithdrawalPayload);
+ */
+export class EOA {
+    constructor(signer, chainId, provider) {
+        this.signer = signer;
+        this.chainId = chainId;
+        this.provider = provider;
+    }
+    /**
+     * Requests withdrawal from an EOA contract.
+     *
+     * This method allows requesting withdrawal of validator funds.
+     * The withdrawal request includes validator public key and corresponding withdrawal amount.
+     *
+     * @remarks
+     * **⚠️ Important:**  If you're storing the private key in an `.env` file, ensure it is securely managed
+     * and not pushed to version control.
+     *
+     * @param {EOAWithdrawalPayload} payload - Data needed to request withdrawal
+     * @returns {Promise<{txHash: string}>} Transaction hash of the withdrawal request
+     * @throws Will throw an error if the signer is not provided or the request fails
+     *
+     * An example of how to use requestWithdrawal:
+     * ```typescript
+     * const result = await client.eoa.requestWithdrawal({
+     *   pubkey: '0x123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456',
+     *   allocation: 32, // 32 ETH
+     *   requiredFee: '1' // in wei
+     * });
+     * console.log('Withdrawal requested:', result.txHash);
+     * ```
+     */
+    requestWithdrawal(payload) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.signer) {
+                throw new Error('Signer is required in requestWithdrawal');
+            }
+            if (!this.provider) {
+                throw new Error('Provider is required in requestWithdrawal');
+            }
+            const chainConfig = CHAIN_CONFIGURATION[this.chainId];
+            if (!((_a = chainConfig === null || chainConfig === void 0 ? void 0 : chainConfig.EOA_WITHDRAWAL_CONTRACT) === null || _a === void 0 ? void 0 : _a.address)) {
+                throw new Error(`EOA withdrawal contract is not configured for chain ${this.chainId}`);
+            }
+            const validatedPayload = validatePayload(payload, eoaWithdrawalPayloadSchema);
+            const withdrawalAddress = yield this.signer.getAddress();
+            return yield submitEOAWithdrawalRequest({
+                pubkey: validatedPayload.pubkey,
+                allocation: validatedPayload.allocation,
+                withdrawalAddress,
+                withdrawalContractAddress: chainConfig.EOA_WITHDRAWAL_CONTRACT.address,
+                requiredFee: validatedPayload.requiredFee,
+                chainId: this.chainId,
+                signer: this.signer,
+                provider: this.provider,
+            });
+        });
+    }
+}

package/dist/esm/src/eoa/eoaHelpers.js

@@ -0,0 +1,33 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { ETHER_TO_GWEI } from '../constants';
+/**
+ * Helper function to submit withdrawal request for EOA
+ */
+export function submitEOAWithdrawalRequest({ pubkey, allocation, withdrawalAddress, withdrawalContractAddress, requiredFee, chainId, signer, provider, }) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!withdrawalAddress)
+            throw new Error('No withdrawal address provided');
+        if (!allocation)
+            throw new Error('No allocation provided');
+        const amountInGwei = BigInt(Math.floor(Number(allocation) * ETHER_TO_GWEI));
+        const data = `0x${pubkey.slice(2)}${amountInGwei.toString(16).padStart(16, '0')}`;
+        const { hash } = yield signer.sendTransaction({
+            to: withdrawalContractAddress,
+            chainId,
+            value: BigInt(requiredFee),
+            data: data,
+        });
+        const txResult = yield provider.getTransactionReceipt(hash);
+        if (!txResult)
+            return { txHash: null };
+        return { txHash: txResult === null || txResult === void 0 ? void 0 : txResult.hash };
+    });
+}

package/dist/esm/src/index.js

@@ -19,6 +19,7 @@ import { isContractAvailable } from './utils.js';
 import { Incentives } from './incentives/incentives.js';
 import { Exit } from './exits/exit.js';
 import { ObolSplits } from './splits/splits.js';
+import { EOA } from './eoa/eoa.js';
 export * from './types.js';
 export * from './services.js';
 export * from './verification/signature-validator.js';
@@ -27,6 +28,7 @@ export * from './constants.js';
 export { Incentives } from './incentives/incentives.js';
 export { Exit } from './exits/exit.js';
 export { ObolSplits } from './splits/splits.js';
+export { EOA } from './eoa/eoa.js';
 /**
  * Obol sdk Client can be used for creating, managing and activating distributed validators.
  */
@@ -50,6 +52,7 @@ export class Client extends Base {
         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);
+        this.eoa = new EOA(this.signer, this.chainId, this.provider);
     }
     /**
      * Accepts Obol terms and conditions to be able to create or update data.

package/dist/esm/src/schema.js

@@ -237,3 +237,21 @@ export const ovmRequestWithdrawalPayloadSchema = {
     validateOVMRequestWithdrawalPayload: true,
     required: ['ovmAddress', 'pubKeys', 'amounts', 'withdrawalFees'],
 };
+export const eoaWithdrawalPayloadSchema = {
+    type: 'object',
+    properties: {
+        pubkey: {
+            type: 'string',
+            pattern: '^0x[a-fA-F0-9]{96}$', // 48 bytes = 96 hex chars + 0x prefix
+        },
+        allocation: {
+            type: 'number',
+            minimum: 0,
+        },
+        requiredFee: {
+            type: 'string',
+            pattern: '^[0-9]+$',
+        },
+    },
+    required: ['pubkey', 'allocation', 'requiredFee'],
+};

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

@@ -12,7 +12,7 @@ import { OWRContract, OWRFactoryContract } from '../abi/OWR';
 import { OVMFactoryContract, OVMContract } from '../abi/OVMFactory';
 import { splitMainEthereumAbi } from '../abi/SplitMain';
 import { MultiCallContract } from '../abi/Multicall';
-import { CHAIN_CONFIGURATION } from '../constants';
+import { CHAIN_CONFIGURATION, ETHER_TO_GWEI } from '../constants';
 import { splitV2FactoryAbi } from '../abi/splitV2FactoryAbi';
 const splitMainContractInterface = new Interface(splitMainEthereumAbi);
 const owrFactoryContractInterface = new Interface(OWRFactoryContract.abi);
@@ -397,7 +397,7 @@ export const deployOVMContract = ({ OVMOwnerAddress, principalRecipient, rewardR
             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 tx = yield ovmFactoryContract.createObolValidatorManager(OVMOwnerAddress, principalRecipient, rewardRecipient, principalThreshold * ETHER_TO_GWEI);
         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];
@@ -441,7 +441,7 @@ export const deployOVMAndSplitV2 = ({ ovmArgs, rewardRecipients, isRewardsSplitt
             });
         }
         // Create OVM call data
-        const ovmTxData = encodeCreateOVMTxData(ovmArgs.OVMOwnerAddress, ovmArgs.principalRecipient, ovmArgs.rewardRecipient, ovmArgs.principalThreshold);
+        const ovmTxData = encodeCreateOVMTxData(ovmArgs.OVMOwnerAddress, ovmArgs.principalRecipient, ovmArgs.rewardRecipient, ovmArgs.principalThreshold * ETHER_TO_GWEI);
         executeCalls.push({
             target: chainConfig.OVM_FACTORY_CONTRACT.address,
             callData: ovmTxData,

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

@@ -0,0 +1,85 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { EOA } from '../../src/eoa/eoa';
+import { submitEOAWithdrawalRequest } from '../../src/eoa/eoaHelpers';
+// Mock the helper function
+jest.mock('../../src/eoa/eoaHelpers', () => ({
+    submitEOAWithdrawalRequest: jest.fn(),
+}));
+describe('EOA', () => {
+    let eoa;
+    let mockSigner;
+    let mockProvider;
+    beforeEach(() => {
+        // Clear all mocks before each test
+        jest.clearAllMocks();
+        mockSigner = {
+            getAddress: jest
+                .fn()
+                .mockResolvedValue('0x1234567890123456789012345678901234567890'),
+        };
+        mockProvider = {
+            getNetwork: jest.fn().mockResolvedValue({ chainId: 1 }),
+        };
+        eoa = new EOA(mockSigner, 1, mockProvider);
+    });
+    describe('requestWithdrawal', () => {
+        it('should successfully request withdrawal', () => __awaiter(void 0, void 0, void 0, function* () {
+            const mockPayload = {
+                pubkey: '0x123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456',
+                allocation: 32,
+                requiredFee: '1',
+            };
+            const mockResult = {
+                txHash: '0xabcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890',
+            };
+            submitEOAWithdrawalRequest.mockResolvedValue(mockResult);
+            const result = yield eoa.requestWithdrawal(mockPayload);
+            expect(submitEOAWithdrawalRequest).toHaveBeenCalledWith({
+                pubkey: mockPayload.pubkey,
+                allocation: mockPayload.allocation,
+                withdrawalAddress: '0x1234567890123456789012345678901234567890',
+                withdrawalContractAddress: '0x00000961Ef480Eb55e80D19ad83579A64c007002',
+                requiredFee: mockPayload.requiredFee,
+                chainId: 1,
+                signer: mockSigner,
+                provider: mockProvider,
+            });
+            expect(result).toEqual(mockResult);
+        }));
+        it('should throw error when signer is not provided', () => __awaiter(void 0, void 0, void 0, function* () {
+            const eoaWithoutSigner = new EOA(undefined, 1, mockProvider);
+            const mockPayload = {
+                pubkey: '0x123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456',
+                allocation: 32,
+                requiredFee: '1',
+            };
+            yield expect(eoaWithoutSigner.requestWithdrawal(mockPayload)).rejects.toThrow('Signer is required in requestWithdrawal');
+        }));
+        it('should throw error when provider is not provided', () => __awaiter(void 0, void 0, void 0, function* () {
+            const eoaWithoutProvider = new EOA(mockSigner, 1, null);
+            const mockPayload = {
+                pubkey: '0x123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456',
+                allocation: 32,
+                requiredFee: '1',
+            };
+            yield expect(eoaWithoutProvider.requestWithdrawal(mockPayload)).rejects.toThrow('Provider is required in requestWithdrawal');
+        }));
+        it('should throw error when EOA withdrawal contract is not configured for chain', () => __awaiter(void 0, void 0, void 0, function* () {
+            const eoaUnsupportedChain = new EOA(mockSigner, 999, mockProvider);
+            const mockPayload = {
+                pubkey: '0x123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456',
+                allocation: 32,
+                requiredFee: '1',
+            };
+            yield expect(eoaUnsupportedChain.requestWithdrawal(mockPayload)).rejects.toThrow('EOA withdrawal contract is not configured for chain 999');
+        }));
+    });
+});

package/dist/types/src/eoa/eoa.d.ts

@@ -0,0 +1,42 @@
+import { type ProviderType, type SignerType, type EOAWithdrawalPayload } from '../types';
+/**
+ * EOA can be used for managing EOA (Externally Owned Account) operations like withdrawals.
+ * @class
+ * @internal Access it through Client.eoa.
+ * @example
+ * const obolClient = new Client(config);
+ * await obolClient.eoa.requestWithdrawal(EOAWithdrawalPayload);
+ */
+export declare class EOA {
+    private readonly signer;
+    readonly chainId: number;
+    readonly provider: ProviderType | undefined | null;
+    constructor(signer: SignerType | undefined, chainId: number, provider: ProviderType | undefined | null);
+    /**
+     * Requests withdrawal from an EOA contract.
+     *
+     * This method allows requesting withdrawal of validator funds.
+     * The withdrawal request includes validator public key and corresponding withdrawal amount.
+     *
+     * @remarks
+     * **⚠️ Important:**  If you're storing the private key in an `.env` file, ensure it is securely managed
+     * and not pushed to version control.
+     *
+     * @param {EOAWithdrawalPayload} payload - Data needed to request withdrawal
+     * @returns {Promise<{txHash: string}>} Transaction hash of the withdrawal request
+     * @throws Will throw an error if the signer is not provided or the request fails
+     *
+     * An example of how to use requestWithdrawal:
+     * ```typescript
+     * const result = await client.eoa.requestWithdrawal({
+     *   pubkey: '0x123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456',
+     *   allocation: 32, // 32 ETH
+     *   requiredFee: '1' // in wei
+     * });
+     * console.log('Withdrawal requested:', result.txHash);
+     * ```
+     */
+    requestWithdrawal(payload: EOAWithdrawalPayload): Promise<{
+        txHash: string | null;
+    }>;
+}

package/dist/types/src/eoa/eoaHelpers.d.ts

@@ -0,0 +1,16 @@
+import { type SignerType, type ProviderType } from '../types';
+/**
+ * Helper function to submit withdrawal request for EOA
+ */
+export declare function submitEOAWithdrawalRequest({ pubkey, allocation, withdrawalAddress, withdrawalContractAddress, requiredFee, chainId, signer, provider, }: {
+    pubkey: string;
+    allocation: number;
+    withdrawalAddress: string;
+    withdrawalContractAddress: string;
+    requiredFee: string;
+    chainId: number;
+    signer: SignerType;
+    provider: ProviderType;
+}): Promise<{
+    txHash: string | null;
+}>;

package/dist/types/src/index.d.ts

@@ -3,6 +3,7 @@ import { type RewardsSplitPayload, type ClusterDefinition, type ClusterLock, typ
 import { Incentives } from './incentives/incentives.js';
 import { Exit } from './exits/exit.js';
 import { ObolSplits } from './splits/splits.js';
+import { EOA } from './eoa/eoa.js';
 export * from './types.js';
 export * from './services.js';
 export * from './verification/signature-validator.js';
@@ -11,6 +12,7 @@ export * from './constants.js';
 export { Incentives } from './incentives/incentives.js';
 export { Exit } from './exits/exit.js';
 export { ObolSplits } from './splits/splits.js';
+export { EOA } from './eoa/eoa.js';
 /**
  * Obol sdk Client can be used for creating, managing and activating distributed validators.
  */
@@ -34,6 +36,11 @@ export declare class Client extends Base {
      * @type {ObolSplits}
      */
     splits: ObolSplits;
+    /**
+     * The eoa module, responsible for managing EOA operations.
+     * @type {EOA}
+     */
+    eoa: EOA;
     /**
      * The blockchain provider, used to interact with the network.
      * It can be null, undefined, or a valid provider instance and defaults to the Signer provider if Signer is passed.

package/dist/types/src/schema.d.ts

@@ -352,3 +352,21 @@ export declare const ovmRequestWithdrawalPayloadSchema: {
     validateOVMRequestWithdrawalPayload: boolean;
     required: string[];
 };
+export declare const eoaWithdrawalPayloadSchema: {
+    type: string;
+    properties: {
+        pubkey: {
+            type: string;
+            pattern: string;
+        };
+        allocation: {
+            type: string;
+            minimum: number;
+        };
+        requiredFee: {
+            type: string;
+            pattern: string;
+        };
+    };
+    required: string[];
+};

package/dist/types/src/types.d.ts

@@ -149,7 +149,7 @@ export type OVMBaseSplitPayload = {
     OVMOwnerAddress: string;
     /** Owner address for the splitter contracts. */
     splitOwnerAddress?: string;
-    /** Principal threshold for OVM contract. */
+    /** Principal threshold in ETH for OVM contract. */
     principalThreshold?: number;
     /** Distributor fee percentage (0-10). */
     distributorFeePercent?: number;
@@ -439,7 +439,7 @@ export type OVMArgs = {
     principalRecipient: string;
     /** Rewards recipient of the cluster. */
     rewardRecipient: string;
-    /** Principal threshold for OVM contract. */
+    /** Principal threshold in ETH for OVM contract. */
     principalThreshold: number;
 };
 export type ChainConfig = {
@@ -471,6 +471,9 @@ export type ChainConfig = {
         address: string;
         bytecode: string;
     };
+    EOA_WITHDRAWAL_CONTRACT?: {
+        address: string;
+    };
 };
 /**
  * Payload for requesting withdrawal from OVM contract
@@ -485,3 +488,14 @@ export type OVMRequestWithdrawalPayload = {
     /** Array of withdrawal amounts in gwei (uint64) as strings */
     amounts: string[];
 };
+/**
+ * Payload for requesting withdrawal from EOA contract
+ */
+export type EOAWithdrawalPayload = {
+    /** Validator public key in hex format */
+    pubkey: string;
+    /** Withdrawal amount in ETH */
+    allocation: number;
+    /** Required fee in wei */
+    requiredFee: string;
+};

package/dist/types/test/eoa/eoa.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

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

package/src/constants.ts

@@ -199,6 +199,9 @@ export const CHAIN_CONFIGURATION: Record<number, ChainConfig> = {
       address: '0x5cbA88D55Cec83caD5A105Ad40C8c9aF20bE21d1',
       bytecode: MAINNET_SPLIT_V2_FACTORY_BYTECODE,
     },
+    EOA_WITHDRAWAL_CONTRACT: {
+      address: '0x00000961Ef480Eb55e80D19ad83579A64c007002',
+    },
   },
   [FORK_MAPPING['0x01017000']]: {
     SPLITMAIN_CONTRACT: {
@@ -217,6 +220,9 @@ export const CHAIN_CONFIGURATION: Record<number, ChainConfig> = {
       address: '0x43F641fA70e09f0326ac66b4Ef0C416EaEcBC6f5',
       bytecode: '',
     },
+    EOA_WITHDRAWAL_CONTRACT: {
+      address: '0x00000961Ef480Eb55e80D19ad83579A64c007002',
+    },
   },
   [FORK_MAPPING['0x10000910']]: {
     SPLITMAIN_CONTRACT: {
@@ -248,6 +254,9 @@ export const CHAIN_CONFIGURATION: Record<number, ChainConfig> = {
       address: '0x5cbA88D55Cec83caD5A105Ad40C8c9aF20bE21d1',
       bytecode: HOODI_SPLIT_V2_FACTORY_BYTECODE,
     },
+    EOA_WITHDRAWAL_CONTRACT: {
+      address: '0x00000961Ef480Eb55e80D19ad83579A64c007002',
+    },
   },
 };
 

package/src/eoa/eoa.ts

@@ -0,0 +1,94 @@
+import { submitEOAWithdrawalRequest } from './eoaHelpers';
+import { validatePayload } from '../ajv';
+import { eoaWithdrawalPayloadSchema } from '../schema';
+import { CHAIN_CONFIGURATION } from '../constants';
+import {
+  type ProviderType,
+  type SignerType,
+  type EOAWithdrawalPayload,
+} from '../types';
+
+/**
+ * EOA can be used for managing EOA (Externally Owned Account) operations like withdrawals.
+ * @class
+ * @internal Access it through Client.eoa.
+ * @example
+ * const obolClient = new Client(config);
+ * await obolClient.eoa.requestWithdrawal(EOAWithdrawalPayload);
+ */
+export class EOA {
+  private readonly signer: SignerType | undefined;
+  public readonly chainId: number;
+  public readonly provider: ProviderType | undefined | null;
+
+  constructor(
+    signer: SignerType | undefined,
+    chainId: number,
+    provider: ProviderType | undefined | null,
+  ) {
+    this.signer = signer;
+    this.chainId = chainId;
+    this.provider = provider;
+  }
+
+  /**
+   * Requests withdrawal from an EOA contract.
+   *
+   * This method allows requesting withdrawal of validator funds.
+   * The withdrawal request includes validator public key and corresponding withdrawal amount.
+   *
+   * @remarks
+   * **⚠️ Important:**  If you're storing the private key in an `.env` file, ensure it is securely managed
+   * and not pushed to version control.
+   *
+   * @param {EOAWithdrawalPayload} payload - Data needed to request withdrawal
+   * @returns {Promise<{txHash: string}>} Transaction hash of the withdrawal request
+   * @throws Will throw an error if the signer is not provided or the request fails
+   *
+   * An example of how to use requestWithdrawal:
+   * ```typescript
+   * const result = await client.eoa.requestWithdrawal({
+   *   pubkey: '0x123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456',
+   *   allocation: 32, // 32 ETH
+   *   requiredFee: '1' // in wei
+   * });
+   * console.log('Withdrawal requested:', result.txHash);
+   * ```
+   */
+  async requestWithdrawal(
+    payload: EOAWithdrawalPayload,
+  ): Promise<{ txHash: string | null }> {
+    if (!this.signer) {
+      throw new Error('Signer is required in requestWithdrawal');
+    }
+
+    if (!this.provider) {
+      throw new Error('Provider is required in requestWithdrawal');
+    }
+
+    const chainConfig = CHAIN_CONFIGURATION[this.chainId];
+    if (!chainConfig?.EOA_WITHDRAWAL_CONTRACT?.address) {
+      throw new Error(
+        `EOA withdrawal contract is not configured for chain ${this.chainId}`,
+      );
+    }
+
+    const validatedPayload = validatePayload<EOAWithdrawalPayload>(
+      payload,
+      eoaWithdrawalPayloadSchema,
+    );
+
+    const withdrawalAddress = await this.signer.getAddress();
+
+    return await submitEOAWithdrawalRequest({
+      pubkey: validatedPayload.pubkey,
+      allocation: validatedPayload.allocation,
+      withdrawalAddress,
+      withdrawalContractAddress: chainConfig.EOA_WITHDRAWAL_CONTRACT.address,
+      requiredFee: validatedPayload.requiredFee,
+      chainId: this.chainId,
+      signer: this.signer,
+      provider: this.provider,
+    });
+  }
+}

package/src/eoa/eoaHelpers.ts

@@ -0,0 +1,43 @@
+import { ETHER_TO_GWEI } from '../constants';
+import { type SignerType, type ProviderType } from '../types';
+
+/**
+ * Helper function to submit withdrawal request for EOA
+ */
+export async function submitEOAWithdrawalRequest({
+  pubkey,
+  allocation,
+  withdrawalAddress,
+  withdrawalContractAddress,
+  requiredFee,
+  chainId,
+  signer,
+  provider,
+}: {
+  pubkey: string;
+  allocation: number;
+  withdrawalAddress: string;
+  withdrawalContractAddress: string;
+  requiredFee: string;
+  chainId: number;
+  signer: SignerType;
+  provider: ProviderType;
+}): Promise<{ txHash: string | null }> {
+  if (!withdrawalAddress) throw new Error('No withdrawal address provided');
+  if (!allocation) throw new Error('No allocation provided');
+
+  const amountInGwei = BigInt(Math.floor(Number(allocation) * ETHER_TO_GWEI));
+  const data = `0x${pubkey.slice(2)}${amountInGwei.toString(16).padStart(16, '0')}`;
+
+  const { hash } = await signer.sendTransaction({
+    to: withdrawalContractAddress,
+    chainId,
+    value: BigInt(requiredFee),
+    data: data as `0x${string}`,
+  });
+
+  const txResult = await provider.getTransactionReceipt(hash);
+  if (!txResult) return { txHash: null };
+
+  return { txHash: txResult?.hash };
+}

package/src/index.ts

@@ -50,6 +50,7 @@ import { isContractAvailable } from './utils.js';
 import { Incentives } from './incentives/incentives.js';
 import { Exit } from './exits/exit.js';
 import { ObolSplits } from './splits/splits.js';
+import { EOA } from './eoa/eoa.js';
 export * from './types.js';
 export * from './services.js';
 export * from './verification/signature-validator.js';
@@ -58,6 +59,7 @@ export * from './constants.js';
 export { Incentives } from './incentives/incentives.js';
 export { Exit } from './exits/exit.js';
 export { ObolSplits } from './splits/splits.js';
+export { EOA } from './eoa/eoa.js';
 
 /**
  * Obol sdk Client can be used for creating, managing and activating distributed validators.
@@ -86,6 +88,12 @@ export class Client extends Base {
    */
   public splits: ObolSplits;
 
+  /**
+   * The eoa module, responsible for managing EOA operations.
+   * @type {EOA}
+   */
+  public eoa: EOA;
+
   /**
    * The blockchain provider, used to interact with the network.
    * It can be null, undefined, or a valid provider instance and defaults to the Signer provider if Signer is passed.
@@ -121,6 +129,7 @@ export class Client extends Base {
     );
     this.exit = new Exit(this.chainId, this.provider);
     this.splits = new ObolSplits(this.signer, this.chainId, this.provider);
+    this.eoa = new EOA(this.signer, this.chainId, this.provider);
   }
 
   /**

package/src/schema.ts

@@ -261,3 +261,22 @@ export const ovmRequestWithdrawalPayloadSchema = {
   validateOVMRequestWithdrawalPayload: true,
   required: ['ovmAddress', 'pubKeys', 'amounts', 'withdrawalFees'],
 };
+
+export const eoaWithdrawalPayloadSchema = {
+  type: 'object',
+  properties: {
+    pubkey: {
+      type: 'string',
+      pattern: '^0x[a-fA-F0-9]{96}$', // 48 bytes = 96 hex chars + 0x prefix
+    },
+    allocation: {
+      type: 'number',
+      minimum: 0,
+    },
+    requiredFee: {
+      type: 'string',
+      pattern: '^[0-9]+$',
+    },
+  },
+  required: ['pubkey', 'allocation', 'requiredFee'],
+};

package/src/splits/splitHelpers.ts

@@ -13,7 +13,7 @@ import { OWRContract, OWRFactoryContract } from '../abi/OWR';
 import { OVMFactoryContract, OVMContract } from '../abi/OVMFactory';
 import { splitMainEthereumAbi } from '../abi/SplitMain';
 import { MultiCallContract } from '../abi/Multicall';
-import { CHAIN_CONFIGURATION } from '../constants';
+import { CHAIN_CONFIGURATION, ETHER_TO_GWEI } from '../constants';
 import { splitV2FactoryAbi } from '../abi/splitV2FactoryAbi';
 
 const splitMainContractInterface = new Interface(splitMainEthereumAbi);
@@ -742,7 +742,7 @@ export const deployOVMContract = async ({
       OVMOwnerAddress,
       principalRecipient,
       rewardRecipient,
-      principalThreshold,
+      principalThreshold * ETHER_TO_GWEI,
     );
 
     const receipt = await tx.wait();
@@ -837,7 +837,7 @@ export const deployOVMAndSplitV2 = async ({
       ovmArgs.OVMOwnerAddress,
       ovmArgs.principalRecipient,
       ovmArgs.rewardRecipient,
-      ovmArgs.principalThreshold,
+      ovmArgs.principalThreshold * ETHER_TO_GWEI,
     );
 
     executeCalls.push({

package/src/types.ts

@@ -214,7 +214,7 @@ export type OVMBaseSplitPayload = {
   /** Owner address for the splitter contracts. */
   splitOwnerAddress?: string;
 
-  /** Principal threshold for OVM contract. */
+  /** Principal threshold in ETH for OVM contract. */
   principalThreshold?: number;
 
   /** Distributor fee percentage (0-10). */
@@ -573,7 +573,7 @@ export type OVMArgs = {
   /** Rewards recipient of the cluster. */
   rewardRecipient: string;
 
-  /** Principal threshold for OVM contract. */
+  /** Principal threshold in ETH for OVM contract. */
   principalThreshold: number;
 };
 
@@ -606,6 +606,9 @@ export type ChainConfig = {
     address: string;
     bytecode: string;
   };
+  EOA_WITHDRAWAL_CONTRACT?: {
+    address: string;
+  };
 };
 
 /**
@@ -624,3 +627,17 @@ export type OVMRequestWithdrawalPayload = {
   /** Array of withdrawal amounts in gwei (uint64) as strings */
   amounts: string[];
 };
+
+/**
+ * Payload for requesting withdrawal from EOA contract
+ */
+export type EOAWithdrawalPayload = {
+  /** Validator public key in hex format */
+  pubkey: string;
+
+  /** Withdrawal amount in ETH */
+  allocation: number;
+
+  /** Required fee in wei */
+  requiredFee: string;
+};