fix a bug for hashlock dapp

chain33.para.toml

@@ -216,6 +216,7 @@ ForkRetrive=0
 
 [fork.sub.hashlock]
 Enable=0
+ForkBadRepeatSecret=0
 
 [fork.sub.manage]
 Enable=0

plugin/dapp/hashlock/executor/hashlockdb.go

@@ -89,10 +89,13 @@ func (action *Action) Hashlocklock(hlock *pty.HashlockLock) (*types.Receipt, err
 
 	var logs []*types.ReceiptLog
 	var kv []*types.KeyValue
-
+	var err error
 	//不存在相同的hashlock，假定采用sha256
-	//_, err := readHashlock(action.db, hlock.Hash)
-	_, err := readHashlock(action.db, common.Sha256(hlock.Hash))
+	if types.IsDappFork(action.height, pty.HashlockX, pty.ForkBadRepeatSecretX) {
+		_, err = readHashlock(action.db, hlock.Hash)
+	} else {
+		_, err = readHashlock(action.db, common.Sha256(hlock.Hash))
+	}
 	if err != types.ErrNotFound {
 		hlog.Error("Hashlocklock", "hlock.Hash repeated", hlock.Hash)
 		return nil, pty.ErrHashlockReapeathash

plugin/dapp/hashlock/types/hashlock.go

@@ -21,6 +21,7 @@ func init() {
 	types.AllowUserExec = append(types.AllowUserExec, []byte(HashlockX))
 	types.RegistorExecutor(HashlockX, NewType())
 	types.RegisterDappFork(HashlockX, "Enable", 0)
+	types.RegisterDappFork(HashlockX, ForkBadRepeatSecretX, 3000000)
 }
 
 // HashlockType def

plugin/dapp/hashlock/types/types.go

@@ -12,4 +12,7 @@ const (
 )
 
 // HashlockX name
-var HashlockX = "hashlock"
+var (
+	HashlockX            = "hashlock"
+	ForkBadRepeatSecretX = "ForkBadRepeatSecret"
+)