Skip to content

P
plugin
Commit 8898b5a7 authored by vipwzw's avatar vipwzw
Browse files
Options

update chain33 to master

parent ed27051b
Show whitespace changes
Inline Side-by-side
Showing with 204 additions and 205 deletions
plugin/dapp/paracross/commands/paracross.go
View file @ 8898b5a7
......@@ -125,7 +125,7 @@ func createAssetTx(cmd *cobra.Command, isWithdraw bool) (string, error) {
To: toAddr,
Amount: amountInt64,
Fee: 0,
Note: note,
Note: []byte(note),
IsWithdraw: isWithdraw,
IsToken: false,
TokenSymbol: symbol,
......@@ -267,7 +267,7 @@ func createTransferTx(cmd *cobra.Command, isWithdraw bool) (string, error) {
To: toAddr,
Amount: amountInt64,
Fee: 0,
Note: note,
Note: []byte(note),
IsWithdraw: isWithdraw,
IsToken: false,
TokenSymbol: symbol,
......
plugin/dapp/privacy/wallet/privacy.go
View file @ 8898b5a7
......@@ -592,7 +592,7 @@ func (policy *privacyPolicy) createPublic2PrivacyTx(req *types.ReqCreateTransact
value := &privacytypes.Public2Privacy{
Tokenname: req.Tokenname,
Amount: amount,
Note: req.GetNote(),
Note: string(req.GetNote()),
Output: privacyOutput,
}
......@@ -662,7 +662,7 @@ func (policy *privacyPolicy) createPrivacy2PrivacyTx(req *types.ReqCreateTransac
value := &privacytypes.Privacy2Privacy{
Tokenname: req.GetTokenname(),
Amount: req.GetAmount(),
Note: req.GetNote(),
Note: string(req.GetNote()),
Input: privacyInput,
Output: privacyOutput,
}
......@@ -731,7 +731,7 @@ func (policy *privacyPolicy) createPrivacy2PublicTx(req *types.ReqCreateTransact
value := &privacytypes.Privacy2Public{
Tokenname: req.GetTokenname(),
Amount: req.GetAmount(),
Note: req.GetNote(),
Note: string(req.GetNote()),
Input: privacyInput,
Output: privacyOutput,
}
......
plugin/dapp/token/commands/token.go
View file @ 8898b5a7
......@@ -248,7 +248,6 @@ func tokenAssets(cmd *cobra.Command, args []string) {
Address: addr,
Execer: execer,
}
var params rpctypes.Query4Jrpc
params.Execer = getRealExecName(paraName, "token")
params.FuncName = "GetAccountTokenAssets"
......
plugin/dapp/token/commands/utils.go
View file @ 8898b5a7
......@@ -30,11 +30,11 @@ func CreateRawTx(cmd *cobra.Command, to string, amount float64, note string, isW
var tx *types.Transaction
transfer := &tokenty.TokenAction{}
if !isWithdraw {
v := &tokenty.TokenAction_Transfer{Transfer: &types.AssetsTransfer{Cointoken: tokenSymbol, Amount: amountInt64, Note: note, To: to}}
v := &tokenty.TokenAction_Transfer{Transfer: &types.AssetsTransfer{Cointoken: tokenSymbol, Amount: amountInt64, Note: []byte(note), To: to}}
transfer.Value = v
transfer.Ty = tokenty.ActionTransfer
} else {
v := &tokenty.TokenAction_Withdraw{Withdraw: &types.AssetsWithdraw{Cointoken: tokenSymbol, Amount: amountInt64, Note: note}}
v := &tokenty.TokenAction_Withdraw{Withdraw: &types.AssetsWithdraw{Cointoken: tokenSymbol, Amount: amountInt64, Note: []byte(note)}}
transfer.Value = v
transfer.Ty = tokenty.ActionWithdraw
}
......
vendor/github.com/33cn/chain33/client/mock_wallet_test.go
View file @ 8898b5a7
......@@ -53,7 +53,7 @@ func (m *mockWallet) SetQueueClient(q queue.Queue) {
}
case types.EventWalletSendToAddress:
if req, ok := msg.GetData().(*types.ReqWalletSendToAddress); ok {
if req.Note == "case1" {
if string(req.Note) == "case1" {
msg.Reply(client.NewMessage(walletKey, types.EventReplyHashes, &types.Transaction{}))
} else {
msg.Reply(client.NewMessage(walletKey, types.EventReplyHashes, &types.ReplyHash{}))
......
vendor/github.com/33cn/chain33/client/queueprotocol_test.go
View file @ 8898b5a7
......@@ -436,7 +436,7 @@ func testWalletSendToAddress(t *testing.T, api client.QueueProtocolAPI) {
if err == nil {
t.Error("WalletSendToAddress(nil) need return error.")
}
_, err = api.WalletSendToAddress(&types.ReqWalletSendToAddress{Note: "case1"})
_, err = api.WalletSendToAddress(&types.ReqWalletSendToAddress{Note: []byte("case1")})
if err == nil {
t.Error("WalletSendToAddress(&types.ReqWalletSendToAddress{Note:\"case1\"}) need return error.")
}
......
vendor/github.com/33cn/chain33/cmd/tools/strategy/updateinit.go
View file @ 8898b5a7
......@@ -75,7 +75,7 @@ import (
_ "${packname}/consensus/init" //consensus init
_ "${packname}/crypto/init" //crypto init
_ "${packname}/dapp/init" //dapp init
_ "${packname}/store/init //store init"
_ "${packname}/store/init" //store init
)`)
data = bytes.Replace(data, []byte("${packname}"), []byte(packname), -1)
ioutil.WriteFile(path, data, 0666)
......
vendor/github.com/33cn/chain33/cmd/write/write.go
View file @ 8898b5a7
......@@ -158,7 +158,7 @@ func scanWrite() {
continue
}
var noteTx types.Transaction
txBytes, err := common.FromHex(action.GetTransfer().Note)
txBytes, err := common.FromHex(string(action.GetTransfer().Note))
if err != nil {
fmt.Fprintln(os.Stderr, "not a user data tx")
continue
......
vendor/github.com/33cn/chain33/rpc/client_test.go
View file @ 8898b5a7
......@@ -85,7 +85,7 @@ func testCreateRawTransactionCoinTransfer(t *testing.T) {
IsToken: false,
IsWithdraw: false,
To: "to",
Note: "note",
Note: []byte("note"),
}
//v := &cty.CoinsAction_Transfer{
......@@ -125,7 +125,7 @@ func testCreateRawTransactionCoinTransferExec(t *testing.T) {
IsToken: false,
IsWithdraw: false,
To: "to",
Note: "note",
Note: []byte("note"),
}
client := newTestChannelClient()
......@@ -152,7 +152,7 @@ func testCreateRawTransactionCoinWithdraw(t *testing.T) {
IsToken: false,
IsWithdraw: true,
To: "to",
Note: "note",
Note: []byte("note"),
}
client := newTestChannelClient()
......
vendor/github.com/33cn/chain33/rpc/jrpchandler_test.go
View file @ 8898b5a7
......@@ -391,7 +391,7 @@ func TestChain33_CreateRawTransaction(t *testing.T) {
To: "qew",
Amount: 10,
Fee: 1,
Note: "12312",
Note: []byte("12312"),
IsWithdraw: false,
IsToken: false,
TokenSymbol: "",
......
vendor/github.com/33cn/chain33/system/dapp/commands/bty.go
View file @ 8898b5a7
......@@ -371,7 +371,7 @@ func createPub2PrivTx(cmd *cobra.Command, args []string) {
Tokenname: tokenname,
Type: types.PrivacyTypePublic2Privacy,
Amount: amount,
Note: note,
Note: []byte(note),
Pubkeypair: pubkeypair,
Expire: expire,
}
......@@ -431,7 +431,7 @@ func createPriv2PrivTx(cmd *cobra.Command, args []string) {
Tokenname: tokenname,
Type: types.PrivacyTypePrivacy2Privacy,
Amount: amount,
Note: note,
Note: []byte(note),
Pubkeypair: pubkeypair,
From: sender,
Mixcount: defaultPrivacyMixCount,
......@@ -493,7 +493,7 @@ func createPriv2PubTx(cmd *cobra.Command, args []string) {
Tokenname: tokenname,
Type: types.PrivacyTypePrivacy2Public,
Amount: amount,
Note: note,
Note: []byte(note),
From: from,
To: to,
Mixcount: defaultPrivacyMixCount,
......
vendor/github.com/33cn/chain33/system/dapp/commands/types/utils.go
View file @ 8898b5a7
......@@ -62,7 +62,7 @@ func SendToAddress(rpcAddr string, from string, to string, amount int64, note st
if isWithdraw {
amt = -amount
}
params := types.ReqWalletSendToAddress{From: from, To: to, Amount: amt, Note: note}
params := types.ReqWalletSendToAddress{From: from, To: to, Amount: amt, Note: []byte(note)}
if !isToken {
params.IsToken = false
} else {
......@@ -95,16 +95,16 @@ func CreateRawTx(cmd *cobra.Command, to string, amount float64, note string, isW
transfer := &cty.CoinsAction{}
if !isWithdraw {
if initExecName != "" {
v := &cty.CoinsAction_TransferToExec{TransferToExec: &types.AssetsTransferToExec{Amount: amountInt64, Note: note, ExecName: execName, To: to}}
v := &cty.CoinsAction_TransferToExec{TransferToExec: &types.AssetsTransferToExec{Amount: amountInt64, Note: []byte(note), ExecName: execName, To: to}}
transfer.Value = v
transfer.Ty = cty.CoinsActionTransferToExec
} else {
v := &cty.CoinsAction_Transfer{Transfer: &types.AssetsTransfer{Amount: amountInt64, Note: note, To: to}}
v := &cty.CoinsAction_Transfer{Transfer: &types.AssetsTransfer{Amount: amountInt64, Note: []byte(note), To: to}}
transfer.Value = v
transfer.Ty = cty.CoinsActionTransfer
}
} else {
v := &cty.CoinsAction_Withdraw{Withdraw: &types.AssetsWithdraw{Amount: amountInt64, Note: note, ExecName: execName}}
v := &cty.CoinsAction_Withdraw{Withdraw: &types.AssetsWithdraw{Amount: amountInt64, Note: []byte(note), ExecName: execName}}
transfer.Value = v
transfer.Ty = cty.CoinsActionWithdraw
}
......
vendor/github.com/33cn/chain33/types/proto/transaction.proto
View file @ 8898b5a7
......@@ -14,7 +14,7 @@ message AssetsGenesis {
message AssetsTransferToExec {
string cointoken = 1;
int64 amount = 2;
string note = 3;
bytes note = 3;
string execName = 4;
string to = 5;
}
......@@ -22,7 +22,7 @@ message AssetsTransferToExec {
message AssetsWithdraw {
string cointoken = 1;
int64 amount = 2;
string note = 3;
bytes note = 3;
string execName = 4;
string to = 5;
}
......@@ -30,7 +30,7 @@ message AssetsWithdraw {
message AssetsTransfer {
string cointoken = 1;
int64 amount = 2;
string note = 3;
bytes note = 3;
string to = 4;
}
......@@ -44,7 +44,7 @@ message CreateTx {
string to = 1;
int64 amount = 2;
int64 fee = 3;
string note = 4;
bytes note = 4;
bool isWithdraw = 5;
bool isToken = 6;
string tokenSymbol = 7;
......
vendor/github.com/33cn/chain33/types/proto/wallet.proto
View file @ 8898b5a7
......@@ -147,7 +147,7 @@ message ReqWalletSendToAddress {
string from = 1;
string to = 2;
int64 amount = 3;
string note = 4;
bytes note = 4;
bool isToken = 5;
string tokenSymbol = 6;
}
......@@ -231,7 +231,7 @@ message ReqCreateTransaction {
// 3：隐私交易 隐私->公开
int32 type = 2;
int64 amount = 3;
string note = 4;
bytes note = 4;
// 普通交易的发送方
string from = 5;
// 普通交易的接收方
......
vendor/github.com/33cn/chain33/types/transaction.pb.go
View file @ 8898b5a7
......@@ -72,7 +72,7 @@ func (m *AssetsGenesis) GetReturnAddress() string {
type AssetsTransferToExec struct {
Cointoken string `protobuf:"bytes,1,opt,name=cointoken,proto3" json:"cointoken,omitempty"`
Amount int64 `protobuf:"varint,2,opt,name=amount,proto3" json:"amount,omitempty"`
Note string `protobuf:"bytes,3,opt,name=note,proto3" json:"note,omitempty"`
Note []byte `protobuf:"bytes,3,opt,name=note,proto3" json:"note,omitempty"`
ExecName string `protobuf:"bytes,4,opt,name=execName,proto3" json:"execName,omitempty"`
To string `protobuf:"bytes,5,opt,name=to,proto3" json:"to,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
......@@ -119,11 +119,11 @@ func (m *AssetsTransferToExec) GetAmount() int64 {
return 0
}
func (m *AssetsTransferToExec) GetNote() string {
func (m *AssetsTransferToExec) GetNote() []byte {
if m != nil {
return m.Note
}
return ""
return nil
}
func (m *AssetsTransferToExec) GetExecName() string {
......@@ -143,7 +143,7 @@ func (m *AssetsTransferToExec) GetTo() string {
type AssetsWithdraw struct {
Cointoken string `protobuf:"bytes,1,opt,name=cointoken,proto3" json:"cointoken,omitempty"`
Amount int64 `protobuf:"varint,2,opt,name=amount,proto3" json:"amount,omitempty"`
Note string `protobuf:"bytes,3,opt,name=note,proto3" json:"note,omitempty"`
Note []byte `protobuf:"bytes,3,opt,name=note,proto3" json:"note,omitempty"`
ExecName string `protobuf:"bytes,4,opt,name=execName,proto3" json:"execName,omitempty"`
To string `protobuf:"bytes,5,opt,name=to,proto3" json:"to,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
......@@ -190,11 +190,11 @@ func (m *AssetsWithdraw) GetAmount() int64 {
return 0
}
func (m *AssetsWithdraw) GetNote() string {
func (m *AssetsWithdraw) GetNote() []byte {
if m != nil {
return m.Note
}
return ""
return nil
}
func (m *AssetsWithdraw) GetExecName() string {
......@@ -214,7 +214,7 @@ func (m *AssetsWithdraw) GetTo() string {
type AssetsTransfer struct {
Cointoken string `protobuf:"bytes,1,opt,name=cointoken,proto3" json:"cointoken,omitempty"`
Amount int64 `protobuf:"varint,2,opt,name=amount,proto3" json:"amount,omitempty"`
Note string `protobuf:"bytes,3,opt,name=note,proto3" json:"note,omitempty"`
Note []byte `protobuf:"bytes,3,opt,name=note,proto3" json:"note,omitempty"`
To string `protobuf:"bytes,4,opt,name=to,proto3" json:"to,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
......@@ -260,11 +260,11 @@ func (m *AssetsTransfer) GetAmount() int64 {
return 0
}
func (m *AssetsTransfer) GetNote() string {
func (m *AssetsTransfer) GetNote() []byte {
if m != nil {
return m.Note
}
return ""
return nil
}
func (m *AssetsTransfer) GetTo() string {
......@@ -333,7 +333,7 @@ type CreateTx struct {
To string `protobuf:"bytes,1,opt,name=to,proto3" json:"to,omitempty"`
Amount int64 `protobuf:"varint,2,opt,name=amount,proto3" json:"amount,omitempty"`
Fee int64 `protobuf:"varint,3,opt,name=fee,proto3" json:"fee,omitempty"`
Note string `protobuf:"bytes,4,opt,name=note,proto3" json:"note,omitempty"`
Note []byte `protobuf:"bytes,4,opt,name=note,proto3" json:"note,omitempty"`
IsWithdraw bool `protobuf:"varint,5,opt,name=isWithdraw,proto3" json:"isWithdraw,omitempty"`
IsToken bool `protobuf:"varint,6,opt,name=isToken,proto3" json:"isToken,omitempty"`
TokenSymbol string `protobuf:"bytes,7,opt,name=tokenSymbol,proto3" json:"tokenSymbol,omitempty"`
......@@ -389,11 +389,11 @@ func (m *CreateTx) GetFee() int64 {
return 0
}
func (m *CreateTx) GetNote() string {
func (m *CreateTx) GetNote() []byte {
if m != nil {
return m.Note
}
return ""
return nil
}
func (m *CreateTx) GetIsWithdraw() bool {
......@@ -2000,7 +2000,7 @@ func init() {
func init() { proto.RegisterFile("transaction.proto", fileDescriptor_2cc4e03d2c28c490) }
var fileDescriptor_2cc4e03d2c28c490 = []byte{
// 1298 bytes of a gzipped FileDescriptorProto
// 1300 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0xdd, 0x8e, 0x13, 0xc7,
0x12, 0xd6, 0xcc, 0xd8, 0x5e, 0xbb, 0x6c, 0x38, 0xec, 0x08, 0x81, 0x85, 0x38, 0xb0, 0xa7, 0xc5,
0x91, 0x10, 0x42, 0x5e, 0x69, 0x97, 0xbb, 0x73, 0xa4, 0x04, 0xd8, 0x08, 0xd0, 0x02, 0x49, 0x1a,
......@@ -2013,74 +2013,74 @@ var fileDescriptor_2cc4e03d2c28c490 = []byte{
0x87, 0xd2, 0x7b, 0x70, 0xa5, 0x40, 0xbd, 0x2a, 0xf2, 0xc7, 0x93, 0x49, 0x81, 0x65, 0x39, 0x4c,
0x76, 0xa2, 0xfb, 0x3d, 0xbe, 0x29, 0x64, 0xbf, 0x45, 0x70, 0xdd, 0xda, 0x1b, 0x1b, 0xff, 0xc7,
0x58, 0x8c, 0xd5, 0x57, 0x15, 0x66, 0xe9, 0x6d, 0xe8, 0x65, 0x4a, 0xe6, 0x5a, 0x7d, 0xc0, 0x7c,
0x18, 0xd1, 0x4f, 0x1b, 0xc1, 0xa5, 0x4e, 0x53, 0x68, 0xe5, 0x4a, 0xa3, 0xf3, 0x45, 0xe7, 0xf4,
0x16, 0x74, 0xb1, 0xc2, 0xec, 0xb5, 0x58, 0xe0, 0xb0, 0x45, 0xf2, 0x1a, 0xa7, 0x57, 0x21, 0xd6,
0x6a, 0xd8, 0x26, 0x69, 0xac, 0x15, 0xfb, 0x25, 0x82, 0xab, 0x36, 0x9c, 0xf7, 0x52, 0xcf, 0x26,
0x85, 0xf8, 0xf8, 0x0f, 0x05, 0xf2, 0xb3, 0x8f, 0xc3, 0x97, 0xe5, 0x6f, 0x8c, 0xc3, 0xfa, 0x6a,
0xd5, 0xbe, 0x0e, 0xa1, 0x4d, 0xbe, 0x8c, 0xb2, 0x09, 0xc8, 0x59, 0xa7, 0xb3, 0x31, 0x5c, 0xae,
0x17, 0x47, 0x6a, 0x4e, 0x86, 0x7b, 0xdc, 0xa1, 0xc0, 0x61, 0x12, 0x3a, 0x64, 0x7f, 0x46, 0xd0,
0x7d, 0x5a, 0xa0, 0xd0, 0x38, 0xae, 0x9c, 0xa7, 0xc8, 0x7b, 0xba, 0x34, 0xca, 0x6b, 0x90, 0x1c,
0x23, 0x3a, 0x4b, 0xe6, 0x58, 0xc7, 0xdd, 0x0a, 0xe2, 0xbe, 0x03, 0x20, 0xeb, 0xbe, 0x50, 0xad,
0xba, 0x3c, 0x90, 0xa4, 0x43, 0xd8, 0x92, 0xe5, 0x98, 0xea, 0xd3, 0xa1, 0x4b, 0x0f, 0xd3, 0x1d,
0xe8, 0x53, 0x99, 0xde, 0xd8, 0x4c, 0xb6, 0xc8, 0x68, 0x28, 0xda, 0xe8, 0x4d, 0x77, 0xb3, 0x37,
0xec, 0x01, 0xdc, 0x70, 0x19, 0x35, 0x23, 0xf2, 0xac, 0x50, 0xab, 0xa5, 0x89, 0x5b, 0x57, 0xe5,
0x30, 0xda, 0x49, 0xee, 0xf7, 0xb8, 0x39, 0xb2, 0x3b, 0xd0, 0x7d, 0x9b, 0x97, 0x72, 0x9a, 0x8f,
0x2b, 0x93, 0xc3, 0x44, 0x68, 0x41, 0xf9, 0x0f, 0x38, 0x9d, 0x99, 0x82, 0xfe, 0x6b, 0xf5, 0x44,
0xcc, 0x45, 0x9e, 0x99, 0x02, 0x5d, 0x87, 0xb6, 0xae, 0x9e, 0x63, 0xe5, 0x6a, 0x64, 0x81, 0x49,
0x64, 0x29, 0xd6, 0x66, 0x44, 0x5c, 0xd1, 0x3d, 0xa4, 0x9b, 0x42, 0x9e, 0x7e, 0xc0, 0xb5, 0xeb,
0xa8, 0x87, 0xa6, 0xb4, 0x58, 0x2d, 0x65, 0xe1, 0x4b, 0xe6, 0x10, 0xfb, 0x09, 0xba, 0x6f, 0xe4,
0x34, 0xc7, 0xc9, 0xb8, 0x32, 0x3a, 0x2b, 0x0a, 0xce, 0x85, 0xe4, 0x90, 0x09, 0x94, 0xa4, 0xb1,
0x0d, 0x94, 0x64, 0x37, 0xa0, 0xb3, 0x5c, 0x1d, 0x79, 0x47, 0x03, 0xee, 0x10, 0xb5, 0x74, 0x4d,
0x3e, 0xda, 0x3c, 0xd6, 0x6b, 0xf6, 0x6b, 0x0c, 0xfd, 0xa0, 0x2e, 0x36, 0x0e, 0xcc, 0xb0, 0xf0,
0x3e, 0x2c, 0x72, 0x39, 0xcd, 0x95, 0x98, 0x38, 0x37, 0x1e, 0xa6, 0x23, 0xe8, 0x19, 0x8f, 0x42,
0xaf, 0x0a, 0x4b, 0x81, 0xfe, 0xde, 0xb5, 0x11, 0xad, 0x9e, 0xd1, 0x1b, 0x2f, 0xe7, 0x8d, 0x8a,
0x27, 0x4b, 0xab, 0x21, 0x4b, 0x93, 0x7b, 0xdb, 0xd2, 0xca, 0x22, 0x53, 0xdd, 0x5c, 0xe5, 0x19,
0x12, 0x1d, 0x12, 0x6e, 0x81, 0x23, 0xe5, 0x56, 0x4d, 0xca, 0x3b, 0x00, 0x53, 0xd3, 0xcd, 0xa7,
0x44, 0xcc, 0x2e, 0x65, 0x16, 0x48, 0x8c, 0xf5, 0x19, 0x8a, 0x09, 0x16, 0xc3, 0x9e, 0xcd, 0xc8,
0x22, 0xa2, 0x28, 0x56, 0x7a, 0x08, 0xb6, 0x6a, 0xe6, 0xcc, 0x1e, 0xc1, 0x20, 0x28, 0x46, 0x99,
0xde, 0x6b, 0x08, 0xd2, 0xdf, 0x4b, 0x5d, 0x56, 0x81, 0x86, 0x25, 0xcd, 0x17, 0x70, 0x85, 0xcb,
0x7c, 0x5a, 0x67, 0x9b, 0x8e, 0xa0, 0x2d, 0x35, 0x2e, 0xfc, 0x0f, 0x87, 0xee, 0x87, 0x1b, 0x4a,
0x2f, 0x34, 0x2e, 0xb8, 0x55, 0x63, 0x2f, 0x60, 0xfb, 0xdc, 0x5d, 0xd0, 0x41, 0x63, 0xa5, 0xe9,
0xe0, 0xed, 0xb0, 0xde, 0x31, 0x5d, 0x35, 0x02, 0xf6, 0x2d, 0xf4, 0x9a, 0x38, 0x6c, 0xb3, 0x23,
0xdf, 0xec, 0xc0, 0x64, 0xbc, 0x41, 0x8a, 0xdb, 0x67, 0x5b, 0xb8, 0x61, 0xf2, 0x47, 0x18, 0x18,
0xf2, 0x7e, 0x7d, 0x8a, 0xc5, 0xa9, 0x44, 0x9a, 0xd3, 0x02, 0x33, 0x79, 0xea, 0x38, 0x92, 0x70,
0x0f, 0xcd, 0xcd, 0x91, 0x9d, 0x0d, 0xb7, 0x20, 0x3c, 0x34, 0x37, 0xba, 0x7a, 0x1a, 0xec, 0x1b,
0x0f, 0xd9, 0xef, 0x11, 0x6c, 0x71, 0x3c, 0xa1, 0xf1, 0x48, 0xa1, 0x25, 0xcc, 0xd4, 0xb8, 0x05,
0x26, 0x9c, 0xec, 0x78, 0x2e, 0xa6, 0x64, 0xb0, 0xcd, 0xe9, 0x6c, 0x88, 0x91, 0xd5, 0xb6, 0xda,
0xdc, 0x02, 0x93, 0xc5, 0x44, 0x16, 0x48, 0x8d, 0x71, 0x0c, 0x6f, 0x04, 0x96, 0x06, 0x72, 0x3a,
0xd3, 0x9e, 0x64, 0x16, 0x19, 0x5b, 0x32, 0x9f, 0x60, 0xe5, 0x49, 0x46, 0x80, 0x7d, 0x07, 0xc0,
0xf1, 0xe4, 0x9b, 0x42, 0x9e, 0x8a, 0x6c, 0xdd, 0xf8, 0x8b, 0x2e, 0xf5, 0x17, 0x5f, 0xee, 0x2f,
0x09, 0xfd, 0xb1, 0x9b, 0xd0, 0x7e, 0x8e, 0x95, 0x5b, 0xae, 0x55, 0xbd, 0x5c, 0x2b, 0xb6, 0x82,
0x3e, 0xc7, 0xe5, 0x7c, 0x3d, 0xae, 0x5e, 0xe4, 0xc7, 0xca, 0xe4, 0x3d, 0x13, 0xe5, 0xcc, 0x6f,
0x1f, 0x73, 0x0e, 0x6c, 0xc6, 0x17, 0xe7, 0x90, 0x04, 0x39, 0xa4, 0xf7, 0xa0, 0x23, 0xe8, 0x0d,
0x1a, 0xb6, 0x88, 0x86, 0x03, 0x47, 0x43, 0x7a, 0x2c, 0xb8, 0xbb, 0x63, 0xff, 0x81, 0x1e, 0xc7,
0x93, 0x71, 0xf5, 0x52, 0x96, 0x7a, 0x33, 0xd1, 0xc4, 0x25, 0xca, 0xf6, 0xeb, 0xc8, 0x48, 0xe9,
0xf3, 0x86, 0x82, 0x03, 0x8c, 0xab, 0xe7, 0xa2, 0x9c, 0xd1, 0x6f, 0x4c, 0xe4, 0xa2, 0x9c, 0x61,
0xe9, 0xc9, 0x6c, 0x51, 0xe3, 0x30, 0x0e, 0x1c, 0x06, 0x0b, 0x21, 0xd9, 0x49, 0x9a, 0x85, 0xc0,
0xfe, 0x0f, 0x83, 0xa0, 0x44, 0x65, 0xfa, 0xd0, 0xb0, 0x8a, 0x8e, 0x67, 0xa2, 0x09, 0xb4, 0xb8,
0x57, 0x61, 0x23, 0xd3, 0xd3, 0x0c, 0xe5, 0x52, 0xbf, 0x54, 0xd3, 0x73, 0xb3, 0x71, 0x0d, 0x92,
0xb9, 0x9a, 0xba, 0xc1, 0x30, 0x47, 0x26, 0x0c, 0x31, 0x49, 0xff, 0x9c, 0xf2, 0x5d, 0x88, 0x0f,
0xdf, 0xd1, 0xf0, 0xf5, 0xf7, 0xfe, 0xe5, 0x7c, 0x1e, 0xe2, 0xfa, 0x9d, 0x98, 0xaf, 0x90, 0xc7,
0x87, 0xef, 0xd2, 0xff, 0x42, 0x6b, 0xae, 0xa6, 0x25, 0xc5, 0xdf, 0xdf, 0xdb, 0xae, 0xc3, 0xf2,
0xee, 0x39, 0x5d, 0xb3, 0x03, 0x53, 0x59, 0x92, 0x1d, 0x08, 0x2d, 0xce, 0xb9, 0xf9, 0x4c, 0x2b,
0xe6, 0xcd, 0x1e, 0x57, 0x1c, 0xcb, 0xd5, 0x5c, 0x07, 0x1c, 0x89, 0x2e, 0xe6, 0x88, 0x65, 0xaa,
0xe3, 0x08, 0x23, 0x12, 0xda, 0xad, 0x7d, 0x51, 0x2b, 0x63, 0x5d, 0xa5, 0x8f, 0xa0, 0x5f, 0x58,
0x97, 0x13, 0xe1, 0x9e, 0xf4, 0xb0, 0xd2, 0x75, 0xf8, 0x3c, 0x54, 0x33, 0xd3, 0x71, 0x34, 0x57,
0xd9, 0x07, 0x2d, 0x17, 0x7e, 0xaf, 0x37, 0x02, 0xb3, 0xb4, 0xad, 0x07, 0x7a, 0xb1, 0x3b, 0x34,
0x04, 0x81, 0x84, 0xfd, 0x11, 0xc3, 0x76, 0x10, 0xc7, 0x01, 0x6a, 0x21, 0xe7, 0x2e, 0xda, 0xe8,
0x93, 0xd1, 0x3e, 0xa4, 0xed, 0x64, 0xc2, 0xa0, 0x4c, 0x2f, 0x8e, 0xd4, 0xab, 0xd0, 0x46, 0x2c,
0x94, 0x3a, 0xb6, 0x35, 0x36, 0x1b, 0x91, 0x50, 0x50, 0xc5, 0xd6, 0xc5, 0x55, 0x6c, 0x87, 0x93,
0xb6, 0x91, 0x6b, 0xe7, 0x6c, 0xae, 0xcd, 0x57, 0xd3, 0xd6, 0xc6, 0x57, 0xd3, 0x2d, 0xe8, 0x1e,
0x17, 0x6a, 0x41, 0x1b, 0xcf, 0x7d, 0xb3, 0x78, 0x7c, 0xa6, 0x3e, 0xbd, 0xb3, 0xf5, 0x09, 0x66,
0x1b, 0x3e, 0x31, 0xdb, 0x5f, 0x42, 0x7a, 0xae, 0x88, 0x65, 0xfa, 0x20, 0x9c, 0xdf, 0xe1, 0xf9,
0x32, 0x5a, 0x3d, 0x3b, 0xc5, 0x3b, 0xd0, 0x75, 0xcb, 0x99, 0x66, 0xd5, 0xc4, 0xe6, 0xbf, 0x97,
0x2c, 0x60, 0xbb, 0x70, 0x93, 0xe3, 0xc9, 0x01, 0x66, 0x6a, 0x82, 0x5c, 0x7c, 0x0c, 0xbf, 0x25,
0x2e, 0xfc, 0x3a, 0x62, 0xff, 0x83, 0xde, 0xdb, 0x12, 0x8b, 0xf7, 0x85, 0xd4, 0xf4, 0xc4, 0x6b,
0xb5, 0x94, 0x59, 0xad, 0x62, 0x80, 0x79, 0x2d, 0x32, 0x95, 0x6b, 0x74, 0x7b, 0xa1, 0xc7, 0x3d,
0x64, 0x3f, 0x40, 0xff, 0xed, 0x72, 0x5a, 0x88, 0x09, 0xbe, 0x42, 0x2d, 0x4c, 0x09, 0xa9, 0x03,
0x32, 0x9f, 0x92, 0x85, 0x2e, 0xaf, 0xb1, 0x31, 0x72, 0x8a, 0x45, 0xe9, 0x97, 0x73, 0x8f, 0x7b,
0x78, 0xd9, 0x6a, 0x7e, 0x72, 0xf7, 0xfb, 0x7f, 0x4f, 0xa5, 0x9e, 0xad, 0x8e, 0x46, 0x99, 0x5a,
0xec, 0xee, 0xef, 0x67, 0xf9, 0x6e, 0x36, 0x13, 0x32, 0xdf, 0xdf, 0xdf, 0xa5, 0x22, 0x1d, 0x75,
0xe8, 0x3f, 0xd4, 0xfe, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x61, 0xf2, 0x14, 0x4d, 0x6d, 0x0d,
0x00, 0x00,
0x18, 0xd1, 0x4f, 0x1b, 0xc1, 0xa5, 0x4e, 0x53, 0x68, 0xe5, 0x4a, 0x23, 0xf9, 0x1a, 0x70, 0x3a,
0xa7, 0xb7, 0xa0, 0x8b, 0x15, 0x66, 0xaf, 0xc5, 0x02, 0x87, 0x2d, 0x32, 0x54, 0xe3, 0xf4, 0x2a,
0xc4, 0x5a, 0x0d, 0xdb, 0x24, 0x8d, 0xb5, 0x62, 0xbf, 0x44, 0x70, 0xd5, 0x86, 0xf3, 0x5e, 0xea,
0xd9, 0xa4, 0x10, 0x1f, 0xff, 0xa1, 0x40, 0x7e, 0xf6, 0x71, 0xf8, 0xb2, 0xfc, 0x8d, 0x71, 0x58,
0x5f, 0xad, 0xda, 0xd7, 0x21, 0xb4, 0xc9, 0x97, 0x51, 0x36, 0x01, 0x39, 0xeb, 0x74, 0x36, 0x86,
0xcb, 0xf5, 0xe2, 0x48, 0xcd, 0xc9, 0x70, 0x8f, 0x3b, 0x14, 0x38, 0x4c, 0x42, 0x87, 0xec, 0xcf,
0x08, 0xba, 0x4f, 0x0b, 0x14, 0x1a, 0xc7, 0x95, 0xf3, 0x14, 0x79, 0x4f, 0x97, 0x46, 0x79, 0x0d,
0x92, 0x63, 0x44, 0x67, 0xc9, 0x1c, 0xeb, 0xb8, 0x5b, 0x41, 0xdc, 0x77, 0x00, 0x64, 0xdd, 0x17,
0xaa, 0x55, 0x97, 0x07, 0x92, 0x74, 0x08, 0x5b, 0xb2, 0x1c, 0x53, 0x7d, 0x3a, 0x74, 0xe9, 0x61,
0xba, 0x03, 0x7d, 0x2a, 0xd3, 0x1b, 0x9b, 0xc9, 0x16, 0x05, 0x14, 0x8a, 0x36, 0x7a, 0xd3, 0xdd,
0xec, 0x0d, 0x7b, 0x00, 0x37, 0x5c, 0x46, 0xcd, 0x88, 0x3c, 0x2b, 0xd4, 0x6a, 0x69, 0xe2, 0xd6,
0x55, 0x39, 0x8c, 0x76, 0x92, 0xfb, 0x3d, 0x6e, 0x8e, 0xec, 0x0e, 0x74, 0xdf, 0xe6, 0xa5, 0x9c,
0xe6, 0xe3, 0xca, 0xe4, 0x30, 0x11, 0x5a, 0x50, 0xfe, 0x03, 0x4e, 0x67, 0xa6, 0xa0, 0xff, 0x5a,
0x3d, 0x11, 0x73, 0x91, 0x67, 0xa6, 0x40, 0xd7, 0xa1, 0xad, 0xab, 0xe7, 0x58, 0xb9, 0x1a, 0x59,
0x60, 0x12, 0x59, 0x8a, 0xb5, 0x19, 0x11, 0x57, 0x74, 0x0f, 0xe9, 0xa6, 0x90, 0xa7, 0x1f, 0x70,
0xed, 0xc6, 0xc9, 0x43, 0x53, 0x5a, 0xac, 0x96, 0xb2, 0xf0, 0xd4, 0x72, 0x88, 0xfd, 0x04, 0xdd,
0x37, 0x72, 0x9a, 0xe3, 0x64, 0x5c, 0x19, 0x9d, 0x15, 0x05, 0xe7, 0x42, 0x72, 0xc8, 0x04, 0x4a,
0xd2, 0xd8, 0x06, 0x4a, 0xb2, 0x1b, 0xd0, 0x59, 0xae, 0x8e, 0xbc, 0xa3, 0x01, 0x77, 0x88, 0x5a,
0xba, 0x26, 0x1f, 0x6d, 0x1e, 0xeb, 0x35, 0xfb, 0x35, 0x86, 0x7e, 0x50, 0x17, 0x1b, 0x07, 0x66,
0x58, 0x78, 0x1f, 0x16, 0xb9, 0x9c, 0xe6, 0x4a, 0x4c, 0x9c, 0x1b, 0x0f, 0xd3, 0x11, 0xf4, 0x8c,
0x47, 0xa1, 0x57, 0x85, 0xa5, 0x40, 0x7f, 0xef, 0xda, 0x88, 0x56, 0xcf, 0xe8, 0x8d, 0x97, 0xf3,
0x46, 0xc5, 0x93, 0xa5, 0xd5, 0x90, 0xa5, 0xc9, 0xbd, 0x6d, 0x69, 0x65, 0x91, 0xa9, 0x6e, 0xae,
0xf2, 0x0c, 0x89, 0x0e, 0x09, 0xb7, 0xc0, 0x91, 0x72, 0xab, 0x26, 0xe5, 0x1d, 0x80, 0xa9, 0xe9,
0xe6, 0x53, 0x22, 0x66, 0x97, 0x32, 0x0b, 0x24, 0xc6, 0xfa, 0x0c, 0xc5, 0x04, 0x8b, 0x61, 0xcf,
0x66, 0x64, 0x11, 0x51, 0x14, 0x2b, 0x3d, 0x04, 0x47, 0x51, 0xac, 0x34, 0x7b, 0x04, 0x83, 0xa0,
0x18, 0x65, 0x7a, 0xaf, 0x21, 0x48, 0x7f, 0x2f, 0x75, 0x59, 0x05, 0x1a, 0x96, 0x34, 0x5f, 0xc0,
0x15, 0x2e, 0xf3, 0x69, 0x9d, 0x6d, 0x3a, 0x82, 0xb6, 0xd4, 0xb8, 0xf0, 0x3f, 0x1c, 0xba, 0x1f,
0x6e, 0x28, 0xbd, 0xd0, 0xb8, 0xe0, 0x56, 0x8d, 0xbd, 0x80, 0xed, 0x73, 0x77, 0x41, 0x07, 0x8d,
0x95, 0xa6, 0x83, 0xb7, 0xc3, 0x7a, 0xc7, 0x74, 0xd5, 0x08, 0xd8, 0xb7, 0xd0, 0x6b, 0xe2, 0xb0,
0xcd, 0x8e, 0x7c, 0xb3, 0x03, 0x93, 0xf1, 0x06, 0x29, 0x6e, 0x9f, 0x6d, 0xe1, 0x86, 0xc9, 0x1f,
0x61, 0x60, 0xc8, 0xfb, 0xf5, 0x29, 0x16, 0xa7, 0x12, 0x69, 0x4e, 0x0b, 0xcc, 0xe4, 0xa9, 0xe3,
0x48, 0xc2, 0x3d, 0x34, 0x37, 0x47, 0x76, 0x36, 0xdc, 0x82, 0xf0, 0xd0, 0xdc, 0xe8, 0xea, 0x69,
0xb0, 0x6f, 0x3c, 0x64, 0xbf, 0x47, 0xb0, 0xc5, 0xf1, 0x84, 0xc6, 0x23, 0x85, 0x96, 0x30, 0x53,
0xe3, 0x16, 0x98, 0x70, 0xb2, 0xe3, 0xb9, 0x98, 0x92, 0xc1, 0x36, 0xa7, 0xb3, 0x21, 0x46, 0x56,
0xdb, 0x6a, 0x73, 0x0b, 0x4c, 0x16, 0x13, 0x59, 0x20, 0x35, 0xc6, 0x31, 0xbc, 0x11, 0x58, 0x1a,
0xc8, 0xe9, 0x4c, 0x7b, 0x92, 0x59, 0x64, 0x6c, 0xc9, 0x7c, 0x82, 0x95, 0x27, 0x19, 0x01, 0xf6,
0x1d, 0x00, 0xc7, 0x93, 0x6f, 0x0a, 0x79, 0x2a, 0xb2, 0x75, 0xe3, 0x2f, 0xba, 0xd4, 0x5f, 0x7c,
0xb9, 0xbf, 0x24, 0xf4, 0xc7, 0x6e, 0x42, 0xfb, 0x39, 0x56, 0x6e, 0xb9, 0x56, 0xf5, 0x72, 0xad,
0xd8, 0x0a, 0xfa, 0x1c, 0x97, 0xf3, 0xf5, 0xb8, 0x7a, 0x91, 0x1f, 0x2b, 0x93, 0xf7, 0x4c, 0x94,
0x33, 0xbf, 0x7d, 0xcc, 0x39, 0xb0, 0x19, 0x5f, 0x9c, 0x43, 0x12, 0xe4, 0x90, 0xde, 0x83, 0x8e,
0xa0, 0x37, 0x68, 0xd8, 0x22, 0x1a, 0x0e, 0x1c, 0x0d, 0xe9, 0xb1, 0xe0, 0xee, 0x8e, 0xfd, 0x07,
0x7a, 0x1c, 0x4f, 0xc6, 0xd5, 0x4b, 0x59, 0xea, 0xcd, 0x44, 0x13, 0x97, 0x28, 0xdb, 0xaf, 0x23,
0x23, 0xa5, 0xcf, 0x1b, 0x0a, 0x0e, 0x30, 0xae, 0x9e, 0x8b, 0x72, 0x46, 0xbf, 0x31, 0x91, 0x8b,
0x72, 0x86, 0xa5, 0x27, 0xb3, 0x45, 0x8d, 0xc3, 0x38, 0x70, 0x18, 0x2c, 0x84, 0x64, 0x27, 0x69,
0x16, 0x02, 0xfb, 0x3f, 0x0c, 0x82, 0x12, 0x95, 0xe9, 0x43, 0xc3, 0x2a, 0x3a, 0x9e, 0x89, 0x26,
0xd0, 0xe2, 0x5e, 0x85, 0x8d, 0x4c, 0x4f, 0x33, 0x94, 0x4b, 0xfd, 0x52, 0x4d, 0xcf, 0xcd, 0xc6,
0x35, 0x48, 0xe6, 0x6a, 0xea, 0x06, 0xc3, 0x1c, 0x99, 0x30, 0xc4, 0x24, 0xfd, 0x73, 0xca, 0x77,
0x21, 0x3e, 0x7c, 0x47, 0xc3, 0xd7, 0xdf, 0xfb, 0x97, 0xf3, 0x79, 0x88, 0xeb, 0x77, 0x62, 0xbe,
0x42, 0x1e, 0x1f, 0xbe, 0x4b, 0xff, 0x0b, 0xad, 0xb9, 0x9a, 0x96, 0x14, 0x7f, 0x7f, 0x6f, 0xbb,
0x0e, 0xcb, 0xbb, 0xe7, 0x74, 0xcd, 0x0e, 0x4c, 0x65, 0x49, 0x76, 0x20, 0xb4, 0x38, 0xe7, 0xe6,
0x33, 0xad, 0x98, 0x37, 0x7b, 0x5c, 0x71, 0x2c, 0x57, 0x73, 0x1d, 0x70, 0x24, 0xba, 0x98, 0x23,
0x96, 0xa9, 0x8e, 0x23, 0x8c, 0x48, 0x68, 0xb7, 0xf6, 0x45, 0xad, 0x8c, 0x75, 0x95, 0x3e, 0x82,
0x7e, 0x61, 0x5d, 0x4e, 0x84, 0x7b, 0xd2, 0xc3, 0x4a, 0xd7, 0xe1, 0xf3, 0x50, 0xcd, 0x4c, 0xc7,
0xd1, 0x5c, 0x65, 0x1f, 0xb4, 0x5c, 0xf8, 0xbd, 0xde, 0x08, 0xcc, 0xd2, 0xb6, 0x1e, 0xe8, 0xc5,
0xee, 0xd0, 0x10, 0x04, 0x12, 0xf6, 0x47, 0x0c, 0xdb, 0x41, 0x1c, 0x07, 0xa8, 0x85, 0x9c, 0xbb,
0x68, 0xa3, 0x4f, 0x46, 0xfb, 0x90, 0xb6, 0x93, 0x09, 0x83, 0x32, 0xbd, 0x38, 0x52, 0xaf, 0x42,
0x1b, 0xb1, 0x50, 0xea, 0xd8, 0xd6, 0xd8, 0x6c, 0x44, 0x42, 0x41, 0x15, 0x5b, 0x17, 0x57, 0xb1,
0x1d, 0x4e, 0xda, 0x46, 0xae, 0x9d, 0xb3, 0xb9, 0x36, 0x5f, 0x4d, 0x5b, 0x1b, 0x5f, 0x4d, 0xb7,
0xa0, 0x7b, 0x5c, 0xa8, 0x05, 0x6d, 0x3c, 0xf7, 0xcd, 0xe2, 0xf1, 0x99, 0xfa, 0xf4, 0xce, 0xd6,
0x27, 0x98, 0x6d, 0xf8, 0xc4, 0x6c, 0x7f, 0x09, 0xe9, 0xb9, 0x22, 0x96, 0xe9, 0x83, 0x70, 0x7e,
0x87, 0xe7, 0xcb, 0x68, 0xf5, 0xec, 0x14, 0xef, 0x40, 0xd7, 0x2d, 0x67, 0x9a, 0x55, 0x13, 0x9b,
0xff, 0x5e, 0xb2, 0x80, 0xed, 0xc2, 0x4d, 0x8e, 0x27, 0x07, 0x98, 0xa9, 0x09, 0x72, 0xf1, 0x31,
0xfc, 0x96, 0xb8, 0xf0, 0xeb, 0x88, 0xfd, 0x0f, 0x7a, 0x6f, 0x4b, 0x2c, 0xde, 0x17, 0x52, 0xd3,
0x13, 0xaf, 0xd5, 0x52, 0x66, 0xb5, 0x8a, 0x01, 0xe6, 0xb5, 0xc8, 0x54, 0xae, 0xd1, 0xed, 0x85,
0x1e, 0xf7, 0x90, 0xfd, 0x00, 0xfd, 0xb7, 0xcb, 0x69, 0x21, 0x26, 0xf8, 0x0a, 0xb5, 0x30, 0x25,
0xa4, 0x0e, 0xc8, 0x7c, 0x4a, 0x16, 0xba, 0xbc, 0xc6, 0xc6, 0xc8, 0x29, 0x16, 0xa5, 0x5f, 0xce,
0x3d, 0xee, 0xe1, 0x65, 0xab, 0xf9, 0xc9, 0xdd, 0xef, 0xff, 0x3d, 0x95, 0x7a, 0xb6, 0x3a, 0x1a,
0x65, 0x6a, 0xb1, 0xbb, 0xbf, 0x9f, 0xe5, 0xbb, 0xd9, 0x4c, 0xc8, 0x7c, 0x7f, 0x7f, 0x97, 0x8a,
0x74, 0xd4, 0xa1, 0xff, 0x50, 0xfb, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x44, 0x92, 0x22, 0xa5,
0x6d, 0x0d, 0x00, 0x00,
}
vendor/github.com/33cn/chain33/types/wallet.pb.go
View file @ 8898b5a7
......@@ -884,7 +884,7 @@ type ReqWalletSendToAddress struct {
From string `protobuf:"bytes,1,opt,name=from,proto3" json:"from,omitempty"`
To string `protobuf:"bytes,2,opt,name=to,proto3" json:"to,omitempty"`
Amount int64 `protobuf:"varint,3,opt,name=amount,proto3" json:"amount,omitempty"`
Note string `protobuf:"bytes,4,opt,name=note,proto3" json:"note,omitempty"`
Note []byte `protobuf:"bytes,4,opt,name=note,proto3" json:"note,omitempty"`
IsToken bool `protobuf:"varint,5,opt,name=isToken,proto3" json:"isToken,omitempty"`
TokenSymbol string `protobuf:"bytes,6,opt,name=tokenSymbol,proto3" json:"tokenSymbol,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
......@@ -938,11 +938,11 @@ func (m *ReqWalletSendToAddress) GetAmount() int64 {
return 0
}
func (m *ReqWalletSendToAddress) GetNote() string {
func (m *ReqWalletSendToAddress) GetNote() []byte {
if m != nil {
return m.Note
}
return ""
return nil
}
func (m *ReqWalletSendToAddress) GetIsToken() bool {
......@@ -1570,7 +1570,7 @@ type ReqCreateTransaction struct {
// 3：隐私交易 隐私->公开
Type int32 `protobuf:"varint,2,opt,name=type,proto3" json:"type,omitempty"`
Amount int64 `protobuf:"varint,3,opt,name=amount,proto3" json:"amount,omitempty"`
Note string `protobuf:"bytes,4,opt,name=note,proto3" json:"note,omitempty"`
Note []byte `protobuf:"bytes,4,opt,name=note,proto3" json:"note,omitempty"`
// 普通交易的发送方
From string `protobuf:"bytes,5,opt,name=from,proto3" json:"from,omitempty"`
// 普通交易的接收方
......@@ -1630,11 +1630,11 @@ func (m *ReqCreateTransaction) GetAmount() int64 {
return 0
}
func (m *ReqCreateTransaction) GetNote() string {
func (m *ReqCreateTransaction) GetNote() []byte {
if m != nil {
return m.Note
}
return ""
return nil
}
func (m *ReqCreateTransaction) GetFrom() string {
......@@ -1747,85 +1747,85 @@ func init() {
func init() { proto.RegisterFile("wallet.proto", fileDescriptor_b88fd140af4deb6f) }
var fileDescriptor_b88fd140af4deb6f = []byte{
// 1270 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xdd, 0x6e, 0x1b, 0x37,
0x13, 0xc5, 0x4a, 0x96, 0x6d, 0xd1, 0xb2, 0x93, 0x10, 0x49, 0xb0, 0xf0, 0xf7, 0x25, 0x51, 0x58,
0x24, 0x75, 0x81, 0xc2, 0x01, 0xa2, 0x9b, 0xa2, 0x40, 0x81, 0x38, 0xbf, 0x0e, 0xe0, 0xa4, 0x06,
0xa5, 0xa2, 0x40, 0x6f, 0x0a, 0x6a, 0x97, 0x96, 0x08, 0xad, 0x96, 0x6b, 0x2e, 0xf5, 0xf7, 0x22,
0x45, 0x1f, 0xa0, 0x8f, 0xd0, 0x17, 0xe9, 0x7b, 0xf4, 0x21, 0x8a, 0x19, 0x92, 0xab, 0xdd, 0xc4,
0xbd, 0x08, 0x7a, 0xc7, 0x33, 0x1c, 0xce, 0x70, 0xce, 0x90, 0x87, 0x24, 0xbd, 0x95, 0xc8, 0x32,
0x69, 0x4f, 0x0b, 0xa3, 0xad, 0xa6, 0x1d, 0xbb, 0x29, 0x64, 0x79, 0x7c, 0xc7, 0x1a, 0x91, 0x97,
0x22, 0xb1, 0x4a, 0xe7, 0x6e, 0xe6, 0xf8, 0xf6, 0x38, 0xd3, 0xc9, 0x2c, 0x99, 0x0a, 0x15, 0x2c,
0x87, 0x22, 0x49, 0xf4, 0x22, 0xf7, 0x4b, 0x8f, 0x8f, 0xe4, 0x5a, 0x26, 0x0b, 0xab, 0x8d, 0xc3,
0xec, 0xcf, 0x16, 0x39, 0xfa, 0x19, 0x63, 0x8f, 0xd6, 0xaf, 0xa5, 0x15, 0x2a, 0xa3, 0x8c, 0xb4,
0xec, 0x3a, 0x8e, 0xfa, 0xd1, 0xc9, 0xc1, 0x73, 0x7a, 0x8a, 0xa9, 0x4e, 0x47, 0xdb, 0x4c, 0xbc,
0x65, 0xd7, 0xf4, 0x5b, 0xb2, 0x67, 0x64, 0x22, 0x55, 0x61, 0xe3, 0x56, 0xc3, 0x91, 0x3b, 0xeb,
0x6b, 0x61, 0x05, 0x0f, 0x2e, 0xf4, 0x3e, 0xd9, 0x9d, 0x4a, 0x35, 0x99, 0xda, 0xb8, 0xdd, 0x8f,
0x4e, 0xda, 0xdc, 0x23, 0x7a, 0x97, 0x74, 0x54, 0x9e, 0xca, 0x75, 0xbc, 0x83, 0x66, 0x07, 0xe8,
0xff, 0x49, 0x17, 0xab, 0xb0, 0x6a, 0x2e, 0xe3, 0x0e, 0xce, 0x6c, 0x0d, 0x10, 0x4b, 0xcc, 0xa1,
0xa0, 0x78, 0xd7, 0xc5, 0x72, 0x88, 0x1e, 0x93, 0xfd, 0x2b, 0xa3, 0xe7, 0x22, 0x4d, 0x4d, 0xbc,
0xd7, 0x8f, 0x4e, 0xba, 0xbc, 0xc2, 0xb0, 0xc6, 0xae, 0xa7, 0xa2, 0x9c, 0xc6, 0xfb, 0xfd, 0xe8,
0xa4, 0xc7, 0x3d, 0xa2, 0x0f, 0x09, 0x71, 0x35, 0x7d, 0x14, 0x73, 0x19, 0x77, 0x71, 0x55, 0xcd,
0x42, 0x63, 0xb2, 0x57, 0x88, 0x4d, 0xa6, 0x45, 0x1a, 0x13, 0x5c, 0x18, 0x20, 0x7b, 0x4b, 0x6e,
0x35, 0x59, 0x2b, 0xe9, 0x80, 0x74, 0x6d, 0x00, 0x71, 0xd4, 0x6f, 0x9f, 0x1c, 0x3c, 0xbf, 0xe7,
0x49, 0x69, 0xba, 0xf2, 0xad, 0x1f, 0x5b, 0x12, 0xea, 0x26, 0xcf, 0x5c, 0x97, 0x86, 0x56, 0x1b,
0x97, 0xd7, 0xa8, 0xe5, 0x4c, 0x6e, 0xb0, 0x0d, 0x5d, 0x1e, 0x20, 0x30, 0x96, 0x89, 0xb1, 0xcc,
0x90, 0xf5, 0x2e, 0x77, 0x80, 0x52, 0xb2, 0x83, 0x75, 0xb7, 0xd1, 0x88, 0x63, 0x60, 0x11, 0xf8,
0x1a, 0x5a, 0x31, 0x2f, 0x90, 0xdf, 0x2e, 0xdf, 0x1a, 0xd8, 0x0b, 0xd2, 0x73, 0x79, 0x2f, 0x57,
0xe7, 0xc0, 0xc4, 0x7d, 0xb2, 0x5b, 0xe0, 0x08, 0x13, 0xf6, 0xb8, 0x47, 0xb0, 0x13, 0x23, 0xf2,
0xb4, 0xb4, 0xc6, 0x67, 0x0c, 0x90, 0xfd, 0x1e, 0x85, 0x10, 0x43, 0x2b, 0xec, 0xa2, 0xa4, 0x8c,
0xf4, 0x54, 0xe9, 0x2c, 0x17, 0x3a, 0x99, 0x61, 0xa0, 0x7d, 0xde, 0xb0, 0x39, 0x9f, 0xb3, 0x85,
0xd5, 0x1f, 0x54, 0xae, 0xf2, 0x09, 0xc6, 0x44, 0x9f, 0xad, 0x0d, 0x36, 0xae, 0xca, 0x73, 0x51,
0x0e, 0xa5, 0x4c, 0xb1, 0xa2, 0x7d, 0xbe, 0x35, 0xb8, 0x08, 0x23, 0x95, 0xcc, 0x7c, 0x96, 0x9d,
0x10, 0x61, 0x6b, 0x63, 0x2f, 0xc2, 0x91, 0xf6, 0xa4, 0x96, 0xf4, 0x94, 0xec, 0xb9, 0x0b, 0x14,
0x3a, 0x73, 0xb7, 0xd1, 0x19, 0xef, 0xc7, 0x83, 0x13, 0x7b, 0x47, 0x0e, 0x1b, 0x33, 0xb4, 0x4f,
0xda, 0x22, 0x49, 0xfc, 0xa5, 0x38, 0xf2, 0x8b, 0xc3, 0x32, 0x98, 0xba, 0xb9, 0x33, 0x6c, 0x1a,
0x48, 0xfa, 0x29, 0x47, 0x02, 0x80, 0x67, 0x51, 0x96, 0xab, 0xd4, 0x37, 0xd6, 0x23, 0xe0, 0x19,
0x9a, 0xa3, 0x17, 0xee, 0x3e, 0xb5, 0x79, 0x80, 0xf4, 0x29, 0x39, 0x72, 0xbb, 0xfa, 0xd1, 0xb8,
0x12, 0x3d, 0x27, 0x9f, 0x58, 0xd9, 0x63, 0x72, 0xf0, 0x4e, 0xe6, 0xc0, 0xd1, 0x85, 0xc8, 0x27,
0x70, 0x24, 0x32, 0x91, 0x4f, 0x30, 0x4d, 0x87, 0xe3, 0x98, 0x3d, 0x01, 0x17, 0x0b, 0x2e, 0x2f,
0x37, 0x97, 0xab, 0x7f, 0xdb, 0x0b, 0xfb, 0x9e, 0xf4, 0x86, 0x62, 0x29, 0x2b, 0x3f, 0x4a, 0x76,
0x4a, 0xe8, 0x85, 0xf3, 0xc2, 0x71, 0x6d, 0x6d, 0xab, 0xb1, 0xf6, 0x11, 0xe9, 0x72, 0x59, 0x64,
0x1b, 0xec, 0xd5, 0x0d, 0x0b, 0xd9, 0x39, 0xa1, 0x5c, 0x5e, 0xfb, 0x83, 0x23, 0xed, 0x65, 0x55,
0xbe, 0xce, 0x52, 0x00, 0xe1, 0xc0, 0x7b, 0x08, 0x33, 0xb9, 0x5c, 0xe1, 0x8c, 0x3f, 0x80, 0x1e,
0xb2, 0x27, 0xe4, 0x90, 0xcb, 0xeb, 0x8f, 0x72, 0x15, 0x7a, 0x54, 0x75, 0x20, 0xaa, 0x77, 0xe0,
0x8a, 0xc4, 0x55, 0xc2, 0x9a, 0x8a, 0x5d, 0xa8, 0x12, 0x75, 0x09, 0x34, 0x62, 0xb4, 0x0e, 0xa7,
0xde, 0x21, 0x88, 0x84, 0x21, 0x31, 0x65, 0x87, 0x3b, 0x00, 0x07, 0x33, 0x55, 0x46, 0xe2, 0x72,
0x6c, 0x42, 0x87, 0x6f, 0x0d, 0xec, 0x9c, 0xdc, 0xaf, 0xf2, 0xbc, 0x9f, 0x17, 0xda, 0xd8, 0x4b,
0x7f, 0x67, 0xbf, 0xf0, 0x36, 0xb3, 0x3f, 0xa2, 0x5a, 0xa8, 0xa1, 0xcc, 0xd3, 0x91, 0x3e, 0x4b,
0x53, 0x23, 0xcb, 0x12, 0x18, 0x85, 0x2d, 0x06, 0x46, 0x61, 0x4c, 0x8f, 0x48, 0xcb, 0x6a, 0x1f,
0xa1, 0x65, 0x75, 0x4d, 0x20, 0xdb, 0x0d, 0x81, 0xa4, 0x64, 0x27, 0xd7, 0x56, 0x7a, 0x2d, 0xc0,
0x31, 0x6c, 0x4d, 0x95, 0x23, 0x3d, 0x93, 0x39, 0x0a, 0xed, 0x3e, 0x0f, 0x90, 0xf6, 0xc9, 0x81,
0x85, 0xc1, 0x70, 0x33, 0x1f, 0xeb, 0x0c, 0xb5, 0xb6, 0xcb, 0xeb, 0x26, 0xf6, 0x0d, 0xb9, 0x55,
0xef, 0xe4, 0x5b, 0x59, 0xd7, 0xe6, 0xa8, 0x9e, 0x9a, 0xfd, 0x40, 0xee, 0xd4, 0x5d, 0x2f, 0x1a,
0xa2, 0x15, 0xd5, 0x44, 0xeb, 0x66, 0x42, 0xbe, 0x26, 0xf7, 0xaa, 0xe5, 0x1f, 0xa4, 0x99, 0xc8,
0x97, 0x22, 0x13, 0x79, 0x22, 0x7d, 0xe9, 0x51, 0x28, 0x9d, 0xfd, 0x15, 0x61, 0x22, 0xac, 0xe0,
0xd2, 0xc8, 0x57, 0x46, 0x0a, 0x2b, 0xe9, 0x63, 0xd2, 0x4b, 0x60, 0xa4, 0xcd, 0xaf, 0xb5, 0x84,
0x07, 0xde, 0x06, 0xd4, 0x22, 0x37, 0xf0, 0x04, 0xb4, 0x3c, 0x37, 0xc2, 0x3d, 0x34, 0xa5, 0x2b,
0xde, 0xc9, 0xaa, 0x47, 0xa8, 0x40, 0xb9, 0x35, 0x3a, 0x5d, 0xb8, 0x93, 0xe0, 0xf8, 0x6c, 0xd8,
0xe8, 0x03, 0x42, 0xf4, 0x2a, 0x97, 0x3e, 0x61, 0xc7, 0xa9, 0x2f, 0x5a, 0xce, 0x7c, 0x99, 0x56,
0x5b, 0x91, 0xf9, 0x27, 0xcc, 0x01, 0xb0, 0x16, 0x46, 0x25, 0x12, 0x9f, 0xaf, 0x36, 0x77, 0x80,
0x19, 0x72, 0x37, 0x94, 0xf4, 0x56, 0xe5, 0xaa, 0x9c, 0xfa, 0xaa, 0xbe, 0x22, 0x87, 0x57, 0x88,
0x65, 0xa3, 0xac, 0x5e, 0x30, 0x9e, 0xf9, 0x87, 0xcf, 0xd7, 0xd0, 0x6a, 0xd4, 0xd0, 0xdc, 0x5f,
0xfb, 0x93, 0xfd, 0xb1, 0x62, 0x9b, 0x93, 0xcb, 0xa5, 0x9e, 0xd5, 0x98, 0x34, 0x88, 0x9b, 0x4c,
0x7a, 0xdb, 0x7f, 0xc9, 0x28, 0xf1, 0x30, 0x7d, 0xd0, 0xa9, 0xba, 0xda, 0xbc, 0xd2, 0xf9, 0x95,
0x9a, 0xd0, 0xdb, 0xa4, 0xbd, 0xbd, 0x32, 0x30, 0x84, 0x76, 0xeb, 0x22, 0x9c, 0x74, 0x5d, 0x00,
0x61, 0x4b, 0x91, 0x2d, 0xa4, 0x0f, 0xe7, 0x00, 0x7c, 0x04, 0xe6, 0x10, 0x47, 0x49, 0xe3, 0x7b,
0x53, 0x61, 0xf6, 0x5b, 0x44, 0x7a, 0x5c, 0x5e, 0x0f, 0xd5, 0x24, 0xe7, 0x62, 0x35, 0x5a, 0xdf,
0x78, 0x08, 0x6b, 0xf7, 0xb5, 0xf5, 0xd9, 0x7d, 0xb5, 0xeb, 0x73, 0xb9, 0x0e, 0x09, 0x11, 0x40,
0xc9, 0x72, 0x5d, 0x28, 0x13, 0xae, 0x96, 0x47, 0xdb, 0xdf, 0x4d, 0xc7, 0xa9, 0x88, 0xfb, 0xdd,
0x60, 0xef, 0xe1, 0xc2, 0xed, 0xf9, 0x18, 0x00, 0xd8, 0x53, 0x72, 0xe4, 0x74, 0xb3, 0xda, 0x59,
0x95, 0x2b, 0xaa, 0xe5, 0x62, 0x63, 0xf4, 0xd3, 0xc6, 0xbe, 0x31, 0xe6, 0xcd, 0x52, 0xe6, 0x16,
0xfe, 0x30, 0x20, 0x03, 0x73, 0x9d, 0x2e, 0x32, 0xe9, 0x9d, 0x6b, 0x16, 0xa0, 0xc3, 0x6a, 0x3f,
0xeb, 0xca, 0xa9, 0x30, 0xe4, 0x90, 0xc6, 0xe8, 0xd0, 0x0f, 0x07, 0xd8, 0xff, 0x48, 0xe7, 0x7d,
0x6e, 0x07, 0xcf, 0x81, 0x9c, 0x54, 0x58, 0x11, 0xde, 0x10, 0x18, 0xb3, 0xbf, 0x23, 0x3c, 0x1b,
0xee, 0x40, 0xd4, 0xf4, 0x14, 0xff, 0x1b, 0x50, 0x0a, 0xde, 0xa3, 0xc8, 0xff, 0x37, 0x82, 0x01,
0x42, 0xc1, 0x9b, 0xe9, 0x05, 0x15, 0xc7, 0x5f, 0x24, 0x54, 0x41, 0xf8, 0x3a, 0x9f, 0x09, 0xdf,
0x6e, 0x25, 0x7c, 0x0f, 0x09, 0x29, 0x16, 0xe3, 0x99, 0xdc, 0x14, 0x42, 0x19, 0xfc, 0xb0, 0x75,
0x79, 0xcd, 0x82, 0x07, 0x43, 0xad, 0x9d, 0xb0, 0x1f, 0xe0, 0x3e, 0x2a, 0x5c, 0xeb, 0x61, 0xcf,
0xed, 0xc5, 0x21, 0xf6, 0x1d, 0xf0, 0x7d, 0xed, 0x5f, 0x18, 0x7c, 0x33, 0xe0, 0x3d, 0x56, 0x76,
0xaa, 0x17, 0xd6, 0xab, 0x90, 0xff, 0xe8, 0x7c, 0x62, 0x7d, 0xf9, 0xe8, 0x97, 0x07, 0x13, 0x65,
0xa7, 0x8b, 0xf1, 0x69, 0xa2, 0xe7, 0xcf, 0x06, 0x83, 0x24, 0x7f, 0x86, 0xdf, 0xf2, 0xc1, 0xe0,
0x19, 0xfe, 0x1e, 0xc6, 0xbb, 0xf8, 0x01, 0x1f, 0xfc, 0x13, 0x00, 0x00, 0xff, 0xff, 0x43, 0x75,
0x08, 0xf5, 0xdb, 0x0b, 0x00, 0x00,
// 1271 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x5d, 0x6e, 0x1b, 0xb7,
0x13, 0xc7, 0x4a, 0x96, 0x6d, 0xd1, 0xb2, 0x93, 0x10, 0x49, 0xb0, 0xf0, 0xff, 0x9f, 0x44, 0x61,
0x91, 0xd4, 0x05, 0x0a, 0x07, 0x88, 0x5e, 0x8a, 0x02, 0x05, 0xe2, 0x7c, 0x3a, 0x80, 0x93, 0x1a,
0x94, 0x8a, 0x02, 0x7d, 0x29, 0xa8, 0x5d, 0x5a, 0x22, 0xb4, 0x5a, 0xae, 0xb9, 0xd4, 0xd7, 0x45,
0x8a, 0x1e, 0xa0, 0x47, 0xe8, 0x45, 0x7a, 0x8f, 0x1e, 0xa2, 0x98, 0x21, 0xb9, 0xda, 0x4d, 0xdc,
0x87, 0xa0, 0x6f, 0xf3, 0x1b, 0x0e, 0x67, 0x38, 0xbf, 0x19, 0x0e, 0x49, 0x7a, 0x2b, 0x91, 0x65,
0xd2, 0x9e, 0x16, 0x46, 0x5b, 0x4d, 0x3b, 0x76, 0x53, 0xc8, 0xf2, 0xf8, 0x8e, 0x35, 0x22, 0x2f,
0x45, 0x62, 0x95, 0xce, 0xdd, 0xca, 0xf1, 0xed, 0x71, 0xa6, 0x93, 0x59, 0x32, 0x15, 0x2a, 0x68,
0x0e, 0x45, 0x92, 0xe8, 0x45, 0xee, 0xb7, 0x1e, 0x1f, 0xc9, 0xb5, 0x4c, 0x16, 0x56, 0x1b, 0x87,
0xd9, 0x9f, 0x2d, 0x72, 0xf4, 0x33, 0xfa, 0x1e, 0xad, 0x5f, 0x4b, 0x2b, 0x54, 0x46, 0x19, 0x69,
0xd9, 0x75, 0x1c, 0xf5, 0xa3, 0x93, 0x83, 0xe7, 0xf4, 0x14, 0x43, 0x9d, 0x8e, 0xb6, 0x91, 0x78,
0xcb, 0xae, 0xe9, 0xb7, 0x64, 0xcf, 0xc8, 0x44, 0xaa, 0xc2, 0xc6, 0xad, 0x86, 0x21, 0x77, 0xda,
0xd7, 0xc2, 0x0a, 0x1e, 0x4c, 0xe8, 0x7d, 0xb2, 0x3b, 0x95, 0x6a, 0x32, 0xb5, 0x71, 0xbb, 0x1f,
0x9d, 0xb4, 0xb9, 0x47, 0xf4, 0x2e, 0xe9, 0xa8, 0x3c, 0x95, 0xeb, 0x78, 0x07, 0xd5, 0x0e, 0xd0,
0xff, 0x93, 0x2e, 0x66, 0x61, 0xd5, 0x5c, 0xc6, 0x1d, 0x5c, 0xd9, 0x2a, 0xc0, 0x97, 0x98, 0x43,
0x42, 0xf1, 0xae, 0xf3, 0xe5, 0x10, 0x3d, 0x26, 0xfb, 0x57, 0x46, 0xcf, 0x45, 0x9a, 0x9a, 0x78,
0xaf, 0x1f, 0x9d, 0x74, 0x79, 0x85, 0x61, 0x8f, 0x5d, 0x4f, 0x45, 0x39, 0x8d, 0xf7, 0xfb, 0xd1,
0x49, 0x8f, 0x7b, 0x44, 0x1f, 0x12, 0xe2, 0x72, 0xfa, 0x28, 0xe6, 0x32, 0xee, 0xe2, 0xae, 0x9a,
0x86, 0xc6, 0x64, 0xaf, 0x10, 0x9b, 0x4c, 0x8b, 0x34, 0x26, 0xb8, 0x31, 0x40, 0xf6, 0x96, 0xdc,
0x6a, 0xb2, 0x56, 0xd2, 0x01, 0xe9, 0xda, 0x00, 0xe2, 0xa8, 0xdf, 0x3e, 0x39, 0x78, 0x7e, 0xcf,
0x93, 0xd2, 0x34, 0xe5, 0x5b, 0x3b, 0xb6, 0x24, 0xd4, 0x2d, 0x9e, 0xb9, 0x2a, 0x0d, 0xad, 0x36,
0x2e, 0xae, 0x51, 0xcb, 0x99, 0xdc, 0x60, 0x19, 0xba, 0x3c, 0x40, 0x60, 0x2c, 0x13, 0x63, 0x99,
0x21, 0xeb, 0x5d, 0xee, 0x00, 0xa5, 0x64, 0x07, 0xf3, 0x6e, 0xa3, 0x12, 0x65, 0x60, 0x11, 0xf8,
0x1a, 0x5a, 0x31, 0x2f, 0x90, 0xdf, 0x2e, 0xdf, 0x2a, 0xd8, 0x0b, 0xd2, 0x73, 0x71, 0x2f, 0x57,
0xe7, 0xc0, 0xc4, 0x7d, 0xb2, 0x5b, 0xa0, 0x84, 0x01, 0x7b, 0xdc, 0x23, 0x38, 0x89, 0x11, 0x79,
0x5a, 0x5a, 0xe3, 0x23, 0x06, 0xc8, 0x7e, 0x8f, 0x82, 0x8b, 0xa1, 0x15, 0x76, 0x51, 0x52, 0x46,
0x7a, 0xaa, 0x74, 0x9a, 0x0b, 0x9d, 0xcc, 0xd0, 0xd1, 0x3e, 0x6f, 0xe8, 0x9c, 0xcd, 0xd9, 0xc2,
0xea, 0x0f, 0x2a, 0x57, 0xf9, 0x04, 0x7d, 0xa2, 0xcd, 0x56, 0x07, 0x07, 0x57, 0xe5, 0xb9, 0x28,
0x87, 0x52, 0xa6, 0x98, 0xd1, 0x3e, 0xdf, 0x2a, 0x9c, 0x87, 0x91, 0x4a, 0x66, 0x3e, 0xca, 0x4e,
0xf0, 0xb0, 0xd5, 0xb1, 0x17, 0xa1, 0xa5, 0x3d, 0xa9, 0x25, 0x3d, 0x25, 0x7b, 0xee, 0x02, 0x85,
0xca, 0xdc, 0x6d, 0x54, 0xc6, 0xdb, 0xf1, 0x60, 0xc4, 0xde, 0x91, 0xc3, 0xc6, 0x0a, 0xed, 0x93,
0xb6, 0x48, 0x12, 0x7f, 0x29, 0x8e, 0xfc, 0xe6, 0xb0, 0x0d, 0x96, 0x6e, 0xae, 0x0c, 0x9b, 0x06,
0x92, 0x7e, 0xca, 0x91, 0x00, 0xe0, 0x59, 0x94, 0xe5, 0x2a, 0xf5, 0x85, 0xf5, 0x08, 0x78, 0x86,
0xe2, 0xe8, 0x85, 0xbb, 0x4f, 0x6d, 0x1e, 0x20, 0x7d, 0x4a, 0x8e, 0xdc, 0xa9, 0x7e, 0x34, 0x2e,
0x45, 0xcf, 0xc9, 0x27, 0x5a, 0xf6, 0x98, 0x1c, 0xbc, 0x93, 0x39, 0x70, 0x74, 0x21, 0xf2, 0x09,
0xb4, 0x44, 0x26, 0xf2, 0x09, 0x86, 0xe9, 0x70, 0x94, 0xd9, 0x13, 0x30, 0xb1, 0x60, 0xf2, 0x72,
0x73, 0xb9, 0xfa, 0xb7, 0xb3, 0xb0, 0xef, 0x49, 0x6f, 0x28, 0x96, 0xb2, 0xb2, 0xa3, 0x64, 0xa7,
0x84, 0x5a, 0x38, 0x2b, 0x94, 0x6b, 0x7b, 0x5b, 0x8d, 0xbd, 0x8f, 0x48, 0x97, 0xcb, 0x22, 0xdb,
0x60, 0xad, 0x6e, 0xd8, 0xc8, 0xce, 0x09, 0xe5, 0xf2, 0xda, 0x37, 0x8e, 0xb4, 0x97, 0x55, 0xfa,
0x3a, 0x4b, 0x01, 0x84, 0x86, 0xf7, 0x10, 0x56, 0x72, 0xb9, 0xc2, 0x15, 0xdf, 0x80, 0x1e, 0xb2,
0x27, 0xe4, 0x90, 0xcb, 0xeb, 0x8f, 0x72, 0x15, 0x6a, 0x54, 0x55, 0x20, 0xaa, 0x57, 0xe0, 0x8a,
0xc4, 0x55, 0xc0, 0xda, 0x14, 0xbb, 0x50, 0x25, 0xce, 0x25, 0x98, 0x11, 0xa3, 0x75, 0xe8, 0x7a,
0x87, 0xc0, 0x13, 0xba, 0xc4, 0x90, 0x1d, 0xee, 0x00, 0x34, 0x66, 0xaa, 0x8c, 0xc4, 0xed, 0x58,
0x84, 0x0e, 0xdf, 0x2a, 0xd8, 0x39, 0xb9, 0x5f, 0xc5, 0x79, 0x3f, 0x2f, 0xb4, 0xb1, 0x97, 0xfe,
0xce, 0x7e, 0xe1, 0x6d, 0x66, 0x7f, 0x44, 0x35, 0x57, 0x43, 0x99, 0xa7, 0x23, 0x7d, 0x96, 0xa6,
0x46, 0x96, 0x25, 0x30, 0x0a, 0x47, 0x0c, 0x8c, 0x82, 0x4c, 0x8f, 0x48, 0xcb, 0x6a, 0xef, 0xa1,
0x65, 0x75, 0x6d, 0x40, 0xb6, 0x1b, 0x03, 0x92, 0x92, 0x9d, 0x5c, 0x5b, 0x89, 0x37, 0xa6, 0xc7,
0x51, 0x86, 0xa3, 0xa9, 0x72, 0xa4, 0x67, 0x32, 0xc7, 0x41, 0xbb, 0xcf, 0x03, 0xa4, 0x7d, 0x72,
0x60, 0x41, 0x18, 0x6e, 0xe6, 0x63, 0x9d, 0xe1, 0xac, 0xed, 0xf2, 0xba, 0x8a, 0x7d, 0x43, 0x6e,
0xd5, 0x2b, 0xf9, 0x56, 0xd6, 0x67, 0x73, 0x54, 0x0f, 0xcd, 0x7e, 0x20, 0x77, 0xea, 0xa6, 0x17,
0x8d, 0xa1, 0x15, 0xd5, 0x86, 0xd6, 0xcd, 0x84, 0x7c, 0x4d, 0xee, 0x55, 0xdb, 0x3f, 0x48, 0x33,
0x91, 0x2f, 0x45, 0x26, 0xf2, 0x44, 0xfa, 0xd4, 0xa3, 0x90, 0x3a, 0xfb, 0x2b, 0xc2, 0x40, 0x98,
0xc1, 0xa5, 0x91, 0xaf, 0x8c, 0x14, 0x56, 0xd2, 0xc7, 0xa4, 0x97, 0x80, 0xa4, 0xcd, 0xaf, 0xb5,
0x80, 0x07, 0x5e, 0x07, 0xd4, 0x22, 0x37, 0xf0, 0x04, 0xb8, 0xb0, 0x28, 0x43, 0x32, 0xa5, 0x4b,
0xde, 0x8d, 0x55, 0x8f, 0x70, 0x02, 0xe5, 0xd6, 0xe8, 0x74, 0xe1, 0x3a, 0xc1, 0xcd, 0xd6, 0x86,
0x8e, 0x3e, 0x20, 0x44, 0xaf, 0x72, 0xe9, 0x03, 0x76, 0xdc, 0xf4, 0x45, 0xcd, 0x99, 0x4f, 0xd3,
0x6a, 0x2b, 0x32, 0xff, 0x84, 0x39, 0x00, 0xda, 0xc2, 0xa8, 0x44, 0xe2, 0xf3, 0xd5, 0xe6, 0x0e,
0x30, 0x43, 0xee, 0x86, 0x94, 0xde, 0xaa, 0x5c, 0x95, 0x53, 0x9f, 0xd5, 0x57, 0xe4, 0xf0, 0x0a,
0xb1, 0x6c, 0xa4, 0xd5, 0x0b, 0xca, 0x33, 0xff, 0xf0, 0xf9, 0x1c, 0x5a, 0x8d, 0x1c, 0x9a, 0xe7,
0x6b, 0x7f, 0x72, 0x3e, 0x56, 0x6c, 0x63, 0x72, 0xb9, 0xd4, 0xb3, 0x1a, 0x93, 0x06, 0x71, 0x93,
0x49, 0xaf, 0xfb, 0x2f, 0x11, 0x25, 0x36, 0xd3, 0x07, 0x9d, 0xaa, 0xab, 0xcd, 0x2b, 0x9d, 0x5f,
0xa9, 0x09, 0xbd, 0x4d, 0xda, 0xdb, 0x2b, 0x03, 0x22, 0x94, 0x5b, 0x17, 0xa1, 0xd3, 0x75, 0x01,
0x84, 0x2d, 0x45, 0xb6, 0x90, 0xde, 0x9d, 0x03, 0xf0, 0x11, 0x98, 0x83, 0x1f, 0x25, 0x8d, 0xaf,
0x4d, 0x85, 0xd9, 0x6f, 0x11, 0xe9, 0x71, 0x79, 0x3d, 0x54, 0x93, 0x9c, 0x8b, 0xd5, 0x68, 0x7d,
0x63, 0x13, 0xd6, 0xee, 0x6b, 0xeb, 0xb3, 0xfb, 0x6a, 0xd7, 0xe7, 0x72, 0x1d, 0x02, 0x22, 0x80,
0x94, 0xe5, 0xba, 0x50, 0x46, 0xfa, 0x70, 0x1e, 0x6d, 0x7f, 0x37, 0x1d, 0x37, 0x45, 0xdc, 0xef,
0x06, 0x6b, 0x0f, 0x17, 0x6e, 0xcf, 0xfb, 0x00, 0xc0, 0x9e, 0x92, 0x23, 0x37, 0x37, 0xab, 0x93,
0x55, 0xb1, 0xa2, 0x5a, 0x2c, 0x36, 0x46, 0x3b, 0x6d, 0xec, 0x1b, 0x63, 0xde, 0x2c, 0x65, 0x6e,
0xe1, 0x0f, 0x03, 0x63, 0x60, 0xae, 0xd3, 0x45, 0x26, 0xbd, 0x71, 0x4d, 0x03, 0x74, 0x58, 0xed,
0x57, 0x5d, 0x3a, 0x15, 0x86, 0x18, 0xd2, 0x18, 0x1d, 0xea, 0xe1, 0x00, 0xfb, 0x1f, 0xe9, 0xbc,
0xcf, 0xed, 0xe0, 0x39, 0x90, 0x93, 0x0a, 0x2b, 0xc2, 0x1b, 0x02, 0x32, 0xfb, 0x3b, 0xc2, 0xde,
0x70, 0x0d, 0x51, 0x9b, 0xa7, 0xf8, 0xdf, 0x80, 0x54, 0xf0, 0x1e, 0x45, 0xfe, 0xbf, 0x11, 0x14,
0xe0, 0x0a, 0xde, 0x4c, 0x3f, 0x50, 0x51, 0xfe, 0xa2, 0x41, 0x15, 0x06, 0x5f, 0xe7, 0xb3, 0xc1,
0xb7, 0x5b, 0x0d, 0xbe, 0x87, 0x84, 0x14, 0x8b, 0xf1, 0x4c, 0x6e, 0x0a, 0xa1, 0x0c, 0x7e, 0xd8,
0xba, 0xbc, 0xa6, 0xc1, 0xc6, 0x50, 0x6b, 0x37, 0xd8, 0x0f, 0xf0, 0x1c, 0x15, 0xae, 0xd5, 0xb0,
0xe7, 0xce, 0xe2, 0x10, 0xfb, 0x0e, 0xf8, 0xbe, 0xf6, 0x2f, 0x0c, 0xbe, 0x19, 0xf0, 0x1e, 0x2b,
0x3b, 0xd5, 0x0b, 0xeb, 0xa7, 0x90, 0xff, 0xe8, 0x7c, 0xa2, 0x7d, 0xf9, 0xe8, 0x97, 0x07, 0x13,
0x65, 0xa7, 0x8b, 0xf1, 0x69, 0xa2, 0xe7, 0xcf, 0x06, 0x83, 0x24, 0x7f, 0x86, 0xdf, 0xf2, 0xc1,
0xe0, 0x19, 0xfe, 0x1e, 0xc6, 0xbb, 0xf8, 0x01, 0x1f, 0xfc, 0x13, 0x00, 0x00, 0xff, 0xff, 0xe6,
0x69, 0x17, 0x4b, 0xdb, 0x0b, 0x00, 0x00,
}
vendor/github.com/33cn/chain33/wallet/sendtx.go
View file @ 8898b5a7
......@@ -202,7 +202,7 @@ func (wallet *Wallet) createSendToAddress(addrto string, amount int64, note stri
create := &types.CreateTx{
To: addrto,
Amount: amount,
Note: note,
Note: []byte(note),
IsWithdraw: isWithdraw,
IsToken: Istoken,
TokenSymbol: tokenSymbol,
......
vendor/github.com/33cn/chain33/wallet/wallet_proc.go
View file @ 8898b5a7
......@@ -572,7 +572,7 @@ func (wallet *Wallet) ProcSendToAddress(SendToAddress *types.ReqWalletSendToAddr
if err != nil {
return nil, err
}
return wallet.sendToAddress(priv, addrto, amount, note, SendToAddress.IsToken, SendToAddress.TokenSymbol)
return wallet.sendToAddress(priv, addrto, amount, string(note), SendToAddress.IsToken, SendToAddress.TokenSymbol)
}
// ProcWalletSetFee 处理设置手续费
......@@ -729,7 +729,7 @@ func (wallet *Wallet) ProcMergeBalance(MergeBalance *types.ReqWalletMergeBalance
}
amount = amount - wallet.FeeAmount
v := &cty.CoinsAction_Transfer{
Transfer: &types.AssetsTransfer{Amount: amount, Note: note},
Transfer: &types.AssetsTransfer{Amount: amount, Note: []byte(note)},
}
transfer := &cty.CoinsAction{Value: v, Ty: cty.CoinsActionTransfer}
//初始化随机数
......
vendor/github.com/33cn/chain33/wallet/wallet_test.go
View file @ 8898b5a7
......@@ -461,7 +461,7 @@ func testProcSendToAddress(t *testing.T, wallet *Wallet) {
transfer := &types.ReqWalletSendToAddress{
Amount: 1000,
From: FromAddr,
Note: "test",
Note: []byte("test"),
To: "1L1zEgVcjqdM2KkQixENd7SZTaudKkcyDu",
}
msg := wallet.client.NewMessage("wallet", types.EventWalletSendToAddress, transfer)
......@@ -473,7 +473,7 @@ func testProcSendToAddress(t *testing.T, wallet *Wallet) {
withdraw := &types.ReqWalletSendToAddress{
Amount: -1000,
From: FromAddr,
Note: "test",
Note: []byte("test"),
To: "16htvcBNSEA7fZhAdLJphDwQRQJaHpyHTp",
}
msg = wallet.client.NewMessage("wallet", types.EventWalletSendToAddress, withdraw)
......@@ -592,7 +592,7 @@ func testProcWalletLock(t *testing.T, wallet *Wallet) {
transfer := &types.ReqWalletSendToAddress{
Amount: 1000,
From: FromAddr,
Note: "test",
Note: []byte("test"),
To: "1L1zEgVcjqdM2KkQixENd7SZTaudKkcyDu",
}
msg = wallet.client.NewMessage("wallet", types.EventWalletSendToAddress, transfer)
......
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