@sonarwatch/portfolio-plugins 0.11.139 → 0.11.140

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [0.11.140](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.139...plugins-0.11.140) (2024-03-21)
+
+
+
 ## [0.11.139](https://github.com/sonarwatch/portfolio/compare/plugins-0.11.138...plugins-0.11.139) (2024-03-21)
 
 

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@sonarwatch/portfolio-plugins",
-  "version": "0.11.139",
+  "version": "0.11.140",
   "type": "commonjs",
   "generators": "./generators.json",
   "dependencies": {
     "@aave/contract-helpers": "^1.18.3",
     "@aave/math-utils": "^1.18.3",
+    "@aptos-labs/ts-sdk": "^1.10.0",
     "@bonfida/spl-name-service": "^1.0.10",
     "@cosmjs/cosmwasm-stargate": "^0.31.1",
     "@ethersproject/address": "^5.7.0",
@@ -23,7 +24,6 @@
     "@sei-js/core": "^3.0.1",
     "@sei-js/proto": "^3.0.1",
     "@solana/web3.js": "^1.89.1",
-    "aptos": "^1.13.1",
     "axios": "^1.4.0",
     "bignumber.js": "^9.1.1",
     "bitcoin-address-validation": "^2.2.1",
@@ -41,7 +41,7 @@
     "web3-v1": "npm:web3@^1.5.0"
   },
   "peerDependencies": {
-    "@sonarwatch/portfolio-core": "0.11.139"
+    "@sonarwatch/portfolio-core": "0.11.140"
   },
   "main": "./src/index.js",
   "types": "./src/index.d.ts"

package/src/plugins/aptin/depositsFetcher.js

@@ -23,8 +23,8 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     const poolPositions = yield (0, aptos_1.getAccountResource)(client, owner, constants_1.poolPositionsType);
     if (!poolPositions)
         return [];
-    if (poolPositions.data.supply_coins.length === 0 &&
-        poolPositions.data.borrow_coins.length === 0)
+    if (poolPositions.supply_coins.length === 0 &&
+        poolPositions.borrow_coins.length === 0)
         return [];
     const configStores = yield cache.getItem(constants_1.configStoresKey, {
         prefix: constants_1.platformId,
@@ -32,12 +32,12 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     });
     if (!configStores)
         return [];
-    const supplyPositions = poolPositions.data.supply_coins.length === 0
+    const supplyPositions = poolPositions.supply_coins.length === 0
         ? []
-        : yield (0, aptos_1.getTableItemsByKeys)(client, poolPositions.data.supply_position.handle, poolPositions.data.supply_coins, '0x1::string::String', '0x3c1d4a86594d681ff7e5d5a233965daeabdc6a15fe5672ceeda5260038857183::pool::SupplyPosition');
-    const borrowPositions = poolPositions.data.borrow_coins.length === 0
+        : yield (0, aptos_1.getTableItemsByKeys)(client, poolPositions.supply_position.handle, poolPositions.supply_coins, '0x1::string::String', '0x3c1d4a86594d681ff7e5d5a233965daeabdc6a15fe5672ceeda5260038857183::pool::SupplyPosition');
+    const borrowPositions = poolPositions.borrow_coins.length === 0
         ? []
-        : yield (0, aptos_1.getTableItemsByKeys)(client, poolPositions.data.borrow_position.handle, poolPositions.data.borrow_coins, '0x1::string::String', '0x3c1d4a86594d681ff7e5d5a233965daeabdc6a15fe5672ceeda5260038857183::pool::BorrowPosition');
+        : yield (0, aptos_1.getTableItemsByKeys)(client, poolPositions.borrow_position.handle, poolPositions.borrow_coins, '0x1::string::String', '0x3c1d4a86594d681ff7e5d5a233965daeabdc6a15fe5672ceeda5260038857183::pool::BorrowPosition');
     const borrowedAssets = [];
     const borrowedYields = [];
     const suppliedAssets = [];
@@ -45,7 +45,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     const rewardAssets = [];
     const suppliedLtvs = [];
     // Token prices
