From: HAOYUatHZ Date: Tue, 18 Jun 2019 09:09:45 +0000 (+0800) Subject: fix sidechainKeeper.getCrossChainReqs() X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=commitdiff_plain;h=d2cc60a7dfc916807a0172e32a911dd4a24ee651 fix sidechainKeeper.getCrossChainReqs() --- diff --git a/federation/synchron/sidechain_keeper.go b/federation/synchron/sidechain_keeper.go index 25a75efe..214c95c4 100644 --- a/federation/synchron/sidechain_keeper.go +++ b/federation/synchron/sidechain_keeper.go @@ -220,9 +220,7 @@ func (s *sidechainKeeper) processWithdrawalTx(chain *orm.Chain, block *types.Blo } func (s *sidechainKeeper) getCrossChainReqs(crossTransactionID uint64, tx *types.Tx, statusFail bool) ([]*orm.CrossTransactionReq, error) { - // assume inputs are from an identical owner - script := hex.EncodeToString(tx.Inputs[0].ControlProgram()) - inputs := []*orm.CrossTransactionReq{} + reqs := []*orm.CrossTransactionReq{} for i, rawOutput := range tx.Outputs { // check valid withdrawal if rawOutput.OutputType() != types.CrossChainOutputType { @@ -238,16 +236,16 @@ func (s *sidechainKeeper) getCrossChainReqs(crossTransactionID uint64, tx *types return nil, err } - input := &orm.CrossTransactionReq{ + req := &orm.CrossTransactionReq{ CrossTransactionID: crossTransactionID, SourcePos: uint64(i), AssetID: asset.ID, AssetAmount: rawOutput.OutputCommitment().AssetAmount.Amount, - Script: script, + Script: hex.EncodeToString(rawOutput.ControlProgram()), } - inputs = append(inputs, input) + reqs = append(reqs, req) } - return inputs, nil + return reqs, nil } func (s *sidechainKeeper) processChainInfo(chain *orm.Chain, block *types.Block) error {