Skip to content

Commit

Permalink
Merge branch 'main' into feat/repay-bundle
Browse files Browse the repository at this point in the history
  • Loading branch information
grothem committed Nov 20, 2023
2 parents e42c342 + 4c7ed45 commit e612ae8
Show file tree
Hide file tree
Showing 81 changed files with 4,505 additions and 3,342 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/build-test-deploy-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ jobs:
fail-fast: false
matrix:
market:
- ethereum
- polygon
- avalanche
steps:
Expand Down Expand Up @@ -170,7 +169,6 @@ jobs:
fail-fast: false
matrix:
market:
- ethereum
- polygon
- avalanche
steps:
Expand All @@ -196,7 +194,6 @@ jobs:
matrix:
market:
- polygon
- avalanche
- optimism
- ethereum
- gho
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/build-test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ jobs:
fail-fast: false
matrix:
market:
- ethereum
- polygon
- avalanche
steps:
Expand Down Expand Up @@ -160,7 +159,6 @@ jobs:
fail-fast: false
matrix:
market:
- ethereum
- polygon
- avalanche
steps:
Expand All @@ -186,7 +184,6 @@ jobs:
matrix:
market:
- polygon
- avalanche
- optimism
- ethereum
- gho
Expand Down Expand Up @@ -215,6 +212,7 @@ jobs:
- settings
- mobile
- governance-stake
- widgets
steps:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2

Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/test-deploy-fork.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ jobs:
fail-fast: false
matrix:
market:
- ethereum
- polygon
- avalanche
steps:
Expand All @@ -90,8 +89,8 @@ jobs:
- avalanche
- optimism
- ethereum
- gho
- base
- gho
steps:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2

Expand Down Expand Up @@ -189,7 +188,6 @@ jobs:
fail-fast: false
matrix:
market:
- ethereum
- polygon
- avalanche
steps:
Expand All @@ -211,9 +209,9 @@ jobs:
matrix:
market:
- polygon
- avalanche
- optimism
- ethereum
- gho
steps:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2

Expand Down
14 changes: 1 addition & 13 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,13 +1 @@
# The 3-Clause BSD License

Copyright 2023 Aave Labs

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
All Rights Reserved © Aave Labs
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ For ease of use:

### Troubleshooting

Issue: I cannot connect to `app.aave.com`
Issue: Cannot connect to `app.aave.com`

The aave-ui is hosted on IPFS in a decentralized manner. `app.aave.com` just holds a CNAME record to the Cloudflare IPFS gateway. You can use [any](https://ipfs.github.io/public-gateway-checker/) public or private IPFS gateway supporting origin isolation to access aave-ui if for some reason the Cloudflare gateway doesn't work for you

Expand All @@ -67,7 +67,7 @@ Just go to `<your favorite public ipfs gateway>/ipns/app.aave.com`

## License

[BSD-3-Clause](./LICENSE.md)
[All Rights Reserved © Aave Labs](./LICENSE.md)

## Credits

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ const testData = {
},
};

