fix prepare bug: can prepare create token again after revoke

plugin/dapp/token/executor/tokendb.go

@@ -177,7 +177,7 @@ func (action *tokenAction) preCreate(token *pty.TokenPreCreate) (*types.Receipt,
 		return nil, pty.ErrTokenExist
 	}
 
-	if checkTokenHasPrecreate(token.GetSymbol(), token.GetOwner(), pty.TokenStatusPreCreated, action.db) {
+	if checkTokenHasPrecreateWithHeight(token.GetSymbol(), token.GetOwner(), action.db, action.height) {
 		return nil, pty.ErrTokenHavePrecreated
 	}
 
@@ -365,6 +365,7 @@ func checkTokenExist(token string, db dbm.KV) bool {
 	return err == nil
 }
 
+// bug: prepare again after revoke, need to check status, fix in fork ForkTokenCheckPrepareX
 func checkTokenHasPrecreate(token, owner string, status int32, db dbm.KV) bool {
 	_, err := db.Get(calcTokenAddrKeyS(token, owner))
 	if err == nil {
@@ -374,6 +375,27 @@ func checkTokenHasPrecreate(token, owner string, status int32, db dbm.KV) bool {
 	return err == nil
 }
 
+func checkTokenHasPrecreateWithHeight(token, owner string, db dbm.KV, height int64) bool {
+	if !types.IsDappFork(height, pty.TokenX, pty.ForkTokenCheckPrepareX) {
+		return checkTokenHasPrecreate(token, owner, pty.TokenStatusPreCreated, db)
+	}
+
+	tokenStatus, err := db.Get(calcTokenAddrNewKeyS(token, owner))
+	if err != nil {
+		tokenStatus, err = db.Get(calcTokenAddrKeyS(token, owner))
+		if err != nil {
+			return false
+		}
+	}
+
+	var t pty.Token
+	if err = types.Decode(tokenStatus, &t); err != nil {
+		tokenlog.Error("checkTokenHasPrecreateWithHeight", "Fail to decode types.token for key err info is", err)
+		panic("data err: checkTokenHasPrecreateWithHeight Fail to decode types.token for key err info is" + err.Error())
+	}
+	return t.Status == pty.TokenStatusPreCreated
+}
+
 func validFinisher(addr string, db dbm.KV) (bool, error) {
 	return validOperator(addr, finisherKey, db)
 }

plugin/dapp/token/types/const.go

@@ -47,6 +47,8 @@ var (
 	ForkTokenPriceX = "ForkTokenPrice"
 	// ForkTokenSymbolWithNumberX fork const
 	ForkTokenSymbolWithNumberX = "ForkTokenSymbolWithNumber"
+	// ForkTokenCheckPrepareX  fork check impl bug
+	ForkTokenCheckPrepareX = "ForkTokenCheckPrepare"
 )
 
 const (

plugin/dapp/token/types/types.go

@@ -24,6 +24,7 @@ func init() {
 	types.RegisterDappFork(TokenX, ForkTokenPriceX, 560000)
 	types.RegisterDappFork(TokenX, ForkTokenSymbolWithNumberX, 1298600)
 	types.RegisterDappFork(TokenX, "ForkTokenCheckAddress", 1600000)
+	types.RegisterDappFork(TokenX, ForkTokenCheckPrepareX, 1600000)
 }
 
 // TokenType 执行器基类结构体