npm - @sonarwatch/portfolio-plugins - Versions diffs - 0.15.40 → 0.15.42 - Mend

@sonarwatch/portfolio-plugins 0.15.40 → 0.15.42

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.

Files changed (128) hide show

package/src/plugins/streamflow/airdropFetcher.js CHANGED Viewed

@@ -13,7 +13,7 @@ exports.airdropFetcherEthereum = exports.airdropFetcherSui = exports.airdropFetc
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const helpers_1 = require("./helpers");
 const constants_1 = require("./constants");
-const solanaExecutor = (owner) => __awaiter(void 0, void 0, void 0, function* () { return (0, helpers_1.getAirdropItems)(owner, portfolio_core_1.NetworkId.solana); });
+const solanaExecutor = (owner) => __awaiter(void 0, void 0, void 0, function* () { return (0, helpers_1.getSolanaAirdropItems)(owner); });
 const aptosExecutor = (owner) => __awaiter(void 0, void 0, void 0, function* () { return (0, helpers_1.getAirdropItems)(owner, portfolio_core_1.NetworkId.aptos); });
 const suiExecutor = (owner) => __awaiter(void 0, void 0, void 0, function* () { return (0, helpers_1.getAirdropItems)(owner, portfolio_core_1.NetworkId.sui); });
 const ethereumExecutor = (owner) => __awaiter(void 0, void 0, void 0, function* () { return (0, helpers_1.getAirdropItems)(owner, portfolio_core_1.NetworkId.ethereum); });
@@ -37,10 +37,4 @@ exports.airdropFetcherEthereum = {
     networkId: portfolio_core_1.NetworkId.ethereum,
     executor: ethereumExecutor,
 };
-// export const fetcher = airdropFetcherToFetcher(
-//   airdropFetcher,
-//   platform.id,
-//   'suilend-airdrop',
-//   airdropStatics.claimEnd
-// );
 //# sourceMappingURL=airdropFetcher.js.map

package/src/plugins/streamflow/airdropFetcher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/streamflow/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAAuD;~~AAOvD~~,~~uCAA4C~~;~~AAC5C~~,2CAA6C;AAE7C,MAAM,cAAc,GAA2B,CAAO,KAAa,EAAE,EAAE,kDACrE,OAAA,IAAA,~~yBAAe,~~EAAC,KAAK,~~EAAE,0BAAS,~~CAAC,~~MAAM,CAAC,~~CAAA,GAAA,CAAC;~~AAE3C~~,MAAM,aAAa,GAA2B,CAAO,KAAa,EAAE,EAAE,kDACpE,OAAA,IAAA,yBAAe,EAAC,KAAK,EAAE,0BAAS,CAAC,KAAK,CAAC,CAAA,GAAA,CAAC;AAE1C,MAAM,WAAW,GAA2B,CAAO,KAAa,EAAE,EAAE,kDAClE,OAAA,IAAA,yBAAe,EAAC,KAAK,EAAE,0BAAS,CAAC,GAAG,CAAC,CAAA,GAAA,CAAC;AAExC,MAAM,gBAAgB,GAA2B,CAAO,KAAa,EAAE,EAAE,kDACvE,OAAA,IAAA,yBAAe,EAAC,KAAK,EAAE,0BAAS,CAAC,QAAQ,CAAC,CAAA,GAAA,CAAC;AAEhC,QAAA,oBAAoB,GAAmB;IAClD,EAAE,EAAE,GAAG,0BAAc,CAAC,EAAE,IAAI,0BAAS,CAAC,MAAM,EAAE;IAC9C,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ,EAAE,cAAc;CACzB,CAAC;AAEW,QAAA,mBAAmB,GAAmB;IACjD,EAAE,EAAE,GAAG,0BAAc,CAAC,EAAE,IAAI,0BAAS,CAAC,KAAK,EAAE;IAC7C,SAAS,EAAE,0BAAS,CAAC,KAAK;IAC1B,QAAQ,EAAE,aAAa;CACxB,CAAC;AACW,QAAA,iBAAiB,GAAmB;IAC/C,EAAE,EAAE,GAAG,0BAAc,CAAC,EAAE,IAAI,0BAAS,CAAC,GAAG,EAAE;IAC3C,SAAS,EAAE,0BAAS,CAAC,GAAG;IACxB,QAAQ,EAAE,WAAW;CACtB,CAAC;AAEW,QAAA,sBAAsB,GAAmB;IACpD,EAAE,EAAE,GAAG,0BAAc,CAAC,EAAE,IAAI,0BAAS,CAAC,QAAQ,EAAE;IAChD,SAAS,EAAE,0BAAS,CAAC,QAAQ;IAC7B,QAAQ,EAAE,gBAAgB;CAC3B,CAAC~~;AAEF,kDAAkD;AAClD,oBAAoB;AACpB,iBAAiB;AACjB,uBAAuB;AACvB,4BAA4B;AAC5B,KAAK~~"}
1	+ {"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/streamflow/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAAuD;AAGvD,uCAAmE;AACnE,2CAA6C;AAE7C,MAAM,cAAc,GAA2B,CAAO,KAAa,EAAE,EAAE,kDACrE,OAAA,IAAA,+BAAqB,EAAC,KAAK,CAAC,CAAA,GAAA,CAAC;AAE/B,MAAM,aAAa,GAA2B,CAAO,KAAa,EAAE,EAAE,kDACpE,OAAA,IAAA,yBAAe,EAAC,KAAK,EAAE,0BAAS,CAAC,KAAK,CAAC,CAAA,GAAA,CAAC;AAE1C,MAAM,WAAW,GAA2B,CAAO,KAAa,EAAE,EAAE,kDAClE,OAAA,IAAA,yBAAe,EAAC,KAAK,EAAE,0BAAS,CAAC,GAAG,CAAC,CAAA,GAAA,CAAC;AAExC,MAAM,gBAAgB,GAA2B,CAAO,KAAa,EAAE,EAAE,kDACvE,OAAA,IAAA,yBAAe,EAAC,KAAK,EAAE,0BAAS,CAAC,QAAQ,CAAC,CAAA,GAAA,CAAC;AAEhC,QAAA,oBAAoB,GAAmB;IAClD,EAAE,EAAE,GAAG,0BAAc,CAAC,EAAE,IAAI,0BAAS,CAAC,MAAM,EAAE;IAC9C,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ,EAAE,cAAc;CACzB,CAAC;AAEW,QAAA,mBAAmB,GAAmB;IACjD,EAAE,EAAE,GAAG,0BAAc,CAAC,EAAE,IAAI,0BAAS,CAAC,KAAK,EAAE;IAC7C,SAAS,EAAE,0BAAS,CAAC,KAAK;IAC1B,QAAQ,EAAE,aAAa;CACxB,CAAC;AACW,QAAA,iBAAiB,GAAmB;IAC/C,EAAE,EAAE,GAAG,0BAAc,CAAC,EAAE,IAAI,0BAAS,CAAC,GAAG,EAAE;IAC3C,SAAS,EAAE,0BAAS,CAAC,GAAG;IACxB,QAAQ,EAAE,WAAW;CACtB,CAAC;AAEW,QAAA,sBAAsB,GAAmB;IACpD,EAAE,EAAE,GAAG,0BAAc,CAAC,EAAE,IAAI,0BAAS,CAAC,QAAQ,EAAE;IAChD,SAAS,EAAE,0BAAS,CAAC,QAAQ;IAC7B,QAAQ,EAAE,gBAAgB;CAC3B,CAAC"}

