aftermath-ts-sdk 0.0.142 → 0.0.144

package/dist/packages/coin/coin.js

@@ -17,14 +17,21 @@ class Coin extends caller_1.Caller {
     /////////////////////////////////////////////////////////////////////
     //// Constructor
     /////////////////////////////////////////////////////////////////////
+    // TODO: update this class to not be instantiated with a coin type at all
     constructor(coinType, network) {
         super(network, "coins");
         this.coinType = coinType;
         this.network = network;
         this.coinType = coinType;
-        this.coinTypePackageName = Coin.getCoinTypePackageName(this.coinType);
-        this.coinTypeSymbol = Coin.getCoinTypeSymbol(this.coinType);
-        this.innerCoinType = Coin.getInnerCoinType(this.coinType);
+        this.coinTypePackageName = this.coinType
+            ? Coin.getCoinTypePackageName(this.coinType)
+            : "";
+        this.coinTypeSymbol = this.coinType
+            ? Coin.getCoinTypeSymbol(this.coinType)
+            : "";
+        this.innerCoinType = this.coinType
+            ? Coin.getInnerCoinType(this.coinType)
+            : "";
     }
     /////////////////////////////////////////////////////////////////////
     //// Public Methods
@@ -32,11 +39,25 @@ class Coin extends caller_1.Caller {
     /////////////////////////////////////////////////////////////////////
     //// Inspections
     /////////////////////////////////////////////////////////////////////
-    getCoinMetadata() {
+    getCoinsToDecimals(inputs) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { coins } = inputs;
+            const allDecimals = yield Promise.all(coins.map((coin) => __awaiter(this, void 0, void 0, function* () { return (yield this.getCoinMetadata(coin)).decimals; })));
+            const coinsToDecimals = allDecimals.reduce((acc, decimals, index) => {
+                return Object.assign(Object.assign({}, acc), { [coins[index]]: decimals });
+            }, {});
+            return coinsToDecimals;
+        });
+    }
+    getCoinMetadata(coin) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.metadata)
                 return this.metadata;
-            const metadata = yield this.fetchApi(this.coinType);
+            const coinType = (_a = this.coinType) !== null && _a !== void 0 ? _a : coin;
+            if (!coinType)
+                throw new Error("no valid coin type");
+            const metadata = yield this.fetchApi(coinType);
             this.setCoinMetadata(metadata);
             return metadata;
         });
@@ -44,21 +65,25 @@ class Coin extends caller_1.Caller {
     setCoinMetadata(metadata) {
         this.metadata = metadata;
     }
-    getPrice() {
+    getPrice(coin) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.price !== undefined)
-                return this.price;
-            const price = yield new prices_1.Prices(this.network).getCoinPrice({
-                coin: this.coinType,
+            if (this.priceInfo !== undefined)
+                return this.priceInfo;
+            const coinType = (_a = this.coinType) !== null && _a !== void 0 ? _a : coin;
+            if (!coinType)
+                throw new Error("no valid coin type");
+            const priceInfo = yield new prices_1.Prices(this.network).getCoinPriceInfo({
+                coin: coinType,
             });
             // NOTE: do we want this here ? (unexpected behavior)
             // if (price <= 0) throw new Error("No price found.")
-            this.setPrice(price);
-            return price;
+            this.setPriceInfo(priceInfo);
+            return priceInfo;
         });
     }
-    setPrice(price) {
-        this.price = price;
+    setPriceInfo(priceInfo) {
+        this.priceInfo = priceInfo;
     }
 }
 exports.Coin = Coin;

package/dist/packages/coin/coinTypes.d.ts

@@ -1,4 +1,4 @@
-import { Balance } from "../../general/types/generalTypes";
+import { Balance, Percentage } from "../../general/types/generalTypes";
 export type CoinDecimal = number;
 export type CoinType = string;
 export type CoinSymbol = string;
@@ -20,5 +20,11 @@ export interface AmountInCoinAndUsd {
 }
 export type CoinsToBalance = Record<CoinType, Balance>;
 export type CoinsToPrice = Record<CoinType, number>;
+export type CoinsToDecimals = Record<CoinType, CoinDecimal>;
+export type CoinsToPriceInfo = Record<CoinType, CoinPriceInfo>;
 export type CoinSymbolToCoinTypes = Record<CoinSymbol, CoinType[]>;
+export interface CoinPriceInfo {
+    price: number;
+    priceChange24HoursPercentage: Percentage;
+}
 //# sourceMappingURL=coinTypes.d.ts.map

package/dist/packages/coin/coinTypes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"coinTypes.d.ts","sourceRoot":"","sources":["../../../src/packages/coin/coinTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAM3D,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC;AACjC,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC;AAC9B,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC;AAMhC,MAAM,MAAM,eAAe,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC;AAEnE,MAAM,WAAW,cAAc;IAC9B,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CACf;AACD,MAAM,WAAW,yBAAyB;IACzC,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B;AAMD,MAAM,WAAW,kBAAkB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CAClB;AAMD,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;AACvD,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AACpD,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC"}
+{"version":3,"file":"coinTypes.d.ts","sourceRoot":"","sources":["../../../src/packages/coin/coinTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAMvE,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC;AACjC,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC;AAC9B,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC;AAMhC,MAAM,MAAM,eAAe,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC;AAEnE,MAAM,WAAW,cAAc;IAC9B,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CACf;AACD,MAAM,WAAW,yBAAyB;IACzC,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B;AAMD,MAAM,WAAW,kBAAkB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CAClB;AAMD,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;AACvD,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AACpD,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;AAC5D,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;AAC/D,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC;AAEnE,MAAM,WAAW,aAAa;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,4BAA4B,EAAE,UAAU,CAAC;CACzC"}

package/dist/packages/external/turbos/turbosApiHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"turbosApiHelpers.d.ts","sourceRoot":"","sources":["../../../../src/packages/external/turbos/turbosApiHelpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"turbosApiHelpers.d.ts","sourceRoot":"","sources":["../../../../src/packages/external/turbos/turbosApiHelpers.ts"],"names":[],"mappings":"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"}

package/dist/packages/external/turbos/turbosApiHelpers.js

@@ -195,7 +195,6 @@ class TurbosApiHelpers {
                 };
             }
             catch (e) {
-                console.error(e);
                 throw new Error("e");
             }
         });

