feat(govdao): add proposal fee-based for non-member

examples/gno.land/r/gov/dao/v3/impl/govdao.gno

@@ -2,6 +2,7 @@ package impl
 
 import (
 	"chain"
+	"chain/banker"
 	"chain/runtime"
 	"errors"
 
@@ -13,6 +14,9 @@ import (
 
 var ErrMemberNotFound = errors.New("member not found")
 
+// ProposalFeeAmount is the fee required for non-members to create proposals (in ugnot)
+var ProposalFeeAmount int64 = 1_000_000 // 1 GNOT
+
 type GovDAO struct {
 	pss    ProposalsStatuses
 	render *render
@@ -64,11 +68,18 @@ func (g *GovDAO) PreCreateProposal(r dao.ProposalRequest) (address, error) {
 			runtime.CurrentRealm(), runtime.PreviousRealm()))
 	}
 
-	// Verify that the one creating the proposal is a member.
 	caller := runtime.OriginCaller()
 	mem, _ := getMembers(cross).GetMember(caller)
+
+	// If the caller is not a member, they must pay a fee
 	if mem == nil {
-		return caller, errors.New("only members can create new proposals")
+		sent := banker.OriginSend()
+		if len(sent) == 0 || sent.AmountOf("ugnot") < ProposalFeeAmount {
+			return caller, errors.New(ufmt.Sprintf(
+				"non-members must send %dugnot to create a proposal",
+				ProposalFeeAmount,
+			))
+		}
 	}
 
 	return caller, nil
@@ -195,3 +206,17 @@ func (g *GovDAO) isValidCall() bool {
 
 	return false
 }
+
+// SetProposalFeeAmount updates the proposal fee amount for non-members.
+func (g *GovDAO) SetProposalFeeAmount(amount int64) error {
+	if !g.isValidCall() {
+		return errors.New("proposal fee amount can only be changed through a proposal")
+	}
+
+	if amount < 0 {
+		return errors.New("proposal fee amount must be non-negative")
+	}
+
+	ProposalFeeAmount = amount
+	return nil
+}

examples/gno.land/r/gov/dao/v3/impl/govdao_test.gno

@@ -5,7 +5,10 @@ import (
 	"strings"
 	"testing"
 
+	"chain"
+
 	"gno.land/p/nt/testutils"
+	"gno.land/p/nt/uassert"
 	"gno.land/p/nt/urequire"
 	"gno.land/r/gov/dao"
 	"gno.land/r/gov/dao/v3/memberstore"
@@ -87,7 +90,7 @@ func TestCreateProposalAndVote(cur realm, t *testing.T) {
 		dao.MustCreateProposal(cross, NewAddMemberRequest(cur, nm1, memberstore.T3, portfolio))
 	})
 
-	urequire.AbortsWithMessage(t, "proposer is not a member", func(cur realm) {
+	uassert.AbortsContains(t, "proposal creation must be done directly by a user or through the r/gov/dao proxy", func(cur realm) {
 		dao.MustCreateProposal(cross, NewAddMemberRequest(cur, nm1, memberstore.T2, portfolio))
 	})
 
@@ -216,9 +219,8 @@ func TestUpgradeDaoImplementation(t *testing.T) {
 	testing.SetOriginCaller(noMember)
 	testing.SetRealm(testing.NewCodeRealm("gno.land/r/gov/dao/v3/impl"))
 
-	urequire.PanicsWithMessage(t, "proposer is not a member", func() {
-		NewUpgradeDaoImplRequest(govDAO, "gno.land/r/gov/dao/v4/impl", "Something happened and we have to fix it.")
-	})
+	testing.SetOriginSend(chain.Coins{chain.Coin{Denom: "ugnot", Amount: ProposalFeeAmount}}) // 1 GNOT
+	NewUpgradeDaoImplRequest(govDAO, "gno.land/r/gov/dao/v4/impl", "Something happened and we have to fix it.")
 
 	testing.SetOriginCaller(m1)
 	testing.SetRealm(testing.NewCodeRealm("gno.land/r/gov/dao/v3/impl"))
@@ -275,6 +277,38 @@ func TestUpgradeDaoImplementation(t *testing.T) {
 	urequire.Equal(t, true, contains(dao.Render("7"), "YES PERCENT: 68.42105263157895%"))
 }
 
+func TestNonMemberProposalFee(cur realm, t *testing.T) {
+	loadMembers()
+
+	portfolio := "# This is my portfolio:\n\n- THINGS"
+
+	testing.SetOriginCaller(noMember)
+
+	// Test: Non-member without fee should fail with fee message
+	_, err := govDAO.PreCreateProposal(NewAddMemberRequest(cur, noMember, memberstore.T2, portfolio))
+	urequire.Error(t, err)
+	urequire.ErrorContains(t, err, "non-members must send 1000000ugnot to create a proposal")
+
+	// Test: Non-member with insufficient fee should fail
+	testing.SetOriginSend(chain.Coins{chain.Coin{Denom: "ugnot", Amount: 500000}}) // 0.5 GNOT - insufficient
+	_, err = govDAO.PreCreateProposal(NewAddMemberRequest(cur, noMember, memberstore.T2, portfolio))
+	urequire.Error(t, err)
+	urequire.ErrorContains(t, err, "non-members must send 1000000ugnot to create a proposal")
+
+	// Test: Non-member with correct fee should succeed
+	testing.SetOriginSend(chain.Coins{chain.Coin{Denom: "ugnot", Amount: ProposalFeeAmount}}) // 1 GNOT
+	_, err = govDAO.PreCreateProposal(NewAddMemberRequest(cur, noMember, memberstore.T2, portfolio))
+	urequire.NoError(t, err)
+
+	// Reset OrigSend
+	testing.SetOriginSend(chain.Coins{})
+
+	// Test: Members don't need to pay a fee
+	testing.SetOriginCaller(m1)
+	_, err = govDAO.PreCreateProposal(NewAddMemberRequest(cur, m1, memberstore.T2, portfolio))
+	urequire.NoError(t, err)
+}
+
 func contains(s, substr string) bool {
 	return strings.Index(s, substr) >= 0
 }

examples/gno.land/r/gov/dao/v3/impl/prop_requests.gno

@@ -1,8 +1,6 @@
 package impl
 
 import (
-	"chain/runtime"
-
 	"gno.land/p/aeddi/panictoerr"
 	"gno.land/p/moul/md"
 	trs_pkg "gno.land/p/nt/treasury"
@@ -14,11 +12,6 @@ import (
 )
 
 func NewChangeLawRequest(_ realm, newLaw *Law) dao.ProposalRequest {
-	member, _ := memberstore.Get().GetMember(runtime.OriginCaller())
-	if member == nil {
-		panic("proposer is not a member")
-	}
-
 	cb := func(_ realm) error {
 		law = newLaw
 		return nil
@@ -30,11 +23,6 @@ func NewChangeLawRequest(_ realm, newLaw *Law) dao.ProposalRequest {
 }
 
 func NewUpgradeDaoImplRequest(newDao dao.DAO, realmPkg, reason string) dao.ProposalRequest {
-	member, _ := memberstore.Get().GetMember(runtime.OriginCaller())
-	if member == nil {
-		panic("proposer is not a member")
-	}
-
 	cb := func(_ realm) error {
 		// dao.UpdateImpl() must be cross-called from v3/impl but
 		// what calls this cb function is r/gov/dao.
@@ -66,17 +54,7 @@ func NewAddMemberRequest(_ realm, addr address, tier string, portfolio string) d
 		panic("A portfolio for the proposed member is required")
 	}
 
-	member, _ := memberstore.Get().GetMember(runtime.OriginCaller())
-	if member == nil {
-		panic("proposer is not a member")
-	}
-
-	if member.InvitationPoints <= 0 {
-		panic("proposer does not have enough invitation points for inviting new people to the board")
-	}
-
 	cb := func(_ realm) error {
-		member.RemoveInvitationPoint()
 		err := memberstore.Get().SetMember(tier, addr, memberByTier(tier))
 
 		return err
@@ -209,6 +187,47 @@ func NewTreasuryGRC20TokensUpdate(newTokenKeys []string) dao.ProposalRequest {
 	)
 }
 
+// NewProposalFeeAmountRequest creates a proposal request to update the proposal fee amount
+// required for non-members to create proposals.
+func NewProposalFeeAmountRequest(newAmount int64, reason string) dao.ProposalRequest {
+	if newAmount < 0 {
+		panic("proposal fee amount must be non-negative")
+	}
+
+	if reason == "" {
+		panic("proposal fee amount change requires a reason")
+	}
+
+	cb := func(_ realm) error {
+		return panictoerr.PanicToError(func() {
+			err := _govdao.SetProposalFeeAmount(newAmount)
+			if err != nil {
+				panic(err)
+			}
+		})
+	}
+
+	e := dao.NewSimpleExecutor(
+		cb,
+		ufmt.Sprintf(
+			"The proposal fee amount for non-members will be changed to %d ugnot.\n\nReason: %s",
+			newAmount,
+			reason,
+		),
+	)
+
+	return dao.NewProposalRequest(
+		"Proposal Fee Amount Change",
+		ufmt.Sprintf(
+			"This proposal is looking to change the proposal fee amount for non-members from %d ugnot to %d ugnot.\n\nReason: %s",
+			ProposalFeeAmount,
+			newAmount,
+			reason,
+		),
+		e,
+	)
+}
+
 func memberByTier(tier string) *memberstore.Member {
 	switch tier {
 	case memberstore.T1:

examples/gno.land/r/gov/dao/v3/impl/render.gno

@@ -93,7 +93,7 @@ func (ren *render) renderProposalPage(sPid string, d *GovDAO) string {
 
 	ps := d.pss.GetStatus(dao.ProposalID(pid))
 	out := ufmt.Sprintf("## Prop #%v - %v\n", pid, p.Title())
-	out += "Author: " + tryResolveAddr(p.Author()) + "\n\n"
+	out += ufmt.Sprintf("Author: %s %s\n\n", tryResolveAddr(p.Author()), renderMembershipBadge(p.Author(), d))
 
 	out += p.Description()
 	out += "\n\n"
@@ -122,7 +122,7 @@ func (ren *render) renderProposalListItem(sPid string, d *GovDAO) string {
 
 	ps := d.pss.GetStatus(dao.ProposalID(pid))
 	out := ufmt.Sprintf("### [Prop #%v - %v](%v:%v)\n", pid, p.Title(), ren.relativeRealmPath, pid)
-	out += ufmt.Sprintf("Author: %s\n\n", tryResolveAddr(p.Author()))
+	out += ufmt.Sprintf("Author: %s %s\n\n", tryResolveAddr(p.Author()), renderMembershipBadge(p.Author(), d))
 
 	out += "Status: " + getPropStatus(ps)
 	out += "\n\n"
@@ -189,3 +189,11 @@ func tryResolveAddr(addr address) string {
 	}
 	return userData.RenderLink("")
 }
+
+func renderMembershipBadge(addr address, d *GovDAO) string {
+	mem, _ := getMembers(cross).GetMember(addr)
+	if mem == nil {
+		return "`[non-member]`"
+	}
+	return ""
+}

examples/gno.land/r/gov/dao/v3/impl/render_test.gno

@@ -0,0 +1,21 @@
+package impl
+
+import (
+	"testing"
+
+	"gno.land/p/nt/urequire"
+)
+
+// TestRenderMembershipBadge verifies that the non-member badge is displayed correctly
+func TestRenderMembershipBadge(t *testing.T) {
+	loadMembers()
+	dao := NewGovDAO()
+
+	// Test member (should not show badge)
+	badge := renderMembershipBadge(m1, dao)
+	urequire.Equal(t, "", badge, "Members should not have a badge")
+
+	// Test non-member (should show badge)
+	badge = renderMembershipBadge(noMember, dao)
+	urequire.Equal(t, "`[non-member]`", badge, "Non-members should have a badge")
+}

gno.land/pkg/integration/testdata/govdao_proposal_only_members_proposals.txtar

@@ -15,9 +15,9 @@ gnoland start
 # call gov/dao render to check everything is working as expected and the loader worked
 gnokey query vm/qrender --data 'gno.land/r/gov/dao:'
 
-# try to add the proposal using a non-member
+# try to add the proposal using a non-member (should fail because no fee was sent)
 gnokey maketx run -gas-fee 1000000ugnot -gas-wanted 100000000 -broadcast -chainid=tendermint_test newmember $WORK/proposer/create_proposal.gno
-stdout 'only members can create new proposals'
+stdout 'non-members must send 1000000ugnot to create a proposal'
 
 -- proposer/create_proposal.gno --
 package main