package/src/plugins/streamflow/helpers.d.ts CHANGED Viewed

@@ -6,3 +6,4 @@ export declare function getPda(owner: string, distributor: string): PublicKey;
 export declare function getPdas(owner: string, distributors: string[]): PublicKey[];
 export declare function getAirdropApiUrlFromNetworkId(owner: string, networkId: NetworkIdType): string | undefined;
 export declare function getAirdropItems(owner: string, networdkId: NetworkIdType): Promise<AirdropRaw>;
+export declare function getSolanaAirdropItems(owner: string): Promise<AirdropRaw>;

package/src/plugins/streamflow/helpers.js CHANGED Viewed

@@ -12,13 +12,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAirdropItems = exports.getAirdropApiUrlFromNetworkId = exports.getPdas = exports.getPda = void 0;
+exports.getSolanaAirdropItems = exports.getAirdropItems = exports.getAirdropApiUrlFromNetworkId = exports.getPdas = exports.getPda = void 0;
 const axios_1 = __importDefault(require("axios"));
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("./constants");
 const AirdropFetcher_1 = require("../../AirdropFetcher");
 const airdropAddresses_1 = require("./airdropAddresses");
+const structs_1 = require("./structs");
+const clients_1 = require("../../utils/clients");
+const getClaimTransactions_1 = require("../../utils/solana/jupiter/getClaimTransactions");
+const getParsedAccountInfo_1 = require("../../utils/solana/getParsedAccountInfo");
 function getPda(owner, distributor) {
     return web3_js_1.PublicKey.findProgramAddressSync([
         Buffer.from([67, 108, 97, 105, 109, 83, 116, 97, 116, 117, 115]),
@@ -115,4 +119,62 @@ function getAirdropItems(owner, networdkId) {
     });
 }
 exports.getAirdropItems = getAirdropItems;
+function getSolanaAirdropItems(owner) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const client = (0, clients_1.getClientSolana)();
+        const [initialAirdropPda, vestedAirdropPda] = [
+            getPda(owner, 'BsL9EiaD1FLhvE1z27s2vSLPCFU9yUY8bphscbunnRag'),
+            getPda(owner, '2nQBWuizQsa3XGX9k6f3wisAzbx1Hf8n4PFwafhyAtsh'),
+        ];
+        const [initialAirdropAccount, vestedAirdropAccount] = yield Promise.all([
+            (0, getParsedAccountInfo_1.getParsedAccountInfo)(client, structs_1.claimStatusStruct, initialAirdropPda),
+            (0, getParsedAccountInfo_1.getParsedAccountInfo)(client, structs_1.claimStatusStruct, vestedAirdropPda),
+        ]);
+        if (!initialAirdropAccount && !vestedAirdropAccount)
+            return (0, AirdropFetcher_1.getAirdropRaw)({
+                statics: constants_1.airdropStatics,
+                items: [
+                    {
+                        amount: 0,
+                        isClaimed: false,
+                        label: 'STREAM',
+                        address: constants_1.streamMint,
+                        imageUri: constants_1.platformImg,
+                    },
+                ],
+            });
+        const [initialClaims, vestedClaims] = yield Promise.all([
+            (0, getClaimTransactions_1.getClaimTransactions)(owner, initialAirdropPda, constants_1.streamMint),
+            (0, getClaimTransactions_1.getClaimTransactions)(owner, vestedAirdropPda, constants_1.streamMint),
+        ]);
+        return (0, AirdropFetcher_1.getAirdropRaw)({
+            statics: constants_1.airdropStatics,
+            items: [
+                initialAirdropAccount
+                    ? {
+                        amount: initialAirdropAccount.unlockedAmount
+                            .div(Math.pow(10, 6))
+                            .toNumber(),
+                        isClaimed: !initialAirdropAccount.lastClaimTs.isZero(),
+                        label: 'STREAM',
+                        address: constants_1.streamMint,
+                        imageUri: constants_1.platformImg,
+                        claims: initialClaims,
+                    }
+                    : [],
+                vestedAirdropAccount
+                    ? {
+                        amount: vestedAirdropAccount.lockedAmount.div(Math.pow(10, 6)).toNumber(),
+                        isClaimed: vestedAirdropAccount.lockedAmount.isEqualTo(vestedAirdropAccount.lockedAmountWithdrawn),
+                        label: 'STREAM',
+                        address: constants_1.streamMint,
+                        imageUri: constants_1.platformImg,
+                        claims: vestedClaims,
+                    }
+                    : [],
+            ].flat(),
+        });
+    });
+}
+exports.getSolanaAirdropItems = getSolanaAirdropItems;
 //# sourceMappingURL=helpers.js.map

