Merge branch 'main' into chore/update-publish-skill

Author: grothem

.changeset/incentives-kind-sync.md

@@ -0,0 +1,13 @@
+---
+"@aave/graphql": minor
+"@aave/client": minor
+"@aave/react": minor
+"@aave/types": minor
+---
+
+Sync GraphQL schema with V3 backend and add the `kind` discriminator on points incentives.
+
+- `SupplyPointsIncentive` / `BorrowPointsIncentive` now expose `kind: PointsProgramKind!` (`CAMPAIGN` for Merkl-backed programs, `LOYALTY` for fixed-multiplier partner programs like Ethena, Ether.fi). For `LOYALTY`, `dailyPoints` / `pointsPerThousandUsd` are always null.
+- New fragments: `MerklSupplyIncentive`, `MerklBorrowIncentive`, `SupplyPointsIncentive`, `BorrowPointsIncentive`, `IncentiveCriteria`, `PointsProgram`, plus extended Merit fragments (`actionKey`, `rewardTokenAddress`, `rewardTokenSymbol`, `customMessage`, `customForumLink`, `selfApr`).
+- New canonical `userRewards` query (supersedes `userMeritRewards`).
+- `RewardId` scalar mapped to a branded string in `@aave/types`.

.changeset/ninety-regions-yell.md

@@ -0,0 +1,7 @@
+---
+"@aave/graphql": minor
+"@aave/client": minor
+"@aave/react": minor
+---
+
+Add stkGHO migration action support

packages/client/src/actions/gho.ts

@@ -19,6 +19,8 @@ import {
   SghoVaultRedeemSharesQuery,
   type SghoVaultRedeemSharesRequest,
   type SghoVaultRequest,
+  StkGhoMigrateQuery,
+  type StkGhoMigrateRequest,
   type TokenAmount,
 } from '@aave/graphql';
 import type { ResultAsync } from '@aave/types';
@@ -181,6 +183,33 @@ export function sghoVaultRedeemShares(
   return client.query(SghoVaultRedeemSharesQuery, { request });
 }
 
+/**
+ * Creates a transaction to migrate the caller's full stkGHO position into the sGHO ERC-4626 vault.
+ *
+ * ```ts
+ * const result = await stkGhoMigrate(client, {
+ *   user: evmAddress('0x9abc…'),
+ *   chainId: chainId(1),
+ * }).andThen(sendWith(wallet))
+ *
+ * if (result.isErr()) {
+ *   return;
+ * }
+ *
+ * // result.value: TxHash
+ * ```
+ *
+ * @param client - Aave client.
+ * @param request - The stkGHO migration request parameters.
+ * @returns The transaction request data to migrate stkGHO to sGHO.
+ */
+export function stkGhoMigrate(
+  client: AaveClient,
+  request: StkGhoMigrateRequest,
+): ResultAsync<ExecutionPlan, UnexpectedError> {
+  return client.query(StkGhoMigrateQuery, { request });
+}
+
 /**
  * Returns the number of sGHO shares minted for a given GHO deposit amount.
  *

packages/client/src/actions/incentives.ts

@@ -1,10 +1,15 @@
 import {
   UserMeritRewardsQuery,
   type UserMeritRewardsRequest,
+  UserRewardsQuery,
+  type UserRewardsRequest,
 } from '@aave/graphql';
 import type { AaveClient } from '../AaveClient';
 
 /**
+ * @deprecated Use {@link userRewards} instead. The `userMeritRewards` query is
+ * kept as a backwards-compatible alias and will be removed in a future release.
+ *
  * Fetches Merit rewards for a user with the transaction request to claim them.
  *
  * ```ts
@@ -24,3 +29,26 @@ export function userMeritRewards(
 ) {
   return client.query(UserMeritRewardsQuery, { request });
 }
+
+/**
+ * Fetches the user's Merkl-claimable rewards on a chain together with the
+ * claim transaction. Canonical replacement for {@link userMeritRewards} —
+ * same data source (the Merkl distributor), with an added `rewardIds` filter
+ * that scopes the claim to specific Aave-owned programs.
+ *
+ * ```ts
+ * const result = await userRewards(client, {
+ *   user: evmAddress('0x742d35cc…'),
+ *   chainId: chainId(1),
+ *   filter: { rewardIds: ['11111111-1111-1111-1111-111111111111'] },
+ * });
+ * ```
+ *
+ * @param client - Aave client.
+ * @param request - The rewards request parameters.
+ * @returns The claimable rewards with the transaction request, or `null`
+ * when the user has nothing to claim on that chain.
+ */
+export function userRewards(client: AaveClient, request: UserRewardsRequest) {
+  return client.query(UserRewardsQuery, { request });
+}