@sonarwatch/portfolio-plugins 0.11.21 → 0.11.22
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/CHANGELOG.md +4 -0
- package/package.json +2 -2
- package/src/plugins/compound/abis.d.ts +51 -3
- package/src/plugins/compound/abis.js +39 -3
- package/src/plugins/compound/abis.js.map +1 -1
- package/src/plugins/compound/getMarketsV2Job.js +50 -5
- package/src/plugins/compound/getMarketsV2Job.js.map +1 -1
- package/src/plugins/compound/getPositionsV2Fetcher.js +8 -0
- package/src/plugins/compound/getPositionsV2Fetcher.js.map +1 -1
- package/src/plugins/compound/types.d.ts +4 -0
- package/src/utils/evm/constants.d.ts +4 -0
- package/src/utils/evm/constants.js +5 -1
- package/src/utils/evm/constants.js.map +1 -1
- package/src/utils/evm/ratePerBlockToApy.d.ts +2 -0
- package/src/utils/evm/ratePerBlockToApy.js +31 -0
- package/src/utils/evm/ratePerBlockToApy.js.map +1 -0
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
|
|
4
4
|
|
|
5
|
+
## [0.11.22](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.21...plugins-0.11.22) (2023-12-20)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
|
|
5
9
|
## [0.11.21](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.20...plugins-0.11.21) (2023-12-19)
|
|
6
10
|
|
|
7
11
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sonarwatch/portfolio-plugins",
|
|
3
|
-
"version": "0.11.
|
|
3
|
+
"version": "0.11.22",
|
|
4
4
|
"type": "commonjs",
|
|
5
5
|
"generators": "./generators.json",
|
|
6
6
|
"dependencies": {
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"web3-v1": "npm:web3@^1.5.0"
|
|
42
42
|
},
|
|
43
43
|
"peerDependencies": {
|
|
44
|
-
"@sonarwatch/portfolio-core": "0.11.
|
|
44
|
+
"@sonarwatch/portfolio-core": "0.11.22"
|
|
45
45
|
},
|
|
46
46
|
"main": "./src/index.js",
|
|
47
47
|
"types": "./src/index.d.ts"
|
|
@@ -140,7 +140,7 @@ export declare const compoundV2Abi: {
|
|
|
140
140
|
readonly inputs: readonly [];
|
|
141
141
|
readonly name: "underlying";
|
|
142
142
|
readonly outputs: readonly [{
|
|
143
|
-
readonly name: "";
|
|
143
|
+
readonly name: "underlyingAddress";
|
|
144
144
|
readonly type: "address";
|
|
145
145
|
}];
|
|
146
146
|
readonly payable: false;
|
|
@@ -157,7 +157,7 @@ export declare const compoundV2Abi: {
|
|
|
157
157
|
readonly name: "borrowBalanceStored";
|
|
158
158
|
readonly outputs: readonly [{
|
|
159
159
|
readonly internalType: "uint256";
|
|
160
|
-
readonly name: "";
|
|
160
|
+
readonly name: "borrowBalance";
|
|
161
161
|
readonly type: "uint256";
|
|
162
162
|
}];
|
|
163
163
|
readonly payable: false;
|
|
@@ -170,11 +170,59 @@ export declare const compoundV2Abi: {
|
|
|
170
170
|
readonly name: "exchangeRateStored";
|
|
171
171
|
readonly outputs: readonly [{
|
|
172
172
|
readonly internalType: "uint256";
|
|
173
|
-
readonly name: "";
|
|
173
|
+
readonly name: "exchangeRate";
|
|
174
174
|
readonly type: "uint256";
|
|
175
175
|
}];
|
|
176
176
|
readonly payable: false;
|
|
177
177
|
readonly stateMutability: "nonpayable";
|
|
178
178
|
readonly type: "function";
|
|
179
179
|
};
|
|
180
|
+
readonly borrowRatePerBlock: {
|
|
181
|
+
readonly constant: false;
|
|
182
|
+
readonly inputs: readonly [];
|
|
183
|
+
readonly name: "borrowRatePerBlock";
|
|
184
|
+
readonly outputs: readonly [{
|
|
185
|
+
readonly internalType: "uint256";
|
|
186
|
+
readonly name: "";
|
|
187
|
+
readonly type: "uint256";
|
|
188
|
+
}];
|
|
189
|
+
readonly stateMutability: "view";
|
|
190
|
+
readonly type: "function";
|
|
191
|
+
};
|
|
192
|
+
readonly supplyRatePerBlock: {
|
|
193
|
+
readonly constant: false;
|
|
194
|
+
readonly inputs: readonly [];
|
|
195
|
+
readonly name: "supplyRatePerBlock";
|
|
196
|
+
readonly outputs: readonly [{
|
|
197
|
+
readonly internalType: "uint256";
|
|
198
|
+
readonly name: "";
|
|
199
|
+
readonly type: "uint256";
|
|
200
|
+
}];
|
|
201
|
+
readonly stateMutability: "view";
|
|
202
|
+
readonly type: "function";
|
|
203
|
+
};
|
|
204
|
+
readonly borrowRatePerTimestamp: {
|
|
205
|
+
readonly constant: false;
|
|
206
|
+
readonly inputs: readonly [];
|
|
207
|
+
readonly name: "borrowRatePerTimestamp";
|
|
208
|
+
readonly outputs: readonly [{
|
|
209
|
+
readonly internalType: "uint256";
|
|
210
|
+
readonly name: "";
|
|
211
|
+
readonly type: "uint256";
|
|
212
|
+
}];
|
|
213
|
+
readonly stateMutability: "view";
|
|
214
|
+
readonly type: "function";
|
|
215
|
+
};
|
|
216
|
+
readonly supplyRatePerTimestamp: {
|
|
217
|
+
readonly constant: false;
|
|
218
|
+
readonly inputs: readonly [];
|
|
219
|
+
readonly name: "supplyRatePerTimestamp";
|
|
220
|
+
readonly outputs: readonly [{
|
|
221
|
+
readonly internalType: "uint256";
|
|
222
|
+
readonly name: "";
|
|
223
|
+
readonly type: "uint256";
|
|
224
|
+
}];
|
|
225
|
+
readonly stateMutability: "view";
|
|
226
|
+
readonly type: "function";
|
|
227
|
+
};
|
|
180
228
|
};
|
|
@@ -103,7 +103,7 @@ exports.compoundV2Abi = {
|
|
|
103
103
|
constant: true,
|
|
104
104
|
inputs: [],
|
|
105
105
|
name: 'underlying',
|
|
106
|
-
outputs: [{ name: '', type: 'address' }],
|
|
106
|
+
outputs: [{ name: 'underlyingAddress', type: 'address' }],
|
|
107
107
|
payable: false,
|
|
108
108
|
stateMutability: 'view',
|
|
109
109
|
type: 'function',
|
|
@@ -112,7 +112,9 @@ exports.compoundV2Abi = {
|
|
|
112
112
|
constant: false,
|
|
113
113
|
inputs: [{ internalType: 'address', name: 'account', type: 'address' }],
|
|
114
114
|
name: 'borrowBalanceStored',
|
|
115
|
-
outputs: [
|
|
115
|
+
outputs: [
|
|
116
|
+
{ internalType: 'uint256', name: 'borrowBalance', type: 'uint256' },
|
|
117
|
+
],
|
|
116
118
|
payable: false,
|
|
117
119
|
stateMutability: 'nonpayable',
|
|
118
120
|
type: 'function',
|
|
@@ -121,10 +123,44 @@ exports.compoundV2Abi = {
|
|
|
121
123
|
constant: false,
|
|
122
124
|
inputs: [],
|
|
123
125
|
name: 'exchangeRateStored',
|
|
124
|
-
outputs: [
|
|
126
|
+
outputs: [
|
|
127
|
+
{ internalType: 'uint256', name: 'exchangeRate', type: 'uint256' },
|
|
128
|
+
],
|
|
125
129
|
payable: false,
|
|
126
130
|
stateMutability: 'nonpayable',
|
|
127
131
|
type: 'function',
|
|
128
132
|
},
|
|
133
|
+
borrowRatePerBlock: {
|
|
134
|
+
constant: false,
|
|
135
|
+
inputs: [],
|
|
136
|
+
name: 'borrowRatePerBlock',
|
|
137
|
+
outputs: [{ internalType: 'uint256', name: '', type: 'uint256' }],
|
|
138
|
+
stateMutability: 'view',
|
|
139
|
+
type: 'function',
|
|
140
|
+
},
|
|
141
|
+
supplyRatePerBlock: {
|
|
142
|
+
constant: false,
|
|
143
|
+
inputs: [],
|
|
144
|
+
name: 'supplyRatePerBlock',
|
|
145
|
+
outputs: [{ internalType: 'uint256', name: '', type: 'uint256' }],
|
|
146
|
+
stateMutability: 'view',
|
|
147
|
+
type: 'function',
|
|
148
|
+
},
|
|
149
|
+
borrowRatePerTimestamp: {
|
|
150
|
+
constant: false,
|
|
151
|
+
inputs: [],
|
|
152
|
+
name: 'borrowRatePerTimestamp',
|
|
153
|
+
outputs: [{ internalType: 'uint256', name: '', type: 'uint256' }],
|
|
154
|
+
stateMutability: 'view',
|
|
155
|
+
type: 'function',
|
|
156
|
+
},
|
|
157
|
+
supplyRatePerTimestamp: {
|
|
158
|
+
constant: false,
|
|
159
|
+
inputs: [],
|
|
160
|
+
name: 'supplyRatePerTimestamp',
|
|
161
|
+
outputs: [{ internalType: 'uint256', name: '', type: 'uint256' }],
|
|
162
|
+
stateMutability: 'view',
|
|
163
|
+
type: 'function',
|
|
164
|
+
},
|
|
129
165
|
};
|
|
130
166
|
//# sourceMappingURL=abis.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abis.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/compound/abis.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"abis.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/compound/abis.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ const viem_1 = require("viem");
|
|
|
14
14
|
const clients_1 = require("../../utils/clients");
|
|
15
15
|
const abis_1 = require("./abis");
|
|
16
16
|
const constants_1 = require("./constants");
|
|
17
|
+
const ratePerBlockToApy_1 = require("../../utils/evm/ratePerBlockToApy");
|
|
17
18
|
function getMarketsV2Job(networkId, platformId, comptroller) {
|
|
18
19
|
const client = (0, clients_1.getEvmClient)(networkId);
|
|
19
20
|
const executor = (cache) => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -42,7 +43,7 @@ function getMarketsV2Job(networkId, platformId, comptroller) {
|
|
|
42
43
|
} while (hasNotFailed);
|
|
43
44
|
if (markets.length === 0)
|
|
44
45
|
return;
|
|
45
|
-
const [marketsInfoRes, underlyingsTokenAddressesRes, exchangeRatesStoredRes,] = yield Promise.all([
|
|
46
|
+
const [marketsInfoRes, underlyingsTokenAddressesRes, exchangeRatesStoredRes, supplyRatesPerBlockRes, borrowRatesPerBlockRes, supplyRatesPerTimestampRes, borrowRatesPerTimestampRes,] = yield Promise.all([
|
|
46
47
|
client.multicall({
|
|
47
48
|
contracts: markets.map((mktAddress) => ({
|
|
48
49
|
abi: [abis_1.compoundV2Abi.markets],
|
|
@@ -65,12 +66,44 @@ function getMarketsV2Job(networkId, platformId, comptroller) {
|
|
|
65
66
|
functionName: abis_1.compoundV2Abi.exchangeRateStored.name,
|
|
66
67
|
})),
|
|
67
68
|
}),
|
|
69
|
+
client.multicall({
|
|
70
|
+
contracts: markets.map((mktAddress) => ({
|
|
71
|
+
abi: [abis_1.compoundV2Abi.supplyRatePerBlock],
|
|
72
|
+
address: mktAddress,
|
|
73
|
+
functionName: abis_1.compoundV2Abi.supplyRatePerBlock.name,
|
|
74
|
+
})),
|
|
75
|
+
}),
|
|
76
|
+
client.multicall({
|
|
77
|
+
contracts: markets.map((mktAddress) => ({
|
|
78
|
+
abi: [abis_1.compoundV2Abi.borrowRatePerBlock],
|
|
79
|
+
address: mktAddress,
|
|
80
|
+
functionName: abis_1.compoundV2Abi.borrowRatePerBlock.name,
|
|
81
|
+
})),
|
|
82
|
+
}),
|
|
83
|
+
client.multicall({
|
|
84
|
+
contracts: markets.map((mktAddress) => ({
|
|
85
|
+
abi: [abis_1.compoundV2Abi.supplyRatePerTimestamp],
|
|
86
|
+
address: mktAddress,
|
|
87
|
+
functionName: abis_1.compoundV2Abi.supplyRatePerTimestamp.name,
|
|
88
|
+
})),
|
|
89
|
+
}),
|
|
90
|
+
client.multicall({
|
|
91
|
+
contracts: markets.map((mktAddress) => ({
|
|
92
|
+
abi: [abis_1.compoundV2Abi.borrowRatePerTimestamp],
|
|
93
|
+
address: mktAddress,
|
|
94
|
+
functionName: abis_1.compoundV2Abi.borrowRatePerTimestamp.name,
|
|
95
|
+
})),
|
|
96
|
+
}),
|
|
68
97
|
]);
|
|
69
98
|
const marketsDetails = marketsInfoRes
|
|
70
|
-
.map((marketInfo,
|
|
71
|
-
const market = markets[
|
|
72
|
-
const underlyingsTokenAddresseRes = underlyingsTokenAddressesRes[
|
|
73
|
-
const exchangeRateStoredRes = exchangeRatesStoredRes[
|
|
99
|
+
.map((marketInfo, i) => {
|
|
100
|
+
const market = markets[i];
|
|
101
|
+
const underlyingsTokenAddresseRes = underlyingsTokenAddressesRes[i];
|
|
102
|
+
const exchangeRateStoredRes = exchangeRatesStoredRes[i];
|
|
103
|
+
const supplyRateResPerBlock = supplyRatesPerBlockRes[i];
|
|
104
|
+
const borrowRateResPerBlock = borrowRatesPerBlockRes[i];
|
|
105
|
+
const supplyRateResPerTimestamp = supplyRatesPerTimestampRes[i];
|
|
106
|
+
const borrowRateResPerTimestamp = borrowRatesPerTimestampRes[i];
|
|
74
107
|
if (marketInfo.status === 'failure' ||
|
|
75
108
|
exchangeRateStoredRes.status === 'failure' ||
|
|
76
109
|
(underlyingsTokenAddresseRes.status === 'failure' &&
|
|
@@ -86,6 +119,18 @@ function getMarketsV2Job(networkId, platformId, comptroller) {
|
|
|
86
119
|
? underlyingsTokenAddresseRes.result.toString()
|
|
87
120
|
: viem_1.zeroAddress,
|
|
88
121
|
],
|
|
122
|
+
borrowApyFromBlock: borrowRateResPerBlock.result
|
|
123
|
+
? (0, ratePerBlockToApy_1.ratePerBlockToApy)(Number(borrowRateResPerBlock.result))
|
|
124
|
+
: undefined,
|
|
125
|
+
supplyApyFromBlock: supplyRateResPerBlock.result
|
|
126
|
+
? (0, ratePerBlockToApy_1.ratePerBlockToApy)(Number(supplyRateResPerBlock.result))
|
|
127
|
+
: undefined,
|
|
128
|
+
borrowApyFromTimestamp: borrowRateResPerTimestamp.result
|
|
129
|
+
? (0, ratePerBlockToApy_1.ratePerTimestampToApy)(Number(borrowRateResPerTimestamp.result))
|
|
130
|
+
: undefined,
|
|
131
|
+
supplyApyFromTimestamp: supplyRateResPerTimestamp.result
|
|
132
|
+
? (0, ratePerBlockToApy_1.ratePerTimestampToApy)(Number(supplyRateResPerTimestamp.result))
|
|
133
|
+
: undefined,
|
|
89
134
|
};
|
|
90
135
|
})
|
|
91
136
|
.flat();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getMarketsV2Job.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/compound/getMarketsV2Job.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAyE;AACzE,+BAAmC;AAGnC,iDAAmD;AACnD,iCAAuC;AAEvC,2CAA+C;
|
|
1
|
+
{"version":3,"file":"getMarketsV2Job.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/compound/getMarketsV2Job.ts"],"names":[],"mappings":"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"}
|
|
@@ -73,6 +73,10 @@ function getPositionsV2Fetcher(networkId, platformId) {
|
|
|
73
73
|
.dividedBy(Math.pow(10, 18))
|
|
74
74
|
.multipliedBy(fmtPricePerFullShare);
|
|
75
75
|
underlyings.forEach((underlying) => suppliedAssets.push((0, tokenPriceToAssetToken_1.default)(underlying, cTokenAmount.toNumber(), networkId, tokenPrice)));
|
|
76
|
+
const supplyApy = market.supplyApyFromBlock || market.supplyApyFromTimestamp;
|
|
77
|
+
if (supplyApy) {
|
|
78
|
+
suppliedYields.push([{ apr: (0, portfolio_core_1.apyToApr)(supplyApy), apy: supplyApy }]);
|
|
79
|
+
}
|
|
76
80
|
}
|
|
77
81
|
const bDecimals = (0, helpers_1.getBDecimal)(networkId);
|
|
78
82
|
if (borrowBalance.status === 'success' &&
|
|
@@ -81,6 +85,10 @@ function getPositionsV2Fetcher(networkId, platformId) {
|
|
|
81
85
|
underlyings.forEach((underlying) => borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(underlying, new bignumber_js_1.default(borrowBalance.result.toString())
|
|
82
86
|
.dividedBy(Math.pow(10, bDecimals))
|
|
83
87
|
.toNumber(), networkId, tokenPrice)));
|
|
88
|
+
const borrowApy = market.borrowApyFromBlock || market.borrowApyFromTimestamp;
|
|
89
|
+
if (borrowApy) {
|
|
90
|
+
borrowedYields.push([{ apr: (0, portfolio_core_1.apyToApr)(borrowApy), apy: borrowApy }]);
|
|
91
|
+
}
|
|
84
92
|
}
|
|
85
93
|
}
|
|
86
94
|
if (borrowedAssets.length === 0 && suppliedAssets.length === 0)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPositionsV2Fetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/compound/getPositionsV2Fetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"getPositionsV2Fetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/compound/getPositionsV2Fetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,6 @@
|
|
|
1
1
|
import BigNumber from 'bignumber.js';
|
|
2
2
|
export declare const ethFactor: BigNumber;
|
|
3
|
+
export declare const ethMantissa: BigNumber;
|
|
4
|
+
export declare const blocksPerDayETH = 7200;
|
|
5
|
+
export declare const timestampPerYear = 31536000;
|
|
6
|
+
export declare const timestampPerDay: number;
|
|
@@ -3,8 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.ethFactor = void 0;
|
|
6
|
+
exports.timestampPerDay = exports.timestampPerYear = exports.blocksPerDayETH = exports.ethMantissa = exports.ethFactor = void 0;
|
|
7
7
|
const portfolio_core_1 = require("@sonarwatch/portfolio-core");
|
|
8
8
|
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
9
9
|
exports.ethFactor = new bignumber_js_1.default(Math.pow(10, portfolio_core_1.ethereumNetwork.native.decimals));
|
|
10
|
+
exports.ethMantissa = new bignumber_js_1.default(1).multipliedBy(Math.pow(10, 18));
|
|
11
|
+
exports.blocksPerDayETH = 7200; // 12 sec per block
|
|
12
|
+
exports.timestampPerYear = 31536000;
|
|
13
|
+
exports.timestampPerDay = exports.timestampPerYear / 365;
|
|
10
14
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/evm/constants.ts"],"names":[],"mappings":";;;;;;AAAA,+DAA6D;AAC7D,gEAAqC;AAExB,QAAA,SAAS,GAAG,IAAI,sBAAS,CAAC,SAAA,EAAE,EAAI,gCAAe,CAAC,MAAM,CAAC,QAAQ,CAAA,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/evm/constants.ts"],"names":[],"mappings":";;;;;;AAAA,+DAA6D;AAC7D,gEAAqC;AAExB,QAAA,SAAS,GAAG,IAAI,sBAAS,CAAC,SAAA,EAAE,EAAI,gCAAe,CAAC,MAAM,CAAC,QAAQ,CAAA,CAAC,CAAC;AACjE,QAAA,WAAW,GAAG,IAAI,sBAAS,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,SAAA,EAAE,EAAI,EAAE,CAAA,CAAC,CAAC;AAEtD,QAAA,eAAe,GAAG,IAAI,CAAC,CAAC,mBAAmB;AAC3C,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAC5B,QAAA,eAAe,GAAG,wBAAgB,GAAG,GAAG,CAAC"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.ratePerTimestampToApy = exports.ratePerBlockToApy = void 0;
|
|
7
|
+
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
8
|
+
const constants_1 = require("./constants");
|
|
9
|
+
function ratePerBlockToApy(rate) {
|
|
10
|
+
const apy = new bignumber_js_1.default(rate)
|
|
11
|
+
.dividedBy(constants_1.ethMantissa)
|
|
12
|
+
.multipliedBy(constants_1.blocksPerDayETH)
|
|
13
|
+
.plus(1)
|
|
14
|
+
.pow(365)
|
|
15
|
+
.minus(1)
|
|
16
|
+
.multipliedBy(100);
|
|
17
|
+
return apy.toNumber();
|
|
18
|
+
}
|
|
19
|
+
exports.ratePerBlockToApy = ratePerBlockToApy;
|
|
20
|
+
function ratePerTimestampToApy(rate) {
|
|
21
|
+
const apy = new bignumber_js_1.default(rate)
|
|
22
|
+
.dividedBy(constants_1.ethMantissa)
|
|
23
|
+
.multipliedBy(constants_1.timestampPerDay)
|
|
24
|
+
.plus(1)
|
|
25
|
+
.pow(365)
|
|
26
|
+
.minus(1)
|
|
27
|
+
.multipliedBy(100);
|
|
28
|
+
return apy.toNumber();
|
|
29
|
+
}
|
|
30
|
+
exports.ratePerTimestampToApy = ratePerTimestampToApy;
|
|
31
|
+
//# sourceMappingURL=ratePerBlockToApy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ratePerBlockToApy.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/evm/ratePerBlockToApy.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,2CAA4E;AAE5E,SAAgB,iBAAiB,CAAC,IAAY;IAC5C,MAAM,GAAG,GAAG,IAAI,sBAAS,CAAC,IAAI,CAAC;SAC5B,SAAS,CAAC,uBAAW,CAAC;SACtB,YAAY,CAAC,2BAAe,CAAC;SAC7B,IAAI,CAAC,CAAC,CAAC;SACP,GAAG,CAAC,GAAG,CAAC;SACR,KAAK,CAAC,CAAC,CAAC;SACR,YAAY,CAAC,GAAG,CAAC,CAAC;IACrB,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;AACxB,CAAC;AATD,8CASC;AAED,SAAgB,qBAAqB,CAAC,IAAY;IAChD,MAAM,GAAG,GAAG,IAAI,sBAAS,CAAC,IAAI,CAAC;SAC5B,SAAS,CAAC,uBAAW,CAAC;SACtB,YAAY,CAAC,2BAAe,CAAC;SAC7B,IAAI,CAAC,CAAC,CAAC;SACP,GAAG,CAAC,GAAG,CAAC;SACR,KAAK,CAAC,CAAC,CAAC;SACR,YAAY,CAAC,GAAG,CAAC,CAAC;IACrB,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;AACxB,CAAC;AATD,sDASC"}
|