Commit d9e5c8a3 authored by vipwzw's avatar vipwzw

auto ci

parent 9a31b596
...@@ -228,7 +228,7 @@ func getDappForkHeight(forkKey string) int64 { ...@@ -228,7 +228,7 @@ func getDappForkHeight(forkKey string) int64 {
var forkHeight int64 var forkHeight int64
if types.IsPara() { if types.IsPara() {
key := forkKey key := forkKey
if forkKey == pt.ForkCommitTx{ if forkKey == pt.ForkCommitTx {
key = "MainForkParacrossCommitTx" key = "MainForkParacrossCommitTx"
} }
forkHeight = types.Conf("config.consensus.sub.para").GInt(key) forkHeight = types.Conf("config.consensus.sub.para").GInt(key)
......
...@@ -46,7 +46,7 @@ func checkReceiptExecOk(receipt *types.ReceiptData) bool { ...@@ -46,7 +46,7 @@ func checkReceiptExecOk(receipt *types.ReceiptData) bool {
// 1, 主链+平行链 user.p.xx.paracross 交易组 混合跨链资产转移 paracross主链执行成功 // 1, 主链+平行链 user.p.xx.paracross 交易组 混合跨链资产转移 paracross主链执行成功
// 2, 平行链 user.p.xx.paracross + user.p.xx.other 混合平行链组合 paracross主链执行成功 // 2, 平行链 user.p.xx.paracross + user.p.xx.other 混合平行链组合 paracross主链执行成功
// 3, 平行链 user.p.xx.other 交易组 混合平行链组合 other主链pack // 3, 平行链 user.p.xx.other 交易组 混合平行链组合 other主链pack
func filterParaTxGroup(title string, tx *types.Transaction, main *types.BlockDetail, index int,forkHeight int64) ([]*types.Transaction, int) { func filterParaTxGroup(title string, tx *types.Transaction, main *types.BlockDetail, index int, forkHeight int64) ([]*types.Transaction, int) {
var headIdx int var headIdx int
for i := index; i >= 0; i-- { for i := index; i >= 0; i-- {
...@@ -80,13 +80,13 @@ func FilterTxsForPara(title string, main *types.BlockDetail) []*types.Transactio ...@@ -80,13 +80,13 @@ func FilterTxsForPara(title string, main *types.BlockDetail) []*types.Transactio
tx := main.Block.Txs[i] tx := main.Block.Txs[i]
if types.IsSpecificParaExecName(title, string(tx.Execer)) { if types.IsSpecificParaExecName(title, string(tx.Execer)) {
if tx.GroupCount >= 2 { if tx.GroupCount >= 2 {
mainTxs, endIdx := filterParaTxGroup(title, tx, main, i,forkHeight) mainTxs, endIdx := filterParaTxGroup(title, tx, main, i, forkHeight)
txs = append(txs, mainTxs...) txs = append(txs, mainTxs...)
i = endIdx - 1 i = endIdx - 1
continue continue
} }
//单独的paracross tx 如果主链执行失败也要排除 //单独的paracross tx 如果主链执行失败也要排除
if main.Block.Height >= forkHeight{ if main.Block.Height >= forkHeight {
if types.IsMyParaExecName(string(tx.Execer)) && !checkReceiptExecOk(main.Receipts[i]) { if types.IsMyParaExecName(string(tx.Execer)) && !checkReceiptExecOk(main.Receipts[i]) {
continue continue
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment