@sonarwatch/portfolio-plugins 0.14.176 → 0.14.177

package/src/plugins/marginfi/getMarginFiAccounts.d.ts

@@ -1,6 +1,15 @@
+/// <reference types="@drift-labs/sdk/node_modules/@solana/web3.js" />
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
+import { PublicKey } from '@solana/web3.js';
 import { BalanceWithBank, MarginfiAccount } from './structs/MarginfiAccount';
 import { Cache } from '../../Cache';
 import { ParsedAccount } from '../../utils/solana';
-export declare const getMarginFiAccounts: (authority: string, cache: Cache) => Promise<((ParsedAccount<MarginfiAccount> & {
+import { MemoizedCache } from '../../utils/misc/MemoizedCache';
+import { BankInfo } from './types';
+export declare const getMarginFiAccounts: (authority: string, config: {
+    pid: PublicKey;
+    group: PublicKey;
+    memo: MemoizedCache<ParsedAccount<BankInfo>[], Map<string, ParsedAccount<BankInfo>>>;
+}, cache: Cache) => Promise<((ParsedAccount<MarginfiAccount> & {
     balances: (BalanceWithBank | null)[];
 }) | null)[]>;

package/src/plugins/marginfi/getMarginFiAccounts.js

@@ -13,17 +13,16 @@ exports.getMarginFiAccounts = void 0;
 const clients_1 = require("../../utils/clients");
 const ParsedGpa_1 = require("../../utils/solana/beets/ParsedGpa");
 const MarginfiAccount_1 = require("./structs/MarginfiAccount");
-const constants_1 = require("./constants");
-const getMarginFiAccounts = (authority, cache) => __awaiter(void 0, void 0, void 0, function* () {
+const getMarginFiAccounts = (authority, config, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientSolana)();
-    const accounts = yield ParsedGpa_1.ParsedGpa.build(client, MarginfiAccount_1.marginfiAccountStruct, constants_1.marginfiProgramId)
-        .addRawFilter(0, 'CKkRR4La3xu')
-        .addRawFilter(8, constants_1.MarginfiAccountAddress)
+    const accounts = yield ParsedGpa_1.ParsedGpa.build(client, MarginfiAccount_1.marginfiAccountStruct, config.pid)
+        .addFilter('discriminator', [67, 178, 130, 109, 126, 114, 28, 42])
+        .addFilter('group', config.group)
         .addRawFilter(40, authority)
         .run();
     if (accounts.length === 0)
         return [];
-    const banksInfoByAddress = yield constants_1.marginFiBanksMemo.getItem(cache);
+    const banksInfoByAddress = yield config.memo.getItem(cache);
     if (!banksInfoByAddress)
         throw new Error('MarginFi banks not cached');
     return accounts.map((marginfiAccount) => {

package/src/plugins/marginfi/getMarginFiAccounts.js.map

@@ -1 +1 @@
-{"version":3,"file":"getMarginFiAccounts.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/marginfi/getMarginFiAccounts.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iDAAsD;AACtD,kEAA+D;AAC/D,+DAImC;AACnC,2CAIqB;AAId,MAAM,mBAAmB,GAAG,CACjC,SAAiB,EACjB,KAAY,EAQZ,EAAE;IACF,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,QAAQ,GAAG,MAAM,qBAAS,CAAC,KAAK,CACpC,MAAM,EACN,uCAAqB,EACrB,6BAAiB,CAClB;SACE,YAAY,CAAC,CAAC,EAAE,aAAa,CAAC;SAC9B,YAAY,CAAC,CAAC,EAAE,kCAAsB,CAAC;SACvC,YAAY,CAAC,EAAE,EAAE,SAAS,CAAC;SAC3B,GAAG,EAAE,CAAC;IAET,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAErC,MAAM,kBAAkB,GAAG,MAAM,6BAAiB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAClE,IAAI,CAAC,kBAAkB;QAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAEtE,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,eAAe,EAAE,EAAE;QACtC,MAAM,EAAE,QAAQ,EAAE,GAAG,eAAe,CAAC,cAAc,CAAC;QACpD,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAEpD,uCACK,eAAe,KAClB,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;gBACjC,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,kCAAkC;oBAClE,OAAO,IAAI,CAAC;gBAEd,MAAM,IAAI,GAAG,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC/D,IAAI,CAAC,IAAI;oBAAE,OAAO,IAAI,CAAC;gBAEvB,OAAO,gCACF,OAAO,KACV,IAAI,GACc,CAAC;YACvB,CAAC,CAAC,IACF;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AA/CW,QAAA,mBAAmB,uBA+C9B"}
+{"version":3,"file":"getMarginFiAccounts.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/marginfi/getMarginFiAccounts.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,iDAAsD;AACtD,kEAA+D;AAC/D,+DAImC;AAM5B,MAAM,mBAAmB,GAAG,CACjC,SAAiB,EACjB,MAOC,EACD,KAAY,EAQZ,EAAE;IACF,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,QAAQ,GAAG,MAAM,qBAAS,CAAC,KAAK,CACpC,MAAM,EACN,uCAAqB,EACrB,MAAM,CAAC,GAAG,CACX;SACE,SAAS,CAAC,eAAe,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;SACjE,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC;SAChC,YAAY,CAAC,EAAE,EAAE,SAAS,CAAC;SAC3B,GAAG,EAAE,CAAC;IAET,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAErC,MAAM,kBAAkB,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC5D,IAAI,CAAC,kBAAkB;QAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAEtE,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,eAAe,EAAE,EAAE;QACtC,MAAM,EAAE,QAAQ,EAAE,GAAG,eAAe,CAAC,cAAc,CAAC;QACpD,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAEpD,uCACK,eAAe,KAClB,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;gBACjC,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,kCAAkC;oBAClE,OAAO,IAAI,CAAC;gBAEd,MAAM,IAAI,GAAG,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC/D,IAAI,CAAC,IAAI;oBAAE,OAAO,IAAI,CAAC;gBAEvB,OAAO,gCACF,OAAO,KACV,IAAI,GACc,CAAC;YACvB,CAAC,CAAC,IACF;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAvDW,QAAA,mBAAmB,uBAuD9B"}

package/src/plugins/marginfi/structs/Bank.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 /// <reference types="@drift-labs/sdk/node_modules/@solana/web3.js" />
 /// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { BeetStruct, bignum } from '@metaplex-foundation/beet';
@@ -54,7 +53,7 @@ export type BankConfig = {
 };
 export declare const bankConfigStruct: BeetStruct<BankConfig, Partial<BankConfig>>;
 export type Bank = {
-    padding: Buffer;
+    discriminator: number[];
     mint: PublicKey;
     mintDecimals: number;
     group: PublicKey;

package/src/plugins/marginfi/structs/Bank.js

@@ -56,7 +56,7 @@ exports.bankConfigStruct = new beet_1.BeetStruct([
     ['padding', (0, beet_1.uniformFixedSizeArray)(solana_1.u64, 5)],
 ], (args) => args);
 exports.bankStruct = new beet_1.BeetStruct([
-    ['padding', (0, solana_1.blob)(8)],
+    ['discriminator', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 8)],
     ['mint', beet_solana_1.publicKey],
     ['mintDecimals', beet_1.u8],
     ['group', beet_solana_1.publicKey],

package/src/plugins/marginfi/structs/Bank.js.map

@@ -1 +1 @@
-{"version":3,"file":"Bank.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/marginfi/structs/Bank.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Bank.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/marginfi/structs/Bank.ts"],"names":[],"mappings":"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"}

package/src/plugins/marginfi/structs/MarginfiAccount.d.ts

@@ -24,7 +24,7 @@ export type LendingAccount = {
 };
 export declare const lendingAccountStruct: FixableBeetStruct<LendingAccount, Partial<LendingAccount>>;
 export type MarginfiAccount = {
-    padding1: Buffer;
+    discriminator: number[];
     group: PublicKey;
     authority: PublicKey;
     lendingAccount: LendingAccount;

package/src/plugins/marginfi/structs/MarginfiAccount.js

@@ -18,7 +18,7 @@ exports.lendingAccountStruct = new beet_1.FixableBeetStruct([
     ['padding', (0, beet_1.uniformFixedSizeArray)((0, solana_1.blob)(8), 8)],
 ], (args) => args);
 exports.marginfiAccountStruct = new beet_1.FixableBeetStruct([
-    ['padding1', (0, solana_1.blob)(8)],
+    ['discriminator', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 8)],
     ['group', beet_solana_1.publicKey],
     ['authority', beet_solana_1.publicKey],
     ['lendingAccount', exports.lendingAccountStruct],

package/src/plugins/marginfi/structs/MarginfiAccount.js.map

@@ -1 +1 @@
-{"version":3,"file":"MarginfiAccount.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/marginfi/structs/MarginfiAccount.ts"],"names":[],"mappings":";;;AAAA,oDAKmC;AACnC,kEAA6D;AAE7D,kDAA4D;AAC5D,qCAA8D;AAcjD,QAAA,aAAa,GAAG,IAAI,iBAAU,CACzC;IACE,CAAC,QAAQ,EAAE,SAAE,CAAC;IACd,CAAC,QAAQ,EAAE,uBAAS,CAAC;IACrB,CAAC,QAAQ,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,CAAC,CAAC,CAAC;IACxC,CAAC,aAAa,EAAE,4BAAmB,CAAC;IACpC,CAAC,iBAAiB,EAAE,4BAAmB,CAAC;IACxC,CAAC,SAAS,EAAE,IAAA,4BAAqB,EAAC,IAAA,aAAI,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CAC/C,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAe,CAC1B,CAAC;AAOW,QAAA,oBAAoB,GAAG,IAAI,wBAAiB,CACvD;IACE,CAAC,UAAU,EAAE,IAAA,4BAAqB,EAAC,qBAAa,EAAE,EAAE,CAAC,CAAC;IACtD,CAAC,SAAS,EAAE,IAAA,4BAAqB,EAAC,IAAA,aAAI,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CAC/C,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAsB,CACjC,CAAC;AAUW,QAAA,qBAAqB,GAAG,IAAI,wBAAiB,CACxD;IACE,CAAC,UAAU,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACrB,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,WAAW,EAAE,uBAAS,CAAC;IACxB,CAAC,gBAAgB,EAAE,4BAAoB,CAAC;IACxC,CAAC,SAAS,EAAE,IAAA,4BAAqB,EAAC,IAAA,aAAI,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;CAChD,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAuB,CAClC,CAAC"}
+{"version":3,"file":"MarginfiAccount.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/marginfi/structs/MarginfiAccount.ts"],"names":[],"mappings":";;;AAAA,oDAKmC;AACnC,kEAA6D;AAE7D,kDAA4D;AAC5D,qCAA8D;AAcjD,QAAA,aAAa,GAAG,IAAI,iBAAU,CACzC;IACE,CAAC,QAAQ,EAAE,SAAE,CAAC;IACd,CAAC,QAAQ,EAAE,uBAAS,CAAC;IACrB,CAAC,QAAQ,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,CAAC,CAAC,CAAC;IACxC,CAAC,aAAa,EAAE,4BAAmB,CAAC;IACpC,CAAC,iBAAiB,EAAE,4BAAmB,CAAC;IACxC,CAAC,SAAS,EAAE,IAAA,4BAAqB,EAAC,IAAA,aAAI,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CAC/C,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAe,CAC1B,CAAC;AAOW,QAAA,oBAAoB,GAAG,IAAI,wBAAiB,CACvD;IACE,CAAC,UAAU,EAAE,IAAA,4BAAqB,EAAC,qBAAa,EAAE,EAAE,CAAC,CAAC;IACtD,CAAC,SAAS,EAAE,IAAA,4BAAqB,EAAC,IAAA,aAAI,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CAC/C,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAsB,CACjC,CAAC;AAUW,QAAA,qBAAqB,GAAG,IAAI,wBAAiB,CACxD;IACE,CAAC,eAAe,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,CAAC,CAAC,CAAC;IAC/C,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,WAAW,EAAE,uBAAS,CAAC;IACxB,CAAC,gBAAgB,EAAE,4BAAoB,CAAC;IACxC,CAAC,SAAS,EAAE,IAAA,4BAAqB,EAAC,IAAA,aAAI,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;CAChD,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAuB,CAClC,CAAC"}

package/src/plugins/perena/poolsJob.js

@@ -50,6 +50,8 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
             };
         })
             .flat();
+        const isUsdStar = lpAccount.lp_mint.toString() ===
+            'BenJy1n3WTx9mTjEvy63e8Q1j4RqUc6E4VBMz3ir4Wo6';
         const lpSources = (0, getLpTokenSourceRaw_1.getLpTokenSourceRaw)({
             lpDetails: {
                 address: lpAccount.lp_mint.toString(),
@@ -57,7 +59,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
                 supplyRaw: lpMintAccount.supply,
             },
             networkId: portfolio_core_1.NetworkId.solana,
-            platformId: constants_1.platformId,
+            platformId: isUsdStar ? portfolio_core_1.walletTokensPlatformId : constants_1.platformId,
             poolUnderlyingsRaw: underlyings,
             sourceId: lpAccount.pubkey.toString(),
             priceUnderlyings: true,

package/src/plugins/perena/poolsJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"poolsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/perena/poolsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAIoC;AACpC,gEAAqC;AAGrC,2CAA8C;AAC9C,iDAAsD;AACtD,+CAI4B;AAC5B,uCAA4C;AAC5C,8EAG8C;AAE9C,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAwB,EAC/C,MAAM,EACN,yBAAe,EACf,eAAG,EACH,CAAC,EAAE,QAAQ,EAAE,yBAAe,CAAC,QAAQ,EAAE,CAAC,CACzC,CAAC;IACF,IAAI,CAAC,UAAU;QAAE,OAAO;IAExB,MAAM,CAAC,cAAc,EAAE,cAAc,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACzD,IAAA,sCAA6B,EAC3B,MAAM,EACN,0BAAiB,EACjB,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,CACnC;QACD,KAAK,CAAC,mBAAmB,CACvB,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,EACzE,0BAAS,CAAC,MAAM,CACjB;KACF,CAAC,CAAC;IAEH,MAAM,OAAO,GAAuB,EAAE,CAAC;IAEvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9C,MAAM,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QAChC,MAAM,aAAa,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;QACxC,IAAI,CAAC,aAAa;YAAE,SAAS;QAE7B,MAAM,WAAW,GAAwB,SAAS,CAAC,KAAK;aACrD,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YACnB,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,KAAK,oCAAmB;gBAAE,OAAO,EAAE,CAAC;YAEtE,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC9D,OAAO;gBACL,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;gBAC/B,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,MAAM,EAAE,IAAI,sBAAS,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;qBAC5C,SAAS,CAAC,SAAS,CAAC,YAAY,CAAC;qBACjC,QAAQ,EAAE;gBACb,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,UAAU;aACX,CAAC;QACJ,CAAC,CAAC;aACD,IAAI,EAAE,CAAC;QAEV,MAAM,SAAS,GAAG,IAAA,yCAAmB,EAAC;YACpC,SAAS,EAAE;gBACT,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE;gBACrC,QAAQ,EAAE,SAAS,CAAC,QAAQ;gBAC5B,SAAS,EAAE,aAAa,CAAC,MAAM;aAChC;YACD,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,kBAAkB,EAAE,WAAW;YAC/B,QAAQ,EAAE,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE;YACrC,gBAAgB,EAAE,IAAI;SACvB,CAAC,CAAC;QAEH,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,KAAK,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AACF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,QAAQ;IACzB,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}
+{"version":3,"file":"poolsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/perena/poolsJob.ts"],"names":[],"mappings":"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"}

package/src/plugins/solayer/poolsJob.js

@@ -30,7 +30,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
             decimals: constants_1.stakePoolDecimals,
             id: constants_1.platformId,
             networkId: portfolio_core_1.NetworkId.solana,
-            platformId: constants_1.platformId,
+            platformId: portfolio_core_1.walletTokensPlatformId,
             price: solTokenPrice.price * ratio,
             timestamp: Date.now(),
             elementName: 'Restaking',

package/src/plugins/solayer/poolsJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"poolsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/solayer/poolsJob.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"poolsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/solayer/poolsJob.ts"],"names":[],"mappings":"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"}

package/src/plugins/sushiswap/helpers.js

@@ -54,30 +54,30 @@ function sushiV3PairToUniV2(pair) {
 }
 function getV3PairsAddresses(url, length = 300) {
     return __awaiter(this, void 0, void 0, function* () {
-        const query = (0, graphql_request_1.gql) `
-    {
-      pools(
-        orderBy: totalValueLockedUSD
-        first: ${length}
-        orderDirection: desc
-        where: { volumeUSD_not: "0", liquidity_not: "0"  }
-      ) {
-        id
-        token0Price
-        token1Price
-        liquidity
-        token0 {
-          id
-          totalSupply
-          decimals
-        }
-        token1 {
-          id
-          totalSupply
-          decimals
-        }
-      }
-    }
+        const query = (0, graphql_request_1.gql) `
+    {
+      pools(
+        orderBy: totalValueLockedUSD
+        first: ${length}
+        orderDirection: desc
+        where: { volumeUSD_not: "0", liquidity_not: "0"  }
+      ) {
+        id
+        token0Price
+        token1Price
+        liquidity
+        token0 {
+          id
+          totalSupply
+          decimals
+        }
+        token1 {
+          id
+          totalSupply
+          decimals
+        }
+      }
+    }
   `;
         const res = yield (0, graphql_request_1.default)(url, query);
         const pools = res.pools;

package/src/plugins/tokens/fetchers/solana.js

@@ -22,7 +22,7 @@ const getAssetsByOwnerDas_1 = require("../../../utils/solana/das/getAssetsByOwne
 const isHeliusFungibleAsset_1 = require("../../../utils/solana/das/isHeliusFungibleAsset");
 const getSolanaDasEndpoint_1 = __importDefault(require("../../../utils/clients/getSolanaDasEndpoint"));
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
+    var _a, _b;
     const dasEndpoint = (0, getSolanaDasEndpoint_1.default)();
     const items = yield (0, getAssetsByOwnerDas_1.getAssetsByOwnerDas)(dasEndpoint, owner, {
         showNativeBalance: false,
@@ -50,7 +50,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             : 1;
         // If it's an LP Token
         if (tokenPrice && tokenPrice.platformId !== portfolio_core_1.walletTokensPlatformId) {
-            const liquidity = (0, tokenPriceToLiquidity_1.default)(asset.id, amount, portfolio_core_1.NetworkId.solana, tokenPrice);
+            const liquidity = Object.assign(Object.assign({}, (0, tokenPriceToLiquidity_1.default)(asset.id, amount, portfolio_core_1.NetworkId.solana, tokenPrice)), { ref: (_a = asset.token_info) === null || _a === void 0 ? void 0 : _a.associated_token_address });
             const tag = (0, helpers_1.getLpTag)(tokenPrice.platformId, tokenPrice.elementName);
             if (!liquiditiesByTag[tag]) {
                 liquiditiesByTag[tag] = [];
@@ -59,7 +59,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         }
         // If it's a regular token
         else if (tokenPrice && tokenPrice.platformId === portfolio_core_1.walletTokensPlatformId) {
-            tokenAssets.push(Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(address, amount, portfolio_core_1.NetworkId.solana, tokenPrice)), { ref: (_a = asset.token_info) === null || _a === void 0 ? void 0 : _a.associated_token_address, link: tokenPrice.link, sourceRefs: tokenPrice.sourceRefs }));
+            tokenAssets.push(Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(address, amount, portfolio_core_1.NetworkId.solana, tokenPrice)), { ref: (_b = asset.token_info) === null || _b === void 0 ? void 0 : _b.associated_token_address, link: tokenPrice.link, sourceRefs: tokenPrice.sourceRefs }));
         }
         // If it's a NFT
         else {

package/src/plugins/tokens/fetchers/solana.js.map

@@ -1 +1 @@
-{"version":3,"file":"solana.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/tokens/fetchers/solana.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"solana.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/tokens/fetchers/solana.ts"],"names":[],"mappings":"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"}

package/src/plugins/uniswap-v2/helpers.js

@@ -40,28 +40,28 @@ function getPairKey(version) {
 exports.getPairKey = getPairKey;
 function getPairsV2FromTheGraph(url, length = 300) {
     return __awaiter(this, void 0, void 0, function* () {
-        const query = (0, graphql_request_1.gql) `
-    {
-      pairs(
-        orderBy: reserveUSD
-        first: ${length}
-        orderDirection: desc
-        where: { trackedReserveETH_not: "0" }
-      ) {
-        id
-        reserve0
-        reserve1
-        totalSupply
-        token0 {
-          id
-          decimals
-        }
-        token1 {
-          id
-          decimals
-        }
-      }
-    }
+        const query = (0, graphql_request_1.gql) `
+    {
+      pairs(
+        orderBy: reserveUSD
+        first: ${length}
+        orderDirection: desc
+        where: { trackedReserveETH_not: "0" }
+      ) {
+        id
+        reserve0
+        reserve1
+        totalSupply
+        token0 {
+          id
+          decimals
+        }
+        token1 {
+          id
+          decimals
+        }
+      }
+    }
   `;
         const res = yield (0, graphql_request_1.default)(url, query);
         const pairs = res.pairs;

package/src/plugins/vaultka/banksJob.d.ts

@@ -0,0 +1,3 @@
+import { Job } from '../../Job';
+declare const job: Job;
+export default job;

package/src/plugins/vaultka/banksJob.js

@@ -0,0 +1,131 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const web3_js_1 = require("@solana/web3.js");
+const constants_1 = require("./constants");
+const constants_2 = require("../marginfi/constants");
+const Bank_1 = require("../marginfi/structs/Bank");
+const helpers_1 = require("../marginfi/helpers");
+const solana_1 = require("../../utils/solana");
+const clients_1 = require("../../utils/clients");
+const getParsedAccountInfo_1 = require("../../utils/solana/getParsedAccountInfo");
+const structs_1 = require("../native-stake/solana/structs");
+const ParsedGpa_1 = require("../../utils/solana/beets/ParsedGpa");
+const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
+    const connection = (0, clients_1.getClientSolana)();
+    const banksRawData = yield ParsedGpa_1.ParsedGpa.build(connection, Bank_1.bankStruct, constants_1.lendingV2Pid)
+        .addFilter('discriminator', [142, 49, 166, 242, 50, 66, 97, 188])
+        .addFilter('group', constants_1.group)
+        .addDataSizeFilter(Bank_1.bankStruct.byteSize)
+        .run();
+    const banks = [];
+    const rateItems = [];
+    const sources = [];
+    const solPrice = yield cache.getTokenPrice(portfolio_core_1.solanaNativeAddress, portfolio_core_1.NetworkId.solana);
+    for (let index = 0; index < banksRawData.length; index += 1) {
+        const bank = banksRawData[index];
+        const { lendingApr, borrowingApr } = (0, helpers_1.computeInterestRates)(bank);
+        banks.push(Object.assign(Object.assign({}, bank), { dividedAssetShareValue: (0, helpers_1.wrappedI80F48toBigNumber)(bank.assetShareValue)
+                .div(Math.pow(10, bank.mintDecimals))
+                .toString(), dividedLiabilityShareValue: (0, helpers_1.wrappedI80F48toBigNumber)(bank.liabilityShareValue)
+                .div(Math.pow(10, bank.mintDecimals))
+                .toString(), suppliedLtv: (0, helpers_1.wrappedI80F48toBigNumber)(bank.config.assetWeightMaint)
+                .decimalPlaces(2)
+                .toNumber(), suppliedYields: [
+                {
+                    apy: (0, portfolio_core_1.aprToApy)(lendingApr),
+                    apr: lendingApr,
+                },
+            ], borrowedWeight: (0, helpers_1.wrappedI80F48toBigNumber)(bank.config.liabilityWeightMaint)
+                .decimalPlaces(2)
+                .toNumber(), borrowedYields: [
+                {
+                    apy: -(0, portfolio_core_1.aprToApy)(borrowingApr),
+                    apr: -borrowingApr,
+                },
+            ] }));
+        const depositedAmount = (0, helpers_1.wrappedI80F48toBigNumber)(bank.liabilityShareValue)
+            .times((0, helpers_1.wrappedI80F48toBigNumber)(bank.totalLiabilityShares))
+            .toNumber();
+        const borrowedAmount = (0, helpers_1.wrappedI80F48toBigNumber)(bank.assetShareValue)
+            .times((0, helpers_1.wrappedI80F48toBigNumber)(bank.totalAssetShares))
+            .toNumber();
+        if (borrowedAmount <= 1 && depositedAmount <= 1)
+            continue;
+        const tokenAddress = bank.mint.toString();
+        // Price the SPL generated for Native Stake Collateral : https://docs.marginfi.com/staked-collateral
+        // Each validator has it's own Stake Account, in which Marginfi deposit the Native Stake deposited by the user
+        // Margingi then mint a SPL token which represent the deposit
+        if (bank.config.assetTag === 2) {
+            const stakeAccountAddress = bank.config.oracleKeys_3;
+            const [mintAccount, stakeAccount] = yield Promise.all([
+                (0, getParsedAccountInfo_1.getParsedAccountInfo)(connection, solana_1.mintAccountStruct, bank.mint),
+                (0, getParsedAccountInfo_1.getParsedAccountInfo)(connection, structs_1.stakeAccountStruct, stakeAccountAddress),
+            ]);
+            if (mintAccount && solPrice && stakeAccount) {
+                const { supply } = mintAccount;
+                const price = stakeAccount.stake
+                    .minus(web3_js_1.LAMPORTS_PER_SOL)
+                    .times(solPrice.price)
+                    .dividedBy(supply)
+                    .toNumber();
+                sources.push({
+                    address: tokenAddress,
+                    decimals: mintAccount.decimals,
+                    id: bank.pubkey.toString(),
+                    networkId: portfolio_core_1.NetworkId.solana,
+                    platformId: portfolio_core_1.walletTokensPlatformId,
+                    price,
+                    timestamp: Date.now(),
+                    weight: 1,
+                    elementName: 'Stake Collateral',
+                });
+            }
+        }
+        const poolName = bank.config.riskTier === 0 ? 'Global Pool' : 'Isolated Pool';
+        const rate = {
+            tokenAddress,
+            borrowYield: {
+                apy: (0, portfolio_core_1.aprToApy)(borrowingApr),
+                apr: borrowingApr,
+            },
+            borrowedAmount,
+            depositYield: {
+                apy: (0, portfolio_core_1.aprToApy)(lendingApr),
+                apr: lendingApr,
+            },
+            depositedAmount,
+            platformId: constants_1.platformId,
+            poolName,
+        };
+        rateItems.push({
+            key: `${bank.pubkey.toString()}-${tokenAddress}`,
+            value: rate,
+        });
+    }
+    yield cache.setItem(constants_2.banksKey, banks, {
+        prefix: constants_1.platformId,
+        networkId: portfolio_core_1.NetworkId.solana,
+    });
+    yield cache.setItems(rateItems, {
+        prefix: portfolio_core_1.borrowLendRatesPrefix,
+        networkId: portfolio_core_1.NetworkId.solana,
+    });
+    yield cache.setTokenPriceSources(sources);
+});
+const job = {
+    id: `${constants_1.platformId}-banks`,
+    executor,
+    labels: ['normal'],
+};
+exports.default = job;
+//# sourceMappingURL=banksJob.js.map

package/src/plugins/vaultka/banksJob.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"banksJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/vaultka/banksJob.ts"],"names":[],"mappings":"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"}

package/src/plugins/vaultka/constants.d.ts

@@ -2,8 +2,14 @@
 /// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 import { StrategyInfo } from './types';
+import { MemoizedCache } from '../../utils/misc/MemoizedCache';
+import { ParsedAccount } from '../../utils/solana';
+import { BankInfo } from '../marginfi/types';
 export declare const platformId = "vaultka";
 export declare const lendingsCacheKey = "lendings";
 export declare const lendingProgramIds: PublicKey[];
+export declare const lendingV2Pid: PublicKey;
+export declare const group: PublicKey;
+export declare const banksMemo: MemoizedCache<ParsedAccount<BankInfo>[], Map<string, ParsedAccount<BankInfo>>>;
 export declare const strategiesCacheKey = "strategies";
 export declare const strategies: StrategyInfo[];

package/src/plugins/vaultka/constants.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.strategies = exports.strategiesCacheKey = exports.lendingProgramIds = exports.lendingsCacheKey = exports.platformId = void 0;
+exports.strategies = exports.strategiesCacheKey = exports.banksMemo = exports.group = exports.lendingV2Pid = exports.lendingProgramIds = exports.lendingsCacheKey = exports.platformId = void 0;
 const web3_js_1 = require("@solana/web3.js");
+const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const structs_1 = require("./structs");
+const MemoizedCache_1 = require("../../utils/misc/MemoizedCache");
+const constants_1 = require("../marginfi/constants");
+const arrayToMap_1 = require("../../utils/misc/arrayToMap");
 exports.platformId = 'vaultka';
 exports.lendingsCacheKey = `lendings`;
 exports.lendingProgramIds = [
@@ -11,6 +15,12 @@ exports.lendingProgramIds = [
     new web3_js_1.PublicKey('nKMLJtN1rr64K9DjmfzXvzaq4JEy5a4AJHHP9gY1dW6'),
     new web3_js_1.PublicKey('69oX4gmwgDAfXWxSRtTx9SHvWmu2bd9qVGjQPpAFHaBF'),
 ];
+exports.lendingV2Pid = new web3_js_1.PublicKey('V1enDN8GY531jkFp3DWEQiRxwYYsnir8SADjHmkt4RG');
+exports.group = new web3_js_1.PublicKey('groUPysZbKCi8RbcziZFeP1WSFPa31kC9CsdUBggdkc');
+exports.banksMemo = new MemoizedCache_1.MemoizedCache(constants_1.banksKey, {
+    prefix: exports.platformId,
+    networkId: portfolio_core_1.NetworkId.solana,
+}, (arr) => (0, arrayToMap_1.arrayToMap)(arr || [], 'pubkey'));
 exports.strategiesCacheKey = `strategies`;
 exports.strategies = [
     {

package/src/plugins/vaultka/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/vaultka/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAE5C,uCAKmB;AAEN,QAAA,UAAU,GAAG,SAAS,CAAC;AAEvB,QAAA,gBAAgB,GAAG,UAAU,CAAC;AAE9B,QAAA,iBAAiB,GAAG;IAC/B,IAAI,mBAAS,CAAC,8CAA8C,CAAC;IAC7D,IAAI,mBAAS,CAAC,8CAA8C,CAAC;IAC7D,IAAI,mBAAS,CAAC,6CAA6C,CAAC;IAC5D,IAAI,mBAAS,CAAC,8CAA8C,CAAC;CAC9D,CAAC;AAEW,QAAA,kBAAkB,GAAG,YAAY,CAAC;AAElC,QAAA,UAAU,GAAmB;IACxC;QACE,MAAM,EAAE,8CAA8C;QACtD,cAAc,EAAd,wBAAc;QACd,kBAAkB,EAAlB,4BAAkB;KACnB;IACD;QACE,MAAM,EAAE,8CAA8C;QACtD,cAAc,EAAd,wBAAc;QACd,kBAAkB,EAAlB,4BAAkB;KACnB;IACD;QACE,MAAM,EAAE,6CAA6C;QACrD,cAAc,EAAd,wBAAc;QACd,kBAAkB,EAAlB,4BAAkB;KACnB;IACD;QACE,MAAM,EAAE,8CAA8C;QACtD,cAAc,EAAd,wBAAc;QACd,kBAAkB,EAAlB,4BAAkB;KACnB;IACD;QACE,MAAM,EAAE,8CAA8C;QACtD,cAAc,EAAE,2BAAiB;QACjC,kBAAkB,EAAE,+BAAqB;KAC1C;IACD;QACE,MAAM,EAAE,8CAA8C;QACtD,cAAc,EAAE,2BAAiB;QACjC,kBAAkB,EAAE,+BAAqB;KAC1C;IACD;QACE,MAAM,EAAE,8CAA8C;QACtD,cAAc,EAAE,2BAAiB;QACjC,kBAAkB,EAAE,+BAAqB;KAC1C;CACF,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/vaultka/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAC5C,+DAAuD;AAEvD,uCAKmB;AACnB,kEAA+D;AAG/D,qDAAiD;AACjD,4DAAyD;AAE5C,QAAA,UAAU,GAAG,SAAS,CAAC;AAEvB,QAAA,gBAAgB,GAAG,UAAU,CAAC;AAE9B,QAAA,iBAAiB,GAAG;IAC/B,IAAI,mBAAS,CAAC,8CAA8C,CAAC;IAC7D,IAAI,mBAAS,CAAC,8CAA8C,CAAC;IAC7D,IAAI,mBAAS,CAAC,6CAA6C,CAAC;IAC5D,IAAI,mBAAS,CAAC,8CAA8C,CAAC;CAC9D,CAAC;AAEW,QAAA,YAAY,GAAG,IAAI,mBAAS,CACvC,6CAA6C,CAC9C,CAAC;AACW,QAAA,KAAK,GAAG,IAAI,mBAAS,CAChC,6CAA6C,CAC9C,CAAC;AACW,QAAA,SAAS,GAAG,IAAI,6BAAa,CAIxC,oBAAQ,EACR;IACE,MAAM,EAAE,kBAAU;IAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;CAC5B,EACD,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,uBAAU,EAAC,GAAG,IAAI,EAAE,EAAE,QAAQ,CAAC,CACzC,CAAC;AAEW,QAAA,kBAAkB,GAAG,YAAY,CAAC;AAElC,QAAA,UAAU,GAAmB;IACxC;QACE,MAAM,EAAE,8CAA8C;QACtD,cAAc,EAAd,wBAAc;QACd,kBAAkB,EAAlB,4BAAkB;KACnB;IACD;QACE,MAAM,EAAE,8CAA8C;QACtD,cAAc,EAAd,wBAAc;QACd,kBAAkB,EAAlB,4BAAkB;KACnB;IACD;QACE,MAAM,EAAE,6CAA6C;QACrD,cAAc,EAAd,wBAAc;QACd,kBAAkB,EAAlB,4BAAkB;KACnB;IACD;QACE,MAAM,EAAE,8CAA8C;QACtD,cAAc,EAAd,wBAAc;QACd,kBAAkB,EAAlB,4BAAkB;KACnB;IACD;QACE,MAAM,EAAE,8CAA8C;QACtD,cAAc,EAAE,2BAAiB;QACjC,kBAAkB,EAAE,+BAAqB;KAC1C;IACD;QACE,MAAM,EAAE,8CAA8C;QACtD,cAAc,EAAE,2BAAiB;QACjC,kBAAkB,EAAE,+BAAqB;KAC1C;IACD;QACE,MAAM,EAAE,8CAA8C;QACtD,cAAc,EAAE,2BAAiB;QACjC,kBAAkB,EAAE,+BAAqB;KAC1C;CACF,CAAC"}

package/src/plugins/vaultka/index.js

@@ -5,9 +5,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchers = exports.jobs = void 0;
 const lendingJob_1 = __importDefault(require("./lendingJob"));
-const lendingFetcher_1 = __importDefault(require("./lendingFetcher"));
-const strategyFetcher_1 = __importDefault(require("./strategyFetcher"));
+const lendingV1Fetcher_1 = __importDefault(require("./lendingV1Fetcher"));
+const strategyV1Fetcher_1 = __importDefault(require("./strategyV1Fetcher"));
 const strategyJob_1 = __importDefault(require("./strategyJob"));
-exports.jobs = [lendingJob_1.default, strategyJob_1.default];
-exports.fetchers = [lendingFetcher_1.default, strategyFetcher_1.default];
+const banksJob_1 = __importDefault(require("./banksJob"));
+const lendingV2Fetcher_1 = __importDefault(require("./lendingV2Fetcher"));
+exports.jobs = [lendingJob_1.default, strategyJob_1.default, banksJob_1.default];
+exports.fetchers = [
+    lendingV1Fetcher_1.default,
+    strategyV1Fetcher_1.default,
+    lendingV2Fetcher_1.default,
+];
 //# sourceMappingURL=index.js.map

package/src/plugins/vaultka/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/vaultka/index.ts"],"names":[],"mappings":";;;;;;AAEA,8DAAsC;AACtC,sEAA8C;AAC9C,wEAAgD;AAChD,gEAAwC;AAE3B,QAAA,IAAI,GAAU,CAAC,oBAAU,EAAE,qBAAW,CAAC,CAAC;AACxC,QAAA,QAAQ,GAAc,CAAC,wBAAc,EAAE,yBAAe,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/vaultka/index.ts"],"names":[],"mappings":";;;;;;AAEA,8DAAsC;AACtC,0EAAkD;AAClD,4EAAkD;AAClD,gEAAwC;AACxC,0DAAkC;AAClC,0EAAkD;AAErC,QAAA,IAAI,GAAU,CAAC,oBAAU,EAAE,qBAAW,EAAE,kBAAQ,CAAC,CAAC;AAClD,QAAA,QAAQ,GAAc;IACjC,0BAAgB;IAChB,2BAAe;IACf,0BAAgB;CACjB,CAAC"}

package/src/plugins/vaultka/{lendingFetcher.js → lendingV1Fetcher.js}

@@ -34,7 +34,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);
     const element = elementRegistry.addElementMultiple({
         label: 'Lending',
-        link: 'https://solana.vaultka.com/',
+        link: 'https://solana-v1.vaultka.com/',
     });
     userInfos.forEach((userInfo, i) => {
         if (userInfo)
@@ -60,4 +60,4 @@ const fetcher = {
     executor,
 };
 exports.default = fetcher;
-//# sourceMappingURL=lendingFetcher.js.map
+//# sourceMappingURL=lendingV1Fetcher.js.map

package/src/plugins/vaultka/lendingV1Fetcher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lendingV1Fetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/vaultka/lendingV1Fetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAA4E;AAC5E,6CAA4C;AAC5C,gEAAqC;AAErC,2CAA8E;AAE9E,iDAAsD;AACtD,+CAG4B;AAC5B,uCAAoD;AACpD,gFAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,SAAS,GAAG,MAAM,IAAA,sCAA6B,EACnD,UAAU,EACV,wBAAc,EACd,6BAAiB,CAAC,GAAG,CACnB,CAAC,gBAAgB,EAAE,EAAE,CACnB,mBAAS,CAAC,sBAAsB,CAC9B,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC,EAC5D,gBAAgB,CACjB,CAAC,CAAC,CAAC,CACP,CACF,CAAC;IAEF,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAE9E,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,OAAO,CAClC,4BAAgB,EAChB;QACE,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CACF,CAAC;IACF,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAEtD,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,eAAe,CAAC,kBAAkB,CAAC;QACjD,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,gCAAgC;KACvC,CAAC,CAAC;IAEH,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE;QAChC,IAAI,QAAQ;YACV,OAAO,CAAC,QAAQ,CAAC;gBACf,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI;oBACvB,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE;oBAC7B,CAAC,CAAC,oCAAmB;gBACvB,MAAM,EAAE,IAAI,sBAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;qBAC7C,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC;qBACjC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC;qBAC7B,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;gBACtC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE;gBAC/B,UAAU,EAAE;oBACV,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE;iBACnE;aACF,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,UAAU;IAC3B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/vaultka/lendingV2Fetcher.d.ts

@@ -0,0 +1,3 @@
+import { Fetcher } from '../../Fetcher';
+declare const fetcher: Fetcher;
+export default fetcher;