package/dist/packages/faucet/api/faucetApi.d.ts

@@ -1,6 +1,6 @@
 import { AftermathApi } from "../../../general/providers/aftermathApi";
 import { EventId, SuiAddress } from "@mysten/sui.js";
-import { CoinType } from "../../coin/coinTypes";
+import { CoinDecimal, CoinType } from "../../coin/coinTypes";
 import { FaucetAddCoinEvent, FaucetMintCoinEvent } from "../faucetTypes";
 import { FaucetApiHelpers } from "./faucetApiHelpers";
 import { SerializedTransaction } from "../../../types";
@@ -10,7 +10,12 @@ export declare class FaucetApi {
     constructor(Provider: AftermathApi);
     fetchSupportedCoins: () => Promise<CoinType[]>;
     fetchIsPackageOnChain: () => Promise<boolean>;
-    fetchRequestCoinAmountTransaction: (coin: CoinType, walletAddress: SuiAddress) => Promise<SerializedTransaction>;
+    fetchRequestCoinAmountTransaction: (inputs: {
+        coinType: CoinType;
+        coinPrice: number;
+        coinDecimals: CoinDecimal;
+        walletAddress: SuiAddress;
+    }) => Promise<SerializedTransaction>;
     fetchMintCoinEvents: (cursor?: EventId, limit?: number) => Promise<import("../../../types").EventsWithCursor<FaucetMintCoinEvent>>;
     fetchAddCoinEvents: (cursor?: EventId, limit?: number) => Promise<import("../../../types").EventsWithCursor<FaucetAddCoinEvent>>;
 }

