Interact with dao contract functions

dapp/.env.example

@@ -11,5 +11,7 @@ SOROBAN_NETWORK="testnet | public"
 PUBLIC_DEFAULT_FEE="100"
 PUBLIC_DEFAULT_TIMEOUT=30
 
+PUBLIC_VOTING_PERIOD=5 # in days
+
 STORACHA_SING_PRIVATE_KEY=""
 STORACHA_PROOF=""

dapp/src/components/ConnectWallet.astro

@@ -9,12 +9,12 @@
 
 <script>
   import { truncateMiddle } from "../utils/utils";
+  import { kit } from "./stellar-wallets-kit";
   import {
     initializeConnection,
-    kit,
     loadedPublicKey,
     setPublicKey,
-  } from "./stellar-wallets-kit";
+  } from "../service/walletService";
 
   document.addEventListener("astro:page-load", () => {
     initializeConnection();

dapp/src/components/page/governance/ProposalForm.tsx

@@ -59,6 +59,7 @@ const ProposalForm: React.FC = () => {
   const connectedAddress = useStore(connectedPublicKey);
   const projectName = useStore(projectNameForGovernance);
   const [projectMaintainers, setProjectMaintainers] = useState<string[]>([]);
+  const [proposalName, setProposalName] = useState("");
 
   useEffect(() => {
     setIsClient(true);
@@ -112,7 +113,31 @@ const ProposalForm: React.FC = () => {
     },
   };
 
+  const isDescriptionValid = (description: string) => {
+    return description.trim().split(/\s+/).length >= 3;
+  };
+
   const submitProposal = async () => {
+    if (!proposalName) {
+      alert("Proposal name is required");
+      return;
+    }
+
+    if (!isDescriptionValid(approveDescription)) {
+      alert("Approved description must contain at least 3 words.");
+      return;
+    }
+
+    if (!isDescriptionValid(rejectDescription)) {
+      alert("Rejected description must contain at least 3 words.");
+      return;
+    }
+
+    if (!isDescriptionValid(cancelledDescription)) {
+      alert("Cancelled description must contain at least 3 words.");
+      return;
+    }
+
     if (!connectedAddress) {
       alert("Please connect your wallet first");
       return;
@@ -181,12 +206,25 @@ const ProposalForm: React.FC = () => {
 
       const directoryCid = await client.uploadDirectory(files);
 
-      setIsLoading(false);
-      alert(
-        `Proposal submitted successfully! CID: ${getIpfsBasicLink(directoryCid.toString())}`,
+      const { createProposal } = await import("@service/WriteContractService");
+
+      const proposalId = await createProposal(
+        projectName,
+        proposalName,
+        directoryCid.toString(),
+        Date.now() + 86400000 * import.meta.env.PUBLIC_VOTING_PERIOD,
       );
 
-      window.location.href = `/governance?name=${projectName}`;
+      setIsLoading(false);
+      if (proposalId === -1) {
+        alert("Error submitting proposal");
+      } else {
+        alert(
+          `Proposal submitted successfully! Proposal ID: ${proposalId}, CID: ${getIpfsBasicLink(directoryCid.toString())}`,
+        );
+
+        window.location.href = `/governance?name=${projectName}`;
+      }
     } catch (error) {
       throw new Error("Error submitting proposal", {
         cause: error,
@@ -196,6 +234,16 @@ const ProposalForm: React.FC = () => {
 
   return (
     <div>
+      <h3 className="text-base sm:text-lg md:text-2xl font-semibold py-2">
+        Proposal Name
+      </h3>
+      <input
+        type="text"
+        value={proposalName}
+        onChange={(e) => setProposalName(e.target.value)}
+        className="w-full p-2 border border-zinc-700 rounded-md focus:outline-none"
+        placeholder="Enter your proposal name here..."
+      />
       <h3 className="text-base sm:text-lg md:text-2xl font-semibold py-2">
         Proposal Description
       </h3>

dapp/src/components/page/project/Commit.astro

@@ -48,7 +48,7 @@ import PrimaryButton from "../../utils/PrimaryButton.astro";
 <script>
   import { commitHash } from "../../../service/WriteContractService";
   import { loadProjectInfo } from "../../../service/StateService";
-  import { loadedPublicKey } from "../../stellar-wallets-kit";
+  import { loadedPublicKey } from "../../../service/walletService";
   import { latestCommit, projectInfoLoaded } from "../../../utils/store";
 
   document.addEventListener("astro:page-load", () => {

dapp/src/components/page/project/ProjectInfo.astro

@@ -252,7 +252,7 @@ import DonateModal from "./DonateModal.astro";
 <DonateModal />
 
 <script>
-  import { loadedPublicKey } from "../../stellar-wallets-kit";
+  import { loadedPublicKey } from "../../../service/walletService";
   import { updateConfig } from "../../../service/WriteContractService";
   import { getProject } from "../../../service/ReadContractService";
   import {

dapp/src/components/stellar-wallets-kit.ts

@@ -3,7 +3,6 @@ import {
   FREIGHTER_ID,
   StellarWalletsKit,
 } from "@creit.tech/stellar-wallets-kit";
-import { connectedPublicKey } from "utils/store";
 
 const kit: StellarWalletsKit = new StellarWalletsKit({
   modules: allowAllModules(),
@@ -12,25 +11,4 @@ const kit: StellarWalletsKit = new StellarWalletsKit({
   selectedWalletId: FREIGHTER_ID,
 });
 
-const connectionState: { publicKey: string | undefined } = {
-  publicKey: undefined,
-};
-
-function loadedPublicKey(): string | undefined {
-  return connectionState.publicKey;
-}
-
-function setPublicKey(data: string): void {
-  connectionState.publicKey = data;
-  localStorage.setItem("publicKey", data);
-  connectedPublicKey.set(data);
-}
-
-function initializeConnection(): void {
-  const storedPublicKey = localStorage.getItem("publicKey");
-  if (storedPublicKey) {
-    setPublicKey(storedPublicKey);
-  }
-}
-
-export { kit, loadedPublicKey, setPublicKey, initializeConnection };
+export { kit };

dapp/src/env.d.ts

@@ -11,6 +11,7 @@ interface ImportMetaEnv {
   readonly SOROBAN_NETWORK: string;
   readonly PUBLIC_DEFAULT_FEE: string;
   readonly PUBLIC_DEFAULT_TIMEOUT: number;
+  readonly PUBLIC_VOTING_PERIOD: number;
   readonly STORACHA_SING_PRIVATE_KEY: string;
   readonly STORACHA_PROOF: string;
 }

dapp/src/service/PaymentService.ts

@@ -1,4 +1,5 @@
-import { kit, loadedPublicKey } from "../components/stellar-wallets-kit";
+import { kit } from "../components/stellar-wallets-kit";
+import { loadedPublicKey } from "./walletService";
 import * as StellarSdk from "@stellar/stellar-sdk";
 
 async function sendXLM(

dapp/src/service/WriteContractService.ts

@@ -1,4 +1,5 @@
-import { kit, loadedPublicKey } from "../components/stellar-wallets-kit";
+import { kit } from "../components/stellar-wallets-kit";
+import { loadedPublicKey } from "./walletService";
 import Versioning from "../contracts/soroban_versioning";
 
 import { loadedProjectId } from "./StateService";
@@ -123,4 +124,41 @@ async function updateConfig(
   }
 }
 
-export { commitHash, registerProject, updateConfig };
+async function createProposal(
+  project_key: string,
+  title: string,
+  ipfs: string,
+  voting_ends_at: number,
+): Promise<number> {
+  const publicKey = loadedPublicKey();
+
+  if (!publicKey) {
+    alert("Please connect your wallet first");
+    return -1;
+  } else {
+    Versioning.options.publicKey = publicKey;
+  }
+
+  try {
+    const tx = await Versioning.create_proposal({
+      proposer: publicKey,
+      project_key: Buffer.from(project_key, "utf-8"),
+      title: title,
+      ipfs: ipfs,
+      voting_ends_at: BigInt(voting_ends_at),
+    });
+
+    const result = await tx.signAndSend({
+      signTransaction: async (xdr) => {
+        const { signedTxXdr } = await kit.signTransaction(xdr);
+        return signedTxXdr;
+      },
+    });
+    return result.result;
+  } catch (e) {
+    console.error(e);
+    return -1;
+  }
+}
+
+export { commitHash, registerProject, updateConfig, createProposal };

dapp/src/service/walletService.ts

@@ -0,0 +1,24 @@
+import { connectedPublicKey } from "utils/store";
+
+const connectionState: { publicKey: string | undefined } = {
+  publicKey: undefined,
+};
+
+function loadedPublicKey(): string | undefined {
+  return connectionState.publicKey;
+}
+
+function setPublicKey(data: string): void {
+  connectionState.publicKey = data;
+  localStorage.setItem("publicKey", data);
+  connectedPublicKey.set(data);
+}
+
+function initializeConnection(): void {
+  const storedPublicKey = localStorage.getItem("publicKey");
+  if (storedPublicKey) {
+    setPublicKey(storedPublicKey);
+  }
+}
+
+export { loadedPublicKey, setPublicKey, initializeConnection };