@obolnetwork/obol-sdk 2.1.1 → 2.2.0

package/dist/cjs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@obolnetwork/obol-sdk",
-    "version": "2.1.1",
+    "version": "2.2.0",
     "description": "A package for creating Distributed Validators using the Obol API.",
     "bugs": {
         "url": "https://github.com/obolnetwork/obol-sdk/issues"
@@ -44,9 +44,12 @@
         "@chainsafe/discv5": "^0.5.1",
         "@chainsafe/ssz": "^0.14.0",
         "@metamask/eth-sig-util": "^7.0.1",
+        "@safe-global/protocol-kit": "4.1.1",
+        "@safe-global/safe-core-sdk-types": "5.1.0",
         "@types/pdf-parse": "^1.1.4",
         "ajv": "^8.12.0",
         "cross-fetch": "^3.1.5",
+        "dotenv": "^16.4.7",
         "elliptic": "^6.5.4",
         "eslint-config-standard-with-typescript": "^43.0.1",
         "eslint-plugin-import": "^2.29.1",

package/dist/cjs/src/constants.js

@@ -23,10 +23,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OBOL_SDK_EMAIL = exports.DEFAULT_RETROACTIVE_FUNDING_TOTAL_SPLIT = exports.DEFAULT_RETROACTIVE_FUNDING_REWARDS_ONLY_SPLIT = exports.CHAIN_CONFIGURATION = exports.AVAILABLE_SPLITTER_CHAINS = exports.TERMS_AND_CONDITIONS_HASH = exports.TERMS_AND_CONDITIONS_URL = exports.TERMS_AND_CONDITIONS_VERSION = exports.ETHER_TO_GWEI = exports.DEFAULT_CHAIN_ID = exports.DEFAULT_BASE_VERSION = exports.DEFAULT_BASE_URL = exports.DefinitionFlow = exports.GENESIS_VALIDATOR_ROOT = exports.DOMAIN_DEPOSIT = exports.DOMAIN_APPLICATION_BUILDER = exports.SDK_VERSION = exports.CONFIG_VERSION = exports.DKG_ALGORITHM = exports.signEnrPayload = exports.signOperatorConfigHashPayload = exports.signCreatorConfigHashPayload = exports.ENRTypedMessage = exports.OperatorTypedMessage = exports.OperatorConfigHashSigningTypes = exports.EnrSigningTypes = exports.CreatorTypedMessage = exports.Domain = exports.TermsAndConditionsSigningTypes = exports.CreatorConfigHashSigningTypes = exports.EIP712_DOMAIN_VERSION = exports.EIP712_DOMAIN_NAME = exports.CONFLICT_ERROR_MSG = void 0;
+exports.PROVIDER_MAP = exports.OBOL_SDK_EMAIL = exports.DEFAULT_RETROACTIVE_FUNDING_TOTAL_SPLIT = exports.DEFAULT_RETROACTIVE_FUNDING_REWARDS_ONLY_SPLIT = exports.CHAIN_CONFIGURATION = exports.AVAILABLE_SPLITTER_CHAINS = exports.TERMS_AND_CONDITIONS_HASH = exports.TERMS_AND_CONDITIONS_URL = exports.TERMS_AND_CONDITIONS_VERSION = exports.ETHER_TO_GWEI = exports.DEFAULT_CHAIN_ID = exports.DEFAULT_BASE_VERSION = exports.DEFAULT_BASE_URL = exports.DefinitionFlow = exports.GENESIS_VALIDATOR_ROOT = exports.DOMAIN_DEPOSIT = exports.DOMAIN_APPLICATION_BUILDER = exports.SDK_VERSION = exports.CONFIG_VERSION = exports.DKG_ALGORITHM = exports.signEnrPayload = exports.signOperatorConfigHashPayload = exports.signCreatorConfigHashPayload = exports.ENRTypedMessage = exports.OperatorTypedMessage = exports.OperatorConfigHashSigningTypes = exports.EnrSigningTypes = exports.CreatorTypedMessage = exports.Domain = exports.TermsAndConditionsSigningTypes = exports.CreatorConfigHashSigningTypes = exports.EIP712_DOMAIN_VERSION = exports.EIP712_DOMAIN_NAME = exports.CONFLICT_ERROR_MSG = void 0;
 const pjson = __importStar(require("../package.json"));
 const types_1 = require("./types");
 const bytecodes_1 = require("./bytecodes");
+const dotenv = __importStar(require("dotenv"));
+dotenv.config();
 exports.CONFLICT_ERROR_MSG = 'Conflict';
 exports.EIP712_DOMAIN_NAME = 'Obol';
 exports.EIP712_DOMAIN_VERSION = '1';
@@ -171,3 +173,9 @@ exports.CHAIN_CONFIGURATION = {
 exports.DEFAULT_RETROACTIVE_FUNDING_REWARDS_ONLY_SPLIT = 1;
 exports.DEFAULT_RETROACTIVE_FUNDING_TOTAL_SPLIT = 0.1;
 exports.OBOL_SDK_EMAIL = 'sdk@dvlabs.tech';
+exports.PROVIDER_MAP = {
+    1: `${process.env.RPC_MAINNET}`, // Mainnet
+    17000: `${process.env.RPC_HOLESKY}`, // Holesky
+    11155111: `${process.env.RPC_SEPOLIA}`, // Sepolia
+    100: `${process.env.RPC_GNOSIS}`, // Gnosis
+};

package/dist/cjs/src/index.js

@@ -36,6 +36,7 @@ const splitHelpers_js_1 = require("./splitHelpers.js");
 const utils_js_1 = require("./utils.js");
 __exportStar(require("./types.js"), exports);
 __exportStar(require("./services.js"), exports);
+__exportStar(require("./verification/signature-validator.js"), exports);
 /**
  * Obol sdk Client can be used for creating, managing and activating distributed validators.
  */
@@ -74,6 +75,7 @@ class Client extends base_js_1.Base {
                     address,
                     version: constants_js_1.TERMS_AND_CONDITIONS_VERSION,
                     terms_and_conditions_hash: termsAndConditionsHash,
+                    fork_version: this.fork_version,
                 };
                 const termsAndConditionsSignature = yield this.signer.signTypedData((0, constants_js_1.Domain)(), constants_js_1.TermsAndConditionsSigningTypes, {
                     terms_and_conditions_hash: termsAndConditionsHash,

package/dist/cjs/src/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FORK_MAPPING = void 0;
+exports.FORK_NAMES = exports.FORK_MAPPING = void 0;
 /**
  * Permitted ChainID's
  */
@@ -14,4 +14,21 @@ var FORK_MAPPING;
     FORK_MAPPING[FORK_MAPPING["0x00000064"] = 100] = "0x00000064";
     /** Holesky. */
     FORK_MAPPING[FORK_MAPPING["0x01017000"] = 17000] = "0x01017000";
+    /** Sepolia. */
+    FORK_MAPPING[FORK_MAPPING["0x90000069"] = 11155111] = "0x90000069";
 })(FORK_MAPPING || (exports.FORK_MAPPING = FORK_MAPPING = {}));
+/**
+ * Permitted Chain Names
+ */
+exports.FORK_NAMES = {
+    /** Mainnet. */
+    [FORK_MAPPING['0x00000000']]: 'mainnet',
+    /** Goerli/Prater. */
+    [FORK_MAPPING['0x00001020']]: 'goerli',
+    /** Gnosis Chain. */
+    [FORK_MAPPING['0x00000064']]: 'gnosis',
+    /** Holesky. */
+    [FORK_MAPPING['0x01017000']]: 'holesky',
+    /** Sepolia. */
+    [FORK_MAPPING['0x90000069']]: 'sepolia',
+};

package/dist/cjs/src/utils.js

@@ -9,8 +9,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isContractAvailable = exports.findDeployedBytecode = exports.definitionFlow = exports.strToUint8Array = exports.hexWithout0x = void 0;
+exports.getProvider = exports.isContractAvailable = exports.findDeployedBytecode = exports.definitionFlow = exports.strToUint8Array = exports.hexWithout0x = void 0;
+const ethers_1 = require("ethers");
 const constants_1 = require("./constants");
+const types_1 = require("./types");
 const hexWithout0x = (hex) => {
     return hex.slice(2, hex.length);
 };
@@ -65,3 +67,11 @@ const isContractAvailable = (contractAddress, provider, bytecode) => __awaiter(v
     return !!code && code !== '0x' && code !== '0x0';
 });
 exports.isContractAvailable = isContractAvailable;
+const getProvider = (chainId) => {
+    const rpcUrl = constants_1.PROVIDER_MAP[chainId];
+    if (!rpcUrl) {
+        throw new Error(`No provider configured for ${types_1.FORK_NAMES[chainId]}`);
+    }
+    return new ethers_1.ethers.JsonRpcProvider(rpcUrl);
+};
+exports.getProvider = getProvider;

package/dist/cjs/src/verification/common.js

@@ -43,13 +43,12 @@ const types_js_1 = require("../types.js");
 const semver = __importStar(require("semver"));
 const v1_6_0_js_1 = require("./v1.6.0.js");
 const v1_7_0_js_1 = require("./v1.7.0.js");
-const ethers_1 = require("ethers");
 const constants_js_1 = require("../constants.js");
-const eth_sig_util_1 = require("@metamask/eth-sig-util");
 const sszTypes_js_1 = require("./sszTypes.js");
 const utils_js_1 = require("../utils.js");
 const discv5_1 = require("@chainsafe/discv5");
 const v1_8_0_js_1 = require("./v1.8.0.js");
+const signature_validator_js_1 = require("./signature-validator.js");
 // cluster-definition hash
 /**
  * @param cluster The cluster configuration or the cluster definition
@@ -109,62 +108,70 @@ const clusterLockHash = (clusterLock) => {
 exports.clusterLockHash = clusterLockHash;
 // Lock verification
 // cluster-definition signatures verification
-const getPOSTConfigHashSigner = (signature, configHash, chainId) => {
+const validatePOSTConfigHashSigner = (address, signature, configHash, chainId) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const sig = ethers_1.ethers.Signature.from(signature);
         const data = (0, constants_js_1.signCreatorConfigHashPayload)({ creator_config_hash: configHash }, chainId);
-        const digest = eth_sig_util_1.TypedDataUtils.eip712Hash(data, eth_sig_util_1.SignTypedDataVersion.V4);
-        return ethers_1.ethers.recoverAddress(digest, sig).toLowerCase();
+        return yield (0, signature_validator_js_1.validateAddressSignature)({
+            address,
+            token: signature,
+            data,
+            chainId,
+        });
     }
     catch (err) {
         throw err;
     }
-};
-const getPUTConfigHashSigner = (signature, configHash, chainId) => {
+});
+const validatePUTConfigHashSigner = (address, signature, configHash, chainId) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const sig = ethers_1.ethers.Signature.from(signature);
         const data = (0, constants_js_1.signOperatorConfigHashPayload)({ operator_config_hash: configHash }, chainId);
-        const digest = eth_sig_util_1.TypedDataUtils.eip712Hash(data, eth_sig_util_1.SignTypedDataVersion.V4);
-        return ethers_1.ethers.recoverAddress(digest, sig).toLowerCase();
+        return yield (0, signature_validator_js_1.validateAddressSignature)({
+            address,
+            token: signature,
+            data,
+            chainId,
+        });
     }
     catch (err) {
         throw err;
     }
-};
-const getEnrSigner = (signature, payload, chainId) => {
+});
+const validateEnrSigner = (address, signature, payload, chainId) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const sig = ethers_1.ethers.Signature.from(signature);
         const data = (0, constants_js_1.signEnrPayload)({ enr: payload }, chainId);
-        const digest = eth_sig_util_1.TypedDataUtils.eip712Hash(data, eth_sig_util_1.SignTypedDataVersion.V4);
-        return ethers_1.ethers.recoverAddress(digest, sig).toLowerCase();
+        return yield (0, signature_validator_js_1.validateAddressSignature)({
+            address,
+            token: signature,
+            data,
+            chainId,
+        });
     }
     catch (err) {
         throw err;
     }
-};
-const verifyDefinitionSignatures = (clusterDefinition, definitionType) => {
+});
+const verifyDefinitionSignatures = (clusterDefinition, definitionType) => __awaiter(void 0, void 0, void 0, function* () {
     if (definitionType === constants_js_1.DefinitionFlow.Charon) {
         return true;
     }
     else {
-        const configSigner = getPOSTConfigHashSigner(clusterDefinition.creator.config_signature, clusterDefinition.config_hash, types_js_1.FORK_MAPPING[clusterDefinition.fork_version]);
-        if (configSigner !== clusterDefinition.creator.address.toLowerCase()) {
+        const isPOSTConfigHashSignerValid = yield validatePOSTConfigHashSigner(clusterDefinition.creator.address, clusterDefinition.creator.config_signature, clusterDefinition.config_hash, types_js_1.FORK_MAPPING[clusterDefinition.fork_version]);
+        if (!isPOSTConfigHashSignerValid) {
             return false;
         }
         if (definitionType === constants_js_1.DefinitionFlow.Solo) {
             return true;
         }
-        return clusterDefinition.operators.every(operator => {
-            const configSigner = getPUTConfigHashSigner(operator.config_signature, clusterDefinition.config_hash, types_js_1.FORK_MAPPING[clusterDefinition.fork_version]);
-            const enrSigner = getEnrSigner(operator.enr_signature, operator.enr, types_js_1.FORK_MAPPING[clusterDefinition.fork_version]);
-            if (configSigner !== operator.address.toLowerCase() ||
-                enrSigner !== operator.address.toLowerCase()) {
+        return clusterDefinition.operators.every((operator) => __awaiter(void 0, void 0, void 0, function* () {
+            const isPUTConfigHashSignerValid = yield validatePUTConfigHashSigner(operator.address, operator.config_signature, clusterDefinition.config_hash, types_js_1.FORK_MAPPING[clusterDefinition.fork_version]);
+            const isENRSignerValid = yield validateEnrSigner(operator.address, operator.enr_signature, operator.enr, types_js_1.FORK_MAPPING[clusterDefinition.fork_version]);
+            if (!isPUTConfigHashSignerValid || !isENRSignerValid) {
                 return false;
             }
             return true;
-        });
+        }));
     }
-};
+});
 // cluster-lock data verification
 const computeSigningRoot = (sszObjectRoot, domain) => {
     const signingRootDefaultValue = sszTypes_js_1.signingRootType.defaultValue();
@@ -295,7 +302,7 @@ const isValidClusterLock = (clusterLock) => __awaiter(void 0, void 0, void 0, fu
         if (definitionType == null) {
             return false;
         }
-        const isValidDefinitionData = verifyDefinitionSignatures(clusterLock.cluster_definition, definitionType);
+        const isValidDefinitionData = yield verifyDefinitionSignatures(clusterLock.cluster_definition, definitionType);
         if (!isValidDefinitionData) {
             return false;
         }

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

@@ -0,0 +1,72 @@
+"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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateSmartContractSignature = exports.validateEOASignature = exports.validateAddressSignature = void 0;
+/* eslint-disable @typescript-eslint/restrict-template-expressions */
+const ethers_1 = require("ethers");
+const eth_sig_util_1 = require("@metamask/eth-sig-util");
+const protocol_kit_1 = __importDefault(require("@safe-global/protocol-kit"));
+const constants_1 = require("../constants");
+const utils_1 = require("@safe-global/protocol-kit/dist/src/utils");
+const utils_2 = require("../utils");
+const validateAddressSignature = ({ address, token, data, chainId, }) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const provider = (0, utils_2.getProvider)(chainId);
+        if (provider) {
+            const contractAddress = yield (0, utils_2.isContractAvailable)(address, provider);
+            if (contractAddress) {
+                return yield (0, exports.validateSmartContractSignature)({
+                    token,
+                    data: data,
+                    address,
+                    chainId,
+                });
+            }
+        }
+        return (0, exports.validateEOASignature)({ token, data, address });
+    }
+    catch (error) {
+        return (0, exports.validateEOASignature)({ token, data, address });
+    }
+});
+exports.validateAddressSignature = validateAddressSignature;
+const validateEOASignature = ({ token, data, address, }) => {
+    try {
+        const sig = ethers_1.ethers.Signature.from(token);
+        const digest = eth_sig_util_1.TypedDataUtils.eip712Hash(data, eth_sig_util_1.SignTypedDataVersion.V4);
+        return (ethers_1.ethers.recoverAddress(digest, sig).toLowerCase() ===
+            address.toLocaleLowerCase());
+    }
+    catch (err) {
+        console.error(`validate EOA Signature error: ${err}`);
+        throw err;
+    }
+};
+exports.validateEOASignature = validateEOASignature;
+const validateSmartContractSignature = ({ token, data, address, chainId, }) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const provider = constants_1.PROVIDER_MAP[chainId];
+        const protocolKit = yield protocol_kit_1.default.init({
+            provider,
+            safeAddress: address,
+        });
+        const messageHash = (0, utils_1.hashTypedData)(data);
+        const isValidSignature = yield protocolKit.isValidSignature(messageHash, token);
+        return isValidSignature;
+    }
+    catch (err) {
+        throw new Error(`Error validating smart contract signature: ${err.message}`);
+    }
+});
+exports.validateSmartContractSignature = validateSmartContractSignature;

