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: evm proxy contract and checksum #1242

Merged
merged 4 commits into from
Feb 20, 2025
Merged
Show file tree
Hide file tree
Changes from 2 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
8 changes: 8 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,14 @@
"eqeqeq": "error",
"semi": "error",

"@typescript-eslint/consistent-type-imports": [
"error",
{
"disallowTypeAnnotations": true,
"fixStyle": "separate-type-imports",
"prefer": "type-imports"
}
],
"@typescript-eslint/no-empty-object-type": "off",
"sonarjs/no-duplicate-string": ["error", { "threshold": 3 }],
"sonarjs/cognitive-complexity": ["error", 27],
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Improvements

- [#1242](https://github.com/alleslabs/celatone-frontend/pull/1242) Fix EVM proxy contract details and checksum address
- [#1236](https://github.com/alleslabs/celatone-frontend/pull/1236) Remove unnecessary configs for users in custom network configs
- [#1228](https://github.com/alleslabs/celatone-frontend/pull/1228) Refactor EVM verification form path and form type location
- [#1215](https://github.com/alleslabs/celatone-frontend/pull/1215) Bump react wallet widget package to support http endpoints
Expand Down
2 changes: 1 addition & 1 deletion src/config/theme/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { CHAIN } from "env";
import { DEFAULT_THEME } from "./default";
import { INITIA_THEME } from "./initia";
import { SEI_THEME } from "./sei";
import { Option } from "lib/types";
import type { Option } from "lib/types";

export const getTheme = (chain: Option<string>) => {
switch (chain) {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/app-fns/tx/common/postEvm.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { EstimatedFeeEvmRender } from "lib/components/EstimatedFeeEvmRender";
import { ExplorerLink } from "lib/components/ExplorerLink";
import { TxReceiptJsonRpc } from "lib/services/types";
import type { TxReceiptJsonRpc } from "lib/services/types";
import type { TxResultRendering } from "lib/types";
import { TxStreamPhase } from "lib/types";

Expand Down
2 changes: 1 addition & 1 deletion src/lib/app-fns/tx/common/sendingEvm.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Spinner } from "@chakra-ui/react";
import { EstimatedFeeEvmRender } from "lib/components/EstimatedFeeEvmRender";

import { SimulatedFeeEvm } from "lib/services/types";
import type { SimulatedFeeEvm } from "lib/services/types";
import type { TxResultRendering } from "lib/types";
import { TxStreamPhase } from "lib/types";

Expand Down
2 changes: 1 addition & 1 deletion src/lib/app-fns/tx/evm/requestEvm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type { SignAndBroadcastEvm } from "lib/app-provider/hooks";
import { EstimatedFeeEvmRender } from "lib/components/EstimatedFeeEvmRender";
import { ExplorerLink } from "lib/components/ExplorerLink";
import { CustomIcon } from "lib/components/icon";
import { SimulatedFeeEvm, TxReceiptJsonRpc } from "lib/services/types";
import type { SimulatedFeeEvm, TxReceiptJsonRpc } from "lib/services/types";
import type { HexAddr, TxResultRendering } from "lib/types";
import { TxStreamPhase } from "lib/types";
import { catchTxError, postEvmTx } from "../common";
Expand Down
4 changes: 2 additions & 2 deletions src/lib/app-provider/hooks/useSignAndBroadcastEvm.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { useCallback } from "react";

import { TransactionRequest } from "ethers";
import type { TransactionRequest } from "ethers";
import { getEthGetTransactionReceipt } from "lib/services/evm/json-rpc";
import { TxReceiptJsonRpc } from "lib/services/types";
import type { TxReceiptJsonRpc } from "lib/services/types";
import { convertCosmosChainIdToEvmChainId, sleep } from "lib/utils";
import { useCelatoneApp } from "../contexts";
import { useCurrentChain } from "./useCurrentChain";
Expand Down
2 changes: 1 addition & 1 deletion src/lib/app-provider/tx/evm/requestEvm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useCallback } from "react";
import { trackTxSucceed } from "lib/amplitude";
import { requestEvmTx } from "lib/app-fns/tx/evm/requestEvm";
import { useSignAndBroadcastEvm } from "lib/app-provider/hooks";
import { SimulatedFeeEvm } from "lib/services/types";
import type { SimulatedFeeEvm } from "lib/services/types";
import type { HexAddr20 } from "lib/types";

export interface RequestEvmStreamParams {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/components/ContractCmdButton.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Button } from "@chakra-ui/react";
import { Option } from "lib/types";
import type { Option } from "lib/types";

interface ContractCmdButtonProps {
cmd: Option<string>;
Expand Down
4 changes: 2 additions & 2 deletions src/lib/components/EstimatedFeeEvmRender.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Spinner } from "@chakra-ui/react";
import Big from "big.js";
import type Big from "big.js";

import { useAssetInfos } from "lib/services/assetService";
import { useEvmParams } from "lib/services/evm";
import { Option } from "lib/types";
import type { Option } from "lib/types";
import { coinToTokenWithValue, formatTokenWithValue } from "lib/utils";

export const EstimatedFeeEvmRender = ({
Expand Down
2 changes: 1 addition & 1 deletion src/lib/components/UserDocsLink.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { trackWebsite } from "lib/amplitude";
import { DEVELOPER_TOOL_DOCS_LINK, USER_GUIDE_DOCS_LINK } from "lib/data";

import { CustomIcon } from "./icon";
import { Option } from "lib/types";
import type { Option } from "lib/types";

const handleLink = (
href: Option<string> = "",
Expand Down
5 changes: 3 additions & 2 deletions src/lib/components/editor/EditorFileBody.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Flex, FlexProps, Text } from "@chakra-ui/react";
import { SourceTreeNode } from "./types";
import type { FlexProps } from "@chakra-ui/react";
import { Flex, Text } from "@chakra-ui/react";
import type { SourceTreeNode } from "./types";
import { CustomIcon } from "../icon";
import { Tooltip } from "../Tooltip";

Expand Down
4 changes: 2 additions & 2 deletions src/lib/components/editor/EditorSidebar.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { useState } from "react";
import { SourceTreeNode } from "./types";
import type { SourceTreeNode } from "./types";
import { Box, Flex } from "@chakra-ui/react";
import { EditorFileBody } from "./EditorFileBody";
import { Nullable } from "lib/types";
import type { Nullable } from "lib/types";

export interface EditorSidebarProps {
sourceTreeNode: SourceTreeNode[];
Expand Down
4 changes: 2 additions & 2 deletions src/lib/components/editor/EditorTop.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Box, Flex, Text } from "@chakra-ui/react";
import { SourceTreeNode } from "./types";
import type { SourceTreeNode } from "./types";
import { EditorFileBody } from "./EditorFileBody";
import { CustomIcon } from "../icon";
import { Nullable } from "lib/types";
import type { Nullable } from "lib/types";
import { Fragment } from "react";

interface EditorTopProps {
Expand Down
10 changes: 4 additions & 6 deletions src/lib/components/editor/FullEditor.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
import { Box, Grid, Stack, Text } from "@chakra-ui/react";
import { generateSourceTree } from "./helpers";
import { FilePath, SourceTreeNode } from "./types";
import type { FilePath, SourceTreeNode } from "./types";
import { EditorSidebar } from "./EditorSidebar";
import { useEffect, useState } from "react";
import { EditorTop } from "./EditorTop";
import { Nullable } from "lib/types";
import type { Nullable } from "lib/types";
import { Editor } from "./Editor";
import { useMobile } from "lib/app-provider";
import {
FullEditorSidebarMobile,
FullEditorSidebarMobileProps,
} from "./FullEditorSidebarMobile";
import type { FullEditorSidebarMobileProps } from "./FullEditorSidebarMobile";
import { FullEditorSidebarMobile } from "./FullEditorSidebarMobile";

interface FullEditorProps
extends Pick<FullEditorSidebarMobileProps, "isOpen" | "onClose"> {
Expand Down
3 changes: 2 additions & 1 deletion src/lib/components/editor/FullEditorSidebarMobile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ import {
DrawerOverlay,
Heading,
} from "@chakra-ui/react";
import { EditorSidebar, EditorSidebarProps } from "./EditorSidebar";
import type { EditorSidebarProps } from "./EditorSidebar";
import { EditorSidebar } from "./EditorSidebar";

export interface FullEditorSidebarMobileProps extends EditorSidebarProps {
isOpen: boolean;
Expand Down
3 changes: 2 additions & 1 deletion src/lib/components/editor/helpers.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { last, split } from "lodash";
import { EXTENSION_LIB, FilePath, SourceTreeNode } from "./types";
import type { FilePath, SourceTreeNode } from "./types";
import { EXTENSION_LIB } from "./types";

export const generateSourceTree = (
filesPath: FilePath[],
Expand Down
2 changes: 1 addition & 1 deletion src/lib/components/editor/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Option } from "lib/types";
import type { Option } from "lib/types";

export const EXTENSION_LIB = ["sol", "vy"];

Expand Down
4 changes: 2 additions & 2 deletions src/lib/components/evm-abi/EvmAbiForm.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { JsonFragmentType } from "ethers";
import { JsonDataType } from "lib/types";
import type { JsonFragmentType } from "ethers";
import type { JsonDataType } from "lib/types";
import { useEffect, useMemo } from "react";
import { useForm } from "react-hook-form";
import { FormFields } from "./fields";
Expand Down
5 changes: 3 additions & 2 deletions src/lib/components/evm-abi/fields/BaseField.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { FieldProps } from "./types";
import { FieldValues, useController } from "react-hook-form";
import type { FieldProps } from "./types";
import type { FieldValues } from "react-hook-form";
import { useController } from "react-hook-form";
import { FormControl, FormErrorMessage, Input } from "@chakra-ui/react";
import { getRules } from "./utils";

Expand Down
8 changes: 5 additions & 3 deletions src/lib/components/evm-abi/fields/BoolField.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { SelectInput, SelectInputOption } from "lib/components/forms";
import { FieldValues, useController } from "react-hook-form";
import { FieldProps } from "./types";
import type { SelectInputOption } from "lib/components/forms";
import { SelectInput } from "lib/components/forms";
import type { FieldValues } from "react-hook-form";
import { useController } from "react-hook-form";
import type { FieldProps } from "./types";

const BOOL_FIELD_OPTIONS: SelectInputOption<string>[] = [
{
Expand Down
4 changes: 2 additions & 2 deletions src/lib/components/evm-abi/fields/Field.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { FieldValues } from "react-hook-form";
import type { FieldValues } from "react-hook-form";
import { BaseField } from "./BaseField";
import { BoolField } from "./BoolField";
import { TupleField } from "./TupleField";
import { FieldProps } from "./types";
import type { FieldProps } from "./types";

export const Field = <T extends FieldValues>({
type,
Expand Down
7 changes: 4 additions & 3 deletions src/lib/components/evm-abi/fields/FieldTemplate.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { Button, Flex, Text } from "@chakra-ui/react";
import { CustomIcon } from "lib/components/icon";
import { Option } from "lib/types";
import { FieldPath, FieldValues, useController } from "react-hook-form";
import type { Option } from "lib/types";
import type { FieldPath, FieldValues } from "react-hook-form";
import { useController } from "react-hook-form";
import { getDefaultValueFromDimensions } from "../utils";
import { Field } from "./Field";
import { FieldProps } from "./types";
import type { FieldProps } from "./types";

interface FieldTemplateProps<T extends FieldValues> extends FieldProps<T> {
dimensions?: Option<number>[];
Expand Down
7 changes: 4 additions & 3 deletions src/lib/components/evm-abi/fields/TupleField.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { Flex } from "@chakra-ui/react";
import { JsonFragmentType } from "ethers";
import { FieldPath, FieldValues, useWatch } from "react-hook-form";
import type { JsonFragmentType } from "ethers";
import type { FieldPath, FieldValues } from "react-hook-form";
import { useWatch } from "react-hook-form";
import { getTypeDimensions } from "../utils";
import { FieldTemplate } from "./FieldTemplate";
import { TypeLabel } from "./TypeLabel";
import { FieldProps } from "./types";
import type { FieldProps } from "./types";

interface TupleFieldProps<T extends FieldValues> extends FieldProps<T> {
components: ReadonlyArray<JsonFragmentType>;
Expand Down
4 changes: 2 additions & 2 deletions src/lib/components/evm-abi/fields/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Control, FieldValues, Path } from "react-hook-form";
import type { Control, FieldValues, Path } from "react-hook-form";
import { TupleField } from "./TupleField";
import { JsonFragmentType } from "ethers";
import type { JsonFragmentType } from "ethers";
import { BaseField } from "./BaseField";
import { TypeLabel } from "./TypeLabel";
import { useEvmParams } from "lib/services/evm";
Expand Down
4 changes: 2 additions & 2 deletions src/lib/components/evm-abi/fields/types.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { JsonFragmentType } from "ethers";
import { Control, FieldPath, FieldValues } from "react-hook-form";
import type { JsonFragmentType } from "ethers";
import type { Control, FieldPath, FieldValues } from "react-hook-form";

export interface FieldProps<T extends FieldValues>
extends Omit<JsonFragmentType, "name"> {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/components/evm-abi/fields/utils.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { big } from "lib/types";
import { is0x, isHex, isHex20Bytes, isHexFixedBytes } from "lib/utils";
import { FieldValues, UseControllerProps } from "react-hook-form";
import type { FieldValues, UseControllerProps } from "react-hook-form";

const validateAddress = (v: string) =>
isHex20Bytes(v) ? undefined : "Invalid address";
Expand Down
4 changes: 2 additions & 2 deletions src/lib/components/evm-abi/utils.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable no-use-before-define */
import { JsonFragmentType } from "ethers";
import { JsonDataType, Option } from "lib/types";
import type { JsonFragmentType } from "ethers";
import type { JsonDataType, Option } from "lib/types";
import { isPositiveInt } from "lib/utils";

export const getTypeDimensions = (type = "") => {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/components/evm-verify-section/FailedDetails.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Button, HStack, Text } from "@chakra-ui/react";

import { useInternalNavigate, useMobile } from "lib/app-provider";
import { EvmVerifyInfo } from "lib/types";
import type { EvmVerifyInfo } from "lib/types";
import type { HexAddr20 } from "lib/types";
import { formatUTC } from "lib/utils";
import { EvmVerifyStatusModalWithTrigger } from "../modal/evm-verify-status";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Button, Text } from "@chakra-ui/react";

import type { HexAddr20 } from "lib/types";
import { EvmVerifyInfo } from "lib/types";
import type { EvmVerifyInfo } from "lib/types";
import { EvmVerifyStatusModalWithTrigger } from "../modal/evm-verify-status";

interface InProgressDetailsProps {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/components/evm-verify-section/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Flex } from "@chakra-ui/react";
import type { HexAddr20, Option } from "lib/types";

import { NotVerifiedDetails } from "./NotVerifiedDetails";
import { EvmVerifyInfo } from "lib/types";
import type { EvmVerifyInfo } from "lib/types";
import { useMobile } from "lib/app-provider";
import { VerifiedDetails } from "./VerifiedDetails";
import { FailedDetails } from "./FailedDetails";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Box, Flex, Text } from "@chakra-ui/react";
import { useMobile } from "lib/app-provider";
import { EvmVerifyInfo } from "lib/types";
import type { EvmVerifyInfo } from "lib/types";
import { getProcessSteps } from "./utils";
import { formatUTC } from "lib/utils";
import { EvmVerifyProcessStepIcon } from "./EvmVerifyProcessStepIcon";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import type { HexAddr20, Option } from "lib/types";
import { EvmVerifyInfo } from "lib/types";
import type { EvmVerifyInfo } from "lib/types";
import { Flex, HStack } from "@chakra-ui/react";
import { Divider, Text, TextProps } from "@chakra-ui/react";
import type { TextProps } from "@chakra-ui/react";
import { Divider, Text } from "@chakra-ui/react";
import { ExplorerLink } from "lib/components/ExplorerLink";
import { formatUTC, getLicenseTypeLabel } from "lib/utils";
import { useMobile } from "lib/app-provider";
Expand Down
2 changes: 1 addition & 1 deletion src/lib/components/modal/evm-verify-status/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import type { ReactNode } from "react";

import { CustomIcon } from "../../icon";
import type { HexAddr20, Option } from "lib/types";
import { EvmVerifyInfo } from "lib/types";
import type { EvmVerifyInfo } from "lib/types";
import { EvmVerifyRequestInfo } from "./EvmVerifyRequestInfo";
import { EvmVerifyAlert } from "./EvmVerifyAlert";
import { EvmVerifyProcess } from "./EvmVerifyProcess";
Expand Down
3 changes: 1 addition & 2 deletions src/lib/components/modal/evm-verify-status/utils.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { EvmVerifyInfo } from "lib/types";
import type { Option } from "lib/types";
import type { EvmVerifyInfo, Option } from "lib/types";

enum ProcessStepState {
PENDING = "Pending",
Expand Down
Loading