@sonarwatch/portfolio-plugins 0.14.0 → 0.14.2

package/src/plugins/native-stake/solana/solanaFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"solanaFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/native-stake/solana/solanaFetcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"solanaFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/native-stake/solana/solanaFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAMoC;AACpC,gEAAqC;AAIrC,4CAA8E;AAC9E,oDAAyD;AACzD,kDAAiE;AACjE,uCAAgD;AAChD,uCAA+C;AAC/C,wGAAgF;AAChF,wDAA4E;AAC5E,oDAAoE;AACpE,2CAIqB;AACrB,qEAAkE;AAElE,+DAA4D;AAE5D,MAAM,cAAc,GAAG,IAAI,6BAAa,CACtC,yBAAa,EACb;IACE,MAAM,EAAE,sBAAU;IAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;CAC5B,EACD,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,uBAAU,EAAC,GAAG,IAAI,EAAE,EAAE,OAAO,CAAC,CACxC,CAAC;AAEF,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,OAAO,GAAG,IAAA,6BAAmB,EAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IAEtD,MAAM,aAAa,GAAG,MAAM,IAAA,iCAAwB,EAClD,MAAM,EACN,4BAAkB,EAClB,0BAAc,EACd,OAAO,CACR,CAAC;IACF,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAE1C,MAAM,CAAC,aAAa,EAAE,SAAS,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC/D,KAAK,CAAC,aAAa,CAAC,8BAAa,CAAC,MAAM,CAAC,OAAO,EAAE,0BAAS,CAAC,MAAM,CAAC;QACnE,KAAK,CAAC,OAAO,CAAY,6BAAiB,EAAE;YAC1C,MAAM,EAAE,sBAAU;YAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;SAC5B,CAAC;QACF,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC;KAC9B,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,CAAC;IAC/B,IAAI,iBAAiB,GAAG,CAAC,CAAC;IAC1B,IAAI,SAAS,GAAG,CAAC,CAAC;IAClB,IAAI,iBAAiB,GAAG,CAAC,CAAC;IAC1B,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,IAAI,YAAY,GAAqB,EAAE,CAAC;IACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACjD,MAAM,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QACtC,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QAChE,MAAM,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,YAAY,CAAC;QAEpE,MAAM,UAAU,GAAG,oCAAwB,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QAExE,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU;YAC1C,UAAU,IAAI,IAAI,sBAAS,CAAC,YAAY,CAAC,QAAQ,CAAC;iBAC/C,KAAK,CAAC,YAAY,CAAC,iBAAiB,CAAC;iBACrC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC;iBACzB,SAAS,CAAC,SAAA,EAAE,EAAI,CAAC,CAAA,CAAC;iBAClB,QAAQ,EAAE,CAAC;QAEhB,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,YAAY,CAAC,QAAQ,CAAC;aAChD,KAAK,CAAC,YAAY,CAAC,iBAAiB,CAAC;aACrC,SAAS,CAAC,SAAA,EAAE,EAAI,CAAC,CAAA,CAAC;aAClB,QAAQ,EAAE,CAAC;QACd,IAAI,MAAM,IAAI,CAAC;YAAE,SAAS;QAE1B,IAAI,UAAU,EAAE,CAAC;YACf,iBAAiB,IAAI,MAAM,CAAC;YAC5B,iBAAiB,IAAI,CAAC,CAAC;YACvB,SAAS;QACX,CAAC;;YAAM,SAAS,IAAI,MAAM,CAAC;QAE3B,cAAc;QACd,MAAM,IAAI,GAAG,EAAE,CAAC;QAChB,IACE,KAAK;YACL,eAAe,CAAC,SAAS,CAAC,KAAK,CAAC;YAChC,iBAAiB,CAAC,SAAS,CAAC,KAAK,CAAC,EAClC,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACxB,CAAC;aAAM,IAAI,KAAK,IAAI,eAAe,CAAC,sBAAsB,CAAC,KAAK,CAAC,EAAE,CAAC;YAClE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC1B,CAAC;aAAM,IAAI,KAAK,IAAI,iBAAiB,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;YACxD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACxB,CAAC;aAAM,IAAI,KAAK,IAAI,iBAAiB,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YACvD,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACzB,CAAC;aAAM,IAAI,iBAAiB,CAAC,MAAM,EAAE,IAAI,eAAe,CAAC,MAAM,EAAE,EAAE,CAAC;YAClE,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC3B,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACtB,CAAC;QAED,MAAM,WAAW,GACf,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,IAAI,SAAS,CAAC;QAExE,YAAY,CAAC,IAAI,iCACZ,IAAA,gCAAsB,EACvB,8BAAa,CAAC,MAAM,CAAC,OAAO,EAC5B,MAAM,EACN,0BAAS,CAAC,MAAM,EAChB,aAAa,EACb,SAAS,EACT;YACE,IAAI;YACJ,WAAW;SACZ,CACF,KACD,IAAI,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,EACrB,QAAQ,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,IAC7B,CAAC;IACL,CAAC;IAED,IAAI,YAAY,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;QAC7B,YAAY,GAAG;YACb,IAAA,gCAAsB,EACpB,8BAAa,CAAC,MAAM,CAAC,OAAO,EAC5B,SAAS,EACT,0BAAS,CAAC,MAAM,EAChB,aAAa,CACd;SACF,CAAC;IACJ,CAAC;IAED,MAAM,QAAQ,GAAuB,EAAE,CAAC;IACxC,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,QAAQ,CAAC,IAAI,CAAC;YACZ,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAE,+BAAmB,CAAC,EAAE;YAClC,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,QAAQ;YACf,KAAK,EAAE,IAAA,+BAAc,EAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACvD,IAAI,EAAE;gBACJ,MAAM,EAAE,YAAY;aACrB;SACF,CAAC,CAAC;IACL,CAAC;IACD,IAAI,iBAAiB,KAAK,CAAC,EAAE,CAAC;QAC5B,QAAQ,CAAC,IAAI,CAAC;YACZ,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAE,sBAAkB;YAC9B,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,QAAQ;YACf,IAAI,EAAE,WAAW,iBAAiB,cAAc;YAChD,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,iBAAiB,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;YACrE,IAAI,EAAE;gBACJ,MAAM,EAAE;oDAED,IAAA,gCAAsB,EACvB,8BAAa,CAAC,MAAM,CAAC,OAAO,EAC5B,iBAAiB,EACjB,0BAAS,CAAC,MAAM,EAChB,aAAa,CACd,KACD,UAAU,EAAE,EAAE;iBAEjB;aACF;SACF,CAAC,CAAC;IACL,CAAC;IACD,IAAI,UAAU,GAAG,CAAC,EAAE,CAAC;QACnB,QAAQ,CAAC,IAAI,CAAC;YACZ,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAE,sBAAc;YAC1B,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,aAAa;YACnB,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,UAAU,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;YAC9D,IAAI,EAAE;gBACJ,MAAM,EAAE;oDAED,IAAA,gCAAsB,EACvB,8BAAa,CAAC,MAAM,CAAC,OAAO,EAC5B,UAAU,EACV,0BAAS,CAAC,MAAM,EAChB,aAAa,CACd,KACD,UAAU,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE;iBAEpC;aACF;SACF,CAAC,CAAC;IACL,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC;AACF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,SAAS;IAC1B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/nxfinance/positionsFetcher.js

