@obolnetwork/obol-sdk 2.4.5 → 2.5.0

package/src/verification/common.ts

@@ -1,7 +1,6 @@
 import { fromHexString } from '@chainsafe/ssz';
 import elliptic from 'elliptic';
 import { init } from '@chainsafe/bls';
-
 import {
   FORK_MAPPING,
   type ClusterDefinition,
@@ -9,6 +8,7 @@ import {
   type DepositData,
   type BuilderRegistrationMessage,
   type DistributedValidator,
+  type SafeRpcUrl,
 } from '../types.js';
 import * as semver from 'semver';
 import {
@@ -167,6 +167,7 @@ const validatePOSTConfigHashSigner = async (
   signature: string,
   configHash: string,
   chainId: FORK_MAPPING,
+  safeRpcUrl?: SafeRpcUrl,
 ): Promise<boolean> => {
   try {
     const data = signCreatorConfigHashPayload(
@@ -179,6 +180,7 @@ const validatePOSTConfigHashSigner = async (
       token: signature,
       data,
       chainId,
+      safeRpcUrl,
     });
   } catch (err) {
     throw err;
@@ -190,6 +192,7 @@ const validatePUTConfigHashSigner = async (
   signature: string,
   configHash: string,
   chainId: number,
+  safeRpcUrl?: SafeRpcUrl,
 ): Promise<boolean> => {
   try {
     const data = signOperatorConfigHashPayload(
@@ -201,6 +204,7 @@ const validatePUTConfigHashSigner = async (
       token: signature,
       data,
       chainId,
+      safeRpcUrl,
     });
   } catch (err) {
     throw err;
@@ -212,6 +216,7 @@ const validateEnrSigner = async (
   signature: string,
   payload: string,
   chainId: number,
+  safeRpcUrl?: SafeRpcUrl,
 ): Promise<boolean> => {
   try {
     const data = signEnrPayload({ enr: payload }, chainId);
@@ -221,6 +226,7 @@ const validateEnrSigner = async (
       token: signature,
       data,
       chainId,
+      safeRpcUrl,
     });
   } catch (err) {
     throw err;
@@ -230,6 +236,7 @@ const validateEnrSigner = async (
 const verifyDefinitionSignatures = async (
   clusterDefinition: ClusterDefinition,
   definitionType: DefinitionFlow,
+  safeRpcUrl?: SafeRpcUrl,
 ): Promise<boolean> => {
   if (definitionType === DefinitionFlow.Charon) {
     return true;
@@ -239,6 +246,7 @@ const verifyDefinitionSignatures = async (
       clusterDefinition.creator.config_signature as string,
       clusterDefinition.config_hash,
       FORK_MAPPING[clusterDefinition.fork_version as keyof typeof FORK_MAPPING],
+      safeRpcUrl,
     );
 
     if (!isPOSTConfigHashSignerValid) {
@@ -256,6 +264,7 @@ const verifyDefinitionSignatures = async (
         FORK_MAPPING[
           clusterDefinition.fork_version as keyof typeof FORK_MAPPING
         ],
+        safeRpcUrl,
       );
 
       const isENRSignerValid = await validateEnrSigner(
@@ -265,6 +274,7 @@ const verifyDefinitionSignatures = async (
         FORK_MAPPING[
           clusterDefinition.fork_version as keyof typeof FORK_MAPPING
         ],
+        safeRpcUrl,
       );
 
       if (!isPUTConfigHashSignerValid || !isENRSignerValid) {
@@ -485,6 +495,7 @@ const verifyLockData = async (clusterLock: ClusterLock): Promise<boolean> => {
 
 export const isValidClusterLock = async (
   clusterLock: ClusterLock,
+  safeRpcUrl?: SafeRpcUrl,
 ): Promise<boolean> => {
   try {
     const definitionType = definitionFlow(clusterLock.cluster_definition);
@@ -494,6 +505,7 @@ export const isValidClusterLock = async (
     const isValidDefinitionData = await verifyDefinitionSignatures(
       clusterLock.cluster_definition,
       definitionType,
+      safeRpcUrl,
     );
     if (!isValidDefinitionData) {
       return false;

package/src/verification/signature-validator.ts

@@ -10,20 +10,23 @@ import { PROVIDER_MAP } from '../constants';
 import { hashTypedData } from '@safe-global/protocol-kit/dist/src/utils';
 import { type EIP712TypedData } from '@safe-global/safe-core-sdk-types';
 import { isContractAvailable, getProvider } from '../utils';
+import { type SafeRpcUrl } from '../types';
 
 export const validateAddressSignature = async ({
   address,
   token,
   data,
   chainId,
+  safeRpcUrl,
 }: {
   address: string;
   token: string;
   data: TypedMessage<any>;
   chainId: number;
+  safeRpcUrl?: SafeRpcUrl;
 }): Promise<boolean> => {
   try {
-    const provider = getProvider(chainId); // [TODO Hanan], should expect it from signer.provider, or passed in client
+    const provider = getProvider(chainId, safeRpcUrl);
     if (provider) {
       const contractAddress = await isContractAvailable(address, provider);
       if (contractAddress) {
@@ -32,6 +35,7 @@ export const validateAddressSignature = async ({
           data: data as unknown as EIP712TypedData,
           address,
           chainId,
+          safeRpcUrl,
         });
       }
     }
@@ -69,16 +73,19 @@ export const validateSmartContractSignature = async ({
   data,
   address,
   chainId,
+  safeRpcUrl,
 }: {
   token: string;
   data: EIP712TypedData;
   address: string;
   chainId: number;
+  safeRpcUrl?: SafeRpcUrl;
 }): Promise<boolean> => {
   try {
-    const provider = PROVIDER_MAP[chainId];
+    const safeProvider = safeRpcUrl ?? PROVIDER_MAP[chainId];
+
     const protocolKit = await Safe.init({
-      provider,
+      provider: safeProvider,
       safeAddress: address,
     });
     const messageHash = hashTypedData(data);

package/src/verification/v1.8.0.ts

@@ -251,6 +251,30 @@ export const verifyDVV1X8 = (clusterLock: ClusterLock): boolean => {
       pubShares.push(fromHexString(element));
     }
 
+    // Check deposit amounts match exactly if they are defined
+    const depositAmounts = clusterLock.cluster_definition.deposit_amounts;
+    if (depositAmounts !== null) {
+      const partialDepositAmounts = (
+        validator.partial_deposit_data as DepositData[]
+      ).map(d => d.amount);
+      if (depositAmounts?.length !== partialDepositAmounts.length) {
+        return false;
+      }
+      // Check that both arrays contain exactly the same elements
+      const sortedDepositAmounts = [...depositAmounts]
+        .map(Number)
+        .sort((a, b) => a - b);
+      const sortedPartialAmounts = [...partialDepositAmounts]
+        .map(Number)
+        .sort((a, b) => a - b);
+      if (
+        !sortedDepositAmounts.every(
+          (amount, index) => amount === sortedPartialAmounts[index],
+        )
+      ) {
+        return false;
+      }
+    }
     // Deposit Data Verification
     for (const element of validator.partial_deposit_data as DepositData[]) {
       const depositData = element;