update

plugin/dapp/zksync/commands/query.go

@@ -557,23 +557,26 @@ func getL2TotalDepositCmd() *cobra.Command {
 func getL2TotalDepositFlag(cmd *cobra.Command) {
 	cmd.Flags().Int32P("tokenId", "t", 0, "token id")
 	_ = cmd.MarkFlagRequired("tokenId")
+	cmd.Flags().Uint32P("decimal", "d", 0, "1:show with token's decimal, 0: real value")
 }
 
 func getL2TotalDeposit(cmd *cobra.Command, args []string) {
 	rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
 	tokenId, _ := cmd.Flags().GetInt32("tokenId")
+	decimal, _ := cmd.Flags().GetUint32("decimal")
 
 	var params rpctypes.Query4Jrpc
 
 	params.Execer = zt.Zksync
 	req := &zt.ZkQueryReq{
 		TokenId: uint64(tokenId),
+		Decimal: decimal,
 	}
 
 	params.FuncName = "GetTotalDeposit"
 	params.Payload = types.MustPBToJSON(req)
 
-	var resp zt.ZkTotalDeposit
+	var resp zt.TokenBalance
 	ctx := jsonclient.NewRPCCtx(rpcLaddr, "Chain33.Query", params, &resp)
 	ctx.Run()
 }

plugin/dapp/zksync/executor/query.go

@@ -420,13 +420,6 @@ func (z *zksync) Query_GetTotalDeposit(in *zt.ZkQueryReq) (types.Message, error)
 	if in == nil {
 		return nil, types.ErrInvalidParam
 	}
-	//根据id查询symbol
-	idStr := new(big.Int).SetUint64(in.TokenId).String()
-	info, err := GetTokenByTokenId(z.GetStateDB(), idStr)
-	if err != nil {
-		return nil, err
-	}
-
 	totalBalance := new(big.Int)
 	lastAccountID, err := getLatestAccountID(z.GetStateDB())
 	if err != nil {
@@ -439,6 +432,5 @@ func (z *zksync) Query_GetTotalDeposit(in *zt.ZkQueryReq) (types.Message, error)
 			totalBalance = new(big.Int).Add(totalBalance, balance)
 		}
 	}
-
-	return &zt.ZkTotalDeposit{TokenId: info.Id, Symbol: info.Symbol, Decimal: info.Decimal, Balance: totalBalance.String()}, nil
+	return &zt.TokenBalance{TokenId: in.TokenId, Balance: decimalVal(totalBalance.String(), in.Decimal)}, nil
 }

plugin/dapp/zksync/proto/zksync.proto

@@ -528,10 +528,3 @@ message Priority2QueueId {
 }
 
 service zksync{}
-
-message ZkTotalDeposit {
-  string tokenId = 1;
-  string symbol  = 2;
-  uint32 decimal = 3;
-  string balance = 4;
-}