@aurigami/sdk 1.23.0 → 1.24.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (101) hide show
  1. package/dist/SDK.d.ts +48 -65
  2. package/dist/SDK.js +165 -0
  3. package/dist/abis/index.d.ts +18 -18
  4. package/dist/abis/index.js +39 -0
  5. package/dist/consts/constants.d.ts +139 -139
  6. package/dist/consts/constants.js +185 -0
  7. package/dist/consts/decimals.d.ts +1 -1
  8. package/dist/consts/decimals.js +35 -0
  9. package/dist/consts/deployments.d.ts +3 -3
  10. package/dist/consts/deployments.js +9 -0
  11. package/dist/consts/dummy.d.ts +13 -13
  12. package/dist/consts/dummy.js +43 -0
  13. package/dist/consts/index.d.ts +5 -5
  14. package/dist/consts/index.js +9 -0
  15. package/dist/consts/symbols.d.ts +1 -1
  16. package/dist/consts/symbols.js +10 -0
  17. package/dist/entities/BlockchainEntity.d.ts +13 -13
  18. package/dist/entities/BlockchainEntity.js +36 -0
  19. package/dist/entities/auriEnv.d.ts +34 -40
  20. package/dist/entities/auriEnv.js +166 -0
  21. package/dist/entities/index.d.ts +4 -4
  22. package/dist/entities/index.js +8 -0
  23. package/dist/entities/token.d.ts +7 -7
  24. package/dist/entities/token.js +27 -0
  25. package/dist/entities/tokenAmount.d.ts +13 -13
  26. package/dist/entities/tokenAmount.js +52 -0
  27. package/dist/helpers/aurigami-api.d.ts +13 -13
  28. package/dist/helpers/aurigami-api.js +26 -0
  29. package/dist/helpers/aurora-api-helpers.d.ts +1 -1
  30. package/dist/helpers/aurora-api-helpers.js +15 -0
  31. package/dist/helpers/graphql-helpers.d.ts +1 -1
  32. package/dist/helpers/graphql-helpers.js +13 -0
  33. package/dist/helpers/helpers.d.ts +23 -40
  34. package/dist/helpers/helpers.js +148 -0
  35. package/dist/helpers/historicalPriceFetcher.d.ts +15 -15
  36. package/dist/helpers/historicalPriceFetcher.js +142 -0
  37. package/dist/helpers/index.d.ts +7 -7
  38. package/dist/helpers/index.js +11 -0
  39. package/dist/helpers/kyber-aggregator-api.d.ts +5 -5
  40. package/dist/helpers/kyber-aggregator-api.js +27 -0
  41. package/dist/helpers/multicall.d.ts +40 -0
  42. package/dist/helpers/multicall.js +203 -0
  43. package/dist/helpers/notification-api.d.ts +2 -2
  44. package/dist/helpers/notification-api.js +21 -0
  45. package/dist/helpers/one-inch-aggregator-api.d.ts +21 -21
  46. package/dist/helpers/one-inch-aggregator-api.js +19 -0
  47. package/dist/helpers/priceFetcher.d.ts +36 -36
  48. package/dist/helpers/priceFetcher.js +296 -0
  49. package/dist/helpers/subgraphQuery.d.ts +1 -1
  50. package/dist/helpers/subgraphQuery.js +22 -0
  51. package/dist/helpers/transfer-event-query.d.ts +17 -26
  52. package/dist/helpers/transfer-event-query.js +41 -0
  53. package/dist/index.d.ts +7 -7
  54. package/dist/index.js +17 -8
  55. package/dist/interactors/Airdrop.d.ts +17 -26
  56. package/dist/interactors/Airdrop.js +48 -0
  57. package/dist/interactors/MoneyMarket.d.ts +63 -63
  58. package/dist/interactors/MoneyMarket.js +392 -0
  59. package/dist/interactors/Multicall.d.ts +15 -18
  60. package/dist/interactors/Multicall.js +36 -0
  61. package/dist/interactors/Papermill.d.ts +27 -57
  62. package/dist/interactors/Papermill.js +125 -0
  63. package/dist/interactors/PlyGame.d.ts +30 -42
  64. package/dist/interactors/PlyGame.js +146 -0
  65. package/dist/interactors/PlyTokenLock.d.ts +16 -16
  66. package/dist/interactors/PlyTokenLock.js +44 -0
  67. package/dist/interactors/Pulp.d.ts +17 -17
  68. package/dist/interactors/Pulp.js +43 -0
  69. package/dist/interactors/Referral.d.ts +35 -78
  70. package/dist/interactors/Referral.js +158 -0
  71. package/dist/interactors/Staking.d.ts +20 -26
  72. package/dist/interactors/Staking.js +106 -0
  73. package/dist/interactors/index.d.ts +9 -9
  74. package/dist/interactors/index.js +13 -0
  75. package/dist/interactors/misc.d.ts +31 -39
  76. package/dist/interactors/misc.js +318 -0
  77. package/dist/types/index.d.ts +175 -197
  78. package/dist/types/index.js +18 -0
  79. package/package.json +3 -3
  80. package/src/SDK.ts +1 -1
  81. package/src/entities/auriEnv.ts +29 -27
  82. package/src/helpers/historicalPriceFetcher.ts +9 -12
  83. package/src/helpers/multicall.ts +251 -0
  84. package/src/helpers/priceFetcher.ts +19 -21
  85. package/src/interactors/Airdrop.ts +2 -2
  86. package/src/interactors/MoneyMarket.ts +31 -27
  87. package/src/interactors/Multicall.ts +3 -3
  88. package/src/interactors/Papermill.ts +9 -9
  89. package/src/interactors/PlyGame.ts +10 -10
  90. package/src/interactors/PlyTokenLock.ts +2 -3
  91. package/src/interactors/Pulp.ts +4 -2
  92. package/src/interactors/Referral.ts +6 -6
  93. package/src/interactors/Staking.ts +13 -9
  94. package/src/interactors/misc.ts +7 -5
  95. package/src/types/index.ts +32 -2
  96. package/dist/sdk.cjs.development.js +0 -6325
  97. package/dist/sdk.cjs.development.js.map +0 -1
  98. package/dist/sdk.cjs.production.min.js +0 -2
  99. package/dist/sdk.cjs.production.min.js.map +0 -1
  100. package/dist/sdk.esm.js +0 -6193
  101. package/dist/sdk.esm.js.map +0 -1
