feat(cover): P2 Cover-Charter + Pool Council + staging + Bill of Rights (D-090(1))
P2 of v0.7 extends x/cover with Cover-Charter + Pool governance hybrid + category staging + the Anti-Capture Bill of Rights types (D-090(1) temporal-gap fix — Bill of Rights types land HERE, not P5, so the dual firewall is in place before any Charter can be signed). New (x/cover/types/rights.go): RightID type + 13 Right* consts + AntiCaptureBillOfRightsCount=13 locked const + 13 Waivable* bool consts (all false) + RightIsWaivable() always false + AllRights()/AllWaivableFlags(). New structs: CoverCharter (REQ-052) + CharterAmendment (7-day cooling) + PoolCouncil (REQ-062 — 3 Masons + Watcher observer; NO Anchor/MAB seat) + CoverCallVote (majority requires Watcher observer present). CoverPool extended with CharterRef + CouncilRef. D-086 DefaultParams [Phase2] -> [Phase2, Phase3, Phase4]. New Msg*: MsgSignCoverCharter (D-090(1) WaivedRights gate at ValidateBasic — mirrors MissionLockAmendmentRejected D-064), MsgAmendCoverCharter, MsgElectPoolMason, MsgVoteCoverCall, MsgAmendPoolStandingGate (D-090(3) dual check: floor at ValidateBasic + handler), MsgEscalateReserveCeiling (12-month age check). New handlers: SignCoverCharter, AmendCoverCharter (Proposed + ProposedAt), ElectPoolMason (max 3), VoteCoverCall (Yes requires observer), AmendPoolStandingGate (D-090(3) re-check), EscalateReserveCeiling, CoolCharterAmendment + RatifyCharterAmendment lifecycle helpers. New stores: charter/ council/ vote/ amendment/ + SetParamsOverride/Params(). Simtest cases (a)-(h): Charter signing + D-090(1) WaivedRights reject + 7-day cooling + election + vote observer + D-086 out-of-phase + ceiling escalation + D-090(3) below-floor reject. Lexicon: rights.go + msg_charter.go lexicon-clean (initial 'policy' hit fixed -> 'invariant'). .lexicon_fixture SkipDir guard added to 3 lexicon walks (fixes pre-existing cross-package test-isolation race). G-003/G-006/G-028/G-024 intact. go.mod/go.sum diff EMPTY. Coverage: types 98.9%, keeper 95.1%, firewall 100.0%. REQs: REQ-048, REQ-052, REQ-062, REQ-065 (D-090(1) Bill of Rights types for REQ-056 land here; P5 adds the ceremony) ---ci--- project: oy phase: 2 milestone: v0.7 status: execute ---/ci---
This commit is contained in:
@@ -43,6 +43,13 @@ type Keeper struct {
|
||||
watcherKeeper types.WatcherKeeper
|
||||
bondKeeper types.BondKeeper
|
||||
stillKeeper types.StillKeeper
|
||||
// paramsOverride is a simtest-grade Params override (nil = use
|
||||
// DefaultParams). A future P2+ will load the Params from the params
|
||||
// store; for now the handler uses DefaultParams unless an override is
|
||||
// set via SetParamsOverride (the D-086 simtest case (f) uses this to
|
||||
// restrict FactoryAllowedPhases to [Phase2, Phase3] only and reject a
|
||||
// Phase4 launch).
|
||||
paramsOverride *types.Params
|
||||
}
|
||||
|
||||
// NewKeeper constructs a new store-backed cover Keeper. The four expected-
|
||||
@@ -76,6 +83,22 @@ func (k *Keeper) SetBondKeeper(bk types.BondKeeper) { k.bondKeeper = bk }
|
||||
// SetStillKeeper sets the StillKeeper expected-keeper shim.
|
||||
func (k *Keeper) SetStillKeeper(stK types.StillKeeper) { k.stillKeeper = stK }
|
||||
|
||||
// SetParamsOverride sets a simtest-grade Params override (nil = use
|
||||
// DefaultParams). The D-086 simtest case (f) uses this to restrict
|
||||
// FactoryAllowedPhases to [Phase2, Phase3] only and reject a Phase4
|
||||
// launch. A future P2+ will replace this with a params-store load.
|
||||
func (k *Keeper) SetParamsOverride(p types.Params) { k.paramsOverride = &p }
|
||||
|
||||
// Params returns the effective Params (the override if set, else
|
||||
// DefaultParams). The handler calls this to get FactoryAllowedPhases +
|
||||
// PoolStandingGate.
|
||||
func (k Keeper) Params() types.Params {
|
||||
if k.paramsOverride != nil {
|
||||
return *k.paramsOverride
|
||||
}
|
||||
return types.DefaultParams()
|
||||
}
|
||||
|
||||
// StoreKey returns the keeper's store key (exported for simtest access to
|
||||
// the underlying KVStore, e.g. to inject corrupt bytes for marshal-error
|
||||
// coverage). Mirrors the x/hub simtest pattern (the simtest reaches the
|
||||
@@ -201,3 +224,242 @@ func prefixEnd(prefix []byte) []byte {
|
||||
// All bytes were 0xFF; return nil (iterate to end of store).
|
||||
return nil
|
||||
}
|
||||
|
||||
// --- P2: CoverCharter / PoolCouncil / CoverCallVote / CharterAmendment stores --
|
||||
//
|
||||
// (REQ-052, REQ-062). Four new stores keyed by ID-string. The
|
||||
// CoverCharter store is keyed by CharterID; the PoolCouncil store is keyed
|
||||
// by PoolID (one council per pool); the CoverCallVote store is keyed by
|
||||
// VoteID; the CharterAmendment store is keyed by AmendmentID. All four
|
||||
// use the same JSON-marshal pattern as the P1 CoverPool / CoverCall
|
||||
// stores. The Get/Set/All helpers mirror the P1 helpers.
|
||||
|
||||
var charterKeyPrefix = []byte("charter/")
|
||||
|
||||
func charterKey(charterID string) []byte {
|
||||
return append(charterKeyPrefix, []byte(charterID)...)
|
||||
}
|
||||
|
||||
// GetCoverCharter loads a CoverCharter by charter-id. Returns the charter
|
||||
// and true if found, or zero value + false if not.
|
||||
func (k Keeper) GetCoverCharter(ctx sdk.Context, charterID string) (types.CoverCharter, bool) {
|
||||
store := ctx.KVStore(k.storeKey)
|
||||
bz := store.Get(charterKey(charterID))
|
||||
if bz == nil {
|
||||
return types.CoverCharter{}, false
|
||||
}
|
||||
var c types.CoverCharter
|
||||
if err := json.Unmarshal(bz, &c); err != nil {
|
||||
return types.CoverCharter{}, false
|
||||
}
|
||||
return c, true
|
||||
}
|
||||
|
||||
// SetCoverCharter persists a CoverCharter by charter-id.
|
||||
func (k Keeper) SetCoverCharter(ctx sdk.Context, c types.CoverCharter) {
|
||||
store := ctx.KVStore(k.storeKey)
|
||||
bz, err := json.Marshal(c)
|
||||
if err != nil {
|
||||
panic(fmt.Sprintf("cover: marshal charter %q: %v", c.CharterID, err))
|
||||
}
|
||||
store.Set(charterKey(c.CharterID), bz)
|
||||
}
|
||||
|
||||
// AllCoverCharters returns all persisted CoverCharter records (iteration
|
||||
// helper, unordered).
|
||||
func (k Keeper) AllCoverCharters(ctx sdk.Context) []types.CoverCharter {
|
||||
store := ctx.KVStore(k.storeKey)
|
||||
iterator := store.Iterator(charterKeyPrefix, prefixEnd(charterKeyPrefix))
|
||||
defer iterator.Close()
|
||||
out := []types.CoverCharter{}
|
||||
for ; iterator.Valid(); iterator.Next() {
|
||||
var c types.CoverCharter
|
||||
if err := json.Unmarshal(iterator.Value(), &c); err == nil {
|
||||
out = append(out, c)
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
var councilKeyPrefix = []byte("council/")
|
||||
|
||||
func councilKey(poolID string) []byte {
|
||||
return append(councilKeyPrefix, []byte(poolID)...)
|
||||
}
|
||||
|
||||
// GetPoolCouncil loads a PoolCouncil by pool-id. Returns the council and
|
||||
// true if found, or zero value + false if not.
|
||||
func (k Keeper) GetPoolCouncil(ctx sdk.Context, poolID string) (types.PoolCouncil, bool) {
|
||||
store := ctx.KVStore(k.storeKey)
|
||||
bz := store.Get(councilKey(poolID))
|
||||
if bz == nil {
|
||||
return types.PoolCouncil{}, false
|
||||
}
|
||||
var c types.PoolCouncil
|
||||
if err := json.Unmarshal(bz, &c); err != nil {
|
||||
return types.PoolCouncil{}, false
|
||||
}
|
||||
return c, true
|
||||
}
|
||||
|
||||
// SetPoolCouncil persists a PoolCouncil by pool-id.
|
||||
func (k Keeper) SetPoolCouncil(ctx sdk.Context, c types.PoolCouncil) {
|
||||
store := ctx.KVStore(k.storeKey)
|
||||
bz, err := json.Marshal(c)
|
||||
if err != nil {
|
||||
panic(fmt.Sprintf("cover: marshal council for pool %q: %v", c.PoolID, err))
|
||||
}
|
||||
store.Set(councilKey(c.PoolID), bz)
|
||||
}
|
||||
|
||||
// AllPoolCouncils returns all persisted PoolCouncil records (iteration
|
||||
// helper, unordered).
|
||||
func (k Keeper) AllPoolCouncils(ctx sdk.Context) []types.PoolCouncil {
|
||||
store := ctx.KVStore(k.storeKey)
|
||||
iterator := store.Iterator(councilKeyPrefix, prefixEnd(councilKeyPrefix))
|
||||
defer iterator.Close()
|
||||
out := []types.PoolCouncil{}
|
||||
for ; iterator.Valid(); iterator.Next() {
|
||||
var c types.PoolCouncil
|
||||
if err := json.Unmarshal(iterator.Value(), &c); err == nil {
|
||||
out = append(out, c)
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
var voteKeyPrefix = []byte("vote/")
|
||||
|
||||
func voteKey(voteID string) []byte {
|
||||
return append(voteKeyPrefix, []byte(voteID)...)
|
||||
}
|
||||
|
||||
// GetCoverCallVote loads a CoverCallVote by vote-id. Returns the vote and
|
||||
// true if found, or zero value + false if not.
|
||||
func (k Keeper) GetCoverCallVote(ctx sdk.Context, voteID string) (types.CoverCallVote, bool) {
|
||||
store := ctx.KVStore(k.storeKey)
|
||||
bz := store.Get(voteKey(voteID))
|
||||
if bz == nil {
|
||||
return types.CoverCallVote{}, false
|
||||
}
|
||||
var v types.CoverCallVote
|
||||
if err := json.Unmarshal(bz, &v); err != nil {
|
||||
return types.CoverCallVote{}, false
|
||||
}
|
||||
return v, true
|
||||
}
|
||||
|
||||
// SetCoverCallVote persists a CoverCallVote by vote-id.
|
||||
func (k Keeper) SetCoverCallVote(ctx sdk.Context, v types.CoverCallVote) {
|
||||
store := ctx.KVStore(k.storeKey)
|
||||
bz, err := json.Marshal(v)
|
||||
if err != nil {
|
||||
panic(fmt.Sprintf("cover: marshal vote %q: %v", v.VoteID, err))
|
||||
}
|
||||
store.Set(voteKey(v.VoteID), bz)
|
||||
}
|
||||
|
||||
// AllCoverCallVotes returns all persisted CoverCallVote records (iteration
|
||||
// helper, unordered).
|
||||
func (k Keeper) AllCoverCallVotes(ctx sdk.Context) []types.CoverCallVote {
|
||||
store := ctx.KVStore(k.storeKey)
|
||||
iterator := store.Iterator(voteKeyPrefix, prefixEnd(voteKeyPrefix))
|
||||
defer iterator.Close()
|
||||
out := []types.CoverCallVote{}
|
||||
for ; iterator.Valid(); iterator.Next() {
|
||||
var v types.CoverCallVote
|
||||
if err := json.Unmarshal(iterator.Value(), &v); err == nil {
|
||||
out = append(out, v)
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
var amendmentKeyPrefix = []byte("amendment/")
|
||||
|
||||
func amendmentKey(amendmentID string) []byte {
|
||||
return append(amendmentKeyPrefix, []byte(amendmentID)...)
|
||||
}
|
||||
|
||||
// GetCharterAmendment loads a CharterAmendment by amendment-id. Returns
|
||||
// the amendment and true if found, or zero value + false if not.
|
||||
func (k Keeper) GetCharterAmendment(ctx sdk.Context, amendmentID string) (types.CharterAmendment, bool) {
|
||||
store := ctx.KVStore(k.storeKey)
|
||||
bz := store.Get(amendmentKey(amendmentID))
|
||||
if bz == nil {
|
||||
return types.CharterAmendment{}, false
|
||||
}
|
||||
var a types.CharterAmendment
|
||||
if err := json.Unmarshal(bz, &a); err != nil {
|
||||
return types.CharterAmendment{}, false
|
||||
}
|
||||
return a, true
|
||||
}
|
||||
|
||||
// SetCharterAmendment persists a CharterAmendment by amendment-id.
|
||||
func (k Keeper) SetCharterAmendment(ctx sdk.Context, a types.CharterAmendment) {
|
||||
store := ctx.KVStore(k.storeKey)
|
||||
bz, err := json.Marshal(a)
|
||||
if err != nil {
|
||||
panic(fmt.Sprintf("cover: marshal amendment %q: %v", a.AmendmentID, err))
|
||||
}
|
||||
store.Set(amendmentKey(a.AmendmentID), bz)
|
||||
}
|
||||
|
||||
// AllCharterAmendments returns all persisted CharterAmendment records
|
||||
// (iteration helper, unordered).
|
||||
func (k Keeper) AllCharterAmendments(ctx sdk.Context) []types.CharterAmendment {
|
||||
store := ctx.KVStore(k.storeKey)
|
||||
iterator := store.Iterator(amendmentKeyPrefix, prefixEnd(amendmentKeyPrefix))
|
||||
defer iterator.Close()
|
||||
out := []types.CharterAmendment{}
|
||||
for ; iterator.Valid(); iterator.Next() {
|
||||
var a types.CharterAmendment
|
||||
if err := json.Unmarshal(iterator.Value(), &a); err == nil {
|
||||
out = append(out, a)
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// CoolCharterAmendment transitions a Proposed CharterAmendment to Cooled
|
||||
// if the 7-day cooling has elapsed (REQ-052). Returns an error if the
|
||||
// amendment is not found, not in the Proposed status, or the cooling has
|
||||
// not elapsed. The handler (or simtest) calls this after the cooling
|
||||
// period; a separate RatifyCharterAmendment transitions to Ratified.
|
||||
func (k Keeper) CoolCharterAmendment(ctx sdk.Context, amendmentID string, now int64) (types.CharterAmendment, error) {
|
||||
a, ok := k.GetCharterAmendment(ctx, amendmentID)
|
||||
if !ok {
|
||||
return types.CharterAmendment{}, fmt.Errorf("cover: amendment %q not found", amendmentID)
|
||||
}
|
||||
if a.Status != types.AmendmentProposed {
|
||||
return types.CharterAmendment{}, fmt.Errorf("cover: amendment %q status %q (only Proposed can be Cooled)", amendmentID, a.Status)
|
||||
}
|
||||
if now-a.ProposedAt < types.CharterAmendmentCoolingSeconds {
|
||||
return types.CharterAmendment{}, fmt.Errorf("cover: amendment %q cooling not elapsed (now=%d ProposedAt=%d, need %d seconds)", amendmentID, now, a.ProposedAt, types.CharterAmendmentCoolingSeconds)
|
||||
}
|
||||
a.Status = types.AmendmentCooled
|
||||
a.CooledAt = now
|
||||
k.SetCharterAmendment(ctx, a)
|
||||
return a, nil
|
||||
}
|
||||
|
||||
// RatifyCharterAmendment transitions a Cooled CharterAmendment to
|
||||
// Ratified (REQ-052). Returns an error if the amendment is not found or
|
||||
// not in the Cooled status. The Pool supermajority + Watcher + Counsel
|
||||
// are checked upstream (the handler); this helper does the state
|
||||
// transition + appends the amendment to the parent charter's Amendments
|
||||
// slice.
|
||||
func (k Keeper) RatifyCharterAmendment(ctx sdk.Context, amendmentID string, now int64) (types.CharterAmendment, error) {
|
||||
a, ok := k.GetCharterAmendment(ctx, amendmentID)
|
||||
if !ok {
|
||||
return types.CharterAmendment{}, fmt.Errorf("cover: amendment %q not found", amendmentID)
|
||||
}
|
||||
if a.Status != types.AmendmentCooled {
|
||||
return types.CharterAmendment{}, fmt.Errorf("cover: amendment %q status %q (only Cooled can be Ratified)", amendmentID, a.Status)
|
||||
}
|
||||
a.Status = types.AmendmentRatified
|
||||
a.RatifiedAt = now
|
||||
k.SetCharterAmendment(ctx, a)
|
||||
return a, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user