@@ -57,7 +57,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         const amount = new bignumber_js_1.default(deposit.depositNote).multipliedBy(supplyNoteRate);
         const asset = {
             address: deposit.tokenMint,
-            amount: amount,
+            amount,
         };
         if (constants_1.leverageVaultsMints.includes(deposit.tokenMint)) {
             elementBorrowlend.addSuppliedAsset(asset);

package/src/plugins/nxfinance/positionsFetcher.js.map

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

package/src/plugins/scallop/cnyAirdropFetcher.js

@@ -50,7 +50,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             type: 'address',
             value: owner,
         },
-        parentId: constants_1.tableId,
+        parentId: constants_1.cnyTableId,
     });
     if (claimStatus.data)
         return [];

package/src/plugins/scallop/cnyAirdropFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"cnyAirdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/scallop/cnyAirdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAA6E;AAC7E,qCAAoD;AACpD,gEAAqC;AACrC,kDAA6C;AAG7C,2CAA8D;AAC9D,iFAA8E;AAE9E,qGAA6E;AAC7E,iDAA6C;AAC7C,iDAAmD;AAEnD,SAAS,SAAS,CAAC,SAAiB;IAClC,IAAI,CAAC,SAAS;QAAE,OAAO,SAAS,CAAC;IAEjC,MAAM,GAAG,GAAG,IAAI,SAAG,CAAC,IAAA,sBAAgB,GAAE,CAAC,CAAC;IACxC,GAAG,CAAC,kBAAkB,CAAC,YAAY,EAAE;QACnC,MAAM,EAAE,YAAY;QACpB,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,KAAK;KACd,CAAC,CAAC;IACH,MAAM,WAAW,GAAG,GAAG,CAAC,EAAE,CAAC,YAAY,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC9D,OAAO,IAAA,sBAAS,EAAC,WAAW,CAAC,MAAM,CAAC;SACjC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;SACjB,QAAQ,EAAE,CAAC;AAChB,CAAC;AAED,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,SAAS,GAAsC,MAAM,eAAK;SAC7D,GAAG,CAAC,sBAAU,GAAG,KAAK,CAAC;SACvB,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IAErB,IAAI,CAAC,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,CAAC,IAAI,CAAA,IAAI,SAAS,CAAC,MAAM,KAAK,GAAG;QAAE,OAAO,EAAE,CAAC;IAEjE,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9C,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IAEvB,MAAM,MAAM,GAAG,IAAA,sBAAY,GAAE,CAAC;IAC9B,MAAM,WAAW,GAAG,MAAM,IAAA,6CAAqB,EAAc,MAAM,EAAE;QACnE,IAAI,EAAE;YACJ,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,KAAK;SACb;QACD,QAAQ,EAAE,mBAAO;KAClB,CAAC,CAAC;IACH,IAAI,WAAW,CAAC,IAAI;QAAE,OAAO,EAAE,CAAC;IAEhC,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,oBAAQ,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC;IACxE,MAAM,KAAK,GAAG,IAAA,gCAAsB,EAClC,oBAAQ,EACR,MAAM,EACN,0BAAS,CAAC,MAAM,EAChB,SAAS,EACT,SAAS,EACT,EAAE,WAAW,EAAE,IAAI,EAAE,CACtB,CAAC;IAEF,OAAO;QACL;YACE,IAAI,EAAE,qCAAoB,CAAC,QAAQ;YACnC,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,KAAK;YACX,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,IAAI,EAAE;gBACJ,MAAM,EAAE,CAAC,KAAK,CAAC;aAChB;YACD,KAAK,EAAE,KAAK,CAAC,KAAK;SACnB;KACF,CAAC;AACJ,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,cAAc;IAC/B,SAAS,EAAE,0BAAS,CAAC,GAAG;IACxB,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"cnyAirdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/scallop/cnyAirdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAA6E;AAC7E,qCAAoD;AACpD,gEAAqC;AACrC,kDAA6C;AAG7C,2CAAiE;AACjE,iFAA8E;AAE9E,qGAA6E;AAC7E,iDAA6C;AAC7C,iDAAmD;AAEnD,SAAS,SAAS,CAAC,SAAiB;IAClC,IAAI,CAAC,SAAS;QAAE,OAAO,SAAS,CAAC;IAEjC,MAAM,GAAG,GAAG,IAAI,SAAG,CAAC,IAAA,sBAAgB,GAAE,CAAC,CAAC;IACxC,GAAG,CAAC,kBAAkB,CAAC,YAAY,EAAE;QACnC,MAAM,EAAE,YAAY;QACpB,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,KAAK;KACd,CAAC,CAAC;IACH,MAAM,WAAW,GAAG,GAAG,CAAC,EAAE,CAAC,YAAY,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC9D,OAAO,IAAA,sBAAS,EAAC,WAAW,CAAC,MAAM,CAAC;SACjC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;SACjB,QAAQ,EAAE,CAAC;AAChB,CAAC;AAED,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,SAAS,GAAsC,MAAM,eAAK;SAC7D,GAAG,CAAC,sBAAU,GAAG,KAAK,CAAC;SACvB,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IAErB,IAAI,CAAC,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,CAAC,IAAI,CAAA,IAAI,SAAS,CAAC,MAAM,KAAK,GAAG;QAAE,OAAO,EAAE,CAAC;IAEjE,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9C,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IAEvB,MAAM,MAAM,GAAG,IAAA,sBAAY,GAAE,CAAC;IAC9B,MAAM,WAAW,GAAG,MAAM,IAAA,6CAAqB,EAAc,MAAM,EAAE;QACnE,IAAI,EAAE;YACJ,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,KAAK;SACb;QACD,QAAQ,EAAE,sBAAU;KACrB,CAAC,CAAC;IACH,IAAI,WAAW,CAAC,IAAI;QAAE,OAAO,EAAE,CAAC;IAEhC,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,oBAAQ,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC;IACxE,MAAM,KAAK,GAAG,IAAA,gCAAsB,EAClC,oBAAQ,EACR,MAAM,EACN,0BAAS,CAAC,MAAM,EAChB,SAAS,EACT,SAAS,EACT,EAAE,WAAW,EAAE,IAAI,EAAE,CACtB,CAAC;IAEF,OAAO;QACL;YACE,IAAI,EAAE,qCAAoB,CAAC,QAAQ;YACnC,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,KAAK;YACX,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,IAAI,EAAE;gBACJ,MAAM,EAAE,CAAC,KAAK,CAAC;aAChB;YACD,KAAK,EAAE,KAAK,CAAC,KAAK;SACnB;KACF,CAAC;AACJ,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,cAAc;IAC/B,SAAS,EAAE,0BAAS,CAAC,GAAG;IACxB,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

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

