alleslabs · bkioshn · Mar 13, 2023 · Mar 7, 2023 · Mar 7, 2023 · Mar 7, 2023
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -39,6 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Features
 
+- [#230](https://github.com/alleslabs/celatone-frontend/pull/230) Add cw2info to code table
 - [#228](https://github.com/alleslabs/celatone-frontend/pull/228) Add Faucet testnet page
 - [#79](https://github.com/alleslabs/celatone-frontend/pull/79) Add dropdown menu and wireup up json attach funds
 - [#225](https://github.com/alleslabs/celatone-frontend/pull/225) Add assets section in account details page

diff --git a/src/lib/gql/gql.ts b/src/lib/gql/gql.ts
diff --git a/src/lib/gql/graphql.ts b/src/lib/gql/graphql.ts
@@ -1439,6 +1439,8 @@ export type Codes = {
   contracts: Array<Contracts>;
   /** An aggregate relationship */
   contracts_aggregate: Contracts_Aggregate;
+  cw2_contract?: Maybe<Scalars["String"]>;
+  cw2_version?: Maybe<Scalars["String"]>;
   id: Scalars["Int"];
   /** An object relationship */
   transaction?: Maybe<Transactions>;
@@ -1599,6 +1601,8 @@ export type Codes_Bool_Exp = {
   contract_instantiated?: InputMaybe<Int_Comparison_Exp>;
   contracts?: InputMaybe<Contracts_Bool_Exp>;
   contracts_aggregate?: InputMaybe<Contracts_Aggregate_Bool_Exp>;
+  cw2_contract?: InputMaybe<String_Comparison_Exp>;
+  cw2_version?: InputMaybe<String_Comparison_Exp>;
   id?: InputMaybe<Int_Comparison_Exp>;
   transaction?: InputMaybe<Transactions_Bool_Exp>;
   transaction_id?: InputMaybe<Int_Comparison_Exp>;
@@ -1628,6 +1632,8 @@ export type Codes_Insert_Input = {
   contract_histories?: InputMaybe<Contract_Histories_Arr_Rel_Insert_Input>;
   contract_instantiated?: InputMaybe<Scalars["Int"]>;
   contracts?: InputMaybe<Contracts_Arr_Rel_Insert_Input>;
+  cw2_contract?: InputMaybe<Scalars["String"]>;
+  cw2_version?: InputMaybe<Scalars["String"]>;
   id?: InputMaybe<Scalars["Int"]>;
   transaction?: InputMaybe<Transactions_Obj_Rel_Insert_Input>;
   transaction_id?: InputMaybe<Scalars["Int"]>;
@@ -1639,6 +1645,8 @@ export type Codes_Max_Fields = {
   __typename?: "codes_max_fields";
   access_config_permission?: Maybe<Scalars["String"]>;
   contract_instantiated?: Maybe<Scalars["Int"]>;
+  cw2_contract?: Maybe<Scalars["String"]>;
+  cw2_version?: Maybe<Scalars["String"]>;
   id?: Maybe<Scalars["Int"]>;
   transaction_id?: Maybe<Scalars["Int"]>;
   uploader?: Maybe<Scalars["Int"]>;
@@ -1648,6 +1656,8 @@ export type Codes_Max_Fields = {
 export type Codes_Max_Order_By = {
   access_config_permission?: InputMaybe<Order_By>;
   contract_instantiated?: InputMaybe<Order_By>;
+  cw2_contract?: InputMaybe<Order_By>;
+  cw2_version?: InputMaybe<Order_By>;
   id?: InputMaybe<Order_By>;
   transaction_id?: InputMaybe<Order_By>;
   uploader?: InputMaybe<Order_By>;
@@ -1658,6 +1668,8 @@ export type Codes_Min_Fields = {
   __typename?: "codes_min_fields";
   access_config_permission?: Maybe<Scalars["String"]>;
   contract_instantiated?: Maybe<Scalars["Int"]>;
+  cw2_contract?: Maybe<Scalars["String"]>;
+  cw2_version?: Maybe<Scalars["String"]>;
   id?: Maybe<Scalars["Int"]>;
   transaction_id?: Maybe<Scalars["Int"]>;
   uploader?: Maybe<Scalars["Int"]>;
@@ -1667,6 +1679,8 @@ export type Codes_Min_Fields = {
 export type Codes_Min_Order_By = {
   access_config_permission?: InputMaybe<Order_By>;
   contract_instantiated?: InputMaybe<Order_By>;
+  cw2_contract?: InputMaybe<Order_By>;
+  cw2_version?: InputMaybe<Order_By>;
   id?: InputMaybe<Order_By>;
   transaction_id?: InputMaybe<Order_By>;
   uploader?: InputMaybe<Order_By>;
@@ -1704,6 +1718,8 @@ export type Codes_Order_By = {
   contract_histories_aggregate?: InputMaybe<Contract_Histories_Aggregate_Order_By>;
   contract_instantiated?: InputMaybe<Order_By>;
   contracts_aggregate?: InputMaybe<Contracts_Aggregate_Order_By>;
+  cw2_contract?: InputMaybe<Order_By>;
+  cw2_version?: InputMaybe<Order_By>;
   id?: InputMaybe<Order_By>;
   transaction?: InputMaybe<Transactions_Order_By>;
   transaction_id?: InputMaybe<Order_By>;
@@ -1724,6 +1740,10 @@ export enum Codes_Select_Column {
   /** column name */
   ContractInstantiated = "contract_instantiated",
   /** column name */
+  Cw2Contract = "cw2_contract",
+  /** column name */
+  Cw2Version = "cw2_version",
+  /** column name */
   Id = "id",
   /** column name */
   TransactionId = "transaction_id",
@@ -1736,6 +1756,8 @@ export type Codes_Set_Input = {
   access_config_addresses?: InputMaybe<Scalars["json"]>;
   access_config_permission?: InputMaybe<Scalars["String"]>;
   contract_instantiated?: InputMaybe<Scalars["Int"]>;
+  cw2_contract?: InputMaybe<Scalars["String"]>;
+  cw2_version?: InputMaybe<Scalars["String"]>;
   id?: InputMaybe<Scalars["Int"]>;
   transaction_id?: InputMaybe<Scalars["Int"]>;
   uploader?: InputMaybe<Scalars["Int"]>;
@@ -1805,6 +1827,8 @@ export type Codes_Stream_Cursor_Value_Input = {
   access_config_addresses?: InputMaybe<Scalars["json"]>;
   access_config_permission?: InputMaybe<Scalars["String"]>;
   contract_instantiated?: InputMaybe<Scalars["Int"]>;
+  cw2_contract?: InputMaybe<Scalars["String"]>;
+  cw2_version?: InputMaybe<Scalars["String"]>;
   id?: InputMaybe<Scalars["Int"]>;
   transaction_id?: InputMaybe<Scalars["Int"]>;
   uploader?: InputMaybe<Scalars["Int"]>;
@@ -1836,6 +1860,10 @@ export enum Codes_Update_Column {
   /** column name */
   ContractInstantiated = "contract_instantiated",
   /** column name */
+  Cw2Contract = "cw2_contract",
+  /** column name */
+  Cw2Version = "cw2_version",
+  /** column name */
   Id = "id",
   /** column name */
   TransactionId = "transaction_id",
@@ -6904,6 +6932,8 @@ export type GetCodeListQueryQuery = {
     id: number;
     access_config_permission: string;
     access_config_addresses: any;
+    cw2_contract?: string | null;
+    cw2_version?: string | null;
     contracts_aggregate: {
       __typename?: "contracts_aggregate";
       aggregate?: {
@@ -6926,6 +6956,8 @@ export type GetCodeListByUserQueryQuery = {
     id: number;
     access_config_permission: string;
     access_config_addresses: any;
+    cw2_contract?: string | null;
+    cw2_version?: string | null;
     contracts_aggregate: {
       __typename?: "contracts_aggregate";
       aggregate?: {
@@ -6948,6 +6980,8 @@ export type GetCodeListByIDsQueryQuery = {
     id: number;
     access_config_permission: string;
     access_config_addresses: any;
+    cw2_contract?: string | null;
+    cw2_version?: string | null;
     contracts_aggregate: {
       __typename?: "contracts_aggregate";
       aggregate?: {
@@ -6970,6 +7004,8 @@ export type GetCodeDataByCodeIdQuery = {
     id: number;
     access_config_permission: string;
     access_config_addresses: any;
+    cw2_contract?: string | null;
+    cw2_version?: string | null;
     account: { __typename?: "accounts"; address: string };
     transaction?: {
       __typename?: "transactions";
@@ -6997,6 +7033,8 @@ export type GetCodeListByWalletAddressPaginationQuery = {
     id: number;
     access_config_permission: string;
     access_config_addresses: any;
+    cw2_contract?: string | null;
+    cw2_version?: string | null;
     contracts_aggregate: {
       __typename?: "contracts_aggregate";
       aggregate?: {
@@ -7150,6 +7188,8 @@ export type GetMigrationHistoriesByContractAddressQuery = {
     block: { __typename?: "blocks"; height: number; timestamp: any };
     code: {
       __typename?: "codes";
+      cw2_contract?: string | null;
+      cw2_version?: string | null;
       account: { __typename?: "accounts"; address: string };
     };
   }>;
@@ -7541,6 +7581,11 @@ export const GetCodeListQueryDocument = {
                   kind: "Field",
                   name: { kind: "Name", value: "access_config_addresses" },
                 },
+                {
+                  kind: "Field",
+                  name: { kind: "Name", value: "cw2_contract" },
+                },
+                { kind: "Field", name: { kind: "Name", value: "cw2_version" } },
               ],
             },
           },
@@ -7690,6 +7735,11 @@ export const GetCodeListByUserQueryDocument = {
                   kind: "Field",
                   name: { kind: "Name", value: "access_config_addresses" },
                 },
+                {
+                  kind: "Field",
+                  name: { kind: "Name", value: "cw2_contract" },
+                },
+                { kind: "Field", name: { kind: "Name", value: "cw2_version" } },
               ],
             },
           },
@@ -7809,6 +7859,11 @@ export const GetCodeListByIDsQueryDocument = {
                   kind: "Field",
                   name: { kind: "Name", value: "access_config_addresses" },
                 },
+                {
+                  kind: "Field",
+                  name: { kind: "Name", value: "cw2_contract" },
+                },
+                { kind: "Field", name: { kind: "Name", value: "cw2_version" } },
               ],
             },
           },
@@ -7945,6 +8000,11 @@ export const GetCodeDataByCodeIdDocument = {
                   kind: "Field",
                   name: { kind: "Name", value: "access_config_addresses" },
                 },
+                {
+                  kind: "Field",
+                  name: { kind: "Name", value: "cw2_contract" },
+                },
+                { kind: "Field", name: { kind: "Name", value: "cw2_version" } },
               ],
             },
           },
@@ -8125,6 +8185,11 @@ export const GetCodeListByWalletAddressPaginationDocument = {
                   kind: "Field",
                   name: { kind: "Name", value: "access_config_addresses" },
                 },
+                {
+                  kind: "Field",
+                  name: { kind: "Name", value: "cw2_contract" },
+                },
+                { kind: "Field", name: { kind: "Name", value: "cw2_version" } },
               ],
             },
           },
@@ -9390,6 +9455,14 @@ export const GetMigrationHistoriesByContractAddressDocument = {
                           ],
                         },
                       },
+                      {
+                        kind: "Field",
+                        name: { kind: "Name", value: "cw2_contract" },
+                      },
+                      {
+                        kind: "Field",
+                        name: { kind: "Name", value: "cw2_version" },
+                      },
                     ],
                   },
                 },

diff --git a/src/lib/model/code.ts b/src/lib/model/code.ts
@@ -16,9 +16,9 @@ import type {
   CodeData,
   PublicDetail,
   Option,
-  PublicCodeData,
   HumanAddr,
   CodeInfo,
+  PublicCode,
 } from "lib/types";
 import { InstantiatePermission } from "lib/types";
 
@@ -27,7 +27,7 @@ export interface CodeDataState {
   chainId: string;
   codeData: Option<CodeData>;
   publicProject: {
-    publicCodeData: Option<PublicCodeData>;
+    publicCodeData: Option<PublicCode>;
     publicDetail: Option<PublicDetail>;
   };
 }
@@ -87,6 +87,8 @@ export const useSavedCodes = () => {
       instantiatePermission:
         rawSavedCode?.instantiatePermission ?? InstantiatePermission.UNKNOWN,
       permissionAddresses: rawSavedCode?.permissionAddresses ?? [],
+      cw2Contract: rawSavedCode?.cw2Contract,
+      cw2Version: rawSavedCode?.cw2Version,
       isSaved: true,
     };
   });

diff --git a/src/lib/pages/code-details/index.tsx b/src/lib/pages/code-details/index.tsx
@@ -13,7 +13,7 @@ import { useCodeData } from "lib/model/code";
 import { useCodeStore } from "lib/providers/store";
 import { AmpEvent, AmpTrack } from "lib/services/amplitude";
 import { InstantiatePermission } from "lib/types";
-import { getFirstQueryParam, isCodeId } from "lib/utils";
+import { getCw2Info, getFirstQueryParam, isCodeId } from "lib/utils";
 
 import { CodeInfoSection } from "./components/CodeInfoSection";
 import { CTASection } from "./components/CTASection";
@@ -34,6 +34,8 @@ const CodeDetailsBody = observer(
 
     if (!codeData) return <InvalidCode />;
 
+    const cw2Info = getCw2Info(codeData.cw2Contract, codeData.cw2Version);
+
     return (
       <>
         <Flex align="center" justify="space-between" mt={6}>
@@ -56,10 +58,22 @@ const CodeDetailsBody = observer(
             </Flex>
             <Flex gap={2}>
               <Text fontWeight={500} color="text.dark" variant="body2">
-                Code ID
+                Code ID:
               </Text>
               <ExplorerLink type="code_id" value={codeId.toString()} />
             </Flex>
+            <Flex gap={2}>
+              <Text fontWeight={500} color="text.dark" variant="body2">
+                CW2 Info:
+              </Text>
+              <Text
+                color={cw2Info ? "text.main" : "text.disabled"}
+                variant="body2"
+                wordBreak="break-all"
+              >
+                {cw2Info ?? "N/A"}
+              </Text>
+            </Flex>
           </Flex>
           <CTASection
             id={codeId}
@@ -70,6 +84,8 @@ const CodeDetailsBody = observer(
             }
             permissionAddresses={codeData.permissionAddresses ?? []}
             contractCount={undefined}
+            cw2Contract={undefined}
+            cw2Version={undefined}
           />
         </Flex>
         <Divider borderColor="pebble.700" my={12} />

diff --git a/src/lib/pages/codes/components/CodesTable.tsx b/src/lib/pages/codes/components/CodesTable.tsx
@@ -25,6 +25,7 @@ import {
   CodeNameCell,
 } from "lib/components/table";
 import type { CodeInfo } from "lib/types";
+import { getCw2Info } from "lib/utils";
 
 // Types of Table: Recent Codes / My Stored Codes / My Saved Codes
 type TableType = "recent" | "stored" | "saved";
@@ -47,7 +48,7 @@ interface OtherTBodyProps {
 }
 
 const TEMPLATE_COLUMNS =
-  "max(80px) minmax(320px, 1fr) max(120px) max(160px) minmax(320px, 0.75fr)";
+  "max(80px) minmax(300px, 1fr) minmax(220px, 1fr) max(120px) max(160px) minmax(320px, 0.75fr)";
 
 const StateContainer = ({ children }: { children: ReactNode }) => (
   <VStack
@@ -110,6 +111,7 @@ const CodeTableHead = () => (
   >
     <TableHeaderNoBorder>Code ID</TableHeaderNoBorder>
     <TableHeaderNoBorder>Code Name</TableHeaderNoBorder>
+    <TableHeaderNoBorder>CW2 Info</TableHeaderNoBorder>
     <TableHeaderNoBorder textAlign="center">Contracts</TableHeaderNoBorder>
     <TableHeaderNoBorder>Uploader</TableHeaderNoBorder>
     <TableHeaderNoBorder>Permission</TableHeaderNoBorder>
@@ -121,6 +123,7 @@ const CodeTableRow = ({ code }: CodesRowProps) => {
   const goToCodeDetails = () => {
     navigate({ pathname: `/code/${code.id}` });
   };
+  const cw2Info = getCw2Info(code.cw2Contract, code.cw2Version);
 
   return (
     <Grid
@@ -144,6 +147,14 @@ const CodeTableRow = ({ code }: CodesRowProps) => {
       <TableRowNoBorder>
         <CodeNameCell code={code} />
       </TableRowNoBorder>
+      <TableRowNoBorder>
+        <Text
+          color={cw2Info ? "text.main" : "text.disabled"}
+          wordBreak="break-all"
+        >
+          {cw2Info ?? "N/A"}
+        </Text>
+      </TableRowNoBorder>
       <TableRowNoBorder>
         <Text
           variant="body2"

diff --git a/src/lib/pages/contract-details/components/tables/migration/MigrationHeader.tsx b/src/lib/pages/contract-details/components/tables/migration/MigrationHeader.tsx
@@ -11,6 +11,7 @@ export const MigrationHeader = ({
   <Grid templateColumns={templateColumns}>
     <TableHeader>Code ID</TableHeader>
     <TableHeader>Code Name</TableHeader>
+    <TableHeader>CW2 Info</TableHeader>
     <TableHeader>Sender</TableHeader>
     <TableHeader>Block Height</TableHeader>
     <TableHeader>Timestamp</TableHeader>