impl exec local

plugin/dapp/unfreeze/executor/exec_local.go

@@ -7,42 +7,70 @@ package executor
 import (
 	"github.com/33cn/chain33/types"
 	uf "github.com/33cn/plugin/plugin/dapp/unfreeze/types"
+	"github.com/33cn/chain33/system/dapp"
 )
 
-func (u *Unfreeze) execLocal(receiptData *types.ReceiptData) (*types.LocalDBSet, error) {
+func (u *Unfreeze) execLocal(receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error) {
 	dbSet := &types.LocalDBSet{}
 	if receiptData.GetTy() != types.ExecOk {
 		return dbSet, nil
 	}
+	table := NewAddrTable(u.GetLocalDB())
+	txIndex := dapp.HeightIndexStr(u.GetHeight(), int64(index))
+
 	for _, log := range receiptData.Logs {
 		switch log.Ty {
-		case uf.TyLogCreateUnfreeze, uf.TyLogWithdrawUnfreeze, uf.TyLogTerminateUnfreeze:
+		case uf.TyLogWithdrawUnfreeze, uf.TyLogTerminateUnfreeze:
+			var receipt uf.ReceiptUnfreeze
+			err := types.Decode(log.Log, &receipt)
+			if err != nil {
+				return nil, err
+			}
+			err = update(table, receipt.Current)
+			if err != nil {
+				return nil, err
+			}
+		case uf.TyLogCreateUnfreeze:
 			var receipt uf.ReceiptUnfreeze
 			err := types.Decode(log.Log, &receipt)
 			if err != nil {
 				return nil, err
 			}
-			kv := u.saveUnfreezeCreate(&receipt)
-			dbSet.KV = append(dbSet.KV, kv...)
+			u := uf.LocalUnfreeze{
+				Unfreeze:             receipt.Current,
+				TxIndex:              txIndex,
+			}
+			err = table.Add(&u)
+			if err != nil {
+				return nil, err
+			}
 		default:
 		}
 	}
+	kv, err := table.Save()
+	if err != nil {
+		return nil, err
+	}
+	dbSet.KV = append(dbSet.KV, kv...)
+	for _, kv := range dbSet.KV {
+		u.GetLocalDB().Set(kv.Key, kv.Value)
+	}
 	return dbSet, nil
 }
 
 // ExecLocal_Create 本地执行创建冻结合约
 func (u *Unfreeze) ExecLocal_Create(payload *uf.UnfreezeCreate, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error) {
-	return u.execLocal(receiptData)
+	return u.execLocal(receiptData, index)
 }
 
 // ExecLocal_Withdraw 本地执行提币
 func (u *Unfreeze) ExecLocal_Withdraw(payload *uf.UnfreezeWithdraw, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error) {
-	return u.execLocal(receiptData)
+	return u.execLocal(receiptData, index)
 }
 
 // ExecLocal_Terminate 本地执行终止冻结合约
 func (u *Unfreeze) ExecLocal_Terminate(payload *uf.UnfreezeTerminate, tx *types.Transaction, receiptData *types.ReceiptData, index int) (*types.LocalDBSet, error) {
-	return u.execLocal(receiptData)
+	return u.execLocal(receiptData, index)
 }
 
 func localKeys(res *uf.ReceiptUnfreeze, value []byte) (kvs []*types.KeyValue) {
@@ -52,6 +80,7 @@ func localKeys(res *uf.ReceiptUnfreeze, value []byte) (kvs []*types.KeyValue) {
 }
 
 func (u *Unfreeze) saveUnfreezeCreate(res *uf.ReceiptUnfreeze) (kvs []*types.KeyValue) {
+
 	kvs = localKeys(res, []byte(res.Current.UnfreezeID))
 	return
 }