From 84942da7ef00d8ea99bb555217963cc264302f95 Mon Sep 17 00:00:00 2001 From: HAOYUatHZ Date: Thu, 13 Jun 2019 21:37:09 +0800 Subject: [PATCH] fix --- federation/common/const.go | 3 ++- federation/synchron/mainchain_keeper.go | 24 ++++++++++++++---------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/federation/common/const.go b/federation/common/const.go index 663c66ae..e843f9ef 100644 --- a/federation/common/const.go +++ b/federation/common/const.go @@ -2,8 +2,9 @@ package common const ( CrossTxPendingStatus uint8 = iota - CrossTxCompletedStatus CrossTxRejectedStatus + CrossTxSubmittedStatus + CrossTxCompletedStatus ) const ( diff --git a/federation/synchron/mainchain_keeper.go b/federation/synchron/mainchain_keeper.go index f0090995..b614d1e0 100644 --- a/federation/synchron/mainchain_keeper.go +++ b/federation/synchron/mainchain_keeper.go @@ -236,16 +236,20 @@ func (m *mainchainKeeper) getCrossChainInputs(crossTransactionID uint64, tx *btm } func (m *mainchainKeeper) processWithdrawalTx(chain *orm.Chain, block *btmTypes.Block, txIndex uint64, tx *btmTypes.Tx) error { - /* - ormTx := &orm.CrossTransaction{ - ChainID: chain.ID, - DestBlockHeight: sql.NullInt64{Valid: false}, - DestBlockHash: sql.NullString{Valid: false}, - DestTxIndex: sql.NullInt64{Valid: false}, - DestTxHash: sql.NullString{Valid: false}, - // Status uint8 - } - */ + blockHash := block.Hash() + + if err := m.db.Where(&orm.CrossTransaction{ + ChainID: chain.ID, + DestTxHash: sql.NullString{tx.ID.String(), true}, + Status: common.CrossTxSubmittedStatus, + }).UpdateColumn(&orm.CrossTransaction{ + DestBlockHeight: sql.NullInt64{int64(block.Height), true}, + DestBlockHash: sql.NullString{blockHash.String(), true}, + DestTxIndex: sql.NullInt64{int64(txIndex), true}, + Status: common.CrossTxCompletedStatus, + }).Error; err != nil { + return err + } return nil } -- 2.11.0