@@ -0,0 +1,48 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.Airdrop = exports.AirdropReadWrite = exports.AirdropRead = void 0;
4
+ const tslib_1 = require("tslib");
5
+ const ethers_1 = require("ethers");
6
+ const entities_1 = require("../entities");
7
+ const helpers = tslib_1.__importStar(require("../helpers"));
8
+ class AirdropRead extends entities_1.BlockchainEntityRead {
9
+ constructor(networkConnection) {
10
+ super(networkConnection);
11
+ Object.defineProperty(this, "env", {
12
+ enumerable: true,
13
+ configurable: true,
14
+ writable: true,
15
+ value: void 0
16
+ });
17
+ this.env = new entities_1.AuriEnv(networkConnection);
18
+ }
19
+ async getRedeemableReward(campaign, token, user) {
20
+ let tokenInstance = new entities_1.Token(token, helpers.getDecimal(token));
21
+ let rewards = await this.env.auriAirdrop.raw.getRedeemableReward(ethers_1.utils.formatBytes32String(campaign), token, user);
22
+ return new entities_1.TokenAmount(tokenInstance, rewards.toString());
23
+ }
24
+ }
25
+ exports.AirdropRead = AirdropRead;
26
+ class AirdropReadWrite extends AirdropRead {
27
+ async redeemMultiple(campaigns, tokens) {
28
+ helpers.assert(campaigns.length == tokens.length, 'campaigns and tokens must have the same length');
29
+ return this.env.auriAirdrop.raw.connect(this._networkConnection.signer).redeem(campaigns.map((e) => ethers_1.utils.formatBytes32String(e)), tokens, await this._networkConnection.signer.getAddress());
30
+ }
31
+ async redeemSingle(campaign, token) {
32
+ return this.redeemMultiple([campaign], [token]);
33
+ }
34
+ }
35
+ exports.AirdropReadWrite = AirdropReadWrite;
36
+ class Airdrop extends entities_1.BlockchainEntity {
37
+ constructor() {
38
+ super();
39
+ }
40
+ read(networkConnection) {
41
+ return new AirdropRead(networkConnection);
42
+ }
43
+ readWrite(networkConnection) {
44
+ return new AirdropReadWrite(networkConnection);
45
+ }
46
+ }
47
+ exports.Airdrop = Airdrop;
48
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQWlyZHJvcC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9pbnRlcmFjdG9ycy9BaXJkcm9wLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7QUFDQSxtQ0FBZ0Q7QUFDaEQsMENBQWtHO0FBQ2xHLDREQUFzQztBQUd0QyxNQUFhLFdBQVksU0FBUSwrQkFBb0I7SUFHbkQsWUFBbUIsaUJBQW9DO1FBQ3JELEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO1FBSFg7Ozs7O1dBQWE7UUFJM0IsSUFBSSxDQUFDLEdBQUcsR0FBRyxJQUFJLGtCQUFPLENBQUMsaUJBQWlCLENBQUMsQ0FBQztJQUM1QyxDQUFDO0lBS00sS0FBSyxDQUFDLG1CQUFtQixDQUM5QixRQUFnQixFQUNoQixLQUFjLEVBQ2QsSUFBYTtRQUViLElBQUksYUFBYSxHQUFVLElBQUksZ0JBQUssQ0FBQyxLQUFLLEVBQUUsT0FBTyxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO1FBRXZFLElBQUksT0FBTyxHQUFPLE1BQU0sSUFBSSxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLG1CQUFtQixDQUNsRSxjQUFLLENBQUMsbUJBQW1CLENBQUMsUUFBUSxDQUFDLEVBQ25DLEtBQUssRUFDTCxJQUFJLENBQ0wsQ0FBQztRQUVGLE9BQU8sSUFBSSxzQkFBVyxDQUFDLGFBQWEsRUFBRSxPQUFPLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztJQUM1RCxDQUFDO0NBQ0Y7QUExQkQsa0NBMEJDO0FBRUQsTUFBYSxnQkFBaUIsU0FBUSxXQUFXO0lBSXhDLEtBQUssQ0FBQyxjQUFjLENBQ3pCLFNBQW1CLEVBQ25CLE1BQWlCO1FBRWpCLE9BQU8sQ0FBQyxNQUFNLENBQ1osU0FBUyxDQUFDLE1BQU0sSUFBSSxNQUFNLENBQUMsTUFBTSxFQUNqQyxnREFBZ0QsQ0FDakQsQ0FBQztRQUNGLE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsa0JBQWtCLENBQUMsTUFBTyxDQUFDLENBQUMsTUFBTSxDQUM3RSxTQUFTLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxjQUFLLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFDbEQsTUFBTSxFQUNOLE1BQU0sSUFBSSxDQUFDLGtCQUFrQixDQUFDLE1BQU8sQ0FBQyxVQUFVLEVBQUUsQ0FDbkQsQ0FBQztJQUNKLENBQUM7SUFLTSxLQUFLLENBQUMsWUFBWSxDQUFDLFFBQWdCLEVBQUUsS0FBYztRQUN4RCxPQUFPLElBQUksQ0FBQyxjQUFjLENBQUMsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7SUFDbEQsQ0FBQztDQUNGO0FBekJELDRDQXlCQztBQUVELE1BQWEsT0FBUSxTQUFRLDJCQUFnQjtJQUMzQztRQUNFLEtBQUssRUFBRSxDQUFDO0lBQ1YsQ0FBQztJQUNNLElBQUksQ0FBQyxpQkFBb0M7UUFDOUMsT0FBTyxJQUFJLFdBQVcsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO0lBQzVDLENBQUM7SUFDTSxTQUFTLENBQUMsaUJBQW9DO1FBQ25ELE9BQU8sSUFBSSxnQkFBZ0IsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO0lBQ2pELENBQUM7Q0FDRjtBQVZELDBCQVVDIn0=
@@ -1,63 +1,63 @@
1
- import { AuETH, AuErc20, EthRepayHelper } from '@aurigami/contracts/typechain';
2
- import { TransactionResponse } from '@ethersproject/abstract-provider';
3
- import BigNumber from 'bignumber.js';
4
- import { BigNumber as BN } from 'ethers';
5
- import { AuriEnv, BlockchainEntity, BlockchainEntityRead, Token, TokenAmount } from '../entities';
6
- import { Address, Apy, MoneyMarketDetails, NetworkConnection } from '../types';
7
- declare type RewardSpeeds = {
8
- plyRewardSupplySpeed: BN;
9
- plyRewardBorrowSpeed: BN;
10
- auroraRewardSupplySpeed: BN;
11
- auroraRewardBorrowSpeed: BN;
12
- };
13
- export declare class MoneyMarketRead extends BlockchainEntityRead {
14
- underlying: Token;
15
- auToken: AuErc20 | AuETH;
16
- readonly env: AuriEnv;
17
- constructor(networkConnection: NetworkConnection, auToken: Address, underlyingAsset: Address);
18
- getUnderlyingPrice(): Promise<BigNumber>;
19
- getPlyPrice(): Promise<BigNumber>;
20
- protected getRewardSpeeds(): Promise<RewardSpeeds>;
21
- getTotalTokenBorrowed(): Promise<TokenAmount>;
22
- getTotalTokenDeposited(): Promise<TokenAmount>;
23
- getDepositAPY(): Promise<BigNumber>;
24
- getBorrowAPY(): Promise<BigNumber>;
25
- getCollateralRatio(): Promise<BigNumber>;
26
- getBorrowPlyAPY(): Promise<BigNumber>;
27
- getDepositPlyAPY(): Promise<BigNumber>;
28
- getDepositNearAPY(): Promise<BigNumber>;
29
- getBorrowNearAPY(): Promise<BigNumber>;
30
- getDepositMetaAPY(): Promise<BigNumber>;
31
- getDepositStaderAPY(): Promise<BigNumber>;
32
- getDetails(): Promise<MoneyMarketDetails>;
33
- getUserBorrowBalance(userAddress: string): Promise<TokenAmount>;
34
- getUserDepositBalance(userAddress: string): Promise<TokenAmount>;
35
- private getDepositNEARRewardPerWeek;
36
- private getBorrowNEARRewardPerWeek;
37
- mintCap(): Promise<TokenAmount>;
38
- borrowCap(): Promise<TokenAmount>;
39
- getDepositBorrowValue(userAddress: Address): Promise<{
40
- suppliedValue: BigNumber;
41
- borrowedValue: BigNumber;
42
- }>;
43
- getApyWithoutIncentive(userAddress: Address): Promise<Apy>;
44
- getApyWithIncentive(userAddress: Address): Promise<Apy>;
45
- }
46
- export declare class MoneyMarketReadWrite extends MoneyMarketRead {
47
- protected _EthRepayHelper: EthRepayHelper;
48
- constructor(networkConnection: NetworkConnection, auToken: Address, underlyingAsset: Address);
49
- deposit(amount: TokenAmount): Promise<TransactionResponse>;
50
- borrow(amount: TokenAmount): Promise<TransactionResponse>;
51
- withdraw(amount: TokenAmount): Promise<TransactionResponse>;
52
- repay(amount: TokenAmount): Promise<TransactionResponse>;
53
- enableCollateral(): Promise<TransactionResponse>;
54
- disableCollateral(): Promise<TransactionResponse>;
55
- }
56
- export declare class MoneyMarket extends BlockchainEntity {
57
- protected address: Address;
58
- protected underlying: Address;
59
- constructor(address: string, underlying: string);
60
- read(networkConnection: NetworkConnection): MoneyMarketRead;
61
- readWrite(networkConnection: NetworkConnection): MoneyMarketReadWrite;
62
- }
63
- export {};
1
+ import { AuETH, AuErc20, EthRepayHelper } from '@aurigami/contracts/typechain';
2
+ import { TransactionResponse } from '@ethersproject/abstract-provider';
3
+ import BigNumber from 'bignumber.js';
4
+ import { BigNumber as BN } from 'ethers';
5
+ import { AuriEnv, BlockchainEntity, BlockchainEntityRead, Token, TokenAmount } from '../entities';
6
+ import { Address, Apy, MoneyMarketDetails, MulticallStatic, NetworkConnection } from '../types';
7
+ type RewardSpeeds = {
8
+ plyRewardSupplySpeed: BN;
9
+ plyRewardBorrowSpeed: BN;
10
+ auroraRewardSupplySpeed: BN;
11
+ auroraRewardBorrowSpeed: BN;
12
+ };
13
+ export declare class MoneyMarketRead extends BlockchainEntityRead {
14
+ underlying: Token;
15
+ auToken: MulticallStatic<AuErc20 | AuETH>;
16
+ readonly env: AuriEnv;
17
+ constructor(networkConnection: NetworkConnection, auToken: Address, underlyingAsset: Address);
18
+ getUnderlyingPrice(): Promise<BigNumber>;
19
+ getPlyPrice(): Promise<BigNumber>;
20
+ protected getRewardSpeeds(): Promise<RewardSpeeds>;
21
+ getTotalTokenBorrowed(): Promise<TokenAmount>;
22
+ getTotalTokenDeposited(): Promise<TokenAmount>;
23
+ getDepositAPY(): Promise<BigNumber>;
24
+ getBorrowAPY(): Promise<BigNumber>;
25
+ getCollateralRatio(): Promise<BigNumber>;
26
+ getBorrowPlyAPY(): Promise<BigNumber>;
27
+ getDepositPlyAPY(): Promise<BigNumber>;
28
+ getDepositNearAPY(): Promise<BigNumber>;
29
+ getBorrowNearAPY(): Promise<BigNumber>;
30
+ getDepositMetaAPY(): Promise<BigNumber>;
31
+ getDepositStaderAPY(): Promise<BigNumber>;
32
+ getDetails(): Promise<MoneyMarketDetails>;
33
+ getUserBorrowBalance(userAddress: string): Promise<TokenAmount>;
34
+ getUserDepositBalance(userAddress: string): Promise<TokenAmount>;
35
+ private getDepositNEARRewardPerWeek;
36
+ private getBorrowNEARRewardPerWeek;
37
+ mintCap(): Promise<TokenAmount>;
38
+ borrowCap(): Promise<TokenAmount>;
39
+ getDepositBorrowValue(userAddress: Address): Promise<{
40
+ suppliedValue: BigNumber;
41
+ borrowedValue: BigNumber;
42
+ }>;
43
+ getApyWithoutIncentive(userAddress: Address): Promise<Apy>;
44
+ getApyWithIncentive(userAddress: Address): Promise<Apy>;
45
+ }
46
+ export declare class MoneyMarketReadWrite extends MoneyMarketRead {
47
+ protected _EthRepayHelper: MulticallStatic<EthRepayHelper>;
48
+ constructor(networkConnection: NetworkConnection, auToken: Address, underlyingAsset: Address);
49
+ deposit(amount: TokenAmount): Promise<TransactionResponse>;
50
+ borrow(amount: TokenAmount): Promise<TransactionResponse>;
51
+ withdraw(amount: TokenAmount): Promise<TransactionResponse>;
52
+ repay(amount: TokenAmount): Promise<TransactionResponse>;
53
+ enableCollateral(): Promise<TransactionResponse>;
54
+ disableCollateral(): Promise<TransactionResponse>;
55
+ }
56
+ export declare class MoneyMarket extends BlockchainEntity {
57
+ protected address: Address;
58
+ protected underlying: Address;
59
+ constructor(address: string, underlying: string);
60
+ read(networkConnection: NetworkConnection): MoneyMarketRead;
61
+ readWrite(networkConnection: NetworkConnection): MoneyMarketReadWrite;
62
+ }
63
+ export {};
@@ -0,0 +1,392 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.MoneyMarket = exports.MoneyMarketReadWrite = exports.MoneyMarketRead = void 0;
4
+ const tslib_1 = require("tslib");
5
+ const bignumber_js_1 = tslib_1.__importDefault(require("bignumber.js"));
6
+ const cache_decorator_1 = require("cache-decorator");
7
+ const ethers_1 = require("ethers");
8
+ const abis = tslib_1.__importStar(require("../abis"));
9
+ const consts = tslib_1.__importStar(require("../consts"));
10
+ const consts_1 = require("../consts");
11
+ const entities_1 = require("../entities");
12
+ const helpers = tslib_1.__importStar(require("../helpers"));
13
+ const multicall_1 = require("../helpers/multicall");
14
+ const priceFetcher_1 = require("../helpers/priceFetcher");
15
+ class MoneyMarketRead extends entities_1.BlockchainEntityRead {
16
+ constructor(networkConnection, auToken, underlyingAsset) {
17
+ super(networkConnection);
18
+ Object.defineProperty(this, "underlying", {
19
+ enumerable: true,
20
+ configurable: true,
21
+ writable: true,
22
+ value: void 0
23
+ });
24
+ Object.defineProperty(this, "auToken", {
25
+ enumerable: true,
26
+ configurable: true,
27
+ writable: true,
28
+ value: void 0
29
+ });
30
+ Object.defineProperty(this, "env", {
31
+ enumerable: true,
32
+ configurable: true,
33
+ writable: true,
34
+ value: void 0
35
+ });
36
+ this.env = new entities_1.AuriEnv(networkConnection);
37
+ if (helpers.isSameAddress(underlyingAsset, consts.ETHAddress)) {
38
+ this.auToken = (0, multicall_1.createContract)(auToken, abis.AuETHABI.abi, networkConnection.provider);
39
+ }
40
+ else {
41
+ this.auToken = (0, multicall_1.createContract)(auToken, abis.AuErc20ABI.abi, networkConnection.provider);
42
+ }
43
+ this.underlying = new entities_1.Token(underlyingAsset, helpers.getDecimal(underlyingAsset));
44
+ }
45
+ async getUnderlyingPrice() {
46
+ return (0, priceFetcher_1.fetchPrice)(this.underlying.address, this._networkConnection.provider);
47
+ }
48
+ async getPlyPrice() {
49
+ return (0, priceFetcher_1.fetchPrice)(consts.networkAddresses.tokens.PLY, this._networkConnection.provider);
50
+ }
51
+ async getRewardSpeeds() {
52
+ var speeds = await this.env.auriLens.callStatic.getRewardSpeeds(this.env.comptroller.address, this.auToken.address);
53
+ return speeds;
54
+ }
55
+ async getTotalTokenBorrowed() {
56
+ return new entities_1.TokenAmount(this.underlying, (await this.auToken.callStatic.totalBorrows()).toString());
57
+ }
58
+ async getTotalTokenDeposited() {
59
+ const [totalBorrow, totalCash] = await Promise.all([
60
+ this.getTotalTokenBorrowed(),
61
+ this.auToken.callStatic.getCash(),
62
+ ]);
63
+ return new entities_1.TokenAmount(this.underlying, ethers_1.BigNumber.from(new entities_1.TokenAmount(this.underlying, totalCash.toString()).rawAmount())
64
+ .add(totalBorrow.rawAmount())
65
+ .toString());
66
+ }
67
+ async getDepositAPY() {
68
+ const supplyRatePerTimestamp = await this.auToken.callStatic.supplyRatePerTimestamp();
69
+ const supplyRatePerDay = new bignumber_js_1.default(supplyRatePerTimestamp.toString())
70
+ .multipliedBy(consts_1.ONE_DAY)
71
+ .div(helpers.decimalFactor(18));
72
+ return new bignumber_js_1.default(supplyRatePerDay.plus(1)).pow(365).minus(1);
73
+ }
74
+ async getBorrowAPY() {
75
+ const borrowRatePerTimestamp = await this.auToken.callStatic.borrowRatePerTimestamp();
76
+ const borrowRatePerDay = new bignumber_js_1.default(borrowRatePerTimestamp.toString())
77
+ .multipliedBy(consts_1.ONE_DAY)
78
+ .div(helpers.decimalFactor(18));
79
+ return new bignumber_js_1.default(borrowRatePerDay.plus(1)).pow(365).minus(1);
80
+ }
81
+ async getCollateralRatio() {
82
+ return this.env.comptroller.callStatic.markets(this.auToken.address).then((res) => {
83
+ return new bignumber_js_1.default(res.collateralFactorMantissa.toString()).div(helpers.decimalFactor(18));
84
+ });
85
+ }
86
+ async getBorrowPlyAPY() {
87
+ const [totalBorrowed, rewardSpeeds, plyPrice, underlyingPrice] = await Promise.all([
88
+ this.getTotalTokenBorrowed(),
89
+ this.getRewardSpeeds(),
90
+ this.getPlyPrice(),
91
+ this.getUnderlyingPrice(),
92
+ ]);
93
+ return helpers.calcLMRewardApr((0, priceFetcher_1.calcValuation)(new entities_1.TokenAmount(entities_1.PLYToken, rewardSpeeds.plyRewardBorrowSpeed.toString()), plyPrice), underlyingPrice.multipliedBy(totalBorrowed.formattedAmount()), consts.ONE_YEAR);
94
+ }
95
+ async getDepositPlyAPY() {
96
+ const [totalDeposited, rewardSpeeds, plyPrice, underlyingPrice] = await Promise.all([
97
+ this.getTotalTokenDeposited(),
98
+ this.getRewardSpeeds(),
99
+ this.getPlyPrice(),
100
+ this.getUnderlyingPrice(),
101
+ ]);
102
+ return helpers.calcLMRewardApr((0, priceFetcher_1.calcValuation)(new entities_1.TokenAmount(entities_1.PLYToken, rewardSpeeds.plyRewardSupplySpeed.toString()), plyPrice), underlyingPrice.multipliedBy(totalDeposited.formattedAmount()), consts.ONE_YEAR);
103
+ }
104
+ async getDepositNearAPY() {
105
+ const [totalDeposited, underlyingPrice] = await Promise.all([
106
+ this.getTotalTokenDeposited(),
107
+ this.getUnderlyingPrice(),
108
+ ]);
109
+ let depositNEARApy = helpers.calcLMRewardApr(await (0, priceFetcher_1.fetchValuation)(this.getDepositNEARRewardPerWeek(), this._networkConnection.provider), underlyingPrice.multipliedBy(totalDeposited.formattedAmount()), 52);
110
+ return depositNEARApy;
111
+ }
112
+ async getBorrowNearAPY() {
113
+ const [totalBorrowed, underlyingPrice] = await Promise.all([
114
+ this.getTotalTokenBorrowed(),
115
+ this.getUnderlyingPrice(),
116
+ ]);
117
+ let borrowNEARApy = helpers.calcLMRewardApr(await (0, priceFetcher_1.fetchValuation)(this.getBorrowNEARRewardPerWeek(), this._networkConnection.provider), underlyingPrice.multipliedBy(totalBorrowed.formattedAmount()), 52);
118
+ return borrowNEARApy;
119
+ }
120
+ async getDepositMetaAPY() {
121
+ return new bignumber_js_1.default(0);
122
+ }
123
+ async getDepositStaderAPY() {
124
+ return new bignumber_js_1.default(0);
125
+ }
126
+ async getDetails() {
127
+ const [totalDeposited, totalBorrowed, depositAPY, borrowAPY, collateralRatio, rewardSpeeds] = await Promise.all([
128
+ this.getTotalTokenDeposited(),
129
+ this.getTotalTokenBorrowed(),
130
+ this.getDepositAPY(),
131
+ this.getBorrowAPY(),
132
+ this.getCollateralRatio(),
133
+ this.getRewardSpeeds(),
134
+ ]);
135
+ const [depositPlyAPY, borrowPlyAPY, depositNearAPY, borrowNearAPY, depositMetaAPY, staderDepositApy,] = await Promise.all([
136
+ this.getDepositPlyAPY(),
137
+ this.getBorrowPlyAPY(),
138
+ this.getDepositNearAPY(),
139
+ this.getBorrowNearAPY(),
140
+ this.getDepositMetaAPY(),
141
+ this.getDepositStaderAPY(),
142
+ ]);
143
+ return {
144
+ auTokenAddress: this.auToken.address,
145
+ totalTokenDeposited: totalDeposited,
146
+ totalTokenBorrowed: totalBorrowed,
147
+ depositApy: depositAPY.toNumber(),
148
+ depositPlyApy: depositPlyAPY.toNumber(),
149
+ borrowApy: borrowAPY.toNumber(),
150
+ borrowPlyApy: borrowPlyAPY.toNumber() * -1,
151
+ collateralRatio: collateralRatio.toNumber(),
152
+ depositPlyPerWeek: new entities_1.TokenAmount(entities_1.PLYToken, rewardSpeeds.plyRewardSupplySpeed.mul(consts.ONE_DAY).mul(7).toString()),
153
+ borrowPlyPerWeek: new entities_1.TokenAmount(entities_1.PLYToken, rewardSpeeds.plyRewardBorrowSpeed.mul(consts.ONE_DAY).mul(7).toString()),
154
+ depositNEARApy: depositNearAPY.toNumber(),
155
+ borrowNEARApy: borrowNearAPY.toNumber() * -1,
156
+ depositMETAApy: depositMetaAPY.toNumber(),
157
+ staderDepositApy: staderDepositApy.toNumber(),
158
+ };
159
+ }
160
+ async getUserBorrowBalance(userAddress) {
161
+ const totalBorrow = await this.auToken.callStatic.borrowBalanceCurrent(userAddress);
162
+ return new entities_1.TokenAmount(this.underlying, totalBorrow.toString());
163
+ }
164
+ async getUserDepositBalance(userAddress) {
165
+ const totalDeposit = await this.auToken.callStatic.balanceOfUnderlying(userAddress);
166
+ return new entities_1.TokenAmount(this.underlying, totalDeposit.toString());
167
+ }
168
+ getDepositNEARRewardPerWeek() {
169
+ const NEARToken = new entities_1.Token(consts.networkAddresses.tokens.WNEAR, helpers.getDecimal(consts.networkAddresses.tokens.WNEAR));
170
+ const rewardStartTime = 1650636000;
171
+ const rewardStopTime = 1651845600;
172
+ const currentTime = helpers.getCurrentTimestamp();
173
+ if (currentTime <= rewardStopTime && currentTime > rewardStartTime) {
174
+ const reward = consts.DEPOSIT_NEAR_REWARDS_PER_WEEK[this.underlying.address.toLocaleLowerCase()] ?? '0';
175
+ return new entities_1.TokenAmount(NEARToken, reward, false);
176
+ }
177
+ else {
178
+ return new entities_1.TokenAmount(NEARToken, '0');
179
+ }
180
+ }
181
+ getBorrowNEARRewardPerWeek() {
182
+ const NEARToken = new entities_1.Token(consts.networkAddresses.tokens.WNEAR, helpers.getDecimal(consts.networkAddresses.tokens.WNEAR));
183
+ const rewardStartTime = 1650636000;
184
+ const rewardStopTime = 1651845600;
185
+ const currentTime = helpers.getCurrentTimestamp();
186
+ if (currentTime <= rewardStopTime && currentTime > rewardStartTime) {
187
+ const reward = consts.BORROW_NEAR_REWARDS_PER_WEEK[this.underlying.address.toLocaleLowerCase()] ?? '0';
188
+ return new entities_1.TokenAmount(NEARToken, reward, false);
189
+ }
190
+ else {
191
+ return new entities_1.TokenAmount(NEARToken, '0');
192
+ }
193
+ }
194
+ async mintCap() {
195
+ return new entities_1.TokenAmount(this.underlying, (await this.env.comptroller.callStatic.mintCaps(this.auToken.address)).toString());
196
+ }
197
+ async borrowCap() {
198
+ return new entities_1.TokenAmount(this.underlying, (await this.env.comptroller.callStatic.borrowCaps(this.auToken.address)).toString());
199
+ }
200
+ async getDepositBorrowValue(userAddress) {
201
+ const [price, depositBalance, borrowBalance] = await Promise.all([
202
+ this.getUnderlyingPrice(),
203
+ this.getUserDepositBalance(userAddress),
204
+ this.getUserBorrowBalance(userAddress),
205
+ ]);
206
+ const suppliedValue = price.multipliedBy(depositBalance.formattedAmount());
207
+ const borrowedValue = price.multipliedBy(borrowBalance.formattedAmount());
208
+ return {
209
+ suppliedValue,
210
+ borrowedValue,
211
+ };
212
+ }
213
+ async getApyWithoutIncentive(userAddress) {
214
+ const [price, depositApy, borrowApy, depositBalance, borrowBalance] = await Promise.all([
215
+ this.getUnderlyingPrice(),
216
+ this.getDepositAPY(),
217
+ this.getBorrowAPY(),
218
+ this.getUserDepositBalance(userAddress),
219
+ this.getUserBorrowBalance(userAddress),
220
+ ]);
221
+ const suppliedValue = price.multipliedBy(depositBalance.formattedAmount());
222
+ const borrowedValue = price.multipliedBy(borrowBalance.formattedAmount());
223
+ const sum = helpers.calcNetApy(suppliedValue, depositApy, borrowedValue, borrowApy);
224
+ return {
225
+ sum,
226
+ suppliedValue,
227
+ borrowedValue,
228
+ };
229
+ }
230
+ async getApyWithIncentive(userAddress) {
231
+ const [price, depositApy, borrowApy, depositBalance, borrowBalance, nearDepositApy, plyDepositApy, metaDepositApy, nearBorrowApy, plyBorrowApy,] = await Promise.all([
232
+ this.getUnderlyingPrice(),
233
+ this.getDepositAPY(),
234
+ this.getBorrowAPY(),
235
+ this.getUserDepositBalance(userAddress),
236
+ this.getUserBorrowBalance(userAddress),
237
+ this.getDepositNearAPY(),
238
+ this.getDepositPlyAPY(),
239
+ this.getDepositMetaAPY(),
240
+ this.getBorrowNearAPY(),
241
+ this.getBorrowPlyAPY(),
242
+ ]);
243
+ const staderDepositApy = await this.getDepositStaderAPY();
244
+ const suppliedValue = price.multipliedBy(depositBalance.formattedAmount());
245
+ const borrowedValue = price.multipliedBy(borrowBalance.formattedAmount());
246
+ const totalDepositApy = depositApy
247
+ .plus(nearDepositApy)
248
+ .plus(plyDepositApy)
249
+ .plus(metaDepositApy)
250
+ .plus(staderDepositApy);
251
+ const totalBorrowApy = borrowApy.plus(nearBorrowApy).plus(plyBorrowApy);
252
+ const sum = helpers.calcNetApy(suppliedValue, totalDepositApy, borrowedValue, totalBorrowApy);
253
+ return {
254
+ sum,
255
+ suppliedValue,
256
+ borrowedValue,
257
+ };
258
+ }
259
+ }
260
+ exports.MoneyMarketRead = MoneyMarketRead;
261
+ tslib_1.__decorate([
262
+ (0, cache_decorator_1.cache)({ ttl: consts_1.CACHE_TIMEOUT, type: cache_decorator_1.CacheType.MEMO })
263
+ ], MoneyMarketRead.prototype, "getUnderlyingPrice", null);
264
+ tslib_1.__decorate([
265
+ (0, cache_decorator_1.cache)({ ttl: consts_1.CACHE_TIMEOUT, type: cache_decorator_1.CacheType.MEMO })
266
+ ], MoneyMarketRead.prototype, "getPlyPrice", null);
267
+ tslib_1.__decorate([
268
+ (0, cache_decorator_1.cache)({ ttl: consts_1.CACHE_TIMEOUT, type: cache_decorator_1.CacheType.MEMO })
269
+ ], MoneyMarketRead.prototype, "getRewardSpeeds", null);
270
+ tslib_1.__decorate([
271
+ (0, cache_decorator_1.cache)({ ttl: consts_1.CACHE_TIMEOUT, type: cache_decorator_1.CacheType.MEMO })
272
+ ], MoneyMarketRead.prototype, "getTotalTokenBorrowed", null);
273
+ tslib_1.__decorate([
274
+ (0, cache_decorator_1.cache)({ ttl: consts_1.CACHE_TIMEOUT, type: cache_decorator_1.CacheType.MEMO })
275
+ ], MoneyMarketRead.prototype, "getTotalTokenDeposited", null);
276
+ tslib_1.__decorate([
277
+ (0, cache_decorator_1.cache)({ ttl: consts_1.CACHE_TIMEOUT, type: cache_decorator_1.CacheType.MEMO })
278
+ ], MoneyMarketRead.prototype, "getDepositAPY", null);
279
+ tslib_1.__decorate([
280
+ (0, cache_decorator_1.cache)({ ttl: consts_1.CACHE_TIMEOUT, type: cache_decorator_1.CacheType.MEMO })
281
+ ], MoneyMarketRead.prototype, "getBorrowAPY", null);
282
+ tslib_1.__decorate([
283
+ (0, cache_decorator_1.cache)({ ttl: consts_1.CACHE_TIMEOUT, type: cache_decorator_1.CacheType.MEMO })
284
+ ], MoneyMarketRead.prototype, "getCollateralRatio", null);
285
+ tslib_1.__decorate([
286
+ (0, cache_decorator_1.cache)({ ttl: consts_1.CACHE_TIMEOUT, type: cache_decorator_1.CacheType.MEMO })
287
+ ], MoneyMarketRead.prototype, "getBorrowPlyAPY", null);
288
+ tslib_1.__decorate([
289
+ (0, cache_decorator_1.cache)({ ttl: consts_1.CACHE_TIMEOUT, type: cache_decorator_1.CacheType.MEMO })
290
+ ], MoneyMarketRead.prototype, "getDepositPlyAPY", null);
291
+ tslib_1.__decorate([
292
+ (0, cache_decorator_1.cache)({ ttl: consts_1.CACHE_TIMEOUT, type: cache_decorator_1.CacheType.MEMO })
293
+ ], MoneyMarketRead.prototype, "getDepositNearAPY", null);
294
+ tslib_1.__decorate([
295
+ (0, cache_decorator_1.cache)({ ttl: consts_1.CACHE_TIMEOUT, type: cache_decorator_1.CacheType.MEMO })
296
+ ], MoneyMarketRead.prototype, "getBorrowNearAPY", null);
297
+ tslib_1.__decorate([
298
+ (0, cache_decorator_1.cache)({ ttl: consts_1.CACHE_TIMEOUT, type: cache_decorator_1.CacheType.MEMO })
299
+ ], MoneyMarketRead.prototype, "getDepositMetaAPY", null);
300
+ tslib_1.__decorate([
301
+ (0, cache_decorator_1.cache)({ ttl: consts_1.CACHE_TIMEOUT, type: cache_decorator_1.CacheType.MEMO })
302
+ ], MoneyMarketRead.prototype, "getDepositStaderAPY", null);
303
+ class MoneyMarketReadWrite extends MoneyMarketRead {
304
+ constructor(networkConnection, auToken, underlyingAsset) {
305
+ super(networkConnection, auToken, underlyingAsset);
306
+ Object.defineProperty(this, "_EthRepayHelper", {
307
+ enumerable: true,
308
+ configurable: true,
309
+ writable: true,
310
+ value: void 0
311
+ });
312
+ this._EthRepayHelper = (0, multicall_1.createContract)(consts.networkAddresses.misc.ETHREPAYHELPER, abis.EthRepayHelperABI.abi, networkConnection.provider);
313
+ }
314
+ async deposit(amount) {
315
+ if (helpers.isSameAddress(amount.token.address, consts.ETHAddress)) {
316
+ return this.auToken.raw
317
+ .connect(this._networkConnection.signer)
318
+ .mint({ value: amount.rawAmount() });
319
+ }
320
+ else {
321
+ return this.auToken.raw
322
+ .connect(this._networkConnection.signer)
323
+ .mint(amount.rawAmount());
324
+ }
325
+ }
326
+ async borrow(amount) {
327
+ return this.auToken.raw.connect(this._networkConnection.signer).borrow(amount.rawAmount());
328
+ }
329
+ async withdraw(amount) {
330
+ if (new bignumber_js_1.default(amount.rawAmount()).lt(0)) {
331
+ return this.auToken.raw.connect(this._networkConnection.signer).redeemUnderlying(consts.INF);
332
+ }
333
+ return this.auToken.raw
334
+ .connect(this._networkConnection.signer)
335
+ .redeemUnderlying(amount.rawAmount());
336
+ }
337
+ async repay(amount) {
338
+ if (helpers.isSameAddress(amount.token.address, consts.ETHAddress)) {
339
+ return this._EthRepayHelper.raw
340
+ .connect(this._networkConnection.signer)
341
+ .repayBorrow({ value: amount.rawAmount() });
342
+ }
343
+ else {
344
+ if (new bignumber_js_1.default(amount.rawAmount()).lt(0)) {
345
+ return this.auToken.raw.connect(this._networkConnection.signer).repayBorrow(consts.INF);
346
+ }
347
+ else {
348
+ return this.auToken.raw
349
+ .connect(this._networkConnection.signer)
350
+ .repayBorrow(amount.rawAmount());
351
+ }
352
+ }
353
+ }
354
+ async enableCollateral() {
355
+ return this.env.comptroller.raw
356
+ .connect(this._networkConnection.signer)
357
+ .enterMarkets([this.auToken.address]);
358
+ }
359
+ async disableCollateral() {
360
+ return this.env.comptroller.raw
361
+ .connect(this._networkConnection.signer)
362
+ .exitMarket(this.auToken.address);
363
+ }
364
+ }
365
+ exports.MoneyMarketReadWrite = MoneyMarketReadWrite;
366
+ class MoneyMarket extends entities_1.BlockchainEntity {
367
+ constructor(address, underlying) {
368
+ super();
369
+ Object.defineProperty(this, "address", {
370
+ enumerable: true,
371
+ configurable: true,
372
+ writable: true,
373
+ value: void 0
374
+ });
375
+ Object.defineProperty(this, "underlying", {
376
+ enumerable: true,
377
+ configurable: true,
378
+ writable: true,
379
+ value: void 0
380
+ });
381
+ this.address = helpers.validateAndParseAddress(address);
382
+ this.underlying = helpers.validateAndParseAddress(underlying);
383
+ }
384
+ read(networkConnection) {
385
+ return new MoneyMarketRead(networkConnection, this.address, this.underlying);
386
+ }
387
+ readWrite(networkConnection) {
388
+ return new MoneyMarketReadWrite(networkConnection, this.address, this.underlying);
389
+ }
390
+ }
391
+ exports.MoneyMarket = MoneyMarket;
392
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"MoneyMarket.js","sourceRoot":"","sources":["../../src/interactors/MoneyMarket.ts"],"names":[],"mappings":";;;;AAEA,wEAAqC;AACrC,qDAAmD;AACnD,mCAAyC;AACzC,sDAAgC;AAChC,0DAAoC;AACpC,sCAAmD;AACnD,0CAOqB;AACrB,4DAAsC;AACtC,oDAAsD;AACtD,0DAAoF;AAUpF,MAAa,eAAgB,SAAQ,+BAAoB;IAIvD,YAAY,iBAAoC,EAAE,OAAgB,EAAE,eAAwB;QAC1F,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAJpB;;;;;WAAkB;QAClB;;;;;WAA0C;QACjC;;;;;WAAa;QAG3B,IAAI,CAAC,GAAG,GAAG,IAAI,kBAAO,CAAC,iBAAiB,CAAC,CAAC;QAC1C,IAAI,OAAO,CAAC,aAAa,CAAC,eAAe,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YAC9D,IAAI,CAAC,OAAO,GAAG,IAAA,0BAAc,EAAQ,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAC/F,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,OAAO,GAAG,IAAA,0BAAc,EAC3B,OAAO,EACP,IAAI,CAAC,UAAU,CAAC,GAAG,EACnB,iBAAiB,CAAC,QAAQ,CAC3B,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,UAAU,GAAG,IAAI,gBAAK,CAAC,eAAe,EAAE,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC;IACpF,CAAC;IAGY,AAAN,KAAK,CAAC,kBAAkB;QAC7B,OAAO,IAAA,yBAAU,EAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IAC/E,CAAC;IAGY,AAAN,KAAK,CAAC,WAAW;QACtB,OAAO,IAAA,yBAAU,EAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IAC1F,CAAC;IAGe,AAAN,KAAK,CAAC,eAAe;QAC7B,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,eAAe,CAC7D,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,EAC5B,IAAI,CAAC,OAAO,CAAC,OAAO,CACrB,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAGY,AAAN,KAAK,CAAC,qBAAqB;QAChC,OAAO,IAAI,sBAAW,CACpB,IAAI,CAAC,UAAU,EACf,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC,CAAC,QAAQ,EAAE,CAC1D,CAAC;IACJ,CAAC;IAGY,AAAN,KAAK,CAAC,sBAAsB;QACjC,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACjD,IAAI,CAAC,qBAAqB,EAAE;YAC5B,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE;SAClC,CAAC,CAAC;QACH,OAAO,IAAI,sBAAW,CACpB,IAAI,CAAC,UAAU,EACf,kBAAE,CAAC,IAAI,CAAC,IAAI,sBAAW,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC;aACxE,GAAG,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;aAC5B,QAAQ,EAAE,CACd,CAAC;IACJ,CAAC;IAGY,AAAN,KAAK,CAAC,aAAa;QACxB,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,sBAAsB,EAAE,CAAC;QACtF,MAAM,gBAAgB,GAAG,IAAI,sBAAS,CAAC,sBAAsB,CAAC,QAAQ,EAAE,CAAC;aACtE,YAAY,CAAC,gBAAO,CAAC;aACrB,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC;QAElC,OAAO,IAAI,sBAAS,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACnE,CAAC;IAGY,AAAN,KAAK,CAAC,YAAY;QACvB,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,sBAAsB,EAAE,CAAC;QACtF,MAAM,gBAAgB,GAAG,IAAI,sBAAS,CAAC,sBAAsB,CAAC,QAAQ,EAAE,CAAC;aACtE,YAAY,CAAC,gBAAO,CAAC;aACrB,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC;QAClC,OAAO,IAAI,sBAAS,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACnE,CAAC;IAGY,AAAN,KAAK,CAAC,kBAAkB;QAC7B,OAAO,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,GAAQ,EAAE,EAAE;YACrF,OAAO,IAAI,sBAAS,CAAC,GAAG,CAAC,wBAAwB,CAAC,QAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC;QAC/F,CAAC,CAAC,CAAC;IACL,CAAC;IAGY,AAAN,KAAK,CAAC,eAAe;QAC1B,MAAM,CAAC,aAAa,EAAE,YAAY,EAAE,QAAQ,EAAE,eAAe,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACjF,IAAI,CAAC,qBAAqB,EAAE;YAC5B,IAAI,CAAC,eAAe,EAAE;YACtB,IAAI,CAAC,WAAW,EAAE;YAClB,IAAI,CAAC,kBAAkB,EAAE;SAC1B,CAAC,CAAC;QACH,OAAO,OAAO,CAAC,eAAe,CAC5B,IAAA,4BAAa,EACX,IAAI,sBAAW,CAAC,mBAAQ,EAAE,YAAY,CAAC,oBAAoB,CAAC,QAAQ,EAAE,CAAC,EACvE,QAAQ,CACT,EACD,eAAe,CAAC,YAAY,CAAC,aAAa,CAAC,eAAe,EAAE,CAAC,EAC7D,MAAM,CAAC,QAAQ,CAChB,CAAC;IACJ,CAAC;IAGY,AAAN,KAAK,CAAC,gBAAgB;QAC3B,MAAM,CAAC,cAAc,EAAE,YAAY,EAAE,QAAQ,EAAE,eAAe,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAClF,IAAI,CAAC,sBAAsB,EAAE;YAC7B,IAAI,CAAC,eAAe,EAAE;YACtB,IAAI,CAAC,WAAW,EAAE;YAClB,IAAI,CAAC,kBAAkB,EAAE;SAC1B,CAAC,CAAC;QACH,OAAO,OAAO,CAAC,eAAe,CAC5B,IAAA,4BAAa,EACX,IAAI,sBAAW,CAAC,mBAAQ,EAAE,YAAY,CAAC,oBAAoB,CAAC,QAAQ,EAAE,CAAC,EACvE,QAAQ,CACT,EACD,eAAe,CAAC,YAAY,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,EAC9D,MAAM,CAAC,QAAQ,CAChB,CAAC;IACJ,CAAC;IAGY,AAAN,KAAK,CAAC,iBAAiB;QAC5B,MAAM,CAAC,cAAc,EAAE,eAAe,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC1D,IAAI,CAAC,sBAAsB,EAAE;YAC7B,IAAI,CAAC,kBAAkB,EAAE;SAC1B,CAAC,CAAC;QACH,IAAI,cAAc,GAAG,OAAO,CAAC,eAAe,CAC1C,MAAM,IAAA,6BAAc,EAAC,IAAI,CAAC,2BAA2B,EAAE,EAAE,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EAC1F,eAAe,CAAC,YAAY,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,EAC9D,EAAE,CACH,CAAC;QACF,OAAO,cAAc,CAAC;IACxB,CAAC;IAGY,AAAN,KAAK,CAAC,gBAAgB;QAC3B,MAAM,CAAC,aAAa,EAAE,eAAe,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACzD,IAAI,CAAC,qBAAqB,EAAE;YAC5B,IAAI,CAAC,kBAAkB,EAAE;SAC1B,CAAC,CAAC;QACH,IAAI,aAAa,GAAG,OAAO,CAAC,eAAe,CACzC,MAAM,IAAA,6BAAc,EAAC,IAAI,CAAC,0BAA0B,EAAE,EAAE,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EACzF,eAAe,CAAC,YAAY,CAAC,aAAa,CAAC,eAAe,EAAE,CAAC,EAC7D,EAAE,CACH,CAAC;QACF,OAAO,aAAa,CAAC;IACvB,CAAC;IAGY,AAAN,KAAK,CAAC,iBAAiB;QAC5B,OAAO,IAAI,sBAAS,CAAC,CAAC,CAAC,CAAC;IAmB1B,CAAC;IAGY,AAAN,KAAK,CAAC,mBAAmB;QAC9B,OAAO,IAAI,sBAAS,CAAC,CAAC,CAAC,CAAC;IAwB1B,CAAC;IAEM,KAAK,CAAC,UAAU;QACrB,MAAM,CAAC,cAAc,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,eAAe,EAAE,YAAY,CAAC,GACzF,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,IAAI,CAAC,sBAAsB,EAAE;YAC7B,IAAI,CAAC,qBAAqB,EAAE;YAC5B,IAAI,CAAC,aAAa,EAAE;YACpB,IAAI,CAAC,YAAY,EAAE;YACnB,IAAI,CAAC,kBAAkB,EAAE;YACzB,IAAI,CAAC,eAAe,EAAE;SACvB,CAAC,CAAC;QACL,MAAM,CACJ,aAAa,EACb,YAAY,EACZ,cAAc,EACd,aAAa,EACb,cAAc,EACd,gBAAgB,EACjB,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACpB,IAAI,CAAC,gBAAgB,EAAE;YACvB,IAAI,CAAC,eAAe,EAAE;YACtB,IAAI,CAAC,iBAAiB,EAAE;YACxB,IAAI,CAAC,gBAAgB,EAAE;YACvB,IAAI,CAAC,iBAAiB,EAAE;YACxB,IAAI,CAAC,mBAAmB,EAAE;SAC3B,CAAC,CAAC;QACH,OAAO;YACL,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO;YACpC,mBAAmB,EAAE,cAAc;YACnC,kBAAkB,EAAE,aAAa;YACjC,UAAU,EAAE,UAAU,CAAC,QAAQ,EAAE;YACjC,aAAa,EAAE,aAAa,CAAC,QAAQ,EAAE;YACvC,SAAS,EAAE,SAAS,CAAC,QAAQ,EAAE;YAC/B,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;YAC1C,eAAe,EAAE,eAAe,CAAC,QAAQ,EAAE;YAC3C,iBAAiB,EAAE,IAAI,sBAAW,CAChC,mBAAQ,EACR,YAAY,CAAC,oBAAoB,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CACxE;YACD,gBAAgB,EAAE,IAAI,sBAAW,CAC/B,mBAAQ,EACR,YAAY,CAAC,oBAAoB,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CACxE;YACD,cAAc,EAAE,cAAc,CAAC,QAAQ,EAAE;YACzC,aAAa,EAAE,aAAa,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;YAC5C,cAAc,EAAE,cAAc,CAAC,QAAQ,EAAE;YACzC,gBAAgB,EAAE,gBAAgB,CAAC,QAAQ,EAAE;SAC9C,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,WAAmB;QACnD,MAAM,WAAW,GAAO,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;QACxF,OAAO,IAAI,sBAAW,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;IAClE,CAAC;IAEM,KAAK,CAAC,qBAAqB,CAAC,WAAmB;QACpD,MAAM,YAAY,GAAO,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QACxF,OAAO,IAAI,sBAAW,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC;IACnE,CAAC;IAEO,2BAA2B;QACjC,MAAM,SAAS,GAAG,IAAI,gBAAK,CACzB,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,KAAK,EACpC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CACzD,CAAC;QACF,MAAM,eAAe,GAAG,UAAU,CAAC;QACnC,MAAM,cAAc,GAAG,UAAU,CAAC;QAClC,MAAM,WAAW,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC;QAClD,IAAI,WAAW,IAAI,cAAc,IAAI,WAAW,GAAG,eAAe,EAAE,CAAC;YACnE,MAAM,MAAM,GACV,MAAM,CAAC,6BAA6B,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,IAAI,GAAG,CAAC;YAC3F,OAAO,IAAI,sBAAW,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QACnD,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,sBAAW,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAEO,0BAA0B;QAChC,MAAM,SAAS,GAAG,IAAI,gBAAK,CACzB,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,KAAK,EACpC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CACzD,CAAC;QACF,MAAM,eAAe,GAAG,UAAU,CAAC;QACnC,MAAM,cAAc,GAAG,UAAU,CAAC;QAClC,MAAM,WAAW,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC;QAClD,IAAI,WAAW,IAAI,cAAc,IAAI,WAAW,GAAG,eAAe,EAAE,CAAC;YACnE,MAAM,MAAM,GACV,MAAM,CAAC,4BAA4B,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,IAAI,GAAG,CAAC;YAC1F,OAAO,IAAI,sBAAW,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QACnD,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,sBAAW,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IACM,KAAK,CAAC,OAAO;QAClB,OAAO,IAAI,sBAAW,CACpB,IAAI,CAAC,UAAU,EACf,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,CAClF,CAAC;IACJ,CAAC;IACM,KAAK,CAAC,SAAS;QACpB,OAAO,IAAI,sBAAW,CACpB,IAAI,CAAC,UAAU,EACf,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,CACpF,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,qBAAqB,CAAC,WAAoB;QACrD,MAAM,CAAC,KAAK,EAAE,cAAc,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC/D,IAAI,CAAC,kBAAkB,EAAE;YACzB,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC;YACvC,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC;SACvC,CAAC,CAAC;QACH,MAAM,aAAa,GAAG,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC;QAC3E,MAAM,aAAa,GAAG,KAAK,CAAC,YAAY,CAAC,aAAa,CAAC,eAAe,EAAE,CAAC,CAAC;QAC1E,OAAO;YACL,aAAa;YACb,aAAa;SACd,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,WAAoB;QACtD,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,cAAc,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACtF,IAAI,CAAC,kBAAkB,EAAE;YACzB,IAAI,CAAC,aAAa,EAAE;YACpB,IAAI,CAAC,YAAY,EAAE;YACnB,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC;YACvC,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC;SACvC,CAAC,CAAC;QACH,MAAM,aAAa,GAAG,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC;QAC3E,MAAM,aAAa,GAAG,KAAK,CAAC,YAAY,CAAC,aAAa,CAAC,eAAe,EAAE,CAAC,CAAC;QAC1E,MAAM,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,aAAa,EAAE,UAAU,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;QACpF,OAAO;YACL,GAAG;YACH,aAAa;YACb,aAAa;SACd,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAAC,WAAoB;QACnD,MAAM,CACJ,KAAK,EACL,UAAU,EACV,SAAS,EACT,cAAc,EACd,aAAa,EACb,cAAc,EACd,aAAa,EACb,cAAc,EACd,aAAa,EACb,YAAY,EACb,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACpB,IAAI,CAAC,kBAAkB,EAAE;YACzB,IAAI,CAAC,aAAa,EAAE;YACpB,IAAI,CAAC,YAAY,EAAE;YACnB,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC;YACvC,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC;YACtC,IAAI,CAAC,iBAAiB,EAAE;YACxB,IAAI,CAAC,gBAAgB,EAAE;YACvB,IAAI,CAAC,iBAAiB,EAAE;YACxB,IAAI,CAAC,gBAAgB,EAAE;YACvB,IAAI,CAAC,eAAe,EAAE;SACvB,CAAC,CAAC;QAEH,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC1D,MAAM,aAAa,GAAG,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC;QAC3E,MAAM,aAAa,GAAG,KAAK,CAAC,YAAY,CAAC,aAAa,CAAC,eAAe,EAAE,CAAC,CAAC;QAC1E,MAAM,eAAe,GAAG,UAAU;aAC/B,IAAI,CAAC,cAAc,CAAC;aACpB,IAAI,CAAC,aAAa,CAAC;aACnB,IAAI,CAAC,cAAc,CAAC;aACpB,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC1B,MAAM,cAAc,GAAG,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACxE,MAAM,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,aAAa,EAAE,eAAe,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC;QAC9F,OAAO;YACL,GAAG;YACH,aAAa;YACb,aAAa;SACd,CAAC;IACJ,CAAC;CACF;AA3XD,0CA2XC;AAvWc;IADZ,IAAA,uBAAK,EAAC,EAAE,GAAG,EAAE,sBAAa,EAAE,IAAI,EAAE,2BAAS,CAAC,IAAI,EAAE,CAAC;yDAGnD;AAGY;IADZ,IAAA,uBAAK,EAAC,EAAE,GAAG,EAAE,sBAAa,EAAE,IAAI,EAAE,2BAAS,CAAC,IAAI,EAAE,CAAC;kDAGnD;AAGe;IADf,IAAA,uBAAK,EAAC,EAAE,GAAG,EAAE,sBAAa,EAAE,IAAI,EAAE,2BAAS,CAAC,IAAI,EAAE,CAAC;sDAOnD;AAGY;IADZ,IAAA,uBAAK,EAAC,EAAE,GAAG,EAAE,sBAAa,EAAE,IAAI,EAAE,2BAAS,CAAC,IAAI,EAAE,CAAC;4DAMnD;AAGY;IADZ,IAAA,uBAAK,EAAC,EAAE,GAAG,EAAE,sBAAa,EAAE,IAAI,EAAE,2BAAS,CAAC,IAAI,EAAE,CAAC;6DAYnD;AAGY;IADZ,IAAA,uBAAK,EAAC,EAAE,GAAG,EAAE,sBAAa,EAAE,IAAI,EAAE,2BAAS,CAAC,IAAI,EAAE,CAAC;oDAQnD;AAGY;IADZ,IAAA,uBAAK,EAAC,EAAE,GAAG,EAAE,sBAAa,EAAE,IAAI,EAAE,2BAAS,CAAC,IAAI,EAAE,CAAC;mDAOnD;AAGY;IADZ,IAAA,uBAAK,EAAC,EAAE,GAAG,EAAE,sBAAa,EAAE,IAAI,EAAE,2BAAS,CAAC,IAAI,EAAE,CAAC;yDAKnD;AAGY;IADZ,IAAA,uBAAK,EAAC,EAAE,GAAG,EAAE,sBAAa,EAAE,IAAI,EAAE,2BAAS,CAAC,IAAI,EAAE,CAAC;sDAgBnD;AAGY;IADZ,IAAA,uBAAK,EAAC,EAAE,GAAG,EAAE,sBAAa,EAAE,IAAI,EAAE,2BAAS,CAAC,IAAI,EAAE,CAAC;uDAgBnD;AAGY;IADZ,IAAA,uBAAK,EAAC,EAAE,GAAG,EAAE,sBAAa,EAAE,IAAI,EAAE,2BAAS,CAAC,IAAI,EAAE,CAAC;wDAYnD;AAGY;IADZ,IAAA,uBAAK,EAAC,EAAE,GAAG,EAAE,sBAAa,EAAE,IAAI,EAAE,2BAAS,CAAC,IAAI,EAAE,CAAC;uDAYnD;AAGY;IADZ,IAAA,uBAAK,EAAC,EAAE,GAAG,EAAE,sBAAa,EAAE,IAAI,EAAE,2BAAS,CAAC,IAAI,EAAE,CAAC;wDAqBnD;AAGY;IADZ,IAAA,uBAAK,EAAC,EAAE,GAAG,EAAE,sBAAa,EAAE,IAAI,EAAE,2BAAS,CAAC,IAAI,EAAE,CAAC;0DA0BnD;AAsLH,MAAa,oBAAqB,SAAQ,eAAe;IAEvD,YAAY,iBAAoC,EAAE,OAAgB,EAAE,eAAwB;QAC1F,KAAK,CAAC,iBAAiB,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;QAF3C;;;;;WAAiD;QAGzD,IAAI,CAAC,eAAe,GAAG,IAAA,0BAAc,EACnC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,cAAc,EAC3C,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAC1B,iBAAiB,CAAC,QAAQ,CAC3B,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,MAAmB;QACtC,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YACnE,OAAQ,IAAI,CAAC,OAAO,CAAC,GAAa;iBAC/B,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAO,CAAC;iBACxC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QACzC,CAAC;aAAM,CAAC;YACN,OAAQ,IAAI,CAAC,OAAO,CAAC,GAAe;iBACjC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAO,CAAC;iBACxC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IACM,KAAK,CAAC,MAAM,CAAC,MAAmB;QACrC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAO,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;IAC9F,CAAC;IACM,KAAK,CAAC,QAAQ,CAAC,MAAmB;QACvC,IAAI,IAAI,sBAAS,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5C,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAO,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAChG,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG;aACpB,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAO,CAAC;aACxC,gBAAgB,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;IAC1C,CAAC;IACM,KAAK,CAAC,KAAK,CAAC,MAAmB;QACpC,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YACnE,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG;iBAC5B,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAO,CAAC;iBACxC,WAAW,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAChD,CAAC;aAAM,CAAC;YACN,IAAI,IAAI,sBAAS,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC5C,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAO,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC3F,CAAC;iBAAM,CAAC;gBACN,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG;qBACpB,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAO,CAAC;qBACxC,WAAW,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;YACrC,CAAC;QACH,CAAC;IACH,CAAC;IACM,KAAK,CAAC,gBAAgB;QAC3B,OAAO,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG;aAC5B,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAO,CAAC;aACxC,YAAY,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IAC1C,CAAC;IACM,KAAK,CAAC,iBAAiB;QAC5B,OAAO,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG;aAC5B,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAO,CAAC;aACxC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;CACF;AA1DD,oDA0DC;AAED,MAAa,WAAY,SAAQ,2BAAgB;IAI/C,YAAY,OAAe,EAAE,UAAkB;QAC7C,KAAK,EAAE,CAAC;QAJA;;;;;WAAiB;QAEjB;;;;;WAAoB;QAG5B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;QACxD,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,UAAU,CAAC,CAAC;IAChE,CAAC;IACM,IAAI,CAAC,iBAAoC;QAC9C,OAAO,IAAI,eAAe,CAAC,iBAAiB,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAC/E,CAAC;IAEM,SAAS,CAAC,iBAAoC;QACnD,OAAO,IAAI,oBAAoB,CAAC,iBAAiB,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IACpF,CAAC;CACF;AAhBD,kCAgBC"}
@@ -1,18 +1,15 @@
1
- import { Multicall2 } from '@aurigami/contracts/typechain';
2
- import { Contract } from 'ethers';
3
- import { Result } from 'ethers/lib/utils';
4
- import { BlockchainEntityRead } from '../entities';
5
- import { NetworkConnection } from '../types';
6
- export declare class MulticallRead extends BlockchainEntityRead {
7
- readonly multicall: Multicall2;
8
- constructor(networkConnection: NetworkConnection);
9
- /**
10
- * Run multiple calls via multicall contract
11
- */
12
- aggregate(calls: {
13
- contract: Contract;
14
- method: string;
15
- args: any[];
16
- returnTypes: string[];
17
- }[]): Promise<Result[]>;
18
- }
1
+ import { Multicall2 } from '@aurigami/contracts/typechain';
2
+ import { Contract } from 'ethers';
3
+ import { Result } from 'ethers/lib/utils';
4
+ import { BlockchainEntityRead } from '../entities';
5
+ import { MulticallStatic, NetworkConnection } from '../types';
6
+ export declare class MulticallRead extends BlockchainEntityRead {
7
+ readonly multicall: Multicall2;
8
+ constructor(networkConnection: NetworkConnection);
9
+ aggregate(calls: {
10
+ contract: MulticallStatic<Contract>;
11
+ method: string;
12
+ args: any[];
13
+ returnTypes: string[];
14
+ }[]): Promise<Result[]>;
15
+ }