@dodoex/widgets 3.0.1-solana.1 → 3.0.1-solana.10

package/dist/types/widgets/PoolWidget/PoolOperate/index.d.ts

@@ -1,17 +1,15 @@
 import { BoxProps } from '@dodoex/components';
 import { PoolOperateInnerProps } from './PoolOperateInner';
 export interface PoolOperateProps {
-    onClose?: () => void;
+    onClose: (() => void) | undefined;
     account: string | undefined;
-    pool?: PoolOperateInnerProps['pool'];
-    address?: string;
-    operate?: PoolOperateInnerProps['operate'];
-    chainId?: number;
-    hasMining?: boolean;
-    hidePoolInfo?: boolean;
+    pool: PoolOperateInnerProps['pool'];
+    operate: PoolOperateInnerProps['operate'];
+    hasMining: boolean;
+    hidePoolInfo: boolean;
     sx?: BoxProps['sx'];
 }
-export declare function PoolOperate({ onClose, pool: poolProps, address, operate, chainId, hasMining, hidePoolInfo, sx, }: PoolOperateProps): JSX.Element;
+export declare function PoolOperate({ onClose, pool, operate, hasMining, hidePoolInfo, sx, }: PoolOperateProps): JSX.Element;
 export default function PoolOperateDialog({ modal, ...props }: PoolOperateProps & {
     modal?: boolean;
 }): JSX.Element;

package/dist/types/widgets/PoolWidget/PoolOperate/types.d.ts

@@ -1,5 +1,6 @@
-import { PoolType } from '@dodoex/api';
+import { ExcludeNone, PoolType } from '@dodoex/api';
 import { TokenInfo } from '../../../hooks/Token';
