test: e2e gno organization deployer

cypress/e2e/gno/organization-creation.cy.ts

@@ -0,0 +1,35 @@
+import { connectWallet, resetChain } from "./lib";
+
+describe("Create an organization flow", () => {
+  it("works", () => {
+    resetChain();
+
+    cy.visit("http://localhost:8081/orgs?network=gno-dev", {
+      timeout: 300000,
+    });
+
+    connectWallet();
+
+    const daoName = "Test Dao";
+    const handle = "testdao";
+    const url =
+      "https://images.unsplash.com/photo-1492571350019-22de08371fd3?fm=jpg&q=60&w=3000&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D";
+    const description = "Test Dao description";
+
+    cy.contains("Create Dao").click();
+
+    cy.get("input[placeholder='Type organization\\'s name here']").type(
+      daoName,
+    );
+    cy.get("input[placeholder='your_organization']").type(handle);
+    cy.get("input[placeholder='https://example.com/preview.png']").type(url);
+    cy.get('[data-testid="organization-description"]').type(description);
+
+    cy.contains("Next: Configure voting").click();
+    cy.contains("Next: Set tokens or members").click();
+    cy.get('[data-testid="member-settings-next"]').click();
+    cy.contains("Confirm & Launch the Organization").click();
+
+    cy.contains("Get Started", { timeout: 10000 }).should("exist");
+  });
+});

networks.json

@@ -4526,6 +4526,8 @@
     "profilePkgPath": "gno.land/r/demo/profile",
     "daoInterfacesPkgPath": "gno.land/p/teritori/dao_interfaces",
     "daoCorePkgPath": "gno.land/p/teritori/dao_core",
+    "daoUtilsPkgPath": "gno.land/p/teritori/dao_utils",
+    "toriPkgPath": "gno.land/r/teritori/tori",
     "nameServiceDefaultImage": "ipfs://bafkreignptjimiu7wuux6mk6uh4hb4odb6ff62ny4bvdokrhes7g67huse",
     "gnowebURL": "http://127.0.0.1:8888",
     "txIndexerURL": "http://127.0.0.1:8546"
@@ -4574,6 +4576,8 @@
     "daoProposalSinglePkgPath": "gno.land/p/teritori/dao_proposal_single",
     "daoInterfacesPkgPath": "gno.land/p/teritori/dao_interfaces",
     "daoCorePkgPath": "gno.land/p/teritori/dao_core",
+    "daoUtilsPkgPath": "gno.land/r/teritori/dao_utils",
+    "toriPkgPath": "gno.land/r/teritori/tori",
     "profilePkgPath": "gno.land/r/demo/profile",
     "txIndexerURL": "https://indexer.portal-loop.gno.testnet.teritori.com"
   },
@@ -4628,7 +4632,9 @@
     "votingGroupPkgPath": "gno.land/p/teritori/dao_voting_group_v2",
     "daoProposalSinglePkgPath": "gno.land/p/teritori/dao_proposal_single_v4",
     "daoInterfacesPkgPath": "gno.land/p/teritori/dao_interfaces_v5",
+    "daoUtilsPkgPath": "",
     "daoCorePkgPath": "gno.land/p/teritori/dao_core_v4",
+    "toriPkgPath": "",
     "gnowebURL": "https://testnet.gno.teritori.com",
     "faucetURL": "https://testnet.gno.teritori.com:5050/?toaddr=$addr"
   },

packages/components/dao/GnoDemo.tsx

@@ -10,10 +10,10 @@ import { NetworkKind, parseUserId } from "../../networks";
 import { adenaVMCall, extractGnoNumber } from "../../utils/gno";
 import {
   GnoDAOUpdateSettings,
-  GnoSingleChoiceProposal,
-  GnoModboardsDeletePostMessage,
-  GnoModboardsCreateMessage,
   GnoMintToriMessage,
+  GnoModboardsCreateMessage,
+  GnoModboardsDeletePostMessage,
+  GnoSingleChoiceProposal,
 } from "../../utils/gnodao/messages";
 import { fontSemibold20 } from "../../utils/style/fonts";
 import { modalMarginPadding } from "../../utils/style/modals";
