Merge branch 'main' into feat/exppand-cli

Author: Trynax

.changeset/kind-lines-wave.md

@@ -0,0 +1,7 @@
+---
+"@aave/graphql": patch
+"@aave/client": patch
+"@aave/react": patch
+---
+
+**chore:** adjusts `UpdateUserPositionConditionsRequest` to latest GQL schema.

examples/balances/src/App.tsx

@@ -1,12 +1,9 @@
 import {
-  chainId,
   evmAddress,
   ReservesRequestFilter,
   useUserBalances,
 } from '@aave/react';
-import { supportedChains } from '@aave/react/viem';
-
-const defaultChainId = chainId(supportedChains[0]!.id);
+import { defaultChainId } from './config';
 
 export function App() {
   const { data, loading } = useUserBalances({

examples/balances/src/config.ts

@@ -0,0 +1,3 @@
+import { chainId } from '@aave/react';
+
+export const defaultChainId = chainId(Number(import.meta.env.VITE_CHAIN_ID));

examples/balances/src/vite-env.d.ts

@@ -1 +1,9 @@
 /// <reference types="vite/client" />
+
+interface ImportMetaEnv {
+  readonly VITE_CHAIN_ID: string;
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv;
+}

packages/client/src/actions/transactions.ts

@@ -236,8 +236,7 @@ export function renounceSpokeUserPositionManager(
  * ```ts
  * const result = await updateUserPositionConditions(client, {
  *   userPositionId: userPositionId('SGVsbG8h'),
- *   dynamicConfig: true,
- *   riskPremium: true,
+ *   update: UserPositionConditionsUpdate.AllDynamicConfig,
  * }).andThen(sendWith(wallet)).andThen(client.waitForTransaction);
  *
  * if (result.isErr()) {

packages/graphql/schema.graphql

@@ -1704,8 +1704,7 @@ type TypeField {
 
 input UpdateUserPositionConditionsRequest {
   userPositionId: UserPositionId!
-  dynamicConfig: Boolean!
-  riskPremium: Boolean!
+  update: UserPositionConditionsUpdate!
 }
 
 type UpdatedDynamicConfigActivity {
@@ -1977,6 +1976,11 @@ type UserPosition {
 
 union UserPositionConditionVariation = CollateralFactorVariation | LiquidationFeeVariation | MaxLiquidationBonusVariation
 
+enum UserPositionConditionsUpdate {
+  ALL_DYNAMIC_CONFIG
+  JUST_RISK_PREMIUM
+}
+
 scalar UserPositionId
 
 input UserPositionRequest @oneOf {

packages/graphql/src/enums.ts

@@ -156,3 +156,11 @@ export enum TokenCategory {
   Stablecoin = 'STABLECOIN',
   EthCorrelated = 'ETH_CORRELATED',
 }
+
+/**
+ * The update type for user position conditions.
+ */
+export enum UserPositionConditionsUpdate {
+  AllDynamicConfig = 'ALL_DYNAMIC_CONFIG',
+  JustRiskPremium = 'JUST_RISK_PREMIUM',
+}

packages/graphql/src/graphql-env.d.ts

@@ -229,7 +229,7 @@ export type introspection_types = {
     'TxHashInput': { kind: 'INPUT_OBJECT'; name: 'TxHashInput'; isOneOf: false; inputFields: [{ name: 'txHash'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'SCALAR'; name: 'TxHash'; ofType: null; }; }; defaultValue: null }, { name: 'chainId'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'SCALAR'; name: 'ChainId'; ofType: null; }; }; defaultValue: null }]; };
     'TypeDefinition': { kind: 'OBJECT'; name: 'TypeDefinition'; fields: { 'EIP712Domain': { name: 'EIP712Domain'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'LIST'; name: never; ofType: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'TypeField'; ofType: null; }; }; }; } }; 'Permit': { name: 'Permit'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'LIST'; name: never; ofType: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'TypeField'; ofType: null; }; }; }; } }; }; };
     'TypeField': { kind: 'OBJECT'; name: 'TypeField'; fields: { 'name': { name: 'name'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'SCALAR'; name: 'String'; ofType: null; }; } }; 'type': { name: 'type'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'SCALAR'; name: 'String'; ofType: null; }; } }; }; };
-    'UpdateUserPositionConditionsRequest': { kind: 'INPUT_OBJECT'; name: 'UpdateUserPositionConditionsRequest'; isOneOf: false; inputFields: [{ name: 'userPositionId'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'SCALAR'; name: 'UserPositionId'; ofType: null; }; }; defaultValue: null }, { name: 'dynamicConfig'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'SCALAR'; name: 'Boolean'; ofType: null; }; }; defaultValue: null }, { name: 'riskPremium'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'SCALAR'; name: 'Boolean'; ofType: null; }; }; defaultValue: null }]; };
+    'UpdateUserPositionConditionsRequest': { kind: 'INPUT_OBJECT'; name: 'UpdateUserPositionConditionsRequest'; isOneOf: false; inputFields: [{ name: 'userPositionId'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'SCALAR'; name: 'UserPositionId'; ofType: null; }; }; defaultValue: null }, { name: 'update'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'ENUM'; name: 'UserPositionConditionsUpdate'; ofType: null; }; }; defaultValue: null }]; };
     'UpdatedDynamicConfigActivity': { kind: 'OBJECT'; name: 'UpdatedDynamicConfigActivity'; fields: { 'chain': { name: 'chain'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'Chain'; ofType: null; }; } }; 'collateralFactor': { name: 'collateralFactor'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'PercentNumberChangeSnapshot'; ofType: null; }; } }; 'id': { name: 'id'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'SCALAR'; name: 'ID'; ofType: null; }; } }; 'liquidationFee': { name: 'liquidationFee'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'PercentNumberChangeSnapshot'; ofType: null; }; } }; 'maxLiquidationBonus': { name: 'maxLiquidationBonus'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'PercentNumberChangeSnapshot'; ofType: null; }; } }; 'reserve': { name: 'reserve'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'ReserveInfo'; ofType: null; }; } }; 'spoke': { name: 'spoke'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'Spoke'; ofType: null; }; } }; 'timestamp': { name: 'timestamp'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'SCALAR'; name: 'DateTime'; ofType: null; }; } }; 'txHash': { name: 'txHash'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'SCALAR'; name: 'TxHash'; ofType: null; }; } }; 'user': { name: 'user'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'SCALAR'; name: 'EvmAddress'; ofType: null; }; } }; }; };
     'UpdatedRiskPremiumActivity': { kind: 'OBJECT'; name: 'UpdatedRiskPremiumActivity'; fields: { 'chain': { name: 'chain'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'Chain'; ofType: null; }; } }; 'id': { name: 'id'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'SCALAR'; name: 'ID'; ofType: null; }; } }; 'premium': { name: 'premium'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'PercentNumberChangeSnapshot'; ofType: null; }; } }; 'spoke': { name: 'spoke'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'Spoke'; ofType: null; }; } }; 'timestamp': { name: 'timestamp'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'SCALAR'; name: 'DateTime'; ofType: null; }; } }; 'txHash': { name: 'txHash'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'SCALAR'; name: 'TxHash'; ofType: null; }; } }; 'user': { name: 'user'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'SCALAR'; name: 'EvmAddress'; ofType: null; }; } }; }; };
     'UserBalance': { kind: 'OBJECT'; name: 'UserBalance'; fields: { 'balances': { name: 'balances'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'LIST'; name: never; ofType: { kind: 'NON_NULL'; name: never; ofType: { kind: 'UNION'; name: 'TokenAmount'; ofType: null; }; }; }; } }; 'borrowApy': { name: 'borrowApy'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'PercentNumber'; ofType: null; }; } }; 'collateralFactor': { name: 'collateralFactor'; type: { kind: 'OBJECT'; name: 'PercentNumber'; ofType: null; } }; 'exchange': { name: 'exchange'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'ExchangeAmount'; ofType: null; }; } }; 'id': { name: 'id'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'SCALAR'; name: 'UserBalanceId'; ofType: null; }; } }; 'info': { name: 'info'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'TokenInfo'; ofType: null; }; } }; 'supplyApy': { name: 'supplyApy'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'PercentNumber'; ofType: null; }; } }; 'totalAmount': { name: 'totalAmount'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'DecimalNumber'; ofType: null; }; } }; }; };
@@ -253,6 +253,7 @@ export type introspection_types = {
     'UserHubInput': { kind: 'INPUT_OBJECT'; name: 'UserHubInput'; isOneOf: true; inputFields: [{ name: 'input'; type: { kind: 'INPUT_OBJECT'; name: 'HubInput'; ofType: null; }; defaultValue: null }, { name: 'id'; type: { kind: 'SCALAR'; name: 'HubId'; ofType: null; }; defaultValue: null }]; };
     'UserPosition': { kind: 'OBJECT'; name: 'UserPosition'; fields: { 'averageCollateralFactor': { name: 'averageCollateralFactor'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'PercentNumber'; ofType: null; }; } }; 'borrowingPower': { name: 'borrowingPower'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'ExchangeAmount'; ofType: null; }; } }; 'createdAt': { name: 'createdAt'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'SCALAR'; name: 'DateTime'; ofType: null; }; } }; 'healthFactor': { name: 'healthFactor'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'HealthFactorWithChange'; ofType: null; }; } }; 'id': { name: 'id'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'SCALAR'; name: 'UserPositionId'; ofType: null; }; } }; 'isUsingLatestDynamicConfigKey': { name: 'isUsingLatestDynamicConfigKey'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'SCALAR'; name: 'Boolean'; ofType: null; }; } }; 'liquidationPrice': { name: 'liquidationPrice'; type: { kind: 'OBJECT'; name: 'ExchangeAmount'; ofType: null; } }; 'netApy': { name: 'netApy'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'PercentNumber'; ofType: null; }; } }; 'netBalance': { name: 'netBalance'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'ExchangeAmountWithChange'; ofType: null; }; } }; 'netBalancePercentChange': { name: 'netBalancePercentChange'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'PercentNumber'; ofType: null; }; } }; 'netBorrowApy': { name: 'netBorrowApy'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'PercentNumberWithChange'; ofType: null; }; } }; 'netCollateral': { name: 'netCollateral'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'ExchangeAmountWithChange'; ofType: null; }; } }; 'netSupplyApy': { name: 'netSupplyApy'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'PercentNumberWithChange'; ofType: null; }; } }; 'riskPremium': { name: 'riskPremium'; type: { kind: 'OBJECT'; name: 'UserPositionRiskPremium'; ofType: null; } }; 'spoke': { name: 'spoke'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'Spoke'; ofType: null; }; } }; 'totalCollateral': { name: 'totalCollateral'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'ExchangeAmountWithChange'; ofType: null; }; } }; 'totalDebt': { name: 'totalDebt'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'ExchangeAmountWithChange'; ofType: null; }; } }; 'totalSupplied': { name: 'totalSupplied'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'ExchangeAmountWithChange'; ofType: null; }; } }; 'user': { name: 'user'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'SCALAR'; name: 'EvmAddress'; ofType: null; }; } }; }; };
     'UserPositionConditionVariation': { kind: 'UNION'; name: 'UserPositionConditionVariation'; fields: {}; possibleTypes: 'CollateralFactorVariation' | 'LiquidationFeeVariation' | 'MaxLiquidationBonusVariation'; };
+    'UserPositionConditionsUpdate': { name: 'UserPositionConditionsUpdate'; enumValues: 'ALL_DYNAMIC_CONFIG' | 'JUST_RISK_PREMIUM'; };
     'UserPositionId': unknown;
     'UserPositionRequest': { kind: 'INPUT_OBJECT'; name: 'UserPositionRequest'; isOneOf: true; inputFields: [{ name: 'userSpoke'; type: { kind: 'INPUT_OBJECT'; name: 'UserSpokeInput'; ofType: null; }; defaultValue: null }, { name: 'id'; type: { kind: 'SCALAR'; name: 'UserPositionId'; ofType: null; }; defaultValue: null }]; };
     'UserPositionRiskPremium': { kind: 'OBJECT'; name: 'UserPositionRiskPremium'; fields: { 'better': { name: 'better'; type: { kind: 'OBJECT'; name: 'PercentNumber'; ofType: null; } }; 'breakdown': { name: 'breakdown'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'LIST'; name: never; ofType: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'UserRiskPremiumBreakdownItem'; ofType: null; }; }; }; } }; 'current': { name: 'current'; type: { kind: 'NON_NULL'; name: never; ofType: { kind: 'OBJECT'; name: 'PercentNumber'; ofType: null; }; } }; }; };

packages/graphql/src/graphql.ts

@@ -33,6 +33,7 @@ import type {
   SwapStatusFilter,
   TimeWindow,
   TokenCategory,
+  UserPositionConditionsUpdate,
 } from './enums';
 import type { introspection } from './graphql-env';
 import type {
@@ -102,6 +103,7 @@ export const graphql = initGraphQLTada<{
     TxHash: TxHash;
     UserBalanceId: UserBalanceId;
     UserBorrowItemId: UserBorrowItemId;
+    UserPositionConditionsUpdate: UserPositionConditionsUpdate;
     UserPositionId: UserPositionId;
     UserSupplyItemId: UserSupplyItemId;
     Void: Void;

packages/react/src/transactions.ts

@@ -585,8 +585,7 @@ export function useRenounceSpokeUserPositionManager(
  *
  * const result = await update({
  *   userPositionId: userPosition.id,
- *   dynamicConfig: true,
- *   riskPremium: true,
+ *   update: UserPositionConditionsUpdate.AllDynamicConfig,
  * });
  *
  * if (result.isErr()) {