package/src/plugins/streamflow/helpers.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/streamflow/helpers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,kDAA6C;AAC7C,gEAAqC;AACrC,6CAA4C;AAC5C,2CAMqB;AACrB,yDAAqD;AAErD,yDAAuD;~~AAEvD~~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"}
1	+ {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/streamflow/helpers.ts"],"names":[],"mappings":"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"}

package/src/plugins/tensor/season4AirdropFetcher.js CHANGED Viewed

@@ -11,32 +11,40 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.s4Fetcher = exports.airdropS4Fetcher = void 0;
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const tx_parser_1 = require("@sonarwatch/tx-parser");
 const constants_1 = require("./constants");
 const season4Alloc_1 = require("./season4Alloc");
 const AirdropFetcher_1 = require("../../AirdropFetcher");
 const deriveClaimStatus_1 = require("../../utils/solana/jupiter/deriveClaimStatus");
 const clients_1 = require("../../utils/clients");
 const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     const baseAlloc = season4Alloc_1.season4Allocations[owner];
     const vectorAlloc = season4Alloc_1.vectorBonusAllocations[owner];
+    const totalAmount = (baseAlloc !== null && baseAlloc !== void 0 ? baseAlloc : 0) + (vectorAlloc !== null && vectorAlloc !== void 0 ? vectorAlloc : 0);
     const claimPda = (0, deriveClaimStatus_1.deriveClaimStatus)(owner, '5qJtp1rTEnW3qUi7SaQpsscqNnvCSo91WFYYbfNJBPDv', 'Td1ST8yc9Vt7vsBY7rZzrCjkXeGnr4ECMtso9ueLhyQ');
     const client = (0, clients_1.getClientSolana)();
     const claimAccount = yield client.getAccountInfo(claimPda);
+    const signatures = yield (0, tx_parser_1.getSignatures)(client, claimPda.toString());
+    const transactions = yield (0, tx_parser_1.getTransactions)(client, signatures.map((s) => s.signature));
     const isClaimed = !!claimAccount;
     return (0, AirdropFetcher_1.getAirdropRaw)({
         statics: constants_1.s4Statics,
         items: [
             {
-                amount: baseAlloc !== null && baseAlloc !== void 0 ? baseAlloc : 0,
-                isClaimed,
-                label: 'TNSR',
-                address: constants_1.tnsrMint,
-            },
-            {
-                amount: vectorAlloc !== null && vectorAlloc !== void 0 ? vectorAlloc : 0,
+                amount: totalAmount,
                 isClaimed,
                 label: 'TNSR',
                 address: constants_1.tnsrMint,
+                claims: ((_a = transactions[0]) === null || _a === void 0 ? void 0 : _a.blockTime)
+                    ? [
+                        {
+                            amount: totalAmount,
+                            date: transactions[0].blockTime * 1000,
+                            txId: transactions[0].transaction.signatures[0],
+                        },
+                    ]
+                    : undefined,
             },
         ],
     });

package/src/plugins/tensor/season4AirdropFetcher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"season4AirdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/tensor/season4AirdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAAuD;AACvD,2CAA8D;AAC9D,iDAA4E;AAC5E,yDAK8B;AAC9B,oFAAiF;AACjF,iDAAsD;AAEtD,MAAM,QAAQ,GAA2B,CAAO,KAAa,EAAE,EAAE;IAC/D,MAAM,SAAS,GAAG,iCAAkB,CAAC,KAAK,CAAC,CAAC;IAC5C,MAAM,WAAW,GAAG,qCAAsB,CAAC,KAAK,CAAC,CAAC;~~IAElD~~,MAAM,QAAQ,GAAG,IAAA,qCAAiB,EAChC,KAAK,EACL,8CAA8C,EAC9C,6CAA6C,CAC9C,CAAC;IAEF,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;~~IAE3D~~,MAAM,SAAS,GAAG,CAAC,CAAC,YAAY,CAAC;IAEjC,OAAO,IAAA,8BAAa,EAAC;QACnB,OAAO,EAAE,qBAAS;QAClB,KAAK,EAAE;YACL;gBACE,MAAM,EAAE,~~SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,CAAC~~;~~gBACtB~~,SAAS;gBACT,KAAK,EAAE,MAAM;gBACb,OAAO,EAAE,oBAAQ;~~aAClB~~;~~YACD~~;~~gBACE~~,MAAM,EAAE,WAAW,~~aAAX~~,~~WAAW~~,~~cAAX~~,~~WAAW~~,~~GAAI~~,CAAC~~;gBACxB~~,SAAS;~~gBACT~~,~~KAAK~~,EAAE,~~MAAM~~;~~gBACb~~,~~OAAO~~,~~EAAE~~,~~oBAAQ~~;~~aAClB~~;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEW,QAAA,gBAAgB,GAAmB;IAC9C,EAAE,EAAE,qBAAS,CAAC,EAAE;IAChB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEW,QAAA,SAAS,GAAG,IAAA,wCAAuB,EAC9C,wBAAgB,EAChB,sBAAU,EACV,WAAW,EACX,qBAAS,CAAC,QAAQ,CACnB,CAAC"}
1	+ {"version":3,"file":"season4AirdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/tensor/season4AirdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAAuD;AACvD,qDAAuE;AACvE,2CAA8D;AAC9D,iDAA4E;AAC5E,yDAK8B;AAC9B,oFAAiF;AACjF,iDAAsD;AAEtD,MAAM,QAAQ,GAA2B,CAAO,KAAa,EAAE,EAAE;;IAC/D,MAAM,SAAS,GAAG,iCAAkB,CAAC,KAAK,CAAC,CAAC;IAC5C,MAAM,WAAW,GAAG,qCAAsB,CAAC,KAAK,CAAC,CAAC;IAClD,MAAM,WAAW,GAAG,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,CAAC,CAAC,GAAG,CAAC,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,CAAC,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,IAAA,qCAAiB,EAChC,KAAK,EACL,8CAA8C,EAC9C,6CAA6C,CAC9C,CAAC;IAEF,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;IAC3D,MAAM,UAAU,GAAG,MAAM,IAAA,yBAAa,EAAC,MAAM,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;IACpE,MAAM,YAAY,GAAG,MAAM,IAAA,2BAAe,EACxC,MAAM,EACN,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CACnC,CAAC;IAEF,MAAM,SAAS,GAAG,CAAC,CAAC,YAAY,CAAC;IAEjC,OAAO,IAAA,8BAAa,EAAC;QACnB,OAAO,EAAE,qBAAS;QAClB,KAAK,EAAE;YACL;gBACE,MAAM,EAAE,WAAW;gBACnB,SAAS;gBACT,KAAK,EAAE,MAAM;gBACb,OAAO,EAAE,oBAAQ;gBACjB,MAAM,EAAE,CAAA,MAAA,YAAY,CAAC,CAAC,CAAC,0CAAE,SAAS;oBAChC,CAAC,CAAC;wBACE;4BACE,MAAM,EAAE,WAAW;4BACnB,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,GAAG,IAAI;4BACtC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC;yBAChD;qBACF;oBACH,CAAC,CAAC,SAAS;aACd;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEW,QAAA,gBAAgB,GAAmB;IAC9C,EAAE,EAAE,qBAAS,CAAC,EAAE;IAChB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEW,QAAA,SAAS,GAAG,IAAA,wCAAuB,EAC9C,wBAAgB,EAChB,sBAAU,EACV,WAAW,EACX,qBAAS,CAAC,QAAQ,CACnB,CAAC"}

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

@@ -14,7 +14,6 @@ const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const helpers_1 = require("../helpers");
 const getTokenAccountsByOwner_1 = require("../../../utils/solana/getTokenAccountsByOwner");
 const ElementRegistry_1 = require("../../../utils/elementbuilder/ElementRegistry");
-const TokenYieldMap_1 = require("../../../TokenYieldMap");
 const getWhirlpoolPositions_1 = require("../../orca/getWhirlpoolPositions");
 const constants_1 = require("../../orca/constants");
 const constants_2 = require("../../cropper/constants");