@@ -376,7 +376,7 @@ const GnoCreateProposal: React.FC<{ daoId: string | undefined }> = ({
                 {
                   caller: selectedWallet.address,
                   send: "",
-                  pkg_path: daoAddress,
+                  pkg_path: "gno.land/r/" + selectedWallet,
                   func: "ProposeJSON",
                   args: ["0", JSON.stringify(propReq)],
                 },

packages/components/socialFeed/SocialActions/FlagModal.tsx

@@ -6,8 +6,11 @@ import { useSelectedNetworkInfo } from "../../../hooks/useSelectedNetwork";
 import useSelectedWallet from "../../../hooks/useSelectedWallet";
 import { mustGetGnoNetwork } from "../../../networks";
 import { TERITORI_FEED_ID } from "../../../utils/feed/constants";
-import { adenaDoContract } from "../../../utils/gno";
-import { neutral77, neutral33 } from "../../../utils/style/colors";
+import {
+  adenaDoContract,
+  AdenaDoContractMessageType,
+} from "../../../utils/gno";
+import { neutral33, neutral77 } from "../../../utils/style/colors";
 import { fontSemibold14, fontSemibold16 } from "../../../utils/style/fonts";
 import { BrandText } from "../../BrandText";
 import FlexRow from "../../FlexRow";
@@ -53,7 +56,7 @@ export const FlagModal: React.FC<FlagModalProps> = ({
     try {
       await adenaDoContract(
         selectedNetworkId || "",
-        [{ type: "/vm.m_call", value: vmCall }],
+        [{ type: AdenaDoContractMessageType.CALL, value: vmCall }],
         {
           gasWanted: 2_000_000,
         },

packages/components/socialFeed/SocialActions/TipModal.tsx

@@ -11,14 +11,17 @@ import { useBalances } from "../../../hooks/useBalances";
 import { useSelectedNetworkInfo } from "../../../hooks/useSelectedNetwork";
 import useSelectedWallet from "../../../hooks/useSelectedWallet";
 import {
-  NetworkKind,
   getStakingCurrency,
   keplrCurrencyFromNativeCurrencyInfo,
+  NetworkKind,
 } from "../../../networks";
 import { prettyPrice } from "../../../utils/coins";
 import { defaultSocialFeedFee } from "../../../utils/fee";
 import { TERITORI_FEED_ID } from "../../../utils/feed/constants";
-import { adenaDoContract } from "../../../utils/gno";
+import {
+  adenaDoContract,
+  AdenaDoContractMessageType,
+} from "../../../utils/gno";
 import { neutral77, primaryColor } from "../../../utils/style/colors";
 import { fontSemibold13, fontSemibold14 } from "../../../utils/style/fonts";
 import { BrandText } from "../../BrandText";
@@ -95,7 +98,7 @@ export const TipModal: React.FC<{
       try {
         await adenaDoContract(
           selectedNetworkId || "",
-          [{ type: "/vm.m_call", value: vmCall }],
+          [{ type: AdenaDoContractMessageType.CALL, value: vmCall }],
           {
             gasWanted: 1_000_000,
           },

packages/components/socialFeed/modals/FlagConfirmModal.tsx

@@ -7,7 +7,10 @@ import { useFeedbacks } from "../../../context/FeedbacksProvider";
 import { useSelectedNetworkId } from "../../../hooks/useSelectedNetwork";
 import useSelectedWallet from "../../../hooks/useSelectedWallet";
 import { mustGetGnoNetwork } from "../../../networks";
-import { adenaDoContract } from "../../../utils/gno";
+import {
+  adenaDoContract,
+  AdenaDoContractMessageType,
+} from "../../../utils/gno";
 import { GnoDAOVoteRequest } from "../../../utils/gnodao/messages";
 import { neutral77 } from "../../../utils/style/colors";
 import {
@@ -74,7 +77,7 @@ export const FlagConfirmModal: React.FC<FlagConfirmModalProps> = ({
 
       const txHash = await adenaDoContract(
         selectedNetworkId,
-        [{ type: "/vm.m_call", value: vmCall }],
+        [{ type: AdenaDoContractMessageType.CALL, value: vmCall }],
         {
           gasWanted: 2_000_000,
         },

packages/components/user/modals/EditProfileModal.tsx

@@ -6,8 +6,8 @@ import React, { useMemo } from "react";
 import { View } from "react-native";
 
 import {
-  ExecuteMsg as TNSExecuteMsg,
   Metadata,
+  ExecuteMsg as TNSExecuteMsg,
 } from "../../../contracts-clients/teritori-name-service/TeritoriNameService.types";
 import { EditProfileForm } from "../forms/EditProfileForm";
 import { TNSModalCommonProps } from "../types";
@@ -22,7 +22,12 @@ import { useNSUserInfo } from "@/hooks/useNSUserInfo";
 import { useRunOrProposeTransaction } from "@/hooks/useRunOrProposeTransaction";
 import useSelectedWallet from "@/hooks/useSelectedWallet";
 import { getNetwork, NetworkKind, UserKind } from "@/networks";
-import { adenaDoContract, AdenaDoContractMessage, VmCall } from "@/utils/gno";
+import {
+  adenaDoContract,
+  AdenaDoContractMessage,
+  AdenaDoContractMessageType,
+  VmCall,
+} from "@/utils/gno";
 import { neutral17, neutral77 } from "@/utils/style/colors";
 import { fontMedium16 } from "@/utils/style/fonts";
 import { EMPTY_PROFILE, ProfileData } from "@/utils/upp";
@@ -183,7 +188,7 @@ export const EditProfileModal: React.FC<EditProfileModalProps> = ({
         func: "Register",
         args: ["", usernameValue, ""],
       };
-      msgs.push({ type: "/vm.m_call", value: vmCall });
+      msgs.push({ type: AdenaDoContractMessageType.CALL, value: vmCall });
     }
 
     // FIXME: the contract supports only update data one by one
@@ -242,7 +247,7 @@ export const EditProfileModal: React.FC<EditProfileModalProps> = ({
         args: [field, val],
       };
 
-      msgs.push({ type: "/vm.m_call", value: vmCall });
+      msgs.push({ type: AdenaDoContractMessageType.CALL, value: vmCall });
     }
 
     if (msgs.length === 0) {

packages/context/WalletsProvider/gnotest/index.tsx

@@ -1,10 +1,12 @@
 import {
   GnoJSONRPCProvider,
   GnoWallet,
+  MemFile,
+  MemPackage,
   MsgSend,
   decodeTxMessages,
 } from "@gnolang/gno-js-client";
-import { TxFee, TransactionEndpoint, Tx } from "@gnolang/tm2-js-client";
+import { TransactionEndpoint, Tx, TxFee } from "@gnolang/tm2-js-client";
 import Long from "long";
 import React from "react";
 import { Pressable } from "react-native";
@@ -16,7 +18,11 @@ import { getUserId } from "@/networks";
 import { gnoDevNetwork } from "@/networks/gno-dev";
 import { setSelectedWalletId } from "@/store/slices/settings";
 import { useAppDispatch } from "@/store/store";
-import { RequestDocontractMessage } from "@/utils/gno";
+import {
+  AdenaDoContractMessage,
+  AdenaDoContractMessageType,
+  RequestDocontractMessage,
+} from "@/utils/gno";
 import { WalletProvider } from "@/utils/walletProvider";
 
 type UseGnotestResult = [true, boolean, Wallet[]] | [false, boolean, undefined];
@@ -268,7 +274,10 @@ const setupAdenaMock = () => {
           throw new Error("Wallet not connected");
         }
         const msg = req.messages[0];
-        if (msg.type !== "/vm.m_call") {
+        if (
+          msg.type !== AdenaDoContractMessageType.CALL &&
+          msg.type !== AdenaDoContractMessageType.ADD_PKG
+        ) {
           throw new Error("Unsupported message type: " + msg.type);
         }
         const txFee: TxFee = {
@@ -283,14 +292,19 @@ const setupAdenaMock = () => {
           console.log("docontract sendAmount", sendAmount);
           sendMap.set("ugnot", +sendAmount);
         }
-        const res = await state.wallet.callMethod(
-          msg.value.pkg_path,
-          msg.value.func,
-          msg.value.args,
-          TransactionEndpoint.BROADCAST_TX_COMMIT,
-          sendMap,
-          txFee,
-        );
+        let res;
+        if (msg.type === AdenaDoContractMessageType.CALL) {
+          res = await state.wallet.callMethod(
+            msg.value.pkg_path,
+            msg.value.func,
+            msg.value.args,
+            TransactionEndpoint.BROADCAST_TX_COMMIT,
+            sendMap,
+            txFee,
+          );
+        } else {
+          res = await deployPackage(state.wallet, msg, sendMap, txFee);
+        }
         return {
           status: "success",
           data: {
@@ -313,6 +327,29 @@ const setupAdenaMock = () => {
   };
 };
 
+const deployPackage = async (
+  wallet: GnoWallet,
+  msg: AdenaDoContractMessage,
+  funds: Map<string, number> | undefined,
+  txFee: TxFee,
+) => {
+  const files: MemFile[] = msg.value.package.files;
+
+  const pkg: MemPackage = {
+    name: msg.value.package.name,
+    path: msg.value.package.path,
+    files,
+  };
+
+  const tx = await wallet.deployPackage(
+    pkg,
+    TransactionEndpoint.BROADCAST_TX_COMMIT,
+    funds,
+    txFee,
+  );
+  return tx;
+};
+
 export const useGnotest: () => UseGnotestResult = () => {
   const { wallet, address } = useGnotestStore();
   const wallets: Wallet[] = [];

packages/hooks/feed/useFeedPosting.ts

@@ -13,16 +13,16 @@ import { useBalances } from "../useBalances";
 
 import { signingSocialFeedClient } from "@/client-creators/socialFeedClient";
 import {
-  parseUserId,
   getStakingCurrency,
   mustGetCosmosNetwork,
   NetworkKind,
+  parseUserId,
 } from "@/networks";
 import { prettyPrice } from "@/utils/coins";
 import { defaultSocialFeedFee } from "@/utils/fee";
 import { TERITORI_FEED_ID } from "@/utils/feed/constants";
-import { FeedPostingStepId, feedPostingStep } from "@/utils/feed/posting";
-import { adenaDoContract } from "@/utils/gno";
+import { feedPostingStep, FeedPostingStepId } from "@/utils/feed/posting";
+import { adenaDoContract, AdenaDoContractMessageType } from "@/utils/gno";
 import { PostCategory } from "@/utils/types/feed";
 
 export const useFeedPosting = (
@@ -124,7 +124,7 @@ export const useFeedPosting = (
 
           const txHash = await adenaDoContract(
             network.id,
-            [{ type: "/vm.m_call", value: vmCall }],
+            [{ type: AdenaDoContractMessageType.CALL, value: vmCall }],
             { gasWanted: 2_000_000 },
           );
 

packages/hooks/feed/useSocialReactions.ts

@@ -15,7 +15,7 @@ import {
   NetworkKind,
 } from "@/networks";
 import { TERITORI_FEED_ID } from "@/utils/feed/constants";
-import { adenaDoContract } from "@/utils/gno";
+import { adenaDoContract, AdenaDoContractMessageType } from "@/utils/gno";
 import {
   DISLIKE_EMOJI,
   getUpdatedReactions,
@@ -77,7 +77,7 @@ export const useSocialReactions = ({
     };
     const txHash = await adenaDoContract(
       post.networkId,
-      [{ type: "/vm.m_call", value: vmCall }],
+      [{ type: AdenaDoContractMessageType.CALL, value: vmCall }],
       {
         gasWanted: 2_000_000,
       },

packages/networks/gno-dev/index.ts

@@ -47,9 +47,10 @@ export const gnoDevNetwork: GnoNetworkInfo = {
   votingGroupPkgPath: "gno.land/p/teritori/dao_voting_group",
   daoProposalSinglePkgPath: "gno.land/p/teritori/dao_proposal_single",
   profilePkgPath: "gno.land/r/demo/profile",
-
   daoInterfacesPkgPath: "gno.land/p/teritori/dao_interfaces",
   daoCorePkgPath: "gno.land/p/teritori/dao_core",
+  daoUtilsPkgPath: "gno.land/p/teritori/dao_utils",
+  toriPkgPath: "gno.land/r/teritori/tori",
   nameServiceDefaultImage:
     "ipfs://bafkreignptjimiu7wuux6mk6uh4hb4odb6ff62ny4bvdokrhes7g67huse",
   gnowebURL: "http://127.0.0.1:8888",

packages/networks/gno-portal/index.ts

@@ -38,6 +38,8 @@ export const gnoPortalNetwork: GnoNetworkInfo = {
   daoProposalSinglePkgPath: "gno.land/p/teritori/dao_proposal_single",
   daoInterfacesPkgPath: "gno.land/p/teritori/dao_interfaces",
   daoCorePkgPath: "gno.land/p/teritori/dao_core",
+  daoUtilsPkgPath: "gno.land/r/teritori/dao_utils",
+  toriPkgPath: "gno.land/r/teritori/tori",
   profilePkgPath: "gno.land/r/demo/profile",
   txIndexerURL: "https://indexer.portal-loop.gno.testnet.teritori.com",
 };

packages/networks/gno-teritori/index.ts

@@ -42,7 +42,9 @@ export const gnoTeritoriNetwork: GnoNetworkInfo = {
   votingGroupPkgPath: "gno.land/p/teritori/dao_voting_group_v2",
   daoProposalSinglePkgPath: "gno.land/p/teritori/dao_proposal_single_v4",
   daoInterfacesPkgPath: "gno.land/p/teritori/dao_interfaces_v5",
+  daoUtilsPkgPath: "", //TODO: fill with the correct path
   daoCorePkgPath: "gno.land/p/teritori/dao_core_v4",
+  toriPkgPath: "", //TODO: fill with the correct path
   gnowebURL: "https://testnet.gno.teritori.com",
   faucetURL: "https://testnet.gno.teritori.com:5050/?toaddr=$addr",
 };

packages/networks/types.ts

@@ -119,6 +119,8 @@ export type GnoNetworkInfo = NetworkInfoBase & {
   daoInterfacesPkgPath?: string;
   daoCorePkgPath?: string;
   groupsPkgPath?: string;
+  daoUtilsPkgPath?: string;
+  toriPkgPath?: string;
   profilePkgPath?: string;
   faucetURL?: string;
   txIndexerURL?: string;

packages/screens/Organizations/components/CreateDAOSection.tsx

@@ -131,6 +131,7 @@ export const CreateDAOSection: React.FC<CreateDAOSectionProps> = ({
               // isAsterickSign
               multiline
               numberOfLines={3}
+              testID="organization-description"
             />
           </View>
         </View>