package/dist/cjs/test/fixtures.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nullDepositAmountsClusterLockV1X8 = exports.clusterLockV1X8 = exports.clusterConfigV1X8 = exports.clusterLockV1X7 = exports.clusterConfigV1X7 = exports.clusterLockV1X6 = exports.enr = void 0;
+exports.clusterLockWithSafe = exports.nullDepositAmountsClusterLockV1X8 = exports.clusterLockV1X8 = exports.clusterConfigV1X8 = exports.clusterLockV1X7 = exports.clusterConfigV1X7 = exports.clusterLockV1X6 = exports.enr = void 0;
 exports.enr = 'enr:-HW4QLlrtMjFLGkFT1bwdGbvZQlH8hLi0M2g44JAxEYP3BZmYpcsy9Q56HPPD87fMucjvLv4-obEFacpsg0ehRilbHeAgmlkgnY0iXNlY3AyNTZrMaEDRaa5o2aSgqyFq_ERZcQTztrOij1mFtXX1bJuVI6ieak';
 // v1.6.0
 exports.clusterLockV1X6 = {
@@ -423,3 +423,90 @@ exports.nullDepositAmountsClusterLockV1X8 = {
         '0xdb6332a4ca9c41592511e7480c835b449fea120430e759735f3c24f1a6d496551a516151d2baae21d0cc9469b28dc1122b672af40ebb0e77045da92e0da6a03500',
     ],
 };
