X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=blobdiff_plain;f=toolbar%2Fvote_reward%2Fsettlementvotereward%2Fsettlementreward.go;h=a6fdbccfe77f5c85a862108137bf84bc00cd8701;hp=e110b95ed3bafcf8d4c122200103772e87cf1deb;hb=c5dcab59bbdcbf29693a368d4e42522a55954c71;hpb=39b01cd36fb3c4341a3385be78ffdcdbc6f94bd5 diff --git a/toolbar/vote_reward/settlementvotereward/settlementreward.go b/toolbar/vote_reward/settlementvotereward/settlementreward.go index e110b95e..a6fdbccf 100644 --- a/toolbar/vote_reward/settlementvotereward/settlementreward.go +++ b/toolbar/vote_reward/settlementvotereward/settlementreward.go @@ -2,6 +2,7 @@ package settlementvotereward import ( "bytes" + "encoding/json" "math/big" "github.com/jinzhu/gorm" @@ -36,6 +37,13 @@ type SettlementReward struct { endHeight uint64 } +type memo struct { + StartHeight uint64 `json:"start_height"` + EndHeight uint64 `json:"end_height"` + NodePubkey string `json:"node_pubkey"` + RewardRatio uint64 `json:"reward_ratio"` +} + func NewSettlementReward(db *gorm.DB, cfg *config.Config, startHeight, endHeight uint64) *SettlementReward { return &SettlementReward{ db: db, @@ -85,8 +93,18 @@ func (s *SettlementReward) Settlement() error { return errNotRewardTx } + data, err := json.Marshal(&memo{ + StartHeight: s.startHeight, + EndHeight: s.endHeight, + NodePubkey: s.rewardCfg.XPub, + RewardRatio: s.rewardCfg.RewardRatio, + }) + if err != nil { + return err + } + // send transactions - _, err := s.node.BatchSendBTM(s.rewardCfg.AccountID, s.rewardCfg.Password, s.rewards) + _, err = s.node.BatchSendBTM(s.rewardCfg.AccountID, s.rewardCfg.Password, s.rewards, data) return err }