use contract name as action.from when using asset api in contract

processor/vm/instructions.go

@@ -1026,7 +1026,7 @@ func execAddAsset(evm *EVM, contract *Contract, assetID uint64, toName common.Na
 		return err
 	}
 
-	action := types.NewAction(types.IncreaseAsset, contract.CallerName, common.Name(evm.chainConfig.AccountName), 0, evm.chainConfig.SysTokenID, 0, big.NewInt(0), b)
+	action := types.NewAction(types.IncreaseAsset, contract.Name(), common.Name(evm.chainConfig.AccountName), 0, evm.chainConfig.SysTokenID, 0, big.NewInt(0), b)
 
 	internalActions, err := evm.AccountDB.Process(&types.AccountManagerContext{Action: action, Number: evm.Context.BlockNumber.Uint64()})
 	if evm.vmConfig.ContractLogFlag {
@@ -1050,7 +1050,7 @@ func opDestroyAsset(pc *uint64, evm *EVM, contract *Contract, memory *Memory, st
 	value, assetID := stack.pop(), stack.pop()
 	astID := assetID.Uint64()
 
-	action := types.NewAction(types.DestroyAsset, contract.CallerName, common.Name(evm.chainConfig.AccountName), 0, astID, 0, value, nil)
+	action := types.NewAction(types.DestroyAsset, contract.Name(), common.Name(evm.chainConfig.AccountName), 0, astID, 0, value, nil)
 
 	internalActions, err := evm.AccountDB.Process(&types.AccountManagerContext{Action: action, Number: evm.Context.BlockNumber.Uint64()})
 	if evm.vmConfig.ContractLogFlag {
@@ -1199,7 +1199,7 @@ func executeIssuseAsset(evm *EVM, contract *Contract, desc string) (uint64, erro
 	if err != nil {
 		return 0, err
 	}
-	action := types.NewAction(types.IssueAsset, contract.CallerName, common.Name(evm.chainConfig.AccountName), 0, evm.chainConfig.SysTokenID, 0, big.NewInt(0), b)
+	action := types.NewAction(types.IssueAsset, contract.Name(), common.Name(evm.chainConfig.AccountName), 0, evm.chainConfig.SysTokenID, 0, big.NewInt(0), b)
 
 	internalActions, err := evm.AccountDB.Process(&types.AccountManagerContext{Action: action, Number: evm.Context.BlockNumber.Uint64()})
 	if err != nil {
@@ -1257,7 +1257,7 @@ func execSetAssetOwner(evm *EVM, contract *Contract, assetID uint64, owner commo
 		return err
 	}
 
-	action := types.NewAction(types.SetAssetOwner, contract.CallerName, common.Name(evm.chainConfig.AccountName), 0, evm.chainConfig.SysTokenID, 0, big.NewInt(0), b)
+	action := types.NewAction(types.SetAssetOwner, contract.Name(), common.Name(evm.chainConfig.AccountName), 0, evm.chainConfig.SysTokenID, 0, big.NewInt(0), b)
 	internalActions, err := evm.AccountDB.Process(&types.AccountManagerContext{Action: action, Number: evm.Context.BlockNumber.Uint64()})
 	if evm.vmConfig.ContractLogFlag {
 		errmsg := ""

processor/vm/runtime/runtime_test.go

@@ -194,7 +194,7 @@ func issueAssetAction(ownerName, toName common.Name) *types.Action {
 		panic(err)
 	}
 
-	action := types.NewAction(types.IssueAsset, ownerName, toName, 0, 0, 0, big.NewInt(0), b)
+	action := types.NewAction(types.IssueAsset, ownerName, "fractal.account", 0, 0, 0, big.NewInt(0), b)
 	return action
 }
 
@@ -282,7 +282,7 @@ func TestAsset(t *testing.T) {
 		fmt.Println("asset result ", b)
 	}
 
-	addAssetInput, err := input(abifile, "add", big.NewInt(2), common.BytesToAddress([]byte(senderName.String())), big.NewInt(210000))
+	addAssetInput, err := input(abifile, "add", big.NewInt(2), common.BigToAddress(big.NewInt(4097)), big.NewInt(210000))
 	if err != nil {
 		fmt.Println("addAssetInput error ", err)
 		return
@@ -306,7 +306,7 @@ func TestAsset(t *testing.T) {
 		fmt.Println("asset result ", b)
 	}
 
-	transferExAssetInput, err := input(abifile, "transAsset", common.BytesToAddress([]byte(receiverName.String())), big.NewInt(2), big.NewInt(10000))
+	transferExAssetInput, err := input(abifile, "transAsset", common.BigToAddress(big.NewInt(4098)), big.NewInt(2), big.NewInt(10000))
 	if err != nil {
 		fmt.Println("transferExAssetInput error ", err)
 		return
@@ -320,7 +320,6 @@ func TestAsset(t *testing.T) {
 		fmt.Println("call error ", err)
 		return
 	}
-
 	senderAcc, err = account.GetAccountByName(senderName)
 	if err != nil {
 		fmt.Println("GetAccountByName sender account error", err)
@@ -343,7 +342,7 @@ func TestAsset(t *testing.T) {
 		fmt.Println("asset receiver result ", b)
 	}
 
-	setOwnerInput, err := input(abifile, "setname", common.BytesToAddress([]byte(receiverName.String())), big.NewInt(2))
+	setOwnerInput, err := input(abifile, "setname", common.BigToAddress(big.NewInt(4098)), big.NewInt(2))
 	if err != nil {
 		fmt.Println("setOwnerInput error ", err)
 		return
@@ -357,7 +356,7 @@ func TestAsset(t *testing.T) {
 		return
 	}
 
-	getBalanceInput, err := input(abifile, "getbalance", common.BytesToAddress([]byte(receiverName.String())), big.NewInt(2))
+	getBalanceInput, err := input(abifile, "getbalance", common.BigToAddress(big.NewInt(4098)), big.NewInt(2))
 	if err != nil {
 		fmt.Println("getBalanceInput error ", err)
 		return