@@ -6,28 +6,21 @@ export declare const marketPrefix = "scallop-market";
 export declare const scoinPrefix = "scallop-scoin";
 export declare const poolsPrefix = "scallop-pools";
 export declare const spoolsPrefix = "scallop-spoolsmarket";
-export declare const addressEndpoint = "https://sui.apis.scallop.io/addresses/664dfe22898c36c159e28bc8";
+export declare const addressEndpoint = "https://sui.apis.scallop.io/addresses/66f8e7ed9bb9e07fdfb86bbb";
 export declare const addressKey = "scallop-address-key";
 export declare const marketKey = "scallop-market-key";
 export declare const poolsKey = "scallop-pools-key";
 export declare const scoinKey = "scallop-scoin-key";
 export declare const spoolsKey = "scallop-spoolsmarket-key";
-export declare const spoolAccountPackageId = "0xe87f1b2d498106a2c61421cec75b7b5c5e348512b0dc263949a0e7a3c256571a::spool_account::SpoolAccount";
-export declare const marketCoinPackageId = "0xefe8b36d5b2e43728cc323298626b83177803521d195cfb11e15b910e892fddf::reserve::MarketCoin";
-export declare const obligationKeyPackageId = "0xefe8b36d5b2e43728cc323298626b83177803521d195cfb11e15b910e892fddf::obligation::ObligationKey";
+export declare const sPoolAccountType = "0xe87f1b2d498106a2c61421cec75b7b5c5e348512b0dc263949a0e7a3c256571a::spool_account::SpoolAccount";
+export declare const veScaKeyType = "0xcfe2d87aa5712b67cad2732edb6a2201bfdf592377e5c0968b7cb02099bd8e21::ve_sca::VeScaKey";
+export declare const marketCoinType = "0xefe8b36d5b2e43728cc323298626b83177803521d195cfb11e15b910e892fddf::reserve::MarketCoin";
+export declare const obligationKeyType = "0xefe8b36d5b2e43728cc323298626b83177803521d195cfb11e15b910e892fddf::obligation::ObligationKey";
 export declare const baseIndexRate = 1000000000;
 export declare const scaAddress = "0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6::sca::SCA";
 export declare const scaDecimals = 9;
-export declare const tableId = "0xbfbbbdf1fe9b70cdd1ebd1444ca273000177f81a405935f6007b7727d2ff90c2";
+export declare const cnyTableId = "0xbfbbbdf1fe9b70cdd1ebd1444ca273000177f81a405935f6007b7727d2ff90c2";
 export declare const airdropUrl = "https://airdrop.apis.scallop.io/cny-campaign/claim-signature/";
-export declare const SCOIN_NAMES: readonly ["scallop_sui", "scallop_cetus", "scallop_sca", "scallop_wormhole_usdc", "scallop_wormhole_usdt", "scallop_wormhole_eth", "scallop_af_sui", "scallop_ha_sui", "scallop_v_sui"];
-export declare const COIN_NAMES: readonly ["eth", "btc", "usdc", "usdt", "sui", "apt", "sol", "cetus", "sca", "afsui", "hasui", "vsui"];
-export declare const MARKET_COIN_NAMES: readonly ["seth", "sbtc", "susdc", "susdt", "ssui", "sapt", "ssol", "scetus", "ssca", "safsui", "shasui", "svsui"];
-export declare const sCoinTypesMap: {
-    [T in sCoinNames]: string;
-};
-export type sCoinNames = (typeof SCOIN_NAMES)[number];
-export type CoinNames = (typeof COIN_NAMES)[number];
-export declare const sCoinToCoinName: {
-    [T in sCoinNames]: CoinNames;
-};
+export declare const scoinNames: readonly ["scallop_sui", "scallop_cetus", "scallop_sca", "scallop_wormhole_usdc", "scallop_wormhole_usdt", "scallop_wormhole_eth", "scallop_wormhole_btc", "scallop_wormhole_sol", "scallop_af_sui", "scallop_ha_sui", "scallop_v_sui", "scallop_usdc"];
+export declare const coinNames: readonly ["weth", "wbtc", "wusdc", "wusdt", "sui", "wapt", "wsol", "cetus", "sca", "afsui", "hasui", "vsui", "usdc"];
+export declare const marketCoinNames: readonly ["sweth", "swbtc", "swusdc", "swusdt", "ssui", "swapt", "swsol", "scetus", "ssca", "safsui", "shasui", "svsui", "susdc"];

