chore: remove govdao dependency in r/gov/dao/bridge

examples/gno.land/r/gov/dao/bridge/bridge.gno

@@ -3,34 +3,60 @@ package bridge
 import (
 	"std"
 
+	"gno.land/p/demo/dao"
 	"gno.land/p/demo/ownable"
 )
 
-const initialOwner = std.Address("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq") // @moul
+const (
+	initialOwner = std.Address("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq") // @moul
+	loader       = "gno.land/r/gov/dao/loader"
+)
 
-var b *Bridge
+var (
+	b       *Bridge
+	Ownable = ownable.NewWithAddress(initialOwner)
+)
 
 // Bridge is the active GovDAO
 // implementation bridge
 type Bridge struct {
-	*ownable.Ownable
-
 	dao DAO
 }
 
 // init constructs the initial GovDAO implementation
 func init() {
 	b = &Bridge{
-		Ownable: ownable.NewWithAddress(initialOwner),
-		dao:     &govdaoV2{},
+		dao: nil, // initially set via r/gov/dao/loader
+	}
+}
+
+// LoadGovDAO loads the initial version of GovDAO into the bridge
+// All changes to b.dao need to be done via GovDAO proposals after
+func LoadGovDAO(d DAO) {
+	if std.PrevRealm().PkgPath() != loader {
+		panic("unauthorized")
 	}
+
+	b.dao = d
 }
 
