@@ -20,6 +20,7 @@ import (
2020 "github.com/iotexproject/iotex-core/logger"
2121 "github.com/iotexproject/iotex-core/pkg/enc"
2222 "github.com/iotexproject/iotex-core/pkg/hash"
23+ "github.com/iotexproject/iotex-core/pkg/keypair"
2324 "github.com/iotexproject/iotex-core/pkg/version"
2425 "github.com/iotexproject/iotex-core/proto"
2526)
@@ -42,17 +43,27 @@ type Vote struct {
4243}
4344
4445// NewVote returns a Vote instance
45- func NewVote (nonce uint64 , selfPubKey [] byte , votePubKey [] byte ) * Vote {
46+ func NewVote (nonce uint64 , selfPubKey keypair. PublicKey , votePubKey keypair. PublicKey ) * Vote {
4647 pbVote := & iproto.VotePb {
4748 Version : version .ProtocolVersion ,
4849
4950 Nonce : nonce ,
50- SelfPubkey : selfPubKey ,
51- VotePubkey : votePubKey ,
51+ SelfPubkey : selfPubKey [:] ,
52+ VotePubkey : votePubKey [:] ,
5253 }
5354 return & Vote {pbVote }
5455}
5556
57+ // SelfPublicKey returns the self public key of the vote
58+ func (v * Vote ) SelfPublicKey () (keypair.PublicKey , error ) {
59+ return keypair .BytesToPublicKey (v .SelfPubkey )
60+ }
61+
62+ // VotePublicKey returns the vote public key of the vote
63+ func (v * Vote ) VotePublicKey () (keypair.PublicKey , error ) {
64+ return keypair .BytesToPublicKey (v .VotePubkey )
65+ }
66+
5667// TotalSize returns the total size of this Vote
5768func (v * Vote ) TotalSize () uint32 {
5869 size := TimestampSizeInBytes
@@ -86,16 +97,24 @@ func (v *Vote) ConvertToVotePb() *iproto.VotePb {
8697}
8798
8899// ToJSON converts Vote to VoteJSON
89- func (v * Vote ) ToJSON () * explorer.Vote {
100+ func (v * Vote ) ToJSON () ( * explorer.Vote , error ) {
90101 // used by account-based model
102+ voterPubKey , err := keypair .BytesToPubKeyString (v .SelfPubkey )
103+ if err != nil {
104+ return nil , err
105+ }
106+ voteePubKey , err := keypair .BytesToPubKeyString (v .VotePubkey )
107+ if err != nil {
108+ return nil , err
109+ }
91110 vote := & explorer.Vote {
92111 Version : int64 (v .Version ),
93112 Nonce : int64 (v .Nonce ),
94- VoterPubKey : hex . EncodeToString ( v . SelfPubkey ) ,
95- VoteePubKey : hex . EncodeToString ( v . VotePubkey ) ,
113+ VoterPubKey : voterPubKey ,
114+ VoteePubKey : voteePubKey ,
96115 Signature : hex .EncodeToString (v .Signature ),
97116 }
98- return vote
117+ return vote , nil
99118}
100119
101120// Serialize returns a serialized byte stream for the Transfer
@@ -114,13 +133,13 @@ func NewVoteFromJSON(jsonVote *explorer.Vote) (*Vote, error) {
114133 v .Version = uint32 (jsonVote .Version )
115134 // used by account-based model
116135 v .Nonce = uint64 (jsonVote .Nonce )
117- voterPubKey , err := hex . DecodeString (jsonVote .VoterPubKey )
136+ voterPubKey , err := keypair . StringToPubKeyBytes (jsonVote .VoterPubKey )
118137 if err != nil {
119138 logger .Error ().Err (err ).Msg ("Fail to create a new Vote from VoteJSON" )
120139 return nil , err
121140 }
122141 v .SelfPubkey = voterPubKey
123- voteePubKey , err := hex . DecodeString (jsonVote .VoteePubKey )
142+ voteePubKey , err := keypair . StringToPubKeyBytes (jsonVote .VoteePubKey )
124143 if err != nil {
125144 logger .Error ().Err (err ).Msg ("Fail to create a new Vote from VoteJSON" )
126145 return nil , err
@@ -155,7 +174,7 @@ func (v *Vote) Hash() hash.Hash32B {
155174// Sign signs the Vote using sender's private key
156175func (v * Vote ) Sign (sender * iotxaddress.Address ) (* Vote , error ) {
157176 // check the sender is correct
158- if ! bytes .Equal (v .SelfPubkey , sender .PublicKey ) {
177+ if ! bytes .Equal (v .SelfPubkey , sender .PublicKey [:] ) {
159178 return nil , errors .Wrapf (ErrVoteError , "signing pubKey %x does not match with Vote pubKey %x" ,
160179 v .SelfPubkey , sender .PublicKey )
161180 }
0 commit comments