Update staking API client for updated openapi spec

src/coinbase/coinbase.ts

@@ -8,8 +8,6 @@ import {
   TradesApiFactory,
   ServerSignersApiFactory,
   StakeApiFactory,
-  WalletStakeApiFactory,
-  ValidatorsApiFactory,
   AssetsApiFactory,
   ExternalAddressesApiFactory,
   WebhooksApiFactory,
@@ -19,6 +17,7 @@ import {
   BalanceHistoryApiFactory,
   SmartContractsApiFactory,
   TransactionHistoryApiFactory,
+  MPCWalletStakeApiFactory,
 } from "../client";
 import { BASE_PATH } from "./../client/base";
 import { Configuration } from "./../client/configuration";
@@ -139,8 +138,7 @@ export class Coinbase {
     Coinbase.apiClients.trade = TradesApiFactory(config, basePath, axiosInstance);
     Coinbase.apiClients.serverSigner = ServerSignersApiFactory(config, basePath, axiosInstance);
     Coinbase.apiClients.stake = StakeApiFactory(config, basePath, axiosInstance);
-    Coinbase.apiClients.walletStake = WalletStakeApiFactory(config, basePath, axiosInstance);
-    Coinbase.apiClients.validator = ValidatorsApiFactory(config, basePath, axiosInstance);
+    Coinbase.apiClients.walletStake = MPCWalletStakeApiFactory(config, basePath, axiosInstance);
     Coinbase.apiClients.asset = AssetsApiFactory(config, basePath, axiosInstance);
     Coinbase.apiClients.webhook = WebhooksApiFactory(config, basePath, axiosInstance);
     Coinbase.apiClients.contractInvocation = ContractInvocationsApiFactory(

src/coinbase/types.ts

@@ -539,9 +539,7 @@ export type StakeAPIClient = {
     page?: string,
     options?: AxiosRequestConfig,
   ): AxiosPromise<FetchHistoricalStakingBalances200Response>;
-};
 
-export type ValidatorAPIClient = {
   /**
    * List the validators for a given network and asset.
    *
@@ -715,7 +713,6 @@ export type ApiClients = {
   serverSigner?: ServerSignerAPIClient;
   stake?: StakeAPIClient;
   walletStake?: WalletStakeAPIClient;
-  validator?: ValidatorAPIClient;
   asset?: AssetAPIClient;
   externalAddress?: ExternalAddressAPIClient;
   webhook?: WebhookApiClient;

src/coinbase/validator.ts

@@ -37,7 +37,7 @@ export class Validator {
     status?: ValidatorStatus,
   ): Promise<Validator[]> {
     const validators: Validator[] = [];
-    const response = await Coinbase.apiClients.validator!.listValidators(
+    const response = await Coinbase.apiClients.stake!.listValidators(
       networkId,
       assetId,
       Validator.getAPIValidatorStatus(status),
@@ -60,7 +60,7 @@ export class Validator {
    * @returns The requested validator details.
    */
   public static async fetch(networkId: string, assetId: string, id: string): Promise<Validator> {
-    const response = await Coinbase.apiClients.validator!.getValidator(networkId, assetId, id);
+    const response = await Coinbase.apiClients.stake!.getValidator(networkId, assetId, id);
 
     return new Validator(response.data);
   }

src/tests/external_address_test.ts

@@ -187,7 +187,6 @@ describe("ExternalAddress", () => {
   beforeAll(() => {
     Coinbase.apiClients.stake = stakeApiMock;
     Coinbase.apiClients.asset = assetsApiMock;
-    Coinbase.apiClients.validator = validatorApiMock;
   });
 
   beforeEach(() => {

src/tests/validator_test.ts → src/tests/stake_test.ts

@@ -3,6 +3,7 @@ import { Coinbase } from "../coinbase/coinbase";
 import {
   mockEthereumValidator,
   mockReturnValue,
+  stakeApiMock,
   VALID_ACTIVE_VALIDATOR_LIST,
   validatorApiMock,
 } from "./utils";
@@ -12,7 +13,7 @@ import { ValidatorStatus as APIValidatorStatus } from "../client/api";
 describe("Validator", () => {
   beforeAll(() => {
     // Mock the validator functions.
-    Coinbase.apiClients.validator = validatorApiMock;
+    Coinbase.apiClients.stake = stakeApiMock;
   });
 
   beforeEach(() => {
@@ -98,15 +99,15 @@ describe("Validator", () => {
   });
 
   it("should return a list of validators for ethereum holesky and eth asset", async () => {
-    Coinbase.apiClients.validator!.listValidators = mockReturnValue(VALID_ACTIVE_VALIDATOR_LIST);
+    Coinbase.apiClients.stake!.listValidators = mockReturnValue(VALID_ACTIVE_VALIDATOR_LIST);
 
     const validators = await Validator.list(
       Coinbase.networks.EthereumHolesky,
       Coinbase.assets.Eth,
       ValidatorStatus.ACTIVE,
     );
 
-    expect(Coinbase.apiClients.validator!.listValidators).toHaveBeenCalledWith(
+    expect(Coinbase.apiClients.stake!.listValidators).toHaveBeenCalledWith(
       Coinbase.networks.EthereumHolesky,
       Coinbase.assets.Eth,
       ValidatorStatus.ACTIVE,
@@ -122,7 +123,7 @@ describe("Validator", () => {
   });
 
   it("should return a validator for ethereum holesky and eth asset", async () => {
-    Coinbase.apiClients.validator!.getValidator = mockReturnValue(
+    Coinbase.apiClients.stake!.getValidator = mockReturnValue(
       mockEthereumValidator("100", ValidatorStatus.EXITING, "0x123"),
     );
 
@@ -132,7 +133,7 @@ describe("Validator", () => {
       "0x123",
     );
 
-    expect(Coinbase.apiClients.validator!.getValidator).toHaveBeenCalledWith(
+    expect(Coinbase.apiClients.stake!.getValidator).toHaveBeenCalledWith(
       Coinbase.networks.EthereumHolesky,
       Coinbase.assets.Eth,
       "0x123",

src/tests/utils.ts

@@ -624,6 +624,8 @@ export const stakeApiMock = {
   getStakingContext: jest.fn(),
   fetchStakingRewards: jest.fn(),
   fetchHistoricalStakingBalances: jest.fn(),
+  getValidator: jest.fn(),
+  listValidators: jest.fn(),
 };
 
 export const walletStakeApiMock = {