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: update naming convention from lcd to rest #1251

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Improvements

- [#1251](https://github.com/alleslabs/celatone-frontend/pull/1251) Update naming convention from LCD to REST
- [#1249](https://github.com/alleslabs/celatone-frontend/pull/1249) Improve import order
- [#1248](https://github.com/alleslabs/celatone-frontend/pull/1248) Support querying multiple evm verification infos
- [#1246](https://github.com/alleslabs/celatone-frontend/pull/1246) Handle undefined constructor args
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ The website will then be live on [http://localhost:3000](http://localhost:3000)
chain: "localinitia",
registryChainName: "localinitia",
prettyName: "Local Initia",
lcd: "http://localhost:1317",
rest: "http://localhost:1317",
rpc: "http://localhost:26657",
wallets: ["initia"], // keplr, initia, compass, station
features: {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
},
"dependencies": {
"@alleslabs/legacy-bcs": "0.0.3",
"@alleslabs/shared": "1.0.0-dev6",
"@alleslabs/shared": "1.0.0-dev7",
"@amplitude/analytics-browser": "^2.3.3",
"@amplitude/analytics-types": "^2.3.0",
"@amplitude/plugin-user-agent-enrichment-browser": "^1.0.0",
Expand Down
10 changes: 5 additions & 5 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/config/chain/devChainConfigs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export const devChainConfigs: ChainConfig[] = [
chain: "localinitia",
registryChainName: "localinitia",
prettyName: "Local Initia",
lcd: "http://localhost:1317",
rest: "http://localhost:1317",
rpc: "http://localhost:26657",
wallets: ["initia"],
features: {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/app-provider/contexts/default.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export const DEFAULT_CHAIN_CONFIG: ChainConfig = {
chain: "",
registryChainName: "",
prettyName: "",
lcd: "",
rest: "",
rpc: "",
wallets: [],
features: {
Expand Down
62 changes: 31 additions & 31 deletions src/lib/app-provider/env.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,56 +14,56 @@ export enum CELATONE_QUERY_KEYS {
// ACCOUNT
ACCOUNT_DATA = "CELATONE_QUERY_ACCOUNT_DATA",
ACCOUNT_TYPE = "CELATONE_QUERY_ACCOUNT_TYPE",
ACCOUNT_BECH_32_LCD = "CELATONE_QUERY_ACCOUNT_BECH_32_LCD",
ACCOUNT_BECH_32_REST = "CELATONE_QUERY_ACCOUNT_BECH_32_REST",
// ASSET
ASSET_INFOS = "CELATONE_QUERY_ASSET_INFOS",
// BLOCK
BLOCKS = "CELATONE_QUERY_BLOCKS",
BLOCK_DATA = "CELATONE_QUERY_BLOCK_DATA",
BLOCK_DATA_LCD = "CELATONE_QUERY_BLOCK_DATA_LCD",
BLOCK_DATA_REST = "CELATONE_QUERY_BLOCK_DATA_REST",
BLOCK_DATA_SEQUENCER = "CELATONE_QUERY_BLOCK_DATA_SEQUENCER",
BLOCK_DATA_JSON_RPC = "CELATONE_QUERY_BLOCK_DATA_JSON_RPC",
BLOCK_LATEST_HEIGHT_LCD = "CELATONE_QUERY_BLOCK_LATEST_HEIGHT_LCD",
BLOCK_LATEST_HEIGHT_REST = "CELATONE_QUERY_BLOCK_LATEST_HEIGHT_REST",
BLOCK_TIME_AVERAGE_SEQUENCER = "CELATONE_QUERY_BLOCK_TIME_AVERAGE_SEQUENCER",
BLOCKS_SEQUENCER = "CELATONE_QUERY_BLOCKS_SEQUENCER",
// CODE GQL
CODES = "CELATONE_QUERY_CODES",
CODES_LCD = "CELATONE_QUERY_CODES_LCD",
CODES_REST = "CELATONE_QUERY_CODES_REST",
CODES_BY_ADDRESS = "CELATONE_QUERY_CODES_BY_ADDRESS",
ALL_CODES_BY_ADDRESS = "CELATONE_QUERY_ALL_CODES_BY_ADDRESS",
CODE_LIST = "CELATONE_QUERY_CODE_LIST",
CODE_DATA = "CELATONE_QUERY_CODE_DATA",
CODE_DATA_LCD = "CELATONE_QUERY_CODE_DATA_LCD",
CODE_DATA_REST = "CELATONE_QUERY_CODE_DATA_REST",
// CONTRACT
CONTRACTS = "CELATONE_QUERY_CONTRACTS",
CONTRACT_DATA = "CELATONE_QUERY_CONTRACT_DATA",
CONTRACT_QUERY_MSGS = "CELATONE_QUERY_CONTRACT_QUERY_MSGS",
CONTRACT_QUERY_LCD = "CELATONE_QUERY_CONTRACT_QUERY_LCD",
CONTRACT_STATES_LCD = "CELATONE_QUERY_CONTRACT_STATES_LCD",
CONTRACT_QUERY_REST = "CELATONE_QUERY_CONTRACT_QUERY_REST",
CONTRACT_STATES_REST = "CELATONE_QUERY_CONTRACT_STATES_REST",
CONTRACTS_BY_CODE_ID = "CELATONE_QUERY_CONTRACTS_BY_CODE_ID",
CONTRACTS_BY_CODE_ID_LCD = "CELATONE_QUERY_CONTRACTS_BY_CODE_ID_LCD",
CONTRACTS_BY_CODE_ID_REST = "CELATONE_QUERY_CONTRACTS_BY_CODE_ID_REST",
INSTANTIATED_CONTRACTS_BY_ADDRESS = "CELATONE_QUERY_INSTANTIATED_CONTRACTS_BY_ADDRESS",
ALL_INSTANTIATED_CONTRACTS_BY_ADDRESS = "CELATONE_QUERY_ALL_INSTANTIATED_CONTRACTS_BY_ADDRESS",
INSTANTIATED_CONTRACTS_BY_ADDRESS_LCD = "CELATONE_QUERY_INSTANTIATED_CONTRACTS_BY_ADDRESS_LCD",
INSTANTIATED_CONTRACTS_BY_ADDRESS_REST = "CELATONE_QUERY_INSTANTIATED_CONTRACTS_BY_ADDRESS_REST",
ADMIN_CONTRACTS_BY_ADDRESS = "CELATONE_QUERY_ADMIN_CONTRACTS_BY_ADDRESS",
ALL_ADMIN_CONTRACTS_BY_ADDRESS = "CELATONE_QUERY_ALL_ADMIN_CONTRACTS_BY_ADDRESS",
ADMINS_BY_CONTRACTS = "CELATONE_QUERY_ADMINS_BY_CONTRACTS",
CONTRACT_MIGRATION_HISTORIES_BY_CONTRACT_ADDRESS = "CELATONE_QUERY_CONTRACT_MIGRATION_HISTORIES_BY_CONTRACT_ADDRESS",
CONTRACT_MIGRATION_HISTORIES_BY_CONTRACT_ADDRESS_LCD = "CELATONE_QUERY_CONTRACT_MIGRATION_HISTORIES_BY_CONTRACT_ADDRESS_LCD",
CONTRACT_CW2_INFO_LCD = "CELATONE_QUERY_CONTRACT_CW2_INFO_LCD",
CONTRACT_MIGRATION_HISTORIES_BY_CONTRACT_ADDRESS_REST = "CELATONE_QUERY_CONTRACT_MIGRATION_HISTORIES_BY_CONTRACT_ADDRESS_REST",
CONTRACT_CW2_INFO_REST = "CELATONE_QUERY_CONTRACT_CW2_INFO_REST",
// X/STAKING
STAKING_PARAMS_LCD = "CELATONE_QUERY_STAKING_PARAMS_LCD",
DELEGATIONS_BY_ADDRESS_LCD = "CELATONE_QUERY_DELEGATIONS_BY_ADDRESS_LCD",
UNBONDINGS_BY_ADDRESS_LCD = "CELATONE_QUERY_UNBONDINGS_BY_ADDRESS_LCD",
REDELEGATIONS_BY_ADDRESS_LCD = "CELATONE_QUERY_REDELEGATIONS_BY_ADDRESS_LCD",
DELEGATION_REWARDS_BY_ADDRESS_LCD = "CELATONE_QUERY_DELEGATION_REWARDS_BY_ADDRESS_LCD",
COMMISSIONS_BY_VALIDATOR_ADDRESS_LCD = "CELATONE_QUERY_COMMISSION_BY_VALIDATOR_ADDRESS_LCD",
STAKING_PARAMS_REST = "CELATONE_QUERY_STAKING_PARAMS_REST",
DELEGATIONS_BY_ADDRESS_REST = "CELATONE_QUERY_DELEGATIONS_BY_ADDRESS_REST",
UNBONDINGS_BY_ADDRESS_REST = "CELATONE_QUERY_UNBONDINGS_BY_ADDRESS_REST",
REDELEGATIONS_BY_ADDRESS_REST = "CELATONE_QUERY_REDELEGATIONS_BY_ADDRESS_REST",
DELEGATION_REWARDS_BY_ADDRESS_REST = "CELATONE_QUERY_DELEGATION_REWARDS_BY_ADDRESS_REST",
COMMISSIONS_BY_VALIDATOR_ADDRESS_REST = "CELATONE_QUERY_COMMISSION_BY_VALIDATOR_ADDRESS_REST",
DELEGATIONS_BY_ADDRESS = "CELATONE_QUERY_DELEGATIONS_BY_ADDRESS",
// VALIDATOR
VALIDATORS = "CELATONE_QUERY_VALIDATORS",
VALIDATORS_LCD = "CELATONE_QUERY_VALIDATORS_LCD",
VALIDATORS_REST = "CELATONE_QUERY_VALIDATORS_REST",
VALIDATOR_DATA = "CELATONE_QUERY_VALIDATOR_DATA",
VALIDATOR_DATA_LCD = "CELATONE_QUERY_VALIDATOR_DATA_LCD",
VALIDATOR_DATA_REST = "CELATONE_QUERY_VALIDATOR_DATA_REST",
VALIDATOR_IDENTITY = "CELATONE_QUERY_VALIDATOR_IDENTITY",
VALIDATOR_UPTIME = "CELATONE_QUERY_VALIDATOR_UPTIME",
VALIDATOR_HISTORICAL_POWERS = "CELATONE_QUERY_VALIDATOR_HISTORICAL_POWERS",
Expand All @@ -77,19 +77,19 @@ export enum CELATONE_QUERY_KEYS {
FAUCET_INFO = "CELATONE_QUERY_FAUCET_INFO",
// X/GOV
PROPOSAL_DATA = "CELATONE_QUERY_PROPOSAL_DATA",
PROPOSAL_DATA_LCD = "CELATONE_QUERY_PROPOSAL_DATA_LCD",
PROPOSAL_DEPOSITS_LCD = "CELATONE_QUERY_PROPOSAL_DEPOSITS_LCD",
PROPOSAL_DATA_REST = "CELATONE_QUERY_PROPOSAL_DATA_REST",
PROPOSAL_DEPOSITS_REST = "CELATONE_QUERY_PROPOSAL_DEPOSITS_REST",
PROPOSAL_VOTES_INFO = "CELATONE_QUERY_PROPOSAL_VOTES_INFO",
PROPOSAL_VOTES = "CELATONE_QUERY_PROPOSAL_VOTES",
PROPOSAL_VALIDATOR_VOTES = "CELATONE_QUERY_PROPOSAL_VALIDATOR_VOTES",
PROPOSAL_ANSWER_COUNTS = "CELATONE_QUERY_PROPOSAL_ANSWER_COUNTS",
RELATED_PROPOSALS_BY_CONTRACT_ADDRESS = "CELATONE_QUERY_RELATED_PROPOSALS_BY_CONTRACT_ADDRESS",
PROPOSALS_BY_ADDRESS = "CELATONE_QUERY_PROPOSALS_BY_ADDRESS",
PROPOSALS = "CELATONE_QUERY_PROPOSALS",
PROPOSALS_LCD = "CELATONE_QUERY_PROPOSALS_LCD",
PROPOSALS_REST = "CELATONE_QUERY_PROPOSALS_REST",
PROPOSAL_PARAMS = "CELATONE_QUERY_PROPOSAL_PARAMS",
PROPOSAL_TYPES = "CELATONE_QUERY_PROPOSAL_TYPES",
UPLOAD_ACCESS_PARAMS_LCD = "CELATONE_QUERY_UPLOAD_ACCESS_PARAMS_LCD",
UPLOAD_ACCESS_PARAMS_REST = "CELATONE_QUERY_UPLOAD_ACCESS_PARAMS_REST",
// PUBLIC PROJECT
PUBLIC_PROJECTS = "CELATONE_QUERY_PUBLIC_PROJECTS",
PUBLIC_PROJECT_BY_SLUG = "CELATONE_QUERY_PUBLIC_PROJECT_BY_SLUG",
Expand All @@ -103,17 +103,17 @@ export enum CELATONE_QUERY_KEYS {
TXS_BY_ADDRESS = "CELATONE_QUERY_TXS_BY_ADDRESS",
TXS_COUNT_SEQUENCER = "CELATONE_QUERY_TXS_COUNT_SEQUENCER",
TXS_COUNT_BY_ADDRESS = "CELATONE_QUERY_TXS_COUNT_BY_ADDRESS",
TXS_BY_ADDRESS_LCD = "CELATONE_QUERY_TXS_BY_ADDRESS_LCD",
TXS_BY_ADDRESS_REST = "CELATONE_QUERY_TXS_BY_ADDRESS_REST",
TXS_BY_ADDRESS_SEQUENCER = "CELATONE_QUERY_TXS_BY_ADDRESS_SEQUENCER",
TXS_BY_ADDRESS_PAGINATION_SEQUENCER = "CELATONE_QUERY_TXS_BY_ADDRESS_PAGINATION_SEQUENCER",
TXS_BY_CONTRACT_ADDRESS_LCD = "CELATONE_QUERY_TXS_BY_CONTRACT_ADDRESS_LCD",
TXS_BY_CONTRACT_ADDRESS_REST = "CELATONE_QUERY_TXS_BY_CONTRACT_ADDRESS_REST",
TXS = "CELATONE_QUERY_TXS",
TXS_SEQUENCER = "CELATONE_QUERY_TXS_SEQUENCER",
TXS_BY_BLOCK_HEIGHT = "CELATONE_QUERY_TXS_BY_BLOCK_HEIGHT",
TXS_BY_BLOCK_HEIGHT_SEQUENCER = "CELATONE_QUERY_TXS_BY_BLOCK_HEIGHT_SEQUENCER",
// ICNS
ICNS_NAMES_BY_ADDRESS_LCD = "CELATONE_QUERY_ICNS_NAMES_BY_ADDRESS_LCD",
ADDRESS_BY_ICNS_NAME_LCD = "CELATONE_QUERY_ADDRESS_BY_ICNS_NAME_LCD",
ICNS_NAMES_BY_ADDRESS_REST = "CELATONE_QUERY_ICNS_NAMES_BY_ADDRESS_REST",
ADDRESS_BY_ICNS_NAME_REST = "CELATONE_QUERY_ADDRESS_BY_ICNS_NAME_REST",
// INITA USERNAME
INITIA_USERNAME_BY_ADDRESS = "CELATONE_QUERY_INITIA_USERNAME_BY_ADDRESS",
ADDRESS_BY_INITIA_USERNAME = "CELATONE_QUERY_ADDRESS_BY_INITIA_USERNAME",
Expand All @@ -128,7 +128,7 @@ export enum CELATONE_QUERY_KEYS {
// MODULES
MODULE_DATA = "CELATONE_QUERY_MODULE_DATA",
MODULES_BY_ADDRESS = "CELATONE_QUERY_MODULES_BY_ADDRESS",
MODULE_BY_ADDRESS_LCD = "CELATONE_QUERY_MODULE_BY_ADDRESS_LCD",
MODULE_BY_ADDRESS_REST = "CELATONE_QUERY_MODULE_BY_ADDRESS_REST",
MODULES = "CELATONE_QUERY_MODULES",
FUNCTION_VIEW = "CELATONE_QUERY_FUNCTION_VIEW",
MODULE_DECODE = "CELATONE_QUERY_MODULE_DECODE",
Expand All @@ -138,8 +138,8 @@ export enum CELATONE_QUERY_KEYS {
MODULE_PROPOSALS = "CELATONE_QUERY_MODULE_PROPOSALS",
SCRIPT_DECODE = "CELATONE_QUERY_SCRIPT_DECODE",
// EVM
EVM_PARAMS_LCD = "CELATONE_QUERY_EVM_PARAMS_LCD",
EVM_CODES_BY_ADDRESS_LCD = "CELATONE_QUERY_EVM_CODES_BY_ADDRESS_LCD",
EVM_PARAMS_REST = "CELATONE_QUERY_EVM_PARAMS_REST",
EVM_CODES_BY_ADDRESS_REST = "CELATONE_QUERY_EVM_CODES_BY_ADDRESS_REST",
EVM_CONTRACT_INFO_SEQUENCER = "CELATONE_QUERY_EVM_CONTRACT_INFO_SEQUENCER",
EVM_TX_HASH_BY_COSMOS_TX_HASH = "CELATONE_QUERY_EVM_TX_HASH_BY_COSMOS_TX_HASH",
EVM_TX_HASHES_BY_COSMOS_TX_HASHES = "CELATONE_QUERY_EVM_TX_HASHES_BY_COSMOS_TX_HASHES",
Expand All @@ -158,7 +158,7 @@ export enum CELATONE_QUERY_KEYS {
NFT_COLLECTIONS_BY_ACCOUNT = "CELATONE_QUERY_NFT_COLLECTIONS_BY_ACCOUNT",
NFTS = "CELATONE_QUERY_NFTS",
NFT_BY_NFT_ADDRESS = "CELATONE_QUERY_NFT_BY_NFT_ADDRESS",
NFT_BY_NFT_ADDRESS_LCD = "CELATONE_QUERY_NFT_BY_NFT_ADDRESS_LCD",
NFT_BY_NFT_ADDRESS_REST = "CELATONE_QUERY_NFT_BY_NFT_ADDRESS_REST",
NFT_TOKEN_MINT_INFO = "CELATONE_QUERY_NFT_TOKEN_MINT_INFO",
NFT_METADATA = "CELATONE_QUERY_NFT_METADATA",
NFT_TRANSACTIONS = "CELATONE_QUERY_NFT_TRANSACTIONS",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Alert, AlertDescription } from "@chakra-ui/react";

export const AlertPaginationLcd = () => (
export const AlertPaginationRest = () => (
<Alert variant="error" alignItems="center">
<AlertDescription wordBreak="break-word">
Error fetching data from LCD. Please try again later.
Error fetching data from REST. Please try again later.
</AlertDescription>
</Alert>
);
8 changes: 4 additions & 4 deletions src/lib/components/modal/MoveCodeSnippet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const MoveCodeSnippet = ({
const { isOpen, onClose, onOpen } = useDisclosure();
const {
currentChainId,
chainConfig: { chain, lcd: lcdEndpoint, rpc: rpcEndpoint },
chainConfig: { chain, rest: restEndpoint, rpc: rpcEndpoint },
theme,
} = useCelatoneApp();
const gasPrice = useGas();
Expand Down Expand Up @@ -126,7 +126,7 @@ const MoveCodeSnippet = ({
{
name: "Curl",
mode: "sh",
snippet: `\n\ncurl '${lcdEndpoint}/initia/move/v1/accounts/${moduleAddress}/modules/${moduleName}/view_functions/${fn.name}' \\
snippet: `\n\ncurl '${restEndpoint}/initia/move/v1/accounts/${moduleAddress}/modules/${moduleName}/view_functions/${fn.name}' \\
--data-raw '${formatedAbiData}'`,
},
{
Expand All @@ -149,7 +149,7 @@ ${daemonName} query move view $MODULE_ADDRESS \\
mode: "javascript",
snippet: `import { LCDClient } from '@initia/initia.js'

const lcd = new LCDClient('${lcdEndpoint}', {
const lcd = new LCDClient('${restEndpoint}', {
chainId: '${currentChainId}',
});
const moduleAddress =
Expand Down Expand Up @@ -178,7 +178,7 @@ viewModule(moduleAddress, moduleName, fnName);`,
mode: "javascript",
snippet: `import { LCDClient, Wallet, MnemonicKey, MsgExecute } from '@initia/initia.js';

const lcd = new LCDClient('${lcdEndpoint}', {
const lcd = new LCDClient('${restEndpoint}', {
chainId: '${currentChainId}',
gasPrices: '${gasPriceStr}',
gasAdjustment: '2.0',
Expand Down
6 changes: 3 additions & 3 deletions src/lib/components/modal/WasmCodeSnippet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const WasmCodeSnippet = ({
const isDisabled = !contractAddress || !message.length;
const {
currentChainId,
chainConfig: { chain, lcd: lcdEndpoint, rpc: rpcEndpoint },
chainConfig: { chain, rest: restEndpoint, rpc: rpcEndpoint },
theme,
} = useCelatoneApp();
const gasPrice = useGas();
Expand Down Expand Up @@ -93,7 +93,7 @@ ${daemonName} query wasm contract-state smart $CONTRACT_ADDRESS $QUERY_MSG \\
snippet: `import base64
import requests\n
CONTRACT_ADDRESS = "${contractAddress}"
LCD_URL = "${lcdEndpoint}"
LCD_URL = "${restEndpoint}"
QUERY_MSG = b'''${message}'''\n
query_b64encoded = base64.b64encode(QUERY_MSG).decode("ascii")
res = requests.get(
Expand Down Expand Up @@ -123,7 +123,7 @@ queryContract(rpcURL, contractAddress, queryMsg);`,
name: "Axios",
mode: "javascript",
snippet: `const axios = require('axios');\n
const lcdURL = '${lcdEndpoint}';
const lcdURL = '${restEndpoint}';
const contractAddress =
"${contractAddress}";
const queryMsg = ${message};\n
Expand Down
4 changes: 2 additions & 2 deletions src/lib/components/modal/code/SaveNewCode.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { NumberInput, TextInput } from "lib/components/forms";
import { CustomIcon } from "lib/components/icon";
import { useGetMaxLengthError } from "lib/hooks";
import { useCodeStore } from "lib/providers/store";
import { useCodeLcd } from "lib/services/wasm/code";
import { useCodeRest } from "lib/services/wasm/code";
import type { BechAddr } from "lib/types";
import {
getNameAndDescriptionDefault,
Expand Down Expand Up @@ -59,7 +59,7 @@ export function SaveNewCodeModal({ buttonProps }: SaveNewCodeModalProps) {
const { isCodeIdSaved, saveNewCode, updateCodeInfo, getCodeLocalInfo } =
useCodeStore();

const { refetch, isFetching, isRefetching } = useCodeLcd(Number(codeId), {
const { refetch, isFetching, isRefetching } = useCodeRest(Number(codeId), {
enabled: false,
retry: false,
cacheTime: 0,
Expand Down
4 changes: 2 additions & 2 deletions src/lib/components/select-code/CodeSelect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { UploadIcon } from "lib/components/icon";
import { useCodeStore } from "lib/providers/store";
import type { Code } from "lib/services/types";
import { useDerivedWasmVerifyInfo } from "lib/services/verification/wasm";
import { useCodeLcd } from "lib/services/wasm/code";
import { useCodeRest } from "lib/services/wasm/code";
import { AccessConfigPermission } from "lib/types";
import { getWasmVerifyStatus } from "lib/utils";

Expand All @@ -31,7 +31,7 @@ export const CodeSelect = ({
}: CodeSelectProps) => {
const { getCodeLocalInfo } = useCodeStore();
const name = getCodeLocalInfo(codeId)?.name;
const { data } = useCodeLcd(codeId, {
const { data } = useCodeRest(codeId, {
enabled: !!codeId,
onSuccess: setCodeHash,
});
Expand Down
4 changes: 2 additions & 2 deletions src/lib/components/wallet-section/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { MouseEventHandler } from "react";

import { AmpEvent, track } from "lib/amplitude";
import { useCurrentChain, useInitia } from "lib/app-provider";
import { useIcnsNamesByAddressLcd } from "lib/services/name";
import { useIcnsNamesByAddressRest } from "lib/services/name";
import { useInitiaUsernameByAddress } from "lib/services/username";
import { truncate } from "lib/utils";

Expand All @@ -20,7 +20,7 @@ export const WalletSection = () => {
address,
isInitia
);
const { data: icnsNames } = useIcnsNamesByAddressLcd(address, !isInitia);
const { data: icnsNames } = useIcnsNamesByAddressRest(address, !isInitia);

const onClickConnect: MouseEventHandler = async (e) => {
track(AmpEvent.USE_CLICK_WALLET);
Expand Down
10 changes: 5 additions & 5 deletions src/lib/hooks/useOpenTab.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import {
import type { Option } from "lib/types";
import { openNewTab } from "lib/utils";

export const useOpenTxTab = (type: "lcd" | "tx-page") => {
export const useOpenTxTab = (type: "rest" | "tx-page") => {
const { currentChainId } = useCelatoneApp();
const txsApiRoute = useBaseApiRoute("txs");
const baseUrl = type === "lcd" ? txsApiRoute : `/${currentChainId}/txs`;
const baseUrl = type === "rest" ? txsApiRoute : `/${currentChainId}/txs`;

return useCallback(
(txHash: Option<string>) => {
Expand All @@ -25,18 +25,18 @@ export const useOpenAssetTab = () => {
const { isFullTier } = useTierConfig();
const apiEndpoint = useBaseApiRoute("accounts");
const {
chainConfig: { lcd: lcdEndpoint },
chainConfig: { rest: restEndpoint },
} = useCelatoneApp();

return useCallback(
(walletAddr: string) => {
openNewTab(
isFullTier
? `${apiEndpoint}/${walletAddr}/balances`
: `${lcdEndpoint}/cosmos/bank/v1beta1/balances/${walletAddr}?pagination.limit=1000`
: `${restEndpoint}/cosmos/bank/v1beta1/balances/${walletAddr}?pagination.limit=1000`
);
},
[apiEndpoint, isFullTier, lcdEndpoint]
[apiEndpoint, isFullTier, restEndpoint]
);
};

Expand Down
Loading
Loading