Skip to content

Commit 72a1a85

Browse files
Merge branch 'main' into feat/tada-types-fix
2 parents 85071a2 + 84692a8 commit 72a1a85

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+770
-370
lines changed

.changeset/config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
"access": "public",
88
"baseBranch": "main",
99
"updateInternalDependencies": "patch",
10-
"ignore": []
10+
"ignore": [],
11+
"privatePackages": false
1112
}

.changeset/stale-queens-watch.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@aave/client": patch
3+
"@aave/react": patch
4+
---
5+
6+
**fix:** avoids invariant error with React hooks that involves not indexed tx

.changeset/wicked-steaks-allow.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@aave/graphql": minor
3+
"@aave/client": minor
4+
"@aave/react": minor
5+
---
6+
7+
**feat:** Add withdraw/deposit/balance sGHO support

.github/workflows/on-demand.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Run Aave SDK V3 Tests
1+
name: Run Aave V3 Spec
22

33
on:
44
repository_dispatch:
@@ -21,13 +21,6 @@ jobs:
2121
ETHEREUM_TENDERLY_ADMIN_RPC: ${{ secrets.ETHEREUM_TENDERLY_ADMIN_RPC }}
2222
ETHEREUM_TENDERLY_BLOCKEXPLORER: ${{ secrets.ETHEREUM_TENDERLY_BLOCKEXPLORER }}
2323
API_X_E2E_TESTS_HEADER: ${{ secrets.API_X_E2E_TESTS_HEADER }}
24-
# TODO: remove the following once tests are separate into unit and e2e tests
25-
PRIVY_TEST_APP_ID: ${{ vars.PRIVY_TEST_APP_ID }}
26-
PRIVY_TEST_APP_SECRET: ${{ secrets.PRIVY_TEST_APP_SECRET }}
27-
PRIVY_TEST_WALLET_ID: ${{ vars.PRIVY_TEST_WALLET_ID }}
28-
PRIVY_TEST_WALLET_ADDRESS: ${{ vars.PRIVY_TEST_WALLET_ADDRESS }}
29-
THIRDWEB_TEST_SECRET_KEY: ${{ secrets.THIRDWEB_TEST_SECRET_KEY }}
30-
THIRDWEB_TEST_WALLET_ADDRESS: ${{ vars.THIRDWEB_TEST_WALLET_ADDRESS }}
3124

3225
steps:
3326
- uses: actions/checkout@v4
@@ -40,7 +33,7 @@ jobs:
4033
run: pnpm build
4134

4235
- name: Run tests
43-
run: pnpm test:client
36+
run: pnpm spec
4437

4538
- name: Publish results
4639
if: always()

.github/workflows/release.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
permissions:
2-
contents: read
2+
contents: write
33
pull-requests: write
44
name: Release
55

@@ -21,11 +21,14 @@ jobs:
2121
- name: Setup
2222
uses: ./.github/actions/setup
2323

24+
- name: Configure NPM Auth Token
25+
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NODE_AUTH_TOKEN }}" >> ~/.npmrc
26+
2427
- name: Create Release Pull Request
2528
uses: changesets/action@v1
2629
with:
27-
branchName: 'release/packages'
28-
title: 'chore: release packages'
30+
title: '[Release] Candidate'
2931
commit: 'chore: bump package versions'
32+
publish: pnpm release
3033
env:
3134
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/verify.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
name: 'Verify'
22
on:
33
workflow_call:
4+
inputs:
5+
run-acceptance:
6+
type: boolean
7+
required: false
8+
default: false
49

510
jobs:
611
lint:
@@ -50,3 +55,11 @@ jobs:
5055
- name: Run Tests
5156
shell: bash
5257
run: pnpm test
58+
59+
- name: Run Acceptance Tests
60+
if: ${{ inputs.run-acceptance }}
61+
shell: bash
62+
run: pnpm spec
63+
64+
65+

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ Update the `.env` file with the correct values.
6464

6565
Run the tests:
6666

67-
- `pnpm test:client`: Run the tests for the `@aave/client` package.
67+
- `pnpm test`: Run unit and integration tests `@aave/client` and `@aave/react` packages.
68+
- `pnpm spec`: Run the acceptance tests for the `@aave/spec` package.
6869