@@ -27,9 +26,6 @@ const clients_1 = require("../../../utils/clients");
 const getSolanaTokens = (simple) => (tokenAccounts, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const fungibleAddresses = tokenAccounts.map((ta) => ta.mint.toString());
     const tokenPrices = yield cache.getTokenPricesAsMap(fungibleAddresses, portfolio_core_1.NetworkId.solana);
-    const tokenYields = !simple
-        ? yield cache.getTokenYieldsAsMap([...tokenPrices.keys()], portfolio_core_1.NetworkId.solana)
-        : new TokenYieldMap_1.TokenYieldMap(portfolio_core_1.NetworkId.solana);
     const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, portfolio_core_1.walletTokensPlatformId);
     const elementTokens = elementRegistry.addElementMultiple({
         label: 'Wallet',
@@ -41,7 +37,6 @@ const getSolanaTokens = (simple) => (tokenAccounts, cache) => __awaiter(void 0,
         const tokenPrice = tokenPrices.get(address);
         if (!tokenPrice)
             return;
-        const tokenYield = tokenYields.get(address);
         const amount = tokenAccount.amount.shiftedBy(-tokenPrice.decimals);
         if (tokenPrice.platformId === portfolio_core_1.walletTokensPlatformId) {
             // it's a regular token
@@ -52,7 +47,6 @@ const getSolanaTokens = (simple) => (tokenAccounts, cache) => __awaiter(void 0,
                 ref: tokenAccount.pubkey,
                 link: tokenPrice.link,
                 sourceRefs: tokenPrice.sourceRefs,
-                tokenYield,
             });
         }
         else if (!simple) {
@@ -68,15 +62,14 @@ const getSolanaTokens = (simple) => (tokenAccounts, cache) => __awaiter(void 0,
             }
             const liquidity = elementLiquidity.addLiquidity({
                 name: tokenPrice.liquidityName,
+                link: tokenPrice.link,
+                ref: tokenAccount.pubkey,
+                sourceRefs: tokenPrice.sourceRefs,
             });
             liquidity.addAsset({
                 address,
                 amount,
                 alreadyShifted: true,
-                ref: tokenAccount.pubkey,
-                link: tokenPrice.link,
-                sourceRefs: tokenPrice.sourceRefs,
-                tokenYield,
             });
             elementsLiquidity.set(tag, elementLiquidity);
         }

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

	@@ -1 +1 @@
1	- {"version":3,"file":"solana.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/tokens/fetchers/solana.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAIoC;AAGpC,wCAAsC;AACtC,2FAAwF;AACxF,mFAAgF;~~AAGhF~~,~~0DAAuD;AAEvD,~~4EAAoE;AACpE,oDAAoE;AACpE,uDAGiC;AACjC,wEAAqE;AACrE,2EAAwE;AACxE,qFAAqF;AACrF,2DAAoE;AACpE,4EAAsE;AACtE,oDAAyD;AAElD,MAAM,eAAe,GAC1B,CAAC,MAAgB,EAAE,EAAE,CACrB,CAAO,aAA4C,EAAE,KAAY,EAAE,EAAE;IACnE,MAAM,iBAAiB,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IAExE,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,mBAAmB,CACjD,iBAAiB,EACjB,0BAAS,CAAC,MAAM,CACjB,CAAC;IAEF,MAAM,~~WAAW,GAAG,CAAC,MAAM;QACzB,CAAC,CAAC,MAAM,KAAK,CAAC,mBAAmB,CAC7B,CAAC,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC,EACvB,0BAAS,CAAC,MAAM,CACjB;QACH,CAAC,CAAC,IAAI,6BAAa,CAAC,0BAAS,CAAC,MAAM,CAAC,CAAC;IAExC,MAAM,~~eAAe,GAAG,IAAI,iCAAe,CACzC,0BAAS,CAAC,MAAM,EAChB,uCAAsB,CACvB,CAAC;IAEF,MAAM,aAAa,GAAG,eAAe,CAAC,kBAAkB,CAAC;QACvD,KAAK,EAAE,QAAQ;KAChB,CAAC,CAAC;IACH,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAmC,CAAC;IAErE,aAAa,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;;QACrC,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,OAAO;QAExB,MAAM,~~UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAE5C,~~MAAM,~~MAAM,~~GAAG,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAEnE,IAAI,UAAU,CAAC,UAAU,KAAK,uCAAsB,EAAE,CAAC;YACrD,uBAAuB;YACvB,aAAa,CAAC,QAAQ,CAAC;gBACrB,OAAO;gBACP,MAAM;gBACN,cAAc,EAAE,IAAI;gBACpB,GAAG,EAAE,YAAY,CAAC,MAAM;gBACxB,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,UAAU,EAAE,UAAU,CAAC,UAAU;~~gBACjC~~,~~UAAU;aACX,~~CAAC,CAAC;QACL,CAAC;aAAM,IAAI,CAAC,MAAM,EAAE,CAAC;YACnB,mBAAmB;YACnB,MAAM,GAAG,GAAG,IAAA,kBAAQ,EAClB,UAAU,CAAC,UAAU,EACrB,UAAU,CAAC,WAAW,EACtB,UAAU,CAAC,KAAK,CACjB,CAAC;YAEF,IAAI,gBAAgB,GAAG,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAClD,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACtB,gBAAgB,GAAG,eAAe,CAAC,mBAAmB,CAAC;oBACrD,IAAI,EAAE,UAAU,CAAC,WAAW;oBAC5B,KAAK,EAAE,MAAA,UAAU,CAAC,KAAK,mCAAI,eAAe;oBAC1C,UAAU,EAAE,UAAU,CAAC,UAAU;iBAClC,CAAC,CAAC;YACL,CAAC;YAED,MAAM,SAAS,GAAG,gBAAgB,CAAC,YAAY,CAAC;gBAC9C,IAAI,EAAE,UAAU,CAAC,aAAa;~~aAC/B~~,~~CAAC~~,~~CAAC;YAEH~~,~~SAAS~~,CAAC,~~QAAQ,CAAC;gBACjB,OAAO;gBACP,MAAM;gBACN,cAAc,EAAE,~~IAAI;~~gBACpB~~,GAAG,EAAE,YAAY,CAAC,MAAM;gBACxB,~~IAAI~~,EAAE,UAAU,CAAC,~~IAAI~~;~~gBACrB~~,~~UAAU~~,~~EAAE~~,~~UAAU~~,CAAC,~~UAAU~~;~~gBACjC~~,~~UAAU~~;~~aACX~~,CAAC,CAAC;YAEH,iBAAiB,CAAC,GAAG,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;~~AAnFS~~,QAAA,eAAe,~~mBAmFxB~~;AAEJ,MAAM,cAAc,GAAmB;IACrC,qCAAuB;IACvB,gDAAwB;IACxB,IAAA,wCAAgB,EAAC,sBAAc,CAAC;IAChC,IAAA,wCAAgB,EAAC,sBAAiB,EAAE,mBAAO,CAAC;IAC5C,uCAAkB;IAClB,yCAAmB;IACnB,IAAA,uBAAe,EAAC,KAAK,CAAC;IACtB,sCAAgB;CACjB,CAAC;AAEF,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,aAAa,GAAG,MAAM,IAAA,iDAAuB,EAAC,IAAA,yBAAe,GAAE,EAAE,KAAK,CAAC,CAAC;IAE9E,MAAM,OAAO,GAAkC,EAAE,CAAC;IAClD,KAAK,MAAM,aAAa,IAAI,cAAc,EAAE,CAAC;QAC3C,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC,CAAC;IACpD,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAEjD,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;AAC/E,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,uCAAsB,SAAS;IACtC,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
1	+ {"version":3,"file":"solana.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/tokens/fetchers/solana.ts"],"names":[],"mappings":"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"}

package/src/plugins/wormhole/airdropFetcher.js CHANGED Viewed

@@ -10,18 +10,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 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 clients_1 = require("../../utils/clients");
 const helpers_1 = require("./helpers");
 const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
+const ParsedGpa_1 = require("../../utils/solana/beets/ParsedGpa");
+const structs_1 = require("./structs");
 function getPositionsV2Fetcher(networkId) {
     const executor = (owner, cache) => __awaiter(this, void 0, void 0, function* () {
         const allocation = yield (0, helpers_1.getAllocation)(owner, networkId);
         if (allocation === 0)
             return [];
         const client = (0, clients_1.getClientSolana)();
-        const account = yield client.getAccountInfo((0, helpers_1.getAccountPubkey)(owner));
-        if (account)
+        const accounts = yield ParsedGpa_1.ParsedGpa.build(client, structs_1.claimInfoStruct, new web3_js_1.PublicKey('Wapq3Hpv2aSKjWrh4pM8eweh8jVJB7D1nLBw9ikjVYx'))
+            .addFilter('identity', {
+            __kind: 'Solana',
+            pubkey: Array.from(new web3_js_1.PublicKey(owner).toBytes()),
+        })
+            .run();
+        if (accounts)
             return [];
         const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);
         const element = elementRegistry.addElementMultiple({

package/src/plugins/wormhole/airdropFetcher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/wormhole/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAsE;~~AAGtE~~,2CAAgD;AAChD,iDAAsD;AACtD,~~uCAA4D~~;~~AAC5D~~,gFAA6E;~~AAE7E~~,SAAwB,qBAAqB,CAC3C,SAAwB;IAExB,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;QACtE,MAAM,UAAU,GAAG,MAAM,IAAA,uBAAa,EAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QACzD,IAAI,UAAU,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAEhC,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;QACjC,MAAM,~~OAAO~~,GAAG,MAAM,MAAM,CAAC,~~cAAc~~,CAAC,~~IAAA~~,~~0BAAgB~~,~~EAAC~~,KAAK,CAAC,CAAC,CAAC;~~QAErE~~,IAAI,~~OAAO~~;YAAE,OAAO,EAAE,CAAC;~~QAEvB~~,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;QAE1E,MAAM,OAAO,GAAG,eAAe,CAAC,kBAAkB,CAAC;YACjD,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;QAEH,OAAO,CAAC,QAAQ,CAAC;YACf,OAAO,EAAE,iBAAK;YACd,MAAM,EAAE,UAAU;YAClB,UAAU,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE;SAClC,CAAC,CAAC;QAEH,OAAO,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAC5C,CAAC,CAAA,CAAC;IAEF,OAAO;QACL,EAAE,EAAE,GAAG,sBAAU,UAAU;QAC3B,SAAS,EAAE,0BAAS,CAAC,MAAM;QAC3B,QAAQ;KACT,CAAC;AACJ,CAAC;~~AAhCD~~,~~wCAgCC~~"}
1	+ {"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/wormhole/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAsE;AACtE,6CAA4C;AAG5C,2CAAgD;AAChD,iDAAsD;AACtD,uCAA0C;AAC1C,gFAA6E;AAC7E,kEAA+D;AAC/D,uCAA4C;AAE5C,SAAwB,qBAAqB,CAC3C,SAAwB;IAExB,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;QACtE,MAAM,UAAU,GAAG,MAAM,IAAA,uBAAa,EAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QACzD,IAAI,UAAU,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAEhC,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;QACjC,MAAM,QAAQ,GAAG,MAAM,qBAAS,CAAC,KAAK,CACpC,MAAM,EACN,yBAAe,EACf,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAC7D;aACE,SAAS,CAAC,UAAU,EAAE;YACrB,MAAM,EAAE,QAAQ;YAChB,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;SACnD,CAAC;aACD,GAAG,EAAE,CAAC;QACT,IAAI,QAAQ;YAAE,OAAO,EAAE,CAAC;QAExB,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;QAE1E,MAAM,OAAO,GAAG,eAAe,CAAC,kBAAkB,CAAC;YACjD,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;QAEH,OAAO,CAAC,QAAQ,CAAC;YACf,OAAO,EAAE,iBAAK;YACd,MAAM,EAAE,UAAU;YAClB,UAAU,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE;SAClC,CAAC,CAAC;QAEH,OAAO,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAC5C,CAAC,CAAA,CAAC;IAEF,OAAO;QACL,EAAE,EAAE,GAAG,sBAAU,UAAU;QAC3B,SAAS,EAAE,0BAAS,CAAC,MAAM;QAC3B,QAAQ;KACT,CAAC;AACJ,CAAC;AAxCD,wCAwCC"}

package/src/plugins/wormhole/structs.d.ts CHANGED Viewed

@@ -3,7 +3,7 @@
 /// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 import BigNumber from 'bignumber.js';
-import { BeetStruct } from '@metaplex-foundation/beet';
+import { BeetStruct, FixableBeetStruct, DataEnumKeyAsKind, FixableBeet } from '@metaplex-foundation/beet';
 export type TokenBalance = {
     buffer: Buffer;
     init: boolean;
@@ -24,3 +24,38 @@ export type StakeAccountMetadata = {
     stake_account_checkpoints_last_index: number;
 };
 export declare const stakeAccountMetadataStruct: BeetStruct<StakeAccountMetadata, Partial<StakeAccountMetadata>>;
+type IdentityRecord = {
+    Discord: {
+        username: number[];
+    };
+    Solana: {
+        pubkey: number[];
+    };
+    Evm: {
+        pubkey: number[];
+    };
+    Sui: {
+        address: number[];
+    };
+    Aptos: {
+        address: number[];
+    };
+    Cosmwasm: {
+        address: number[];
+    };
+    Injective: {
+        address: number[];
+    };
+    Algorand: {
+        pubkey: number[];
+    };
+};
+export type Identity = DataEnumKeyAsKind<IdentityRecord>;
+export declare const identityStruct: FixableBeet<Identity>;
+export type ClaimInfo = {
+    discriminator: number[];
+    identity: Identity;
+    amount: BigNumber;
+};
+export declare const claimInfoStruct: FixableBeetStruct<ClaimInfo, Partial<ClaimInfo>>;
+export {};

package/src/plugins/wormhole/structs.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stakeAccountMetadataStruct = exports.tokenBalanceStruct = void 0;
+exports.claimInfoStruct = exports.identityStruct = exports.stakeAccountMetadataStruct = exports.tokenBalanceStruct = void 0;
 const beet_1 = require("@metaplex-foundation/beet");
 const beet_solana_1 = require("@metaplex-foundation/beet-solana");
 const solana_1 = require("../../utils/solana");
@@ -22,4 +22,43 @@ exports.stakeAccountMetadataStruct = new beet_1.BeetStruct([
     ['delegate', beet_solana_1.publicKey],
     ['stake_account_checkpoints_last_index', beet_1.u16],
 ], (args) => args);
+exports.identityStruct = (0, beet_1.dataEnum)([
+    [
+        'Discord',
+        new beet_1.FixableBeetArgsStruct([['username', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 20)]], 'IdentityRecord["Discord"]'),
+    ],
+    [
+        'Solana',
+        new beet_1.FixableBeetArgsStruct([['pubkey', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 32)]], 'IdentityRecord["Solana"]'),
+    ],
+    [
+        'Evm',
+        new beet_1.FixableBeetArgsStruct([['pubkey', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 20)]], 'IdentityRecord["Evm"]'),
+    ],
+    [
+        'Sui',
+        new beet_1.FixableBeetArgsStruct([['address', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 32)]], 'IdentityRecord["Sui"]'),
+    ],
+    [
+        'Aptos',
+        new beet_1.FixableBeetArgsStruct([['address', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 32)]], 'IdentityRecord["Aptos"]'),
+    ],
+    [
+        'Cosmwasm',
+        new beet_1.FixableBeetArgsStruct([['address', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 20)]], 'IdentityRecord["Cosmwasm"]'),
+    ],
+    [
+        'Injective',
+        new beet_1.FixableBeetArgsStruct([['address', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 20)]], 'IdentityRecord["Injective"]'),
+    ],
+    [
+        'Algorand',
+        new beet_1.FixableBeetArgsStruct([['pubkey', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 32)]], 'IdentityRecord["Algorand"]'),
+    ],
+]);
+exports.claimInfoStruct = new beet_1.FixableBeetStruct([
+    ['discriminator', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 8)],
+    ['identity', exports.identityStruct],
+    ['amount', solana_1.u64],
+], (args) => args);
 //# sourceMappingURL=structs.js.map

