dapp/vote:update doc

plugin/dapp/vote/executor/util.go

@@ -91,17 +91,19 @@ func decodeCommitInfo(data []byte) *vty.CommitInfo {
 func classifyVoteList(infos *vty.VoteInfos) *vty.ReplyVoteList {
 
 	reply := &vty.ReplyVoteList{}
+	currentTime := types.Now().Unix()
 	for _, voteInfo := range infos.GetVoteList() {
 
 		if voteInfo.Status == voteStatusClosed {
 			reply.ClosedList = append(reply.ClosedList, voteInfo)
-		} else if voteInfo.BeginTimestamp > types.Now().Unix() {
+		} else if voteInfo.BeginTimestamp > currentTime {
 			reply.PendingList = append(reply.PendingList, voteInfo)
-		} else if voteInfo.EndTimestamp > types.Now().Unix() {
+		} else if voteInfo.EndTimestamp > currentTime {
 			reply.OngoingList = append(reply.OngoingList, voteInfo)
 		} else {
 			reply.FinishedList = append(reply.FinishedList, voteInfo)
 		}
 	}
+	reply.CurrentTimestamp = currentTime
 	return reply
 }

plugin/dapp/vote/proto/vote.proto

@@ -23,7 +23,7 @@ message GroupMember {
 //创建投票组
 message CreateGroup {
     string   name                    = 1; //投票组名称
-    repeated string admins           = 2; //管理员地址列表
+    repeated string admins           = 2; //管理员地址列表，创建者默认为管理员
     repeated GroupMember members     = 3; //组员
     string               description = 4; //描述
 }
@@ -134,8 +134,9 @@ message ReqListVote {
 }
 
 message ReplyVoteList {
-    repeated VoteInfo pendingList  = 1; //即将开始投票列表
-    repeated VoteInfo ongoingList  = 2; //正在进行投票列表
-    repeated VoteInfo finishedList = 3; //已经完成投票列表
-    repeated VoteInfo closedList   = 4; //已经关闭投票列表
+    repeated VoteInfo pendingList      = 1; //即将开始投票列表
+    repeated VoteInfo ongoingList      = 2; //正在进行投票列表
+    repeated VoteInfo finishedList     = 3; //已经完成投票列表
+    repeated VoteInfo closedList       = 4; //已经关闭投票列表
+    int64             currentTimestamp = 5;
 }

plugin/dapp/vote/readme.md

@@ -19,7 +19,7 @@
 //创建投票组
 message CreateGroup {
     string   name                    = 1; //投票组名称
-    repeated string admins           = 2; //管理员地址列表
+    repeated string admins           = 2; //管理员地址列表, 创建者默认为管理员
     repeated GroupMember members     = 3; //组员
     string               description = 4; //描述
 }
@@ -349,12 +349,13 @@ curl -kd  '{"method":"Chain33.Query","params":[{"execer":"vote","funcName":"GetM
 ```
 
 #### 获取投票组列表(ListGroup)
+全局投票组有序列表
 
 ##### 请求结构
 ```proto
 //列表请求结构
 message ReqListItem {
-    string startItemID = 1; //列表开始的ID，如请求组列表即groupID，不包含在结果中
+    string startItemID = 1; //列表开始的投票组ID，不包含在结果中
     int32  count       = 2; //列表项单次请求数量
     int32  direction   = 3; // 0表示根据ID降序，1表示升序
 }
@@ -377,17 +378,17 @@ curl -kd  '{"method":"Chain33.Query","params":[{"execer":"vote","funcName":"List
 ```
 
 #### 获取投票列表(ListVote)
-
+获取全局投票列表, 指定groupID时，则获取指定组的投票列表
 ##### 请求结构
 ```proto
 //列表请求结构
 message ReqListVote {
-    string      groupID = 1; //所属组ID
+    string      groupID = 1; //所属组ID，不填时获取全局的投票列表
     ReqListItem listReq = 2; //列表请求
 }
 
 message ReqListItem {
-    string startItemID = 1; //列表开始的ID，如请求组列表即groupID，不包含在结果中
+    string startItemID = 1; //列表开始的投票ID，不包含在结果中
     int32  count       = 2; //列表项单次请求数量
     int32  direction   = 3; // 0表示根据ID降序，1表示升序
 }
@@ -414,13 +415,14 @@ curl -kd  '{"method":"Chain33.Query","params":[{"execer":"vote","funcName":"List
 ```
 
 #### 获取用户列表(ListMember)
+全局用户有序列表
 
 ##### 请求结构
 
 ```proto
 //列表请求结构
 message ReqListItem {
-    string startItemID = 1; //列表开始的ID，如请求组列表即groupID，不包含在结果中
+    string startItemID = 1; //列表开始的用户ID（地址）
     int32  count       = 2; //列表项单次请求数量
     int32  direction   = 3; // 0表示根据ID降序，1表示升序
 }

plugin/dapp/vote/types/vote.pb.go

@@ -5,9 +5,8 @@ package types
 
 import (
 	fmt "fmt"
-	math "math"
-
 	proto "github.com/golang/protobuf/proto"
+	math "math"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1173,6 +1172,7 @@ type ReplyVoteList struct {
 	OngoingList          []*VoteInfo `protobuf:"bytes,2,rep,name=ongoingList,proto3" json:"ongoingList,omitempty"`
 	FinishedList         []*VoteInfo `protobuf:"bytes,3,rep,name=finishedList,proto3" json:"finishedList,omitempty"`
 	ClosedList           []*VoteInfo `protobuf:"bytes,4,rep,name=closedList,proto3" json:"closedList,omitempty"`
+	CurrentTimestamp     int64       `protobuf:"varint,5,opt,name=currentTimestamp,proto3" json:"currentTimestamp,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
 	XXX_unrecognized     []byte      `json:"-"`
 	XXX_sizecache        int32       `json:"-"`
@@ -1231,6 +1231,13 @@ func (m *ReplyVoteList) GetClosedList() []*VoteInfo {
 	return nil
 }
 
+func (m *ReplyVoteList) GetCurrentTimestamp() int64 {
+	if m != nil {
+		return m.CurrentTimestamp
+	}
+	return 0
+}
+
 func init() {
 	proto.RegisterType((*VoteAction)(nil), "types.VoteAction")
 	proto.RegisterType((*GroupMember)(nil), "types.GroupMember")
@@ -1259,62 +1266,63 @@ func init() {
 }
 
 var fileDescriptor_21d31c94b62a6ac7 = []byte{
-	// 909 bytes of a gzipped FileDescriptorProto
+	// 921 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0xdd, 0x8e, 0xe3, 0x34,
-	0x14, 0x6e, 0xd2, 0xa6, 0x6d, 0x4e, 0xda, 0x65, 0x31, 0x68, 0x15, 0xa1, 0x15, 0xaa, 0x0c, 0x42,
-	0x23, 0xb1, 0x2a, 0xec, 0x56, 0x42, 0x0b, 0xe2, 0x82, 0x81, 0x15, 0xb4, 0x12, 0x03, 0xc8, 0xb0,
-	0xc3, 0x75, 0x26, 0xf1, 0x74, 0x22, 0x35, 0x71, 0x26, 0x76, 0xab, 0xe9, 0x23, 0xf0, 0x5c, 0xdc,
-	0x71, 0x83, 0xc4, 0x2d, 0xaf, 0xc0, 0x43, 0x20, 0x1f, 0xe7, 0xc7, 0xe9, 0xb4, 0x30, 0x7b, 0xd7,
-	0x73, 0xfc, 0x7d, 0xc7, 0xc7, 0xdf, 0x77, 0xec, 0x06, 0x60, 0x27, 0x14, 0x9f, 0x17, 0xa5, 0x50,
-	0x82, 0x78, 0x6a, 0x5f, 0x70, 0x49, 0xff, 0x71, 0x01, 0x2e, 0x85, 0xe2, 0xe7, 0xb1, 0x4a, 0x45,
-	0x4e, 0x1e, 0x81, 0xab, 0xf6, 0xa1, 0x33, 0x73, 0xce, 0x3c, 0xe6, 0xaa, 0x3d, 0xf9, 0x0c, 0x82,
-	0xb8, 0xe4, 0x91, 0xe2, 0xdf, 0x95, 0x62, 0x5b, 0x84, 0xee, 0xcc, 0x39, 0x0b, 0x5e, 0x90, 0x39,
-	0x72, 0xe7, 0xdf, 0xb4, 0x2b, 0xcb, 0x1e, 0xb3, 0x81, 0x9a, 0xb7, 0x2d, 0x92, 0x86, 0xd7, 0xef,
-	0xf0, 0x5e, 0xb7, 0x2b, 0x9a, 0x67, 0x01, 0xc9, 0x02, 0xc0, 0x94, 0xd1, 0x3d, 0x85, 0x03, 0xa4,
-	0xbd, 0xdd, 0xd9, 0x4e, 0x2f, 0x2c, 0x7b, 0xcc, 0x82, 0x21, 0x49, 0x64, 0x59, 0xaa, 0x90, 0xe4,
-	0x75, 0x49, 0xcd, 0x02, 0x92, 0x9a, 0x88, 0x7c, 0x0a, 0x7e, 0xbc, 0x11, 0xd2, 0x6c, 0x34, 0x44,
-	0xce, 0xe3, 0x9a, 0x53, 0xe7, 0x97, 0x3d, 0xd6, 0x82, 0xc8, 0xe7, 0x30, 0x31, 0xad, 0x5e, 0xf0,
-	0xec, 0x8a, 0x97, 0xe1, 0x08, 0x49, 0xef, 0x74, 0x0e, 0x65, 0x96, 0x96, 0x3d, 0xd6, 0x81, 0x7e,
-	0x3d, 0x02, 0x6f, 0x17, 0x6d, 0xb6, 0x9c, 0x9e, 0x43, 0x80, 0x07, 0x35, 0x79, 0x42, 0x60, 0x10,
-	0x25, 0x49, 0x89, 0x82, 0xfb, 0x0c, 0x7f, 0x93, 0xf7, 0x8d, 0x4d, 0xbf, 0xf2, 0x74, 0x7d, 0xa3,
-	0x50, 0xf1, 0x29, 0xb3, 0x32, 0xf4, 0x37, 0x07, 0x02, 0x4b, 0x79, 0x5d, 0x23, 0x8f, 0x32, 0x5e,
-	0xd7, 0xd0, 0xbf, 0xc9, 0x13, 0x18, 0x46, 0x49, 0x96, 0xe6, 0x32, 0x74, 0x67, 0xfd, 0x33, 0x9f,
-	0x55, 0x11, 0x79, 0x06, 0xa3, 0x0c, 0x77, 0x96, 0x61, 0x7f, 0xd6, 0xb7, 0x2c, 0xb1, 0x9a, 0x62,
-	0x35, 0x84, 0xcc, 0x20, 0x48, 0xb8, 0x8c, 0xcb, 0xb4, 0xd0, 0xb3, 0x81, 0x6e, 0xf8, 0xcc, 0x4e,
-	0xd1, 0xdf, 0x1d, 0x08, 0x2c, 0x37, 0x49, 0x08, 0xa3, 0xb5, 0xfe, 0xb1, 0x7a, 0x55, 0xb5, 0x53,
-	0x87, 0xe4, 0x05, 0x40, 0x94, 0x24, 0x17, 0xd5, 0xe6, 0xee, 0xc9, 0xcd, 0x2d, 0x14, 0xf9, 0x10,
-	0xa6, 0x25, 0xcf, 0xc4, 0x8e, 0x5f, 0x58, 0x3d, 0xfb, 0xac, 0x9b, 0x24, 0x4f, 0xc1, 0x8f, 0x92,
-	0xe4, 0xdc, 0x1c, 0x77, 0x80, 0x88, 0x36, 0x41, 0x28, 0x4c, 0x0c, 0xbc, 0x02, 0x78, 0x08, 0xe8,
-	0xe4, 0xe8, 0x9f, 0x0e, 0xf8, 0xd8, 0xc3, 0x2a, 0xbf, 0x16, 0xfa, 0x0a, 0x34, 0xed, 0xbb, 0xab,
-	0x57, 0x8d, 0xbe, 0xae, 0xa5, 0xef, 0x53, 0xf0, 0x8d, 0x48, 0x3f, 0x6c, 0x33, 0x1c, 0xee, 0x29,
-	0x6b, 0x13, 0x5a, 0x05, 0x9c, 0x4e, 0x51, 0x56, 0x9a, 0xd5, 0xa1, 0xe5, 0x8b, 0x77, 0xca, 0x97,
-	0xe1, 0x1b, 0xfb, 0x32, 0xba, 0xef, 0xcb, 0x97, 0x00, 0xcd, 0x81, 0x24, 0x99, 0x83, 0x8f, 0x36,
-	0x7c, 0x9f, 0x4a, 0x15, 0x3a, 0x58, 0xff, 0xb1, 0x5d, 0x5f, 0xa3, 0x58, 0x0b, 0xa1, 0x5f, 0x98,
-	0x27, 0xe1, 0x47, 0xac, 0xa5, 0x7b, 0x16, 0x66, 0x23, 0xa3, 0x49, 0x15, 0x91, 0x77, 0xc1, 0x93,
-	0xb1, 0x28, 0x79, 0x35, 0xa2, 0x26, 0xa0, 0x7f, 0x38, 0x00, 0xed, 0x45, 0x3d, 0x3a, 0x9c, 0xd6,
-	0x90, 0xb8, 0xdd, 0x21, 0x99, 0x41, 0xb0, 0x6b, 0x36, 0xae, 0xed, 0xb6, 0x53, 0xe4, 0x23, 0x78,
-	0x74, 0xc5, 0xd7, 0x69, 0xfe, 0x4b, 0x9a, 0x71, 0xa9, 0xa2, 0xac, 0x40, 0x85, 0xfb, 0xec, 0x20,
-	0xab, 0x6d, 0xe7, 0x79, 0xd2, 0xa2, 0x3c, 0x44, 0x75, 0x72, 0x87, 0x32, 0x0e, 0xef, 0xcb, 0xf8,
-	0x2d, 0x40, 0xfb, 0x7e, 0x68, 0x21, 0x74, 0x2b, 0xcd, 0x70, 0x54, 0x91, 0xae, 0x63, 0x24, 0x59,
-	0xe5, 0x09, 0xbf, 0xab, 0xe4, 0xb0, 0x53, 0xf4, 0x65, 0x5d, 0x07, 0x07, 0xec, 0xd8, 0xa5, 0x7f,
-	0x02, 0x43, 0x75, 0xb7, 0x8c, 0xe4, 0x4d, 0x25, 0x49, 0x15, 0xd1, 0x0f, 0xc0, 0x6f, 0x5e, 0xa3,
-	0x53, 0x0d, 0x50, 0x0a, 0x13, 0xfb, 0xf5, 0x39, 0x26, 0x3a, 0xfd, 0xcb, 0x85, 0xb1, 0x2e, 0xf2,
-	0xe0, 0x11, 0xb7, 0x86, 0xb8, 0xdf, 0x1d, 0x62, 0xcb, 0xbf, 0x41, 0xd7, 0xbf, 0x45, 0xd7, 0x3f,
-	0x0f, 0x47, 0xad, 0x7e, 0x89, 0xdb, 0x91, 0xfa, 0x3f, 0x4b, 0x87, 0x0f, 0xb2, 0x74, 0x74, 0xc4,
-	0xd2, 0x05, 0x04, 0x71, 0x23, 0xb4, 0x0c, 0xc7, 0x9d, 0x06, 0x5a, 0x0b, 0x98, 0x8d, 0x3a, 0x9c,
-	0x03, 0xff, 0xde, 0x1c, 0x68, 0xe1, 0xa5, 0x8a, 0xd4, 0x56, 0x86, 0x80, 0xe6, 0x56, 0x11, 0x7d,
-	0x09, 0x7e, 0xad, 0xa9, 0x24, 0x1f, 0xc3, 0x58, 0x1f, 0xcb, 0xba, 0x64, 0x6f, 0x59, 0x27, 0xc7,
-	0x6d, 0x1b, 0x00, 0xfd, 0x09, 0xc0, 0x98, 0x75, 0x72, 0x22, 0x8e, 0x79, 0xf2, 0x1e, 0x8c, 0x2b,
-	0xa9, 0xeb, 0xcb, 0xd1, 0xc4, 0xf4, 0x2b, 0x08, 0xda, 0x8a, 0x92, 0x3c, 0x07, 0x30, 0xcf, 0x85,
-	0xd5, 0x4f, 0x2d, 0x44, 0x8b, 0x63, 0x16, 0x88, 0x52, 0x00, 0xc6, 0x6f, 0x7f, 0x56, 0x65, 0x9a,
-	0xaf, 0xa5, 0xbe, 0xde, 0xa9, 0xe2, 0x99, 0x44, 0xae, 0xcf, 0x4c, 0x40, 0x63, 0x08, 0x18, 0xbf,
-	0xd5, 0xf0, 0x95, 0xe2, 0x99, 0x96, 0x4e, 0xaa, 0xa8, 0xc4, 0xa0, 0x99, 0x28, 0x3b, 0xa5, 0xcb,
-	0xc4, 0x62, 0x9b, 0x9b, 0x3f, 0x32, 0x8f, 0x99, 0x40, 0xbf, 0x9f, 0x49, 0x5a, 0x72, 0xfc, 0xe6,
-	0xc0, 0xf1, 0xf2, 0x58, 0x9b, 0xa0, 0xaf, 0x9b, 0x4d, 0x70, 0xec, 0x4f, 0xff, 0xa9, 0x3c, 0x83,
-	0xd1, 0x26, 0x95, 0x8a, 0xf1, 0xdb, 0x83, 0x2f, 0x13, 0xab, 0x47, 0x56, 0x43, 0xe8, 0xdf, 0x0e,
-	0x4c, 0x19, 0x2f, 0x36, 0xfb, 0xcb, 0xca, 0x05, 0xf2, 0x1c, 0x82, 0x82, 0xe7, 0x49, 0x9a, 0xaf,
-	0xff, 0xcb, 0x35, 0x1b, 0xa3, 0x29, 0x22, 0x5f, 0x8b, 0x9a, 0xe2, 0x9e, 0xa0, 0x58, 0x18, 0xb2,
-	0x80, 0xc9, 0x75, 0x9a, 0xa7, 0xf2, 0x86, 0x27, 0xc8, 0xe9, 0x1f, 0xe7, 0x74, 0x40, 0xe4, 0x13,
-	0x00, 0xfc, 0xf2, 0x30, 0x94, 0xc1, 0x71, 0x8a, 0x05, 0xb9, 0x1a, 0xe2, 0x67, 0xdd, 0xe2, 0xdf,
-	0x00, 0x00, 0x00, 0xff, 0xff, 0x40, 0x29, 0x58, 0x6e, 0xe4, 0x09, 0x00, 0x00,
+	0x14, 0x6e, 0xd2, 0xa6, 0x6d, 0x4e, 0xda, 0x65, 0x30, 0x68, 0x15, 0xa1, 0x15, 0xaa, 0x0c, 0x42,
+	0x23, 0x58, 0x15, 0x76, 0x2b, 0xa1, 0x05, 0x71, 0xc1, 0xc0, 0x0a, 0x5a, 0x89, 0x01, 0x64, 0xd8,
+	0xe5, 0x3a, 0x93, 0x78, 0x3b, 0x91, 0x9a, 0x38, 0x13, 0xbb, 0xd5, 0xf6, 0x09, 0x10, 0xcf, 0xc5,
+	0x1d, 0x37, 0x48, 0x3c, 0x07, 0x0f, 0x81, 0x7c, 0x9c, 0x1f, 0xa7, 0x3f, 0x30, 0xdc, 0xf5, 0x1c,
+	0x7f, 0xdf, 0xf1, 0xf1, 0xf7, 0x1d, 0xbb, 0x01, 0xd8, 0x09, 0xc5, 0xe7, 0x45, 0x29, 0x94, 0x20,
+	0x9e, 0xda, 0x17, 0x5c, 0xd2, 0xbf, 0x5d, 0x80, 0x97, 0x42, 0xf1, 0xab, 0x58, 0xa5, 0x22, 0x27,
+	0x0f, 0xc0, 0x55, 0xfb, 0xd0, 0x99, 0x39, 0x97, 0x1e, 0x73, 0xd5, 0x9e, 0x7c, 0x0a, 0x41, 0x5c,
+	0xf2, 0x48, 0xf1, 0x6f, 0x4b, 0xb1, 0x2d, 0x42, 0x77, 0xe6, 0x5c, 0x06, 0x4f, 0xc9, 0x1c, 0xb9,
+	0xf3, 0xaf, 0xdb, 0x95, 0x65, 0x8f, 0xd9, 0x40, 0xcd, 0xdb, 0x16, 0x49, 0xc3, 0xeb, 0x77, 0x78,
+	0x2f, 0xda, 0x15, 0xcd, 0xb3, 0x80, 0x64, 0x01, 0x60, 0xca, 0xe8, 0x9e, 0xc2, 0x01, 0xd2, 0xde,
+	0xec, 0x6c, 0xa7, 0x17, 0x96, 0x3d, 0x66, 0xc1, 0x90, 0x24, 0xb2, 0x2c, 0x55, 0x48, 0xf2, 0xba,
+	0xa4, 0x66, 0x01, 0x49, 0x4d, 0x44, 0x3e, 0x01, 0x3f, 0xde, 0x08, 0x69, 0x36, 0x1a, 0x22, 0xe7,
+	0xa2, 0xe6, 0xd4, 0xf9, 0x65, 0x8f, 0xb5, 0x20, 0xf2, 0x19, 0x4c, 0x4c, 0xab, 0xd7, 0x3c, 0xbb,
+	0xe1, 0x65, 0x38, 0x42, 0xd2, 0x5b, 0x9d, 0x43, 0x99, 0xa5, 0x65, 0x8f, 0x75, 0xa0, 0x5f, 0x8d,
+	0xc0, 0xdb, 0x45, 0x9b, 0x2d, 0xa7, 0x57, 0x10, 0xe0, 0x41, 0x4d, 0x9e, 0x10, 0x18, 0x44, 0x49,
+	0x52, 0xa2, 0xe0, 0x3e, 0xc3, 0xdf, 0xe4, 0x5d, 0x63, 0xd3, 0x2f, 0x3c, 0x5d, 0xdf, 0x2a, 0x54,
+	0x7c, 0xca, 0xac, 0x0c, 0xfd, 0xcd, 0x81, 0xc0, 0x52, 0x5e, 0xd7, 0xc8, 0xa3, 0x8c, 0xd7, 0x35,
+	0xf4, 0x6f, 0xf2, 0x10, 0x86, 0x51, 0x92, 0xa5, 0xb9, 0x0c, 0xdd, 0x59, 0xff, 0xd2, 0x67, 0x55,
+	0x44, 0x1e, 0xc3, 0x28, 0xc3, 0x9d, 0x65, 0xd8, 0x9f, 0xf5, 0x2d, 0x4b, 0xac, 0xa6, 0x58, 0x0d,
+	0x21, 0x33, 0x08, 0x12, 0x2e, 0xe3, 0x32, 0x2d, 0xf4, 0x6c, 0xa0, 0x1b, 0x3e, 0xb3, 0x53, 0xf4,
+	0x77, 0x07, 0x02, 0xcb, 0x4d, 0x12, 0xc2, 0x68, 0xad, 0x7f, 0xac, 0x9e, 0x57, 0xed, 0xd4, 0x21,
+	0x79, 0x0a, 0x10, 0x25, 0xc9, 0x75, 0xb5, 0xb9, 0x7b, 0x76, 0x73, 0x0b, 0x45, 0xde, 0x87, 0x69,
+	0xc9, 0x33, 0xb1, 0xe3, 0xd7, 0x56, 0xcf, 0x3e, 0xeb, 0x26, 0xc9, 0x23, 0xf0, 0xa3, 0x24, 0xb9,
+	0x32, 0xc7, 0x1d, 0x20, 0xa2, 0x4d, 0x10, 0x0a, 0x13, 0x03, 0xaf, 0x00, 0x1e, 0x02, 0x3a, 0x39,
+	0xfa, 0xa7, 0x03, 0x3e, 0xf6, 0xb0, 0xca, 0x5f, 0x09, 0x7d, 0x05, 0x9a, 0xf6, 0xdd, 0xd5, 0xf3,
+	0x46, 0x5f, 0xd7, 0xd2, 0xf7, 0x11, 0xf8, 0x46, 0xa4, 0xef, 0xb7, 0x19, 0x0e, 0xf7, 0x94, 0xb5,
+	0x09, 0xad, 0x02, 0x4e, 0xa7, 0x28, 0x2b, 0xcd, 0xea, 0xd0, 0xf2, 0xc5, 0x3b, 0xe7, 0xcb, 0xf0,
+	0x7f, 0xfb, 0x32, 0x3a, 0xf6, 0xe5, 0x0b, 0x80, 0xe6, 0x40, 0x92, 0xcc, 0xc1, 0x47, 0x1b, 0xbe,
+	0x4b, 0xa5, 0x0a, 0x1d, 0xac, 0x7f, 0x61, 0xd7, 0xd7, 0x28, 0xd6, 0x42, 0xe8, 0xe7, 0xe6, 0x49,
+	0xf8, 0x01, 0x6b, 0xe9, 0x9e, 0x85, 0xd9, 0xc8, 0x68, 0x52, 0x45, 0xe4, 0x6d, 0xf0, 0x64, 0x2c,
+	0x4a, 0x5e, 0x8d, 0xa8, 0x09, 0xe8, 0x1f, 0x0e, 0x40, 0x7b, 0x51, 0x4f, 0x0e, 0xa7, 0x35, 0x24,
+	0x6e, 0x77, 0x48, 0x66, 0x10, 0xec, 0x9a, 0x8d, 0x6b, 0xbb, 0xed, 0x14, 0xf9, 0x00, 0x1e, 0xdc,
+	0xf0, 0x75, 0x9a, 0xff, 0x9c, 0x66, 0x5c, 0xaa, 0x28, 0x2b, 0x50, 0xe1, 0x3e, 0x3b, 0xc8, 0x6a,
+	0xdb, 0x79, 0x9e, 0xb4, 0x28, 0x0f, 0x51, 0x9d, 0xdc, 0xa1, 0x8c, 0xc3, 0x63, 0x19, 0xbf, 0x01,
+	0x68, 0xdf, 0x0f, 0x2d, 0x84, 0x6e, 0xa5, 0x19, 0x8e, 0x2a, 0xd2, 0x75, 0x8c, 0x24, 0xab, 0x3c,
+	0xe1, 0xaf, 0x2b, 0x39, 0xec, 0x14, 0x7d, 0x56, 0xd7, 0xc1, 0x01, 0x3b, 0x75, 0xe9, 0x1f, 0xc2,
+	0x50, 0xbd, 0x5e, 0x46, 0xf2, 0xb6, 0x92, 0xa4, 0x8a, 0xe8, 0x7b, 0xe0, 0x37, 0xaf, 0xd1, 0xb9,
+	0x06, 0x28, 0x85, 0x89, 0xfd, 0xfa, 0x9c, 0x12, 0x9d, 0xfe, 0xe5, 0xc2, 0x58, 0x17, 0xb9, 0xf7,
+	0x88, 0x5b, 0x43, 0xdc, 0xef, 0x0e, 0xb1, 0xe5, 0xdf, 0xa0, 0xeb, 0xdf, 0xa2, 0xeb, 0x9f, 0x87,
+	0xa3, 0x56, 0xbf, 0xc4, 0xed, 0x48, 0xfd, 0x97, 0xa5, 0xc3, 0x7b, 0x59, 0x3a, 0x3a, 0x61, 0xe9,
+	0x02, 0x82, 0xb8, 0x11, 0x5a, 0x86, 0xe3, 0x4e, 0x03, 0xad, 0x05, 0xcc, 0x46, 0x1d, 0xce, 0x81,
+	0x7f, 0x34, 0x07, 0x5a, 0x78, 0xa9, 0x22, 0xb5, 0x95, 0x21, 0xa0, 0xb9, 0x55, 0x44, 0x9f, 0x81,
+	0x5f, 0x6b, 0x2a, 0xc9, 0x47, 0x30, 0xd6, 0xc7, 0xb2, 0x2e, 0xd9, 0x1b, 0xd6, 0xc9, 0x71, 0xdb,
+	0x06, 0x40, 0x7f, 0x04, 0x30, 0x66, 0x9d, 0x9d, 0x88, 0x53, 0x9e, 0xbc, 0x03, 0xe3, 0x4a, 0xea,
+	0xfa, 0x72, 0x34, 0x31, 0xfd, 0x12, 0x82, 0xb6, 0xa2, 0x24, 0x4f, 0x00, 0xcc, 0x73, 0x61, 0xf5,
+	0x53, 0x0b, 0xd1, 0xe2, 0x98, 0x05, 0xa2, 0x14, 0x80, 0xf1, 0xbb, 0x9f, 0x54, 0x99, 0xe6, 0x6b,
+	0xa9, 0xaf, 0x77, 0xaa, 0x78, 0x26, 0x91, 0xeb, 0x33, 0x13, 0xd0, 0x18, 0x02, 0xc6, 0xef, 0x34,
+	0x7c, 0xa5, 0x78, 0xa6, 0xa5, 0x93, 0x2a, 0x2a, 0x31, 0x68, 0x26, 0xca, 0x4e, 0xe9, 0x32, 0xb1,
+	0xd8, 0xe6, 0xe6, 0x8f, 0xcc, 0x63, 0x26, 0xd0, 0xef, 0x67, 0x92, 0x96, 0x1c, 0xbf, 0x39, 0x70,
+	0xbc, 0x3c, 0xd6, 0x26, 0xe8, 0x8b, 0x66, 0x13, 0x1c, 0xfb, 0xf3, 0x7f, 0x2a, 0x8f, 0x61, 0xb4,
+	0x49, 0xa5, 0x62, 0xfc, 0xee, 0xe0, 0xcb, 0xc4, 0xea, 0x91, 0xd5, 0x10, 0xfa, 0xab, 0x0b, 0x53,
+	0xc6, 0x8b, 0xcd, 0xfe, 0x65, 0xe5, 0x02, 0x79, 0x02, 0x41, 0xc1, 0xf3, 0x24, 0xcd, 0xd7, 0xff,
+	0xe6, 0x9a, 0x8d, 0xd1, 0x14, 0x91, 0xaf, 0x45, 0x4d, 0x71, 0xcf, 0x50, 0x2c, 0x0c, 0x59, 0xc0,
+	0xe4, 0x55, 0x9a, 0xa7, 0xf2, 0x96, 0x27, 0xc8, 0xe9, 0x9f, 0xe6, 0x74, 0x40, 0xe4, 0x63, 0x00,
+	0xfc, 0xf2, 0x30, 0x94, 0xc1, 0x69, 0x8a, 0x05, 0x21, 0x1f, 0xc2, 0x45, 0xbc, 0x2d, 0x4b, 0x9e,
+	0xab, 0xc3, 0x57, 0xef, 0x28, 0x7f, 0x33, 0xc4, 0x4f, 0xc0, 0xc5, 0x3f, 0x01, 0x00, 0x00, 0xff,
+	0xff, 0xa6, 0x1a, 0xe7, 0xfd, 0x10, 0x0a, 0x00, 0x00,
 }