@sonarwatch/portfolio-plugins 0.8.64 → 0.8.66
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 +9 -1
- package/package.json +2 -2
- package/src/plugins/compound/getPositionsV3Fetcher.js +25 -3
- package/src/plugins/compound/getPositionsV3Fetcher.js.map +1 -1
- package/src/plugins/drift/helpers.d.ts +4 -0
- package/src/plugins/drift/helpers.js +27 -1
- package/src/plugins/drift/helpers.js.map +1 -1
- package/src/plugins/drift/spotPositionsFetcher.js +14 -2
- package/src/plugins/drift/spotPositionsFetcher.js.map +1 -1
- package/src/plugins/top-tokens/forcedAddresses.js +2 -1
- package/src/plugins/top-tokens/forcedAddresses.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,7 +2,15 @@
|
|
|
2
2
|
|
|
3
3
|
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
|
|
4
4
|
|
|
5
|
-
## [0.8.
|
|
5
|
+
## [0.8.66](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.65...plugins-0.8.66) (2023-11-08)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
## [0.8.65](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.64...plugins-0.8.65) (2023-11-08)
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
## [0.8.64](https://github.com/sonarwatch/portfolio/compare/plugins-0.8.63...plugins-0.8.64) (2023-11-08)
|
|
6
14
|
|
|
7
15
|
|
|
8
16
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sonarwatch/portfolio-plugins",
|
|
3
|
-
"version": "0.8.
|
|
3
|
+
"version": "0.8.66",
|
|
4
4
|
"type": "commonjs",
|
|
5
5
|
"generators": "./generators.json",
|
|
6
6
|
"dependencies": {
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"web3-v1": "npm:web3@^1.5.0"
|
|
40
40
|
},
|
|
41
41
|
"peerDependencies": {
|
|
42
|
-
"@sonarwatch/portfolio-core": "0.8.
|
|
42
|
+
"@sonarwatch/portfolio-core": "0.8.66"
|
|
43
43
|
},
|
|
44
44
|
"main": "./src/index.js",
|
|
45
45
|
"types": "./src/index.d.ts"
|
|
@@ -19,6 +19,7 @@ const clients_1 = require("../../utils/clients");
|
|
|
19
19
|
const abis_1 = require("./abis");
|
|
20
20
|
const constants_2 = require("../../utils/misc/constants");
|
|
21
21
|
const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
|
|
22
|
+
const erc20Abi_1 = require("../../utils/evm/erc20Abi");
|
|
22
23
|
function getPositionsV3Fetcher(networkId) {
|
|
23
24
|
const executor = (owner, cache) => __awaiter(this, void 0, void 0, function* () {
|
|
24
25
|
const markets = constants_1.marketDetails.get(networkId);
|
|
@@ -34,6 +35,16 @@ function getPositionsV3Fetcher(networkId) {
|
|
|
34
35
|
args: [owner, asset.address],
|
|
35
36
|
})))
|
|
36
37
|
.flat();
|
|
38
|
+
const userBaseCollateralContracts = markets.map((m) => ({
|
|
39
|
+
abi: erc20Abi_1.balanceOfErc20ABI,
|
|
40
|
+
functionName: 'balanceOf',
|
|
41
|
+
address: m.cometAddress,
|
|
42
|
+
args: [owner],
|
|
43
|
+
}));
|
|
44
|
+
const userBaseCollateralResponses = yield client.multicall({
|
|
45
|
+
contracts: userBaseCollateralContracts,
|
|
46
|
+
});
|
|
47
|
+
const isBaseSupplyNotZero = userBaseCollateralResponses.some((r) => r.status === 'success' && r.result !== constants_2.zeroBigInt);
|
|
37
48
|
const userCollateralResponses = yield client.multicall({
|
|
38
49
|
contracts: userCollateralContracts,
|
|
39
50
|
});
|
|
@@ -50,7 +61,7 @@ function getPositionsV3Fetcher(networkId) {
|
|
|
50
61
|
contracts: borrowBalanceOfContracts,
|
|
51
62
|
});
|
|
52
63
|
const isBorrowNotZero = borrowBalanceOfResponses.some((r) => r.status === 'success' && r.result !== constants_2.zeroBigInt);
|
|
53
|
-
if (!isSupplyNotZero && !isBorrowNotZero)
|
|
64
|
+
if (!isSupplyNotZero && !isBorrowNotZero && !isBaseSupplyNotZero)
|
|
54
65
|
return [];
|
|
55
66
|
const tokenPrices = yield cache.getItem(constants_1.comethTokenPricesPrefix, {
|
|
56
67
|
prefix: constants_1.platformId,
|
|
@@ -94,6 +105,17 @@ function getPositionsV3Fetcher(networkId) {
|
|
|
94
105
|
suppliedAssets.push(asset);
|
|
95
106
|
suppliedYields.push([]);
|
|
96
107
|
}
|
|
108
|
+
const userBaseCollateralResponse = userBaseCollateralResponses[i];
|
|
109
|
+
if (userBaseCollateralResponse.status !== 'failure') {
|
|
110
|
+
const amount = new bignumber_js_1.default(userBaseCollateralResponse.result.toString())
|
|
111
|
+
.dividedBy(Math.pow(10, marketDetail.baseAssetDecimals))
|
|
112
|
+
.toNumber();
|
|
113
|
+
const baseAsset = (0, tokenPriceToAssetToken_1.default)(marketDetail.baseAssetAddress, amount, networkId, tokenPrices[marketDetail.baseAssetAddress]);
|
|
114
|
+
if (amount !== 0) {
|
|
115
|
+
suppliedAssets.push(baseAsset);
|
|
116
|
+
suppliedYields.push([]);
|
|
117
|
+
}
|
|
118
|
+
}
|
|
97
119
|
if (borrowedAssets.length === 0 &&
|
|
98
120
|
suppliedAssets.length === 0 &&
|
|
99
121
|
rewardAssets.length === 0)
|
|
@@ -101,7 +123,7 @@ function getPositionsV3Fetcher(networkId) {
|
|
|
101
123
|
const { borrowedValue, collateralRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
|
|
102
124
|
elements.push({
|
|
103
125
|
type: portfolio_core_1.PortfolioElementType.borrowlend,
|
|
104
|
-
networkId
|
|
126
|
+
networkId,
|
|
105
127
|
platformId: constants_1.platformId,
|
|
106
128
|
label: 'Lending',
|
|
107
129
|
name: 'Compound V3',
|
|
@@ -123,7 +145,7 @@ function getPositionsV3Fetcher(networkId) {
|
|
|
123
145
|
});
|
|
124
146
|
return {
|
|
125
147
|
id: `${constants_1.platformId}-${networkId}-positions-v3`,
|
|
126
|
-
networkId
|
|
148
|
+
networkId,
|
|
127
149
|
executor,
|
|
128
150
|
};
|
|
129
151
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPositionsV3Fetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/compound/getPositionsV3Fetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"getPositionsV3Fetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/compound/getPositionsV3Fetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import BigNumber from 'bignumber.js';
|
|
2
|
+
import { PublicKey } from '@solana/web3.js';
|
|
2
3
|
import { SpotBalanceType, SpotMarket, SpotPosition } from './struct';
|
|
3
4
|
export declare const ZERO: BigNumber;
|
|
4
5
|
export declare const ONE: BigNumber;
|
|
@@ -20,3 +21,6 @@ export declare function calculateDepositRate(bank: SpotMarket): BigNumber;
|
|
|
20
21
|
export declare function calculateInterestRate(bank: SpotMarket, delta?: BigNumber): BigNumber;
|
|
21
22
|
export declare function isSpotPositionAvailable(position: SpotPosition): boolean;
|
|
22
23
|
export declare function decodeName(bytes: number[]): string;
|
|
24
|
+
export declare function getUserAccountPublicKey(programId: PublicKey, owner: PublicKey, subAccountId: number): PublicKey;
|
|
25
|
+
export declare function getUserMainAccountPublicKey(programId: PublicKey, owner: PublicKey): PublicKey;
|
|
26
|
+
export declare function getUserAccountsPublicKeys(programId: PublicKey, owner: PublicKey, startId: number, endId: number): PublicKey[];
|
|
@@ -3,8 +3,10 @@ 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.decodeName = exports.isSpotPositionAvailable = exports.calculateInterestRate = exports.calculateDepositRate = exports.calculateBorrowRate = exports.calculateUtilization = exports.getSignedTokenAmount = exports.getTokenAmount = exports.divCeil = exports.CONCENTRATION_PRECISION = exports.PERCENTAGE_PRECISION = exports.PERCENTAGE_PRECISION_EXP = exports.SPOT_MARKET_RATE_PRECISION = exports.SPOT_MARKET_RATE_PRECISION_EXP = exports.SPOT_MARKET_UTILIZATION_PRECISION = exports.SPOT_MARKET_UTILIZATION_PRECISION_EXP = exports.QUOTE_SPOT_MARKET_INDEX = exports.TEN = exports.ONE = exports.ZERO = void 0;
|
|
6
|
+
exports.getUserAccountsPublicKeys = exports.getUserMainAccountPublicKey = exports.getUserAccountPublicKey = exports.decodeName = exports.isSpotPositionAvailable = exports.calculateInterestRate = exports.calculateDepositRate = exports.calculateBorrowRate = exports.calculateUtilization = exports.getSignedTokenAmount = exports.getTokenAmount = exports.divCeil = exports.CONCENTRATION_PRECISION = exports.PERCENTAGE_PRECISION = exports.PERCENTAGE_PRECISION_EXP = exports.SPOT_MARKET_RATE_PRECISION = exports.SPOT_MARKET_RATE_PRECISION_EXP = exports.SPOT_MARKET_UTILIZATION_PRECISION = exports.SPOT_MARKET_UTILIZATION_PRECISION_EXP = exports.QUOTE_SPOT_MARKET_INDEX = exports.TEN = exports.ONE = exports.ZERO = void 0;
|
|
7
7
|
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
8
|
+
const web3_js_1 = require("@solana/web3.js");
|
|
9
|
+
const bn_js_1 = require("bn.js");
|
|
8
10
|
const struct_1 = require("./struct");
|
|
9
11
|
exports.ZERO = new bignumber_js_1.default(0);
|
|
10
12
|
exports.ONE = new bignumber_js_1.default(1);
|
|
@@ -114,4 +116,28 @@ function decodeName(bytes) {
|
|
|
114
116
|
return buffer.toString('utf8').trim();
|
|
115
117
|
}
|
|
116
118
|
exports.decodeName = decodeName;
|
|
119
|
+
function getUserAccountPublicKey(programId, owner, subAccountId) {
|
|
120
|
+
return web3_js_1.PublicKey.findProgramAddressSync([
|
|
121
|
+
Buffer.from('user', 'utf8'),
|
|
122
|
+
owner.toBuffer(),
|
|
123
|
+
new bn_js_1.BN(subAccountId).toArrayLike(Buffer, 'le', 2),
|
|
124
|
+
], programId)[0];
|
|
125
|
+
}
|
|
126
|
+
exports.getUserAccountPublicKey = getUserAccountPublicKey;
|
|
127
|
+
function getUserMainAccountPublicKey(programId, owner) {
|
|
128
|
+
return getUserAccountPublicKey(programId, owner, 0);
|
|
129
|
+
}
|
|
130
|
+
exports.getUserMainAccountPublicKey = getUserMainAccountPublicKey;
|
|
131
|
+
function getUserAccountsPublicKeys(programId, owner, startId, endId) {
|
|
132
|
+
const keys = [];
|
|
133
|
+
for (let i = startId; i < endId; i++) {
|
|
134
|
+
keys.push(web3_js_1.PublicKey.findProgramAddressSync([
|
|
135
|
+
Buffer.from('user', 'utf8'),
|
|
136
|
+
owner.toBuffer(),
|
|
137
|
+
new bn_js_1.BN(i).toArrayLike(Buffer, 'le', 2),
|
|
138
|
+
], programId)[0]);
|
|
139
|
+
}
|
|
140
|
+
return keys;
|
|
141
|
+
}
|
|
142
|
+
exports.getUserAccountsPublicKeys = getUserAccountsPublicKeys;
|
|
117
143
|
//# sourceMappingURL=helpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift/helpers.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift/helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,9 +14,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
const portfolio_core_1 = require("@sonarwatch/portfolio-core");
|
|
16
16
|
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
17
|
+
const web3_js_1 = require("@solana/web3.js");
|
|
17
18
|
const constants_1 = require("./constants");
|
|
18
19
|
const struct_1 = require("./struct");
|
|
19
|
-
const filters_1 = require("./filters");
|
|
20
20
|
const helpers_1 = require("./helpers");
|
|
21
21
|
const solana_1 = require("../../utils/solana");
|
|
22
22
|
const clients_1 = require("../../utils/clients");
|
|
@@ -24,11 +24,21 @@ const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/token
|
|
|
24
24
|
const runInBatch_1 = __importDefault(require("../../utils/misc/runInBatch"));
|
|
25
25
|
const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
26
26
|
const client = (0, clients_1.getClientSolana)();
|
|
27
|
-
|
|
27
|
+
let id = 0;
|
|
28
|
+
const userAccounts = [];
|
|
29
|
+
let parsedAccount;
|
|
30
|
+
do {
|
|
31
|
+
const accountPubKeys = (0, helpers_1.getUserAccountsPublicKeys)(constants_1.DriftProgram, new web3_js_1.PublicKey(owner), id, id + 3);
|
|
32
|
+
parsedAccount = yield (0, solana_1.getParsedMultipleAccountsInfo)(client, struct_1.userAccountStruct, accountPubKeys);
|
|
33
|
+
userAccounts.push(...parsedAccount);
|
|
34
|
+
id += 3;
|
|
35
|
+
} while (parsedAccount[parsedAccount.length]);
|
|
28
36
|
if (!userAccounts)
|
|
29
37
|
return [];
|
|
30
38
|
const spotMarketIndexes = new Set();
|
|
31
39
|
for (const userAccount of userAccounts) {
|
|
40
|
+
if (!userAccount)
|
|
41
|
+
continue;
|
|
32
42
|
for (const spotPosition of userAccount.spotPositions) {
|
|
33
43
|
spotMarketIndexes.add(spotPosition.marketIndex.toString());
|
|
34
44
|
}
|
|
@@ -59,6 +69,8 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
59
69
|
const elements = [];
|
|
60
70
|
// One user can have multiple sub-account
|
|
61
71
|
for (const userAccount of userAccounts) {
|
|
72
|
+
if (!userAccount)
|
|
73
|
+
continue;
|
|
62
74
|
const borrowedAssets = [];
|
|
63
75
|
const borrowedYields = [];
|
|
64
76
|
const suppliedAssets = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spotPositionsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift/spotPositionsFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DASoC;AACpC,gEAAqC;
|
|
1
|
+
{"version":3,"file":"spotPositionsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift/spotPositionsFetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,8 @@ const forcedAddresses = new Map([
|
|
|
20
20
|
'0xa2E3356610840701BDf5611a53974510Ae27E2e1',
|
|
21
21
|
'0x25eC98773D7b4ceD4cAFaB96A2A1c0945f145e10',
|
|
22
22
|
'0xA35b1B31Ce002FBF2058D22F30f95D405200A15b',
|
|
23
|
-
'0xf03A7Eb46d01d9EcAA104558C732Cf82f6B6B645',
|
|
23
|
+
'0xf03A7Eb46d01d9EcAA104558C732Cf82f6B6B645',
|
|
24
|
+
'0xA0D3707c569ff8C87FA923d3823eC5D81c98Be78', // InstaDapp ETH V2
|
|
24
25
|
],
|
|
25
26
|
],
|
|
26
27
|
[
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"forcedAddresses.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/top-tokens/forcedAddresses.ts"],"names":[],"mappings":";;AAAA,+DAAsE;AAEtE,MAAM,eAAe,GAAiC,IAAI,GAAG,CAAC;IAC5D;QACE,0BAAS,CAAC,QAAQ;QAClB;YACE,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C,EAAE,
|
|
1
|
+
{"version":3,"file":"forcedAddresses.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/top-tokens/forcedAddresses.ts"],"names":[],"mappings":";;AAAA,+DAAsE;AAEtE,MAAM,eAAe,GAAiC,IAAI,GAAG,CAAC;IAC5D;QACE,0BAAS,CAAC,QAAQ;QAClB;YACE,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C,EAAE,mBAAmB;SAClE;KACF;IACD;QACE,0BAAS,CAAC,OAAO;QACjB;YACE,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C,EAAE,gBAAgB;SAC/D;KACF;IACD;QACE,0BAAS,CAAC,SAAS;QACnB;YACE,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C,EAAE,SAAS;SACxD;KACF;IACD;QACE,0BAAS,CAAC,GAAG;QACb;YACE,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C,EAAE,OAAO;SACtD;KACF;CACF,CAAC,CAAC;AACH,kBAAe,eAAe,CAAC"}
|