package/src/plugins/wormhole/structs.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/wormhole/structs.ts"],"names":[],"mappings":";;;AAEA,~~oDAMmC~~;AACnC,kEAA6D;AAC7D,+CAA+C;AAUlC,QAAA,kBAAkB,GAAG,IAAI,iBAAU,CAC9C;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACnB,CAAC,MAAM,EAAE,WAAI,CAAC;IACd,CAAC,MAAM,EAAE,SAAE,CAAC;IACZ,CAAC,SAAS,EAAE,YAAG,CAAC;IAChB,CAAC,WAAW,EAAE,uBAAS,CAAC;CACzB,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAoB,CAC/B,CAAC;AAcW,QAAA,0BAA0B,GAAG,IAAI,iBAAU,CACtD;IACE,CAAC,sBAAsB,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,CAAC,CAAC,CAAC;IACtD,CAAC,eAAe,EAAE,SAAE,CAAC;IACrB,CAAC,cAAc,EAAE,SAAE,CAAC;IACpB,CAAC,gBAAgB,EAAE,SAAE,CAAC;IACtB,CAAC,kBAAkB,EAAE,YAAG,CAAC;IACzB,CAAC,0BAA0B,EAAE,YAAG,CAAC;IACjC,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,UAAU,EAAE,uBAAS,CAAC;IACvB,CAAC,sCAAsC,EAAE,UAAG,CAAC;CAC9C,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAA4B,CACvC,CAAC"}
1	+ {"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/wormhole/structs.ts"],"names":[],"mappings":";;;AAEA,oDAWmC;AACnC,kEAA6D;AAC7D,+CAA+C;AAUlC,QAAA,kBAAkB,GAAG,IAAI,iBAAU,CAC9C;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACnB,CAAC,MAAM,EAAE,WAAI,CAAC;IACd,CAAC,MAAM,EAAE,SAAE,CAAC;IACZ,CAAC,SAAS,EAAE,YAAG,CAAC;IAChB,CAAC,WAAW,EAAE,uBAAS,CAAC;CACzB,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAoB,CAC/B,CAAC;AAcW,QAAA,0BAA0B,GAAG,IAAI,iBAAU,CACtD;IACE,CAAC,sBAAsB,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,CAAC,CAAC,CAAC;IACtD,CAAC,eAAe,EAAE,SAAE,CAAC;IACrB,CAAC,cAAc,EAAE,SAAE,CAAC;IACpB,CAAC,gBAAgB,EAAE,SAAE,CAAC;IACtB,CAAC,kBAAkB,EAAE,YAAG,CAAC;IACzB,CAAC,0BAA0B,EAAE,YAAG,CAAC;IACjC,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,UAAU,EAAE,uBAAS,CAAC;IACvB,CAAC,sCAAsC,EAAE,UAAG,CAAC;CAC9C,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAA4B,CACvC,CAAC;AAeW,QAAA,cAAc,GAAG,IAAA,eAAQ,EAAiB;IACrD;QACE,SAAS;QACT,IAAI,4BAAqB,CACvB,CAAC,CAAC,UAAU,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAC7C,2BAA2B,CAC5B;KACF;IACD;QACE,QAAQ;QACR,IAAI,4BAAqB,CACvB,CAAC,CAAC,QAAQ,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAC3C,0BAA0B,CAC3B;KACF;IACD;QACE,KAAK;QACL,IAAI,4BAAqB,CACvB,CAAC,CAAC,QAAQ,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAC3C,uBAAuB,CACxB;KACF;IACD;QACE,KAAK;QACL,IAAI,4BAAqB,CACvB,CAAC,CAAC,SAAS,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAC5C,uBAAuB,CACxB;KACF;IACD;QACE,OAAO;QACP,IAAI,4BAAqB,CACvB,CAAC,CAAC,SAAS,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAC5C,yBAAyB,CAC1B;KACF;IACD;QACE,UAAU;QACV,IAAI,4BAAqB,CACvB,CAAC,CAAC,SAAS,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAC5C,4BAA4B,CAC7B;KACF;IACD;QACE,WAAW;QACX,IAAI,4BAAqB,CACvB,CAAC,CAAC,SAAS,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAC5C,6BAA6B,CAC9B;KACF;IACD;QACE,UAAU;QACV,IAAI,4BAAqB,CACvB,CAAC,CAAC,QAAQ,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAC3C,4BAA4B,CAC7B;KACF;CACF,CAA0B,CAAC;AASf,QAAA,eAAe,GAAG,IAAI,wBAAiB,CAClD;IACE,CAAC,eAAe,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,CAAC,CAAC,CAAC;IAC/C,CAAC,UAAU,EAAE,sBAAc,CAAC;IAC5B,CAAC,QAAQ,EAAE,YAAG,CAAC;CAChB,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAiB,CAC5B,CAAC"}

