update 2019/01/26

vendor/github.com/33cn/chain33/build/util/balance.sh

@@ -3,5 +3,5 @@ i=0
 while IFS='' read -r line || [[ -n $line ]]; do
     [ -z "$line" ] && continue
     ((i++))
-    ../chain33-cli account balance -a "$line" -e ticket
+    ../chain33-cli --rpc_laddr https://mainnode.bityuan.com:8801 account balance -a "$line" -e ticket
 done <"$1"

vendor/github.com/33cn/chain33/rpc/client.go

@@ -220,7 +220,7 @@ func (c *channelClient) GetBalance(in *types.ReqBalance) ([]*types.Account, erro
 }
 
 // GetAllExecBalance get balance of exec
-func (c *channelClient) GetAllExecBalance(in *types.ReqAddr) (*types.AllExecBalance, error) {
+func (c *channelClient) GetAllExecBalance(in *types.ReqAllExecBalance) (*types.AllExecBalance, error) {
 	addr := in.Addr
 	err := address.CheckAddress(addr)
 	if err != nil {
@@ -234,8 +234,11 @@ func (c *channelClient) GetAllExecBalance(in *types.ReqAddr) (*types.AllExecBala
 	for _, exec := range types.AllowUserExec {
 		execer := types.ExecName(string(exec))
 		params := &types.ReqBalance{
-			Addresses: addrs,
-			Execer:    execer,
+			Addresses:   addrs,
+			Execer:      execer,
+			StateHash:   in.StateHash,
+			AssetExec:   in.AssetExec,
+			AssetSymbol: in.AssetSymbol,
 		}
 		res, err := c.GetBalance(params)
 		if err != nil {

vendor/github.com/33cn/chain33/rpc/grpchandler.go

@@ -254,7 +254,7 @@ func (g *Grpc) GetBalance(ctx context.Context, in *pb.ReqBalance) (*pb.Accounts,
 }
 
 // GetAllExecBalance get balance of exec
-func (g *Grpc) GetAllExecBalance(ctx context.Context, in *pb.ReqAddr) (*pb.AllExecBalance, error) {
+func (g *Grpc) GetAllExecBalance(ctx context.Context, in *pb.ReqAllExecBalance) (*pb.AllExecBalance, error) {
 	return g.cli.GetAllExecBalance(in)
 }
 

vendor/github.com/33cn/chain33/rpc/jrpchandler.go

@@ -740,7 +740,7 @@ func (c *Chain33) GetBalance(in types.ReqBalance, result *interface{}) error {
 }
 
 // GetAllExecBalance get all balance of exec
-func (c *Chain33) GetAllExecBalance(in types.ReqAddr, result *interface{}) error {
+func (c *Chain33) GetAllExecBalance(in types.ReqAllExecBalance, result *interface{}) error {
 	balance, err := c.cli.GetAllExecBalance(&in)
 	if err != nil {
 		return err

vendor/github.com/33cn/chain33/system/dapp/commands/account.go

@@ -143,18 +143,15 @@ func balance(cmd *cobra.Command, args []string) {
 			return
 		}
 	}
-	if execer == "" {
-		req := types.ReqAddr{Addr: addr}
+	if execer == "" && height == -1 {
+		req := types.ReqAllExecBalance{Addr: addr}
 		var res rpctypes.AllExecBalance
 		ctx := jsonclient.NewRPCCtx(rpcLaddr, "Chain33.GetAllExecBalance", req, &res)
 		ctx.SetResultCb(parseGetAllBalanceRes)
 		ctx.Run()
 		return
 	}
-	if ok := types.IsAllowExecName([]byte(execer), []byte(execer)); !ok {
-		fmt.Fprintln(os.Stderr, types.ErrExecNameNotAllow)
-		return
-	}
+
 	stateHash := ""
 	if height >= 0 {
 		params := types.ReqBlocks{
@@ -173,6 +170,20 @@ func balance(cmd *cobra.Command, args []string) {
 		stateHash = h.StateHash
 	}
 
+	if execer == "" {
+		req := types.ReqAllExecBalance{Addr: addr, StateHash: stateHash}
+		var res rpctypes.AllExecBalance
+		ctx := jsonclient.NewRPCCtx(rpcLaddr, "Chain33.GetAllExecBalance", req, &res)
+		ctx.SetResultCb(parseGetAllBalanceRes)
+		ctx.Run()
+		return
+	}
+
+	if ok := types.IsAllowExecName([]byte(execer), []byte(execer)); !ok {
+		fmt.Fprintln(os.Stderr, types.ErrExecNameNotAllow)
+		return
+	}
+
 	var addrs []string
 	addrs = append(addrs, addr)
 	params := types.ReqBalance{

vendor/github.com/33cn/chain33/system/dapp/manage/executor/rpc_test.go

+package executor
+
+import (
+	"testing"
+
+	rpctypes "github.com/33cn/chain33/rpc/types"
+	"github.com/33cn/chain33/types"
+	"github.com/33cn/chain33/util"
+	"github.com/33cn/chain33/util/testnode"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestManageConfig(t *testing.T) {
+	cfg, sub := testnode.GetDefaultConfig()
+	mocker := testnode.NewWithConfig(cfg, sub, nil)
+	defer mocker.Close()
+	mocker.Listen()
+	err := mocker.SendHot()
+	assert.Nil(t, err)
+	//创建黑名单
+	// -o add -v BTY
+	create := &types.ModifyConfig{
+		Key:   "token-blacklist",
+		Op:    "add",
+		Value: "BTY",
+		Addr:  "",
+	}
+	jsondata := types.MustPBToJSON(create)
+	/*
+	  {
+	  		"execer": "manage",
+	  		"actionName": "Modify",
+	  		"payload": {
+	  			"key": "token-blacklist",
+	  			"value": "BTY",
+	  			"op": "add",
+	  			"addr": ""
+	  		}
+	  	}
+	*/
+	req := &rpctypes.CreateTxIn{
+		Execer:     "manage",
+		ActionName: "Modify",
+		Payload:    jsondata,
+	}
+	var txhex string
+	err = mocker.GetJSONC().Call("Chain33.CreateTransaction", req, &txhex)
+	assert.Nil(t, err)
+	hash, err := mocker.SendAndSign(mocker.GetHotKey(), txhex)
+	assert.Nil(t, err)
+	txinfo, err := mocker.WaitTx(hash)
+	assert.Nil(t, err)
+	assert.Equal(t, txinfo.Receipt.Ty, int32(2))
+
+	create = &types.ModifyConfig{
+		Key:   "token-blacklist",
+		Op:    "add",
+		Value: "YCC",
+		Addr:  "",
+	}
+	jsondata = types.MustPBToJSON(create)
+	req = &rpctypes.CreateTxIn{
+		Execer:     "manage",
+		ActionName: "Modify",
+		Payload:    jsondata,
+	}
+	err = mocker.GetJSONC().Call("Chain33.CreateTransaction", req, &txhex)
+	assert.Nil(t, err)
+	hash, err = mocker.SendAndSign(mocker.GetHotKey(), txhex)
+	assert.Nil(t, err)
+	txinfo, err = mocker.WaitTx(hash)
+	assert.Nil(t, err)
+	assert.Equal(t, txinfo.Receipt.Ty, int32(2))
+
+	create = &types.ModifyConfig{
+		Key:   "token-blacklist",
+		Op:    "add",
+		Value: "TTT",
+		Addr:  "",
+	}
+	jsondata = types.MustPBToJSON(create)
+	req = &rpctypes.CreateTxIn{
+		Execer:     "manage",
+		ActionName: "Modify",
+		Payload:    jsondata,
+	}
+	err = mocker.GetJSONC().Call("Chain33.CreateTransaction", req, &txhex)
+	assert.Nil(t, err)
+	hash, err = mocker.SendAndSign(mocker.GetHotKey(), txhex)
+	assert.Nil(t, err)
+	txinfo, err = mocker.WaitTx(hash)
+	assert.Nil(t, err)
+	assert.Equal(t, txinfo.Receipt.Ty, int32(2))
+	//做一个查询
+	/*
+		{
+			"execer": "manage",
+			"funcName": "GetConfigItem",
+			"payload": {
+				"data": "token-blacklist"
+			}
+		}
+	*/
+	queryreq := &types.ReqString{
+		Data: "token-blacklist",
+	}
+	query := &rpctypes.Query4Jrpc{
+		Execer:   "manage",
+		FuncName: "GetConfigItem",
+		Payload:  types.MustPBToJSON(queryreq),
+	}
+	var reply types.ReplyConfig
+	err = mocker.GetJSONC().Call("Chain33.Query", query, &reply)
+	assert.Nil(t, err)
+	assert.Equal(t, reply.Key, "token-blacklist")
+	assert.Equal(t, reply.Value, "[BTY YCC TTT]")
+
+	create = &types.ModifyConfig{
+		Key:   "token-blacklist",
+		Op:    "delete",
+		Value: "TTT",
+		Addr:  "",
+	}
+	jsondata = types.MustPBToJSON(create)
+	req = &rpctypes.CreateTxIn{
+		Execer:     "manage",
+		ActionName: "Modify",
+		Payload:    jsondata,
+	}
+	err = mocker.GetJSONC().Call("Chain33.CreateTransaction", req, &txhex)
+	assert.Nil(t, err)
+	hash, err = mocker.SendAndSign(mocker.GetHotKey(), txhex)
+	assert.Nil(t, err)
+	txinfo, err = mocker.WaitTx(hash)
+	assert.Nil(t, err)
+	util.JSONPrint(t, txinfo)
+	assert.Equal(t, txinfo.Receipt.Ty, int32(2))
+
+	queryreq = &types.ReqString{
+		Data: "token-blacklist",
+	}
+	query = &rpctypes.Query4Jrpc{
+		Execer:   "manage",
+		FuncName: "GetConfigItem",
+		Payload:  types.MustPBToJSON(queryreq),
+	}
+	err = mocker.GetJSONC().Call("Chain33.Query", query, &reply)
+	assert.Nil(t, err)
+	assert.Equal(t, reply.Key, "token-blacklist")
+	assert.Equal(t, reply.Value, "[BTY YCC]")
+}
+
+func TestTokenFinisher(t *testing.T) {
+	cfg, sub := testnode.GetDefaultConfig()
+	mocker := testnode.NewWithConfig(cfg, sub, nil)
+	defer mocker.Close()
+	mocker.Listen()
+	err := mocker.SendHot()
+	assert.Nil(t, err)
+	//添加发币审核地址
+	create := &types.ModifyConfig{
+		Key:   "token-finisher",
+		Op:    "add",
+		Value: "1FCX9XJTZXvZteagTrefJEBPZMt8BFmdoi",
+		Addr:  "",
+	}
+	jsondata := types.MustPBToJSON(create)
+	/*
+	  {
+	  		"execer": "manage",
+	  		"actionName": "Modify",
+	  		"payload": {
+	  			"key": "token-finisher",
+	  			"value": "1FCX9XJTZXvZteagTrefJEBPZMt8BFmdoi",
+	  			"op": "add",
+	  			"addr": ""
+	  		}
+	  	}
+	*/
+	req := &rpctypes.CreateTxIn{
+		Execer:     "manage",
+		ActionName: "Modify",
+		Payload:    jsondata,
+	}
+	var txhex string
+	err = mocker.GetJSONC().Call("Chain33.CreateTransaction", req, &txhex)
+	assert.Nil(t, err)
+	hash, err := mocker.SendAndSign(mocker.GetHotKey(), txhex)
+	assert.Nil(t, err)
+	txinfo, err := mocker.WaitTx(hash)
+	assert.Nil(t, err)
+	assert.Equal(t, txinfo.Receipt.Ty, int32(2))
+
+	queryreq := &types.ReqString{
+		Data: "token-finisher",
+	}
+	query := &rpctypes.Query4Jrpc{
+		Execer:   "manage",
+		FuncName: "GetConfigItem",
+		Payload:  types.MustPBToJSON(queryreq),
+	}
+	var reply types.ReplyConfig
+	err = mocker.GetJSONC().Call("Chain33.Query", query, &reply)
+	assert.Nil(t, err)
+	assert.Equal(t, reply.Key, "token-finisher")
+	assert.Equal(t, reply.Value, "[1FCX9XJTZXvZteagTrefJEBPZMt8BFmdoi]")
+}

vendor/github.com/33cn/chain33/types/account.pb.go

@@ -406,6 +406,79 @@ func (m *AllExecBalance) GetExecAccount() []*ExecAccount {
 	return nil
 }
 
+type ReqAllExecBalance struct {
+	//地址列表
+	Addr string `protobuf:"bytes,1,opt,name=addr,proto3" json:"addr,omitempty"`
+	//执行器名称
+	Execer               string   `protobuf:"bytes,2,opt,name=execer,proto3" json:"execer,omitempty"`
+	StateHash            string   `protobuf:"bytes,3,opt,name=stateHash,proto3" json:"stateHash,omitempty"`
+	AssetExec            string   `protobuf:"bytes,4,opt,name=asset_exec,json=assetExec,proto3" json:"asset_exec,omitempty"`
+	AssetSymbol          string   `protobuf:"bytes,5,opt,name=asset_symbol,json=assetSymbol,proto3" json:"asset_symbol,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ReqAllExecBalance) Reset()         { *m = ReqAllExecBalance{} }
+func (m *ReqAllExecBalance) String() string { return proto.CompactTextString(m) }
+func (*ReqAllExecBalance) ProtoMessage()    {}
+func (*ReqAllExecBalance) Descriptor() ([]byte, []int) {
+	return fileDescriptor_8e28828dcb8d24f0, []int{7}
+}
+
+func (m *ReqAllExecBalance) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ReqAllExecBalance.Unmarshal(m, b)
+}
+func (m *ReqAllExecBalance) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ReqAllExecBalance.Marshal(b, m, deterministic)
+}
+func (m *ReqAllExecBalance) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReqAllExecBalance.Merge(m, src)
+}
+func (m *ReqAllExecBalance) XXX_Size() int {
+	return xxx_messageInfo_ReqAllExecBalance.Size(m)
+}
+func (m *ReqAllExecBalance) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReqAllExecBalance.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ReqAllExecBalance proto.InternalMessageInfo
+
+func (m *ReqAllExecBalance) GetAddr() string {
+	if m != nil {
+		return m.Addr
+	}
+	return ""
+}
+
+func (m *ReqAllExecBalance) GetExecer() string {
+	if m != nil {
+		return m.Execer
+	}
+	return ""
+}
+
+func (m *ReqAllExecBalance) GetStateHash() string {
+	if m != nil {
+		return m.StateHash
+	}
+	return ""
+}
+
+func (m *ReqAllExecBalance) GetAssetExec() string {
+	if m != nil {
+		return m.AssetExec
+	}
+	return ""
+}
+
+func (m *ReqAllExecBalance) GetAssetSymbol() string {
+	if m != nil {
+		return m.AssetSymbol
+	}
+	return ""
+}
+
 func init() {
 	proto.RegisterType((*Account)(nil), "types.Account")
 	proto.RegisterType((*ReceiptExecAccountTransfer)(nil), "types.ReceiptExecAccountTransfer")
@@ -414,35 +487,37 @@ func init() {
 	proto.RegisterType((*Accounts)(nil), "types.Accounts")
 	proto.RegisterType((*ExecAccount)(nil), "types.ExecAccount")
 	proto.RegisterType((*AllExecBalance)(nil), "types.AllExecBalance")
+	proto.RegisterType((*ReqAllExecBalance)(nil), "types.ReqAllExecBalance")
 }
 
 func init() { proto.RegisterFile("account.proto", fileDescriptor_8e28828dcb8d24f0) }
 
 var fileDescriptor_8e28828dcb8d24f0 = []byte{
-	// 399 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0xc1, 0x8e, 0xd3, 0x30,
-	0x10, 0x95, 0x9b, 0x76, 0xb3, 0x99, 0xc2, 0x1e, 0x7c, 0x58, 0x59, 0x2b, 0x56, 0x84, 0x9c, 0x72,
-	0x40, 0xa9, 0x44, 0xf8, 0x81, 0x56, 0x42, 0xe2, 0x86, 0x64, 0x38, 0xf5, 0x82, 0x1c, 0x77, 0x4a,
-	0x2b, 0xd2, 0x24, 0xd8, 0x2e, 0xa2, 0x7c, 0x00, 0x1f, 0xc2, 0x97, 0x22, 0x4f, 0x9d, 0x36, 0xa5,
-	0x02, 0xed, 0xad, 0xf3, 0xde, 0xcc, 0xbc, 0xe7, 0xd7, 0x09, 0x3c, 0x57, 0x5a, 0xb7, 0xfb, 0xc6,
-	0x15, 0x9d, 0x69, 0x5d, 0xcb, 0x27, 0xee, 0xd0, 0xa1, 0xcd, 0xbe, 0x42, 0x3c, 0x3f, 0xe2, 0xfc,
-	0x01, 0x6e, 0xf5, 0xde, 0x18, 0x6c, 0xf4, 0x41, 0xb0, 0x94, 0xe5, 0x13, 0x79, 0xaa, 0xb9, 0x80,
-	0xb8, 0x52, 0xb5, 0x6a, 0x34, 0x8a, 0x51, 0xca, 0xf2, 0x48, 0xf6, 0x25, 0xbf, 0x87, 0x9b, 0xb5,
-	0x69, 0x7f, 0x62, 0x23, 0x22, 0x22, 0x42, 0xc5, 0x39, 0x8c, 0xd5, 0x6a, 0x65, 0xc4, 0x38, 0x65,
-	0x79, 0x22, 0xe9, 0x77, 0xf6, 0x8b, 0xc1, 0x83, 0x44, 0x8d, 0xdb, 0xce, 0xbd, 0xfb, 0x81, 0x3a,
-	0x08, 0x7f, 0x32, 0xaa, 0xb1, 0x6b, 0x34, 0xde, 0x00, 0x7a, 0xd8, 0x8f, 0x31, 0x1a, 0x3b, 0xd5,
-	0x3c, 0x83, 0x71, 0x67, 0xf0, 0x3b, 0xa9, 0x4f, 0xdf, 0xdc, 0x15, 0xe4, 0xbe, 0x08, 0x1b, 0x24,
-	0x71, 0x3c, 0x87, 0xf8, 0x68, 0xd8, 0x91, 0x97, 0xeb, 0xb6, 0x9e, 0xce, 0xd6, 0x70, 0x1f, 0x7c,
-	0xfc, 0xed, 0xa1, 0xd7, 0x61, 0x4f, 0xd3, 0x19, 0xfd, 0x5f, 0xe7, 0x37, 0x03, 0x90, 0xf8, 0x6d,
-	0x11, 0xb2, 0x7a, 0x01, 0x89, 0xcf, 0x01, 0xad, 0x45, 0x2b, 0x58, 0x1a, 0xe5, 0x89, 0x3c, 0x03,
-	0x3e, 0x49, 0xff, 0x5c, 0x34, 0xb4, 0x35, 0x91, 0xa1, 0xf2, 0x53, 0xd6, 0x29, 0x87, 0xef, 0x95,
-	0xdd, 0xd0, 0xc3, 0x12, 0x79, 0x06, 0xf8, 0x23, 0x80, 0xb2, 0x16, 0xdd, 0x67, 0xdf, 0x1d, 0xd2,
-	0x4e, 0x08, 0xf1, 0x11, 0xf3, 0x57, 0xf0, 0xec, 0x48, 0xdb, 0xc3, 0xae, 0x6a, 0x6b, 0x31, 0xa1,
-	0x86, 0x29, 0x61, 0x1f, 0x09, 0xca, 0x5e, 0xc3, 0x6d, 0x30, 0x6e, 0x79, 0x0a, 0x91, 0xd2, 0x9a,
-	0xbc, 0x5d, 0x3f, 0xcb, 0x53, 0xd9, 0x07, 0x98, 0x0e, 0xfe, 0xbb, 0x81, 0x69, 0x76, 0x61, 0x3a,
-	0x87, 0x38, 0xdc, 0xdb, 0xbf, 0x32, 0x0a, 0x74, 0xb6, 0x84, 0xbb, 0x79, 0x5d, 0xfb, 0x9d, 0x7d,
-	0x4c, 0xfd, 0xe9, 0xb0, 0xf3, 0xe9, 0xf0, 0xb7, 0x17, 0xb2, 0x62, 0x44, 0x06, 0x79, 0xd8, 0x39,
-	0x60, 0xe4, 0xb0, 0x6d, 0xf1, 0x72, 0xf9, 0xf8, 0x65, 0xeb, 0x36, 0xfb, 0xaa, 0xd0, 0xed, 0x6e,
-	0x56, 0x96, 0xba, 0x99, 0xe9, 0x8d, 0xda, 0x36, 0x65, 0x39, 0xa3, 0xc9, 0xea, 0x86, 0x3e, 0x86,
-	0xf2, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb3, 0x61, 0x7c, 0x60, 0x1d, 0x03, 0x00, 0x00,
+	// 414 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x53, 0xc1, 0x6e, 0xd3, 0x40,
+	0x10, 0xd5, 0xc6, 0x49, 0x5d, 0x4f, 0xa0, 0x12, 0x7b, 0xa8, 0x56, 0x15, 0x15, 0x66, 0x4f, 0x3e,
+	0x20, 0x47, 0xc2, 0xfc, 0x40, 0x2b, 0x21, 0x71, 0x43, 0x5a, 0x38, 0xf5, 0x82, 0xd6, 0xdb, 0x09,
+	0x89, 0x70, 0x6d, 0x77, 0x77, 0x83, 0x08, 0x1f, 0xc0, 0x6f, 0x20, 0xf1, 0xa5, 0x68, 0x27, 0xeb,
+	0xc6, 0x25, 0x02, 0xe5, 0xc6, 0x2d, 0xf3, 0xde, 0xec, 0xbc, 0x37, 0x2f, 0x63, 0x78, 0xaa, 0x8d,
+	0xe9, 0x36, 0xad, 0x2f, 0x7b, 0xdb, 0xf9, 0x8e, 0xcf, 0xfc, 0xb6, 0x47, 0x27, 0xbf, 0x40, 0x7a,
+	0xb5, 0xc3, 0xf9, 0x05, 0x9c, 0x9a, 0x8d, 0xb5, 0xd8, 0x9a, 0xad, 0x60, 0x39, 0x2b, 0x66, 0xea,
+	0xa1, 0xe6, 0x02, 0xd2, 0x5a, 0x37, 0xba, 0x35, 0x28, 0x26, 0x39, 0x2b, 0x12, 0x35, 0x94, 0xfc,
+	0x1c, 0x4e, 0x96, 0xb6, 0xfb, 0x8e, 0xad, 0x48, 0x88, 0x88, 0x15, 0xe7, 0x30, 0xd5, 0xb7, 0xb7,
+	0x56, 0x4c, 0x73, 0x56, 0x64, 0x8a, 0x7e, 0xcb, 0x1f, 0x0c, 0x2e, 0x14, 0x1a, 0x5c, 0xf7, 0xfe,
+	0xed, 0x37, 0x34, 0x51, 0xf8, 0xa3, 0xd5, 0xad, 0x5b, 0xa2, 0x0d, 0x06, 0x30, 0xc0, 0xe1, 0x19,
+	0xa3, 0x67, 0x0f, 0x35, 0x97, 0x30, 0xed, 0x2d, 0x7e, 0x25, 0xf5, 0xf9, 0xeb, 0xb3, 0x92, 0xdc,
+	0x97, 0x71, 0x82, 0x22, 0x8e, 0x17, 0x90, 0xee, 0x0c, 0x7b, 0xf2, 0x72, 0xd8, 0x36, 0xd0, 0x72,
+	0x09, 0xe7, 0xd1, 0xc7, 0x9f, 0x1e, 0x06, 0x1d, 0x76, 0x9c, 0xce, 0xe4, 0xdf, 0x3a, 0xbf, 0x18,
+	0x80, 0xc2, 0xfb, 0xeb, 0x98, 0xd5, 0x73, 0xc8, 0x42, 0x0e, 0xe8, 0x1c, 0x3a, 0xc1, 0xf2, 0xa4,
+	0xc8, 0xd4, 0x1e, 0x08, 0x49, 0x86, 0x75, 0xd1, 0xd2, 0xd4, 0x4c, 0xc5, 0x2a, 0xbc, 0x72, 0x5e,
+	0x7b, 0x7c, 0xa7, 0xdd, 0x8a, 0x16, 0xcb, 0xd4, 0x1e, 0xe0, 0x97, 0x00, 0xda, 0x39, 0xf4, 0x9f,
+	0x42, 0x77, 0x4c, 0x3b, 0x23, 0x24, 0x44, 0xcc, 0x5f, 0xc2, 0x93, 0x1d, 0xed, 0xb6, 0x77, 0x75,
+	0xd7, 0x88, 0x19, 0x35, 0xcc, 0x09, 0xfb, 0x40, 0x90, 0x7c, 0x05, 0xa7, 0xd1, 0xb8, 0xe3, 0x39,
+	0x24, 0xda, 0x18, 0xf2, 0x76, 0xb8, 0x56, 0xa0, 0xe4, 0x7b, 0x98, 0x8f, 0xfe, 0xbb, 0x91, 0x69,
+	0xf6, 0xc8, 0x74, 0x01, 0x69, 0xbc, 0xb7, 0xbf, 0x65, 0x14, 0x69, 0x79, 0x03, 0x67, 0x57, 0x4d,
+	0x13, 0x66, 0x0e, 0x31, 0x0d, 0xa7, 0xc3, 0xf6, 0xa7, 0xc3, 0xdf, 0x3c, 0x92, 0x15, 0x13, 0x32,
+	0xc8, 0xe3, 0xcc, 0x11, 0xa3, 0xc6, 0x6d, 0xf2, 0x27, 0x83, 0x67, 0x0a, 0xef, 0x8f, 0x98, 0xff,
+	0x9f, 0xc2, 0xbf, 0x7e, 0x71, 0x73, 0xf9, 0x79, 0xed, 0x57, 0x9b, 0xba, 0x34, 0xdd, 0xdd, 0xa2,
+	0xaa, 0x4c, 0xbb, 0x30, 0x2b, 0xbd, 0x6e, 0xab, 0x6a, 0x41, 0xbb, 0xd5, 0x27, 0xf4, 0xb9, 0x56,
+	0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xf3, 0x95, 0x98, 0xa9, 0xbf, 0x03, 0x00, 0x00,
 }

vendor/github.com/33cn/chain33/types/mocks/chain33client.go

@@ -313,7 +313,7 @@ func (_m *Chain33Client) GetAddrOverview(ctx context.Context, in *types.ReqAddr,
 }
 
 // GetAllExecBalance provides a mock function with given fields: ctx, in, opts
-func (_m *Chain33Client) GetAllExecBalance(ctx context.Context, in *types.ReqAddr, opts ...grpc.CallOption) (*types.AllExecBalance, error) {
+func (_m *Chain33Client) GetAllExecBalance(ctx context.Context, in *types.ReqAllExecBalance, opts ...grpc.CallOption) (*types.AllExecBalance, error) {
 	_va := make([]interface{}, len(opts))
 	for _i := range opts {
 		_va[_i] = opts[_i]
@@ -324,7 +324,7 @@ func (_m *Chain33Client) GetAllExecBalance(ctx context.Context, in *types.ReqAdd
 	ret := _m.Called(_ca...)
 
 	var r0 *types.AllExecBalance
-	if rf, ok := ret.Get(0).(func(context.Context, *types.ReqAddr, ...grpc.CallOption) *types.AllExecBalance); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *types.ReqAllExecBalance, ...grpc.CallOption) *types.AllExecBalance); ok {
 		r0 = rf(ctx, in, opts...)
 	} else {
 		if ret.Get(0) != nil {
@@ -333,7 +333,7 @@ func (_m *Chain33Client) GetAllExecBalance(ctx context.Context, in *types.ReqAdd
 	}
 
 	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, *types.ReqAddr, ...grpc.CallOption) error); ok {
+	if rf, ok := ret.Get(1).(func(context.Context, *types.ReqAllExecBalance, ...grpc.CallOption) error); ok {
 		r1 = rf(ctx, in, opts...)
 	} else {
 		r1 = ret.Error(1)

vendor/github.com/33cn/chain33/types/proto/account.proto

@@ -58,3 +58,13 @@ message AllExecBalance {
     string   addr                    = 1;
     repeated ExecAccount ExecAccount = 2;
 }
+
+message ReqAllExecBalance {
+    //地址列表
+    string addr = 1;
+    //执行器名称
+    string execer       = 2;
+    string stateHash    = 3;
+    string asset_exec   = 4;
+    string asset_symbol = 5;
+}
\ No newline at end of file

vendor/github.com/33cn/chain33/types/proto/rpc.proto

@@ -135,7 +135,7 @@ service chain33 {
     rpc CloseQueue(ReqNil) returns (Reply) {}
 
     //获取地址所以合约下的余额
-    rpc GetAllExecBalance(ReqAddr) returns (AllExecBalance) {}
+    rpc GetAllExecBalance(ReqAllExecBalance) returns (AllExecBalance) {}
     //签名交易
     rpc SignRawTx(ReqSignRawTx) returns (ReplySignRawTx) {}