Skip to content

chore: merge updated permit flow #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 56 commits into from
Dec 26, 2022
Merged

chore: merge updated permit flow #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
01ecddc
chore: automated cache update [skip cypress]
Dec 9, 2022
0a7071e
chore: automated cache update [skip cypress]
Dec 9, 2022
21602d8
chore: automated cache update [skip cypress]
Dec 9, 2022
2cd480b
chore: automated cache update [skip cypress]
Dec 10, 2022
670853f
chore: automated cache update [skip cypress]
Dec 10, 2022
988005c
chore: automated cache update [skip cypress]
Dec 10, 2022
7f8afcb
chore: automated cache update [skip cypress]
Dec 10, 2022
a57fe52
chore: automated cache update [skip cypress]
Dec 10, 2022
ddf34f3
chore: automated cache update [skip cypress]
Dec 10, 2022
dc1c9ec
chore: automated cache update [skip cypress]
Dec 10, 2022
c1b93e9
chore: automated cache update [skip cypress]
Dec 10, 2022
dbb6019
chore: automated cache update [skip cypress]
Dec 11, 2022
c539a2f
chore: automated cache update [skip cypress]
Dec 11, 2022
f3d3851
chore: automated cache update [skip cypress]
Dec 11, 2022
09e8991
chore: automated cache update [skip cypress]
Dec 12, 2022
4784101
chore: screening optimisations (#1348)
defispartan Dec 12, 2022
9745e3e
chore: automated cache update [skip cypress]
Dec 12, 2022
a8dae9d
chore: automated cache update [skip cypress]
Dec 12, 2022
6672c16
chore: automated cache update [skip cypress]
Dec 13, 2022
aed9218
chore(i18n): synchronize translations from crowdin [skip cypress]
Dec 13, 2022
a3c492b
chore: automated cache update [skip cypress]
Dec 13, 2022
8a60265
chore: automated cache update [skip cypress]
Dec 13, 2022
d33c242
chore: automated cache update [skip cypress]
Dec 13, 2022
87a5d5f
chore: automated cache update [skip cypress]
Dec 13, 2022
8517002
chore: automated cache update [skip cypress]
Dec 13, 2022
8d18044
chore: automated cache update [skip cypress]
Dec 13, 2022
1d65b1b
chore: automated cache update [skip cypress]
Dec 13, 2022
89b3281
chore: automated cache update [skip cypress]
Dec 14, 2022
95fa959
chore: automated cache update [skip cypress]
Dec 14, 2022
6a92a50
chore: automated cache update [skip cypress]
Dec 14, 2022
dc026ff
chore: automated cache update [skip cypress]
Dec 14, 2022
8561689
chore: automated cache update [skip cypress]
Dec 14, 2022
2c36c67
chore: automated cache update [skip cypress]
Dec 14, 2022
a0d3436
chore: automated cache update [skip cypress]
Dec 14, 2022
d538b12
chore: permit modifications (#1325)
defispartan Dec 14, 2022
0e76475
chore: automated cache update [skip cypress]
Dec 14, 2022
2c7dd52
feat: paraswap feature updates (#1219)
defispartan Dec 14, 2022
053bb31
chore: automated cache update [skip cypress]
Dec 15, 2022
ed5a975
chore(i18n): synchronize translations from crowdin [skip cypress]
Dec 15, 2022
ba186f2
chore: automated cache update [skip cypress]
Dec 15, 2022
837c5c1
Merge branch 'main' into feature/v2-v3-migration
defispartan Dec 15, 2022
aa26caa
chore: automated cache update [skip cypress]
Dec 15, 2022
e4a9269
chore: automated cache update [skip cypress]
Dec 15, 2022
790743a
chore: automated cache update [skip cypress]
Dec 15, 2022
ea5ef49
chore: automated cache update [skip cypress]
Dec 15, 2022
4eb6bc7
chore: automated cache update [skip cypress]
Dec 15, 2022
a638e5a
chore: replace rotationDelay with check on max retries (#1364)
defispartan Dec 15, 2022
52fe148
chore: automated cache update [skip cypress]
Dec 15, 2022
34abcb7
chore: automated cache update [skip cypress]
Dec 16, 2022
b00347c
chore(i18n): synchronize translations from crowdin [skip cypress]
Dec 16, 2022
d682669
chore: automated cache update [skip cypress]
Dec 16, 2022
ede4c65
chore: automated cache update [skip cypress]
Dec 16, 2022
cf58cab
Merge branch 'main' into chore/merge-updated-permit-flow
defispartan Dec 16, 2022
5b965d4
chore: check null conditions in poolSelectors
defispartan Dec 16, 2022
7e188bf
feat: enable permit in MigrateV3Actions
defispartan Dec 16, 2022
2005038
Merge branch 'feature/v2-v3-migration' into chore/merge-updated-permi…
defispartan Dec 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions cypress/e2e/0-v2-markets/0-main-v2-market/0-assets/dai.aave-v2.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,13 @@ const testData = {
hasApproval: true,
repayOption: constants.repayType.default,
},
// {
// asset: assets.aaveMarket.DAI,
// apyType: constants.apyType.stable,
// amount: 10,
// hasApproval: false,
// repayOption: constants.repayType.collateral,
// assetForRepay: assets.aaveMarket.BAT,
// },
{
asset: assets.aaveMarket.DAI,
apyType: constants.apyType.stable,
amount: 10,
hasApproval: false,
repayOption: constants.repayType.collateral,
},
],
withdraw: {
asset: assets.aaveMarket.DAI,
Expand All @@ -81,7 +80,6 @@ const testData = {
type: constants.dashboardTypes.deposit,
assetName: assets.aaveMarket.DAI.shortName,
wrapped: assets.aaveMarket.DAI.wrapped,
// amount: 30,
amount: 40,
collateralType: constants.collateralType.isCollateral,
isCollateral: true,
Expand All @@ -90,8 +88,7 @@ const testData = {
type: constants.dashboardTypes.borrow,
assetName: assets.aaveMarket.DAI.shortName,
wrapped: assets.aaveMarket.DAI.wrapped,
// amount: 80,
amount: 90,
amount: 80,
apyType: constants.borrowAPYType.stable,
},
],
Expand Down
19 changes: 8 additions & 11 deletions cypress/e2e/0-v2-markets/0-main-v2-market/0-assets/ren.aave-v2.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,13 @@ const testData = {
hasApproval: true,
repayOption: constants.repayType.default,
},
// {
// asset: assets.aaveMarket.REN,
// apyType: constants.apyType.stable,
// amount: 20,
// hasApproval: false,
// repayOption: constants.repayType.collateral,
// assetForRepay: assets.aaveMarket.BAT,
// },
{
asset: assets.aaveMarket.REN,
apyType: constants.apyType.stable,
amount: 20,
hasApproval: false,
repayOption: constants.repayType.collateral,
},
],
withdraw: {
asset: assets.aaveMarket.REN,
Expand All @@ -81,7 +80,6 @@ const testData = {
type: constants.dashboardTypes.deposit,
assetName: assets.aaveMarket.REN.shortName,
wrapped: assets.aaveMarket.REN.wrapped,
// amount: 60,
amount: 80,
collateralType: constants.collateralType.isCollateral,
isCollateral: true,
Expand All @@ -90,8 +88,7 @@ const testData = {
type: constants.dashboardTypes.borrow,
assetName: assets.aaveMarket.REN.shortName,
wrapped: assets.aaveMarket.REN.wrapped,
// amount: 160,
amount: 180,
amount: 160,
apyType: constants.borrowAPYType.stable,
},
],
Expand Down
19 changes: 8 additions & 11 deletions cypress/e2e/0-v2-markets/0-main-v2-market/0-assets/tusd.aave-v2.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,13 @@ const testData = {
hasApproval: true,
repayOption: constants.repayType.default,
},
// {
// asset: assets.aaveMarket.TUSD,
// apyType: constants.apyType.stable,
// amount: 10,
// hasApproval: false,
// repayOption: constants.repayType.collateral,
// assetForRepay: assets.aaveMarket.TUSD,
// },
{
asset: assets.aaveMarket.TUSD,
apyType: constants.apyType.stable,
amount: 10,
hasApproval: false,
repayOption: constants.repayType.collateral,
},
],
withdraw: {
asset: assets.aaveMarket.TUSD,
Expand All @@ -81,7 +80,6 @@ const testData = {
type: constants.dashboardTypes.deposit,
assetName: assets.aaveMarket.TUSD.shortName,
wrapped: assets.aaveMarket.TUSD.wrapped,
// amount: 30,
amount: 40,
collateralType: constants.collateralType.isCollateral,
isCollateral: true,
Expand All @@ -90,8 +88,7 @@ const testData = {
type: constants.dashboardTypes.borrow,
assetName: assets.aaveMarket.TUSD.shortName,
wrapped: assets.aaveMarket.TUSD.wrapped,
// amount: 80,
amount: 90,
amount: 80,
apyType: constants.borrowAPYType.stable,
},
],
Expand Down
19 changes: 8 additions & 11 deletions cypress/e2e/0-v2-markets/0-main-v2-market/0-assets/usdc.aave-v2.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,13 @@ const testData = {
hasApproval: true,
repayOption: constants.repayType.default,
},
// {
// asset: assets.aaveMarket.USDC,
// apyType: constants.apyType.stable,
// amount: 10,
// hasApproval: false,
// repayOption: constants.repayType.collateral,
// assetForRepay: assets.aaveMarket.USDC,
// },
{
asset: assets.aaveMarket.USDC,
apyType: constants.apyType.stable,
amount: 10,
hasApproval: false,
repayOption: constants.repayType.collateral,
},
],
withdraw: {
asset: assets.aaveMarket.USDC,
Expand All @@ -81,7 +80,6 @@ const testData = {
type: constants.dashboardTypes.deposit,
assetName: assets.aaveMarket.USDC.shortName,
wrapped: assets.aaveMarket.USDC.wrapped,
// amount: 30,
amount: 40,
collateralType: constants.collateralType.isCollateral,
isCollateral: true,
Expand All @@ -90,8 +88,7 @@ const testData = {
type: constants.dashboardTypes.borrow,
assetName: assets.aaveMarket.USDC.shortName,
wrapped: assets.aaveMarket.USDC.wrapped,
// amount: 80,
amount: 90,
amount: 80,
apyType: constants.borrowAPYType.stable,
},
],
Expand Down
19 changes: 8 additions & 11 deletions cypress/e2e/0-v2-markets/0-main-v2-market/0-assets/usdt.aave-v2.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,13 @@ const testData = {
hasApproval: true,
repayOption: constants.repayType.default,
},
// {
// asset: assets.aaveMarket.USDT,
// apyType: constants.apyType.stable,
// amount: 10,
// hasApproval: false,
// repayOption: constants.repayType.collateral,
// assetForRepay: assets.aaveMarket.USDT,
// },
{
asset: assets.aaveMarket.USDT,
apyType: constants.apyType.stable,
amount: 10,
hasApproval: false,
repayOption: constants.repayType.collateral,
},
],
withdraw: {
asset: assets.aaveMarket.USDT,
Expand All @@ -88,7 +87,6 @@ const testData = {
type: constants.dashboardTypes.deposit,
assetName: assets.aaveMarket.USDT.shortName,
wrapped: assets.aaveMarket.USDT.wrapped,
// amount: 30,
amount: 40,
collateralType: constants.collateralType.isCollateral,
isCollateral: false,
Expand All @@ -97,8 +95,7 @@ const testData = {
type: constants.dashboardTypes.borrow,
assetName: assets.aaveMarket.USDT.shortName,
wrapped: assets.aaveMarket.USDT.wrapped,
// amount: 80,
amount: 90,
amount: 80,
apyType: constants.borrowAPYType.stable,
},
],
Expand Down
29 changes: 20 additions & 9 deletions cypress/e2e/0-v2-markets/2-polygon-v2-market/0-assets/usdc.polygon-v2.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,22 @@ const testData = {
amount: 10,
hasApproval: false,
},
repay: {
asset: assets.polygonMarket.USDC,
apyType: constants.apyType.variable,
amount: 2,
hasApproval: true,
repayOption: constants.repayType.default,
},
repay: [
{
asset: assets.polygonMarket.USDC,
apyType: constants.apyType.variable,
amount: 2,
hasApproval: true,
repayOption: constants.repayType.default,
},
{
asset: assets.polygonMarket.USDC,
apyType: constants.apyType.variable,
amount: 2,
hasApproval: false,
repayOption: constants.repayType.collateral,
},
],
withdraw: {
asset: assets.polygonMarket.USDC,
isCollateral: true,
Expand All @@ -50,7 +59,7 @@ const testData = {
type: constants.dashboardTypes.borrow,
assetName: assets.polygonMarket.USDC.shortName,
wrapped: assets.polygonMarket.USDC.wrapped,
amount: 23.0,
amount: 21.0,
apyType: constants.borrowAPYType.variable,
},
],
Expand All @@ -64,7 +73,9 @@ describe('USDC INTEGRATION SPEC, POLYGON V2 MARKET', () => {
supply(testData.depositBaseAmount, skipTestState, true);
borrow(testData.testCases.borrow, skipTestState, true);
supply(testData.testCases.deposit, skipTestState, true);
repay(testData.testCases.repay, skipTestState, false);
testData.testCases.repay.forEach((repayCase) => {
repay(repayCase, skipTestState, false);
});
withdraw(testData.testCases.withdraw, skipTestState, false);
dashboardAssetValuesVerification(testData.verifications.finalDashboard, skipTestState);
});
29 changes: 20 additions & 9 deletions cypress/e2e/0-v2-markets/2-polygon-v2-market/0-assets/usdt.polygon-v2.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,22 @@ const testData = {
amount: 10,
hasApproval: false,
},
repay: {
asset: assets.polygonMarket.USDT,
apyType: constants.apyType.variable,
amount: 2,
hasApproval: true,
repayOption: constants.repayType.default,
},
repay: [
{
asset: assets.polygonMarket.USDT,
apyType: constants.apyType.variable,
amount: 2,
hasApproval: true,
repayOption: constants.repayType.default,
},
{
asset: assets.polygonMarket.USDT,
apyType: constants.apyType.variable,
amount: 2,
hasApproval: false,
repayOption: constants.repayType.collateral,
},
],
withdraw: {
asset: assets.polygonMarket.USDT,
isCollateral: false,
Expand All @@ -57,7 +66,7 @@ const testData = {
type: constants.dashboardTypes.borrow,
assetName: assets.polygonMarket.USDT.shortName,
wrapped: assets.polygonMarket.USDT.wrapped,
amount: 23.0,
amount: 21.0,
apyType: constants.borrowAPYType.variable,
},
],
Expand All @@ -71,7 +80,9 @@ describe('USDT INTEGRATION SPEC, POLYGON MARKET', () => {
supply(testData.depositBaseAmount, skipTestState, true);
borrow(testData.testCases.borrow, skipTestState, true);
supply(testData.testCases.deposit, skipTestState, true);
repay(testData.testCases.repay, skipTestState, false);
testData.testCases.repay.forEach((repayCase) => {
repay(repayCase, skipTestState, false);
});
withdraw(testData.testCases.withdraw, skipTestState, false);
changeBorrowTypeBlocked(testData.testCases.checkDisabledCollateral, skipTestState);
dashboardAssetValuesVerification(testData.verifications.finalDashboard, skipTestState);
Expand Down
29 changes: 20 additions & 9 deletions cypress/e2e/0-v2-markets/3-avalanche-v2-market/0-assets/usdc.avalanche-v2.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,22 @@ const testData = {
amount: 10,
hasApproval: false,
},
repay: {
asset: assets.avalancheMarket.USDC,
apyType: constants.apyType.variable,
amount: 2,
hasApproval: true,
repayOption: constants.repayType.default,
},
repay: [
{
asset: assets.avalancheMarket.USDC,
apyType: constants.apyType.variable,
amount: 2,
hasApproval: true,
repayOption: constants.repayType.default,
},
{
asset: assets.avalancheMarket.USDC,
apyType: constants.apyType.variable,
amount: 2,
hasApproval: false,
repayOption: constants.repayType.collateral,
},
],
withdraw: {
asset: assets.avalancheMarket.USDC,
isCollateral: true,
Expand All @@ -57,7 +66,7 @@ const testData = {
type: constants.dashboardTypes.borrow,
assetName: assets.avalancheMarket.USDC.shortName,
wrapped: assets.avalancheMarket.USDC.wrapped,
amount: 23.0,
amount: 21.0,
apyType: constants.borrowAPYType.variable,
},
],
Expand All @@ -71,7 +80,9 @@ describe('USDC INTEGRATION SPEC, AVALANCHE V2 MARKET', () => {
supply(testData.depositBaseAmount, skipTestState, true);
borrow(testData.testCases.borrow, skipTestState, true);
supply(testData.testCases.deposit, skipTestState, true);
repay(testData.testCases.repay, skipTestState, false);
testData.testCases.repay.forEach((repayCase) => {
repay(repayCase, skipTestState, false);
});
withdraw(testData.testCases.withdraw, skipTestState, false);
switchApyBlocked(testData.testCases.checkDisabledApy, skipTestState);
dashboardAssetValuesVerification(testData.verifications.finalDashboard, skipTestState);
Expand Down
29 changes: 20 additions & 9 deletions cypress/e2e/0-v2-markets/3-avalanche-v2-market/0-assets/usdt.avalanche-v2.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,22 @@ const testData = {
amount: 10,
hasApproval: false,
},
repay: {
asset: assets.avalancheMarket.USDT,
apyType: constants.apyType.variable,
amount: 2,
hasApproval: true,
repayOption: constants.repayType.default,
},
repay: [
{
asset: assets.avalancheMarket.USDT,
apyType: constants.apyType.variable,
amount: 2,
hasApproval: true,
repayOption: constants.repayType.default,
},
{
asset: assets.avalancheMarket.USDT,
apyType: constants.apyType.variable,
amount: 2,
hasApproval: false,
repayOption: constants.repayType.collateral,
},
],
withdraw: {
asset: assets.avalancheMarket.USDT,
isCollateral: false,
Expand Down Expand Up @@ -62,7 +71,7 @@ const testData = {
type: constants.dashboardTypes.borrow,
assetName: assets.avalancheMarket.USDT.shortName,
wrapped: assets.avalancheMarket.USDT.wrapped,
amount: 23.0,
amount: 21.0,
apyType: constants.borrowAPYType.variable,
},
],
Expand All @@ -76,7 +85,9 @@ describe('USDT INTEGRATION SPEC, AVALANCHE V2 MARKET', () => {
supply(testData.depositBaseAmount, skipTestState, true);
borrow(testData.testCases.borrow, skipTestState, true);
supply(testData.testCases.deposit, skipTestState, true);
repay(testData.testCases.repay, skipTestState, false);
testData.testCases.repay.forEach((repayCase) => {
repay(repayCase, skipTestState, false);
});
withdraw(testData.testCases.withdraw, skipTestState, false);
switchApyBlocked(testData.testCases.checkDisabledApy, skipTestState);
changeBorrowTypeBlocked(testData.testCases.checkBorrowTypeBlocked, skipTestState);
Expand Down
Loading