diff --git a/packages/components/dao/GnoDemo.tsx b/packages/components/dao/GnoDemo.tsx index b0bdc25cf9..6d5e56227c 100644 --- a/packages/components/dao/GnoDemo.tsx +++ b/packages/components/dao/GnoDemo.tsx @@ -75,12 +75,12 @@ const DeletePost: React.FC<{ daoId: string }> = ({ daoId }) => { const { data: flagCount } = useQuery( ["flagCount", name, threadId, postId], async () => { - if (network?.kind !== NetworkKind.Gno) { + if (network?.kind !== NetworkKind.Gno || !network.modboardsPkgPath) { return 0; } const client = new GnoJSONRPCProvider(network.endpoint); const boardIdRes = await client.evaluateExpression( - "gno.land/r/demo/modboards_v2", + network.modboardsPkgPath, `GetBoardIDFromName("${name}")` ); const boardIdNum = extractGnoNumber(boardIdRes); @@ -89,7 +89,7 @@ const DeletePost: React.FC<{ daoId: string }> = ({ daoId }) => { } return extractGnoNumber( await client.evaluateExpression( - "gno.land/r/demo/modboards_v2", + network.modboardsPkgPath, `getBoard(${boardIdNum}).flags.GetFlagCount(getFlagID(${threadId}, ${postId}))` ) ); @@ -131,12 +131,12 @@ const DeletePost: React.FC<{ daoId: string }> = ({ daoId }) => { text="Propose delete" loader onPress={wrapWithFeedback(async () => { - if (network?.kind !== NetworkKind.Gno) { + if (network?.kind !== NetworkKind.Gno || !network.modboardsPkgPath) { throw new Error("invalid network"); } const client = new GnoJSONRPCProvider(network.endpoint); const boardIdRes = await client.evaluateExpression( - "gno.land/r/demo/modboards_v2", + network.modboardsPkgPath, `GetBoardIDFromName("${name}")` ); console.log(boardIdRes); diff --git a/packages/hooks/useNSNameOwner.ts b/packages/hooks/useNSNameOwner.ts index fdeb6628c2..baacd0ebbb 100644 --- a/packages/hooks/useNSNameOwner.ts +++ b/packages/hooks/useNSNameOwner.ts @@ -1,7 +1,7 @@ import { GnoJSONRPCProvider } from "@gnolang/gno-js-client"; import { useQuery } from "@tanstack/react-query"; -import { getGnoNetwork } from "../networks"; +import { NetworkKind, getGnoNetwork, getNetwork } from "../networks"; import { getCosmosNameServiceQueryClient } from "../utils/contracts"; import { extractGnoString } from "../utils/gno"; diff --git a/packages/hooks/useNSPrimaryAlias.ts b/packages/hooks/useNSPrimaryAlias.ts index d32d5c0923..72abcc1d82 100644 --- a/packages/hooks/useNSPrimaryAlias.ts +++ b/packages/hooks/useNSPrimaryAlias.ts @@ -54,7 +54,7 @@ const gnoGetUsernameByAddress = async ( const provider = new GnoJSONRPCProvider(network.endpoint); const username = await provider.evaluateExpression( - "gno.land/r/demo/users", + network.nameServiceContractAddress, `GetUserByAddress("${userAddress}").name` ); const gnoUsename = extractGnoString(username); diff --git a/packages/networks/gno-teritori/index.ts b/packages/networks/gno-teritori/index.ts index c1f693004a..d0a3b37135 100644 --- a/packages/networks/gno-teritori/index.ts +++ b/packages/networks/gno-teritori/index.ts @@ -22,5 +22,6 @@ export const gnoTeritoriNetwork: GnoNetworkInfo = { nameServiceDefaultImage: "ipfs://bafkreignptjimiu7wuux6mk6uh4hb4odb6ff62ny4bvdokrhes7g67huse", daoRegistryPkgPath: "gno.land/r/demo/dao_registry_v5", + modboardsPkgPath: "gno.land/r/demo/modboards_v3", gnowebURL: "https://testnet.gno.teritori.com", }; diff --git a/packages/networks/types.ts b/packages/networks/types.ts index 86033e8ce1..0eda004191 100644 --- a/packages/networks/types.ts +++ b/packages/networks/types.ts @@ -86,7 +86,8 @@ export type GnoNetworkInfo = NetworkInfoBase & { nameServiceContractAddress: string; nameServiceDefaultImage: string; gnowebURL: string; - daoRegistryPkgPath: string; + daoRegistryPkgPath?: string; + modboardsPkgPath?: string; }; export type NetworkInfo = diff --git a/packages/utils/gnodao/deploy.ts b/packages/utils/gnodao/deploy.ts index 12ecc6e182..dad9b65718 100644 --- a/packages/utils/gnodao/deploy.ts +++ b/packages/utils/gnodao/deploy.ts @@ -36,7 +36,7 @@ import ( "gno.land/p/demo/daodao/voting_group_v5" "gno.land/p/demo/jsonutil_v2" "gno.land/r/demo/groups_v6" - modboards "gno.land/r/demo/modboards_v3" + modboards "${network.modboardsPkgPath}" "${network.daoRegistryPkgPath}" )