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: load all contract detail #37

Merged
merged 6 commits into from
Dec 23, 2022
Merged
Show file tree
Hide file tree
Changes from 4 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: 1 addition & 1 deletion src/env.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const CELATONE_FALLBACK_GAS_PRICE: Record<string, ChainGasPrice> = {
},
};

export const CELATONE_CONTRACT_ADDRESS = (
export const CELATONE_APP_CONTRACT_ADDRESS = (
songwongtp marked this conversation as resolved.
Show resolved Hide resolved
chainName: string
): CelatoneContractAddress => {
switch (chainName) {
Expand Down
4 changes: 2 additions & 2 deletions src/lib/app-fns/tx/execute.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ import type { Observable } from "rxjs";

import { ExplorerLink } from "lib/components/ExplorerLink";
import type { Activity } from "lib/stores/contract";
import type { TxResultRendering } from "lib/types";
import type { ContractAddr, TxResultRendering } from "lib/types";
import { TxStreamPhase } from "lib/types";
import { encode, formatUFee } from "lib/utils";

import { catchTxError, postTx, sendingTx } from "./common";

interface ExecuteTxParams {
address: string;
contractAddress: string;
contractAddress: ContractAddr;
fee: StdFee;
msg: object;
client: SigningCosmWasmClient;
Expand Down
53 changes: 26 additions & 27 deletions src/lib/app-provider/contexts/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ import { useCodeStore, useContractStore } from "lib/hooks";
import type { ChainGasPrice, Token, U } from "lib/types";
import { formatUserKey } from "lib/utils";

interface AppProviderProps<ContractAddress, Constants extends AppConstants> {
interface AppProviderProps<AppContractAddress, Constants extends AppConstants> {
children: ReactNode;

fallbackGasPrice: Record<string, ChainGasPrice>;

contractAddress: (currentChainName: string) => ContractAddress;
appContractAddressMap: (currentChainName: string) => AppContractAddress;

constants: Constants;
}
Expand All @@ -36,33 +36,33 @@ interface AppContextInterface<
Constants extends AppConstants = AppConstants
> {
chainGasPrice: ChainGasPrice;
contractAddress: ContractAddress;
appContractAddress: ContractAddress;
constants: Constants;
explorerLink: {
contractAddr: string;
txs: string;
address: string;
contractUrl: string;
txUrl: string;
userUrl: string;
};
indexerGraphClient: GraphQLClient;
}

// eslint-disable-next-line @typescript-eslint/no-explicit-any
const AppContext = createContext<AppContextInterface<any, any>>({
chainGasPrice: { denom: "", gasPrice: "0" as U<Token> },
contractAddress: {},
appContractAddress: {},
constants: { gasAdjustment: 0 },
explorerLink: {
contractAddr: "",
txs: "",
address: "",
contractUrl: "",
txUrl: "",
userUrl: "",
},
indexerGraphClient: new GraphQLClient(""),
});

export const AppProvider = <ContractAddress, Constants extends AppConstants>({
children,
fallbackGasPrice,
contractAddress,
appContractAddressMap,
constants,
}: AppProviderProps<ContractAddress, Constants>) => {
const { currentChainName, currentChainRecord, setCurrentChain } = useWallet();
Expand All @@ -87,30 +87,29 @@ export const AppProvider = <ContractAddress, Constants extends AppConstants>({
const chainBoundStates = useMemo(() => {
return {
explorerLink: {
contractAddr: getExplorerContractAddressUrl(currentChainName),
txs: getExplorerTxUrl(currentChainName),
address: getExplorerUserAddressUrl(currentChainName),
contractUrl: getExplorerContractAddressUrl(currentChainName),
txUrl: getExplorerTxUrl(currentChainName),
userUrl: getExplorerUserAddressUrl(currentChainName),
},
indexerGraphClient: getIndexerGraphClient(currentChainName),
};
}, [currentChainName]);

const states = useMemo<
AppContextInterface<ContractAddress, Constants>
>(() => {
return {
const states = useMemo<AppContextInterface<ContractAddress, Constants>>(
() => ({
chainGasPrice,
contractAddress: contractAddress(currentChainName),
appContractAddress: appContractAddressMap(currentChainName),
constants,
...chainBoundStates,
};
}, [
chainGasPrice,
contractAddress,
currentChainName,
constants,
chainBoundStates,
]);
}),
[
chainGasPrice,
appContractAddressMap,
currentChainName,
constants,
chainBoundStates,
]
);

useEffect(() => {
if (currentChainName) {
Expand Down
3 changes: 2 additions & 1 deletion src/lib/app-provider/tx/execute.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ import { useCallback } from "react";
import { executeContractTx } from "lib/app-fns/tx/execute";
import { useUserKey } from "lib/hooks/useUserKey";
import type { Activity } from "lib/stores/contract";
import type { ContractAddr } from "lib/types";

export interface ExecuteStreamParams {
onTxSucceed?: (userKey: string, activity: Activity) => void;
onTxFailed?: () => void;
estimatedFee: StdFee | undefined;
contractAddress: string;
contractAddress: ContractAddr;
msg: object;
}

Expand Down
3 changes: 2 additions & 1 deletion src/lib/components/InstantiateOffchainDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
} from "lib/data";
import { useContractStore } from "lib/hooks";
import { useUserKey } from "lib/hooks/useUserKey";
import type { ContractAddr } from "lib/types";

import { ListSelection } from "./forms/ListSelection";
import { TagSelection } from "./forms/TagSelection";
Expand All @@ -22,7 +23,7 @@ interface InstantiateOffChainFormProps {
title?: string;
subtitle?: string;
cta?: boolean;
contractAddress: string;
contractAddress: ContractAddr;
contractLabel: string;
}

Expand Down
2 changes: 1 addition & 1 deletion src/lib/components/modal/EditTags.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export function EditTags({ contractInfo }: EditTagsProps) {
const [tagResult, setTagResult] = useState<string[]>(contractInfo.tags ?? []);
const handleSave = useHandleContractSave({
title: "Updated tags successfully!",
address: contractInfo.address,
contractAddress: contractInfo.address,
instantiator: contractInfo.instantiator,
label: contractInfo.label,
created: contractInfo.created,
Expand Down
2 changes: 1 addition & 1 deletion src/lib/components/modal/code/SaveNewCode.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
MAX_CODE_DESCRIPTION_LENGTH,
} from "lib/data";
import { useCodeStore, useEndpoint, useUserKey } from "lib/hooks";
import { getCodeIdInfo } from "lib/services/contract";
import { getCodeIdInfo } from "lib/services/code";

interface ModalProps {
buttonProps: ButtonProps;
Expand Down
2 changes: 1 addition & 1 deletion src/lib/components/modal/contract/AddToOtherList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export function AddToOtherList({

const handleSave = useHandleContractSave({
title: "Action complete!",
address: contractInfo.address,
contractAddress: contractInfo.address,
instantiator: contractInfo.instantiator,
label: contractInfo.label,
created: contractInfo.created,
Expand Down
2 changes: 1 addition & 1 deletion src/lib/components/modal/contract/EditContract.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const EditContract = ({ contractInfo, menuItemProps }: ModalProps) => {

const handleSave = useHandleContractSave({
title: "Action Complete",
address: contractInfo.address,
contractAddress: contractInfo.address,
instantiator: contractInfo.instantiator,
label: contractInfo.label,
created: contractInfo.created,
Expand Down
2 changes: 1 addition & 1 deletion src/lib/components/modal/contract/RemoveContract.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export function RemoveContract({

const handleRemove = useHandleContractSave({
title: `Removed ${displayName} from ${list.label}`,
address: contractInfo.address,
contractAddress: contractInfo.address,
instantiator: contractInfo.instantiator,
label: contractInfo.label,
created: contractInfo.created,
Expand Down
14 changes: 7 additions & 7 deletions src/lib/components/modal/contract/SaveNewContract.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import {
} from "lib/data";
import { useContractStore, useEndpoint } from "lib/hooks";
import { useHandleContractSave } from "lib/hooks/useHandleSave";
import { queryContractWithTime } from "lib/services/contract";
import type { Option, RpcContractError } from "lib/types";
import { queryInstantiateInfo } from "lib/services/contract";
import type { ContractAddr, Option, RpcContractError } from "lib/types";
import { formatSlugName } from "lib/utils";

interface SaveNewContractProps {
Expand All @@ -28,7 +28,7 @@ interface SaveNewContractProps {
}
export function SaveNewContract({ list, buttonProps }: SaveNewContractProps) {
const {
contractAddress: { example: exampleContractAddress },
appContractAddress: { example: exampleContractAddress },
} = useCelatoneApp();
const initialList =
list.value === formatSlugName(INSTANTIATED_LIST_NAME) ? [] : [list];
Expand Down Expand Up @@ -62,8 +62,8 @@ export function SaveNewContract({ list, buttonProps }: SaveNewContractProps) {

// TODO: Abstract query
const { refetch } = useQuery(
["query", "contractWithTime", contractAddress],
async () => queryContractWithTime(endpoint, contractAddress),
["query", "instantiateInfo", contractAddress],
async () => queryInstantiateInfo(endpoint, contractAddress as ContractAddr),
{
enabled: false,
retry: false,
Expand All @@ -72,7 +72,7 @@ export function SaveNewContract({ list, buttonProps }: SaveNewContractProps) {
onSuccess(data) {
setInstantiator(data.instantiator);
setLabel(data.label);
setCreated(data.created);
setCreated(data.createdTime);
setName(data.label);
setStatus({
state: "success",
Expand Down Expand Up @@ -121,7 +121,7 @@ export function SaveNewContract({ list, buttonProps }: SaveNewContractProps) {

const handleSave = useHandleContractSave({
title: `Saved ${name.trim().length ? name : label}`,
address: contractAddress,
contractAddress: contractAddress as ContractAddr,
instantiator,
label,
created,
Expand Down
10 changes: 6 additions & 4 deletions src/lib/components/modal/select-contract/SelectContract.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { DEFAULT_RPC_ERROR } from "lib/data";
import { useContractStore, useEndpoint } from "lib/hooks";
import { useInstantiatedByMe } from "lib/model/contract";
import { queryContract } from "lib/services/contract";
import type { RpcContractError } from "lib/types";
import type { ContractAddr, RpcContractError } from "lib/types";

import { AllContractLists } from "./AllContractLists";
import { ListDetail } from "./ListDetail";
Expand All @@ -39,7 +39,9 @@ export const SelectContract = ({
notSelected,
onContractSelect,
}: SelectContractProps) => {
const { contractAddress } = useCelatoneApp();
const {
appContractAddress: { example: exampleContractAddress },
} = useCelatoneApp();
const { isOpen, onOpen, onClose } = useDisclosure();
const [listSlug, setListSlug] = useState("");

Expand Down Expand Up @@ -71,7 +73,7 @@ export const SelectContract = ({
// TODO: Abstract query
const { refetch, isFetching, isRefetching } = useQuery(
["query", "contract", searchManual],
async () => queryContract(endpoint, searchManual),
async () => queryContract(endpoint, searchManual as ContractAddr),
{
enabled: false,
retry: false,
Expand Down Expand Up @@ -124,7 +126,7 @@ export const SelectContract = ({
const inputValue = e.target.value;
setSearchManual(inputValue);
}}
placeholder={`ex. ${contractAddress.example}`}
placeholder={`ex. ${exampleContractAddress}`}
size="md"
/>
<Button
Expand Down
11 changes: 11 additions & 0 deletions src/lib/data/queries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,14 @@ export const getInstantiatedListByUserQueryDocument = graphql(`
}
}
`);

export const getInstantiateDetailByContractQueryDocument = graphql(`
query getInstantiateDetailByContractQueryDocument($contractAddress: String!) {
contracts(where: { address: { _eq: $contractAddress } }) {
init_msg
transaction {
hash
}
}
}
`);
5 changes: 5 additions & 0 deletions src/lib/gql/gql.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ const documents = {
types.GetInstantiatedCountByUserQueryDocumentDocument,
"\n query getInstantiatedListByUserQueryDocument($walletAddr: String!) {\n contracts(\n where: { transaction: { account: { address: { _eq: $walletAddr } } } }\n limit: 500\n offset: 0\n order_by: { transaction: { block: { timestamp: desc } } }\n ) {\n label\n address\n transaction {\n block {\n timestamp\n }\n }\n }\n }\n":
types.GetInstantiatedListByUserQueryDocumentDocument,
"\n query getInstantiateDetailByContractQueryDocument($contractAddress: String!) {\n contracts(where: { address: { _eq: $contractAddress } }) {\n init_msg\n transaction {\n hash\n }\n }\n }\n":
types.GetInstantiateDetailByContractQueryDocumentDocument,
};

export function graphql(
Expand All @@ -25,6 +27,9 @@ export function graphql(
export function graphql(
source: "\n query getInstantiatedListByUserQueryDocument($walletAddr: String!) {\n contracts(\n where: { transaction: { account: { address: { _eq: $walletAddr } } } }\n limit: 500\n offset: 0\n order_by: { transaction: { block: { timestamp: desc } } }\n ) {\n label\n address\n transaction {\n block {\n timestamp\n }\n }\n }\n }\n"
): typeof documents["\n query getInstantiatedListByUserQueryDocument($walletAddr: String!) {\n contracts(\n where: { transaction: { account: { address: { _eq: $walletAddr } } } }\n limit: 500\n offset: 0\n order_by: { transaction: { block: { timestamp: desc } } }\n ) {\n label\n address\n transaction {\n block {\n timestamp\n }\n }\n }\n }\n"];
export function graphql(
source: "\n query getInstantiateDetailByContractQueryDocument($contractAddress: String!) {\n contracts(where: { address: { _eq: $contractAddress } }) {\n init_msg\n transaction {\n hash\n }\n }\n }\n"
): typeof documents["\n query getInstantiateDetailByContractQueryDocument($contractAddress: String!) {\n contracts(where: { address: { _eq: $contractAddress } }) {\n init_msg\n transaction {\n hash\n }\n }\n }\n"];

export function graphql(source: string): unknown;
export function graphql(source: string) {
Expand Down
Loading