-    const tokenPricesRes = yield cache.getTokenPrices([...poolPositions.data.supply_coins, ...poolPositions.data.borrow_coins], portfolio_core_1.NetworkId.aptos);
+    const tokenPricesRes = yield cache.getTokenPrices([...poolPositions.supply_coins, ...poolPositions.borrow_coins], portfolio_core_1.NetworkId.aptos);
     const tokenPrices = {};
     tokenPricesRes.forEach((tp) => {
         if (!tp)
@@ -58,7 +58,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             continue;
         if (supplyPosition.amount === '0')
             continue;
-        const coinType = poolPositions.data.supply_coins[i];
+        const coinType = poolPositions.supply_coins[i];
         const address = (0, portfolio_core_1.formatTokenAddress)(coinType, portfolio_core_1.NetworkId.aptos);
         const { decimals, ltv } = configStores[coinType];
         const amount = new bignumber_js_1.default(supplyPosition.amount)
@@ -74,7 +74,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             continue;
         if (borrowPosition.amount === '0')
             continue;
-        const coinType = poolPositions.data.borrow_coins[i];
+        const coinType = poolPositions.borrow_coins[i];
         const address = (0, portfolio_core_1.formatTokenAddress)(coinType, portfolio_core_1.NetworkId.aptos);
         const { decimals } = configStores[coinType];
         const amount = new bignumber_js_1.default(borrowPosition.amount)

package/src/plugins/aptin/depositsFetcher.js.map

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

package/src/plugins/native-stake/activeValidatorsJob.js

@@ -14,16 +14,21 @@ const clients_1 = require("../../utils/clients");
 const constants_1 = require("./constants");
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientAptos)();
-    const resources = (yield client.getAccountResource('0x1', '0x1::stake::ValidatorSet'));
+    const resources = (yield client.getAccountResource({
+        accountAddress: '0x1',
+        resourceType: '0x1::stake::ValidatorSet',
+    }));
     const activeValidators = resources.data.active_validators;
     const validatorsWithStake = [];
     for (let i = 0; i < activeValidators.length; i++) {
         const validator = activeValidators[i];
         const hasStake = yield client
             .view({
-            function: '0x1::delegation_pool::operator_commission_percentage',
-            type_arguments: [],
-            arguments: [validator.addr],
+            payload: {
+                function: '0x1::delegation_pool::operator_commission_percentage',
+                typeArguments: [],
+                functionArguments: [validator.addr],
+            },
         })
             .catch(() => { });
         if (hasStake)

package/src/plugins/native-stake/activeValidatorsJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"activeValidatorsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/native-stake/activeValidatorsJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAGvD,iDAAqD;AACrD,2CAA0E;AAG1E,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAAG,IAAA,wBAAc,GAAE,CAAC;IAChC,MAAM,SAAS,GAAG,CAAC,MAAM,MAAM,CAAC,kBAAkB,CAChD,KAAK,EACL,0BAA0B,CAC3B,CAAiB,CAAC;IACnB,MAAM,gBAAgB,GAAG,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC;IAC1D,MAAM,mBAAmB,GAAa,EAAE,CAAC;IACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACjD,MAAM,SAAS,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;QACtC,MAAM,QAAQ,GAAG,MAAM,MAAM;aAC1B,IAAI,CAAC;YACJ,QAAQ,EAAE,sDAAsD;YAChE,cAAc,EAAE,EAAE;YAClB,SAAS,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC;SAC5B,CAAC;aACD,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QACnB,IAAI,QAAQ;YAAE,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACzD,CAAC;IACD,MAAM,KAAK,CAAC,OAAO,CAAC,yBAAa,EAAE,mBAAmB,EAAE;QACtD,MAAM,EAAE,4BAAgB;QACxB,SAAS,EAAE,0BAAS,CAAC,KAAK;KAC3B,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,oBAAoB;IACrC,QAAQ;IACR,KAAK,EAAE,QAAQ;CAChB,CAAC;AACF,kBAAe,GAAG,CAAC"}
+{"version":3,"file":"activeValidatorsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/native-stake/activeValidatorsJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAGvD,iDAAqD;AACrD,2CAA0E;AAG1E,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAAG,IAAA,wBAAc,GAAE,CAAC;IAChC,MAAM,SAAS,GAAG,CAAC,MAAM,MAAM,CAAC,kBAAkB,CAAC;QACjD,cAAc,EAAE,KAAK;QACrB,YAAY,EAAE,0BAA0B;KACzC,CAAC,CAAiB,CAAC;IACpB,MAAM,gBAAgB,GAAG,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC;IAC1D,MAAM,mBAAmB,GAAa,EAAE,CAAC;IACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACjD,MAAM,SAAS,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;QACtC,MAAM,QAAQ,GAAG,MAAM,MAAM;aAC1B,IAAI,CAAC;YACJ,OAAO,EAAE;gBACP,QAAQ,EAAE,sDAAsD;gBAChE,aAAa,EAAE,EAAE;gBACjB,iBAAiB,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC;aACpC;SACF,CAAC;aACD,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QACnB,IAAI,QAAQ;YAAE,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACzD,CAAC;IACD,MAAM,KAAK,CAAC,OAAO,CAAC,yBAAa,EAAE,mBAAmB,EAAE;QACtD,MAAM,EAAE,4BAAgB;QACxB,SAAS,EAAE,0BAAS,CAAC,KAAK;KAC3B,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,oBAAoB;IACrC,QAAQ;IACR,KAAK,EAAE,QAAQ;CAChB,CAAC;AACF,kBAAe,GAAG,CAAC"}

package/src/plugins/native-stake/aptosFetcher.js

@@ -32,9 +32,11 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     for (let i = 0; i < activeValidators.length; i++) {
         const validatorAddress = activeValidators[i];
         const stakedValuesInValidator = (yield client.view({
-            function: '0x1::delegation_pool::get_stake',
-            type_arguments: [],
-            arguments: [validatorAddress, owner],
+            payload: {
+                function: '0x1::delegation_pool::get_stake',
+                typeArguments: [],
+                functionArguments: [validatorAddress, owner],
+            },
         }));
         const amount = stakedValuesInValidator
             .filter((item) => item !== '0')

package/src/plugins/native-stake/aptosFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"aptosFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/native-stake/aptosFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAIoC;AACpC,gEAAqC;AAGrC,2CAKqB;AACrB,iDAAqD;AACrD,qGAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,wBAAc,GAAE,CAAC;IAChC,MAAM,gBAAgB,GAAG,MAAM,KAAK,CAAC,OAAO,CAAW,yBAAa,EAAE;QACpE,MAAM,EAAE,4BAAgB;QACxB,SAAS,EAAE,0BAAS,CAAC,KAAK;KAC3B,CAAC,CAAC;IACH,IAAI,CAAC,gBAAgB;QAAE,OAAO,EAAE,CAAC;IAEjC,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,aAAa,CAC1C,6BAAY,CAAC,MAAM,CAAC,OAAO,EAC3B,0BAAS,CAAC,KAAK,CAChB,CAAC;IACF,IAAI,CAAC,UAAU;QAAE,OAAO,EAAE,CAAC;IAE3B,MAAM,QAAQ,GAAuB,EAAE,CAAC;IAExC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACjD,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;QAC7C,MAAM,uBAAuB,GAAG,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC;YACjD,QAAQ,EAAE,iCAAiC;YAC3C,cAAc,EAAE,EAAE;YAClB,SAAS,EAAE,CAAC,gBAAgB,EAAE,KAAK,CAAC;SACrC,CAAC,CAAa,CAAC;QAEhB,MAAM,MAAM,GAAG,uBAAuB;aACnC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,GAAG,CAAC;aAC9B,MAAM,CACL,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,CACf,IAAI,sBAAS,CAAC,OAAO,CAAC;aACnB,GAAG,CAAC,SAAA,EAAE,EAAI,6BAAY,CAAC,MAAM,CAAC,QAAQ,CAAA,CAAC;aACvC,IAAI,CAAC,GAAG,CAAC;aACT,QAAQ,EAAE,EACf,CAAC,CACF,CAAC;QACJ,IAAI,MAAM,KAAK,CAAC;YAAE,SAAS;QAC3B,MAAM,KAAK,GAAG,IAAA,gCAAsB,EAClC,UAAU,CAAC,OAAO,EAClB,MAAM,EACN,0BAAS,CAAC,KAAK,EACf,UAAU,CACX,CAAC;QACF,QAAQ,CAAC,IAAI,CAAC;YACZ,SAAS,EAAE,0BAAS,CAAC,KAAK;YAC1B,UAAU,EAAE,+BAAmB,CAAC,EAAE;YAClC,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,QAAQ;YACf,IAAI,EAAE,CAAC,cAAc,CAAC;YACtB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,IAAI,EAAE;gBACJ,MAAM,EAAE,CAAC,KAAK,CAAC;aAChB;SACF,CAAC,CAAC;IACL,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,QAAQ;IACzB,SAAS,EAAE,0BAAS,CAAC,KAAK;IAC1B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"aptosFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/native-stake/aptosFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAIoC;AACpC,gEAAqC;AAGrC,2CAKqB;AACrB,iDAAqD;AACrD,qGAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,wBAAc,GAAE,CAAC;IAChC,MAAM,gBAAgB,GAAG,MAAM,KAAK,CAAC,OAAO,CAAW,yBAAa,EAAE;QACpE,MAAM,EAAE,4BAAgB;QACxB,SAAS,EAAE,0BAAS,CAAC,KAAK;KAC3B,CAAC,CAAC;IACH,IAAI,CAAC,gBAAgB;QAAE,OAAO,EAAE,CAAC;IAEjC,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,aAAa,CAC1C,6BAAY,CAAC,MAAM,CAAC,OAAO,EAC3B,0BAAS,CAAC,KAAK,CAChB,CAAC;IACF,IAAI,CAAC,UAAU;QAAE,OAAO,EAAE,CAAC;IAE3B,MAAM,QAAQ,GAAuB,EAAE,CAAC;IAExC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACjD,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;QAC7C,MAAM,uBAAuB,GAAG,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC;YACjD,OAAO,EAAE;gBACP,QAAQ,EAAE,iCAAiC;gBAC3C,aAAa,EAAE,EAAE;gBACjB,iBAAiB,EAAE,CAAC,gBAAgB,EAAE,KAAK,CAAC;aAC7C;SACF,CAAC,CAAa,CAAC;QAEhB,MAAM,MAAM,GAAG,uBAAuB;aACnC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,GAAG,CAAC;aAC9B,MAAM,CACL,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,CACf,IAAI,sBAAS,CAAC,OAAO,CAAC;aACnB,GAAG,CAAC,SAAA,EAAE,EAAI,6BAAY,CAAC,MAAM,CAAC,QAAQ,CAAA,CAAC;aACvC,IAAI,CAAC,GAAG,CAAC;aACT,QAAQ,EAAE,EACf,CAAC,CACF,CAAC;QACJ,IAAI,MAAM,KAAK,CAAC;YAAE,SAAS;QAC3B,MAAM,KAAK,GAAG,IAAA,gCAAsB,EAClC,UAAU,CAAC,OAAO,EAClB,MAAM,EACN,0BAAS,CAAC,KAAK,EACf,UAAU,CACX,CAAC;QACF,QAAQ,CAAC,IAAI,CAAC;YACZ,SAAS,EAAE,0BAAS,CAAC,KAAK;YAC1B,UAAU,EAAE,+BAAmB,CAAC,EAAE;YAClC,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,QAAQ;YACf,IAAI,EAAE,CAAC,cAAc,CAAC;YACtB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,IAAI,EAAE;gBACJ,MAAM,EAAE,CAAC,KAAK,CAAC;aAChB;SACF,CAAC,CAAC;IACL,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,QAAQ;IACzB,SAAS,EAAE,0BAAS,CAAC,KAAK;IAC1B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/pancakeswap/aptosLpJob.js

@@ -17,12 +17,11 @@ const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const constants_1 = require("./constants");
 const clients_1 = require("../../utils/clients");
 const aptos_1 = require("../../utils/aptos");
-const getTokensPricesMap_1 = __importDefault(require("../../utils/misc/getTokensPricesMap"));
 const getLpUnderlyingTokenSource_1 = __importDefault(require("../../utils/misc/getLpUnderlyingTokenSource"));
-const getDecimalsForToken_1 = require("../../utils/misc/getDecimalsForToken");
 const getLpTokenSourceRaw_1 = __importDefault(require("../../utils/misc/getLpTokenSourceRaw"));
+const getDecimals_1 = require("../../utils/aptos/getDecimals");
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     const client = (0, clients_1.getClientAptos)();
     const resources = yield (0, aptos_1.getAccountResources)(client, constants_1.programAddress);
     if (!resources)
@@ -31,34 +30,39 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     resources.forEach((resource) => {
         resourcesByType.set(resource.type, resource);
     });
-    const tokenPriceById = yield (0, getTokensPricesMap_1.default)(resources
+    const tokenPriceById = yield cache.getTokenPricesAsMap(resources
         .map((ressource) => {
         const { keys } = (0, aptos_1.parseTypeString)(ressource.type);
         return keys ? keys.map((key) => key.type) : [];
     })
-        .flat(), portfolio_core_1.NetworkId.aptos, cache);
+        .flat(), portfolio_core_1.NetworkId.aptos);
+    const lpSources = [];
     for (let i = 0; i < resources.length; i++) {
         const resource = resources[i];
         if (!resource.type.startsWith(constants_1.lpCoinInfoTypePrefix))
             continue;
-        const lpType = (0, aptos_1.getNestedType)(resource.type);
+        const lpType = (_b = (_a = (0, aptos_1.parseTypeString)(resource.type).keys) === null || _a === void 0 ? void 0 : _a.at(0)) === null || _b === void 0 ? void 0 : _b.type;
+        if (!lpType)
+            continue;
         const lpInfoData = resource.data;
-        const lpSupplyString = (_c = (_b = (_a = lpInfoData.supply) === null || _a === void 0 ? void 0 : _a.vec[0]) === null || _b === void 0 ? void 0 : _b.integer.vec[0]) === null || _c === void 0 ? void 0 : _c.value;
+        const lpSupplyString = (_e = (_d = (_c = lpInfoData.supply) === null || _c === void 0 ? void 0 : _c.vec[0]) === null || _d === void 0 ? void 0 : _d.integer.vec[0]) === null || _e === void 0 ? void 0 : _e.value;
         if (!lpSupplyString)
             continue;
         const lpDecimals = lpInfoData.decimals;
         const lpSupply = new bignumber_js_1.default(lpSupplyString);
         if (lpSupply.isZero())
             continue;
-        const tokenPairId = (0, aptos_1.getNestedType)(lpType);
+        const tokenPairId = (_f = (0, aptos_1.parseTypeString)(lpType)
+            .keys) === null || _f === void 0 ? void 0 : _f.map((t) => t.type).join(', ');
+        if (!tokenPairId)
+            continue;
         // TODO : get ride of those by using parseTypeString() instead of getNestedType()
         if (tokenPairId.includes('swap::LPToken') ||
             tokenPairId.includes('LPCoinV1::LPCoin') ||
             tokenPairId.includes('lp_coin::LP'))
             continue;
-        const splits = tokenPairId.split(', ');
-        const typeX = splits.at(0);
-        const typeY = splits.at(1);
+        const typeX = (_h = (_g = (0, aptos_1.parseTypeString)(lpType).keys) === null || _g === void 0 ? void 0 : _g.at(0)) === null || _h === void 0 ? void 0 : _h.type;
+        const typeY = (_k = (_j = (0, aptos_1.parseTypeString)(lpType).keys) === null || _j === void 0 ? void 0 : _j.at(1)) === null || _k === void 0 ? void 0 : _k.type;
         const tokenPairResource = resourcesByType.get(`${constants_1.programAddress}::swap::TokenPairMetadata<${tokenPairId}>`);
         if (!tokenPairResource)
             throw new Error(`Failed to get tokenPairResource: ${lpType}`);
@@ -73,12 +77,12 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
             tokenPairData.balance_y.value === '0')
             continue;
         const [tokenPriceX, tokenPriceY] = [
-            tokenPriceById.get(typeX),
-            tokenPriceById.get(typeY),
+            tokenPriceById.get((0, portfolio_core_1.formatTokenAddress)(typeX, portfolio_core_1.NetworkId.aptos)),
+            tokenPriceById.get((0, portfolio_core_1.formatTokenAddress)(typeY, portfolio_core_1.NetworkId.aptos)),
         ];
         const [decimalsX, decimalsY] = yield Promise.all([
-            (0, getDecimalsForToken_1.getDecimalsForToken)(cache, typeX, portfolio_core_1.NetworkId.aptos),
-            (0, getDecimalsForToken_1.getDecimalsForToken)(cache, typeY, portfolio_core_1.NetworkId.aptos),
+            (0, getDecimals_1.getDecimals)(client, typeX),
+            (0, getDecimals_1.getDecimals)(client, typeY),
         ]);
         const [reserveAmountRawX, reserveAmountRawY] = [
             new bignumber_js_1.default(tokenPairData.balance_x.value),
@@ -98,7 +102,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
             tokenPrice: tokenPriceY,
         });
         if (underlyingSource)
-            yield cache.setTokenPriceSource(underlyingSource);
+            lpSources.push(underlyingSource);
         if (!tokenPriceX || !tokenPriceY)
             continue;
         const lpSource = (0, getLpTokenSourceRaw_1.default)(portfolio_core_1.NetworkId.aptos, lpType, constants_1.platformId, {
@@ -119,8 +123,9 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
                 reserveAmountRaw: reserveAmountRawY,
             },
         ], '');
