@obolnetwork/obol-sdk 1.0.12 → 1.0.13

package/dist/cjs/src/{verify.js → verification/common.js}

@@ -35,73 +35,69 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isValidClusterLock = exports.signingRoot = void 0;
-const semver = __importStar(require("semver"));
-const bls_1 = require("@chainsafe/bls");
-const discv5_1 = require("@chainsafe/discv5");
+exports.isValidClusterLock = exports.signingRoot = exports.verifyNodeSignatures = exports.verifyBuilderRegistration = exports.verifyDepositData = exports.clusterLockHash = exports.clusterConfigOrDefinitionHash = void 0;
 const ssz_1 = require("@chainsafe/ssz");
-const uint_js_1 = require("@chainsafe/ssz/lib/type/uint.js");
-const eth_sig_util_1 = require("@metamask/eth-sig-util");
 const elliptic_1 = __importDefault(require("elliptic"));
+const bls_1 = require("@chainsafe/bls");
+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 types_js_1 = require("./types.js");
-const hash_js_1 = require("./hash.js");
-const constants_js_1 = require("./constants.js");
-const utils_js_1 = require("./utils.js");
-const builderRegistrationMessageType = new ssz_1.ContainerType({
-    fee_recipient: new ssz_1.ByteVectorType(20),
-    gas_limit: new uint_js_1.UintNumberType(8),
-    timestamp: new uint_js_1.UintNumberType(8),
-    pubkey: new ssz_1.ByteVectorType(48),
-});
-//For domain computation that is used in deposit data and builder registration verification for dv
-const forkDataType = new ssz_1.ContainerType({
-    currentVersion: new ssz_1.ByteVectorType(4),
-    genesisValidatorsRoot: new ssz_1.ByteVectorType(32),
-});
-const depositMessageType = new ssz_1.ContainerType({
-    pubkey: new ssz_1.ByteVectorType(48),
-    withdrawal_credentials: new ssz_1.ByteVectorType(32),
-    amount: new uint_js_1.UintNumberType(8),
-});
-const signingRootType = new ssz_1.ContainerType({
-    objectRoot: new ssz_1.ByteVectorType(32),
-    domain: new ssz_1.ByteVectorType(32),
-});
-const definitionFlow = (clusterDefinition) => {
-    if (clusterDefinition.creator.address &&
-        clusterDefinition.creator.config_signature &&
-        clusterDefinition.operators.every(operator => {
-            return (operator.address &&
-                operator.config_signature &&
-                operator.enr &&
-                operator.enr_signature);
-        })) {
-        return constants_js_1.DefinitionFlow.Group;
+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");
+// cluster-definition hash
+/**
+ * @param cluster The cluster configuration or the cluster definition
+ * @param configOnly a boolean to indicate config hash or definition hash
+ * @returns The config hash or the definition hash in of the corresponding cluster
+ */
+const clusterConfigOrDefinitionHash = (cluster, configOnly) => {
+    let definitionType, val;
+    if (semver.eq(cluster.version, 'v1.6.0')) {
+        definitionType = (0, v1_6_0_js_1.clusterDefinitionContainerTypeV1X6)(configOnly);
+        val = (0, v1_6_0_js_1.hashClusterDefinitionV1X6)(cluster, configOnly);
+        return ('0x' + Buffer.from(definitionType.hashTreeRoot(val).buffer).toString('hex'));
+    }
+    if (semver.eq(cluster.version, 'v1.7.0')) {
+        definitionType = (0, v1_7_0_js_1.clusterDefinitionContainerTypeV1X7)(configOnly);
+        val = (0, v1_7_0_js_1.hashClusterDefinitionV1X7)(cluster, configOnly);
+        return ('0x' + Buffer.from(definitionType.hashTreeRoot(val).buffer).toString('hex'));
+    }
+    if (semver.eq(cluster.version, 'v1.8.0')) {
+        definitionType = (0, v1_8_0_js_1.clusterDefinitionContainerTypeV1X8)(configOnly);
+        val = (0, v1_8_0_js_1.hashClusterDefinitionV1X8)(cluster, configOnly);
+        return ('0x' + Buffer.from(definitionType.hashTreeRoot(val).buffer).toString('hex'));
     }
-    else if (clusterDefinition.creator.address &&
-        clusterDefinition.creator.config_signature &&
-        clusterDefinition.operators.every(operator => {
-            return (!operator.address &&
-                !operator.config_signature &&
-                operator.enr &&
-                !operator.enr_signature);
-        })) {
-        return constants_js_1.DefinitionFlow.Solo;
+    throw new Error('unsupported version');
+};
+exports.clusterConfigOrDefinitionHash = clusterConfigOrDefinitionHash;
+// cluster-lock hash
+/**
+ * Returns the SSZ cluster lock hash of the given cluster lock object
+ * @param cluster The cluster lock whose lock hash needs to be calculated
+ * @returns The cluster lock hash in of the corresponding cluster lock
+ */
+const clusterLockHash = (clusterLock) => {
+    if (semver.eq(clusterLock.cluster_definition.version, 'v1.6.0')) {
+        return (0, v1_6_0_js_1.hashClusterLockV1X6)(clusterLock);
+    }
+    if (semver.eq(clusterLock.cluster_definition.version, 'v1.7.0')) {
+        return (0, v1_7_0_js_1.hashClusterLockV1X7)(clusterLock);
     }
-    else if (!clusterDefinition.creator.address &&
-        !clusterDefinition.creator.config_signature &&
-        clusterDefinition.operators.every(operator => {
-            return (!operator.address &&
-                !operator.config_signature &&
-                operator.enr &&
-                !operator.enr_signature);
-        })) {
-        return constants_js_1.DefinitionFlow.Charon;
+    if (semver.eq(clusterLock.cluster_definition.version, 'v1.8.0')) {
+        return (0, v1_8_0_js_1.hashClusterLockV1X8)(clusterLock);
     }
-    return null;
+    // other versions
+    throw new Error('unsupported version');
 };
-//cluster-definition signatures verificatin
+exports.clusterLockHash = clusterLockHash;
+// Lock verification
+// cluster-definition signatures verification
 const getPOSTConfigHashSigner = (signature, configHash, chainId) => {
     try {
         const sig = ethers_1.ethers.Signature.from(signature);
@@ -136,7 +132,7 @@ const getEnrSigner = (signature, payload, chainId) => {
     }
 };
 const verifyDefinitionSignatures = (clusterDefinition, definitionType) => {
-    if (definitionType === 'Charon-Command') {
+    if (definitionType === constants_js_1.DefinitionFlow.Charon) {
         return true;
     }
     else {
@@ -144,10 +140,10 @@ const verifyDefinitionSignatures = (clusterDefinition, definitionType) => {
         if (configSigner !== clusterDefinition.creator.address.toLowerCase()) {
             return false;
         }
-        if (definitionType === 'LP-Solo') {
+        if (definitionType === constants_js_1.DefinitionFlow.Solo) {
             return true;
         }
-        return clusterDefinition.operators.every(operator => {
+        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() ||
@@ -158,36 +154,35 @@ const verifyDefinitionSignatures = (clusterDefinition, definitionType) => {
         });
     }
 };
-//cluster-lock data verification 
+// cluster-lock data verification
 const computeSigningRoot = (sszObjectRoot, domain) => {
-    const val1 = signingRootType.defaultValue();
-    val1.objectRoot = sszObjectRoot;
-    val1.domain = domain;
-    return Buffer.from(signingRootType.hashTreeRoot(val1).buffer);
+    const signingRootDefaultValue = sszTypes_js_1.signingRootType.defaultValue();
+    signingRootDefaultValue.objectRoot = sszObjectRoot;
+    signingRootDefaultValue.domain = domain;
+    return Buffer.from(sszTypes_js_1.signingRootType.hashTreeRoot(signingRootDefaultValue).buffer);
 };
 const computeDepositMsgRoot = (msg) => {
-    const depositMsgVal = depositMessageType.defaultValue();
+    const depositMsgVal = sszTypes_js_1.depositMessageType.defaultValue();
     depositMsgVal.pubkey = (0, ssz_1.fromHexString)(msg.pubkey);
     depositMsgVal.withdrawal_credentials = (0, ssz_1.fromHexString)(msg.withdrawal_credentials);
     depositMsgVal.amount = parseInt(msg.amount);
-    return Buffer.from(depositMessageType.hashTreeRoot(depositMsgVal).buffer);
+    return Buffer.from(sszTypes_js_1.depositMessageType.hashTreeRoot(depositMsgVal).buffer);
 };
 const computeForkDataRoot = (currentVersion, genesisValidatorsRoot) => {
-    const forkDataVal = forkDataType.defaultValue();
+    const forkDataVal = sszTypes_js_1.forkDataType.defaultValue();
     forkDataVal.currentVersion = currentVersion;
     forkDataVal.genesisValidatorsRoot = genesisValidatorsRoot;
-    return Buffer.from(forkDataType.hashTreeRoot(forkDataVal).buffer);
+    return Buffer.from(sszTypes_js_1.forkDataType.hashTreeRoot(forkDataVal).buffer);
 };
 const computebuilderRegistrationMsgRoot = (msg) => {
-    const builderRegistrationMsgVal = builderRegistrationMessageType.defaultValue();
+    const builderRegistrationMsgVal = sszTypes_js_1.builderRegistrationMessageType.defaultValue();
     builderRegistrationMsgVal.fee_recipient = (0, ssz_1.fromHexString)(msg.fee_recipient);
     builderRegistrationMsgVal.gas_limit = msg.gas_limit;
     builderRegistrationMsgVal.timestamp = msg.timestamp;
     builderRegistrationMsgVal.pubkey = (0, ssz_1.fromHexString)(msg.pubkey);
-    return Buffer.from(builderRegistrationMessageType.hashTreeRoot(builderRegistrationMsgVal)
+    return Buffer.from(sszTypes_js_1.builderRegistrationMessageType.hashTreeRoot(builderRegistrationMsgVal)
         .buffer);
 };
-// DV data verification
 const computeDomain = (domainType, lockForkVersion, genesisValidatorsRoot = (0, ssz_1.fromHexString)(constants_js_1.GENESIS_VALIDATOR_ROOT)) => {
     const forkVersion = (0, ssz_1.fromHexString)(lockForkVersion.substring(2, lockForkVersion.length));
     const forkDataRoot = computeForkDataRoot(forkVersion, genesisValidatorsRoot);
@@ -196,121 +191,99 @@ const computeDomain = (domainType, lockForkVersion, genesisValidatorsRoot = (0,
     domain.set(forkDataRoot.subarray(0, 28), 4);
     return domain;
 };
-const verifyDepositData = (validator, withdrawalAddress) => {
+/**
+ * Verify deposit data withdrawal credintials and signature
+ * @param {string} forkVersion - fork version in definition file.
+ * @param {DistributedValidatorDto} validator - distributed validator.
+ * @param {string} withdrawalAddress - withdrawal address in definition file.
+ * @returns {boolean} - return if deposit data is valid.
+ */
+const verifyDepositData = (distributedPublicKey, depositData, withdrawalAddress, forkVersion) => {
+    const depositDomain = computeDomain((0, ssz_1.fromHexString)(constants_js_1.DOMAIN_DEPOSIT), forkVersion);
     const eth1AddressWithdrawalPrefix = '0x01';
     if (eth1AddressWithdrawalPrefix +
         '0'.repeat(22) +
         withdrawalAddress.toLowerCase().slice(2) !==
-        validator.deposit_data.withdrawal_credentials) {
-        return false;
+        depositData.withdrawal_credentials) {
+        return { isValidDepositData: false, depositDataMsg: new Uint8Array(0) };
     }
-    if (validator.distributed_public_key !== validator.deposit_data.pubkey) {
-        return false;
+    if (distributedPublicKey !== depositData.pubkey) {
+        return { isValidDepositData: false, depositDataMsg: new Uint8Array(0) };
     }
-    return true;
+    const depositMessageBuffer = computeDepositMsgRoot(depositData);
+    const depositDataMessage = (0, exports.signingRoot)(depositDomain, depositMessageBuffer);
+    return { isValidDepositData: true, depositDataMsg: depositDataMessage };
 };
-const verifyBuilderRegistration = (validator, feeRecipientAddress) => {
+exports.verifyDepositData = verifyDepositData;
+const verifyBuilderRegistration = (validator, feeRecipientAddress, forkVersion) => {
+    var _a;
+    const builderDomain = computeDomain((0, ssz_1.fromHexString)(constants_js_1.DOMAIN_APPLICATION_BUILDER), forkVersion);
     if (validator.distributed_public_key !==
-        validator.builder_registration.message.pubkey) {
-        return false;
+        ((_a = validator.builder_registration) === null || _a === void 0 ? void 0 : _a.message.pubkey)) {
+        return { isValidBuilderRegistration: false, builderRegistrationMsg: new Uint8Array(0) };
     }
     if (feeRecipientAddress.toLowerCase() !==
         validator.builder_registration.message.fee_recipient.toLowerCase()) {
-        return false;
+        return { isValidBuilderRegistration: false, builderRegistrationMsg: new Uint8Array(0) };
+    }
+    const builderRegistrationMessageBuffer = computebuilderRegistrationMsgRoot(validator.builder_registration.message);
+    const builderRegistrationMessage = (0, exports.signingRoot)(builderDomain, builderRegistrationMessageBuffer);
+    return { isValidBuilderRegistration: true, builderRegistrationMsg: builderRegistrationMessage };
+};
+exports.verifyBuilderRegistration = verifyBuilderRegistration;
+const verifyNodeSignatures = (clusterLock) => {
+    const ec = new elliptic_1.default.ec('secp256k1');
+    const nodeSignatures = clusterLock.node_signatures;
+    const lockHashWithout0x = (0, utils_js_1.hexWithout0x)(clusterLock.lock_hash);
+    // node(ENR) signatures
+    for (let i = 0; i < nodeSignatures.length; i++) {
+        const pubkey = discv5_1.ENR.decodeTxt(clusterLock.cluster_definition.operators[i].enr).publicKey.toString('hex');
+        const ENRsignature = {
+            r: nodeSignatures[i].slice(2, 66),
+            s: nodeSignatures[i].slice(66, 130),
+        };
+        const nodeSignatureVerification = ec
+            .keyFromPublic(pubkey, 'hex')
+            .verify(lockHashWithout0x, ENRsignature);
+        if (!nodeSignatureVerification) {
+            return false;
+        }
     }
     return true;
 };
+exports.verifyNodeSignatures = verifyNodeSignatures;
 const signingRoot = (domain, messageBuffer) => {
     return computeSigningRoot(messageBuffer, domain);
 };
 exports.signingRoot = signingRoot;
 const verifyLockData = (clusterLock) => __awaiter(void 0, void 0, void 0, function* () {
-    const ec = new elliptic_1.default.ec('secp256k1');
-    const validators = clusterLock.distributed_validators;
-    const nodeSignatures = clusterLock.node_signatures;
-    const depositDomain = computeDomain((0, ssz_1.fromHexString)(constants_js_1.DOMAIN_DEPOSIT), clusterLock.cluster_definition.fork_version);
-    const builderDomain = computeDomain((0, ssz_1.fromHexString)(constants_js_1.DOMAIN_APPLICATION_BUILDER), clusterLock.cluster_definition.fork_version);
-    const pubShares = [];
-    const pubKeys = [];
-    const builderRegistrationAndDepositDataMessages = [];
-    const blsSignatures = [];
     yield (0, bls_1.init)('herumi');
-    for (let i = 0; i < validators.length; i++) {
-        const validator = validators[i];
-        const validatorPublicShares = validator['public_shares'];
-        for (const element of validatorPublicShares) {
-            pubShares.push((0, ssz_1.fromHexString)(element));
-        }
-        //Deposit data signature
-        if (semver.gte(clusterLock.cluster_definition.version, 'v1.6.0')) {
-            if (!verifyDepositData(validator, clusterLock.cluster_definition.validators[i].withdrawal_address)) {
-                return false;
-            }
-            const depositMessageBuffer = computeDepositMsgRoot(validator.deposit_data);
-            const depositDataMessage = (0, exports.signingRoot)(depositDomain, depositMessageBuffer);
-            pubKeys.push((0, ssz_1.fromHexString)(validator.distributed_public_key));
-            builderRegistrationAndDepositDataMessages.push(depositDataMessage);
-            blsSignatures.push((0, ssz_1.fromHexString)(validator.deposit_data.signature));
-        }
-        //Builder registration signature
-        if (semver.gte(clusterLock.cluster_definition.version, 'v1.7.0')) {
-            if (!verifyBuilderRegistration(validator, clusterLock.cluster_definition.validators[i].fee_recipient_address)) {
-                return false;
-            }
-            const builderRegistrationMessageBuffer = computebuilderRegistrationMsgRoot(validator.builder_registration.message);
-            const builderRegistrationMessage = (0, exports.signingRoot)(builderDomain, builderRegistrationMessageBuffer);
-            pubKeys.push((0, ssz_1.fromHexString)(validator.distributed_public_key));
-            builderRegistrationAndDepositDataMessages.push(builderRegistrationMessage);
-            blsSignatures.push((0, ssz_1.fromHexString)(validator.builder_registration.signature));
-        }
+    if (semver.eq(clusterLock.cluster_definition.version, 'v1.6.0')) {
+        return (0, v1_6_0_js_1.verifyDVV1X6)(clusterLock);
     }
-    if (blsSignatures.length &&
-        pubKeys.length &&
-        builderRegistrationAndDepositDataMessages.length) {
-        // verify all deposit data and builder registration bls signatures
-        const aggregateBLSSignature = (0, bls_1.aggregateSignatures)(blsSignatures);
-        if (!(0, bls_1.verifyMultiple)(pubKeys, builderRegistrationAndDepositDataMessages, aggregateBLSSignature)) {
-            return false;
-        }
+    if (semver.eq(clusterLock.cluster_definition.version, 'v1.7.0')) {
+        return (0, v1_7_0_js_1.verifyDVV1X7)(clusterLock);
     }
-    if (semver.gte(clusterLock.cluster_definition.version, 'v1.7.0')) {
-        const lockHashWithout0x = (0, utils_js_1.hexWithout0x)(clusterLock.lock_hash);
-        //node(ENR) signatures
-        for (let i = 0; i < nodeSignatures.length; i++) {
-            const pubkey = discv5_1.ENR.decodeTxt(clusterLock.cluster_definition.operators[i].enr).publicKey.toString('hex');
-            const ENRsignature = {
-                r: nodeSignatures[i].slice(2, 66),
-                s: nodeSignatures[i].slice(66, 130),
-            };
-            const nodeSignatureVerification = ec
-                .keyFromPublic(pubkey, 'hex')
-                .verify(lockHashWithout0x, ENRsignature);
-            if (!nodeSignatureVerification) {
-                return false;
-            }
-        }
+    if (semver.eq(clusterLock.cluster_definition.version, 'v1.8.0')) {
+        return (0, v1_8_0_js_1.verifyDVV1X8)(clusterLock);
     }
-    //signature aggregate
-    if (!(0, bls_1.verifyAggregate)(pubShares, (0, ssz_1.fromHexString)(clusterLock.lock_hash), (0, ssz_1.fromHexString)(clusterLock.signature_aggregate))) {
-        return false;
-    }
-    return true;
+    return false;
 });
 const isValidClusterLock = (clusterLock) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const definitionType = definitionFlow(clusterLock.cluster_definition);
-        if (!definitionType) {
+        const definitionType = (0, utils_js_1.definitionFlow)(clusterLock.cluster_definition);
+        if (definitionType == null) {
             return false;
         }
         const isValidDefinitionData = verifyDefinitionSignatures(clusterLock.cluster_definition, definitionType);
         if (!isValidDefinitionData) {
             return false;
         }
-        if ((0, hash_js_1.clusterConfigOrDefinitionHash)(clusterLock.cluster_definition, false) !==
+        if ((0, exports.clusterConfigOrDefinitionHash)(clusterLock.cluster_definition, false) !==
             clusterLock.cluster_definition.definition_hash) {
             return false;
         }
-        if ((0, hash_js_1.clusterLockHash)(clusterLock) !== clusterLock.lock_hash) {
+        if ((0, exports.clusterLockHash)(clusterLock) !== clusterLock.lock_hash) {
             return false;
         }
         const isValidLockData = yield verifyLockData(clusterLock);

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

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.signingRootType = exports.depositMessageType = exports.forkDataType = exports.builderRegistrationMessageType = exports.builderRegistrationContainer = exports.builderRegistrationMessageContainer = exports.depositDataContainer = exports.newOperatorContainerType = exports.newCreatorContainerType = exports.validatorsContainerType = exports.creatorContainerType = exports.operatorContainerType = exports.creatorAddressWrapperType = exports.operatorAddressWrapperType = void 0;
+const ssz_1 = require("@chainsafe/ssz");
+exports.operatorAddressWrapperType = new ssz_1.ContainerType({
+    address: new ssz_1.ByteVectorType(20),
+});
+exports.creatorAddressWrapperType = new ssz_1.ContainerType({
+    address: new ssz_1.ByteVectorType(20),
+});
+exports.operatorContainerType = new ssz_1.ContainerType({
+    address: new ssz_1.ByteVectorType(20),
+    enr: new ssz_1.ByteListType(1024), // This needs to be dynamic, since ENRs do not have a fixed length.
+    config_signature: new ssz_1.ByteVectorType(65),
+    enr_signature: new ssz_1.ByteVectorType(65),
+});
+exports.creatorContainerType = new ssz_1.ContainerType({
+    address: new ssz_1.ByteVectorType(20),
+    config_signature: new ssz_1.ByteVectorType(65),
+});
+exports.validatorsContainerType = new ssz_1.ContainerType({
+    fee_recipient_address: new ssz_1.ByteVectorType(20),
+    withdrawal_address: new ssz_1.ByteVectorType(20),
+});
+const newCreatorContainerType = (configOnly) => {
+    return configOnly ? exports.creatorAddressWrapperType : exports.creatorContainerType;
+};
+exports.newCreatorContainerType = newCreatorContainerType;
+const newOperatorContainerType = (configOnly) => {
+    return configOnly ? exports.operatorAddressWrapperType : exports.operatorContainerType;
+};
+exports.newOperatorContainerType = newOperatorContainerType;
+// Lock
+exports.depositDataContainer = new ssz_1.ContainerType({
+    pubkey: new ssz_1.ByteVectorType(48),
+    withdrawal_credentials: new ssz_1.ByteVectorType(32),
+    amount: new ssz_1.UintNumberType(8),
+    signature: new ssz_1.ByteVectorType(96),
+});
+exports.builderRegistrationMessageContainer = new ssz_1.ContainerType({
+    fee_recipient: new ssz_1.ByteVectorType(20),
+    gas_limit: new ssz_1.UintNumberType(8),
+    timestamp: new ssz_1.UintNumberType(8),
+    pubkey: new ssz_1.ByteVectorType(48),
+});
+exports.builderRegistrationContainer = new ssz_1.ContainerType({
+    message: exports.builderRegistrationMessageContainer,
+    signature: new ssz_1.ByteVectorType(96),
+});
+exports.builderRegistrationMessageType = new ssz_1.ContainerType({
+    fee_recipient: new ssz_1.ByteVectorType(20),
+    gas_limit: new ssz_1.UintNumberType(8),
+    timestamp: new ssz_1.UintNumberType(8),
+    pubkey: new ssz_1.ByteVectorType(48),
+});
+// For domain computation that is used in deposit data and builder registration verification for dv
+exports.forkDataType = new ssz_1.ContainerType({
+    currentVersion: new ssz_1.ByteVectorType(4),
+    genesisValidatorsRoot: new ssz_1.ByteVectorType(32),
+});
+exports.depositMessageType = new ssz_1.ContainerType({
+    pubkey: new ssz_1.ByteVectorType(48),
+    withdrawal_credentials: new ssz_1.ByteVectorType(32),
+    amount: new ssz_1.UintNumberType(8),
+});
+exports.signingRootType = new ssz_1.ContainerType({
+    objectRoot: new ssz_1.ByteVectorType(32),
+    domain: new ssz_1.ByteVectorType(32),
+});

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

@@ -0,0 +1,149 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.verifyDVV1X6 = exports.hashClusterLockV1X6 = exports.hashClusterDefinitionV1X6 = exports.clusterDefinitionContainerTypeV1X6 = void 0;
+const uint_1 = require("@chainsafe/ssz/lib/type/uint");
+const utils_1 = require("../utils");
+const sszTypes_1 = require("./sszTypes");
+const ssz_1 = require("@chainsafe/ssz");
+const common_1 = require("./common");
+const bls_1 = require("@chainsafe/bls");
+/**
+ * Returns the containerized cluster definition
+ * @param cluster ClusterDefinition to calculate the type from
+ * @returns SSZ Containerized type of cluster input
+ */
+const clusterDefinitionContainerTypeV1X6 = (configOnly) => {
+    let returnedContainerType = {
+        uuid: new ssz_1.ByteListType(64),
+        name: new ssz_1.ByteListType(256),
+        version: new ssz_1.ByteListType(16),
+        timestamp: new ssz_1.ByteListType(32),
+        num_validators: new uint_1.UintNumberType(8),
+        threshold: new uint_1.UintNumberType(8),
+        dkg_algorithm: new ssz_1.ByteListType(32),
+        fork_version: new ssz_1.ByteVectorType(4),
+        operators: new ssz_1.ListCompositeType((0, sszTypes_1.newOperatorContainerType)(configOnly), 256),
+        creator: (0, sszTypes_1.newCreatorContainerType)(configOnly),
+        validators: new ssz_1.ListCompositeType(sszTypes_1.validatorsContainerType, 65536),
+    };
+    if (!configOnly) {
+        returnedContainerType = Object.assign(Object.assign({}, returnedContainerType), { config_hash: new ssz_1.ByteVectorType(32) });
+    }
+    return new ssz_1.ContainerType(returnedContainerType);
+};
+exports.clusterDefinitionContainerTypeV1X6 = clusterDefinitionContainerTypeV1X6;
+const hashClusterDefinitionV1X6 = (cluster, configOnly) => {
+    const definitionType = (0, exports.clusterDefinitionContainerTypeV1X6)(configOnly);
+    const val = definitionType.defaultValue();
+    // order should be same as charon https://github.com/ObolNetwork/charon/blob/main/cluster/ssz.go#L276
+    val.uuid = (0, utils_1.strToUint8Array)(cluster.uuid);
+    val.name = (0, utils_1.strToUint8Array)(cluster.name);
+    val.version = (0, utils_1.strToUint8Array)(cluster.version);
+    val.timestamp = (0, utils_1.strToUint8Array)(cluster.timestamp);
+    val.num_validators = cluster.num_validators;
+    val.threshold = cluster.threshold;
+    val.dkg_algorithm = (0, utils_1.strToUint8Array)(cluster.dkg_algorithm);
+    val.fork_version = (0, ssz_1.fromHexString)(cluster.fork_version);
+    val.operators = cluster.operators.map(operator => {
+        return configOnly
+            ? { address: (0, ssz_1.fromHexString)(operator.address) }
+            : {
+                address: (0, ssz_1.fromHexString)(operator.address),
+                enr: (0, utils_1.strToUint8Array)(operator.enr),
+                config_signature: (0, ssz_1.fromHexString)(operator.config_signature),
+                enr_signature: (0, ssz_1.fromHexString)(operator.enr_signature),
+            };
+    });
+    val.creator = configOnly
+        ? { address: (0, ssz_1.fromHexString)(cluster.creator.address) }
+        : {
+            address: (0, ssz_1.fromHexString)(cluster.creator.address),
+            config_signature: (0, ssz_1.fromHexString)(cluster.creator.config_signature),
+        };
+    val.validators = cluster.validators.map((validator) => {
+        return {
+            fee_recipient_address: (0, ssz_1.fromHexString)(validator.fee_recipient_address),
+            withdrawal_address: (0, ssz_1.fromHexString)(validator.withdrawal_address),
+        };
+    });
+    if (!configOnly) {
+        val.config_hash = (0, ssz_1.fromHexString)(cluster.config_hash);
+    }
+    return val;
+};
+exports.hashClusterDefinitionV1X6 = hashClusterDefinitionV1X6;
+// cluster lock
+const dvContainerTypeV1X6 = new ssz_1.ContainerType({
+    distributed_public_key: new ssz_1.ByteVectorType(48),
+    public_shares: new ssz_1.ListCompositeType(new ssz_1.ByteVectorType(48), 256),
+    pubkey: new ssz_1.ByteVectorType(48),
+    withdrawal_credentials: new ssz_1.ByteVectorType(32),
+    amount: new uint_1.UintNumberType(8),
+    signature: new ssz_1.ByteVectorType(96),
+});
+/**
+ * @returns SSZ Containerized type of cluster lock
+ */
+const clusterLockContainerTypeV1X6 = () => {
+    return new ssz_1.ContainerType({
+        cluster_definition: (0, exports.clusterDefinitionContainerTypeV1X6)(false),
+        distributed_validators: new ssz_1.ListCompositeType(dvContainerTypeV1X6, 65536),
+    });
+};
+/**
+ * @param cluster The published cluster lock
+ * @returns The lock hash in of the corresponding cluster
+ */
+const hashClusterLockV1X6 = (cluster) => {
+    const lockType = clusterLockContainerTypeV1X6();
+    const val = lockType.defaultValue();
+    // Check if we can replace with definition_hash
+    val.cluster_definition = (0, exports.hashClusterDefinitionV1X6)(cluster.cluster_definition, false);
+    val.distributed_validators = cluster.distributed_validators.map(dValidator => {
+        var _a, _b, _c, _d;
+        return {
+            distributed_public_key: (0, ssz_1.fromHexString)(dValidator.distributed_public_key),
+            public_shares: dValidator.public_shares.map(publicShare => (0, ssz_1.fromHexString)(publicShare)),
+            pubkey: (0, ssz_1.fromHexString)((_a = dValidator.deposit_data) === null || _a === void 0 ? void 0 : _a.pubkey),
+            withdrawal_credentials: (0, ssz_1.fromHexString)((_b = dValidator.deposit_data) === null || _b === void 0 ? void 0 : _b.withdrawal_credentials),
+            amount: parseInt((_c = dValidator.deposit_data) === null || _c === void 0 ? void 0 : _c.amount),
+            signature: (0, ssz_1.fromHexString)((_d = dValidator.deposit_data) === null || _d === void 0 ? void 0 : _d.signature),
+        };
+    });
+    return '0x' + Buffer.from(lockType.hashTreeRoot(val).buffer).toString('hex');
+};
+exports.hashClusterLockV1X6 = hashClusterLockV1X6;
+// DV verification
+const verifyDVV1X6 = (clusterLock) => {
+    var _a;
+    const validators = clusterLock.distributed_validators;
+    const pubShares = [];
+    const pubKeys = [];
+    const builderRegistrationAndDepositDataMessages = [];
+    const blsSignatures = [];
+    for (let i = 0; i < validators.length; i++) {
+        const validator = validators[i];
+        const validatorPublicShares = validator.public_shares;
+        const distributedPublicKey = validator.distributed_public_key;
+        // Needed in signature_aggregate verification
+        for (const element of validatorPublicShares) {
+            pubShares.push((0, ssz_1.fromHexString)(element));
+        }
+        const { isValidDepositData, depositDataMsg } = (0, common_1.verifyDepositData)(distributedPublicKey, validator.deposit_data, clusterLock.cluster_definition.validators[i].withdrawal_address, clusterLock.cluster_definition.fork_version);
+        if (!isValidDepositData) {
+            return false;
+        }
+        pubKeys.push((0, ssz_1.fromHexString)(validator.distributed_public_key));
+        builderRegistrationAndDepositDataMessages.push(depositDataMsg);
+        blsSignatures.push((0, ssz_1.fromHexString)((_a = validator.deposit_data) === null || _a === void 0 ? void 0 : _a.signature));
+    }
+    const aggregateBLSSignature = (0, bls_1.aggregateSignatures)(blsSignatures);
+    if (!(0, bls_1.verifyMultiple)(pubKeys, builderRegistrationAndDepositDataMessages, aggregateBLSSignature)) {
+        return false;
+    }
+    if (!(0, bls_1.verifyAggregate)(pubShares, (0, ssz_1.fromHexString)(clusterLock.lock_hash), (0, ssz_1.fromHexString)(clusterLock.signature_aggregate))) {
+        return false;
+    }
+    return true;
+};
+exports.verifyDVV1X6 = verifyDVV1X6;