Commit df6f79f2 authored by heyubin's avatar heyubin

add by hyb for bug

parent 5e850837
This diff is collapsed.
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
package executor package executor
import ( import (
"github.com/33cn/chain33/common/address"
"github.com/33cn/chain33/types" "github.com/33cn/chain33/types"
mty "github.com/33cn/plugin/plugin/dapp/multisig/types" mty "github.com/33cn/plugin/plugin/dapp/multisig/types"
) )
...@@ -73,6 +74,10 @@ func (m *MultiSig) Query_MultiSigAccountInfo(in *mty.ReqMultiSigAccInfo) (types. ...@@ -73,6 +74,10 @@ func (m *MultiSig) Query_MultiSigAccountInfo(in *mty.ReqMultiSigAccInfo) (types.
} }
db := m.GetLocalDB() db := m.GetLocalDB()
addr := in.MultiSigAccAddr addr := in.MultiSigAccAddr
if err := address.CheckAddress(addr); err != nil {
return nil, types.ErrInvalidAddress
}
multiSigAcc, err := getMultiSigAccount(db, addr) multiSigAcc, err := getMultiSigAccount(db, addr)
if err != nil { if err != nil {
return nil, err return nil, err
...@@ -95,6 +100,11 @@ func (m *MultiSig) Query_MultiSigAccTxCount(in *mty.ReqMultiSigAccInfo) (types.M ...@@ -95,6 +100,11 @@ func (m *MultiSig) Query_MultiSigAccTxCount(in *mty.ReqMultiSigAccInfo) (types.M
} }
db := m.GetLocalDB() db := m.GetLocalDB()
addr := in.MultiSigAccAddr addr := in.MultiSigAccAddr
if err := address.CheckAddress(addr); err != nil {
return nil, types.ErrInvalidAddress
}
multiSigAcc, err := getMultiSigAccount(db, addr) multiSigAcc, err := getMultiSigAccount(db, addr)
if err != nil { if err != nil {
return nil, err return nil, err
...@@ -124,6 +134,10 @@ func (m *MultiSig) Query_MultiSigTxids(in *mty.ReqMultiSigTxids) (types.Message, ...@@ -124,6 +134,10 @@ func (m *MultiSig) Query_MultiSigTxids(in *mty.ReqMultiSigTxids) (types.Message,
db := m.GetLocalDB() db := m.GetLocalDB()
addr := in.MultiSigAddr addr := in.MultiSigAddr
if err := address.CheckAddress(addr); err != nil {
return nil, types.ErrInvalidAddress
}
multiSigAcc, err := getMultiSigAccount(db, addr) multiSigAcc, err := getMultiSigAccount(db, addr)
if err != nil { if err != nil {
return nil, err return nil, err
...@@ -167,6 +181,11 @@ func (m *MultiSig) Query_MultiSigTxInfo(in *mty.ReqMultiSigTxInfo) (types.Messag ...@@ -167,6 +181,11 @@ func (m *MultiSig) Query_MultiSigTxInfo(in *mty.ReqMultiSigTxInfo) (types.Messag
db := m.GetLocalDB() db := m.GetLocalDB()
addr := in.MultiSigAddr addr := in.MultiSigAddr
txid := in.TxId txid := in.TxId
if err := address.CheckAddress(addr); err != nil {
return nil, types.ErrInvalidAddress
}
multiSigTx, err := getMultiSigTx(db, addr, txid) multiSigTx, err := getMultiSigTx(db, addr, txid)
if err != nil { if err != nil {
return nil, err return nil, err
...@@ -191,6 +210,11 @@ func (m *MultiSig) Query_MultiSigTxConfirmedWeight(in *mty.ReqMultiSigTxInfo) (t ...@@ -191,6 +210,11 @@ func (m *MultiSig) Query_MultiSigTxConfirmedWeight(in *mty.ReqMultiSigTxInfo) (t
db := m.GetLocalDB() db := m.GetLocalDB()
addr := in.MultiSigAddr addr := in.MultiSigAddr
txid := in.TxId txid := in.TxId
if err := address.CheckAddress(addr); err != nil {
return nil, types.ErrInvalidAddress
}
multiSigTx, err := getMultiSigTx(db, addr, txid) multiSigTx, err := getMultiSigTx(db, addr, txid)
if err != nil { if err != nil {
return nil, err return nil, err
...@@ -223,6 +247,10 @@ func (m *MultiSig) Query_MultiSigAccUnSpentToday(in *mty.ReqAccAssets) (types.Me ...@@ -223,6 +247,10 @@ func (m *MultiSig) Query_MultiSigAccUnSpentToday(in *mty.ReqAccAssets) (types.Me
db := m.GetLocalDB() db := m.GetLocalDB()
addr := in.MultiSigAddr addr := in.MultiSigAddr
isAll := in.IsAll isAll := in.IsAll
if err := address.CheckAddress(addr); err != nil {
return nil, types.ErrInvalidAddress
}
multiSigAcc, err := getMultiSigAccount(db, addr) multiSigAcc, err := getMultiSigAccount(db, addr)
if err != nil { if err != nil {
return nil, err return nil, err
...@@ -291,6 +319,10 @@ func (m *MultiSig) Query_MultiSigAccAssets(in *mty.ReqAccAssets) (types.Message, ...@@ -291,6 +319,10 @@ func (m *MultiSig) Query_MultiSigAccAssets(in *mty.ReqAccAssets) (types.Message,
return nil, types.ErrInvalidParam return nil, types.ErrInvalidParam
} }
if err := address.CheckAddress(in.MultiSigAddr); err != nil {
return nil, types.ErrInvalidAddress
}
replyAccAssets := &mty.ReplyAccAssets{} replyAccAssets := &mty.ReplyAccAssets{}
//获取账户上的所有资产数据 //获取账户上的所有资产数据
if in.IsAll { if in.IsAll {
...@@ -344,6 +376,8 @@ func (m *MultiSig) Query_MultiSigAccAllAddress(in *mty.ReqMultiSigAccInfo) (type ...@@ -344,6 +376,8 @@ func (m *MultiSig) Query_MultiSigAccAllAddress(in *mty.ReqMultiSigAccInfo) (type
if in == nil { if in == nil {
return nil, types.ErrInvalidParam return nil, types.ErrInvalidParam
} }
if err := address.CheckAddress(in.MultiSigAccAddr); err != nil {
return nil, types.ErrInvalidAddress
}
return getMultiSigAccAllAddress(m.GetLocalDB(), in.MultiSigAccAddr) return getMultiSigAccAllAddress(m.GetLocalDB(), in.MultiSigAccAddr)
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment