feat: (contract details) use instantiated height from indexer as fall…

…back
alleslabs · May 31, 2023 · a045a64 · a045a64
1 parent 2b3734b
commit a045a64
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -57,6 +57,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Improvements
 
+- [#364](https://github.com/alleslabs/celatone-frontend/pull/364) (Contract Details) use instantiated height and time from indexer as fallback
 - [#323](https://github.com/alleslabs/celatone-frontend/pull/323) Revise back button and breadcrumb components
 - [#339](https://github.com/alleslabs/celatone-frontend/pull/339) Update all routes to plural form, and patch all codes
 - [#334](https://github.com/alleslabs/celatone-frontend/pull/334) Change `osmo-test-4` to `osmo-test-5`, fix tx service when accountId is undefined

diff --git a/src/lib/gql/gql.ts b/src/lib/gql/gql.ts
@@ -29,7 +29,7 @@ const documents = {
     types.GetInstantiatedListByUserQueryDocumentDocument,
   "\n  query getInstantiatedCountByUserQueryDocument($walletAddr: String!) {\n    contracts_aggregate(\n      where: { accountByInitBy: { address: { _eq: $walletAddr } } }\n    ) {\n      aggregate {\n        count\n      }\n    }\n  }\n":
     types.GetInstantiatedCountByUserQueryDocumentDocument,
-  '\n  query getInstantiateDetailByContractQueryDocument($contractAddress: String!) {\n    contracts_by_pk(address: $contractAddress) {\n      init_msg\n      transaction {\n        hash\n      }\n      contract_proposals(\n        where: {\n          proposal: {\n            type: {\n              _in: [\n                "InstantiateContract"\n                "InstantiateContract2"\n                "SoftwareUpgrade"\n              ]\n            }\n          }\n        }\n        order_by: { proposal: { id: asc } }\n        limit: 1\n      ) {\n        proposal {\n          id\n          title\n        }\n      }\n    }\n  }\n':
+  '\n  query getInstantiateDetailByContractQueryDocument($contractAddress: String!) {\n    contracts_by_pk(address: $contractAddress) {\n      init_msg\n      transaction {\n        hash\n        block_height\n        block {\n          timestamp\n        }\n      }\n      contract_proposals(\n        where: {\n          proposal: {\n            type: {\n              _in: [\n                "InstantiateContract"\n                "InstantiateContract2"\n                "SoftwareUpgrade"\n              ]\n            }\n          }\n        }\n        order_by: { proposal: { id: asc } }\n        limit: 1\n      ) {\n        proposal {\n          id\n          title\n        }\n      }\n    }\n  }\n':
     types.GetInstantiateDetailByContractQueryDocumentDocument,
   "\n  query getAdminByContractAddressesQueryDocument(\n    $contractAddresses: [String!]!\n  ) {\n    contracts(where: { address: { _in: $contractAddresses } }) {\n      address\n      admin: account {\n        address\n      }\n    }\n  }\n":
     types.GetAdminByContractAddressesQueryDocumentDocument,
@@ -117,8 +117,8 @@ export function graphql(
   source: "\n  query getInstantiatedCountByUserQueryDocument($walletAddr: String!) {\n    contracts_aggregate(\n      where: { accountByInitBy: { address: { _eq: $walletAddr } } }\n    ) {\n      aggregate {\n        count\n      }\n    }\n  }\n"
 ): typeof documents["\n  query getInstantiatedCountByUserQueryDocument($walletAddr: String!) {\n    contracts_aggregate(\n      where: { accountByInitBy: { address: { _eq: $walletAddr } } }\n    ) {\n      aggregate {\n        count\n      }\n    }\n  }\n"];
 export function graphql(
-  source: '\n  query getInstantiateDetailByContractQueryDocument($contractAddress: String!) {\n    contracts_by_pk(address: $contractAddress) {\n      init_msg\n      transaction {\n        hash\n      }\n      contract_proposals(\n        where: {\n          proposal: {\n            type: {\n              _in: [\n                "InstantiateContract"\n                "InstantiateContract2"\n                "SoftwareUpgrade"\n              ]\n            }\n          }\n        }\n        order_by: { proposal: { id: asc } }\n        limit: 1\n      ) {\n        proposal {\n          id\n          title\n        }\n      }\n    }\n  }\n'
-): typeof documents['\n  query getInstantiateDetailByContractQueryDocument($contractAddress: String!) {\n    contracts_by_pk(address: $contractAddress) {\n      init_msg\n      transaction {\n        hash\n      }\n      contract_proposals(\n        where: {\n          proposal: {\n            type: {\n              _in: [\n                "InstantiateContract"\n                "InstantiateContract2"\n                "SoftwareUpgrade"\n              ]\n            }\n          }\n        }\n        order_by: { proposal: { id: asc } }\n        limit: 1\n      ) {\n        proposal {\n          id\n          title\n        }\n      }\n    }\n  }\n'];
+  source: '\n  query getInstantiateDetailByContractQueryDocument($contractAddress: String!) {\n    contracts_by_pk(address: $contractAddress) {\n      init_msg\n      transaction {\n        hash\n        block_height\n        block {\n          timestamp\n        }\n      }\n      contract_proposals(\n        where: {\n          proposal: {\n            type: {\n              _in: [\n                "InstantiateContract"\n                "InstantiateContract2"\n                "SoftwareUpgrade"\n              ]\n            }\n          }\n        }\n        order_by: { proposal: { id: asc } }\n        limit: 1\n      ) {\n        proposal {\n          id\n          title\n        }\n      }\n    }\n  }\n'
+): typeof documents['\n  query getInstantiateDetailByContractQueryDocument($contractAddress: String!) {\n    contracts_by_pk(address: $contractAddress) {\n      init_msg\n      transaction {\n        hash\n        block_height\n        block {\n          timestamp\n        }\n      }\n      contract_proposals(\n        where: {\n          proposal: {\n            type: {\n              _in: [\n                "InstantiateContract"\n                "InstantiateContract2"\n                "SoftwareUpgrade"\n              ]\n            }\n          }\n        }\n        order_by: { proposal: { id: asc } }\n        limit: 1\n      ) {\n        proposal {\n          id\n          title\n        }\n      }\n    }\n  }\n'];
 export function graphql(
   source: "\n  query getAdminByContractAddressesQueryDocument(\n    $contractAddresses: [String!]!\n  ) {\n    contracts(where: { address: { _in: $contractAddresses } }) {\n      address\n      admin: account {\n        address\n      }\n    }\n  }\n"
 ): typeof documents["\n  query getAdminByContractAddressesQueryDocument(\n    $contractAddresses: [String!]!\n  ) {\n    contracts(where: { address: { _in: $contractAddresses } }) {\n      address\n      admin: account {\n        address\n      }\n    }\n  }\n"];

diff --git a/src/lib/gql/graphql.ts b/src/lib/gql/graphql.ts
@@ -12351,7 +12351,12 @@ export type GetInstantiateDetailByContractQueryDocumentQuery = {
   contracts_by_pk?: {
     __typename?: "contracts";
     init_msg?: string | null;
-    transaction?: { __typename?: "transactions"; hash: any } | null;
+    transaction?: {
+      __typename?: "transactions";
+      hash: any;
+      block_height: number;
+      block: { __typename?: "blocks"; timestamp: any };
+    } | null;
     contract_proposals: Array<{
       __typename?: "contract_proposals";
       proposal: { __typename?: "proposals"; id: number; title: string };
@@ -14236,6 +14241,23 @@ export const GetInstantiateDetailByContractQueryDocumentDocument = {
                     kind: "SelectionSet",
                     selections: [
                       { kind: "Field", name: { kind: "Name", value: "hash" } },
+                      {
+                        kind: "Field",
+                        name: { kind: "Name", value: "block_height" },
+                      },
+                      {
+                        kind: "Field",
+                        name: { kind: "Name", value: "block" },
+                        selectionSet: {
+                          kind: "SelectionSet",
+                          selections: [
+                            {
+                              kind: "Field",
+                              name: { kind: "Name", value: "timestamp" },
+                            },
+                          ],
+                        },
+                      },
                     ],
                   },
                 },

diff --git a/src/lib/model/contract.ts b/src/lib/model/contract.ts
@@ -167,6 +167,10 @@ export const useContractData = (
       initTxHash: instantiateDetail?.initTxHash,
       initProposalId: instantiateDetail?.initProposalId,
       initProposalTitle: instantiateDetail?.initProposalTitle,
+      createdHeight:
+        instantiateInfo?.createdHeight ?? instantiateDetail?.createdHeight,
+      createdTime:
+        instantiateInfo?.createdTime ?? instantiateDetail?.createdTime,
     },
     isLoading:
       isInstantiateInfoLoading ||

diff --git a/src/lib/pages/contract-details/components/InstantiateInfo.tsx b/src/lib/pages/contract-details/components/InstantiateInfo.tsx
@@ -101,6 +101,8 @@ export const InstantiateInfo = ({
     initTxHash,
     initProposalId,
     initProposalTitle,
+    createdHeight,
+    createdTime,
   },
 }: InstantiateInfoProps) => {
   const getAddressType = useGetAddressType();
@@ -163,30 +165,21 @@ export const InstantiateInfo = ({
 
       <Divider border="1px solid" borderColor="gray.700" />
 
-      {instantiateInfo &&
-        (instantiateInfo.createdHeight ? (
-          <LabelText
-            label="Instantiated Block Height"
-            helperText1={
-              instantiateInfo.createdTime
-                ? formatUTC(instantiateInfo.createdTime)
-                : undefined
-            }
-            helperText2={
-              instantiateInfo.createdTime
-                ? dateFromNow(instantiateInfo.createdTime)
-                : undefined
-            }
-          >
-            <ExplorerLink
-              type="block_height"
-              value={instantiateInfo.createdHeight.toString()}
-              showCopyOnHover
-            />
-          </LabelText>
-        ) : (
-          <LabelText label="Instantiated Block Height">N/A</LabelText>
-        ))}
+      {createdHeight ? (
+        <LabelText
+          label="Instantiated Block Height"
+          helperText1={createdTime ? formatUTC(createdTime) : undefined}
+          helperText2={createdTime ? dateFromNow(createdTime) : undefined}
+        >
+          <ExplorerLink
+            type="block_height"
+            value={createdHeight.toString()}
+            showCopyOnHover
+          />
+        </LabelText>
+      ) : (
+        <LabelText label="Instantiated Block Height">N/A</LabelText>
+      )}
 
       <LabelText
         label="Instantiated by"

diff --git a/src/lib/query/contract.ts b/src/lib/query/contract.ts
@@ -35,6 +35,10 @@ export const getInstantiateDetailByContractQueryDocument = graphql(`
       init_msg
       transaction {
         hash
+        block_height
+        block {
+          timestamp
+        }
       }
       contract_proposals(
         where: {

diff --git a/src/lib/services/contractService.ts b/src/lib/services/contractService.ts
@@ -31,6 +31,8 @@ import type {
 import { parseDate, parseTxHashOpt, parseDateOpt } from "lib/utils";
 
 interface InstantiateDetail {
+  createdHeight: Option<number>;
+  createdTime: Option<Date>;
   initMsg: Option<string>;
   initTxHash: Option<string>;
   initProposalId: Option<number>;
@@ -136,6 +138,10 @@ export const useInstantiateDetailByContractQuery = (
     return indexerGraphClient
       .request(getInstantiateDetailByContractQueryDocument, { contractAddress })
       .then(({ contracts_by_pk }) => ({
+        createdHeight: contracts_by_pk?.transaction?.block_height,
+        createdTime: parseDateOpt(
+          contracts_by_pk?.transaction?.block.timestamp
+        ),
         initMsg: contracts_by_pk?.init_msg,
         initTxHash: parseTxHashOpt(contracts_by_pk?.transaction?.hash),
         initProposalId: contracts_by_pk?.contract_proposals.at(0)?.proposal.id,

diff --git a/src/lib/types/contract.ts b/src/lib/types/contract.ts
@@ -58,4 +58,6 @@ export interface ContractData {
   initTxHash: Option<string>;
   initProposalId: Option<number>;
   initProposalTitle: Option<string>;
+  createdHeight: Option<number>;
+  createdTime: Option<Date>;
 }