Skip to content

P
plugin
Commit 5a0b57b3 authored by 张振华's avatar 张振华
Browse files
Options

update

parents a70c378e d19a436b
Show whitespace changes
Inline Side-by-side
Showing with 1805 additions and 499 deletions
plugin/consensus/dpos/consensus_state.go
View file @ 5a0b57b3
......@@ -10,13 +10,14 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/33cn/chain33/types"
"reflect"
"runtime/debug"
"sync"
"sync/atomic"
"time"
"github.com/33cn/chain33/types"
"github.com/33cn/chain33/common/crypto"
dpostype "github.com/33cn/plugin/plugin/consensus/dpos/types"
ttypes "github.com/33cn/plugin/plugin/consensus/dpos/types"
......
plugin/consensus/dpos/dpos.go
View file @ 5a0b57b3
......@@ -8,11 +8,12 @@ import (
"bytes"
"encoding/hex"
"fmt"
"github.com/33cn/chain33/common/address"
"github.com/33cn/chain33/util"
"strings"
"time"
"github.com/33cn/chain33/common/address"
"github.com/33cn/chain33/util"
"github.com/33cn/chain33/common/crypto"
"github.com/33cn/chain33/common/log/log15"
"github.com/33cn/chain33/common/merkle"
......
plugin/consensus/dpos/ticker_test.go
View file @ 5a0b57b3
package dpos
import (
"github.com/stretchr/testify/assert"
"testing"
"time"
"github.com/stretchr/testify/assert"
)
func TestTicker(t *testing.T) {
......
plugin/consensus/dpos/types/dpos_msg.pb.go
View file @ 5a0b57b3
......@@ -18,9 +18,13 @@ It has these top-level messages:
*/
package types
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
import math "math"
import (
fmt "fmt"
proto "github.com/golang/protobuf/proto"
math "math"
)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
......
plugin/consensus/dpos/types/genesis_test.go
View file @ 5a0b57b3
package types
import (
"os"
"testing"
"github.com/33cn/chain33/common/crypto"
"github.com/33cn/chain33/types"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"os"
"testing"
)
const (
......
plugin/consensus/dpos/types/priv_validator_test.go
View file @ 5a0b57b3
......@@ -5,16 +5,17 @@ import (
"encoding/hex"
"encoding/json"
"fmt"
"github.com/33cn/chain33/common/crypto"
"github.com/33cn/chain33/types"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"io"
"os"
"sort"
"strings"
"testing"
"time"
"github.com/33cn/chain33/common/crypto"
"github.com/33cn/chain33/types"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
const (
......
plugin/consensus/dpos/types/signable.go
View file @ 5a0b57b3
......@@ -9,10 +9,11 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/33cn/chain33/common/address"
"io"
"time"
"github.com/33cn/chain33/common/address"
"github.com/33cn/chain33/common/crypto"
"github.com/33cn/chain33/common/log/log15"
)
......
plugin/consensus/dpos/types/signable_test.go
View file @ 5a0b57b3
......@@ -2,6 +2,7 @@ package types
import (
"encoding/json"
"github.com/33cn/chain33/common/crypto"
"github.com/33cn/chain33/types"
"github.com/stretchr/testify/assert"
......
plugin/consensus/dpos/types/util_test.go
View file @ 5a0b57b3
......@@ -3,14 +3,15 @@ package types
import (
"bytes"
"fmt"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"os"
"os/signal"
"strings"
"sync"
"testing"
"time"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func init() {
......
plugin/consensus/dpos/types/validator_set_test.go
View file @ 5a0b57b3
......@@ -4,12 +4,13 @@ import (
"bytes"
"encoding/hex"
"fmt"
"strings"
"testing"
"github.com/33cn/chain33/common/crypto"
"github.com/33cn/chain33/types"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"strings"
"testing"
)
const (
......
plugin/consensus/dpos/validator_manager.go
View file @ 5a0b57b3
......@@ -8,6 +8,7 @@ import (
"bytes"
"encoding/json"
"fmt"
"github.com/33cn/chain33/common/address"
ttypes "github.com/33cn/plugin/plugin/consensus/dpos/types"
dty "github.com/33cn/plugin/plugin/dapp/dposvote/types"
......
plugin/consensus/dpos/validator_manager_test.go
View file @ 5a0b57b3
......@@ -3,6 +3,7 @@ package dpos
import (
"bytes"
"encoding/hex"
"github.com/33cn/chain33/common/crypto"
"github.com/33cn/chain33/types"
ttypes "github.com/33cn/plugin/plugin/consensus/dpos/types"
......
plugin/dapp/dposvote/commands/vote.go
View file @ 5a0b57b3
......@@ -10,12 +10,13 @@ import (
"encoding/hex"
"encoding/json"
"fmt"
"github.com/33cn/chain33/common/crypto"
"math/rand"
"strconv"
"strings"
"time"
"github.com/33cn/chain33/common/crypto"
vrf "github.com/33cn/chain33/common/vrf/secp256k1"
jsonrpc "github.com/33cn/chain33/rpc/jsonclient"
rpctypes "github.com/33cn/chain33/rpc/types"
......
plugin/dapp/dposvote/executor/dposvotedb.go
View file @ 5a0b57b3
......@@ -8,6 +8,9 @@ import (
"bytes"
"encoding/hex"
"fmt"
"sort"
"strings"
"github.com/33cn/chain33/account"
"github.com/33cn/chain33/common"
"github.com/33cn/chain33/common/db"
......@@ -15,8 +18,6 @@ import (
"github.com/33cn/chain33/system/dapp"
"github.com/33cn/chain33/types"
dty "github.com/33cn/plugin/plugin/dapp/dposvote/types"
"sort"
"strings"
)
const (
......@@ -99,7 +100,6 @@ func queryVrfByTime(kvdb db.KVDB, req *dty.DposVrfQuery) (types.Message, error)
return queryVrfByCycle(kvdb, req)
}
func getJSONVrfs(vrfs []*dty.VrfInfo) []*dty.JSONVrfInfo {
var jsonVrfs []*dty.JSONVrfInfo
for i := 0; i < len(vrfs); i++ {
......
plugin/dapp/dposvote/executor/exec_local.go
View file @ 5a0b57b3
......@@ -6,6 +6,7 @@ package executor
import (
"fmt"
"github.com/33cn/chain33/types"
dty "github.com/33cn/plugin/plugin/dapp/dposvote/types"
)
......
plugin/dapp/dposvote/types/dposvote.pb.go
View file @ 5a0b57b3
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: dposvote.proto
/*
Package types is a generated protocol buffer package.
It is generated from these files:
dposvote.proto
It has these top-level messages:
CandidatorInfo
DposVoter
Candidator
DposCandidatorRegist
DposCandidatorCancelRegist
DposVote
DposCancelVote
DposVoteAction
CandidatorQuery
JSONCandidator
CandidatorReply
DposVoteQuery
JSONDposVoter
DposVoteReply
ReceiptCandicator
DposVrfM
DposVrfRP
DposVrfMRegist
DposVrfRPRegist
ReceiptVrf
VrfInfo
DposVrfQuery
JSONVrfInfo
DposVrfReply
DposCycleBoundaryInfo
DposCBInfo
DposCBQuery
DposCBReply
ReceiptCB
TopNCandidator
TopNCandidators
TopNCandidatorRegist
TopNCandidatorsQuery
TopNCandidatorsReply
ReceiptTopN
*/
package types
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
import math "math"
import (
fmt "fmt"
proto "github.com/golang/protobuf/proto"
math "math"
)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
......@@ -64,24 +25,46 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
// CandidatorInfo 候选节点信息
type CandidatorInfo struct {
Pubkey []byte `protobuf:"bytes,1,opt,name=pubkey,proto3" json:"pubkey,omitempty"`
Address string `protobuf:"bytes,2,opt,name=address" json:"address,omitempty"`
IP string `protobuf:"bytes,3,opt,name=IP" json:"IP,omitempty"`
Votes int64 `protobuf:"varint,4,opt,name=votes" json:"votes,omitempty"`
Status int64 `protobuf:"varint,5,opt,name=status" json:"status,omitempty"`
PreStatus int64 `protobuf:"varint,6,opt,name=preStatus" json:"preStatus,omitempty"`
StartTime int64 `protobuf:"varint,7,opt,name=startTime" json:"startTime,omitempty"`
StartHeight int64 `protobuf:"varint,8,opt,name=startHeight" json:"startHeight,omitempty"`
StartTxHash string `protobuf:"bytes,9,opt,name=startTxHash" json:"startTxHash,omitempty"`
StartIndex int64 `protobuf:"varint,10,opt,name=startIndex" json:"startIndex,omitempty"`
Index int64 `protobuf:"varint,11,opt,name=index" json:"index,omitempty"`
PreIndex int64 `protobuf:"varint,12,opt,name=preIndex" json:"preIndex,omitempty"`
Voters []*DposVoter `protobuf:"bytes,13,rep,name=voters" json:"voters,omitempty"`
Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"`
IP string `protobuf:"bytes,3,opt,name=IP,proto3" json:"IP,omitempty"`
Votes int64 `protobuf:"varint,4,opt,name=votes,proto3" json:"votes,omitempty"`
Status int64 `protobuf:"varint,5,opt,name=status,proto3" json:"status,omitempty"`
PreStatus int64 `protobuf:"varint,6,opt,name=preStatus,proto3" json:"preStatus,omitempty"`
StartTime int64 `protobuf:"varint,7,opt,name=startTime,proto3" json:"startTime,omitempty"`
StartHeight int64 `protobuf:"varint,8,opt,name=startHeight,proto3" json:"startHeight,omitempty"`
StartTxHash string `protobuf:"bytes,9,opt,name=startTxHash,proto3" json:"startTxHash,omitempty"`
StartIndex int64 `protobuf:"varint,10,opt,name=startIndex,proto3" json:"startIndex,omitempty"`
Index int64 `protobuf:"varint,11,opt,name=index,proto3" json:"index,omitempty"`
PreIndex int64 `protobuf:"varint,12,opt,name=preIndex,proto3" json:"preIndex,omitempty"`
Voters []*DposVoter `protobuf:"bytes,13,rep,name=voters,proto3" json:"voters,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *CandidatorInfo) Reset() { *m = CandidatorInfo{} }
func (m *CandidatorInfo) String() string { return proto.CompactTextString(m) }
func (*CandidatorInfo) ProtoMessage() {}
func (*CandidatorInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
func (*CandidatorInfo) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{0}
}
func (m *CandidatorInfo) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_CandidatorInfo.Unmarshal(m, b)
}
func (m *CandidatorInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_CandidatorInfo.Marshal(b, m, deterministic)
}
func (dst *CandidatorInfo) XXX_Merge(src proto.Message) {
xxx_messageInfo_CandidatorInfo.Merge(dst, src)
}
func (m *CandidatorInfo) XXX_Size() int {
return xxx_messageInfo_CandidatorInfo.Size(m)
}
func (m *CandidatorInfo) XXX_DiscardUnknown() {
xxx_messageInfo_CandidatorInfo.DiscardUnknown(m)
}
var xxx_messageInfo_CandidatorInfo proto.InternalMessageInfo
func (m *CandidatorInfo) GetPubkey() []byte {
if m != nil {
......@@ -176,17 +159,39 @@ func (m *CandidatorInfo) GetVoters() []*DposVoter {
// DposVoter 投票者信息
type DposVoter struct {
FromAddr string `protobuf:"bytes,1,opt,name=fromAddr" json:"fromAddr,omitempty"`
FromAddr string `protobuf:"bytes,1,opt,name=fromAddr,proto3" json:"fromAddr,omitempty"`
Pubkey []byte `protobuf:"bytes,2,opt,name=pubkey,proto3" json:"pubkey,omitempty"`
Votes int64 `protobuf:"varint,3,opt,name=votes" json:"votes,omitempty"`
Index int64 `protobuf:"varint,4,opt,name=index" json:"index,omitempty"`
Time int64 `protobuf:"varint,5,opt,name=time" json:"time,omitempty"`
Votes int64 `protobuf:"varint,3,opt,name=votes,proto3" json:"votes,omitempty"`
Index int64 `protobuf:"varint,4,opt,name=index,proto3" json:"index,omitempty"`
Time int64 `protobuf:"varint,5,opt,name=time,proto3" json:"time,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *DposVoter) Reset() { *m = DposVoter{} }
func (m *DposVoter) String() string { return proto.CompactTextString(m) }
func (*DposVoter) ProtoMessage() {}
func (*DposVoter) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
func (*DposVoter) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{1}
}
func (m *DposVoter) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_DposVoter.Unmarshal(m, b)
}
func (m *DposVoter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_DposVoter.Marshal(b, m, deterministic)
}
func (dst *DposVoter) XXX_Merge(src proto.Message) {
xxx_messageInfo_DposVoter.Merge(dst, src)
}
func (m *DposVoter) XXX_Size() int {
return xxx_messageInfo_DposVoter.Size(m)
}
func (m *DposVoter) XXX_DiscardUnknown() {
xxx_messageInfo_DposVoter.DiscardUnknown(m)
}
var xxx_messageInfo_DposVoter proto.InternalMessageInfo
func (m *DposVoter) GetFromAddr() string {
if m != nil {
......@@ -226,16 +231,38 @@ func (m *DposVoter) GetTime() int64 {
// Candidator 候选节点信息
type Candidator struct {
Pubkey []byte `protobuf:"bytes,1,opt,name=pubkey,proto3" json:"pubkey,omitempty"`
Address string `protobuf:"bytes,2,opt,name=address" json:"address,omitempty"`
IP string `protobuf:"bytes,3,opt,name=IP" json:"IP,omitempty"`
Votes int64 `protobuf:"varint,4,opt,name=votes" json:"votes,omitempty"`
Status int64 `protobuf:"varint,5,opt,name=status" json:"status,omitempty"`
Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"`
IP string `protobuf:"bytes,3,opt,name=IP,proto3" json:"IP,omitempty"`
Votes int64 `protobuf:"varint,4,opt,name=votes,proto3" json:"votes,omitempty"`
Status int64 `protobuf:"varint,5,opt,name=status,proto3" json:"status,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *Candidator) Reset() { *m = Candidator{} }
func (m *Candidator) String() string { return proto.CompactTextString(m) }
func (*Candidator) ProtoMessage() {}
func (*Candidator) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
func (*Candidator) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{2}
}
func (m *Candidator) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_Candidator.Unmarshal(m, b)
}
func (m *Candidator) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_Candidator.Marshal(b, m, deterministic)
}
func (dst *Candidator) XXX_Merge(src proto.Message) {
xxx_messageInfo_Candidator.Merge(dst, src)
}
func (m *Candidator) XXX_Size() int {
return xxx_messageInfo_Candidator.Size(m)
}
func (m *Candidator) XXX_DiscardUnknown() {
xxx_messageInfo_Candidator.DiscardUnknown(m)
}
var xxx_messageInfo_Candidator proto.InternalMessageInfo
func (m *Candidator) GetPubkey() []byte {
if m != nil {
......@@ -274,15 +301,37 @@ func (m *Candidator) GetStatus() int64 {
// DposCandidatorRegist 注册Dpos候选节点，必须抵押一定数量的币，比如：10000个币
type DposCandidatorRegist struct {
Pubkey string `protobuf:"bytes,1,opt,name=pubkey" json:"pubkey,omitempty"`
Address string `protobuf:"bytes,2,opt,name=address" json:"address,omitempty"`
IP string `protobuf:"bytes,3,opt,name=IP" json:"IP,omitempty"`
Pubkey string `protobuf:"bytes,1,opt,name=pubkey,proto3" json:"pubkey,omitempty"`
Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"`
IP string `protobuf:"bytes,3,opt,name=IP,proto3" json:"IP,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *DposCandidatorRegist) Reset() { *m = DposCandidatorRegist{} }
func (m *DposCandidatorRegist) String() string { return proto.CompactTextString(m) }
func (*DposCandidatorRegist) ProtoMessage() {}
func (*DposCandidatorRegist) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
func (*DposCandidatorRegist) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{3}
}
func (m *DposCandidatorRegist) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_DposCandidatorRegist.Unmarshal(m, b)
}
func (m *DposCandidatorRegist) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_DposCandidatorRegist.Marshal(b, m, deterministic)
}
func (dst *DposCandidatorRegist) XXX_Merge(src proto.Message) {
xxx_messageInfo_DposCandidatorRegist.Merge(dst, src)
}
func (m *DposCandidatorRegist) XXX_Size() int {
return xxx_messageInfo_DposCandidatorRegist.Size(m)
}
func (m *DposCandidatorRegist) XXX_DiscardUnknown() {
xxx_messageInfo_DposCandidatorRegist.DiscardUnknown(m)
}
var xxx_messageInfo_DposCandidatorRegist proto.InternalMessageInfo
func (m *DposCandidatorRegist) GetPubkey() string {
if m != nil {
......@@ -307,14 +356,36 @@ func (m *DposCandidatorRegist) GetIP() string {
// DposCandidatorCancelRegist 注销Dpos候选节点，解冻抵押的币
type DposCandidatorCancelRegist struct {
Pubkey string `protobuf:"bytes,1,opt,name=pubkey" json:"pubkey,omitempty"`
Address string `protobuf:"bytes,2,opt,name=address" json:"address,omitempty"`
Pubkey string `protobuf:"bytes,1,opt,name=pubkey,proto3" json:"pubkey,omitempty"`
Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *DposCandidatorCancelRegist) Reset() { *m = DposCandidatorCancelRegist{} }
func (m *DposCandidatorCancelRegist) String() string { return proto.CompactTextString(m) }
func (*DposCandidatorCancelRegist) ProtoMessage() {}
func (*DposCandidatorCancelRegist) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
func (*DposCandidatorCancelRegist) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{4}
}
func (m *DposCandidatorCancelRegist) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_DposCandidatorCancelRegist.Unmarshal(m, b)
}
func (m *DposCandidatorCancelRegist) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_DposCandidatorCancelRegist.Marshal(b, m, deterministic)
}
func (dst *DposCandidatorCancelRegist) XXX_Merge(src proto.Message) {
xxx_messageInfo_DposCandidatorCancelRegist.Merge(dst, src)
}
func (m *DposCandidatorCancelRegist) XXX_Size() int {
return xxx_messageInfo_DposCandidatorCancelRegist.Size(m)
}
func (m *DposCandidatorCancelRegist) XXX_DiscardUnknown() {
xxx_messageInfo_DposCandidatorCancelRegist.DiscardUnknown(m)
}
var xxx_messageInfo_DposCandidatorCancelRegist proto.InternalMessageInfo
func (m *DposCandidatorCancelRegist) GetPubkey() string {
if m != nil {
......@@ -332,15 +403,37 @@ func (m *DposCandidatorCancelRegist) GetAddress() string {
// DposVote 为Dpos候选节点投票
type DposVote struct {
FromAddr string `protobuf:"bytes,1,opt,name=fromAddr" json:"fromAddr,omitempty"`
Pubkey string `protobuf:"bytes,2,opt,name=pubkey" json:"pubkey,omitempty"`
Votes int64 `protobuf:"varint,3,opt,name=votes" json:"votes,omitempty"`
FromAddr string `protobuf:"bytes,1,opt,name=fromAddr,proto3" json:"fromAddr,omitempty"`
Pubkey string `protobuf:"bytes,2,opt,name=pubkey,proto3" json:"pubkey,omitempty"`
Votes int64 `protobuf:"varint,3,opt,name=votes,proto3" json:"votes,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *DposVote) Reset() { *m = DposVote{} }
func (m *DposVote) String() string { return proto.CompactTextString(m) }
func (*DposVote) ProtoMessage() {}
func (*DposVote) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
func (*DposVote) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{5}
}
func (m *DposVote) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_DposVote.Unmarshal(m, b)
}
func (m *DposVote) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_DposVote.Marshal(b, m, deterministic)
}
func (dst *DposVote) XXX_Merge(src proto.Message) {
xxx_messageInfo_DposVote.Merge(dst, src)
}
func (m *DposVote) XXX_Size() int {
return xxx_messageInfo_DposVote.Size(m)
}
func (m *DposVote) XXX_DiscardUnknown() {
xxx_messageInfo_DposVote.DiscardUnknown(m)
}
var xxx_messageInfo_DposVote proto.InternalMessageInfo
func (m *DposVote) GetFromAddr() string {
if m != nil {
......@@ -365,14 +458,36 @@ func (m *DposVote) GetVotes() int64 {
// DposCancelVote 撤销为Dpos候选节点投票
type DposCancelVote struct {
Pubkey string `protobuf:"bytes,1,opt,name=pubkey" json:"pubkey,omitempty"`
Index int64 `protobuf:"varint,3,opt,name=index" json:"index,omitempty"`
Pubkey string `protobuf:"bytes,1,opt,name=pubkey,proto3" json:"pubkey,omitempty"`
Index int64 `protobuf:"varint,3,opt,name=index,proto3" json:"index,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *DposCancelVote) Reset() { *m = DposCancelVote{} }
func (m *DposCancelVote) String() string { return proto.CompactTextString(m) }
func (*DposCancelVote) ProtoMessage() {}
func (*DposCancelVote) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
func (*DposCancelVote) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{6}
}
func (m *DposCancelVote) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_DposCancelVote.Unmarshal(m, b)
}
func (m *DposCancelVote) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_DposCancelVote.Marshal(b, m, deterministic)
}
func (dst *DposCancelVote) XXX_Merge(src proto.Message) {
xxx_messageInfo_DposCancelVote.Merge(dst, src)
}
func (m *DposCancelVote) XXX_Size() int {
return xxx_messageInfo_DposCancelVote.Size(m)
}
func (m *DposCancelVote) XXX_DiscardUnknown() {
xxx_messageInfo_DposCancelVote.DiscardUnknown(m)
}
var xxx_messageInfo_DposCancelVote proto.InternalMessageInfo
func (m *DposCancelVote) GetPubkey() string {
if m != nil {
......@@ -406,74 +521,122 @@ type DposVoteAction struct {
// *DposVoteAction_RegistTopN
// *DposVoteAction_TopNQuery
Value isDposVoteAction_Value `protobuf_oneof:"value"`
Ty int32 `protobuf:"varint,15,opt,name=ty" json:"ty,omitempty"`
Ty int32 `protobuf:"varint,15,opt,name=ty,proto3" json:"ty,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *DposVoteAction) Reset() { *m = DposVoteAction{} }
func (m *DposVoteAction) String() string { return proto.CompactTextString(m) }
func (*DposVoteAction) ProtoMessage() {}
func (*DposVoteAction) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
func (*DposVoteAction) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{7}
}
func (m *DposVoteAction) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_DposVoteAction.Unmarshal(m, b)
}
func (m *DposVoteAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_DposVoteAction.Marshal(b, m, deterministic)
}
func (dst *DposVoteAction) XXX_Merge(src proto.Message) {
xxx_messageInfo_DposVoteAction.Merge(dst, src)
}
func (m *DposVoteAction) XXX_Size() int {
return xxx_messageInfo_DposVoteAction.Size(m)
}
func (m *DposVoteAction) XXX_DiscardUnknown() {
xxx_messageInfo_DposVoteAction.DiscardUnknown(m)
}
var xxx_messageInfo_DposVoteAction proto.InternalMessageInfo
type isDposVoteAction_Value interface {
isDposVoteAction_Value()
}
type DposVoteAction_Regist struct {
Regist *DposCandidatorRegist `protobuf:"bytes,1,opt,name=regist,oneof"`
Regist *DposCandidatorRegist `protobuf:"bytes,1,opt,name=regist,proto3,oneof"`
}
type DposVoteAction_CancelRegist struct {
CancelRegist *DposCandidatorCancelRegist `protobuf:"bytes,2,opt,name=cancelRegist,oneof"`
CancelRegist *DposCandidatorCancelRegist `protobuf:"bytes,2,opt,name=cancelRegist,proto3,oneof"`
}
type DposVoteAction_ReRegist struct {
ReRegist *DposCandidatorRegist `protobuf:"bytes,3,opt,name=reRegist,oneof"`
ReRegist *DposCandidatorRegist `protobuf:"bytes,3,opt,name=reRegist,proto3,oneof"`
}
type DposVoteAction_Vote struct {
Vote *DposVote `protobuf:"bytes,4,opt,name=vote,oneof"`
Vote *DposVote `protobuf:"bytes,4,opt,name=vote,proto3,oneof"`
}
type DposVoteAction_CancelVote struct {
CancelVote *DposCancelVote `protobuf:"bytes,5,opt,name=cancelVote,oneof"`
CancelVote *DposCancelVote `protobuf:"bytes,5,opt,name=cancelVote,proto3,oneof"`
}
type DposVoteAction_CandidatorQuery struct {
CandidatorQuery *CandidatorQuery `protobuf:"bytes,6,opt,name=candidatorQuery,oneof"`
CandidatorQuery *CandidatorQuery `protobuf:"bytes,6,opt,name=candidatorQuery,proto3,oneof"`
}
type DposVoteAction_VoteQuery struct {
VoteQuery *DposVoteQuery `protobuf:"bytes,7,opt,name=voteQuery,oneof"`
VoteQuery *DposVoteQuery `protobuf:"bytes,7,opt,name=voteQuery,proto3,oneof"`
}
type DposVoteAction_RegistVrfM struct {
RegistVrfM *DposVrfMRegist `protobuf:"bytes,8,opt,name=registVrfM,oneof"`
RegistVrfM *DposVrfMRegist `protobuf:"bytes,8,opt,name=registVrfM,proto3,oneof"`
}
type DposVoteAction_RegistVrfRP struct {
RegistVrfRP *DposVrfRPRegist `protobuf:"bytes,9,opt,name=registVrfRP,oneof"`
RegistVrfRP *DposVrfRPRegist `protobuf:"bytes,9,opt,name=registVrfRP,proto3,oneof"`
}
type DposVoteAction_VrfQuery struct {
VrfQuery *DposVrfQuery `protobuf:"bytes,10,opt,name=vrfQuery,oneof"`
VrfQuery *DposVrfQuery `protobuf:"bytes,10,opt,name=vrfQuery,proto3,oneof"`
}
type DposVoteAction_RecordCB struct {
RecordCB *DposCBInfo `protobuf:"bytes,11,opt,name=recordCB,oneof"`
RecordCB *DposCBInfo `protobuf:"bytes,11,opt,name=recordCB,proto3,oneof"`
}
type DposVoteAction_CbQuery struct {
CbQuery *DposCBQuery `protobuf:"bytes,12,opt,name=cbQuery,oneof"`
CbQuery *DposCBQuery `protobuf:"bytes,12,opt,name=cbQuery,proto3,oneof"`
}
type DposVoteAction_RegistTopN struct {
RegistTopN *TopNCandidatorRegist `protobuf:"bytes,13,opt,name=registTopN,oneof"`
RegistTopN *TopNCandidatorRegist `protobuf:"bytes,13,opt,name=registTopN,proto3,oneof"`
}
type DposVoteAction_TopNQuery struct {
TopNQuery *TopNCandidatorsQuery `protobuf:"bytes,14,opt,name=topNQuery,oneof"`
TopNQuery *TopNCandidatorsQuery `protobuf:"bytes,14,opt,name=topNQuery,proto3,oneof"`
}
func (*DposVoteAction_Regist) isDposVoteAction_Value() {}
func (*DposVoteAction_CancelRegist) isDposVoteAction_Value() {}
func (*DposVoteAction_ReRegist) isDposVoteAction_Value() {}
func (*DposVoteAction_Vote) isDposVoteAction_Value() {}
func (*DposVoteAction_CancelVote) isDposVoteAction_Value() {}
func (*DposVoteAction_CandidatorQuery) isDposVoteAction_Value() {}
func (*DposVoteAction_VoteQuery) isDposVoteAction_Value() {}
func (*DposVoteAction_RegistVrfM) isDposVoteAction_Value() {}
func (*DposVoteAction_RegistVrfRP) isDposVoteAction_Value() {}
func (*DposVoteAction_VrfQuery) isDposVoteAction_Value() {}
func (*DposVoteAction_RecordCB) isDposVoteAction_Value() {}
func (*DposVoteAction_CbQuery) isDposVoteAction_Value() {}
func (*DposVoteAction_RegistTopN) isDposVoteAction_Value() {}
func (*DposVoteAction_TopNQuery) isDposVoteAction_Value() {}
func (m *DposVoteAction) GetValue() isDposVoteAction_Value {
......@@ -815,72 +978,72 @@ func _DposVoteAction_OneofSizer(msg proto.Message) (n int) {
switch x := m.Value.(type) {
case *DposVoteAction_Regist:
s := proto.Size(x.Regist)
n += proto.SizeVarint(1<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *DposVoteAction_CancelRegist:
s := proto.Size(x.CancelRegist)
n += proto.SizeVarint(2<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *DposVoteAction_ReRegist:
s := proto.Size(x.ReRegist)
n += proto.SizeVarint(3<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *DposVoteAction_Vote:
s := proto.Size(x.Vote)
n += proto.SizeVarint(4<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *DposVoteAction_CancelVote:
s := proto.Size(x.CancelVote)
n += proto.SizeVarint(5<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *DposVoteAction_CandidatorQuery:
s := proto.Size(x.CandidatorQuery)
n += proto.SizeVarint(6<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *DposVoteAction_VoteQuery:
s := proto.Size(x.VoteQuery)
n += proto.SizeVarint(7<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *DposVoteAction_RegistVrfM:
s := proto.Size(x.RegistVrfM)
n += proto.SizeVarint(8<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *DposVoteAction_RegistVrfRP:
s := proto.Size(x.RegistVrfRP)
n += proto.SizeVarint(9<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *DposVoteAction_VrfQuery:
s := proto.Size(x.VrfQuery)
n += proto.SizeVarint(10<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *DposVoteAction_RecordCB:
s := proto.Size(x.RecordCB)
n += proto.SizeVarint(11<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *DposVoteAction_CbQuery:
s := proto.Size(x.CbQuery)
n += proto.SizeVarint(12<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *DposVoteAction_RegistTopN:
s := proto.Size(x.RegistTopN)
n += proto.SizeVarint(13<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *DposVoteAction_TopNQuery:
s := proto.Size(x.TopNQuery)
n += proto.SizeVarint(14<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case nil:
......@@ -892,15 +1055,37 @@ func _DposVoteAction_OneofSizer(msg proto.Message) (n int) {
// CandidatorQuery 候选节点查询
type CandidatorQuery struct {
Pubkeys []string `protobuf:"bytes,1,rep,name=pubkeys" json:"pubkeys,omitempty"`
TopN int32 `protobuf:"varint,2,opt,name=topN" json:"topN,omitempty"`
Ty int32 `protobuf:"varint,3,opt,name=ty" json:"ty,omitempty"`
Pubkeys []string `protobuf:"bytes,1,rep,name=pubkeys,proto3" json:"pubkeys,omitempty"`
TopN int32 `protobuf:"varint,2,opt,name=topN,proto3" json:"topN,omitempty"`
Ty int32 `protobuf:"varint,3,opt,name=ty,proto3" json:"ty,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *CandidatorQuery) Reset() { *m = CandidatorQuery{} }
func (m *CandidatorQuery) String() string { return proto.CompactTextString(m) }
func (*CandidatorQuery) ProtoMessage() {}
func (*CandidatorQuery) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
func (*CandidatorQuery) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{8}
}
func (m *CandidatorQuery) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_CandidatorQuery.Unmarshal(m, b)
}
func (m *CandidatorQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_CandidatorQuery.Marshal(b, m, deterministic)
}
func (dst *CandidatorQuery) XXX_Merge(src proto.Message) {
xxx_messageInfo_CandidatorQuery.Merge(dst, src)
}
func (m *CandidatorQuery) XXX_Size() int {
return xxx_messageInfo_CandidatorQuery.Size(m)
}
func (m *CandidatorQuery) XXX_DiscardUnknown() {
xxx_messageInfo_CandidatorQuery.DiscardUnknown(m)
}
var xxx_messageInfo_CandidatorQuery proto.InternalMessageInfo
func (m *CandidatorQuery) GetPubkeys() []string {
if m != nil {
......@@ -925,17 +1110,39 @@ func (m *CandidatorQuery) GetTy() int32 {
// JSONCandidator 候选节点Json格式信息
type JSONCandidator struct {
Pubkey string `protobuf:"bytes,1,opt,name=pubkey" json:"pubkey,omitempty"`
Address string `protobuf:"bytes,2,opt,name=address" json:"address,omitempty"`
IP string `protobuf:"bytes,3,opt,name=IP" json:"IP,omitempty"`
Votes int64 `protobuf:"varint,4,opt,name=votes" json:"votes,omitempty"`
Status int64 `protobuf:"varint,5,opt,name=status" json:"status,omitempty"`
Pubkey string `protobuf:"bytes,1,opt,name=pubkey,proto3" json:"pubkey,omitempty"`
Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"`
IP string `protobuf:"bytes,3,opt,name=IP,proto3" json:"IP,omitempty"`
Votes int64 `protobuf:"varint,4,opt,name=votes,proto3" json:"votes,omitempty"`
Status int64 `protobuf:"varint,5,opt,name=status,proto3" json:"status,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *JSONCandidator) Reset() { *m = JSONCandidator{} }
func (m *JSONCandidator) String() string { return proto.CompactTextString(m) }
func (*JSONCandidator) ProtoMessage() {}
func (*JSONCandidator) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
func (*JSONCandidator) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{9}
}
func (m *JSONCandidator) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_JSONCandidator.Unmarshal(m, b)
}
func (m *JSONCandidator) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_JSONCandidator.Marshal(b, m, deterministic)
}
func (dst *JSONCandidator) XXX_Merge(src proto.Message) {
xxx_messageInfo_JSONCandidator.Merge(dst, src)
}
func (m *JSONCandidator) XXX_Size() int {
return xxx_messageInfo_JSONCandidator.Size(m)
}
func (m *JSONCandidator) XXX_DiscardUnknown() {
xxx_messageInfo_JSONCandidator.DiscardUnknown(m)
}
var xxx_messageInfo_JSONCandidator proto.InternalMessageInfo
func (m *JSONCandidator) GetPubkey() string {
if m != nil {
......@@ -974,13 +1181,35 @@ func (m *JSONCandidator) GetStatus() int64 {
// CandidatorReply 候选节点查询响应
type CandidatorReply struct {
Candidators []*JSONCandidator `protobuf:"bytes,1,rep,name=candidators" json:"candidators,omitempty"`
Candidators []*JSONCandidator `protobuf:"bytes,1,rep,name=candidators,proto3" json:"candidators,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *CandidatorReply) Reset() { *m = CandidatorReply{} }
func (m *CandidatorReply) String() string { return proto.CompactTextString(m) }
func (*CandidatorReply) ProtoMessage() {}
func (*CandidatorReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
func (*CandidatorReply) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{10}
}
func (m *CandidatorReply) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_CandidatorReply.Unmarshal(m, b)
}
func (m *CandidatorReply) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_CandidatorReply.Marshal(b, m, deterministic)
}
func (dst *CandidatorReply) XXX_Merge(src proto.Message) {
xxx_messageInfo_CandidatorReply.Merge(dst, src)
}
func (m *CandidatorReply) XXX_Size() int {
return xxx_messageInfo_CandidatorReply.Size(m)
}
func (m *CandidatorReply) XXX_DiscardUnknown() {
xxx_messageInfo_CandidatorReply.DiscardUnknown(m)
}
var xxx_messageInfo_CandidatorReply proto.InternalMessageInfo
func (m *CandidatorReply) GetCandidators() []*JSONCandidator {
if m != nil {
......@@ -991,14 +1220,36 @@ func (m *CandidatorReply) GetCandidators() []*JSONCandidator {
// DposVoteQuery 投票查询
type DposVoteQuery struct {
Pubkeys []string `protobuf:"bytes,1,rep,name=pubkeys" json:"pubkeys,omitempty"`
Addr string `protobuf:"bytes,2,opt,name=addr" json:"addr,omitempty"`
Pubkeys []string `protobuf:"bytes,1,rep,name=pubkeys,proto3" json:"pubkeys,omitempty"`
Addr string `protobuf:"bytes,2,opt,name=addr,proto3" json:"addr,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *DposVoteQuery) Reset() { *m = DposVoteQuery{} }
func (m *DposVoteQuery) String() string { return proto.CompactTextString(m) }
func (*DposVoteQuery) ProtoMessage() {}
func (*DposVoteQuery) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
func (*DposVoteQuery) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{11}
}
func (m *DposVoteQuery) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_DposVoteQuery.Unmarshal(m, b)
}
func (m *DposVoteQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_DposVoteQuery.Marshal(b, m, deterministic)
}
func (dst *DposVoteQuery) XXX_Merge(src proto.Message) {
xxx_messageInfo_DposVoteQuery.Merge(dst, src)
}
func (m *DposVoteQuery) XXX_Size() int {
return xxx_messageInfo_DposVoteQuery.Size(m)
}
func (m *DposVoteQuery) XXX_DiscardUnknown() {
xxx_messageInfo_DposVoteQuery.DiscardUnknown(m)
}
var xxx_messageInfo_DposVoteQuery proto.InternalMessageInfo
func (m *DposVoteQuery) GetPubkeys() []string {
if m != nil {
......@@ -1016,17 +1267,39 @@ func (m *DposVoteQuery) GetAddr() string {
// JSONDposVoter Json格式的投票者信息
type JSONDposVoter struct {
FromAddr string `protobuf:"bytes,1,opt,name=fromAddr" json:"fromAddr,omitempty"`
Pubkey string `protobuf:"bytes,2,opt,name=pubkey" json:"pubkey,omitempty"`
Votes int64 `protobuf:"varint,3,opt,name=votes" json:"votes,omitempty"`
Index int64 `protobuf:"varint,4,opt,name=index" json:"index,omitempty"`
Time int64 `protobuf:"varint,5,opt,name=time" json:"time,omitempty"`
FromAddr string `protobuf:"bytes,1,opt,name=fromAddr,proto3" json:"fromAddr,omitempty"`
Pubkey string `protobuf:"bytes,2,opt,name=pubkey,proto3" json:"pubkey,omitempty"`
Votes int64 `protobuf:"varint,3,opt,name=votes,proto3" json:"votes,omitempty"`
Index int64 `protobuf:"varint,4,opt,name=index,proto3" json:"index,omitempty"`
Time int64 `protobuf:"varint,5,opt,name=time,proto3" json:"time,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *JSONDposVoter) Reset() { *m = JSONDposVoter{} }
func (m *JSONDposVoter) String() string { return proto.CompactTextString(m) }
func (*JSONDposVoter) ProtoMessage() {}
func (*JSONDposVoter) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
func (*JSONDposVoter) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{12}
}
func (m *JSONDposVoter) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_JSONDposVoter.Unmarshal(m, b)
}
func (m *JSONDposVoter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_JSONDposVoter.Marshal(b, m, deterministic)
}
func (dst *JSONDposVoter) XXX_Merge(src proto.Message) {
xxx_messageInfo_JSONDposVoter.Merge(dst, src)
}
func (m *JSONDposVoter) XXX_Size() int {
return xxx_messageInfo_JSONDposVoter.Size(m)
}
func (m *JSONDposVoter) XXX_DiscardUnknown() {
xxx_messageInfo_JSONDposVoter.DiscardUnknown(m)
}
var xxx_messageInfo_JSONDposVoter proto.InternalMessageInfo
func (m *JSONDposVoter) GetFromAddr() string {
if m != nil {
......@@ -1065,13 +1338,35 @@ func (m *JSONDposVoter) GetTime() int64 {
// DposVoteReply 投票查询响应
type DposVoteReply struct {
Votes []*JSONDposVoter `protobuf:"bytes,1,rep,name=votes" json:"votes,omitempty"`
Votes []*JSONDposVoter `protobuf:"bytes,1,rep,name=votes,proto3" json:"votes,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *DposVoteReply) Reset() { *m = DposVoteReply{} }
func (m *DposVoteReply) String() string { return proto.CompactTextString(m) }
func (*DposVoteReply) ProtoMessage() {}
func (*DposVoteReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
func (*DposVoteReply) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{13}
}
func (m *DposVoteReply) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_DposVoteReply.Unmarshal(m, b)
}
func (m *DposVoteReply) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_DposVoteReply.Marshal(b, m, deterministic)
}
func (dst *DposVoteReply) XXX_Merge(src proto.Message) {
xxx_messageInfo_DposVoteReply.Merge(dst, src)
}
func (m *DposVoteReply) XXX_Size() int {
return xxx_messageInfo_DposVoteReply.Size(m)
}
func (m *DposVoteReply) XXX_DiscardUnknown() {
xxx_messageInfo_DposVoteReply.DiscardUnknown(m)
}
var xxx_messageInfo_DposVoteReply proto.InternalMessageInfo
func (m *DposVoteReply) GetVotes() []*JSONDposVoter {
if m != nil {
......@@ -1082,23 +1377,45 @@ func (m *DposVoteReply) GetVotes() []*JSONDposVoter {
// ReceiptCandicator 候选者收据信息
type ReceiptCandicator struct {
Index int64 `protobuf:"varint,1,opt,name=Index" json:"Index,omitempty"`
Index int64 `protobuf:"varint,1,opt,name=Index,proto3" json:"Index,omitempty"`
Pubkey []byte `protobuf:"bytes,2,opt,name=pubkey,proto3" json:"pubkey,omitempty"`
Address string `protobuf:"bytes,3,opt,name=address" json:"address,omitempty"`
Status int64 `protobuf:"varint,4,opt,name=status" json:"status,omitempty"`
PreStatus int64 `protobuf:"varint,5,opt,name=preStatus" json:"preStatus,omitempty"`
StatusChange bool `protobuf:"varint,6,opt,name=statusChange" json:"statusChange,omitempty"`
VoteType int32 `protobuf:"varint,7,opt,name=voteType" json:"voteType,omitempty"`
Vote *DposVoter `protobuf:"bytes,8,opt,name=vote" json:"vote,omitempty"`
FromAddr string `protobuf:"bytes,9,opt,name=fromAddr" json:"fromAddr,omitempty"`
CandInfo *CandidatorInfo `protobuf:"bytes,10,opt,name=candInfo" json:"candInfo,omitempty"`
Time int64 `protobuf:"varint,11,opt,name=time" json:"time,omitempty"`
Address string `protobuf:"bytes,3,opt,name=address,proto3" json:"address,omitempty"`
Status int64 `protobuf:"varint,4,opt,name=status,proto3" json:"status,omitempty"`
PreStatus int64 `protobuf:"varint,5,opt,name=preStatus,proto3" json:"preStatus,omitempty"`
StatusChange bool `protobuf:"varint,6,opt,name=statusChange,proto3" json:"statusChange,omitempty"`
VoteType int32 `protobuf:"varint,7,opt,name=voteType,proto3" json:"voteType,omitempty"`
Vote *DposVoter `protobuf:"bytes,8,opt,name=vote,proto3" json:"vote,omitempty"`
FromAddr string `protobuf:"bytes,9,opt,name=fromAddr,proto3" json:"fromAddr,omitempty"`
CandInfo *CandidatorInfo `protobuf:"bytes,10,opt,name=candInfo,proto3" json:"candInfo,omitempty"`
Time int64 `protobuf:"varint,11,opt,name=time,proto3" json:"time,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ReceiptCandicator) Reset() { *m = ReceiptCandicator{} }
func (m *ReceiptCandicator) String() string { return proto.CompactTextString(m) }
func (*ReceiptCandicator) ProtoMessage() {}
func (*ReceiptCandicator) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
func (*ReceiptCandicator) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{14}
}
func (m *ReceiptCandicator) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReceiptCandicator.Unmarshal(m, b)
}
func (m *ReceiptCandicator) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ReceiptCandicator.Marshal(b, m, deterministic)
}
func (dst *ReceiptCandicator) XXX_Merge(src proto.Message) {
xxx_messageInfo_ReceiptCandicator.Merge(dst, src)
}
func (m *ReceiptCandicator) XXX_Size() int {
return xxx_messageInfo_ReceiptCandicator.Size(m)
}
func (m *ReceiptCandicator) XXX_DiscardUnknown() {
xxx_messageInfo_ReceiptCandicator.DiscardUnknown(m)
}
var xxx_messageInfo_ReceiptCandicator proto.InternalMessageInfo
func (m *ReceiptCandicator) GetIndex() int64 {
if m != nil {
......@@ -1179,21 +1496,43 @@ func (m *ReceiptCandicator) GetTime() int64 {
// DposVrfM VrfM信息
type DposVrfM struct {
Index int64 `protobuf:"varint,1,opt,name=Index" json:"Index,omitempty"`
Index int64 `protobuf:"varint,1,opt,name=Index,proto3" json:"Index,omitempty"`
Pubkey []byte `protobuf:"bytes,2,opt,name=pubkey,proto3" json:"pubkey,omitempty"`
Cycle int64 `protobuf:"varint,3,opt,name=cycle" json:"cycle,omitempty"`
Height int64 `protobuf:"varint,4,opt,name=height" json:"height,omitempty"`
Cycle int64 `protobuf:"varint,3,opt,name=cycle,proto3" json:"cycle,omitempty"`
Height int64 `protobuf:"varint,4,opt,name=height,proto3" json:"height,omitempty"`
M []byte `protobuf:"bytes,5,opt,name=m,proto3" json:"m,omitempty"`
Time int64 `protobuf:"varint,6,opt,name=time" json:"time,omitempty"`
CycleStart int64 `protobuf:"varint,7,opt,name=cycleStart" json:"cycleStart,omitempty"`
CycleMiddle int64 `protobuf:"varint,8,opt,name=cycleMiddle" json:"cycleMiddle,omitempty"`
CycleStop int64 `protobuf:"varint,9,opt,name=cycleStop" json:"cycleStop,omitempty"`
Time int64 `protobuf:"varint,6,opt,name=time,proto3" json:"time,omitempty"`
CycleStart int64 `protobuf:"varint,7,opt,name=cycleStart,proto3" json:"cycleStart,omitempty"`
CycleMiddle int64 `protobuf:"varint,8,opt,name=cycleMiddle,proto3" json:"cycleMiddle,omitempty"`
CycleStop int64 `protobuf:"varint,9,opt,name=cycleStop,proto3" json:"cycleStop,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *DposVrfM) Reset() { *m = DposVrfM{} }
func (m *DposVrfM) String() string { return proto.CompactTextString(m) }
func (*DposVrfM) ProtoMessage() {}
func (*DposVrfM) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
func (*DposVrfM) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{15}
}
func (m *DposVrfM) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_DposVrfM.Unmarshal(m, b)
}
func (m *DposVrfM) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_DposVrfM.Marshal(b, m, deterministic)
}
func (dst *DposVrfM) XXX_Merge(src proto.Message) {
xxx_messageInfo_DposVrfM.Merge(dst, src)
}
func (m *DposVrfM) XXX_Size() int {
return xxx_messageInfo_DposVrfM.Size(m)
}
func (m *DposVrfM) XXX_DiscardUnknown() {
xxx_messageInfo_DposVrfM.DiscardUnknown(m)
}
var xxx_messageInfo_DposVrfM proto.InternalMessageInfo
func (m *DposVrfM) GetIndex() int64 {
if m != nil {
......@@ -1260,23 +1599,45 @@ func (m *DposVrfM) GetCycleStop() int64 {
// DposVrfRP VrfRP信息
type DposVrfRP struct {
Index int64 `protobuf:"varint,1,opt,name=Index" json:"Index,omitempty"`
Index int64 `protobuf:"varint,1,opt,name=Index,proto3" json:"Index,omitempty"`
Pubkey []byte `protobuf:"bytes,2,opt,name=pubkey,proto3" json:"pubkey,omitempty"`
Cycle int64 `protobuf:"varint,3,opt,name=cycle" json:"cycle,omitempty"`
Height int64 `protobuf:"varint,4,opt,name=height" json:"height,omitempty"`
Cycle int64 `protobuf:"varint,3,opt,name=cycle,proto3" json:"cycle,omitempty"`
Height int64 `protobuf:"varint,4,opt,name=height,proto3" json:"height,omitempty"`
M []byte `protobuf:"bytes,5,opt,name=m,proto3" json:"m,omitempty"`
R []byte `protobuf:"bytes,6,opt,name=r,proto3" json:"r,omitempty"`
P []byte `protobuf:"bytes,7,opt,name=p,proto3" json:"p,omitempty"`
Time int64 `protobuf:"varint,8,opt,name=time" json:"time,omitempty"`
CycleStart int64 `protobuf:"varint,9,opt,name=cycleStart" json:"cycleStart,omitempty"`
CycleMiddle int64 `protobuf:"varint,10,opt,name=cycleMiddle" json:"cycleMiddle,omitempty"`
CycleStop int64 `protobuf:"varint,11,opt,name=cycleStop" json:"cycleStop,omitempty"`
Time int64 `protobuf:"varint,8,opt,name=time,proto3" json:"time,omitempty"`
CycleStart int64 `protobuf:"varint,9,opt,name=cycleStart,proto3" json:"cycleStart,omitempty"`
CycleMiddle int64 `protobuf:"varint,10,opt,name=cycleMiddle,proto3" json:"cycleMiddle,omitempty"`
CycleStop int64 `protobuf:"varint,11,opt,name=cycleStop,proto3" json:"cycleStop,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *DposVrfRP) Reset() { *m = DposVrfRP{} }
func (m *DposVrfRP) String() string { return proto.CompactTextString(m) }
func (*DposVrfRP) ProtoMessage() {}
func (*DposVrfRP) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
func (*DposVrfRP) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{16}
}
func (m *DposVrfRP) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_DposVrfRP.Unmarshal(m, b)
}
func (m *DposVrfRP) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_DposVrfRP.Marshal(b, m, deterministic)
}
func (dst *DposVrfRP) XXX_Merge(src proto.Message) {
xxx_messageInfo_DposVrfRP.Merge(dst, src)
}
func (m *DposVrfRP) XXX_Size() int {
return xxx_messageInfo_DposVrfRP.Size(m)
}
func (m *DposVrfRP) XXX_DiscardUnknown() {
xxx_messageInfo_DposVrfRP.DiscardUnknown(m)
}
var xxx_messageInfo_DposVrfRP proto.InternalMessageInfo
func (m *DposVrfRP) GetIndex() int64 {
if m != nil {
......@@ -1357,15 +1718,37 @@ func (m *DposVrfRP) GetCycleStop() int64 {
// DposVrfMRegist VrfM注册请求
type DposVrfMRegist struct {
Pubkey string `protobuf:"bytes,1,opt,name=pubkey" json:"pubkey,omitempty"`
Cycle int64 `protobuf:"varint,2,opt,name=cycle" json:"cycle,omitempty"`
M string `protobuf:"bytes,3,opt,name=m" json:"m,omitempty"`
Pubkey string `protobuf:"bytes,1,opt,name=pubkey,proto3" json:"pubkey,omitempty"`
Cycle int64 `protobuf:"varint,2,opt,name=cycle,proto3" json:"cycle,omitempty"`
M string `protobuf:"bytes,3,opt,name=m,proto3" json:"m,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *DposVrfMRegist) Reset() { *m = DposVrfMRegist{} }
func (m *DposVrfMRegist) String() string { return proto.CompactTextString(m) }
func (*DposVrfMRegist) ProtoMessage() {}
func (*DposVrfMRegist) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
func (*DposVrfMRegist) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{17}
}
func (m *DposVrfMRegist) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_DposVrfMRegist.Unmarshal(m, b)
}
func (m *DposVrfMRegist) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_DposVrfMRegist.Marshal(b, m, deterministic)
}
func (dst *DposVrfMRegist) XXX_Merge(src proto.Message) {
xxx_messageInfo_DposVrfMRegist.Merge(dst, src)
}
func (m *DposVrfMRegist) XXX_Size() int {
return xxx_messageInfo_DposVrfMRegist.Size(m)
}
func (m *DposVrfMRegist) XXX_DiscardUnknown() {
xxx_messageInfo_DposVrfMRegist.DiscardUnknown(m)
}
var xxx_messageInfo_DposVrfMRegist proto.InternalMessageInfo
func (m *DposVrfMRegist) GetPubkey() string {
if m != nil {
......@@ -1390,16 +1773,38 @@ func (m *DposVrfMRegist) GetM() string {
// DposVrfRPRegist VrfRP注册请求
type DposVrfRPRegist struct {
Pubkey string `protobuf:"bytes,1,opt,name=pubkey" json:"pubkey,omitempty"`
Cycle int64 `protobuf:"varint,2,opt,name=cycle" json:"cycle,omitempty"`
R string `protobuf:"bytes,3,opt,name=r" json:"r,omitempty"`
P string `protobuf:"bytes,4,opt,name=p" json:"p,omitempty"`
Pubkey string `protobuf:"bytes,1,opt,name=pubkey,proto3" json:"pubkey,omitempty"`
Cycle int64 `protobuf:"varint,2,opt,name=cycle,proto3" json:"cycle,omitempty"`
R string `protobuf:"bytes,3,opt,name=r,proto3" json:"r,omitempty"`
P string `protobuf:"bytes,4,opt,name=p,proto3" json:"p,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *DposVrfRPRegist) Reset() { *m = DposVrfRPRegist{} }
func (m *DposVrfRPRegist) String() string { return proto.CompactTextString(m) }
func (*DposVrfRPRegist) ProtoMessage() {}
func (*DposVrfRPRegist) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
func (*DposVrfRPRegist) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{18}
}
func (m *DposVrfRPRegist) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_DposVrfRPRegist.Unmarshal(m, b)
}
func (m *DposVrfRPRegist) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_DposVrfRPRegist.Marshal(b, m, deterministic)
}
func (dst *DposVrfRPRegist) XXX_Merge(src proto.Message) {
xxx_messageInfo_DposVrfRPRegist.Merge(dst, src)
}
func (m *DposVrfRPRegist) XXX_Size() int {
return xxx_messageInfo_DposVrfRPRegist.Size(m)
}
func (m *DposVrfRPRegist) XXX_DiscardUnknown() {
xxx_messageInfo_DposVrfRPRegist.DiscardUnknown(m)
}
var xxx_messageInfo_DposVrfRPRegist proto.InternalMessageInfo
func (m *DposVrfRPRegist) GetPubkey() string {
if m != nil {
......@@ -1431,24 +1836,46 @@ func (m *DposVrfRPRegist) GetP() string {
// ReceiptVrf vrf收据信息
type ReceiptVrf struct {
Index int64 `protobuf:"varint,1,opt,name=Index" json:"Index,omitempty"`
Index int64 `protobuf:"varint,1,opt,name=Index,proto3" json:"Index,omitempty"`
Pubkey []byte `protobuf:"bytes,2,opt,name=pubkey,proto3" json:"pubkey,omitempty"`
Status int64 `protobuf:"varint,3,opt,name=status" json:"status,omitempty"`
Cycle int64 `protobuf:"varint,4,opt,name=cycle" json:"cycle,omitempty"`
Height int64 `protobuf:"varint,5,opt,name=height" json:"height,omitempty"`
Status int64 `protobuf:"varint,3,opt,name=status,proto3" json:"status,omitempty"`
Cycle int64 `protobuf:"varint,4,opt,name=cycle,proto3" json:"cycle,omitempty"`
Height int64 `protobuf:"varint,5,opt,name=height,proto3" json:"height,omitempty"`
M []byte `protobuf:"bytes,6,opt,name=m,proto3" json:"m,omitempty"`
R []byte `protobuf:"bytes,7,opt,name=r,proto3" json:"r,omitempty"`
P []byte `protobuf:"bytes,8,opt,name=p,proto3" json:"p,omitempty"`
Time int64 `protobuf:"varint,9,opt,name=time" json:"time,omitempty"`
CycleStart int64 `protobuf:"varint,10,opt,name=cycleStart" json:"cycleStart,omitempty"`
CycleMiddle int64 `protobuf:"varint,11,opt,name=cycleMiddle" json:"cycleMiddle,omitempty"`
CycleStop int64 `protobuf:"varint,12,opt,name=cycleStop" json:"cycleStop,omitempty"`
Time int64 `protobuf:"varint,9,opt,name=time,proto3" json:"time,omitempty"`
CycleStart int64 `protobuf:"varint,10,opt,name=cycleStart,proto3" json:"cycleStart,omitempty"`
CycleMiddle int64 `protobuf:"varint,11,opt,name=cycleMiddle,proto3" json:"cycleMiddle,omitempty"`
CycleStop int64 `protobuf:"varint,12,opt,name=cycleStop,proto3" json:"cycleStop,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ReceiptVrf) Reset() { *m = ReceiptVrf{} }
func (m *ReceiptVrf) String() string { return proto.CompactTextString(m) }
func (*ReceiptVrf) ProtoMessage() {}
func (*ReceiptVrf) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} }
func (*ReceiptVrf) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{19}
}
func (m *ReceiptVrf) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReceiptVrf.Unmarshal(m, b)
}
func (m *ReceiptVrf) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ReceiptVrf.Marshal(b, m, deterministic)
}
func (dst *ReceiptVrf) XXX_Merge(src proto.Message) {
xxx_messageInfo_ReceiptVrf.Merge(dst, src)
}
func (m *ReceiptVrf) XXX_Size() int {
return xxx_messageInfo_ReceiptVrf.Size(m)
}
func (m *ReceiptVrf) XXX_DiscardUnknown() {
xxx_messageInfo_ReceiptVrf.DiscardUnknown(m)
}
var xxx_messageInfo_ReceiptVrf proto.InternalMessageInfo
func (m *ReceiptVrf) GetIndex() int64 {
if m != nil {
......@@ -1536,20 +1963,42 @@ func (m *ReceiptVrf) GetCycleStop() int64 {
// VrfInfo vrf信息
type VrfInfo struct {
Index int64 `protobuf:"varint,1,opt,name=Index" json:"Index,omitempty"`
Index int64 `protobuf:"varint,1,opt,name=Index,proto3" json:"Index,omitempty"`
Pubkey []byte `protobuf:"bytes,2,opt,name=pubkey,proto3" json:"pubkey,omitempty"`
Cycle int64 `protobuf:"varint,4,opt,name=cycle" json:"cycle,omitempty"`
Height int64 `protobuf:"varint,5,opt,name=height" json:"height,omitempty"`
Cycle int64 `protobuf:"varint,4,opt,name=cycle,proto3" json:"cycle,omitempty"`
Height int64 `protobuf:"varint,5,opt,name=height,proto3" json:"height,omitempty"`
M []byte `protobuf:"bytes,6,opt,name=m,proto3" json:"m,omitempty"`
R []byte `protobuf:"bytes,7,opt,name=r,proto3" json:"r,omitempty"`
P []byte `protobuf:"bytes,8,opt,name=p,proto3" json:"p,omitempty"`
Time int64 `protobuf:"varint,9,opt,name=time" json:"time,omitempty"`
Time int64 `protobuf:"varint,9,opt,name=time,proto3" json:"time,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *VrfInfo) Reset() { *m = VrfInfo{} }
func (m *VrfInfo) String() string { return proto.CompactTextString(m) }
func (*VrfInfo) ProtoMessage() {}
func (*VrfInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} }
func (*VrfInfo) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{20}
}
func (m *VrfInfo) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_VrfInfo.Unmarshal(m, b)
}
func (m *VrfInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_VrfInfo.Marshal(b, m, deterministic)
}
func (dst *VrfInfo) XXX_Merge(src proto.Message) {
xxx_messageInfo_VrfInfo.Merge(dst, src)
}
func (m *VrfInfo) XXX_Size() int {
return xxx_messageInfo_VrfInfo.Size(m)
}
func (m *VrfInfo) XXX_DiscardUnknown() {
xxx_messageInfo_VrfInfo.DiscardUnknown(m)
}
var xxx_messageInfo_VrfInfo proto.InternalMessageInfo
func (m *VrfInfo) GetIndex() int64 {
if m != nil {
......@@ -1609,16 +2058,38 @@ func (m *VrfInfo) GetTime() int64 {
// DposVrfQuery vrf查询请求
type DposVrfQuery struct {
Pubkeys []string `protobuf:"bytes,1,rep,name=pubkeys" json:"pubkeys,omitempty"`
Ty int64 `protobuf:"varint,2,opt,name=ty" json:"ty,omitempty"`
Timestamp int64 `protobuf:"varint,3,opt,name=timestamp" json:"timestamp,omitempty"`
Cycle int64 `protobuf:"varint,4,opt,name=cycle" json:"cycle,omitempty"`
Pubkeys []string `protobuf:"bytes,1,rep,name=pubkeys,proto3" json:"pubkeys,omitempty"`
Ty int64 `protobuf:"varint,2,opt,name=ty,proto3" json:"ty,omitempty"`
Timestamp int64 `protobuf:"varint,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
Cycle int64 `protobuf:"varint,4,opt,name=cycle,proto3" json:"cycle,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *DposVrfQuery) Reset() { *m = DposVrfQuery{} }
func (m *DposVrfQuery) String() string { return proto.CompactTextString(m) }
func (*DposVrfQuery) ProtoMessage() {}
func (*DposVrfQuery) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{21} }
func (*DposVrfQuery) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{21}
}
func (m *DposVrfQuery) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_DposVrfQuery.Unmarshal(m, b)
}
func (m *DposVrfQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_DposVrfQuery.Marshal(b, m, deterministic)
}
func (dst *DposVrfQuery) XXX_Merge(src proto.Message) {
xxx_messageInfo_DposVrfQuery.Merge(dst, src)
}
func (m *DposVrfQuery) XXX_Size() int {
return xxx_messageInfo_DposVrfQuery.Size(m)
}
func (m *DposVrfQuery) XXX_DiscardUnknown() {
xxx_messageInfo_DposVrfQuery.DiscardUnknown(m)
}
var xxx_messageInfo_DposVrfQuery proto.InternalMessageInfo
func (m *DposVrfQuery) GetPubkeys() []string {
if m != nil {
......@@ -1650,20 +2121,42 @@ func (m *DposVrfQuery) GetCycle() int64 {
// JSONVrfInfo json格式的vrf信息
type JSONVrfInfo struct {
Index int64 `protobuf:"varint,1,opt,name=Index" json:"Index,omitempty"`
Pubkey string `protobuf:"bytes,2,opt,name=pubkey" json:"pubkey,omitempty"`
Cycle int64 `protobuf:"varint,4,opt,name=cycle" json:"cycle,omitempty"`
Height int64 `protobuf:"varint,5,opt,name=height" json:"height,omitempty"`
M string `protobuf:"bytes,6,opt,name=m" json:"m,omitempty"`
R string `protobuf:"bytes,7,opt,name=r" json:"r,omitempty"`
P string `protobuf:"bytes,8,opt,name=p" json:"p,omitempty"`
Time int64 `protobuf:"varint,9,opt,name=time" json:"time,omitempty"`
Index int64 `protobuf:"varint,1,opt,name=Index,proto3" json:"Index,omitempty"`
Pubkey string `protobuf:"bytes,2,opt,name=pubkey,proto3" json:"pubkey,omitempty"`
Cycle int64 `protobuf:"varint,4,opt,name=cycle,proto3" json:"cycle,omitempty"`
Height int64 `protobuf:"varint,5,opt,name=height,proto3" json:"height,omitempty"`
M string `protobuf:"bytes,6,opt,name=m,proto3" json:"m,omitempty"`
R string `protobuf:"bytes,7,opt,name=r,proto3" json:"r,omitempty"`
P string `protobuf:"bytes,8,opt,name=p,proto3" json:"p,omitempty"`
Time int64 `protobuf:"varint,9,opt,name=time,proto3" json:"time,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *JSONVrfInfo) Reset() { *m = JSONVrfInfo{} }
func (m *JSONVrfInfo) String() string { return proto.CompactTextString(m) }
func (*JSONVrfInfo) ProtoMessage() {}
func (*JSONVrfInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{22} }
func (*JSONVrfInfo) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{22}
}
func (m *JSONVrfInfo) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_JSONVrfInfo.Unmarshal(m, b)
}
func (m *JSONVrfInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_JSONVrfInfo.Marshal(b, m, deterministic)
}
func (dst *JSONVrfInfo) XXX_Merge(src proto.Message) {
xxx_messageInfo_JSONVrfInfo.Merge(dst, src)
}
func (m *JSONVrfInfo) XXX_Size() int {
return xxx_messageInfo_JSONVrfInfo.Size(m)
}
func (m *JSONVrfInfo) XXX_DiscardUnknown() {
xxx_messageInfo_JSONVrfInfo.DiscardUnknown(m)
}
var xxx_messageInfo_JSONVrfInfo proto.InternalMessageInfo
func (m *JSONVrfInfo) GetIndex() int64 {
if m != nil {
......@@ -1723,13 +2216,35 @@ func (m *JSONVrfInfo) GetTime() int64 {
// DposVrfReply vrf查询响应
type DposVrfReply struct {
Vrf []*JSONVrfInfo `protobuf:"bytes,1,rep,name=vrf" json:"vrf,omitempty"`
Vrf []*JSONVrfInfo `protobuf:"bytes,1,rep,name=vrf,proto3" json:"vrf,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *DposVrfReply) Reset() { *m = DposVrfReply{} }
func (m *DposVrfReply) String() string { return proto.CompactTextString(m) }
func (*DposVrfReply) ProtoMessage() {}
func (*DposVrfReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{23} }
func (*DposVrfReply) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{23}
}
func (m *DposVrfReply) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_DposVrfReply.Unmarshal(m, b)
}
func (m *DposVrfReply) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_DposVrfReply.Marshal(b, m, deterministic)
}
func (dst *DposVrfReply) XXX_Merge(src proto.Message) {
xxx_messageInfo_DposVrfReply.Merge(dst, src)
}
func (m *DposVrfReply) XXX_Size() int {
return xxx_messageInfo_DposVrfReply.Size(m)
}
func (m *DposVrfReply) XXX_DiscardUnknown() {
xxx_messageInfo_DposVrfReply.DiscardUnknown(m)
}
var xxx_messageInfo_DposVrfReply proto.InternalMessageInfo
func (m *DposVrfReply) GetVrf() []*JSONVrfInfo {
if m != nil {
......@@ -1740,17 +2255,39 @@ func (m *DposVrfReply) GetVrf() []*JSONVrfInfo {
// DposCycleBoundaryInfo cycle边界信息
type DposCycleBoundaryInfo struct {
Cycle int64 `protobuf:"varint,1,opt,name=cycle" json:"cycle,omitempty"`
StopHeight int64 `protobuf:"varint,2,opt,name=stopHeight" json:"stopHeight,omitempty"`
Cycle int64 `protobuf:"varint,1,opt,name=cycle,proto3" json:"cycle,omitempty"`
StopHeight int64 `protobuf:"varint,2,opt,name=stopHeight,proto3" json:"stopHeight,omitempty"`
StopHash []byte `protobuf:"bytes,3,opt,name=stopHash,proto3" json:"stopHash,omitempty"`
Pubkey []byte `protobuf:"bytes,4,opt,name=pubkey,proto3" json:"pubkey,omitempty"`
Signature []byte `protobuf:"bytes,5,opt,name=signature,proto3" json:"signature,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *DposCycleBoundaryInfo) Reset() { *m = DposCycleBoundaryInfo{} }
func (m *DposCycleBoundaryInfo) String() string { return proto.CompactTextString(m) }
func (*DposCycleBoundaryInfo) ProtoMessage() {}
func (*DposCycleBoundaryInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{24} }
func (*DposCycleBoundaryInfo) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{24}
}
func (m *DposCycleBoundaryInfo) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_DposCycleBoundaryInfo.Unmarshal(m, b)
}
func (m *DposCycleBoundaryInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_DposCycleBoundaryInfo.Marshal(b, m, deterministic)
}
func (dst *DposCycleBoundaryInfo) XXX_Merge(src proto.Message) {
xxx_messageInfo_DposCycleBoundaryInfo.Merge(dst, src)
}
func (m *DposCycleBoundaryInfo) XXX_Size() int {
return xxx_messageInfo_DposCycleBoundaryInfo.Size(m)
}
func (m *DposCycleBoundaryInfo) XXX_DiscardUnknown() {
xxx_messageInfo_DposCycleBoundaryInfo.DiscardUnknown(m)
}
var xxx_messageInfo_DposCycleBoundaryInfo proto.InternalMessageInfo
func (m *DposCycleBoundaryInfo) GetCycle() int64 {
if m != nil {
......@@ -1789,17 +2326,39 @@ func (m *DposCycleBoundaryInfo) GetSignature() []byte {
// DposCBInfo cycle边界记录请求消息
type DposCBInfo struct {
Cycle int64 `protobuf:"varint,1,opt,name=cycle" json:"cycle,omitempty"`
StopHeight int64 `protobuf:"varint,2,opt,name=stopHeight" json:"stopHeight,omitempty"`
StopHash string `protobuf:"bytes,3,opt,name=stopHash" json:"stopHash,omitempty"`
Pubkey string `protobuf:"bytes,4,opt,name=pubkey" json:"pubkey,omitempty"`
Signature string `protobuf:"bytes,5,opt,name=signature" json:"signature,omitempty"`
Cycle int64 `protobuf:"varint,1,opt,name=cycle,proto3" json:"cycle,omitempty"`
StopHeight int64 `protobuf:"varint,2,opt,name=stopHeight,proto3" json:"stopHeight,omitempty"`
StopHash string `protobuf:"bytes,3,opt,name=stopHash,proto3" json:"stopHash,omitempty"`
Pubkey string `protobuf:"bytes,4,opt,name=pubkey,proto3" json:"pubkey,omitempty"`
Signature string `protobuf:"bytes,5,opt,name=signature,proto3" json:"signature,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *DposCBInfo) Reset() { *m = DposCBInfo{} }
func (m *DposCBInfo) String() string { return proto.CompactTextString(m) }
func (*DposCBInfo) ProtoMessage() {}
func (*DposCBInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{25} }
func (*DposCBInfo) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{25}
}
func (m *DposCBInfo) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_DposCBInfo.Unmarshal(m, b)
}
func (m *DposCBInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_DposCBInfo.Marshal(b, m, deterministic)
}
func (dst *DposCBInfo) XXX_Merge(src proto.Message) {
xxx_messageInfo_DposCBInfo.Merge(dst, src)
}
func (m *DposCBInfo) XXX_Size() int {
return xxx_messageInfo_DposCBInfo.Size(m)
}
func (m *DposCBInfo) XXX_DiscardUnknown() {
xxx_messageInfo_DposCBInfo.DiscardUnknown(m)
}
var xxx_messageInfo_DposCBInfo proto.InternalMessageInfo
func (m *DposCBInfo) GetCycle() int64 {
if m != nil {
......@@ -1838,16 +2397,38 @@ func (m *DposCBInfo) GetSignature() string {
// DposCBQuery cycle边界记录查询请求
type DposCBQuery struct {
Cycle int64 `protobuf:"varint,1,opt,name=cycle" json:"cycle,omitempty"`
StopHeight int64 `protobuf:"varint,2,opt,name=stopHeight" json:"stopHeight,omitempty"`
StopHash string `protobuf:"bytes,3,opt,name=stopHash" json:"stopHash,omitempty"`
Ty int32 `protobuf:"varint,4,opt,name=ty" json:"ty,omitempty"`
Cycle int64 `protobuf:"varint,1,opt,name=cycle,proto3" json:"cycle,omitempty"`
StopHeight int64 `protobuf:"varint,2,opt,name=stopHeight,proto3" json:"stopHeight,omitempty"`
StopHash string `protobuf:"bytes,3,opt,name=stopHash,proto3" json:"stopHash,omitempty"`
Ty int32 `protobuf:"varint,4,opt,name=ty,proto3" json:"ty,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *DposCBQuery) Reset() { *m = DposCBQuery{} }
func (m *DposCBQuery) String() string { return proto.CompactTextString(m) }
func (*DposCBQuery) ProtoMessage() {}
func (*DposCBQuery) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{26} }
func (*DposCBQuery) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{26}
}
func (m *DposCBQuery) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_DposCBQuery.Unmarshal(m, b)
}
func (m *DposCBQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_DposCBQuery.Marshal(b, m, deterministic)
}
func (dst *DposCBQuery) XXX_Merge(src proto.Message) {
xxx_messageInfo_DposCBQuery.Merge(dst, src)
}
func (m *DposCBQuery) XXX_Size() int {
return xxx_messageInfo_DposCBQuery.Size(m)
}
func (m *DposCBQuery) XXX_DiscardUnknown() {
xxx_messageInfo_DposCBQuery.DiscardUnknown(m)
}
var xxx_messageInfo_DposCBQuery proto.InternalMessageInfo
func (m *DposCBQuery) GetCycle() int64 {
if m != nil {
......@@ -1879,13 +2460,35 @@ func (m *DposCBQuery) GetTy() int32 {
// DposCBReply cycle边界记录查询响应
type DposCBReply struct {
CbInfo *DposCBInfo `protobuf:"bytes,1,opt,name=cbInfo" json:"cbInfo,omitempty"`
CbInfo *DposCBInfo `protobuf:"bytes,1,opt,name=cbInfo,proto3" json:"cbInfo,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *DposCBReply) Reset() { *m = DposCBReply{} }
func (m *DposCBReply) String() string { return proto.CompactTextString(m) }
func (*DposCBReply) ProtoMessage() {}
func (*DposCBReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{27} }
func (*DposCBReply) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{27}
}
func (m *DposCBReply) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_DposCBReply.Unmarshal(m, b)
}
func (m *DposCBReply) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_DposCBReply.Marshal(b, m, deterministic)
}
func (dst *DposCBReply) XXX_Merge(src proto.Message) {
xxx_messageInfo_DposCBReply.Merge(dst, src)
}
func (m *DposCBReply) XXX_Size() int {
return xxx_messageInfo_DposCBReply.Size(m)
}
func (m *DposCBReply) XXX_DiscardUnknown() {
xxx_messageInfo_DposCBReply.DiscardUnknown(m)
}
var xxx_messageInfo_DposCBReply proto.InternalMessageInfo
func (m *DposCBReply) GetCbInfo() *DposCBInfo {
if m != nil {
......@@ -1896,22 +2499,44 @@ func (m *DposCBReply) GetCbInfo() *DposCBInfo {
// ReceiptCB CycleBoundary收据信息
type ReceiptCB struct {
Index int64 `protobuf:"varint,1,opt,name=Index" json:"Index,omitempty"`
Index int64 `protobuf:"varint,1,opt,name=Index,proto3" json:"Index,omitempty"`
Pubkey []byte `protobuf:"bytes,2,opt,name=pubkey,proto3" json:"pubkey,omitempty"`
Status int64 `protobuf:"varint,3,opt,name=status" json:"status,omitempty"`
Cycle int64 `protobuf:"varint,4,opt,name=cycle" json:"cycle,omitempty"`
Height int64 `protobuf:"varint,5,opt,name=height" json:"height,omitempty"`
Time int64 `protobuf:"varint,6,opt,name=time" json:"time,omitempty"`
CycleStart int64 `protobuf:"varint,7,opt,name=cycleStart" json:"cycleStart,omitempty"`
CycleMiddle int64 `protobuf:"varint,8,opt,name=cycleMiddle" json:"cycleMiddle,omitempty"`
CycleStop int64 `protobuf:"varint,9,opt,name=cycleStop" json:"cycleStop,omitempty"`
CbInfo *DposCycleBoundaryInfo `protobuf:"bytes,10,opt,name=cbInfo" json:"cbInfo,omitempty"`
Status int64 `protobuf:"varint,3,opt,name=status,proto3" json:"status,omitempty"`
Cycle int64 `protobuf:"varint,4,opt,name=cycle,proto3" json:"cycle,omitempty"`
Height int64 `protobuf:"varint,5,opt,name=height,proto3" json:"height,omitempty"`
Time int64 `protobuf:"varint,6,opt,name=time,proto3" json:"time,omitempty"`
CycleStart int64 `protobuf:"varint,7,opt,name=cycleStart,proto3" json:"cycleStart,omitempty"`
CycleMiddle int64 `protobuf:"varint,8,opt,name=cycleMiddle,proto3" json:"cycleMiddle,omitempty"`
CycleStop int64 `protobuf:"varint,9,opt,name=cycleStop,proto3" json:"cycleStop,omitempty"`
CbInfo *DposCycleBoundaryInfo `protobuf:"bytes,10,opt,name=cbInfo,proto3" json:"cbInfo,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ReceiptCB) Reset() { *m = ReceiptCB{} }
func (m *ReceiptCB) String() string { return proto.CompactTextString(m) }
func (*ReceiptCB) ProtoMessage() {}
func (*ReceiptCB) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{28} }
func (*ReceiptCB) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{28}
}
func (m *ReceiptCB) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReceiptCB.Unmarshal(m, b)
}
func (m *ReceiptCB) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ReceiptCB.Marshal(b, m, deterministic)
}
func (dst *ReceiptCB) XXX_Merge(src proto.Message) {
xxx_messageInfo_ReceiptCB.Merge(dst, src)
}
func (m *ReceiptCB) XXX_Size() int {
return xxx_messageInfo_ReceiptCB.Size(m)
}
func (m *ReceiptCB) XXX_DiscardUnknown() {
xxx_messageInfo_ReceiptCB.DiscardUnknown(m)
}
var xxx_messageInfo_ReceiptCB proto.InternalMessageInfo
func (m *ReceiptCB) GetIndex() int64 {
if m != nil {
......@@ -1985,17 +2610,39 @@ func (m *ReceiptCB) GetCbInfo() *DposCycleBoundaryInfo {
// TopNCandidator topN候选者
type TopNCandidator struct {
Cands []*Candidator `protobuf:"bytes,1,rep,name=cands" json:"cands,omitempty"`
Cands []*Candidator `protobuf:"bytes,1,rep,name=cands,proto3" json:"cands,omitempty"`
Hash []byte `protobuf:"bytes,2,opt,name=hash,proto3" json:"hash,omitempty"`
Height int64 `protobuf:"varint,3,opt,name=height" json:"height,omitempty"`
Height int64 `protobuf:"varint,3,opt,name=height,proto3" json:"height,omitempty"`
SignerPubkey []byte `protobuf:"bytes,4,opt,name=signerPubkey,proto3" json:"signerPubkey,omitempty"`
Signature []byte `protobuf:"bytes,5,opt,name=signature,proto3" json:"signature,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *TopNCandidator) Reset() { *m = TopNCandidator{} }
func (m *TopNCandidator) String() string { return proto.CompactTextString(m) }
func (*TopNCandidator) ProtoMessage() {}
func (*TopNCandidator) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{29} }
func (*TopNCandidator) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{29}
}
func (m *TopNCandidator) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_TopNCandidator.Unmarshal(m, b)
}
func (m *TopNCandidator) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_TopNCandidator.Marshal(b, m, deterministic)
}
func (dst *TopNCandidator) XXX_Merge(src proto.Message) {
xxx_messageInfo_TopNCandidator.Merge(dst, src)
}
func (m *TopNCandidator) XXX_Size() int {
return xxx_messageInfo_TopNCandidator.Size(m)
}
func (m *TopNCandidator) XXX_DiscardUnknown() {
xxx_messageInfo_TopNCandidator.DiscardUnknown(m)
}
var xxx_messageInfo_TopNCandidator proto.InternalMessageInfo
func (m *TopNCandidator) GetCands() []*Candidator {
if m != nil {
......@@ -2034,16 +2681,38 @@ func (m *TopNCandidator) GetSignature() []byte {
// TopNCandidators topN候选者(复数)
type TopNCandidators struct {
CandsVotes []*TopNCandidator `protobuf:"bytes,1,rep,name=candsVotes" json:"candsVotes,omitempty"`
Version int64 `protobuf:"varint,2,opt,name=version" json:"version,omitempty"`
Status int64 `protobuf:"varint,3,opt,name=status" json:"status,omitempty"`
FinalCands []*Candidator `protobuf:"bytes,4,rep,name=finalCands" json:"finalCands,omitempty"`
CandsVotes []*TopNCandidator `protobuf:"bytes,1,rep,name=candsVotes,proto3" json:"candsVotes,omitempty"`
Version int64 `protobuf:"varint,2,opt,name=version,proto3" json:"version,omitempty"`
Status int64 `protobuf:"varint,3,opt,name=status,proto3" json:"status,omitempty"`
FinalCands []*Candidator `protobuf:"bytes,4,rep,name=finalCands,proto3" json:"finalCands,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *TopNCandidators) Reset() { *m = TopNCandidators{} }
func (m *TopNCandidators) String() string { return proto.CompactTextString(m) }
func (*TopNCandidators) ProtoMessage() {}
func (*TopNCandidators) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{30} }
func (*TopNCandidators) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{30}
}
func (m *TopNCandidators) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_TopNCandidators.Unmarshal(m, b)
}
func (m *TopNCandidators) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_TopNCandidators.Marshal(b, m, deterministic)
}
func (dst *TopNCandidators) XXX_Merge(src proto.Message) {
xxx_messageInfo_TopNCandidators.Merge(dst, src)
}
func (m *TopNCandidators) XXX_Size() int {
return xxx_messageInfo_TopNCandidators.Size(m)
}
func (m *TopNCandidators) XXX_DiscardUnknown() {
xxx_messageInfo_TopNCandidators.DiscardUnknown(m)
}
var xxx_messageInfo_TopNCandidators proto.InternalMessageInfo
func (m *TopNCandidators) GetCandsVotes() []*TopNCandidator {
if m != nil {
......@@ -2075,13 +2744,35 @@ func (m *TopNCandidators) GetFinalCands() []*Candidator {
// TopNCandidatorRegist topN候选者注册请求
type TopNCandidatorRegist struct {
Cand *TopNCandidator `protobuf:"bytes,1,opt,name=cand" json:"cand,omitempty"`
Cand *TopNCandidator `protobuf:"bytes,1,opt,name=cand,proto3" json:"cand,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *TopNCandidatorRegist) Reset() { *m = TopNCandidatorRegist{} }
func (m *TopNCandidatorRegist) String() string { return proto.CompactTextString(m) }
func (*TopNCandidatorRegist) ProtoMessage() {}
func (*TopNCandidatorRegist) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{31} }
func (*TopNCandidatorRegist) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{31}
}
func (m *TopNCandidatorRegist) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_TopNCandidatorRegist.Unmarshal(m, b)
}
func (m *TopNCandidatorRegist) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_TopNCandidatorRegist.Marshal(b, m, deterministic)
}
func (dst *TopNCandidatorRegist) XXX_Merge(src proto.Message) {
xxx_messageInfo_TopNCandidatorRegist.Merge(dst, src)
}
func (m *TopNCandidatorRegist) XXX_Size() int {
return xxx_messageInfo_TopNCandidatorRegist.Size(m)
}
func (m *TopNCandidatorRegist) XXX_DiscardUnknown() {
xxx_messageInfo_TopNCandidatorRegist.DiscardUnknown(m)
}
var xxx_messageInfo_TopNCandidatorRegist proto.InternalMessageInfo
func (m *TopNCandidatorRegist) GetCand() *TopNCandidator {
if m != nil {
......@@ -2092,13 +2783,35 @@ func (m *TopNCandidatorRegist) GetCand() *TopNCandidator {
// TopNCandidatorsQuery topN候选者查询请求
type TopNCandidatorsQuery struct {
Version int64 `protobuf:"varint,1,opt,name=version" json:"version,omitempty"`
Version int64 `protobuf:"varint,1,opt,name=version,proto3" json:"version,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *TopNCandidatorsQuery) Reset() { *m = TopNCandidatorsQuery{} }
func (m *TopNCandidatorsQuery) String() string { return proto.CompactTextString(m) }
func (*TopNCandidatorsQuery) ProtoMessage() {}
func (*TopNCandidatorsQuery) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{32} }
func (*TopNCandidatorsQuery) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{32}
}
func (m *TopNCandidatorsQuery) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_TopNCandidatorsQuery.Unmarshal(m, b)
}
func (m *TopNCandidatorsQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_TopNCandidatorsQuery.Marshal(b, m, deterministic)
}
func (dst *TopNCandidatorsQuery) XXX_Merge(src proto.Message) {
xxx_messageInfo_TopNCandidatorsQuery.Merge(dst, src)
}
func (m *TopNCandidatorsQuery) XXX_Size() int {
return xxx_messageInfo_TopNCandidatorsQuery.Size(m)
}
func (m *TopNCandidatorsQuery) XXX_DiscardUnknown() {
xxx_messageInfo_TopNCandidatorsQuery.DiscardUnknown(m)
}
var xxx_messageInfo_TopNCandidatorsQuery proto.InternalMessageInfo
func (m *TopNCandidatorsQuery) GetVersion() int64 {
if m != nil {
......@@ -2109,13 +2822,35 @@ func (m *TopNCandidatorsQuery) GetVersion() int64 {
// TopNCandidatorsReply topN候选者查询响应
type TopNCandidatorsReply struct {
TopN *TopNCandidators `protobuf:"bytes,1,opt,name=topN" json:"topN,omitempty"`
TopN *TopNCandidators `protobuf:"bytes,1,opt,name=topN,proto3" json:"topN,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *TopNCandidatorsReply) Reset() { *m = TopNCandidatorsReply{} }
func (m *TopNCandidatorsReply) String() string { return proto.CompactTextString(m) }
func (*TopNCandidatorsReply) ProtoMessage() {}
func (*TopNCandidatorsReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{33} }
func (*TopNCandidatorsReply) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{33}
}
func (m *TopNCandidatorsReply) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_TopNCandidatorsReply.Unmarshal(m, b)
}
func (m *TopNCandidatorsReply) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_TopNCandidatorsReply.Marshal(b, m, deterministic)
}
func (dst *TopNCandidatorsReply) XXX_Merge(src proto.Message) {
xxx_messageInfo_TopNCandidatorsReply.Merge(dst, src)
}
func (m *TopNCandidatorsReply) XXX_Size() int {
return xxx_messageInfo_TopNCandidatorsReply.Size(m)
}
func (m *TopNCandidatorsReply) XXX_DiscardUnknown() {
xxx_messageInfo_TopNCandidatorsReply.DiscardUnknown(m)
}
var xxx_messageInfo_TopNCandidatorsReply proto.InternalMessageInfo
func (m *TopNCandidatorsReply) GetTopN() *TopNCandidators {
if m != nil {
......@@ -2126,19 +2861,41 @@ func (m *TopNCandidatorsReply) GetTopN() *TopNCandidators {
// ReceiptTopN topN注册的收据信息
type ReceiptTopN struct {
Index int64 `protobuf:"varint,1,opt,name=Index" json:"Index,omitempty"`
Index int64 `protobuf:"varint,1,opt,name=Index,proto3" json:"Index,omitempty"`
Pubkey []byte `protobuf:"bytes,2,opt,name=pubkey,proto3" json:"pubkey,omitempty"`
Status int64 `protobuf:"varint,3,opt,name=status" json:"status,omitempty"`
Version int64 `protobuf:"varint,4,opt,name=version" json:"version,omitempty"`
Height int64 `protobuf:"varint,5,opt,name=height" json:"height,omitempty"`
Time int64 `protobuf:"varint,6,opt,name=time" json:"time,omitempty"`
TopN *TopNCandidator `protobuf:"bytes,10,opt,name=topN" json:"topN,omitempty"`
Status int64 `protobuf:"varint,3,opt,name=status,proto3" json:"status,omitempty"`
Version int64 `protobuf:"varint,4,opt,name=version,proto3" json:"version,omitempty"`
Height int64 `protobuf:"varint,5,opt,name=height,proto3" json:"height,omitempty"`
Time int64 `protobuf:"varint,6,opt,name=time,proto3" json:"time,omitempty"`
TopN *TopNCandidator `protobuf:"bytes,10,opt,name=topN,proto3" json:"topN,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ReceiptTopN) Reset() { *m = ReceiptTopN{} }
func (m *ReceiptTopN) String() string { return proto.CompactTextString(m) }
func (*ReceiptTopN) ProtoMessage() {}
func (*ReceiptTopN) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{34} }
func (*ReceiptTopN) Descriptor() ([]byte, []int) {
return fileDescriptor_dposvote_1126daa6e916fdd0, []int{34}
}
func (m *ReceiptTopN) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReceiptTopN.Unmarshal(m, b)
}
func (m *ReceiptTopN) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ReceiptTopN.Marshal(b, m, deterministic)
}
func (dst *ReceiptTopN) XXX_Merge(src proto.Message) {
xxx_messageInfo_ReceiptTopN.Merge(dst, src)
}
func (m *ReceiptTopN) XXX_Size() int {
return xxx_messageInfo_ReceiptTopN.Size(m)
}
func (m *ReceiptTopN) XXX_DiscardUnknown() {
xxx_messageInfo_ReceiptTopN.DiscardUnknown(m)
}
var xxx_messageInfo_ReceiptTopN proto.InternalMessageInfo
func (m *ReceiptTopN) GetIndex() int64 {
if m != nil {
......@@ -2227,9 +2984,9 @@ func init() {
proto.RegisterType((*ReceiptTopN)(nil), "types.ReceiptTopN")
}
func init() { proto.RegisterFile("dposvote.proto", fileDescriptor0) }
func init() { proto.RegisterFile("dposvote.proto", fileDescriptor_dposvote_1126daa6e916fdd0) }
var fileDescriptor0 = []byte{
var fileDescriptor_dposvote_1126daa6e916fdd0 = []byte{
// 1511 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xdd, 0x6e, 0xdc, 0xc4,
0x17, 0xcf, 0xd8, 0xfb, 0xe5, 0xe3, 0xcd, 0xe6, 0xdf, 0xf9, 0x6f, 0x2b, 0xab, 0x54, 0x68, 0xb1,
......
plugin/dapp/dposvote/types/msg.go
View file @ 5a0b57b3
......@@ -5,6 +5,7 @@ import (
"encoding/hex"
"encoding/json"
"fmt"
"github.com/33cn/chain33/common/crypto"
ttypes "github.com/33cn/plugin/plugin/consensus/dpos/types"
)
......
plugin/dapp/guess/types/guess.pb.go
View file @ 5a0b57b3
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: guess.proto
/*
Package types is a generated protocol buffer package.
It is generated from these files:
guess.proto
It has these top-level messages:
GuessGame
GuessPlayer
GuessBet
GuessBetStat
GuessBetStatItem
GuessGameAction
GuessGameStart
GuessGameBet
GuessGameStopBet
GuessGameAbort
GuessGamePublish
GuessGameQuery
QueryGuessGameInfo
ReplyGuessGameInfo
QueryGuessGameInfos
ReplyGuessGameInfos
ReceiptGuessGame
UserBet
GuessStartTxReq
GuessBetTxReq
GuessStopBetTxReq
GuessAbortTxReq
GuessPublishTxReq
GuessGameRecord
GuessGameRecords
*/
package types
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
import math "math"
import types2 "github.com/33cn/chain33/types"
import (
fmt "fmt"
proto "github.com/golang/protobuf/proto"
math "math"
types "github.com/33cn/chain33/types"
context "golang.org/x/net/context"
grpc "google.golang.org/grpc"
)
......@@ -59,38 +30,60 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
// GuessGame 竞猜游戏详情
type GuessGame struct {
GameID string `protobuf:"bytes,1,opt,name=gameID" json:"gameID,omitempty"`
Status int32 `protobuf:"varint,2,opt,name=status" json:"status,omitempty"`
PreStatus int32 `protobuf:"varint,3,opt,name=preStatus" json:"preStatus,omitempty"`
StartTime int64 `protobuf:"varint,4,opt,name=startTime" json:"startTime,omitempty"`
StartHeight int64 `protobuf:"varint,5,opt,name=startHeight" json:"startHeight,omitempty"`
StartTxHash string `protobuf:"bytes,6,opt,name=startTxHash" json:"startTxHash,omitempty"`
StartIndex int64 `protobuf:"varint,7,opt,name=startIndex" json:"startIndex,omitempty"`
Topic string `protobuf:"bytes,8,opt,name=topic" json:"topic,omitempty"`
Category string `protobuf:"bytes,9,opt,name=category" json:"category,omitempty"`
Options string `protobuf:"bytes,10,opt,name=options" json:"options,omitempty"`
MaxBetHeight int64 `protobuf:"varint,11,opt,name=maxBetHeight" json:"maxBetHeight,omitempty"`
MaxBetsOneTime int64 `protobuf:"varint,12,opt,name=maxBetsOneTime" json:"maxBetsOneTime,omitempty"`
MaxBetsNumber int64 `protobuf:"varint,13,opt,name=maxBetsNumber" json:"maxBetsNumber,omitempty"`
DevFeeFactor int64 `protobuf:"varint,14,opt,name=devFeeFactor" json:"devFeeFactor,omitempty"`
DevFeeAddr string `protobuf:"bytes,15,opt,name=devFeeAddr" json:"devFeeAddr,omitempty"`
PlatFeeFactor int64 `protobuf:"varint,16,opt,name=platFeeFactor" json:"platFeeFactor,omitempty"`
PlatFeeAddr string `protobuf:"bytes,17,opt,name=platFeeAddr" json:"platFeeAddr,omitempty"`
ExpireHeight int64 `protobuf:"varint,18,opt,name=expireHeight" json:"expireHeight,omitempty"`
AdminAddr string `protobuf:"bytes,19,opt,name=adminAddr" json:"adminAddr,omitempty"`
BetsNumber int64 `protobuf:"varint,20,opt,name=betsNumber" json:"betsNumber,omitempty"`
Plays []*GuessPlayer `protobuf:"bytes,21,rep,name=plays" json:"plays,omitempty"`
Result string `protobuf:"bytes,22,opt,name=result" json:"result,omitempty"`
BetStat *GuessBetStat `protobuf:"bytes,23,opt,name=betStat" json:"betStat,omitempty"`
Index int64 `protobuf:"varint,24,opt,name=index" json:"index,omitempty"`
PreIndex int64 `protobuf:"varint,25,opt,name=preIndex" json:"preIndex,omitempty"`
DrivenByAdmin bool `protobuf:"varint,26,opt,name=drivenByAdmin" json:"drivenByAdmin,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"`
StartHeight int64 `protobuf:"varint,5,opt,name=startHeight,proto3" json:"startHeight,omitempty"`
StartTxHash string `protobuf:"bytes,6,opt,name=startTxHash,proto3" json:"startTxHash,omitempty"`
StartIndex int64 `protobuf:"varint,7,opt,name=startIndex,proto3" json:"startIndex,omitempty"`
Topic string `protobuf:"bytes,8,opt,name=topic,proto3" json:"topic,omitempty"`
Category string `protobuf:"bytes,9,opt,name=category,proto3" json:"category,omitempty"`
Options string `protobuf:"bytes,10,opt,name=options,proto3" json:"options,omitempty"`
MaxBetHeight int64 `protobuf:"varint,11,opt,name=maxBetHeight,proto3" json:"maxBetHeight,omitempty"`
MaxBetsOneTime int64 `protobuf:"varint,12,opt,name=maxBetsOneTime,proto3" json:"maxBetsOneTime,omitempty"`
MaxBetsNumber int64 `protobuf:"varint,13,opt,name=maxBetsNumber,proto3" json:"maxBetsNumber,omitempty"`
DevFeeFactor int64 `protobuf:"varint,14,opt,name=devFeeFactor,proto3" json:"devFeeFactor,omitempty"`
DevFeeAddr string `protobuf:"bytes,15,opt,name=devFeeAddr,proto3" json:"devFeeAddr,omitempty"`
PlatFeeFactor int64 `protobuf:"varint,16,opt,name=platFeeFactor,proto3" json:"platFeeFactor,omitempty"`
PlatFeeAddr string `protobuf:"bytes,17,opt,name=platFeeAddr,proto3" json:"platFeeAddr,omitempty"`
ExpireHeight int64 `protobuf:"varint,18,opt,name=expireHeight,proto3" json:"expireHeight,omitempty"`
AdminAddr string `protobuf:"bytes,19,opt,name=adminAddr,proto3" json:"adminAddr,omitempty"`
BetsNumber int64 `protobuf:"varint,20,opt,name=betsNumber,proto3" json:"betsNumber,omitempty"`
Plays []*GuessPlayer `protobuf:"bytes,21,rep,name=plays,proto3" json:"plays,omitempty"`
Result string `protobuf:"bytes,22,opt,name=result,proto3" json:"result,omitempty"`
BetStat *GuessBetStat `protobuf:"bytes,23,opt,name=betStat,proto3" json:"betStat,omitempty"`
Index int64 `protobuf:"varint,24,opt,name=index,proto3" json:"index,omitempty"`
PreIndex int64 `protobuf:"varint,25,opt,name=preIndex,proto3" json:"preIndex,omitempty"`
DrivenByAdmin bool `protobuf:"varint,26,opt,name=drivenByAdmin,proto3" json:"drivenByAdmin,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *GuessGame) Reset() { *m = GuessGame{} }
func (m *GuessGame) String() string { return proto.CompactTextString(m) }
func (*GuessGame) ProtoMessage() {}
func (*GuessGame) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
func (*GuessGame) Descriptor() ([]byte, []int) {
return fileDescriptor_guess_4b019e5c5053844a, []int{0}
}
func (m *GuessGame) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GuessGame.Unmarshal(m, b)
}
func (m *GuessGame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_GuessGame.Marshal(b, m, deterministic)
}
func (dst *GuessGame) XXX_Merge(src proto.Message) {
xxx_messageInfo_GuessGame.Merge(dst, src)
}
func (m *GuessGame) XXX_Size() int {
return xxx_messageInfo_GuessGame.Size(m)
}
func (m *GuessGame) XXX_DiscardUnknown() {
xxx_messageInfo_GuessGame.DiscardUnknown(m)
}
var xxx_messageInfo_GuessGame proto.InternalMessageInfo
func (m *GuessGame) GetGameID() string {
if m != nil {
......@@ -276,14 +269,36 @@ func (m *GuessGame) GetDrivenByAdmin() bool {
// GuessPlayer 竞猜玩家信息
type GuessPlayer struct {
Addr string `protobuf:"bytes,1,opt,name=addr" json:"addr,omitempty"`
Bet *GuessBet `protobuf:"bytes,2,opt,name=bet" json:"bet,omitempty"`
Addr string `protobuf:"bytes,1,opt,name=addr,proto3" json:"addr,omitempty"`
Bet *GuessBet `protobuf:"bytes,2,opt,name=bet,proto3" json:"bet,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *GuessPlayer) Reset() { *m = GuessPlayer{} }
func (m *GuessPlayer) String() string { return proto.CompactTextString(m) }
func (*GuessPlayer) ProtoMessage() {}
func (*GuessPlayer) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
func (*GuessPlayer) Descriptor() ([]byte, []int) {
return fileDescriptor_guess_4b019e5c5053844a, []int{1}
}
func (m *GuessPlayer) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GuessPlayer.Unmarshal(m, b)
}
func (m *GuessPlayer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_GuessPlayer.Marshal(b, m, deterministic)
}
func (dst *GuessPlayer) XXX_Merge(src proto.Message) {
xxx_messageInfo_GuessPlayer.Merge(dst, src)
}
func (m *GuessPlayer) XXX_Size() int {
return xxx_messageInfo_GuessPlayer.Size(m)
}
func (m *GuessPlayer) XXX_DiscardUnknown() {
xxx_messageInfo_GuessPlayer.DiscardUnknown(m)
}
var xxx_messageInfo_GuessPlayer proto.InternalMessageInfo
func (m *GuessPlayer) GetAddr() string {
if m != nil {
......@@ -301,18 +316,40 @@ func (m *GuessPlayer) GetBet() *GuessBet {
// GuessBet 竞猜下注信息
type GuessBet struct {
Option string `protobuf:"bytes,1,opt,name=option" json:"option,omitempty"`
BetsNumber int64 `protobuf:"varint,2,opt,name=betsNumber" json:"betsNumber,omitempty"`
IsWinner bool `protobuf:"varint,3,opt,name=isWinner" json:"isWinner,omitempty"`
Profit int64 `protobuf:"varint,4,opt,name=profit" json:"profit,omitempty"`
Index int64 `protobuf:"varint,5,opt,name=index" json:"index,omitempty"`
PreIndex int64 `protobuf:"varint,6,opt,name=preIndex" json:"preIndex,omitempty"`
Option string `protobuf:"bytes,1,opt,name=option,proto3" json:"option,omitempty"`
BetsNumber int64 `protobuf:"varint,2,opt,name=betsNumber,proto3" json:"betsNumber,omitempty"`
IsWinner bool `protobuf:"varint,3,opt,name=isWinner,proto3" json:"isWinner,omitempty"`
Profit int64 `protobuf:"varint,4,opt,name=profit,proto3" json:"profit,omitempty"`
Index int64 `protobuf:"varint,5,opt,name=index,proto3" json:"index,omitempty"`
PreIndex int64 `protobuf:"varint,6,opt,name=preIndex,proto3" json:"preIndex,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *GuessBet) Reset() { *m = GuessBet{} }
func (m *GuessBet) String() string { return proto.CompactTextString(m) }
func (*GuessBet) ProtoMessage() {}
func (*GuessBet) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
func (*GuessBet) Descriptor() ([]byte, []int) {
return fileDescriptor_guess_4b019e5c5053844a, []int{2}
}
func (m *GuessBet) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GuessBet.Unmarshal(m, b)
}
func (m *GuessBet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_GuessBet.Marshal(b, m, deterministic)
}
func (dst *GuessBet) XXX_Merge(src proto.Message) {
xxx_messageInfo_GuessBet.Merge(dst, src)
}
func (m *GuessBet) XXX_Size() int {
return xxx_messageInfo_GuessBet.Size(m)
}
func (m *GuessBet) XXX_DiscardUnknown() {
xxx_messageInfo_GuessBet.DiscardUnknown(m)
}
var xxx_messageInfo_GuessBet proto.InternalMessageInfo
func (m *GuessBet) GetOption() string {
if m != nil {
......@@ -358,15 +395,37 @@ func (m *GuessBet) GetPreIndex() int64 {
// GuessBetStat 竞猜下注统计信息
type GuessBetStat struct {
TotalBetTimes int64 `protobuf:"varint,1,opt,name=totalBetTimes" json:"totalBetTimes,omitempty"`
TotalBetsNumber int64 `protobuf:"varint,2,opt,name=totalBetsNumber" json:"totalBetsNumber,omitempty"`
Items []*GuessBetStatItem `protobuf:"bytes,3,rep,name=items" json:"items,omitempty"`
TotalBetTimes int64 `protobuf:"varint,1,opt,name=totalBetTimes,proto3" json:"totalBetTimes,omitempty"`
TotalBetsNumber int64 `protobuf:"varint,2,opt,name=totalBetsNumber,proto3" json:"totalBetsNumber,omitempty"`
Items []*GuessBetStatItem `protobuf:"bytes,3,rep,name=items,proto3" json:"items,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *GuessBetStat) Reset() { *m = GuessBetStat{} }
func (m *GuessBetStat) String() string { return proto.CompactTextString(m) }
func (*GuessBetStat) ProtoMessage() {}
func (*GuessBetStat) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
func (*GuessBetStat) Descriptor() ([]byte, []int) {
return fileDescriptor_guess_4b019e5c5053844a, []int{3}
}
func (m *GuessBetStat) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GuessBetStat.Unmarshal(m, b)
}
func (m *GuessBetStat) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_GuessBetStat.Marshal(b, m, deterministic)
}
func (dst *GuessBetStat) XXX_Merge(src proto.Message) {
xxx_messageInfo_GuessBetStat.Merge(dst, src)
}
func (m *GuessBetStat) XXX_Size() int {
return xxx_messageInfo_GuessBetStat.Size(m)
}
func (m *GuessBetStat) XXX_DiscardUnknown() {
xxx_messageInfo_GuessBetStat.DiscardUnknown(m)
}
var xxx_messageInfo_GuessBetStat proto.InternalMessageInfo
func (m *GuessBetStat) GetTotalBetTimes() int64 {
if m != nil {
......@@ -391,15 +450,37 @@ func (m *GuessBetStat) GetItems() []*GuessBetStatItem {
// GuessBetStat 竞猜下注子选项统计信息
type GuessBetStatItem struct {
Option string `protobuf:"bytes,1,opt,name=option" json:"option,omitempty"`
BetsNumber int64 `protobuf:"varint,2,opt,name=betsNumber" json:"betsNumber,omitempty"`
BetsTimes int64 `protobuf:"varint,3,opt,name=betsTimes" json:"betsTimes,omitempty"`
Option string `protobuf:"bytes,1,opt,name=option,proto3" json:"option,omitempty"`
BetsNumber int64 `protobuf:"varint,2,opt,name=betsNumber,proto3" json:"betsNumber,omitempty"`
BetsTimes int64 `protobuf:"varint,3,opt,name=betsTimes,proto3" json:"betsTimes,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *GuessBetStatItem) Reset() { *m = GuessBetStatItem{} }
func (m *GuessBetStatItem) String() string { return proto.CompactTextString(m) }
func (*GuessBetStatItem) ProtoMessage() {}
func (*GuessBetStatItem) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
func (*GuessBetStatItem) Descriptor() ([]byte, []int) {
return fileDescriptor_guess_4b019e5c5053844a, []int{4}
}
func (m *GuessBetStatItem) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GuessBetStatItem.Unmarshal(m, b)
}
func (m *GuessBetStatItem) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_GuessBetStatItem.Marshal(b, m, deterministic)
}
func (dst *GuessBetStatItem) XXX_Merge(src proto.Message) {
xxx_messageInfo_GuessBetStatItem.Merge(dst, src)
}
func (m *GuessBetStatItem) XXX_Size() int {
return xxx_messageInfo_GuessBetStatItem.Size(m)
}
func (m *GuessBetStatItem) XXX_DiscardUnknown() {
xxx_messageInfo_GuessBetStatItem.DiscardUnknown(m)
}
var xxx_messageInfo_GuessBetStatItem proto.InternalMessageInfo
func (m *GuessBetStatItem) GetOption() string {
if m != nil {
......@@ -432,42 +513,74 @@ type GuessGameAction struct {
// *GuessGameAction_Publish
// *GuessGameAction_Query
Value isGuessGameAction_Value `protobuf_oneof:"value"`
Ty int32 `protobuf:"varint,7,opt,name=ty" json:"ty,omitempty"`
Ty int32 `protobuf:"varint,7,opt,name=ty,proto3" json:"ty,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *GuessGameAction) Reset() { *m = GuessGameAction{} }
func (m *GuessGameAction) String() string { return proto.CompactTextString(m) }
func (*GuessGameAction) ProtoMessage() {}
func (*GuessGameAction) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
func (*GuessGameAction) Descriptor() ([]byte, []int) {
return fileDescriptor_guess_4b019e5c5053844a, []int{5}
}
func (m *GuessGameAction) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GuessGameAction.Unmarshal(m, b)
}
func (m *GuessGameAction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_GuessGameAction.Marshal(b, m, deterministic)
}
func (dst *GuessGameAction) XXX_Merge(src proto.Message) {
xxx_messageInfo_GuessGameAction.Merge(dst, src)
}
func (m *GuessGameAction) XXX_Size() int {
return xxx_messageInfo_GuessGameAction.Size(m)
}
func (m *GuessGameAction) XXX_DiscardUnknown() {
xxx_messageInfo_GuessGameAction.DiscardUnknown(m)
}
var xxx_messageInfo_GuessGameAction proto.InternalMessageInfo
type isGuessGameAction_Value interface {
isGuessGameAction_Value()
}
type GuessGameAction_Start struct {
Start *GuessGameStart `protobuf:"bytes,1,opt,name=start,oneof"`
Start *GuessGameStart `protobuf:"bytes,1,opt,name=start,proto3,oneof"`
}
type GuessGameAction_Bet struct {
Bet *GuessGameBet `protobuf:"bytes,2,opt,name=bet,oneof"`
Bet *GuessGameBet `protobuf:"bytes,2,opt,name=bet,proto3,oneof"`
}
type GuessGameAction_StopBet struct {
StopBet *GuessGameStopBet `protobuf:"bytes,3,opt,name=stopBet,oneof"`
StopBet *GuessGameStopBet `protobuf:"bytes,3,opt,name=stopBet,proto3,oneof"`
}
type GuessGameAction_Abort struct {
Abort *GuessGameAbort `protobuf:"bytes,4,opt,name=abort,oneof"`
Abort *GuessGameAbort `protobuf:"bytes,4,opt,name=abort,proto3,oneof"`
}
type GuessGameAction_Publish struct {
Publish *GuessGamePublish `protobuf:"bytes,5,opt,name=publish,oneof"`
Publish *GuessGamePublish `protobuf:"bytes,5,opt,name=publish,proto3,oneof"`
}
type GuessGameAction_Query struct {
Query *GuessGameQuery `protobuf:"bytes,6,opt,name=query,oneof"`
Query *GuessGameQuery `protobuf:"bytes,6,opt,name=query,proto3,oneof"`
}
func (*GuessGameAction_Start) isGuessGameAction_Value() {}
func (*GuessGameAction_Bet) isGuessGameAction_Value() {}
func (*GuessGameAction_StopBet) isGuessGameAction_Value() {}
func (*GuessGameAction_Abort) isGuessGameAction_Value() {}
func (*GuessGameAction_Publish) isGuessGameAction_Value() {}
func (*GuessGameAction_Query) isGuessGameAction_Value() {}
func (m *GuessGameAction) GetValue() isGuessGameAction_Value {
......@@ -641,32 +754,32 @@ func _GuessGameAction_OneofSizer(msg proto.Message) (n int) {
switch x := m.Value.(type) {
case *GuessGameAction_Start:
s := proto.Size(x.Start)
n += proto.SizeVarint(1<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *GuessGameAction_Bet:
s := proto.Size(x.Bet)
n += proto.SizeVarint(2<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *GuessGameAction_StopBet:
s := proto.Size(x.StopBet)
n += proto.SizeVarint(3<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *GuessGameAction_Abort:
s := proto.Size(x.Abort)
n += proto.SizeVarint(4<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *GuessGameAction_Publish:
s := proto.Size(x.Publish)
n += proto.SizeVarint(5<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case *GuessGameAction_Query:
s := proto.Size(x.Query)
n += proto.SizeVarint(6<<3 | proto.WireBytes)
n += 1 // tag and wire
n += proto.SizeVarint(uint64(s))
n += s
case nil:
......@@ -678,24 +791,46 @@ func _GuessGameAction_OneofSizer(msg proto.Message) (n int) {
// GuessGameStart 游戏创建
type GuessGameStart struct {
Topic string `protobuf:"bytes,1,opt,name=topic" json:"topic,omitempty"`
Options string `protobuf:"bytes,2,opt,name=options" json:"options,omitempty"`
Category string `protobuf:"bytes,3,opt,name=category" json:"category,omitempty"`
MaxBetHeight int64 `protobuf:"varint,4,opt,name=maxBetHeight" json:"maxBetHeight,omitempty"`
MaxBetsOneTime int64 `protobuf:"varint,5,opt,name=maxBetsOneTime" json:"maxBetsOneTime,omitempty"`
MaxBetsNumber int64 `protobuf:"varint,6,opt,name=maxBetsNumber" json:"maxBetsNumber,omitempty"`
DevFeeFactor int64 `protobuf:"varint,7,opt,name=devFeeFactor" json:"devFeeFactor,omitempty"`
DevFeeAddr string `protobuf:"bytes,8,opt,name=devFeeAddr" json:"devFeeAddr,omitempty"`
PlatFeeFactor int64 `protobuf:"varint,9,opt,name=platFeeFactor" json:"platFeeFactor,omitempty"`
PlatFeeAddr string `protobuf:"bytes,10,opt,name=platFeeAddr" json:"platFeeAddr,omitempty"`
ExpireHeight int64 `protobuf:"varint,11,opt,name=expireHeight" json:"expireHeight,omitempty"`
DrivenByAdmin bool `protobuf:"varint,12,opt,name=drivenByAdmin" json:"drivenByAdmin,omitempty"`
Topic string `protobuf:"bytes,1,opt,name=topic,proto3" json:"topic,omitempty"`
Options string `protobuf:"bytes,2,opt,name=options,proto3" json:"options,omitempty"`
Category string `protobuf:"bytes,3,opt,name=category,proto3" json:"category,omitempty"`
MaxBetHeight int64 `protobuf:"varint,4,opt,name=maxBetHeight,proto3" json:"maxBetHeight,omitempty"`
MaxBetsOneTime int64 `protobuf:"varint,5,opt,name=maxBetsOneTime,proto3" json:"maxBetsOneTime,omitempty"`
MaxBetsNumber int64 `protobuf:"varint,6,opt,name=maxBetsNumber,proto3" json:"maxBetsNumber,omitempty"`
DevFeeFactor int64 `protobuf:"varint,7,opt,name=devFeeFactor,proto3" json:"devFeeFactor,omitempty"`
DevFeeAddr string `protobuf:"bytes,8,opt,name=devFeeAddr,proto3" json:"devFeeAddr,omitempty"`
PlatFeeFactor int64 `protobuf:"varint,9,opt,name=platFeeFactor,proto3" json:"platFeeFactor,omitempty"`
PlatFeeAddr string `protobuf:"bytes,10,opt,name=platFeeAddr,proto3" json:"platFeeAddr,omitempty"`
ExpireHeight int64 `protobuf:"varint,11,opt,name=expireHeight,proto3" json:"expireHeight,omitempty"`
DrivenByAdmin bool `protobuf:"varint,12,opt,name=drivenByAdmin,proto3" json:"drivenByAdmin,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *GuessGameStart) Reset() { *m = GuessGameStart{} }
func (m *GuessGameStart) String() string { return proto.CompactTextString(m) }
func (*GuessGameStart) ProtoMessage() {}
func (*GuessGameStart) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
func (*GuessGameStart) Descriptor() ([]byte, []int) {
return fileDescriptor_guess_4b019e5c5053844a, []int{6}
}
func (m *GuessGameStart) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GuessGameStart.Unmarshal(m, b)
}
func (m *GuessGameStart) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_GuessGameStart.Marshal(b, m, deterministic)
}
func (dst *GuessGameStart) XXX_Merge(src proto.Message) {
xxx_messageInfo_GuessGameStart.Merge(dst, src)
}
func (m *GuessGameStart) XXX_Size() int {
return xxx_messageInfo_GuessGameStart.Size(m)
}
func (m *GuessGameStart) XXX_DiscardUnknown() {
xxx_messageInfo_GuessGameStart.DiscardUnknown(m)
}
var xxx_messageInfo_GuessGameStart proto.InternalMessageInfo
func (m *GuessGameStart) GetTopic() string {
if m != nil {
......@@ -783,15 +918,37 @@ func (m *GuessGameStart) GetDrivenByAdmin() bool {
// GuessGameBet 参与游戏下注
type GuessGameBet struct {
GameID string `protobuf:"bytes,1,opt,name=gameID" json:"gameID,omitempty"`
Option string `protobuf:"bytes,2,opt,name=option" json:"option,omitempty"`
BetsNum int64 `protobuf:"varint,3,opt,name=betsNum" json:"betsNum,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:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *GuessGameBet) Reset() { *m = GuessGameBet{} }
func (m *GuessGameBet) String() string { return proto.CompactTextString(m) }
func (*GuessGameBet) ProtoMessage() {}
func (*GuessGameBet) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
func (*GuessGameBet) Descriptor() ([]byte, []int) {
return fileDescriptor_guess_4b019e5c5053844a, []int{7}
}
func (m *GuessGameBet) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GuessGameBet.Unmarshal(m, b)
}
func (m *GuessGameBet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_GuessGameBet.Marshal(b, m, deterministic)
}
func (dst *GuessGameBet) XXX_Merge(src proto.Message) {
xxx_messageInfo_GuessGameBet.Merge(dst, src)
}
func (m *GuessGameBet) XXX_Size() int {
return xxx_messageInfo_GuessGameBet.Size(m)
}
func (m *GuessGameBet) XXX_DiscardUnknown() {
xxx_messageInfo_GuessGameBet.DiscardUnknown(m)
}
var xxx_messageInfo_GuessGameBet proto.InternalMessageInfo
func (m *GuessGameBet) GetGameID() string {
if m != nil {
......@@ -816,13 +973,35 @@ func (m *GuessGameBet) GetBetsNum() int64 {
// GuessGameStopBet 游戏停止下注
type GuessGameStopBet struct {
GameID string `protobuf:"bytes,1,opt,name=gameID" 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:"-"`
}
func (m *GuessGameStopBet) Reset() { *m = GuessGameStopBet{} }
func (m *GuessGameStopBet) String() string { return proto.CompactTextString(m) }
func (*GuessGameStopBet) ProtoMessage() {}
func (*GuessGameStopBet) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
func (*GuessGameStopBet) Descriptor() ([]byte, []int) {
return fileDescriptor_guess_4b019e5c5053844a, []int{8}
}
func (m *GuessGameStopBet) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GuessGameStopBet.Unmarshal(m, b)
}
func (m *GuessGameStopBet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_GuessGameStopBet.Marshal(b, m, deterministic)
}
func (dst *GuessGameStopBet) XXX_Merge(src proto.Message) {
xxx_messageInfo_GuessGameStopBet.Merge(dst, src)
}
func (m *GuessGameStopBet) XXX_Size() int {
return xxx_messageInfo_GuessGameStopBet.Size(m)
}
func (m *GuessGameStopBet) XXX_DiscardUnknown() {
xxx_messageInfo_GuessGameStopBet.DiscardUnknown(m)
}
var xxx_messageInfo_GuessGameStopBet proto.InternalMessageInfo
func (m *GuessGameStopBet) GetGameID() string {
if m != nil {
......@@ -833,13 +1012,35 @@ func (m *GuessGameStopBet) GetGameID() string {
// GuessGameAbort 游戏异常终止,退还下注
type GuessGameAbort struct {
GameID string `protobuf:"bytes,1,opt,name=gameID" 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:"-"`
}
func (m *GuessGameAbort) Reset() { *m = GuessGameAbort{} }
func (m *GuessGameAbort) String() string { return proto.CompactTextString(m) }
func (*GuessGameAbort) ProtoMessage() {}
func (*GuessGameAbort) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
func (*GuessGameAbort) Descriptor() ([]byte, []int) {
return fileDescriptor_guess_4b019e5c5053844a, []int{9}
}
func (m *GuessGameAbort) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GuessGameAbort.Unmarshal(m, b)
}
func (m *GuessGameAbort) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_GuessGameAbort.Marshal(b, m, deterministic)
}
func (dst *GuessGameAbort) XXX_Merge(src proto.Message) {
xxx_messageInfo_GuessGameAbort.Merge(dst, src)
}
func (m *GuessGameAbort) XXX_Size() int {
return xxx_messageInfo_GuessGameAbort.Size(m)
}
func (m *GuessGameAbort) XXX_DiscardUnknown() {
xxx_messageInfo_GuessGameAbort.DiscardUnknown(m)
}
var xxx_messageInfo_GuessGameAbort proto.InternalMessageInfo
func (m *GuessGameAbort) GetGameID() string {
if m != nil {
......@@ -850,14 +1051,36 @@ func (m *GuessGameAbort) GetGameID() string {
// GuessGamePublish 游戏结果揭晓
type GuessGamePublish struct {
GameID string `protobuf:"bytes,1,opt,name=gameID" json:"gameID,omitempty"`
Result string `protobuf:"bytes,2,opt,name=result" json:"result,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:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *GuessGamePublish) Reset() { *m = GuessGamePublish{} }
func (m *GuessGamePublish) String() string { return proto.CompactTextString(m) }
func (*GuessGamePublish) ProtoMessage() {}
func (*GuessGamePublish) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
func (*GuessGamePublish) Descriptor() ([]byte, []int) {
return fileDescriptor_guess_4b019e5c5053844a, []int{10}
}
func (m *GuessGamePublish) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GuessGamePublish.Unmarshal(m, b)
}
func (m *GuessGamePublish) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_GuessGamePublish.Marshal(b, m, deterministic)
}
func (dst *GuessGamePublish) XXX_Merge(src proto.Message) {
xxx_messageInfo_GuessGamePublish.Merge(dst, src)
}
func (m *GuessGamePublish) XXX_Size() int {
return xxx_messageInfo_GuessGamePublish.Size(m)
}
func (m *GuessGamePublish) XXX_DiscardUnknown() {
xxx_messageInfo_GuessGamePublish.DiscardUnknown(m)
}
var xxx_messageInfo_GuessGamePublish proto.InternalMessageInfo
func (m *GuessGamePublish) GetGameID() string {
if m != nil {
......@@ -875,14 +1098,36 @@ func (m *GuessGamePublish) GetResult() string {
// GuessGameQuery 查询游戏结果
type GuessGameQuery struct {
GameID string `protobuf:"bytes,1,opt,name=gameID" json:"gameID,omitempty"`
Ty uint32 `protobuf:"varint,2,opt,name=ty" json:"ty,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:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *GuessGameQuery) Reset() { *m = GuessGameQuery{} }
func (m *GuessGameQuery) String() string { return proto.CompactTextString(m) }
func (*GuessGameQuery) ProtoMessage() {}
func (*GuessGameQuery) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
func (*GuessGameQuery) Descriptor() ([]byte, []int) {
return fileDescriptor_guess_4b019e5c5053844a, []int{11}
}
func (m *GuessGameQuery) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GuessGameQuery.Unmarshal(m, b)
}
func (m *GuessGameQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_GuessGameQuery.Marshal(b, m, deterministic)
}
func (dst *GuessGameQuery) XXX_Merge(src proto.Message) {
xxx_messageInfo_GuessGameQuery.Merge(dst, src)
}
func (m *GuessGameQuery) XXX_Size() int {
return xxx_messageInfo_GuessGameQuery.Size(m)
}
func (m *GuessGameQuery) XXX_DiscardUnknown() {
xxx_messageInfo_GuessGameQuery.DiscardUnknown(m)
}
var xxx_messageInfo_GuessGameQuery proto.InternalMessageInfo
func (m *GuessGameQuery) GetGameID() string {
if m != nil {
......@@ -900,19 +1145,41 @@ func (m *GuessGameQuery) GetTy() uint32 {
// QueryGuessGameInfo 游戏信息查询消息
type QueryGuessGameInfo struct {
GameID string `protobuf:"bytes,1,opt,name=gameID" json:"gameID,omitempty"`
Addr string `protobuf:"bytes,2,opt,name=addr" json:"addr,omitempty"`
Status int32 `protobuf:"varint,3,opt,name=status" json:"status,omitempty"`
Index int64 `protobuf:"varint,4,opt,name=index" json:"index,omitempty"`
AdminAddr string `protobuf:"bytes,5,opt,name=adminAddr" json:"adminAddr,omitempty"`
Category string `protobuf:"bytes,6,opt,name=category" json:"category,omitempty"`
PrimaryKey string `protobuf:"bytes,7,opt,name=primaryKey" json:"primaryKey,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"`
AdminAddr string `protobuf:"bytes,5,opt,name=adminAddr,proto3" json:"adminAddr,omitempty"`
Category string `protobuf:"bytes,6,opt,name=category,proto3" json:"category,omitempty"`
PrimaryKey string `protobuf:"bytes,7,opt,name=primaryKey,proto3" json:"primaryKey,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *QueryGuessGameInfo) Reset() { *m = QueryGuessGameInfo{} }
func (m *QueryGuessGameInfo) String() string { return proto.CompactTextString(m) }
func (*QueryGuessGameInfo) ProtoMessage() {}
func (*QueryGuessGameInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
func (*QueryGuessGameInfo) Descriptor() ([]byte, []int) {
return fileDescriptor_guess_4b019e5c5053844a, []int{12}
}
func (m *QueryGuessGameInfo) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_QueryGuessGameInfo.Unmarshal(m, b)
}
func (m *QueryGuessGameInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_QueryGuessGameInfo.Marshal(b, m, deterministic)
}
func (dst *QueryGuessGameInfo) XXX_Merge(src proto.Message) {
xxx_messageInfo_QueryGuessGameInfo.Merge(dst, src)
}
func (m *QueryGuessGameInfo) XXX_Size() int {
return xxx_messageInfo_QueryGuessGameInfo.Size(m)
}
func (m *QueryGuessGameInfo) XXX_DiscardUnknown() {
xxx_messageInfo_QueryGuessGameInfo.DiscardUnknown(m)
}
var xxx_messageInfo_QueryGuessGameInfo proto.InternalMessageInfo
func (m *QueryGuessGameInfo) GetGameID() string {
if m != nil {
......@@ -965,13 +1232,35 @@ func (m *QueryGuessGameInfo) GetPrimaryKey() string {
// ReplyGuessGameInfo 游戏信息查询响应消息
type ReplyGuessGameInfo struct {
Game *GuessGame `protobuf:"bytes,1,opt,name=game" json:"game,omitempty"`
Game *GuessGame `protobuf:"bytes,1,opt,name=game,proto3" json:"game,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ReplyGuessGameInfo) Reset() { *m = ReplyGuessGameInfo{} }
func (m *ReplyGuessGameInfo) String() string { return proto.CompactTextString(m) }
func (*ReplyGuessGameInfo) ProtoMessage() {}
func (*ReplyGuessGameInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
func (*ReplyGuessGameInfo) Descriptor() ([]byte, []int) {
return fileDescriptor_guess_4b019e5c5053844a, []int{13}
}
func (m *ReplyGuessGameInfo) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReplyGuessGameInfo.Unmarshal(m, b)
}
func (m *ReplyGuessGameInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ReplyGuessGameInfo.Marshal(b, m, deterministic)
}
func (dst *ReplyGuessGameInfo) XXX_Merge(src proto.Message) {
xxx_messageInfo_ReplyGuessGameInfo.Merge(dst, src)
}
func (m *ReplyGuessGameInfo) XXX_Size() int {
return xxx_messageInfo_ReplyGuessGameInfo.Size(m)
}
func (m *ReplyGuessGameInfo) XXX_DiscardUnknown() {
xxx_messageInfo_ReplyGuessGameInfo.DiscardUnknown(m)
}
var xxx_messageInfo_ReplyGuessGameInfo proto.InternalMessageInfo
func (m *ReplyGuessGameInfo) GetGame() *GuessGame {
if m != nil {
......@@ -982,13 +1271,35 @@ func (m *ReplyGuessGameInfo) GetGame() *GuessGame {
// QueryGuessGameInfos 游戏信息列表查询消息
type QueryGuessGameInfos struct {
GameIDs []string `protobuf:"bytes,1,rep,name=gameIDs" 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:"-"`
}
func (m *QueryGuessGameInfos) Reset() { *m = QueryGuessGameInfos{} }
func (m *QueryGuessGameInfos) String() string { return proto.CompactTextString(m) }
func (*QueryGuessGameInfos) ProtoMessage() {}
func (*QueryGuessGameInfos) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
func (*QueryGuessGameInfos) Descriptor() ([]byte, []int) {
return fileDescriptor_guess_4b019e5c5053844a, []int{14}
}
func (m *QueryGuessGameInfos) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_QueryGuessGameInfos.Unmarshal(m, b)
}
func (m *QueryGuessGameInfos) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_QueryGuessGameInfos.Marshal(b, m, deterministic)
}
func (dst *QueryGuessGameInfos) XXX_Merge(src proto.Message) {
xxx_messageInfo_QueryGuessGameInfos.Merge(dst, src)
}
func (m *QueryGuessGameInfos) XXX_Size() int {
return xxx_messageInfo_QueryGuessGameInfos.Size(m)
}
func (m *QueryGuessGameInfos) XXX_DiscardUnknown() {
xxx_messageInfo_QueryGuessGameInfos.DiscardUnknown(m)
}
var xxx_messageInfo_QueryGuessGameInfos proto.InternalMessageInfo
func (m *QueryGuessGameInfos) GetGameIDs() []string {
if m != nil {
......@@ -999,13 +1310,35 @@ func (m *QueryGuessGameInfos) GetGameIDs() []string {
// ReplyGuessGameInfos 游戏信息列表查询响应消息
type ReplyGuessGameInfos struct {
Games []*GuessGame `protobuf:"bytes,1,rep,name=games" json:"games,omitempty"`
Games []*GuessGame `protobuf:"bytes,1,rep,name=games,proto3" json:"games,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ReplyGuessGameInfos) Reset() { *m = ReplyGuessGameInfos{} }
func (m *ReplyGuessGameInfos) String() string { return proto.CompactTextString(m) }
func (*ReplyGuessGameInfos) ProtoMessage() {}
func (*ReplyGuessGameInfos) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
func (*ReplyGuessGameInfos) Descriptor() ([]byte, []int) {
return fileDescriptor_guess_4b019e5c5053844a, []int{15}
}
func (m *ReplyGuessGameInfos) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReplyGuessGameInfos.Unmarshal(m, b)
}
func (m *ReplyGuessGameInfos) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ReplyGuessGameInfos.Marshal(b, m, deterministic)
}
func (dst *ReplyGuessGameInfos) XXX_Merge(src proto.Message) {
xxx_messageInfo_ReplyGuessGameInfos.Merge(dst, src)
}
func (m *ReplyGuessGameInfos) XXX_Size() int {
return xxx_messageInfo_ReplyGuessGameInfos.Size(m)
}
func (m *ReplyGuessGameInfos) XXX_DiscardUnknown() {
xxx_messageInfo_ReplyGuessGameInfos.DiscardUnknown(m)
}
var xxx_messageInfo_ReplyGuessGameInfos proto.InternalMessageInfo
func (m *ReplyGuessGameInfos) GetGames() []*GuessGame {
if m != nil {
......@@ -1016,26 +1349,48 @@ func (m *ReplyGuessGameInfos) GetGames() []*GuessGame {
// ReceiptGuessGame 竞猜游戏收据信息
type ReceiptGuessGame struct {
StartIndex int64 `protobuf:"varint,1,opt,name=startIndex" json:"startIndex,omitempty"`
GameID string `protobuf:"bytes,2,opt,name=gameID" json:"gameID,omitempty"`
PreStatus int32 `protobuf:"varint,3,opt,name=preStatus" json:"preStatus,omitempty"`
Status int32 `protobuf:"varint,4,opt,name=status" json:"status,omitempty"`
Addr string `protobuf:"bytes,5,opt,name=addr" json:"addr,omitempty"`
AdminAddr string `protobuf:"bytes,6,opt,name=adminAddr" json:"adminAddr,omitempty"`
PreIndex int64 `protobuf:"varint,7,opt,name=preIndex" json:"preIndex,omitempty"`
Index int64 `protobuf:"varint,8,opt,name=index" json:"index,omitempty"`
Category string `protobuf:"bytes,9,opt,name=category" json:"category,omitempty"`
StatusChange bool `protobuf:"varint,10,opt,name=statusChange" json:"statusChange,omitempty"`
Bet bool `protobuf:"varint,11,opt,name=bet" json:"bet,omitempty"`
Option string `protobuf:"bytes,12,opt,name=option" json:"option,omitempty"`
BetsNumber int64 `protobuf:"varint,13,opt,name=betsNumber" json:"betsNumber,omitempty"`
Game *GuessGame `protobuf:"bytes,14,opt,name=game" json:"game,omitempty"`
StartIndex int64 `protobuf:"varint,1,opt,name=startIndex,proto3" json:"startIndex,omitempty"`
GameID string `protobuf:"bytes,2,opt,name=gameID,proto3" json:"gameID,omitempty"`
PreStatus int32 `protobuf:"varint,3,opt,name=preStatus,proto3" json:"preStatus,omitempty"`
Status int32 `protobuf:"varint,4,opt,name=status,proto3" json:"status,omitempty"`
Addr string `protobuf:"bytes,5,opt,name=addr,proto3" json:"addr,omitempty"`
AdminAddr string `protobuf:"bytes,6,opt,name=adminAddr,proto3" json:"adminAddr,omitempty"`
PreIndex int64 `protobuf:"varint,7,opt,name=preIndex,proto3" json:"preIndex,omitempty"`
Index int64 `protobuf:"varint,8,opt,name=index,proto3" json:"index,omitempty"`
Category string `protobuf:"bytes,9,opt,name=category,proto3" json:"category,omitempty"`
StatusChange bool `protobuf:"varint,10,opt,name=statusChange,proto3" json:"statusChange,omitempty"`
Bet bool `protobuf:"varint,11,opt,name=bet,proto3" json:"bet,omitempty"`
Option string `protobuf:"bytes,12,opt,name=option,proto3" json:"option,omitempty"`
BetsNumber int64 `protobuf:"varint,13,opt,name=betsNumber,proto3" json:"betsNumber,omitempty"`
Game *GuessGame `protobuf:"bytes,14,opt,name=game,proto3" json:"game,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ReceiptGuessGame) Reset() { *m = ReceiptGuessGame{} }
func (m *ReceiptGuessGame) String() string { return proto.CompactTextString(m) }
func (*ReceiptGuessGame) ProtoMessage() {}
func (*ReceiptGuessGame) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
func (*ReceiptGuessGame) Descriptor() ([]byte, []int) {
return fileDescriptor_guess_4b019e5c5053844a, []int{16}
}
func (m *ReceiptGuessGame) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReceiptGuessGame.Unmarshal(m, b)
}
func (m *ReceiptGuessGame) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ReceiptGuessGame.Marshal(b, m, deterministic)
}
func (dst *ReceiptGuessGame) XXX_Merge(src proto.Message) {
xxx_messageInfo_ReceiptGuessGame.Merge(dst, src)
}
func (m *ReceiptGuessGame) XXX_Size() int {
return xxx_messageInfo_ReceiptGuessGame.Size(m)
}
func (m *ReceiptGuessGame) XXX_DiscardUnknown() {
xxx_messageInfo_ReceiptGuessGame.DiscardUnknown(m)
}
var xxx_messageInfo_ReceiptGuessGame proto.InternalMessageInfo
func (m *ReceiptGuessGame) GetStartIndex() int64 {
if m != nil {
......@@ -1137,18 +1492,40 @@ func (m *ReceiptGuessGame) GetGame() *GuessGame {
// UserBet 用户下注信息
type UserBet struct {
StartIndex int64 `protobuf:"varint,1,opt,name=startIndex" json:"startIndex,omitempty"`
Index int64 `protobuf:"varint,2,opt,name=index" json:"index,omitempty"`
GameID string `protobuf:"bytes,3,opt,name=gameID" json:"gameID,omitempty"`
Addr string `protobuf:"bytes,4,opt,name=addr" json:"addr,omitempty"`
Option string `protobuf:"bytes,5,opt,name=option" json:"option,omitempty"`
BetsNumber int64 `protobuf:"varint,6,opt,name=betsNumber" json:"betsNumber,omitempty"`
StartIndex int64 `protobuf:"varint,1,opt,name=startIndex,proto3" json:"startIndex,omitempty"`
Index int64 `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty"`
GameID string `protobuf:"bytes,3,opt,name=gameID,proto3" json:"gameID,omitempty"`
Addr string `protobuf:"bytes,4,opt,name=addr,proto3" json:"addr,omitempty"`
Option string `protobuf:"bytes,5,opt,name=option,proto3" json:"option,omitempty"`
BetsNumber int64 `protobuf:"varint,6,opt,name=betsNumber,proto3" json:"betsNumber,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *UserBet) Reset() { *m = UserBet{} }
func (m *UserBet) String() string { return proto.CompactTextString(m) }
func (*UserBet) ProtoMessage() {}
func (*UserBet) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
func (*UserBet) Descriptor() ([]byte, []int) {
return fileDescriptor_guess_4b019e5c5053844a, []int{17}
}
func (m *UserBet) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_UserBet.Unmarshal(m, b)
}
func (m *UserBet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_UserBet.Marshal(b, m, deterministic)
}
func (dst *UserBet) XXX_Merge(src proto.Message) {
xxx_messageInfo_UserBet.Merge(dst, src)
}
func (m *UserBet) XXX_Size() int {
return xxx_messageInfo_UserBet.Size(m)
}
func (m *UserBet) XXX_DiscardUnknown() {
xxx_messageInfo_UserBet.DiscardUnknown(m)
}
var xxx_messageInfo_UserBet proto.InternalMessageInfo
func (m *UserBet) GetStartIndex() int64 {
if m != nil {
......@@ -1194,25 +1571,47 @@ func (m *UserBet) GetBetsNumber() int64 {
// GuessStartTxReq 构造start交易的请求
type GuessStartTxReq struct {
Topic string `protobuf:"bytes,1,opt,name=topic" json:"topic,omitempty"`
Options string `protobuf:"bytes,2,opt,name=options" json:"options,omitempty"`
Category string `protobuf:"bytes,3,opt,name=category" json:"category,omitempty"`
MaxHeight int64 `protobuf:"varint,4,opt,name=maxHeight" json:"maxHeight,omitempty"`
MaxBetHeight int64 `protobuf:"varint,5,opt,name=maxBetHeight" json:"maxBetHeight,omitempty"`
MaxBetsOneTime int64 `protobuf:"varint,6,opt,name=maxBetsOneTime" json:"maxBetsOneTime,omitempty"`
MaxBetsNumber int64 `protobuf:"varint,7,opt,name=maxBetsNumber" json:"maxBetsNumber,omitempty"`
DevFeeFactor int64 `protobuf:"varint,8,opt,name=devFeeFactor" json:"devFeeFactor,omitempty"`
DevFeeAddr string `protobuf:"bytes,9,opt,name=devFeeAddr" json:"devFeeAddr,omitempty"`
PlatFeeFactor int64 `protobuf:"varint,10,opt,name=platFeeFactor" json:"platFeeFactor,omitempty"`
PlatFeeAddr string `protobuf:"bytes,11,opt,name=platFeeAddr" json:"platFeeAddr,omitempty"`
ExpireHeight int64 `protobuf:"varint,12,opt,name=expireHeight" json:"expireHeight,omitempty"`
Fee int64 `protobuf:"varint,13,opt,name=fee" json:"fee,omitempty"`
Topic string `protobuf:"bytes,1,opt,name=topic,proto3" json:"topic,omitempty"`
Options string `protobuf:"bytes,2,opt,name=options,proto3" json:"options,omitempty"`
Category string `protobuf:"bytes,3,opt,name=category,proto3" json:"category,omitempty"`
MaxHeight int64 `protobuf:"varint,4,opt,name=maxHeight,proto3" json:"maxHeight,omitempty"`
MaxBetHeight int64 `protobuf:"varint,5,opt,name=maxBetHeight,proto3" json:"maxBetHeight,omitempty"`
MaxBetsOneTime int64 `protobuf:"varint,6,opt,name=maxBetsOneTime,proto3" json:"maxBetsOneTime,omitempty"`
MaxBetsNumber int64 `protobuf:"varint,7,opt,name=maxBetsNumber,proto3" json:"maxBetsNumber,omitempty"`
DevFeeFactor int64 `protobuf:"varint,8,opt,name=devFeeFactor,proto3" json:"devFeeFactor,omitempty"`
DevFeeAddr string `protobuf:"bytes,9,opt,name=devFeeAddr,proto3" json:"devFeeAddr,omitempty"`
PlatFeeFactor int64 `protobuf:"varint,10,opt,name=platFeeFactor,proto3" json:"platFeeFactor,omitempty"`
PlatFeeAddr string `protobuf:"bytes,11,opt,name=platFeeAddr,proto3" json:"platFeeAddr,omitempty"`
ExpireHeight int64 `protobuf:"varint,12,opt,name=expireHeight,proto3" json:"expireHeight,omitempty"`
Fee int64 `protobuf:"varint,13,opt,name=fee,proto3" json:"fee,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *GuessStartTxReq) Reset() { *m = GuessStartTxReq{} }
func (m *GuessStartTxReq) String() string { return proto.CompactTextString(m) }
func (*GuessStartTxReq) ProtoMessage() {}
func (*GuessStartTxReq) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
func (*GuessStartTxReq) Descriptor() ([]byte, []int) {
return fileDescriptor_guess_4b019e5c5053844a, []int{18}
}
func (m *GuessStartTxReq) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GuessStartTxReq.Unmarshal(m, b)
}
func (m *GuessStartTxReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_GuessStartTxReq.Marshal(b, m, deterministic)
}
func (dst *GuessStartTxReq) XXX_Merge(src proto.Message) {
xxx_messageInfo_GuessStartTxReq.Merge(dst, src)
}
func (m *GuessStartTxReq) XXX_Size() int {
return xxx_messageInfo_GuessStartTxReq.Size(m)
}
func (m *GuessStartTxReq) XXX_DiscardUnknown() {
xxx_messageInfo_GuessStartTxReq.DiscardUnknown(m)
}
var xxx_messageInfo_GuessStartTxReq proto.InternalMessageInfo
func (m *GuessStartTxReq) GetTopic() string {
if m != nil {
......@@ -1307,16 +1706,38 @@ func (m *GuessStartTxReq) GetFee() int64 {
// GuessBetTxReq 构造bet交易的请求
type GuessBetTxReq struct {
GameID string `protobuf:"bytes,1,opt,name=gameID" json:"gameID,omitempty"`
Option string `protobuf:"bytes,2,opt,name=option" json:"option,omitempty"`
Bets int64 `protobuf:"varint,3,opt,name=bets" json:"bets,omitempty"`
Fee int64 `protobuf:"varint,4,opt,name=fee" json:"fee,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"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *GuessBetTxReq) Reset() { *m = GuessBetTxReq{} }
func (m *GuessBetTxReq) String() string { return proto.CompactTextString(m) }
func (*GuessBetTxReq) ProtoMessage() {}
func (*GuessBetTxReq) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} }
func (*GuessBetTxReq) Descriptor() ([]byte, []int) {
return fileDescriptor_guess_4b019e5c5053844a, []int{19}
}
func (m *GuessBetTxReq) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GuessBetTxReq.Unmarshal(m, b)
}
func (m *GuessBetTxReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_GuessBetTxReq.Marshal(b, m, deterministic)
}
func (dst *GuessBetTxReq) XXX_Merge(src proto.Message) {
xxx_messageInfo_GuessBetTxReq.Merge(dst, src)
}
func (m *GuessBetTxReq) XXX_Size() int {
return xxx_messageInfo_GuessBetTxReq.Size(m)
}
func (m *GuessBetTxReq) XXX_DiscardUnknown() {
xxx_messageInfo_GuessBetTxReq.DiscardUnknown(m)
}
var xxx_messageInfo_GuessBetTxReq proto.InternalMessageInfo
func (m *GuessBetTxReq) GetGameID() string {
if m != nil {
......@@ -1348,14 +1769,36 @@ func (m *GuessBetTxReq) GetFee() int64 {
// GuessStopBetTxReq 构造stopBet交易的请求
type GuessStopBetTxReq struct {
GameID string `protobuf:"bytes,1,opt,name=gameID" json:"gameID,omitempty"`
Fee int64 `protobuf:"varint,2,opt,name=fee" json:"fee,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:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *GuessStopBetTxReq) Reset() { *m = GuessStopBetTxReq{} }
func (m *GuessStopBetTxReq) String() string { return proto.CompactTextString(m) }
func (*GuessStopBetTxReq) ProtoMessage() {}
func (*GuessStopBetTxReq) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} }
func (*GuessStopBetTxReq) Descriptor() ([]byte, []int) {
return fileDescriptor_guess_4b019e5c5053844a, []int{20}
}
func (m *GuessStopBetTxReq) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GuessStopBetTxReq.Unmarshal(m, b)
}
func (m *GuessStopBetTxReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_GuessStopBetTxReq.Marshal(b, m, deterministic)
}
func (dst *GuessStopBetTxReq) XXX_Merge(src proto.Message) {
xxx_messageInfo_GuessStopBetTxReq.Merge(dst, src)
}
func (m *GuessStopBetTxReq) XXX_Size() int {
return xxx_messageInfo_GuessStopBetTxReq.Size(m)
}
func (m *GuessStopBetTxReq) XXX_DiscardUnknown() {
xxx_messageInfo_GuessStopBetTxReq.DiscardUnknown(m)
}
var xxx_messageInfo_GuessStopBetTxReq proto.InternalMessageInfo
func (m *GuessStopBetTxReq) GetGameID() string {
if m != nil {
......@@ -1373,14 +1816,36 @@ func (m *GuessStopBetTxReq) GetFee() int64 {
// GuessAbortTxReq 构造abort交易的请求
type GuessAbortTxReq struct {
GameID string `protobuf:"bytes,1,opt,name=gameID" json:"gameID,omitempty"`
Fee int64 `protobuf:"varint,2,opt,name=fee" json:"fee,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:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *GuessAbortTxReq) Reset() { *m = GuessAbortTxReq{} }
func (m *GuessAbortTxReq) String() string { return proto.CompactTextString(m) }
func (*GuessAbortTxReq) ProtoMessage() {}
func (*GuessAbortTxReq) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{21} }
func (*GuessAbortTxReq) Descriptor() ([]byte, []int) {
return fileDescriptor_guess_4b019e5c5053844a, []int{21}
}
func (m *GuessAbortTxReq) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GuessAbortTxReq.Unmarshal(m, b)
}
func (m *GuessAbortTxReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_GuessAbortTxReq.Marshal(b, m, deterministic)
}
func (dst *GuessAbortTxReq) XXX_Merge(src proto.Message) {
xxx_messageInfo_GuessAbortTxReq.Merge(dst, src)
}
func (m *GuessAbortTxReq) XXX_Size() int {
return xxx_messageInfo_GuessAbortTxReq.Size(m)
}
func (m *GuessAbortTxReq) XXX_DiscardUnknown() {
xxx_messageInfo_GuessAbortTxReq.DiscardUnknown(m)
}
var xxx_messageInfo_GuessAbortTxReq proto.InternalMessageInfo
func (m *GuessAbortTxReq) GetGameID() string {
if m != nil {
......@@ -1398,15 +1863,37 @@ func (m *GuessAbortTxReq) GetFee() int64 {
// GuessPublishTxReq 构造publish交易的请求
type GuessPublishTxReq struct {
GameID string `protobuf:"bytes,1,opt,name=gameID" json:"gameID,omitempty"`
Result string `protobuf:"bytes,2,opt,name=result" json:"result,omitempty"`
Fee int64 `protobuf:"varint,3,opt,name=fee" json:"fee,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:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *GuessPublishTxReq) Reset() { *m = GuessPublishTxReq{} }
func (m *GuessPublishTxReq) String() string { return proto.CompactTextString(m) }
func (*GuessPublishTxReq) ProtoMessage() {}
func (*GuessPublishTxReq) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{22} }
func (*GuessPublishTxReq) Descriptor() ([]byte, []int) {
return fileDescriptor_guess_4b019e5c5053844a, []int{22}
}
func (m *GuessPublishTxReq) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GuessPublishTxReq.Unmarshal(m, b)
}
func (m *GuessPublishTxReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_GuessPublishTxReq.Marshal(b, m, deterministic)
}
func (dst *GuessPublishTxReq) XXX_Merge(src proto.Message) {
xxx_messageInfo_GuessPublishTxReq.Merge(dst, src)
}
func (m *GuessPublishTxReq) XXX_Size() int {
return xxx_messageInfo_GuessPublishTxReq.Size(m)
}
func (m *GuessPublishTxReq) XXX_DiscardUnknown() {
xxx_messageInfo_GuessPublishTxReq.DiscardUnknown(m)
}
var xxx_messageInfo_GuessPublishTxReq proto.InternalMessageInfo
func (m *GuessPublishTxReq) GetGameID() string {
if m != nil {
......@@ -1431,14 +1918,36 @@ func (m *GuessPublishTxReq) GetFee() int64 {
// GuessGameRecord game信息查询记录
type GuessGameRecord struct {
GameID string `protobuf:"bytes,1,opt,name=gameID" json:"gameID,omitempty"`
StartIndex int64 `protobuf:"varint,2,opt,name=startIndex" json:"startIndex,omitempty"`
GameID string `protobuf:"bytes,1,opt,name=gameID,proto3" json:"gameID,omitempty"`
StartIndex int64 `protobuf:"varint,2,opt,name=startIndex,proto3" json:"startIndex,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *GuessGameRecord) Reset() { *m = GuessGameRecord{} }
func (m *GuessGameRecord) String() string { return proto.CompactTextString(m) }
func (*GuessGameRecord) ProtoMessage() {}
func (*GuessGameRecord) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{23} }
func (*GuessGameRecord) Descriptor() ([]byte, []int) {
return fileDescriptor_guess_4b019e5c5053844a, []int{23}
}
func (m *GuessGameRecord) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GuessGameRecord.Unmarshal(m, b)
}
func (m *GuessGameRecord) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_GuessGameRecord.Marshal(b, m, deterministic)
}
func (dst *GuessGameRecord) XXX_Merge(src proto.Message) {
xxx_messageInfo_GuessGameRecord.Merge(dst, src)
}
func (m *GuessGameRecord) XXX_Size() int {
return xxx_messageInfo_GuessGameRecord.Size(m)
}
func (m *GuessGameRecord) XXX_DiscardUnknown() {
xxx_messageInfo_GuessGameRecord.DiscardUnknown(m)
}
var xxx_messageInfo_GuessGameRecord proto.InternalMessageInfo
func (m *GuessGameRecord) GetGameID() string {
if m != nil {
......@@ -1456,14 +1965,36 @@ func (m *GuessGameRecord) GetStartIndex() int64 {
// GuessGameRecords game信息查询记录集
type GuessGameRecords struct {
Records []*GuessGameRecord `protobuf:"bytes,1,rep,name=records" json:"records,omitempty"`
PrimaryKey string `protobuf:"bytes,2,opt,name=primaryKey" json:"primaryKey,omitempty"`
Records []*GuessGameRecord `protobuf:"bytes,1,rep,name=records,proto3" json:"records,omitempty"`
PrimaryKey string `protobuf:"bytes,2,opt,name=primaryKey,proto3" json:"primaryKey,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *GuessGameRecords) Reset() { *m = GuessGameRecords{} }
func (m *GuessGameRecords) String() string { return proto.CompactTextString(m) }
func (*GuessGameRecords) ProtoMessage() {}
func (*GuessGameRecords) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{24} }
func (*GuessGameRecords) Descriptor() ([]byte, []int) {
return fileDescriptor_guess_4b019e5c5053844a, []int{24}
}
func (m *GuessGameRecords) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GuessGameRecords.Unmarshal(m, b)
}
func (m *GuessGameRecords) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_GuessGameRecords.Marshal(b, m, deterministic)
}
func (dst *GuessGameRecords) XXX_Merge(src proto.Message) {
xxx_messageInfo_GuessGameRecords.Merge(dst, src)
}
func (m *GuessGameRecords) XXX_Size() int {
return xxx_messageInfo_GuessGameRecords.Size(m)
}
func (m *GuessGameRecords) XXX_DiscardUnknown() {
xxx_messageInfo_GuessGameRecords.DiscardUnknown(m)
}
var xxx_messageInfo_GuessGameRecords proto.InternalMessageInfo
func (m *GuessGameRecords) GetRecords() []*GuessGameRecord {
if m != nil {
......@@ -1515,19 +2046,20 @@ var _ grpc.ClientConn
// is compatible with the grpc package it is being compiled against.
const _ = grpc.SupportPackageIsVersion4
// Client API for Guess service
// GuessClient is the client API for Guess service.
//
// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
type GuessClient interface {
// 游戏开始
GuessStart(ctx context.Context, in *GuessGameStart, opts ...grpc.CallOption) (*types2.UnsignTx, error)
GuessStart(ctx context.Context, in *GuessGameStart, opts ...grpc.CallOption) (*types.UnsignTx, error)
// 游戏下注
GuessBet(ctx context.Context, in *GuessGameBet, opts ...grpc.CallOption) (*types2.UnsignTx, error)
GuessBet(ctx context.Context, in *GuessGameBet, opts ...grpc.CallOption) (*types.UnsignTx, error)
// 游戏终止下注
GuessStopBet(ctx context.Context, in *GuessGameStopBet, opts ...grpc.CallOption) (*types2.UnsignTx, error)
GuessStopBet(ctx context.Context, in *GuessGameStopBet, opts ...grpc.CallOption) (*types.UnsignTx, error)
// 游戏异常终止
GuessAbort(ctx context.Context, in *GuessGameAbort, opts ...grpc.CallOption) (*types2.UnsignTx, error)
GuessAbort(ctx context.Context, in *GuessGameAbort, opts ...grpc.CallOption) (*types.UnsignTx, error)
// 游戏结束
GuessPublish(ctx context.Context, in *GuessGamePublish, opts ...grpc.CallOption) (*types2.UnsignTx, error)
GuessPublish(ctx context.Context, in *GuessGamePublish, opts ...grpc.CallOption) (*types.UnsignTx, error)
}
type guessClient struct {
......@@ -1538,64 +2070,63 @@ func NewGuessClient(cc *grpc.ClientConn) GuessClient {
return &guessClient{cc}
}
func (c *guessClient) GuessStart(ctx context.Context, in *GuessGameStart, opts ...grpc.CallOption) (*types2.UnsignTx, error) {
out := new(types2.UnsignTx)
err := grpc.Invoke(ctx, "/types.guess/GuessStart", in, out, c.cc, opts...)
func (c *guessClient) GuessStart(ctx context.Context, in *GuessGameStart, opts ...grpc.CallOption) (*types.UnsignTx, error) {
out := new(types.UnsignTx)
err := c.cc.Invoke(ctx, "/types.guess/GuessStart", in, out, opts...)
if err != nil {
return nil, err
}
return out, nil
}
func (c *guessClient) GuessBet(ctx context.Context, in *GuessGameBet, opts ...grpc.CallOption) (*types2.UnsignTx, error) {
out := new(types2.UnsignTx)
err := grpc.Invoke(ctx, "/types.guess/GuessBet", in, out, c.cc, opts...)
func (c *guessClient) GuessBet(ctx context.Context, in *GuessGameBet, opts ...grpc.CallOption) (*types.UnsignTx, error) {
out := new(types.UnsignTx)
err := c.cc.Invoke(ctx, "/types.guess/GuessBet", in, out, opts...)
if err != nil {
return nil, err
}
return out, nil
}
func (c *guessClient) GuessStopBet(ctx context.Context, in *GuessGameStopBet, opts ...grpc.CallOption) (*types2.UnsignTx, error) {
out := new(types2.UnsignTx)
err := grpc.Invoke(ctx, "/types.guess/GuessStopBet", in, out, c.cc, opts...)
func (c *guessClient) GuessStopBet(ctx context.Context, in *GuessGameStopBet, opts ...grpc.CallOption) (*types.UnsignTx, error) {
out := new(types.UnsignTx)
err := c.cc.Invoke(ctx, "/types.guess/GuessStopBet", in, out, opts...)
if err != nil {
return nil, err
}
return out, nil
}
func (c *guessClient) GuessAbort(ctx context.Context, in *GuessGameAbort, opts ...grpc.CallOption) (*types2.UnsignTx, error) {
out := new(types2.UnsignTx)
err := grpc.Invoke(ctx, "/types.guess/GuessAbort", in, out, c.cc, opts...)
func (c *guessClient) GuessAbort(ctx context.Context, in *GuessGameAbort, opts ...grpc.CallOption) (*types.UnsignTx, error) {
out := new(types.UnsignTx)
err := c.cc.Invoke(ctx, "/types.guess/GuessAbort", in, out, opts...)
if err != nil {
return nil, err
}
return out, nil
}
func (c *guessClient) GuessPublish(ctx context.Context, in *GuessGamePublish, opts ...grpc.CallOption) (*types2.UnsignTx, error) {
out := new(types2.UnsignTx)
err := grpc.Invoke(ctx, "/types.guess/GuessPublish", in, out, c.cc, opts...)
func (c *guessClient) GuessPublish(ctx context.Context, in *GuessGamePublish, opts ...grpc.CallOption) (*types.UnsignTx, error) {
out := new(types.UnsignTx)
err := c.cc.Invoke(ctx, "/types.guess/GuessPublish", in, out, opts...)
if err != nil {
return nil, err
}
return out, nil
}
// Server API for Guess service
// GuessServer is the server API for Guess service.
type GuessServer interface {
// 游戏开始
GuessStart(context.Context, *GuessGameStart) (*types2.UnsignTx, error)
GuessStart(context.Context, *GuessGameStart) (*types.UnsignTx, error)
// 游戏下注
GuessBet(context.Context, *GuessGameBet) (*types2.UnsignTx, error)
GuessBet(context.Context, *GuessGameBet) (*types.UnsignTx, error)
// 游戏终止下注
GuessStopBet(context.Context, *GuessGameStopBet) (*types2.UnsignTx, error)
GuessStopBet(context.Context, *GuessGameStopBet) (*types.UnsignTx, error)
// 游戏异常终止
GuessAbort(context.Context, *GuessGameAbort) (*types2.UnsignTx, error)
GuessAbort(context.Context, *GuessGameAbort) (*types.UnsignTx, error)
// 游戏结束
GuessPublish(context.Context, *GuessGamePublish) (*types2.UnsignTx, error)
GuessPublish(context.Context, *GuessGamePublish) (*types.UnsignTx, error)
}
func RegisterGuessServer(s *grpc.Server, srv GuessServer) {
......@@ -1721,9 +2252,9 @@ var _Guess_serviceDesc = grpc.ServiceDesc{
Metadata: "guess.proto",
}
func init() { proto.RegisterFile("guess.proto", fileDescriptor0) }
func init() { proto.RegisterFile("guess.proto", fileDescriptor_guess_4b019e5c5053844a) }
var fileDescriptor0 = []byte{
var fileDescriptor_guess_4b019e5c5053844a = []byte{
// 1367 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xc9, 0x8e, 0xdb, 0x46,
0x13, 0x1e, 0x92, 0xa2, 0x96, 0x92, 0x66, 0x46, 0xee, 0xf1, 0xc2, 0x7f, 0x60, 0x18, 0xfa, 0x09,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment