@obolnetwork/obol-sdk 2.4.0 → 2.4.2

package/dist/cjs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@obolnetwork/obol-sdk",
-    "version": "2.4.0",
+    "version": "2.4.2",
     "description": "A package for creating Distributed Validators using the Obol API.",
     "bugs": {
         "url": "https://github.com/obolnetwork/obol-sdk/issues"

package/dist/cjs/src/constants.js

@@ -22,9 +22,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 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 package_json_1 = __importDefault(require("../package.json"));
 const types_1 = require("./types");
 const bytecodes_1 = require("./bytecodes");
 const dotenv = __importStar(require("dotenv"));
@@ -108,7 +111,7 @@ const signEnrPayload = (payload, chainId) => {
 exports.signEnrPayload = signEnrPayload;
 exports.DKG_ALGORITHM = 'default';
 exports.CONFIG_VERSION = 'v1.8.0';
-exports.SDK_VERSION = pjson.version;
+exports.SDK_VERSION = package_json_1.default.version;
 exports.DOMAIN_APPLICATION_BUILDER = '00000001';
 exports.DOMAIN_DEPOSIT = '03000000';
 exports.GENESIS_VALIDATOR_ROOT = '0000000000000000000000000000000000000000000000000000000000000000';

package/dist/cjs/src/incentives.js

@@ -11,13 +11,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Incentives = void 0;
 const utils_1 = require("./utils");
+const types_1 = require("./types");
 const incentivesHalpers_1 = require("./incentivesHalpers");
 const constants_1 = require("./constants");
 class Incentives {
-    constructor(signer, chainId, request) {
+    constructor(signer, chainId, request, provider) {
         this.signer = signer;
         this.chainId = chainId;
         this.request = request;
+        this.provider = provider;
     }
     /**
      * Claims obol incentives from a Merkle Distributor contract.
@@ -72,7 +74,7 @@ class Incentives {
      */
     isClaimed(contractAddress, index) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield (0, incentivesHalpers_1.isClaimedFromMerkleDistributor)(this.chainId, contractAddress, index);
+            return yield (0, incentivesHalpers_1.isClaimedFromMerkleDistributor)(this.chainId, contractAddress, index, this.provider);
         });
     }
     /**
@@ -82,7 +84,8 @@ class Incentives {
      */
     getIncentivesByAddress(address) {
         return __awaiter(this, void 0, void 0, function* () {
-            const incentives = yield this.request(`/${constants_1.DEFAULT_BASE_VERSION}/address/incentives/${address}`, {
+            const network = types_1.FORK_NAMES[this.chainId];
+            const incentives = yield this.request(`/${constants_1.DEFAULT_BASE_VERSION}/address/incentives/${network}/${address}`, {
                 method: 'GET',
             });
             return incentives;

package/dist/cjs/src/incentivesHalpers.js

@@ -26,10 +26,10 @@ const claimIncentivesFromMerkleDistributor = (incentivesData) => __awaiter(void
     }
 });
 exports.claimIncentivesFromMerkleDistributor = claimIncentivesFromMerkleDistributor;
-const isClaimedFromMerkleDistributor = (chainId, contractAddress, index) => __awaiter(void 0, void 0, void 0, function* () {
+const isClaimedFromMerkleDistributor = (chainId, contractAddress, index, provider) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const provider = (0, utils_1.getProvider)(chainId);
-        const contract = new ethers_1.Contract(contractAddress, MerkleDistributorWithDeadline_1.MerkleDistributorABI.abi, provider);
+        const clientProvider = provider !== null && provider !== void 0 ? provider : (0, utils_1.getProvider)(chainId);
+        const contract = new ethers_1.Contract(contractAddress, MerkleDistributorWithDeadline_1.MerkleDistributorABI.abi, clientProvider);
         const claimed = yield contract.isClaimed(BigInt(index));
         return claimed;
     }

package/dist/cjs/src/index.js

@@ -53,10 +53,13 @@ class Client extends base_js_1.Base {
      * An example of how to instantiate obol-sdk Client:
      * [obolClient](https://github.com/ObolNetwork/obol-sdk-examples/blob/main/TS-Example/index.ts#L29)
      */
-    constructor(config, signer) {
+    constructor(config, signer, provider) {
         super(config);
         this.signer = signer;
-        this.incentives = new incentives_js_1.Incentives(this.signer, this.chainId, this.request.bind(this));
+        // Use the provided provider, or fall back to signer.provider if available
+        this.provider =
+            provider !== null && provider !== void 0 ? provider : (signer && 'provider' in signer ? signer.provider : undefined);
+        this.incentives = new incentives_js_1.Incentives(this.signer, this.chainId, this.request.bind(this), (this.provider = provider));
     }
     /**
      * Accepts Obol terms and conditions to be able to create or update data.

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

@@ -22,7 +22,7 @@ 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);
+        const provider = (0, utils_2.getProvider)(chainId); // [TODO Hanan], should expect it from signer.provider, or passed in client
         if (provider) {
             const contractAddress = yield (0, utils_2.isContractAvailable)(address, provider);
             if (contractAddress) {

package/dist/cjs/test/incentives.test.js

@@ -116,7 +116,7 @@ describe('Client.incentives', () => {
             .mockImplementation(() => __awaiter(void 0, void 0, void 0, function* () { return yield Promise.resolve(true); }));
         const result = yield clientInstance.incentives.isClaimed(mockIncentivesData.contractAddress, mockIncentivesData.index);
         expect(result).toBe(true);
-        expect(incentivesHelpers.isClaimedFromMerkleDistributor).toHaveBeenCalledWith(clientInstance.incentives.chainId, mockIncentivesData.contractAddress, mockIncentivesData.index);
+        expect(incentivesHelpers.isClaimedFromMerkleDistributor).toHaveBeenCalledWith(clientInstance.incentives.chainId, mockIncentivesData.contractAddress, mockIncentivesData.index, undefined);
     }));
     test('isClaimed should return false when incentive is not claimed', () => __awaiter(void 0, void 0, void 0, function* () {
         jest
@@ -133,18 +133,18 @@ describe('Client.incentives', () => {
         }));
         yield expect(clientInstance.incentives.isClaimed(mockIncentivesData.contractAddress, mockIncentivesData.index)).rejects.toThrow('Helper function error');
     }));
-    test('isClaimed should work with a client without signer', () => __awaiter(void 0, void 0, void 0, function* () {
+    test('isClaimed should work with a provider and a without signer', () => __awaiter(void 0, void 0, void 0, function* () {
         // Create a client without a signer
         const clientWithoutSigner = new index_1.Client({
             baseUrl,
             chainId: 17000,
-        });
+        }, undefined, provider);
         jest
             .spyOn(incentivesHelpers, 'isClaimedFromMerkleDistributor')
             .mockImplementation(() => __awaiter(void 0, void 0, void 0, function* () { return yield Promise.resolve(true); }));
         const result = yield clientWithoutSigner.incentives.isClaimed(mockIncentivesData.contractAddress, mockIncentivesData.index);
         expect(result).toBe(true);
-        expect(incentivesHelpers.isClaimedFromMerkleDistributor).toHaveBeenCalledWith(clientWithoutSigner.incentives.chainId, mockIncentivesData.contractAddress, mockIncentivesData.index);
+        expect(incentivesHelpers.isClaimedFromMerkleDistributor).toHaveBeenCalledWith(clientWithoutSigner.incentives.chainId, mockIncentivesData.contractAddress, mockIncentivesData.index, provider);
     }));
     test('getIncentivesByAddress should make the correct API request', () => __awaiter(void 0, void 0, void 0, function* () {
         const mockAddress = '0x1234567890abcdef1234567890abcdef12345678';
@@ -163,7 +163,7 @@ describe('Client.incentives', () => {
         });
         const result = yield clientInstance.incentives.getIncentivesByAddress(mockAddress);
         expect(result).toEqual(mockIncentives);
-        expect(global.fetch).toHaveBeenCalledWith(`${baseUrl}/${constants_1.DEFAULT_BASE_VERSION}/address/incentives/${mockAddress}`, expect.objectContaining({ method: 'GET' }));
+        expect(global.fetch).toHaveBeenCalledWith(`${baseUrl}/${constants_1.DEFAULT_BASE_VERSION}/address/incentives/holesky/${mockAddress}`, expect.objectContaining({ method: 'GET' }));
     }));
     test('getIncentivesByAddress should handle API errors', () => __awaiter(void 0, void 0, void 0, function* () {
         const mockAddress = '0x1234567890abcdef1234567890abcdef12345678';

package/dist/esm/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@obolnetwork/obol-sdk",
-    "version": "2.4.0",
+    "version": "2.4.2",
     "description": "A package for creating Distributed Validators using the Obol API.",
     "bugs": {
         "url": "https://github.com/obolnetwork/obol-sdk/issues"

package/dist/esm/src/constants.js

@@ -1,4 +1,4 @@
-import * as pjson from '../package.json';
+import 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';

package/dist/esm/src/incentives.js

@@ -8,13 +8,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { isContractAvailable } from './utils';
+import { FORK_NAMES, } from './types';
 import { claimIncentivesFromMerkleDistributor, isClaimedFromMerkleDistributor, } from './incentivesHalpers';
 import { DEFAULT_BASE_VERSION } from './constants';
 export class Incentives {
-    constructor(signer, chainId, request) {
+    constructor(signer, chainId, request, provider) {
         this.signer = signer;
         this.chainId = chainId;
         this.request = request;
+        this.provider = provider;
     }
     /**
      * Claims obol incentives from a Merkle Distributor contract.
@@ -69,7 +71,7 @@ export class Incentives {
      */
     isClaimed(contractAddress, index) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield isClaimedFromMerkleDistributor(this.chainId, contractAddress, index);
+            return yield isClaimedFromMerkleDistributor(this.chainId, contractAddress, index, this.provider);
         });
     }
     /**
@@ -79,7 +81,8 @@ export class Incentives {
      */
     getIncentivesByAddress(address) {
         return __awaiter(this, void 0, void 0, function* () {
-            const incentives = yield this.request(`/${DEFAULT_BASE_VERSION}/address/incentives/${address}`, {
+            const network = FORK_NAMES[this.chainId];
+            const incentives = yield this.request(`/${DEFAULT_BASE_VERSION}/address/incentives/${network}/${address}`, {
                 method: 'GET',
             });
             return incentives;

package/dist/esm/src/incentivesHalpers.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { Contract } from 'ethers';
+import { Contract, } from 'ethers';
 import { MerkleDistributorABI } from './abi/MerkleDistributorWithDeadline';
 import { getProvider } from './utils';
 export const claimIncentivesFromMerkleDistributor = (incentivesData) => __awaiter(void 0, void 0, void 0, function* () {
@@ -22,10 +22,10 @@ export const claimIncentivesFromMerkleDistributor = (incentivesData) => __awaite
         throw new Error(`Failed to claim incentives: ${error.message}`);
     }
 });
-export const isClaimedFromMerkleDistributor = (chainId, contractAddress, index) => __awaiter(void 0, void 0, void 0, function* () {
+export const isClaimedFromMerkleDistributor = (chainId, contractAddress, index, provider) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const provider = getProvider(chainId);
-        const contract = new Contract(contractAddress, MerkleDistributorABI.abi, provider);
+        const clientProvider = provider !== null && provider !== void 0 ? provider : getProvider(chainId);
+        const contract = new Contract(contractAddress, MerkleDistributorABI.abi, clientProvider);
         const claimed = yield contract.isClaimed(BigInt(index));
         return claimed;
     }

package/dist/esm/src/index.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { ZeroAddress } from 'ethers';
+import { ZeroAddress, } from 'ethers';
 import { v4 as uuidv4 } from 'uuid';
 import { Base } from './base.js';
 import { CONFLICT_ERROR_MSG, CreatorConfigHashSigningTypes, Domain, DKG_ALGORITHM, CONFIG_VERSION, OperatorConfigHashSigningTypes, EnrSigningTypes, TERMS_AND_CONDITIONS_VERSION, TermsAndConditionsSigningTypes, DEFAULT_BASE_VERSION, TERMS_AND_CONDITIONS_HASH, AVAILABLE_SPLITTER_CHAINS, CHAIN_CONFIGURATION, DEFAULT_RETROACTIVE_FUNDING_REWARDS_ONLY_SPLIT, DEFAULT_RETROACTIVE_FUNDING_TOTAL_SPLIT, OBOL_SDK_EMAIL, } from './constants.js';
@@ -36,10 +36,13 @@ export class Client extends Base {
      * An example of how to instantiate obol-sdk Client:
      * [obolClient](https://github.com/ObolNetwork/obol-sdk-examples/blob/main/TS-Example/index.ts#L29)
      */
-    constructor(config, signer) {
+    constructor(config, signer, provider) {
         super(config);
         this.signer = signer;
-        this.incentives = new Incentives(this.signer, this.chainId, this.request.bind(this));
+        // Use the provided provider, or fall back to signer.provider if available
+        this.provider =
+            provider !== null && provider !== void 0 ? provider : (signer && 'provider' in signer ? signer.provider : undefined);
+        this.incentives = new Incentives(this.signer, this.chainId, this.request.bind(this), (this.provider = provider));
     }
     /**
      * Accepts Obol terms and conditions to be able to create or update data.

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

@@ -16,7 +16,7 @@ import { hashTypedData } from '@safe-global/protocol-kit/dist/src/utils';
 import { isContractAvailable, getProvider } from '../utils';
 export const validateAddressSignature = ({ address, token, data, chainId, }) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const provider = getProvider(chainId);
+        const provider = getProvider(chainId); // [TODO Hanan], should expect it from signer.provider, or passed in client
         if (provider) {
             const contractAddress = yield isContractAvailable(address, provider);
             if (contractAddress) {

package/dist/esm/test/incentives.test.js

@@ -91,7 +91,7 @@ describe('Client.incentives', () => {
             .mockImplementation(() => __awaiter(void 0, void 0, void 0, function* () { return yield Promise.resolve(true); }));
         const result = yield clientInstance.incentives.isClaimed(mockIncentivesData.contractAddress, mockIncentivesData.index);
         expect(result).toBe(true);
-        expect(incentivesHelpers.isClaimedFromMerkleDistributor).toHaveBeenCalledWith(clientInstance.incentives.chainId, mockIncentivesData.contractAddress, mockIncentivesData.index);
+        expect(incentivesHelpers.isClaimedFromMerkleDistributor).toHaveBeenCalledWith(clientInstance.incentives.chainId, mockIncentivesData.contractAddress, mockIncentivesData.index, undefined);
     }));
     test('isClaimed should return false when incentive is not claimed', () => __awaiter(void 0, void 0, void 0, function* () {
         jest
@@ -108,18 +108,18 @@ describe('Client.incentives', () => {
         }));
         yield expect(clientInstance.incentives.isClaimed(mockIncentivesData.contractAddress, mockIncentivesData.index)).rejects.toThrow('Helper function error');
     }));
-    test('isClaimed should work with a client without signer', () => __awaiter(void 0, void 0, void 0, function* () {
+    test('isClaimed should work with a provider and a without signer', () => __awaiter(void 0, void 0, void 0, function* () {
         // Create a client without a signer
         const clientWithoutSigner = new Client({
             baseUrl,
             chainId: 17000,
-        });
+        }, undefined, provider);
         jest
             .spyOn(incentivesHelpers, 'isClaimedFromMerkleDistributor')
             .mockImplementation(() => __awaiter(void 0, void 0, void 0, function* () { return yield Promise.resolve(true); }));
         const result = yield clientWithoutSigner.incentives.isClaimed(mockIncentivesData.contractAddress, mockIncentivesData.index);
         expect(result).toBe(true);
-        expect(incentivesHelpers.isClaimedFromMerkleDistributor).toHaveBeenCalledWith(clientWithoutSigner.incentives.chainId, mockIncentivesData.contractAddress, mockIncentivesData.index);
+        expect(incentivesHelpers.isClaimedFromMerkleDistributor).toHaveBeenCalledWith(clientWithoutSigner.incentives.chainId, mockIncentivesData.contractAddress, mockIncentivesData.index, provider);
     }));
     test('getIncentivesByAddress should make the correct API request', () => __awaiter(void 0, void 0, void 0, function* () {
         const mockAddress = '0x1234567890abcdef1234567890abcdef12345678';
@@ -138,7 +138,7 @@ describe('Client.incentives', () => {
         });
         const result = yield clientInstance.incentives.getIncentivesByAddress(mockAddress);
         expect(result).toEqual(mockIncentives);
-        expect(global.fetch).toHaveBeenCalledWith(`${baseUrl}/${DEFAULT_BASE_VERSION}/address/incentives/${mockAddress}`, expect.objectContaining({ method: 'GET' }));
+        expect(global.fetch).toHaveBeenCalledWith(`${baseUrl}/${DEFAULT_BASE_VERSION}/address/incentives/holesky/${mockAddress}`, expect.objectContaining({ method: 'GET' }));
     }));
     test('getIncentivesByAddress should handle API errors', () => __awaiter(void 0, void 0, void 0, function* () {
         const mockAddress = '0x1234567890abcdef1234567890abcdef12345678';

package/dist/types/src/incentives.d.ts

@@ -1,10 +1,11 @@
-import { type Signer } from 'ethers';
+import { type JsonRpcApiProvider, type JsonRpcProvider, type JsonRpcSigner, type Provider, type Signer } from 'ethers';
 import { type Incentives as IncentivesType, type ETH_ADDRESS } from './types';
 export declare class Incentives {
     private readonly signer;
-    chainId: number;
+    readonly chainId: number;
     private readonly request;
-    constructor(signer: Signer | undefined, chainId: number, request: (endpoint: string, options?: RequestInit) => Promise<any>);
+    readonly provider: Provider | JsonRpcProvider | JsonRpcApiProvider | undefined | null;
+    constructor(signer: Signer | JsonRpcSigner | undefined, chainId: number, request: (endpoint: string, options?: RequestInit) => Promise<any>, provider: Provider | JsonRpcProvider | JsonRpcApiProvider | undefined | null);
     /**
      * Claims obol incentives from a Merkle Distributor contract.
      *

package/dist/types/src/incentivesHalpers.d.ts

@@ -1,5 +1,5 @@
 import { type ETH_ADDRESS } from './types';
-import { type Signer } from 'ethers';
+import { type JsonRpcApiProvider, type JsonRpcProvider, type Provider, type Signer } from 'ethers';
 export declare const claimIncentivesFromMerkleDistributor: (incentivesData: {
     signer: Signer;
     contractAddress: ETH_ADDRESS;
@@ -10,4 +10,4 @@ export declare const claimIncentivesFromMerkleDistributor: (incentivesData: {
 }) => Promise<{
     txHash: string;
 }>;
-export declare const isClaimedFromMerkleDistributor: (chainId: number, contractAddress: ETH_ADDRESS, index: number) => Promise<boolean>;
+export declare const isClaimedFromMerkleDistributor: (chainId: number, contractAddress: ETH_ADDRESS, index: number, provider: Provider | JsonRpcProvider | JsonRpcApiProvider | undefined | null) => Promise<boolean>;

package/dist/types/src/index.d.ts

@@ -1,4 +1,4 @@
-import { type Signer } from 'ethers';
+import { type Provider, type Signer, type JsonRpcSigner, type JsonRpcProvider, type JsonRpcApiProvider } from 'ethers';
 import { Base } from './base.js';
 import { type RewardsSplitPayload, type ClusterDefinition, type ClusterLock, type ClusterPayload, type OperatorPayload, type TotalSplitPayload, type ClusterValidator, type ETH_ADDRESS, type OWRTranches } from './types.js';
 import { Incentives } from './incentives.js';
@@ -12,6 +12,7 @@ export * from './verification/common.js';
 export declare class Client extends Base {
     private readonly signer;
     incentives: Incentives;
+    provider: Provider | JsonRpcProvider | JsonRpcApiProvider | undefined | null;
     /**
      * @param config - Client configurations
      * @param config.baseUrl - obol-api url
@@ -25,7 +26,7 @@ export declare class Client extends Base {
     constructor(config: {
         baseUrl?: string;
         chainId?: number;
-    }, signer?: Signer);
+    }, signer?: Signer | JsonRpcSigner, provider?: Provider | JsonRpcProvider);
     /**
      * Accepts Obol terms and conditions to be able to create or update data.
      * @returns {Promise<string>} terms and conditions acceptance success message.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@obolnetwork/obol-sdk",
-  "version": "2.4.0",
+  "version": "2.4.2",
   "description": "A package for creating Distributed Validators using the Obol API.",
   "bugs": {
     "url": "https://github.com/obolnetwork/obol-sdk/issues"

package/src/constants.ts

@@ -1,6 +1,6 @@
 import { type TypedMessage } from '@metamask/eth-sig-util';
 import { type TypedDataDomain } from 'ethers';
-import * as pjson from '../package.json';
+import pjson from '../package.json';
 import { FORK_MAPPING } from './types';
 import {
   HOLESKY_MULTICALL_BYTECODE,

package/src/incentives.ts

@@ -1,6 +1,16 @@
-import { type Provider, type Signer } from 'ethers';
+import {
+  type JsonRpcApiProvider,
+  type JsonRpcProvider,
+  type JsonRpcSigner,
+  type Provider,
+  type Signer,
+} from 'ethers';
 import { isContractAvailable } from './utils';
-import { type Incentives as IncentivesType, type ETH_ADDRESS } from './types';
+import {
+  type Incentives as IncentivesType,
+  type ETH_ADDRESS,
+  FORK_NAMES,
+} from './types';
 import {
   claimIncentivesFromMerkleDistributor,
   isClaimedFromMerkleDistributor,
@@ -8,21 +18,35 @@ import {
 import { DEFAULT_BASE_VERSION } from './constants';
 
 export class Incentives {
-  private readonly signer: Signer | undefined;
-  public chainId: number;
+  private readonly signer: Signer | JsonRpcSigner | undefined;
+  public readonly chainId: number;
   private readonly request: (
     endpoint: string,
     options?: RequestInit,
   ) => Promise<any>;
 
+  public readonly provider:
+    | Provider
+    | JsonRpcProvider
+    | JsonRpcApiProvider
+    | undefined
+    | null;
+
   constructor(
-    signer: Signer | undefined,
+    signer: Signer | JsonRpcSigner | undefined,
     chainId: number,
     request: (endpoint: string, options?: RequestInit) => Promise<any>,
+    provider:
+      | Provider
+      | JsonRpcProvider
+      | JsonRpcApiProvider
+      | undefined
+      | null,
   ) {
     this.signer = signer;
     this.chainId = chainId;
     this.request = request;
+    this.provider = provider;
   }
 
   /**
@@ -96,6 +120,7 @@ export class Incentives {
       this.chainId,
       contractAddress,
       index,
+      this.provider,
     );
   }
 
@@ -105,8 +130,9 @@ export class Incentives {
    * @throws On not found if address not found.
    */
   async getIncentivesByAddress(address: string): Promise<IncentivesType> {
+    const network = FORK_NAMES[this.chainId];
     const incentives: IncentivesType = await this.request(
-      `/${DEFAULT_BASE_VERSION}/address/incentives/${address}`,
+      `/${DEFAULT_BASE_VERSION}/address/incentives/${network}/${address}`,
       {
         method: 'GET',
       },

package/src/incentivesHalpers.ts

@@ -1,5 +1,11 @@
 import { type ETH_ADDRESS } from './types';
-import { Contract, type Signer } from 'ethers';
+import {
+  Contract,
+  type JsonRpcApiProvider,
+  type JsonRpcProvider,
+  type Provider,
+  type Signer,
+} from 'ethers';
 import { MerkleDistributorABI } from './abi/MerkleDistributorWithDeadline';
 import { getProvider } from './utils';
 
@@ -38,14 +44,15 @@ export const isClaimedFromMerkleDistributor = async (
   chainId: number,
   contractAddress: ETH_ADDRESS,
   index: number,
+  provider: Provider | JsonRpcProvider | JsonRpcApiProvider | undefined | null,
 ): Promise<boolean> => {
   try {
-    const provider = getProvider(chainId);
+    const clientProvider = provider ?? getProvider(chainId);
 
     const contract = new Contract(
       contractAddress,
       MerkleDistributorABI.abi,
-      provider,
+      clientProvider,
     );
 
     const claimed = await contract.isClaimed(BigInt(index));

package/src/index.ts

@@ -1,4 +1,11 @@
-import { ZeroAddress, type Provider, type Signer } from 'ethers';
+import {
+  ZeroAddress,
+  type Provider,
+  type Signer,
+  type JsonRpcSigner,
+  type JsonRpcProvider,
+  type JsonRpcApiProvider,
+} from 'ethers';
 import { v4 as uuidv4 } from 'uuid';
 import { Base } from './base.js';
 import {
@@ -57,8 +64,14 @@ export * from './verification/common.js';
  * Obol sdk Client can be used for creating, managing and activating distributed validators.
  */
 export class Client extends Base {
-  private readonly signer: Signer | undefined;
+  private readonly signer: Signer | JsonRpcSigner | undefined;
   public incentives: Incentives;
+  public provider:
+    | Provider
+    | JsonRpcProvider
+    | JsonRpcApiProvider
+    | undefined
+    | null;
 
   /**
    * @param config - Client configurations
@@ -70,13 +83,22 @@ export class Client extends Base {
    * An example of how to instantiate obol-sdk Client:
    * [obolClient](https://github.com/ObolNetwork/obol-sdk-examples/blob/main/TS-Example/index.ts#L29)
    */
-  constructor(config: { baseUrl?: string; chainId?: number }, signer?: Signer) {
+  constructor(
+    config: { baseUrl?: string; chainId?: number },
+    signer?: Signer | JsonRpcSigner,
+    provider?: Provider | JsonRpcProvider,
+  ) {
     super(config);
     this.signer = signer;
+    // Use the provided provider, or fall back to signer.provider if available
+    this.provider =
+      provider ??
+      (signer && 'provider' in signer ? signer.provider : undefined);
     this.incentives = new Incentives(
       this.signer,
       this.chainId,
       this.request.bind(this),
+      (this.provider = provider),
     );
   }
 

package/src/verification/signature-validator.ts

@@ -23,7 +23,7 @@ export const validateAddressSignature = async ({
   chainId: number;
 }): Promise<boolean> => {
   try {
-    const provider = getProvider(chainId);
+    const provider = getProvider(chainId); // [TODO Hanan], should expect it from signer.provider, or passed in client
     if (provider) {
       const contractAddress = await isContractAvailable(address, provider);
       if (contractAddress) {