@obolnetwork/obol-sdk 2.3.0 → 2.4.0

package/src/incentivesHalpers.ts

@@ -0,0 +1,58 @@
+import { type ETH_ADDRESS } from './types';
+import { Contract, type Signer } from 'ethers';
+import { MerkleDistributorABI } from './abi/MerkleDistributorWithDeadline';
+import { getProvider } from './utils';
+
+export const claimIncentivesFromMerkleDistributor = async (incentivesData: {
+  signer: Signer;
+  contractAddress: ETH_ADDRESS;
+  index: number;
+  operatorAddress: ETH_ADDRESS;
+  amount: number;
+  merkleProof: string[];
+}): Promise<{ txHash: string }> => {
+  try {
+    const contract = new Contract(
+      incentivesData.contractAddress,
+      MerkleDistributorABI.abi,
+      incentivesData.signer,
+    );
+
+    const tx = await contract.claim(
+      BigInt(incentivesData.index),
+      incentivesData.operatorAddress,
+      BigInt(incentivesData.amount),
+      incentivesData.merkleProof,
+    );
+
+    const receipt = await tx.wait();
+
+    return { txHash: receipt.hash };
+  } catch (error: any) {
+    console.log('Error claiming incentives:', error);
+    throw new Error(`Failed to claim incentives: ${error.message}`);
+  }
+};
+
+export const isClaimedFromMerkleDistributor = async (
+  chainId: number,
+  contractAddress: ETH_ADDRESS,
+  index: number,
+): Promise<boolean> => {
+  try {
+    const provider = getProvider(chainId);
+
+    const contract = new Contract(
+      contractAddress,
+      MerkleDistributorABI.abi,
+      provider,
+    );
+
+    const claimed = await contract.isClaimed(BigInt(index));
+
+    return claimed;
+  } catch (error: any) {
+    console.log('Error checking claim status:', error);
+    throw new Error(`Failed to check claim status: ${error.message}`);
+  }
+};

package/src/index.ts

@@ -30,7 +30,6 @@ import {
   type ClusterValidator,
   type ETH_ADDRESS,
   type OWRTranches,
-  type Incentives,
 } from './types.js';
 import { clusterConfigOrDefinitionHash } from './verification/common.js';
 import { validatePayload } from './ajv.js';
@@ -48,6 +47,7 @@ import {
   getOWRTranches,
 } from './splitHelpers.js';
 import { isContractAvailable } from './utils.js';
+import { Incentives } from './incentives.js';
 export * from './types.js';
 export * from './services.js';
 export * from './verification/signature-validator.js';
@@ -58,6 +58,7 @@ export * from './verification/common.js';
  */
 export class Client extends Base {
   private readonly signer: Signer | undefined;
+  public incentives: Incentives;
 
   /**
    * @param config - Client configurations
@@ -72,6 +73,11 @@ export class Client extends Base {
   constructor(config: { baseUrl?: string; chainId?: number }, signer?: Signer) {
     super(config);
     this.signer = signer;
+    this.incentives = new Incentives(
+      this.signer,
+      this.chainId,
+      this.request.bind(this),
+    );
   }
 
   /**
@@ -521,19 +527,4 @@ export class Client extends Base {
     );
     return lock;
   }
-
-  /**
-   * @param address - Operator address
-   * @returns {Promise<Incentives>} The matched incentives from DB
-   * @throws On not found if address not found.
-   */
-  async getIncentivesByAddress(address: string): Promise<Incentives> {
-    const incentives: Incentives = await this.request(
-      `/${DEFAULT_BASE_VERSION}/address/incentives/${address}`,
-      {
-        method: 'GET',
-      },
-    );
-    return incentives;
-  }
 }