6970
Lint the code:
7071

biome.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
}
7575
},
7676
{
77-
"includes": ["packages/**/*.test.ts","packages/**/*.helpers.ts"],
77+
"includes": ["packages/**/*.spec.ts", "packages/**/*.test.ts", "packages/**/*.helpers.ts"],
7878
"linter": {
7979
"rules": {
8080
"style": {

package.json

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,27 @@
2020
"new:package": "NODE_OPTIONS='--import tsx' plop --plopfile=plopfile.ts",
2121
"prepublish": "pnpm run build",
2222
"publish:results": "tsx scripts/publishResults.ts",
23+
"release": "pnpm changeset publish",
24+
"spec": "vitest --project spec",
25+
"spec:borrow": "vitest --project spec packages/spec/markets/borrow.spec.ts",
26+
"spec:chains": "vitest --project spec packages/spec/misc/chains.spec.ts",
27+
"spec:collateral": "vitest --project spec packages/spec/markets/collateralToggle.spec.ts",
28+
"spec:emode": "vitest --project spec packages/spec/markets/eMode.spec.ts",
29+
"spec:healthFactor": "vitest --project spec packages/spec/markets/healthFactor.spec.ts",
30+
"spec:history": "vitest --project spec packages/spec/markets/history.spec.ts",
31+
"spec:markets": "vitest --project spec packages/spec/markets/markets.spec.ts",
32+
"spec:incentives": "vitest --project spec packages/spec/markets/incentives.spec.ts",
33+
"spec:positions": "vitest --project spec packages/spec/markets/positions.spec.ts",
34+
"spec:repay": "vitest --project spec packages/spec/markets/repay.spec.ts",
35+
"spec:reserve": "vitest --project spec packages/spec/markets/reserve.spec.ts",
36+
"spec:supply": "vitest --project spec packages/spec/markets/supply.spec.ts",
37+
"spec:vaults": "vitest --project spec packages/spec/vaults/vaults.spec.ts",
38+
"spec:withdraw": "vitest --project spec packages/spec/markets/withdraw.spec.ts",
39+
"test": "pnpm test:client && pnpm test:react",
2340
"test:client": "vitest --project client",
24-
"test:client:local": "ENVIRONMENT=local vitest --project client",
25-
"test:privy": "vitest --project client packages/client/src/privy.test.ts",
26-
"test:thirdweb": "vitest --project client packages/client/src/thirdweb.test.ts",
27-
"test:healthFactorPreview": "vitest --project client packages/client/src/actions/healthFactorPreview.test.ts",
28-
"test:react": "vitest --project react",
29-
"test:borrow": "vitest --project client packages/client/src/actions/borrow.test.ts",
30-
"test:chains": "vitest --project client packages/client/src/actions/chains.test.ts",
31-
"test:collateral": "vitest --project client packages/client/src/actions/collateralToggle.test.ts",
32-
"test:emode": "vitest --project client packages/client/src/actions/emode.test.ts",
33-
"test:history": "vitest --project client packages/client/src/actions/history.test.ts",
34-
"test:markets": "vitest --project client packages/client/src/actions/markets.test.ts",
35-
"test:positions": "vitest --project client packages/client/src/actions/positions.test.ts",
36-
"test:repay": "vitest --project client packages/client/src/actions/repay.test.ts",
37-
"test:reserve": "vitest --project client packages/client/src/actions/reserve.test.ts",
38-
"test:supply": "vitest --project client packages/client/src/actions/supply.test.ts",
39-
"test:vaults": "vitest --project client packages/client/src/actions/vaults.test.ts",
40-
"test:withdraw": "vitest --project client packages/client/src/actions/withdraw.test.ts",
41-
"test:cache": "vitest --project client packages/client/src/actions/cache.test.ts",
42-
"test": "vitest"
41+
"test:client:privy": "vitest --project client packages/client/src/privy.test.ts",
42+
"test:client:thirdweb": "vitest --project client packages/client/src/thirdweb.test.ts",
43+
"test:react": "vitest --project react"
4344
},
4445
"license": "MIT",
4546
"devDependencies": {

packages/client/src/actions/cache.test.ts

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

0 commit comments

Comments
 (0)