@stake-dao/reader 0.3.1 → 0.3.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/esm/lockers/utils/callsForLockers/feeCalls.js +26 -38
- package/dist/esm/lockers/utils/callsForLockers/feeCalls.js.map +1 -1
- package/dist/esm/lockers/utils/getFees.js +3 -6
- package/dist/esm/lockers/utils/getFees.js.map +1 -1
- package/dist/esm/lockers/utils/substractFees.js +1 -7
- package/dist/esm/lockers/utils/substractFees.js.map +1 -1
- package/dist/esm/tsconfig.build.tsbuildinfo +1 -1
- package/dist/esm/votemarket/curve/fetchCurveGauges.js +18 -8
- package/dist/esm/votemarket/curve/fetchCurveGauges.js.map +1 -1
- package/dist/types/lockers/utils/callsForLockers/feeCalls.d.ts +5 -5
- package/dist/types/lockers/utils/callsForLockers/feeCalls.d.ts.map +1 -1
- package/dist/types/lockers/utils/getFees.d.ts.map +1 -1
- package/dist/types/lockers/utils/substractFees.d.ts.map +1 -1
- package/dist/types/votemarket/curve/fetchCurveGauges.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/lockers/utils/callsForLockers/feeCalls.ts +31 -43
- package/src/lockers/utils/getFees.ts +3 -6
- package/src/lockers/utils/substractFees.ts +1 -7
- package/src/votemarket/curve/fetchCurveGauges.ts +21 -8
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import { zeroAddress } from 'viem';
|
|
2
|
-
import { Zero } from '../../../index.js';
|
|
1
|
+
import { formatUnits, zeroAddress } from 'viem';
|
|
3
2
|
export const feeCalls = (lockerId, accumulatorAddress) => {
|
|
4
3
|
const calls = [];
|
|
5
4
|
if (accumulatorAddress === zeroAddress || lockerId === 'mav') {
|
|
@@ -8,27 +7,21 @@ export const feeCalls = (lockerId, accumulatorAddress) => {
|
|
|
8
7
|
// Harvester fees
|
|
9
8
|
calls.push({ address: accumulatorAddress, name: 'claimerFee' });
|
|
10
9
|
// Treasury
|
|
11
|
-
if (['cake'
|
|
10
|
+
if (['cake'].includes(lockerId)) {
|
|
12
11
|
calls.push({ address: accumulatorAddress, name: 'daoFee' });
|
|
13
12
|
}
|
|
14
13
|
switch (lockerId) {
|
|
15
|
-
case '
|
|
16
|
-
calls.push({ address: accumulatorAddress, name: 'getFeeSplit' });
|
|
14
|
+
case 'angle':
|
|
17
15
|
break;
|
|
18
16
|
case 'cake':
|
|
19
|
-
case 'yfi':
|
|
20
17
|
calls.push({ address: accumulatorAddress, name: 'liquidityFee' });
|
|
21
18
|
break;
|
|
22
|
-
case 'pendle':
|
|
23
|
-
calls.push({ address: accumulatorAddress, name: 'bountyFee' });
|
|
24
|
-
break;
|
|
25
|
-
case 'fpis':
|
|
26
|
-
calls.push({ address: accumulatorAddress, name: 'bribeFee' });
|
|
27
|
-
break;
|
|
28
|
-
case 'apw':
|
|
29
19
|
case 'bpt':
|
|
30
20
|
calls.push({ address: accumulatorAddress, name: 'lockerFee' });
|
|
31
21
|
break;
|
|
22
|
+
default:
|
|
23
|
+
calls.push({ address: accumulatorAddress, name: 'getFeeSplit' });
|
|
24
|
+
break;
|
|
32
25
|
}
|
|
33
26
|
return calls;
|
|
34
27
|
};
|
|
@@ -47,41 +40,36 @@ export const extractFees = (lockers, feesData) => {
|
|
|
47
40
|
const lockerFee = locker.fees.find((f) => f.key === 'lockerFee');
|
|
48
41
|
results.push({
|
|
49
42
|
lockerId: locker.id,
|
|
50
|
-
claimerFee: claimerFee ?
|
|
51
|
-
daoFee: daoFee ?
|
|
52
|
-
bountyFee: bountyFee ?
|
|
53
|
-
liquidityFee: liquidityFee ?
|
|
54
|
-
lockerFee: lockerFee ?
|
|
43
|
+
claimerFee: claimerFee ? `${claimerFee.value}` : '0',
|
|
44
|
+
daoFee: daoFee ? `${daoFee.value}` : '0',
|
|
45
|
+
bountyFee: bountyFee ? `${bountyFee.value}` : '0',
|
|
46
|
+
liquidityFee: liquidityFee ? `${liquidityFee.value}` : '0',
|
|
47
|
+
lockerFee: lockerFee ? `${lockerFee.value}` : '0',
|
|
55
48
|
});
|
|
56
49
|
continue;
|
|
57
50
|
}
|
|
58
|
-
let daoFee =
|
|
59
|
-
|
|
60
|
-
let liquidityFee =
|
|
61
|
-
let lockerFee =
|
|
51
|
+
let daoFee = '0';
|
|
52
|
+
const bountyFee = '0';
|
|
53
|
+
let liquidityFee = '0';
|
|
54
|
+
let lockerFee = '0';
|
|
62
55
|
switch (locker.id) {
|
|
63
|
-
case '
|
|
64
|
-
const crvFees = feesData.pop()?.result;
|
|
65
|
-
daoFee = BigInt(crvFees.fees[0]);
|
|
66
|
-
liquidityFee = BigInt(crvFees.fees[1]);
|
|
56
|
+
case 'angle':
|
|
67
57
|
break;
|
|
68
|
-
}
|
|
69
58
|
case 'cake':
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
daoFee = BigInt(feesData.pop()?.result);
|
|
73
|
-
break;
|
|
74
|
-
case 'pendle':
|
|
75
|
-
case 'fpis':
|
|
76
|
-
bountyFee = BigInt(feesData.pop()?.result);
|
|
77
|
-
daoFee = BigInt(feesData.pop()?.result);
|
|
59
|
+
liquidityFee = formatUnits(feesData.pop()?.result, 2);
|
|
60
|
+
daoFee = formatUnits(feesData.pop()?.result, 2);
|
|
78
61
|
break;
|
|
79
|
-
case 'apw':
|
|
80
62
|
case 'bpt':
|
|
81
|
-
lockerFee =
|
|
63
|
+
lockerFee = formatUnits(feesData.pop()?.result, 2);
|
|
82
64
|
break;
|
|
65
|
+
default: {
|
|
66
|
+
const fees = feesData.pop()?.result;
|
|
67
|
+
daoFee = formatUnits(fees.fees[0], 16);
|
|
68
|
+
liquidityFee = formatUnits(fees.fees[1], 16);
|
|
69
|
+
break;
|
|
70
|
+
}
|
|
83
71
|
}
|
|
84
|
-
const claimerFee =
|
|
72
|
+
const claimerFee = formatUnits(feesData.pop()?.result, !['angle', 'cake', 'bpt'].includes(locker.id) ? 16 : 2);
|
|
85
73
|
results.push({
|
|
86
74
|
lockerId: locker.id,
|
|
87
75
|
claimerFee,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feeCalls.js","sourceRoot":"","sources":["../../../../../src/lockers/utils/callsForLockers/feeCalls.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"feeCalls.js","sourceRoot":"","sources":["../../../../../src/lockers/utils/callsForLockers/feeCalls.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,13 +6,10 @@ const getFees = (locker, lockerFee) => {
|
|
|
6
6
|
if (!fee.static) {
|
|
7
7
|
switch (fee.key) {
|
|
8
8
|
case 'voteFee':
|
|
9
|
-
value = Number(lockerFee?.bountyFee || 0)
|
|
9
|
+
value = Number(lockerFee?.bountyFee || 0);
|
|
10
10
|
break;
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
case 'daoFee':
|
|
14
|
-
case 'lockerFee':
|
|
15
|
-
value = Number(lockerFee?.[fee.key] || 0) / 100;
|
|
11
|
+
default:
|
|
12
|
+
value = Number(lockerFee?.[fee.key] || 0);
|
|
16
13
|
break;
|
|
17
14
|
}
|
|
18
15
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFees.js","sourceRoot":"","sources":["../../../../src/lockers/utils/getFees.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,MAAM,+BAA+B,CAAA;AAE/D,MAAM,OAAO,GAAG,CAAC,MAAW,EAAE,SAAwC,EAAE,EAAE;IACxE,MAAM,IAAI,GAAU,EAAE,CAAA;IAEtB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;QAC9B,IAAI,KAAK,GAAW,GAAG,CAAC,KAAK,CAAA;QAC7B,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;YAChB,QAAQ,GAAG,CAAC,GAAG,EAAE,CAAC;gBAChB,KAAK,SAAS;oBACZ,KAAK,GAAG,MAAM,CAAC,SAAS,EAAE,SAAS,IAAI,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"getFees.js","sourceRoot":"","sources":["../../../../src/lockers/utils/getFees.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,MAAM,+BAA+B,CAAA;AAE/D,MAAM,OAAO,GAAG,CAAC,MAAW,EAAE,SAAwC,EAAE,EAAE;IACxE,MAAM,IAAI,GAAU,EAAE,CAAA;IAEtB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;QAC9B,IAAI,KAAK,GAAW,GAAG,CAAC,KAAK,CAAA;QAC7B,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;YAChB,QAAQ,GAAG,CAAC,GAAG,EAAE,CAAC;gBAChB,KAAK,SAAS;oBACZ,KAAK,GAAG,MAAM,CAAC,SAAS,EAAE,SAAS,IAAI,CAAC,CAAC,CAAA;oBACzC,MAAK;gBACP;oBACE,KAAK,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAA;oBACzC,MAAK;YACT,CAAC;QACH,CAAC;QAED,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;YACd,IAAI,CAAC,IAAI,CAAC;gBACR,KAAK,EAAE,GAAG,CAAC,KAAK;gBAChB,KAAK;gBACL,GAAG,EAAE,GAAG,CAAC,GAAG;aACb,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,eAAe,OAAO,CAAA"}
|
|
@@ -1,17 +1,11 @@
|
|
|
1
1
|
const substractFees = (lockerId, maxApr, lockerFee) => {
|
|
2
2
|
switch (lockerId) {
|
|
3
|
-
case 'yfi':
|
|
4
|
-
case 'bpt':
|
|
5
3
|
case 'apw': {
|
|
6
4
|
const totalFee = lockerFee
|
|
7
|
-
? Object.keys(lockerFee).reduce((total, key) => (key !== 'lockerId' ? total + Number(lockerFee[key])
|
|
5
|
+
? Object.keys(lockerFee).reduce((total, key) => (key !== 'lockerId' ? total + Number(lockerFee[key]) : total), 0)
|
|
8
6
|
: 0;
|
|
9
7
|
return (maxApr * (100 - totalFee)) / 100;
|
|
10
8
|
}
|
|
11
|
-
case 'mav': {
|
|
12
|
-
// 10% airdrop fees
|
|
13
|
-
return (maxApr * (100 - 10)) / 100;
|
|
14
|
-
}
|
|
15
9
|
default: {
|
|
16
10
|
// Streaming from gauges, fees are already substracted
|
|
17
11
|
return maxApr;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"substractFees.js","sourceRoot":"","sources":["../../../../src/lockers/utils/substractFees.ts"],"names":[],"mappings":"AAAA,MAAM,aAAa,GAAG,CAAC,QAAgB,EAAE,MAAc,EAAE,SAAc,EAAU,EAAE;IACjF,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,KAAK,CAAC
|
|
1
|
+
{"version":3,"file":"substractFees.js","sourceRoot":"","sources":["../../../../src/lockers/utils/substractFees.ts"],"names":[],"mappings":"AAAA,MAAM,aAAa,GAAG,CAAC,QAAgB,EAAE,MAAc,EAAE,SAAc,EAAU,EAAE;IACjF,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,KAAK,CAAC,CAAC,CAAC;YACX,MAAM,QAAQ,GAAG,SAAS;gBACxB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAC3B,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAC7E,CAAC,CACF;gBACH,CAAC,CAAC,CAAC,CAAA;YAEL,OAAO,CAAC,MAAM,GAAG,CAAC,GAAG,GAAG,QAAQ,CAAC,CAAC,GAAG,GAAG,CAAA;QAC1C,CAAC;QACD,OAAO,CAAC,CAAC,CAAC;YACR,sDAAsD;YACtD,OAAO,MAAM,CAAA;QACf,CAAC;IACH,CAAC;AACH,CAAC,CAAA;AAED,eAAe,aAAa,CAAA"}
|