take isDappFork

plugin/dapp/paracross/cmd/build/testcase.sh

@@ -33,7 +33,9 @@ function para_set_toml() {
     sed -i $xsedfix 's/^startHeight=.*/startHeight=0/g' "${1}"
     sed -i $xsedfix 's/^emptyBlockInterval=.*/emptyBlockInterval=4/g' "${1}"
     sed -i $xsedfix '/^emptyBlockInterval=.*/a MainBlockHashForkHeight=1' "${1}"
-    sed -i $xsedfix '/^emptyBlockInterval=.*/a MainParaSelfConsensusForkHeight=300' "${1}"
+
+    #测试使用，主链也要替换ForkParacrossCommitTx 为300
+    # sed -i $xsedfix '/^emptyBlockInterval=.*/a MainParaSelfConsensusForkHeight=300' "${1}"
 
     # rpc
     sed -i $xsedfix 's/^jrpcBindAddr=.*/jrpcBindAddr="0.0.0.0:8901"/g' "${1}"

plugin/dapp/paracross/executor/paracross.go

@@ -321,7 +321,7 @@ func (c *Paracross) allow(tx *types.Transaction, index int) error {
 		if payload.Ty == pt.ParacrossActionAssetTransfer || payload.Ty == pt.ParacrossActionAssetWithdraw {
 			return nil
 		}
-		if c.GetHeight() > types.GetDappFork(pt.ParaX, pt.ForkCommitTx) {
+		if types.IsDappFork(c.GetHeight(), pt.ParaX, pt.ForkCommitTx) {
 			if payload.Ty == pt.ParacrossActionCommit {
 				return nil
 			}