Merge pull request #56 from gacogo/commspend

community spend proposal #51
DCFoundation · Jun 17, 2024 · 0b42096 · 0b42096
2 parents 910cfd0 + fe4227d
commit 0b42096
Show file tree

Hide file tree

Showing 5 changed files with 145 additions and 3 deletions.
diff --git a/src/components/ProposalForm.tsx b/src/components/ProposalForm.tsx
@@ -32,7 +32,12 @@ export type SelectorReturnType = ReturnType<
 export type ProposalDetail =
   | { msgType: "textProposal" }
   | { msgType: "coreEvalProposal"; evals: CoreEval[] }
-  | { msgType: "parameterChangeProposal"; changes: ParamChange[] };
+  | { msgType: "parameterChangeProposal"; changes: ParamChange[] }
+  | {
+      msgType: "communityPoolSpendProposal";
+      recipient: string;
+      amount: string;
+    };
 
 interface ProposalFormProps {
   title: string;
@@ -84,6 +89,10 @@ const ProposalForm = forwardRef<ProposalFormMethods, ProposalFormProps>(
             const changes = paramChangeRef.current?.getChanges();
             if (!Array.isArray(changes)) throw new Error("No changes");
             return handleSubmit({ ...args, msgType, changes });
+          } else if (msgType === "communityPoolSpendProposal") {
+            const recipient = (formData.get("recipient") as string) || "";
+            const amount = (formData.get("amount") as string) || "";
+            return handleSubmit({ ...args, msgType, recipient, amount });
           }
         }
       }
@@ -113,7 +122,35 @@ const ProposalForm = forwardRef<ProposalFormMethods, ProposalFormProps>(
               <TitleDescriptionInputs
                 communityForumLink={governanceForumLink}
               />
+              {msgType === "communityPoolSpendProposal" ? (
+                <div className="grid grid-cols-2 gap-[10px] pt-[20px]">
+                  <label
+                    htmlFor="recipient"
+                    className="text-sm font-medium text-blue"
+                  >
+                    Recipient
+                  </label>
+                  <input
+                    type="text"
+                    id="recipient"
+                    name="recipient"
+                    className="col-span-2 mt-0"
+                  />
 
+                  <label
+                    htmlFor="amount"
+                    className="text-sm font-medium text-blue"
+                  >
+                    Amount
+                  </label>
+                  <input
+                    type="text"
+                    id="amount"
+                    name="amount"
+                    className="col-span-2 mt-0"
+                  />
+                </div>
+              ) : null}
               {msgType === "coreEvalProposal" ? (
                 <div className="grid grid-cols-2 gap-[10px] pt-[20px]">
                   <label

diff --git a/src/config/agoric/agoric.spec.tsx b/src/config/agoric/agoric.spec.tsx
@@ -1,5 +1,5 @@
 import "../../installSesLockdown";
-import { render, screen } from "@testing-library/react";
+import { fireEvent, render, screen } from "@testing-library/react";
 import { Router } from "wouter";
 import App from "../../App";
 import { ContextProviders } from "../../contexts/providers";
@@ -26,6 +26,46 @@ describe("Agoric Config", () => {
       "CoreEval Proposal",
       "Install Bundle",
       "Parameter Change Proposal",
+      "Community Pool Spend",
     ]);
   });
+
+  vi.mock("../../hooks/useWallet", () => ({
+    useWallet: vi.fn(() => ({
+      walletAddress: "agoric12se",
+      stargateClient: {
+        simulate: vi.fn(),
+        signAndBroadcast: vi.fn(),
+      },
+    })),
+  }));
+
+  vi.mock("../../lib/signAndBroadcast", () => ({
+    makeSignAndBroadcast: vi.fn(),
+  }));
+  it(" renders comm spend proposal form", async () => {
+
+    render(
+      <Router hook={memoryLocation("/agoric")}>
+        <ContextProviders>
+          <App />
+        </ContextProviders>
+        ,
+      </Router>,
+    );
+    const communityPoolSpendTab = await screen.findByRole("tab", {
+      name: "Community Pool Spend",
+    });
+    fireEvent.click(communityPoolSpendTab);
+
+    const recipientField = await screen.findByLabelText("Recipient");
+    expect(recipientField).toBeTruthy();
+
+    const amountField = await screen.findByLabelText("Amount");
+    expect(amountField).toBeTruthy();
+
+    fireEvent.change(recipientField, { target: { value: "agoric12se" } });
+    fireEvent.change(amountField, { target: { value: "1000000" } });
+
+  });
 });
