remove asset from accountmanager.proto

plugin/dapp/accountmanager/executor/account_test.go

@@ -125,7 +125,7 @@ func TestAccountManager(t *testing.T) {
 	tx3, err := CreateRegister(&et.Register{AccountID: "harrylee2020"}, PrivKeyC)
 	Exec_Block(t, stateDB, kvdb, env, tx3)
 	//转账
-	tx4, err := CreateTransfer(&et.Transfer{FromAccountID: "harrylee2015", ToAccountID: "harrylee2020", Amount: 1e8, Asset: &et.Asset{Execer: "coins", Symbol: "bty"}}, PrivKeyB)
+	tx4, err := CreateTransfer(&et.Transfer{FromAccountID: "harrylee2015", ToAccountID: "harrylee2020", Asset: &types.Asset{Exec: "coins", Symbol: "bty", Amount: 1e8}}, PrivKeyB)
 	assert.Equal(t, err, nil)
 	err = Exec_Block(t, stateDB, kvdb, env, tx4)
 	assert.Equal(t, err, nil)
@@ -147,11 +147,11 @@ func TestAccountManager(t *testing.T) {
 	tx6, err = CreateApply(&et.Apply{Op: et.EnforceReset, AccountID: "harrylee2015"}, PrivKeyD)
 	assert.Equal(t, err, nil)
 	err = Exec_Block(t, stateDB, kvdb, env, tx6)
-	tx7, _ := CreateTransfer(&et.Transfer{FromAccountID: "harrylee2015", ToAccountID: "harrylee2015", Amount: 1e8, Asset: &et.Asset{Execer: "coins", Symbol: "bty"}}, PrivKeyD)
+	tx7, _ := CreateTransfer(&et.Transfer{FromAccountID: "harrylee2015", ToAccountID: "harrylee2015", Asset: &types.Asset{Exec: "coins", Symbol: "bty", Amount: 1e8}}, PrivKeyD)
 
 	err = Exec_Block(t, stateDB, kvdb, env, tx7)
 	assert.Equal(t, err, nil)
-	balance, err := Exec_QueryBalanceByID(&et.QueryBalanceByID{AccountID: "harrylee2015", Asset: &et.Asset{Symbol: "bty", Execer: "coins"}}, stateDB, kvdb)
+	balance, err := Exec_QueryBalanceByID(&et.QueryBalanceByID{AccountID: "harrylee2015", Asset: &types.Asset{Symbol: "bty", Exec: "coins"}}, stateDB, kvdb)
 	assert.Equal(t, err, nil)
 	assert.Equal(t, balance.Balance, 199*types.Coin)
 
@@ -166,7 +166,7 @@ func TestAccountManager(t *testing.T) {
 	accounts, err := Exec_QueryAccountsByStatus(et.Frozen, stateDB, kvdb)
 	assert.Equal(t, err, nil)
 	assert.Equal(t, accounts.Accounts[0].Status, et.Frozen)
-	balance, err = Exec_QueryBalanceByID(&et.QueryBalanceByID{Asset: &et.Asset{Execer: "coins", Symbol: "bty"}, AccountID: "harrylee2015"}, stateDB, kvdb)
+	balance, err = Exec_QueryBalanceByID(&et.QueryBalanceByID{Asset: &types.Asset{Exec: "coins", Symbol: "bty"}, AccountID: "harrylee2015"}, stateDB, kvdb)
 	assert.Equal(t, err, nil)
 	assert.Equal(t, balance.Frozen, 199*types.Coin)
 
@@ -180,7 +180,7 @@ func TestAccountManager(t *testing.T) {
 	//根据状态查询
 	accounts, err = Exec_QueryAccountsByStatus(et.Frozen, stateDB, kvdb)
 	assert.NotEqual(t, err, nil)
-	balance, err = Exec_QueryBalanceByID(&et.QueryBalanceByID{Asset: &et.Asset{Execer: "coins", Symbol: "bty"}, AccountID: "harrylee2015"}, stateDB, kvdb)
+	balance, err = Exec_QueryBalanceByID(&et.QueryBalanceByID{Asset: &types.Asset{Exec: "coins", Symbol: "bty"}, AccountID: "harrylee2015"}, stateDB, kvdb)
 	assert.Equal(t, err, nil)
 	assert.Equal(t, balance.Balance, 199*types.Coin)
 

plugin/dapp/accountmanager/executor/accountdb.go

@@ -131,7 +131,7 @@ func (a *Action) Transfer(payload *et.Transfer) (*types.Receipt, error) {
 	}
 	//如果prevAddr地址不为空，先查看余额，将该地址下面得资产划转到新得公钥地址下
 	if account1.PrevAddr != "" {
-		assetDB, err := account.NewAccountDB(cfg, payload.Asset.GetExecer(), payload.Asset.GetSymbol(), a.statedb)
+		assetDB, err := account.NewAccountDB(cfg, payload.Asset.GetExec(), payload.Asset.GetSymbol(), a.statedb)
 		if err != nil {
 			return nil, err
 		}
@@ -166,16 +166,16 @@ func (a *Action) Transfer(payload *et.Transfer) (*types.Receipt, error) {
 		return nil, et.ErrAccountIDNotPermiss
 	}
 
-	assetDB, err := account.NewAccountDB(cfg, payload.Asset.GetExecer(), payload.Asset.GetSymbol(), a.statedb)
+	assetDB, err := account.NewAccountDB(cfg, payload.Asset.GetExec(), payload.Asset.GetSymbol(), a.statedb)
 	if err != nil {
 		return nil, err
 	}
 	fromAccount := assetDB.LoadExecAccount(a.fromaddr, a.execaddr)
-	if fromAccount.Balance < payload.Amount {
-		elog.Error("Transfer, check  balance", "addr", a.fromaddr, "avail", fromAccount.Balance, "need", payload.Amount)
+	if fromAccount.Balance < payload.Asset.Amount {
+		elog.Error("Transfer, check  balance", "addr", a.fromaddr, "avail", fromAccount.Balance, "need", payload.Asset.Amount)
 		return nil, et.ErrAssetBalance
 	}
-	receipt, err := assetDB.ExecTransfer(account1.Addr, account2.Addr, a.execaddr, payload.Amount)
+	receipt, err := assetDB.ExecTransfer(account1.Addr, account2.Addr, a.execaddr, payload.Asset.Amount)
 	if err != nil {
 		return nil, err
 	}
@@ -472,7 +472,7 @@ func queryBalanceByID(statedb, localdb dbm.KV, cfg *types.Chain33Config, execNam
 	if err != nil {
 		return nil, err
 	}
-	assetDB, err := account.NewAccountDB(cfg, in.Asset.GetExecer(), in.Asset.GetSymbol(), statedb)
+	assetDB, err := account.NewAccountDB(cfg, in.Asset.GetExec(), in.Asset.GetSymbol(), statedb)
 	if err != nil {
 		return nil, err
 	}

plugin/dapp/accountmanager/proto/accountmanager.proto

 syntax = "proto3";
+
+import "transaction.proto";
+
 package types;
 
 message Accountmanager {
@@ -41,22 +44,16 @@ message Apply {
     int32 op = 2;
 }
 
-//资产类型
-message asset {
-    string execer = 1;
-    string symbol = 2;
-}
 
 //合约内部账户之间转账
 message Transfer {
-    //资产类型
-    asset   Asset = 1;
+    //资产类型 及转账金额
+    Asset   asset = 1;
     // from账户
     string fromAccountID = 2;
     // to账户
     string toAccountID = 3;
-    //转账金额
-    int64 amount = 4;
+
 
 }
 
@@ -144,7 +141,7 @@ message QueryAccountByAddr {
 message QueryBalanceByID {
     string accountID = 1;
 
-    asset asset = 2;
+    Asset asset = 2;
 }
 
 message balance {