@sonarwatch/portfolio-plugins 0.11.157 → 0.11.159
Sign up to get free protection for your applications and to get access to all the features.
- package/CHANGELOG.md +8 -0
- package/package.json +2 -2
- package/src/plugins/abex/marketsJob.js +2 -2
- package/src/plugins/abex/marketsJob.js.map +1 -1
- package/src/plugins/aftermath/poolsJob.js +36 -102
- package/src/plugins/aftermath/poolsJob.js.map +1 -1
- package/src/plugins/atrix/poolsV1Job.js +2 -2
- package/src/plugins/atrix/poolsV1Job.js.map +1 -1
- package/src/plugins/auxexchange/aptosLpJob.js +6 -4
- package/src/plugins/auxexchange/aptosLpJob.js.map +1 -1
- package/src/plugins/bskt/vestingFetcher.js +4 -24
- package/src/plugins/bskt/vestingFetcher.js.map +1 -1
- package/src/plugins/fluxbeam/poolsJob.js +6 -4
- package/src/plugins/fluxbeam/poolsJob.js.map +1 -1
- package/src/plugins/kai/vaultsJob.js +2 -2
- package/src/plugins/kai/vaultsJob.js.map +1 -1
- package/src/plugins/liquiditypools-sei/job.js +6 -4
- package/src/plugins/liquiditypools-sei/job.js.map +1 -1
- package/src/plugins/liquidswap/aptosLpJob.js +2 -2
- package/src/plugins/liquidswap/aptosLpJob.js.map +1 -1
- package/src/plugins/marginfi/banksJob.d.ts +3 -0
- package/src/plugins/marginfi/{jobExecutor.js → banksJob.js} +8 -3
- package/src/plugins/marginfi/banksJob.js.map +1 -0
- package/src/plugins/marginfi/depositsFetcher.d.ts +3 -0
- package/src/plugins/marginfi/{fetcherExecutor.js → depositsFetcher.js} +8 -3
- package/src/plugins/marginfi/{fetcherExecutor.js.map → depositsFetcher.js.map} +1 -1
- package/src/plugins/marginfi/index.js +4 -17
- package/src/plugins/marginfi/index.js.map +1 -1
- package/src/plugins/meteora/multiTokenPoolsJob.js +2 -2
- package/src/plugins/meteora/multiTokenPoolsJob.js.map +1 -1
- package/src/plugins/meteora/poolsJob.js +6 -4
- package/src/plugins/meteora/poolsJob.js.map +1 -1
- package/src/plugins/navi/collateralFetcher.js +5 -1
- package/src/plugins/navi/collateralFetcher.js.map +1 -1
- package/src/plugins/orca/lpTokensJob.js +6 -4
- package/src/plugins/orca/lpTokensJob.js.map +1 -1
- package/src/plugins/pancakeswap/aptosLpJob.js +6 -4
- package/src/plugins/pancakeswap/aptosLpJob.js.map +1 -1
- package/src/plugins/raydium/lpTokensJob.js +8 -10
- package/src/plugins/raydium/lpTokensJob.js.map +1 -1
- package/src/plugins/raydium/structs/amms.d.ts +5 -2
- package/src/plugins/raydium/structs/amms.js +6 -3
- package/src/plugins/raydium/structs/amms.js.map +1 -1
- package/src/plugins/sushiswap/aptos/poolsJob.js +2 -2
- package/src/plugins/sushiswap/aptos/poolsJob.js.map +1 -1
- package/src/plugins/symmetry/basketsJob.js +2 -2
- package/src/plugins/symmetry/basketsJob.js.map +1 -1
- package/src/plugins/tulip/lendingTokensJob.js +2 -2
- package/src/plugins/tulip/lendingTokensJob.js.map +1 -1
- package/src/plugins/tulip/strategyTokensJob.js +2 -2
- package/src/plugins/tulip/strategyTokensJob.js.map +1 -1
- package/src/utils/clmm/tokenPricesFromSqrt.js +11 -4
- package/src/utils/clmm/tokenPricesFromSqrt.js.map +1 -1
- package/src/utils/misc/getLpTokenSource.d.ts +13 -9
- package/src/utils/misc/getLpTokenSource.js +29 -8
- package/src/utils/misc/getLpTokenSource.js.map +1 -1
- package/src/utils/misc/getLpTokenSourceOld.d.ts +18 -0
- package/src/utils/misc/getLpTokenSourceOld.js +32 -0
- package/src/utils/misc/getLpTokenSourceOld.js.map +1 -0
- package/src/utils/misc/getLpTokenSourceRaw.d.ts +16 -5
- package/src/utils/misc/getLpTokenSourceRaw.js +22 -6
- package/src/utils/misc/getLpTokenSourceRaw.js.map +1 -1
- package/src/utils/misc/getLpTokenSourceRawOld.d.ts +25 -0
- package/src/utils/misc/getLpTokenSourceRawOld.js +20 -0
- package/src/utils/misc/getLpTokenSourceRawOld.js.map +1 -0
- package/src/utils/misc/getLpUnderlyingTokenSource.d.ts +14 -18
- package/src/utils/misc/getLpUnderlyingTokenSource.js +101 -70
- package/src/utils/misc/getLpUnderlyingTokenSource.js.map +1 -1
- package/src/utils/misc/getLpUnderlyingTokenSourceOld.d.ts +26 -0
- package/src/utils/misc/getLpUnderlyingTokenSourceOld.js +73 -0
- package/src/utils/misc/getLpUnderlyingTokenSourceOld.js.map +1 -0
- package/src/plugins/marginfi/fetcherExecutor.d.ts +0 -3
- package/src/plugins/marginfi/jobExecutor.d.ts +0 -3
- package/src/plugins/marginfi/jobExecutor.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aptosLpJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/liquidswap/aptosLpJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,gEAAqC;AACrC,+DAA2E;AAO3E,6CAK2B;AAC3B,iDAAqD;AACrD,2CAKqB;AACrB
|
|
1
|
+
{"version":3,"file":"aptosLpJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/liquidswap/aptosLpJob.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ const filters_1 = require("./filters");
|
|
|
16
16
|
const helpers_1 = require("./helpers");
|
|
17
17
|
const solana_1 = require("../../utils/solana");
|
|
18
18
|
const clients_1 = require("../../utils/clients");
|
|
19
|
-
const
|
|
19
|
+
const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
20
20
|
const connection = (0, clients_1.getClientSolana)();
|
|
21
21
|
const banksRawData = yield (0, solana_1.getParsedProgramAccounts)(connection, Bank_1.bankStruct, constants_1.MarginfiProgram, (0, filters_1.banksFilters)());
|
|
22
22
|
for (let index = 0; index < banksRawData.length; index += 1) {
|
|
@@ -57,5 +57,10 @@ const jobExecutor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
57
57
|
});
|
|
58
58
|
}
|
|
59
59
|
});
|
|
60
|
-
|
|
61
|
-
|
|
60
|
+
const job = {
|
|
61
|
+
id: `${constants_1.platformId}-banks`,
|
|
62
|
+
executor,
|
|
63
|
+
label: 'normal',
|
|
64
|
+
};
|
|
65
|
+
exports.default = job;
|
|
66
|
+
//# sourceMappingURL=banksJob.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"banksJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/marginfi/banksJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAKoC;AACpC,2CAAkE;AAClE,yCAA4C;AAC5C,uCAAyC;AACzC,uCAAuE;AACvE,+CAA8D;AAC9D,iDAAsD;AAItD,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,YAAY,GAAG,MAAM,IAAA,iCAAwB,EACjD,UAAU,EACV,iBAAU,EACV,2BAAe,EACf,IAAA,sBAAY,GAAE,CACf,CAAC;IAEF,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,YAAY,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QAC5D,MAAM,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;QACjC,MAAM,KAAK,CAAC,OAAO,CACjB,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,kCAEjB,IAAI,KACP,sBAAsB,EAAE,IAAA,kCAAwB,EAC9C,IAAI,CAAC,eAAe,CACrB,CAAC,GAAG,CAAC,SAAA,EAAE,EAAI,IAAI,CAAC,YAAY,CAAA,CAAC,EAC9B,0BAA0B,EAAE,IAAA,kCAAwB,EAClD,IAAI,CAAC,mBAAmB,CACzB,CAAC,GAAG,CAAC,SAAA,EAAE,EAAI,IAAI,CAAC,YAAY,CAAA,CAAC,KAEhC;YACE,MAAM,EAAN,kBAAM;YACN,SAAS,EAAE,0BAAS,CAAC,MAAM;SAC5B,CACF,CAAC;QAEF,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,IAAA,0BAAgB,EAAC,IAAI,CAAC,CAAC;QAC5D,MAAM,eAAe,GAAG,IAAA,kCAAwB,EAAC,IAAI,CAAC,mBAAmB,CAAC;aACvE,KAAK,CAAC,IAAA,kCAAwB,EAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;aAC1D,QAAQ,EAAE,CAAC;QAEd,MAAM,cAAc,GAAG,IAAA,kCAAwB,EAAC,IAAI,CAAC,eAAe,CAAC;aAClE,KAAK,CAAC,IAAA,kCAAwB,EAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;aACtD,QAAQ,EAAE,CAAC;QAEd,IAAI,cAAc,IAAI,EAAE,IAAI,eAAe,IAAI,EAAE;YAAE,SAAS;QAE5D,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;QAE1C,MAAM,QAAQ,GACZ,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,CAAC;QAE/D,MAAM,IAAI,GAAmB;YAC3B,YAAY;YACZ,WAAW,EAAE;gBACX,GAAG,EAAE,IAAA,yBAAQ,EAAC,YAAY,CAAC;gBAC3B,GAAG,EAAE,YAAY;aAClB;YACD,cAAc;YACd,YAAY,EAAE;gBACZ,GAAG,EAAE,IAAA,yBAAQ,EAAC,UAAU,CAAC;gBACzB,GAAG,EAAE,UAAU;aAChB;YACD,eAAe;YACf,UAAU,EAAV,sBAAU;YACV,QAAQ;SACT,CAAC;QAEF,MAAM,KAAK,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,YAAY,EAAE,EAAE,IAAI,EAAE;YACrE,MAAM,EAAE,sCAAqB;YAC7B,SAAS,EAAE,0BAAS,CAAC,MAAM;SAC5B,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,QAAQ;IACzB,QAAQ;IACR,KAAK,EAAE,QAAQ;CAChB,CAAC;AACF,kBAAe,GAAG,CAAC"}
|
|
@@ -24,7 +24,7 @@ const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/token
|
|
|
24
24
|
const getTokensPricesMap_1 = __importDefault(require("../../utils/misc/getTokensPricesMap"));
|
|
25
25
|
const helpers_2 = require("../../utils/solana/pyth/helpers");
|
|
26
26
|
const Bank_1 = require("./structs/Bank");
|
|
27
|
-
const
|
|
27
|
+
const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
28
28
|
const client = (0, clients_1.getClientSolana)();
|
|
29
29
|
const accounts = yield (0, solana_1.getParsedProgramAccounts)(client, MarginfiAccount_1.marginfiAccountStruct, constants_1.MarginfiProgram, (0, filters_1.accountsFilter)(owner));
|
|
30
30
|
if (accounts.length === 0)
|
|
@@ -133,5 +133,10 @@ const fetcherExecutor = (owner, cache) => __awaiter(void 0, void 0, void 0, func
|
|
|
133
133
|
}
|
|
134
134
|
return elements;
|
|
135
135
|
});
|
|
136
|
-
|
|
137
|
-
|
|
136
|
+
const fetcher = {
|
|
137
|
+
id: `${constants_1.platformId}-deposits`,
|
|
138
|
+
networkId: portfolio_core_1.NetworkId.solana,
|
|
139
|
+
executor,
|
|
140
|
+
};
|
|
141
|
+
exports.default = fetcher;
|
|
142
|
+
//# sourceMappingURL=depositsFetcher.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"
|
|
1
|
+
{"version":3,"file":"depositsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/marginfi/depositsFetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,23 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.fetchers = exports.jobs = exports.platforms = void 0;
|
|
7
|
-
const
|
|
8
|
-
const
|
|
9
|
-
const fetcherExecutor_1 = __importDefault(require("./fetcherExecutor"));
|
|
7
|
+
const banksJob_1 = __importDefault(require("./banksJob"));
|
|
8
|
+
const depositsFetcher_1 = __importDefault(require("./depositsFetcher"));
|
|
10
9
|
const constants_1 = require("./constants");
|
|
11
10
|
exports.platforms = [constants_1.marginfiPlatform];
|
|
12
|
-
exports.jobs = [
|
|
13
|
-
|
|
14
|
-
id: 'marginfi',
|
|
15
|
-
executor: jobExecutor_1.default,
|
|
16
|
-
label: 'normal',
|
|
17
|
-
},
|
|
18
|
-
];
|
|
19
|
-
exports.fetchers = [
|
|
20
|
-
{
|
|
21
|
-
id: 'marginfi',
|
|
22
|
-
networkId: portfolio_core_1.NetworkId.solana,
|
|
23
|
-
executor: fetcherExecutor_1.default,
|
|
24
|
-
},
|
|
25
|
-
];
|
|
11
|
+
exports.jobs = [banksJob_1.default];
|
|
12
|
+
exports.fetchers = [depositsFetcher_1.default];
|
|
26
13
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/marginfi/index.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/marginfi/index.ts"],"names":[],"mappings":";;;;;;AACA,0DAAkC;AAClC,wEAAgD;AAGhD,2CAA+C;AAElC,QAAA,SAAS,GAAe,CAAC,4BAAgB,CAAC,CAAC;AAC3C,QAAA,IAAI,GAAU,CAAC,kBAAQ,CAAC,CAAC;AACzB,QAAA,QAAQ,GAAc,CAAC,yBAAe,CAAC,CAAC"}
|
|
@@ -18,7 +18,7 @@ const constants_1 = require("./constants");
|
|
|
18
18
|
const multiTokenPools_json_1 = __importDefault(require("./multiTokenPools.json"));
|
|
19
19
|
const solana_1 = require("../../utils/solana");
|
|
20
20
|
const clients_1 = require("../../utils/clients");
|
|
21
|
-
const
|
|
21
|
+
const getLpTokenSourceRawOld_1 = __importDefault(require("../../utils/misc/getLpTokenSourceRawOld"));
|
|
22
22
|
const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
23
23
|
const connection = (0, clients_1.getClientSolana)();
|
|
24
24
|
const reserveAddresses = multiTokenPools_json_1.default
|
|
@@ -58,7 +58,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
58
58
|
});
|
|
59
59
|
if (poolUnderlyingsRaw.length !== pool.reserveAccounts.length)
|
|
60
60
|
continue;
|
|
61
|
-
const lpSource = (0,
|
|
61
|
+
const lpSource = (0, getLpTokenSourceRawOld_1.default)(portfolio_core_1.NetworkId.solana, pool.address, constants_1.platformId, {
|
|
62
62
|
address: pool.address,
|
|
63
63
|
decimals: lpMintAccount.decimals,
|
|
64
64
|
supplyRaw: lpMintAccount.supply,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multiTokenPoolsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/meteora/multiTokenPoolsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAAyE;AACzE,6CAA4C;AAG5C,2CAAyC;AACzC,kFAAqD;AACrD,+CAM4B;AAC5B,iDAAsD;AACtD
|
|
1
|
+
{"version":3,"file":"multiTokenPoolsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/meteora/multiTokenPoolsJob.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,8 +19,8 @@ const clients_1 = require("../../utils/clients");
|
|
|
19
19
|
const solana_1 = require("../../utils/solana");
|
|
20
20
|
const struct_1 = require("./struct");
|
|
21
21
|
const filters_1 = require("./filters");
|
|
22
|
-
const
|
|
23
|
-
const
|
|
22
|
+
const getLpTokenSourceRawOld_1 = __importDefault(require("../../utils/misc/getLpTokenSourceRawOld"));
|
|
23
|
+
const getLpUnderlyingTokenSourceOld_1 = __importDefault(require("../../utils/misc/getLpUnderlyingTokenSourceOld"));
|
|
24
24
|
const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
25
25
|
const client = (0, clients_1.getClientSolana)();
|
|
26
26
|
// Get all 2-tokens pool (permissionless)
|
|
@@ -92,23 +92,25 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
92
92
|
if (!lpMintAccount)
|
|
93
93
|
continue;
|
|
94
94
|
if (aMintAccount && bMintAccount) {
|
|
95
|
-
const underlyingSource = (0,
|
|
95
|
+
const underlyingSource = (0, getLpUnderlyingTokenSourceOld_1.default)(lpMint.toString(), portfolio_core_1.NetworkId.solana, {
|
|
96
96
|
address: aTokenMint,
|
|
97
97
|
decimals: aMintAccount.decimals,
|
|
98
98
|
reserveAmountRaw: tAccountA.amount,
|
|
99
99
|
tokenPrice: aTokenPrice,
|
|
100
|
+
weight: 0.5,
|
|
100
101
|
}, {
|
|
101
102
|
address: bTokenMint,
|
|
102
103
|
decimals: bMintAccount.decimals,
|
|
103
104
|
reserveAmountRaw: tAccountB.amount,
|
|
104
105
|
tokenPrice: bTokenPrice,
|
|
106
|
+
weight: 0.5,
|
|
105
107
|
});
|
|
106
108
|
if (underlyingSource)
|
|
107
109
|
lpSources.push(underlyingSource);
|
|
108
110
|
}
|
|
109
111
|
if (!bTokenPrice || !aTokenPrice)
|
|
110
112
|
continue;
|
|
111
|
-
const lpSource = (0,
|
|
113
|
+
const lpSource = (0, getLpTokenSourceRawOld_1.default)(portfolio_core_1.NetworkId.solana, lpMint, constants_1.platformId, {
|
|
112
114
|
address: lpMint,
|
|
113
115
|
decimals: lpMintAccount.decimals,
|
|
114
116
|
supplyRaw: lpMintAccount.supply,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"poolsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/meteora/poolsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAAyE;AACzE,6CAA4C;AAC5C,2CAAyD;AACzD,iDAAsD;AACtD,+CAO4B;AAC5B,qCAAsD;AACtD,uCAAqE;AAGrE
|
|
1
|
+
{"version":3,"file":"poolsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/meteora/poolsJob.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,6 +27,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
27
27
|
const suppliedAssets = [];
|
|
28
28
|
const suppliedYields = [];
|
|
29
29
|
const rewardAssets = [];
|
|
30
|
+
const suppliedLtvs = [];
|
|
30
31
|
const reservesData = yield cache.getItem(constants_1.reservesKey, {
|
|
31
32
|
prefix: constants_1.reservesPrefix,
|
|
32
33
|
networkId: portfolio_core_1.NetworkId.sui,
|
|
@@ -85,12 +86,15 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
85
86
|
apy,
|
|
86
87
|
},
|
|
87
88
|
]);
|
|
89
|
+
suppliedLtvs.push(new bignumber_js_1.default(rData.value.fields.liquidation_factors.fields.threshold)
|
|
90
|
+
.div(Math.pow(10, 27))
|
|
91
|
+
.toNumber());
|
|
88
92
|
}
|
|
89
93
|
}
|
|
90
94
|
}
|
|
91
95
|
if (suppliedAssets.length === 0 && borrowedAssets.length === 0)
|
|
92
96
|
return [];
|
|
93
|
-
const { borrowedValue, suppliedValue, value, healthRatio, rewardValue } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
|
|
97
|
+
const { borrowedValue, suppliedValue, value, healthRatio, rewardValue } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets, suppliedLtvs);
|
|
94
98
|
const element = {
|
|
95
99
|
type: portfolio_core_1.PortfolioElementType.borrowlend,
|
|
96
100
|
networkId: portfolio_core_1.NetworkId.sui,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collateralFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/navi/collateralFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DASoC;AACpC,gEAAqC;AAGrC,2CAKqB;AACrB,iDAAmD;AACnD,qGAA6E;AAE7E,iFAA8E;AAE9E,MAAM,YAAY,GAAG,IAAI,sBAAS,CAAC,SAAA,EAAE,EAAI,EAAE,CAAA,CAAC,CAAC;AAE7C,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;;IACtE,MAAM,MAAM,GAAG,IAAA,sBAAY,GAAE,CAAC;IAE9B,MAAM,cAAc,GAAqB,EAAE,CAAC;IAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;IACrC,MAAM,cAAc,GAAqB,EAAE,CAAC;IAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;IACrC,MAAM,YAAY,GAAqB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"collateralFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/navi/collateralFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DASoC;AACpC,gEAAqC;AAGrC,2CAKqB;AACrB,iDAAmD;AACnD,qGAA6E;AAE7E,iFAA8E;AAE9E,MAAM,YAAY,GAAG,IAAI,sBAAS,CAAC,SAAA,EAAE,EAAI,EAAE,CAAA,CAAC,CAAC;AAE7C,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;;IACtE,MAAM,MAAM,GAAG,IAAA,sBAAY,GAAE,CAAC;IAE9B,MAAM,cAAc,GAAqB,EAAE,CAAC;IAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;IACrC,MAAM,cAAc,GAAqB,EAAE,CAAC;IAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;IACrC,MAAM,YAAY,GAAqB,EAAE,CAAC;IAC1C,MAAM,YAAY,GAAa,EAAE,CAAC;IAElC,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,OAAO,CAAgB,uBAAW,EAAE;QACnE,MAAM,EAAE,0BAAc;QACtB,SAAS,EAAE,0BAAS,CAAC,GAAG;KACzB,CAAC,CAAC;IACH,IAAI,CAAC,YAAY;QAAE,OAAO,EAAE,CAAC;IAE7B,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,mBAAmB,CACjD,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,EACjD,0BAAS,CAAC,GAAG,CACd,CAAC;IAEF,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;QACjC,MAAM,oBAAoB,GAAG,IAAA,6CAAqB,EAAc,MAAM,EAAE;YACtE,QAAQ,EACN,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;YAClE,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE;SACxC,CAAC,CAAC;QACH,MAAM,oBAAoB,GAAG,IAAA,6CAAqB,EAAc,MAAM,EAAE;YACtE,QAAQ,EACN,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;YAClE,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE;SACxC,CAAC,CAAC;QACH,MAAM,CAAC,aAAa,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACvD,oBAAoB;YACpB,oBAAoB;SACrB,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAChC,IAAA,mCAAkB,EAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,0BAAS,CAAC,GAAG,CAAC,CAChE,CAAC;QAEF,IAAI,CAAC,aAAa,CAAC,KAAK,KAAI,MAAA,aAAa,CAAC,IAAI,0CAAE,OAAO,CAAA,EAAE,CAAC;YACxD,MAAM,UAAU,GAAG,MAAA,aAAa,CAAC,IAAI,CAAC,OAAO,0CAAE,MAAM,CAAC;YACtD,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;gBACrB,MAAM,WAAW,GAAG,IAAA,gCAAsB,EACxC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,EAC5B,IAAI,sBAAS,CAAC,UAAU,CAAC,KAAK,CAAC;qBAC5B,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,oBAAoB,CAAC;qBAC9C,SAAS,CAAC,YAAY,CAAC;qBACvB,QAAQ,EAAE,EACb,0BAAS,CAAC,GAAG,EACb,UAAU,CACX,CAAC;gBACF,IAAI,WAAW,CAAC,KAAK,KAAK,IAAI,IAAI,WAAW,CAAC,KAAK,GAAG,KAAK,EAAE,CAAC;oBAC5D,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;oBACjC,MAAM,GAAG,GAAG,IAAI,sBAAS,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,mBAAmB,CAAC;yBAC9D,SAAS,CAAC,SAAA,EAAE,EAAI,sBAAU,CAAA,CAAC;yBAC3B,QAAQ,EAAE,CAAC;oBACd,cAAc,CAAC,IAAI,CAAC;wBAClB;4BACE,GAAG,EAAE,CAAC,IAAA,yBAAQ,EAAC,GAAG,CAAC;4BACnB,GAAG,EAAE,CAAC,GAAG;yBACV;qBACF,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,CAAC,aAAa,CAAC,KAAK,KAAI,MAAA,MAAA,aAAa,CAAC,IAAI,0CAAE,OAAO,0CAAE,MAAM,CAAA,EAAE,CAAC;YAChE,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;YACrD,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;gBACrB,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,EAC5B,IAAI,sBAAS,CAAC,UAAU,CAAC,KAAK,CAAC;qBAC5B,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,oBAAoB,CAAC;qBAC9C,SAAS,CAAC,YAAY,CAAC;qBACvB,QAAQ,EAAE,EACb,0BAAS,CAAC,GAAG,EACb,UAAU,CACX,CACF,CAAC;gBACF,MAAM,GAAG,GAAG,IAAI,sBAAS,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,mBAAmB,CAAC;qBAC9D,SAAS,CAAC,SAAA,EAAE,EAAI,sBAAU,CAAA,CAAC;qBAC3B,QAAQ,EAAE,CAAC;gBACd,cAAc,CAAC,IAAI,CAAC;oBAClB;wBACE,GAAG,EAAE,IAAA,yBAAQ,EAAC,GAAG,CAAC;wBAClB,GAAG;qBACJ;iBACF,CAAC,CAAC;gBACH,YAAY,CAAC,IAAI,CACf,IAAI,sBAAS,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC;qBACnE,GAAG,CAAC,SAAA,EAAE,EAAI,EAAE,CAAA,CAAC;qBACb,QAAQ,EAAE,CACd,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAE1E,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,GACrE,IAAA,wCAAuB,EACrB,cAAc,EACd,cAAc,EACd,YAAY,EACZ,YAAY,CACb,CAAC;IACJ,MAAM,OAAO,GAAqB;QAChC,IAAI,EAAE,qCAAoB,CAAC,UAAU;QACrC,SAAS,EAAE,0BAAS,CAAC,GAAG;QACxB,UAAU,EAAV,sBAAU;QACV,KAAK,EAAE,SAAS;QAChB,KAAK;QACL,IAAI,EAAE;YACJ,cAAc;YACd,aAAa;YACb,cAAc;YACd,cAAc;YACd,aAAa;YACb,cAAc;YACd,eAAe,EAAE,IAAI;YACrB,WAAW;YACX,YAAY;YACZ,WAAW;YACX,KAAK;SACN;KACF,CAAC;IACF,OAAO,CAAC,OAAO,CAAC,CAAC;AACnB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,aAAa;IAC9B,SAAS,EAAE,0BAAS,CAAC,GAAG;IACxB,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
|
|
@@ -23,9 +23,9 @@ const fetchTokenSupplyAndDecimals_1 = require("../../utils/solana/fetchTokenSupp
|
|
|
23
23
|
const runInBatch_1 = __importDefault(require("../../utils/misc/runInBatch"));
|
|
24
24
|
const computeAndStoreLpPrice_1 = require("../../utils/misc/computeAndStoreLpPrice");
|
|
25
25
|
const getTokensPricesMap_1 = __importDefault(require("../../utils/misc/getTokensPricesMap"));
|
|
26
|
-
const
|
|
26
|
+
const getLpUnderlyingTokenSourceOld_1 = __importDefault(require("../../utils/misc/getLpUnderlyingTokenSourceOld"));
|
|
27
27
|
const getDecimalsForToken_1 = require("../../utils/misc/getDecimalsForToken");
|
|
28
|
-
const
|
|
28
|
+
const getLpTokenSourceRawOld_1 = __importDefault(require("../../utils/misc/getLpTokenSourceRawOld"));
|
|
29
29
|
const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
30
30
|
const client = (0, clients_1.getClientSolana)();
|
|
31
31
|
const farmsAccounts = yield (0, solana_1.getParsedProgramAccounts)(client, oldLiquidities_1.aquafarmStruct, constants_1.aquafarmsProgram, filters_1.aquafarmFilters);
|
|
@@ -87,22 +87,24 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
87
87
|
continue;
|
|
88
88
|
const coinAmountWei = new bignumber_js_1.default(poolCoinTokenAccount.amount.toString());
|
|
89
89
|
const pcAmountWei = new bignumber_js_1.default(poolPcTokenAccount.amount.toString());
|
|
90
|
-
const underlyingSource = (0,
|
|
90
|
+
const underlyingSource = (0, getLpUnderlyingTokenSourceOld_1.default)(lpMint.toString(), portfolio_core_1.NetworkId.solana, {
|
|
91
91
|
address: mintA,
|
|
92
92
|
decimals: decimalsA,
|
|
93
93
|
reserveAmountRaw: coinAmountWei,
|
|
94
94
|
tokenPrice: tokenPriceA,
|
|
95
|
+
weight: 0.5,
|
|
95
96
|
}, {
|
|
96
97
|
address: mintB,
|
|
97
98
|
decimals: decimalsB,
|
|
98
99
|
reserveAmountRaw: pcAmountWei,
|
|
99
100
|
tokenPrice: tokenPriceB,
|
|
101
|
+
weight: 0.5,
|
|
100
102
|
});
|
|
101
103
|
if (underlyingSource)
|
|
102
104
|
yield cache.setTokenPriceSource(underlyingSource);
|
|
103
105
|
if (!tokenPriceA || !tokenPriceB)
|
|
104
106
|
continue;
|
|
105
|
-
const lpSource = (0,
|
|
107
|
+
const lpSource = (0, getLpTokenSourceRawOld_1.default)(portfolio_core_1.NetworkId.solana, lpMint.toString(), constants_1.platformId, { address: lpMint.toString(), decimals: lpDecimals, supplyRaw: lpSupply }, [
|
|
106
108
|
{
|
|
107
109
|
address: tokenPriceA.address,
|
|
108
110
|
decimals: tokenPriceA.decimals,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lpTokensJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/lpTokensJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,gEAAqC;AAErC,2CAAyE;AACzE,uCAA0D;AAC1D,iDAAsD;AACtD,6DAA0E;AAC1E,+CAK4B;AAC5B,gGAA6F;AAG7F,6EAAqD;AACrD,oFAA2E;AAC3E,6FAAoE;AACpE,
|
|
1
|
+
{"version":3,"file":"lpTokensJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/lpTokensJob.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,8 +17,8 @@ const portfolio_core_1 = require("@sonarwatch/portfolio-core");
|
|
|
17
17
|
const constants_1 = require("./constants");
|
|
18
18
|
const clients_1 = require("../../utils/clients");
|
|
19
19
|
const aptos_1 = require("../../utils/aptos");
|
|
20
|
-
const
|
|
21
|
-
const
|
|
20
|
+
const getLpUnderlyingTokenSourceOld_1 = __importDefault(require("../../utils/misc/getLpUnderlyingTokenSourceOld"));
|
|
21
|
+
const getLpTokenSourceRawOld_1 = __importDefault(require("../../utils/misc/getLpTokenSourceRawOld"));
|
|
22
22
|
const getDecimals_1 = require("../../utils/aptos/getDecimals");
|
|
23
23
|
const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
24
24
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
|
|
@@ -90,22 +90,24 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
90
90
|
];
|
|
91
91
|
if (!decimalsX || !decimalsY)
|
|
92
92
|
continue;
|
|
93
|
-
const underlyingSource = (0,
|
|
93
|
+
const underlyingSource = (0, getLpUnderlyingTokenSourceOld_1.default)(lpType, portfolio_core_1.NetworkId.aptos, {
|
|
94
94
|
address: typeX,
|
|
95
95
|
decimals: decimalsX,
|
|
96
96
|
reserveAmountRaw: reserveAmountRawX,
|
|
97
97
|
tokenPrice: tokenPriceX,
|
|
98
|
+
weight: 0.5,
|
|
98
99
|
}, {
|
|
99
100
|
address: typeY,
|
|
100
101
|
decimals: decimalsY,
|
|
101
102
|
reserveAmountRaw: reserveAmountRawY,
|
|
102
103
|
tokenPrice: tokenPriceY,
|
|
104
|
+
weight: 0.5,
|
|
103
105
|
});
|
|
104
106
|
if (underlyingSource)
|
|
105
107
|
lpSources.push(underlyingSource);
|
|
106
108
|
if (!tokenPriceX || !tokenPriceY)
|
|
107
109
|
continue;
|
|
108
|
-
const lpSource = (0,
|
|
110
|
+
const lpSource = (0, getLpTokenSourceRawOld_1.default)(portfolio_core_1.NetworkId.aptos, lpType, constants_1.platformId, {
|
|
109
111
|
address: lpType,
|
|
110
112
|
decimals: lpDecimals,
|
|
111
113
|
supplyRaw: lpSupply,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aptosLpJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/pancakeswap/aptosLpJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,gEAAqC;AACrC,+DAIoC;AAGpC,2CAA+E;AAE/E,iDAAqD;AACrD,6CAK2B;AAC3B,
|
|
1
|
+
{"version":3,"file":"aptosLpJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/pancakeswap/aptosLpJob.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
const portfolio_core_1 = require("@sonarwatch/portfolio-core");
|
|
16
|
-
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
17
16
|
const clients_1 = require("../../utils/clients");
|
|
18
17
|
const constants_1 = require("./constants");
|
|
19
18
|
const amms_1 = require("./structs/amms");
|
|
@@ -22,10 +21,9 @@ const filters_1 = require("./filters");
|
|
|
22
21
|
const types_1 = require("./types");
|
|
23
22
|
const runInBatch_1 = __importDefault(require("../../utils/misc/runInBatch"));
|
|
24
23
|
const getMultipleAccountsInfoSafe_1 = require("../../utils/solana/getMultipleAccountsInfoSafe");
|
|
25
|
-
const
|
|
26
|
-
const
|
|
24
|
+
const getLpUnderlyingTokenSourceOld_1 = __importDefault(require("../../utils/misc/getLpUnderlyingTokenSourceOld"));
|
|
25
|
+
const getLpTokenSourceRawOld_1 = __importDefault(require("../../utils/misc/getLpTokenSourceRawOld"));
|
|
27
26
|
const constants_2 = require("../orders/clobs-solana/constants");
|
|
28
|
-
const getTokensPricesMap_1 = __importDefault(require("../../utils/misc/getTokensPricesMap"));
|
|
29
27
|
const ammsDetails = [
|
|
30
28
|
{
|
|
31
29
|
versionId: 4,
|
|
@@ -107,7 +105,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
107
105
|
ammsOpenOrdersMap.set(addresses[i + 2].toString(), orderStruct.deserialize(ammOpenOrdersInfo.data)[0]);
|
|
108
106
|
mintAccountsMap.set(addresses[i + 3].toString(), solana_1.mintAccountStruct.deserialize(lpMintAddressInfo.data)[0]);
|
|
109
107
|
}
|
|
110
|
-
const tokenPrices = yield
|
|
108
|
+
const tokenPrices = yield cache.getTokenPricesAsMap([...mints], portfolio_core_1.NetworkId.solana);
|
|
111
109
|
for (let i = 0; i < ammsAccounts.length; i += 1) {
|
|
112
110
|
const amm = ammsAccounts[i];
|
|
113
111
|
const mintA = amm.coinMintAddress.toString();
|
|
@@ -136,16 +134,18 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
136
134
|
tokenPrices.get(mintB),
|
|
137
135
|
];
|
|
138
136
|
const lpMint = amm.lpMintAddress;
|
|
139
|
-
const underlyingSource = (0,
|
|
137
|
+
const underlyingSource = (0, getLpUnderlyingTokenSourceOld_1.default)(lpMint.toString(), portfolio_core_1.NetworkId.solana, {
|
|
140
138
|
address: mintA,
|
|
141
139
|
decimals: decimalsA,
|
|
142
140
|
reserveAmountRaw: tokenAmountA,
|
|
143
141
|
tokenPrice: tokenPriceA,
|
|
142
|
+
weight: 0.5,
|
|
144
143
|
}, {
|
|
145
144
|
address: mintB,
|
|
146
145
|
decimals: decimalsB,
|
|
147
146
|
reserveAmountRaw: tokenAmountB,
|
|
148
147
|
tokenPrice: tokenPriceB,
|
|
148
|
+
weight: 0.5,
|
|
149
149
|
});
|
|
150
150
|
if (underlyingSource) {
|
|
151
151
|
yield cache.setTokenPriceSource(underlyingSource);
|
|
@@ -156,12 +156,10 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
156
156
|
if (!lpMintAccount)
|
|
157
157
|
continue;
|
|
158
158
|
const lpDecimals = lpMintAccount.decimals;
|
|
159
|
-
const lpSupply =
|
|
160
|
-
? new bignumber_js_1.default('3381427.37').times(Math.pow(10, lpDecimals)) // Temporary fix for SOL-WIF lp
|
|
161
|
-
: lpMintAccount.supply;
|
|
159
|
+
const lpSupply = amm.lpAmount;
|
|
162
160
|
if (lpSupply.isZero())
|
|
163
161
|
continue;
|
|
164
|
-
tokenPriceSources.push((0,
|
|
162
|
+
tokenPriceSources.push((0, getLpTokenSourceRawOld_1.default)(portfolio_core_1.NetworkId.solana, lpMint.toString(), constants_1.platformId, {
|
|
165
163
|
address: lpMint.toString(),
|
|
166
164
|
decimals: lpDecimals,
|
|
167
165
|
supplyRaw: lpSupply,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lpTokensJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/lpTokensJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAAuD;
|
|
1
|
+
{"version":3,"file":"lpTokensJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/lpTokensJob.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,7 +50,9 @@ export type AmmInfoV4 = {
|
|
|
50
50
|
poolWithdrawQueue: PublicKey;
|
|
51
51
|
poolTempLpTokenAccount: PublicKey;
|
|
52
52
|
ammOwner: PublicKey;
|
|
53
|
-
|
|
53
|
+
lpAmount: BigNumber;
|
|
54
|
+
clientOrderId: BigNumber;
|
|
55
|
+
padding: BigNumber[];
|
|
54
56
|
};
|
|
55
57
|
export declare const ammInfoV4Struct: BeetStruct<AmmInfoV4, Partial<AmmInfoV4>>;
|
|
56
58
|
export type AmmInfoV5 = {
|
|
@@ -106,8 +108,9 @@ export type AmmInfoV5 = {
|
|
|
106
108
|
serumMarket: PublicKey;
|
|
107
109
|
serumProgramId: PublicKey;
|
|
108
110
|
ammTargetOrders: PublicKey;
|
|
109
|
-
ammOwner: PublicKey;
|
|
110
111
|
padding: BigNumber[];
|
|
112
|
+
lpAmount: BigNumber;
|
|
113
|
+
padding2: BigNumber[];
|
|
111
114
|
};
|
|
112
115
|
export declare const ammInfoV5Struct: BeetStruct<AmmInfoV5, Partial<AmmInfoV5>>;
|
|
113
116
|
export type UserFarmInfoV5 = {
|
|
@@ -55,7 +55,9 @@ exports.ammInfoV4Struct = new beet_1.BeetStruct([
|
|
|
55
55
|
['poolWithdrawQueue', beet_solana_1.publicKey],
|
|
56
56
|
['poolTempLpTokenAccount', beet_solana_1.publicKey],
|
|
57
57
|
['ammOwner', beet_solana_1.publicKey],
|
|
58
|
-
['
|
|
58
|
+
['lpAmount', solana_1.u64],
|
|
59
|
+
['clientOrderId', solana_1.u64],
|
|
60
|
+
['padding', (0, beet_1.uniformFixedSizeArray)(solana_1.u64, 2)],
|
|
59
61
|
], (args) => args);
|
|
60
62
|
exports.ammInfoV5Struct = new beet_1.BeetStruct([
|
|
61
63
|
['accountType', solana_1.u64],
|
|
@@ -112,8 +114,9 @@ exports.ammInfoV5Struct = new beet_1.BeetStruct([
|
|
|
112
114
|
['serumMarket', beet_solana_1.publicKey],
|
|
113
115
|
['serumProgramId', beet_solana_1.publicKey],
|
|
114
116
|
['ammTargetOrders', beet_solana_1.publicKey],
|
|
115
|
-
['
|
|
116
|
-
['
|
|
117
|
+
['padding', (0, beet_1.uniformFixedSizeArray)(solana_1.u64, 5)],
|
|
118
|
+
['lpAmount', solana_1.u64],
|
|
119
|
+
['padding2', (0, beet_1.uniformFixedSizeArray)(solana_1.u64, 62)],
|
|
117
120
|
], (args) => args);
|
|
118
121
|
exports.userFarmInfoV5Struct = new beet_1.FixableBeetStruct([
|
|
119
122
|
['state', solana_1.u64],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"amms.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/raydium/structs/amms.ts"],"names":[],"mappings":";;;AAAA,oDAImC;AAEnC,kEAA6D;AAE7D,kDAAkD;
|
|
1
|
+
{"version":3,"file":"amms.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/raydium/structs/amms.ts"],"names":[],"mappings":"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"}
|