Skip to content

Commit 8e90f06

Browse files
authored
Merge branch 'main' into feat/expose-userearnedapy-and-userdebtapy
2 parents b71ea40 + 642adc6 commit 8e90f06

34 files changed

+769
-361
lines changed

.changeset/angry-webs-relate.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

.changeset/sharp-chefs-fail.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

.github/actions/setup/action.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: 'Setup repo and install dependencies'
33

44
runs:
55
using: 'composite'
6-
steps:
6+
steps:
77
- name: Setup pnpm
88
uses: pnpm/action-setup@v4
99

@@ -13,6 +13,10 @@ runs:
1313
node-version-file: '.nvmrc'
1414
cache: 'pnpm'
1515

16+
- name: Update npm
17+
shell: bash
18+
run: npm install -g [email protected]
19+
1620
- name: Install Dependencies
1721
shell: bash
1822
run: pnpm install --frozen-lockfile

.github/workflows/cd.yml

Lines changed: 0 additions & 45 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Continuous Deployment
2+
3+
on:
4+
push:
5+
branches: [main]
6+
7+
concurrency:
8+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
9+
cancel-in-progress: true
10+
11+
jobs:
12+
verify:
13+
name: Verify
14+
uses: ./.github/workflows/verify.yml
15+
secrets: inherit

.github/workflows/release.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
1-
permissions:
2-
contents: write
3-
pull-requests: write
41
name: Release
52

63
on:
74
push:
85
branches:
96
- main
7+
workflow_dispatch:
8+
inputs:
9+
run-verify:
10+
type: boolean
11+
description: 'Run verification after release'
12+
required: false
13+
default: false
14+
15+
permissions:
16+
id-token: write
17+
contents: write
18+
pull-requests: write
1019

1120
concurrency: ${{ github.workflow }}-${{ github.ref }}
1221

@@ -21,9 +30,6 @@ jobs:
2130
- name: Setup
2231
uses: ./.github/actions/setup
2332

24-
- name: Configure NPM Auth Token
25-
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NODE_AUTH_TOKEN }}" >> ~/.npmrc
26-
2733
- name: Create Release Pull Request
2834
uses: changesets/action@v1
2935
with:
@@ -35,7 +41,7 @@ jobs:
3541

3642
verify:
3743
needs: release
38-
if: ${{ needs.release.outputs.pullRequestNumber != '' }}
44+
if: ${{ inputs.run-verify && needs.release.outputs.pullRequestNumber != '' }}
3945
uses: ./.github/workflows/verify.yml
4046
secrets: inherit
4147
with:

.github/workflows/verify.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: 'Verify'
1+
name: Verify
22
on:
33
workflow_call:
44
inputs:
@@ -44,7 +44,7 @@ jobs:
4444

4545
steps:
4646
- uses: actions/checkout@v4
47-
47+
4848
- name: Setup Repository
4949
uses: ./.github/actions/setup
5050

@@ -64,6 +64,3 @@ jobs:
6464
if: ${{ inputs.run-acceptance }}
6565
shell: bash
6666
run: pnpm spec
67-
68-
69-

packages/client/CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
# @aave/client
22

3+
## 0.7.0
4+
5+
### Minor Changes
6+
7+
- 67ee5ad: **chore:** extract core logic into internal @aave/core package
8+
9+
### Patch Changes
10+
11+
- Updated dependencies [67ee5ad]
12+
- Updated dependencies [65cb5b6]
13+
- Updated dependencies [df44eb5]
14+
- @aave/graphql@0.7.0
15+
- @aave/types@0.2.0
16+
- @aave/core@0.1.0
17+
318
## 0.6.1
419

520
### Patch Changes

packages/client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@aave/client",
3-
"version": "0.6.1",
3+
"version": "0.7.0",
44
"description": "The official JavaScript client for the Aave API",
55
"repository": {
66
"directory": "packages/client",

packages/client/src/actions/vaults.ts

Lines changed: 76 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@ import {
33
type PaginatedVaultsResult,
44
type PaginatedVaultUserTransactionHistoryResult,
55
type TokenAmount,
6+
type TransactionRequest,
67
UserVaultsQuery,
78
type UserVaultsRequest,
89
type Vault,
10+
type VaultCreateRecipientsConfigurationRequest,
11+
type VaultFeesRecipientsConfiguration,
912
VaultPreviewDepositQuery,
1013
type VaultPreviewDepositRequest,
1114
VaultPreviewMintQuery,
@@ -15,14 +18,21 @@ import {
1518
VaultPreviewWithdrawQuery,
1619
type VaultPreviewWithdrawRequest,
1720
VaultQuery,
21+
type VaultRecipientConfigurationRequest,
1822
type VaultRequest,
23+
type VaultSetRecipientsConfigurationRequest,
1924
VaultsQuery,
2025
type VaultsRequest,
26+
type VaultTransferOwnershipRequest,
2127
VaultUserActivityQuery,
2228
type VaultUserActivityRequest,
2329
type VaultUserActivityResult,
2430
VaultUserTransactionHistoryQuery,
2531
type VaultUserTransactionHistoryRequest,
32+
vaultCreateRecipientsConfigurationQuery,
33+
vaultRecipientConfigurationQuery,
34+
vaultSetRecipientsConfigurationQuery,
35+
vaultTransferOwnershipQuery,
2636
} from '@aave/graphql';
2737
import type { ResultAsync } from '@aave/types';
2838
import type { AaveClient } from '../AaveClient';
@@ -181,7 +191,7 @@ export function vaultPreviewMint(
181191
*
182192
* ```ts
183193
* const result = await vaultPreviewWithdraw(client, {
184-
* vault: evmAddress('0x1234567890abcdef1234567890abcdef12345678'),
194+
* vault: evmAddress('0x1234…'),
185195
* chainId: chainId(1),
186196
* amount: bigDecimal('750'),
187197
* });
@@ -210,7 +220,7 @@ export function vaultPreviewWithdraw(
210220
*
211221
* ```ts
212222
* const result = await vaultPreviewRedeem(client, {
213-
* vault: evmAddress('0x1234567890abcdef1234567890abcdef12345678'),
223+
* vault: evmAddress('0x1234…'),
214224
* chainId: chainId(1),
215225
* amount: bigDecimal('200'),
216226
* });
@@ -239,9 +249,9 @@ export function vaultPreviewRedeem(
239249
*
240250
* ```ts
241251
* const result = await vaultUserTransactionHistory(client, {
242-
* vault: evmAddress('0x1234567890abcdef1234567890abcdef12345678'),
252+
* vault: evmAddress('0x1234…'),
243253
* chainId: chainId(1),
244-
* user: evmAddress('0x5678901234567890abcdef1234567890abcdef12'),
254+
* user: evmAddress('0x5678…'),
245255
* });
246256
*
247257
* if (result.isOk()) {
@@ -274,9 +284,9 @@ export function vaultUserTransactionHistory(
274284
*
275285
* ```ts
276286
* const result = await vaultUserActivity(client, {
277-
* vault: evmAddress('0x1234567890abcdef1234567890abcdef12345678'),
287+
* vault: evmAddress('0x1234…'),
278288
* chainId: chainId(1),
279-
* user: evmAddress('0x5678901234567890abcdef1234567890abcdef12'),
289+
* user: evmAddress('0x5678…'),
280290
* });
281291
*
282292
* if (result.isOk()) {
@@ -302,3 +312,63 @@ export function vaultUserActivity(
302312
request,
303313
});
304314
}
315+
316+
/**
317+
* Creates a transaction to transfer ownership of a vault.
318+
*
319+
* ```ts
320+
* const result = await vaultTransferOwnership(client, {
321+
* vault: evmAddress('0x1234…'),
322+
* chainId: chainId(1),
323+
* newOwner: evmAddress('0x5678…'),
324+
* }).andThen(sendWith(wallet)).andThen(client.waitForTransaction);
325+
* ```
326+
*
327+
* @param client - Aave client.
328+
* @param request - The vault transfer ownership request parameters.
329+
* @returns The transaction data for transferring vault ownership.
330+
*/
331+
export function vaultTransferOwnership(
332+
client: AaveClient,
333+
request: VaultTransferOwnershipRequest,
334+
): ResultAsync<TransactionRequest, UnexpectedError> {
335+
return client.query(vaultTransferOwnershipQuery, {
336+
request,
337+
});
338+
}
339+
340+
/**
341+
* @internal
342+
*/
343+
export function vaultCreateRecipientsConfiguration(
344+
client: AaveClient,
345+
request: VaultCreateRecipientsConfigurationRequest,
346+
): ResultAsync<TransactionRequest, UnexpectedError> {
347+
return client.query(vaultCreateRecipientsConfigurationQuery, {
348+
request,
349+
});
350+
}
351+
352+
/**
353+
* @internal
354+
*/
355+
export function vaultRecipientConfiguration(
356+
client: AaveClient,
357+
request: VaultRecipientConfigurationRequest,
358+
): ResultAsync<VaultFeesRecipientsConfiguration | null, UnexpectedError> {
359+
return client.query(vaultRecipientConfigurationQuery, {
360+
request,
361+
});
362+
}
363+
364+
/**
365+
* @internal
366+
*/
367+
export function vaultSetRecipientsConfiguration(
368+
client: AaveClient,
369+
request: VaultSetRecipientsConfigurationRequest,
370+
): ResultAsync<TransactionRequest, UnexpectedError> {
371+
return client.query(vaultSetRecipientsConfigurationQuery, {
372+
request,
373+
});
374+
}

0 commit comments

Comments
 (0)