change board.proto lcommon.proto

plugin/dapp/autonomy/executor/boardaction.go

@@ -59,11 +59,11 @@ func (a *action) getPropBoard(prob *auty.ProposalBoard) (*auty.ActiveBoard, erro
 	}
 
 	switch prob.BoardUpdate {
-	case auty.BoardUpdate_WHOLE:
+	case auty.BoardUpdate_REPLACEALL:
 		return &auty.ActiveBoard{Boards: prob.Boards}, nil
-	case auty.BoardUpdate_ADD:
+	case auty.BoardUpdate_ADDBoard:
 		return a.addPropBoard(prob, mpBd)
-	case auty.BoardUpdate_DEL:
+	case auty.BoardUpdate_DELBoard:
 		return a.delPropBoard(prob, mpBd)
 	default:
 		return nil, errors.Wrapf(types.ErrInvalidParam, "board update param=%d", prob.BoardUpdate)
@@ -366,7 +366,7 @@ func (a *action) votePropBoard(voteProb *auty.VoteProposalBoard) (*types.Receipt
 	// 更新当前具有权利的董事会成员
 	if cur.VoteResult.Pass {
 		if a.api.GetConfig().IsDappFork(a.height, auty.AutonomyX, auty.ForkAutonomyDelRule) {
-			if cur.PropBoard.BoardUpdate == auty.BoardUpdate_WHOLE {
+			if cur.PropBoard.BoardUpdate == auty.BoardUpdate_REPLACEALL {
 				cur.Board.StartHeight = a.height
 			}
 		} else {
@@ -476,7 +476,7 @@ func (a *action) tmintPropBoard(tmintProb *auty.TerminateProposalBoard) (*types.
 	// 更新当前具有权利的董事会成员
 	if cur.VoteResult.Pass {
 		if a.api.GetConfig().IsDappFork(a.height, auty.AutonomyX, auty.ForkAutonomyDelRule) {
-			if cur.PropBoard.BoardUpdate == auty.BoardUpdate_WHOLE {
+			if cur.PropBoard.BoardUpdate == auty.BoardUpdate_REPLACEALL {
 				cur.Board.StartHeight = a.height
 			}
 		} else {

plugin/dapp/autonomy/executor/boardaction_test.go

@@ -196,43 +196,43 @@ func TestPropBoard(t *testing.T) {
 
 	opts := []*auty.ProposalBoard{
 		{ // ErrRepeatAddr
-			BoardUpdate:      auty.BoardUpdate_ADD,
+			BoardUpdate:      auty.BoardUpdate_ADDBoard,
 			Boards:           []string{"18e1nfiux7aVSfN2zYUZhbidMRokbBSPA6", "18e1nfiux7aVSfN2zYUZhbidMRokbBSPA6"},
 			StartBlockHeight: env.blockHeight + 5,
 			EndBlockHeight:   env.blockHeight + startEndBlockPeriod + 10,
 		},
 		{ // ErrRepeatAddr
-			BoardUpdate:      auty.BoardUpdate_ADD,
+			BoardUpdate:      auty.BoardUpdate_ADDBoard,
 			Boards:           []string{"18e1nfiux7aVSfN2zYUZhbidMRokbBSPA6", AddrA},
 			StartBlockHeight: env.blockHeight + 5,
 			EndBlockHeight:   env.blockHeight + startEndBlockPeriod + 10,
 		},
 		{ // ErrBoardNumber
-			BoardUpdate:      auty.BoardUpdate_ADD,
+			BoardUpdate:      auty.BoardUpdate_ADDBoard,
 			StartBlockHeight: env.blockHeight + 5,
 			EndBlockHeight:   env.blockHeight + startEndBlockPeriod + 10,
 		},
 		{ // 正常
-			BoardUpdate:      auty.BoardUpdate_ADD,
+			BoardUpdate:      auty.BoardUpdate_ADDBoard,
 			Boards:           []string{"18e1nfiux7aVSfN2zYUZhbidMRokbBSPA6"},
 			StartBlockHeight: env.blockHeight + 5,
 			EndBlockHeight:   env.blockHeight + startEndBlockPeriod + 10,
 		},
 
 		{ // ErrRepeatAddr
-			BoardUpdate:      auty.BoardUpdate_WHOLE,
+			BoardUpdate:      auty.BoardUpdate_REPLACEALL,
 			Boards:           []string{"18e1nfiux7aVSfN2zYUZhbidMRokbBSPA6", "18e1nfiux7aVSfN2zYUZhbidMRokbBSPA6"},
 			StartBlockHeight: env.blockHeight + 5,
 			EndBlockHeight:   env.blockHeight + startEndBlockPeriod + 10,
 		},
 		{ // ErrBoardNumber
-			BoardUpdate:      auty.BoardUpdate_WHOLE,
+			BoardUpdate:      auty.BoardUpdate_REPLACEALL,
 			Boards:           []string{"18e1nfiux7aVSfN2zYUZhbidMRokbBSPA6", AddrA},
 			StartBlockHeight: env.blockHeight + 5,
 			EndBlockHeight:   env.blockHeight + startEndBlockPeriod + 10,
 		},
 		{ // 正常
-			BoardUpdate:      auty.BoardUpdate_WHOLE,
+			BoardUpdate:      auty.BoardUpdate_REPLACEALL,
 			Boards:           boards,
 			StartBlockHeight: env.blockHeight + 5,
 			EndBlockHeight:   env.blockHeight + startEndBlockPeriod + 10,
@@ -292,7 +292,7 @@ func testPropBoard(t *testing.T, env *ExecEnv, exec drivers.Driver, stateDB dbm.
 		Month:            7,
 		Day:              10,
 		Boards:           boards,
-		BoardUpdate:      auty.BoardUpdate_WHOLE,
+		BoardUpdate:      auty.BoardUpdate_REPLACEALL,
 		StartBlockHeight: env.blockHeight + 5,
 		EndBlockHeight:   env.blockHeight + startEndBlockPeriod + 10,
 	}

plugin/dapp/autonomy/proto/board.proto

@@ -28,11 +28,11 @@ message AutonomyProposalBoard {
 enum BoardUpdate {
     INV = 0;
     //新增
-    ADD = 1;
+    ADDBoard = 1;
     //剔除
-    DEL = 2;
+    DELBoard = 2;
     //整体替换
-    WHOLE = 3;
+    REPLACEALL = 3;
 }
 
 // action

plugin/dapp/autonomy/proto/lcommon.proto

@@ -55,7 +55,7 @@ message RuleConfig {
 
 //三种投票选项
 enum AutonomyVoteOption {
-    INVALID = 0;
+    NOJOIN = 0;
     //支持
     APPROVE = 1;
     //反对

plugin/dapp/autonomy/types/board.pb.go

@@ -25,25 +25,25 @@ type BoardUpdate int32
 const (
 	BoardUpdate_INV BoardUpdate = 0
 	//新增
-	BoardUpdate_ADD BoardUpdate = 1
+	BoardUpdate_ADDBoard BoardUpdate = 1
 	//剔除
-	BoardUpdate_DEL BoardUpdate = 2
+	BoardUpdate_DELBoard BoardUpdate = 2
 	//整体替换
-	BoardUpdate_WHOLE BoardUpdate = 3
+	BoardUpdate_REPLACEALL BoardUpdate = 3
 )
 
 var BoardUpdate_name = map[int32]string{
 	0: "INV",
-	1: "ADD",
-	2: "DEL",
-	3: "WHOLE",
+	1: "ADDBoard",
+	2: "DELBoard",
+	3: "REPLACEALL",
 }
 
 var BoardUpdate_value = map[string]int32{
-	"INV":   0,
-	"ADD":   1,
-	"DEL":   2,
-	"WHOLE": 3,
+	"INV":        0,
+	"ADDBoard":   1,
+	"DELBoard":   2,
+	"REPLACEALL": 3,
 }
 
 func (x BoardUpdate) String() string {
@@ -371,7 +371,7 @@ func (m *VoteProposalBoard) GetVoteOption() AutonomyVoteOption {
 	if m != nil {
 		return m.VoteOption
 	}
-	return AutonomyVoteOption_INVALID
+	return AutonomyVoteOption_NOJOIN
 }
 
 type TerminateProposalBoard struct {
@@ -643,48 +643,48 @@ func init() {
 func init() { proto.RegisterFile("board.proto", fileDescriptor_937f74b042f92c0f) }
 
 var fileDescriptor_937f74b042f92c0f = []byte{
-	// 680 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xd1, 0x4e, 0xdb, 0x4a,
-	0x10, 0xbd, 0x8e, 0xe3, 0x24, 0x1e, 0x04, 0x0a, 0x7b, 0x81, 0xeb, 0x8b, 0xd0, 0x55, 0xe4, 0x87,
-	0xab, 0x88, 0x4a, 0x69, 0x0b, 0xb4, 0x6a, 0xa5, 0xbe, 0x24, 0x0d, 0x12, 0x48, 0xa8, 0xb4, 0xab,
-	0x16, 0xa4, 0xbe, 0x19, 0x7b, 0x01, 0x0b, 0xc7, 0xbb, 0x5d, 0xaf, 0xa3, 0xe6, 0xad, 0x3f, 0x53,
-	0xa9, 0x3f, 0xd0, 0x4f, 0xe9, 0xff, 0x54, 0x3b, 0xbb, 0x49, 0x6c, 0x40, 0x6d, 0x79, 0xdb, 0x33,
-	0x3e, 0xb3, 0x9e, 0x39, 0x3b, 0x67, 0x60, 0xe5, 0x82, 0x47, 0x32, 0x19, 0x08, 0xc9, 0x15, 0x27,
-	0x9e, 0x9a, 0x09, 0x56, 0x6c, 0xaf, 0x66, 0x31, 0x9f, 0x4c, 0x78, 0x6e, 0xa2, 0xe1, 0x8f, 0x06,
-	0x6c, 0x0e, 0x4b, 0xc5, 0x73, 0x3e, 0x99, 0xbd, 0x95, 0x5c, 0xf0, 0x22, 0xca, 0x46, 0x3a, 0x8b,
-	0xec, 0x81, 0x2f, 0x24, 0x17, 0x08, 0x02, 0xa7, 0xe7, 0xf4, 0x57, 0xf6, 0x36, 0x06, 0x78, 0xc7,
-	0xa0, 0x46, 0xa4, 0x4b, 0x1a, 0x79, 0x04, 0xed, 0xb8, 0x94, 0xb4, 0xcc, 0x58, 0xd0, 0xc0, 0x8c,
-	0x75, 0x9b, 0xa1, 0x43, 0xaf, 0x79, 0x7e, 0x99, 0x5e, 0xd1, 0x39, 0x83, 0xf4, 0xc1, 0xc3, 0xfa,
-	0x02, 0x17, 0xa9, 0xc4, 0x52, 0x87, 0xb1, 0x4a, 0xa7, 0xcc, 0x5c, 0x6d, 0x08, 0xe4, 0x29, 0xc0,
-	0x94, 0x2b, 0x46, 0x59, 0x51, 0x66, 0x2a, 0x68, 0xd6, 0x6e, 0x3e, 0x5b, 0x7c, 0xa0, 0x15, 0x12,
-	0xd9, 0x82, 0x56, 0xa1, 0x22, 0x55, 0x16, 0x81, 0xd7, 0x73, 0xfa, 0x1e, 0xb5, 0x88, 0x04, 0xd0,
-	0x8e, 0x92, 0x44, 0xb2, 0xa2, 0x08, 0x5a, 0x3d, 0xa7, 0xef, 0xd3, 0x39, 0xd4, 0x19, 0xd7, 0x2c,
-	0xbd, 0xba, 0x56, 0x41, 0xbb, 0xe7, 0xf4, 0x5d, 0x6a, 0x11, 0xd9, 0x00, 0x2f, 0xcd, 0x13, 0xf6,
-	0x39, 0xe8, 0xe0, 0x45, 0x06, 0x90, 0xff, 0x00, 0x84, 0x55, 0xe1, 0x78, 0x1c, 0xf8, 0x78, 0x55,
-	0x25, 0x12, 0x7e, 0x6f, 0xc0, 0x6a, 0x5d, 0x4f, 0x02, 0xcd, 0x19, 0x8b, 0x24, 0x4a, 0xe9, 0x51,
-	0x3c, 0xeb, 0xbb, 0x27, 0x3c, 0x57, 0xd7, 0xa8, 0x96, 0x47, 0x0d, 0x20, 0x5d, 0x70, 0x93, 0x68,
-	0x86, 0xb2, 0x78, 0x54, 0x1f, 0x75, 0x6d, 0xa5, 0x48, 0x22, 0xc5, 0xb0, 0xf9, 0x0e, 0xb5, 0x48,
-	0xc7, 0x51, 0x21, 0xdd, 0xa5, 0xdb, 0xf7, 0xa9, 0x45, 0x64, 0x17, 0xba, 0x85, 0x8a, 0xa4, 0x1a,
-	0x65, 0x3c, 0xbe, 0x39, 0x32, 0x5d, 0xb5, 0xb0, 0xab, 0x3b, 0x71, 0xf2, 0x3f, 0xac, 0xb1, 0x3c,
-	0xa9, 0x32, 0x4d, 0xff, 0xb7, 0xa2, 0x64, 0x00, 0x44, 0xb2, 0x28, 0x3b, 0xac, 0x73, 0x3b, 0xc8,
-	0xbd, 0xe7, 0x0b, 0x39, 0xb0, 0xe3, 0xf7, 0xc1, 0x14, 0xae, 0x25, 0x5a, 0x5b, 0x3c, 0xf2, 0x68,
-	0xf9, 0x85, 0x56, 0x69, 0xe1, 0x33, 0xf8, 0x9b, 0xb2, 0x29, 0xbf, 0x61, 0x75, 0xf1, 0xea, 0x72,
-	0x3b, 0x77, 0xe4, 0xfe, 0xe6, 0xc0, 0xba, 0x9e, 0x84, 0x07, 0x65, 0xe1, 0x30, 0x08, 0x21, 0xf9,
-	0xd4, 0x8c, 0x6b, 0x87, 0xce, 0xa1, 0xce, 0xe4, 0x32, 0xbd, 0x4a, 0xf3, 0x61, 0x92, 0xc8, 0xc0,
-	0x45, 0x71, 0x2b, 0x11, 0xf2, 0xd2, 0x4c, 0xe4, 0xa9, 0x50, 0x29, 0xcf, 0xf1, 0x51, 0xd6, 0xf6,
-	0xfe, 0x9d, 0x0f, 0xb0, 0xb5, 0xd3, 0xd9, 0x82, 0x40, 0x2b, 0xe4, 0xf0, 0x05, 0x6c, 0xbd, 0x67,
-	0x72, 0x92, 0xe6, 0xd1, 0x03, 0xcb, 0x0d, 0xbf, 0x38, 0xb0, 0x41, 0x59, 0xcc, 0x52, 0xa1, 0xea,
-	0x89, 0x4f, 0xa0, 0x29, 0x24, 0x9b, 0x5a, 0x97, 0xee, 0xdc, 0xaa, 0xa3, 0xee, 0x56, 0x64, 0x92,
-	0xe7, 0x68, 0x54, 0xc9, 0x72, 0x65, 0x8d, 0xfa, 0xeb, 0xa4, 0x39, 0x39, 0xbc, 0x04, 0x72, 0xc2,
-	0xe3, 0x28, 0xab, 0xff, 0xff, 0x00, 0x5a, 0xb8, 0x03, 0x92, 0x3f, 0xaa, 0xc0, 0x72, 0xc9, 0x36,
-	0x74, 0xf4, 0x2a, 0x62, 0xb9, 0x2a, 0x82, 0x06, 0x2a, 0xbc, 0xc0, 0xe1, 0x57, 0x07, 0x36, 0x29,
-	0xfb, 0xf4, 0xae, 0x64, 0xf2, 0xd6, 0x5a, 0x5a, 0x1a, 0xdb, 0xa9, 0x19, 0x9b, 0x40, 0x53, 0x3b,
-	0x19, 0xdb, 0xf1, 0x29, 0x9e, 0xb5, 0xbd, 0x62, 0x5e, 0xe6, 0xca, 0x5a, 0xc9, 0x00, 0xb2, 0x03,
-	0x7e, 0x92, 0x4a, 0x16, 0x2f, 0x9e, 0xce, 0xa3, 0xcb, 0x40, 0x65, 0x0d, 0x78, 0xf7, 0xaf, 0x81,
-	0x56, 0x65, 0x0d, 0x84, 0xe7, 0xf0, 0x0f, 0x65, 0x22, 0x9b, 0xdd, 0x53, 0xe8, 0x2b, 0xf3, 0x9a,
-	0x23, 0xe3, 0x4f, 0xa7, 0xe7, 0xfe, 0x56, 0x98, 0x0a, 0x7f, 0x77, 0x1f, 0x56, 0x2a, 0x1e, 0x21,
-	0x6d, 0x70, 0x8f, 0xdf, 0x9c, 0x75, 0xff, 0xd2, 0x87, 0xe1, 0x78, 0xdc, 0x75, 0xf4, 0x61, 0x7c,
-	0x78, 0xd2, 0x6d, 0x10, 0x1f, 0xbc, 0xf3, 0xa3, 0xd3, 0x93, 0xc3, 0xae, 0x3b, 0x82, 0x8f, 0x9d,
-	0xc1, 0xe0, 0x31, 0xfe, 0xe2, 0xa2, 0x85, 0xfb, 0x7d, 0xff, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff,
-	0x48, 0xf2, 0x04, 0xf2, 0x04, 0x06, 0x00, 0x00,
+	// 683 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xc1, 0x6e, 0xd3, 0x40,
+	0x10, 0xc5, 0x71, 0x9c, 0x38, 0x53, 0x1a, 0xa5, 0x4b, 0x5b, 0x4c, 0x55, 0xa1, 0xc8, 0x07, 0x14,
+	0x15, 0x29, 0x40, 0x29, 0x08, 0x24, 0x2e, 0x49, 0x13, 0x89, 0x4a, 0x11, 0x94, 0x15, 0x14, 0x89,
+	0x9b, 0x6b, 0x6f, 0x5b, 0xab, 0x8e, 0xd7, 0xac, 0xd7, 0x11, 0xb9, 0xf1, 0x33, 0x48, 0xfc, 0x00,
+	0x9f, 0xc2, 0xff, 0xa0, 0x9d, 0xdd, 0x24, 0x76, 0x5b, 0x01, 0xbd, 0xf9, 0xcd, 0xbe, 0x59, 0xcf,
+	0xbc, 0x9d, 0x37, 0xb0, 0x76, 0xca, 0x03, 0x11, 0xf5, 0x33, 0xc1, 0x25, 0x27, 0x8e, 0x9c, 0x67,
+	0x2c, 0xdf, 0x59, 0x4f, 0x42, 0x3e, 0x9d, 0xf2, 0x54, 0x47, 0xfd, 0xdf, 0x35, 0xd8, 0x1a, 0x14,
+	0x92, 0xa7, 0x7c, 0x3a, 0x3f, 0x16, 0x3c, 0xe3, 0x79, 0x90, 0x0c, 0x55, 0x16, 0xd9, 0x87, 0x56,
+	0x26, 0x78, 0x86, 0xc0, 0xb3, 0xba, 0x56, 0x6f, 0x6d, 0x7f, 0xb3, 0x8f, 0x77, 0xf4, 0x2b, 0x44,
+	0xba, 0xa2, 0x91, 0xc7, 0xd0, 0x0c, 0x0b, 0x41, 0x8b, 0x84, 0x79, 0x35, 0xcc, 0xd8, 0x30, 0x19,
+	0x2a, 0x74, 0xc8, 0xd3, 0xb3, 0xf8, 0x9c, 0x2e, 0x18, 0xa4, 0x07, 0x0e, 0xd6, 0xe7, 0xd9, 0x48,
+	0x25, 0x86, 0x3a, 0x08, 0x65, 0x3c, 0x63, 0xfa, 0x6a, 0x4d, 0x20, 0xcf, 0x00, 0x66, 0x5c, 0x32,
+	0xca, 0xf2, 0x22, 0x91, 0x5e, 0xbd, 0x72, 0xf3, 0xc9, 0xf2, 0x80, 0x96, 0x48, 0x64, 0x1b, 0x1a,
+	0xb9, 0x0c, 0x64, 0x91, 0x7b, 0x4e, 0xd7, 0xea, 0x39, 0xd4, 0x20, 0xe2, 0x41, 0x33, 0x88, 0x22,
+	0xc1, 0xf2, 0xdc, 0x6b, 0x74, 0xad, 0x5e, 0x8b, 0x2e, 0xa0, 0xca, 0xb8, 0x60, 0xf1, 0xf9, 0x85,
+	0xf4, 0x9a, 0x5d, 0xab, 0x67, 0x53, 0x83, 0xc8, 0x26, 0x38, 0x71, 0x1a, 0xb1, 0x6f, 0x9e, 0x8b,
+	0x17, 0x69, 0x40, 0x1e, 0x02, 0x64, 0x46, 0x85, 0xa3, 0x91, 0xd7, 0xc2, 0xab, 0x4a, 0x11, 0xff,
+	0x57, 0x0d, 0xd6, 0xab, 0x7a, 0x12, 0xa8, 0xcf, 0x59, 0x20, 0x50, 0x4a, 0x87, 0xe2, 0xb7, 0xba,
+	0x7b, 0xca, 0x53, 0x79, 0x81, 0x6a, 0x39, 0x54, 0x03, 0xd2, 0x01, 0x3b, 0x0a, 0xe6, 0x28, 0x8b,
+	0x43, 0xd5, 0xa7, 0xaa, 0xad, 0xc8, 0xa2, 0x40, 0x32, 0x6c, 0xde, 0xa5, 0x06, 0xa9, 0x38, 0x2a,
+	0xa4, 0xba, 0xb4, 0x7b, 0x2d, 0x6a, 0x10, 0xd9, 0x83, 0x4e, 0x2e, 0x03, 0x21, 0x87, 0x09, 0x0f,
+	0x2f, 0xdf, 0xea, 0xae, 0x1a, 0xd8, 0xd5, 0xb5, 0x38, 0x79, 0x04, 0x6d, 0x96, 0x46, 0x65, 0xa6,
+	0xee, 0xff, 0x4a, 0x94, 0xf4, 0x81, 0x08, 0x16, 0x24, 0xe3, 0x2a, 0xd7, 0x45, 0xee, 0x0d, 0x27,
+	0xe4, 0xc0, 0x8c, 0xdf, 0x27, 0x5d, 0xb8, 0x92, 0xa8, 0xbd, 0x7c, 0xe4, 0xe1, 0xea, 0x84, 0x96,
+	0x69, 0xfe, 0x0b, 0xb8, 0x47, 0xd9, 0x8c, 0x5f, 0xb2, 0xaa, 0x78, 0x55, 0xb9, 0xad, 0x6b, 0x72,
+	0xff, 0xb4, 0x60, 0x43, 0x4d, 0xc2, 0xad, 0xb2, 0x70, 0x18, 0xb2, 0x4c, 0xf0, 0x99, 0x1e, 0x57,
+	0x97, 0x2e, 0xa0, 0xca, 0xe4, 0x22, 0x3e, 0x8f, 0xd3, 0x41, 0x14, 0x09, 0xcf, 0x46, 0x71, 0x4b,
+	0x11, 0xf2, 0x5a, 0x4f, 0xe4, 0xfb, 0x4c, 0xc6, 0x3c, 0xc5, 0x47, 0x69, 0xef, 0x3f, 0x58, 0x0c,
+	0xb0, 0xb1, 0xd3, 0xc9, 0x92, 0x40, 0x4b, 0x64, 0xff, 0x15, 0x6c, 0x7f, 0x64, 0x62, 0x1a, 0xa7,
+	0xc1, 0x2d, 0xcb, 0xf5, 0xbf, 0x5b, 0xb0, 0x49, 0x59, 0xc8, 0xe2, 0x4c, 0x56, 0x13, 0x9f, 0x42,
+	0x3d, 0x13, 0x6c, 0x66, 0x5c, 0xba, 0x7b, 0xa5, 0x8e, 0xaa, 0x5b, 0x91, 0x49, 0x5e, 0xa2, 0x51,
+	0x05, 0x4b, 0xa5, 0x31, 0xea, 0xdf, 0x93, 0x16, 0x64, 0xff, 0x0c, 0xc8, 0x84, 0x87, 0x41, 0x52,
+	0xfd, 0xff, 0x01, 0x34, 0x70, 0x07, 0x44, 0xff, 0x55, 0x81, 0xe1, 0x92, 0x1d, 0x70, 0xd5, 0x2a,
+	0x62, 0xa9, 0xcc, 0xbd, 0x1a, 0x2a, 0xbc, 0xc4, 0xfe, 0x0f, 0x0b, 0xb6, 0x28, 0xfb, 0xfa, 0xa1,
+	0x60, 0xe2, 0xca, 0x5a, 0x5a, 0x19, 0xdb, 0xaa, 0x18, 0x9b, 0x40, 0x5d, 0x39, 0x19, 0xdb, 0x69,
+	0x51, 0xfc, 0x56, 0xf6, 0x0a, 0x79, 0x91, 0x4a, 0x63, 0x25, 0x0d, 0xc8, 0x2e, 0xb4, 0xa2, 0x58,
+	0xb0, 0x70, 0xf9, 0x74, 0x0e, 0x5d, 0x05, 0x4a, 0x6b, 0xc0, 0xb9, 0x79, 0x0d, 0x34, 0x4a, 0x6b,
+	0xc0, 0xff, 0x0c, 0xf7, 0x29, 0xcb, 0x92, 0xf9, 0x0d, 0x85, 0xbe, 0xd1, 0xaf, 0x39, 0xd4, 0xfe,
+	0xb4, 0xba, 0xf6, 0x3f, 0x85, 0x29, 0xf1, 0xf7, 0x86, 0xb0, 0x56, 0xf2, 0x08, 0x69, 0x82, 0x7d,
+	0xf4, 0xee, 0xa4, 0x73, 0x87, 0xdc, 0x05, 0x77, 0x30, 0x1a, 0xe1, 0x51, 0xc7, 0x52, 0x68, 0x34,
+	0x9e, 0x68, 0x54, 0x23, 0x6d, 0x00, 0x3a, 0x3e, 0x9e, 0x0c, 0x0e, 0xc7, 0x83, 0xc9, 0xa4, 0x63,
+	0x0f, 0xe1, 0x8b, 0xdb, 0xef, 0x3f, 0xc1, 0x3f, 0x9e, 0x36, 0x70, 0xdd, 0x3f, 0xff, 0x13, 0x00,
+	0x00, 0xff, 0xff, 0xbc, 0x39, 0x74, 0x01, 0x13, 0x06, 0x00, 0x00,
 }

plugin/dapp/autonomy/types/change.pb.go

@@ -357,7 +357,7 @@ func (m *VoteProposalChange) GetVote() AutonomyVoteOption {
 	if m != nil {
 		return m.Vote
 	}
-	return AutonomyVoteOption_INVALID
+	return AutonomyVoteOption_NOJOIN
 }
 
 type TerminateProposalChange struct {

plugin/dapp/autonomy/types/lcommon.pb.go

@@ -24,7 +24,7 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 type AutonomyVoteOption int32
 
 const (
-	AutonomyVoteOption_INVALID AutonomyVoteOption = 0
+	AutonomyVoteOption_NOJOIN AutonomyVoteOption = 0
 	//支持
 	AutonomyVoteOption_APPROVE AutonomyVoteOption = 1
 	//反对
@@ -34,14 +34,14 @@ const (
 )
 
 var AutonomyVoteOption_name = map[int32]string{
-	0: "INVALID",
+	0: "NOJOIN",
 	1: "APPROVE",
 	2: "OPPOSE",
 	3: "QUIT",
 }
 
 var AutonomyVoteOption_value = map[string]int32{
-	"INVALID": 0,
+	"NOJOIN":  0,
 	"APPROVE": 1,
 	"OPPOSE":  2,
 	"QUIT":    3,
@@ -407,33 +407,33 @@ func init() { proto.RegisterFile("lcommon.proto", fileDescriptor_d916a933dd8220f
 
 var fileDescriptor_d916a933dd8220ff = []byte{
 	// 456 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0xcd, 0x8e, 0xd3, 0x30,
-	0x14, 0x85, 0x49, 0xfa, 0x3b, 0xb7, 0xfc, 0x14, 0x2f, 0x50, 0x17, 0x08, 0x55, 0x59, 0x40, 0x85,
-	0x50, 0x59, 0xf0, 0x04, 0x19, 0x66, 0x24, 0x2a, 0x21, 0x12, 0x0c, 0x74, 0xc1, 0xce, 0x49, 0x4c,
-	0x31, 0x4a, 0x73, 0x8d, 0x7d, 0x53, 0xa9, 0x0b, 0xb6, 0x3c, 0x09, 0x0f, 0xc0, 0x23, 0x22, 0x3b,
-	0x29, 0xcd, 0x64, 0x90, 0xd8, 0xe5, 0x7c, 0xf7, 0x58, 0x3a, 0xf7, 0x5c, 0x05, 0xee, 0x95, 0x39,
-	0xee, 0xf7, 0x58, 0xad, 0xb5, 0x41, 0x42, 0x36, 0xa2, 0xa3, 0x96, 0x36, 0xfa, 0x15, 0x00, 0x6c,
-	0x91, 0x24, 0x97, 0xb6, 0x2e, 0x89, 0x3d, 0x01, 0x20, 0x24, 0x51, 0x3a, 0x64, 0x17, 0xc1, 0x32,
-	0x58, 0x8d, 0x78, 0x87, 0xb0, 0x08, 0xee, 0x0a, 0xad, 0x0d, 0x1e, 0x64, 0xe3, 0x08, 0xbd, 0xe3,
-	0x06, 0x63, 0x4b, 0x98, 0xa1, 0xd6, 0x68, 0x5b, 0xcb, 0xc0, 0x5b, 0xba, 0x88, 0x31, 0x18, 0x6a,
-	0x61, 0xed, 0x62, 0xb8, 0x0c, 0x56, 0x53, 0xee, 0xbf, 0xd9, 0x63, 0xb8, 0xf8, 0x5e, 0x2b, 0x6a,
-	0xde, 0x8c, 0xfc, 0x9b, 0x33, 0x88, 0x7e, 0x06, 0x00, 0x69, 0x9d, 0x95, 0x2a, 0x77, 0xda, 0x99,
-	0xb5, 0x57, 0x8a, 0x8e, 0x3e, 0xe5, 0x94, 0x9f, 0x41, 0x6f, 0x89, 0xf0, 0xd6, 0x12, 0xff, 0x0f,
-	0xb8, 0x80, 0x89, 0xae, 0xb3, 0xf4, 0x9c, 0xf1, 0x24, 0xa3, 0x67, 0x30, 0xf3, 0x16, 0x2e, 0x73,
-	0x34, 0x85, 0x33, 0x8a, 0xa2, 0x30, 0xd2, 0xba, 0xb2, 0x06, 0xab, 0x0b, 0x7e, 0x92, 0xd1, 0xef,
-	0x10, 0x80, 0xd7, 0xa5, 0x7c, 0x8d, 0xd5, 0x17, 0xb5, 0x63, 0x2f, 0xe0, 0x61, 0x86, 0xc2, 0x14,
-	0x71, 0xd3, 0x14, 0x17, 0xa4, 0xb0, 0xed, 0xf7, 0xf6, 0x80, 0x3d, 0x85, 0xfb, 0xba, 0xce, 0x12,
-	0x9f, 0xa8, 0xb1, 0x36, 0x5b, 0xf4, 0xa8, 0xf7, 0x19, 0xd4, 0x68, 0x45, 0x19, 0xef, 0xb1, 0xae,
-	0xc8, 0x2f, 0x33, 0xe0, 0x3d, 0xca, 0xd6, 0xc0, 0x4a, 0x61, 0x76, 0x32, 0x35, 0xf8, 0x4d, 0xe6,
-	0xd4, 0x7a, 0x87, 0xde, 0xfb, 0x8f, 0x89, 0x3b, 0x73, 0x53, 0x67, 0x2a, 0x8d, 0xc2, 0xa2, 0xbd,
-	0xc7, 0x0d, 0xd6, 0x66, 0x8c, 0x89, 0x64, 0x55, 0x34, 0x19, 0xc7, 0x7f, 0x33, 0x76, 0x28, 0x5b,
-	0xc1, 0x03, 0x47, 0xba, 0x7b, 0x4f, 0xbc, 0xb1, 0x8f, 0xa3, 0x1f, 0x30, 0x8b, 0x73, 0x52, 0x07,
-	0x79, 0xe9, 0x0a, 0x61, 0x8f, 0x60, 0xec, 0x9b, 0x39, 0x55, 0xdb, 0x2a, 0x77, 0x7c, 0x23, 0x0f,
-	0xed, 0x28, 0xf4, 0xa3, 0x33, 0x70, 0xaf, 0x44, 0xb7, 0x8a, 0x56, 0xb9, 0xa3, 0x5b, 0x12, 0x86,
-	0xde, 0x48, 0xb5, 0xfb, 0x7a, 0xda, 0xbd, 0x8b, 0x9e, 0x5f, 0x01, 0x8b, 0x6b, 0xc2, 0x0a, 0xf7,
-	0x47, 0x77, 0xe2, 0x44, 0x93, 0xc2, 0x8a, 0xcd, 0x60, 0xb2, 0x79, 0xb7, 0x8d, 0xdf, 0x6e, 0xae,
-	0xe6, 0x77, 0x9c, 0x88, 0xd3, 0x94, 0x27, 0xdb, 0xeb, 0x79, 0xc0, 0x00, 0xc6, 0x49, 0x9a, 0x26,
-	0x1f, 0xae, 0xe7, 0x21, 0x9b, 0xc2, 0xf0, 0xfd, 0xa7, 0xcd, 0xc7, 0xf9, 0xe0, 0x12, 0x3e, 0x4f,
-	0xd7, 0xeb, 0x97, 0xfe, 0xe7, 0xca, 0xc6, 0xfe, 0x57, 0x7b, 0xf5, 0x27, 0x00, 0x00, 0xff, 0xff,
-	0x52, 0x8a, 0x3a, 0x10, 0x7b, 0x03, 0x00, 0x00,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0x4d, 0x8e, 0xd3, 0x40,
+	0x10, 0x85, 0xb1, 0xf3, 0x3b, 0x15, 0x7e, 0x42, 0x2d, 0x50, 0x16, 0x08, 0x45, 0x5e, 0x40, 0x84,
+	0x50, 0x58, 0x70, 0x02, 0xcf, 0x68, 0x24, 0x86, 0xc5, 0xd8, 0x34, 0x30, 0x0b, 0x76, 0x6d, 0xbb,
+	0x09, 0x46, 0x8e, 0xab, 0xe9, 0x2e, 0x47, 0xca, 0x82, 0x2d, 0x27, 0xe1, 0x00, 0x1c, 0x11, 0x75,
+	0xdb, 0x21, 0x9e, 0x0c, 0x12, 0x3b, 0xd7, 0x57, 0xaf, 0xa5, 0xf7, 0x5e, 0xc9, 0xf0, 0xa0, 0xca,
+	0x69, 0xbb, 0xa5, 0x7a, 0xad, 0x0d, 0x31, 0xe1, 0x88, 0xf7, 0x5a, 0xd9, 0xe8, 0x57, 0x00, 0x70,
+	0x43, 0xac, 0x84, 0xb2, 0x4d, 0xc5, 0xf8, 0x0c, 0x80, 0x89, 0x65, 0xe5, 0x90, 0x5d, 0x04, 0xcb,
+	0x60, 0x35, 0x12, 0x3d, 0x82, 0x11, 0xdc, 0x97, 0x5a, 0x1b, 0xda, 0xa9, 0x56, 0x11, 0x7a, 0xc5,
+	0x2d, 0x86, 0x4b, 0x98, 0x91, 0xd6, 0x64, 0x3b, 0xc9, 0xc0, 0x4b, 0xfa, 0x08, 0x11, 0x86, 0x5a,
+	0x5a, 0xbb, 0x18, 0x2e, 0x83, 0xd5, 0x54, 0xf8, 0x6f, 0x7c, 0x0a, 0x67, 0xdf, 0x9b, 0x92, 0xdb,
+	0x37, 0x23, 0xff, 0xe6, 0x08, 0xa2, 0x9f, 0x01, 0x40, 0xda, 0x64, 0x55, 0x99, 0xbb, 0xd9, 0x89,
+	0xb5, 0x9f, 0x4a, 0xde, 0x7b, 0x97, 0x53, 0x71, 0x04, 0x27, 0x21, 0xc2, 0x3b, 0x21, 0xfe, 0x6f,
+	0x70, 0x01, 0x13, 0xdd, 0x64, 0xe9, 0xd1, 0xe3, 0x61, 0x8c, 0x5e, 0xc0, 0xcc, 0x4b, 0x84, 0xca,
+	0xc9, 0x14, 0x4e, 0x28, 0x8b, 0xc2, 0x28, 0xeb, 0xca, 0x1a, 0xac, 0xce, 0xc4, 0x61, 0x8c, 0x7e,
+	0x87, 0x00, 0xa2, 0xa9, 0xd4, 0x05, 0xd5, 0x5f, 0xca, 0x0d, 0xbe, 0x82, 0xc7, 0x19, 0x49, 0x53,
+	0xc4, 0x6d, 0x53, 0x42, 0x72, 0x49, 0x5d, 0xbf, 0x77, 0x17, 0xf8, 0x1c, 0x1e, 0xea, 0x26, 0x4b,
+	0xbc, 0xa3, 0x56, 0xda, 0xa6, 0x38, 0xa1, 0x5e, 0x67, 0x48, 0x93, 0x95, 0x55, 0xbc, 0xa5, 0xa6,
+	0x66, 0x1f, 0x66, 0x20, 0x4e, 0x28, 0xae, 0x01, 0x2b, 0x69, 0x36, 0x2a, 0x35, 0xf4, 0x4d, 0xe5,
+	0xdc, 0x69, 0x87, 0x5e, 0xfb, 0x8f, 0x8d, 0x3b, 0x73, 0x5b, 0x67, 0xaa, 0x4c, 0x49, 0x45, 0x77,
+	0x8f, 0x5b, 0xac, 0xf3, 0x18, 0x33, 0xab, 0xba, 0x68, 0x3d, 0x8e, 0xff, 0x7a, 0xec, 0x51, 0x5c,
+	0xc1, 0x23, 0x47, 0xfa, 0xb9, 0x27, 0x5e, 0x78, 0x8a, 0xa3, 0x1f, 0x30, 0x8b, 0x73, 0x2e, 0x77,
+	0xea, 0xdc, 0x15, 0x82, 0x4f, 0x60, 0xec, 0x9b, 0x39, 0x54, 0xdb, 0x4d, 0xee, 0xf8, 0x46, 0xed,
+	0xba, 0x55, 0xe8, 0x57, 0x47, 0xe0, 0x5e, 0xc9, 0x7e, 0x15, 0xdd, 0xe4, 0x8e, 0x6e, 0x59, 0x1a,
+	0x7e, 0xab, 0xca, 0xcd, 0xd7, 0x43, 0xf6, 0x3e, 0x7a, 0x79, 0x01, 0x18, 0x37, 0x4c, 0x35, 0x6d,
+	0xf7, 0xee, 0xc4, 0x89, 0xe6, 0x92, 0x6a, 0x04, 0x18, 0x5f, 0x27, 0xef, 0x92, 0xab, 0xeb, 0xf9,
+	0x3d, 0x9c, 0xc1, 0x24, 0x4e, 0x53, 0x91, 0xdc, 0x5c, 0xce, 0x03, 0xb7, 0x48, 0xd2, 0x34, 0xf9,
+	0x70, 0x39, 0x0f, 0x71, 0x0a, 0xc3, 0xf7, 0x9f, 0xae, 0x3e, 0xce, 0x07, 0xe7, 0xf0, 0x79, 0xba,
+	0x5e, 0xbf, 0xf6, 0xff, 0x56, 0x36, 0xf6, 0x7f, 0xda, 0x9b, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff,
+	0x45, 0x4b, 0xaa, 0xe7, 0x7a, 0x03, 0x00, 0x00,
 }

plugin/dapp/autonomy/types/project.pb.go

@@ -382,7 +382,7 @@ func (m *VoteProposalProject) GetVote() AutonomyVoteOption {
 	if m != nil {
 		return m.Vote
 	}
-	return AutonomyVoteOption_INVALID
+	return AutonomyVoteOption_NOJOIN
 }
 
 type PubVoteProposalProject struct {

plugin/dapp/autonomy/types/rule.pb.go

@@ -306,7 +306,7 @@ func (m *VoteProposalRule) GetVote() AutonomyVoteOption {
 	if m != nil {
 		return m.Vote
 	}
-	return AutonomyVoteOption_INVALID
+	return AutonomyVoteOption_NOJOIN
 }
 
 type TerminateProposalRule struct {