@obolnetwork/obol-sdk 2.2.3 → 2.2.4

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

@@ -208,18 +208,13 @@ const computeDomain = (domainType, lockForkVersion, genesisValidatorsRoot = from
  * @param {string} withdrawalAddress - withdrawal address in definition file.
  * @returns {boolean} - return if deposit data is valid.
  */
-export const verifyDepositData = (distributedPublicKey, depositData, withdrawalAddress, forkVersion) => {
+export const verifyDepositData = (distributedPublicKey, depositData, withdrawalAddress, forkVersion, compounding) => {
     const depositDomain = computeDomain(fromHexString(DOMAIN_DEPOSIT), forkVersion);
-    const eth1AddressWithdrawalPrefix = '0x01';
-    const compoundingWithdrawalPrefix = '0x02';
-    if (eth1AddressWithdrawalPrefix +
+    const withdrawalPrefix = compounding ? '0x02' : '0x01';
+    const expectedWithdrawalCredentials = withdrawalPrefix +
         '0'.repeat(22) +
-        withdrawalAddress.toLowerCase().slice(2) !==
-        depositData.withdrawal_credentials &&
-        compoundingWithdrawalPrefix +
-            '0'.repeat(22) +
-            withdrawalAddress.toLowerCase().slice(2) !==
-            depositData.withdrawal_credentials) {
+        withdrawalAddress.toLowerCase().slice(2);
+    if (expectedWithdrawalCredentials !== depositData.withdrawal_credentials) {
         return { isValidDepositData: false, depositDataMsg: new Uint8Array(0) };
     }
     if (distributedPublicKey !== depositData.pubkey) {

package/dist/esm/src/verification/v1.10.0.js

@@ -1,7 +1,7 @@
 import { UintNumberType, } from '@chainsafe/ssz/lib/type/uint';
 import { strToUint8Array } from '../utils';
 import { builderRegistrationContainer, depositDataContainer, newCreatorContainerType, newOperatorContainerType, validatorsContainerType, } from './sszTypes';
-import { ByteListType, ByteVectorType, ContainerType, ListBasicType, ListCompositeType, fromHexString, } from '@chainsafe/ssz';
+import { ByteListType, ByteVectorType, ContainerType, ListBasicType, ListCompositeType, fromHexString, BooleanType, } from '@chainsafe/ssz';
 import { verifyDVV1X8 } from './v1.8.0';
 /**
  * Returns the containerized cluster definition
@@ -24,6 +24,7 @@ export const clusterDefinitionContainerTypeV1X10 = (configOnly) => {
         deposit_amounts: new ListBasicType(new UintNumberType(8), 256),
         consensus_protocol: new ByteListType(256),
         target_gas_limit: new UintNumberType(8),
+        compounding: new BooleanType(),
     };
     if (!configOnly) {
         returnedContainerType = Object.assign(Object.assign({}, returnedContainerType), { config_hash: new ByteVectorType(32) });
@@ -75,6 +76,9 @@ export const hashClusterDefinitionV1X10 = (cluster, configOnly) => {
     if (cluster.target_gas_limit) {
         val.target_gas_limit = cluster.target_gas_limit;
     }
+    if (cluster.compounding) {
+        val.compounding = cluster.compounding;
+    }
     if (!configOnly) {
         val.config_hash = fromHexString(cluster.config_hash);
     }

package/dist/esm/src/verification/v1.8.0.js

@@ -144,7 +144,7 @@ export const verifyDVV1X8 = (clusterLock) => {
         // Deposit Data Verification
         for (const element of validator.partial_deposit_data) {
             const depositData = element;
-            const { isValidDepositData, depositDataMsg } = verifyDepositData(distributedPublicKey, depositData, clusterLock.cluster_definition.validators[i].withdrawal_address, clusterLock.cluster_definition.fork_version);
+            const { isValidDepositData, depositDataMsg } = verifyDepositData(distributedPublicKey, depositData, clusterLock.cluster_definition.validators[i].withdrawal_address, clusterLock.cluster_definition.fork_version, clusterLock.cluster_definition.compounding);
             if (!isValidDepositData) {
                 return false;
             }