diff --git a/src/config/agoric/agoric.tsx b/src/config/agoric/agoric.tsx
@@ -12,6 +12,7 @@ import {
   makeTextProposalMsg,
   makeInstallBundleMsg,
   makeParamChangeProposalMsg,
+  makeCommunityPoolSpendProposalMsg,
 } from "../../lib/messageBuilder";
 import { isValidBundle } from "../../utils/validate";
 import { makeSignAndBroadcast } from "../../lib/signAndBroadcast";
@@ -98,6 +99,17 @@ const Agoric = () => {
           proposer: walletAddress,
         });
       }
+
+      if (msgType === "communityPoolSpendProposal") {
+        if (!("recipient" in vals) || !("amount" in vals)) {
+          throw new Error("Missing recipient or amount");
+        }
+        proposalMsg = makeCommunityPoolSpendProposalMsg({
+          ...vals,
+          proposer: walletAddress,
+        });
+      }
+
       if (msgType === "parameterChangeProposal") {
         if (vals.msgType !== "parameterChangeProposal") return;
         proposalMsg = makeParamChangeProposalMsg({
@@ -280,6 +292,19 @@ const Agoric = () => {
               />
             ),
           },
+          {
+            title: "Community Pool Spend",
+            msgType: "communityPoolSpendProposal",
+            content: (
+              <ProposalForm
+                title="Community Pool Spend Proposal"
+                handleSubmit={handleProposal("communityPoolSpendProposal")}
+                description="This is a governance proposal to spend funds from the community pool."
+                governanceForumLink="https://community.agoric.com/c/governance/community-pool-spend-proposals/15"
+                msgType="communityPoolSpendProposal"
+              />
+            ),
+          },
         ]}
       />
     </>

diff --git a/src/index.d.ts b/src/index.d.ts
@@ -22,7 +22,8 @@ declare global {
       | "installBundle"
       | "parameterChangeProposal"
       | "addPSM"
-      | "addVault";
+      | "addVault"
+      | "communityPoolSpendProposal";
     paramType: string;
   }
 

diff --git a/src/lib/messageBuilder.ts b/src/lib/messageBuilder.ts
@@ -8,12 +8,51 @@ import { TextProposal } from "cosmjs-types/cosmos/gov/v1beta1/gov";
 import { ParameterChangeProposal } from "cosmjs-types/cosmos/params/v1beta1/params";
 import { Any } from "cosmjs-types/google/protobuf/any";
 import type { ParamChange } from "cosmjs-types/cosmos/params/v1beta1/params";
+import { CommunityPoolSpendProposal } from "cosmjs-types/cosmos/distribution/v1beta1/distribution";
 
 export const registry = new Registry([
   ...defaultRegistryTypes,
   ["/agoric.swingset.MsgInstallBundle", MsgInstallBundle],
 ]);
 
+export const makeCommunityPoolSpendProposalMsg = ({
+  proposer,
+  recipient,
+  amount,
+  title,
+  description,
+  deposit,
+}: {
+  proposer: string;
+  recipient: string;
+  amount: string;
+  title: string;
+  description: string;
+  deposit?: number | string;
+}) => {
+  const communityPoolSpendProposal: CommunityPoolSpendProposal = {
+    title,
+    description,
+    recipient,
+    amount: coins(amount, "ubld"),
+  };
+  const msgSubmitProposal = {
+    typeUrl: "/cosmos.gov.v1beta1.MsgSubmitProposal",
+    value: {
+      content: {
+        typeUrl: "/cosmos.distribution.v1beta1.CommunityPoolSpendProposal",
+        value: CommunityPoolSpendProposal.encode(
+          communityPoolSpendProposal,
+        ).finish(),
+      },
+      proposer: proposer,
+      ...(deposit &&
+        Number(deposit) && { initialDeposit: coins(deposit, "ubld") }),
+    },
+  };
+  return msgSubmitProposal;
+};
+
 interface MakeTextProposalArgs {
   title: string;
   description: string;