change chain Api

Author: huaapp

service/common/bean/bean.go

@@ -31,8 +31,8 @@ type CoreBaseReturn struct {
 	Result  interface{} `json:"result"`
 }
 
-// QueryObjectResult struct
-type QueryObjectResult struct {
+// GetKeyValueResult struct
+type GetKeyValueResult struct {
 	Contract string `json:"contract"`
 	Object   string `json:"object"`
 	Key      string `json:"key"`

service/common/data/chain.go

@@ -37,12 +37,12 @@ const (
 	// BASE_URL BASE_URL
 	BASE_URL = config.BASE_RPC
 	// TX_PARAMS TX_PARAMS
-	TX_PARAMS = "service=bottos&method=CoreApi.PushTrx&request=%s"
+	TX_PARAMS = "service=bottos&method=Chain.SendTransaction&request=%s"
 )
 
 // BlockHeader get block header
 func BlockHeader() (*user_proto.BlockHeader, error) {
-	params := `service=bottos&method=CoreApi.QueryChainInfo&request={}`
+	params := `service=bottos&method=Chain.GetInfo&request={}`
 	resp, err := http.Post(BASE_URL, "application/x-www-form-urlencoded",
 		strings.NewReader(params))
 	if err != nil {
@@ -135,7 +135,7 @@ func PushTransaction(i interface{}) (*bean.CoreCommonReturn, error) {
 
 // AccountInfo get account info
 func AccountInfo(account string) (*user_proto.AccountInfoData, error) {
-	params := `service=bottos&method=CoreApi.QueryAccount&request={"account_name":"%s"}`
+	params := `service=bottos&method=Chain.GetAccount&request={"account_name":"%s"}`
 	resp, err := http.Post(BASE_URL, "application/x-www-form-urlencoded",
 		strings.NewReader(fmt.Sprintf(params, string(account))))
 	if err != nil {
@@ -197,10 +197,10 @@ func AccountInfo(account string) (*user_proto.AccountInfoData, error) {
 	}
 }
 
-// QueryObject get Object
-func QueryObject(contract, object, key string) ([]byte, error) {
-	log.Info("Start QueryObject.")
-	params := `service=bottos&method=CoreApi.QueryObject&request={"contract":"%s","object":"%s","key":"%s"}`
+// GetKeyValue get Object
+func GetKeyValue(contract, object, key string) ([]byte, error) {
+	log.Info("Start GetKeyValue.")
+	params := `service=bottos&method=Chain.GetKeyValue&request={"contract":"%s","object":"%s","key":"%s"}`
 	resp, err := http.Post(BASE_URL, "application/x-www-form-urlencoded",
 		strings.NewReader(fmt.Sprintf(params, contract, object, key)))
 	//strings.NewReader(fmt.Sprintf(params, "bottoscontract", "DTO", "bbb")))
@@ -237,7 +237,7 @@ func QueryObject(contract, object, key string) ([]byte, error) {
 		return nil, err
 	}
 
-	var queryObjectRes = &bean.QueryObjectResult{}
+	var queryObjectRes = &bean.GetKeyValueResult{}
 	err = json.Unmarshal(resultBuf, queryObjectRes)
 	if err != nil {
 		log.Error(err)

service/contract/conApi/main.go

@@ -1,4 +1,4 @@
-/*Copyright 2017~2022 The Bottos Authors
+/*Copyright 2017~2022 The Bottos Authors
   This file is part of the Bottos Service Layer
   Created by Developers Team of Bottos.
 
@@ -55,7 +55,7 @@ func (s *Contract) Query(ctx context.Context, req *api.Request, rsp *api.Respons
 		return err
 	}
 
-	params := `service=bottos&method=CoreApi.QueryAbi&request={"contract":"` + queryRequest.Contract + `"}`
+	params := `service=bottos&method=Chain.GetAbi&request={"contract":"` + queryRequest.Contract + `"}`
 	resp, err := http.Post(data.BASE_URL, "application/x-www-form-urlencoded",
 		strings.NewReader(params))
 	if err != nil {

service/user/main.go

@@ -393,12 +393,13 @@ func (u *User) GetBalance(ctx context.Context, req *user_proto.GetBalanceRequest
 	log.Info("GetBalance src Start!")
 	btoToken := "BTO"
 	dtoToken := "DTO"
-
+	//get BTO Amount
 	accountInfo, err := data.AccountInfo(req.Username)
 	if err != nil {
 		log.Error(err)
 		rsp.Code = 1100
 		rsp.Msg = err.Error()
+		return nil
 	}
 	log.Info(accountInfo.Balance)
 	if accountInfo != nil {
@@ -412,7 +413,8 @@ func (u *User) GetBalance(ctx context.Context, req *user_proto.GetBalanceRequest
 		})
 	}
 
-	dtoAmountByte, err := data.QueryObject("bottostoken", dtoToken, req.Username)
+	//get DTO Amount
+	dtoAmountByte, err := data.GetKeyValue("bottostoken", dtoToken, req.Username)
 
 	if err != nil && !(strings.Contains(err.Error(), "10205")) {
 		log.Error(err)