diff --git a/api/oracle/v1/state.cosmos_orm.go b/api/oracle/v1/state.cosmos_orm.go index 15d94d2ab..77615a9ca 100644 --- a/api/oracle/v1/state.cosmos_orm.go +++ b/api/oracle/v1/state.cosmos_orm.go @@ -144,9 +144,9 @@ type AccountTable interface { Has(ctx context.Context, id uint64) (found bool, err error) // Get returns nil and an error which responds true to ormerrors.IsNotFound() if the record was not found. Get(ctx context.Context, id uint64) (*Account, error) - HasByAccount(ctx context.Context, account string) (found bool, err error) - // GetByAccount returns nil and an error which responds true to ormerrors.IsNotFound() if the record was not found. - GetByAccount(ctx context.Context, account string) (*Account, error) + HasByAddressChainNetwork(ctx context.Context, address string, chain string, network string) (found bool, err error) + // GetByAddressChainNetwork returns nil and an error which responds true to ormerrors.IsNotFound() if the record was not found. + GetByAddressChainNetwork(ctx context.Context, address string, chain string, network string) (*Account, error) List(ctx context.Context, prefixKey AccountIndexKey, opts ...ormlist.Option) (AccountIterator, error) ListRange(ctx context.Context, from, to AccountIndexKey, opts ...ormlist.Option) (AccountIterator, error) DeleteBy(ctx context.Context, prefixKey AccountIndexKey) error @@ -187,16 +187,26 @@ func (this AccountIdIndexKey) WithId(id uint64) AccountIdIndexKey { return this } -type AccountAccountIndexKey struct { +type AccountAddressChainNetworkIndexKey struct { vs []interface{} } -func (x AccountAccountIndexKey) id() uint32 { return 1 } -func (x AccountAccountIndexKey) values() []interface{} { return x.vs } -func (x AccountAccountIndexKey) accountIndexKey() {} +func (x AccountAddressChainNetworkIndexKey) id() uint32 { return 1 } +func (x AccountAddressChainNetworkIndexKey) values() []interface{} { return x.vs } +func (x AccountAddressChainNetworkIndexKey) accountIndexKey() {} -func (this AccountAccountIndexKey) WithAccount(account string) AccountAccountIndexKey { - this.vs = []interface{}{account} +func (this AccountAddressChainNetworkIndexKey) WithAddress(address string) AccountAddressChainNetworkIndexKey { + this.vs = []interface{}{address} + return this +} + +func (this AccountAddressChainNetworkIndexKey) WithAddressChain(address string, chain string) AccountAddressChainNetworkIndexKey { + this.vs = []interface{}{address, chain} + return this +} + +func (this AccountAddressChainNetworkIndexKey) WithAddressChainNetwork(address string, chain string, network string) AccountAddressChainNetworkIndexKey { + this.vs = []interface{}{address, chain, network} return this } @@ -236,16 +246,20 @@ func (this accountTable) Get(ctx context.Context, id uint64) (*Account, error) { return &account, nil } -func (this accountTable) HasByAccount(ctx context.Context, account string) (found bool, err error) { +func (this accountTable) HasByAddressChainNetwork(ctx context.Context, address string, chain string, network string) (found bool, err error) { return this.table.GetIndexByID(1).(ormtable.UniqueIndex).Has(ctx, - account, + address, + chain, + network, ) } -func (this accountTable) GetByAccount(ctx context.Context, account string) (*Account, error) { +func (this accountTable) GetByAddressChainNetwork(ctx context.Context, address string, chain string, network string) (*Account, error) { var account Account found, err := this.table.GetIndexByID(1).(ormtable.UniqueIndex).Get(ctx, &account, - account, + address, + chain, + network, ) if err != nil { return nil, err diff --git a/api/oracle/v1/state.pulsar.go b/api/oracle/v1/state.pulsar.go index 5c1641d95..612431016 100644 --- a/api/oracle/v1/state.pulsar.go +++ b/api/oracle/v1/state.pulsar.go @@ -484,7 +484,7 @@ func (x *fastReflection_Balance) ProtoMethods() *protoiface.Methods { var ( md_Account protoreflect.MessageDescriptor fd_Account_id protoreflect.FieldDescriptor - fd_Account_account protoreflect.FieldDescriptor + fd_Account_address protoreflect.FieldDescriptor fd_Account_chain protoreflect.FieldDescriptor fd_Account_network protoreflect.FieldDescriptor ) @@ -493,7 +493,7 @@ func init() { file_oracle_v1_state_proto_init() md_Account = File_oracle_v1_state_proto.Messages().ByName("Account") fd_Account_id = md_Account.Fields().ByName("id") - fd_Account_account = md_Account.Fields().ByName("account") + fd_Account_address = md_Account.Fields().ByName("address") fd_Account_chain = md_Account.Fields().ByName("chain") fd_Account_network = md_Account.Fields().ByName("network") } @@ -569,9 +569,9 @@ func (x *fastReflection_Account) Range(f func(protoreflect.FieldDescriptor, prot return } } - if x.Account != "" { - value := protoreflect.ValueOfString(x.Account) - if !f(fd_Account_account, value) { + if x.Address != "" { + value := protoreflect.ValueOfString(x.Address) + if !f(fd_Account_address, value) { return } } @@ -604,8 +604,8 @@ func (x *fastReflection_Account) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { case "oracle.v1.Account.id": return x.Id != uint64(0) - case "oracle.v1.Account.account": - return x.Account != "" + case "oracle.v1.Account.address": + return x.Address != "" case "oracle.v1.Account.chain": return x.Chain != "" case "oracle.v1.Account.network": @@ -628,8 +628,8 @@ func (x *fastReflection_Account) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { case "oracle.v1.Account.id": x.Id = uint64(0) - case "oracle.v1.Account.account": - x.Account = "" + case "oracle.v1.Account.address": + x.Address = "" case "oracle.v1.Account.chain": x.Chain = "" case "oracle.v1.Account.network": @@ -653,8 +653,8 @@ func (x *fastReflection_Account) Get(descriptor protoreflect.FieldDescriptor) pr case "oracle.v1.Account.id": value := x.Id return protoreflect.ValueOfUint64(value) - case "oracle.v1.Account.account": - value := x.Account + case "oracle.v1.Account.address": + value := x.Address return protoreflect.ValueOfString(value) case "oracle.v1.Account.chain": value := x.Chain @@ -684,8 +684,8 @@ func (x *fastReflection_Account) Set(fd protoreflect.FieldDescriptor, value prot switch fd.FullName() { case "oracle.v1.Account.id": x.Id = value.Uint() - case "oracle.v1.Account.account": - x.Account = value.Interface().(string) + case "oracle.v1.Account.address": + x.Address = value.Interface().(string) case "oracle.v1.Account.chain": x.Chain = value.Interface().(string) case "oracle.v1.Account.network": @@ -712,8 +712,8 @@ func (x *fastReflection_Account) Mutable(fd protoreflect.FieldDescriptor) protor switch fd.FullName() { case "oracle.v1.Account.id": panic(fmt.Errorf("field id of message oracle.v1.Account is not mutable")) - case "oracle.v1.Account.account": - panic(fmt.Errorf("field account of message oracle.v1.Account is not mutable")) + case "oracle.v1.Account.address": + panic(fmt.Errorf("field address of message oracle.v1.Account is not mutable")) case "oracle.v1.Account.chain": panic(fmt.Errorf("field chain of message oracle.v1.Account is not mutable")) case "oracle.v1.Account.network": @@ -733,7 +733,7 @@ func (x *fastReflection_Account) NewField(fd protoreflect.FieldDescriptor) proto switch fd.FullName() { case "oracle.v1.Account.id": return protoreflect.ValueOfUint64(uint64(0)) - case "oracle.v1.Account.account": + case "oracle.v1.Account.address": return protoreflect.ValueOfString("") case "oracle.v1.Account.chain": return protoreflect.ValueOfString("") @@ -811,7 +811,7 @@ func (x *fastReflection_Account) ProtoMethods() *protoiface.Methods { if x.Id != 0 { n += 1 + runtime.Sov(uint64(x.Id)) } - l = len(x.Account) + l = len(x.Address) if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } @@ -866,10 +866,10 @@ func (x *fastReflection_Account) ProtoMethods() *protoiface.Methods { i-- dAtA[i] = 0x1a } - if len(x.Account) > 0 { - i -= len(x.Account) - copy(dAtA[i:], x.Account) - i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Account))) + if len(x.Address) > 0 { + i -= len(x.Address) + copy(dAtA[i:], x.Address) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Address))) i-- dAtA[i] = 0x12 } @@ -948,7 +948,7 @@ func (x *fastReflection_Account) ProtoMethods() *protoiface.Methods { } case 2: if wireType != 2 { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Account", wireType) + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Address", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -976,7 +976,7 @@ func (x *fastReflection_Account) ProtoMethods() *protoiface.Methods { if postIndex > l { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } - x.Account = string(dAtA[iNdEx:postIndex]) + x.Address = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 3: if wireType != 2 { @@ -1139,7 +1139,7 @@ type Account struct { unknownFields protoimpl.UnknownFields Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` - Account string `protobuf:"bytes,2,opt,name=account,proto3" json:"account,omitempty"` + Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"` Chain string `protobuf:"bytes,3,opt,name=chain,proto3" json:"chain,omitempty"` Network string `protobuf:"bytes,4,opt,name=network,proto3" json:"network,omitempty"` } @@ -1171,9 +1171,9 @@ func (x *Account) GetId() uint64 { return 0 } -func (x *Account) GetAccount() string { +func (x *Account) GetAddress() string { if x != nil { - return x.Account + return x.Address } return "" } @@ -1204,25 +1204,26 @@ var file_oracle_v1_state_proto_rawDesc = []byte{ 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x3a, 0x1f, 0xf2, 0x9e, 0xd3, 0x8e, 0x03, 0x19, 0x0a, 0x09, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x0a, 0x0a, 0x06, 0x61, - 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x01, 0x18, 0x01, 0x22, 0x82, 0x01, 0x0a, 0x07, 0x41, 0x63, + 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x01, 0x18, 0x01, 0x22, 0x90, 0x01, 0x0a, 0x07, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x04, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, + 0x04, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x3a, - 0x1d, 0xf2, 0x9e, 0xd3, 0x8e, 0x03, 0x17, 0x0a, 0x04, 0x0a, 0x02, 0x69, 0x64, 0x12, 0x0d, 0x0a, - 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x01, 0x18, 0x01, 0x18, 0x02, 0x42, 0x8f, - 0x01, 0x0a, 0x0d, 0x63, 0x6f, 0x6d, 0x2e, 0x6f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x2e, 0x76, 0x31, - 0x42, 0x0a, 0x53, 0x74, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2d, - 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x6e, 0x73, 0x6f, 0x6e, - 0x72, 0x2f, 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x6f, 0x72, 0x61, 0x63, 0x6c, - 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x6f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, - 0x4f, 0x58, 0x58, 0xaa, 0x02, 0x09, 0x4f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x2e, 0x56, 0x31, 0xca, - 0x02, 0x09, 0x4f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x15, 0x4f, 0x72, - 0x61, 0x63, 0x6c, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, - 0x61, 0x74, 0x61, 0xea, 0x02, 0x0a, 0x4f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x3a, 0x3a, 0x56, 0x31, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2b, 0xf2, 0x9e, 0xd3, 0x8e, 0x03, 0x25, 0x0a, 0x04, 0x0a, 0x02, 0x69, 0x64, 0x12, 0x1b, 0x0a, + 0x15, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x2c, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x2c, 0x6e, + 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x10, 0x01, 0x18, 0x01, 0x18, 0x02, 0x42, 0x8f, 0x01, 0x0a, + 0x0d, 0x63, 0x6f, 0x6d, 0x2e, 0x6f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0a, + 0x53, 0x74, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2d, 0x67, 0x69, + 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x6e, 0x73, 0x6f, 0x6e, 0x72, 0x2f, + 0x73, 0x6f, 0x6e, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x6f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x2f, + 0x76, 0x31, 0x3b, 0x6f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x4f, 0x58, + 0x58, 0xaa, 0x02, 0x09, 0x4f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x09, + 0x4f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x15, 0x4f, 0x72, 0x61, 0x63, + 0x6c, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, + 0x61, 0xea, 0x02, 0x0a, 0x4f, 0x72, 0x61, 0x63, 0x6c, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/proto/oracle/v1/state.proto b/proto/oracle/v1/state.proto index c2de52d7d..bbf834e72 100644 --- a/proto/oracle/v1/state.proto +++ b/proto/oracle/v1/state.proto @@ -27,13 +27,13 @@ message Account { primary_key: {fields: "id"} index: { id: 1 - fields: "account" + fields: "address,chain,network" unique: true } }; uint64 id = 1; - string account = 2; + string address = 2; string chain = 3; string network = 4; } diff --git a/x/oracle/types/state.pb.go b/x/oracle/types/state.pb.go index 62b699b58..9cfd09c3b 100644 --- a/x/oracle/types/state.pb.go +++ b/x/oracle/types/state.pb.go @@ -77,7 +77,7 @@ func (m *Balance) GetAmount() uint64 { type Account struct { Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` - Account string `protobuf:"bytes,2,opt,name=account,proto3" json:"account,omitempty"` + Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"` Chain string `protobuf:"bytes,3,opt,name=chain,proto3" json:"chain,omitempty"` Network string `protobuf:"bytes,4,opt,name=network,proto3" json:"network,omitempty"` } @@ -122,9 +122,9 @@ func (m *Account) GetId() uint64 { return 0 } -func (m *Account) GetAccount() string { +func (m *Account) GetAddress() string { if m != nil { - return m.Account + return m.Address } return "" } @@ -151,24 +151,25 @@ func init() { func init() { proto.RegisterFile("oracle/v1/state.proto", fileDescriptor_8840885873256d8c) } var fileDescriptor_8840885873256d8c = []byte{ - // 275 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xcd, 0x2f, 0x4a, 0x4c, - 0xce, 0x49, 0xd5, 0x2f, 0x33, 0xd4, 0x2f, 0x2e, 0x49, 0x2c, 0x49, 0xd5, 0x2b, 0x28, 0xca, 0x2f, - 0xc9, 0x17, 0xe2, 0x84, 0x08, 0xeb, 0x95, 0x19, 0x4a, 0x89, 0x27, 0xe7, 0x17, 0xe7, 0xe6, 0x17, - 0xeb, 0xe7, 0x17, 0xe5, 0x82, 0x54, 0xe5, 0x17, 0xe5, 0x42, 0xd4, 0x28, 0xc5, 0x70, 0xb1, 0x3b, - 0x25, 0xe6, 0x24, 0xe6, 0x25, 0xa7, 0x0a, 0x49, 0x70, 0xb1, 0x27, 0x26, 0x27, 0xe7, 0x97, 0xe6, - 0x95, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x06, 0xc1, 0xb8, 0x42, 0x62, 0x5c, 0x6c, 0x89, 0xb9, - 0x60, 0x09, 0x26, 0x05, 0x46, 0x0d, 0x96, 0x20, 0x28, 0xcf, 0x4a, 0xfe, 0xd3, 0xbc, 0xcb, 0x7d, - 0xcc, 0x92, 0x5c, 0x9c, 0x70, 0x9d, 0x42, 0x5c, 0x30, 0xa5, 0x02, 0x8c, 0x12, 0x8c, 0x4a, 0x4d, - 0x8c, 0x5c, 0xec, 0x8e, 0x50, 0x19, 0x3e, 0x2e, 0xa6, 0xcc, 0x14, 0xb0, 0xc9, 0x2c, 0x41, 0x4c, - 0x99, 0x29, 0xc8, 0xd6, 0x31, 0xa1, 0x5a, 0x27, 0xc2, 0xc5, 0x9a, 0x9c, 0x91, 0x98, 0x99, 0x27, - 0xc1, 0x0c, 0x16, 0x87, 0x70, 0x40, 0xea, 0xf3, 0x52, 0x4b, 0xca, 0xf3, 0x8b, 0xb2, 0x25, 0x58, - 0x20, 0xea, 0xa1, 0x5c, 0x2b, 0x59, 0xb0, 0x33, 0xc4, 0xb9, 0x58, 0x40, 0x36, 0x08, 0xf1, 0xc2, - 0xcd, 0x05, 0x39, 0x41, 0x82, 0xc9, 0xc9, 0xfe, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, - 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, - 0x18, 0xa2, 0x54, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0xf3, 0xf3, - 0x8a, 0xf3, 0xf3, 0x8a, 0xf4, 0xc1, 0x44, 0x85, 0x3e, 0x34, 0x40, 0x4b, 0x2a, 0x0b, 0x52, 0x8b, - 0x93, 0xd8, 0xc0, 0x41, 0x65, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xff, 0x11, 0xbc, 0xfd, 0x67, + // 291 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x3c, 0x90, 0xc1, 0x4a, 0x03, 0x31, + 0x10, 0x86, 0x9b, 0xed, 0xda, 0xd2, 0x1c, 0x44, 0x82, 0xd5, 0xa8, 0x10, 0x4b, 0xa1, 0x50, 0xb0, + 0x6c, 0x28, 0xde, 0x7a, 0x11, 0xfb, 0x08, 0x7b, 0x14, 0x2f, 0x69, 0x36, 0xd8, 0xc5, 0x6e, 0xa6, + 0x24, 0x69, 0xd5, 0x97, 0x90, 0x3e, 0x81, 0xcf, 0xe3, 0xb1, 0xe0, 0xc5, 0xa3, 0xec, 0xbe, 0x81, + 0x4f, 0x20, 0x9b, 0x4d, 0xbd, 0x0c, 0xfc, 0x33, 0xdf, 0xfc, 0xff, 0x30, 0xb8, 0x0f, 0x46, 0xc8, + 0x95, 0xe2, 0xdb, 0x29, 0xb7, 0x4e, 0x38, 0x95, 0xac, 0x0d, 0x38, 0x20, 0xbd, 0xa6, 0x9d, 0x6c, + 0xa7, 0x97, 0xe7, 0x12, 0x6c, 0x01, 0x96, 0x83, 0x29, 0x6a, 0x0a, 0x4c, 0xd1, 0x30, 0xc3, 0x47, + 0xdc, 0x9d, 0x8b, 0x95, 0xd0, 0x52, 0x11, 0x8a, 0xbb, 0x42, 0x4a, 0xd8, 0x68, 0x47, 0xd1, 0x00, + 0x8d, 0x7b, 0xe9, 0x41, 0x92, 0x33, 0xdc, 0x11, 0x85, 0x1f, 0x44, 0x03, 0x34, 0x8e, 0xd3, 0xa0, + 0x66, 0xd7, 0xbf, 0x1f, 0x5f, 0xef, 0xed, 0x0b, 0xdc, 0xfb, 0xdf, 0x24, 0xf8, 0x80, 0x9e, 0x20, + 0x8a, 0x86, 0x3b, 0x84, 0xbb, 0xf7, 0x61, 0x72, 0x8c, 0xa3, 0x3c, 0xf3, 0xce, 0x71, 0x1a, 0xe5, + 0x99, 0x8f, 0xcb, 0x32, 0xa3, 0xac, 0xf5, 0xae, 0x75, 0x5c, 0x23, 0xc9, 0x29, 0x3e, 0x92, 0x4b, + 0x91, 0x6b, 0xda, 0xf6, 0xfd, 0x46, 0xd4, 0xbc, 0x56, 0xee, 0x05, 0xcc, 0x33, 0x8d, 0x1b, 0x3e, + 0xc8, 0xd9, 0x8d, 0x3f, 0x63, 0x84, 0xe3, 0x3a, 0x81, 0x5c, 0xe1, 0x7e, 0x30, 0x9a, 0xf8, 0xc5, + 0x49, 0xc0, 0xea, 0x83, 0x68, 0x34, 0xbf, 0xfb, 0x2c, 0x19, 0xda, 0x97, 0x0c, 0xfd, 0x94, 0x0c, + 0xed, 0x2a, 0xd6, 0xda, 0x57, 0xac, 0xf5, 0x5d, 0xb1, 0xd6, 0xc3, 0xe8, 0x29, 0x77, 0xcb, 0xcd, + 0x22, 0x91, 0x50, 0x70, 0xd0, 0x16, 0xb4, 0xe1, 0xbe, 0xbc, 0xf2, 0xf0, 0x5e, 0xf7, 0xb6, 0x56, + 0x76, 0xd1, 0xf1, 0x8f, 0xbb, 0xfd, 0x0b, 0x00, 0x00, 0xff, 0xff, 0xa1, 0x85, 0x67, 0x6c, 0x75, 0x01, 0x00, 0x00, } @@ -241,10 +242,10 @@ func (m *Account) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x1a } - if len(m.Account) > 0 { - i -= len(m.Account) - copy(dAtA[i:], m.Account) - i = encodeVarintState(dAtA, i, uint64(len(m.Account))) + if len(m.Address) > 0 { + i -= len(m.Address) + copy(dAtA[i:], m.Address) + i = encodeVarintState(dAtA, i, uint64(len(m.Address))) i-- dAtA[i] = 0x12 } @@ -292,7 +293,7 @@ func (m *Account) Size() (n int) { if m.Id != 0 { n += 1 + sovState(uint64(m.Id)) } - l = len(m.Account) + l = len(m.Address) if l > 0 { n += 1 + l + sovState(uint64(l)) } @@ -464,7 +465,7 @@ func (m *Account) Unmarshal(dAtA []byte) error { } case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Account", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -492,7 +493,7 @@ func (m *Account) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Account = string(dAtA[iNdEx:postIndex]) + m.Address = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 3: if wireType != 2 {