Commit 71099b46 authored by mdj33's avatar mdj33

change to function IsMyParaExecName

parent cda4cffd
...@@ -251,7 +251,7 @@ func calcParaCrossTxGroup(tx *types.Transaction, main *types.BlockDetail, index ...@@ -251,7 +251,7 @@ func calcParaCrossTxGroup(tx *types.Transaction, main *types.BlockDetail, index
endIdx := headIdx + int(tx.GroupCount) endIdx := headIdx + int(tx.GroupCount)
for i := headIdx; i < endIdx; i++ { for i := headIdx; i < endIdx; i++ {
if types.IsParaTitleTx(string(main.Block.Txs[i].Execer)) { if types.IsMyParaExecName(string(main.Block.Txs[i].Execer)) {
continue continue
} }
if main.Receipts[i].Ty == types.ExecOk { if main.Receipts[i].Ty == types.ExecOk {
...@@ -272,7 +272,7 @@ func (client *client) FilterTxsForPara(main *types.BlockDetail) []*types.Transac ...@@ -272,7 +272,7 @@ func (client *client) FilterTxsForPara(main *types.BlockDetail) []*types.Transac
var txs []*types.Transaction var txs []*types.Transaction
for i := 0; i < len(main.Block.Txs); i++ { for i := 0; i < len(main.Block.Txs); i++ {
tx := main.Block.Txs[i] tx := main.Block.Txs[i]
if types.IsParaTitleTx(string(tx.Execer)) { if types.IsMyParaExecName(string(tx.Execer)) {
if tx.GroupCount >= paraCrossTxCount { if tx.GroupCount >= paraCrossTxCount {
mainTxs, endIdx := calcParaCrossTxGroup(tx, main, i) mainTxs, endIdx := calcParaCrossTxGroup(tx, main, i)
txs = append(txs, mainTxs...) txs = append(txs, mainTxs...)
......
...@@ -86,7 +86,7 @@ func (e *Paracross) ExecLocal_Miner(payload *pt.ParacrossMinerAction, tx *types. ...@@ -86,7 +86,7 @@ func (e *Paracross) ExecLocal_Miner(payload *pt.ParacrossMinerAction, tx *types.
hash := tx.Hash() hash := tx.Hash()
mixTxHashs = append(mixTxHashs, hash) mixTxHashs = append(mixTxHashs, hash)
//跨链交易包含了主链交易,需要过滤出来 //跨链交易包含了主链交易,需要过滤出来
if types.IsParaTitleTx(string(tx.Execer)) { if types.IsMyParaExecName(string(tx.Execer)) {
paraTxHashs = append(paraTxHashs, hash) paraTxHashs = append(paraTxHashs, hash)
} }
} }
...@@ -100,7 +100,7 @@ func (e *Paracross) ExecLocal_Miner(payload *pt.ParacrossMinerAction, tx *types. ...@@ -100,7 +100,7 @@ func (e *Paracross) ExecLocal_Miner(payload *pt.ParacrossMinerAction, tx *types.
i = int(end) - 1 i = int(end) - 1
continue continue
} }
if types.IsParaTitleTx(string(tx.Execer)) && if types.IsMyParaExecName(string(tx.Execer)) &&
bytes.HasSuffix(tx.Execer, []byte(pt.ParaX)) { bytes.HasSuffix(tx.Execer, []byte(pt.ParaX)) {
crossTxHashs = append(crossTxHashs, tx.Hash()) crossTxHashs = append(crossTxHashs, tx.Hash())
} }
......
...@@ -87,7 +87,7 @@ func crossTxGroupProc(txs []*types.Transaction, index int) ([]*types.Transaction ...@@ -87,7 +87,7 @@ func crossTxGroupProc(txs []*types.Transaction, index int) ([]*types.Transaction
//cross asset transfer in tx group //cross asset transfer in tx group
var transfers []*types.Transaction var transfers []*types.Transaction
for i := headIdx; i < endIdx; i++ { for i := headIdx; i < endIdx; i++ {
if types.IsParaTitleTx(string(txs[i].Execer)) && if types.IsMyParaExecName(string(txs[i].Execer)) &&
bytes.HasSuffix(txs[i].Execer, []byte(pt.ParaX)) { bytes.HasSuffix(txs[i].Execer, []byte(pt.ParaX)) {
transfers = append(transfers, txs[i]) transfers = append(transfers, txs[i])
......
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