feat: role proposal confirmation logic

docs/core/proto-docs.md

@@ -760,6 +760,7 @@
     - [ProvisionData](#lbm.fbridge.v1.ProvisionData)
     - [ProvisionStatus](#lbm.fbridge.v1.ProvisionStatus)
     - [RoleMetadata](#lbm.fbridge.v1.RoleMetadata)
+    - [RolePair](#lbm.fbridge.v1.RolePair)
     - [RoleProposal](#lbm.fbridge.v1.RoleProposal)
     - [Vote](#lbm.fbridge.v1.Vote)
 
@@ -11482,6 +11483,22 @@ RoleMetadata defines the metadata of the role.
 
 
 
+<a name="lbm.fbridge.v1.RolePair"></a>
+
+### RolePair
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `address` | [string](#string) |  |  |
+| `role` | [Role](#lbm.fbridge.v1.Role) |  |  |
+
+
+
+
+
+
 <a name="lbm.fbridge.v1.RoleProposal"></a>
 
 ### RoleProposal
@@ -11743,6 +11760,7 @@ GenesisState defines the fbridge module's genesis state.
 | `role_proposals` | [RoleProposal](#lbm.fbridge.v1.RoleProposal) | repeated | role_proposals defines all the role proposals present at genesis. |
 | `votes` | [Vote](#lbm.fbridge.v1.Vote) | repeated | votes defines all the votes present for role proposals at genesis. |
 | `role_metadata` | [RoleMetadata](#lbm.fbridge.v1.RoleMetadata) |  | role_metadata defines all the role metadata present at genesis. |
+| `roles` | [RolePair](#lbm.fbridge.v1.RolePair) | repeated | roles defines all addresses assigned roles at genesis. |
 
 
 

proto/lbm/fbridge/v1/fbridge.proto

@@ -60,6 +60,11 @@ enum Role {
   JUDGE       = 3 [(gogoproto.enumvalue_customname) = "RoleJudge"];
 }
 
+message RolePair {
+  string address = 1;
+  Role   role    = 2;
+}
+
 message RoleProposal {
   uint64 id = 1;
   // the proposer address
@@ -106,4 +111,4 @@ message RoleMetadata {
   uint32 operator = 2;
   // the number of the judges
   uint32 judge = 3;
-}
+}

proto/lbm/fbridge/v1/genesis.proto

@@ -22,6 +22,8 @@ message GenesisState {
   repeated Vote votes = 6 [(gogoproto.nullable) = false];
   // role_metadata defines all the role metadata present at genesis.
   RoleMetadata role_metadata = 7 [(gogoproto.nullable) = false];
+  // roles defines all addresses assigned roles at genesis.
+  repeated RolePair roles = 8 [(gogoproto.nullable) = false];
 }
 
 message SendingState {

x/fbridge/keeper/auth.go

@@ -157,7 +157,21 @@ func (k Keeper) GetVote(ctx sdk.Context, proposalID uint64, voter sdk.AccAddress
 	return types.VoteOption(binary.BigEndian.Uint32(bz)), nil
 }
 
-func (k Keeper) setRole(ctx sdk.Context, role types.Role, addr sdk.AccAddress) {
+func (k Keeper) GetVotes(ctx sdk.Context, proposalID uint64) []types.VoteOption {
+	store := ctx.KVStore(k.storeKey)
+
+	votes := make([]types.VoteOption, 0)
+	iterator := sdk.KVStorePrefixIterator(store, types.VotesKey(proposalID))
+	defer iterator.Close()
+	for ; iterator.Valid(); iterator.Next() {
+		v := types.VoteOption(binary.BigEndian.Uint32(iterator.Value()))
+		votes = append(votes, v)
+	}
+
+	return votes
+}
+
+func (k Keeper) SetRole(ctx sdk.Context, role types.Role, addr sdk.AccAddress) {
 	store := ctx.KVStore(k.storeKey)
 	bz := make([]byte, 4)
 	binary.BigEndian.PutUint32(bz, uint32(role))
@@ -174,7 +188,26 @@ func (k Keeper) GetRole(ctx sdk.Context, addr sdk.AccAddress) types.Role {
 	return types.Role(binary.BigEndian.Uint32(bz))
 }
 
-func (k Keeper) setRoleMetadata(ctx sdk.Context, data types.RoleMetadata) {
+func (k Keeper) GetRolePairs(ctx sdk.Context) []types.RolePair {
+	store := ctx.KVStore(k.storeKey)
+
+	pairs := make([]types.RolePair, 0)
+	iterator := sdk.KVStorePrefixIterator(store, types.KeyRolePrefix)
+	defer iterator.Close()
+	for ; iterator.Valid(); iterator.Next() {
+		assignee := types.SplitRoleKey(iterator.Key())
+		pairs = append(pairs, types.RolePair{Address: assignee.String(), Role: types.Role(binary.BigEndian.Uint32(iterator.Value()))})
+	}
+
+	return pairs
+}
+
+func (k Keeper) DeleteRole(ctx sdk.Context, addr sdk.AccAddress) {
+	store := ctx.KVStore(k.storeKey)
+	store.Delete(types.RoleKey(addr))
+}
+
+func (k Keeper) SetRoleMetadata(ctx sdk.Context, data types.RoleMetadata) {
 	store := ctx.KVStore(k.storeKey)
 	bz := k.cdc.MustMarshal(&data)
 	store.Set(types.KeyRoleMetadata, bz)

x/fbridge/keeper/genesis.go

@@ -9,12 +9,21 @@ import (
 func (k Keeper) InitGenesis(ctx sdk.Context, gs *types.GenesisState) error {
 	k.SetParams(ctx, gs.Params)
 	k.setNextSequence(ctx, gs.SendingState.NextSeq)
-	k.setNextProposalID(ctx, gs.NextRoleProposalId)
-	k.setRoleMetadata(ctx, gs.RoleMetadata)
 
+	k.setNextProposalID(ctx, gs.NextRoleProposalId)
 	for _, proposal := range gs.RoleProposals {
 		k.setRoleProposal(ctx, proposal)
 	}
+
+	for _, vote := range gs.Votes {
+		k.setVote(ctx, vote.ProposalId, sdk.MustAccAddressFromBech32(vote.Voter), vote.Option)
+	}
+
+	k.SetRoleMetadata(ctx, gs.RoleMetadata)
+	for _, pair := range gs.Roles {
+		k.SetRole(ctx, pair.Role, sdk.MustAccAddressFromBech32(pair.Address))
+	}
+
 	// TODO: we initialize the appropriate genesis parameters whenever the feature is added
 
 	return nil
@@ -27,9 +36,10 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState {
 			NextSeq: k.GetNextSequence(ctx),
 		},
 		NextRoleProposalId: k.GetNextProposalID(ctx),
-		RoleMetadata:       k.GetRoleMetadata(ctx),
 		RoleProposals:      k.GetProposals(ctx),
 		Votes:              k.GetAllVotes(ctx),
+		RoleMetadata:       k.GetRoleMetadata(ctx),
+		Roles:              k.GetRolePairs(ctx),
 	}
 }
 
@@ -43,7 +53,6 @@ func (k Keeper) IterateVotes(ctx sdk.Context, cb func(proposal types.Vote) (stop
 		id, voter := types.SplitVoterVoteKey(iterator.Key())
 		opt := types.VoteOption(binary.BigEndian.Uint32(iterator.Value()))
 		v := types.Vote{ProposalId: id, Voter: voter.String(), Option: opt}
-		k.cdc.MustUnmarshal(iterator.Value(), &v)
 		if cb(v) {
 			break
 		}

x/fbridge/module/abci.go

@@ -0,0 +1,70 @@
+package module
+
+import (
+	"fmt"
+	sdk "github.com/Finschia/finschia-sdk/types"
+	"github.com/Finschia/finschia-sdk/x/fbridge/keeper"
+	"github.com/Finschia/finschia-sdk/x/fbridge/types"
+)
+
+func EndBlocker(ctx sdk.Context, k keeper.Keeper) {
+	guardianTrustLevel := k.GetParams(ctx).GuardianTrustLevel
+	proposals := k.GetProposals(ctx)
+	for _, proposal := range proposals {
+		if ctx.BlockTime().After(proposal.ExpiredAt) {
+			k.DeleteRoleProposal(ctx, proposal.Id)
+			continue
+		}
+
+		votes := k.GetVotes(ctx, proposal.Id)
+
+		voteYes := 0
+		for _, vote := range votes {
+			if vote == types.OptionYes {
+				voteYes++
+			}
+		}
+
+		var total uint32 = 0
+		roleMeta := k.GetRoleMetadata(ctx)
+		previousRole := k.GetRole(ctx, sdk.MustAccAddressFromBech32(proposal.Target))
+		switch proposal.Role {
+		case types.RoleGuardian:
+			total = roleMeta.Guardian
+		case types.RoleOperator:
+			total = roleMeta.Operator
+		case types.RoleJudge:
+			total = roleMeta.Judge
+		default:
+			panic(fmt.Sprintf("invalid role: %s\n", proposal.Role))
+		}
+
+		if types.CheckTrustLevelThreshold(uint64(total), uint64(voteYes), guardianTrustLevel) {
+			if proposal.Role == types.RoleEmpty {
+				k.DeleteRole(ctx, sdk.MustAccAddressFromBech32(proposal.Target))
+			} else {
+				k.SetRole(ctx, proposal.Role, sdk.MustAccAddressFromBech32(proposal.Target))
+			}
+
+			switch proposal.Role {
+			case types.RoleGuardian:
+				roleMeta.Guardian++
+			case types.RoleOperator:
+				roleMeta.Operator++
+			case types.RoleJudge:
+				roleMeta.Judge++
+			}
+			switch previousRole {
+			case types.RoleGuardian:
+				roleMeta.Guardian--
+			case types.RoleOperator:
+				roleMeta.Operator--
+			case types.RoleJudge:
+				roleMeta.Judge--
+			}
+			k.SetRoleMetadata(ctx, roleMeta)
+
+			k.DeleteRoleProposal(ctx, proposal.Id)
+		}
+	}
+}

x/fbridge/module/module.go

@@ -24,9 +24,10 @@ const (
 )
 
 var (
-	_ module.AppModuleBasic   = AppModuleBasic{}
-	_ module.AppModuleGenesis = AppModule{}
-	_ module.AppModule        = AppModule{}
+	_ module.AppModuleBasic    = AppModuleBasic{}
+	_ module.AppModuleGenesis  = AppModule{}
+	_ module.AppModule         = AppModule{}
+	_ module.EndBlockAppModule = AppModule{}
 )
 
 // AppModuleBasic defines the basic application module used by the fbridge module.
@@ -121,6 +122,13 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw
 // ConsensusVersion implements AppModule/ConsensusVersion.
 func (AppModule) ConsensusVersion() uint64 { return consensusVersion }
 
+// EndBlock returns the end blocker for the fbridge module.
+// It returns no validator updates.
+func (am AppModule) EndBlock(ctx sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate {
+	EndBlocker(ctx, am.keeper)
+	return []abci.ValidatorUpdate{}
+}
+
 // RegisterInvariants does nothing, there are no invariants to enforce
 func (am AppModule) RegisterInvariants(ir sdk.InvariantRegistry) {
 	_ = ir