• R/O
  • HTTP
  • SSH
  • HTTPS

vapor: 提交

Golang implemented sidechain for Bytom


Commit MetaInfo

修订版63fcd63fc38aaa85e3f9ad3eb22d8e604bd507d9 (tree)
时间2019-06-20 19:22:34
作者HAOYUatHZ <haoyu@prot...>
CommiterHAOYUatHZ

Log Message

fix

更改概述

差异

--- a/federation/warder.go
+++ b/federation/warder.go
@@ -3,6 +3,7 @@ package federation
33 import (
44 "database/sql"
55 "encoding/hex"
6+ "encoding/json"
67 "time"
78
89 btmTypes "github.com/bytom/protocol/bc/types"
@@ -278,12 +279,27 @@ func (w *warder) signDestTx(destTx interface{}, ormTx *orm.CrossTransaction) err
278279 return errors.New("cross-chain tx status error")
279280 }
280281
281- _ /*signData*/, err := w.getSignData(destTx)
282+ signData, err := w.getSignData(destTx)
282283 if err != nil {
283284 return errors.New("getSignData")
284285 }
285286
286- return w.db.Model(nil).Where(nil).UpdateColumn(nil).Error
287+ // TODO: compose
288+
289+ b, err := json.Marshal(signData)
290+ if err != nil {
291+ return errors.Wrap(err, "marshal signData")
292+ }
293+
294+ return w.db.Model(&orm.CrossTransactionSign{}).
295+ Where(&orm.CrossTransactionSign{
296+ CrossTransactionID: ormTx.ID,
297+ WarderID: w.position,
298+ }).
299+ UpdateColumn(&orm.CrossTransactionSign{
300+ Signatures: string(b),
301+ Status: common.CrossTxSignCompletedStatus,
302+ }).Error
287303 }
288304
289305 func (w *warder) getSignData(destTx interface{}) ([]string, error) {
Show on old repository browser