Skip to content

Commit f6fcf36

Browse files
satanworkersatanworker
authored
Merge pull request #10 from defispartan/chore/merge-updated-permit-flow
chore: merge updated permit flow
2 parents b8fe477 + 2005038 commit f6fcf36

File tree

79 files changed

+3177
-1450
lines changed

Some content is hidden

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

79 files changed

+3177
-1450
lines changed

‎cypress/e2e/0-v2-markets/0-main-v2-market/0-assets/dai.aave-v2.cy.ts‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,13 @@ const testData = {
5959
hasApproval: true,
6060
repayOption: constants.repayType.default,
6161
},
62-
// {
63-
// asset: assets.aaveMarket.DAI,
64-
// apyType: constants.apyType.stable,
65-
// amount: 10,
66-
// hasApproval: false,
67-
// repayOption: constants.repayType.collateral,
68-
// assetForRepay: assets.aaveMarket.BAT,
69-
// },
62+
{
63+
asset: assets.aaveMarket.DAI,
64+
apyType: constants.apyType.stable,
65+
amount: 10,
66+
hasApproval: false,
67+
repayOption: constants.repayType.collateral,
68+
},
7069
],
7170
withdraw: {
7271
asset: assets.aaveMarket.DAI,
@@ -81,7 +80,6 @@ const testData = {
8180
type: constants.dashboardTypes.deposit,
8281
assetName: assets.aaveMarket.DAI.shortName,
8382
wrapped: assets.aaveMarket.DAI.wrapped,
84-
// amount: 30,
8583
amount: 40,
8684
collateralType: constants.collateralType.isCollateral,
8785
isCollateral: true,
@@ -90,8 +88,7 @@ const testData = {
9088
type: constants.dashboardTypes.borrow,
9189
assetName: assets.aaveMarket.DAI.shortName,
9290
wrapped: assets.aaveMarket.DAI.wrapped,
93-
// amount: 80,
94-
amount: 90,
91+
amount: 80,
9592
apyType: constants.borrowAPYType.stable,
9693
},
9794
],

‎cypress/e2e/0-v2-markets/0-main-v2-market/0-assets/ren.aave-v2.cy.ts‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,13 @@ const testData = {
5959
hasApproval: true,
6060
repayOption: constants.repayType.default,
6161
},
62-
// {
63-
// asset: assets.aaveMarket.REN,
64-
// apyType: constants.apyType.stable,
65-
// amount: 20,
66-
// hasApproval: false,
67-
// repayOption: constants.repayType.collateral,
68-
// assetForRepay: assets.aaveMarket.BAT,
69-
// },
62+
{
63+
asset: assets.aaveMarket.REN,
64+
apyType: constants.apyType.stable,
65+
amount: 20,
66+
hasApproval: false,
67+
repayOption: constants.repayType.collateral,
68+
},
7069
],
7170
withdraw: {
7271
asset: assets.aaveMarket.REN,
@@ -81,7 +80,6 @@ const testData = {
8180
type: constants.dashboardTypes.deposit,
8281
assetName: assets.aaveMarket.REN.shortName,
8382
wrapped: assets.aaveMarket.REN.wrapped,
84-
// amount: 60,
8583
amount: 80,
8684
collateralType: constants.collateralType.isCollateral,
8785
isCollateral: true,
@@ -90,8 +88,7 @@ const testData = {
9088
type: constants.dashboardTypes.borrow,
9189
assetName: assets.aaveMarket.REN.shortName,
9290
wrapped: assets.aaveMarket.REN.wrapped,
93-
// amount: 160,
94-
amount: 180,
91+
amount: 160,
9592
apyType: constants.borrowAPYType.stable,
9693
},
9794
],

‎cypress/e2e/0-v2-markets/0-main-v2-market/0-assets/tusd.aave-v2.cy.ts‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,13 @@ const testData = {
5959
hasApproval: true,
6060
repayOption: constants.repayType.default,
6161
},
62-
// {
63-
// asset: assets.aaveMarket.TUSD,
64-
// apyType: constants.apyType.stable,
65-
// amount: 10,
66-
// hasApproval: false,
67-
// repayOption: constants.repayType.collateral,
68-
// assetForRepay: assets.aaveMarket.TUSD,
69-
// },
62+
{
63+
asset: assets.aaveMarket.TUSD,
64+
apyType: constants.apyType.stable,
65+
amount: 10,
66+
hasApproval: false,
67+
repayOption: constants.repayType.collateral,
68+
},
7069
],
7170
withdraw: {
7271
asset: assets.aaveMarket.TUSD,
@@ -81,7 +80,6 @@ const testData = {
8180
type: constants.dashboardTypes.deposit,
8281
assetName: assets.aaveMarket.TUSD.shortName,
8382
wrapped: assets.aaveMarket.TUSD.wrapped,
84-
// amount: 30,
8583
amount: 40,
8684
collateralType: constants.collateralType.isCollateral,
8785
isCollateral: true,
@@ -90,8 +88,7 @@ const testData = {
9088
type: constants.dashboardTypes.borrow,
9189
assetName: assets.aaveMarket.TUSD.shortName,
9290
wrapped: assets.aaveMarket.TUSD.wrapped,
93-
// amount: 80,
94-
amount: 90,
91+
amount: 80,
9592
apyType: constants.borrowAPYType.stable,
9693
},
9794
],

‎cypress/e2e/0-v2-markets/0-main-v2-market/0-assets/usdc.aave-v2.cy.ts‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,13 @@ const testData = {
5959
hasApproval: true,
6060
repayOption: constants.repayType.default,
6161
},
62-
// {
63-
// asset: assets.aaveMarket.USDC,
64-
// apyType: constants.apyType.stable,
65-
// amount: 10,
66-
// hasApproval: false,
67-
// repayOption: constants.repayType.collateral,
68-
// assetForRepay: assets.aaveMarket.USDC,
69-
// },
62+
{
63+
asset: assets.aaveMarket.USDC,
64+
apyType: constants.apyType.stable,
65+
amount: 10,
66+
hasApproval: false,
67+
repayOption: constants.repayType.collateral,
68+
},
7069
],
7170
withdraw: {
7271
asset: assets.aaveMarket.USDC,
@@ -81,7 +80,6 @@ const testData = {
8180
type: constants.dashboardTypes.deposit,
8281
assetName: assets.aaveMarket.USDC.shortName,
8382
wrapped: assets.aaveMarket.USDC.wrapped,
84-
// amount: 30,
8583
amount: 40,
8684
collateralType: constants.collateralType.isCollateral,
8785
isCollateral: true,
@@ -90,8 +88,7 @@ const testData = {
9088
type: constants.dashboardTypes.borrow,
9189
assetName: assets.aaveMarket.USDC.shortName,
9290
wrapped: assets.aaveMarket.USDC.wrapped,
93-
// amount: 80,
94-
amount: 90,
91+
amount: 80,
9592
apyType: constants.borrowAPYType.stable,
9693
},
9794
],

‎cypress/e2e/0-v2-markets/0-main-v2-market/0-assets/usdt.aave-v2.cy.ts‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,13 @@ const testData = {
6262
hasApproval: true,
6363
repayOption: constants.repayType.default,
6464
},
65-
// {
66-
// asset: assets.aaveMarket.USDT,
67-
// apyType: constants.apyType.stable,
68-
// amount: 10,
69-
// hasApproval: false,
70-
// repayOption: constants.repayType.collateral,
71-
// assetForRepay: assets.aaveMarket.USDT,
72-
// },
65+
{
66+
asset: assets.aaveMarket.USDT,
67+
apyType: constants.apyType.stable,
68+
amount: 10,
69+
hasApproval: false,
70+
repayOption: constants.repayType.collateral,
71+
},
7372
],
7473
withdraw: {
7574
asset: assets.aaveMarket.USDT,
@@ -88,7 +87,6 @@ const testData = {
8887
type: constants.dashboardTypes.deposit,
8988
assetName: assets.aaveMarket.USDT.shortName,
9089
wrapped: assets.aaveMarket.USDT.wrapped,
91-
// amount: 30,
9290
amount: 40,
9391
collateralType: constants.collateralType.isCollateral,
9492
isCollateral: false,
@@ -97,8 +95,7 @@ const testData = {
9795
type: constants.dashboardTypes.borrow,
9896
assetName: assets.aaveMarket.USDT.shortName,
9997
wrapped: assets.aaveMarket.USDT.wrapped,
100-
// amount: 80,
101-
amount: 90,
98+
amount: 80,
10299
apyType: constants.borrowAPYType.stable,
103100
},
104101
],

‎cypress/e2e/0-v2-markets/2-polygon-v2-market/0-assets/usdc.polygon-v2.cy.ts‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,22 @@ const testData = {
2222
amount: 10,
2323
hasApproval: false,
2424
},
25-
repay: {
26-
asset: assets.polygonMarket.USDC,
27-
apyType: constants.apyType.variable,
28-
amount: 2,
29-
hasApproval: true,
30-
repayOption: constants.repayType.default,
31-
},
25+
repay: [
26+
{
27+
asset: assets.polygonMarket.USDC,
28+
apyType: constants.apyType.variable,
29+
amount: 2,
30+
hasApproval: true,
31+
repayOption: constants.repayType.default,
32+
},
33+
{
34+
asset: assets.polygonMarket.USDC,
35+
apyType: constants.apyType.variable,
36+
amount: 2,
37+
hasApproval: false,
38+
repayOption: constants.repayType.collateral,
39+
},
40+
],
3241
withdraw: {
3342
asset: assets.polygonMarket.USDC,
3443
isCollateral: true,
@@ -50,7 +59,7 @@ const testData = {
5059
type: constants.dashboardTypes.borrow,
5160
assetName: assets.polygonMarket.USDC.shortName,
5261
wrapped: assets.polygonMarket.USDC.wrapped,
53-
amount: 23.0,
62+
amount: 21.0,
5463
apyType: constants.borrowAPYType.variable,
5564
},
5665
],
@@ -64,7 +73,9 @@ describe('USDC INTEGRATION SPEC, POLYGON V2 MARKET', () => {
6473
supply(testData.depositBaseAmount, skipTestState, true);
6574
borrow(testData.testCases.borrow, skipTestState, true);
6675
supply(testData.testCases.deposit, skipTestState, true);
67-
repay(testData.testCases.repay, skipTestState, false);
76+
testData.testCases.repay.forEach((repayCase) => {
77+
repay(repayCase, skipTestState, false);
78+
});
6879
withdraw(testData.testCases.withdraw, skipTestState, false);
6980
dashboardAssetValuesVerification(testData.verifications.finalDashboard, skipTestState);
7081
});

‎cypress/e2e/0-v2-markets/2-polygon-v2-market/0-assets/usdt.polygon-v2.cy.ts‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,22 @@ const testData = {
2525
amount: 10,
2626
hasApproval: false,
2727
},
28-
repay: {
29-
asset: assets.polygonMarket.USDT,
30-
apyType: constants.apyType.variable,
31-
amount: 2,
32-
hasApproval: true,
33-
repayOption: constants.repayType.default,
34-
},
28+
repay: [
29+
{
30+
asset: assets.polygonMarket.USDT,
31+
apyType: constants.apyType.variable,
32+
amount: 2,
33+
hasApproval: true,
34+
repayOption: constants.repayType.default,
35+
},
36+
{
37+
asset: assets.polygonMarket.USDT,
38+
apyType: constants.apyType.variable,
39+
amount: 2,
40+
hasApproval: false,
41+
repayOption: constants.repayType.collateral,
42+
},
43+
],
3544
withdraw: {
3645
asset: assets.polygonMarket.USDT,
3746
isCollateral: false,
@@ -57,7 +66,7 @@ const testData = {
5766
type: constants.dashboardTypes.borrow,
5867
assetName: assets.polygonMarket.USDT.shortName,
5968
wrapped: assets.polygonMarket.USDT.wrapped,
60-
amount: 23.0,
69+
amount: 21.0,
6170
apyType: constants.borrowAPYType.variable,
6271
},
6372
],
@@ -71,7 +80,9 @@ describe('USDT INTEGRATION SPEC, POLYGON MARKET', () => {
7180
supply(testData.depositBaseAmount, skipTestState, true);
7281
borrow(testData.testCases.borrow, skipTestState, true);
7382
supply(testData.testCases.deposit, skipTestState, true);
74-
repay(testData.testCases.repay, skipTestState, false);
83+
testData.testCases.repay.forEach((repayCase) => {
84+
repay(repayCase, skipTestState, false);
85+
});
7586
withdraw(testData.testCases.withdraw, skipTestState, false);
7687
changeBorrowTypeBlocked(testData.testCases.checkDisabledCollateral, skipTestState);
7788
dashboardAssetValuesVerification(testData.verifications.finalDashboard, skipTestState);

‎cypress/e2e/0-v2-markets/3-avalanche-v2-market/0-assets/usdc.avalanche-v2.cy.ts‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,22 @@ const testData = {
2525
amount: 10,
2626
hasApproval: false,
2727
},
28-
repay: {
29-
asset: assets.avalancheMarket.USDC,
30-
apyType: constants.apyType.variable,
31-
amount: 2,
32-
hasApproval: true,
33-
repayOption: constants.repayType.default,
34-
},
28+
repay: [
29+
{
30+
asset: assets.avalancheMarket.USDC,
31+
apyType: constants.apyType.variable,
32+
amount: 2,
33+
hasApproval: true,
34+
repayOption: constants.repayType.default,
35+
},
36+
{
37+
asset: assets.avalancheMarket.USDC,
38+
apyType: constants.apyType.variable,
39+
amount: 2,
40+
hasApproval: false,
41+
repayOption: constants.repayType.collateral,
42+
},
43+
],
3544
withdraw: {
3645
asset: assets.avalancheMarket.USDC,
3746
isCollateral: true,
@@ -57,7 +66,7 @@ const testData = {
5766
type: constants.dashboardTypes.borrow,
5867
assetName: assets.avalancheMarket.USDC.shortName,
5968
wrapped: assets.avalancheMarket.USDC.wrapped,
60-
amount: 23.0,
69+
amount: 21.0,
6170
apyType: constants.borrowAPYType.variable,
6271
},
6372
],
@@ -71,7 +80,9 @@ describe('USDC INTEGRATION SPEC, AVALANCHE V2 MARKET', () => {
7180
supply(testData.depositBaseAmount, skipTestState, true);
7281
borrow(testData.testCases.borrow, skipTestState, true);
7382
supply(testData.testCases.deposit, skipTestState, true);
74-
repay(testData.testCases.repay, skipTestState, false);
83+
testData.testCases.repay.forEach((repayCase) => {
84+
repay(repayCase, skipTestState, false);
85+
});
7586
withdraw(testData.testCases.withdraw, skipTestState, false);
7687
switchApyBlocked(testData.testCases.checkDisabledApy, skipTestState);
7788
dashboardAssetValuesVerification(testData.verifications.finalDashboard, skipTestState);

‎cypress/e2e/0-v2-markets/3-avalanche-v2-market/0-assets/usdt.avalanche-v2.cy.ts‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,22 @@ const testData = {
2626
amount: 10,
2727
hasApproval: false,
2828
},
29-
repay: {
30-
asset: assets.avalancheMarket.USDT,
31-
apyType: constants.apyType.variable,
32-
amount: 2,
33-
hasApproval: true,
34-
repayOption: constants.repayType.default,
35-
},
29+
repay: [
30+
{
31+
asset: assets.avalancheMarket.USDT,
32+
apyType: constants.apyType.variable,
33+
amount: 2,
34+
hasApproval: true,
35+
repayOption: constants.repayType.default,
36+
},
37+
{
38+
asset: assets.avalancheMarket.USDT,
39+
apyType: constants.apyType.variable,
40+
amount: 2,
41+
hasApproval: false,
42+
repayOption: constants.repayType.collateral,
43+
},
44+
],
3645
withdraw: {
3746
asset: assets.avalancheMarket.USDT,
3847
isCollateral: false,
@@ -62,7 +71,7 @@ const testData = {
6271
type: constants.dashboardTypes.borrow,
6372
assetName: assets.avalancheMarket.USDT.shortName,
6473
wrapped: assets.avalancheMarket.USDT.wrapped,
65-
amount: 23.0,
74+
amount: 21.0,
6675
apyType: constants.borrowAPYType.variable,
6776
},
6877
],
@@ -76,7 +85,9 @@ describe('USDT INTEGRATION SPEC, AVALANCHE V2 MARKET', () => {
7685
supply(testData.depositBaseAmount, skipTestState, true);
7786
borrow(testData.testCases.borrow, skipTestState, true);
7887
supply(testData.testCases.deposit, skipTestState, true);
79-
repay(testData.testCases.repay, skipTestState, false);
88+
testData.testCases.repay.forEach((repayCase) => {
89+
repay(repayCase, skipTestState, false);
90+
});
8091
withdraw(testData.testCases.withdraw, skipTestState, false);
8192
switchApyBlocked(testData.testCases.checkDisabledApy, skipTestState);
8293
changeBorrowTypeBlocked(testData.testCases.checkBorrowTypeBlocked, skipTestState);

0 commit comments

Comments
 (0)