+exports.clusterLockWithSafe = {
+    cluster_definition: {
+        name: 'Rainy cluster',
+        creator: {
+            address: '0xEF43Ff87070247EC9D28B482D6474318e9DAFc98',
+            config_signature: '0x0c4aaafcef722cf770b419d47a21571b3c73275185a1b719e5709168af6327eb2ee392134e660d6e4ea113abd184dd4f2bd8ee09a4ae33f434433f7575873b981c',
+        },
+        operators: [
+            {
+                address: '0xe5b709A14859EdF820347D78E587b1634B0ec771',
+                enr: 'enr:-HW4QGrhMVQGLtKv_KlubzcVZM9AUsSVgDPtq4k_0q344ZtWJ6tD4riMP5jfWXXdHIklAm_pHdQv0MbTE1DrXmuEM7yAgmlkgnY0iXNlY3AyNTZrMaECa_cfUuFYiuFQp_dUEEicCBdFWNfzm8QhrNhBwey8PBg',
+                config_signature: '0xad813cd706d7469b560570ef13b0afdf36d0637e9bc5362ec358c218085d9b231b1377f0078e1ed9c2af99fddb3d7608c03bf8aee6edc931c73d7204a7fdee181b',
+                enr_signature: '0x304c022e74c13bfd492219efc52fb133f728afa01fefa9fe1d2540ce7c23ca730dd8248b0ad76630dd120975085d77fba20c050620f1e9583590d003110dbca41c',
+            },
+            {
+                address: '0x83b7CA5be230A50DEE511657CCFF262ba04D0353',
+                enr: 'enr:-HW4QNGbmr_0YhIeTUQfljlDGGCnR8RGhtWr_gjMI8a5BwigGur2qFgGZrqSumAvk4gX9ciP2Tu74uOdOZPw6nvTi7aAgmlkgnY0iXNlY3AyNTZrMaEC0nrshQsWtEOphaLrZVTzPFOz8EAJweGbhXDtSsXPiLY',
+                config_signature: '0x41dfb02ff13775d53ad3f739151c44952ff98a3283d124b6f69782e7458150e92771e32f965803391818d23ad95c9c7bcba15e896c3a576d1a700a16d8cb29fe1b',
+                enr_signature: '0x388460abfdeded56839e4ae1480ea48a70ac44a89963bda24152e4f879a9d22918c3e77733f2ccaed5c2745f503565d651a357c6a50634a597d61e16c384961e1c',
+            },
+            {
+                address: '0x123C1cD7AeE10b525D09b848D4A62596958f7D9C',
+                enr: 'enr:-HW4QMpDdYHJR3TlnWsnuIKfbmg2aRMMcAFlhTuuZa0Grd3dMFC0AEPHvHM2cKboULC4RUl2Dz7-LpwL2EJRGhJzxcyAgmlkgnY0iXNlY3AyNTZrMaEC73iR5dcgO_bJ8tvsHLrFglwspGFhaAbiBtGAHAJPD9c',
+                config_signature: '0x91d23aefc02263fdf0edd0dcfdf26eee01c4d673b97a91a099fc10dfc01f55fa690eccc809658ea2ed17383df355f80a62bd96df15e40a2e2f740189fa6537f61b',
+                enr_signature: '0x1035b284df3b1d60434bfe2d139f1472ed29663e2af719779bb5da35537f202032ab0f7cdc540c724c8e80bedfba247809d741260201fbb5bcbfc7f0813334241b',
+            },
+            {
+                address: '0x169212AE1A834C1E0efd8C827Abdbc2b5557B86C', // safe address
+                enr: 'enr:-HW4QPwheIq51G9r9k-6GYrhp9-y-hN2SSowqgQemvPyBu9cOKERqPeqy0JuZ0yKyWiji406eK8fFeHX5fKU-6OI3u6AgmlkgnY0iXNlY3AyNTZrMaECaARWVFt5KNkHPno5YYdFBUrkLU5EmOB3K0Ns9hp-s-s',
+                config_signature: '0xf97cc2536afe96e43e07aac140254cea37b0345573b12476f8840e571095d72049aa9e03a099ef2965523f83648c4323cd16ec2ee3f5e6efac177da13bcf6eb21c',
+                enr_signature: '0x422f471d54eb19fc52e076bb11fd5c8de895734ed111b66708ef805ae124f87b7519e841e59eccdb75c8328223efd8bb324f3fd7d3048f037419bb83e03caae41b',
+            },
+        ],
+        uuid: '3ac43657-b465-49a8-94aa-25b7f7979c2a',
+        version: 'v1.8.0',
+        timestamp: '2025-01-08T15:18:28.598Z',
+        num_validators: 1,
+        threshold: 3,
+        validators: [
+            {
+                fee_recipient_address: '0xe5b709A14859EdF820347D78E587b1634B0ec771',
+                withdrawal_address: '0xe5b709A14859EdF820347D78E587b1634B0ec771',
+            },
+        ],
+        dkg_algorithm: 'default',
+        fork_version: '0x01017000',
+        deposit_amounts: ['32000000000'],
+        config_hash: '0x1849d9434a5ce7a7d15e1e030a48740a307c80424608c6618386d78a2e597fb3',
+        definition_hash: '0x85dabfcebf9bf850521cdb65ea6083c462d9ac57eb62d9a9eb47761ec10bc80e',
+    },
+    distributed_validators: [
+        {
+            distributed_public_key: '0xb0427b57f3f31da882a1ca5d9980e6164ba4c4d3e2c35fb6699f4e76d88e1aede881e0bdb87c48ac707da282f0c92e92',
+            public_shares: [
+                '0x8d150f921a54fe258bb57f568288de87e392946124df65861afbe52d2a3be6a1fa09d19beb62f879b0f18b2e3b26f69f',
+                '0x8fa69ec7c31eeda66007bc3d49a3d5654dbe6a3c0890898ea5913ed263a0efc3f6744064dbde3ee0cc1d2f08db33b4d7',
+                '0xb862933b7b7adb33cfb3de1052f7dd9e45dfa30accda01dfc4d3c38716747504aade8f832fa5a256dcaf13f80dbbb38f',
+                '0xb5a15d86945c7ff38e0b09158a3264033e6dbaebf2ec9f3426988e6d24e38b3dbd6fe413d3253b308404bb691757fb2e',
+            ],
+            builder_registration: {
+                message: {
+                    fee_recipient: '0xe5b709a14859edf820347d78e587b1634b0ec771',
+                    gas_limit: 30000000,
+                    timestamp: 1696000704,
+                    pubkey: '0xb0427b57f3f31da882a1ca5d9980e6164ba4c4d3e2c35fb6699f4e76d88e1aede881e0bdb87c48ac707da282f0c92e92',
+                },
+                signature: '0xa5e4220e7d8e7fd4430590c70a27104473b15c8ea03b2d1571bc86bbbcb443e2b7467f75a7e77b5d9b1a10d5fbc335cf0d59c3b3bc1b6d036b2e22511abcf41373567a15185f011ce0129741f0ae0e9e49759f9c5c0ce62f2a99f30e8c7df996',
+            },
+            partial_deposit_data: [
+                {
+                    pubkey: '0xb0427b57f3f31da882a1ca5d9980e6164ba4c4d3e2c35fb6699f4e76d88e1aede881e0bdb87c48ac707da282f0c92e92',
+                    withdrawal_credentials: '0x010000000000000000000000e5b709a14859edf820347d78e587b1634b0ec771',
+                    amount: '32000000000',
+                    signature: '0x90aff3cb35c577644cb5fe3036ae8aeb5ac6cc2ce2a33a4332e2e883dc48f8fb71165531862d3035a4b6e3a60215d661021672a59f9406e3bd04b5f88f4f77c5f54a9ff37167807010123cdcc230040e5a485b5eb36704fd276dbf541f7151a8',
+                },
+            ],
+        },
+    ],
+    signature_aggregate: '0x86fdeae3db45215d5f24fc19645f8f95e91fffd1a1d0a87668d3f27724fa735b85fb15de120106b8463ff1d32823813e0f139ee7cb6d3b026c6b81cc96566819817742a13e24ac44fc6571385d5b0fdbaace7e50e2cfbcd692e36b1ca25436e4',
+    lock_hash: '0xe03b0fdf6d6a7d38360b0ceac1f0380b051f710e80d0e166b855ef3148d46733',
+    node_signatures: [
+        '0x564328bcad4cac498aa51b7e7e041cf264e9c65c95138df1fc00d4bf714bc38419c43b5a32662d5c8b747d646d6e77830b2bfd62fa8402e136147c244acdce0300',
+        '0xb0e984efd2874fc4bc97bb9c42dccbc723080cf29a20a3cf0b05867ebe87bc430c29a560936000439fcde610ce91452ced763586d3bcca24fbe4fe83bb39202601',
+        '0xf3633a8e59db2e8d253ffe1b284f9edab1c1c1aca6288c3a3b2e9cb4eb7e789e23366fc325274f13b7311b9faf53665c80b5cb1f93810713f7b094cd2bec1d9900',
+        '0x4067921a5257efe4ceb103f2129faaa7a502781157b3b54e5efca559c558c2b43b89f30962e87df88fbf62250049a31888fcd62735d54b7553e5dc75c3b6ae0901',
+    ],
+};

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