-// SetDAO sets the currently active GovDAO implementation
-func SetDAO(dao DAO) {
-	b.AssertCallerIsOwner()
+// NewGovDAOImplChangeExecutor allows creating a GovDAO proposal
+// Which will upgrade the GovDAO version inside the bridge
+func NewGovDAOImplChangeExecutor(newImpl DAO) dao.Executor {
+	callback := func() error {
+		b.dao = newImpl
+		return nil
+	}
+
+	return b.dao.NewGovDAOExecutor(callback)
+}
 
-	b.dao = dao
+// SetGovDAO allows the admin to set the GovDAO version manually
+// This functionality can be fully disabled by Ownable.DropOwnership(),
+// making this realm fully managed by GovDAO.
+func SetGovDAO(d DAO) {
+	Ownable.AssertCallerIsOwner()
+	b.dao = d
 }
 
 // GovDAO returns the current GovDAO implementation

examples/gno.land/r/gov/dao/bridge/bridge_test.gno

@@ -1,9 +1,8 @@
 package bridge
 
 import (
-	"testing"
-
 	"std"
+	"testing"
 
 	"gno.land/p/demo/dao"
 	"gno.land/p/demo/ownable"
@@ -27,11 +26,47 @@ func TestBridge_DAO(t *testing.T) {
 	uassert.Equal(t, proposalID, GovDAO().Propose(dao.ProposalRequest{}))
 }
 
+func TestBridge_LoadGovDAO(t *testing.T) {
+	t.Run("invalid loader path", func(t *testing.T) {
+		std.TestSetRealm(std.NewCodeRealm("gno.land/r/demo/loader")) // invalid loader
+
+		// Attempt to set a new DAO implementation
+		uassert.PanicsWithMessage(t, "unauthorized", func() {
+			LoadGovDAO(&mockDAO{})
+		})
+	})
+
+	t.Run("valid loader", func(t *testing.T) {
+		var (
+			loader     = "gno.land/r/gov/dao/loader"
+			proposalID = uint64(10)
+			mockDAO    = &mockDAO{
+				proposeFn: func(_ dao.ProposalRequest) uint64 {
+					return proposalID
+				},
+			}
+		)
+
+		std.TestSetRealm(std.NewCodeRealm(loader))
+
+		// Attempt to set a new DAO implementation
+		uassert.NotPanics(t, func() {
+			LoadGovDAO(mockDAO)
+		})
+
+		uassert.Equal(
+			t,
+			mockDAO.Propose(dao.ProposalRequest{}),
+			GovDAO().Propose(dao.ProposalRequest{}),
+		)
+	})
+}
+
 func TestBridge_SetDAO(t *testing.T) {
 	t.Run("invalid owner", func(t *testing.T) {
 		// Attempt to set a new DAO implementation
 		uassert.PanicsWithMessage(t, ownable.ErrUnauthorized.Error(), func() {
-			SetDAO(&mockDAO{})
+			SetGovDAO(&mockDAO{})
 		})
 	})
 
@@ -49,10 +84,10 @@ func TestBridge_SetDAO(t *testing.T) {
 
 		std.TestSetOrigCaller(addr)
 
-		b.Ownable = ownable.NewWithAddress(addr)
+		Ownable = ownable.NewWithAddress(addr)
 
 		urequire.NotPanics(t, func() {
-			SetDAO(mockDAO)
+			SetGovDAO(mockDAO)
 		})
 
 		uassert.Equal(

examples/gno.land/r/gov/dao/loader/gno.mod

@@ -0,0 +1 @@
+module gno.land/r/gov/dao/loader

examples/gno.land/r/gov/dao/loader/loader.gno

@@ -0,0 +1,13 @@
+// Package loader's only task is to load the initial GovDAO version into the bridge.
+// This is done to avoid gov/dao/v2 as a bridge dependency,
+// As this can often lead to cyclic dependency errors.
+package loader
+
+import (
+	"gno.land/r/gov/dao/bridge"
+	govdao "gno.land/r/gov/dao/v2"
+)
+
+func init() {
+	bridge.LoadGovDAO(govdao.GovDAO)
+}

examples/gno.land/r/gov/dao/v2/dao.gno

@@ -11,8 +11,17 @@ import (
 var (
 	d       *simpledao.SimpleDAO  // the current active DAO implementation
 	members membstore.MemberStore // the member store
+
+	// GovDAO exposes all functions of this contract as methods
+	GovDAO = &DAO{}
 )
 
+// DAO is an empty struct that allows all
+// functions of this realm to be methods instead of functions
+// This allows a registry, such as r/gov/dao/bridge
+// to take this object and match it to a required interface
+type DAO struct{}
+
 const daoPkgPath = "gno.land/r/gov/dao/v2"
 
 func init() {
@@ -33,7 +42,7 @@ func init() {
 
 // Propose is designed to be called by another contract or with
 // `maketx run`, not by a `maketx call`.
-func Propose(request dao.ProposalRequest) uint64 {
+func (_ DAO) Propose(request dao.ProposalRequest) uint64 {
 	idx, err := d.Propose(request)
 	if err != nil {
 		panic(err)
@@ -43,25 +52,25 @@ func Propose(request dao.ProposalRequest) uint64 {
 }
 
 // VoteOnProposal casts a vote for the given proposal
-func VoteOnProposal(id uint64, option dao.VoteOption) {
+func (_ DAO) VoteOnProposal(id uint64, option dao.VoteOption) {
 	if err := d.VoteOnProposal(id, option); err != nil {
 		panic(err)
 	}
 }
 
 // ExecuteProposal executes the proposal
-func ExecuteProposal(id uint64) {
+func (_ DAO) ExecuteProposal(id uint64) {
 	if err := d.ExecuteProposal(id); err != nil {
 		panic(err)
 	}
 }
 
 // GetPropStore returns the active proposal store
-func GetPropStore() dao.PropStore {
+func (_ DAO) GetPropStore() dao.PropStore {
 	return d
 }
 
 // GetMembStore returns the active member store
-func GetMembStore() membstore.MemberStore {
+func (_ DAO) GetMembStore() membstore.MemberStore {
 	return members
 }

examples/gno.land/r/gov/dao/v2/poc.gno

@@ -13,7 +13,7 @@ import (
 var errNoChangesProposed = errors.New("no set changes proposed")
 
 // NewGovDAOExecutor creates the govdao wrapped callback executor
-func NewGovDAOExecutor(cb func() error) dao.Executor {
+func (_ DAO) NewGovDAOExecutor(cb func() error) dao.Executor {
 	if cb == nil {
 		panic(errNoChangesProposed)
 	}
@@ -25,7 +25,7 @@ func NewGovDAOExecutor(cb func() error) dao.Executor {
 }
 
 // NewMemberPropExecutor returns the GOVDAO member change executor
-func NewMemberPropExecutor(changesFn func() []membstore.Member) dao.Executor {
+func (_ DAO) NewMemberPropExecutor(changesFn func() []membstore.Member) dao.Executor {
 	if changesFn == nil {
 		panic(errNoChangesProposed)
 	}
@@ -65,10 +65,10 @@ func NewMemberPropExecutor(changesFn func() []membstore.Member) dao.Executor {
 		return errs
 	}
 
-	return NewGovDAOExecutor(callback)
+	return GovDAO.NewGovDAOExecutor(callback)
 }
 
-func NewMembStoreImplExecutor(changeFn func() membstore.MemberStore) dao.Executor {
+func (_ DAO) NewMembStoreImplExecutor(changeFn func() membstore.MemberStore) dao.Executor {
 	if changeFn == nil {
 		panic(errNoChangesProposed)
 	}
@@ -79,7 +79,7 @@ func NewMembStoreImplExecutor(changeFn func() membstore.MemberStore) dao.Executo
 		return nil
 	}
 
-	return NewGovDAOExecutor(callback)
+	return GovDAO.NewGovDAOExecutor(callback)
 }
 
 // setMembStoreImpl sets a new dao.MembStore implementation

examples/gno.land/r/gov/dao/v2/prop1_filetest.gno

@@ -12,11 +12,13 @@ import (
 
 	"gno.land/p/demo/dao"
 	pVals "gno.land/p/sys/validators"
+	_ "gno.land/r/gov/dao/loader" // so that loader.init is executed
 	govdao "gno.land/r/gov/dao/v2"
 	validators "gno.land/r/sys/validators/v2"
 )
 
 func init() {
+
 	changesFn := func() []pVals.Validator {
 		return []pVals.Validator{
 			{
@@ -51,7 +53,7 @@ func init() {
 		Executor:    executor,
 	}
 
-	govdao.Propose(prop)
+	govdao.GovDAO.Propose(prop)
 }
 
 func main() {
@@ -60,13 +62,13 @@ func main() {
 	println("--")
 	println(govdao.Render("0"))
 	println("--")
-	govdao.VoteOnProposal(0, dao.YesVote)
+	govdao.GovDAO.VoteOnProposal(0, dao.YesVote)
 	println("--")
 	println(govdao.Render("0"))
 	println("--")
 	println(validators.Render(""))
 	println("--")
-	govdao.ExecuteProposal(0)
+	govdao.GovDAO.ExecuteProposal(0)
 	println("--")
 	println(govdao.Render("0"))
 	println("--")

examples/gno.land/r/gov/dao/v2/prop2_filetest.gno

@@ -5,6 +5,7 @@ import (
 
 	"gno.land/p/demo/dao"
 	gnoblog "gno.land/r/gnoland/blog"
+	_ "gno.land/r/gov/dao/loader" // so that loader.init is executed
 	govdao "gno.land/r/gov/dao/v2"
 )
 
@@ -28,7 +29,7 @@ func init() {
 		Executor:    ex,
 	}
 
-	govdao.Propose(prop)
+	govdao.GovDAO.Propose(prop)
 }
 
 func main() {
@@ -37,13 +38,13 @@ func main() {
 	println("--")
 	println(govdao.Render("0"))
 	println("--")
-	govdao.VoteOnProposal(0, "YES")
+	govdao.GovDAO.VoteOnProposal(0, "YES")
 	println("--")
 	println(govdao.Render("0"))
 	println("--")
 	println(gnoblog.Render(""))
 	println("--")
-	govdao.ExecuteProposal(0)
+	govdao.GovDAO.ExecuteProposal(0)
 	println("--")
 	println(govdao.Render("0"))
 	println("--")