From 0fb2a433153ac10714522eba7e337f7674b15c03 Mon Sep 17 00:00:00 2001 From: Minh Doan Date: Thu, 7 Feb 2019 14:47:36 -0800 Subject: [PATCH] modify staking proto --- api/proto/message/message.pb.go | 72 +++++++++++++-------------------- api/proto/message/message.proto | 6 +-- api/service/staking/service.go | 9 ++--- cmd/harmony.go | 2 +- 4 files changed, 33 insertions(+), 56 deletions(-) diff --git a/api/proto/message/message.pb.go b/api/proto/message/message.pb.go index b9fd75670..5725714d0 100644 --- a/api/proto/message/message.pb.go +++ b/api/proto/message/message.pb.go @@ -63,8 +63,7 @@ func (MessageType) EnumDescriptor() ([]byte, []int) { // // The request field will be either one of the structure corresponding to the MessageType type. type Message struct { - Type MessageType `protobuf:"varint,1,opt,name=type,proto3,enum=message.MessageType" json:"type,omitempty"` - Signature string `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"` + Type MessageType `protobuf:"varint,1,opt,name=type,proto3,enum=message.MessageType" json:"type,omitempty"` // Types that are valid to be assigned to Request: // *Message_Staking Request isMessage_Request `protobuf_oneof:"request"` @@ -105,13 +104,6 @@ func (m *Message) GetType() MessageType { return MessageType_UNKNOWN } -func (m *Message) GetSignature() string { - if m != nil { - return m.Signature - } - return "" -} - type isMessage_Request interface { isMessage_Request() } @@ -209,9 +201,8 @@ var xxx_messageInfo_BootNodeNewNodeRequest proto.InternalMessageInfo // Staking Request from new node to beacon node. type StakingRequest struct { - Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` - Amount int64 `protobuf:"varint,2,opt,name=amount,proto3" json:"amount,omitempty"` - PublicKey string `protobuf:"bytes,4,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"` + Transaction []byte `protobuf:"bytes,1,opt,name=transaction,proto3" json:"transaction,omitempty"` + NodeId string `protobuf:"bytes,2,opt,name=node_id,json=nodeId,proto3" json:"node_id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -242,23 +233,16 @@ func (m *StakingRequest) XXX_DiscardUnknown() { var xxx_messageInfo_StakingRequest proto.InternalMessageInfo -func (m *StakingRequest) GetAddress() string { +func (m *StakingRequest) GetTransaction() []byte { if m != nil { - return m.Address + return m.Transaction } - return "" -} - -func (m *StakingRequest) GetAmount() int64 { - if m != nil { - return m.Amount - } - return 0 + return nil } -func (m *StakingRequest) GetPublicKey() string { +func (m *StakingRequest) GetNodeId() string { if m != nil { - return m.PublicKey + return m.NodeId } return "" } @@ -274,25 +258,23 @@ func init() { func init() { proto.RegisterFile("message.proto", fileDescriptor_33c57e4bae7b9afd) } var fileDescriptor_33c57e4bae7b9afd = []byte{ - // 307 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x91, 0x51, 0x6b, 0xc2, 0x30, - 0x14, 0x85, 0x8d, 0x3a, 0x4b, 0xaf, 0x4c, 0xca, 0x45, 0x5c, 0x19, 0x1b, 0x88, 0x4f, 0x65, 0x0f, - 0x3e, 0xe8, 0x2f, 0xd0, 0x4d, 0xb6, 0x21, 0x4b, 0x21, 0x3a, 0x7c, 0x2c, 0x75, 0x5e, 0x44, 0x9c, - 0xa6, 0x6b, 0x52, 0x46, 0xff, 0xc2, 0xde, 0xf6, 0x8f, 0x47, 0x9b, 0x46, 0xe7, 0x53, 0xcf, 0xf9, - 0xce, 0xe9, 0x25, 0x37, 0x81, 0xeb, 0x03, 0x29, 0x15, 0x6f, 0x69, 0x98, 0xa4, 0x52, 0x4b, 0x74, - 0x2a, 0x3b, 0xf8, 0x65, 0xe0, 0xbc, 0x19, 0x8d, 0x01, 0x34, 0x75, 0x9e, 0x90, 0xcf, 0xfa, 0x2c, - 0xe8, 0x8c, 0xba, 0x43, 0xfb, 0x4b, 0x95, 0x2f, 0xf3, 0x84, 0x44, 0xd9, 0xc0, 0x3b, 0x70, 0xd5, - 0x6e, 0x7b, 0x8c, 0x75, 0x96, 0x92, 0x5f, 0xef, 0xb3, 0xc0, 0x15, 0x67, 0x80, 0x63, 0x70, 0x94, - 0x8e, 0xf7, 0xbb, 0xe3, 0xd6, 0x6f, 0xf4, 0x59, 0xd0, 0x1e, 0xdd, 0x9c, 0x46, 0x2d, 0x0c, 0x17, - 0xf4, 0x95, 0x91, 0xd2, 0x2f, 0x35, 0x61, 0x9b, 0x53, 0x17, 0x9c, 0xd4, 0xd0, 0x81, 0x0f, 0x3d, - 0x4e, 0xdf, 0x5c, 0x6e, 0x68, 0x2a, 0xa5, 0x2e, 0xbe, 0xe2, 0x9c, 0x58, 0x54, 0x35, 0x6c, 0x12, - 0x43, 0xe7, 0x72, 0x36, 0xfa, 0xe0, 0xc4, 0x9b, 0x4d, 0x4a, 0x4a, 0x95, 0x0b, 0xb9, 0xc2, 0x5a, - 0xec, 0x41, 0x2b, 0x3e, 0xc8, 0xec, 0xa8, 0xcb, 0xa3, 0x37, 0x44, 0xe5, 0xf0, 0x1e, 0x20, 0xc9, - 0xd6, 0x9f, 0xbb, 0x8f, 0x68, 0x4f, 0xb9, 0xdf, 0x34, 0x6b, 0x19, 0x32, 0xa7, 0xfc, 0xe1, 0x87, - 0x41, 0xfb, 0xdf, 0x55, 0x60, 0x1b, 0x9c, 0x77, 0x3e, 0xe7, 0xe1, 0x8a, 0x7b, 0x35, 0xec, 0x82, - 0xc7, 0x67, 0x2b, 0x1e, 0x3e, 0xcd, 0xa2, 0x69, 0x18, 0x2e, 0x0b, 0xe1, 0xb1, 0x82, 0x5a, 0x17, - 0x55, 0xb1, 0x57, 0x47, 0x84, 0xce, 0xa9, 0x3b, 0x9b, 0x3c, 0x86, 0xdc, 0x6b, 0x14, 0xcc, 0xe8, - 0x53, 0xaf, 0x89, 0xb7, 0xd0, 0xbb, 0xec, 0x45, 0x8b, 0xe5, 0x64, 0xfe, 0xca, 0x9f, 0xbd, 0xab, - 0x75, 0xab, 0x7c, 0xc7, 0xf1, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0x35, 0x6a, 0x87, 0xd8, - 0x01, 0x00, 0x00, + // 276 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x91, 0x4f, 0x6b, 0xc2, 0x30, + 0x18, 0xc6, 0x8d, 0x3a, 0x83, 0x6f, 0xb7, 0x12, 0x82, 0x68, 0xd9, 0xa9, 0x78, 0x2a, 0x3b, 0x78, + 0xd0, 0x4f, 0x60, 0xb7, 0xb2, 0x49, 0x59, 0x0a, 0xb1, 0xc3, 0x63, 0xe9, 0xd6, 0x20, 0x65, 0xac, + 0xe9, 0x9a, 0x8c, 0xe1, 0x57, 0xd8, 0xa7, 0x1e, 0xfd, 0x93, 0xaa, 0xa7, 0xbc, 0xcf, 0xef, 0xf9, + 0x25, 0x24, 0x04, 0xee, 0xbe, 0x84, 0x52, 0xe9, 0x51, 0xac, 0xca, 0x4a, 0x6a, 0x49, 0x71, 0x17, + 0x97, 0x0a, 0xf0, 0x6b, 0x3b, 0x52, 0x0f, 0xc6, 0xfa, 0x54, 0x0a, 0x07, 0xb9, 0xc8, 0xb3, 0xd7, + 0xb3, 0x95, 0xd9, 0xd1, 0xf5, 0xf1, 0xa9, 0x14, 0xbc, 0x31, 0xe8, 0x06, 0xb0, 0xd2, 0xe9, 0x67, + 0x5e, 0x1c, 0x9d, 0x91, 0x8b, 0x3c, 0x6b, 0xbd, 0xe8, 0xe5, 0x7d, 0xcb, 0xb9, 0xf8, 0xfe, 0x11, + 0x4a, 0xbf, 0x0c, 0xb8, 0x31, 0xfd, 0x29, 0xe0, 0xaa, 0xa5, 0x4b, 0x07, 0xe6, 0x4c, 0xfc, 0x32, + 0x99, 0x09, 0x5f, 0x4a, 0x5d, 0xaf, 0xfc, 0xdc, 0x18, 0xd4, 0x19, 0xa6, 0x09, 0xc1, 0xbe, 0x3e, + 0x9b, 0xba, 0x60, 0xe9, 0x2a, 0x2d, 0x54, 0xfa, 0xa1, 0x73, 0x59, 0x34, 0xd7, 0xbe, 0xe5, 0x97, + 0x88, 0x2e, 0x00, 0x17, 0x32, 0x13, 0x49, 0x9e, 0x39, 0x43, 0x17, 0x79, 0x53, 0x3e, 0xa9, 0xe3, + 0x2e, 0x7b, 0xf8, 0x43, 0x60, 0x5d, 0x3c, 0x8b, 0x5a, 0x80, 0xdf, 0x58, 0xc8, 0xa2, 0x03, 0x23, + 0x03, 0x3a, 0x03, 0xc2, 0x82, 0x03, 0x8b, 0x9e, 0x82, 0xc4, 0x8f, 0xa2, 0xb8, 0x1e, 0x08, 0xaa, + 0xa9, 0x49, 0x49, 0x57, 0x93, 0x21, 0xa5, 0x60, 0xf7, 0x6e, 0xb0, 0x7d, 0x8c, 0x18, 0x19, 0xd5, + 0xac, 0x9d, 0x7b, 0x6f, 0x4c, 0xef, 0x61, 0x7e, 0xed, 0x25, 0xfb, 0x78, 0x1b, 0xee, 0xd8, 0x33, + 0xb9, 0x79, 0x9f, 0x34, 0x5f, 0xb2, 0xf9, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x1b, 0xd6, 0xe4, 0x08, + 0xa3, 0x01, 0x00, 0x00, } diff --git a/api/proto/message/message.proto b/api/proto/message/message.proto index 714f9531b..c515910d5 100644 --- a/api/proto/message/message.proto +++ b/api/proto/message/message.proto @@ -17,7 +17,6 @@ enum MessageType { // The request field will be either one of the structure corresponding to the MessageType type. message Message { MessageType type = 1; - string signature = 2; oneof request { StakingRequest staking = 3; } @@ -33,7 +32,6 @@ message BootNodeNewNodeRequest { // Staking Request from new node to beacon node. message StakingRequest { - string address = 1; - int64 amount = 2; - string public_key = 4; + bytes transaction = 1; + string node_id = 2; } diff --git a/api/service/staking/service.go b/api/service/staking/service.go index e470ed532..8f337016f 100644 --- a/api/service/staking/service.go +++ b/api/service/staking/service.go @@ -4,7 +4,6 @@ import ( "github.com/ethereum/go-ethereum/log" "github.com/harmony-one/harmony/api/proto/message" "github.com/harmony-one/harmony/internal/utils" - "github.com/harmony-one/harmony/internal/utils/contract" "github.com/harmony-one/harmony/p2p" ) @@ -65,13 +64,11 @@ func (s *Service) createStakingMessage() *message.Message { // TODO(minhdoan): Add signature and public key. // To add public we need to assign a fake account to new node initially. return &message.Message{ - Type: message.MessageType_NEWNODE_BEACON_STAKING, - Signature: "", + Type: message.MessageType_NEWNODE_BEACON_STAKING, Request: &message.Message_Staking{ Staking: &message.StakingRequest{ - Address: contract.FakeAccounts[0].Address, - Amount: 1000, - PublicKey: "", + Transaction: []byte{}, + NodeId: "", }, }, } diff --git a/cmd/harmony.go b/cmd/harmony.go index 91b7de3b2..f40a3309f 100644 --- a/cmd/harmony.go +++ b/cmd/harmony.go @@ -246,7 +246,7 @@ func main() { if consensus.IsLeader { currentNode.State = node.NodeLeader } else { - go currentNode.JoinShard(leader) + // go currentNode.JoinShard(leader) } }