Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add mesa, sequencer tier and TierSwitcher #994

Merged
merged 2 commits into from
Jul 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Features

- [#994](https://github.com/alleslabs/celatone-frontend/pull/994) Add Sequencer, Mesa tier and TierSwitcher component

### Improvements

### Bug fixes
Expand Down
49 changes: 49 additions & 0 deletions src/config/chain/initia.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable sonarjs/no-duplicate-string */
import { wallets as initiaWallets } from "@cosmos-kit/initia";
import { wallets as keplrWallets } from "@cosmos-kit/keplr";

Expand Down Expand Up @@ -55,6 +56,54 @@ export const INITIA_CHAIN_CONFIGS: ChainConfigs = {
isValidatorExternalLink: null,
},
},
"tomcat-1-sequencer": {
tier: "sequencer",
chain: "initia",
registryChainName: "blackwingtestnet",
prettyName: "Blackwing Testnet Sequencer",
lcd: "https://maze-rest-18bdff44-3aa4-425e-9bc0-06a2afa40af8.ase1-prod.newmetric.xyz",
rpc: "https://maze-rpc-18bdff44-3aa4-425e-9bc0-06a2afa40af8.ase1-prod.newmetric.xyz",
indexer: "https://tomcat-1-graphql.alleslabs.dev/v1/graphql",
wallets: [...initiaWallets, ...keplrWallets],
features: {
faucet: {
enabled: false,
},
wasm: {
enabled: false,
},
move: {
enabled: true,
moduleMaxFileSize: 1_048_576,
decodeApi: INITIA_DECODER,
verify: "",
},
pool: {
enabled: false,
},
publicProject: {
enabled: true,
},
gov: {
enabled: false,
},
nft: {
enabled: true,
},
},
gas: {
gasPrice: {
tokenPerGas: 0.151,
denom:
"l2/aee375e9d0b181f0d9d3a49f9a3d1d6b05d62b0ac81f8c92b9282afa4213d884",
},
gasAdjustment: 1.5,
maxGasLimit: 25_000_000,
},
extra: {
isValidatorExternalLink: null,
},
},
"initiation-1": {
tier: "full",
chain: "initia",
Expand Down
2 changes: 1 addition & 1 deletion src/config/chain/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ type GovConfig =
type NftConfig = { enabled: boolean };

export interface ChainConfig {
tier: "lite" | "full";
tier: "lite" | "mesa" | "sequencer" | "full";
chain: string;
registryChainName: string;
prettyName: string;
Expand Down
13 changes: 10 additions & 3 deletions src/lib/app-provider/hooks/useConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ import { useInternalNavigate } from "./useInternalNavigate";

const TierMap: Record<ChainConfig["tier"], number> = {
lite: 0,
// new metric 1
full: 2,
mesa: 1,
sequencer: 2,
full: 3,
};

export const useTierConfig = (
Expand All @@ -26,7 +27,13 @@ export const useTierConfig = (
if (TierMap[tier] < TierMap[minTier])
navigate({ pathname: "/", replace: true });

return tier;
return {
tier,
isFullTier: tier === "full",
isLiteTier: tier === "lite",
isMesaTier: tier === "mesa",
isSequencerTier: tier === "sequencer",
};
};

type Features = ChainConfig["features"];
Expand Down
29 changes: 29 additions & 0 deletions src/lib/components/TierSwitcher.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import { useTierConfig } from "lib/app-provider";

interface TierSwitcherProps {
full: React.ReactNode;
sequencer?: React.ReactNode;
mesa?: React.ReactNode;
lite: React.ReactNode;
}

export const TierSwitcher = ({
full,
lite,
mesa,
sequencer,
}: TierSwitcherProps) => {
const { tier } = useTierConfig();

switch (tier) {
case "full":
return full;
case "sequencer":
return sequencer ?? lite;
case "mesa":
return mesa ?? lite;
case "lite":
default:
return lite;
}
};
2 changes: 1 addition & 1 deletion src/lib/components/modal/account/SaveNewAccount.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export function SaveNewAccountModal({
publicDescription,
}: SaveNewAccountModalProps) {
const { constants } = useCelatoneApp();
const isFullTier = useTierConfig() === "full";
const { isFullTier } = useTierConfig();
const { user: exampleUserAddress } = useExampleAddresses();
const { isSomeValidAddress } = useValidateAddress();
const formatAddresses = useFormatAddresses();
Expand Down
2 changes: 1 addition & 1 deletion src/lib/components/select-code/CodeSelectSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export const CodeSelectSection = <T extends FieldValues>({
setCodeHash,
status,
}: CodeSelectSectionProps<T>) => {
const isFullTier = useTierConfig() === "full";
const { isFullTier } = useTierConfig();
const [method, setMethod] = useState<"select-existing" | "fill-manually">(
isFullTier ? "select-existing" : "fill-manually"
);
Expand Down
2 changes: 1 addition & 1 deletion src/lib/components/select-contract/ContractListDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export const ContractListDetail = ({
onContractSelect,
isReadOnly = false,
}: ContractListDetailProps) => {
const isFullTier = useTierConfig() === "full";
const { isFullTier } = useTierConfig();
const dataFull = useAdminByContractAddresses(
isReadOnly || !isFullTier
? []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export const ContractsTableRowCTA = ({
showLastUpdate = true,
}: ContractsTableRowCTAProps) => {
const { address } = useCurrentChain();
const isFullTier = useTierConfig() === "full";
const { isFullTier } = useTierConfig();
const navigate = useInternalNavigate();

const isAdmin = !!address && address === contractInfo.admin;
Expand Down
2 changes: 1 addition & 1 deletion src/lib/components/table/proposals/ProposalsTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const ProposalsTable = ({
isLoading,
emptyState,
}: ProposalsTableProps) => {
const isFullTier = useTierConfig() === "full";
const { isFullTier } = useTierConfig();
const isMobile = useMobile();

if (isLoading) return <Loading />;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const ProposalsTableHeader = ({
templateColumns,
boxShadow,
}: ProposalsTableHeaderProps) => {
const isFullTier = useTierConfig() === "full";
const { isFullTier } = useTierConfig();

// TODO - Revisit split columnsWidth
const columnsWidth = templateColumns?.toString().split(" ");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export interface ProposalsTableMobileCardProps {
export const ProposalsTableMobileCard = ({
proposal,
}: ProposalsTableMobileCardProps) => {
const isFullTier = useTierConfig() === "full";
const { isFullTier } = useTierConfig();
const navigate = useInternalNavigate();

const onCardSelect = (proposalId: number) =>
Expand Down
2 changes: 1 addition & 1 deletion src/lib/components/table/proposals/ProposalsTableRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const ProposalsTableRow = ({
templateColumns,
boxShadow,
}: ProposalsTableRowProps) => {
const isFullTier = useTierConfig() === "full";
const { isFullTier } = useTierConfig();
const navigate = useInternalNavigate();

const onRowSelect = (proposalId: number) =>
Expand Down
2 changes: 1 addition & 1 deletion src/lib/hooks/useOpenTab.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const useOpenTxTab = (type: "lcd" | "tx-page") => {
};

export const useOpenAssetTab = () => {
const isFullTier = useTierConfig() === "full";
const { isFullTier } = useTierConfig();
const apiEndpoint = useBaseApiRoute("accounts");
const lcdEndpoint = useLcdEndpoint();

Expand Down
2 changes: 1 addition & 1 deletion src/lib/hooks/useSingleMessageProps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@ export const useSingleActionMsgProps = (
messages: Message[],
singleMsg: Option<boolean>
): SingleMsgProps => {
const isFullTier = useTierConfig() === "full";
const { isFullTier } = useTierConfig();
const { getContractLocalInfo } = useContractStore();
const { data: assetInfos } = useAssetInfos({ withPrices: false });
const { data: movePoolInfos } = useMovePoolInfos({ withPrices: false });
Expand Down
2 changes: 1 addition & 1 deletion src/lib/layout/InformationFooter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const FOOTER_BUTTONS = [
];

export const InformationFooter = () => {
const isFullTier = useTierConfig() === "full";
const { isFullTier } = useTierConfig();
const { data: overviewsStats, isLoading: isLoadingFull } =
useOverviewsStats(isFullTier);
const { data: latestHeight, isLoading: isLoadingLite } = useLatestBlockLcd();
Expand Down
2 changes: 1 addition & 1 deletion src/lib/layout/Searchbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ const getPlaceholder = ({

// eslint-disable-next-line sonarjs/cognitive-complexity
const Searchbar = () => {
const isFullTier = useTierConfig() === "full";
const { isFullTier } = useTierConfig();
const isMobile = useMobile();
const navigate = useInternalNavigate();
const {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/layout/mobile/NavDrawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import { usePublicProjectStore } from "lib/providers/store";
import { getNavDrawerFull, getNavDrawerLite } from "./utils";

export const NavDrawer = () => {
const isFullTier = useTierConfig() === "full";
const { isFullTier } = useTierConfig();
const govConfig = useGovConfig({ shouldRedirect: false });
const wasmConfig = useWasmConfig({ shouldRedirect: false });
const moveConfig = useMoveConfig({ shouldRedirect: false });
Expand Down
2 changes: 1 addition & 1 deletion src/lib/layout/navbar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const Navbar = observer(({ isExpand, setIsExpand }: NavbarProps) => {
const isCurrentPage = useIsCurrentPage();
const wasm = useWasmConfig({ shouldRedirect: false });
const move = useMoveConfig({ shouldRedirect: false });
const isFullTier = useTierConfig() === "full";
const { isFullTier } = useTierConfig();
const { address } = useCurrentChain();

const navMenu: MenuInfo[] = isFullTier
Expand Down
2 changes: 1 addition & 1 deletion src/lib/layout/subheader/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { getSubHeaderFull, getSubHeaderLite } from "./utils";
const ACTIVE_COLOR = "primary.light";

const SubHeader = () => {
const isFullTier = useTierConfig() === "full";
const { isFullTier } = useTierConfig();
const govConfig = useGovConfig({ shouldRedirect: false });
const wasmConfig = useWasmConfig({ shouldRedirect: false });
const moveConfig = useMoveConfig({ shouldRedirect: false });
Expand Down
4 changes: 2 additions & 2 deletions src/lib/model/contract.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ interface InstantiatedByMeState {

export const useInstantiatedByMe = (enable: boolean): InstantiatedByMeState => {
const { address } = useCurrentChain();
const isFullTier = useTierConfig() === "full";
const { isFullTier } = useTierConfig();

const resApi = useInstantiatedListByAddress(address, enable && isFullTier);
const resLcd = useInstantiatedContractsByAddressLcd(
Expand Down Expand Up @@ -46,7 +46,7 @@ export const useInstantiatedByMe = (enable: boolean): InstantiatedByMeState => {

export const useInstantiatedMockInfoByMe = (): ContractListInfo => {
const { address } = useCurrentChain();
const isFullTier = useTierConfig() === "full";
const { isFullTier } = useTierConfig();
const resApi = useInstantiatedCountByAddress(address);
const resLcd = useInstantiatedContractsByAddressLcd(address, !isFullTier);
const count = isFullTier ? resApi.data : resLcd.data?.length ?? 0;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
import { observer } from "mobx-react-lite";

import { useTierConfig } from "lib/app-provider";
import { TierSwitcher } from "lib/components/TierSwitcher";

import { InstantiatedContractsTableFull } from "./Full";
import { InstantiatedContractsTableLite } from "./Lite";
import type { InstantiatedContractsTableProps } from "./types";

export const InstantiatedContractsTable = observer(
(props: InstantiatedContractsTableProps) => {
const isFullTier = useTierConfig() === "full";

return isFullTier ? (
<InstantiatedContractsTableFull {...props} />
) : (
<InstantiatedContractsTableLite {...props} />
);
}
(props: InstantiatedContractsTableProps) => (
<TierSwitcher
full={<InstantiatedContractsTableFull {...props} />}
lite={<InstantiatedContractsTableLite {...props} />}
/>
)
);
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const TxsTableLite = ({
onViewMore,
}: TxsTableProps) => {
const isMobile = useMobile();
const isFullTier = useTierConfig() === "full";
const { isFullTier } = useTierConfig();

const {
pagesQuantity,
Expand Down
13 changes: 7 additions & 6 deletions src/lib/pages/account-details/components/tables/txs/index.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { useTierConfig } from "lib/app-provider";
import { TierSwitcher } from "lib/components/TierSwitcher";

import { TxsTableFull } from "./Full";
import { TxsTableLite } from "./Lite";
import type { TxsTableProps } from "./types";

export const TxsTable = (props: TxsTableProps) => {
const isFullTier = useTierConfig() === "full";

return isFullTier ? <TxsTableFull {...props} /> : <TxsTableLite {...props} />;
};
export const TxsTable = (props: TxsTableProps) => (
<TierSwitcher
full={<TxsTableFull {...props} />}
lite={<TxsTableLite {...props} />}
/>
);
2 changes: 1 addition & 1 deletion src/lib/pages/account-details/data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ interface AccountDetailsTableCounts {
export const useAccountDetailsTableCounts = (
address: BechAddr
): AccountDetailsTableCounts => {
const isFullTier = useTierConfig() === "full";
const { isFullTier } = useTierConfig();
const {
data,
refetch,
Expand Down
2 changes: 1 addition & 1 deletion src/lib/pages/account-details/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ const AccountDetailsBody = ({
const navigate = useInternalNavigate();
const { address: accountAddress, hex: hexAddress } =
formatAddresses(accountAddressParam);
const isFullTier = useTierConfig() === "full";
const { isFullTier } = useTierConfig();

// ------------------------------------------//
// ------------------QUERIES-----------------//
Expand Down
Loading
Loading