add manager exec apply process

Author: mdj33

Makefile

@@ -310,7 +310,7 @@ webhook_auto_ci: clean fmt_proto fmt_shell protobuf mock
 		  fi;
 
 addupstream:
-	git remote add upstream https://github.com/33cn/chain33.git
+	git remote add upstream git@github.com:33cn/chain33.git
 	git remote -v
 
 sync:

cmd/chain33/chain33.toml

@@ -319,6 +319,8 @@ superManager=[
     "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv",
     "1Q8hGLfoGe63efeWa8fJ4Pnukhkngt6poK"
 ]
+#自治合约执行器可配置
+autonomyExec="autonomy"
 
 [exec.sub.autonomy]
 total="16htvcBNSEA7fZhAdLJphDwQRQJaHpyHTp"

system/dapp/manage/executor/exec.go

@@ -28,12 +28,40 @@ func (c *Manage) Exec_Modify(manageAction *types.ModifyConfig, tx *types.Transac
 	// 兼容在区块上没有To地址检查的交易数据
 	types.AssertConfig(c.GetAPI())
 	cfg := c.GetAPI().GetConfig()
-	if cfg.IsDappFork(c.GetHeight(), mty.ManageX, "ForkManageExec") {
+
+	if cfg.IsDappFork(c.GetHeight(), mty.ManageX, mty.ForkManageAutonomyApprove) {
+		return nil, types.ErrNotAllow
+	}
+
+	if cfg.IsDappFork(c.GetHeight(), mty.ManageX, mty.ForkManageExec) {
 		if err := c.checkTxToAddress(tx, index); err != nil {
 			return nil, err
 		}
 	}
-	action := NewAction(c, tx)
+	action := newAction(c, tx, int32(index))
+	if !IsSuperManager(cfg, action.fromaddr) {
+		return nil, mty.ErrNoPrivilege
+	}
 	return action.modifyConfig(manageAction)
 
 }
+
+func (c *Manage) Exec_ApplyConfig(payload *mty.ApplyConfig, tx *types.Transaction, index int) (*types.Receipt, error) {
+	cfg := c.GetAPI().GetConfig()
+	if !cfg.IsDappFork(c.GetHeight(), mty.ManageX, mty.ForkManageAutonomyApprove) {
+		return nil, types.ErrNotAllow
+	}
+
+	action := newAction(c, tx, int32(index))
+	return action.applyConfig(payload)
+}
+
+func (c *Manage) Exec_ApproveConfig(payload *mty.ApproveConfig, tx *types.Transaction, index int) (*types.Receipt, error) {
+	cfg := c.GetAPI().GetConfig()
+	if !cfg.IsDappFork(c.GetHeight(), mty.ManageX, mty.ForkManageAutonomyApprove) {
+		return nil, types.ErrNotAllow
+	}
+
+	action := newAction(c, tx, int32(index))
+	return action.approveConfig(payload)
+}

system/dapp/manage/executor/kv.go

@@ -0,0 +1,26 @@
+// Copyright Fuzamei Corp. 2018 All Rights Reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package executor
+
+import (
+	"fmt"
+)
+
+// ConfigPrefix 配置前缀key
+var configPrefix = "mavl-config-"
+
+// ConfigKey 原来实现有bug， 但生成的key在状态树里， 不可修改
+// mavl-config–{key}  key 前面两个-
+func configKey(key string) []byte {
+	return []byte(fmt.Sprintf("%s-%s", configPrefix, key))
+}
+
+// ManagePrefix 超级管理员账户配置前缀key
+var managePrefix = "mavl-manage"
+
+//ManageKey 超级管理员账户key
+func manageKey(key string) []byte {
+	return []byte(fmt.Sprintf("%s-%s", managePrefix, key))
+}

system/dapp/manage/executor/managedb.go

@@ -5,27 +5,34 @@
 package executor
 
 import (
+	"github.com/33cn/chain33/account"
+	"github.com/33cn/chain33/client"
+	"github.com/33cn/chain33/common"
 	dbm "github.com/33cn/chain33/common/db"
-	pty "github.com/33cn/chain33/system/dapp/manage/types"
+	"github.com/33cn/chain33/system/dapp"
+	mty "github.com/33cn/chain33/system/dapp/manage/types"
 	"github.com/33cn/chain33/types"
+	"github.com/golang/protobuf/proto"
+	"github.com/pkg/errors"
 )
 
-// Action attribute
-type Action struct {
-	db       dbm.KV
-	fromaddr string
-	height   int64
-	cfg      *types.Chain33Config
+type action struct {
+	api          client.QueueProtocolAPI
+	coinsAccount *account.DB
+	db           dbm.KV
+	txhash       []byte
+	fromaddr     string
+	height       int64
+	index        int32
+	execaddr     string
 }
 
-// NewAction new a action object
-func NewAction(m *Manage, tx *types.Transaction) *Action {
-	types.AssertConfig(m.GetAPI())
-	return &Action{db: m.GetStateDB(), fromaddr: tx.From(), height: m.GetHeight(), cfg: m.GetAPI().GetConfig()}
-
+func newAction(m *Manage, tx *types.Transaction, index int32) *action {
+	return &action{m.GetAPI(), m.GetCoinsAccount(), m.GetStateDB(), tx.Hash(), tx.From(),
+		m.GetHeight(), index, dapp.ExecAddress(string(tx.Execer))}
 }
 
-func (m *Action) modifyConfig(modify *types.ModifyConfig) (*types.Receipt, error) {
+func (a *action) modifyConfig(modify *types.ModifyConfig) (*types.Receipt, error) {
 
 	//if modify.Key == "Manager-managers" && !wallet.IsSuperManager(modify.GetAddr()) {
 	//	return nil, types.ErrNoPrivilege
@@ -34,23 +41,20 @@ func (m *Action) modifyConfig(modify *types.ModifyConfig) (*types.Receipt, error
 	//	return nil, types.ErrNoPrivilege
 	//}
 
-	if !IsSuperManager(m.cfg, m.fromaddr) {
-		return nil, pty.ErrNoPrivilege
-	}
 	if len(modify.Key) == 0 {
-		return nil, pty.ErrBadConfigKey
+		return nil, mty.ErrBadConfigKey
 	}
 	if modify.Op != "add" && modify.Op != "delete" {
-		return nil, pty.ErrBadConfigOp
+		return nil, mty.ErrBadConfigOp
 	}
 
 	var item types.ConfigItem
-	value, err := m.db.Get([]byte(types.ManageKey(modify.Key)))
+	value, err := a.db.Get(manageKey(modify.Key))
 	if err != nil {
 		value = nil
 	}
 	if value == nil {
-		value, err = m.db.Get([]byte(types.ConfigKey(modify.Key)))
+		value, err = a.db.Get(configKey(modify.Key))
 		if err != nil {
 			value = nil
 		}
@@ -64,7 +68,7 @@ func (m *Action) modifyConfig(modify *types.ModifyConfig) (*types.Receipt, error
 	} else { // if config item not exist, create a new empty
 		item.Key = modify.Key
 		item.Addr = modify.Addr
-		item.Ty = pty.ConfigItemArrayConfig
+		item.Ty = mty.ConfigItemArrayConfig
 		emptyValue := &types.ArrayConfig{Value: make([]string, 0)}
 		arr := types.ConfigItem_Arr{Arr: emptyValue}
 		item.Value = &arr
@@ -110,15 +114,144 @@ func (m *Action) modifyConfig(modify *types.ModifyConfig) (*types.Receipt, error
 
 	var logs []*types.ReceiptLog
 	var kv []*types.KeyValue
-	key := m.cfg.ManaeKeyWithHeigh(modify.Key, m.height)
+	key := a.manageKeyWithHeigh(modify.Key)
 	valueSave := types.Encode(&item)
-	err = m.db.Set([]byte(key), valueSave)
+	err = a.db.Set(key, valueSave)
 	if err != nil {
 		return nil, err
 	}
-	kv = append(kv, &types.KeyValue{Key: []byte(key), Value: valueSave})
+	kv = append(kv, &types.KeyValue{Key: key, Value: valueSave})
 	log := types.ReceiptConfig{Prev: &copyItem, Current: &item}
-	logs = append(logs, &types.ReceiptLog{Ty: pty.TyLogModifyConfig, Log: types.Encode(&log)})
+	logs = append(logs, &types.ReceiptLog{Ty: mty.TyLogModifyConfig, Log: types.Encode(&log)})
 	receipt := &types.Receipt{Ty: types.ExecOk, KV: kv, Logs: logs}
 	return receipt, nil
 }
+
+//ManaeKeyWithHeigh 超级管理员账户key
+func (a *action) manageKeyWithHeigh(key string) []byte {
+	if a.api.GetConfig().IsFork(a.height, "ForkExecKey") {
+		return manageKey(key)
+	}
+	return configKey(key)
+}
+
+func (a *action) applyConfig(payload *mty.ApplyConfig) (*types.Receipt, error) {
+	configStatus := &mty.ConfigStatus{
+		Id:       common.ToHex(a.txhash),
+		Modify:   payload.Modify,
+		Status:   mty.ManageConfigStatusApply,
+		Proposer: a.fromaddr,
+		Height:   a.height,
+		Index:    a.index,
+	}
+
+	return makeApplyReceipt(configStatus), nil
+}
+
+func (a *action) getConfig(ID string) (*mty.ConfigStatus, error) {
+	value, err := a.db.Get(manageKey(ID))
+	if err != nil {
+		return nil, err
+	}
+	var status mty.ConfigStatus
+	err = types.Decode(value, &status)
+	if err != nil {
+		return nil, err
+	}
+	return &status, nil
+}
+
+func (a *action) approveConfig(payload *mty.ApproveConfig) (*types.Receipt, error) {
+	if len(payload.ApproveId) <= 0 || len(payload.Id) <= 0 {
+		return nil, errors.Wrapf(types.ErrInvalidParam, "id nil, appoved=%s,id=%s", payload.ApproveId, payload.Id)
+	}
+
+	s, err := a.getConfig(payload.Id)
+	if err != nil {
+		return nil, errors.Wrapf(err, "get Config id=%s", payload.Id)
+	}
+
+	if s.Status != mty.ManageConfigStatusApply {
+		return nil, errors.Wrapf(types.ErrNotAllow, "id status =%d", s.Status)
+	}
+
+	cfg := a.api.GetConfig()
+	confManager := types.ConfSub(cfg, mty.ManageX)
+	autonomyExec := confManager.GStr(types.AutonomyCfgKey)
+	if len(autonomyExec) <= 0 {
+		return nil, errors.Wrapf(types.ErrNotFound, "manager autonomy key not config")
+	}
+
+	//去autonomy 合约检验是否id approved, 成功 err返回nil
+	_, err = a.api.QueryChain(&types.ChainExecutor{
+		Driver:   autonomyExec,
+		FuncName: "IsAutonomyApprovedItem",
+		Param:    types.Encode(&types.ReqStrings{Datas: []string{payload.ApproveId, payload.Id}}),
+	})
+	if err != nil {
+		return nil, errors.Wrapf(err, "query autonomy,approveid=%s,hashId=%s", payload.ApproveId, payload.Id)
+	}
+
+	copyStat := proto.Clone(s).(*mty.ConfigStatus)
+	s.Status = mty.ForkManageAutonomyApprove
+
+	r := makeApproveReceipt(copyStat, s)
+
+	cr, err := a.modifyConfig(s.Modify)
+	if err != nil {
+		return nil, errors.Wrap(err, "modify config")
+	}
+
+	return mergeReceipt(r, cr), nil
+
+}
+
+func mergeReceipt(receipt1, receipt2 *types.Receipt) *types.Receipt {
+	if receipt2 != nil {
+		receipt1.KV = append(receipt1.KV, receipt2.KV...)
+		receipt1.Logs = append(receipt1.Logs, receipt2.Logs...)
+	}
+
+	return receipt1
+}
+
+func makeApplyReceipt(status *mty.ConfigStatus) *types.Receipt {
+	key := manageKey(status.Id)
+	log := &mty.ReceiptApplyConfig{
+		Status: status,
+	}
+
+	return &types.Receipt{
+		Ty: types.ExecOk,
+		KV: []*types.KeyValue{
+			{Key: key, Value: types.Encode(status)},
+		},
+		Logs: []*types.ReceiptLog{
+			{
+				Ty:  mty.TyLogApplyConfig,
+				Log: types.Encode(log),
+			},
+		},
+	}
+}
+
+func makeApproveReceipt(pre, cur *mty.ConfigStatus) *types.Receipt {
+	key := manageKey(cur.Id)
+	log := &mty.ReceiptApproveConfig{
+		Pre: pre,
+		Cur: cur,
+	}
+
+	return &types.Receipt{
+		Ty: types.ExecOk,
+		KV: []*types.KeyValue{
+			{Key: key, Value: types.Encode(cur)},
+		},
+		Logs: []*types.ReceiptLog{
+			{
+				Ty:  mty.TyLogApproveConfig,
+				Log: types.Encode(log),
+			},
+		},
+	}
+}

system/dapp/manage/executor/query.go

@@ -13,13 +13,13 @@ import (
 // Query_GetConfigItem get config item
 func (c *Manage) Query_GetConfigItem(in *types.ReqString) (types.Message, error) {
 	// Load config from state db
-	value, err := c.GetStateDB().Get([]byte(types.ManageKey(in.Data)))
+	value, err := c.GetStateDB().Get(manageKey(in.Data))
 	if err != nil {
 		clog.Info("modifyConfig", "get db key", "not found")
 		value = nil
 	}
 	if value == nil {
-		value, err = c.GetStateDB().Get([]byte(types.ConfigKey(in.Data)))
+		value, err = c.GetStateDB().Get(configKey(in.Data))
 		if err != nil {
 			clog.Info("modifyConfig", "get db key", "not found")
 			value = nil

system/dapp/manage/proto/manage.proto

@@ -3,10 +3,44 @@ syntax = "proto3";
 import "executor.proto";
 
 package types;
+option go_package = "../types";
+
+//申请修改配置项
+message ApplyConfig {
+    ModifyConfig modify = 1;
+}
+
+//批准配置项
+message ApproveConfig {
+    string id        = 1; //修改配置项申请ID
+    string approveId = 2; // approve 合约批准的ID
+}
 
 message ManageAction {
     oneof value {
-        ModifyConfig modify = 1;
+        ModifyConfig  modify  = 1;
+        ApplyConfig   apply   = 3;
+        ApproveConfig approve = 4;
     }
     int32 Ty = 2;
-}
+}
+
+message ConfigStatus {
+    string       id       = 1; //申请ID
+    ModifyConfig modify   = 2;
+    int32        status   = 3;
+    string       proposer = 4;
+
+    // 状态
+    int64 height = 8;
+    int32 index  = 9;
+}
+
+message ReceiptApplyConfig {
+    ConfigStatus status = 1;
+}
+
+message ReceiptApproveConfig {
+    ConfigStatus pre = 1;
+    ConfigStatus cur = 2;
+}