@@ -202,6 +202,10 @@ describe('Cluster Client without a signer', () => {
             version: 'null deposit_amounts v1.8.0',
             clusterLock: fixtures_js_1.nullDepositAmountsClusterLockV1X8,
         },
+        {
+            version: 'Cluster with safe address v1.8.0',
+            clusterLock: fixtures_js_1.clusterLockWithSafe,
+        },
     ])("$version: 'should return true on verified cluster lock'", ({ clusterLock }) => __awaiter(void 0, void 0, void 0, function* () {
         const isValidLock = yield (0, index_1.validateClusterLock)(clusterLock);
         expect(isValidLock).toEqual(true);

package/dist/esm/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@obolnetwork/obol-sdk",
-    "version": "2.1.1",
+    "version": "2.2.0",
     "description": "A package for creating Distributed Validators using the Obol API.",
     "bugs": {
         "url": "https://github.com/obolnetwork/obol-sdk/issues"
@@ -44,9 +44,12 @@
         "@chainsafe/discv5": "^0.5.1",
         "@chainsafe/ssz": "^0.14.0",
         "@metamask/eth-sig-util": "^7.0.1",
+        "@safe-global/protocol-kit": "4.1.1",
+        "@safe-global/safe-core-sdk-types": "5.1.0",
         "@types/pdf-parse": "^1.1.4",
         "ajv": "^8.12.0",
         "cross-fetch": "^3.1.5",
+        "dotenv": "^16.4.7",
         "elliptic": "^6.5.4",
         "eslint-config-standard-with-typescript": "^43.0.1",
         "eslint-plugin-import": "^2.29.1",

package/dist/esm/src/constants.js

@@ -1,6 +1,8 @@
 import * as pjson from '../package.json';
 import { FORK_MAPPING } from './types';
 import { HOLESKY_MULTICALL_BYTECODE, HOLESKY_OWR_FACTORY_BYTECODE, HOLESKY_SPLITMAIN_BYTECODE, MAINNET_MULTICALL_BYTECODE, MAINNET_OWR_FACTORY_BYTECODE, MAINNET_SPLITMAIN_BYTECODE, } from './bytecodes';
+import * as dotenv from 'dotenv';
+dotenv.config();
 export const CONFLICT_ERROR_MSG = 'Conflict';
 export const EIP712_DOMAIN_NAME = 'Obol';
 export const EIP712_DOMAIN_VERSION = '1';
@@ -141,3 +143,9 @@ export const CHAIN_CONFIGURATION = {
 export const DEFAULT_RETROACTIVE_FUNDING_REWARDS_ONLY_SPLIT = 1;
 export const DEFAULT_RETROACTIVE_FUNDING_TOTAL_SPLIT = 0.1;
 export const OBOL_SDK_EMAIL = 'sdk@dvlabs.tech';
+export const PROVIDER_MAP = {
+    1: `${process.env.RPC_MAINNET}`, // Mainnet
+    17000: `${process.env.RPC_HOLESKY}`, // Holesky
+    11155111: `${process.env.RPC_SEPOLIA}`, // Sepolia
+    100: `${process.env.RPC_GNOSIS}`, // Gnosis
+};

package/dist/esm/src/index.js

@@ -19,6 +19,7 @@ import { deploySplitterContract, formatSplitRecipients, handleDeployOWRAndSplitt
 import { isContractAvailable } from './utils.js';
 export * from './types.js';
 export * from './services.js';
+export * from './verification/signature-validator.js';
 /**
  * Obol sdk Client can be used for creating, managing and activating distributed validators.
  */
@@ -57,6 +58,7 @@ export class Client extends Base {
                     address,
                     version: TERMS_AND_CONDITIONS_VERSION,
                     terms_and_conditions_hash: termsAndConditionsHash,
+                    fork_version: this.fork_version,
                 };
                 const termsAndConditionsSignature = yield this.signer.signTypedData(Domain(), TermsAndConditionsSigningTypes, {
                     terms_and_conditions_hash: termsAndConditionsHash,

package/dist/esm/src/types.js

@@ -11,4 +11,21 @@ export var FORK_MAPPING;
     FORK_MAPPING[FORK_MAPPING["0x00000064"] = 100] = "0x00000064";
     /** Holesky. */
     FORK_MAPPING[FORK_MAPPING["0x01017000"] = 17000] = "0x01017000";
+    /** Sepolia. */
+    FORK_MAPPING[FORK_MAPPING["0x90000069"] = 11155111] = "0x90000069";
 })(FORK_MAPPING || (FORK_MAPPING = {}));
+/**
+ * Permitted Chain Names
+ */
+export const FORK_NAMES = {
+    /** Mainnet. */
+    [FORK_MAPPING['0x00000000']]: 'mainnet',
+    /** Goerli/Prater. */
+    [FORK_MAPPING['0x00001020']]: 'goerli',
+    /** Gnosis Chain. */
+    [FORK_MAPPING['0x00000064']]: 'gnosis',
+    /** Holesky. */
+    [FORK_MAPPING['0x01017000']]: 'holesky',
+    /** Sepolia. */
+    [FORK_MAPPING['0x90000069']]: 'sepolia',
+};

package/dist/esm/src/utils.js

@@ -7,7 +7,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { DefinitionFlow } from './constants';
+import { ethers } from 'ethers';
+import { DefinitionFlow, PROVIDER_MAP } from './constants';
+import { FORK_NAMES } from './types';
 export const hexWithout0x = (hex) => {
     return hex.slice(2, hex.length);
 };
@@ -57,3 +59,10 @@ export const isContractAvailable = (contractAddress, provider, bytecode) => __aw
     }
     return !!code && code !== '0x' && code !== '0x0';
 });
+export const getProvider = (chainId) => {
+    const rpcUrl = PROVIDER_MAP[chainId];
+    if (!rpcUrl) {
+        throw new Error(`No provider configured for ${FORK_NAMES[chainId]}`);
+    }
+    return new ethers.JsonRpcProvider(rpcUrl);
+};