linter

plugin/dapp/guess/commands/game.go

@@ -139,7 +139,7 @@ func guessBet(cmd *cobra.Command, args []string) {
 	fee, _ := cmd.Flags().GetFloat64("fee")
 
 	params := &pkt.GuessBetTxReq{
-		GameId: gameID,
+		GameID: gameID,
 		Option: option,
 		Bets:   betsNumber,
 		Fee:    int64(fee * float64(1e8)),
@@ -173,7 +173,7 @@ func guessStopBet(cmd *cobra.Command, args []string) {
 	fee, _ := cmd.Flags().GetFloat64("fee")
 
 	params := &pkt.GuessStopBetTxReq{
-		GameId: gameID,
+		GameID: gameID,
 		Fee:    int64(fee * float64(1e8)),
 	}
 
@@ -204,7 +204,7 @@ func guessAbort(cmd *cobra.Command, args []string) {
 	gameID, _ := cmd.Flags().GetString("gameId")
 	fee, _ := cmd.Flags().GetFloat64("fee")
 	params := &pkt.GuessAbortTxReq{
-		GameId: gameID,
+		GameID: gameID,
 		Fee:    int64(fee * float64(1e8)),
 	}
 
@@ -241,7 +241,7 @@ func guessPublish(cmd *cobra.Command, args []string) {
 	fee, _ := cmd.Flags().GetFloat64("fee")
 
 	params := &pkt.GuessPublishTxReq{
-		GameId: gameID,
+		GameID: gameID,
 		Result: result,
 		Fee:    int64(fee * float64(1e8)),
 	}
@@ -300,7 +300,7 @@ func guessQuery(cmd *cobra.Command, args []string) {
 	case 1:
 		gameIds := strings.Split(gameIDs, ";")
 		req := &pkt.QueryGuessGameInfos{
-			GameIds: gameIds,
+			GameIDs: gameIds,
 		}
 		params.FuncName = pkt.FuncName_QueryGamesByIds
 		params.Payload = types.MustPBToJSON(req)
@@ -310,7 +310,7 @@ func guessQuery(cmd *cobra.Command, args []string) {
 
 	case 2:
 		req := &pkt.QueryGuessGameInfo{
-			GameId: gameID,
+			GameID: gameID,
 		}
 		params.FuncName = pkt.FuncName_QueryGameById
 		params.Payload = types.MustPBToJSON(req)

plugin/dapp/guess/executor/exec_del_local.go

@@ -24,9 +24,9 @@ func (g *Guess) rollbackIndex(log *pkt.ReceiptGuessGame) (kvs []*types.KeyValue)
 
 		//如果发生了状态变化，恢复老状态的记录，删除新添加的状态记录
 		if log.StatusChange {
-			kvs = append(kvs, addGuessGameStatusIndexKey(log.PreStatus, log.GameId, log.PreIndex))
-			kvs = append(kvs, addGuessGameAdminStatusIndexKey(log.PreStatus, log.AdminAddr, log.GameId, log.PreIndex))
-			kvs = append(kvs, addGuessGameCategoryStatusIndexKey(log.PreStatus, log.Category, log.GameId, log.PreIndex))
+			kvs = append(kvs, addGuessGameStatusIndexKey(log.PreStatus, log.GameID, log.PreIndex))
+			kvs = append(kvs, addGuessGameAdminStatusIndexKey(log.PreStatus, log.AdminAddr, log.GameID, log.PreIndex))
+			kvs = append(kvs, addGuessGameCategoryStatusIndexKey(log.PreStatus, log.Category, log.GameID, log.PreIndex))
 
 			kvs = append(kvs, delGuessGameStatusIndexKey(log.Status, log.Index))
 			kvs = append(kvs, delGuessGameAdminStatusIndexKey(log.Status, log.AdminAddr, log.Index))
@@ -34,20 +34,20 @@ func (g *Guess) rollbackIndex(log *pkt.ReceiptGuessGame) (kvs []*types.KeyValue)
 		}
 	} else if log.StatusChange {
 		//其他状态时的状态发生变化的情况,要将老状态对应的记录恢复，同时删除新加的状态记录；对于每个地址的下注记录也需要遍历处理。
-		kvs = append(kvs, addGuessGameStatusIndexKey(log.PreStatus, log.GameId, log.PreIndex))
-		kvs = append(kvs, addGuessGameAdminStatusIndexKey(log.PreStatus, log.AdminAddr, log.GameId, log.PreIndex))
-		kvs = append(kvs, addGuessGameCategoryStatusIndexKey(log.PreStatus, log.Category, log.GameId, log.PreIndex))
+		kvs = append(kvs, addGuessGameStatusIndexKey(log.PreStatus, log.GameID, log.PreIndex))
+		kvs = append(kvs, addGuessGameAdminStatusIndexKey(log.PreStatus, log.AdminAddr, log.GameID, log.PreIndex))
+		kvs = append(kvs, addGuessGameCategoryStatusIndexKey(log.PreStatus, log.Category, log.GameID, log.PreIndex))
 
 		kvs = append(kvs, delGuessGameStatusIndexKey(log.Status, log.Index))
 		kvs = append(kvs, delGuessGameAdminStatusIndexKey(log.Status, log.AdminAddr, log.Index))
 		kvs = append(kvs, delGuessGameCategoryStatusIndexKey(log.Status, log.Category, log.Index))
 
 		//从game中遍历每个地址的记录进行删除新增记录，回复老记录
-		game, err := readGame(g.GetStateDB(), log.GameId)
+		game, err := readGame(g.GetStateDB(), log.GameID)
 		if err == nil {
 			for i := 0; i < len(game.Plays); i++ {
 				player := game.Plays[i]
-				kvs = append(kvs, addGuessGameAddrStatusIndexKey(log.PreStatus, player.Addr, log.GameId, player.Bet.PreIndex))
+				kvs = append(kvs, addGuessGameAddrStatusIndexKey(log.PreStatus, player.Addr, log.GameID, player.Bet.PreIndex))
 				kvs = append(kvs, delGuessGameAddrStatusIndexKey(log.Status, player.Addr, log.Index))
 			}
 		}

plugin/dapp/guess/executor/exec_local.go

@@ -13,19 +13,19 @@ func (g *Guess) updateIndex(log *pkt.ReceiptGuessGame) (kvs []*types.KeyValue) {
 	//新创建游戏
 	if log.Status == pkt.GuessGameStatusStart {
 		//kvs = append(kvs, addGuessGameAddrIndexKey(log.Status, log.Addr, log.GameId, log.Index))
-		kvs = append(kvs, addGuessGameStatusIndexKey(log.Status, log.GameId, log.Index))
-		kvs = append(kvs, addGuessGameAdminIndexKey(log.Status, log.AdminAddr, log.GameId, log.Index))
-		kvs = append(kvs, addGuessGameAdminStatusIndexKey(log.Status, log.AdminAddr, log.GameId, log.Index))
-		kvs = append(kvs, addGuessGameCategoryStatusIndexKey(log.Status, log.Category, log.GameId, log.Index))
+		kvs = append(kvs, addGuessGameStatusIndexKey(log.Status, log.GameID, log.Index))
+		kvs = append(kvs, addGuessGameAdminIndexKey(log.Status, log.AdminAddr, log.GameID, log.Index))
+		kvs = append(kvs, addGuessGameAdminStatusIndexKey(log.Status, log.AdminAddr, log.GameID, log.Index))
+		kvs = append(kvs, addGuessGameCategoryStatusIndexKey(log.Status, log.Category, log.GameID, log.Index))
 	} else if log.Status == pkt.GuessGameStatusBet {
 		//如果是下注状态，则有用户进行了下注操作
-		kvs = append(kvs, addGuessGameAddrIndexKey(log.Status, log.Addr, log.GameId, log.Index))
-		kvs = append(kvs, addGuessGameAddrStatusIndexKey(log.Status, log.Addr, log.GameId, log.Index))
+		kvs = append(kvs, addGuessGameAddrIndexKey(log.Status, log.Addr, log.GameID, log.Index))
+		kvs = append(kvs, addGuessGameAddrStatusIndexKey(log.Status, log.Addr, log.GameID, log.Index))
 		//如果发生了状态变化，则是从start->bet，对于老状态的记录进行删除操作，并增加新状态记录
 		if log.StatusChange {
-			kvs = append(kvs, addGuessGameStatusIndexKey(log.Status, log.GameId, log.Index))
-			kvs = append(kvs, addGuessGameAdminStatusIndexKey(log.Status, log.AdminAddr, log.GameId, log.Index))
-			kvs = append(kvs, addGuessGameCategoryStatusIndexKey(log.Status, log.Category, log.GameId, log.Index))
+			kvs = append(kvs, addGuessGameStatusIndexKey(log.Status, log.GameID, log.Index))
+			kvs = append(kvs, addGuessGameAdminStatusIndexKey(log.Status, log.AdminAddr, log.GameID, log.Index))
+			kvs = append(kvs, addGuessGameCategoryStatusIndexKey(log.Status, log.Category, log.GameID, log.Index))
 
 			kvs = append(kvs, delGuessGameStatusIndexKey(log.PreStatus, log.PreIndex))
 			kvs = append(kvs, delGuessGameAdminStatusIndexKey(log.PreStatus, log.AdminAddr, log.PreIndex))
@@ -33,20 +33,20 @@ func (g *Guess) updateIndex(log *pkt.ReceiptGuessGame) (kvs []*types.KeyValue) {
 		}
 	} else if log.StatusChange {
 		//其他状态时的状态发生变化,要将老状态对应的记录删除，同时加入新状态记录；对于每个地址的下注记录也需要遍历处理。
-		kvs = append(kvs, addGuessGameStatusIndexKey(log.Status, log.GameId, log.Index))
-		kvs = append(kvs, addGuessGameAdminStatusIndexKey(log.Status, log.AdminAddr, log.GameId, log.Index))
-		kvs = append(kvs, addGuessGameCategoryStatusIndexKey(log.Status, log.Category, log.GameId, log.Index))
+		kvs = append(kvs, addGuessGameStatusIndexKey(log.Status, log.GameID, log.Index))
+		kvs = append(kvs, addGuessGameAdminStatusIndexKey(log.Status, log.AdminAddr, log.GameID, log.Index))
+		kvs = append(kvs, addGuessGameCategoryStatusIndexKey(log.Status, log.Category, log.GameID, log.Index))
 
 		kvs = append(kvs, delGuessGameStatusIndexKey(log.PreStatus, log.PreIndex))
 		kvs = append(kvs, delGuessGameAdminStatusIndexKey(log.PreStatus, log.AdminAddr, log.PreIndex))
 		kvs = append(kvs, delGuessGameCategoryStatusIndexKey(log.PreStatus, log.Category, log.PreIndex))
 
 		//从game中遍历每个地址的记录进行新状态记录的增和老状态记录的删除
-		game, err := readGame(g.GetStateDB(), log.GameId)
+		game, err := readGame(g.GetStateDB(), log.GameID)
 		if err == nil {
 			for i := 0; i < len(game.Plays); i++ {
 				player := game.Plays[i]
-				kvs = append(kvs, addGuessGameAddrStatusIndexKey(log.Status, player.Addr, log.GameId, log.Index))
+				kvs = append(kvs, addGuessGameAddrStatusIndexKey(log.Status, player.Addr, log.GameID, log.Index))
 				kvs = append(kvs, delGuessGameAddrStatusIndexKey(log.PreStatus, player.Addr, player.Bet.PreIndex))
 			}
 		}

plugin/dapp/guess/executor/guessdb.go

@@ -139,8 +139,8 @@ func readGame(db dbm.KV, id string) (*pkt.GuessGame, error) {
 //Infos 根据游戏id列表查询多个游戏详情信息
 func Infos(db dbm.KV, infos *pkt.QueryGuessGameInfos) (types.Message, error) {
 	var games []*pkt.GuessGame
-	for i := 0; i < len(infos.GameIds); i++ {
-		id := infos.GameIds[i]
+	for i := 0; i < len(infos.GameIDs); i++ {
+		id := infos.GameIDs[i]
 		game, err := readGame(db, id)
 		if err != nil {
 			return nil, err
@@ -302,8 +302,8 @@ func getGameListByCategoryStatus(db dbm.Lister, category string, status int32, i
 
 func (action *Action) saveGame(game *pkt.GuessGame) (kvset []*types.KeyValue) {
 	value := types.Encode(game)
-	action.db.Set(Key(game.GetGameId()), value)
-	kvset = append(kvset, &types.KeyValue{Key: Key(game.GameId), Value: value})
+	action.db.Set(Key(game.GetGameID()), value)
+	kvset = append(kvset, &types.KeyValue{Key: Key(game.GameID), Value: value})
 	return kvset
 }
 
@@ -331,7 +331,7 @@ func (action *Action) GetReceiptLog(game *pkt.GuessGame, statusChange bool) *typ
 	}
 
 	r.Index = game.Index
-	r.GameId = game.GameId
+	r.GameID = game.GameID
 	r.Status = game.Status
 	r.AdminAddr = game.AdminAddr
 	r.PreStatus = game.PreStatus
@@ -359,7 +359,7 @@ func (action *Action) readGame(id string) (*pkt.GuessGame, error) {
 // 新建一局游戏
 func (action *Action) newGame(gameID string, start *pkt.GuessGameStart) (*pkt.GuessGame, error) {
 	game := &pkt.GuessGame{
-		GameId: gameID,
+		GameID: gameID,
 		Status: pkt.GuessGameActionStart,
 		//StartTime:   action.blocktime,
 		StartTxHash:    gameID,
@@ -468,10 +468,10 @@ func (action *Action) GameBet(pbBet *pkt.GuessGameBet) (*types.Receipt, error) {
 	var logs []*types.ReceiptLog
 	var kv []*types.KeyValue
 
-	game, err := action.readGame(pbBet.GetGameId())
+	game, err := action.readGame(pbBet.GetGameID())
 	if err != nil {
 		logger.Error("GameBet", "addr", action.fromaddr, "execaddr", action.execaddr, "get game failed",
-			pbBet.GetGameId(), "err", err)
+			pbBet.GetGameID(), "err", err)
 		return nil, err
 	}
 
@@ -484,7 +484,7 @@ func (action *Action) GameBet(pbBet *pkt.GuessGameBet) (*types.Receipt, error) {
 
 	canBet := action.RefreshStatusByTime(game)
 
-	if canBet == false {
+	if !canBet {
 		var receiptLog *types.ReceiptLog
 		if prevStatus != game.Status {
 			//状态发生了变化，且是变到了不可下注的状态，那么对于所有下注的addr来说，其addr:status主键的数据都需要更新
@@ -529,7 +529,7 @@ func (action *Action) GameBet(pbBet *pkt.GuessGameBet) (*types.Receipt, error) {
 	checkValue := pbBet.BetsNum
 	if !action.CheckExecAccountBalance(action.fromaddr, checkValue, 0) {
 		logger.Error("GameBet", "addr", action.fromaddr, "execaddr", action.execaddr, "id",
-			pbBet.GetGameId(), "err", types.ErrNoBalance)
+			pbBet.GetGameID(), "err", types.ErrNoBalance)
 		return nil, types.ErrNoBalance
 	}
 
@@ -562,10 +562,10 @@ func (action *Action) GameStopBet(pbBet *pkt.GuessGameStopBet) (*types.Receipt,
 	var logs []*types.ReceiptLog
 	var kv []*types.KeyValue
 
-	game, err := action.readGame(pbBet.GetGameId())
+	game, err := action.readGame(pbBet.GetGameID())
 	if err != nil {
 		logger.Error("GameStopBet", "addr", action.fromaddr, "execaddr", action.execaddr, "get game failed",
-			pbBet.GetGameId(), "err", err)
+			pbBet.GetGameID(), "err", err)
 		return nil, err
 	}
 
@@ -622,10 +622,10 @@ func (action *Action) GamePublish(publish *pkt.GuessGamePublish) (*types.Receipt
 	var logs []*types.ReceiptLog
 	var kv []*types.KeyValue
 
-	game, err := action.readGame(publish.GetGameId())
+	game, err := action.readGame(publish.GetGameID())
 	if err != nil {
 		logger.Error("GamePublish", "addr", action.fromaddr, "execaddr", action.execaddr, "get game failed",
-			publish.GetGameId(), "err", err)
+			publish.GetGameID(), "err", err)
 		return nil, err
 	}
 
@@ -706,7 +706,7 @@ func (action *Action) GamePublish(publish *pkt.GuessGamePublish) (*types.Receipt
 	}
 
 	if game.DevFeeFactor > 0 {
-		devFee = int64(totalBetsNumber) * game.DevFeeFactor / 1000
+		devFee = totalBetsNumber * game.DevFeeFactor / 1000
 		receipt, err := action.coinsAccount.ExecTransfer(game.AdminAddr, devAddr, action.execaddr, devFee)
 		if err != nil {
 			action.coinsAccount.ExecFrozen(game.AdminAddr, action.execaddr, devFee) // rollback
@@ -719,7 +719,7 @@ func (action *Action) GamePublish(publish *pkt.GuessGamePublish) (*types.Receipt
 	}
 
 	if game.PlatFeeFactor > 0 {
-		platFee = int64(totalBetsNumber) * game.PlatFeeFactor / 1000
+		platFee = totalBetsNumber * game.PlatFeeFactor / 1000
 		receipt, err := action.coinsAccount.ExecTransfer(game.AdminAddr, platAddr, action.execaddr, platFee)
 		if err != nil {
 			action.coinsAccount.ExecFrozen(game.AdminAddr, action.execaddr, platFee) // rollback
@@ -736,7 +736,7 @@ func (action *Action) GamePublish(publish *pkt.GuessGamePublish) (*types.Receipt
 	for j := 0; j < len(game.Plays); j++ {
 		player := game.Plays[j]
 		if player.Bet.Option == game.Result {
-			value := int64(player.Bet.BetsNumber * winValue / winBetsNumber)
+			value := player.Bet.BetsNumber * winValue / winBetsNumber
 			receipt, err := action.coinsAccount.ExecTransfer(game.AdminAddr, player.Addr, action.execaddr, value)
 			if err != nil {
 				action.coinsAccount.ExecFrozen(player.Addr, action.execaddr, value) // rollback
@@ -766,10 +766,10 @@ func (action *Action) GameAbort(pbend *pkt.GuessGameAbort) (*types.Receipt, erro
 	var logs []*types.ReceiptLog
 	var kv []*types.KeyValue
 
-	game, err := action.readGame(pbend.GetGameId())
+	game, err := action.readGame(pbend.GetGameID())
 	if err != nil {
 		logger.Error("GameAbort", "addr", action.fromaddr, "execaddr", action.execaddr, "get game failed",
-			pbend.GetGameId(), "err", err)
+			pbend.GetGameID(), "err", err)
 		return nil, err
 	}
 
@@ -796,7 +796,7 @@ func (action *Action) GameAbort(pbend *pkt.GuessGameAbort) (*types.Receipt, erro
 	//激活冻结账户
 	for i := 0; i < len(game.Plays); i++ {
 		player := game.Plays[i]
-		value := int64(player.Bet.BetsNumber)
+		value := player.Bet.BetsNumber
 		receipt, err := action.coinsAccount.ExecActive(player.Addr, action.execaddr, value)
 		if err != nil {
 			logger.Error("GameAbort", "addr", player.Addr, "execaddr", action.execaddr, "amount", value, "err", err)
@@ -864,8 +864,6 @@ func (action *Action) ChangeStatus(game *pkt.GuessGame, destStatus int32) {
 		game.Status = destStatus
 		game.Index = action.getIndex()
 	}
-
-	return
 }
 
 //ChangeAllAddrIndex 状态更新时，更新下注记录的历史信息

plugin/dapp/guess/executor/keys.go

@@ -81,7 +81,7 @@ func addGuessGameAddrIndexKey(status int32, addr, gameID string, index int64) *t
 	kv := &types.KeyValue{}
 	kv.Key = calcGuessGameAddrKey(addr, index)
 	record := &pkt.GuessGameRecord{
-		GameId: gameID,
+		GameID: gameID,
 		Status: status,
 		Index:  index,
 	}
@@ -100,7 +100,7 @@ func addGuessGameStatusIndexKey(status int32, gameID string, index int64) *types
 	kv := &types.KeyValue{}
 	kv.Key = calcGuessGameStatusKey(status, index)
 	record := &pkt.GuessGameRecord{
-		GameId: gameID,
+		GameID: gameID,
 		Status: status,
 		Index:  index,
 	}
@@ -119,7 +119,7 @@ func addGuessGameAddrStatusIndexKey(status int32, addr, gameID string, index int
 	kv := &types.KeyValue{}
 	kv.Key = calcGuessGameAddrStatusKey(addr, status, index)
 	record := &pkt.GuessGameRecord{
-		GameId: gameID,
+		GameID: gameID,
 		Status: status,
 		Index:  index,
 	}
@@ -138,7 +138,7 @@ func addGuessGameAdminIndexKey(status int32, addr, gameID string, index int64) *
 	kv := &types.KeyValue{}
 	kv.Key = calcGuessGameAdminKey(addr, index)
 	record := &pkt.GuessGameRecord{
-		GameId: gameID,
+		GameID: gameID,
 		Status: status,
 		Index:  index,
 	}
@@ -157,7 +157,7 @@ func addGuessGameAdminStatusIndexKey(status int32, addr, gameID string, index in
 	kv := &types.KeyValue{}
 	kv.Key = calcGuessGameAdminStatusKey(addr, status, index)
 	record := &pkt.GuessGameRecord{
-		GameId: gameID,
+		GameID: gameID,
 		Status: status,
 		Index:  index,
 	}
@@ -176,7 +176,7 @@ func addGuessGameCategoryStatusIndexKey(status int32, category, gameID string, i
 	kv := &types.KeyValue{}
 	kv.Key = calcGuessGameCategoryStatusKey(category, status, index)
 	record := &pkt.GuessGameRecord{
-		GameId: gameID,
+		GameID: gameID,
 		Status: status,
 		Index:  index,
 	}

plugin/dapp/guess/executor/query.go

@@ -16,7 +16,7 @@ func (g *Guess) Query_QueryGamesByIds(in *pkt.QueryGuessGameInfos) (types.Messag
 
 //Query_QueryGameById method
 func (g *Guess) Query_QueryGameById(in *pkt.QueryGuessGameInfo) (types.Message, error) {
-	game, err := readGame(g.GetStateDB(), in.GetGameId())
+	game, err := readGame(g.GetStateDB(), in.GetGameID())
 	if err != nil {
 		return nil, err
 	}

plugin/dapp/guess/proto/guess.proto

@@ -6,7 +6,7 @@ package types;
 
 //GuessGame 竞猜游戏详情
 message GuessGame {
-    string gameId        = 1;  //游戏ID
+    string gameID        = 1;  //游戏ID
     int32 status         = 2;  //游戏的状态：创建->投注->截止投注->开奖
     int32 preStatus      = 3;
     int64  startTime     = 4;  //创建游戏的时间
@@ -94,36 +94,36 @@ message GuessGameStart{
 
 //GuessGameBet 参与游戏下注
 message GuessGameBet{
-    string gameId     = 1;
+    string gameID     = 1;
     string option     = 2;
     int64  betsNum    = 3;
 }
 
 //GuessGameStopBet 游戏停止下注
 message GuessGameStopBet{
-    string gameId     = 1;
+    string gameID     = 1;
 }
 
 //GuessGameAbort 游戏异常终止,退还下注
 message GuessGameAbort{
-    string gameId     = 1;
+    string gameID     = 1;
 }
 
 //GuessGamePublish 游戏结果揭晓
 message GuessGamePublish{
-    string gameId     = 1;
+    string gameID     = 1;
     string result     = 2;
 }
 
 //GuessGameQuery 查询游戏结果
 message GuessGameQuery{
-    string gameId     = 1;
+    string gameID     = 1;
     uint32 ty          = 2;
 }
 
 //QueryGuessGameInfo 游戏信息查询消息
 message QueryGuessGameInfo {
-    string gameId = 1;
+    string gameID = 1;
     string addr   = 2;
     int32  status = 3;
     int64  index  = 4;
@@ -138,7 +138,7 @@ message ReplyGuessGameInfo {
 
 //QueryGuessGameInfos 游戏信息列表查询消息
 message QueryGuessGameInfos {
-    repeated string gameIds = 1;
+    repeated string gameIDs = 1;
 }
 
 //ReplyGuessGameInfos 游戏信息列表查询响应消息
@@ -148,7 +148,7 @@ message ReplyGuessGameInfos {
 
 //ReceiptGuessGame 竞猜游戏收据信息
 message ReceiptGuessGame {
-    string   gameId           = 1;
+    string   gameID           = 1;
     int32   preStatus        = 2;
     int32   status           = 3;
     string   addr             = 4;
@@ -178,7 +178,7 @@ message GuessStartTxReq {
 
 //GuessBetTxReq 构造bet交易的请求
 message GuessBetTxReq {
-    string gameId    = 1;
+    string gameID    = 1;
     string option    = 2;
     int64  bets      = 3;
     int64 fee        = 4;
@@ -186,26 +186,26 @@ message GuessBetTxReq {
 
 //GuessStopBetTxReq 构造stopBet交易的请求
 message GuessStopBetTxReq {
-    string gameId    = 1;
+    string gameID    = 1;
     int64 fee        = 2;
 }
 
 //GuessAbortTxReq 构造abort交易的请求
 message GuessAbortTxReq {
-    string gameId    = 1;
+    string gameID    = 1;
     int64 fee        = 2;
 }
 
 //GuessPublishTxReq 构造publish交易的请求
 message GuessPublishTxReq {
-    string gameId    = 1;
+    string gameID    = 1;
     string result    = 2;
     int64 fee        = 3;
 }
 
 // GuessGameRecord game信息查询记录
 message GuessGameRecord {
-    string gameId = 1;
+    string gameID = 1;
     int32  status = 2;
     int64  index  = 3;
 }

plugin/dapp/guess/rpc/rpc.go

@@ -52,7 +52,7 @@ func (c *channelClient) GuessStart(ctx context.Context, parm *pb.GuessStartTxReq
 //构造bet原始交易
 func (c *channelClient) GuessBet(ctx context.Context, parm *pb.GuessBetTxReq) (*types.UnsignTx, error) {
 	v := &pb.GuessGameBet{
-		GameId:  parm.GameId,
+		GameID:  parm.GameID,
 		Option:  parm.Option,
 		BetsNum: parm.Bets,
 	}
@@ -81,7 +81,7 @@ func (c *channelClient) GuessBet(ctx context.Context, parm *pb.GuessBetTxReq) (*
 //构造stopBet原始交易
 func (c *channelClient) GuessStopBet(ctx context.Context, parm *pb.GuessStopBetTxReq) (*types.UnsignTx, error) {
 	v := &pb.GuessGameStopBet{
-		GameId: parm.GameId,
+		GameID: parm.GameID,
 	}
 
 	val := &pb.GuessGameAction{
@@ -108,7 +108,7 @@ func (c *channelClient) GuessStopBet(ctx context.Context, parm *pb.GuessStopBetT
 //构造abort原始交易
 func (c *channelClient) GuessAbort(ctx context.Context, parm *pb.GuessAbortTxReq) (*types.UnsignTx, error) {
 	v := &pb.GuessGameAbort{
-		GameId: parm.GameId,
+		GameID: parm.GameID,
 	}
 
 	val := &pb.GuessGameAction{
@@ -134,7 +134,7 @@ func (c *channelClient) GuessAbort(ctx context.Context, parm *pb.GuessAbortTxReq
 //构造publish原始交易
 func (c *channelClient) GuessPublish(ctx context.Context, parm *pb.GuessPublishTxReq) (*types.UnsignTx, error) {
 	v := &pb.GuessGamePublish{
-		GameId: parm.GameId,
+		GameID: parm.GameID,
 		Result: parm.Result,
 	}
 

plugin/dapp/guess/types/guess.pb.go

@@ -6,11 +6,10 @@ package types
 import (
 	context "context"
 	fmt "fmt"
-	math "math"
-
 	types "github.com/33cn/chain33/types"
 	proto "github.com/golang/protobuf/proto"
 	grpc "google.golang.org/grpc"
+	math "math"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -26,7 +25,7 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 //GuessGame 竞猜游戏详情
 type GuessGame struct {
-	GameId               string         `protobuf:"bytes,1,opt,name=gameId,proto3" json:"gameId,omitempty"`
+	GameID               string         `protobuf:"bytes,1,opt,name=gameID,proto3" json:"gameID,omitempty"`
 	Status               int32          `protobuf:"varint,2,opt,name=status,proto3" json:"status,omitempty"`
 	PreStatus            int32          `protobuf:"varint,3,opt,name=preStatus,proto3" json:"preStatus,omitempty"`
 	StartTime            int64          `protobuf:"varint,4,opt,name=startTime,proto3" json:"startTime,omitempty"`
@@ -81,9 +80,9 @@ func (m *GuessGame) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_GuessGame proto.InternalMessageInfo
 
-func (m *GuessGame) GetGameId() string {
+func (m *GuessGame) GetGameID() string {
 	if m != nil {
-		return m.GameId
+		return m.GameID
 	}
 	return ""
 }
@@ -913,7 +912,7 @@ func (m *GuessGameStart) GetDrivenByAdmin() bool {
 
 //GuessGameBet 参与游戏下注
 type GuessGameBet struct {
-	GameId               string   `protobuf:"bytes,1,opt,name=gameId,proto3" json:"gameId,omitempty"`
+	GameID               string   `protobuf:"bytes,1,opt,name=gameID,proto3" json:"gameID,omitempty"`
 	Option               string   `protobuf:"bytes,2,opt,name=option,proto3" json:"option,omitempty"`
 	BetsNum              int64    `protobuf:"varint,3,opt,name=betsNum,proto3" json:"betsNum,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -946,9 +945,9 @@ func (m *GuessGameBet) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_GuessGameBet proto.InternalMessageInfo
 
-func (m *GuessGameBet) GetGameId() string {
+func (m *GuessGameBet) GetGameID() string {
 	if m != nil {
-		return m.GameId
+		return m.GameID
 	}
 	return ""
 }
@@ -969,7 +968,7 @@ func (m *GuessGameBet) GetBetsNum() int64 {
 
 //GuessGameStopBet 游戏停止下注
 type GuessGameStopBet struct {
-	GameId               string   `protobuf:"bytes,1,opt,name=gameId,proto3" json:"gameId,omitempty"`
+	GameID               string   `protobuf:"bytes,1,opt,name=gameID,proto3" json:"gameID,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1000,16 +999,16 @@ func (m *GuessGameStopBet) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_GuessGameStopBet proto.InternalMessageInfo
 
-func (m *GuessGameStopBet) GetGameId() string {
+func (m *GuessGameStopBet) GetGameID() string {
 	if m != nil {
-		return m.GameId
+		return m.GameID
 	}
 	return ""
 }
 
 //GuessGameAbort 游戏异常终止,退还下注
 type GuessGameAbort struct {
-	GameId               string   `protobuf:"bytes,1,opt,name=gameId,proto3" json:"gameId,omitempty"`
+	GameID               string   `protobuf:"bytes,1,opt,name=gameID,proto3" json:"gameID,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1040,16 +1039,16 @@ func (m *GuessGameAbort) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_GuessGameAbort proto.InternalMessageInfo
 
-func (m *GuessGameAbort) GetGameId() string {
+func (m *GuessGameAbort) GetGameID() string {
 	if m != nil {
-		return m.GameId
+		return m.GameID
 	}
 	return ""
 }
 
 //GuessGamePublish 游戏结果揭晓
 type GuessGamePublish struct {
-	GameId               string   `protobuf:"bytes,1,opt,name=gameId,proto3" json:"gameId,omitempty"`
+	GameID               string   `protobuf:"bytes,1,opt,name=gameID,proto3" json:"gameID,omitempty"`
 	Result               string   `protobuf:"bytes,2,opt,name=result,proto3" json:"result,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
@@ -1081,9 +1080,9 @@ func (m *GuessGamePublish) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_GuessGamePublish proto.InternalMessageInfo
 
-func (m *GuessGamePublish) GetGameId() string {
+func (m *GuessGamePublish) GetGameID() string {
 	if m != nil {
-		return m.GameId
+		return m.GameID
 	}
 	return ""
 }
@@ -1097,7 +1096,7 @@ func (m *GuessGamePublish) GetResult() string {
 
 //GuessGameQuery 查询游戏结果
 type GuessGameQuery struct {
-	GameId               string   `protobuf:"bytes,1,opt,name=gameId,proto3" json:"gameId,omitempty"`
+	GameID               string   `protobuf:"bytes,1,opt,name=gameID,proto3" json:"gameID,omitempty"`
 	Ty                   uint32   `protobuf:"varint,2,opt,name=ty,proto3" json:"ty,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
@@ -1129,9 +1128,9 @@ func (m *GuessGameQuery) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_GuessGameQuery proto.InternalMessageInfo
 
-func (m *GuessGameQuery) GetGameId() string {
+func (m *GuessGameQuery) GetGameID() string {
 	if m != nil {
-		return m.GameId
+		return m.GameID
 	}
 	return ""
 }
@@ -1145,7 +1144,7 @@ func (m *GuessGameQuery) GetTy() uint32 {
 
 //QueryGuessGameInfo 游戏信息查询消息
 type QueryGuessGameInfo struct {
-	GameId               string   `protobuf:"bytes,1,opt,name=gameId,proto3" json:"gameId,omitempty"`
+	GameID               string   `protobuf:"bytes,1,opt,name=gameID,proto3" json:"gameID,omitempty"`
 	Addr                 string   `protobuf:"bytes,2,opt,name=addr,proto3" json:"addr,omitempty"`
 	Status               int32    `protobuf:"varint,3,opt,name=status,proto3" json:"status,omitempty"`
 	Index                int64    `protobuf:"varint,4,opt,name=index,proto3" json:"index,omitempty"`
@@ -1181,9 +1180,9 @@ func (m *QueryGuessGameInfo) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_QueryGuessGameInfo proto.InternalMessageInfo
 
-func (m *QueryGuessGameInfo) GetGameId() string {
+func (m *QueryGuessGameInfo) GetGameID() string {
 	if m != nil {
-		return m.GameId
+		return m.GameID
 	}
 	return ""
 }
@@ -1265,7 +1264,7 @@ func (m *ReplyGuessGameInfo) GetGame() *GuessGame {
 
 //QueryGuessGameInfos 游戏信息列表查询消息
 type QueryGuessGameInfos struct {
-	GameIds              []string `protobuf:"bytes,1,rep,name=gameIds,proto3" json:"gameIds,omitempty"`
+	GameIDs              []string `protobuf:"bytes,1,rep,name=gameIDs,proto3" json:"gameIDs,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1296,9 +1295,9 @@ func (m *QueryGuessGameInfos) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_QueryGuessGameInfos proto.InternalMessageInfo
 
-func (m *QueryGuessGameInfos) GetGameIds() []string {
+func (m *QueryGuessGameInfos) GetGameIDs() []string {
 	if m != nil {
-		return m.GameIds
+		return m.GameIDs
 	}
 	return nil
 }
@@ -1345,7 +1344,7 @@ func (m *ReplyGuessGameInfos) GetGames() []*GuessGame {
 
 //ReceiptGuessGame 竞猜游戏收据信息
 type ReceiptGuessGame struct {
-	GameId               string   `protobuf:"bytes,1,opt,name=gameId,proto3" json:"gameId,omitempty"`
+	GameID               string   `protobuf:"bytes,1,opt,name=gameID,proto3" json:"gameID,omitempty"`
 	PreStatus            int32    `protobuf:"varint,2,opt,name=preStatus,proto3" json:"preStatus,omitempty"`
 	Status               int32    `protobuf:"varint,3,opt,name=status,proto3" json:"status,omitempty"`
 	Addr                 string   `protobuf:"bytes,4,opt,name=addr,proto3" json:"addr,omitempty"`
@@ -1384,9 +1383,9 @@ func (m *ReceiptGuessGame) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_ReceiptGuessGame proto.InternalMessageInfo
 
-func (m *ReceiptGuessGame) GetGameId() string {
+func (m *ReceiptGuessGame) GetGameID() string {
 	if m != nil {
-		return m.GameId
+		return m.GameID
 	}
 	return ""
 }
@@ -1585,7 +1584,7 @@ func (m *GuessStartTxReq) GetFee() int64 {
 
 //GuessBetTxReq 构造bet交易的请求
 type GuessBetTxReq struct {
-	GameId               string   `protobuf:"bytes,1,opt,name=gameId,proto3" json:"gameId,omitempty"`
+	GameID               string   `protobuf:"bytes,1,opt,name=gameID,proto3" json:"gameID,omitempty"`
 	Option               string   `protobuf:"bytes,2,opt,name=option,proto3" json:"option,omitempty"`
 	Bets                 int64    `protobuf:"varint,3,opt,name=bets,proto3" json:"bets,omitempty"`
 	Fee                  int64    `protobuf:"varint,4,opt,name=fee,proto3" json:"fee,omitempty"`
@@ -1619,9 +1618,9 @@ func (m *GuessBetTxReq) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_GuessBetTxReq proto.InternalMessageInfo
 
-func (m *GuessBetTxReq) GetGameId() string {
+func (m *GuessBetTxReq) GetGameID() string {
 	if m != nil {
-		return m.GameId
+		return m.GameID
 	}
 	return ""
 }
@@ -1649,7 +1648,7 @@ func (m *GuessBetTxReq) GetFee() int64 {
 
 //GuessStopBetTxReq 构造stopBet交易的请求
 type GuessStopBetTxReq struct {
-	GameId               string   `protobuf:"bytes,1,opt,name=gameId,proto3" json:"gameId,omitempty"`
+	GameID               string   `protobuf:"bytes,1,opt,name=gameID,proto3" json:"gameID,omitempty"`
 	Fee                  int64    `protobuf:"varint,2,opt,name=fee,proto3" json:"fee,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
@@ -1681,9 +1680,9 @@ func (m *GuessStopBetTxReq) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_GuessStopBetTxReq proto.InternalMessageInfo
 
-func (m *GuessStopBetTxReq) GetGameId() string {
+func (m *GuessStopBetTxReq) GetGameID() string {
 	if m != nil {
-		return m.GameId
+		return m.GameID
 	}
 	return ""
 }
@@ -1697,7 +1696,7 @@ func (m *GuessStopBetTxReq) GetFee() int64 {
 
 //GuessAbortTxReq 构造abort交易的请求
 type GuessAbortTxReq struct {
-	GameId               string   `protobuf:"bytes,1,opt,name=gameId,proto3" json:"gameId,omitempty"`
+	GameID               string   `protobuf:"bytes,1,opt,name=gameID,proto3" json:"gameID,omitempty"`
 	Fee                  int64    `protobuf:"varint,2,opt,name=fee,proto3" json:"fee,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
@@ -1729,9 +1728,9 @@ func (m *GuessAbortTxReq) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_GuessAbortTxReq proto.InternalMessageInfo
 
-func (m *GuessAbortTxReq) GetGameId() string {
+func (m *GuessAbortTxReq) GetGameID() string {
 	if m != nil {
-		return m.GameId
+		return m.GameID
 	}
 	return ""
 }
@@ -1745,7 +1744,7 @@ func (m *GuessAbortTxReq) GetFee() int64 {
 
 //GuessPublishTxReq 构造publish交易的请求
 type GuessPublishTxReq struct {
-	GameId               string   `protobuf:"bytes,1,opt,name=gameId,proto3" json:"gameId,omitempty"`
+	GameID               string   `protobuf:"bytes,1,opt,name=gameID,proto3" json:"gameID,omitempty"`
 	Result               string   `protobuf:"bytes,2,opt,name=result,proto3" json:"result,omitempty"`
 	Fee                  int64    `protobuf:"varint,3,opt,name=fee,proto3" json:"fee,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -1778,9 +1777,9 @@ func (m *GuessPublishTxReq) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_GuessPublishTxReq proto.InternalMessageInfo
 
-func (m *GuessPublishTxReq) GetGameId() string {
+func (m *GuessPublishTxReq) GetGameID() string {
 	if m != nil {
-		return m.GameId
+		return m.GameID
 	}
 	return ""
 }
@@ -1801,7 +1800,7 @@ func (m *GuessPublishTxReq) GetFee() int64 {
 
 // GuessGameRecord game信息查询记录
 type GuessGameRecord struct {
-	GameId               string   `protobuf:"bytes,1,opt,name=gameId,proto3" json:"gameId,omitempty"`
+	GameID               string   `protobuf:"bytes,1,opt,name=gameID,proto3" json:"gameID,omitempty"`
 	Status               int32    `protobuf:"varint,2,opt,name=status,proto3" json:"status,omitempty"`
 	Index                int64    `protobuf:"varint,3,opt,name=index,proto3" json:"index,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -1834,9 +1833,9 @@ func (m *GuessGameRecord) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_GuessGameRecord proto.InternalMessageInfo
 
-func (m *GuessGameRecord) GetGameId() string {
+func (m *GuessGameRecord) GetGameID() string {
 	if m != nil {
-		return m.GameId
+		return m.GameID
 	}
 	return ""
 }
@@ -1925,86 +1924,86 @@ func init() {
 func init() { proto.RegisterFile("guess.proto", fileDescriptor_7574406c5d3430e8) }
 
 var fileDescriptor_7574406c5d3430e8 = []byte{
-	// 1255 bytes of a gzipped FileDescriptorProto
+	// 1254 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xcd, 0x6e, 0xdb, 0x46,
-	0x10, 0xb6, 0x48, 0x51, 0x3f, 0x23, 0xf9, 0x27, 0xeb, 0xc4, 0x61, 0x0d, 0xa3, 0x50, 0x89, 0x20,
-	0x15, 0x0a, 0xc4, 0x2d, 0x14, 0xa0, 0x28, 0x52, 0xe4, 0x60, 0x35, 0x48, 0xec, 0x4b, 0x9b, 0xd2,
-	0x0e, 0xd2, 0x2b, 0x25, 0xad, 0x25, 0x02, 0x12, 0xc9, 0x90, 0x2b, 0x43, 0xba, 0xf7, 0xda, 0xa7,
-	0x68, 0x0f, 0xbd, 0xb5, 0xcf, 0xd1, 0xa7, 0x2a, 0x66, 0x76, 0x29, 0x2e, 0x29, 0xca, 0x92, 0x8b,
-	0xde, 0x38, 0x3f, 0x3b, 0x33, 0x3b, 0x3b, 0xf3, 0xcd, 0x48, 0xd0, 0x1a, 0xcf, 0x79, 0x92, 0x9c,
-	0x47, 0x71, 0x28, 0x42, 0x66, 0x89, 0x65, 0xc4, 0x93, 0xd3, 0x47, 0x22, 0xf6, 0x82, 0xc4, 0x1b,
-	0x0a, 0x3f, 0x0c, 0xa4, 0xc4, 0xf9, 0xbb, 0x06, 0xcd, 0x77, 0xa8, 0xf9, 0xce, 0x9b, 0x71, 0x76,
-	0x02, 0xb5, 0xb1, 0x37, 0xe3, 0x57, 0x23, 0xbb, 0xd2, 0xa9, 0x74, 0x9b, 0xae, 0xa2, 0x90, 0x9f,
-	0x08, 0x4f, 0xcc, 0x13, 0xdb, 0xe8, 0x54, 0xba, 0x96, 0xab, 0x28, 0x76, 0x06, 0xcd, 0x28, 0xe6,
-	0xd7, 0x52, 0x64, 0x92, 0x28, 0x63, 0xa0, 0x34, 0x11, 0x5e, 0x2c, 0x6e, 0xfc, 0x19, 0xb7, 0xab,
-	0x9d, 0x4a, 0xd7, 0x74, 0x33, 0x06, 0xeb, 0x40, 0x8b, 0x88, 0x4b, 0xee, 0x8f, 0x27, 0xc2, 0xb6,
-	0x48, 0xae, 0xb3, 0x56, 0x1a, 0x37, 0x8b, 0x4b, 0x2f, 0x99, 0xd8, 0x35, 0x0a, 0x49, 0x67, 0xb1,
-	0xc7, 0x60, 0x89, 0x30, 0xf2, 0x87, 0x76, 0x9d, 0x64, 0x92, 0x60, 0xa7, 0xd0, 0x18, 0x7a, 0x82,
-	0x8f, 0xc3, 0x78, 0x69, 0x37, 0x48, 0xb0, 0xa2, 0x99, 0x0d, 0xf5, 0x30, 0xc2, 0xfb, 0x27, 0x76,
-	0x93, 0x44, 0x29, 0xc9, 0x1c, 0x68, 0xcf, 0xbc, 0x45, 0x9f, 0xa7, 0x01, 0x01, 0x05, 0x94, 0xe3,
-	0xb1, 0xe7, 0x70, 0x20, 0xe9, 0xe4, 0xa7, 0x80, 0xd3, 0xb5, 0x5a, 0xa4, 0x55, 0xe0, 0xb2, 0x67,
-	0xb0, 0xaf, 0x38, 0x3f, 0xce, 0x67, 0x03, 0x1e, 0xdb, 0x6d, 0x52, 0xcb, 0x33, 0xd1, 0xe3, 0x88,
-	0xdf, 0xbd, 0xe5, 0xfc, 0xad, 0x37, 0x14, 0x61, 0x6c, 0xef, 0x4b, 0x8f, 0x3a, 0x8f, 0x7d, 0x0e,
-	0x20, 0xe9, 0x8b, 0xd1, 0x28, 0xb6, 0x0f, 0x28, 0x64, 0x8d, 0x83, 0x9e, 0xa2, 0xa9, 0x27, 0x32,
-	0x23, 0x87, 0xd2, 0x53, 0x8e, 0x89, 0x99, 0x54, 0x0c, 0x32, 0x73, 0x24, 0x33, 0xa9, 0xb1, 0x30,
-	0x16, 0xbe, 0x88, 0xfc, 0x98, 0xab, 0xdb, 0x3f, 0x92, 0xb1, 0xe8, 0x3c, 0x7c, 0x4f, 0x6f, 0x34,
-	0xf3, 0x03, 0xb2, 0xc1, 0xc8, 0x46, 0xc6, 0xc0, 0x48, 0x07, 0xd9, 0x85, 0x8f, 0xe9, 0xbc, 0xc6,
-	0x61, 0x5d, 0xb0, 0xa2, 0xa9, 0xb7, 0x4c, 0xec, 0xc7, 0x1d, 0xb3, 0xdb, 0xea, 0xb1, 0x73, 0xaa,
-	0xc9, 0x73, 0x2a, 0xbe, 0xf7, 0x53, 0x6f, 0xc9, 0x63, 0x57, 0x2a, 0x60, 0xb5, 0xc5, 0x3c, 0x99,
-	0x4f, 0x85, 0xfd, 0x44, 0x56, 0xa1, 0xa4, 0xd8, 0x0b, 0xa8, 0x0f, 0xb8, 0xc0, 0xe2, 0xb2, 0x4f,
-	0x3a, 0x95, 0x6e, 0xab, 0x77, 0xac, 0xdb, 0xe8, 0x4b, 0x91, 0x9b, 0xea, 0x60, 0x71, 0xf8, 0xc1,
-	0x88, 0x2f, 0xec, 0xa7, 0x14, 0x8b, 0x24, 0xb0, 0x38, 0xa2, 0x98, 0x5f, 0x91, 0xc0, 0x26, 0xc1,
-	0x8a, 0xc6, 0x64, 0x8e, 0x62, 0xff, 0x8e, 0x07, 0xfd, 0xe5, 0x05, 0xde, 0xcb, 0xfe, 0xac, 0x53,
-	0xe9, 0x36, 0xdc, 0x3c, 0xd3, 0x79, 0x03, 0x2d, 0x2d, 0x68, 0xc6, 0xa0, 0xea, 0x61, 0x42, 0x64,
-	0xc7, 0xd0, 0x37, 0xfb, 0x02, 0xcc, 0x01, 0x17, 0xd4, 0x2c, 0xad, 0xde, 0x61, 0x21, 0x4a, 0x17,
-	0x65, 0xce, 0x9f, 0x15, 0x68, 0xa4, 0x1c, 0xbc, 0xb1, 0x2c, 0xc3, 0xb4, 0xef, 0x24, 0x55, 0xc8,
-	0xa9, 0xb1, 0x96, 0xd3, 0x53, 0x68, 0xf8, 0xc9, 0x47, 0x3f, 0x08, 0x78, 0x4c, 0xed, 0xd7, 0x70,
-	0x57, 0x34, 0xda, 0x8c, 0xe2, 0xf0, 0xd6, 0x17, 0xaa, 0xf5, 0x14, 0x95, 0xa5, 0xc5, 0xda, 0x94,
-	0x96, 0x5a, 0x3e, 0x2d, 0xce, 0x6f, 0x15, 0x68, 0xeb, 0x29, 0xc6, 0x3c, 0x89, 0x50, 0x78, 0xd3,
-	0x3e, 0xa7, 0x56, 0x4e, 0x28, 0x6a, 0xd3, 0xcd, 0x33, 0x59, 0x17, 0x0e, 0x53, 0x46, 0xfe, 0x06,
-	0x45, 0x36, 0x7b, 0x01, 0x96, 0x2f, 0xf8, 0x0c, 0x21, 0x04, 0x4b, 0xe3, 0x69, 0xc9, 0xb3, 0x5e,
-	0x09, 0x3e, 0x73, 0xa5, 0x96, 0x33, 0x81, 0xa3, 0xa2, 0xe8, 0x3f, 0x67, 0xf0, 0x0c, 0x9a, 0x48,
-	0xc9, 0x6b, 0x98, 0x12, 0xa3, 0x56, 0x0c, 0xe7, 0x1f, 0x03, 0x0e, 0x57, 0xe8, 0x78, 0x41, 0xb8,
-	0x89, 0xc1, 0x12, 0x04, 0x91, 0xa3, 0x56, 0xef, 0x89, 0x1e, 0x2c, 0xaa, 0x5d, 0x13, 0x82, 0xed,
-	0xb9, 0x52, 0x8b, 0x7d, 0xa9, 0x97, 0xc2, 0x71, 0x51, 0x19, 0xa1, 0x65, 0x8f, 0x0a, 0x82, 0xbd,
-	0x84, 0x7a, 0x22, 0xc2, 0xa8, 0xcf, 0x05, 0xc5, 0x51, 0x48, 0x83, 0xb4, 0x4c, 0xe2, 0xcb, 0x3d,
-	0x37, 0xd5, 0xc4, 0x60, 0xbc, 0x41, 0x18, 0xcb, 0x37, 0x2e, 0x09, 0xe6, 0x02, 0x85, 0x18, 0x0c,
-	0x69, 0xa1, 0x8f, 0x68, 0x3e, 0x98, 0xfa, 0xc9, 0x84, 0x5e, 0xbf, 0xc4, 0xc7, 0x7b, 0x29, 0x46,
-	0x1f, 0x4a, 0x13, 0x7d, 0x7c, 0x9a, 0xf3, 0x78, 0x49, 0x75, 0x51, 0xe2, 0xe3, 0x67, 0x14, 0xa2,
-	0x0f, 0xd2, 0x62, 0x07, 0x60, 0x88, 0x25, 0x01, 0xb2, 0xe5, 0x1a, 0x62, 0xd9, 0xaf, 0x83, 0x75,
-	0xe7, 0x4d, 0xe7, 0xdc, 0xf9, 0xc3, 0x84, 0x83, 0x7c, 0x96, 0x32, 0xfc, 0xae, 0xe8, 0xf8, 0xad,
-	0x61, 0xb4, 0x91, 0xc7, 0x68, 0x1d, 0xd9, 0xcd, 0x02, 0xb2, 0x17, 0xf1, 0xbb, 0xba, 0x13, 0x7e,
-	0x5b, 0xbb, 0xe1, 0x77, 0x6d, 0x17, 0xfc, 0xae, 0x6f, 0xc5, 0xef, 0xc6, 0x76, 0xfc, 0x6e, 0xee,
-	0x80, 0xdf, 0xb0, 0x1d, 0xbf, 0x5b, 0x25, 0xf8, 0xbd, 0x06, 0x6f, 0xed, 0x32, 0x78, 0xfb, 0x45,
-	0x35, 0xbb, 0x2a, 0xcf, 0xfb, 0x76, 0x02, 0xd5, 0x71, 0x46, 0xae, 0xe3, 0x6c, 0x42, 0x69, 0xcc,
-	0x91, 0xea, 0xa7, 0x94, 0x74, 0xbe, 0x52, 0x7d, 0xab, 0xd5, 0xf2, 0x26, 0xeb, 0x4e, 0x57, 0xab,
-	0x15, 0x2a, 0xe2, 0x8d, 0x9a, 0x7d, 0xcd, 0xaa, 0xaa, 0xde, 0xfb, 0x62, 0x56, 0x93, 0xc5, 0xd0,
-	0x27, 0x8b, 0xf3, 0x9d, 0xe6, 0x8d, 0xca, 0x79, 0xa3, 0x05, 0x59, 0xdd, 0x78, 0x7a, 0x1f, 0xab,
-	0x1b, 0x61, 0x9c, 0xd1, 0x89, 0xd5, 0xf9, 0xab, 0xe0, 0x36, 0xdc, 0x78, 0x3c, 0x1d, 0x16, 0x86,
-	0x36, 0x2c, 0xb2, 0xe5, 0xca, 0xcc, 0x2d, 0x57, 0x2b, 0xa0, 0xae, 0xea, 0x40, 0x9d, 0x1b, 0xc2,
-	0x56, 0x71, 0x08, 0xeb, 0x0d, 0x52, 0xcb, 0x37, 0x88, 0xf3, 0x0a, 0x98, 0xcb, 0xa3, 0x69, 0x21,
-	0xd2, 0x67, 0x50, 0xc5, 0xd8, 0x14, 0x9a, 0x1d, 0x15, 0x9b, 0xdb, 0x25, 0xa9, 0xf3, 0x35, 0x1c,
-	0xaf, 0xdf, 0x32, 0xc1, 0xb7, 0x96, 0x17, 0xc3, 0x11, 0x60, 0x62, 0xa7, 0x2a, 0xd2, 0x79, 0x0d,
-	0xc7, 0xeb, 0xce, 0x12, 0xf6, 0x1c, 0x2c, 0xd4, 0x90, 0xea, 0x65, 0xee, 0xa4, 0xd8, 0xf9, 0xd5,
-	0x80, 0x23, 0x97, 0x0f, 0xb9, 0x1f, 0x89, 0xed, 0xdb, 0x69, 0x6e, 0x0b, 0x35, 0x8a, 0x5b, 0xe8,
-	0xa6, 0xf4, 0xa6, 0x4f, 0x51, 0xd5, 0x9e, 0x62, 0x6b, 0x72, 0x37, 0xcd, 0xc8, 0xec, 0xb1, 0xea,
-	0x85, 0xa9, 0xba, 0x71, 0x13, 0x75, 0xa0, 0x2d, 0x23, 0xf9, 0x61, 0xe2, 0x05, 0x63, 0x4e, 0x8d,
+	0x10, 0xb6, 0x48, 0x51, 0x3f, 0x23, 0xf9, 0x6f, 0x9d, 0x38, 0xac, 0x61, 0x14, 0x2a, 0x11, 0xa4,
+	0x42, 0x81, 0xb8, 0x85, 0x02, 0x14, 0x45, 0x8a, 0x1c, 0xac, 0x1a, 0x89, 0x7d, 0x69, 0x53, 0xda,
+	0x41, 0x7a, 0xa5, 0xa4, 0xb5, 0x4c, 0x40, 0x22, 0x19, 0x72, 0x65, 0x48, 0xf7, 0x5e, 0xfb, 0x14,
+	0xed, 0xa1, 0xb7, 0xf6, 0x39, 0xfa, 0x54, 0xc5, 0xcc, 0x2e, 0xc5, 0x25, 0x45, 0x59, 0x72, 0xd1,
+	0x1b, 0xe7, 0x67, 0x67, 0x66, 0x67, 0x67, 0xbe, 0x19, 0x09, 0x5a, 0xe3, 0x19, 0x4f, 0x92, 0xb3,
+	0x28, 0x0e, 0x45, 0xc8, 0x2c, 0xb1, 0x88, 0x78, 0x72, 0x72, 0x28, 0x62, 0x2f, 0x48, 0xbc, 0xa1,
+	0xf0, 0xc3, 0x40, 0x4a, 0x9c, 0xbf, 0x6b, 0xd0, 0x7c, 0x87, 0x9a, 0xef, 0xbc, 0x29, 0x67, 0xc7,
+	0x50, 0x1b, 0x7b, 0x53, 0x7e, 0x75, 0x61, 0x57, 0x3a, 0x95, 0x6e, 0xd3, 0x55, 0x14, 0xf2, 0x13,
+	0xe1, 0x89, 0x59, 0x62, 0x1b, 0x9d, 0x4a, 0xd7, 0x72, 0x15, 0xc5, 0x4e, 0xa1, 0x19, 0xc5, 0xfc,
+	0x5a, 0x8a, 0x4c, 0x12, 0x65, 0x0c, 0x94, 0x26, 0xc2, 0x8b, 0xc5, 0x8d, 0x3f, 0xe5, 0x76, 0xb5,
+	0x53, 0xe9, 0x9a, 0x6e, 0xc6, 0x60, 0x1d, 0x68, 0x11, 0x71, 0xc9, 0xfd, 0xf1, 0x9d, 0xb0, 0x2d,
+	0x92, 0xeb, 0xac, 0xa5, 0xc6, 0xcd, 0xfc, 0xd2, 0x4b, 0xee, 0xec, 0x1a, 0x85, 0xa4, 0xb3, 0xd8,
+	0x13, 0xb0, 0x44, 0x18, 0xf9, 0x43, 0xbb, 0x4e, 0x32, 0x49, 0xb0, 0x13, 0x68, 0x0c, 0x3d, 0xc1,
+	0xc7, 0x61, 0xbc, 0xb0, 0x1b, 0x24, 0x58, 0xd2, 0xcc, 0x86, 0x7a, 0x18, 0xe1, 0xfd, 0x13, 0xbb,
+	0x49, 0xa2, 0x94, 0x64, 0x0e, 0xb4, 0xa7, 0xde, 0xbc, 0xcf, 0xd3, 0x80, 0x80, 0x02, 0xca, 0xf1,
+	0xd8, 0x0b, 0xd8, 0x93, 0x74, 0xf2, 0x53, 0xc0, 0xe9, 0x5a, 0x2d, 0xd2, 0x2a, 0x70, 0xd9, 0x73,
+	0xd8, 0x55, 0x9c, 0x1f, 0x67, 0xd3, 0x01, 0x8f, 0xed, 0x36, 0xa9, 0xe5, 0x99, 0xe8, 0x71, 0xc4,
+	0xef, 0xdf, 0x72, 0xfe, 0xd6, 0x1b, 0x8a, 0x30, 0xb6, 0x77, 0xa5, 0x47, 0x9d, 0xc7, 0x3e, 0x07,
+	0x90, 0xf4, 0xf9, 0x68, 0x14, 0xdb, 0x7b, 0x14, 0xb2, 0xc6, 0x41, 0x4f, 0xd1, 0xc4, 0x13, 0x99,
+	0x91, 0x7d, 0xe9, 0x29, 0xc7, 0xc4, 0x4c, 0x2a, 0x06, 0x99, 0x39, 0x90, 0x99, 0xd4, 0x58, 0x18,
+	0x0b, 0x9f, 0x47, 0x7e, 0xcc, 0xd5, 0xed, 0x0f, 0x65, 0x2c, 0x3a, 0x0f, 0xdf, 0xd3, 0x1b, 0x4d,
+	0xfd, 0x80, 0x6c, 0x30, 0xb2, 0x91, 0x31, 0x30, 0xd2, 0x41, 0x76, 0xe1, 0x23, 0x3a, 0xaf, 0x71,
+	0x58, 0x17, 0xac, 0x68, 0xe2, 0x2d, 0x12, 0xfb, 0x49, 0xc7, 0xec, 0xb6, 0x7a, 0xec, 0x8c, 0x6a,
+	0xf2, 0x8c, 0x8a, 0xef, 0xfd, 0xc4, 0x5b, 0xf0, 0xd8, 0x95, 0x0a, 0x58, 0x6d, 0x31, 0x4f, 0x66,
+	0x13, 0x61, 0x3f, 0x95, 0x55, 0x28, 0x29, 0xf6, 0x12, 0xea, 0x03, 0x2e, 0xb0, 0xb8, 0xec, 0xe3,
+	0x4e, 0xa5, 0xdb, 0xea, 0x1d, 0xe9, 0x36, 0xfa, 0x52, 0xe4, 0xa6, 0x3a, 0x58, 0x1c, 0x7e, 0x30,
+	0xe2, 0x73, 0xfb, 0x19, 0xc5, 0x22, 0x09, 0x2c, 0x8e, 0x28, 0xe6, 0x57, 0x24, 0xb0, 0x49, 0xb0,
+	0xa4, 0x31, 0x99, 0xa3, 0xd8, 0xbf, 0xe7, 0x41, 0x7f, 0x71, 0x8e, 0xf7, 0xb2, 0x3f, 0xeb, 0x54,
+	0xba, 0x0d, 0x37, 0xcf, 0x74, 0x2e, 0xa0, 0xa5, 0x05, 0xcd, 0x18, 0x54, 0x3d, 0x4c, 0x88, 0xec,
+	0x18, 0xfa, 0x66, 0x5f, 0x80, 0x39, 0xe0, 0x82, 0x9a, 0xa5, 0xd5, 0xdb, 0x2f, 0x44, 0xe9, 0xa2,
+	0xcc, 0xf9, 0xb3, 0x02, 0x8d, 0x94, 0x83, 0x37, 0x96, 0x65, 0x98, 0xf6, 0x9d, 0xa4, 0x0a, 0x39,
+	0x35, 0x56, 0x72, 0x7a, 0x02, 0x0d, 0x3f, 0xf9, 0xe8, 0x07, 0x01, 0x8f, 0xa9, 0xfd, 0x1a, 0xee,
+	0x92, 0x46, 0x9b, 0x51, 0x1c, 0xde, 0xfa, 0x42, 0xb5, 0x9e, 0xa2, 0xb2, 0xb4, 0x58, 0xeb, 0xd2,
+	0x52, 0xcb, 0xa7, 0xc5, 0xf9, 0xad, 0x02, 0x6d, 0x3d, 0xc5, 0x98, 0x27, 0x11, 0x0a, 0x6f, 0xd2,
+	0xe7, 0xd4, 0xca, 0x09, 0x45, 0x6d, 0xba, 0x79, 0x26, 0xeb, 0xc2, 0x7e, 0xca, 0xc8, 0xdf, 0xa0,
+	0xc8, 0x66, 0x2f, 0xc1, 0xf2, 0x05, 0x9f, 0x22, 0x84, 0x60, 0x69, 0x3c, 0x2b, 0x79, 0xd6, 0x2b,
+	0xc1, 0xa7, 0xae, 0xd4, 0x72, 0xee, 0xe0, 0xa0, 0x28, 0xfa, 0xcf, 0x19, 0x3c, 0x85, 0x26, 0x52,
+	0xf2, 0x1a, 0xa6, 0xc4, 0xa8, 0x25, 0xc3, 0xf9, 0xc7, 0x80, 0xfd, 0x25, 0x3a, 0x9e, 0x13, 0x6e,
+	0x62, 0xb0, 0x04, 0x41, 0xe4, 0xa8, 0xd5, 0x7b, 0xaa, 0x07, 0x8b, 0x6a, 0xd7, 0x84, 0x60, 0x3b,
+	0xae, 0xd4, 0x62, 0x5f, 0xea, 0xa5, 0x70, 0x54, 0x54, 0x46, 0x68, 0xd9, 0xa1, 0x82, 0x60, 0xaf,
+	0xa0, 0x9e, 0x88, 0x30, 0xea, 0x73, 0x41, 0x71, 0x14, 0xd2, 0x20, 0x2d, 0x93, 0xf8, 0x72, 0xc7,
+	0x4d, 0x35, 0x31, 0x18, 0x6f, 0x10, 0xc6, 0xf2, 0x8d, 0x4b, 0x82, 0x39, 0x47, 0x21, 0x06, 0x43,
+	0x5a, 0xe8, 0x23, 0x9a, 0x0d, 0x26, 0x7e, 0x72, 0x47, 0xaf, 0x5f, 0xe2, 0xe3, 0xbd, 0x14, 0xa3,
+	0x0f, 0xa5, 0x89, 0x3e, 0x3e, 0xcd, 0x78, 0xbc, 0xa0, 0xba, 0x28, 0xf1, 0xf1, 0x33, 0x0a, 0xd1,
+	0x07, 0x69, 0xb1, 0x3d, 0x30, 0xc4, 0x82, 0x00, 0xd9, 0x72, 0x0d, 0xb1, 0xe8, 0xd7, 0xc1, 0xba,
+	0xf7, 0x26, 0x33, 0xee, 0xfc, 0x61, 0xc2, 0x5e, 0x3e, 0x4b, 0x19, 0x7e, 0x57, 0x74, 0xfc, 0xd6,
+	0x30, 0xda, 0xc8, 0x63, 0xb4, 0x8e, 0xec, 0x66, 0x01, 0xd9, 0x8b, 0xf8, 0x5d, 0xdd, 0x0a, 0xbf,
+	0xad, 0xed, 0xf0, 0xbb, 0xb6, 0x0d, 0x7e, 0xd7, 0x37, 0xe2, 0x77, 0x63, 0x33, 0x7e, 0x37, 0xb7,
+	0xc0, 0x6f, 0xd8, 0x8c, 0xdf, 0xad, 0x12, 0xfc, 0x5e, 0x81, 0xb7, 0x76, 0x19, 0xbc, 0xfd, 0xa2,
+	0x9a, 0x5d, 0x95, 0xe7, 0x43, 0x3b, 0x81, 0xea, 0x38, 0x23, 0xd7, 0x71, 0x36, 0xa1, 0x34, 0xe6,
+	0x48, 0xf5, 0x53, 0x4a, 0x3a, 0x5f, 0xa9, 0xbe, 0xd5, 0x6a, 0x79, 0x9d, 0x75, 0xa7, 0xab, 0xd5,
+	0x0a, 0x15, 0xf1, 0x5a, 0xcd, 0xbe, 0x66, 0x55, 0x55, 0xef, 0x43, 0x31, 0xab, 0xc9, 0x62, 0xe8,
+	0x93, 0xc5, 0xf9, 0x4e, 0xf3, 0x46, 0xe5, 0xbc, 0xd6, 0x82, 0xac, 0x6e, 0x3c, 0xbd, 0x8b, 0xd5,
+	0x8d, 0x30, 0xce, 0xe8, 0xc4, 0xf2, 0xfc, 0x55, 0x70, 0x1b, 0xae, 0x3d, 0x9e, 0x0e, 0x0b, 0x43,
+	0x1b, 0x16, 0xd9, 0x72, 0x65, 0xe6, 0x96, 0xab, 0x25, 0x50, 0x57, 0x75, 0xa0, 0xce, 0x0d, 0x61,
+	0xab, 0x38, 0x84, 0xf5, 0x06, 0xa9, 0xe5, 0x1b, 0xc4, 0x79, 0x0d, 0xcc, 0xe5, 0xd1, 0xa4, 0x10,
+	0xe9, 0x73, 0xa8, 0x62, 0x6c, 0x0a, 0xcd, 0x0e, 0x8a, 0xcd, 0xed, 0x92, 0xd4, 0xf9, 0x1a, 0x8e,
+	0x56, 0x6f, 0x99, 0xe0, 0x5b, 0xcb, 0x8b, 0xe1, 0x08, 0x30, 0xb1, 0x53, 0x15, 0xe9, 0xbc, 0x81,
+	0xa3, 0x55, 0x67, 0x09, 0x7b, 0x01, 0x16, 0x6a, 0x48, 0xf5, 0x32, 0x77, 0x52, 0xec, 0xfc, 0x6a,
+	0xc0, 0x81, 0xcb, 0x87, 0xdc, 0x8f, 0xc4, 0xe6, 0xed, 0x34, 0xb7, 0x85, 0x1a, 0xc5, 0x2d, 0x74,
+	0x5d, 0x7a, 0xd3, 0xa7, 0xa8, 0x6a, 0x4f, 0xb1, 0x31, 0xb9, 0xeb, 0x66, 0x64, 0xf6, 0x58, 0xf5,
+	0xc2, 0x54, 0x5d, 0xbb, 0x89, 0x3a, 0xd0, 0x96, 0x91, 0xfc, 0x70, 0xe7, 0x05, 0x63, 0x4e, 0x8d,
 	0xdf, 0x70, 0x73, 0x3c, 0xe7, 0x2f, 0x53, 0xcd, 0x9f, 0x6b, 0xb9, 0xf4, 0xba, 0xfc, 0xd3, 0xff,
-	0x8a, 0x99, 0x67, 0xd0, 0x9c, 0x79, 0x8b, 0x1c, 0x60, 0x66, 0x8c, 0x35, 0x44, 0xb5, 0x76, 0x42,
-	0xd4, 0xda, 0x6e, 0x88, 0x5a, 0xdf, 0x05, 0x51, 0x1b, 0x5b, 0x11, 0xb5, 0xb9, 0x1d, 0x51, 0x61,
-	0x07, 0x44, 0x6d, 0x6d, 0x47, 0xd4, 0x76, 0x09, 0xa2, 0x1e, 0x81, 0x79, 0xcb, 0xb9, 0x5a, 0xdc,
-	0xf1, 0xd3, 0xe1, 0xb0, 0x9f, 0xee, 0x26, 0xf2, 0xb9, 0x1e, 0x0a, 0x9f, 0x0c, 0xaa, 0x88, 0x97,
-	0x0a, 0x3b, 0xe9, 0x3b, 0x75, 0x53, 0xcd, 0xdc, 0xbc, 0x86, 0x47, 0xaa, 0x2e, 0x08, 0x46, 0xef,
-	0x77, 0xa5, 0x8e, 0x1b, 0xd9, 0xf1, 0xef, 0x55, 0x59, 0x11, 0xb2, 0x3e, 0xf4, 0xf0, 0x07, 0xe5,
-	0x5b, 0x81, 0xed, 0xd6, 0x6b, 0x96, 0x21, 0x6e, 0x6a, 0xd6, 0xcc, 0xcc, 0x7e, 0xd4, 0x56, 0x2d,
-	0x97, 0x0f, 0xc3, 0x78, 0xf4, 0xe0, 0x9f, 0xa3, 0xab, 0x26, 0x34, 0xb5, 0x26, 0x74, 0xde, 0x68,
-	0x03, 0x42, 0x1a, 0x4e, 0xd8, 0x37, 0x50, 0x8f, 0xe5, 0xa7, 0x42, 0xa2, 0x93, 0x35, 0x24, 0x22,
-	0xb1, 0x9b, 0xaa, 0xf5, 0x7e, 0x37, 0xc0, 0xa2, 0x9f, 0xd4, 0xec, 0x5b, 0x80, 0xac, 0x27, 0x59,
-	0xf9, 0xfe, 0x77, 0x9a, 0x2e, 0xfd, 0x1f, 0x82, 0xc4, 0x1f, 0x07, 0x37, 0x0b, 0x67, 0x8f, 0xf5,
-	0xb4, 0x85, 0xbf, 0x6c, 0x11, 0x2c, 0x3b, 0xf3, 0x4a, 0x0d, 0xe3, 0x74, 0x5c, 0x6e, 0xda, 0x09,
-	0xcb, 0xce, 0xa6, 0x71, 0xca, 0xf1, 0x59, 0xbe, 0x1a, 0xde, 0xe7, 0x33, 0x1d, 0xa6, 0x9b, 0x76,
-	0xc4, 0x92, 0xb3, 0x83, 0x1a, 0xfd, 0xab, 0xf0, 0xf2, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf0,
-	0x09, 0xae, 0xf2, 0x7e, 0x10, 0x00, 0x00,
+	0x8a, 0x99, 0xa7, 0xd0, 0x9c, 0x7a, 0xf3, 0x1c, 0x60, 0x66, 0x8c, 0x15, 0x44, 0xb5, 0xb6, 0x42,
+	0xd4, 0xda, 0x76, 0x88, 0x5a, 0xdf, 0x06, 0x51, 0x1b, 0x1b, 0x11, 0xb5, 0xb9, 0x19, 0x51, 0x61,
+	0x0b, 0x44, 0x6d, 0x6d, 0x46, 0xd4, 0x76, 0x09, 0xa2, 0x1e, 0x80, 0x79, 0xcb, 0xb9, 0x5a, 0xdc,
+	0xf1, 0xd3, 0xe1, 0xb0, 0x9b, 0xee, 0x26, 0xf2, 0xb9, 0x1e, 0x0b, 0x9f, 0x0c, 0xaa, 0x88, 0x97,
+	0x0a, 0x3b, 0xe9, 0x3b, 0x75, 0x53, 0xcd, 0xdc, 0xbc, 0x81, 0x43, 0x55, 0x17, 0x04, 0xa3, 0x0f,
+	0xbb, 0x52, 0xc7, 0x8d, 0xec, 0xf8, 0xf7, 0xaa, 0xac, 0x08, 0x59, 0x1f, 0x7b, 0xf8, 0x83, 0xf2,
+	0xad, 0xc0, 0x76, 0xe3, 0x35, 0xcb, 0x10, 0x37, 0x35, 0x6b, 0x66, 0x66, 0x3f, 0x6a, 0xab, 0x96,
+	0xcb, 0x87, 0x61, 0x3c, 0x7a, 0xf4, 0xcf, 0xd1, 0x65, 0x13, 0x9a, 0x5a, 0x13, 0x3a, 0x17, 0xda,
+	0x80, 0x90, 0x86, 0x13, 0xf6, 0x0d, 0xd4, 0x63, 0xf9, 0xa9, 0x90, 0xe8, 0x78, 0x05, 0x89, 0x48,
+	0xec, 0xa6, 0x6a, 0xbd, 0xdf, 0x0d, 0xb0, 0xe8, 0x27, 0x35, 0xfb, 0x16, 0x20, 0xeb, 0x49, 0x56,
+	0xbe, 0xff, 0x9d, 0xa4, 0x4b, 0xff, 0x87, 0x20, 0xf1, 0xc7, 0xc1, 0xcd, 0xdc, 0xd9, 0x61, 0x3d,
+	0x6d, 0xe1, 0x2f, 0x5b, 0x04, 0xcb, 0xce, 0xbc, 0x56, 0xc3, 0x38, 0x1d, 0x97, 0xeb, 0x76, 0xc2,
+	0xb2, 0xb3, 0x69, 0x9c, 0x72, 0x7c, 0x96, 0xaf, 0x86, 0x0f, 0xf9, 0x4c, 0x87, 0xe9, 0xba, 0x1d,
+	0xb1, 0xe4, 0xec, 0xa0, 0x46, 0xff, 0x2a, 0xbc, 0xfa, 0x37, 0x00, 0x00, 0xff, 0xff, 0x98, 0xe5,
+	0x9a, 0x47, 0x7e, 0x10, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.

plugin/dapp/guess/types/tx.go

@@ -22,7 +22,7 @@ type GuessGameStartTx struct {
 
 //GuessGameBetTx struct
 type GuessGameBetTx struct {
-	GameId  string `json:"gameId,omitempty"`
+	GameID  string `json:"gameId,omitempty"`
 	Option  string `json:"option,omitempty"`
 	BetsNum int64  `json:"betsNum,omitempty"`
 	Fee     int64  `json:"fee,omitempty"`
@@ -30,19 +30,19 @@ type GuessGameBetTx struct {
 
 //GuessGameStopBetTx struct
 type GuessGameStopBetTx struct {
-	GameId string `json:"gameId,omitempty"`
+	GameID string `json:"gameId,omitempty"`
 	Fee    int64  `json:"fee,omitempty"`
 }
 
 //GuessGamePublishTx struct
 type GuessGamePublishTx struct {
-	GameId string `json:"gameId,omitempty"`
+	GameID string `json:"gameId,omitempty"`
 	Result string `json:"result,omitempty"`
 	Fee    int64  `json:"fee,omitempty"`
 }
 
 //GuessGameAbortTx struct
 type GuessGameAbortTx struct {
-	GameId string `json:"gameId,omitempty"`
+	GameID string `json:"gameId,omitempty"`
 	Fee    int64  `json:"fee,omitempty"`
 }

plugin/dapp/guess/types/types.go

@@ -164,7 +164,7 @@ func CreateRawGuessBetTx(parm *GuessGameBetTx) (*types.Transaction, error) {
 	}
 
 	v := &GuessGameBet{
-		GameId:  parm.GameId,
+		GameID:  parm.GameID,
 		Option:  parm.Option,
 		BetsNum: parm.BetsNum,
 	}
@@ -195,7 +195,7 @@ func CreateRawGuessStopBetTx(parm *GuessGameStopBetTx) (*types.Transaction, erro
 	}
 
 	v := &GuessGameStopBet{
-		GameId: parm.GameId,
+		GameID: parm.GameID,
 	}
 	val := &GuessGameAction{
 		Ty:    GuessGameActionStopBet,
@@ -224,7 +224,7 @@ func CreateRawGuessPublishTx(parm *GuessGamePublishTx) (*types.Transaction, erro
 	}
 
 	v := &GuessGamePublish{
-		GameId: parm.GameId,
+		GameID: parm.GameID,
 		Result: parm.Result,
 	}
 
@@ -255,7 +255,7 @@ func CreateRawGuessAbortTx(parm *GuessGameAbortTx) (*types.Transaction, error) {
 	}
 
 	v := &GuessGameAbort{
-		GameId: parm.GameId,
+		GameID: parm.GameID,
 	}
 
 	val := &GuessGameAction{