-        yield cache.setTokenPriceSource(lpSource);
+        lpSources.push(lpSource);
     }
+    yield cache.setTokenPriceSources(lpSources);
 });
 const job = {
     id: `${constants_1.platformId}-aptos-lp`,

package/src/plugins/pancakeswap/aptosLpJob.js.map

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

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

@@ -1,4 +1,5 @@
 import { Platform } from '@sonarwatch/portfolio-core';
+import { InputViewRequestData } from '@aptos-labs/ts-sdk';
 export declare const platformId = "thala";
 export declare const thalaPlatform: Platform;
 export declare const programAdressThala = "0x6f986d146e4a90b828d8c12c14b6f4e003fdff11a8eecceceb63744363eaac01";
@@ -14,13 +15,5 @@ export declare const lpStableTypePrefix = "0x48271d39d0b05bd6efca2278f22277d6fcc
 export declare const lpWeightedTypePrefix = "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool::WeightedPool";
 export declare const lpStableCoinInfoTypePrefix = "0x1::coin::CoinInfo<0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::stable_pool::StablePoolToken";
 export declare const lpWeightedCoinInfoTypePrefix = "0x1::coin::CoinInfo<0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af::weighted_pool::WeightedPoolToken";
-export declare const stabilityDepositPayload: (owner: string) => {
-    function: string;
-    type_arguments: string[];
-    arguments: string[];
-};
-export declare const stabilityClaimablePayload: (owner: string) => {
-    function: string;
-    type_arguments: never[];
-    arguments: string[];
-};
+export declare const stabilityDepositPayload: (owner: string) => InputViewRequestData;
+export declare const stabilityClaimablePayload: (owner: string) => InputViewRequestData;

package/src/plugins/thala/constants.js

@@ -30,14 +30,14 @@ exports.lpStableCoinInfoTypePrefix = `${aptos_1.coinInfo}<${exports.lpStableType
 exports.lpWeightedCoinInfoTypePrefix = `${aptos_1.coinInfo}<${exports.lpWeightedTypeTokenPrefix}`;
 const stabilityDepositPayload = (owner) => ({
     function: liquidityDeposit,
-    type_arguments: [cryptoType],
-    arguments: [owner],
+    typeArguments: [cryptoType],
+    functionArguments: [owner],
 });
 exports.stabilityDepositPayload = stabilityDepositPayload;
 const stabilityClaimablePayload = (owner) => ({
     function: liquidityClaimable,
-    type_arguments: [],
-    arguments: [owner],
+    typeArguments: [],
+    functionArguments: [owner],
 });
 exports.stabilityClaimablePayload = stabilityClaimablePayload;
 //# sourceMappingURL=constants.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/thala/constants.ts"],"names":[],"mappings":";;;AACA,6CAA6C;AAEhC,QAAA,UAAU,GAAG,OAAO,CAAC;AACrB,QAAA,aAAa,GAAa;IACrC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,OAAO;IACb,KAAK,EAAE,6CAA6C;IACpD,WAAW,EAAE,mBAAmB;IAChC,OAAO,EAAE,uBAAuB;CACjC,CAAC;AACW,QAAA,kBAAkB,GAC7B,oEAAoE,CAAC;AAEvE,MAAM,eAAe,GAAG,gBAAgB,CAAC;AACzC,MAAM,WAAW,GAAG,OAAO,CAAC;AAE5B,MAAM,gBAAgB,GAAG,GAAG,0BAAkB,KAAK,eAAe,mBAAmB,CAAC;AACtF,MAAM,kBAAkB,GAAG,GAAG,0BAAkB,KAAK,eAAe,iBAAiB,CAAC;AAEtF,MAAM,UAAU,GAAG,GAAG,0BAAkB,KAAK,eAAe,UAAU,CAAC;AAC1D,QAAA,WAAW,GAAG,GAAG,0BAAkB,KAAK,WAAW,UAAU,CAAC;AAC9D,QAAA,2BAA2B,GAAG,GAAG,0BAAkB,KAAK,WAAW,0BAA0B,CAAC;AAE9F,QAAA,OAAO,GAAG,kFAAkF,CAAC;AAC7F,QAAA,OAAO,GAAG,GAAG,0BAAkB,iBAAiB,CAAC;AAEjD,QAAA,iBAAiB,GAAG,0CAA0C,CAAC;AAE/D,QAAA,gBAAgB,GAC3B,oEAAoE,CAAC;AAC1D,QAAA,uBAAuB,GAAG,GAAG,wBAAgB,gCAAgC,CAAC;AAC9E,QAAA,yBAAyB,GAAG,GAAG,wBAAgB,oCAAoC,CAAC;AACpF,QAAA,kBAAkB,GAAG,GAAG,wBAAgB,2BAA2B,CAAC;AACpE,QAAA,oBAAoB,GAAG,GAAG,wBAAgB,+BAA+B,CAAC;AAC1E,QAAA,0BAA0B,GAAG,GAAG,gBAAQ,IAAI,+BAAuB,EAAE,CAAC;AACtE,QAAA,4BAA4B,GAAG,GAAG,gBAAQ,IAAI,iCAAyB,EAAE,CAAC;AAEhF,MAAM,uBAAuB,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC;IACzD,QAAQ,EAAE,gBAAgB;IAC1B,cAAc,EAAE,CAAC,UAAU,CAAC;IAC5B,SAAS,EAAE,CAAC,KAAK,CAAC;CACnB,CAAC,CAAC;AAJU,QAAA,uBAAuB,2BAIjC;AAEI,MAAM,yBAAyB,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC;IAC3D,QAAQ,EAAE,kBAAkB;IAC5B,cAAc,EAAE,EAAE;IAClB,SAAS,EAAE,CAAC,KAAK,CAAC;CACnB,CAAC,CAAC;AAJU,QAAA,yBAAyB,6BAInC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/thala/constants.ts"],"names":[],"mappings":";;;AAEA,6CAA6C;AAEhC,QAAA,UAAU,GAAG,OAAO,CAAC;AACrB,QAAA,aAAa,GAAa;IACrC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,OAAO;IACb,KAAK,EAAE,6CAA6C;IACpD,WAAW,EAAE,mBAAmB;IAChC,OAAO,EAAE,uBAAuB;CACjC,CAAC;AACW,QAAA,kBAAkB,GAC7B,oEAAoE,CAAC;AAEvE,MAAM,eAAe,GAAG,gBAAgB,CAAC;AACzC,MAAM,WAAW,GAAG,OAAO,CAAC;AAE5B,MAAM,gBAAgB,GAAG,GAAG,0BAAkB,KAAK,eAAe,mBAAmB,CAAC;AACtF,MAAM,kBAAkB,GAAG,GAAG,0BAAkB,KAAK,eAAe,iBAAiB,CAAC;AAEtF,MAAM,UAAU,GAAG,GAAG,0BAAkB,KAAK,eAAe,UAAU,CAAC;AAC1D,QAAA,WAAW,GAAG,GAAG,0BAAkB,KAAK,WAAW,UAAU,CAAC;AAC9D,QAAA,2BAA2B,GAAG,GAAG,0BAAkB,KAAK,WAAW,0BAA0B,CAAC;AAE9F,QAAA,OAAO,GAAG,kFAAkF,CAAC;AAC7F,QAAA,OAAO,GAAG,GAAG,0BAAkB,iBAAiB,CAAC;AAEjD,QAAA,iBAAiB,GAAG,0CAA0C,CAAC;AAE/D,QAAA,gBAAgB,GAC3B,oEAAoE,CAAC;AAC1D,QAAA,uBAAuB,GAAG,GAAG,wBAAgB,gCAAgC,CAAC;AAC9E,QAAA,yBAAyB,GAAG,GAAG,wBAAgB,oCAAoC,CAAC;AACpF,QAAA,kBAAkB,GAAG,GAAG,wBAAgB,2BAA2B,CAAC;AACpE,QAAA,oBAAoB,GAAG,GAAG,wBAAgB,+BAA+B,CAAC;AAC1E,QAAA,0BAA0B,GAAG,GAAG,gBAAQ,IAAI,+BAAuB,EAAE,CAAC;AACtE,QAAA,4BAA4B,GAAG,GAAG,gBAAQ,IAAI,iCAAyB,EAAE,CAAC;AAEhF,MAAM,uBAAuB,GAAG,CACrC,KAAa,EACS,EAAE,CAAC,CAAC;IAC1B,QAAQ,EAAE,gBAAgB;IAC1B,aAAa,EAAE,CAAC,UAAU,CAAC;IAC3B,iBAAiB,EAAE,CAAC,KAAK,CAAC;CAC3B,CAAC,CAAC;AANU,QAAA,uBAAuB,2BAMjC;AAEI,MAAM,yBAAyB,GAAG,CACvC,KAAa,EACS,EAAE,CAAC,CAAC;IAC1B,QAAQ,EAAE,kBAAkB;IAC5B,aAAa,EAAE,EAAE;IACjB,iBAAiB,EAAE,CAAC,KAAK,CAAC;CAC3B,CAAC,CAAC;AANU,QAAA,yBAAyB,6BAMnC"}

package/src/plugins/thala/stabilityPoolFetcher.js

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const constants_1 = require("./constants");
 const aptos_1 = require("../../utils/aptos");
 const clients_1 = require("../../utils/clients");
@@ -25,7 +26,9 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     const depositAmountString = stabilityPoolDepositView.at(0);
     if (!depositAmountString)
         return [];
-    const depositAmount = +depositAmountString / Math.pow(10, portfolio_core_1.aptosNetwork.native.decimals);
+    const depositAmount = new bignumber_js_1.default(depositAmountString.toString())
+        .div(Math.pow(10, portfolio_core_1.aptosNetwork.native.decimals))
+        .toNumber();
     if (depositAmount === 0)
         return [];
     const depositTokenPrice = yield cache.getTokenPrice(constants_1.modCoin.toString(), portfolio_core_1.NetworkId.aptos);

package/src/plugins/thala/stabilityPoolFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"stabilityPoolFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/thala/stabilityPoolFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAQoC;AAGpC,2CAMqB;AACrB,6CAA4C;AAC5C,iDAAqD;AACrD,qGAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,UAAU,GAAG,IAAA,wBAAc,GAAE,CAAC;IACpC,MAAM,wBAAwB,GAAG,MAAM,IAAA,eAAO,EAC5C,UAAU,EACV,IAAA,mCAAuB,EAAC,KAAK,CAAC,CAC/B,CAAC;IACF,IAAI,CAAC,wBAAwB,IAAI,wBAAwB,CAAC,MAAM,KAAK,CAAC;QACpE,OAAO,EAAE,CAAC;IAEZ,MAAM,mBAAmB,GAAG,wBAAwB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC3D,IAAI,CAAC,mBAAmB;QAAE,OAAO,EAAE,CAAC;IAEpC,MAAM,aAAa,GACjB,CAAC,mBAAmB,GAAG,SAAA,EAAE,EAAI,6BAAY,CAAC,MAAM,CAAC,QAAQ,CAAA,CAAC;IAC5D,IAAI,aAAa,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAEnC,MAAM,iBAAiB,GAAG,MAAM,KAAK,CAAC,aAAa,CACjD,mBAAO,CAAC,QAAQ,EAAE,EAClB,0BAAS,CAAC,KAAK,CAChB,CAAC;IAEF,MAAM,MAAM,GAAG,IAAA,gCAAsB,EACnC,mBAAO,CAAC,QAAQ,EAAE,EAClB,aAAa,EACb,0BAAS,CAAC,KAAK,EACf,iBAAiB,CAClB,CAAC;IAEF,MAAM,aAAa,GAAG,MAAM,IAAA,eAAO,EACjC,UAAU,EACV,IAAA,qCAAyB,EAAC,KAAK,CAAC,CACjC,CAAC;IAEF,MAAM,WAAW,GAAkB,CAAC,iBAAiB;QACnD,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,iBAAiB,CAAC,KAAK,GAAG,aAAa,CAAC;IAC5C,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAE5D,MAAM,mBAAmB,GAAG,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAChD,IAAI,CAAC,mBAAmB;QAAE,OAAO,EAAE,CAAC;IAEpC,MAAM,aAAa,GACjB,CAAC,mBAAmB,GAAG,SAAA,EAAE,EAAI,6BAAY,CAAC,MAAM,CAAC,QAAQ,CAAA,CAAC;IAC5D,MAAM,iBAAiB,GAAG,MAAM,KAAK,CAAC,aAAa,CACjD,mBAAO,CAAC,QAAQ,EAAE,EAClB,0BAAS,CAAC,KAAK,CAChB,CAAC;IACF,MAAM,YAAY,GAAG,IAAA,gCAAsB,EACzC,mBAAO,CAAC,QAAQ,EAAE,EAClB,aAAa,EACb,0BAAS,CAAC,KAAK,EACf,iBAAiB,CAClB,CAAC;IACF,MAAM,iBAAiB,GAAkB,CAAC,iBAAiB;QACzD,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,iBAAiB,CAAC,KAAK,GAAG,aAAa,CAAC;IAE5C,MAAM,KAAK,GACT,CAAC,iBAAiB,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,iBAAiB,GAAG,WAAW,CAAC;IAE9E,MAAM,MAAM,GAAY,EAAE,CAAC;IAC3B,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,OAAO,CAAS,KAAK,EAAE,EAAE,MAAM,EAAE,sBAAU,EAAE,CAAC,CAAC;IACvE,IAAI,GAAG,EAAE,CAAC;QACR,MAAM,CAAC,IAAI,CAAC;YACV,GAAG;YACH,GAAG,EAAE,IAAA,yBAAQ,EAAC,GAAG,CAAC;SACnB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,SAAS,GAAuB;QACpC,KAAK;QACL,MAAM,EAAE,CAAC,MAAM,CAAC;QAChB,WAAW;QACX,YAAY,EAAE,CAAC,YAAY,CAAC;QAC5B,iBAAiB;QACjB,MAAM;KACP,CAAC;IACF,MAAM,WAAW,GAAyB,CAAC,SAAS,CAAC,CAAC;IAEtD,MAAM,eAAe,GAA8B;QACjD,SAAS,EAAE,0BAAS,CAAC,KAAK;QAC1B,UAAU,EAAE,OAAO;QACnB,IAAI,EAAE,qCAAoB,CAAC,SAAS;QACpC,KAAK,EAAE,QAAQ;QACf,KAAK;QACL,IAAI,EAAE;YACJ,WAAW;SACZ;KACF,CAAC;IACF,OAAO,CAAC,eAAe,CAAC,CAAC;AAC3B,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,iBAAiB;IAClC,SAAS,EAAE,0BAAS,CAAC,KAAK;IAC1B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"stabilityPoolFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/thala/stabilityPoolFetcher.ts"],"names":[],"mappings":"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"}

package/src/utils/aptos/getAccountCoinsData.d.ts

@@ -0,0 +1,26 @@
+import { AptosClient } from '../clients/types';
+export declare function getAccountCoinsData(client: AptosClient, coinType: string): Promise<{
+    amount: any;
+    asset_type: string;
+    is_frozen: boolean;
+    is_primary: boolean;
+    last_transaction_timestamp: any;
+    last_transaction_version: any;
+    owner_address: string;
+    storage_id: string;
+    token_standard: string;
+    metadata?: {
+        token_standard: string;
+        symbol: string;
+        supply_aggregator_table_key_v1?: string | null | undefined;
+        supply_aggregator_table_handle_v1?: string | null | undefined;
+        project_uri?: string | null | undefined;
+        name: string;
+        last_transaction_version: any;
+        last_transaction_timestamp: any;
+        icon_uri?: string | null | undefined;
+        decimals: number;
+        creator_address: string;
+        asset_type: string;
+    } | null | undefined;
+}[]>;

package/src/utils/aptos/getAccountCoinsData.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAccountCoinsData = void 0;
+function getAccountCoinsData(client, coinType) {
+    return client.getAccountCoinsData({
+        accountAddress: coinType,
+    });
+}
+exports.getAccountCoinsData = getAccountCoinsData;
+//# sourceMappingURL=getAccountCoinsData.js.map

package/src/utils/aptos/getAccountCoinsData.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getAccountCoinsData.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/aptos/getAccountCoinsData.ts"],"names":[],"mappings":";;;AAEA,SAAgB,mBAAmB,CAAC,MAAmB,EAAE,QAAgB;IACvE,OAAO,MAAM,CAAC,mBAAmB,CAAC;QAChC,cAAc,EAAE,QAAQ;KACzB,CAAC,CAAC;AACL,CAAC;AAJD,kDAIC"}

package/src/utils/aptos/getAccountResource.d.ts

@@ -1,3 +1,2 @@
-import { AptosClient } from 'aptos';
-import { MoveResource } from './MoveResource';
-export declare function getAccountResource<T>(client: AptosClient, accountAddress: string, resourceType: string): Promise<MoveResource<T> | null>;
+import { AptosClient } from '../clients/types';
+export declare function getAccountResource<T extends object>(client: AptosClient, accountAddress: string, resourceType: `${string}::${string}::${string}`): Promise<T | null>;

package/src/utils/aptos/getAccountResource.js

@@ -13,7 +13,10 @@ exports.getAccountResource = void 0;
 function getAccountResource(client, accountAddress, resourceType) {
     return __awaiter(this, void 0, void 0, function* () {
         const resource = yield client
-            .getAccountResource(accountAddress, resourceType)
+            .getAccountResource({
+            accountAddress,
+            resourceType,
+        })
             .catch((e) => {
             if (!e.status || e.status !== 404)
                 throw e;

package/src/utils/aptos/getAccountResource.js.map

@@ -1 +1 @@
-{"version":3,"file":"getAccountResource.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/aptos/getAccountResource.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,SAAsB,kBAAkB,CACtC,MAAmB,EACnB,cAAsB,EACtB,YAAoB;;QAEpB,MAAM,QAAQ,GAAG,MAAM,MAAM;aAC1B,kBAAkB,CAAC,cAAc,EAAE,YAAY,CAAC;aAChD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACX,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,KAAK,GAAG;gBAAE,MAAM,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QACL,IAAI,CAAC,QAAQ;YAAE,OAAO,IAAI,CAAC;QAC3B,OAAO,QAA2B,CAAC;IACrC,CAAC;CAAA;AAZD,gDAYC"}
+{"version":3,"file":"getAccountResource.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/aptos/getAccountResource.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,SAAsB,kBAAkB,CACtC,MAAmB,EACnB,cAAsB,EACtB,YAA+C;;QAE/C,MAAM,QAAQ,GAAG,MAAM,MAAM;aAC1B,kBAAkB,CAAI;YACrB,cAAc;YACd,YAAY;SACb,CAAC;aACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACX,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,KAAK,GAAG;gBAAE,MAAM,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QACL,IAAI,CAAC,QAAQ;YAAE,OAAO,IAAI,CAAC;QAC3B,OAAO,QAAQ,CAAC;IAClB,CAAC;CAAA;AAfD,gDAeC"}

package/src/utils/aptos/getAccountResources.d.ts

@@ -1,5 +1,2 @@
-import { AptosClient } from 'aptos';
-export declare function getAccountResources(client: AptosClient, accountAddress: string): Promise<{
-    type: string;
-    data: {};
-}[] | null>;
+import { AptosClient } from '../clients/types';
+export declare function getAccountResources(client: AptosClient, accountAddress: string): Promise<import("@aptos-labs/ts-sdk").MoveResource[] | null>;

package/src/utils/aptos/getAccountResources.js

@@ -13,7 +13,9 @@ exports.getAccountResources = void 0;
 function getAccountResources(client, accountAddress) {
     return __awaiter(this, void 0, void 0, function* () {
         const resources = yield client
-            .getAccountResources(accountAddress)
+            .getAccountResources({
+            accountAddress,
+        })
             .catch((e) => {
             if (!e.status || e.status !== 404)
                 throw e;

package/src/utils/aptos/getAccountResources.js.map

@@ -1 +1 @@
-{"version":3,"file":"getAccountResources.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/aptos/getAccountResources.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,SAAsB,mBAAmB,CACvC,MAAmB,EACnB,cAAsB;;QAEtB,MAAM,SAAS,GAAG,MAAM,MAAM;aAC3B,mBAAmB,CAAC,cAAc,CAAC;aACnC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACX,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,KAAK,GAAG;gBAAE,MAAM,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QACL,OAAO,SAAS,IAAI,IAAI,CAAC;IAC3B,CAAC;CAAA;AAVD,kDAUC"}
+{"version":3,"file":"getAccountResources.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/aptos/getAccountResources.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,SAAsB,mBAAmB,CACvC,MAAmB,EACnB,cAAsB;;QAEtB,MAAM,SAAS,GAAG,MAAM,MAAM;aAC3B,mBAAmB,CAAC;YACnB,cAAc;SACf,CAAC;aACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACX,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,KAAK,GAAG;gBAAE,MAAM,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QACL,OAAO,SAAS,IAAI,IAAI,CAAC;IAC3B,CAAC;CAAA;AAZD,kDAYC"}

package/src/utils/aptos/getCoinInfoResource.d.ts

@@ -1,3 +1,3 @@
-import { AptosClient } from 'aptos';
+import { AptosClient } from '../clients/types';
 import { CoinInfoData } from './resources/coinInfo';
-export declare function getCoinInfoResource(client: AptosClient, coinType: string): Promise<import("./MoveResource").MoveResource<CoinInfoData> | null>;
+export declare function getCoinInfoResource(client: AptosClient, coinType: string): Promise<CoinInfoData | null>;

package/src/utils/aptos/getCoinStoreResource.d.ts

@@ -1,3 +1,3 @@
-import { AptosClient } from 'aptos';
+import { AptosClient } from '../clients/types';
 import { CoinStoreData } from './resources/coinStore';
-export declare function getCoinStoreResource(client: AptosClient, owner: string, coinType: string): Promise<import("./MoveResource").MoveResource<CoinStoreData> | null>;
+export declare function getCoinStoreResource(client: AptosClient, owner: string, coinType: string): Promise<CoinStoreData | null>;

package/src/utils/aptos/getCoinStoreResources.d.ts

@@ -1,5 +1,2 @@
-import { AptosClient } from 'aptos';
-export declare function getCoinStoreResources(client: AptosClient, owner: string): Promise<{
-    type: string;
-    data: {};
-}[] | null>;
+import { AptosClient } from '../clients/types';
+export declare function getCoinStoreResources(client: AptosClient, owner: string): Promise<import("@aptos-labs/ts-sdk").MoveResource[] | null>;

package/src/utils/aptos/getDecimals.d.ts

@@ -1,2 +1,2 @@
-import { AptosClient } from 'aptos';
+import { AptosClient } from '../clients/types';
 export declare function getDecimals(client: AptosClient, coinType: string): Promise<number | null>;

package/src/utils/aptos/getDecimals.js

@@ -16,7 +16,7 @@ function getDecimals(client, coinType) {
         const coinInfoResource = yield (0, getCoinInfoResource_1.getCoinInfoResource)(client, coinType);
         if (!coinInfoResource)
             return null;
-        return coinInfoResource.data.decimals;
+        return coinInfoResource.decimals;
     });
 }
 exports.getDecimals = getDecimals;

package/src/utils/aptos/getDecimals.js.map

@@ -1 +1 @@
-{"version":3,"file":"getDecimals.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/aptos/getDecimals.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,+DAA4D;AAE5D,SAAsB,WAAW,CAAC,MAAmB,EAAE,QAAgB;;QACrE,MAAM,gBAAgB,GAAG,MAAM,IAAA,yCAAmB,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACrE,IAAI,CAAC,gBAAgB;YAAE,OAAO,IAAI,CAAC;QACnC,OAAO,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC;IACxC,CAAC;CAAA;AAJD,kCAIC"}
+{"version":3,"file":"getDecimals.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/aptos/getDecimals.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,+DAA4D;AAE5D,SAAsB,WAAW,CAAC,MAAmB,EAAE,QAAgB;;QACrE,MAAM,gBAAgB,GAAG,MAAM,IAAA,yCAAmB,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACrE,IAAI,CAAC,gBAAgB;YAAE,OAAO,IAAI,CAAC;QACnC,OAAO,gBAAgB,CAAC,QAAQ,CAAC;IACnC,CAAC;CAAA;AAJD,kCAIC"}

package/src/utils/aptos/getNestedType.d.ts

@@ -1 +1,5 @@
+/**
+ * @deprecated
+ * This function has been deprecated. Use the parseTypeString instead.
+ */
 export declare function getNestedType(type: string): string;

package/src/utils/aptos/getNestedType.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNestedType = void 0;
+/**
+ * @deprecated
+ * This function has been deprecated. Use the parseTypeString instead.
+ */
 function getNestedType(type) {
     const index = type.indexOf('<');
     return type.slice(index + 1, -1);

package/src/utils/aptos/getNestedType.js.map

@@ -1 +1 @@
-{"version":3,"file":"getNestedType.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/aptos/getNestedType.ts"],"names":[],"mappings":";;;AAAA,SAAgB,aAAa,CAAC,IAAY;IACxC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAChC,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACnC,CAAC;AAHD,sCAGC"}
+{"version":3,"file":"getNestedType.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/aptos/getNestedType.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,SAAgB,aAAa,CAAC,IAAY;IACxC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAChC,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACnC,CAAC;AAHD,sCAGC"}

package/src/utils/aptos/getTableItem.d.ts

@@ -1,3 +1,3 @@
-import { AptosClient } from 'aptos';
-import { TableItemRequest } from './types';
-export declare function getTableItem<T>(client: AptosClient, handle: string, data: TableItemRequest): Promise<NonNullable<T> | null>;
+import { TableItemRequest } from '@aptos-labs/ts-sdk';
+import { AptosClient } from '../clients/types';
+export declare function getTableItem<T>(client: AptosClient, handle: string, data: TableItemRequest): Promise<NonNullable<Awaited<T>> | null>;

package/src/utils/aptos/getTableItem.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTableItem = void 0;
 function getTableItem(client, handle, data) {
     return __awaiter(this, void 0, void 0, function* () {
-        const item = yield client.getTableItem(handle, data).catch((e) => {
+        const item = yield client.getTableItem({ handle, data }).catch((e) => {
             if (!e.status || e.status !== 404)
                 throw e;
         });

package/src/utils/aptos/getTableItem.js.map

@@ -1 +1 @@
-{"version":3,"file":"getTableItem.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/aptos/getTableItem.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,SAAsB,YAAY,CAChC,MAAmB,EACnB,MAAc,EACd,IAAsB;;QAEtB,MAAM,IAAI,GAAa,MAAM,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACzE,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,KAAK,GAAG;gBAAE,MAAM,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,IAAI,IAAI,CAAC;IACtB,CAAC;CAAA;AATD,oCASC"}
+{"version":3,"file":"getTableItem.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/aptos/getTableItem.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,SAAsB,YAAY,CAChC,MAAmB,EACnB,MAAc,EACd,IAAsB;;QAEtB,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACtE,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,KAAK,GAAG;gBAAE,MAAM,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,IAAI,IAAI,CAAC;IACtB,CAAC;CAAA;AATD,oCASC"}

package/src/utils/aptos/getTableItemsByHandles.d.ts

@@ -1,3 +1,3 @@
-import { AptosClient } from 'aptos';
-import { TableItemRequest } from './types';
-export declare function getTableItemsByHandles<T>(client: AptosClient, handles: string[], data: TableItemRequest): Promise<(Awaited<NonNullable<T>> | null)[]>;
+import { TableItemRequest } from '@aptos-labs/ts-sdk';
+import { AptosClient } from '../clients/types';
+export declare function getTableItemsByHandles<T>(client: AptosClient, handles: string[], data: TableItemRequest): Promise<(Awaited<NonNullable<Awaited<T>>> | null)[]>;

package/src/utils/aptos/getTableItemsByHandles.js.map

@@ -1 +1 @@
-{"version":3,"file":"getTableItemsByHandles.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/aptos/getTableItemsByHandles.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,iDAA8C;AAG9C,MAAM,GAAG,GAAG,EAAE,CAAC;AAEf,SAAsB,sBAAsB,CAC1C,MAAmB,EACnB,OAAiB,EACjB,IAAsB;;QAEtB,MAAM,KAAK,GAAG,EAAE,CAAC;QACjB,MAAM,cAAc,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC;QACpC,OAAO,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,MAAM,kBAAkB,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;YACzD,MAAM,SAAS,GAAG,MAAM,uBAAuB,CAC7C,MAAM,EACN,kBAAkB,EAClB,IAAI,CACL,CAAC;YACF,KAAK,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;QAC3B,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CAAA;AAjBD,wDAiBC;AAED,SAAe,uBAAuB,CACpC,MAAmB,EACnB,OAAiB,EACjB,IAAsB;;QAEtB,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CACtC,IAAA,2BAAY,EAAI,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CACtC,CAAC;QACF,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACnD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAC5B,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU;gBAAE,OAAO,IAAI,CAAC;YAC9C,OAAO,MAAM,CAAC,KAAK,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC;CAAA"}
+{"version":3,"file":"getTableItemsByHandles.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/aptos/getTableItemsByHandles.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,iDAA8C;AAE9C,MAAM,GAAG,GAAG,EAAE,CAAC;AAEf,SAAsB,sBAAsB,CAC1C,MAAmB,EACnB,OAAiB,EACjB,IAAsB;;QAEtB,MAAM,KAAK,GAAG,EAAE,CAAC;QACjB,MAAM,cAAc,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC;QACpC,OAAO,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,MAAM,kBAAkB,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;YACzD,MAAM,SAAS,GAAG,MAAM,uBAAuB,CAC7C,MAAM,EACN,kBAAkB,EAClB,IAAI,CACL,CAAC;YACF,KAAK,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;QAC3B,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CAAA;AAjBD,wDAiBC;AAED,SAAe,uBAAuB,CACpC,MAAmB,EACnB,OAAiB,EACjB,IAAsB;;QAEtB,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CACtC,IAAA,2BAAY,EAAI,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CACtC,CAAC;QACF,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACnD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAC5B,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU;gBAAE,OAAO,IAAI,CAAC;YAC9C,OAAO,MAAM,CAAC,KAAK,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC;CAAA"}

package/src/utils/aptos/getTableItemsByKeys.d.ts

@@ -1,2 +1,2 @@
-import { AptosClient } from 'aptos';
-export declare function getTableItemsByKeys<T>(client: AptosClient, handle: string, keys: string[], keyType: string, valueType: string): Promise<(Awaited<NonNullable<T>> | null)[]>;
+import { AptosClient } from '../clients/types';
+export declare function getTableItemsByKeys<T>(client: AptosClient, handle: string, keys: string[], keyType: string, valueType: string): Promise<(Awaited<NonNullable<Awaited<T>>> | null)[]>;

package/src/utils/aptos/getView.d.ts

@@ -1,3 +1,3 @@
-import { AptosClient } from 'aptos';
-import { ViewRequest } from './types';
-export declare function getView(client: AptosClient, payload: ViewRequest): Promise<(string | number | boolean | {} | (string | number | boolean | {} | (string | number | boolean | {} | (string | number | boolean | {} | (string | number | boolean | {} | (string | number | boolean | {} | (string | number | boolean | {} | (string | number | boolean | {} | (string | number | boolean | {} | (string | number | boolean | {} | (string | number | boolean | {} | (string | number | boolean | {} | any)[])[])[])[])[])[])[])[])[])[])[])[] | null>;
+import { InputViewRequestData } from '@aptos-labs/ts-sdk';
+import { AptosClient } from '../clients/types';
+export declare function getView(client: AptosClient, payload: InputViewRequestData): Promise<import("@aptos-labs/ts-sdk").MoveValue[] | null>;

package/src/utils/aptos/getView.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getView = void 0;
 function getView(client, payload) {
     return __awaiter(this, void 0, void 0, function* () {
-        const resource = yield client.view(payload).catch((e) => {
+        const resource = yield client.view({ payload }).catch((e) => {
             if (!e.status || e.status !== 404)
                 throw e;
         });

package/src/utils/aptos/getView.js.map

@@ -1 +1 @@
-{"version":3,"file":"getView.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/aptos/getView.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,SAAsB,OAAO,CAAC,MAAmB,EAAE,OAAoB;;QACrE,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACtD,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,KAAK,GAAG;gBAAE,MAAM,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ;YAAE,OAAO,IAAI,CAAC;QAC3B,OAAO,QAAQ,CAAC;IAClB,CAAC;CAAA;AAND,0BAMC"}
+{"version":3,"file":"getView.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/aptos/getView.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,SAAsB,OAAO,CAC3B,MAAmB,EACnB,OAA6B;;QAE7B,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YAC1D,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,KAAK,GAAG;gBAAE,MAAM,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ;YAAE,OAAO,IAAI,CAAC;QAC3B,OAAO,QAAQ,CAAC;IAClB,CAAC;CAAA;AATD,0BASC"}

package/src/utils/aptos/types.d.ts

@@ -1,13 +1,3 @@
-export type TableItemRequest = {
-    key_type: string;
-    value_type: string;
-    key: string;
-};
-export type ViewRequest = {
-    function: string;
-    type_arguments: string[];
-    arguments: string[];
-};
 export type MoveType = {
     type: string;
     root: string;

package/src/utils/blank/isBlankAddressAptos.js

@@ -14,7 +14,11 @@ const clients_1 = require("../clients");
 function isBlankAddressAptos(address) {
     return __awaiter(this, void 0, void 0, function* () {
         const client = (0, clients_1.getClientAptos)();
-        const ressources = yield client.getAccountResources(address).catch(() => []);
+        const ressources = yield client
+            .getAccountResources({
+            accountAddress: address,
+        })
+            .catch(() => []);
         return ressources.length === 0;
     });
 }

package/src/utils/blank/isBlankAddressAptos.js.map

@@ -1 +1 @@
-{"version":3,"file":"isBlankAddressAptos.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/blank/isBlankAddressAptos.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA4C;AAE5C,SAAsB,mBAAmB,CAAC,OAAe;;QACvD,MAAM,MAAM,GAAG,IAAA,wBAAc,GAAE,CAAC;QAChC,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;QAC7E,OAAO,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC;IACjC,CAAC;CAAA;AAJD,kDAIC"}
+{"version":3,"file":"isBlankAddressAptos.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/blank/isBlankAddressAptos.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA4C;AAE5C,SAAsB,mBAAmB,CAAC,OAAe;;QACvD,MAAM,MAAM,GAAG,IAAA,wBAAc,GAAE,CAAC;QAChC,MAAM,UAAU,GAAG,MAAM,MAAM;aAC5B,mBAAmB,CAAC;YACnB,cAAc,EAAE,OAAO;SACxB,CAAC;aACD,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;QACnB,OAAO,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC;IACjC,CAAC;CAAA;AARD,kDAQC"}

package/src/utils/clients/constants.js

@@ -24,7 +24,7 @@ function getUrlEndpoints() {
             'https://api.avax.network/ext/bc/C/rpc',
         polygon: process.env['PORTFOLIO_POLYGON_RPC'] || 'https://1rpc.io/matic',
         aptos: process.env['PORTFOLIO_APTOS_RPC'] ||
-            'https://fullnode.mainnet.aptoslabs.com',
+            'https://api.mainnet.aptoslabs.com/v1',
         sui: process.env['PORTFOLIO_SUI_RPC'] || 'https://sui-rpc.publicnode.com',
     };
 }

package/src/utils/clients/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/clients/constants.ts"],"names":[],"mappings":";;;;;;AAKA,wCAAsE;AACtE,0EAAkD;AAErC,QAAA,qBAAqB,GAAoC;IACpE,QAAQ,EAAE,gBAAO;IACjB,SAAS,EAAT,kBAAS;IACT,OAAO,EAAP,gBAAO;IACP,GAAG,EAAE,YAAG;CACT,CAAC;AAEF,SAAgB,eAAe;IAC7B,OAAO;QACL,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,+BAA+B;QACxE,OAAO,EACL,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,IAAI,+BAA+B;QACzE,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,8BAA8B;QACvE,MAAM,EACJ,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC;YACnC,qCAAqC;QACvC,QAAQ,EACN,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,IAAI,0BAA0B;QACrE,SAAS,EACP,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC;YACtC,uCAAuC;QACzC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,IAAI,uBAAuB;QACxE,KAAK,EACH,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC;YAClC,wCAAwC;QAC1C,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,gCAAgC;KAC1E,CAAC;AACJ,CAAC;AApBD,0CAoBC;AAED,SAAgB,cAAc,CAAC,SAAwB;IACrD,OAAO,eAAe,EAAE,CAAC,SAAS,CAAC,CAAC;AACtC,CAAC;AAFD,wCAEC;AAED,SAAgB,eAAe;IAC7B,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;QACjD,GAAG;QACH,IAAA,0BAAgB,EAAC,KAAK,CAAC;KACxB,CAAC,CACmC,CAAC;AAC1C,CAAC;AARD,0CAQC;AAED,SAAgB,cAAc,CAAC,SAAwB;IACrD,OAAO,eAAe,EAAE,CAAC,SAAS,CAAC,CAAC;AACtC,CAAC;AAFD,wCAEC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/clients/constants.ts"],"names":[],"mappings":";;;;;;AAKA,wCAAsE;AACtE,0EAAkD;AAErC,QAAA,qBAAqB,GAAoC;IACpE,QAAQ,EAAE,gBAAO;IACjB,SAAS,EAAT,kBAAS;IACT,OAAO,EAAP,gBAAO;IACP,GAAG,EAAE,YAAG;CACT,CAAC;AAEF,SAAgB,eAAe;IAC7B,OAAO;QACL,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,+BAA+B;QACxE,OAAO,EACL,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,IAAI,+BAA+B;QACzE,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,8BAA8B;QACvE,MAAM,EACJ,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC;YACnC,qCAAqC;QACvC,QAAQ,EACN,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,IAAI,0BAA0B;QACrE,SAAS,EACP,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC;YACtC,uCAAuC;QACzC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,IAAI,uBAAuB;QACxE,KAAK,EACH,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC;YAClC,sCAAsC;QACxC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,gCAAgC;KAC1E,CAAC;AACJ,CAAC;AApBD,0CAoBC;AAED,SAAgB,cAAc,CAAC,SAAwB;IACrD,OAAO,eAAe,EAAE,CAAC,SAAS,CAAC,CAAC;AACtC,CAAC;AAFD,wCAEC;AAED,SAAgB,eAAe;IAC7B,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;QACjD,GAAG;QACH,IAAA,0BAAgB,EAAC,KAAK,CAAC;KACxB,CAAC,CACmC,CAAC;AAC1C,CAAC;AARD,0CAQC;AAED,SAAgB,cAAc,CAAC,SAAwB;IACrD,OAAO,eAAe,EAAE,CAAC,SAAS,CAAC,CAAC;AACtC,CAAC;AAFD,wCAEC"}

package/src/utils/clients/getClientAptos.d.ts

@@ -1,2 +1,2 @@
-import { AptosClient } from 'aptos';
+import { AptosClient } from './types';
 export default function getClientAptos(): AptosClient;

package/src/utils/clients/getClientAptos.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
-const aptos_1 = require("aptos");
+const ts_sdk_1 = require("@aptos-labs/ts-sdk");
 const constants_1 = require("./constants");
 const getBasicAuthHeaders_1 = require("../misc/getBasicAuthHeaders");
 function getClientAptos() {
@@ -10,9 +10,14 @@ function getClientAptos() {
     const headers = rpcEndpoint.basicAuth
         ? (0, getBasicAuthHeaders_1.getBasicAuthHeaders)((_a = rpcEndpoint.basicAuth) === null || _a === void 0 ? void 0 : _a.username, (_b = rpcEndpoint.basicAuth) === null || _b === void 0 ? void 0 : _b.password)
         : undefined;
-    return new aptos_1.AptosClient(rpcEndpoint.url, {
-        HEADERS: headers,
+    const config = new ts_sdk_1.AptosConfig({
+        network: ts_sdk_1.Network.MAINNET,
+        clientConfig: {
+            HEADERS: headers,
+        },
+        fullnode: rpcEndpoint.url,
     });
+    return new ts_sdk_1.Aptos(config);
 }
 exports.default = getClientAptos;
 //# sourceMappingURL=getClientAptos.js.map

package/src/utils/clients/getClientAptos.js.map

@@ -1 +1 @@
-{"version":3,"file":"getClientAptos.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/clients/getClientAptos.ts"],"names":[],"mappings":";;AAAA,+DAAuD;AACvD,iCAAoC;AACpC,2CAA6C;AAC7C,qEAAkE;AAElE,SAAwB,cAAc;;IACpC,MAAM,WAAW,GAAG,IAAA,0BAAc,EAAC,0BAAS,CAAC,KAAK,CAAC,CAAC;IACpD,MAAM,OAAO,GAAG,WAAW,CAAC,SAAS;QACnC,CAAC,CAAC,IAAA,yCAAmB,EACjB,MAAA,WAAW,CAAC,SAAS,0CAAE,QAAQ,EAC/B,MAAA,WAAW,CAAC,SAAS,0CAAE,QAAQ,CAChC;QACH,CAAC,CAAC,SAAS,CAAC;IACd,OAAO,IAAI,mBAAW,CAAC,WAAW,CAAC,GAAG,EAAE;QACtC,OAAO,EAAE,OAAO;KACjB,CAAC,CAAC;AACL,CAAC;AAXD,iCAWC"}
+{"version":3,"file":"getClientAptos.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/clients/getClientAptos.ts"],"names":[],"mappings":";;AAAA,+DAAuD;AACvD,+CAAiE;AACjE,2CAA6C;AAC7C,qEAAkE;AAGlE,SAAwB,cAAc;;IACpC,MAAM,WAAW,GAAG,IAAA,0BAAc,EAAC,0BAAS,CAAC,KAAK,CAAC,CAAC;IACpD,MAAM,OAAO,GAAG,WAAW,CAAC,SAAS;QACnC,CAAC,CAAC,IAAA,yCAAmB,EACjB,MAAA,WAAW,CAAC,SAAS,0CAAE,QAAQ,EAC/B,MAAA,WAAW,CAAC,SAAS,0CAAE,QAAQ,CAChC;QACH,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,MAAM,GAAG,IAAI,oBAAW,CAAC;QAC7B,OAAO,EAAE,gBAAO,CAAC,OAAO;QACxB,YAAY,EAAE;YACZ,OAAO,EAAE,OAAO;SACjB;QACD,QAAQ,EAAE,WAAW,CAAC,GAAG;KAC1B,CAAC,CAAC;IACH,OAAO,IAAI,cAAK,CAAC,MAAM,CAAC,CAAC;AAC3B,CAAC;AAhBD,iCAgBC"}

package/src/utils/clients/types.d.ts

@@ -1,6 +1,8 @@
+import { Aptos } from '@aptos-labs/ts-sdk';
 import { SuiClient as MystenSuiClient } from '@mysten/sui.js/client';
 import { Connection } from '@solana/web3.js';
 import { PublicClient } from 'viem';
 export type EvmClient = PublicClient;
 export type SuiClient = MystenSuiClient;
 export type SolanaClient = Connection;
+export type AptosClient = Aptos;

package/src/utils/misc/checkComputeAndStoreTokensPrices.d.ts

@@ -23,6 +23,14 @@ export type PartialTokenUnderlying = {
  * If you think other tokens should be added to this list, please send a PR.
  */
 export declare const tokensToRelyOnByNetwork: Map<NetworkIdType, string[]>;
+/**
+ * @deprecated
+ * This function has been deprecated. Use the getLpUnderlyingTokenSource instead.
+ * This list is used to avoid calulating low liquidity tokens with others low liquidity tokens.
+ * To prevent wrong prices (with very low precision) to be calculated, we setup a list of tokens to rely on.
+ * These tokens have very low chance of having price manipulation.
+ * Therefore, they can be safely used to compute other tokens prices.
+ */
 export default function checkComputeAndStoreTokensPrices(cache: Cache, source: string, networkId: NetworkIdType, tokenX: TokenInfo, tokenY: TokenInfo): Promise<{
     partialTokenUnderlyingX: PartialTokenUnderlying;
     partialTokenUnderlyingY: PartialTokenUnderlying;

package/src/utils/misc/checkComputeAndStoreTokensPrices.js

@@ -66,6 +66,14 @@ exports.tokensToRelyOnByNetwork = new Map([
         ],
     ],
 ]);
+/**
+ * @deprecated
+ * This function has been deprecated. Use the getLpUnderlyingTokenSource instead.
+ * This list is used to avoid calulating low liquidity tokens with others low liquidity tokens.
+ * To prevent wrong prices (with very low precision) to be calculated, we setup a list of tokens to rely on.
+ * These tokens have very low chance of having price manipulation.
+ * Therefore, they can be safely used to compute other tokens prices.
+ */
 function checkComputeAndStoreTokensPrices(cache, source, networkId, tokenX, tokenY) {
     return __awaiter(this, void 0, void 0, function* () {
         const tokensToRelyOn = exports.tokensToRelyOnByNetwork.get(networkId);

package/src/utils/misc/checkComputeAndStoreTokensPrices.js.map

@@ -1 +1 @@
-{"version":3,"file":"checkComputeAndStoreTokensPrices.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/misc/checkComputeAndStoreTokensPrices.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+DAMoC;AAGpC,wEAAgD;AAChD,+DAA4D;AAC5D,8DAAsE;AAetE;;;;;;;;;GASG;AACU,QAAA,uBAAuB,GAAiC,IAAI,GAAG,CAAC;IAC3E;QACE,0BAAS,CAAC,GAAG;QACb;YACE,yBAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO;YAC3B,sEAAsE,EAAE,OAAO;YAC/E,qHAAqH,EAAE,SAAS;SACjI;KACF;IACD;QACE,0BAAS,CAAC,MAAM;QAChB;YACE,yBAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO;YAC9B,2CAA0B,EAAE,OAAO;YACnC,8CAA8C,EAAE,WAAW;YAC3D,6CAA6C,EAAE,OAAO;YACtD,8CAA8C,EAAE,WAAW;YAC3D,8CAA8C,EAAE,OAAO;YACvD,8CAA8C,EAAE,OAAO;SACxD;KACF;IACD;QACE,0BAAS,CAAC,KAAK;QACf;YACE,yBAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO;YAC7B,6EAA6E,EAAE,SAAS;YACxF,mFAAmF,EAAE,oBAAoB;SAC1G;KACF;IACD;QACE,0BAAS,CAAC,GAAG;QACb;YACE,yBAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO;YAC3B,gFAAgF,EAAE,SAAS;YAC3F,iFAAiF,EAAE,QAAQ;YAC3F,eAAe;SAChB;KACF;CACF,CAAC,CAAC;AAEH,SAA8B,gCAAgC,CAC5D,KAAY,EACZ,MAAc,EACd,SAAwB,EACxB,MAAiB,EACjB,MAAiB;;QAQjB,MAAM,cAAc,GAAG,+BAAuB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAE9D,IAAI,CAAC,cAAc;YAAE,OAAO,SAAS,CAAC;QAEtC,IACE,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;YACrC,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;YAErC,OAAO,SAAS,CAAC;QAEnB,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,cAAc,CAC5C,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,EAC1B,SAAS,CACV,CAAC;QACF,MAAM,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QACnC,MAAM,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QACnC,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW;YAAE,OAAO,SAAS,CAAC;QAEnD,IAAI,uBAAuB,CAAC;QAC5B,IAAI,uBAAuB,CAAC;QAE5B,IAAI,WAAW,IAAI,WAAW,EAAE,CAAC;YAC/B,uBAAuB,GAAG;gBACxB,SAAS;gBACT,OAAO,EAAE,MAAM,CAAC,IAAI;gBACpB,QAAQ,EAAE,WAAW,CAAC,QAAQ;gBAC9B,KAAK,EAAE,WAAW,CAAC,KAAK;aACzB,CAAC;YAEF,uBAAuB,GAAG;gBACxB,SAAS;gBACT,OAAO,EAAE,MAAM,CAAC,IAAI;gBACpB,QAAQ,EAAE,WAAW,CAAC,QAAQ;gBAC9B,KAAK,EAAE,WAAW,CAAC,KAAK;aACzB,CAAC;YACF,OAAO,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,CAAC;QAC9D,CAAC;QAED,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,EAAE,CAAC;YACjC,IAAI,cAAc,CAAC;YACnB,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACnB,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC;YAClC,CAAC;iBAAM,IAAI,WAAW,EAAE,CAAC;gBACvB,cAAc,GAAG,WAAW,CAAC,QAAQ,CAAC;YACxC,CAAC;iBAAM,CAAC;gBACN,cAAc,GAAG,MAAM,IAAA,yCAAmB,EAAC,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YAC5E,CAAC;YAED,IAAI,cAAc,CAAC;YACnB,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACnB,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC;YAClC,CAAC;iBAAM,IAAI,WAAW,EAAE,CAAC;gBACvB,cAAc,GAAG,WAAW,CAAC,QAAQ,CAAC;YACxC,CAAC;iBAAM,CAAC;gBACN,cAAc,GAAG,MAAM,IAAA,yCAAmB,EAAC,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YAC5E,CAAC;YAED,IAAI,cAAc,KAAK,SAAS,IAAI,cAAc,KAAK,SAAS;gBAC9D,OAAO,SAAS,CAAC;YAEnB,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,cAAc,CAAA,CAAC,CAAC;YACxE,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,cAAc,CAAA,CAAC,CAAC;YAExE,IAAI,MAAc,CAAC;YACnB,IAAI,MAAc,CAAC;YAEnB,IAAI,CAAC,WAAW,IAAI,WAAW,EAAE,CAAC;gBAChC,MAAM,GAAG,aAAa;qBACnB,YAAY,CAAC,WAAW,CAAC,KAAK,CAAC;qBAC/B,SAAS,CAAC,aAAa,CAAC;qBACxB,QAAQ,EAAE,CAAC;gBACd,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC;YAC7B,CAAC;iBAAM,IAAI,CAAC,WAAW,IAAI,WAAW,EAAE,CAAC;gBACvC,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC;gBAC3B,MAAM,GAAG,aAAa;qBACnB,YAAY,CAAC,WAAW,CAAC,KAAK,CAAC;qBAC/B,SAAS,CAAC,aAAa,CAAC;qBACxB,QAAQ,EAAE,CAAC;YAChB,CAAC;iBAAM,CAAC;gBACN,OAAO,SAAS,CAAC;YACnB,CAAC;YAED,MAAM,MAAM,GAAG,IAAA,yBAAe,EAC5B,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CACnD,CAAC;YAEF,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC;YACxD,MAAM,KAAK,GAAG,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;YAC5C,MAAM,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC;YAC/D,IAAI,QAAQ,KAAK,SAAS;gBAAE,OAAO,SAAS,CAAC;YAE7C,MAAM,oBAAoB,GAAqB;gBAC7C,EAAE,EAAE,MAAM;gBACV,MAAM;gBACN,OAAO;gBACP,SAAS;gBACT,UAAU,EAAE,gCAAoB,CAAC,EAAE;gBACnC,QAAQ;gBACR,KAAK;gBACL,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;aACtB,CAAC;YAEF,uBAAuB,GAAG;gBACxB,SAAS;gBACT,OAAO,EAAE,MAAM,CAAC,IAAI;gBACpB,QAAQ,EAAE,cAAc;gBACxB,KAAK,EAAE,MAAM;aACd,CAAC;YAEF,uBAAuB,GAAG;gBACxB,SAAS;gBACT,OAAO,EAAE,MAAM,CAAC,IAAI;gBACpB,QAAQ,EAAE,cAAc;gBACxB,KAAK,EAAE,MAAM;aACd,CAAC;YAEF,MAAM,KAAK,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;YACtD,OAAO,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,CAAC;QAC9D,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CAAA;AArID,mDAqIC"}
+{"version":3,"file":"checkComputeAndStoreTokensPrices.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/misc/checkComputeAndStoreTokensPrices.ts"],"names":[],"mappings":"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"}

package/src/utils/misc/getDecimalsForToken.js

@@ -40,9 +40,11 @@ function getDecimalsForToken(cache, address, networkId) {
             case 'aptos': {
                 const client = (0, clients_1.getClientAptos)();
                 const viewRes = (yield client.view({
-                    function: aptos_1.coinDecimals,
-                    type_arguments: [address],
-                    arguments: [],
+                    payload: {
+                        function: aptos_1.coinDecimals,
+                        typeArguments: [address],
+                        functionArguments: [],
+                    },
                 }));
                 if (viewRes.length !== 1)
                     return undefined;

package/src/utils/misc/getDecimalsForToken.js.map

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

package/src/plugins/tokens/fetchers/aptos-nfts.d.ts

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

package/src/plugins/tokens/fetchers/aptos-nfts.js

@@ -1,117 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-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 */
-const portfolio_core_1 = require("@sonarwatch/portfolio-core");
-const aptos_1 = require("aptos");
-const runInBatch_1 = __importDefault(require("../../../utils/misc/runInBatch"));
-const getImagefromUri_1 = require("../../../utils/misc/getImagefromUri");
-const constants_1 = require("../constants");
-const prefix = 'nft-images-aptos';
-const noImageValue = 'noimage';
-const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
-    const provider = new aptos_1.Provider(aptos_1.Network.MAINNET);
-    const ownedTokensRes = yield provider.getOwnedTokens(owner);
-    const nfts = ownedTokensRes.current_token_ownerships_v2.filter((nft) => nft.current_token_data);
-    const cachedImages = yield cache.getItems(nfts
-        .map((o) => (o.current_token_data ? o.current_token_data.token_uri : []))
-        .flat(), {
-        prefix,
-        networkId: portfolio_core_1.NetworkId.aptos,
-    });
-    const images = new Map();
-    const missings = [];
-    nfts.forEach((o, i) => __awaiter(void 0, void 0, void 0, function* () {
-        if (!o.current_token_data)
-            return;
-        const cachedImage = cachedImages[i];
-        const address = o.current_token_data.token_uri;
-        if (cachedImage) {
-            images.set(address, cachedImage);
-        }
-        else
-            missings.push(o);
-    }));
-    const res = yield (0, runInBatch_1.default)(missings.map((o) => () => { var _a; return (0, getImagefromUri_1.getImagefromUri)((_a = o.current_token_data) === null || _a === void 0 ? void 0 : _a.token_uri, portfolio_core_1.NetworkId.aptos, cache); }), 10);
-    const promises = res.map((r, i) => {
-        var _a;
-        const image = r.status !== 'rejected' ? r.value : undefined;
-        const address = (_a = missings[i].current_token_data) === null || _a === void 0 ? void 0 : _a.token_uri;
-        if (!address)
-            return undefined;
-        if (r.status === 'rejected' || !image) {
-            return cache.setItem(address, noImageValue, {
-                prefix,
-                networkId: portfolio_core_1.NetworkId.aptos,
-            });
-        }
-        images.set(address, image);
-        return cache.setItem(address, image, {
-            prefix,
-            networkId: portfolio_core_1.NetworkId.aptos,
-        });
-    });
-    yield Promise.allSettled(promises);
-    const assets = nfts
-        .map((nft) => {
-        var _a;
-        if (!nft.current_token_data)
-            return [];
-        const address = nft.current_token_data.token_data_id;
-        const dataUri = nft.current_token_data.token_uri;
-        const { amount } = nft;
-        let image = images.get(dataUri);
-        if (image === noImageValue)
-            image = undefined;
-        return {
-            networkId: portfolio_core_1.NetworkId.aptos,
-            type: portfolio_core_1.PortfolioAssetType.collectible,
-            value: null,
-            attributes: {},
-            data: {
-                address,
-                amount,
-                dataUri,
-                price: null,
-                value: null,
-                floorPrice: null,
-                image,
-                imageUri: image,
-                name: nft.current_token_data.token_name,
-                collectionId: (_a = nft.current_token_data.current_collection) === null || _a === void 0 ? void 0 : _a.collection_id,
-            },
-        };
-    })
-        .flat();
-    if (assets.length === 0)
-        return [];
-    const element = {
-        type: portfolio_core_1.PortfolioElementType.multiple,
-        networkId: portfolio_core_1.NetworkId.aptos,
-        platformId: constants_1.walletNftsPlatform.id,
-        label: 'Wallet',
-        value: null,
-        data: {
-            assets,
-        },
-    };
-    return [element];
-});
-const fetcher = {
-    id: `${constants_1.walletNftsPlatform.id}-${portfolio_core_1.NetworkId.aptos}`,
-    networkId: portfolio_core_1.NetworkId.sui,
-    executor,
-};
-exports.default = fetcher;
-//# sourceMappingURL=aptos-nfts.js.map

package/src/plugins/tokens/fetchers/aptos-nfts.js.map

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