package/src/utils/elementbuilder/AssetBuilder.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import { NetworkIdType, PortfolioAsset, TokenPriceMap } from '@sonarwatch/portfolio-core';
+import { TokenYieldMap } from '../../TokenYieldMap';
 export declare abstract class AssetBuilder {
     abstract tokenAddresses(): string[];
-    abstract get(networkId: NetworkIdType, tokenPrices: TokenPriceMap): PortfolioAsset | null;
+    abstract get(networkId: NetworkIdType, tokenPrices: TokenPriceMap, tokenYields: TokenYieldMap): PortfolioAsset | null;
 }

package/src/utils/elementbuilder/AssetBuilder.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"AssetBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/AssetBuilder.ts"],"names":[],"mappings":";;;~~AAMA~~,MAAsB,YAAY;~~CAMjC~~;~~AAND~~,~~oCAMC~~"}
1	+ {"version":3,"file":"AssetBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/AssetBuilder.ts"],"names":[],"mappings":";;;AAOA,MAAsB,YAAY;CAOjC;AAPD,oCAOC"}

package/src/utils/elementbuilder/AssetTokenBuilder.d.ts CHANGED Viewed

@@ -5,6 +5,7 @@ import BigNumber from 'bignumber.js';
 import { PublicKey } from '@solana/web3.js';
 import { AssetBuilder } from './AssetBuilder';
 import { PortfolioAssetTokenParams } from './Params';