package/src/plugins/scallop/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sCoinToCoinName = exports.sCoinTypesMap = exports.MARKET_COIN_NAMES = exports.COIN_NAMES = exports.SCOIN_NAMES = exports.airdropUrl = exports.tableId = exports.scaDecimals = exports.scaAddress = exports.baseIndexRate = exports.obligationKeyPackageId = exports.marketCoinPackageId = exports.spoolAccountPackageId = exports.spoolsKey = exports.scoinKey = exports.poolsKey = exports.marketKey = exports.addressKey = exports.addressEndpoint = exports.spoolsPrefix = exports.poolsPrefix = exports.scoinPrefix = exports.marketPrefix = exports.addressPrefix = exports.platform = exports.platformId = void 0;
+exports.marketCoinNames = exports.coinNames = exports.scoinNames = exports.airdropUrl = exports.cnyTableId = exports.scaDecimals = exports.scaAddress = exports.baseIndexRate = exports.obligationKeyType = exports.marketCoinType = exports.veScaKeyType = exports.sPoolAccountType = exports.spoolsKey = exports.scoinKey = exports.poolsKey = exports.marketKey = exports.addressKey = exports.addressEndpoint = exports.spoolsPrefix = exports.poolsPrefix = exports.scoinPrefix = exports.marketPrefix = exports.addressPrefix = exports.platform = exports.platformId = void 0;
 exports.platformId = 'scallop';
 exports.platform = {
     id: exports.platformId,
@@ -14,80 +14,64 @@ exports.marketPrefix = `${exports.platformId}-market`;
 exports.scoinPrefix = `${exports.platformId}-scoin`;
 exports.poolsPrefix = `${exports.platformId}-pools`;
 exports.spoolsPrefix = `${exports.platformId}-spoolsmarket`;
-exports.addressEndpoint = 'https://sui.apis.scallop.io/addresses/664dfe22898c36c159e28bc8';
+exports.addressEndpoint = 'https://sui.apis.scallop.io/addresses/66f8e7ed9bb9e07fdfb86bbb';
 exports.addressKey = 'scallop-address-key';
 exports.marketKey = 'scallop-market-key';
 exports.poolsKey = 'scallop-pools-key';
 exports.scoinKey = 'scallop-scoin-key';
 exports.spoolsKey = 'scallop-spoolsmarket-key';
-exports.spoolAccountPackageId = `0xe87f1b2d498106a2c61421cec75b7b5c5e348512b0dc263949a0e7a3c256571a::spool_account::SpoolAccount`;
-const PROTOCOL_OBJECT_ID = '0xefe8b36d5b2e43728cc323298626b83177803521d195cfb11e15b910e892fddf';
-exports.marketCoinPackageId = `${PROTOCOL_OBJECT_ID}::reserve::MarketCoin`;
-exports.obligationKeyPackageId = `${PROTOCOL_OBJECT_ID}::obligation::ObligationKey`;
+exports.sPoolAccountType = `0xe87f1b2d498106a2c61421cec75b7b5c5e348512b0dc263949a0e7a3c256571a::spool_account::SpoolAccount`;
+exports.veScaKeyType = '0xcfe2d87aa5712b67cad2732edb6a2201bfdf592377e5c0968b7cb02099bd8e21::ve_sca::VeScaKey';
+const scallopPackageId = '0xefe8b36d5b2e43728cc323298626b83177803521d195cfb11e15b910e892fddf';
+exports.marketCoinType = `${scallopPackageId}::reserve::MarketCoin`;
+exports.obligationKeyType = `${scallopPackageId}::obligation::ObligationKey`;
 exports.baseIndexRate = 1000000000;
 exports.scaAddress = '0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6::sca::SCA';
 exports.scaDecimals = 9;
-exports.tableId = '0xbfbbbdf1fe9b70cdd1ebd1444ca273000177f81a405935f6007b7727d2ff90c2';
+exports.cnyTableId = '0xbfbbbdf1fe9b70cdd1ebd1444ca273000177f81a405935f6007b7727d2ff90c2';
 exports.airdropUrl = 'https://airdrop.apis.scallop.io/cny-campaign/claim-signature/';
-exports.SCOIN_NAMES = [
+exports.scoinNames = [
     'scallop_sui',
     'scallop_cetus',
     'scallop_sca',
     'scallop_wormhole_usdc',
     'scallop_wormhole_usdt',
     'scallop_wormhole_eth',
+    'scallop_wormhole_btc',
+    'scallop_wormhole_sol',
     'scallop_af_sui',
     'scallop_ha_sui',
     'scallop_v_sui',
+    'scallop_usdc',
 ];
-exports.COIN_NAMES = [
-    'eth',
-    'btc',
-    'usdc',
-    'usdt',
+exports.coinNames = [
+    'weth',
+    'wbtc',
+    'wusdc',
+    'wusdt',
     'sui',
-    'apt',
-    'sol',
+    'wapt',
+    'wsol',
     'cetus',
     'sca',
     'afsui',
     'hasui',
     'vsui',
+    'usdc',
 ];
-exports.MARKET_COIN_NAMES = [
-    'seth',
-    'sbtc',
-    'susdc',
-    'susdt',
+exports.marketCoinNames = [
+    'sweth',
+    'swbtc',
+    'swusdc',
+    'swusdt',
     'ssui',
-    'sapt',
-    'ssol',
+    'swapt',
+    'swsol',
     'scetus',
     'ssca',
     'safsui',
     'shasui',
     'svsui',
+    'susdc',
 ];
-exports.sCoinTypesMap = {
-    scallop_sui: '0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI',
-    scallop_cetus: '0xea346ce428f91ab007210443efcea5f5cdbbb3aae7e9affc0ca93f9203c31f0c::scallop_cetus::SCALLOP_CETUS',
-    scallop_sca: '0x5ca17430c1d046fae9edeaa8fd76c7b4193a00d764a0ecfa9418d733ad27bc1e::scallop_sca::SCALLOP_SCA',
-    scallop_wormhole_usdc: '0xad4d71551d31092230db1fd482008ea42867dbf27b286e9c70a79d2a6191d58d::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC',
-    scallop_wormhole_usdt: '0xe6e5a012ec20a49a3d1d57bd2b67140b96cd4d3400b9d79e541f7bdbab661f95::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT',
-    scallop_wormhole_eth: '0x67540ceb850d418679e69f1fb6b2093d6df78a2a699ffc733f7646096d552e9b::scallop_wormhole_eth::SCALLOP_WORMHOLE_ETH',
-    scallop_af_sui: '0x00671b1fa2a124f5be8bdae8b91ee711462c5d9e31bda232e70fd9607b523c88::scallop_af_sui::SCALLOP_AF_SUI',
-    scallop_ha_sui: '0x9a2376943f7d22f88087c259c5889925f332ca4347e669dc37d54c2bf651af3c::scallop_ha_sui::SCALLOP_HA_SUI',
-    scallop_v_sui: '0xe1a1cc6bcf0001a015eab84bcc6713393ce20535f55b8b6f35c142e057a25fbe::scallop_v_sui::SCALLOP_V_SUI',
-};
-exports.sCoinToCoinName = {
-    scallop_sui: 'sui',
-    scallop_cetus: 'cetus',
-    scallop_sca: 'sca',
-    scallop_wormhole_usdc: 'usdc',
-    scallop_wormhole_usdt: 'usdt',
-    scallop_wormhole_eth: 'eth',
-    scallop_af_sui: 'afsui',
-    scallop_ha_sui: 'hasui',
-    scallop_v_sui: 'vsui',
-};
 //# sourceMappingURL=constants.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/scallop/constants.ts"],"names":[],"mappings":";;;AAEa,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,qCAAqC,kBAAU,OAAO;IAC7D,WAAW,EAAE,gBAAgB;IAC7B,OAAO,EAAE,yBAAyB;CACnC,CAAC;AAEW,QAAA,aAAa,GAAG,GAAG,kBAAU,UAAU,CAAC;AACxC,QAAA,YAAY,GAAG,GAAG,kBAAU,SAAS,CAAC;AACtC,QAAA,WAAW,GAAG,GAAG,kBAAU,QAAQ,CAAC;AACpC,QAAA,WAAW,GAAG,GAAG,kBAAU,QAAQ,CAAC;AACpC,QAAA,YAAY,GAAG,GAAG,kBAAU,eAAe,CAAC;AAE5C,QAAA,eAAe,GAC1B,gEAAgE,CAAC;AACtD,QAAA,UAAU,GAAG,qBAAqB,CAAC;AACnC,QAAA,SAAS,GAAG,oBAAoB,CAAC;AACjC,QAAA,QAAQ,GAAG,mBAAmB,CAAC;AAC/B,QAAA,QAAQ,GAAG,mBAAmB,CAAC;AAC/B,QAAA,SAAS,GAAG,0BAA0B,CAAC;AAEvC,QAAA,qBAAqB,GAAG,iGAAiG,CAAC;AACvI,MAAM,kBAAkB,GACtB,oEAAoE,CAAC;AAC1D,QAAA,mBAAmB,GAAG,GAAG,kBAAkB,uBAAuB,CAAC;AACnE,QAAA,sBAAsB,GAAG,GAAG,kBAAkB,6BAA6B,CAAC;AAC5E,QAAA,aAAa,GAAG,UAAa,CAAC;AAC9B,QAAA,UAAU,GACrB,8EAA8E,CAAC;AACpE,QAAA,WAAW,GAAG,CAAC,CAAC;AAEhB,QAAA,OAAO,GAClB,oEAAoE,CAAC;AAC1D,QAAA,UAAU,GACrB,+DAA+D,CAAC;AAErD,QAAA,WAAW,GAAG;IACzB,aAAa;IACb,eAAe;IACf,aAAa;IACb,uBAAuB;IACvB,uBAAuB;IACvB,sBAAsB;IACtB,gBAAgB;IAChB,gBAAgB;IAChB,eAAe;CACP,CAAC;AAEE,QAAA,UAAU,GAAG;IACxB,KAAK;IACL,KAAK;IACL,MAAM;IACN,MAAM;IACN,KAAK;IACL,KAAK;IACL,KAAK;IACL,OAAO;IACP,KAAK;IACL,OAAO;IACP,OAAO;IACP,MAAM;CACE,CAAC;AAEE,QAAA,iBAAiB,GAAG;IAC/B,MAAM;IACN,MAAM;IACN,OAAO;IACP,OAAO;IACP,MAAM;IACN,MAAM;IACN,MAAM;IACN,QAAQ;IACR,MAAM;IACN,QAAQ;IACR,QAAQ;IACR,OAAO;CACC,CAAC;AAEE,QAAA,aAAa,GAAkC;IAC1D,WAAW,EACT,8FAA8F;IAChG,aAAa,EACX,kGAAkG;IACpG,WAAW,EACT,8FAA8F;IAChG,qBAAqB,EACnB,kHAAkH;IACpH,qBAAqB,EACnB,kHAAkH;IACpH,oBAAoB,EAClB,gHAAgH;IAClH,cAAc,EACZ,oGAAoG;IACtG,cAAc,EACZ,oGAAoG;IACtG,aAAa,EACX,kGAAkG;CAC5F,CAAC;AAOE,QAAA,eAAe,GAAqC;IAC/D,WAAW,EAAE,KAAK;IAClB,aAAa,EAAE,OAAO;IACtB,WAAW,EAAE,KAAK;IAClB,qBAAqB,EAAE,MAAM;IAC7B,qBAAqB,EAAE,MAAM;IAC7B,oBAAoB,EAAE,KAAK;IAC3B,cAAc,EAAE,OAAO;IACvB,cAAc,EAAE,OAAO;IACvB,aAAa,EAAE,MAAM;CACtB,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/scallop/constants.ts"],"names":[],"mappings":";;;AAEa,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,qCAAqC,kBAAU,OAAO;IAC7D,WAAW,EAAE,gBAAgB;IAC7B,OAAO,EAAE,yBAAyB;CACnC,CAAC;AAEW,QAAA,aAAa,GAAG,GAAG,kBAAU,UAAU,CAAC;AACxC,QAAA,YAAY,GAAG,GAAG,kBAAU,SAAS,CAAC;AACtC,QAAA,WAAW,GAAG,GAAG,kBAAU,QAAQ,CAAC;AACpC,QAAA,WAAW,GAAG,GAAG,kBAAU,QAAQ,CAAC;AACpC,QAAA,YAAY,GAAG,GAAG,kBAAU,eAAe,CAAC;AAE5C,QAAA,eAAe,GAC1B,gEAAgE,CAAC;AACtD,QAAA,UAAU,GAAG,qBAAqB,CAAC;AACnC,QAAA,SAAS,GAAG,oBAAoB,CAAC;AACjC,QAAA,QAAQ,GAAG,mBAAmB,CAAC;AAC/B,QAAA,QAAQ,GAAG,mBAAmB,CAAC;AAC/B,QAAA,SAAS,GAAG,0BAA0B,CAAC;AAEvC,QAAA,gBAAgB,GAAG,iGAAiG,CAAC;AACrH,QAAA,YAAY,GACvB,sFAAsF,CAAC;AAEzF,MAAM,gBAAgB,GACpB,oEAAoE,CAAC;AAC1D,QAAA,cAAc,GAAG,GAAG,gBAAgB,uBAAuB,CAAC;AAC5D,QAAA,iBAAiB,GAAG,GAAG,gBAAgB,6BAA6B,CAAC;AAErE,QAAA,aAAa,GAAG,UAAa,CAAC;AAC9B,QAAA,UAAU,GACrB,8EAA8E,CAAC;AACpE,QAAA,WAAW,GAAG,CAAC,CAAC;AAEhB,QAAA,UAAU,GACrB,oEAAoE,CAAC;AAC1D,QAAA,UAAU,GACrB,+DAA+D,CAAC;AAErD,QAAA,UAAU,GAAG;IACxB,aAAa;IACb,eAAe;IACf,aAAa;IACb,uBAAuB;IACvB,uBAAuB;IACvB,sBAAsB;IACtB,sBAAsB;IACtB,sBAAsB;IACtB,gBAAgB;IAChB,gBAAgB;IAChB,eAAe;IACf,cAAc;CACN,CAAC;AAEE,QAAA,SAAS,GAAG;IACvB,MAAM;IACN,MAAM;IACN,OAAO;IACP,OAAO;IACP,KAAK;IACL,MAAM;IACN,MAAM;IACN,OAAO;IACP,KAAK;IACL,OAAO;IACP,OAAO;IACP,MAAM;IACN,MAAM;CACE,CAAC;AAEE,QAAA,eAAe,GAAG;IAC7B,OAAO;IACP,OAAO;IACP,QAAQ;IACR,QAAQ;IACR,MAAM;IACN,OAAO;IACP,OAAO;IACP,QAAQ;IACR,MAAM;IACN,QAAQ;IACR,QAAQ;IACR,OAAO;IACP,OAAO;CACC,CAAC"}

package/src/plugins/scallop/index.js

@@ -14,7 +14,13 @@ const veScaFetcher_1 = __importDefault(require("./veScaFetcher"));
 const obligationsFetcher_1 = __importDefault(require("./obligationsFetcher"));
 const cnyAirdropFetcher_1 = __importDefault(require("./cnyAirdropFetcher"));
 const constants_1 = require("./constants");
-exports.jobs = [addressJob_1.default, sCoinJob_1.default, poolsJob_1.default, marketJob_1.default, spoolsMarketJob_1.default];
+exports.jobs = [
+    addressJob_1.default,
+    sCoinJob_1.default,
+    poolsJob_1.default,
+    marketJob_1.default,
+    spoolsMarketJob_1.default,
+];
 exports.fetchers = [
     lendingsFetcher_1.default,
     obligationsFetcher_1.default,

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/scallop/index.ts"],"names":[],"mappings":";;;;;;AAGA,0DAAkC;AAClC,8DAAsC;AACtC,4DAAoC;AACpC,wEAAgD;AAChD,0DAAkC;AAElC,wEAAgD;AAChD,kEAA0C;AAC1C,8EAAsD;AACtD,4EAAmD;AACnD,2CAAuC;AAE1B,QAAA,IAAI,GAAU,CAAC,oBAAU,EAAE,kBAAQ,EAAE,kBAAQ,EAAE,mBAAS,EAAE,yBAAe,CAAC,CAAC;AAC3E,QAAA,QAAQ,GAAc;IACjC,yBAAe;IACf,4BAAkB;IAClB,sBAAY;IACZ,2BAAgB;CACjB,CAAC;AACW,QAAA,SAAS,GAAe,CAAC,oBAAQ,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/scallop/index.ts"],"names":[],"mappings":";;;;;;AAGA,0DAAkC;AAClC,8DAAsC;AACtC,4DAAoC;AACpC,wEAAgD;AAChD,0DAAkC;AAElC,wEAAgD;AAChD,kEAA0C;AAC1C,8EAAsD;AACtD,4EAAmD;AACnD,2CAAuC;AAE1B,QAAA,IAAI,GAAU;IACzB,oBAAU;IACV,kBAAQ;IACR,kBAAQ;IACR,mBAAS;IACT,yBAAe;CAChB,CAAC;AACW,QAAA,QAAQ,GAAc;IACjC,yBAAe;IACf,4BAAkB;IAClB,sBAAY;IACZ,2BAAgB;CACjB,CAAC;AACW,QAAA,SAAS,GAAe,CAAC,oBAAQ,CAAC,CAAC"}

package/src/plugins/scallop/lendingsFetcher.js

@@ -12,15 +12,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const utils_1 = require("@mysten/sui/utils");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const constants_1 = require("./constants");
 const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
+const types_1 = require("./types");
 const getOwnedObjects_1 = require("../../utils/sui/getOwnedObjects");
 const clients_1 = require("../../utils/clients");
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     const elements = [];
     const borrowedAssets = [];
     const borrowedYields = [];
@@ -39,25 +41,31 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         return [];
     }
     const poolValues = Object.values(pools);
-    const sCoinValues = Object.values(sCoins);
     if (poolValues.length === 0) {
         return [];
     }
+    const sCoinValues = Object.values(sCoins);
+    // {'0x...': CoinMetaData }
+    const poolValuesMetadataMap = poolValues.reduce((acc, poolValue) => {
+        if (poolValue.metadata)
+            acc[poolValue.coinType] = poolValue.metadata;
+        return acc;
+    }, {});
     const client = (0, clients_1.getClientSui)();
     const filterOwnerObject = {
         MatchAny: [
             ...poolValues.map((value) => ({
-                StructType: `0x2::coin::Coin<${constants_1.marketCoinPackageId}<${value.coinType}>>`,
+                StructType: `0x2::coin::Coin<${constants_1.marketCoinType}<${value.coinType}>>`,
             })),
             ...sCoinValues.map(({ coinType }) => ({
                 StructType: `0x2::coin::Coin<${coinType}>`,
             })),
             {
-                StructType: constants_1.spoolAccountPackageId,
+                StructType: constants_1.sPoolAccountType,
             },
         ],
     };
-    const [allOwnedObjects, marketData, spoolData] = yield Promise.all([
+    const [allOwnedObjects, marketData, spoolData, addressData] = yield Promise.all([
         (0, getOwnedObjects_1.getOwnedObjects)(client, owner, { filter: filterOwnerObject }),
         cache.getItem(constants_1.marketKey, {
             prefix: constants_1.marketPrefix,
@@ -67,12 +75,18 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             prefix: constants_1.spoolsPrefix,
             networkId: portfolio_core_1.NetworkId.sui,
         }),
+        cache.getItem(constants_1.addressKey, {
+            prefix: constants_1.addressPrefix,
+            networkId: portfolio_core_1.NetworkId.sui,
+        }),
     ]);
     const fetchedDataIncomplete = !marketData ||
         !spoolData ||
+        !addressData ||
         allOwnedObjects.length === 0 ||
         Object.keys(marketData).length === 0 ||
-        Object.keys(spoolData).length === 0;
+        Object.keys(spoolData).length === 0 ||
+        Object.keys(addressData).length === 0;
     if (fetchedDataIncomplete) {
         return [];
     }
@@ -87,83 +101,140 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     });
     // get user lending assets
     const lendingAssets = {};
-    const stakedAccount = {};
-    for (const ownedMarketCoin of allOwnedObjects) {
-        const objType = (_a = ownedMarketCoin.data) === null || _a === void 0 ? void 0 : _a.type;
+    const stakedAccounts = {};
+    const isSpoolAccount = (obj) => {
+        var _a;
+        const objType = (_a = obj.data) === null || _a === void 0 ? void 0 : _a.type;
         if (!objType)
-            continue;
-        const parsed = (0, utils_1.parseStructTag)(objType);
-        const coinType = (0, utils_1.normalizeStructTag)(objType.substring(objType.indexOf('MarketCoin<') + 11, objType.indexOf('>')));
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const fields = (_c = (_b = ownedMarketCoin.data) === null || _b === void 0 ? void 0 : _b.content) === null || _c === void 0 ? void 0 : _c.fields;
-        const coinName = (_e = (_d = poolValues
-            .find((value) => value.coinType === coinType)) === null || _d === void 0 ? void 0 : _d.metadata) === null || _e === void 0 ? void 0 : _e.symbol.toLowerCase();
-        if (!coinName || !fields)
-            continue;
-        if (!lendingAssets[coinName]) {
-            lendingAssets[coinName] = { coinType, amount: new bignumber_js_1.default(0) };
-        }
-        if (fields['stakes']) {
-            if (!stakedAccount[`s${coinName}`]) {
-                stakedAccount[`s${coinName}`] = [];
-            }
-            stakedAccount[`s${coinName}`].push({
-                points: fields['points'],
-                index: fields['index'],
-                stakes: fields['stakes'],
-            });
-        }
-        const balance = (0, bignumber_js_1.default)((_f = (parsed.name === 'Coin' ? fields['balance'] : fields['stakes'])) !== null && _f !== void 0 ? _f : 0);
-        lendingAssets[coinName] = Object.assign(Object.assign({}, lendingAssets[coinName]), { amount: lendingAssets[coinName].amount.plus(balance) });
-    }
-    // add support for new sCoin
-    allOwnedObjects
-        .filter((obj) => {
+            return false;
+        const { address, module, name } = (0, utils_1.parseStructTag)((0, utils_1.normalizeStructTag)(objType));
+        return `${address}::${module}::${name}` === constants_1.sPoolAccountType;
+    };
+    const isSCoin = (obj) => {
         var _a;
         const objType = (_a = obj.data) === null || _a === void 0 ? void 0 : _a.type;
         if (!objType)
             return false;
         const parsed = (0, utils_1.parseStructTag)(objType);
-        const subParsed = parsed.typeParams[0];
-        return !(parsed.name !== 'Coin' ||
-            !constants_1.sCoinToCoinName[subParsed.name.toLowerCase()]);
-    })
-        .forEach((sCoin) => {
-        var _a, _b, _c, _d;
-        if (!sCoin.data)
-            return;
-        const types = (0, utils_1.parseStructTag)(sCoin.data.type);
-        const firstCoin = types.typeParams[0];
-        const coinName = firstCoin.name.toLowerCase();
-        const coinType = `${firstCoin.address}::${firstCoin.module}::${firstCoin.name}`;
-        const lendingAssetName = constants_1.sCoinToCoinName[coinName];
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const fields = (_b = (_a = sCoin.data) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.fields;
-        if (!lendingAssets[lendingAssetName]) {
-            lendingAssets[lendingAssetName] = {
-                amount: new bignumber_js_1.default((_c = fields['balance']) !== null && _c !== void 0 ? _c : 0),
-                coinType,
-            };
+        const isCoin = parsed.name === 'Coin';
+        const sCoinTypeParsed = parsed.typeParams[0];
+        const isObjectSCoin = !!types_1.sCoinToCoinName[sCoinTypeParsed.name.toLowerCase()];
+        return isCoin && isObjectSCoin;
+    };
+    const isMarketCoin = (obj) => {
+        var _a;
+        const objType = (_a = obj.data) === null || _a === void 0 ? void 0 : _a.type;
+        if (!objType)
+            return false;
+        const { address, module, name } = (0, utils_1.parseStructTag)(objType);
+        const isCoin = name === 'Coin';
+        const isObjectMarketCoin = address === addressData.mainnet.core.object &&
+            module === 'reserve' &&
+            name === 'MarketCoin';
+        return isCoin && isObjectMarketCoin;
+    };
+    allOwnedObjects.forEach((obj) => {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        if (isMarketCoin(obj)) {
+            const marketCoinObj = obj.data;
+            if (!marketCoinObj)
+                return;
+            // access underlying asset type from market coin struct
+            // 0x2::coin::Coin<T>
+            const { address, module, name } = (0, utils_1.parseStructTag)((0, utils_1.normalizeStructTag)(marketCoinObj.type)).typeParams[0];
+            const coinType = `${address}::${module}::${name}`;
+            const coinName = (_a = poolValuesMetadataMap[coinType]) === null || _a === void 0 ? void 0 : _a.symbol.toLowerCase();
+            if (!coinName)
+                return;
+            const coinBalance = (0, bignumber_js_1.default)((_c = (_b = marketCoinObj.content) === null || _b === void 0 ? void 0 : _b.fields.balance) !== null && _c !== void 0 ? _c : 0);
+            if (!coinName)
+                return;
+            if (lendingAssets[coinName]) {
+                lendingAssets[coinName].amount =
+                    lendingAssets[coinName].amount.plus(coinBalance);
+            }
+            else {
+                lendingAssets[coinName] = { coinType, amount: coinBalance };
+            }
         }
-        else {
-            lendingAssets[lendingAssetName].amount = lendingAssets[lendingAssetName].amount.plus(new bignumber_js_1.default((_d = fields['balance']) !== null && _d !== void 0 ? _d : 0));
+        else if (isSpoolAccount(obj)) {
+            const spoolObj = obj.data;
+            const fields = (_d = spoolObj === null || spoolObj === void 0 ? void 0 : spoolObj.content) === null || _d === void 0 ? void 0 : _d.fields;
+            if (!fields)
+                return;
+            // parse market coin struct inside the spoolAccount struct
+            // 0x...::spool_account::SpoolAccount<0x..::reserve::MarketCoin<T>>
+            const marketCoinStruct = (0, utils_1.parseStructTag)((0, utils_1.normalizeStructTag)(spoolObj.type))
+                .typeParams[0];
+            const { address, module, name } = marketCoinStruct
+                .typeParams[0];
+            const stakeType = `${address}::${module}::${name}`;
+            const coinName = (_e = poolValuesMetadataMap[stakeType]) === null || _e === void 0 ? void 0 : _e.symbol.toLowerCase();
+            if (!coinName)
+                return;
+            // sui -> ssui, usdc -> susdc, ...
+            const spoolName = `s${coinName}`;
+            const { stakes, points, index } = fields;
+            if (!stakedAccounts[spoolName]) {
+                stakedAccounts[spoolName] = [];
+            }
+            stakedAccounts[spoolName].push({
+                stakes,
+                points,
+                index,
+            });
+            const stakeBalance = (0, bignumber_js_1.default)(stakes);
+            if (lendingAssets[coinName]) {
+                lendingAssets[coinName].amount =
+                    lendingAssets[coinName].amount.plus(stakeBalance);
+            }
+            else {
+                lendingAssets[coinName] = { coinType: stakeType, amount: stakeBalance };
+            }
+        }
+        else if (isSCoin(obj)) {
+            const marketCoinObj = obj.data;
+            if (!marketCoinObj)
+                return;
+            // access underlying asset type from market coin struct
+            // 0x2::coin::Coin<T>
+            const { address, module, name } = (0, utils_1.parseStructTag)((0, utils_1.normalizeStructTag)(marketCoinObj.type)).typeParams[0];
+            // convert sCoinType to coinType
+            const sCoinType = `${address}::${module}::${name}`;
+            const coinType = types_1.sCoinTypeToCoinTypeMap[sCoinType];
+            if (!coinType)
+                return;
+            const coinName = (_f = poolValuesMetadataMap[coinType]) === null || _f === void 0 ? void 0 : _f.symbol.toLowerCase();
+            if (!coinName)
+                return;
+            const coinBalance = (0, bignumber_js_1.default)((_h = (_g = marketCoinObj.content) === null || _g === void 0 ? void 0 : _g.fields.balance) !== null && _h !== void 0 ? _h : 0);
+            if (lendingAssets[coinName]) {
+                lendingAssets[coinName].amount =
+                    lendingAssets[coinName].amount.plus(coinBalance);
+            }
+            else {
+                lendingAssets[coinName] = { coinType, amount: coinBalance };
+            }
         }
     });
     let pendingReward = (0, bignumber_js_1.default)(0);
-    for (const spoolCoin of Object.keys(stakedAccount)) {
-        for (const { points, index, stakes } of stakedAccount[spoolCoin]) {
-            if (spoolData[spoolCoin]) {
-                const increasedPointRate = spoolData[spoolCoin].currentPointIndex
-                    ? (0, bignumber_js_1.default)((0, bignumber_js_1.default)(spoolData[spoolCoin].currentPointIndex).minus(index)).dividedBy(constants_1.baseIndexRate)
+    constants_1.marketCoinNames.forEach((marketCoin) => {
+        if (!stakedAccounts[marketCoin])
+            return;
+        stakedAccounts[marketCoin].forEach(({ points, index, stakes }) => {
+            if (spoolData[marketCoin]) {
+                const { currentPointIndex, exchangeRateNumerator, exchangeRateDenominator, } = spoolData[marketCoin];
+                const increasedPointRate = currentPointIndex
+                    ? (0, bignumber_js_1.default)((0, bignumber_js_1.default)(currentPointIndex).minus(index)).dividedBy(constants_1.baseIndexRate)
                     : 0;
                 pendingReward = pendingReward.plus((0, bignumber_js_1.default)(stakes)
                     .multipliedBy(increasedPointRate)
                     .plus(points)
-                    .multipliedBy(spoolData[spoolCoin].exchangeRateNumerator)
-                    .dividedBy(spoolData[spoolCoin].exchangeRateDenominator));
+                    .multipliedBy(exchangeRateNumerator)
+                    .dividedBy(exchangeRateDenominator));
             }
-        }
-    }
+        });
+    });
     const tokenAddresses = Object.values(lendingAssets).map((value) => value.coinType);
     const tokenPrices = yield cache.getTokenPricesAsMap([...tokenAddresses, portfolio_core_1.suiNetwork.native.address], portfolio_core_1.NetworkId.sui);
     if (pendingReward.isGreaterThan(0)) {
@@ -177,27 +248,26 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         });
         rewardAssets.push(Object.assign({}, rewardAssetToken));
     }
-    for (const [assetName, assetValue] of Object.entries(lendingAssets)) {
-        if (assetValue.amount.isZero())
-            continue;
-        const market = marketData[assetName];
-        if (!market)
-            continue;
+    Object.entries(lendingAssets)
+        .filter(([assetName, assetValue]) => assetValue.amount.isGreaterThan(0) && marketData[assetName])
+        .forEach(([assetName, assetValue]) => {
+        var _a, _b, _c, _d;
+        const { supplyInterestRate } = marketData[assetName];
         const addressMove = (0, portfolio_core_1.formatMoveTokenAddress)(assetValue.coinType);
         const tokenPrice = tokenPrices.get(addressMove);
         const lendingAmount = assetValue.amount
-            .multipliedBy((_g = lendingRate.get(assetName)) !== null && _g !== void 0 ? _g : 0)
-            .shiftedBy(-1 * ((_k = (_j = (_h = pools[assetName]) === null || _h === void 0 ? void 0 : _h.metadata) === null || _j === void 0 ? void 0 : _j.decimals) !== null && _k !== void 0 ? _k : 0))
+            .multipliedBy((_a = lendingRate.get(assetName)) !== null && _a !== void 0 ? _a : 0)
+            .shiftedBy(-1 * ((_d = (_c = (_b = pools[assetName]) === null || _b === void 0 ? void 0 : _b.metadata) === null || _c === void 0 ? void 0 : _c.decimals) !== null && _d !== void 0 ? _d : 0))
             .toNumber();
         const assetToken = (0, tokenPriceToAssetToken_1.default)(addressMove, lendingAmount, portfolio_core_1.NetworkId.sui, tokenPrice);
         suppliedYields.push([
             {
-                apy: (0, portfolio_core_1.aprToApy)(market.supplyInterestRate),
-                apr: market.supplyInterestRate,
+                apy: (0, portfolio_core_1.aprToApy)(supplyInterestRate),
+                apr: supplyInterestRate,
             },
         ]);
         suppliedAssets.push(assetToken);
-    }
+    });
     if (suppliedAssets.length === 0 &&
         borrowedAssets.length === 0 &&
         rewardAssets.length === 0) {