+import { FetchMyLiquidityListLqList } from '../utils';
 export type OperatePool = {
     address: string;
     chainId: number;
@@ -14,4 +15,7 @@ export type OperatePool = {
     type: PoolType;
     owner?: string;
     creator: string;
+    lpFeeRate?: string;
+    mtFeeRate?: string;
+    liquidityPositions?: ExcludeNone<ExcludeNone<FetchMyLiquidityListLqList>[0]>['liquidityPositions'];
 } | undefined;

package/dist/types/widgets/PoolWidget/hooks/contract/useModifyDppPool.d.ts

@@ -9,7 +9,7 @@ export declare function useModifyDppPool({ pool, }: {
         quoteToken: TokenInfo;
     };
 }): {
-    modifyDPPMutation: import("@tanstack/react-query").UseMutationResult<import("../../../../hooks/Submission/types").ExecutionResult, Error, {
+    modifyDPPMutation: import("@tanstack/react-query").UseMutationResult<any, Error, {
         baseAmount: string;
         quoteAmount: string;
         isRemove?: boolean;

package/dist/types/widgets/PoolWidget/hooks/useAMMV2AddLiquidity.d.ts

@@ -0,0 +1,14 @@
+import { ApiV3PoolInfoStandardItemCpmm, CpmmKeys } from '@raydium-io/raydium-sdk-v2';
+import { TokenInfo } from '../../../hooks/Token';
+export declare function useAMMV2AddLiquidity({ baseToken, quoteToken, pairMintAAmount, pairMintBAmount, slippage, isExists, poolInfo, poolKeys, successBack, submittedBack, }: {
+    baseToken: TokenInfo | undefined;
+    quoteToken: TokenInfo | undefined;
+    pairMintAAmount: string | undefined;
+    pairMintBAmount: string | undefined;
+    slippage: number;
+    isExists?: boolean;
+    poolInfo?: ApiV3PoolInfoStandardItemCpmm;
+    poolKeys?: CpmmKeys;
+    successBack?: () => void;
+    submittedBack?: () => void;
+}): import("@tanstack/react-query").UseMutationResult<import("../../../hooks/Submission/types").ExecutionResult, Error, void, unknown>;

package/dist/types/widgets/PoolWidget/hooks/useAMMV2Balance.d.ts

@@ -0,0 +1,13 @@
+import { Pair } from '@uniswap/v2-sdk';
+import BigNumber from 'bignumber.js';
+export declare function useAMMV2Balance({ pairAddress, pair, }: {
+    pairAddress?: string;
+    pair?: Pair | null;
+}): {
+    isBalanceLoading: boolean;
+    isDepositedLoading: boolean;
+    balance: BigNumber | undefined;
+    poolTokenPercentage: BigNumber | undefined;
+    token0Deposited: BigNumber | undefined;
+    token1Deposited: BigNumber | undefined;
+};

package/dist/types/widgets/PoolWidget/hooks/useAMMV2RemoveLiquidity.d.ts

@@ -0,0 +1,9 @@
+import { ApiV3PoolInfoStandardItemCpmm, CpmmKeys } from '@raydium-io/raydium-sdk-v2';
+import BigNumber from 'bignumber.js';
+export declare function useAMMV2RemoveLiquidity({ liquidityAmount, slippage, poolInfo, poolKeys, submittedBack, }: {
+    liquidityAmount: BigNumber | undefined;
+    slippage: number;
+    poolInfo?: ApiV3PoolInfoStandardItemCpmm;
+    poolKeys?: CpmmKeys;
+    submittedBack?: () => void;
+}): import("@tanstack/react-query").UseMutationResult<import("../../../hooks/Submission/types").ExecutionResult, Error, void, unknown>;

package/dist/types/widgets/PoolWidget/hooks/usePoolBalanceInfo.d.ts

@@ -14,28 +14,28 @@ export declare function usePoolBalanceInfo({ account, pool, }: {
     };
 }): {
     /** existing base lp balance */
-    totalBaseLpBalance: import("bignumber.js").BigNumber | null | undefined;
+    totalBaseLpBalance: unknown;
     /** existing quote lp balance */
-    totalQuoteLpBalance: import("bignumber.js").BigNumber | null | undefined;
+    totalQuoteLpBalance: unknown;
     /** the total deposited base lp balance */
-    baseReserve: import("bignumber.js").BigNumber | undefined;
+    baseReserve: any;
     /** the total deposited quote lp balance */
-    quoteReserve: import("bignumber.js").BigNumber | undefined;
+    quoteReserve: any;
     /** classical base equilibrium target */
-    classicalBaseTarget: import("bignumber.js").BigNumber | undefined;
+    classicalBaseTarget: any;
     /** classical quote equilibrium target */
-    classicalQuoteTarget: import("bignumber.js").BigNumber | undefined;
+    classicalQuoteTarget: any;
     /** the user's existing base lp balance */
-    userBaseLpBalance: import("bignumber.js").BigNumber | Balance;
+    userBaseLpBalance: any;
     /** the user's existing quote lp balance */
-    userQuoteLpBalance: import("bignumber.js").BigNumber | Balance;
+    userQuoteLpBalance: any;
     /** The number of base that can be obtained when a user withdraws from the pool */
-    userBaseLpToTokenBalance: BigNumber | import("bignumber.js").BigNumber | undefined;
+    userBaseLpToTokenBalance: any;
     /** The number of quote that can be obtained when a user withdraws from the pool */
     userQuoteLpToTokenBalance: BigNumber | null | undefined;
     baseLpToTokenProportion: BigNumber | undefined;
     quoteLpToTokenProportion: BigNumber | undefined;
-    isSinglePool: boolean;
+    isSinglePool: any;
     userLpBalanceLoading: boolean;
     userLpToTokenBalanceLoading: boolean;
     userLpBalanceError: boolean;

package/dist/types/widgets/PoolWidget/hooks/useUniV2CreatePairs.d.ts

@@ -0,0 +1,29 @@
+import { TokenInfo } from '../../../hooks/Token';
+import BigNumber from 'bignumber.js';
+interface UniV2CreatePairsResult {
+    poolKeys: any;
+    poolInfo: any;
+    pairAddress: string | undefined;
+    isInvalidPair: boolean;
+    price: BigNumber | undefined;
+    invertedPrice: BigNumber | undefined;
+    poolInfoLoading: boolean;
+    lpBalanceLoading: boolean;
+    lpBalance: BigNumber | undefined;
+    lpBalancePercentage: BigNumber | undefined;
+    lpToAmountA: BigNumber | undefined;
+    lpToAmountB: BigNumber | undefined;
+    liquidityMinted: BigNumber | undefined;
+    pairMintAAmount: string | undefined;
+    pairMintBAmount: string | undefined;
+    isExists: boolean;
+}
+export declare function useUniV2CreatePairs({ baseToken, quoteToken, baseAmount, quoteAmount, feeIndex, slippage, }: {
+    baseToken: TokenInfo | undefined;
+    quoteToken: TokenInfo | undefined;
+    baseAmount: string;
+    quoteAmount: string;
+    feeIndex: number;
+    slippage: number;
+}): UniV2CreatePairsResult;
+export {};

package/dist/types/widgets/PoolWidget/utils.d.ts

@@ -1,12 +1,12 @@
-import { PoolApi, ExcludeNone } from '@dodoex/api';
-import { ChainId } from '@dodoex/api';
+import { AMMV3Api, ChainId, ExcludeNone, PoolApi, PoolType } from '@dodoex/api';
 import { TokenInfo } from '../../hooks/Token';
 import { OperatePool } from './PoolOperate/types';
 export declare const poolApi: PoolApi;
-export type FetchLiquidityListLqList = ExcludeNone<ReturnType<Exclude<typeof PoolApi.graphql.fetchLiquidityList['__apiType'], undefined>>['liquidity_list']>['lqList'];
-export type FetchMyLiquidityListLqList = ExcludeNone<ReturnType<Exclude<typeof PoolApi.graphql.fetchMyLiquidityList['__apiType'], undefined>>['liquidity_list']>['lqList'];
-export type FetchMyCreateListLqList = ExcludeNone<ReturnType<Exclude<typeof PoolApi.graphql.fetchDashboardPairList['__apiType'], undefined>>['dashboard_pairs_list']>['list'];
-export type FetchPoolList = ExcludeNone<ReturnType<Exclude<typeof PoolApi.graphql.fetchPoolList['__apiType'], undefined>>['pairs']>;
+export declare const ammV3Api: AMMV3Api;
+export type FetchLiquidityListLqList = ExcludeNone<ReturnType<Exclude<(typeof PoolApi.graphql.fetchLiquidityList)['__apiType'], undefined>>['liquidity_list']>['lqList'];
+export type FetchMyLiquidityListLqList = ExcludeNone<ReturnType<Exclude<(typeof PoolApi.graphql.fetchMyLiquidityList)['__apiType'], undefined>>['liquidity_list']>['lqList'];
+export type FetchMyCreateListLqList = ExcludeNone<ReturnType<Exclude<(typeof PoolApi.graphql.fetchDashboardPairList)['__apiType'], undefined>>['dashboard_pairs_list']>['list'];
+export type FetchPoolList = ExcludeNone<ReturnType<Exclude<(typeof PoolApi.graphql.fetchPoolList)['__apiType'], undefined>>['pairs']>;
 export declare function convertLiquidityTokenToTokenInfo(token: {
     id: string;
     symbol: string;
@@ -15,4 +15,11 @@ export declare function convertLiquidityTokenToTokenInfo(token: {
     logoImg?: string | null;
 } | undefined, chainId: ChainId | number): TokenInfo | undefined;
 export declare function convertFetchLiquidityToOperateData(lqData: ExcludeNone<FetchLiquidityListLqList>[0]): OperatePool;
+export declare function convertFetchMyLiquidityToOperateData(lqData: ExcludeNone<FetchMyLiquidityListLqList>[0]): OperatePool;
 export declare function convertFetchPoolToOperateData(pool: FetchPoolList[0], chainId: number): OperatePool;
+export declare function getPoolAMMOrPMM(type: PoolType): "AMM V2" | "AMM V3" | "PMM";
+export declare function getPoolFeeRate({ type, lpFeeRate, mtFeeRate, }: {
+    type: PoolType;
+    lpFeeRate: string | number;
+    mtFeeRate: string | number;
+}): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dodoex/widgets",
-  "version": "3.0.1-solana.1",
+  "version": "3.0.1-solana.10",
   "description": "DODO Widgets",
   "source": "src/index.tsx",
   "types": "dist/types/index.d.ts",
@@ -23,7 +23,7 @@
     "release": "semantic-release",
     "release:local": "np --any-branch --no-cleanup --no-tests",
     "release.npm-publish": "npm publish --access public",
-    "release.npm-publish-beta": "npm publish --tag beta",
+    "release.npm-publish-beta": "yarn run build && npm publish --tag beta",
     "test": "jest src",
     "test:e2e": "jest e2e"
   },
@@ -58,8 +58,11 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.17.0",
-    "@dodoex/api": "3.0.0",
-    "@dodoex/components": "3.0.0",
+    "@coral-xyz/anchor": "^0.30.1",
+    "@dodoex/api": "3.0.2-solana.1",
+    "@dodoex/components": "3.0.2-solana.1",
+    "@dodoex/contract-request": "^1.3.0",
+    "@dodoex/dodo-contract-request": "^1.8.0",
     "@dodoex/icons": "^2.0.2",
     "@emotion/react": "^11.10.0",
     "@emotion/styled": "^11.10.0",
@@ -68,16 +71,20 @@
     "@lingui/core": "^4.3.0",
     "@lingui/macro": "^4.3.0",
     "@lingui/react": "^4.3.0",
+    "@raydium-io/raydium-sdk-v2": "^0.1.117-alpha",
     "@reduxjs/toolkit": "^1.6.1",
     "@semantic-release/changelog": "^6.0.1",
     "@semantic-release/git": "^10.0.1",
-    "@solana/react": "^2.0.0",
+    "@solana/react": "^2.1.0",
+    "@solana/spl-token": "^0.4.13",
     "@solana/wallet-adapter-base": "^0.9.23",
     "@solana/wallet-adapter-react": "^0.15.35",
     "@solana/wallet-adapter-react-ui": "^0.9.35",
     "@solana/wallet-adapter-wallets": "^0.19.32",
-    "@solana/web3.js": "^1.95.5",
+    "@solana/web3.js": "^1.98.0",
     "@tanstack/react-query": "^5.18.1",
+    "@uniswap/sdk-core": "^5.9.0",
+    "@uniswap/v2-sdk": "^4.6.2",
     "@web3-react/core": "8.2.0",
     "@web3-react/eip1193": "8.2.0",
     "@web3-react/metamask": "8.2.1",
@@ -85,8 +92,13 @@
     "@web3-react/walletconnect-v2": "8.3.6",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
+    "bn.js": "^5.2.1",
+    "d3": "7.6.1",
     "dayjs": "^1.11.11",
+    "decimal.js": "^10.4.1",
+    "decimal.js-light": "^2.5.1",
     "identicon.js": "^2.3.3",
+    "jsbi": "^3.1.4",
     "konva": "^9.3.6",
     "lodash": "^4.17.21",
     "make-plural": "^7.0.0",
@@ -100,6 +112,7 @@
     "recharts": "^2.12.7",
     "rmc-date-picker": "^6.0.10",
     "semantic-release": "^19.0.2",
+    "tiny-invariant": "^1.1.0",
     "zustand": "^4.5.5"
   },
   "peerDependencies": {
@@ -129,13 +142,13 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.4.0",
     "@testing-library/react-hooks": "^8.0.1",
+    "@types/d3": "7.4.3",
     "@types/identicon.js": "^2.3.1",
     "@types/jest": "^29.0.3",
     "@types/lodash": "^4.14.184",
     "@types/react-infinite-scroller": "^1.2.5",
     "@types/react-transition-group": "^4.4.11",
     "@types/react-window": "^1.8.5",
-    "@uniswap/sdk-core": "^3.0.2",
     "babel-plugin-macros": "^3.1.0",
     "babel-runtime": "^6.26.0",
     "dotenv": "^16.0.2",