package/dist/packages/faucet/api/faucetApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"faucetApi.d.ts","sourceRoot":"","sources":["../../../../src/packages/faucet/api/faucetApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAEvE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAErD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAKhD,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,qBAAa,SAAS;IAWT,OAAO,CAAC,QAAQ,CAAC,QAAQ;IANrC,SAAgB,OAAO,mBAAC;gBAMK,QAAQ,EAAE,YAAY;IAS5C,mBAAmB,QAAa,QAAQ,QAAQ,EAAE,CAAC,CASxD;IAEK,qBAAqB,yBAK1B;IAMK,iCAAiC,SACjC,QAAQ,iBACC,UAAU,KACvB,QAAQ,qBAAqB,CAAC,CAmB/B;IAMK,mBAAmB,YAAmB,OAAO,UAAU,MAAM,6EAWjE;IAEI,kBAAkB,YAAmB,OAAO,UAAU,MAAM,4EAWhE;CACH"}
+{"version":3,"file":"faucetApi.d.ts","sourceRoot":"","sources":["../../../../src/packages/faucet/api/faucetApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAEvE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAoB,MAAM,gBAAgB,CAAC;AAEvE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAK7D,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAGvD,qBAAa,SAAS;IAWT,OAAO,CAAC,QAAQ,CAAC,QAAQ;IANrC,SAAgB,OAAO,mBAAC;gBAMK,QAAQ,EAAE,YAAY;IAS5C,mBAAmB,QAAa,QAAQ,QAAQ,EAAE,CAAC,CASxD;IAEK,qBAAqB,yBAK1B;IAMK,iCAAiC,WAAkB;QACzD,QAAQ,EAAE,QAAQ,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,YAAY,EAAE,WAAW,CAAC;QAC1B,aAAa,EAAE,UAAU,CAAC;KAC1B,KAAG,QAAQ,qBAAqB,CAAC,CAuBhC;IAMK,mBAAmB,YAAmB,OAAO,UAAU,MAAM,6EAWjE;IAEI,kBAAkB,YAAmB,OAAO,UAAU,MAAM,4EAWhE;CACH"}

package/dist/packages/faucet/api/faucetApi.js

@@ -11,8 +11,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FaucetApi = void 0;
 const faucet_1 = require("../faucet");
+const sui_js_1 = require("@mysten/sui.js");
 const faucetApiCasting_1 = require("./faucetApiCasting");
 const faucetApiHelpers_1 = require("./faucetApiHelpers");
+const coin_1 = require("../../coin");
 class FaucetApi {
     /////////////////////////////////////////////////////////////////////
     //// Constructor
@@ -38,12 +40,19 @@ class FaucetApi {
         /////////////////////////////////////////////////////////////////////
         //// Transactions
         /////////////////////////////////////////////////////////////////////
-        this.fetchRequestCoinAmountTransaction = (coin, walletAddress) => __awaiter(this, void 0, void 0, function* () {
-            const price = yield this.Provider.Prices().fetchPrice(coin);
-            const requestAmount = faucet_1.Faucet.constants.defaultRequestAmountUsd / price;
-            const requestAmountWithDecimals = yield this.Provider.Coin().Helpers.fetchCoinDecimalsNormalizeBalance(coin, requestAmount);
-            const transaction = this.Helpers.faucetRequestCoinAmountTransaction(coin, requestAmountWithDecimals, walletAddress);
-            return this.Provider.Transactions().fetchSetGasBudgetAndSerializeTransaction(transaction);
+        this.fetchRequestCoinAmountTransaction = (inputs) => __awaiter(this, void 0, void 0, function* () {
+            const { coinType, coinPrice, coinDecimals, walletAddress } = inputs;
+            const requestAmount = faucet_1.Faucet.constants.defaultRequestAmountUsd /
+                (coinPrice <= 0 ? 1 : coinPrice);
+            const requestAmountWithDecimals = coin_1.Coin.normalizeBalance(requestAmount, coinDecimals);
+            const tx = new sui_js_1.TransactionBlock();
+            tx.setSender(walletAddress);
+            this.Helpers.requestCoinAmountTx({
+                tx,
+                coinType,
+                amount: requestAmountWithDecimals,
+            });
+            return this.Provider.Transactions().fetchSetGasBudgetAndSerializeTransaction(tx);
         });
         /////////////////////////////////////////////////////////////////////
         //// Events

package/dist/packages/faucet/api/faucetApiHelpers.d.ts

@@ -1,22 +1,114 @@
 import { AftermathApi } from "../../../general/providers/aftermathApi";
-import { ObjectId, SuiAddress, TransactionBlock } from "@mysten/sui.js";
+import { ObjectId, TransactionBlock } from "@mysten/sui.js";
 import { CoinType } from "../../coin/coinTypes";
 import { AnyObjectType, Balance, FaucetAddresses } from "../../../types";
 export declare class FaucetApiHelpers {
     private readonly Provider;
     private static readonly constants;
     readonly addresses: FaucetAddresses;
-    readonly coinTypes: {
-        af: CoinType;
-    };
     readonly eventTypes: {
         mintCoin: AnyObjectType;
         addCoin: AnyObjectType;
     };
     constructor(Provider: AftermathApi);
-    faucetAddCoinTransaction: (treasuryCapId: ObjectId, treasuryCapType: CoinType) => TransactionBlock;
-    faucetRequestCoinAmountTransaction: (coinType: CoinType, amount: Balance, walletAddress: SuiAddress) => TransactionBlock;
-    faucetRequestCoinTransaction: (coinType: CoinType) => TransactionBlock;
+    addCoinTx: (inputs: {
+        tx: TransactionBlock;
+        treasuryCapId: ObjectId;
+        treasuryCapType: AnyObjectType;
+    }) => ({
+        kind: "Input";
+        index: number;
+        type?: "object" | "pure" | undefined;
+        value?: any;
+    } | {
+        kind: "GasCoin";
+    } | {
+        kind: "Result";
+        index: number;
+    } | {
+        kind: "NestedResult";
+        index: number;
+        resultIndex: number;
+    }) & ({
+        kind: "Input";
+        index: number;
+        type?: "object" | "pure" | undefined;
+        value?: any;
+    } | {
+        kind: "GasCoin";
+    } | {
+        kind: "Result";
+        index: number;
+    } | {
+        kind: "NestedResult";
+        index: number;
+        resultIndex: number;
+    })[];
+    requestCoinAmountTx: (inputs: {
+        tx: TransactionBlock;
+        coinType: CoinType;
+        amount: Balance;
+    }) => ({
+        kind: "Input";
+        index: number;
+        type?: "object" | "pure" | undefined;
+        value?: any;
+    } | {
+        kind: "GasCoin";
+    } | {
+        kind: "Result";
+        index: number;
+    } | {
+        kind: "NestedResult";
+        index: number;
+        resultIndex: number;
+    }) & ({
+        kind: "Input";
+        index: number;
+        type?: "object" | "pure" | undefined;
+        value?: any;
+    } | {
+        kind: "GasCoin";
+    } | {
+        kind: "Result";
+        index: number;
+    } | {
+        kind: "NestedResult";
+        index: number;
+        resultIndex: number;
+    })[];
+    requestCoinTx: (inputs: {
+        tx: TransactionBlock;
+        coinType: CoinType;
+    }) => ({
+        kind: "Input";
+        index: number;
+        type?: "object" | "pure" | undefined;
+        value?: any;
+    } | {
+        kind: "GasCoin";
+    } | {
+        kind: "Result";
+        index: number;
+    } | {
+        kind: "NestedResult";
+        index: number;
+        resultIndex: number;
+    }) & ({
+        kind: "Input";
+        index: number;
+        type?: "object" | "pure" | undefined;
+        value?: any;
+    } | {
+        kind: "GasCoin";
+    } | {
+        kind: "Result";
+        index: number;
+    } | {
+        kind: "NestedResult";
+        index: number;
+        resultIndex: number;
+    })[];
     protected mintCoinEventType: () => string;
     protected addCoinEventType: () => string;
 }

package/dist/packages/faucet/api/faucetApiHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"faucetApiHelpers.d.ts","sourceRoot":"","sources":["../../../../src/packages/faucet/api/faucetApiHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAEvE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGzE,qBAAa,gBAAgB;IA4ChB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAvCrC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAkB/B;IAMF,SAAgB,SAAS,EAAE,eAAe,CAAC;IAE3C,SAAgB,SAAS,EAAE;QAC1B,EAAE,EAAE,QAAQ,CAAC;KACb,CAAC;IAEF,SAAgB,UAAU,EAAE;QAC3B,QAAQ,EAAE,aAAa,CAAC;QACxB,OAAO,EAAE,aAAa,CAAC;KACvB,CAAC;gBAM2B,QAAQ,EAAE,YAAY;IAwB5C,wBAAwB,kBACf,QAAQ,mBACN,QAAQ,KACvB,gBAAgB,CAiBjB;IAEK,kCAAkC,aAC9B,QAAQ,UACV,OAAO,iBACA,UAAU,KACvB,gBAAgB,CAkBjB;IAEK,4BAA4B,aACxB,QAAQ,KAChB,gBAAgB,CAcjB;IAUF,SAAS,CAAC,iBAAiB,eAMzB;IAEF,SAAS,CAAC,gBAAgB,eAMxB;CACF"}
+{"version":3,"file":"faucetApiHelpers.d.ts","sourceRoot":"","sources":["../../../../src/packages/faucet/api/faucetApiHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAEvE,OAAO,EAAE,QAAQ,EAAc,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGzE,qBAAa,gBAAgB;IAwChB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAnCrC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAkB/B;IAMF,SAAgB,SAAS,EAAE,eAAe,CAAC;IAE3C,SAAgB,UAAU,EAAE;QAC3B,QAAQ,EAAE,aAAa,CAAC;QACxB,OAAO,EAAE,aAAa,CAAC;KACvB,CAAC;gBAM2B,QAAQ,EAAE,YAAY;IAoB5C,SAAS,WAAY;QAC3B,EAAE,EAAE,gBAAgB,CAAC;QACrB,aAAa,EAAE,QAAQ,CAAC;QACxB,eAAe,EAAE,aAAa,CAAC;KAC/B;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAeC;IAEK,mBAAmB,WAAY;QACrC,EAAE,EAAE,gBAAgB,CAAC;QACrB,QAAQ,EAAE,QAAQ,CAAC;QACnB,MAAM,EAAE,OAAO,CAAC;KAChB;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAeC;IAEK,aAAa,WAAY;QAC/B,EAAE,EAAE,gBAAgB,CAAC;QACrB,QAAQ,EAAE,QAAQ,CAAC;KACnB;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAYC;IAUF,SAAS,CAAC,iBAAiB,eAMzB;IAEF,SAAS,CAAC,gBAAgB,eAMxB;CACF"}

package/dist/packages/faucet/api/faucetApiHelpers.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FaucetApiHelpers = void 0;
 const eventsApiHelpers_1 = require("../../../general/api/eventsApiHelpers");
-const sui_js_1 = require("@mysten/sui.js");
 const utils_1 = require("../../../general/utils");
 class FaucetApiHelpers {
     /////////////////////////////////////////////////////////////////////
@@ -13,9 +12,9 @@ class FaucetApiHelpers {
         /////////////////////////////////////////////////////////////////////
         //// Transcations
         /////////////////////////////////////////////////////////////////////
-        this.faucetAddCoinTransaction = (treasuryCapId, treasuryCapType) => {
-            const tx = new sui_js_1.TransactionBlock();
-            tx.moveCall({
+        this.addCoinTx = (inputs) => {
+            const { tx, treasuryCapId, treasuryCapType } = inputs;
+            return tx.moveCall({
                 target: utils_1.Helpers.transactions.createTransactionTarget(this.addresses.packages.faucet, FaucetApiHelpers.constants.faucetModuleName, FaucetApiHelpers.constants.functions.add.name),
                 typeArguments: [treasuryCapType],
                 arguments: [
@@ -23,12 +22,10 @@ class FaucetApiHelpers {
                     tx.object(treasuryCapId),
                 ],
             });
-            return tx;
         };
-        this.faucetRequestCoinAmountTransaction = (coinType, amount, walletAddress) => {
-            const tx = new sui_js_1.TransactionBlock();
-            tx.setSender(walletAddress);
-            tx.moveCall({
+        this.requestCoinAmountTx = (inputs) => {
+            const { tx, coinType, amount } = inputs;
+            return tx.moveCall({
                 target: utils_1.Helpers.transactions.createTransactionTarget(this.addresses.packages.faucet, FaucetApiHelpers.constants.faucetModuleName, FaucetApiHelpers.constants.functions.requestAmount.name),
                 typeArguments: [coinType],
                 arguments: [
@@ -36,16 +33,14 @@ class FaucetApiHelpers {
                     tx.pure(amount.toString()),
                 ],
             });
-            return tx;
         };
-        this.faucetRequestCoinTransaction = (coinType) => {
-            const tx = new sui_js_1.TransactionBlock();
-            tx.moveCall({
+        this.requestCoinTx = (inputs) => {
+            const { tx, coinType } = inputs;
+            return tx.moveCall({
                 target: utils_1.Helpers.transactions.createTransactionTarget(this.addresses.packages.faucet, FaucetApiHelpers.constants.faucetModuleName, FaucetApiHelpers.constants.functions.request.name),
                 typeArguments: [coinType],
                 arguments: [tx.object(this.addresses.objects.faucet)],
             });
-            return tx;
         };
         /////////////////////////////////////////////////////////////////////
         //// Protected Methods
@@ -64,9 +59,6 @@ class FaucetApiHelpers {
             throw new Error("not all required addresses have been set in provider");
         this.Provider = Provider;
         this.addresses = addresses;
-        this.coinTypes = {
-            af: `${addresses.packages.faucet}::af::AF`,
-        };
         this.eventTypes = {
             mintCoin: this.mintCoinEventType(),
             addCoin: this.addCoinEventType(),

package/dist/packages/faucet/faucetTypes.d.ts

@@ -11,7 +11,7 @@ export interface FaucetAddCoinEvent extends Event {
     coinType: CoinType;
 }
 export interface ApiFaucetRequestBody {
-    coin: CoinType;
+    coinType: CoinType;
     walletAddress: SuiAddress;
 }
 //# sourceMappingURL=faucetTypes.d.ts.map

package/dist/packages/faucet/faucetTypes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"faucetTypes.d.ts","sourceRoot":"","sources":["../../../src/packages/faucet/faucetTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAM7C,MAAM,WAAW,mBAAoB,SAAQ,KAAK;IACjD,MAAM,EAAE,UAAU,CAAC;IACnB,UAAU,EAAE,QAAQ,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,kBAAmB,SAAQ,KAAK;IAChD,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;CACnB;AAMD,MAAM,WAAW,oBAAoB;IACpC,IAAI,EAAE,QAAQ,CAAC;IACf,aAAa,EAAE,UAAU,CAAC;CAC1B"}
+{"version":3,"file":"faucetTypes.d.ts","sourceRoot":"","sources":["../../../src/packages/faucet/faucetTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAM7C,MAAM,WAAW,mBAAoB,SAAQ,KAAK;IACjD,MAAM,EAAE,UAAU,CAAC;IACnB,UAAU,EAAE,QAAQ,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,kBAAmB,SAAQ,KAAK;IAChD,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;CACnB;AAMD,MAAM,WAAW,oBAAoB;IACpC,QAAQ,EAAE,QAAQ,CAAC;IACnB,aAAa,EAAE,UAAU,CAAC;CAC1B"}

package/dist/packages/pools/api/poolsApi.d.ts

@@ -1,8 +1,8 @@
 import { EventId, ObjectId, SuiAddress } from "@mysten/sui.js";
 import { AftermathApi } from "../../../general/providers/aftermathApi";
 import { PoolsApiHelpers } from "./poolsApiHelpers";
-import { CoinType, CoinsToBalance, CoinsToPrice } from "../../coin/coinTypes";
-import { Balance, PoolVolumeDataTimeframeKey, PoolDepositEvent, PoolStats, PoolTradeEvent, PoolWithdrawEvent, SerializedTransaction, Slippage, PoolCreationLpCoinMetadata, PoolName } from "../../../types";
+import { CoinType, CoinsToBalance, CoinsToDecimals, CoinsToPrice } from "../../coin/coinTypes";
+import { Balance, PoolDepositEvent, PoolStats, PoolTradeEvent, PoolWithdrawEvent, SerializedTransaction, Slippage, PoolCreationLpCoinMetadata, PoolName, PoolDataPoint, PoolObject, PoolTradeFee, PoolGraphDataTimeframeKey } from "../../../types";
 import { Pool } from "..";
 import { Aftermath } from "../../../general/providers";
 export declare class PoolsApi {
@@ -12,9 +12,9 @@ export declare class PoolsApi {
     fetchTradeEvents: (cursor?: EventId, limit?: number) => Promise<import("../../../types").EventsWithCursor<PoolTradeEvent>>;
     fetchDepositEvents: (cursor?: EventId, limit?: number) => Promise<import("../../../types").EventsWithCursor<PoolDepositEvent>>;
     fetchWithdrawEvents: (cursor?: EventId, limit?: number) => Promise<import("../../../types").EventsWithCursor<PoolWithdrawEvent>>;
-    fetchPool: (objectId: ObjectId) => Promise<import("../poolsTypes").PoolObject>;
-    fetchPools: (objectIds: ObjectId[]) => Promise<import("../poolsTypes").PoolObject[]>;
-    fetchAllPools: () => Promise<import("../poolsTypes").PoolObject[]>;
+    fetchPool: (objectId: ObjectId) => Promise<PoolObject>;
+    fetchPools: (objectIds: ObjectId[]) => Promise<PoolObject[]>;
+    fetchAllPools: () => Promise<PoolObject[]>;
     fetchDepositTransaction: (inputs: {
         walletAddress: SuiAddress;
         pool: Pool;
@@ -64,8 +64,21 @@ export declare class PoolsApi {
     }) => Promise<SerializedTransaction>;
     fetchPoolObjectIdForLpCoinType: (lpCoinType: CoinType) => Promise<ObjectId>;
     fetchSupportedCoins: () => Promise<string[]>;
-    fetchPoolStats: (pool: Pool, coinsToPrice: CoinsToPrice) => Promise<PoolStats>;
+    fetchPoolStats: (inputs: {
+        pool: Pool;
+        coinsToPrice: CoinsToPrice;
+        coinsToDecimals: CoinsToDecimals;
+    }) => Promise<PoolStats>;
     fetchLpCoinsToPrice: (provider: Aftermath, lpCoins: CoinType[]) => Promise<CoinsToPrice>;
-    fetchPoolVolumeData: (poolObjectId: ObjectId, timeframe: PoolVolumeDataTimeframeKey) => Promise<import("../poolsTypes").PoolDataPoint[]>;
+    fetchPoolVolumeData: (inputs: {
+        poolObjectId: ObjectId;
+        timeframe: PoolGraphDataTimeframeKey;
+        coinsToDecimals: CoinsToDecimals;
+        coinsToPrice: CoinsToPrice;
+    }) => Promise<PoolDataPoint[]>;
+    calcPoolFeeDataFromVolume: (inputs: {
+        volumeData: PoolDataPoint[];
+        poolTradeFee: PoolTradeFee;
+    }) => PoolDataPoint[];
 }
 //# sourceMappingURL=poolsApi.d.ts.map

package/dist/packages/pools/api/poolsApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"poolsApi.d.ts","sourceRoot":"","sources":["../../../../src/packages/pools/api/poolsApi.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"poolsApi.d.ts","sourceRoot":"","sources":["../../../../src/packages/pools/api/poolsApi.ts"],"names":[],"mappings":"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"}

package/dist/packages/pools/api/poolsApi.js

@@ -153,12 +153,10 @@ class PoolsApi {
         //// Stats
         /////////////////////////////////////////////////////////////////////
         // TODO: use promise.all to execute some of this fetching in parallel
-        this.fetchPoolStats = (pool, coinsToPrice) => __awaiter(this, void 0, void 0, function* () {
+        this.fetchPoolStats = (inputs) => __awaiter(this, void 0, void 0, function* () {
+            const { pool, coinsToPrice, coinsToDecimals } = inputs;
             const poolCoins = pool.pool.coins;
-            const poolCoinTypes = Object.keys(poolCoins);
-            // TODO: move this outside of func to be called externally via provider in api ?
-            const coinsToDecimals = yield this.Provider.Coin().Helpers.fetchCoinsToDecimals(poolCoinTypes);
-            // PRODUCTION: remove all notions of sdk from api functions !
+            // TODO: remove all notions of sdk from api functions !
             const tradeEventsWithinTime = yield this.Provider.Events().fetchEventsWithinTime((cursor, limit) => pool.getTradeEvents({
                 cursor,
                 limit,
@@ -229,16 +227,20 @@ class PoolsApi {
         /////////////////////////////////////////////////////////////////////
         //// Graph Data
         /////////////////////////////////////////////////////////////////////
-        this.fetchPoolVolumeData = (poolObjectId, timeframe) => __awaiter(this, void 0, void 0, function* () {
-            const timeframeValue = this.Helpers.poolVolumeDataTimeframes[timeframe];
-            const [pool, tradeEvents] = yield Promise.all([
-                this.fetchPool(poolObjectId),
-                (yield this.Provider.Events().fetchEventsWithinTime(
-                // TODO: fetch only pool's events
-                this.fetchTradeEvents, timeframeValue.timeUnit, timeframeValue.time, 512)).filter((trade) => trade.poolId === poolObjectId),
-            ]);
-            return yield this.Helpers.fetchCalcPoolVolumeData(pool, tradeEvents, timeframeValue.timeUnit, timeframeValue.time, timeframeValue.time);
-        });
+        this.fetchPoolVolumeData = (inputs) => __awaiter(this, void 0, void 0, function* () {
+            const timeframeValue = this.Helpers.poolVolumeDataTimeframes[inputs.timeframe];
+            const tradeEvents = (yield this.Provider.Events().fetchEventsWithinTime(
+            // TODO: fetch only pool's events
+            this.fetchTradeEvents, timeframeValue.timeUnit, timeframeValue.time, 512)).filter((trade) => trade.poolId === inputs.poolObjectId);
+            return this.Helpers.calcPoolVolumeData(Object.assign(Object.assign(Object.assign({}, inputs), timeframeValue), { tradeEvents, buckets: timeframeValue.time }));
+        });
+        this.calcPoolFeeDataFromVolume = (inputs) => {
+            const feeData = inputs.volumeData.map((data) => ({
+                time: data.time,
+                value: data.value * __1.Pools.tradeFeeWithDecimals(inputs.poolTradeFee),
+            }));
+            return feeData;
+        };
         this.Provider = Provider;
         this.Helpers = new poolsApiHelpers_1.PoolsApiHelpers(Provider);
     }

package/dist/packages/pools/api/poolsApiHelpers.d.ts

@@ -1,6 +1,6 @@
 import { ObjectId, TransactionBlock, SuiAddress, TransactionArgument } from "@mysten/sui.js";
 import { AftermathApi } from "../../../general/providers/aftermathApi";
-import { Balance, CoinDecimal, CoinType, PoolDataPoint, PoolVolumeDataTimeframe, PoolVolumeDataTimeframeKey, PoolObject, PoolTradeEvent, PoolsAddresses, AnyObjectType, PoolCoins, CoinsToPrice, Slippage, CoinsToBalance, ReferralVaultAddresses, PoolName, PoolCreationCoinInfo, PoolFlatness, PoolCreationLpCoinMetadata, PoolWeight, PoolTradeFee, PoolDepositFee, PoolWithdrawFee } from "../../../types";
+import { Balance, CoinDecimal, CoinType, PoolDataPoint, PoolGraphDataTimeframe, PoolGraphDataTimeframeKey, PoolTradeEvent, PoolsAddresses, AnyObjectType, PoolCoins, CoinsToPrice, Slippage, CoinsToBalance, ReferralVaultAddresses, PoolName, PoolCreationCoinInfo, PoolFlatness, PoolCreationLpCoinMetadata, PoolWeight, PoolTradeFee, PoolDepositFee, PoolWithdrawFee, CoinsToDecimals } from "../../../types";
 import { ManipulateType } from "dayjs";
 import { Pool } from "..";
 export declare class PoolsApiHelpers {
@@ -15,7 +15,7 @@ export declare class PoolsApiHelpers {
         deposit: AnyObjectType;
         withdraw: AnyObjectType;
     };
-    readonly poolVolumeDataTimeframes: Record<PoolVolumeDataTimeframeKey, PoolVolumeDataTimeframe>;
+    readonly poolVolumeDataTimeframes: Record<PoolGraphDataTimeframeKey, PoolGraphDataTimeframe>;
     constructor(Provider: AftermathApi);
     fetchAllPoolObjectIds: () => Promise<ObjectId[]>;
     poolObjectIdForLpCoinTypeDevInspectTransaction: (lpCoinType: CoinType) => TransactionBlock;
@@ -184,11 +184,21 @@ export declare class PoolsApiHelpers {
         fees24Hours: number;
         tvl: number;
     }) => number;
-    fetchCalcPoolVolumeData: (pool: PoolObject, tradeEvents: PoolTradeEvent[], timeUnit: ManipulateType, time: number, buckets: number) => Promise<PoolDataPoint[]>;
+    calcPoolVolumeData: (inputs: {
+        tradeEvents: PoolTradeEvent[];
+        timeUnit: ManipulateType;
+        time: number;
+        buckets: number;
+        coinsToDecimals: CoinsToDecimals;
+        coinsToPrice: CoinsToPrice;
+    }) => PoolDataPoint[];
     isLpCoin: (coin: CoinType) => boolean;
+    createLpCoinMetadataDescription: (inputs: {
+        poolName: PoolName;
+        coinTypes: CoinType[];
+    }) => Promise<string>;
     private tradeEventType;
     private depositEventType;
     private withdrawEventType;
-    private createLpCoinMetadataDescription;
 }
 //# sourceMappingURL=poolsApiHelpers.d.ts.map

package/dist/packages/pools/api/poolsApiHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"poolsApiHelpers.d.ts","sourceRoot":"","sources":["../../../../src/packages/pools/api/poolsApiHelpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"poolsApiHelpers.d.ts","sourceRoot":"","sources":["../../../../src/packages/pools/api/poolsApiHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,QAAQ,EACR,gBAAgB,EAChB,UAAU,EACV,mBAAmB,EAGnB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EACN,OAAO,EACP,WAAW,EACX,QAAQ,EACR,aAAa,EACb,sBAAsB,EACtB,yBAAyB,EAEzB,cAAc,EACd,cAAc,EACd,aAAa,EACb,SAAS,EACT,YAAY,EACZ,QAAQ,EACR,cAAc,EACd,sBAAsB,EAEtB,QAAQ,EACR,oBAAoB,EACpB,YAAY,EACZ,0BAA0B,EAC1B,UAAU,EACV,YAAY,EACZ,cAAc,EACd,eAAe,EACf,eAAe,EACf,MAAM,gBAAgB,CAAC;AAGxB,OAAc,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAI1B,qBAAa,eAAe;IA4Ef,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAvErC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CA6B/B;IAMF,SAAgB,SAAS,EAAE;QAC1B,KAAK,EAAE,cAAc,CAAC;QACtB,aAAa,EAAE,sBAAsB,CAAC;KACtC,CAAC;IACF,SAAgB,UAAU,EAAE;QAC3B,KAAK,EAAE,aAAa,CAAC;QACrB,OAAO,EAAE,aAAa,CAAC;QACvB,QAAQ,EAAE,aAAa,CAAC;KACxB,CAAC;IAEF,SAAgB,wBAAwB,EAAE,MAAM,CAC/C,yBAAyB,EACzB,sBAAsB,CACtB,CAiBC;gBAM2B,QAAQ,EAAE,YAAY;IA6B5C,qBAAqB,QAAa,QAAQ,QAAQ,EAAE,CAAC,CA0B1D;IAMK,8CAA8C,eACxC,QAAQ,KAClB,gBAAgB,CAcjB;IAMK,OAAO,WAAY;QACzB,EAAE,EAAE,gBAAgB,CAAC;QACrB,MAAM,EAAE,QAAQ,CAAC;QACjB,QAAQ,EAAE,QAAQ,GAAG,mBAAmB,CAAC;QACzC,UAAU,EAAE,QAAQ,CAAC;QACrB,iBAAiB,EAAE,OAAO,CAAC;QAC3B,WAAW,EAAE,QAAQ,CAAC;QACtB,UAAU,EAAE,QAAQ,CAAC;QACrB,QAAQ,EAAE,QAAQ,CAAC;QACnB,YAAY,CAAC,EAAE,OAAO,CAAC;KACvB,KAAG,mBAAmB,CAqCrB;IAEK,kBAAkB,WAAY;QACpC,EAAE,EAAE,gBAAgB,CAAC;QACrB,MAAM,EAAE,QAAQ,CAAC;QACjB,OAAO,EAAE,QAAQ,EAAE,GAAG,mBAAmB,EAAE,CAAC;QAC5C,SAAS,EAAE,QAAQ,EAAE,CAAC;QACtB,eAAe,EAAE,MAAM,CAAC;QACxB,UAAU,EAAE,QAAQ,CAAC;QACrB,QAAQ,EAAE,QAAQ,CAAC;QACnB,YAAY,CAAC,EAAE,OAAO,CAAC;KACvB,KAAG,mBAAmB,CAwCrB;IAEK,mBAAmB,WAAY;QACrC,EAAE,EAAE,gBAAgB,CAAC;QACrB,MAAM,EAAE,QAAQ,CAAC;QACjB,QAAQ,EAAE,QAAQ,GAAG,mBAAmB,CAAC;QACzC,UAAU,EAAE,QAAQ,CAAC;QACrB,kBAAkB,EAAE,OAAO,EAAE,CAAC;QAC9B,SAAS,EAAE,QAAQ,EAAE,CAAC;QACtB,QAAQ,EAAE,QAAQ,CAAC;QACnB,YAAY,CAAC,EAAE,OAAO,CAAC;KACvB,KAAG,mBAAmB,CAuCrB;IAEK,iBAAiB,WAAY;QACnC,EAAE,EAAE,gBAAgB,CAAC;QACrB,MAAM,EAAE,QAAQ,CAAC;QACjB,QAAQ,EAAE,QAAQ,GAAG,mBAAmB,CAAC;QACzC,UAAU,EAAE,QAAQ,CAAC;QACrB,SAAS,EAAE,QAAQ,EAAE,CAAC;QACtB,YAAY,CAAC,EAAE,OAAO,CAAC;KACvB,KAAG,mBAAmB,CA6BrB;IAEK,eAAe,WAAY;QAAE,EAAE,EAAE,gBAAgB,CAAA;KAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAexD;IAGK,iBAAiB,WAAkB;QACzC,EAAE,EAAE,gBAAgB,CAAC;QACrB,UAAU,EAAE,QAAQ,CAAC;QACrB,SAAS,EAAE;YACV,MAAM,EAAE,QAAQ,GAAG,mBAAmB,CAAC;YACvC,QAAQ,EAAE,QAAQ,CAAC;YACnB,MAAM,EAAE,UAAU,CAAC;YACnB,UAAU,EAAE,YAAY,CAAC;YACzB,WAAW,EAAE,YAAY,CAAC;YAC1B,UAAU,EAAE,cAAc,CAAC;YAC3B,WAAW,EAAE,eAAe,CAAC;SAC7B,EAAE,CAAC;QACJ,cAAc,EAAE,0BAA0B,CAAC;QAC3C,eAAe,EAAE,QAAQ,GAAG,mBAAmB,CAAC;QAChD,QAAQ,EAAE,QAAQ,CAAC;QACnB,YAAY,EAAE,YAAY,CAAC;KAC3B;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAmEC;IAMK,iBAAiB,WAAkB;QACzC,aAAa,EAAE,UAAU,CAAC;QAC1B,IAAI,EAAE,IAAI,CAAC;QACX,UAAU,EAAE,QAAQ,CAAC;QACrB,YAAY,EAAE,OAAO,CAAC;QACtB,WAAW,EAAE,QAAQ,CAAC;QACtB,QAAQ,EAAE,QAAQ,CAAC;QACnB,QAAQ,CAAC,EAAE,UAAU,CAAC;KACtB,KAAG,QAAQ,gBAAgB,CAAC,CAkD3B;IAEK,mBAAmB,WAAkB;QAC3C,aAAa,EAAE,UAAU,CAAC;QAC1B,IAAI,EAAE,IAAI,CAAC;QACX,SAAS,EAAE,cAAc,CAAC;QAC1B,QAAQ,EAAE,QAAQ,CAAC;QACnB,QAAQ,CAAC,EAAE,UAAU,CAAC;KACtB,KAAG,QAAQ,gBAAgB,CAAC,CA6C3B;IAEK,oBAAoB,WAAkB;QAC5C,aAAa,EAAE,UAAU,CAAC;QAC1B,IAAI,EAAE,IAAI,CAAC;QACX,mBAAmB,EAAE,cAAc,CAAC;QACpC,YAAY,EAAE,OAAO,CAAC;QACtB,QAAQ,EAAE,QAAQ,CAAC;QACnB,QAAQ,CAAC,EAAE,UAAU,CAAC;KACtB,KAAG,QAAQ,gBAAgB,CAAC,CAsD3B;IAEK,2BAA2B,WAAkB;QACnD,aAAa,EAAE,UAAU,CAAC;QAC1B,IAAI,EAAE,IAAI,CAAC;QACX,YAAY,EAAE,OAAO,CAAC;QACtB,QAAQ,CAAC,EAAE,UAAU,CAAC;KACtB,KAAG,QAAQ,gBAAgB,CAAC,CAkC3B;IAEK,oBAAoB,WAAY;QACtC,aAAa,EAAE,UAAU,CAAC;KAC1B,KAAG,gBAAgB,CAQlB;IAEK,sBAAsB,WAAkB;QAC9C,aAAa,EAAE,UAAU,CAAC;QAC1B,UAAU,EAAE,QAAQ,CAAC;QACrB,cAAc,EAAE,0BAA0B,CAAC;QAC3C,SAAS,EAAE,oBAAoB,EAAE,CAAC;QAClC,QAAQ,EAAE,QAAQ,CAAC;QACnB,YAAY,EAAE,YAAY,CAAC;QAC3B,eAAe,EAAE,QAAQ,CAAC;KAC1B,KAAG,QAAQ,gBAAgB,CAAC,CA4C3B;IAQK,mBAAmB,gBACZ,cAAc,EAAE,gBACf,YAAY,mBACT,OAAO,QAAQ,EAAE,WAAW,CAAC,YAmB7C;IAEK,gBAAgB,cACX,SAAS,UACZ,YAAY,mBACH,OAAO,QAAQ,EAAE,WAAW,CAAC,qBAe7C;IAEK,oBAAoB,cAAe,SAAS,YAAY,OAAO,cAMpE;IAEK,eAAe,aAAc,OAAO,OAAO,MAAM,YAOtD;IAEK,OAAO,WAAY;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,KAAG,MAAM,CAKrE;IAMK,kBAAkB,WAAY;QACpC,WAAW,EAAE,cAAc,EAAE,CAAC;QAC9B,QAAQ,EAAE,cAAc,CAAC;QACzB,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,eAAe,EAAE,eAAe,CAAC;QACjC,YAAY,EAAE,YAAY,CAAC;KAC3B,qBAuDC;IAOK,QAAQ,SAAU,QAAQ,aAM/B;IAMK,+BAA+B,WAAkB;QACvD,QAAQ,EAAE,QAAQ,CAAC;QACnB,SAAS,EAAE,QAAQ,EAAE,CAAC;KACtB,qBAgBC;IAUF,OAAO,CAAC,cAAc,CAKnB;IAEH,OAAO,CAAC,gBAAgB,CAKrB;IAEH,OAAO,CAAC,iBAAiB,CAKtB;CACH"}