@sonarwatch/portfolio-plugins 0.4.35 → 0.4.37
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/generators/fetcher/generator.js +5 -2
- package/src/generators/fetcher/generator.js.map +1 -1
- package/src/generators/helpers.d.ts +3 -0
- package/src/generators/helpers.js +19 -1
- package/src/generators/helpers.js.map +1 -1
- package/src/generators/job/generator.js +5 -2
- package/src/generators/job/generator.js.map +1 -1
- package/src/generators/plugin/generator.js +3 -18
- package/src/generators/plugin/generator.js.map +1 -1
- package/src/plugins/orca/clmmPositionsFetcher.js +8 -5
- package/src/plugins/orca/clmmPositionsFetcher.js.map +1 -1
- package/src/plugins/orca/constants.d.ts +1 -1
- package/src/plugins/orca/constants.js +4 -4
- package/src/plugins/orca/constants.js.map +1 -1
- package/src/plugins/orca/lpTokensJob.js +2 -2
- package/src/plugins/orca/lpTokensJob.js.map +1 -1
- package/src/plugins/orca/structs/aquafarms.d.ts +1 -1
- package/src/plugins/orca/structs/whirlpool.d.ts +1 -1
- package/src/plugins/raydium/clmmPositionsFetcher.js +5 -4
- package/src/plugins/raydium/clmmPositionsFetcher.js.map +1 -1
- package/src/plugins/raydium/structs/amms.d.ts +1 -1
- package/src/plugins/raydium/structs/amms.js.map +1 -1
- package/src/plugins/raydium/structs/clmms.d.ts +1 -1
- package/src/plugins/raydium/structs/openOrders.d.ts +1 -1
- package/src/plugins/raydium/structs/openOrders.js.map +1 -1
- package/src/plugins/solend/obligationsFetcher.js +2 -2
- package/src/plugins/solend/obligationsFetcher.js.map +1 -1
- package/src/plugins/solend/reservesJob.js +3 -1
- package/src/plugins/solend/reservesJob.js.map +1 -1
- package/src/plugins/tensor/fetcherExecutor.js.map +1 -1
- package/src/plugins/tokens/fetchers/solana-native.js +2 -2
- package/src/plugins/tokens/fetchers/solana-native.js.map +1 -1
- package/src/plugins/tokens/fetchers/solana.js +2 -2
- package/src/plugins/tokens/fetchers/solana.js.map +1 -1
- package/src/utils/solana/fetchTokenSupplyAndDecimals.d.ts +1 -2
- package/src/utils/solana/fetchTokenSupplyAndDecimals.js +2 -2
- package/src/utils/solana/fetchTokenSupplyAndDecimals.js.map +1 -1
package/CHANGELOG.md
CHANGED
@@ -2,10 +2,18 @@
|
|
2
2
|
|
3
3
|
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
|
4
4
|
|
5
|
-
## [0.4.
|
5
|
+
## [0.4.37](https://github.com/sonarwatch/portfolio/compare/plugins-0.4.36...plugins-0.4.37) (2023-07-16)
|
6
6
|
|
7
7
|
|
8
8
|
|
9
|
+
## [0.4.36](https://github.com/sonarwatch/portfolio/compare/plugins-0.4.35...plugins-0.4.36) (2023-07-16)
|
10
|
+
|
11
|
+
|
12
|
+
|
13
|
+
## [0.4.35](https://github.com/sonarwatch/portfolio/compare/plugins-0.4.34...plugins-0.4.35) (2023-07-14)
|
14
|
+
|
15
|
+
|
16
|
+
|
9
17
|
## [0.4.34](https://github.com/sonarwatch/portfolio/compare/plugins-0.4.33...plugins-0.4.34) (2023-07-14)
|
10
18
|
|
11
19
|
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@sonarwatch/portfolio-plugins",
|
3
|
-
"version": "0.4.
|
3
|
+
"version": "0.4.37",
|
4
4
|
"type": "commonjs",
|
5
5
|
"generators": "./generators.json",
|
6
6
|
"dependencies": {
|
@@ -22,7 +22,7 @@
|
|
22
22
|
"viem": "^1.2.9"
|
23
23
|
},
|
24
24
|
"peerDependencies": {
|
25
|
-
"@sonarwatch/portfolio-core": "0.4.
|
25
|
+
"@sonarwatch/portfolio-core": "0.4.39"
|
26
26
|
},
|
27
27
|
"main": "./src/index.js",
|
28
28
|
"types": "./src/index.d.ts"
|
@@ -40,7 +40,7 @@ const portfolio_core_1 = require("@sonarwatch/portfolio-core");
|
|
40
40
|
const helpers_1 = require("../helpers");
|
41
41
|
function fetcherGenerator(tree, options) {
|
42
42
|
return __awaiter(this, void 0, void 0, function* () {
|
43
|
-
const
|
43
|
+
const name = (0, helpers_1.toKebabCase)(options.fetcherName);
|
44
44
|
const pluginId = (0, helpers_1.toKebabCase)(options.pluginId);
|
45
45
|
const { networkId } = options;
|
46
46
|
(0, portfolio_core_1.assertNetworkId)(networkId);
|
@@ -50,7 +50,10 @@ function fetcherGenerator(tree, options) {
|
|
50
50
|
}
|
51
51
|
const substitutions = {
|
52
52
|
pluginId,
|
53
|
-
|
53
|
+
name,
|
54
|
+
pascalCaseName: (0, helpers_1.idToPascalCase)(name),
|
55
|
+
spacedPascalCaseName: (0, helpers_1.idToSpacedPascalCase)(name),
|
56
|
+
loweredPascalCaseName: (0, helpers_1.lowerFirstLetter)((0, helpers_1.idToPascalCase)(name)),
|
54
57
|
networkId,
|
55
58
|
};
|
56
59
|
(0, devkit_1.generateFiles)(tree, path.join(__dirname, 'files'), libraryRoot, substitutions);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/generators/fetcher/generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAKoB;AACpB,qCAAqC;AACrC,2CAA6B;AAC7B,+DAA6D;AAE7D,
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/generators/fetcher/generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAKoB;AACpB,qCAAqC;AACrC,2CAA6B;AAC7B,+DAA6D;AAE7D,wCAKoB;AAEpB,SAAsB,gBAAgB,CACpC,IAAU,EACV,OAA+B;;QAE/B,MAAM,IAAI,GAAG,IAAA,qBAAW,EAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC9C,MAAM,QAAQ,GAAG,IAAA,qBAAW,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC/C,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;QAC9B,IAAA,gCAAe,EAAC,SAAS,CAAC,CAAC;QAE3B,MAAM,WAAW,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC;QAEnE,IAAI,CAAC,IAAA,oBAAU,EAAC,GAAG,WAAW,gBAAgB,QAAQ,EAAE,CAAC,EAAE;YACzD,MAAM,IAAI,KAAK,CAAC,uCAAuC,QAAQ,EAAE,CAAC,CAAC;SACpE;QAED,MAAM,aAAa,GAAG;YACpB,QAAQ;YACR,IAAI;YACJ,cAAc,EAAE,IAAA,wBAAc,EAAC,IAAI,CAAC;YACpC,oBAAoB,EAAE,IAAA,8BAAoB,EAAC,IAAI,CAAC;YAChD,qBAAqB,EAAE,IAAA,0BAAgB,EAAC,IAAA,wBAAc,EAAC,IAAI,CAAC,CAAC;YAC7D,SAAS;SACV,CAAC;QAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAC7B,WAAW,EACX,aAAa,CACd,CAAC;QACF,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AA/BD,4CA+BC;AAED,kBAAe,gBAAgB,CAAC"}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.toKebabCase = void 0;
|
3
|
+
exports.idToSpacedPascalCase = exports.idToPascalCase = exports.lowerFirstLetter = exports.toKebabCase = void 0;
|
4
4
|
const toKebabCaseRegexp = /[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[0-9]+/g;
|
5
5
|
function toKebabCase(str) {
|
6
6
|
var _a;
|
@@ -10,4 +10,22 @@ function toKebabCase(str) {
|
|
10
10
|
.match(toKebabCaseRegexp)) === null || _a === void 0 ? void 0 : _a.map((x) => x.toLowerCase()).join('-')) || '');
|
11
11
|
}
|
12
12
|
exports.toKebabCase = toKebabCase;
|
13
|
+
function trimAndUpper(text) {
|
14
|
+
return text.replace(/-/, '').toUpperCase();
|
15
|
+
}
|
16
|
+
function spaceAndUpper(text) {
|
17
|
+
return text.replace(/-/, ' ').toUpperCase();
|
18
|
+
}
|
19
|
+
function lowerFirstLetter(string) {
|
20
|
+
return string.charAt(0).toLocaleLowerCase() + string.slice(1);
|
21
|
+
}
|
22
|
+
exports.lowerFirstLetter = lowerFirstLetter;
|
23
|
+
function idToPascalCase(id) {
|
24
|
+
return id.replace(/(^\w|-\w)/g, trimAndUpper);
|
25
|
+
}
|
26
|
+
exports.idToPascalCase = idToPascalCase;
|
27
|
+
function idToSpacedPascalCase(id) {
|
28
|
+
return id.replace(/(^\w|-\w)/g, spaceAndUpper);
|
29
|
+
}
|
30
|
+
exports.idToSpacedPascalCase = idToSpacedPascalCase;
|
13
31
|
//# sourceMappingURL=helpers.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../packages/plugins/src/generators/helpers.ts"],"names":[],"mappings":";;;AAAA,MAAM,iBAAiB,GACrB,oEAAoE,CAAC;AAEvE,SAAgB,WAAW,CAAC,GAAW;;IACrC,IAAI,CAAC,GAAG;QAAE,OAAO,EAAE,CAAC;IACpB,OAAO,CACL,CAAA,MAAA,GAAG;SACA,KAAK,CAAC,iBAAiB,CAAC,0CACvB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,EAC3B,IAAI,CAAC,GAAG,CAAC,KAAI,EAAE,CACnB,CAAC;AACJ,CAAC;AARD,kCAQC"}
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../packages/plugins/src/generators/helpers.ts"],"names":[],"mappings":";;;AAAA,MAAM,iBAAiB,GACrB,oEAAoE,CAAC;AAEvE,SAAgB,WAAW,CAAC,GAAW;;IACrC,IAAI,CAAC,GAAG;QAAE,OAAO,EAAE,CAAC;IACpB,OAAO,CACL,CAAA,MAAA,GAAG;SACA,KAAK,CAAC,iBAAiB,CAAC,0CACvB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,EAC3B,IAAI,CAAC,GAAG,CAAC,KAAI,EAAE,CACnB,CAAC;AACJ,CAAC;AARD,kCAQC;AAED,SAAS,YAAY,CAAC,IAAY;IAChC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;AAC7C,CAAC;AACD,SAAS,aAAa,CAAC,IAAY;IACjC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;AAC9C,CAAC;AAED,SAAgB,gBAAgB,CAAC,MAAc;IAC7C,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,iBAAiB,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAChE,CAAC;AAFD,4CAEC;AAED,SAAgB,cAAc,CAAC,EAAU;IACvC,OAAO,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;AAChD,CAAC;AAFD,wCAEC;AAED,SAAgB,oBAAoB,CAAC,EAAU;IAC7C,OAAO,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;AACjD,CAAC;AAFD,oDAEC"}
|
@@ -39,7 +39,7 @@ const node_fs_1 = require("node:fs");
|
|
39
39
|
const helpers_1 = require("../helpers");
|
40
40
|
function jobGenerator(tree, options) {
|
41
41
|
return __awaiter(this, void 0, void 0, function* () {
|
42
|
-
const
|
42
|
+
const name = (0, helpers_1.toKebabCase)(options.jobName);
|
43
43
|
const pluginId = (0, helpers_1.toKebabCase)(options.pluginId);
|
44
44
|
const libraryRoot = (0, devkit_1.readProjectConfiguration)(tree, 'plugins').root;
|
45
45
|
if (!(0, node_fs_1.existsSync)(`${libraryRoot}/src/plugins/${pluginId}`)) {
|
@@ -47,7 +47,10 @@ function jobGenerator(tree, options) {
|
|
47
47
|
}
|
48
48
|
const substitutions = {
|
49
49
|
pluginId,
|
50
|
-
|
50
|
+
name,
|
51
|
+
pascalCaseName: (0, helpers_1.idToPascalCase)(name),
|
52
|
+
spacedPascalCaseName: (0, helpers_1.idToSpacedPascalCase)(name),
|
53
|
+
loweredPascalCaseName: (0, helpers_1.lowerFirstLetter)((0, helpers_1.idToPascalCase)(name)),
|
51
54
|
};
|
52
55
|
(0, devkit_1.generateFiles)(tree, path.join(__dirname, 'files'), libraryRoot, substitutions);
|
53
56
|
yield (0, devkit_1.formatFiles)(tree);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/generators/job/generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAKoB;AACpB,2CAA6B;AAC7B,qCAAqC;AAErC,
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/generators/job/generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAKoB;AACpB,2CAA6B;AAC7B,qCAAqC;AAErC,wCAKoB;AAEpB,SAAsB,YAAY,CAAC,IAAU,EAAE,OAA2B;;QACxE,MAAM,IAAI,GAAG,IAAA,qBAAW,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC1C,MAAM,QAAQ,GAAG,IAAA,qBAAW,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC/C,MAAM,WAAW,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC;QAEnE,IAAI,CAAC,IAAA,oBAAU,EAAC,GAAG,WAAW,gBAAgB,QAAQ,EAAE,CAAC,EAAE;YACzD,MAAM,IAAI,KAAK,CAAC,uCAAuC,QAAQ,EAAE,CAAC,CAAC;SACpE;QAED,MAAM,aAAa,GAAG;YACpB,QAAQ;YACR,IAAI;YACJ,cAAc,EAAE,IAAA,wBAAc,EAAC,IAAI,CAAC;YACpC,oBAAoB,EAAE,IAAA,8BAAoB,EAAC,IAAI,CAAC;YAChD,qBAAqB,EAAE,IAAA,0BAAgB,EAAC,IAAA,wBAAc,EAAC,IAAI,CAAC,CAAC;SAC9D,CAAC;QAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAC7B,WAAW,EACX,aAAa,CACd,CAAC;QACF,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAxBD,oCAwBC;AAED,kBAAe,YAAY,CAAC"}
|
@@ -36,30 +36,15 @@ exports.pluginGenerator = void 0;
|
|
36
36
|
const devkit_1 = require("@nx/devkit");
|
37
37
|
const path = __importStar(require("path"));
|
38
38
|
const helpers_1 = require("../helpers");
|
39
|
-
function trimAndUpper(text) {
|
40
|
-
return text.replace(/-/, '').toUpperCase();
|
41
|
-
}
|
42
|
-
function spaceAndUpper(text) {
|
43
|
-
return text.replace(/-/, ' ').toUpperCase();
|
44
|
-
}
|
45
|
-
function lowerFirstLetter(string) {
|
46
|
-
return string.charAt(0).toLocaleLowerCase() + string.slice(1);
|
47
|
-
}
|
48
|
-
function idToPascalCase(id) {
|
49
|
-
return id.replace(/(^\w|-\w)/g, trimAndUpper);
|
50
|
-
}
|
51
|
-
function idToSpacedPascalCase(id) {
|
52
|
-
return id.replace(/(^\w|-\w)/g, spaceAndUpper);
|
53
|
-
}
|
54
39
|
function pluginGenerator(tree, options) {
|
55
40
|
return __awaiter(this, void 0, void 0, function* () {
|
56
41
|
const id = (0, helpers_1.toKebabCase)(options.id);
|
57
42
|
const libraryRoot = (0, devkit_1.readProjectConfiguration)(tree, 'plugins').root;
|
58
43
|
const substitutions = {
|
59
44
|
id,
|
60
|
-
pascalCaseId: idToPascalCase(id),
|
61
|
-
spacedPascalCaseId: idToSpacedPascalCase(id),
|
62
|
-
loweredPascalCaseId: lowerFirstLetter(idToPascalCase(id)),
|
45
|
+
pascalCaseId: (0, helpers_1.idToPascalCase)(id),
|
46
|
+
spacedPascalCaseId: (0, helpers_1.idToSpacedPascalCase)(id),
|
47
|
+
loweredPascalCaseId: (0, helpers_1.lowerFirstLetter)((0, helpers_1.idToPascalCase)(id)),
|
63
48
|
};
|
64
49
|
(0, devkit_1.generateFiles)(tree, path.join(__dirname, 'files'), libraryRoot, substitutions);
|
65
50
|
yield (0, devkit_1.formatFiles)(tree);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/generators/plugin/generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAKoB;AACpB,2CAA6B;AAE7B,
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/generators/plugin/generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAKoB;AACpB,2CAA6B;AAE7B,wCAKoB;AAEpB,SAAsB,eAAe,CACnC,IAAU,EACV,OAA8B;;QAE9B,MAAM,EAAE,GAAG,IAAA,qBAAW,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACnC,MAAM,WAAW,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC;QAEnE,MAAM,aAAa,GAAG;YACpB,EAAE;YACF,YAAY,EAAE,IAAA,wBAAc,EAAC,EAAE,CAAC;YAChC,kBAAkB,EAAE,IAAA,8BAAoB,EAAC,EAAE,CAAC;YAC5C,mBAAmB,EAAE,IAAA,0BAAgB,EAAC,IAAA,wBAAc,EAAC,EAAE,CAAC,CAAC;SAC1D,CAAC;QAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAC7B,WAAW,EACX,aAAa,CACd,CAAC;QACF,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AArBD,0CAqBC;AAED,kBAAe,eAAe,CAAC"}
|
@@ -14,6 +14,7 @@ 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 js_1 = require("@metaplex-foundation/js");
|
17
|
+
const web3_js_1 = require("@solana/web3.js");
|
17
18
|
const constants_1 = require("./constants");
|
18
19
|
const clients_1 = require("../../utils/clients");
|
19
20
|
const solana_1 = require("../../utils/solana");
|
@@ -27,16 +28,16 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
27
28
|
if (!owner)
|
28
29
|
return [];
|
29
30
|
const nfts = yield metaplex.nfts().findAllByOwner({
|
30
|
-
owner: new
|
31
|
+
owner: new web3_js_1.PublicKey(owner),
|
31
32
|
});
|
32
33
|
const positionsProgramAddress = [];
|
33
34
|
nfts.forEach((nft) => {
|
34
35
|
if (nft && nft.name === 'Orca Whirlpool Position') {
|
35
36
|
const address = nft.model === 'metadata'
|
36
|
-
? new
|
37
|
-
: new
|
37
|
+
? new web3_js_1.PublicKey(nft.mintAddress.toString())
|
38
|
+
: new web3_js_1.PublicKey(nft.mint.address.toString());
|
38
39
|
const positionSeed = [Buffer.from('position'), address.toBuffer()];
|
39
|
-
const [positionPublicKey] =
|
40
|
+
const [positionPublicKey] = web3_js_1.PublicKey.findProgramAddressSync(positionSeed, constants_1.whirlpoolProgram);
|
40
41
|
positionsProgramAddress.push(positionPublicKey);
|
41
42
|
}
|
42
43
|
});
|
@@ -51,13 +52,15 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
51
52
|
whirlpoolAddresses.add(pos.whirlpool.toString());
|
52
53
|
});
|
53
54
|
// TODO : improve once we have getItems(string[])
|
54
|
-
const allWhirlpoolsInfo = yield cache.getItems({
|
55
|
+
const allWhirlpoolsInfo = yield cache.getItems(Array.from(whirlpoolAddresses), {
|
55
56
|
prefix: constants_1.whirlpoolPrefix,
|
56
57
|
networkId: portfolio_core_1.NetworkId.solana,
|
57
58
|
});
|
58
59
|
const tokensMints = [];
|
59
60
|
const whirlpoolMap = new Map();
|
60
61
|
allWhirlpoolsInfo.forEach((wInfo) => {
|
62
|
+
if (!wInfo)
|
63
|
+
return;
|
61
64
|
if (whirlpoolAddresses.has(wInfo.pubkey.toString())) {
|
62
65
|
whirlpoolMap.set(wInfo.pubkey.toString(), wInfo);
|
63
66
|
tokensMints.push(wInfo.tokenMintA.toString(), wInfo.tokenMintB.toString());
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"clmmPositionsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/clmmPositionsFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAQoC;AACpC,
|
1
|
+
{"version":3,"file":"clmmPositionsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/clmmPositionsFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAQoC;AACpC,gDAAmD;AACnD,6CAA4C;AAC5C,2CAA4E;AAC5E,iDAAsD;AACtD,+CAG4B;AAC5B,mDAAgE;AAChE,uCAGmB;AACnB,qGAA6E;AAC7E,6EAAqD;AAErD,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,QAAQ,GAAG,IAAI,aAAQ,CAAC,MAAM,CAAC,CAAC;IACtC,IAAI,CAAC,KAAK;QAAE,OAAO,EAAE,CAAC;IACtB,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,cAAc,CAAC;QAChD,KAAK,EAAE,IAAI,mBAAS,CAAC,KAAK,CAAC;KAC5B,CAAC,CAAC;IACH,MAAM,uBAAuB,GAAgB,EAAE,CAAC;IAChD,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACnB,IAAI,GAAG,IAAI,GAAG,CAAC,IAAI,KAAK,yBAAyB,EAAE;YACjD,MAAM,OAAO,GACX,GAAG,CAAC,KAAK,KAAK,UAAU;gBACtB,CAAC,CAAC,IAAI,mBAAS,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;gBAC3C,CAAC,CAAC,IAAI,mBAAS,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YAEjD,MAAM,YAAY,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YAEnE,MAAM,CAAC,iBAAiB,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CAC1D,YAAY,EACZ,4BAAgB,CACjB,CAAC;YACF,uBAAuB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;SACjD;IACH,CAAC,CAAC,CAAC;IACH,IAAI,uBAAuB,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAEpD,MAAM,aAAa,GAAG,MAAM,IAAA,sCAA6B,EACvD,MAAM,EACN,0BAAc,EACd,uBAAuB,CACxB,CAAC;IACF,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAE5D,MAAM,kBAAkB,GAAgB,IAAI,GAAG,EAAE,CAAC;IAClD,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC5B,IAAI,GAAG;YAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,iDAAiD;IACjD,MAAM,iBAAiB,GAAG,MAAM,KAAK,CAAC,QAAQ,CAC5C,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAC9B;QACE,MAAM,EAAE,2BAAe;QACvB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CACF,CAAC;IACF,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,MAAM,YAAY,GAA2B,IAAI,GAAG,EAAE,CAAC;IACvD,iBAAiB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QAClC,IAAI,CAAC,KAAK;YAAE,OAAO;QACnB,IAAI,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE;YACnD,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,CAAC;YACjD,WAAW,CAAC,IAAI,CACd,KAAK,CAAC,UAAU,CAAC,QAAQ,EAAE,EAC3B,KAAK,CAAC,UAAU,CAAC,QAAQ,EAAE,CAC5B,CAAC;SACH;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,iBAAiB,GAAG,MAAM,IAAA,oBAAU,EACxC,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC,CAC7E,CAAC;IACF,MAAM,WAAW,GAA4B,IAAI,GAAG,EAAE,CAAC;IACvD,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC9B,IAAI,CAAC,CAAC,MAAM,KAAK,UAAU;YAAE,OAAO;QACpC,IAAI,CAAC,CAAC,CAAC,KAAK;YAAE,OAAO;QACrB,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,IAAI,YAAY,CAAC,IAAI,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAEvC,MAAM,MAAM,GAAyB,EAAE,CAAC;IACxC,IAAI,mBAAmB,GAAG,CAAC,CAAC;IAC5B,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,aAAa,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;QACzD,MAAM,YAAY,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;QAC1C,IAAI,CAAC,YAAY;YAAE,SAAS;QAE5B,MAAM,aAAa,GAAG,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1E,IAAI,CAAC,aAAa;YAAE,SAAS;QAE7B,IACE,CAAC,aAAa,CAAC,UAAU;YACzB,CAAC,aAAa,CAAC,UAAU;YACzB,CAAC,aAAa,CAAC,gBAAgB;YAE/B,SAAS;QAEX,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,IAAA,sCAA4B,EACjE,YAAY,CAAC,SAAS,CAAC,QAAQ,EAAE,EACjC,IAAA,iCAAuB,EAAC,aAAa,CAAC,gBAAgB,CAAC,EACvD,IAAA,iCAAuB,EAAC,YAAY,CAAC,cAAc,CAAC,EACpD,IAAA,iCAAuB,EAAC,YAAY,CAAC,cAAc,CAAC,EACpD,CAAC,CACF,CAAC;QAEF,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;QACzE,IAAI,CAAC,WAAW;YAAE,SAAS;QAE3B,MAAM,WAAW,GAAG,IAAA,gCAAsB,EACxC,aAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,EACnC,YAAY,GAAG,SAAA,EAAE,EAAI,WAAW,CAAC,QAAQ,CAAA,EACzC,0BAAS,CAAC,MAAM,EAChB,WAAW,CACZ,CAAC;QACF,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;QACzE,IAAI,CAAC,WAAW;YAAE,SAAS;QAE3B,MAAM,WAAW,GAAG,IAAA,gCAAsB,EACxC,aAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,EACnC,YAAY,GAAG,SAAA,EAAE,EAAI,WAAW,CAAC,QAAQ,CAAA,EACzC,0BAAS,CAAC,MAAM,EAChB,WAAW,CACZ,CAAC;QACF,IACE,CAAC,WAAW;YACZ,CAAC,WAAW;YACZ,WAAW,CAAC,KAAK,KAAK,IAAI;YAC1B,WAAW,CAAC,KAAK,KAAK,IAAI;YAE1B,SAAS;QAEX,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC;QACpD,MAAM,CAAC,IAAI,CAAC;YACV,MAAM,EAAE,CAAC,WAAW,EAAE,WAAW,CAAC;YAClC,WAAW,EAAE,KAAK;YAClB,YAAY,EAAE,EAAE;YAChB,iBAAiB,EAAE,CAAC;YACpB,KAAK;YACL,MAAM,EAAE,EAAE;SACX,CAAC,CAAC;QACH,mBAAmB,IAAI,KAAK,CAAC;KAC9B;IACD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IACnC,OAAO;QACL;YACE,IAAI,EAAE,qCAAoB,CAAC,SAAS;YACpC,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAE,MAAM;YAClB,KAAK,EAAE,eAAe;YACtB,IAAI,EAAE,CAAC,cAAc,CAAC;YACtB,KAAK,EAAE,mBAAmB;YAC1B,IAAI,EAAE;gBACJ,WAAW,EAAE,MAAM;aACpB;SACF;KACF,CAAC;AACJ,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,iBAAiB;IAClC,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
|
@@ -1,12 +1,12 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.apiWhirlpool = exports.whirlpoolConfig = exports.whirlpoolProgram = exports.whirlpoolPrefix = exports.aquafarmsProgram = exports.aquafarmsPrefix = exports.platformId = void 0;
|
4
|
-
const
|
4
|
+
const web3_js_1 = require("@solana/web3.js");
|
5
5
|
exports.platformId = 'orca';
|
6
6
|
exports.aquafarmsPrefix = `${exports.platformId}-aquafarms`;
|
7
|
-
exports.aquafarmsProgram = new
|
7
|
+
exports.aquafarmsProgram = new web3_js_1.PublicKey('82yxjeMsvaURa4MbZZ7WZZHfobirZYkH1zF8fmeGtyaQ');
|
8
8
|
exports.whirlpoolPrefix = `${exports.platformId}-whirlpool`;
|
9
|
-
exports.whirlpoolProgram = new
|
10
|
-
exports.whirlpoolConfig = new
|
9
|
+
exports.whirlpoolProgram = new web3_js_1.PublicKey('whirLbMiicVdio4qvUfM5KAg6Ct8VwpYzGff3uctyCc');
|
10
|
+
exports.whirlpoolConfig = new web3_js_1.PublicKey('2LecshUwdy9xi7meFgHtFJQNSKk4KdTrcpvaB56dP2NQ');
|
11
11
|
exports.apiWhirlpool = 'https://api.mainnet.orca.so/v1/whirlpool/list';
|
12
12
|
//# sourceMappingURL=constants.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/constants.ts"],"names":[],"mappings":";;;AAAA,
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAE/B,QAAA,UAAU,GAAG,MAAM,CAAC;AAEpB,QAAA,eAAe,GAAG,GAAG,kBAAU,YAAY,CAAC;AAC5C,QAAA,gBAAgB,GAAG,IAAI,mBAAS,CAC3C,8CAA8C,CAC/C,CAAC;AAEW,QAAA,eAAe,GAAG,GAAG,kBAAU,YAAY,CAAC;AAC5C,QAAA,gBAAgB,GAAG,IAAI,mBAAS,CAC3C,6CAA6C,CAC9C,CAAC;AACW,QAAA,eAAe,GAAG,IAAI,mBAAS,CAC1C,8CAA8C,CAC/C,CAAC;AACW,QAAA,YAAY,GAAG,+CAA+C,CAAC"}
|
@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
10
10
|
};
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
12
12
|
const portfolio_core_1 = require("@sonarwatch/portfolio-core");
|
13
|
-
const
|
13
|
+
const web3_js_1 = require("@solana/web3.js");
|
14
14
|
const constants_1 = require("./constants");
|
15
15
|
const filters_1 = require("./filters");
|
16
16
|
const clients_1 = require("../../utils/clients");
|
@@ -51,7 +51,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
51
51
|
if (baseVault.amount.isZero())
|
52
52
|
continue;
|
53
53
|
const farmMint = aquafarm.farmTokenMint.toString();
|
54
|
-
const tokenSupplyRes = yield (0, fetchTokenSupplyAndDecimals_1.fetchTokenSupplyAndDecimals)(new
|
54
|
+
const tokenSupplyRes = yield (0, fetchTokenSupplyAndDecimals_1.fetchTokenSupplyAndDecimals)(new web3_js_1.PublicKey(farmMint), client, 0);
|
55
55
|
if (!tokenSupplyRes)
|
56
56
|
continue;
|
57
57
|
const { decimals: farmDecimals, supply: farmSupply } = tokenSupplyRes;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"lpTokensJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/lpTokensJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAgF;AAChF,
|
1
|
+
{"version":3,"file":"lpTokensJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/lpTokensJob.ts"],"names":[],"mappings":"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"}
|
@@ -1,7 +1,7 @@
|
|
1
1
|
/// <reference types="node" />
|
2
2
|
import { BeetStruct } from '@metaplex-foundation/beet';
|
3
|
-
import { PublicKey } from '@metaplex-foundation/js';
|
4
3
|
import BigNumber from 'bignumber.js';
|
4
|
+
import { PublicKey } from '@solana/web3.js';
|
5
5
|
export type AMMV4Info = {
|
6
6
|
isInitialized: number;
|
7
7
|
accountType: number;
|
@@ -1,7 +1,7 @@
|
|
1
1
|
/// <reference types="node" />
|
2
2
|
import { BeetStruct } from '@metaplex-foundation/beet';
|
3
|
-
import { PublicKey } from '@metaplex-foundation/js';
|
4
3
|
import BigNumber from 'bignumber.js';
|
4
|
+
import { PublicKey } from '@solana/web3.js';
|
5
5
|
export type PositionRewardInfo = {
|
6
6
|
growthInsideCheckpoint: BigNumber;
|
7
7
|
amountOwed: BigNumber;
|
@@ -14,6 +14,7 @@ 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 js_1 = require("@metaplex-foundation/js");
|
17
|
+
const web3_js_1 = require("@solana/web3.js");
|
17
18
|
const constants_1 = require("./constants");
|
18
19
|
const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
|
19
20
|
const helpers_1 = require("./helpers");
|
@@ -24,16 +25,16 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
24
25
|
const client = (0, clients_1.getClientSolana)();
|
25
26
|
const metaplex = new js_1.Metaplex(client);
|
26
27
|
const nfts = yield metaplex.nfts().findAllByOwner({
|
27
|
-
owner: new
|
28
|
+
owner: new web3_js_1.PublicKey(owner),
|
28
29
|
});
|
29
30
|
const positionsProgramAddress = [];
|
30
31
|
nfts.forEach((nft) => {
|
31
32
|
if (nft && nft.name === constants_1.clmmNFTName) {
|
32
33
|
const address = nft.model === 'metadata'
|
33
|
-
? new
|
34
|
-
: new
|
34
|
+
? new web3_js_1.PublicKey(nft.mintAddress.toString())
|
35
|
+
: new web3_js_1.PublicKey(nft.mint.address.toString());
|
35
36
|
const positionSeed = [Buffer.from('position'), address.toBuffer()];
|
36
|
-
const [programAddress] =
|
37
|
+
const [programAddress] = web3_js_1.PublicKey.findProgramAddressSync(positionSeed, constants_1.raydiumProgram);
|
37
38
|
positionsProgramAddress.push(programAddress);
|
38
39
|
}
|
39
40
|
});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"clmmPositionsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/clmmPositionsFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAQoC;AACpC,
|
1
|
+
{"version":3,"file":"clmmPositionsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/clmmPositionsFetcher.ts"],"names":[],"mappings":"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"}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
import { BeetStruct, FixableBeetStruct } from '@metaplex-foundation/beet';
|
2
|
-
import { PublicKey } from '@metaplex-foundation/js';
|
3
2
|
import BigNumber from 'bignumber.js';
|
3
|
+
import { PublicKey } from '@solana/web3.js';
|
4
4
|
export type AmmInfoV4 = {
|
5
5
|
status: BigNumber;
|
6
6
|
nonce: BigNumber;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"amms.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/raydium/structs/amms.ts"],"names":[],"mappings":";;;AAAA,oDAImC;
|
1
|
+
{"version":3,"file":"amms.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/raydium/structs/amms.ts"],"names":[],"mappings":"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"}
|
@@ -1,7 +1,7 @@
|
|
1
1
|
/// <reference types="node" />
|
2
2
|
import { BeetStruct } from '@metaplex-foundation/beet';
|
3
|
-
import { PublicKey } from '@metaplex-foundation/js';
|
4
3
|
import BigNumber from 'bignumber.js';
|
4
|
+
import { PublicKey } from '@solana/web3.js';
|
5
5
|
export type PositionRewardInfo = {
|
6
6
|
growthInsideLastX64: BigNumber;
|
7
7
|
rewardAmountOwed: BigNumber;
|
@@ -1,7 +1,7 @@
|
|
1
1
|
/// <reference types="node" />
|
2
2
|
import { BeetStruct } from '@metaplex-foundation/beet';
|
3
|
-
import { PublicKey } from '@metaplex-foundation/js';
|
4
3
|
import BigNumber from 'bignumber.js';
|
4
|
+
import { PublicKey } from '@solana/web3.js';
|
5
5
|
export type AccountFlag = {
|
6
6
|
initialized: boolean;
|
7
7
|
market: boolean;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"openOrders.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/raydium/structs/openOrders.ts"],"names":[],"mappings":";;;AAAA,oDAImC;
|
1
|
+
{"version":3,"file":"openOrders.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/raydium/structs/openOrders.ts"],"names":[],"mappings":";;;AAAA,oDAImC;AAEnC,kEAA6D;AAE7D,kDAAwD;AAY3C,QAAA,iBAAiB,GAAG,IAAI,iBAAU,CAC7C;IACE,CAAC,aAAa,EAAE,WAAI,CAAC;IACrB,CAAC,QAAQ,EAAE,WAAI,CAAC;IAChB,CAAC,YAAY,EAAE,WAAI,CAAC;IACpB,CAAC,cAAc,EAAE,WAAI,CAAC;IACtB,CAAC,YAAY,EAAE,WAAI,CAAC;IACpB,CAAC,MAAM,EAAE,WAAI,CAAC;IACd,CAAC,MAAM,EAAE,WAAI,CAAC;CACf,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAmB,CAC9B,CAAC;AAuBW,QAAA,kBAAkB,GAAG,IAAI,iBAAU,CAC9C;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IAEnB,CAAC,cAAc,EAAE,yBAAiB,CAAC;IAEnC,CAAC,QAAQ,EAAE,uBAAS,CAAC;IACrB,CAAC,OAAO,EAAE,uBAAS,CAAC;IAEpB,CAAC,eAAe,EAAE,YAAG,CAAC;IACtB,CAAC,gBAAgB,EAAE,YAAG,CAAC;IACvB,CAAC,gBAAgB,EAAE,YAAG,CAAC;IACvB,CAAC,iBAAiB,EAAE,YAAG,CAAC;IAExB,CAAC,cAAc,EAAE,aAAI,CAAC;IACtB,CAAC,WAAW,EAAE,aAAI,CAAC;IAEnB,CAAC,QAAQ,EAAE,IAAA,4BAAqB,EAAC,aAAI,EAAE,GAAG,CAAC,CAAC;IAC5C,CAAC,WAAW,EAAE,IAAA,4BAAqB,EAAC,YAAG,EAAE,GAAG,CAAC,CAAC;IAE9C,CAAC,SAAS,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;CACrB,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAoB,CAC/B,CAAC;AAuBW,QAAA,kBAAkB,GAAG,IAAI,iBAAU,CAC9C;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IAEnB,CAAC,cAAc,EAAE,yBAAiB,CAAC;IAEnC,CAAC,QAAQ,EAAE,uBAAS,CAAC;IACrB,CAAC,OAAO,EAAE,uBAAS,CAAC;IAEpB,CAAC,eAAe,EAAE,YAAG,CAAC;IACtB,CAAC,gBAAgB,EAAE,YAAG,CAAC;IACvB,CAAC,gBAAgB,EAAE,YAAG,CAAC;IACvB,CAAC,iBAAiB,EAAE,YAAG,CAAC;IAExB,CAAC,cAAc,EAAE,aAAI,CAAC;IACtB,CAAC,WAAW,EAAE,aAAI,CAAC;IAEnB,CAAC,QAAQ,EAAE,IAAA,4BAAqB,EAAC,aAAI,EAAE,GAAG,CAAC,CAAC;IAC5C,CAAC,WAAW,EAAE,IAAA,4BAAqB,EAAC,YAAG,EAAE,GAAG,CAAC,CAAC;IAE9C,CAAC,wBAAwB,EAAE,YAAG,CAAC;IAE/B,CAAC,SAAS,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;CACrB,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAoB,CAC/B,CAAC"}
|
@@ -24,7 +24,7 @@ const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/token
|
|
24
24
|
const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
|
25
25
|
const client = (0, clients_1.getClientSolana)();
|
26
26
|
const obligationAddresses = [];
|
27
|
-
const markets = yield cache.
|
27
|
+
const markets = yield cache.getAllItems({
|
28
28
|
prefix: constants_1.marketsPrefix,
|
29
29
|
networkId: portfolio_core_1.NetworkId.solana,
|
30
30
|
});
|
@@ -128,7 +128,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
128
128
|
platformId: constants_1.platformId,
|
129
129
|
label: 'Lending',
|
130
130
|
value,
|
131
|
-
|
131
|
+
name: market.name,
|
132
132
|
data: {
|
133
133
|
borrowedAssets,
|
134
134
|
borrowedValue,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"obligationsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/solend/obligationsFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAWoC;AACpC,gDAAoD;AACpD,gEAAqC;AACrC,2CAMqB;AACrB,uCAA6D;AAE7D,+CAAmE;AACnE,iDAAsD;AACtD,uCAA6C;AAC7C,qGAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,mBAAmB,GAAG,EAAE,CAAC;IAC/B,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,
|
1
|
+
{"version":3,"file":"obligationsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/solend/obligationsFetcher.ts"],"names":[],"mappings":"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"}
|
@@ -17,7 +17,9 @@ const portfolio_core_1 = require("@sonarwatch/portfolio-core");
|
|
17
17
|
const constants_1 = require("./constants");
|
18
18
|
const sleep_1 = __importDefault(require("../../utils/misc/sleep"));
|
19
19
|
const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
20
|
-
const markets = yield cache.
|
20
|
+
const markets = yield cache.getAllItems({
|
21
|
+
prefix: constants_1.marketsPrefix,
|
22
|
+
});
|
21
23
|
const reservesAddressesByMarket = markets.map((m) => m.reserves.map((r) => r.address));
|
22
24
|
for (let i = 0; i < reservesAddressesByMarket.length; i += 1) {
|
23
25
|
const reservesAddresses = reservesAddressesByMarket[i];
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"reservesJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/solend/reservesJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kDAA6C;AAC7C,+DAAgF;AAChF,2CAKqB;AAErB,mEAA2C;AAE3C,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,
|
1
|
+
{"version":3,"file":"reservesJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/solend/reservesJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kDAA6C;AAC7C,+DAAgF;AAChF,2CAKqB;AAErB,mEAA2C;AAE3C,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,WAAW,CAAa;QAClD,MAAM,EAAE,yBAAa;KACtB,CAAC,CAAC;IACH,MAAM,yBAAyB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAClD,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CACjC,CAAC;IACF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,yBAAyB,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;QAC5D,MAAM,iBAAiB,GAAG,yBAAyB,CAAC,CAAC,CAAC,CAAC;QACvD,MAAM,eAAe,GACnB,MAAM,eAAK;aACR,GAAG,CAAC,GAAG,2BAAe,GAAG,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;aACvD,KAAK,CAAC,GAAG,EAAE;YACV,EAAE;QACJ,CAAC,CAAC,CAAC;QACP,IAAI,CAAC,eAAe;YAAE,SAAS;QAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;YAC/D,MAAM,WAAW,GAAG,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACpD,MAAM,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE;gBACrD,MAAM,EAAN,0BAAM;gBACN,SAAS,EAAE,0BAAS,CAAC,MAAM;aAC5B,CAAC,CAAC;SACJ;QACD,MAAM,IAAA,eAAK,EAAC,GAAG,CAAC,CAAC;KAClB;AACH,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,WAAW;IAC5B,QAAQ;CACT,CAAC;AACF,kBAAe,GAAG,CAAC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"fetcherExecutor.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/tensor/fetcherExecutor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAQoC;AACpC,
|
1
|
+
{"version":3,"file":"fetcherExecutor.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/tensor/fetcherExecutor.ts"],"names":[],"mappings":"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"}
|
@@ -12,15 +12,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
13
13
|
};
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
15
|
-
const js_1 = require("@metaplex-foundation/js");
|
16
15
|
const portfolio_core_1 = require("@sonarwatch/portfolio-core");
|
16
|
+
const web3_js_1 = require("@solana/web3.js");
|
17
17
|
const platforms_1 = require("../../../platforms");
|
18
18
|
const clients_1 = require("../../../utils/clients");
|
19
19
|
const tokenPriceToAssetToken_1 = __importDefault(require("../../../utils/misc/tokenPriceToAssetToken"));
|
20
20
|
const solFactor = Math.pow(10, portfolio_core_1.solanaNetwork.native.decimals);
|
21
21
|
const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
|
22
22
|
const client = (0, clients_1.getClientSolana)();
|
23
|
-
const ownerPubKey = new
|
23
|
+
const ownerPubKey = new web3_js_1.PublicKey(owner);
|
24
24
|
const amountLamports = yield client.getBalance(ownerPubKey);
|
25
25
|
if (amountLamports === 0)
|
26
26
|
return [];
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"solana-native.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/tokens/fetchers/solana-native.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA
|
1
|
+
{"version":3,"file":"solana-native.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/tokens/fetchers/solana-native.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAQoC;AACpC,6CAA4C;AAC5C,kDAA0D;AAC1D,oDAAyD;AACzD,wGAAgF;AAEhF,MAAM,SAAS,GAAG,SAAA,EAAE,EAAI,8BAAa,CAAC,MAAM,CAAC,QAAQ,CAAA,CAAC;AAEtD,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,WAAW,GAAG,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC;IAEzC,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAC5D,IAAI,cAAc,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAEpC,MAAM,MAAM,GAAG,cAAc,GAAG,SAAS,CAAC;IAC1C,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,aAAa,CAC7C,8BAAa,CAAC,MAAM,CAAC,OAAO,EAC5B,0BAAS,CAAC,MAAM,CACjB,CAAC;IAEF,MAAM,KAAK,GAAG,IAAA,gCAAsB,EAClC,8BAAa,CAAC,MAAM,CAAC,OAAO,EAC5B,MAAM,EACN,0BAAS,CAAC,MAAM,EAChB,aAAa,CACd,CAAC;IACF,MAAM,OAAO,GAA6B;QACxC,IAAI,EAAE,qCAAoB,CAAC,QAAQ;QACnC,SAAS,EAAE,0BAAS,CAAC,MAAM;QAC3B,UAAU,EAAE,gCAAoB,CAAC,EAAE;QACnC,KAAK,EAAE,QAAQ;QACf,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,IAAI,EAAE;YACJ,MAAM,EAAE,CAAC,KAAK,CAAC;SAChB;KACF,CAAC;IACF,OAAO,CAAC,OAAO,CAAC,CAAC;AACnB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,gCAAoB,CAAC,EAAE,gBAAgB;IAC9C,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
|
@@ -12,8 +12,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
13
13
|
};
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
15
|
-
const js_1 = require("@metaplex-foundation/js");
|
16
15
|
const portfolio_core_1 = require("@sonarwatch/portfolio-core");
|
16
|
+
const web3_js_1 = require("@solana/web3.js");
|
17
17
|
const platforms_1 = require("../../../platforms");
|
18
18
|
const clients_1 = require("../../../utils/clients");
|
19
19
|
const solana_1 = require("../../../utils/solana");
|
@@ -22,7 +22,7 @@ const tokenPriceToAssetTokens_1 = __importDefault(require("../../../utils/misc/t
|
|
22
22
|
const tokenPriceToAssetToken_1 = __importDefault(require("../../../utils/misc/tokenPriceToAssetToken"));
|
23
23
|
const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
|
24
24
|
const client = (0, clients_1.getClientSolana)();
|
25
|
-
const ownerPubKey = new
|
25
|
+
const ownerPubKey = new web3_js_1.PublicKey(owner);
|
26
26
|
const tokenAccounts = yield (0, solana_1.getTokenAccountsByOwner)(client, ownerPubKey);
|
27
27
|
const mints = [...new Set(tokenAccounts.map((ta) => ta.mint.toString()))];
|
28
28
|
const results = yield (0, runInBatch_1.default)(mints.map((mint) => () => cache.getTokenPrice(mint, portfolio_core_1.NetworkId.solana)));
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"solana.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/tokens/fetchers/solana.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA
|
1
|
+
{"version":3,"file":"solana.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/tokens/fetchers/solana.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAYoC;AACpC,6CAA4C;AAC5C,kDAA0D;AAC1D,oDAAyD;AACzD,kDAAgE;AAChE,gFAAwD;AACxD,0GAAkF;AAClF,wGAAgF;AAEhF,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,WAAW,GAAG,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC;IAEzC,MAAM,aAAa,GAAG,MAAM,IAAA,gCAAuB,EAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACzE,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;IAE1E,MAAM,OAAO,GAAG,MAAM,IAAA,oBAAU,EAC9B,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC,CACvE,CAAC;IACF,MAAM,WAAW,GAA4B,IAAI,GAAG,EAAE,CAAC;IACvD,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACpB,IAAI,CAAC,CAAC,MAAM,KAAK,UAAU;YAAE,OAAO;QACpC,IAAI,CAAC,CAAC,CAAC,KAAK;YAAE,OAAO;QACrB,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAA0B,EAAE,CAAC;IACrD,MAAM,uBAAuB,GAAyC,EAAE,CAAC;IAEzE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC7C,MAAM,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QACtC,IAAI,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE;YAAE,SAAS;QAE3C,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC7C,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC5C,IAAI,CAAC,UAAU;YAAE,SAAS;QAE1B,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM;aAC/B,GAAG,CAAC,SAAA,EAAE,EAAI,UAAU,CAAC,QAAQ,CAAA,CAAC;aAC9B,QAAQ,EAAE,CAAC;QAEd,IAAI,UAAU,CAAC,UAAU,KAAK,gCAAoB,CAAC,EAAE,EAAE;YACrD,MAAM,MAAM,GAAG,IAAA,iCAAuB,EACpC,OAAO,EACP,MAAM,EACN,0BAAS,CAAC,MAAM,EAChB,UAAU,CACX,CAAC;YACF,MAAM,SAAS,GAAuB;gBACpC,MAAM;gBACN,WAAW,EAAE,IAAA,+BAAc,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;gBACvD,YAAY,EAAE,EAAE;gBAChB,iBAAiB,EAAE,CAAC;gBACpB,KAAK,EAAE,IAAA,+BAAc,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;gBACjD,MAAM,EAAE,EAAE;aACX,CAAC;YACF,IAAI,CAAC,uBAAuB,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;gBACnD,uBAAuB,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;aACrD;YACD,uBAAuB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAChE;aAAM;YACL,kBAAkB,CAAC,IAAI,CACrB,IAAA,gCAAsB,EAAC,OAAO,EAAE,MAAM,EAAE,0BAAS,CAAC,MAAM,EAAE,UAAU,CAAC,CACtE,CAAC;SACH;KACF;IACD,MAAM,QAAQ,GAAuB,EAAE,CAAC;IACxC,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE;QACjC,MAAM,mBAAmB,GAA6B;YACpD,IAAI,EAAE,qCAAoB,CAAC,QAAQ;YACnC,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAE,gCAAoB,CAAC,EAAE;YACnC,KAAK,EAAE,QAAQ;YACf,KAAK,EAAE,IAAA,+BAAc,EAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAC7D,IAAI,EAAE;gBACJ,MAAM,EAAE,kBAAkB;aAC3B;SACF,CAAC;QACF,QAAQ,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;KACpC;IACD,KAAK,MAAM,CAAC,UAAU,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CACpD,uBAAuB,CACxB,EAAE;QACD,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,qCAAoB,CAAC,SAAS;YACpC,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU;YACV,KAAK,EAAE,eAAe;YACtB,KAAK,EAAE,IAAA,+BAAc,EAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACtD,IAAI,EAAE;gBACJ,WAAW;aACZ;SACF,CAAC,CAAC;KACJ;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,gCAAoB,CAAC,EAAE,SAAS;IACvC,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
|
@@ -1,5 +1,4 @@
|
|
1
|
-
import { PublicKey } from '@
|
2
|
-
import { Connection } from '@solana/web3.js';
|
1
|
+
import { Connection, PublicKey } from '@solana/web3.js';
|
3
2
|
export declare function fetchTokenSupplyAndDecimals(mint: PublicKey, client: Connection, sleepMultiplier?: number): Promise<{
|
4
3
|
supply: number;
|
5
4
|
decimals: number;
|
@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
13
13
|
};
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
15
15
|
exports.fetchTokenSupplyAndDecimals = void 0;
|
16
|
-
const
|
16
|
+
const web3_js_1 = require("@solana/web3.js");
|
17
17
|
const sleep_1 = __importDefault(require("../misc/sleep"));
|
18
18
|
const solMints = [
|
19
19
|
'11111111111111111111111111111111',
|
@@ -23,7 +23,7 @@ function fetchTokenSupplyAndDecimals(mint, client, sleepMultiplier = 1) {
|
|
23
23
|
return __awaiter(this, void 0, void 0, function* () {
|
24
24
|
let mintPublicKey;
|
25
25
|
if (typeof mint === 'string') {
|
26
|
-
mintPublicKey = new
|
26
|
+
mintPublicKey = new web3_js_1.PublicKey(mint);
|
27
27
|
}
|
28
28
|
else {
|
29
29
|
mintPublicKey = mint;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"fetchTokenSupplyAndDecimals.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/solana/fetchTokenSupplyAndDecimals.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
1
|
+
{"version":3,"file":"fetchTokenSupplyAndDecimals.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/solana/fetchTokenSupplyAndDecimals.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAwD;AACxD,0DAAkC;AAElC,MAAM,QAAQ,GAAG;IACf,kCAAkC;IAClC,6CAA6C;CAC9C,CAAC;AAEF,SAAsB,2BAA2B,CAC/C,IAAe,EACf,MAAkB,EAClB,eAAe,GAAG,CAAC;;QAEnB,IAAI,aAAa,CAAC;QAClB,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YAC5B,aAAa,GAAG,IAAI,mBAAS,CAAC,IAAI,CAAC,CAAC;SACrC;aAAM;YACL,aAAa,GAAG,IAAI,CAAC;SACtB;QAED,IAAI,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,EAAE;YAC/C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,EAAE,CAAC;YACxC,MAAM,IAAA,eAAK,EAAC,GAAG,GAAG,eAAe,CAAC,CAAC;YACnC,OAAO;gBACL,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI;gBACjC,QAAQ,EAAE,CAAC;aACZ,CAAC;SACH;QACD,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;QAClE,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ;YAAE,OAAO,SAAS,CAAC;QACrD,MAAM,IAAA,eAAK,EAAC,GAAG,GAAG,eAAe,CAAC,CAAC;QACnC,OAAO;YACL,MAAM,EAAE,UAAU,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;YAC5D,QAAQ,EAAE,cAAc,CAAC,KAAK,CAAC,QAAQ;SACxC,CAAC;IACJ,CAAC;CAAA;AA3BD,kEA2BC"}
|