describe('DAI INTEGRATION SPEC, AAVE V2 MARKET', () => {
//due asset frozen
describe.skip('DAI INTEGRATION SPEC, AAVE V2 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyMainnetFork({});
supply(testData.depositETH, skipTestState, true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ const testData = {
},
};

describe('ETH INTEGRATION SPEC, AAVE V2 MARKET', () => {
//due asset frozen
describe.skip('ETH INTEGRATION SPEC, AAVE V2 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyMainnetFork({});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ const testData = {
},
};

describe('USDC INTEGRATION SPEC, AAVE V2 MARKET', () => {
//due asset frozen
describe.skip('USDC INTEGRATION SPEC, AAVE V2 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyMainnetFork({});
supply(testData.depositETH, skipTestState, true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ const testData = {
},
};

describe('USDT INTEGRATION SPEC, AAVE V2 MARKET', () => {
//due asset frozen
describe.skip('USDT INTEGRATION SPEC, AAVE V2 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyMainnetFork({});
supply(testData.depositETH, skipTestState, true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ const testData = {
},
};

describe('DAI INTEGRATION SPEC, AVALANCHE V3 MARKET', () => {
//due asset frozen
describe.skip('DAI INTEGRATION SPEC, AVALANCHE V3 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyAvalancheFork({ market: 'fork_proto_avalanche_v3', v3: true });

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ const testData = {
},
};

describe('DAI INTEGRATION SPEC, POLYGON V3 MARKET', () => {
//due asset frozen
describe.skip('DAI INTEGRATION SPEC, POLYGON V3 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyPolygonFork({ market: 'fork_proto_polygon_v3', v3: true });

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ const testData = {
},
};

describe('USDC INTEGRATION SPEC, POLYGON V3 MARKET', () => {
//due asset frozen
describe.skip('USDC INTEGRATION SPEC, POLYGON V3 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyPolygonFork({ market: 'fork_proto_polygon_v3', v3: true });

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ const testData = {
},
};

describe('USDT INTEGRATION SPEC, POLYGON V3 MARKET', () => {
//due asset frozen
describe.skip('USDT INTEGRATION SPEC, POLYGON V3 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyPolygonFork({ market: 'fork_proto_polygon_v3', v3: true });

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ const testData = {
],
},
};

describe('E-MODE SPEC, POLYGON V3 MARKET', () => {
//due frozen assets
describe.skip('E-MODE SPEC, POLYGON V3 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyPolygonFork({ market: 'fork_proto_polygon_v3', v3: true });
describe('Prepare min health factor state, with stable coins', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ const testData = {
],
},
};

describe('SWAP, POLYGON V3 MARKET, INTEGRATION SPEC', () => {
//due frozen assets
describe.skip('SWAP, POLYGON V3 MARKET, INTEGRATION SPEC', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyPolygonFork({ market: 'fork_proto_polygon_v3', v3: true });

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ const testData = {
},
};

describe('DAI INTEGRATION SPEC, OPTIMISM V3 MARKET', () => {
//due asset frozen
describe.skip('DAI INTEGRATION SPEC, OPTIMISM V3 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyOptimismFork({ v3: true });

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ const testData = {
],
},
};

describe('USDT INTEGRATION SPEC, OPTIMISM V3 MARKET', () => {
// due frozen assets
describe.skip('USDT INTEGRATION SPEC, OPTIMISM V3 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyOptimismFork({ v3: true });

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ const testData = {
],
},
};

describe('E-MODE SPEC, OPTIMISM V3 MARKET', () => {
//due frozen assets
describe.skip('E-MODE SPEC, OPTIMISM V3 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyOptimismFork({ v3: true });
describe('Prepare min health factor state, with stable coins', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ const testData = {
],
},
};

describe('USDbC INTEGRATION SPEC, BASE V3 MARKET', () => {
//due oracle
describe.skip('USDbC INTEGRATION SPEC, BASE V3 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyBaseFork({ v3: true });

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ const testData = {
],
},
};

describe('ETH INTEGRATION SPEC, BASE V3 MARKET', () => {
//due oracle
describe.skip('ETH INTEGRATION SPEC, BASE V3 MARKET', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyBaseFork({ v3: true });

Expand Down
4 changes: 2 additions & 2 deletions cypress/e2e/1-v3-markets/6-base-v3-market/swap.base-v3.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ const testData = {
],
},
};

describe('SWAP, BASE V3 MARKET, INTEGRATION SPEC', () => {
//due oracle
describe.skip('SWAP, BASE V3 MARKET, INTEGRATION SPEC', () => {
const skipTestState = skipState(false);
configEnvWithTenderlyBaseFork({ v3: true });

Expand Down
22 changes: 0 additions & 22 deletions cypress/e2e/2-settings/stake-abpt.cy.ts

This file was deleted.

1 change: 1 addition & 0 deletions cypress/e2e/3-stake-governance/governance-deligation.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ const testData = {
mask: '0x36...49e2',
},
};

// skip while tenderly issue
describe.skip(`DELEGATION SPEC`, () => {
const skipTestState = skipState(false);
Expand Down
4 changes: 2 additions & 2 deletions cypress/e2e/4-gho-ethereum/fixtures/gho.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"collateral": false,
"wrapped": false,
"apy": {
"min": 2.13,
"max": 3.05
"min": 3.38,
"max": 4.83
}
}
Loading

0 comments on commit e612ae8

Please sign in to comment.