+import { TokenYieldMap } from '../../TokenYieldMap';
 export declare class AssetTokenBuilder extends AssetBuilder {
     address: string;
     amount: number | BigNumber | string;
@@ -16,6 +17,6 @@ export declare class AssetTokenBuilder extends AssetBuilder {
     tokenYield?: TokenYield;
     constructor(params: PortfolioAssetTokenParams);
     tokenAddresses(): string[];
-    getUnderlyings(networkId: NetworkIdType, tokenPrices: TokenPriceMap): PortfolioAsset[];
-    get(networkId: NetworkIdType, tokenPrices: TokenPriceMap): PortfolioAsset | null;
+    getUnderlyings(networkId: NetworkIdType, tokenPrices: TokenPriceMap, tokenYields: TokenYieldMap): PortfolioAsset[];
+    get(networkId: NetworkIdType, tokenPrices: TokenPriceMap, tokenYields: TokenYieldMap): PortfolioAsset | null;
 }

package/src/utils/elementbuilder/AssetTokenBuilder.js CHANGED Viewed

@@ -23,7 +23,9 @@ class AssetTokenBuilder extends AssetBuilder_1.AssetBuilder {
     tokenAddresses() {
         return [this.address];
     }
-    getUnderlyings(networkId, tokenPrices) {
+    getUnderlyings(networkId, tokenPrices,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    tokenYields) {
         const tokenPrice = tokenPrices.get(this.address);
         if (!tokenPrice)
             return [];
@@ -34,7 +36,7 @@ class AssetTokenBuilder extends AssetBuilder_1.AssetBuilder {
             amount = amount.dividedBy(Math.pow(10, tokenPrice.decimals));
         return (0, tokenPriceToAssetTokens_1.default)(tokenPrice.address, amount.toNumber(), networkId, tokenPrice, undefined, this.attributes);
     }
-    get(networkId, tokenPrices) {
+    get(networkId, tokenPrices, tokenYields) {
         var _a;
         let amount = new bignumber_js_1.default(this.amount);
         if (amount.isZero())
@@ -44,7 +46,8 @@ class AssetTokenBuilder extends AssetBuilder_1.AssetBuilder {
             return null;
         if (!this.alreadyShifted && tokenPrice)
             amount = amount.dividedBy(Math.pow(10, tokenPrice.decimals));
-        return Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(this.address, amount.toNumber(), networkId, tokenPrice, undefined, this.attributes, this.link, this.tokenYield)), { sourceRefs: this.sourceRefs, ref: (_a = this.ref) === null || _a === void 0 ? void 0 : _a.toString() });
+        const tokenYield = this.tokenYield || tokenYields.get(this.address);
+        return Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(this.address, amount.toNumber(), networkId, tokenPrice, undefined, this.attributes, this.link, tokenYield)), { sourceRefs: this.sourceRefs, ref: (_a = this.ref) === null || _a === void 0 ? void 0 : _a.toString() });
     }
 }
 exports.AssetTokenBuilder = AssetTokenBuilder;

package/src/utils/elementbuilder/AssetTokenBuilder.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"AssetTokenBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/AssetTokenBuilder.ts"],"names":[],"mappings":";;;;;;AAQA,gEAAqC;AAErC,4FAAoE;AACpE,8FAAsE;AACtE,iDAA8C;~~AAG9C~~,MAAa,iBAAkB,SAAQ,2BAAY;IAUjD,YAAY,MAAiC;QAC3C,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QACzC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC;QAC1C,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,IAAI,KAAK,CAAC;QACrD,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;QACtB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;QACpC,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IACtC,CAAC;IAED,cAAc;QACZ,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACxB,CAAC;IAED,cAAc,CACZ,SAAwB,EACxB,WAA0B;QAE1B,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,UAAU;YAAE,OAAO,EAAE,CAAC;QAE3B,IAAI,MAAM,GAAG,IAAI,sBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAExC,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,UAAU,CAAC,WAAW;YAAE,OAAO,EAAE,CAAC;QAEzD,IAAI,CAAC,IAAI,CAAC,cAAc;YACtB,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,UAAU,CAAC,QAAQ,CAAA,CAAC,CAAC;QAEvD,OAAO,IAAA,iCAAuB,EAC5B,UAAU,CAAC,OAAO,EAClB,MAAM,CAAC,QAAQ,EAAE,EACjB,SAAS,EACT,UAAU,EACV,SAAS,EACT,IAAI,CAAC,UAAU,CAChB,CAAC;IACJ,CAAC;IAED,GAAG,CACD,SAAwB,EACxB,WAA0B;;QAE1B,IAAI,MAAM,GAAG,IAAI,sBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxC,IAAI,MAAM,CAAC,MAAM,EAAE;YAAE,OAAO,IAAI,CAAC;QAEjC,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,cAAc;YAAE,OAAO,IAAI,CAAC;QAErD,IAAI,CAAC,IAAI,CAAC,cAAc,IAAI,UAAU;YACpC,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,UAAU,CAAC,QAAQ,CAAA,CAAC,CAAC;QAEvD,uCACK,IAAA,gCAAsB,EACvB,IAAI,CAAC,OAAO,EACZ,MAAM,CAAC,QAAQ,EAAE,EACjB,SAAS,EACT,UAAU,EACV,SAAS,EACT,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,IAAI,EACT,~~IAAI,CAAC,~~UAAU,~~CAChB~~,KACD,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,GAAG,EAAE,MAAA,IAAI,CAAC,GAAG,0CAAE,QAAQ,EAAE,IACzB;IACJ,CAAC;CACF;~~AA9ED~~,~~8CA8EC~~"}
1	+ {"version":3,"file":"AssetTokenBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/AssetTokenBuilder.ts"],"names":[],"mappings":";;;;;;AAQA,gEAAqC;AAErC,4FAAoE;AACpE,8FAAsE;AACtE,iDAA8C;AAI9C,MAAa,iBAAkB,SAAQ,2BAAY;IAUjD,YAAY,MAAiC;QAC3C,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QACzC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC;QAC1C,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,IAAI,KAAK,CAAC;QACrD,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;QACtB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;QACpC,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IACtC,CAAC;IAED,cAAc;QACZ,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACxB,CAAC;IAED,cAAc,CACZ,SAAwB,EACxB,WAA0B;IAC1B,6DAA6D;IAC7D,WAA0B;QAE1B,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,UAAU;YAAE,OAAO,EAAE,CAAC;QAE3B,IAAI,MAAM,GAAG,IAAI,sBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAExC,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,UAAU,CAAC,WAAW;YAAE,OAAO,EAAE,CAAC;QAEzD,IAAI,CAAC,IAAI,CAAC,cAAc;YACtB,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,UAAU,CAAC,QAAQ,CAAA,CAAC,CAAC;QAEvD,OAAO,IAAA,iCAAuB,EAC5B,UAAU,CAAC,OAAO,EAClB,MAAM,CAAC,QAAQ,EAAE,EACjB,SAAS,EACT,UAAU,EACV,SAAS,EACT,IAAI,CAAC,UAAU,CAChB,CAAC;IACJ,CAAC;IAED,GAAG,CACD,SAAwB,EACxB,WAA0B,EAC1B,WAA0B;;QAE1B,IAAI,MAAM,GAAG,IAAI,sBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxC,IAAI,MAAM,CAAC,MAAM,EAAE;YAAE,OAAO,IAAI,CAAC;QAEjC,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,cAAc;YAAE,OAAO,IAAI,CAAC;QAErD,IAAI,CAAC,IAAI,CAAC,cAAc,IAAI,UAAU;YACpC,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,UAAU,CAAC,QAAQ,CAAA,CAAC,CAAC;QAEvD,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEpE,uCACK,IAAA,gCAAsB,EACvB,IAAI,CAAC,OAAO,EACZ,MAAM,CAAC,QAAQ,EAAE,EACjB,SAAS,EACT,UAAU,EACV,SAAS,EACT,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,IAAI,EACT,UAAU,CACX,KACD,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,GAAG,EAAE,MAAA,IAAI,CAAC,GAAG,0CAAE,QAAQ,EAAE,IACzB;IACJ,CAAC;CACF;AAnFD,8CAmFC"}

package/src/utils/elementbuilder/ElementBorrowlendBuilder.d.ts CHANGED Viewed

