@sonarwatch/portfolio-plugins 0.5.34 → 0.5.36
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +8 -0
- package/package.json +2 -2
- package/src/plugins/aave/{lendingFetcherExecutorGenerator.d.ts → getLendingFetcherExecutor.d.ts} +1 -2
- package/src/plugins/aave/{lendingFetcherExecutorGenerator.js → getLendingFetcherExecutor.js} +8 -7
- package/src/plugins/aave/getLendingFetcherExecutor.js.map +1 -0
- package/src/plugins/aave/helpers.d.ts +3 -1
- package/src/plugins/aave/helpers.js +34 -2
- package/src/plugins/aave/helpers.js.map +1 -1
- package/src/plugins/aave/index.js +8 -18
- package/src/plugins/aave/index.js.map +1 -1
- package/src/plugins/aave/lendingPoolsJob.js +10 -5
- package/src/plugins/aave/lendingPoolsJob.js.map +1 -1
- package/src/plugins/aave/lendingFetcherExecutorGenerator.js.map +0 -1
package/CHANGELOG.md
CHANGED
@@ -2,6 +2,14 @@
|
|
2
2
|
|
3
3
|
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
|
4
4
|
|
5
|
+
## [0.5.36](https://github.com/sonarwatch/portfolio/compare/plugins-0.5.35...plugins-0.5.36) (2023-08-14)
|
6
|
+
|
7
|
+
|
8
|
+
|
9
|
+
## [0.5.35](https://github.com/sonarwatch/portfolio/compare/plugins-0.5.34...plugins-0.5.35) (2023-08-14)
|
10
|
+
|
11
|
+
|
12
|
+
|
5
13
|
## [0.5.34](https://github.com/sonarwatch/portfolio/compare/plugins-0.5.33...plugins-0.5.34) (2023-08-14)
|
6
14
|
|
7
15
|
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@sonarwatch/portfolio-plugins",
|
3
|
-
"version": "0.5.
|
3
|
+
"version": "0.5.36",
|
4
4
|
"type": "commonjs",
|
5
5
|
"generators": "./generators.json",
|
6
6
|
"dependencies": {
|
@@ -26,7 +26,7 @@
|
|
26
26
|
"web3-v1": "npm:web3@^1.5.0"
|
27
27
|
},
|
28
28
|
"peerDependencies": {
|
29
|
-
"@sonarwatch/portfolio-core": "0.5.
|
29
|
+
"@sonarwatch/portfolio-core": "0.5.36"
|
30
30
|
},
|
31
31
|
"main": "./src/index.js",
|
32
32
|
"types": "./src/index.d.ts"
|
package/src/plugins/aave/{lendingFetcherExecutorGenerator.d.ts → getLendingFetcherExecutor.d.ts}
RENAMED
@@ -1,4 +1,3 @@
|
|
1
1
|
import { EvmNetworkIdType } from '@sonarwatch/portfolio-core';
|
2
|
-
import DSA from 'dsa-connect';
|
3
2
|
import { FetcherExecutor } from '../../Fetcher';
|
4
|
-
export default function getLendingFetcherExecutor(networkId: EvmNetworkIdType
|
3
|
+
export default function getLendingFetcherExecutor(networkId: EvmNetworkIdType): FetcherExecutor;
|
package/src/plugins/aave/{lendingFetcherExecutorGenerator.js → getLendingFetcherExecutor.js}
RENAMED
@@ -11,14 +11,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
12
12
|
const helpers_1 = require("./helpers");
|
13
13
|
const constants_1 = require("./constants");
|
14
|
-
|
14
|
+
const constants_2 = require("../../utils/clients/constants");
|
15
|
+
function getLendingFetcherExecutor(networkId) {
|
16
|
+
const rpcEndpoint = (0, constants_2.getRpcEndpoint)(networkId);
|
17
|
+
const instadappDSA = (0, helpers_1.getDSA)(networkId, rpcEndpoint);
|
15
18
|
return (owner, cache) => __awaiter(this, void 0, void 0, function* () {
|
16
19
|
const addresses = [owner];
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
addresses.push(...accountsAddresses);
|
21
|
-
}
|
20
|
+
const accounts = yield instadappDSA.getAccounts(owner);
|
21
|
+
const accountsAddresses = accounts.map((acc) => acc.address);
|
22
|
+
addresses.push(...accountsAddresses);
|
22
23
|
const configs = constants_1.lendingConfigs.get(networkId);
|
23
24
|
if (!configs)
|
24
25
|
return [];
|
@@ -33,4 +34,4 @@ function getLendingFetcherExecutor(networkId, instadappDSA) {
|
|
33
34
|
});
|
34
35
|
}
|
35
36
|
exports.default = getLendingFetcherExecutor;
|
36
|
-
//# sourceMappingURL=
|
37
|
+
//# sourceMappingURL=getLendingFetcherExecutor.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"getLendingFetcherExecutor.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aave/getLendingFetcherExecutor.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,uCAA2D;AAE3D,2CAA6C;AAC7C,6DAA+D;AAE/D,SAAwB,yBAAyB,CAC/C,SAA2B;IAE3B,MAAM,WAAW,GAAG,IAAA,0BAAc,EAAC,SAAS,CAAC,CAAC;IAC9C,MAAM,YAAY,GAAG,IAAA,gBAAM,EAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAEpD,OAAO,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;QAC3C,MAAM,SAAS,GAAG,CAAC,KAAK,CAAC,CAAC;QAE1B,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACvD,MAAM,iBAAiB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC7D,SAAS,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,CAAC;QAErC,MAAM,OAAO,GAAG,0BAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC9C,IAAI,CAAC,OAAO;YAAE,OAAO,EAAE,CAAC;QAExB,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE;YAC5C,IAAI,SAAgC,CAAC;YACrC,IAAI,CAAC,GAAG,CAAC;gBAAE,SAAS,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC;YACpD,OAAO,IAAA,gCAAsB,EAC3B,OAAO,EACP,SAAS,EACT,OAAO,EACP,KAAK,EACL,SAAS,CACV,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvD,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAA,CAAC;AACJ,CAAC;AA9BD,4CA8BC"}
|
@@ -1,9 +1,11 @@
|
|
1
|
-
import { NetworkIdType, PortfolioAssetToken, PortfolioElement, PortfolioElementBorrowLendData, ProxyInfo, Yield } from '@sonarwatch/portfolio-core';
|
1
|
+
import { EvmNetworkIdType, NetworkIdType, PortfolioAssetToken, PortfolioElement, PortfolioElementBorrowLendData, ProxyInfo, RpcEndpoint, Yield } from '@sonarwatch/portfolio-core';
|
2
2
|
import { UiIncentiveDataProvider, UiPoolDataProvider } from '@aave/contract-helpers';
|
3
3
|
import { UserIncentiveDict } from '@aave/math-utils';
|
4
|
+
import DSA from 'dsa-connect';
|
4
5
|
import { LendingConfig, LendingData } from './types';
|
5
6
|
import { Cache } from '../../Cache';
|
6
7
|
export declare const lendingPoolsPrefix = "aave-lendingPools";
|
8
|
+
export declare function getDSA(networkId: EvmNetworkIdType, rpcEndpoint: RpcEndpoint): DSA;
|
7
9
|
export declare function fetchLendingForAddress(address: string, networkId: NetworkIdType, configs: LendingConfig[], cache: Cache, proxyInfo?: ProxyInfo): Promise<PortfolioElement[]>;
|
8
10
|
export declare function getUserSummary(user: string, lendingData: LendingData, poolDataProvider: UiPoolDataProvider, incentiveDataProvider: UiIncentiveDataProvider, lendingPoolAddressProvider: string): Promise<import("@aave/math-utils").FormatUserSummaryAndIncentivesResponse<import("@aave/math-utils").FormatReserveUSDResponse & import("@aave/math-utils").ReserveData & {
|
9
11
|
priceInMarketReferenceCurrency: string;
|
@@ -8,16 +8,43 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
9
9
|
});
|
10
10
|
};
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
13
|
+
};
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
12
|
-
exports.getTokenAddressesFromLendingDatas = exports.getTokenAddressesFromLendingData = exports.getElementLendingData = exports.getSuppliedAsset = exports.getVarriableBorrowedAsset = exports.getStableBorrowedAsset = exports.getVariableBorrowYields = exports.getSupplyYields = exports.getUserSummary = exports.fetchLendingForAddress = exports.lendingPoolsPrefix = void 0;
|
15
|
+
exports.getTokenAddressesFromLendingDatas = exports.getTokenAddressesFromLendingData = exports.getElementLendingData = exports.getSuppliedAsset = exports.getVarriableBorrowedAsset = exports.getStableBorrowedAsset = exports.getVariableBorrowYields = exports.getSupplyYields = exports.getUserSummary = exports.fetchLendingForAddress = exports.getDSA = exports.lendingPoolsPrefix = void 0;
|
13
16
|
const portfolio_core_1 = require("@sonarwatch/portfolio-core");
|
14
17
|
const contract_helpers_1 = require("@aave/contract-helpers");
|
15
18
|
const providers_1 = require("@ethersproject/providers");
|
16
19
|
const math_utils_1 = require("@aave/math-utils");
|
20
|
+
const web3_v1_1 = __importDefault(require("web3-v1"));
|
21
|
+
const dsa_connect_1 = __importDefault(require("dsa-connect"));
|
17
22
|
const constants_1 = require("../../utils/clients/constants");
|
18
23
|
const constants_2 = require("./constants");
|
24
|
+
const getBasicAuthHeaders_1 = require("../../utils/misc/getBasicAuthHeaders");
|
19
25
|
exports.lendingPoolsPrefix = 'aave-lendingPools';
|
26
|
+
function getDSA(networkId, rpcEndpoint) {
|
27
|
+
const authHeaders = rpcEndpoint.basicAuth
|
28
|
+
? (0, getBasicAuthHeaders_1.getBasicAuthHeaders)(rpcEndpoint.basicAuth.username, rpcEndpoint.basicAuth.password)
|
29
|
+
: undefined;
|
30
|
+
const httpHeaders = authHeaders
|
31
|
+
? [
|
32
|
+
{
|
33
|
+
name: 'Authorization',
|
34
|
+
value: authHeaders.Authorization,
|
35
|
+
},
|
36
|
+
]
|
37
|
+
: undefined;
|
38
|
+
const network = portfolio_core_1.networks[networkId];
|
39
|
+
return new dsa_connect_1.default({
|
40
|
+
web3: new web3_v1_1.default(new web3_v1_1.default.providers.HttpProvider(rpcEndpoint.url, {
|
41
|
+
headers: httpHeaders,
|
42
|
+
})),
|
43
|
+
}, network.chainId);
|
44
|
+
}
|
45
|
+
exports.getDSA = getDSA;
|
20
46
|
function fetchLendingForAddress(address, networkId, configs, cache, proxyInfo) {
|
47
|
+
var _a, _b;
|
21
48
|
return __awaiter(this, void 0, void 0, function* () {
|
22
49
|
const elements = [];
|
23
50
|
for (let i = 0; i < configs.length; i++) {
|
@@ -31,8 +58,13 @@ function fetchLendingForAddress(address, networkId, configs, cache, proxyInfo) {
|
|
31
58
|
});
|
32
59
|
if (!lendingData)
|
33
60
|
continue;
|
61
|
+
const rpcEndpoint = (0, constants_1.getRpcEndpoint)(networkId);
|
62
|
+
const user = (_a = rpcEndpoint.basicAuth) === null || _a === void 0 ? void 0 : _a.username;
|
63
|
+
const password = (_b = rpcEndpoint.basicAuth) === null || _b === void 0 ? void 0 : _b.password;
|
34
64
|
const provider = new providers_1.StaticJsonRpcProvider({
|
35
|
-
url:
|
65
|
+
url: rpcEndpoint.url,
|
66
|
+
user,
|
67
|
+
password,
|
36
68
|
}, portfolio_core_1.networks[networkId].chainId);
|
37
69
|
const poolDataProvider = new contract_helpers_1.UiPoolDataProvider({
|
38
70
|
uiPoolDataProviderAddress,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aave/helpers.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aave/helpers.ts"],"names":[],"mappings":"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"}
|
@@ -5,35 +5,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
6
6
|
exports.fetchers = exports.jobs = void 0;
|
7
7
|
const portfolio_core_1 = require("@sonarwatch/portfolio-core");
|
8
|
-
const dsa_connect_1 = __importDefault(require("dsa-connect"));
|
9
|
-
const web3_v1_1 = __importDefault(require("web3-v1"));
|
10
|
-
const contract_helpers_1 = require("@aave/contract-helpers");
|
11
8
|
const lendingPoolsJob_1 = __importDefault(require("./lendingPoolsJob"));
|
12
|
-
const
|
13
|
-
const constants_1 = require("
|
14
|
-
const constants_2 = require("./constants");
|
9
|
+
const getLendingFetcherExecutor_1 = __importDefault(require("./getLendingFetcherExecutor"));
|
10
|
+
const constants_1 = require("./constants");
|
15
11
|
exports.jobs = [lendingPoolsJob_1.default];
|
16
12
|
exports.fetchers = [
|
17
13
|
{
|
18
|
-
id: `${
|
14
|
+
id: `${constants_1.platformId}-${portfolio_core_1.NetworkId.ethereum}-lending`,
|
19
15
|
networkId: portfolio_core_1.NetworkId.ethereum,
|
20
|
-
executor: (0,
|
21
|
-
web3: new web3_v1_1.default(new web3_v1_1.default.providers.HttpProvider((0, constants_1.getUrlEndpoint)(portfolio_core_1.NetworkId.ethereum))),
|
22
|
-
}, contract_helpers_1.ChainId.mainnet)),
|
16
|
+
executor: (0, getLendingFetcherExecutor_1.default)(portfolio_core_1.NetworkId.ethereum),
|
23
17
|
},
|
24
18
|
{
|
25
|
-
id: `${
|
19
|
+
id: `${constants_1.platformId}-${portfolio_core_1.NetworkId.polygon}-lending`,
|
26
20
|
networkId: portfolio_core_1.NetworkId.polygon,
|
27
|
-
executor: (0,
|
28
|
-
web3: new web3_v1_1.default(new web3_v1_1.default.providers.HttpProvider((0, constants_1.getUrlEndpoint)(portfolio_core_1.NetworkId.polygon))),
|
29
|
-
}, contract_helpers_1.ChainId.polygon)),
|
21
|
+
executor: (0, getLendingFetcherExecutor_1.default)(portfolio_core_1.NetworkId.polygon),
|
30
22
|
},
|
31
23
|
{
|
32
|
-
id: `${
|
24
|
+
id: `${constants_1.platformId}-${portfolio_core_1.NetworkId.avalanche}-lending`,
|
33
25
|
networkId: portfolio_core_1.NetworkId.avalanche,
|
34
|
-
executor: (0,
|
35
|
-
web3: new web3_v1_1.default(new web3_v1_1.default.providers.HttpProvider((0, constants_1.getUrlEndpoint)(portfolio_core_1.NetworkId.avalanche))),
|
36
|
-
}, contract_helpers_1.ChainId.avalanche)),
|
26
|
+
executor: (0, getLendingFetcherExecutor_1.default)(portfolio_core_1.NetworkId.avalanche),
|
37
27
|
},
|
38
28
|
];
|
39
29
|
//# sourceMappingURL=index.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aave/index.ts"],"names":[],"mappings":";;;;;;AAAA,+DAAuD;
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aave/index.ts"],"names":[],"mappings":";;;;;;AAAA,+DAAuD;AAGvD,wEAAgD;AAChD,4FAAoE;AACpE,2CAAyC;AAE5B,QAAA,IAAI,GAAU,CAAC,yBAAe,CAAC,CAAC;AAChC,QAAA,QAAQ,GAAc;IACjC;QACE,EAAE,EAAE,GAAG,sBAAU,IAAI,0BAAS,CAAC,QAAQ,UAAU;QACjD,SAAS,EAAE,0BAAS,CAAC,QAAQ;QAC7B,QAAQ,EAAE,IAAA,mCAAyB,EAAC,0BAAS,CAAC,QAAQ,CAAC;KACxD;IACD;QACE,EAAE,EAAE,GAAG,sBAAU,IAAI,0BAAS,CAAC,OAAO,UAAU;QAChD,SAAS,EAAE,0BAAS,CAAC,OAAO;QAC5B,QAAQ,EAAE,IAAA,mCAAyB,EAAC,0BAAS,CAAC,OAAO,CAAC;KACvD;IACD;QACE,EAAE,EAAE,GAAG,sBAAU,IAAI,0BAAS,CAAC,SAAS,UAAU;QAClD,SAAS,EAAE,0BAAS,CAAC,SAAS;QAC9B,QAAQ,EAAE,IAAA,mCAAyB,EAAC,0BAAS,CAAC,SAAS,CAAC;KACzD;CACF,CAAC"}
|
@@ -9,7 +9,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
9
9
|
});
|
10
10
|
};
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
12
|
-
const portfolio_core_1 = require("@sonarwatch/portfolio-core");
|
13
12
|
const providers_1 = require("@ethersproject/providers");
|
14
13
|
const contract_helpers_1 = require("@aave/contract-helpers");
|
15
14
|
const math_utils_1 = require("@aave/math-utils");
|
@@ -17,26 +16,32 @@ const constants_1 = require("./constants");
|
|
17
16
|
const constants_2 = require("../../utils/clients/constants");
|
18
17
|
const helpers_1 = require("./helpers");
|
19
18
|
const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
|
19
|
+
var _a, _b;
|
20
20
|
const lendingConfigsArray = Array.from(constants_1.lendingConfigs.values()).flat();
|
21
21
|
for (let i = 0; i < lendingConfigsArray.length; i++) {
|
22
22
|
const lendingConfig = lendingConfigsArray[i];
|
23
23
|
if (!lendingConfig)
|
24
24
|
continue;
|
25
25
|
const { uiPoolDataProviderAddress, uiIncentiveDataProviderAddress, lendingPoolAddressProvider, chainId, networkId, } = lendingConfig;
|
26
|
+
const rpcEndpoint = (0, constants_2.getRpcEndpoint)(networkId);
|
27
|
+
const user = (_a = rpcEndpoint.basicAuth) === null || _a === void 0 ? void 0 : _a.username;
|
28
|
+
const password = (_b = rpcEndpoint.basicAuth) === null || _b === void 0 ? void 0 : _b.password;
|
26
29
|
const provider = new providers_1.StaticJsonRpcProvider({
|
27
|
-
url:
|
28
|
-
|
30
|
+
url: rpcEndpoint.url,
|
31
|
+
user,
|
32
|
+
password,
|
33
|
+
}, chainId);
|
29
34
|
if (!provider)
|
30
35
|
continue;
|
31
36
|
const poolDataProvider = new contract_helpers_1.UiPoolDataProvider({
|
32
37
|
uiPoolDataProviderAddress,
|
33
38
|
provider,
|
34
|
-
chainId
|
39
|
+
chainId,
|
35
40
|
});
|
36
41
|
const incentiveDataProvider = new contract_helpers_1.UiIncentiveDataProvider({
|
37
42
|
uiIncentiveDataProviderAddress,
|
38
43
|
provider,
|
39
|
-
chainId
|
44
|
+
chainId,
|
40
45
|
});
|
41
46
|
if (!poolDataProvider || !incentiveDataProvider)
|
42
47
|
continue;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"lendingPoolsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aave/lendingPoolsJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA
|
1
|
+
{"version":3,"file":"lendingPoolsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aave/lendingPoolsJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,wDAAiE;AACjE,6DAGgC;AAChC,iDAA+D;AAG/D,2CAAyD;AAEzD,6DAA+D;AAC/D,uCAA+C;AAE/C,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;;IACnD,MAAM,mBAAmB,GAAG,KAAK,CAAC,IAAI,CAAC,0BAAc,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAEvE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,mBAAmB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACnD,MAAM,aAAa,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;QAC7C,IAAI,CAAC,aAAa;YAAE,SAAS;QAE7B,MAAM,EACJ,yBAAyB,EACzB,8BAA8B,EAC9B,0BAA0B,EAC1B,OAAO,EACP,SAAS,GACV,GAAG,aAAa,CAAC;QAElB,MAAM,WAAW,GAAG,IAAA,0BAAc,EAAC,SAAS,CAAC,CAAC;QAC9C,MAAM,IAAI,GAAG,MAAA,WAAW,CAAC,SAAS,0CAAE,QAAQ,CAAC;QAC7C,MAAM,QAAQ,GAAG,MAAA,WAAW,CAAC,SAAS,0CAAE,QAAQ,CAAC;QACjD,MAAM,QAAQ,GAAG,IAAI,iCAAqB,CACxC;YACE,GAAG,EAAE,WAAW,CAAC,GAAG;YACpB,IAAI;YACJ,QAAQ;SACT,EACD,OAAO,CACR,CAAC;QACF,IAAI,CAAC,QAAQ;YAAE,SAAS;QAExB,MAAM,gBAAgB,GAAG,IAAI,qCAAkB,CAAC;YAC9C,yBAAyB;YACzB,QAAQ;YACR,OAAO;SACR,CAAC,CAAC;QAEH,MAAM,qBAAqB,GAAG,IAAI,0CAAuB,CAAC;YACxD,8BAA8B;YAC9B,QAAQ;YACR,OAAO;SACR,CAAC,CAAC;QAEH,IAAI,CAAC,gBAAgB,IAAI,CAAC,qBAAqB;YAAE,SAAS;QAE1D,+DAA+D;QAC/D,uDAAuD;QACvD,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,oBAAoB,CAAC;YAC3D,0BAA0B;SAC3B,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG,QAAQ,CAAC,YAAY,CAAC;QAC5C,MAAM,EAAE,gBAAgB,EAAE,GAAG,QAAQ,CAAC;QACtC,MAAM,EAAE,+BAA+B,EAAE,GAAG,gBAAgB,CAAC;QAC7D,MAAM,yBAAyB,GAC7B,gBAAgB,CAAC,iCAAiC,CAAC;QACrD,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;QACvD,MAAM,iBAAiB,GACrB,MAAM,qBAAqB,CAAC,kCAAkC,CAAC;YAC7D,0BAA0B;SAC3B,CAAC,CAAC;QACL,MAAM,iBAAiB,GAAG,IAAA,wCAA2B,EAAC;YACpD,QAAQ,EAAE,aAAa;YACvB,gBAAgB;YAChB,+BAA+B;YAC/B,yBAAyB;YACzB,iBAAiB;SAClB,CAAC,CAAC;QAEH,MAAM,WAAW,GAAgB;YAC/B,0BAA0B;YAC1B,OAAO;YACP,SAAS;YACT,gBAAgB;YAChB,iBAAiB;YACjB,iBAAiB;YACjB,yBAAyB;YACzB,+BAA+B;SAChC,CAAC;QACF,MAAM,KAAK,CAAC,OAAO,CAAC,0BAA0B,EAAE,WAAW,EAAE;YAC3D,MAAM,EAAE,4BAAkB;YAC1B,SAAS;SACV,CAAC,CAAC;KACJ;AACH,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,gBAAgB;IACjC,QAAQ;CACT,CAAC;AACF,kBAAe,GAAG,CAAC"}
|
@@ -1 +0,0 @@
|
|
1
|
-
{"version":3,"file":"lendingFetcherExecutorGenerator.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aave/lendingFetcherExecutorGenerator.ts"],"names":[],"mappings":";;;;;;;;;;;AAGA,uCAAmD;AAEnD,2CAA6C;AAE7C,SAAwB,yBAAyB,CAC/C,SAA2B,EAC3B,YAAkB;IAElB,OAAO,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;QAC3C,MAAM,SAAS,GAAG,CAAC,KAAK,CAAC,CAAC;QAE1B,IAAI,YAAY,EAAE;YAChB,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YACvD,MAAM,iBAAiB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC7D,SAAS,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,CAAC;SACtC;QAED,MAAM,OAAO,GAAG,0BAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC9C,IAAI,CAAC,OAAO;YAAE,OAAO,EAAE,CAAC;QAExB,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE;YAC5C,IAAI,SAAgC,CAAC;YACrC,IAAI,CAAC,GAAG,CAAC;gBAAE,SAAS,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC;YACpD,OAAO,IAAA,gCAAsB,EAC3B,OAAO,EACP,SAAS,EACT,OAAO,EACP,KAAK,EACL,SAAS,CACV,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvD,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAA,CAAC;AACJ,CAAC;AA9BD,4CA8BC"}
|