Merge pull request #333 from meshplus/fix/fix-direct-transaction-bug-v1.21

jiuhuche120 · web-flow · commit 08e3efb769fd · 2022-04-13T16:33:25.000+08:00
fix(exchanger): fix a bug when dst chain receive INTERCHAIN and RECEIPT_ROLLBACK simultaneously
diff --git a/internal/exchanger/direct_consumer.go b/internal/exchanger/direct_consumer.go
@@ -45,6 +45,8 @@ func (ex *Exchanger) listenIBTPFromDestAdaptForDirect(servicePair string) {
 			}
 
 			if isRollback := ex.isIBTPRollbackForDirect(ibtp); isRollback {
+				// receipt time out, need update ibtp with invoke info
+				ibtp, _ = ex.srcAdapt.QueryIBTP(ibtp.ID(), true)
 				ex.rollbackIBTPForDirect(ibtp)
 			} else {
 				ex.sendIBTPForDirect(ex.destAdapt, ex.srcAdapt, ibtp, !ex.isIBTPBelongSrc(ibtp), false)

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,8 @@ func (ex *Exchanger) listenIBTPFromDestAdaptForDirect(servicePair string) {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`if isRollback := ex.isIBTPRollbackForDirect(ibtp); isRollback {`
	`48`	`+ // receipt time out, need update ibtp with invoke info`
	`49`	`+ ibtp, _ = ex.srcAdapt.QueryIBTP(ibtp.ID(), true)`
`48`	`50`	`ex.rollbackIBTPForDirect(ibtp)`
`49`	`51`	`} else {`
`50`	`52`	`ex.sendIBTPForDirect(ex.destAdapt, ex.srcAdapt, ibtp, !ex.isIBTPBelongSrc(ibtp), false)`