@@ -4,6 +4,7 @@ import { ElementBuilder } from './ElementBuilder';
 import { Params, PortfolioAssetCollectibleParams, PortfolioAssetGenericParams, PortfolioAssetTokenParams } from './Params';
 import { AssetBuilder } from './AssetBuilder';
 import { AssetGenericBuilder } from './AssetGenericBuilder';
+import { TokenYieldMap } from '../../TokenYieldMap';
 export declare class ElementBorrowlendBuilder extends ElementBuilder {
     borrowedAssets: AssetBuilder[];
     suppliedAssets: AssetBuilder[];
@@ -33,5 +34,5 @@ export declare class ElementBorrowlendBuilder extends ElementBuilder {
     addBorrowedWeight(borrowedWeight: number): void;
     setFixedTerms(isLender: boolean, expireOn?: number | BigNumber): void;
     tokenAddresses(): string[];
-    get(networkId: NetworkIdType, platformId: string, tokenPrices: TokenPriceMap): PortfolioElementBorrowLend | null;
+    get(networkId: NetworkIdType, platformId: string, tokenPrices: TokenPriceMap, tokenYields: TokenYieldMap): PortfolioElementBorrowLend | null;
 }

package/src/utils/elementbuilder/ElementBorrowlendBuilder.js CHANGED Viewed

@@ -75,11 +75,11 @@ class ElementBorrowlendBuilder extends ElementBuilder_1.ElementBuilder {
             ...this.unsettledAssets.map((a) => a.tokenAddresses()),
         ].flat();
     }
-    get(networkId, platformId, tokenPrices) {
+    get(networkId, platformId, tokenPrices, tokenYields) {
         var _a, _b;
         const suppliedAssets = this.suppliedAssets
             .map((sAB, i) => {
-            const sA = sAB.get(networkId, tokenPrices);
+            const sA = sAB.get(networkId, tokenPrices, tokenYields);
             if (sA === null) {
                 this.suppliedYields.splice(i, 1);
                 this.suppliedLtvs.splice(i, 1);
@@ -89,7 +89,7 @@ class ElementBorrowlendBuilder extends ElementBuilder_1.ElementBuilder {
             .filter((a) => a !== null);
         const borrowedAssets = this.borrowedAssets
             .map((bAB, i) => {
-            const bA = bAB.get(networkId, tokenPrices);
+            const bA = bAB.get(networkId, tokenPrices, tokenYields);
             if (bA === null) {
                 this.borrowedYields.splice(i, 1);
                 this.borrowedWeights.splice(i, 1);
@@ -98,7 +98,7 @@ class ElementBorrowlendBuilder extends ElementBuilder_1.ElementBuilder {
         })
             .filter((a) => a !== null && a.value && a.value > 0.002);
         const rewardAssets = this.rewardAssets
-            .map((a) => a.get(networkId, tokenPrices))
+            .map((a) => a.get(networkId, tokenPrices, tokenYields))
             .filter((a) => a !== null);
         const unsettledAssets = this.unsettledAssets
             .map((a) => a.get(networkId, tokenPrices))

package/src/utils/elementbuilder/ElementBorrowlendBuilder.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ElementBorrowlendBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementBorrowlendBuilder.ts"],"names":[],"mappings":";;;;;;AAAA,+DAUoC;AACpC,gEAAqC;AACrC,qDAAkD;AAQlD,2DAAwD;AACxD,+DAA4D;AAC5D,uEAAoE;~~AAEpE~~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~~YAC3C~~,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;gBAChB,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBACjC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACjC,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAqB,CAAC;QAEjD,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc;aACvC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;YACd,MAAM,EAAE,GAAG,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;~~YAC3C~~,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;gBAChB,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBACjC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACpC,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC;aACD,MAAM,CACL,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,KAAK,GAAG,KAAK,CAC5B,CAAC;QAExB,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY;aACnC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;~~aACzC~~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~~AAjND~~,~~4DAiNC~~"}
1	+ {"version":3,"file":"ElementBorrowlendBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementBorrowlendBuilder.ts"],"names":[],"mappings":"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"}

package/src/utils/elementbuilder/ElementBuilder.d.ts CHANGED Viewed

@@ -3,6 +3,7 @@
 import { NetworkIdType, PortfolioElement, PortfolioElementLabel, PortfolioElementTypeType, SourceRef, TokenPriceMap } from '@sonarwatch/portfolio-core';
 import { PublicKey } from '@solana/web3.js';
 import { Params } from './Params';
+import { TokenYieldMap } from '../../TokenYieldMap';
 export declare abstract class ElementBuilder {
     readonly type: PortfolioElementTypeType;
     readonly label: PortfolioElementLabel;
@@ -16,5 +17,5 @@ export declare abstract class ElementBuilder {
     addTag(tag: string): void;
     setName(name: string): void;
     abstract tokenAddresses(): string[];
-    abstract get(networkId: NetworkIdType, platformId: string, tokenPrices: TokenPriceMap): PortfolioElement | null;
+    abstract get(networkId: NetworkIdType, platformId: string, tokenPrices: TokenPriceMap, tokenYields: TokenYieldMap): PortfolioElement | null;
 }

package/src/utils/elementbuilder/ElementBuilder.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ElementBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementBuilder.ts"],"names":[],"mappings":";;;~~AAWA~~,MAAsB,cAAc;IAUlC,YAAsB,MAAc;QAClC,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QAC1B,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;QACpC,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;QACpC,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;QACtB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;IAC1B,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,IAAI,CAAC,IAAI,CAAC,IAAI;YAAE,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;QAC/B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACtB,CAAC;IAED,OAAO,CAAC,IAAY;QAClB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;~~CASF~~;~~AArCD~~,~~wCAqCC~~"}
1	+ {"version":3,"file":"ElementBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementBuilder.ts"],"names":[],"mappings":";;;AAYA,MAAsB,cAAc;IAUlC,YAAsB,MAAc;QAClC,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QAC1B,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;QACpC,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;QACpC,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;QACtB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;IAC1B,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,IAAI,CAAC,IAAI,CAAC,IAAI;YAAE,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;QAC/B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACtB,CAAC;IAED,OAAO,CAAC,IAAY;QAClB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;CAUF;AAtCD,wCAsCC"}

package/src/utils/elementbuilder/ElementConcentratedLiquidityBuilder.d.ts CHANGED Viewed

@@ -2,10 +2,11 @@ import { NetworkIdType, PortfolioElementLiquidity, TokenPriceMap } from '@sonarw
 import { ElementLiquidityBuilder } from './ElementLiquidityBuilder';
 import { LiquidityBuilder } from './LiquidityBuilder';
 import { ConcentratedLiquidityParams, LiquidityParams } from './Params';
+import { TokenYieldMap } from '../../TokenYieldMap';
 export declare class ElementConcentratedLiquidityBuilder extends ElementLiquidityBuilder {
     concentratedLiquidityParams?: ConcentratedLiquidityParams;
     addLiquidity(params?: LiquidityParams): LiquidityBuilder;
     setLiquidity(params: ConcentratedLiquidityParams): LiquidityBuilder;
     tokenAddresses(): string[];
-    get(networkId: NetworkIdType, platformId: string, tokenPrices: TokenPriceMap): PortfolioElementLiquidity | null;
+    get(networkId: NetworkIdType, platformId: string, tokenPrices: TokenPriceMap, tokenYields: TokenYieldMap): PortfolioElementLiquidity | null;
 }