Skip to content

Commit

Permalink
Merge pull request #131 from alleslabs/feat/add-cw2-details
Browse files Browse the repository at this point in the history
add cw2 info data
  • Loading branch information
songwongtp committed Feb 1, 2023
2 parents 535ba0f + 748ed9f commit a8d0861
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Features

- [#131](https://github.com/alleslabs/celatone-frontend/pull/131) Add CW2-related information to contract details page
- [#120](https://github.com/alleslabs/celatone-frontend/pull/120) Add simulate migrate fee and the final migration step
- [#108](https://github.com/alleslabs/celatone-frontend/pull/108) Add migrate options on migrate page and upload new code for migration
- [#130](https://github.com/alleslabs/celatone-frontend/pull/130) Add support for Terra public projects
Expand Down
12 changes: 11 additions & 1 deletion src/lib/model/contract.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ import { useCelatoneApp } from "lib/app-provider";
import { INSTANTIATED_LIST_NAME } from "lib/data";
import { useCodeStore, useContractStore, useLCDEndpoint } from "lib/hooks";
import { useAssetInfos } from "lib/services/assetService";
import type { InstantiateInfo } from "lib/services/contract";
import type { ContractCw2Info, InstantiateInfo } from "lib/services/contract";
import {
queryContractCw2Info,
queryContractBalances,
queryInstantiateInfo,
} from "lib/services/contract";
Expand Down Expand Up @@ -39,6 +40,7 @@ export interface ContractData {
chainId: string;
codeInfo: Option<CodeLocalInfo>;
contractLocalInfo: Option<ContractLocalInfo>;
contractCw2Info: Option<ContractCw2Info>;
instantiateInfo: Option<InstantiateInfo>;
publicProject: {
publicInfo: Option<PublicInfo>;
Expand Down Expand Up @@ -112,6 +114,13 @@ export const useContractData = (
queryInstantiateInfo(endpoint, indexerGraphClient, contractAddress),
{ enabled: !!currentChainRecord }
);

const { data: contractCw2Info } = useQuery(
["query", "contract_cw2_info", endpoint, contractAddress],
async () => queryContractCw2Info(endpoint, contractAddress),
{ enabled: !!currentChainRecord }
);

const { data: contractBalances } = useQuery(
["query", "contractBalances", contractAddress],
async () =>
Expand Down Expand Up @@ -154,6 +163,7 @@ export const useContractData = (
chainId: currentChainRecord.chain.chain_id,
codeInfo,
contractLocalInfo,
contractCw2Info,
instantiateInfo,
publicProject: {
publicInfo,
Expand Down
13 changes: 13 additions & 0 deletions src/lib/pages/contract-details/components/InstantiateInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ const RenderPortId = ({ portId }: { portId: string }) => {

export const InstantiateInfo = ({
contractData: {
contractCw2Info,
instantiateInfo,
chainId,
codeInfo,
Expand Down Expand Up @@ -84,6 +85,18 @@ export const InstantiateInfo = ({
/>
</LabelText>

<LabelText label="CW2 Info">
{contractCw2Info ? (
<Text variant="body2">
{contractCw2Info.contract} ({contractCw2Info.version})
</Text>
) : (
<Text variant="body2" color="text.dark">
No Info
</Text>
)}
</LabelText>

<LabelText
label="Admin Address"
helperText1={
Expand Down
2 changes: 1 addition & 1 deletion src/lib/pages/contract-details/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ const ContractDetailsBody = observer(
jsonAreaHeight="180px"
/>
<JsonInfo
header="Instantiate Messages"
header="Instantiate Message"
jsonString={jsonPrettify(contractData.initMsg ?? "")}
showViewFullButton
defaultExpand
Expand Down
21 changes: 20 additions & 1 deletion src/lib/services/contract.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,16 @@ import type {
Option,
PublicInfo,
} from "lib/types";
import { encode, parseDateDefault } from "lib/utils";
import { encode, libDecode, parseDateDefault } from "lib/utils";

export interface ContractCw2InfoRaw {
data: string;
}

export interface ContractCw2Info {
contract: string;
version: string;
}

interface ContractResponse {
address: ContractAddr;
Expand Down Expand Up @@ -69,6 +78,16 @@ export const queryContract = async (
return data;
};

export const queryContractCw2Info = async (
endpoint: string,
contractAddress: ContractAddr
) => {
const { data } = await axios.get<ContractCw2InfoRaw>(
`${endpoint}/cosmwasm/wasm/v1/contract/${contractAddress}/raw/Y29udHJhY3RfaW5mbw%3D%3D`
);
return JSON.parse(libDecode(data.data)) as ContractCw2Info;
};

export const queryInstantiateInfo = async (
endpoint: string,
indexerGraphClient: GraphQLClient,
Expand Down

2 comments on commit a8d0861

@vercel
Copy link

@vercel vercel bot commented on a8d0861 Feb 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vercel
Copy link

@vercel vercel bot commented on a8d0861 Feb 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.