From 26aa346fbf4d88910f03e6c8e7991feff7d834bd Mon Sep 17 00:00:00 2001 From: Ava Howell Date: Mon, 10 Apr 2023 21:06:16 -0700 Subject: [PATCH] penumbra provider: update generated protos (#1168) --- .../penumbra/core/chain/v1alpha1/chain.pb.go | 753 ++-- .../core/crypto/v1alpha1/crypto.pb.go | 1600 +++++++-- .../penumbra/core/dex/v1alpha1/dex.pb.go | 735 ++-- .../penumbra/core/stake/v1alpha1/stake.pb.go | 327 +- .../transaction/v1alpha1/transaction.pb.go | 3035 +++++++++++++---- .../v1alpha1/transparent_proofs.pb.go | 171 +- 6 files changed, 4852 insertions(+), 1769 deletions(-) diff --git a/relayer/chains/penumbra/core/chain/v1alpha1/chain.pb.go b/relayer/chains/penumbra/core/chain/v1alpha1/chain.pb.go index 19da79408..2d6cf9a53 100644 --- a/relayer/chains/penumbra/core/chain/v1alpha1/chain.pb.go +++ b/relayer/chains/penumbra/core/chain/v1alpha1/chain.pb.go @@ -527,7 +527,6 @@ type StatePayload struct { // *StatePayload_RolledUp_ // *StatePayload_Note_ // *StatePayload_Swap_ - // *StatePayload_Position_ StatePayload isStatePayload_StatePayload `protobuf_oneof:"state_payload"` } @@ -579,14 +578,10 @@ type StatePayload_Note_ struct { type StatePayload_Swap_ struct { Swap *StatePayload_Swap `protobuf:"bytes,3,opt,name=swap,proto3,oneof" json:"swap,omitempty"` } -type StatePayload_Position_ struct { - Position *StatePayload_Position `protobuf:"bytes,4,opt,name=position,proto3,oneof" json:"position,omitempty"` -} func (*StatePayload_RolledUp_) isStatePayload_StatePayload() {} func (*StatePayload_Note_) isStatePayload_StatePayload() {} func (*StatePayload_Swap_) isStatePayload_StatePayload() {} -func (*StatePayload_Position_) isStatePayload_StatePayload() {} func (m *StatePayload) GetStatePayload() isStatePayload_StatePayload { if m != nil { @@ -616,20 +611,12 @@ func (m *StatePayload) GetSwap() *StatePayload_Swap { return nil } -func (m *StatePayload) GetPosition() *StatePayload_Position { - if x, ok := m.GetStatePayload().(*StatePayload_Position_); ok { - return x.Position - } - return nil -} - // XXX_OneofWrappers is for the internal use of the proto package. func (*StatePayload) XXX_OneofWrappers() []interface{} { return []interface{}{ (*StatePayload_RolledUp_)(nil), (*StatePayload_Note_)(nil), (*StatePayload_Swap_)(nil), - (*StatePayload_Position_)(nil), } } @@ -781,58 +768,6 @@ func (m *StatePayload_Swap) GetSwap() *v1alpha11.SwapPayload { return nil } -type StatePayload_Position struct { - LpNft *v1alpha11.LpNft `protobuf:"bytes,2,opt,name=lp_nft,json=lpNft,proto3" json:"lp_nft,omitempty"` - Commitment *v1alpha1.StateCommitment `protobuf:"bytes,1,opt,name=commitment,proto3" json:"commitment,omitempty"` -} - -func (m *StatePayload_Position) Reset() { *m = StatePayload_Position{} } -func (m *StatePayload_Position) String() string { return proto.CompactTextString(m) } -func (*StatePayload_Position) ProtoMessage() {} -func (*StatePayload_Position) Descriptor() ([]byte, []int) { - return fileDescriptor_b0cedb8b84ba3224, []int{5, 3} -} -func (m *StatePayload_Position) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *StatePayload_Position) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_StatePayload_Position.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *StatePayload_Position) XXX_Merge(src proto.Message) { - xxx_messageInfo_StatePayload_Position.Merge(m, src) -} -func (m *StatePayload_Position) XXX_Size() int { - return m.Size() -} -func (m *StatePayload_Position) XXX_DiscardUnknown() { - xxx_messageInfo_StatePayload_Position.DiscardUnknown(m) -} - -var xxx_messageInfo_StatePayload_Position proto.InternalMessageInfo - -func (m *StatePayload_Position) GetLpNft() *v1alpha11.LpNft { - if m != nil { - return m.LpNft - } - return nil -} - -func (m *StatePayload_Position) GetCommitment() *v1alpha1.StateCommitment { - if m != nil { - return m.Commitment - } - return nil -} - type KnownAssets struct { Assets []*v1alpha1.Asset `protobuf:"bytes,1,rep,name=assets,proto3" json:"assets,omitempty"` } @@ -1036,7 +971,7 @@ func (m *GenesisAppState) GetAllocations() []*GenesisAppState_Allocation { } type GenesisAppState_Allocation struct { - Amount uint64 `protobuf:"varint,1,opt,name=amount,proto3" json:"amount,omitempty"` + Amount *v1alpha1.Amount `protobuf:"bytes,1,opt,name=amount,proto3" json:"amount,omitempty"` Denom string `protobuf:"bytes,2,opt,name=denom,proto3" json:"denom,omitempty"` Address *v1alpha1.Address `protobuf:"bytes,3,opt,name=address,proto3" json:"address,omitempty"` } @@ -1074,11 +1009,11 @@ func (m *GenesisAppState_Allocation) XXX_DiscardUnknown() { var xxx_messageInfo_GenesisAppState_Allocation proto.InternalMessageInfo -func (m *GenesisAppState_Allocation) GetAmount() uint64 { +func (m *GenesisAppState_Allocation) GetAmount() *v1alpha1.Amount { if m != nil { return m.Amount } - return 0 + return nil } func (m *GenesisAppState_Allocation) GetDenom() string { @@ -1095,6 +1030,58 @@ func (m *GenesisAppState_Allocation) GetAddress() *v1alpha1.Address { return nil } +type Epoch struct { + Index uint64 `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty"` + StartHeight uint64 `protobuf:"varint,2,opt,name=start_height,json=startHeight,proto3" json:"start_height,omitempty"` +} + +func (m *Epoch) Reset() { *m = Epoch{} } +func (m *Epoch) String() string { return proto.CompactTextString(m) } +func (*Epoch) ProtoMessage() {} +func (*Epoch) Descriptor() ([]byte, []int) { + return fileDescriptor_b0cedb8b84ba3224, []int{10} +} +func (m *Epoch) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Epoch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Epoch.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Epoch) XXX_Merge(src proto.Message) { + xxx_messageInfo_Epoch.Merge(m, src) +} +func (m *Epoch) XXX_Size() int { + return m.Size() +} +func (m *Epoch) XXX_DiscardUnknown() { + xxx_messageInfo_Epoch.DiscardUnknown(m) +} + +var xxx_messageInfo_Epoch proto.InternalMessageInfo + +func (m *Epoch) GetIndex() uint64 { + if m != nil { + return m.Index + } + return 0 +} + +func (m *Epoch) GetStartHeight() uint64 { + if m != nil { + return m.StartHeight + } + return 0 +} + func init() { proto.RegisterType((*ChainParameters)(nil), "penumbra.core.chain.v1alpha1.ChainParameters") proto.RegisterType((*Ratio)(nil), "penumbra.core.chain.v1alpha1.Ratio") @@ -1105,12 +1092,12 @@ func init() { proto.RegisterType((*StatePayload_RolledUp)(nil), "penumbra.core.chain.v1alpha1.StatePayload.RolledUp") proto.RegisterType((*StatePayload_Note)(nil), "penumbra.core.chain.v1alpha1.StatePayload.Note") proto.RegisterType((*StatePayload_Swap)(nil), "penumbra.core.chain.v1alpha1.StatePayload.Swap") - proto.RegisterType((*StatePayload_Position)(nil), "penumbra.core.chain.v1alpha1.StatePayload.Position") proto.RegisterType((*KnownAssets)(nil), "penumbra.core.chain.v1alpha1.KnownAssets") proto.RegisterType((*NoteSource)(nil), "penumbra.core.chain.v1alpha1.NoteSource") proto.RegisterType((*SpendInfo)(nil), "penumbra.core.chain.v1alpha1.SpendInfo") proto.RegisterType((*GenesisAppState)(nil), "penumbra.core.chain.v1alpha1.GenesisAppState") proto.RegisterType((*GenesisAppState_Allocation)(nil), "penumbra.core.chain.v1alpha1.GenesisAppState.Allocation") + proto.RegisterType((*Epoch)(nil), "penumbra.core.chain.v1alpha1.Epoch") } func init() { @@ -1118,106 +1105,105 @@ func init() { } var fileDescriptor_b0cedb8b84ba3224 = []byte{ - // 1572 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x5b, 0x8f, 0x1b, 0x49, - 0x15, 0x1e, 0xcf, 0xd5, 0x73, 0x3c, 0x97, 0x50, 0x9b, 0x4b, 0xc7, 0x0c, 0x93, 0x89, 0xb5, 0x0b, - 0x4e, 0x56, 0xd8, 0xec, 0xec, 0x0a, 0x22, 0x2f, 0xa0, 0xcc, 0x25, 0x4c, 0xa2, 0x4d, 0xb2, 0x4e, - 0xcd, 0x12, 0x50, 0x14, 0xa9, 0x55, 0xee, 0x2e, 0xc7, 0xa5, 0x74, 0x57, 0x35, 0x5d, 0xd5, 0x33, - 0x19, 0x89, 0x47, 0x40, 0x3c, 0xf2, 0xc0, 0x2f, 0xe0, 0x91, 0x37, 0xfe, 0x05, 0x42, 0x42, 0xda, - 0x47, 0xb4, 0x4f, 0x68, 0xf2, 0xc6, 0xaf, 0x40, 0x75, 0xaa, 0x2f, 0xb6, 0x59, 0x3c, 0x3b, 0xab, - 0x3c, 0xd9, 0x75, 0xce, 0xf7, 0x7d, 0x75, 0xea, 0x54, 0xd5, 0x39, 0x5d, 0xd0, 0x4e, 0xb8, 0xcc, - 0xe2, 0x41, 0xca, 0xba, 0x81, 0x4a, 0x79, 0x37, 0x18, 0x31, 0x21, 0xbb, 0x27, 0x1f, 0xb1, 0x28, - 0x19, 0xb1, 0x8f, 0xdc, 0xb0, 0x93, 0xa4, 0xca, 0x28, 0xb2, 0x55, 0x20, 0x3b, 0x16, 0xd9, 0x71, - 0xae, 0x02, 0xd9, 0xbc, 0x3b, 0xa5, 0x93, 0x9e, 0x25, 0x46, 0x8d, 0x09, 0xe1, 0xd8, 0x29, 0x35, - 0xa7, 0xe6, 0xd4, 0x86, 0xbd, 0xe6, 0x15, 0x14, 0x87, 0x39, 0xf2, 0xfd, 0x49, 0x64, 0xc8, 0xdf, - 0x54, 0xb8, 0x90, 0xbf, 0x71, 0xa8, 0xd6, 0x3f, 0x57, 0x60, 0xf3, 0xc0, 0x86, 0xd3, 0x67, 0x29, - 0x8b, 0xb9, 0xe1, 0xa9, 0x26, 0x37, 0xa1, 0x8e, 0x11, 0xfa, 0x22, 0xf4, 0x6a, 0x3b, 0xb5, 0xf6, - 0x2a, 0x5d, 0xc1, 0xf1, 0xa3, 0x90, 0x7c, 0x00, 0x1b, 0x3c, 0x51, 0xc1, 0xc8, 0x0f, 0xb3, 0x94, - 0x19, 0xa1, 0xa4, 0x37, 0xbf, 0x53, 0x6b, 0x2f, 0xd2, 0x75, 0xb4, 0x1e, 0xe6, 0x46, 0x72, 0x07, - 0xae, 0x64, 0x72, 0xa0, 0x64, 0x28, 0xe4, 0x2b, 0x1f, 0x5d, 0xda, 0x5b, 0x40, 0xe0, 0x66, 0x69, - 0x7f, 0x80, 0x66, 0xf2, 0x09, 0x5c, 0x67, 0x81, 0x11, 0x27, 0xdc, 0x3f, 0x61, 0x91, 0x08, 0x99, - 0x51, 0xa9, 0x1f, 0x89, 0x58, 0x18, 0x6f, 0x11, 0x09, 0x57, 0x9d, 0xf7, 0x79, 0xe1, 0x7c, 0x6c, - 0x7d, 0xa4, 0x0d, 0x57, 0x06, 0x4c, 0x73, 0x3f, 0xe5, 0xa7, 0x2c, 0x0d, 0xfd, 0x94, 0x19, 0xee, - 0xad, 0x22, 0x7e, 0xc3, 0xda, 0x29, 0x9a, 0x29, 0x33, 0x9c, 0xdc, 0x87, 0x2d, 0x1d, 0x31, 0x3d, - 0xb2, 0x91, 0x24, 0x5c, 0xb2, 0xc8, 0x9c, 0xf9, 0xb1, 0xd0, 0x03, 0x3e, 0x62, 0x27, 0x42, 0xa5, - 0xde, 0x12, 0xb2, 0x9a, 0x05, 0xa6, 0xef, 0x20, 0x4f, 0x2a, 0x04, 0xe9, 0xc1, 0xcd, 0xff, 0x51, - 0x08, 0xd5, 0xa9, 0x34, 0x22, 0xe6, 0x1e, 0x20, 0xfd, 0xc6, 0x14, 0xfd, 0x30, 0x77, 0x93, 0x9f, - 0x80, 0xa7, 0xc5, 0x2b, 0xc9, 0x43, 0x7f, 0x10, 0xa9, 0xe0, 0xb5, 0xf6, 0x4f, 0x85, 0x0c, 0xd5, - 0xa9, 0x1f, 0x71, 0xe9, 0x35, 0x90, 0x7a, 0xcd, 0xf9, 0xf7, 0xd1, 0xfd, 0x2b, 0xf4, 0x3e, 0xe6, - 0x92, 0xec, 0xc2, 0xb5, 0x58, 0x68, 0x5d, 0x11, 0x63, 0xf6, 0x46, 0xc4, 0x59, 0xec, 0xad, 0x21, - 0xeb, 0x3d, 0xe7, 0x74, 0xac, 0x27, 0xce, 0x45, 0x6e, 0x41, 0x43, 0x0c, 0x02, 0x9f, 0x4b, 0x36, - 0x88, 0x78, 0xe8, 0x2d, 0xef, 0xd4, 0xda, 0x75, 0x0a, 0x62, 0x10, 0x3c, 0x70, 0x16, 0xf2, 0x00, - 0x6e, 0x09, 0x39, 0x50, 0x99, 0x0c, 0x7d, 0x11, 0xe8, 0xdd, 0x1f, 0xf9, 0x26, 0x65, 0x52, 0x0f, - 0x79, 0xaa, 0x4b, 0xd2, 0x0a, 0x92, 0xb6, 0x72, 0xd8, 0x23, 0x8b, 0xfa, 0xa2, 0x00, 0x15, 0x32, - 0x47, 0xb0, 0xa3, 0x32, 0x33, 0x5b, 0xa7, 0x8e, 0x3a, 0xdf, 0x2b, 0x70, 0x5f, 0x2f, 0xf4, 0x09, - 0x5c, 0x4f, 0x52, 0x95, 0x28, 0xcd, 0x22, 0xff, 0x44, 0x19, 0x9b, 0x60, 0xb7, 0x5a, 0xef, 0xaa, - 0xdb, 0xfb, 0xc2, 0xfb, 0x1c, 0x9d, 0x6e, 0xb5, 0xe4, 0xc7, 0x70, 0xa3, 0x64, 0x85, 0x3c, 0x51, - 0x5a, 0x18, 0x9f, 0xc5, 0x2a, 0x93, 0xc6, 0xbb, 0xe6, 0x52, 0x5a, 0xb8, 0x0f, 0x9d, 0x77, 0x0f, - 0x9d, 0x36, 0xa5, 0xd5, 0x6c, 0xf6, 0x38, 0xf9, 0xbf, 0xc9, 0x54, 0x9a, 0xc5, 0xde, 0x75, 0x3c, - 0xe3, 0xef, 0x95, 0x93, 0x59, 0xdf, 0x33, 0x74, 0x4d, 0xcc, 0x95, 0x30, 0xad, 0x7d, 0x33, 0x4a, - 0xb9, 0x1e, 0xa9, 0x28, 0xf4, 0x6e, 0x20, 0xab, 0x94, 0xec, 0x33, 0xad, 0xbf, 0x28, 0x9c, 0xe4, - 0x1e, 0x78, 0x25, 0x0f, 0xcf, 0xc6, 0x18, 0xd1, 0x43, 0x62, 0xb9, 0xf2, 0x63, 0xeb, 0xae, 0x98, - 0x3f, 0x83, 0xef, 0x86, 0x4c, 0xf9, 0x3a, 0xe1, 0x32, 0xf4, 0x0b, 0x4c, 0x95, 0xd7, 0x9b, 0x98, - 0x57, 0x2f, 0x64, 0xea, 0xd8, 0x22, 0xfa, 0x05, 0x20, 0x4f, 0x69, 0xeb, 0x08, 0x96, 0xa8, 0xbd, - 0x83, 0x64, 0x0b, 0x56, 0x65, 0x16, 0xf3, 0xd4, 0xde, 0x19, 0xbc, 0xc5, 0x8b, 0xb4, 0x32, 0x90, - 0x1d, 0x68, 0x84, 0x5c, 0xaa, 0x58, 0x48, 0xf4, 0xbb, 0x4b, 0x3c, 0x6e, 0x6a, 0x05, 0xb0, 0xfe, - 0x8b, 0x38, 0x1c, 0xab, 0x0a, 0x1f, 0xc0, 0x46, 0x92, 0xf2, 0x40, 0x68, 0xa1, 0xa4, 0x3f, 0x10, - 0x46, 0xa3, 0xea, 0x3a, 0x5d, 0x2f, 0xad, 0xfb, 0xc2, 0x68, 0xf2, 0x21, 0x10, 0xa6, 0x7d, 0x35, - 0x74, 0x3b, 0xe9, 0x8f, 0xb8, 0x78, 0x35, 0x32, 0xf9, 0x04, 0x9b, 0x4c, 0x7f, 0x3e, 0xc4, 0x5d, - 0x7c, 0x88, 0xe6, 0xd6, 0x57, 0x35, 0x58, 0xdd, 0xd3, 0x9a, 0x9b, 0x47, 0x72, 0xa8, 0xc8, 0x1e, - 0xd4, 0x99, 0x1d, 0x14, 0x75, 0xa7, 0xb1, 0xfb, 0xfd, 0xce, 0x54, 0xe1, 0x74, 0xa5, 0xb0, 0xa8, - 0x63, 0x1d, 0xc7, 0x0d, 0xe9, 0x0a, 0x73, 0x7f, 0x48, 0x0f, 0x96, 0x70, 0x11, 0x38, 0x61, 0x63, - 0xf7, 0xfd, 0x0b, 0xf8, 0x87, 0x16, 0x4b, 0x1d, 0xe5, 0xff, 0x44, 0xbe, 0xf0, 0xb5, 0x91, 0x93, - 0xdb, 0xb0, 0x66, 0x94, 0xb1, 0xbb, 0x9b, 0x25, 0x49, 0x74, 0x96, 0x17, 0xab, 0x06, 0xda, 0x8e, - 0xd1, 0xd4, 0xfa, 0xdd, 0x12, 0xac, 0x1d, 0xa8, 0x38, 0x61, 0x81, 0x41, 0x26, 0xb9, 0x0e, 0xcb, - 0xb9, 0xa8, 0xdb, 0x8f, 0x7c, 0x44, 0x9e, 0xc1, 0x86, 0x36, 0xcc, 0x70, 0x3f, 0x61, 0x67, 0x91, - 0x62, 0xa1, 0xf6, 0xe6, 0x77, 0x16, 0xda, 0x8d, 0xdd, 0xbb, 0x9d, 0x59, 0x6d, 0xa3, 0x73, 0x6c, - 0x39, 0x7d, 0x47, 0xa1, 0xeb, 0x7a, 0x6c, 0xa4, 0xc9, 0x43, 0x00, 0x99, 0x45, 0x91, 0x18, 0x0a, - 0x9e, 0xda, 0xd2, 0x6b, 0xe5, 0xda, 0x17, 0x24, 0xe3, 0x69, 0x41, 0xa0, 0x63, 0x5c, 0xab, 0xe4, - 0xf2, 0x91, 0x2a, 0xe5, 0x6a, 0x72, 0x63, 0xf7, 0xce, 0x05, 0x4a, 0x4f, 0x78, 0xfa, 0x3a, 0xe2, - 0x54, 0x29, 0x43, 0x57, 0x91, 0x6c, 0xff, 0x5a, 0x25, 0xd7, 0x3b, 0x50, 0xe9, 0x3b, 0x97, 0x56, - 0x42, 0x32, 0x2a, 0xdd, 0x81, 0x2b, 0xd5, 0xed, 0x32, 0x2c, 0x35, 0x3c, 0xc4, 0x8a, 0x51, 0xa7, - 0x9b, 0xe5, 0xad, 0x72, 0x66, 0x42, 0x61, 0x63, 0x18, 0x87, 0x7e, 0x52, 0x9e, 0x63, 0x2f, 0xc4, - 0x89, 0x3f, 0x9c, 0x9d, 0xdb, 0x89, 0xa3, 0x4f, 0xd7, 0x87, 0x13, 0x37, 0x81, 0xc2, 0x9a, 0x3e, - 0x65, 0x89, 0xaf, 0x32, 0x93, 0x64, 0x46, 0x7b, 0x4b, 0x98, 0xde, 0xee, 0x94, 0xa2, 0xed, 0xb1, - 0xa5, 0xde, 0x3e, 0x33, 0xc1, 0xe8, 0xf8, 0x94, 0x25, 0x9f, 0x23, 0xe7, 0x90, 0x19, 0x46, 0x1b, - 0xba, 0x1c, 0x6b, 0xf2, 0x6b, 0xb8, 0xe2, 0x7a, 0xee, 0x58, 0xa4, 0xcb, 0x18, 0xe9, 0x0f, 0x67, - 0x47, 0x3a, 0xd5, 0xbc, 0xe9, 0x66, 0x30, 0x69, 0x68, 0x7d, 0xb5, 0x0c, 0x6b, 0xe3, 0x47, 0x85, - 0x50, 0x58, 0x4d, 0x55, 0x14, 0xf1, 0xd0, 0xcf, 0x92, 0xfc, 0x9e, 0x7d, 0xfc, 0xcd, 0x4f, 0x5a, - 0x87, 0x22, 0xf7, 0x97, 0xc9, 0xc3, 0x39, 0x5a, 0x4f, 0xf3, 0xff, 0xe4, 0x01, 0x2c, 0x4a, 0x65, - 0x78, 0x7e, 0xed, 0xba, 0x97, 0x90, 0x7b, 0xaa, 0x0c, 0x7f, 0x38, 0x47, 0x91, 0x6e, 0x65, 0x6c, - 0x52, 0xf0, 0xd2, 0x5d, 0x4e, 0xc6, 0xe6, 0xd6, 0xca, 0x58, 0x3a, 0x79, 0x06, 0x75, 0x2c, 0xfc, - 0xf6, 0xfb, 0x64, 0xf1, 0xd2, 0x0b, 0xec, 0xe7, 0x54, 0xbb, 0xc0, 0x42, 0xa6, 0xf9, 0x02, 0xea, - 0xc5, 0xc2, 0xc9, 0x53, 0x80, 0x40, 0xc5, 0xb1, 0x30, 0x31, 0x97, 0x26, 0xcf, 0x60, 0xe7, 0x82, - 0x83, 0x8c, 0x33, 0x1c, 0x94, 0x2c, 0x3a, 0xa6, 0xd0, 0xfc, 0x63, 0x0d, 0x16, 0x6d, 0x1a, 0xc8, - 0x7d, 0x58, 0xd6, 0x2a, 0x4b, 0x03, 0x9e, 0x8b, 0xb6, 0x67, 0x47, 0x6d, 0x39, 0xc7, 0x88, 0xa7, - 0x39, 0x8f, 0xfc, 0x7c, 0x62, 0x1f, 0xee, 0x5e, 0x74, 0xe3, 0x55, 0x55, 0x40, 0x90, 0xd7, 0xfc, - 0x7d, 0x0d, 0x16, 0x6d, 0x2a, 0xdf, 0x41, 0x28, 0x9f, 0xe6, 0x7b, 0xe9, 0x42, 0xf9, 0xc1, 0xac, - 0xdb, 0x61, 0x67, 0x2c, 0xe3, 0xb0, 0xa4, 0xe6, 0x9f, 0x6b, 0x50, 0x2f, 0xf6, 0x81, 0xdc, 0x83, - 0xe5, 0x28, 0xf1, 0xe5, 0xd0, 0xe4, 0x5a, 0xb7, 0x67, 0x69, 0x3d, 0x4e, 0x9e, 0x0e, 0x0d, 0x5d, - 0x8a, 0xec, 0xcf, 0xbb, 0xde, 0xa9, 0xfd, 0x4d, 0x58, 0x9f, 0xa8, 0xd4, 0xad, 0xcf, 0xa0, 0xf1, - 0x99, 0x54, 0xa7, 0x12, 0x1b, 0x91, 0x26, 0x3f, 0x85, 0x65, 0xec, 0x44, 0xb6, 0x37, 0x2e, 0x7c, - 0x83, 0xfe, 0x83, 0x34, 0x9a, 0x73, 0x5a, 0x2d, 0x80, 0x2a, 0x8f, 0xe4, 0x2a, 0x2c, 0x09, 0x29, - 0xb9, 0x6b, 0xde, 0x6b, 0xd4, 0x0d, 0x5a, 0x67, 0xb0, 0x8a, 0x8d, 0x1f, 0x1b, 0xe6, 0x23, 0x68, - 0xd8, 0x5d, 0xf3, 0xbf, 0xe5, 0x4e, 0x81, 0xac, 0x66, 0xbb, 0x0d, 0x6b, 0xee, 0x93, 0x63, 0xa2, - 0x61, 0x37, 0xd0, 0x96, 0x37, 0xeb, 0x3f, 0x2c, 0xc0, 0xe6, 0x11, 0x97, 0x5c, 0x0b, 0xbd, 0x97, - 0x24, 0x98, 0x26, 0xd2, 0x87, 0xb5, 0xb1, 0xb2, 0xa5, 0xf3, 0x10, 0x2e, 0x59, 0xb2, 0x1a, 0x55, - 0xc9, 0xd2, 0xe4, 0x08, 0xa0, 0x7c, 0x08, 0x14, 0x8d, 0x70, 0xfa, 0xf0, 0xb8, 0x67, 0x4e, 0xa9, - 0x57, 0xbe, 0x0d, 0xe8, 0x18, 0x95, 0xbc, 0x80, 0x06, 0x8b, 0x22, 0x15, 0xe0, 0x8b, 0xa4, 0xe8, - 0x81, 0xf7, 0x66, 0x47, 0x36, 0xb5, 0xbc, 0xce, 0x5e, 0x29, 0x40, 0xc7, 0xc5, 0x9a, 0xbf, 0x05, - 0xa8, 0x5c, 0xb6, 0xaf, 0xe7, 0xdf, 0x9f, 0x79, 0x5f, 0x77, 0x23, 0xbb, 0x83, 0xd5, 0xc7, 0xc8, - 0x6a, 0xf1, 0x99, 0x71, 0x1f, 0x56, 0x58, 0x18, 0xa6, 0x5c, 0xeb, 0xbc, 0xcc, 0x5d, 0xf8, 0x91, - 0xe3, 0xd0, 0xb4, 0xa0, 0xed, 0xff, 0x6d, 0xfe, 0xef, 0xe7, 0xdb, 0xb5, 0x2f, 0xcf, 0xb7, 0x6b, - 0xff, 0x3e, 0xdf, 0xae, 0xfd, 0xe9, 0xed, 0xf6, 0xdc, 0x97, 0x6f, 0xb7, 0xe7, 0xfe, 0xf5, 0x76, - 0x7b, 0x0e, 0x76, 0x02, 0x15, 0xcf, 0x5c, 0xe2, 0x3e, 0xb8, 0xec, 0xdb, 0xc7, 0x5f, 0xbf, 0xf6, - 0xe2, 0xf9, 0x2b, 0x61, 0x46, 0xd9, 0xa0, 0x13, 0xa8, 0xb8, 0x1b, 0x28, 0x1d, 0x2b, 0xdd, 0x4d, - 0x79, 0xc4, 0xce, 0x78, 0xda, 0x3d, 0xd9, 0x2d, 0xff, 0xa2, 0x84, 0xee, 0xce, 0x7a, 0xee, 0x7e, - 0x8a, 0xc3, 0x62, 0xf4, 0x97, 0xf9, 0x85, 0xfe, 0xc1, 0xc1, 0x5f, 0xe7, 0xb7, 0xfa, 0x45, 0x28, - 0x07, 0x36, 0x14, 0x9c, 0xba, 0xf3, 0x3c, 0x07, 0xfd, 0xa3, 0x72, 0xbf, 0xb4, 0xee, 0x97, 0xe8, - 0x7e, 0x59, 0xb8, 0xcf, 0xe7, 0xdb, 0xb3, 0xdc, 0x2f, 0x8f, 0xfa, 0xfb, 0x4f, 0xb8, 0x61, 0x21, - 0x33, 0xec, 0x3f, 0xf3, 0xb7, 0x0a, 0x68, 0xaf, 0x67, 0xb1, 0xbd, 0x1e, 0x82, 0x7b, 0xbd, 0x02, - 0x3d, 0x58, 0xc6, 0xe7, 0xee, 0xc7, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x31, 0xa7, 0xa5, 0x64, - 0xb4, 0x0f, 0x00, 0x00, + // 1553 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x5b, 0x6f, 0x23, 0x49, + 0x15, 0x8e, 0x73, 0xf7, 0xb1, 0x93, 0x0c, 0xb5, 0x73, 0xe9, 0x09, 0x21, 0x93, 0xb5, 0x76, 0xc0, + 0x33, 0x2b, 0x6c, 0x36, 0xbb, 0x82, 0x95, 0x97, 0x45, 0x93, 0xcb, 0x90, 0x19, 0xed, 0xce, 0xac, + 0xb7, 0xb2, 0x04, 0x34, 0x8a, 0xd4, 0x2a, 0x77, 0x57, 0xe2, 0xd2, 0x74, 0x57, 0x35, 0x5d, 0xd5, + 0xb9, 0xbc, 0x83, 0xc4, 0x23, 0xbf, 0x01, 0xde, 0x78, 0x40, 0xe2, 0x5f, 0x20, 0x24, 0xa4, 0x7d, + 0x44, 0x3c, 0xa1, 0xcc, 0x1b, 0x4f, 0xfc, 0x04, 0x54, 0xa7, 0xfa, 0x62, 0x9b, 0xc5, 0x99, 0x20, + 0xde, 0x5c, 0xe7, 0x7c, 0xdf, 0x57, 0xa7, 0x4e, 0xd5, 0x39, 0xa7, 0x0d, 0xed, 0x84, 0xcb, 0x2c, + 0x1e, 0xa4, 0xac, 0x1b, 0xa8, 0x94, 0x77, 0x83, 0x21, 0x13, 0xb2, 0x7b, 0xf6, 0x01, 0x8b, 0x92, + 0x21, 0xfb, 0xc0, 0x2d, 0x3b, 0x49, 0xaa, 0x8c, 0x22, 0x1b, 0x05, 0xb2, 0x63, 0x91, 0x1d, 0xe7, + 0x2a, 0x90, 0xeb, 0x8f, 0x27, 0x74, 0xd2, 0xcb, 0xc4, 0xa8, 0x11, 0x21, 0x5c, 0x3b, 0xa5, 0xf5, + 0x89, 0x3d, 0xb5, 0x61, 0xaf, 0x79, 0x05, 0xc5, 0x65, 0x8e, 0x7c, 0x6f, 0x1c, 0x19, 0xf2, 0x8b, + 0x0a, 0x17, 0xf2, 0x0b, 0x87, 0x6a, 0xfd, 0x75, 0x09, 0xd6, 0xf6, 0x6c, 0x38, 0x7d, 0x96, 0xb2, + 0x98, 0x1b, 0x9e, 0x6a, 0x72, 0x1f, 0x96, 0x31, 0x42, 0x5f, 0x84, 0x5e, 0x6d, 0xab, 0xd6, 0xae, + 0xd3, 0x25, 0x5c, 0x3f, 0x0f, 0xc9, 0x43, 0x58, 0xe5, 0x89, 0x0a, 0x86, 0x7e, 0x98, 0xa5, 0xcc, + 0x08, 0x25, 0xbd, 0xd9, 0xad, 0x5a, 0x7b, 0x9e, 0xae, 0xa0, 0x75, 0x3f, 0x37, 0x92, 0x47, 0x70, + 0x2b, 0x93, 0x03, 0x25, 0x43, 0x21, 0x4f, 0x7d, 0x74, 0x69, 0x6f, 0x0e, 0x81, 0x6b, 0xa5, 0xfd, + 0x29, 0x9a, 0xc9, 0x47, 0x70, 0x97, 0x05, 0x46, 0x9c, 0x71, 0xff, 0x8c, 0x45, 0x22, 0x64, 0x46, + 0xa5, 0x7e, 0x24, 0x62, 0x61, 0xbc, 0x79, 0x24, 0xdc, 0x76, 0xde, 0xa3, 0xc2, 0xf9, 0xb9, 0xf5, + 0x91, 0x36, 0xdc, 0x1a, 0x30, 0xcd, 0xfd, 0x94, 0x9f, 0xb3, 0x34, 0xf4, 0x53, 0x66, 0xb8, 0x57, + 0x47, 0xfc, 0xaa, 0xb5, 0x53, 0x34, 0x53, 0x66, 0x38, 0x79, 0x02, 0x1b, 0x3a, 0x62, 0x7a, 0x68, + 0x23, 0x49, 0xb8, 0x64, 0x91, 0xb9, 0xf4, 0x63, 0xa1, 0x07, 0x7c, 0xc8, 0xce, 0x84, 0x4a, 0xbd, + 0x05, 0x64, 0xad, 0x17, 0x98, 0xbe, 0x83, 0xbc, 0xa8, 0x10, 0xa4, 0x07, 0xf7, 0xff, 0x43, 0x21, + 0x54, 0xe7, 0xd2, 0x88, 0x98, 0x7b, 0x80, 0xf4, 0x7b, 0x13, 0xf4, 0xfd, 0xdc, 0x4d, 0x7e, 0x04, + 0x9e, 0x16, 0xa7, 0x92, 0x87, 0xfe, 0x20, 0x52, 0xc1, 0x6b, 0xed, 0x9f, 0x0b, 0x19, 0xaa, 0x73, + 0x3f, 0xe2, 0xd2, 0x6b, 0x20, 0xf5, 0x8e, 0xf3, 0xef, 0xa2, 0xfb, 0xe7, 0xe8, 0xfd, 0x9c, 0x4b, + 0xb2, 0x0d, 0x77, 0x62, 0xa1, 0x75, 0x45, 0x8c, 0xd9, 0x85, 0x88, 0xb3, 0xd8, 0x6b, 0x22, 0xeb, + 0x1d, 0xe7, 0x74, 0xac, 0x17, 0xce, 0x45, 0x1e, 0x40, 0x43, 0x0c, 0x02, 0x9f, 0x4b, 0x36, 0x88, + 0x78, 0xe8, 0x2d, 0x6e, 0xd5, 0xda, 0xcb, 0x14, 0xc4, 0x20, 0x78, 0xea, 0x2c, 0xe4, 0x29, 0x3c, + 0x10, 0x72, 0xa0, 0x32, 0x19, 0xfa, 0x22, 0xd0, 0xdb, 0x3f, 0xf0, 0x4d, 0xca, 0xa4, 0x3e, 0xe1, + 0xa9, 0x2e, 0x49, 0x4b, 0x48, 0xda, 0xc8, 0x61, 0xcf, 0x2d, 0xea, 0xab, 0x02, 0x54, 0xc8, 0x1c, + 0xc0, 0x96, 0xca, 0xcc, 0x74, 0x9d, 0x65, 0xd4, 0xf9, 0x4e, 0x81, 0xfb, 0x66, 0xa1, 0x8f, 0xe0, + 0x6e, 0x92, 0xaa, 0x44, 0x69, 0x16, 0xf9, 0x67, 0xca, 0xd8, 0x04, 0xbb, 0xd3, 0x7a, 0xb7, 0xdd, + 0xdd, 0x17, 0xde, 0x23, 0x74, 0xba, 0xd3, 0x92, 0x1f, 0xc2, 0xbd, 0x92, 0x15, 0xf2, 0x44, 0x69, + 0x61, 0x7c, 0x16, 0xab, 0x4c, 0x1a, 0xef, 0x8e, 0x4b, 0x69, 0xe1, 0xde, 0x77, 0xde, 0x1d, 0x74, + 0xda, 0x94, 0x56, 0xbb, 0xd9, 0xe7, 0xe4, 0xff, 0x32, 0x53, 0x69, 0x16, 0x7b, 0x77, 0xf1, 0x8d, + 0xbf, 0x53, 0x6e, 0x66, 0x7d, 0x5f, 0xa2, 0x6b, 0x6c, 0xaf, 0x84, 0x69, 0xed, 0x9b, 0x61, 0xca, + 0xf5, 0x50, 0x45, 0xa1, 0x77, 0x0f, 0x59, 0xa5, 0x64, 0x9f, 0x69, 0xfd, 0x55, 0xe1, 0x24, 0x1f, + 0x83, 0x57, 0xf2, 0xf0, 0x6d, 0x8c, 0x10, 0x3d, 0x24, 0x96, 0x27, 0x3f, 0xb4, 0xee, 0x8a, 0xf9, + 0x29, 0x7c, 0x3b, 0x64, 0xca, 0xd7, 0x09, 0x97, 0xa1, 0x5f, 0x60, 0xaa, 0xbc, 0xde, 0xc7, 0xbc, + 0x7a, 0x21, 0x53, 0x87, 0x16, 0xd1, 0x2f, 0x00, 0x79, 0x4a, 0x5b, 0x07, 0xb0, 0x40, 0x6d, 0x0d, + 0x92, 0x0d, 0xa8, 0xcb, 0x2c, 0xe6, 0xa9, 0xad, 0x19, 0xac, 0xe2, 0x79, 0x5a, 0x19, 0xc8, 0x16, + 0x34, 0x42, 0x2e, 0x55, 0x2c, 0x24, 0xfa, 0x5d, 0x11, 0x8f, 0x9a, 0x5a, 0x01, 0xac, 0xfc, 0x34, + 0x0e, 0x47, 0xba, 0xc2, 0x43, 0x58, 0x4d, 0x52, 0x1e, 0x08, 0x2d, 0x94, 0xf4, 0x07, 0xc2, 0x68, + 0x54, 0x5d, 0xa1, 0x2b, 0xa5, 0x75, 0x57, 0x18, 0x4d, 0xde, 0x07, 0xc2, 0xb4, 0xaf, 0x4e, 0xdc, + 0x4d, 0xfa, 0x43, 0x2e, 0x4e, 0x87, 0x26, 0xdf, 0x60, 0x8d, 0xe9, 0x2f, 0x4e, 0xf0, 0x16, 0x9f, + 0xa1, 0xb9, 0xf5, 0xf7, 0x1a, 0xd4, 0x77, 0xb4, 0xe6, 0xe6, 0xb9, 0x3c, 0x51, 0x64, 0x07, 0x96, + 0x99, 0x5d, 0x14, 0x7d, 0xa7, 0xb1, 0xfd, 0xdd, 0xce, 0x44, 0xe3, 0x74, 0xad, 0xb0, 0xe8, 0x63, + 0x1d, 0xc7, 0x0d, 0xe9, 0x12, 0x73, 0x3f, 0x48, 0x0f, 0x16, 0xf0, 0x10, 0xb8, 0x61, 0x63, 0xfb, + 0xbd, 0x6b, 0xf8, 0xfb, 0x16, 0x4b, 0x1d, 0xe5, 0xbf, 0x44, 0x3e, 0xf7, 0x8d, 0x91, 0x93, 0x77, + 0xa1, 0x69, 0x94, 0xb1, 0xb7, 0x9b, 0x25, 0x49, 0x74, 0x99, 0x37, 0xab, 0x06, 0xda, 0x0e, 0xd1, + 0xd4, 0xfa, 0xd5, 0x02, 0x34, 0xf7, 0x54, 0x9c, 0xb0, 0xc0, 0x20, 0x93, 0xdc, 0x85, 0xc5, 0x5c, + 0xd4, 0xdd, 0x47, 0xbe, 0x22, 0x5f, 0xc2, 0xaa, 0x36, 0xcc, 0x70, 0x3f, 0x61, 0x97, 0x91, 0x62, + 0xa1, 0xf6, 0x66, 0xb7, 0xe6, 0xda, 0x8d, 0xed, 0xc7, 0x9d, 0x69, 0x63, 0xa3, 0x73, 0x68, 0x39, + 0x7d, 0x47, 0xa1, 0x2b, 0x7a, 0x64, 0xa5, 0xc9, 0x33, 0x00, 0x99, 0x45, 0x91, 0x38, 0x11, 0x3c, + 0xb5, 0xad, 0xd7, 0xca, 0xb5, 0xaf, 0x49, 0xc6, 0xcb, 0x82, 0x40, 0x47, 0xb8, 0x56, 0xc9, 0xe5, + 0x23, 0x55, 0xca, 0xf5, 0xe4, 0xc6, 0xf6, 0xa3, 0x6b, 0x94, 0x5e, 0xf0, 0xf4, 0x75, 0xc4, 0xa9, + 0x52, 0x86, 0xd6, 0x91, 0x6c, 0x7f, 0x5a, 0x25, 0x37, 0x3b, 0x50, 0xe9, 0x5b, 0x37, 0x56, 0x42, + 0x32, 0x2a, 0x3d, 0x82, 0x5b, 0x55, 0x75, 0x19, 0x96, 0x1a, 0x1e, 0x62, 0xc7, 0x58, 0xa6, 0x6b, + 0x65, 0x55, 0x39, 0x33, 0xa1, 0xb0, 0x7a, 0x12, 0x87, 0x7e, 0x52, 0xbe, 0x63, 0x2f, 0xc4, 0x8d, + 0xdf, 0x9f, 0x9e, 0xdb, 0xb1, 0xa7, 0x4f, 0x57, 0x4e, 0xc6, 0x2a, 0x81, 0x42, 0x53, 0x9f, 0xb3, + 0xc4, 0x57, 0x99, 0x49, 0x32, 0xa3, 0xbd, 0x05, 0x4c, 0x6f, 0x77, 0x42, 0xd1, 0xce, 0xd8, 0x52, + 0x6f, 0x97, 0x99, 0x60, 0x78, 0x78, 0xce, 0x92, 0x2f, 0x90, 0xb3, 0xcf, 0x0c, 0xa3, 0x0d, 0x5d, + 0xae, 0x35, 0xf9, 0x05, 0xdc, 0x72, 0x33, 0x77, 0x24, 0xd2, 0x45, 0x8c, 0xf4, 0xfb, 0xd3, 0x23, + 0x9d, 0x18, 0xde, 0x74, 0x2d, 0x18, 0x37, 0xb4, 0xfe, 0x35, 0x0f, 0xcd, 0xd1, 0xa7, 0x42, 0x28, + 0xd4, 0x53, 0x15, 0x45, 0x3c, 0xf4, 0xb3, 0x24, 0xaf, 0xb3, 0x0f, 0xdf, 0xfe, 0xa5, 0x75, 0x28, + 0x72, 0x7f, 0x96, 0x3c, 0x9b, 0xa1, 0xcb, 0x69, 0xfe, 0x9b, 0x3c, 0x85, 0x79, 0xa9, 0x0c, 0xcf, + 0xcb, 0xae, 0x7b, 0x03, 0xb9, 0x97, 0xca, 0xf0, 0x67, 0x33, 0x14, 0xe9, 0x56, 0xc6, 0x26, 0x05, + 0x8b, 0xee, 0x66, 0x32, 0x36, 0xb7, 0x56, 0xc6, 0xd2, 0xd7, 0x5f, 0xc1, 0x72, 0x11, 0x25, 0x79, + 0x09, 0x10, 0xa8, 0x38, 0x16, 0x26, 0xe6, 0xd2, 0xe4, 0xc7, 0xed, 0x5c, 0xf3, 0xea, 0x50, 0x79, + 0xaf, 0x64, 0xd1, 0x11, 0x85, 0xf5, 0xdf, 0xd4, 0x60, 0xde, 0xc6, 0x4c, 0x9e, 0xc0, 0xa2, 0x56, + 0x59, 0x1a, 0xf0, 0x5c, 0xb4, 0x3d, 0x3d, 0x5a, 0xcb, 0x39, 0x44, 0x3c, 0xcd, 0x79, 0xe4, 0x27, + 0x63, 0x49, 0x7b, 0x7c, 0x5d, 0x79, 0xaa, 0xaa, 0xda, 0x91, 0xb7, 0xfe, 0xeb, 0x1a, 0xcc, 0xdb, + 0x73, 0xff, 0x1f, 0x42, 0xf9, 0x24, 0x4f, 0xbc, 0x0b, 0xe5, 0x7b, 0xd3, 0x9e, 0xb2, 0xdd, 0xb1, + 0x8c, 0xc3, 0x92, 0x76, 0xd7, 0x60, 0x65, 0xac, 0x7f, 0xb5, 0x3e, 0x83, 0xc6, 0x67, 0x52, 0x9d, + 0x4b, 0x6c, 0xcf, 0x9a, 0xfc, 0x18, 0x16, 0xb1, 0x3f, 0xdb, 0x89, 0x31, 0xf7, 0x16, 0x5d, 0x19, + 0x69, 0x34, 0xe7, 0xb4, 0x5a, 0x00, 0x55, 0xc0, 0xe4, 0x36, 0x2c, 0x08, 0x29, 0xb9, 0x1b, 0x69, + 0x4d, 0xea, 0x16, 0xad, 0x4b, 0xa8, 0xe3, 0x38, 0xc4, 0x31, 0xf2, 0x1c, 0x1a, 0x36, 0x3d, 0xfe, + 0xff, 0x98, 0x12, 0x90, 0xd5, 0x6e, 0xef, 0x42, 0xd3, 0x0d, 0xe2, 0xb1, 0x31, 0xd6, 0x40, 0x5b, + 0x3e, 0xc2, 0xfe, 0x38, 0x07, 0x6b, 0x07, 0x5c, 0x72, 0x2d, 0xf4, 0x4e, 0x92, 0xe0, 0xcb, 0x21, + 0x7d, 0x68, 0x8e, 0x14, 0xb3, 0xce, 0x43, 0xb8, 0x61, 0x21, 0x37, 0xaa, 0x42, 0xd6, 0xe4, 0x00, + 0xa0, 0xfc, 0x3c, 0x2e, 0xc6, 0xc3, 0xe4, 0x2d, 0xb9, 0x8f, 0xff, 0x52, 0xaf, 0xfc, 0x62, 0xa6, + 0x23, 0x54, 0xf2, 0x0a, 0x1a, 0x2c, 0x8a, 0x54, 0x80, 0xdf, 0xe9, 0xc5, 0x64, 0xf8, 0x78, 0x7a, + 0x64, 0x13, 0xc7, 0xeb, 0xec, 0x94, 0x02, 0x74, 0x54, 0x6c, 0xfd, 0xf7, 0x35, 0x80, 0xca, 0x47, + 0x3e, 0x85, 0xc5, 0xfc, 0xb3, 0xcc, 0x9d, 0xff, 0xe1, 0x75, 0xd7, 0x8e, 0x60, 0x9a, 0x93, 0xec, + 0x4d, 0x57, 0xa3, 0xbc, 0x5e, 0x0c, 0xe9, 0x27, 0xb0, 0xc4, 0xc2, 0x30, 0xe5, 0x5a, 0xe7, 0x4d, + 0xe2, 0xda, 0x4f, 0x04, 0x87, 0xa6, 0x05, 0xad, 0xf5, 0x04, 0x16, 0xf0, 0xaf, 0x87, 0x7b, 0x4a, + 0x21, 0xbf, 0xc8, 0xa7, 0xb1, 0x5b, 0xe0, 0x95, 0xdb, 0xd9, 0x31, 0x79, 0xe5, 0xd6, 0xe6, 0xae, + 0x7c, 0xf7, 0x4f, 0xb3, 0x7f, 0xbe, 0xda, 0xac, 0x7d, 0x7d, 0xb5, 0x59, 0xfb, 0xc7, 0xd5, 0x66, + 0xed, 0xb7, 0x6f, 0x36, 0x67, 0xbe, 0x7e, 0xb3, 0x39, 0xf3, 0xb7, 0x37, 0x9b, 0x33, 0xb0, 0x15, + 0xa8, 0x78, 0x6a, 0x32, 0x77, 0xc1, 0xdd, 0xb3, 0xfd, 0xf3, 0xd5, 0xaf, 0xbd, 0x3a, 0x3a, 0x15, + 0x66, 0x98, 0x0d, 0x3a, 0x81, 0x8a, 0xbb, 0x81, 0xd2, 0xb1, 0xd2, 0xdd, 0x94, 0x47, 0xec, 0x92, + 0xa7, 0xdd, 0xb3, 0xed, 0xf2, 0x27, 0x4a, 0xe8, 0xee, 0xb4, 0xbf, 0x9b, 0x9f, 0xe0, 0xb2, 0x58, + 0xfd, 0x6e, 0x76, 0xae, 0xbf, 0xb7, 0xf7, 0x87, 0xd9, 0x8d, 0x7e, 0x11, 0xca, 0x9e, 0x0d, 0x05, + 0xb7, 0xee, 0x1c, 0xe5, 0xa0, 0xbf, 0x54, 0xee, 0x63, 0xeb, 0x3e, 0x46, 0xf7, 0x71, 0xe1, 0xbe, + 0x9a, 0x6d, 0x4f, 0x73, 0x1f, 0x1f, 0xf4, 0x77, 0x5f, 0x70, 0xc3, 0x42, 0x66, 0xd8, 0x3f, 0x67, + 0x1f, 0x14, 0xd0, 0x5e, 0xcf, 0x62, 0x7b, 0x3d, 0x04, 0xf7, 0x7a, 0x05, 0x7a, 0xb0, 0x88, 0x7f, + 0x37, 0x3f, 0xfc, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xaf, 0xae, 0x76, 0x40, 0x34, 0x0f, 0x00, + 0x00, } func (m *ChainParameters) Marshal() (dAtA []byte, err error) { @@ -1725,27 +1711,6 @@ func (m *StatePayload_Swap_) MarshalToSizedBuffer(dAtA []byte) (int, error) { } return len(dAtA) - i, nil } -func (m *StatePayload_Position_) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *StatePayload_Position_) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - if m.Position != nil { - { - size, err := m.Position.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintChain(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x22 - } - return len(dAtA) - i, nil -} func (m *StatePayload_RolledUp) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -1875,53 +1840,6 @@ func (m *StatePayload_Swap) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *StatePayload_Position) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *StatePayload_Position) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *StatePayload_Position) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.LpNft != nil { - { - size, err := m.LpNft.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintChain(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if m.Commitment != nil { - { - size, err := m.Commitment.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintChain(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - func (m *KnownAssets) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -2131,8 +2049,48 @@ func (m *GenesisAppState_Allocation) MarshalToSizedBuffer(dAtA []byte) (int, err i-- dAtA[i] = 0x12 } - if m.Amount != 0 { - i = encodeVarintChain(dAtA, i, uint64(m.Amount)) + if m.Amount != nil { + { + size, err := m.Amount.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintChain(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *Epoch) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *Epoch) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Epoch) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.StartHeight != 0 { + i = encodeVarintChain(dAtA, i, uint64(m.StartHeight)) + i-- + dAtA[i] = 0x10 + } + if m.Index != 0 { + i = encodeVarintChain(dAtA, i, uint64(m.Index)) i-- dAtA[i] = 0x8 } @@ -2367,18 +2325,6 @@ func (m *StatePayload_Swap_) Size() (n int) { } return n } -func (m *StatePayload_Position_) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Position != nil { - l = m.Position.Size() - n += 1 + l + sovChain(uint64(l)) - } - return n -} func (m *StatePayload_RolledUp) Size() (n int) { if m == nil { return 0 @@ -2426,23 +2372,6 @@ func (m *StatePayload_Swap) Size() (n int) { return n } -func (m *StatePayload_Position) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Commitment != nil { - l = m.Commitment.Size() - n += 1 + l + sovChain(uint64(l)) - } - if m.LpNft != nil { - l = m.LpNft.Size() - n += 1 + l + sovChain(uint64(l)) - } - return n -} - func (m *KnownAssets) Size() (n int) { if m == nil { return 0 @@ -2518,8 +2447,9 @@ func (m *GenesisAppState_Allocation) Size() (n int) { } var l int _ = l - if m.Amount != 0 { - n += 1 + sovChain(uint64(m.Amount)) + if m.Amount != nil { + l = m.Amount.Size() + n += 1 + l + sovChain(uint64(l)) } l = len(m.Denom) if l > 0 { @@ -2532,6 +2462,21 @@ func (m *GenesisAppState_Allocation) Size() (n int) { return n } +func (m *Epoch) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Index != 0 { + n += 1 + sovChain(uint64(m.Index)) + } + if m.StartHeight != 0 { + n += 1 + sovChain(uint64(m.StartHeight)) + } + return n +} + func sovChain(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -3791,41 +3736,6 @@ func (m *StatePayload) Unmarshal(dAtA []byte) error { } m.StatePayload = &StatePayload_Swap_{v} iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Position", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowChain - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthChain - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthChain - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - v := &StatePayload_Position{} - if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - m.StatePayload = &StatePayload_Position_{v} - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipChain(dAtA[iNdEx:]) @@ -4177,128 +4087,6 @@ func (m *StatePayload_Swap) Unmarshal(dAtA []byte) error { } return nil } -func (m *StatePayload_Position) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowChain - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Position: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Position: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Commitment", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowChain - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthChain - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthChain - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Commitment == nil { - m.Commitment = &v1alpha1.StateCommitment{} - } - if err := m.Commitment.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LpNft", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowChain - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthChain - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthChain - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.LpNft == nil { - m.LpNft = &v1alpha11.LpNft{} - } - if err := m.LpNft.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipChain(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthChain - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *KnownAssets) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -4756,10 +4544,10 @@ func (m *GenesisAppState_Allocation) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: - if wireType != 0 { + if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType) } - m.Amount = 0 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowChain @@ -4769,11 +4557,28 @@ func (m *GenesisAppState_Allocation) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Amount |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } + if msglen < 0 { + return ErrInvalidLengthChain + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthChain + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Amount == nil { + m.Amount = &v1alpha1.Amount{} + } + if err := m.Amount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Denom", wireType) @@ -4863,6 +4668,94 @@ func (m *GenesisAppState_Allocation) Unmarshal(dAtA []byte) error { } return nil } +func (m *Epoch) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowChain + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: Epoch: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Epoch: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Index", wireType) + } + m.Index = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowChain + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Index |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field StartHeight", wireType) + } + m.StartHeight = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowChain + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.StartHeight |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + default: + iNdEx = preIndex + skippy, err := skipChain(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthChain + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipChain(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/relayer/chains/penumbra/core/crypto/v1alpha1/crypto.pb.go b/relayer/chains/penumbra/core/crypto/v1alpha1/crypto.pb.go index fa0a1ff3e..720bc79d3 100644 --- a/relayer/chains/penumbra/core/crypto/v1alpha1/crypto.pb.go +++ b/relayer/chains/penumbra/core/crypto/v1alpha1/crypto.pb.go @@ -864,6 +864,206 @@ func (m *Value) GetAssetId() *AssetId { return nil } +// Represents a value of a known or unknown denomination. +// +// Note: unlike some other View types, we don't just store the underlying +// `Value` message together with an additional `Denom`. Instead, we record +// either an `Amount` and `Denom` (only) or an `Amount` and `AssetId`. This is +// because we don't want to allow a situation where the supplied `Denom` doesn't +// match the `AssetId`, and a consumer of the API that doesn't check is tricked. +// This way, the `Denom` will always match, because the consumer is forced to +// recompute it themselves if they want it. +type ValueView struct { + // Types that are valid to be assigned to ValueView: + // + // *ValueView_KnownDenom_ + // *ValueView_UnknownDenom_ + ValueView isValueView_ValueView `protobuf_oneof:"value_view"` +} + +func (m *ValueView) Reset() { *m = ValueView{} } +func (m *ValueView) String() string { return proto.CompactTextString(m) } +func (*ValueView) ProtoMessage() {} +func (*ValueView) Descriptor() ([]byte, []int) { + return fileDescriptor_5c23a0b4440af102, []int{15} +} +func (m *ValueView) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ValueView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ValueView.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *ValueView) XXX_Merge(src proto.Message) { + xxx_messageInfo_ValueView.Merge(m, src) +} +func (m *ValueView) XXX_Size() int { + return m.Size() +} +func (m *ValueView) XXX_DiscardUnknown() { + xxx_messageInfo_ValueView.DiscardUnknown(m) +} + +var xxx_messageInfo_ValueView proto.InternalMessageInfo + +type isValueView_ValueView interface { + isValueView_ValueView() + MarshalTo([]byte) (int, error) + Size() int +} + +type ValueView_KnownDenom_ struct { + KnownDenom *ValueView_KnownDenom `protobuf:"bytes,1,opt,name=known_denom,json=knownDenom,proto3,oneof" json:"known_denom,omitempty"` +} +type ValueView_UnknownDenom_ struct { + UnknownDenom *ValueView_UnknownDenom `protobuf:"bytes,2,opt,name=unknown_denom,json=unknownDenom,proto3,oneof" json:"unknown_denom,omitempty"` +} + +func (*ValueView_KnownDenom_) isValueView_ValueView() {} +func (*ValueView_UnknownDenom_) isValueView_ValueView() {} + +func (m *ValueView) GetValueView() isValueView_ValueView { + if m != nil { + return m.ValueView + } + return nil +} + +func (m *ValueView) GetKnownDenom() *ValueView_KnownDenom { + if x, ok := m.GetValueView().(*ValueView_KnownDenom_); ok { + return x.KnownDenom + } + return nil +} + +func (m *ValueView) GetUnknownDenom() *ValueView_UnknownDenom { + if x, ok := m.GetValueView().(*ValueView_UnknownDenom_); ok { + return x.UnknownDenom + } + return nil +} + +// XXX_OneofWrappers is for the internal use of the proto package. +func (*ValueView) XXX_OneofWrappers() []interface{} { + return []interface{}{ + (*ValueView_KnownDenom_)(nil), + (*ValueView_UnknownDenom_)(nil), + } +} + +// A value whose asset ID has a known denomination. +type ValueView_KnownDenom struct { + Amount *Amount `protobuf:"bytes,1,opt,name=amount,proto3" json:"amount,omitempty"` + Denom *Denom `protobuf:"bytes,2,opt,name=denom,proto3" json:"denom,omitempty"` +} + +func (m *ValueView_KnownDenom) Reset() { *m = ValueView_KnownDenom{} } +func (m *ValueView_KnownDenom) String() string { return proto.CompactTextString(m) } +func (*ValueView_KnownDenom) ProtoMessage() {} +func (*ValueView_KnownDenom) Descriptor() ([]byte, []int) { + return fileDescriptor_5c23a0b4440af102, []int{15, 0} +} +func (m *ValueView_KnownDenom) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ValueView_KnownDenom) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ValueView_KnownDenom.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *ValueView_KnownDenom) XXX_Merge(src proto.Message) { + xxx_messageInfo_ValueView_KnownDenom.Merge(m, src) +} +func (m *ValueView_KnownDenom) XXX_Size() int { + return m.Size() +} +func (m *ValueView_KnownDenom) XXX_DiscardUnknown() { + xxx_messageInfo_ValueView_KnownDenom.DiscardUnknown(m) +} + +var xxx_messageInfo_ValueView_KnownDenom proto.InternalMessageInfo + +func (m *ValueView_KnownDenom) GetAmount() *Amount { + if m != nil { + return m.Amount + } + return nil +} + +func (m *ValueView_KnownDenom) GetDenom() *Denom { + if m != nil { + return m.Denom + } + return nil +} + +type ValueView_UnknownDenom struct { + Amount *Amount `protobuf:"bytes,1,opt,name=amount,proto3" json:"amount,omitempty"` + AssetId *AssetId `protobuf:"bytes,2,opt,name=asset_id,json=assetId,proto3" json:"asset_id,omitempty"` +} + +func (m *ValueView_UnknownDenom) Reset() { *m = ValueView_UnknownDenom{} } +func (m *ValueView_UnknownDenom) String() string { return proto.CompactTextString(m) } +func (*ValueView_UnknownDenom) ProtoMessage() {} +func (*ValueView_UnknownDenom) Descriptor() ([]byte, []int) { + return fileDescriptor_5c23a0b4440af102, []int{15, 1} +} +func (m *ValueView_UnknownDenom) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ValueView_UnknownDenom) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ValueView_UnknownDenom.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *ValueView_UnknownDenom) XXX_Merge(src proto.Message) { + xxx_messageInfo_ValueView_UnknownDenom.Merge(m, src) +} +func (m *ValueView_UnknownDenom) XXX_Size() int { + return m.Size() +} +func (m *ValueView_UnknownDenom) XXX_DiscardUnknown() { + xxx_messageInfo_ValueView_UnknownDenom.DiscardUnknown(m) +} + +var xxx_messageInfo_ValueView_UnknownDenom proto.InternalMessageInfo + +func (m *ValueView_UnknownDenom) GetAmount() *Amount { + if m != nil { + return m.Amount + } + return nil +} + +func (m *ValueView_UnknownDenom) GetAssetId() *AssetId { + if m != nil { + return m.AssetId + } + return nil +} + type MerkleRoot struct { Inner []byte `protobuf:"bytes,1,opt,name=inner,proto3" json:"inner,omitempty"` } @@ -872,7 +1072,7 @@ func (m *MerkleRoot) Reset() { *m = MerkleRoot{} } func (m *MerkleRoot) String() string { return proto.CompactTextString(m) } func (*MerkleRoot) ProtoMessage() {} func (*MerkleRoot) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{15} + return fileDescriptor_5c23a0b4440af102, []int{16} } func (m *MerkleRoot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -917,7 +1117,7 @@ func (m *Asset) Reset() { *m = Asset{} } func (m *Asset) String() string { return proto.CompactTextString(m) } func (*Asset) ProtoMessage() {} func (*Asset) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{16} + return fileDescriptor_5c23a0b4440af102, []int{17} } func (m *Asset) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -969,7 +1169,7 @@ func (m *IdentityKey) Reset() { *m = IdentityKey{} } func (m *IdentityKey) String() string { return proto.CompactTextString(m) } func (*IdentityKey) ProtoMessage() {} func (*IdentityKey) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{17} + return fileDescriptor_5c23a0b4440af102, []int{18} } func (m *IdentityKey) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1014,7 +1214,7 @@ func (m *GovernanceKey) Reset() { *m = GovernanceKey{} } func (m *GovernanceKey) String() string { return proto.CompactTextString(m) } func (*GovernanceKey) ProtoMessage() {} func (*GovernanceKey) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{18} + return fileDescriptor_5c23a0b4440af102, []int{19} } func (m *GovernanceKey) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1058,7 +1258,7 @@ func (m *ConsensusKey) Reset() { *m = ConsensusKey{} } func (m *ConsensusKey) String() string { return proto.CompactTextString(m) } func (*ConsensusKey) ProtoMessage() {} func (*ConsensusKey) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{19} + return fileDescriptor_5c23a0b4440af102, []int{20} } func (m *ConsensusKey) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1104,7 +1304,7 @@ func (m *Note) Reset() { *m = Note{} } func (m *Note) String() string { return proto.CompactTextString(m) } func (*Note) ProtoMessage() {} func (*Note) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{20} + return fileDescriptor_5c23a0b4440af102, []int{21} } func (m *Note) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1154,6 +1354,66 @@ func (m *Note) GetAddress() *Address { return nil } +type NoteView struct { + Value *ValueView `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` + Rseed []byte `protobuf:"bytes,2,opt,name=rseed,proto3" json:"rseed,omitempty"` + Address *AddressView `protobuf:"bytes,3,opt,name=address,proto3" json:"address,omitempty"` +} + +func (m *NoteView) Reset() { *m = NoteView{} } +func (m *NoteView) String() string { return proto.CompactTextString(m) } +func (*NoteView) ProtoMessage() {} +func (*NoteView) Descriptor() ([]byte, []int) { + return fileDescriptor_5c23a0b4440af102, []int{22} +} +func (m *NoteView) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *NoteView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_NoteView.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *NoteView) XXX_Merge(src proto.Message) { + xxx_messageInfo_NoteView.Merge(m, src) +} +func (m *NoteView) XXX_Size() int { + return m.Size() +} +func (m *NoteView) XXX_DiscardUnknown() { + xxx_messageInfo_NoteView.DiscardUnknown(m) +} + +var xxx_messageInfo_NoteView proto.InternalMessageInfo + +func (m *NoteView) GetValue() *ValueView { + if m != nil { + return m.Value + } + return nil +} + +func (m *NoteView) GetRseed() []byte { + if m != nil { + return m.Rseed + } + return nil +} + +func (m *NoteView) GetAddress() *AddressView { + if m != nil { + return m.Address + } + return nil +} + // An encrypted note. // 132 = 1(type) + 11(d) + 8(amount) + 32(asset_id) + 32(rcm) + 32(pk_d) + 16(MAC) bytes. type NoteCiphertext struct { @@ -1164,7 +1424,7 @@ func (m *NoteCiphertext) Reset() { *m = NoteCiphertext{} } func (m *NoteCiphertext) String() string { return proto.CompactTextString(m) } func (*NoteCiphertext) ProtoMessage() {} func (*NoteCiphertext) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{21} + return fileDescriptor_5c23a0b4440af102, []int{23} } func (m *NoteCiphertext) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1208,7 +1468,7 @@ func (m *Nullifier) Reset() { *m = Nullifier{} } func (m *Nullifier) String() string { return proto.CompactTextString(m) } func (*Nullifier) ProtoMessage() {} func (*Nullifier) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{22} + return fileDescriptor_5c23a0b4440af102, []int{24} } func (m *Nullifier) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1252,7 +1512,7 @@ func (m *SpendAuthSignature) Reset() { *m = SpendAuthSignature{} } func (m *SpendAuthSignature) String() string { return proto.CompactTextString(m) } func (*SpendAuthSignature) ProtoMessage() {} func (*SpendAuthSignature) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{23} + return fileDescriptor_5c23a0b4440af102, []int{25} } func (m *SpendAuthSignature) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1296,7 +1556,7 @@ func (m *BindingSignature) Reset() { *m = BindingSignature{} } func (m *BindingSignature) String() string { return proto.CompactTextString(m) } func (*BindingSignature) ProtoMessage() {} func (*BindingSignature) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{24} + return fileDescriptor_5c23a0b4440af102, []int{26} } func (m *BindingSignature) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1348,7 +1608,7 @@ func (m *NotePayload) Reset() { *m = NotePayload{} } func (m *NotePayload) String() string { return proto.CompactTextString(m) } func (*NotePayload) ProtoMessage() {} func (*NotePayload) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{25} + return fileDescriptor_5c23a0b4440af102, []int{27} } func (m *NotePayload) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1409,7 +1669,7 @@ func (m *StateCommitmentProof) Reset() { *m = StateCommitmentProof{} } func (m *StateCommitmentProof) String() string { return proto.CompactTextString(m) } func (*StateCommitmentProof) ProtoMessage() {} func (*StateCommitmentProof) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{26} + return fileDescriptor_5c23a0b4440af102, []int{28} } func (m *StateCommitmentProof) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1470,7 +1730,7 @@ func (m *MerklePathChunk) Reset() { *m = MerklePathChunk{} } func (m *MerklePathChunk) String() string { return proto.CompactTextString(m) } func (*MerklePathChunk) ProtoMessage() {} func (*MerklePathChunk) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{27} + return fileDescriptor_5c23a0b4440af102, []int{29} } func (m *MerklePathChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1529,7 +1789,7 @@ func (m *Clue) Reset() { *m = Clue{} } func (m *Clue) String() string { return proto.CompactTextString(m) } func (*Clue) ProtoMessage() {} func (*Clue) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{28} + return fileDescriptor_5c23a0b4440af102, []int{30} } func (m *Clue) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1574,7 +1834,7 @@ func (m *EffectHash) Reset() { *m = EffectHash{} } func (m *EffectHash) String() string { return proto.CompactTextString(m) } func (*EffectHash) ProtoMessage() {} func (*EffectHash) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{29} + return fileDescriptor_5c23a0b4440af102, []int{31} } func (m *EffectHash) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1619,7 +1879,7 @@ func (m *ZKOutputProof) Reset() { *m = ZKOutputProof{} } func (m *ZKOutputProof) String() string { return proto.CompactTextString(m) } func (*ZKOutputProof) ProtoMessage() {} func (*ZKOutputProof) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{30} + return fileDescriptor_5c23a0b4440af102, []int{32} } func (m *ZKOutputProof) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1664,7 +1924,7 @@ func (m *ZKSpendProof) Reset() { *m = ZKSpendProof{} } func (m *ZKSpendProof) String() string { return proto.CompactTextString(m) } func (*ZKSpendProof) ProtoMessage() {} func (*ZKSpendProof) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{31} + return fileDescriptor_5c23a0b4440af102, []int{33} } func (m *ZKSpendProof) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1709,7 +1969,7 @@ func (m *ZKSwapProof) Reset() { *m = ZKSwapProof{} } func (m *ZKSwapProof) String() string { return proto.CompactTextString(m) } func (*ZKSwapProof) ProtoMessage() {} func (*ZKSwapProof) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{32} + return fileDescriptor_5c23a0b4440af102, []int{34} } func (m *ZKSwapProof) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1763,12 +2023,16 @@ func init() { proto.RegisterType((*Amount)(nil), "penumbra.core.crypto.v1alpha1.Amount") proto.RegisterType((*Denom)(nil), "penumbra.core.crypto.v1alpha1.Denom") proto.RegisterType((*Value)(nil), "penumbra.core.crypto.v1alpha1.Value") + proto.RegisterType((*ValueView)(nil), "penumbra.core.crypto.v1alpha1.ValueView") + proto.RegisterType((*ValueView_KnownDenom)(nil), "penumbra.core.crypto.v1alpha1.ValueView.KnownDenom") + proto.RegisterType((*ValueView_UnknownDenom)(nil), "penumbra.core.crypto.v1alpha1.ValueView.UnknownDenom") proto.RegisterType((*MerkleRoot)(nil), "penumbra.core.crypto.v1alpha1.MerkleRoot") proto.RegisterType((*Asset)(nil), "penumbra.core.crypto.v1alpha1.Asset") proto.RegisterType((*IdentityKey)(nil), "penumbra.core.crypto.v1alpha1.IdentityKey") proto.RegisterType((*GovernanceKey)(nil), "penumbra.core.crypto.v1alpha1.GovernanceKey") proto.RegisterType((*ConsensusKey)(nil), "penumbra.core.crypto.v1alpha1.ConsensusKey") proto.RegisterType((*Note)(nil), "penumbra.core.crypto.v1alpha1.Note") + proto.RegisterType((*NoteView)(nil), "penumbra.core.crypto.v1alpha1.NoteView") proto.RegisterType((*NoteCiphertext)(nil), "penumbra.core.crypto.v1alpha1.NoteCiphertext") proto.RegisterType((*Nullifier)(nil), "penumbra.core.crypto.v1alpha1.Nullifier") proto.RegisterType((*SpendAuthSignature)(nil), "penumbra.core.crypto.v1alpha1.SpendAuthSignature") @@ -1788,74 +2052,81 @@ func init() { } var fileDescriptor_5c23a0b4440af102 = []byte{ - // 1060 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0x4f, 0x6f, 0xe3, 0x44, - 0x14, 0xaf, 0x9d, 0xb6, 0x69, 0x5f, 0xd2, 0x74, 0xb1, 0x7a, 0xa8, 0x0a, 0xcd, 0x76, 0xdd, 0x6e, - 0xd9, 0x5d, 0x20, 0x51, 0x5b, 0x89, 0x43, 0x10, 0x12, 0x4d, 0x96, 0x6d, 0x4b, 0xb4, 0xdd, 0xc8, - 0x45, 0x5d, 0x54, 0x55, 0x8a, 0xa6, 0xf6, 0x6b, 0x3c, 0x8a, 0x33, 0x63, 0xec, 0x71, 0xba, 0x81, - 0x0f, 0x80, 0xb8, 0x71, 0xe6, 0xc8, 0x91, 0x6f, 0xc0, 0x37, 0x40, 0x9c, 0xf6, 0xb8, 0x47, 0x68, - 0x0f, 0x48, 0x9c, 0xf8, 0x08, 0x68, 0xec, 0x71, 0x36, 0xad, 0xd6, 0x49, 0x01, 0x21, 0x71, 0x9b, - 0x37, 0xef, 0xf7, 0x7e, 0xf3, 0xfe, 0xdb, 0xf0, 0xc8, 0x47, 0x16, 0xf5, 0xce, 0x02, 0x52, 0xb5, - 0x79, 0x80, 0x55, 0x3b, 0x18, 0xf8, 0x82, 0x57, 0xfb, 0x5b, 0xc4, 0xf3, 0x5d, 0xb2, 0xa5, 0xe4, - 0x8a, 0x1f, 0x70, 0xc1, 0x8d, 0xd5, 0x14, 0x5b, 0x91, 0xd8, 0x8a, 0xd2, 0xa5, 0x58, 0xf3, 0x1b, - 0x0d, 0x72, 0x4f, 0x10, 0x8d, 0x8f, 0x61, 0x96, 0xf4, 0x78, 0xc4, 0xc4, 0xb2, 0xb6, 0xa6, 0x3d, - 0x28, 0x6c, 0xdf, 0xaf, 0x8c, 0xb5, 0xab, 0xec, 0xc6, 0x60, 0x4b, 0x19, 0x19, 0xbb, 0x30, 0x47, - 0xc2, 0x10, 0x45, 0x9b, 0x3a, 0xcb, 0x7a, 0x4c, 0xb0, 0x39, 0x89, 0x40, 0xc2, 0x0f, 0x1c, 0x2b, - 0x4f, 0x92, 0x83, 0x79, 0x17, 0xf2, 0xbb, 0x8e, 0x13, 0x60, 0x18, 0x1a, 0x4b, 0x30, 0x43, 0x19, - 0xc3, 0x20, 0xf6, 0xa5, 0x68, 0x25, 0x82, 0xf9, 0x67, 0x0e, 0x0a, 0x0a, 0x71, 0x4c, 0xf1, 0xc2, - 0x38, 0x84, 0x7c, 0x9f, 0x86, 0xf4, 0xcc, 0x43, 0xe5, 0xf3, 0xf6, 0xa4, 0x27, 0x5f, 0x1b, 0x57, - 0x8e, 0x13, 0xcb, 0xfd, 0x29, 0x2b, 0x25, 0x31, 0x9a, 0x30, 0xcb, 0x7d, 0xf2, 0x65, 0x84, 0x2a, - 0x82, 0xad, 0xbf, 0x41, 0xf7, 0x2c, 0x36, 0xdc, 0x9f, 0xb2, 0x14, 0xc5, 0xca, 0xef, 0x1a, 0xe4, - 0xd5, 0x1b, 0xc6, 0x27, 0x90, 0x27, 0x09, 0x56, 0x39, 0xba, 0x79, 0x3b, 0x66, 0x2b, 0x35, 0x33, - 0x76, 0x65, 0x42, 0x1c, 0x7c, 0xa1, 0x3c, 0x7b, 0xef, 0x76, 0xf6, 0x07, 0xd2, 0xc4, 0x4a, 0x2c, - 0x8d, 0xe7, 0x70, 0x87, 0xd8, 0xb6, 0x2c, 0x56, 0xbb, 0x13, 0xf0, 0xc8, 0x97, 0x95, 0xca, 0xc5, - 0x6c, 0x1f, 0x4c, 0x62, 0x4b, 0xcc, 0xf6, 0xa4, 0xd5, 0x81, 0x63, 0x95, 0xc8, 0x35, 0x79, 0xe5, - 0x33, 0x98, 0x4d, 0xa2, 0xff, 0xf7, 0x71, 0xd6, 0x4b, 0x50, 0x54, 0xc7, 0x76, 0x9f, 0xe2, 0x85, - 0xb9, 0x06, 0x73, 0x47, 0x3e, 0x32, 0xa7, 0x89, 0x83, 0x8c, 0xa6, 0x78, 0x1f, 0x96, 0x62, 0xc4, - 0x31, 0x06, 0xf4, 0x9c, 0xda, 0x44, 0x50, 0xce, 0xb2, 0xd1, 0x9b, 0x50, 0x7a, 0x12, 0x79, 0x9e, - 0x2c, 0x19, 0x65, 0x9d, 0xb1, 0xb8, 0xeb, 0x51, 0x67, 0xe0, 0xd6, 0xa1, 0xf0, 0x98, 0xf6, 0x31, - 0x08, 0xe9, 0x39, 0xc5, 0x20, 0x03, 0xb4, 0x0f, 0xc5, 0xd1, 0x82, 0x18, 0xcb, 0x90, 0x57, 0x29, - 0x8c, 0xcb, 0xb9, 0x60, 0xa5, 0xa2, 0x51, 0x06, 0x08, 0x08, 0x73, 0x78, 0x8f, 0x7e, 0x85, 0x41, - 0x5c, 0x9d, 0xa2, 0x35, 0x72, 0x63, 0xbe, 0x0b, 0x8b, 0x47, 0x82, 0x08, 0x6c, 0xf0, 0x5e, 0x8f, - 0x8a, 0x1e, 0x32, 0x91, 0xf1, 0xe4, 0x43, 0x78, 0xab, 0x4e, 0x3c, 0xc2, 0xec, 0xc9, 0x50, 0x39, - 0x76, 0xc9, 0x04, 0x66, 0x00, 0x1e, 0xc0, 0x6c, 0x32, 0xec, 0x46, 0x09, 0x74, 0x8f, 0xc7, 0xca, - 0x69, 0x4b, 0xf7, 0xb8, 0x94, 0x5d, 0x1a, 0xc7, 0x30, 0x6d, 0xe9, 0x2e, 0x35, 0x57, 0x61, 0xe6, - 0x31, 0x32, 0xde, 0x93, 0x44, 0x8e, 0x3c, 0xc4, 0xd8, 0x79, 0x2b, 0x11, 0xcc, 0x6f, 0x35, 0x98, - 0x39, 0x26, 0x5e, 0xf4, 0x7f, 0x58, 0x36, 0x26, 0xc0, 0x53, 0x0c, 0xba, 0x1e, 0x5a, 0x9c, 0x67, - 0x65, 0xe6, 0x6b, 0x98, 0x89, 0xed, 0x8c, 0x0f, 0x41, 0xa7, 0xce, 0x6d, 0x5b, 0x5a, 0xbd, 0xa4, - 0x53, 0xc7, 0xa8, 0xa5, 0x69, 0x48, 0x9c, 0xdc, 0x98, 0x60, 0x1a, 0xe7, 0x2e, 0x4d, 0xd6, 0x2a, - 0x14, 0x0e, 0x1c, 0x64, 0x82, 0x8a, 0x81, 0x6c, 0xd3, 0x12, 0xe8, 0xb4, 0xab, 0xdc, 0xd3, 0x69, - 0xd7, 0xbc, 0x0b, 0x0b, 0x7b, 0xbc, 0x8f, 0x01, 0x93, 0x35, 0x56, 0x80, 0xce, 0x10, 0xd0, 0xe9, - 0x9a, 0x1b, 0x50, 0x6c, 0x70, 0x16, 0x22, 0x0b, 0xa3, 0x30, 0xbb, 0xcf, 0xbf, 0xd7, 0x60, 0xfa, - 0x90, 0x0b, 0x94, 0xae, 0xf6, 0x65, 0x69, 0x54, 0x94, 0x93, 0x5c, 0x8d, 0xcb, 0x68, 0x25, 0x26, - 0x92, 0x3a, 0x08, 0x11, 0x93, 0x5a, 0x14, 0xad, 0x44, 0x18, 0x5d, 0x06, 0xb9, 0x7f, 0xb4, 0x0c, - 0xe4, 0x10, 0x4a, 0xdf, 0x1a, 0xd4, 0x77, 0x31, 0x10, 0xf8, 0x22, 0xab, 0x4e, 0xf7, 0x60, 0xfe, - 0x30, 0xf2, 0xbc, 0x71, 0x23, 0xf8, 0x08, 0x8c, 0x78, 0x4b, 0xec, 0x46, 0xc2, 0x3d, 0xa2, 0x1d, - 0x46, 0x44, 0x14, 0x60, 0x66, 0xbf, 0xdf, 0xa9, 0x53, 0xe6, 0x50, 0xd6, 0x99, 0x84, 0xfc, 0x4d, - 0x83, 0x82, 0xf4, 0xb0, 0x45, 0x06, 0x1e, 0x27, 0x8e, 0xf1, 0x1c, 0x16, 0x19, 0x17, 0xd8, 0xb6, - 0x87, 0x33, 0xa7, 0xd2, 0x59, 0x99, 0x10, 0xfa, 0x8d, 0xa1, 0xb6, 0x4a, 0x92, 0x66, 0x64, 0x72, - 0xd7, 0x61, 0x01, 0x7d, 0x17, 0x7b, 0x18, 0x10, 0xaf, 0xdd, 0xc5, 0x81, 0xca, 0x74, 0x71, 0x78, - 0x29, 0x2b, 0xfc, 0x39, 0x94, 0x90, 0xc5, 0xcc, 0xe8, 0xb4, 0x25, 0xc1, 0x2d, 0xd7, 0xfb, 0xf5, - 0x1c, 0x5b, 0x0b, 0x43, 0x12, 0xa9, 0x30, 0x5f, 0x69, 0xb0, 0x74, 0xc3, 0xbd, 0x56, 0xc0, 0xf9, - 0xf9, 0x7f, 0x17, 0xec, 0x0a, 0xcc, 0xf9, 0x3c, 0xa4, 0x72, 0x91, 0xab, 0xdd, 0x32, 0x94, 0x8d, - 0x26, 0xcc, 0x93, 0x48, 0xb8, 0x6d, 0x9f, 0x08, 0x77, 0x39, 0xb7, 0x96, 0xbb, 0xc5, 0x73, 0xc9, - 0x98, 0xb7, 0x88, 0x70, 0x1b, 0x6e, 0xc4, 0xba, 0xd6, 0x9c, 0x24, 0x90, 0xa2, 0xe9, 0xc2, 0xe2, - 0x0d, 0xa5, 0xf1, 0x36, 0xcc, 0xcb, 0x4f, 0x36, 0x65, 0x9d, 0xf6, 0x96, 0xaa, 0xf5, 0x9c, 0xba, - 0xd8, 0x1a, 0x55, 0x6e, 0xab, 0x0a, 0xa4, 0xca, 0xed, 0x51, 0xe5, 0x8e, 0xda, 0xdc, 0xa9, 0x72, - 0xc7, 0x7c, 0x07, 0xa6, 0x1b, 0x6a, 0x52, 0xde, 0xd0, 0x46, 0x26, 0xc0, 0xa7, 0xe7, 0xe7, 0x68, - 0x8b, 0x7d, 0x12, 0xba, 0x19, 0x98, 0xfb, 0xb0, 0x70, 0xd2, 0x7c, 0x16, 0x09, 0x3f, 0x52, 0xe9, - 0x7f, 0x33, 0x6c, 0x03, 0x8a, 0x27, 0xcd, 0xb8, 0xd3, 0xc7, 0xa1, 0xd6, 0xa1, 0x70, 0xd2, 0x3c, - 0xba, 0x20, 0xfe, 0x18, 0x50, 0xfd, 0x27, 0xfd, 0xe7, 0xcb, 0xb2, 0xf6, 0xf2, 0xb2, 0xac, 0xfd, - 0x7a, 0x59, 0xd6, 0xbe, 0xbb, 0x2a, 0x4f, 0xbd, 0xbc, 0x2a, 0x4f, 0xbd, 0xba, 0x2a, 0x4f, 0xc1, - 0x3d, 0x9b, 0xf7, 0xc6, 0x67, 0xbd, 0x5e, 0x68, 0xc4, 0x17, 0x2d, 0xf9, 0x0b, 0xda, 0xd2, 0x4e, - 0xbe, 0xe8, 0x50, 0xe1, 0x46, 0x67, 0x15, 0x9b, 0xf7, 0xaa, 0x36, 0x0f, 0x7b, 0x3c, 0xac, 0x06, - 0xe8, 0x91, 0x01, 0x06, 0xd5, 0xfe, 0xf6, 0xf0, 0x68, 0xbb, 0x84, 0xb2, 0xb0, 0x3a, 0xf6, 0xe7, - 0xf6, 0xa3, 0x44, 0x4e, 0xc5, 0x1f, 0xf4, 0x5c, 0xab, 0xd1, 0xf8, 0x51, 0x5f, 0x6d, 0xa5, 0xee, - 0x34, 0xa4, 0x3b, 0xc9, 0xeb, 0x95, 0x63, 0x85, 0xfa, 0xe5, 0xb5, 0xfe, 0x54, 0xea, 0x4f, 0x13, - 0xfd, 0x69, 0xaa, 0xbf, 0xd4, 0x1f, 0x8e, 0xd5, 0x9f, 0xee, 0xb5, 0xea, 0x4f, 0x51, 0x10, 0x87, - 0x08, 0xf2, 0x87, 0xbe, 0x96, 0x62, 0x6b, 0x35, 0x09, 0xae, 0xd5, 0x12, 0x74, 0xad, 0x96, 0xc2, - 0xcf, 0x66, 0xe3, 0x5f, 0xef, 0x9d, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x3a, 0x9c, 0x41, 0xcd, - 0xa8, 0x0b, 0x00, 0x00, + // 1182 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0xcf, 0x6f, 0xe3, 0xc4, + 0x17, 0x8f, 0x9d, 0xb6, 0x49, 0x5f, 0x7e, 0xec, 0x7e, 0xad, 0x1e, 0xaa, 0x7e, 0x69, 0xb6, 0xeb, + 0x76, 0x4b, 0xb7, 0x40, 0xa2, 0xa6, 0x82, 0x43, 0x10, 0x88, 0x26, 0x65, 0xdb, 0x12, 0x6d, 0x37, + 0x72, 0x21, 0x8b, 0xaa, 0x4a, 0xd1, 0xd4, 0x9e, 0xc6, 0xa3, 0x38, 0x33, 0xc6, 0x1e, 0xa7, 0x1b, + 0xf8, 0x03, 0x56, 0xdc, 0xf6, 0xcc, 0x91, 0x03, 0x07, 0xfe, 0x03, 0xfe, 0x03, 0xc4, 0x69, 0x8f, + 0x7b, 0x84, 0xf6, 0x80, 0x84, 0x38, 0xf0, 0x27, 0xa0, 0xb1, 0xc7, 0x69, 0x5a, 0x6d, 0x7e, 0x40, + 0x85, 0xe0, 0xe6, 0xe7, 0xf7, 0x79, 0x9f, 0xf9, 0xbc, 0xf7, 0x66, 0xde, 0xd8, 0xb0, 0xe9, 0x62, + 0x1a, 0x74, 0x4f, 0x3d, 0x54, 0x32, 0x99, 0x87, 0x4b, 0xa6, 0xd7, 0x77, 0x39, 0x2b, 0xf5, 0xb6, + 0x90, 0xe3, 0xda, 0x68, 0x4b, 0xda, 0x45, 0xd7, 0x63, 0x9c, 0x69, 0xcb, 0x31, 0xb6, 0x28, 0xb0, + 0x45, 0xe9, 0x8b, 0xb1, 0xfa, 0x73, 0x05, 0x92, 0x8f, 0x30, 0xd6, 0x3e, 0x80, 0x39, 0xd4, 0x65, + 0x01, 0xe5, 0x8b, 0xca, 0x8a, 0xb2, 0x91, 0x29, 0x3f, 0x28, 0x8e, 0x8d, 0x2b, 0xee, 0x84, 0x60, + 0x43, 0x06, 0x69, 0x3b, 0x90, 0x46, 0xbe, 0x8f, 0x79, 0x8b, 0x58, 0x8b, 0x6a, 0x48, 0xb0, 0x3e, + 0x89, 0x40, 0xc0, 0x0f, 0x2c, 0x23, 0x85, 0xa2, 0x07, 0xfd, 0x1e, 0xa4, 0x76, 0x2c, 0xcb, 0xc3, + 0xbe, 0xaf, 0x2d, 0xc0, 0x2c, 0xa1, 0x14, 0x7b, 0xa1, 0x96, 0xac, 0x11, 0x19, 0xfa, 0x1f, 0x49, + 0xc8, 0x48, 0x44, 0x93, 0xe0, 0x73, 0xed, 0x10, 0x52, 0x3d, 0xe2, 0x93, 0x53, 0x07, 0x4b, 0xcd, + 0xe5, 0x49, 0x4b, 0x5e, 0x05, 0x17, 0x9b, 0x51, 0xe4, 0x7e, 0xc2, 0x88, 0x49, 0xb4, 0x3a, 0xcc, + 0x31, 0x17, 0x7d, 0x11, 0x60, 0x99, 0xc1, 0xd6, 0x5f, 0xa0, 0x7b, 0x12, 0x06, 0xee, 0x27, 0x0c, + 0x49, 0xb1, 0xf4, 0xab, 0x02, 0x29, 0xb9, 0x86, 0xf6, 0x11, 0xa4, 0x50, 0x84, 0x95, 0x42, 0xd7, + 0xa7, 0x63, 0x36, 0xe2, 0x30, 0x6d, 0x47, 0x14, 0xc4, 0xc2, 0xcf, 0xa4, 0xb2, 0xb7, 0xa6, 0x8b, + 0x3f, 0x10, 0x21, 0x46, 0x14, 0xa9, 0x3d, 0x85, 0xbb, 0xc8, 0x34, 0x45, 0xb3, 0x5a, 0x6d, 0x8f, + 0x05, 0xae, 0xe8, 0x54, 0x32, 0x64, 0x7b, 0x67, 0x12, 0x5b, 0x14, 0xb6, 0x27, 0xa2, 0x0e, 0x2c, + 0x23, 0x8f, 0xae, 0xd9, 0x4b, 0x9f, 0xc0, 0x5c, 0x94, 0xfd, 0xed, 0xf3, 0xac, 0xe6, 0x21, 0x2b, + 0x1f, 0x5b, 0x3d, 0x82, 0xcf, 0xf5, 0x15, 0x48, 0x1f, 0xb9, 0x98, 0x5a, 0x75, 0xdc, 0x1f, 0xb1, + 0x29, 0xde, 0x86, 0x85, 0x10, 0xd1, 0xc4, 0x1e, 0x39, 0x23, 0x26, 0xe2, 0x84, 0xd1, 0xd1, 0xe8, + 0x75, 0xc8, 0x3f, 0x0a, 0x1c, 0x47, 0xb4, 0x8c, 0xd0, 0xf6, 0x58, 0xdc, 0xf5, 0xac, 0x47, 0xe0, + 0x56, 0x21, 0xb3, 0x4b, 0x7a, 0xd8, 0xf3, 0xc9, 0x19, 0xc1, 0xde, 0x08, 0xd0, 0x3e, 0x64, 0x87, + 0x1b, 0xa2, 0x2d, 0x42, 0x4a, 0x96, 0x30, 0x6c, 0x67, 0xce, 0x88, 0x4d, 0xad, 0x00, 0xe0, 0x21, + 0x6a, 0xb1, 0x2e, 0xf9, 0x12, 0x7b, 0x61, 0x77, 0xb2, 0xc6, 0xd0, 0x1b, 0xfd, 0x4d, 0xb8, 0x73, + 0xc4, 0x11, 0xc7, 0x35, 0xd6, 0xed, 0x12, 0xde, 0xc5, 0x94, 0x8f, 0x58, 0xf2, 0x21, 0xfc, 0xaf, + 0x8a, 0x1c, 0x44, 0xcd, 0xc9, 0x50, 0x71, 0xec, 0xa2, 0x13, 0x38, 0x02, 0xb0, 0x01, 0x73, 0xd1, + 0x61, 0xd7, 0xf2, 0xa0, 0x3a, 0x2c, 0x74, 0xce, 0x18, 0xaa, 0xc3, 0x84, 0x6d, 0x93, 0x30, 0x87, + 0x19, 0x43, 0xb5, 0x89, 0xbe, 0x0c, 0xb3, 0xbb, 0x98, 0xb2, 0xae, 0x20, 0xb2, 0xc4, 0x43, 0x88, + 0x9d, 0x37, 0x22, 0x43, 0xff, 0x5a, 0x81, 0xd9, 0x26, 0x72, 0x82, 0xff, 0xc2, 0xb0, 0xf9, 0x3d, + 0x09, 0xf3, 0xa1, 0x96, 0x70, 0x92, 0x34, 0x21, 0xd3, 0xa1, 0xec, 0x9c, 0xb6, 0xae, 0x54, 0x67, + 0xca, 0xdb, 0x13, 0x38, 0x07, 0xe1, 0xc5, 0xba, 0x88, 0x0d, 0x33, 0xdf, 0x4f, 0x18, 0xd0, 0x19, + 0x58, 0xda, 0x09, 0xe4, 0x02, 0x3a, 0xcc, 0x1c, 0xa9, 0x7d, 0x77, 0x6a, 0xe6, 0xcf, 0x68, 0x67, + 0x98, 0x3b, 0x1b, 0x0c, 0xd9, 0x4b, 0xcf, 0x15, 0x80, 0xab, 0xa5, 0x6f, 0x5b, 0xd4, 0x4a, 0xdc, + 0xb3, 0x48, 0xe3, 0xda, 0x84, 0xe8, 0x70, 0x4d, 0xd9, 0xd9, 0xa5, 0x17, 0x0a, 0x64, 0x87, 0xa5, + 0xfe, 0xfb, 0x0d, 0xae, 0x66, 0x01, 0x7a, 0xa2, 0x8c, 0xd1, 0x1c, 0xd1, 0x01, 0x1e, 0x63, 0xaf, + 0xe3, 0x60, 0x83, 0xb1, 0x51, 0x07, 0xe1, 0x2b, 0x98, 0x0d, 0x59, 0xb4, 0xf7, 0x40, 0x25, 0xd6, + 0xb4, 0x13, 0x4c, 0xae, 0xab, 0x12, 0xeb, 0x36, 0x15, 0xd4, 0x97, 0x21, 0x73, 0x60, 0x61, 0xca, + 0x09, 0xef, 0x8b, 0xa9, 0x94, 0x07, 0x95, 0x74, 0xa4, 0x3c, 0x95, 0x74, 0xf4, 0x7b, 0x90, 0xdb, + 0x63, 0x3d, 0xec, 0x51, 0x71, 0xa4, 0x25, 0xa0, 0x3d, 0x00, 0xb4, 0x3b, 0xfa, 0x1a, 0x64, 0x6b, + 0x8c, 0xfa, 0x98, 0xfa, 0x81, 0x3f, 0x7a, 0xac, 0x7d, 0xa3, 0xc0, 0xcc, 0x21, 0xe3, 0x58, 0x48, + 0x0d, 0xab, 0x23, 0xb3, 0x5c, 0x9b, 0x66, 0x43, 0x1a, 0x51, 0x88, 0xa0, 0xf6, 0x7c, 0x8c, 0xa3, + 0xce, 0x64, 0x8d, 0xc8, 0x18, 0x9e, 0xfd, 0xc9, 0xbf, 0x35, 0xfb, 0xf5, 0xef, 0x14, 0x48, 0x0b, + 0x71, 0xe1, 0x89, 0xfc, 0xf0, 0xba, 0xc0, 0x8d, 0x69, 0x4f, 0xcc, 0x78, 0x91, 0xbb, 0x37, 0x45, + 0x6e, 0x4e, 0x7f, 0xc5, 0x5f, 0x09, 0x5d, 0x87, 0xbc, 0xd0, 0x59, 0x23, 0xae, 0x8d, 0x3d, 0x8e, + 0x9f, 0x8d, 0xda, 0x50, 0xf7, 0x61, 0xfe, 0x30, 0x70, 0x9c, 0x71, 0x57, 0xc3, 0x26, 0x68, 0xe1, + 0xed, 0xb5, 0x13, 0x70, 0xfb, 0x88, 0xb4, 0x29, 0xe2, 0x81, 0x87, 0x47, 0xce, 0xe1, 0xbb, 0x55, + 0x42, 0x2d, 0x42, 0xdb, 0x93, 0x90, 0xbf, 0x28, 0x90, 0x11, 0x0a, 0x1b, 0xa8, 0xef, 0x30, 0x64, + 0x69, 0x4f, 0xe1, 0x0e, 0x65, 0x1c, 0xb7, 0xcc, 0xc1, 0x5d, 0x20, 0xcb, 0x5a, 0x9c, 0x90, 0xfe, + 0x8d, 0xcb, 0xc6, 0xc8, 0x0b, 0x9a, 0xa1, 0x1b, 0x65, 0x15, 0x72, 0xd8, 0xb5, 0x71, 0x17, 0x7b, + 0xc8, 0x69, 0x75, 0x70, 0x5f, 0x56, 0x3b, 0x3b, 0x78, 0x29, 0xb6, 0xe2, 0xa7, 0x90, 0xc7, 0x34, + 0x64, 0xc6, 0x56, 0x4b, 0x10, 0x4c, 0xf9, 0xd9, 0x71, 0xbd, 0xc6, 0x46, 0x6e, 0x40, 0x22, 0x1c, + 0xfa, 0x2b, 0x05, 0x16, 0x6e, 0xc8, 0x6b, 0x78, 0x8c, 0x9d, 0xfd, 0x73, 0xc9, 0x2e, 0x41, 0xda, + 0x65, 0x3e, 0x11, 0x1f, 0x18, 0xf2, 0xce, 0x1b, 0xd8, 0x5a, 0x1d, 0xe6, 0x51, 0xc0, 0xed, 0x96, + 0x8b, 0xb8, 0xbd, 0x98, 0x5c, 0x49, 0x4e, 0xb1, 0x5c, 0x34, 0x8f, 0x1a, 0x88, 0xdb, 0x35, 0x3b, + 0xa0, 0x1d, 0x23, 0x2d, 0x08, 0x84, 0xa9, 0xdb, 0x70, 0xe7, 0x86, 0x53, 0xfb, 0x3f, 0xcc, 0x8b, + 0x4f, 0x49, 0x42, 0xdb, 0xad, 0x2d, 0xd9, 0xeb, 0xb4, 0x7c, 0xb1, 0x35, 0xec, 0x2c, 0xcb, 0x0e, + 0xc4, 0xce, 0xf2, 0xb0, 0x73, 0x5b, 0x7e, 0x51, 0xc4, 0xce, 0x6d, 0xfd, 0x0d, 0x98, 0xa9, 0xc9, + 0xd3, 0xf2, 0x9a, 0x6d, 0xa4, 0x03, 0x7c, 0x7c, 0x76, 0x86, 0x4d, 0xbe, 0x8f, 0x7c, 0x7b, 0x04, + 0xe6, 0x01, 0xe4, 0x8e, 0xeb, 0x4f, 0x02, 0xee, 0x06, 0xb2, 0xfc, 0xaf, 0x87, 0xad, 0x41, 0xf6, + 0xb8, 0x1e, 0xee, 0xf4, 0x71, 0xa8, 0x55, 0xc8, 0x1c, 0xd7, 0x8f, 0xce, 0x91, 0x3b, 0x06, 0x54, + 0xfd, 0x41, 0xfd, 0xf1, 0xa2, 0xa0, 0xbc, 0xbc, 0x28, 0x28, 0x3f, 0x5f, 0x14, 0x94, 0x17, 0x97, + 0x85, 0xc4, 0xcb, 0xcb, 0x42, 0xe2, 0xd5, 0x65, 0x21, 0x01, 0xf7, 0x4d, 0xd6, 0x1d, 0x5f, 0xf5, + 0x6a, 0xa6, 0x16, 0xbe, 0x68, 0x88, 0x5f, 0xa3, 0x86, 0x72, 0xfc, 0x79, 0x9b, 0x70, 0x3b, 0x38, + 0x2d, 0x9a, 0xac, 0x5b, 0x32, 0x99, 0xdf, 0x65, 0x7e, 0xc9, 0xc3, 0x0e, 0xea, 0x63, 0xaf, 0xd4, + 0x2b, 0x0f, 0x1e, 0x4d, 0x1b, 0x11, 0xea, 0x97, 0xc6, 0xfe, 0x74, 0xbd, 0x1f, 0xd9, 0xb1, 0xf9, + 0xad, 0x9a, 0x6c, 0xd4, 0x6a, 0xdf, 0xab, 0xcb, 0x8d, 0x58, 0x4e, 0x4d, 0xc8, 0x89, 0x56, 0x2f, + 0x36, 0x25, 0xea, 0xa7, 0x2b, 0xff, 0x89, 0xf0, 0x9f, 0x44, 0xfe, 0x93, 0xd8, 0x7f, 0xa1, 0x3e, + 0x1c, 0xeb, 0x3f, 0xd9, 0x6b, 0x54, 0x1f, 0x63, 0x8e, 0x2c, 0xc4, 0xd1, 0x6f, 0xea, 0x4a, 0x8c, + 0xad, 0x54, 0x04, 0xb8, 0x52, 0x89, 0xd0, 0x95, 0x4a, 0x0c, 0x3f, 0x9d, 0x0b, 0x7f, 0x09, 0xb7, + 0xff, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x4f, 0x4e, 0x9d, 0x9e, 0x40, 0x0e, 0x00, 0x00, } func (m *Fee) Marshal() (dAtA []byte, err error) { @@ -2488,7 +2759,7 @@ func (m *Value) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *MerkleRoot) Marshal() (dAtA []byte, err error) { +func (m *ValueView) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2498,27 +2769,71 @@ func (m *MerkleRoot) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MerkleRoot) MarshalTo(dAtA []byte) (int, error) { +func (m *ValueView) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MerkleRoot) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *ValueView) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.Inner) > 0 { - i -= len(m.Inner) - copy(dAtA[i:], m.Inner) - i = encodeVarintCrypto(dAtA, i, uint64(len(m.Inner))) + if m.ValueView != nil { + { + size := m.ValueView.Size() + i -= size + if _, err := m.ValueView.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + } + } + return len(dAtA) - i, nil +} + +func (m *ValueView_KnownDenom_) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ValueView_KnownDenom_) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + if m.KnownDenom != nil { + { + size, err := m.KnownDenom.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintCrypto(dAtA, i, uint64(size)) + } i-- dAtA[i] = 0xa } return len(dAtA) - i, nil } +func (m *ValueView_UnknownDenom_) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} -func (m *Asset) Marshal() (dAtA []byte, err error) { +func (m *ValueView_UnknownDenom_) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + if m.UnknownDenom != nil { + { + size, err := m.UnknownDenom.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintCrypto(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + return len(dAtA) - i, nil +} +func (m *ValueView_KnownDenom) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2528,12 +2843,12 @@ func (m *Asset) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *Asset) MarshalTo(dAtA []byte) (int, error) { +func (m *ValueView_KnownDenom) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *Asset) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *ValueView_KnownDenom) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2550,9 +2865,9 @@ func (m *Asset) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - if m.Id != nil { + if m.Amount != nil { { - size, err := m.Id.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Amount.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2565,7 +2880,7 @@ func (m *Asset) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *IdentityKey) Marshal() (dAtA []byte, err error) { +func (m *ValueView_UnknownDenom) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2575,26 +2890,150 @@ func (m *IdentityKey) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *IdentityKey) MarshalTo(dAtA []byte) (int, error) { +func (m *ValueView_UnknownDenom) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *IdentityKey) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *ValueView_UnknownDenom) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.Ik) > 0 { - i -= len(m.Ik) - copy(dAtA[i:], m.Ik) - i = encodeVarintCrypto(dAtA, i, uint64(len(m.Ik))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - + if m.AssetId != nil { + { + size, err := m.AssetId.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintCrypto(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + if m.Amount != nil { + { + size, err := m.Amount.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintCrypto(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MerkleRoot) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *MerkleRoot) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MerkleRoot) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Inner) > 0 { + i -= len(m.Inner) + copy(dAtA[i:], m.Inner) + i = encodeVarintCrypto(dAtA, i, uint64(len(m.Inner))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *Asset) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *Asset) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Asset) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Denom != nil { + { + size, err := m.Denom.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintCrypto(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + if m.Id != nil { + { + size, err := m.Id.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintCrypto(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *IdentityKey) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *IdentityKey) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *IdentityKey) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Ik) > 0 { + i -= len(m.Ik) + copy(dAtA[i:], m.Ik) + i = encodeVarintCrypto(dAtA, i, uint64(len(m.Ik))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func (m *GovernanceKey) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -2709,6 +3148,60 @@ func (m *Note) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *NoteView) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *NoteView) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NoteView) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Address != nil { + { + size, err := m.Address.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintCrypto(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + } + if len(m.Rseed) > 0 { + i -= len(m.Rseed) + copy(dAtA[i:], m.Rseed) + i = encodeVarintCrypto(dAtA, i, uint64(len(m.Rseed))) + i-- + dAtA[i] = 0x12 + } + if m.Value != nil { + { + size, err := m.Value.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintCrypto(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func (m *NoteCiphertext) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -3407,136 +3900,133 @@ func (m *Value) Size() (n int) { return n } -func (m *MerkleRoot) Size() (n int) { +func (m *ValueView) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = len(m.Inner) - if l > 0 { - n += 1 + l + sovCrypto(uint64(l)) + if m.ValueView != nil { + n += m.ValueView.Size() } return n } -func (m *Asset) Size() (n int) { +func (m *ValueView_KnownDenom_) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.Id != nil { - l = m.Id.Size() - n += 1 + l + sovCrypto(uint64(l)) - } - if m.Denom != nil { - l = m.Denom.Size() + if m.KnownDenom != nil { + l = m.KnownDenom.Size() n += 1 + l + sovCrypto(uint64(l)) } return n } - -func (m *IdentityKey) Size() (n int) { +func (m *ValueView_UnknownDenom_) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = len(m.Ik) - if l > 0 { + if m.UnknownDenom != nil { + l = m.UnknownDenom.Size() n += 1 + l + sovCrypto(uint64(l)) } return n } - -func (m *GovernanceKey) Size() (n int) { +func (m *ValueView_KnownDenom) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = len(m.Gk) - if l > 0 { + if m.Amount != nil { + l = m.Amount.Size() + n += 1 + l + sovCrypto(uint64(l)) + } + if m.Denom != nil { + l = m.Denom.Size() n += 1 + l + sovCrypto(uint64(l)) } return n } -func (m *ConsensusKey) Size() (n int) { +func (m *ValueView_UnknownDenom) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = len(m.Inner) - if l > 0 { + if m.Amount != nil { + l = m.Amount.Size() + n += 1 + l + sovCrypto(uint64(l)) + } + if m.AssetId != nil { + l = m.AssetId.Size() n += 1 + l + sovCrypto(uint64(l)) } return n } -func (m *Note) Size() (n int) { +func (m *MerkleRoot) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.Value != nil { - l = m.Value.Size() - n += 1 + l + sovCrypto(uint64(l)) - } - l = len(m.Rseed) + l = len(m.Inner) if l > 0 { n += 1 + l + sovCrypto(uint64(l)) } - if m.Address != nil { - l = m.Address.Size() - n += 1 + l + sovCrypto(uint64(l)) - } return n } -func (m *NoteCiphertext) Size() (n int) { +func (m *Asset) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = len(m.Inner) - if l > 0 { + if m.Id != nil { + l = m.Id.Size() + n += 1 + l + sovCrypto(uint64(l)) + } + if m.Denom != nil { + l = m.Denom.Size() n += 1 + l + sovCrypto(uint64(l)) } return n } -func (m *Nullifier) Size() (n int) { +func (m *IdentityKey) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = len(m.Inner) + l = len(m.Ik) if l > 0 { n += 1 + l + sovCrypto(uint64(l)) } return n } -func (m *SpendAuthSignature) Size() (n int) { +func (m *GovernanceKey) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = len(m.Inner) + l = len(m.Gk) if l > 0 { n += 1 + l + sovCrypto(uint64(l)) } return n } -func (m *BindingSignature) Size() (n int) { +func (m *ConsensusKey) Size() (n int) { if m == nil { return 0 } @@ -3549,15 +4039,109 @@ func (m *BindingSignature) Size() (n int) { return n } -func (m *NotePayload) Size() (n int) { +func (m *Note) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.NoteCommitment != nil { - l = m.NoteCommitment.Size() - n += 1 + l + sovCrypto(uint64(l)) + if m.Value != nil { + l = m.Value.Size() + n += 1 + l + sovCrypto(uint64(l)) + } + l = len(m.Rseed) + if l > 0 { + n += 1 + l + sovCrypto(uint64(l)) + } + if m.Address != nil { + l = m.Address.Size() + n += 1 + l + sovCrypto(uint64(l)) + } + return n +} + +func (m *NoteView) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Value != nil { + l = m.Value.Size() + n += 1 + l + sovCrypto(uint64(l)) + } + l = len(m.Rseed) + if l > 0 { + n += 1 + l + sovCrypto(uint64(l)) + } + if m.Address != nil { + l = m.Address.Size() + n += 1 + l + sovCrypto(uint64(l)) + } + return n +} + +func (m *NoteCiphertext) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Inner) + if l > 0 { + n += 1 + l + sovCrypto(uint64(l)) + } + return n +} + +func (m *Nullifier) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Inner) + if l > 0 { + n += 1 + l + sovCrypto(uint64(l)) + } + return n +} + +func (m *SpendAuthSignature) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Inner) + if l > 0 { + n += 1 + l + sovCrypto(uint64(l)) + } + return n +} + +func (m *BindingSignature) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Inner) + if l > 0 { + n += 1 + l + sovCrypto(uint64(l)) + } + return n +} + +func (m *NotePayload) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.NoteCommitment != nil { + l = m.NoteCommitment.Size() + n += 1 + l + sovCrypto(uint64(l)) } l = len(m.EphemeralKey) if l > 0 { @@ -5321,7 +5905,7 @@ func (m *Value) Unmarshal(dAtA []byte) error { } return nil } -func (m *MerkleRoot) Unmarshal(dAtA []byte) error { +func (m *ValueView) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5344,17 +5928,17 @@ func (m *MerkleRoot) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MerkleRoot: wiretype end group for non-group") + return fmt.Errorf("proto: ValueView: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MerkleRoot: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: ValueView: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Inner", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field KnownDenom", wireType) } - var byteLen int + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowCrypto @@ -5364,25 +5948,61 @@ func (m *MerkleRoot) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + if msglen < 0 { return ErrInvalidLengthCrypto } - postIndex := iNdEx + byteLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthCrypto } if postIndex > l { return io.ErrUnexpectedEOF } - m.Inner = append(m.Inner[:0], dAtA[iNdEx:postIndex]...) - if m.Inner == nil { - m.Inner = []byte{} + v := &ValueView_KnownDenom{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.ValueView = &ValueView_KnownDenom_{v} + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field UnknownDenom", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCrypto + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthCrypto + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCrypto + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + v := &ValueView_UnknownDenom{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } + m.ValueView = &ValueView_UnknownDenom_{v} iNdEx = postIndex default: iNdEx = preIndex @@ -5405,7 +6025,7 @@ func (m *MerkleRoot) Unmarshal(dAtA []byte) error { } return nil } -func (m *Asset) Unmarshal(dAtA []byte) error { +func (m *ValueView_KnownDenom) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5428,15 +6048,15 @@ func (m *Asset) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: Asset: wiretype end group for non-group") + return fmt.Errorf("proto: KnownDenom: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: Asset: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: KnownDenom: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -5463,10 +6083,10 @@ func (m *Asset) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Id == nil { - m.Id = &AssetId{} + if m.Amount == nil { + m.Amount = &Amount{} } - if err := m.Id.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Amount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -5527,7 +6147,7 @@ func (m *Asset) Unmarshal(dAtA []byte) error { } return nil } -func (m *IdentityKey) Unmarshal(dAtA []byte) error { +func (m *ValueView_UnknownDenom) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5550,17 +6170,17 @@ func (m *IdentityKey) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: IdentityKey: wiretype end group for non-group") + return fmt.Errorf("proto: UnknownDenom: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: IdentityKey: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: UnknownDenom: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Ik", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType) } - var byteLen int + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowCrypto @@ -5570,81 +6190,33 @@ func (m *IdentityKey) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + if msglen < 0 { return ErrInvalidLengthCrypto } - postIndex := iNdEx + byteLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthCrypto } if postIndex > l { return io.ErrUnexpectedEOF } - m.Ik = append(m.Ik[:0], dAtA[iNdEx:postIndex]...) - if m.Ik == nil { - m.Ik = []byte{} + if m.Amount == nil { + m.Amount = &Amount{} } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipCrypto(dAtA[iNdEx:]) - if err != nil { + if err := m.Amount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthCrypto - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *GovernanceKey) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCrypto - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: GovernanceKey: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: GovernanceKey: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: + iNdEx = postIndex + case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Gk", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field AssetId", wireType) } - var byteLen int + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowCrypto @@ -5654,24 +6226,26 @@ func (m *GovernanceKey) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + if msglen < 0 { return ErrInvalidLengthCrypto } - postIndex := iNdEx + byteLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthCrypto } if postIndex > l { return io.ErrUnexpectedEOF } - m.Gk = append(m.Gk[:0], dAtA[iNdEx:postIndex]...) - if m.Gk == nil { - m.Gk = []byte{} + if m.AssetId == nil { + m.AssetId = &AssetId{} + } + if err := m.AssetId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } iNdEx = postIndex default: @@ -5695,7 +6269,7 @@ func (m *GovernanceKey) Unmarshal(dAtA []byte) error { } return nil } -func (m *ConsensusKey) Unmarshal(dAtA []byte) error { +func (m *MerkleRoot) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5718,10 +6292,10 @@ func (m *ConsensusKey) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: ConsensusKey: wiretype end group for non-group") + return fmt.Errorf("proto: MerkleRoot: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: ConsensusKey: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MerkleRoot: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -5779,7 +6353,7 @@ func (m *ConsensusKey) Unmarshal(dAtA []byte) error { } return nil } -func (m *Note) Unmarshal(dAtA []byte) error { +func (m *Asset) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5802,10 +6376,384 @@ func (m *Note) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: Note: wiretype end group for non-group") + return fmt.Errorf("proto: Asset: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: Note: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: Asset: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCrypto + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthCrypto + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCrypto + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Id == nil { + m.Id = &AssetId{} + } + if err := m.Id.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Denom", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCrypto + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthCrypto + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCrypto + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Denom == nil { + m.Denom = &Denom{} + } + if err := m.Denom.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipCrypto(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthCrypto + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *IdentityKey) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCrypto + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: IdentityKey: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: IdentityKey: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Ik", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCrypto + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthCrypto + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthCrypto + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Ik = append(m.Ik[:0], dAtA[iNdEx:postIndex]...) + if m.Ik == nil { + m.Ik = []byte{} + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipCrypto(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthCrypto + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *GovernanceKey) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCrypto + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: GovernanceKey: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: GovernanceKey: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Gk", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCrypto + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthCrypto + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthCrypto + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Gk = append(m.Gk[:0], dAtA[iNdEx:postIndex]...) + if m.Gk == nil { + m.Gk = []byte{} + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipCrypto(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthCrypto + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *ConsensusKey) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCrypto + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: ConsensusKey: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: ConsensusKey: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Inner", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCrypto + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthCrypto + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthCrypto + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Inner = append(m.Inner[:0], dAtA[iNdEx:postIndex]...) + if m.Inner == nil { + m.Inner = []byte{} + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipCrypto(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthCrypto + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *Note) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCrypto + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: Note: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Note: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -5935,6 +6883,162 @@ func (m *Note) Unmarshal(dAtA []byte) error { } return nil } +func (m *NoteView) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCrypto + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: NoteView: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: NoteView: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Value", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCrypto + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthCrypto + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCrypto + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Value == nil { + m.Value = &ValueView{} + } + if err := m.Value.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Rseed", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCrypto + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthCrypto + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthCrypto + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Rseed = append(m.Rseed[:0], dAtA[iNdEx:postIndex]...) + if m.Rseed == nil { + m.Rseed = []byte{} + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCrypto + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthCrypto + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCrypto + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Address == nil { + m.Address = &AddressView{} + } + if err := m.Address.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipCrypto(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthCrypto + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *NoteCiphertext) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/relayer/chains/penumbra/core/dex/v1alpha1/dex.pb.go b/relayer/chains/penumbra/core/dex/v1alpha1/dex.pb.go index b3c6b6c99..cf6cf0bb4 100644 --- a/relayer/chains/penumbra/core/dex/v1alpha1/dex.pb.go +++ b/relayer/chains/penumbra/core/dex/v1alpha1/dex.pb.go @@ -503,7 +503,7 @@ func (m *SwapPlaintext) GetRseed() []byte { type MockFlowCiphertext struct { // Represents this transaction's contribution to flow's value. - Value uint64 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"` + Value *v1alpha1.Amount `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` } func (m *MockFlowCiphertext) Reset() { *m = MockFlowCiphertext{} } @@ -539,11 +539,11 @@ func (m *MockFlowCiphertext) XXX_DiscardUnknown() { var xxx_messageInfo_MockFlowCiphertext proto.InternalMessageInfo -func (m *MockFlowCiphertext) GetValue() uint64 { +func (m *MockFlowCiphertext) GetValue() *v1alpha1.Amount { if m != nil { return m.Value } - return 0 + return nil } type SwapPlan struct { @@ -941,9 +941,9 @@ func (*SwapClaimView) XXX_OneofWrappers() []interface{} { } type SwapClaimView_Visible struct { - SwapClaim *SwapClaim `protobuf:"bytes,1,opt,name=swap_claim,json=swapClaim,proto3" json:"swap_claim,omitempty"` - Output_1 *v1alpha1.Note `protobuf:"bytes,2,opt,name=output_1,json=output1,proto3" json:"output_1,omitempty"` - Output_2 *v1alpha1.Note `protobuf:"bytes,3,opt,name=output_2,json=output2,proto3" json:"output_2,omitempty"` + SwapClaim *SwapClaim `protobuf:"bytes,1,opt,name=swap_claim,json=swapClaim,proto3" json:"swap_claim,omitempty"` + Output_1 *v1alpha1.NoteView `protobuf:"bytes,2,opt,name=output_1,json=output1,proto3" json:"output_1,omitempty"` + Output_2 *v1alpha1.NoteView `protobuf:"bytes,3,opt,name=output_2,json=output2,proto3" json:"output_2,omitempty"` } func (m *SwapClaimView_Visible) Reset() { *m = SwapClaimView_Visible{} } @@ -986,14 +986,14 @@ func (m *SwapClaimView_Visible) GetSwapClaim() *SwapClaim { return nil } -func (m *SwapClaimView_Visible) GetOutput_1() *v1alpha1.Note { +func (m *SwapClaimView_Visible) GetOutput_1() *v1alpha1.NoteView { if m != nil { return m.Output_1 } return nil } -func (m *SwapClaimView_Visible) GetOutput_2() *v1alpha1.Note { +func (m *SwapClaimView_Visible) GetOutput_2() *v1alpha1.NoteView { if m != nil { return m.Output_2 } @@ -1163,19 +1163,21 @@ func (m *DirectedTradingPair) GetEnd() *v1alpha1.AssetId { // clearing price for the batch. type BatchSwapOutputData struct { // The total amount of asset 1 that was input to the batch swap. - Delta_1 uint64 `protobuf:"varint,1,opt,name=delta_1,json=delta1,proto3" json:"delta_1,omitempty"` + Delta_1 *v1alpha1.Amount `protobuf:"bytes,1,opt,name=delta_1,json=delta1,proto3" json:"delta_1,omitempty"` // The total amount of asset 2 that was input to the batch swap. - Delta_2 uint64 `protobuf:"varint,2,opt,name=delta_2,json=delta2,proto3" json:"delta_2,omitempty"` - // The total amount of asset 1 that was output from the batch swap. - Lambda_1 uint64 `protobuf:"varint,3,opt,name=lambda_1,json=lambda1,proto3" json:"lambda_1,omitempty"` - // The total amount of asset 2 that was output from the batch swap. - Lambda_2 uint64 `protobuf:"varint,4,opt,name=lambda_2,json=lambda2,proto3" json:"lambda_2,omitempty"` - // Whether the swap succeeded or not. - Success bool `protobuf:"varint,5,opt,name=success,proto3" json:"success,omitempty"` + Delta_2 *v1alpha1.Amount `protobuf:"bytes,2,opt,name=delta_2,json=delta2,proto3" json:"delta_2,omitempty"` + // The total amount of asset 1 that was output from the batch swap for 1=>2 trades. + Lambda_1_1 *v1alpha1.Amount `protobuf:"bytes,3,opt,name=lambda_1_1,json=lambda11,proto3" json:"lambda_1_1,omitempty"` + // The total amount of asset 2 that was output from the batch swap for 1=>2 trades. + Lambda_2_1 *v1alpha1.Amount `protobuf:"bytes,4,opt,name=lambda_2_1,json=lambda21,proto3" json:"lambda_2_1,omitempty"` + // The total amount of asset 1 that was output from the batch swap for 2=>1 trades. + Lambda_1_2 *v1alpha1.Amount `protobuf:"bytes,5,opt,name=lambda_1_2,json=lambda12,proto3" json:"lambda_1_2,omitempty"` + // The total amount of asset 2 that was output from the batch swap for 2=>1 trades. + Lambda_2_2 *v1alpha1.Amount `protobuf:"bytes,6,opt,name=lambda_2_2,json=lambda22,proto3" json:"lambda_2_2,omitempty"` // The height for which the batch swap data is valid. - Height uint64 `protobuf:"varint,6,opt,name=height,proto3" json:"height,omitempty"` + Height uint64 `protobuf:"varint,7,opt,name=height,proto3" json:"height,omitempty"` // The trading pair associated with the batch swap. - TradingPair *TradingPair `protobuf:"bytes,7,opt,name=trading_pair,json=tradingPair,proto3" json:"trading_pair,omitempty"` + TradingPair *TradingPair `protobuf:"bytes,8,opt,name=trading_pair,json=tradingPair,proto3" json:"trading_pair,omitempty"` } func (m *BatchSwapOutputData) Reset() { *m = BatchSwapOutputData{} } @@ -1211,39 +1213,46 @@ func (m *BatchSwapOutputData) XXX_DiscardUnknown() { var xxx_messageInfo_BatchSwapOutputData proto.InternalMessageInfo -func (m *BatchSwapOutputData) GetDelta_1() uint64 { +func (m *BatchSwapOutputData) GetDelta_1() *v1alpha1.Amount { if m != nil { return m.Delta_1 } - return 0 + return nil } -func (m *BatchSwapOutputData) GetDelta_2() uint64 { +func (m *BatchSwapOutputData) GetDelta_2() *v1alpha1.Amount { if m != nil { return m.Delta_2 } - return 0 + return nil } -func (m *BatchSwapOutputData) GetLambda_1() uint64 { +func (m *BatchSwapOutputData) GetLambda_1_1() *v1alpha1.Amount { if m != nil { - return m.Lambda_1 + return m.Lambda_1_1 } - return 0 + return nil } -func (m *BatchSwapOutputData) GetLambda_2() uint64 { +func (m *BatchSwapOutputData) GetLambda_2_1() *v1alpha1.Amount { if m != nil { - return m.Lambda_2 + return m.Lambda_2_1 } - return 0 + return nil +} + +func (m *BatchSwapOutputData) GetLambda_1_2() *v1alpha1.Amount { + if m != nil { + return m.Lambda_1_2 + } + return nil } -func (m *BatchSwapOutputData) GetSuccess() bool { +func (m *BatchSwapOutputData) GetLambda_2_2() *v1alpha1.Amount { if m != nil { - return m.Success + return m.Lambda_2_2 } - return false + return nil } func (m *BatchSwapOutputData) GetHeight() uint64 { @@ -2125,7 +2134,9 @@ func (m *SwapExecution) GetTrades() []*Trade { // Contains private and public data for withdrawing funds from a closed position. type PositionWithdrawPlan struct { - Reserves *Reserves `protobuf:"bytes,1,opt,name=reserves,proto3" json:"reserves,omitempty"` + Reserves *Reserves `protobuf:"bytes,1,opt,name=reserves,proto3" json:"reserves,omitempty"` + PositionId *PositionId `protobuf:"bytes,2,opt,name=position_id,json=positionId,proto3" json:"position_id,omitempty"` + Pair *TradingPair `protobuf:"bytes,3,opt,name=pair,proto3" json:"pair,omitempty"` } func (m *PositionWithdrawPlan) Reset() { *m = PositionWithdrawPlan{} } @@ -2168,6 +2179,20 @@ func (m *PositionWithdrawPlan) GetReserves() *Reserves { return nil } +func (m *PositionWithdrawPlan) GetPositionId() *PositionId { + if m != nil { + return m.PositionId + } + return nil +} + +func (m *PositionWithdrawPlan) GetPair() *TradingPair { + if m != nil { + return m.Pair + } + return nil +} + // Contains private and public data for claiming rewards from a position. type PositionRewardClaimPlan struct { Reserves *Reserves `protobuf:"bytes,1,opt,name=reserves,proto3" json:"reserves,omitempty"` @@ -2257,119 +2282,121 @@ func init() { } var fileDescriptor_d1eba752ca2f0d70 = []byte{ - // 1788 bytes of a gzipped FileDescriptorProto + // 1815 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x59, 0x5f, 0x6f, 0x23, 0x57, - 0x15, 0xcf, 0xd8, 0x4e, 0xec, 0x1c, 0x3b, 0xbb, 0xd9, 0x9b, 0x15, 0x0d, 0x41, 0x4d, 0x77, 0xa7, - 0xdd, 0xb2, 0x6c, 0x91, 0x53, 0x4f, 0x8b, 0x54, 0xb2, 0xb4, 0xdb, 0xf8, 0x4f, 0x1a, 0x6f, 0x1b, - 0x67, 0xb8, 0x49, 0x77, 0xab, 0xb2, 0x62, 0x74, 0x33, 0x73, 0xb3, 0x1e, 0x31, 0x9e, 0x99, 0x9d, - 0x19, 0x27, 0xce, 0x13, 0x12, 0x02, 0xf1, 0x84, 0xa0, 0x1f, 0x00, 0xa1, 0xe5, 0x91, 0xcf, 0x80, - 0xe0, 0x15, 0x21, 0x10, 0xfb, 0x06, 0x6f, 0xa0, 0xdd, 0x37, 0x3e, 0x00, 0x42, 0x82, 0x07, 0x74, - 0xff, 0xd9, 0x93, 0xc4, 0x8e, 0xed, 0x6c, 0x78, 0xe9, 0x9b, 0xef, 0x3d, 0xe7, 0xf7, 0x9b, 0x73, - 0xef, 0xef, 0xde, 0x73, 0xce, 0x4d, 0xe0, 0x8d, 0x90, 0xfa, 0xdd, 0xce, 0x7e, 0x44, 0xd6, 0xec, - 0x20, 0xa2, 0x6b, 0x0e, 0xed, 0xad, 0x1d, 0x56, 0x88, 0x17, 0xb6, 0x49, 0x85, 0x0d, 0xca, 0x61, - 0x14, 0x24, 0x01, 0x5a, 0x51, 0x5e, 0x65, 0xe6, 0x55, 0x66, 0x06, 0xe5, 0xb5, 0x72, 0xe7, 0x24, - 0x83, 0x1d, 0x1d, 0x87, 0x49, 0x30, 0x20, 0x11, 0x63, 0xc1, 0xa3, 0xff, 0x48, 0x83, 0xdc, 0xee, - 0x11, 0x09, 0xd1, 0x87, 0x30, 0x1b, 0x46, 0x41, 0x70, 0xb0, 0xac, 0xdd, 0xd0, 0x6e, 0x17, 0x8d, - 0x3b, 0xe5, 0x93, 0x1f, 0x90, 0x20, 0x45, 0x52, 0xfe, 0xfc, 0x63, 0x86, 0x32, 0x19, 0x02, 0x0b, - 0x20, 0x7a, 0x0f, 0x72, 0xfb, 0x81, 0x73, 0xbc, 0x9c, 0xe3, 0x04, 0x6f, 0x94, 0x47, 0x47, 0x58, - 0x66, 0xd8, 0x6a, 0xe0, 0x1c, 0x63, 0x8e, 0xd0, 0x7f, 0xaa, 0xc1, 0x3c, 0x9b, 0xaa, 0x79, 0xc4, - 0xed, 0xa0, 0xeb, 0xe9, 0x48, 0x4a, 0x8a, 0xfd, 0x7d, 0xc9, 0x9e, 0xe1, 0xec, 0xdf, 0x18, 0xc7, - 0xce, 0xa9, 0x06, 0x9f, 0x40, 0xb7, 0xe0, 0x0a, 0x0d, 0x03, 0xbb, 0x6d, 0x39, 0xdd, 0x88, 0x24, - 0x6e, 0xe0, 0x2f, 0xe7, 0x6f, 0x68, 0xb7, 0x73, 0x78, 0x81, 0xcf, 0xd6, 0xe5, 0xa4, 0xfe, 0xab, - 0x2c, 0x2c, 0x9c, 0x80, 0xa3, 0x4d, 0x98, 0xf7, 0xbb, 0x9e, 0xe7, 0x1e, 0xb8, 0x34, 0x92, 0x7b, - 0x73, 0x7b, 0xcc, 0xde, 0xb4, 0x94, 0x3f, 0x1e, 0x40, 0xd1, 0xbb, 0x90, 0x3d, 0xa0, 0x54, 0x86, - 0xaf, 0x8f, 0x61, 0xd8, 0xa4, 0x14, 0x33, 0x77, 0xf4, 0x7d, 0x58, 0x0a, 0xba, 0x49, 0xd8, 0x4d, - 0xac, 0x8a, 0x65, 0x07, 0x9d, 0x8e, 0x9b, 0x74, 0xa8, 0x9f, 0x2c, 0x67, 0x39, 0x4b, 0x79, 0x0c, - 0xcb, 0x6e, 0x42, 0x12, 0x5a, 0xeb, 0xa3, 0xf0, 0x35, 0x41, 0x55, 0x19, 0x4c, 0xa5, 0xf8, 0x8d, - 0x34, 0x7f, 0xee, 0x65, 0xf8, 0x8d, 0x14, 0xbf, 0x09, 0x45, 0xc9, 0xef, 0x90, 0x84, 0x2c, 0xcf, - 0x71, 0xde, 0xb5, 0xf3, 0xc4, 0xab, 0x92, 0xc4, 0x6e, 0x33, 0x09, 0x76, 0x38, 0xae, 0x4e, 0x12, - 0x82, 0x21, 0xe8, 0xff, 0xd6, 0xff, 0x9d, 0x81, 0x82, 0x3a, 0x3e, 0xe8, 0x3e, 0x94, 0x92, 0x88, - 0x38, 0xae, 0xff, 0xd8, 0x0a, 0x89, 0xab, 0xf4, 0xf9, 0xfa, 0x79, 0xfc, 0x7b, 0xc2, 0xdf, 0x24, - 0x6e, 0x84, 0x8b, 0xc9, 0x60, 0x80, 0x36, 0x60, 0xde, 0xa1, 0x5e, 0x42, 0xac, 0x8a, 0xe5, 0x4a, - 0x99, 0x6e, 0x8d, 0xd9, 0x80, 0x8d, 0x4e, 0xd0, 0xf5, 0x13, 0x9c, 0xe7, 0xb8, 0x4a, 0x73, 0x40, - 0x61, 0x58, 0xae, 0xd4, 0x68, 0x2a, 0x0a, 0xa3, 0x89, 0x1e, 0xc2, 0x95, 0x03, 0x4a, 0xcf, 0x6a, - 0xf1, 0xf6, 0x18, 0x9e, 0x2a, 0xf1, 0x88, 0x6f, 0xa7, 0xd5, 0x58, 0x38, 0xa0, 0xa9, 0x21, 0xda, - 0x80, 0x7c, 0x48, 0x8e, 0xbd, 0x80, 0x38, 0xcb, 0xb3, 0xe3, 0x77, 0x89, 0x5f, 0x6e, 0xe1, 0x8e, - 0x15, 0x4e, 0xff, 0xb1, 0x06, 0xc5, 0x94, 0x01, 0xb5, 0x00, 0x52, 0x71, 0x6a, 0x17, 0x3a, 0x33, - 0x29, 0x06, 0x7e, 0x47, 0x7d, 0x0e, 0xa0, 0x8e, 0x15, 0x1f, 0x91, 0x90, 0xcb, 0x50, 0xc2, 0x0b, - 0xfd, 0x59, 0xf6, 0x75, 0xfd, 0x27, 0xf2, 0x8e, 0x9a, 0x1e, 0x71, 0xfd, 0x84, 0xf6, 0x92, 0x2f, - 0xe1, 0x31, 0xb8, 0x07, 0xf3, 0x36, 0x4b, 0x41, 0x16, 0xcb, 0x19, 0xb9, 0x89, 0x73, 0x46, 0x81, - 0x83, 0x36, 0x29, 0x45, 0x1f, 0xc3, 0x82, 0x20, 0x20, 0x8e, 0x13, 0xd1, 0x38, 0x96, 0xa2, 0xbf, - 0x39, 0x2e, 0x0e, 0xe1, 0x8d, 0x4b, 0x1c, 0x2c, 0x47, 0x2c, 0x23, 0x47, 0x31, 0xa5, 0x0e, 0xbf, - 0xbf, 0x25, 0x2c, 0x06, 0xfa, 0x1d, 0x40, 0xdb, 0x81, 0xfd, 0x83, 0x4d, 0x2f, 0x38, 0xaa, 0xb9, - 0x61, 0x9b, 0x46, 0x5c, 0x8b, 0xeb, 0x30, 0x7b, 0x48, 0xbc, 0x2e, 0xe5, 0x22, 0xe4, 0xb0, 0x18, - 0xe8, 0x3f, 0x14, 0x97, 0xd6, 0xf4, 0x88, 0x8f, 0x4c, 0xb8, 0xc2, 0xc4, 0xb5, 0x42, 0xa5, 0x9f, - 0xd4, 0x6b, 0x6c, 0x4e, 0xef, 0x0b, 0x8e, 0x17, 0xe2, 0x13, 0xfa, 0xdf, 0x84, 0x12, 0xbb, 0x34, - 0xfb, 0x9e, 0xeb, 0x33, 0x1d, 0xe5, 0xb1, 0x29, 0x1e, 0x50, 0x5a, 0x95, 0x53, 0xfa, 0xbf, 0xb4, - 0x54, 0x62, 0xff, 0x3f, 0x85, 0xb1, 0x02, 0x85, 0x30, 0x88, 0x5d, 0x5e, 0x5d, 0x32, 0x7c, 0xf5, - 0xfd, 0xf1, 0xe9, 0x44, 0x98, 0x7d, 0xe9, 0x44, 0x38, 0xa4, 0xa2, 0xe5, 0x86, 0x55, 0xb4, 0xff, - 0xca, 0x7c, 0xf9, 0xc0, 0xa5, 0x47, 0x68, 0x0b, 0xf2, 0x87, 0x6e, 0xec, 0xee, 0x7b, 0x54, 0x2e, - 0xf6, 0x9b, 0xe3, 0x16, 0xcb, 0x60, 0xe5, 0x07, 0x02, 0xb3, 0x35, 0x83, 0x15, 0x1c, 0x35, 0x60, - 0x2e, 0x08, 0xc9, 0x93, 0xae, 0xaa, 0x68, 0x6f, 0x4d, 0x44, 0xb4, 0xc3, 0x21, 0x5b, 0x33, 0x58, - 0x82, 0x57, 0xbe, 0xd0, 0x20, 0x2f, 0xd9, 0xd1, 0xbb, 0x90, 0xe3, 0x97, 0x5e, 0x44, 0x76, 0x63, - 0x1c, 0x21, 0xe6, 0xde, 0x43, 0x64, 0xcc, 0xbe, 0x9c, 0x8c, 0x2b, 0x1f, 0xc0, 0x9c, 0x88, 0xf3, - 0x62, 0x11, 0x55, 0x8b, 0x30, 0xcf, 0x23, 0x3a, 0x74, 0xe9, 0x91, 0xfe, 0xf7, 0x74, 0x43, 0xc1, - 0x35, 0xd8, 0x3e, 0xad, 0x41, 0x65, 0xa2, 0x5e, 0x66, 0x94, 0x10, 0xf7, 0x4f, 0x09, 0xf1, 0xf6, - 0xe4, 0x6c, 0x67, 0xd4, 0xf8, 0x4b, 0x4a, 0x8d, 0x3a, 0x00, 0x5f, 0x05, 0x4f, 0x04, 0x32, 0xd2, - 0x5b, 0x13, 0x71, 0x63, 0xbe, 0x7c, 0xd1, 0xcb, 0x7d, 0x00, 0x05, 0xd5, 0xbf, 0xc8, 0xf8, 0x5e, - 0x1f, 0xd7, 0x3c, 0x05, 0x09, 0xc5, 0x79, 0xd9, 0xa9, 0xa4, 0xf0, 0x86, 0xd4, 0x75, 0x1a, 0xbc, - 0xb1, 0xd2, 0xea, 0x6b, 0x79, 0x29, 0xeb, 0xa9, 0x5e, 0x83, 0xab, 0x03, 0x16, 0xa1, 0xf0, 0xcf, - 0x35, 0x28, 0xa6, 0xaa, 0x09, 0xba, 0x07, 0x79, 0x12, 0xc7, 0x94, 0xad, 0x58, 0x9b, 0x2c, 0xe7, - 0x32, 0xef, 0xa6, 0x83, 0xe7, 0x38, 0xac, 0x32, 0x20, 0x30, 0xe4, 0x96, 0x4d, 0x47, 0x60, 0xe8, - 0x3f, 0xd3, 0x60, 0xa9, 0xee, 0x46, 0xd4, 0x4e, 0xa8, 0x93, 0x8e, 0xec, 0x3b, 0x30, 0x1b, 0x27, - 0x24, 0x4a, 0xa6, 0x8c, 0x4b, 0x80, 0xd0, 0x7b, 0x90, 0xa5, 0xbe, 0x33, 0x65, 0x48, 0x0c, 0xa2, - 0xff, 0x47, 0x83, 0xa5, 0x21, 0xd9, 0x0c, 0xbd, 0x02, 0x79, 0x59, 0x6a, 0x65, 0xb1, 0x98, 0x13, - 0x15, 0x74, 0x60, 0x30, 0x64, 0x1e, 0x15, 0x06, 0x03, 0x7d, 0x15, 0x0a, 0x1e, 0xe9, 0xec, 0x3b, - 0x0c, 0x92, 0xe5, 0x96, 0xbc, 0x18, 0x57, 0x52, 0x26, 0x43, 0x26, 0x42, 0x69, 0x32, 0xd0, 0x32, - 0xe4, 0xe3, 0xae, 0x6d, 0xab, 0x2a, 0x58, 0xc0, 0x6a, 0x88, 0xbe, 0x02, 0x73, 0x6d, 0xea, 0x3e, - 0x6e, 0x27, 0xbc, 0xb2, 0xe5, 0xb0, 0x1c, 0x9d, 0x69, 0x28, 0xf2, 0x17, 0x6f, 0x28, 0xf4, 0x5f, - 0x6a, 0x70, 0x55, 0x1a, 0x37, 0xbb, 0xbe, 0xcd, 0xab, 0xc1, 0x36, 0xcc, 0xdb, 0x41, 0x27, 0x0c, - 0xfc, 0x41, 0xe3, 0x34, 0xa6, 0x16, 0x44, 0xf4, 0x14, 0x07, 0x1e, 0x30, 0xa0, 0xbb, 0x90, 0xe3, - 0x61, 0x66, 0xa6, 0x0b, 0x93, 0x83, 0xf4, 0x2f, 0xb8, 0x3a, 0x67, 0xf8, 0xd1, 0xa2, 0x78, 0xb0, - 0xb0, 0xe8, 0x16, 0xc4, 0x63, 0xe4, 0x1d, 0xd0, 0xc2, 0xe9, 0x5a, 0x22, 0x2d, 0x64, 0xa0, 0x27, - 0xd3, 0x35, 0x41, 0xda, 0x13, 0xbd, 0x07, 0x05, 0x4c, 0x63, 0x1a, 0x1d, 0xd2, 0x18, 0x7d, 0x0b, - 0x32, 0x51, 0x65, 0xc4, 0x85, 0x1d, 0xc1, 0x90, 0x89, 0x2a, 0x1c, 0x66, 0x4c, 0x17, 0x6d, 0x26, - 0x32, 0x74, 0x0b, 0x0a, 0xa6, 0xaa, 0xd9, 0xef, 0x43, 0x36, 0x6c, 0xbb, 0xf2, 0xd3, 0x6f, 0x4d, - 0xb0, 0xab, 0x7d, 0x6d, 0x18, 0x8e, 0x75, 0x42, 0x7e, 0xe0, 0xdb, 0x54, 0xb6, 0x23, 0x62, 0xa0, - 0xeb, 0x00, 0xea, 0x03, 0x4d, 0x87, 0xf9, 0xb8, 0xbe, 0x2f, 0x5f, 0x96, 0x25, 0x2c, 0x06, 0xfa, - 0xd3, 0x0c, 0x2c, 0x28, 0x27, 0xde, 0x30, 0xa3, 0xef, 0xf2, 0xab, 0x9b, 0x08, 0x39, 0xae, 0x18, - 0x77, 0xcf, 0x0b, 0xe6, 0x04, 0xf2, 0xe4, 0xa8, 0xe1, 0x77, 0x3b, 0x58, 0x30, 0xe9, 0xbf, 0xd5, - 0xe0, 0xda, 0x19, 0x23, 0x7a, 0x1d, 0x5e, 0x33, 0x77, 0x76, 0x9b, 0x7b, 0xcd, 0x9d, 0x96, 0xb5, - 0xbb, 0xb7, 0xb1, 0xd7, 0xb0, 0x1a, 0xad, 0x4f, 0xb7, 0xad, 0x4f, 0x5b, 0xbb, 0x66, 0xa3, 0xd6, - 0xdc, 0x6c, 0x36, 0xea, 0x8b, 0x33, 0x68, 0x15, 0x56, 0x86, 0x39, 0xed, 0x98, 0x8d, 0x56, 0xa3, - 0xbe, 0xa8, 0x8d, 0xb2, 0xd7, 0x3e, 0xd9, 0xd9, 0x6d, 0xd4, 0x17, 0x33, 0xe8, 0x26, 0xbc, 0x3a, - 0xcc, 0xfe, 0xb0, 0xb9, 0xb7, 0x55, 0xc7, 0x1b, 0x0f, 0x5b, 0x8b, 0x59, 0xf4, 0x1a, 0x7c, 0x6d, - 0x38, 0xc5, 0x46, 0x73, 0xbb, 0x51, 0x5f, 0xcc, 0xe9, 0x7f, 0xd5, 0x60, 0x51, 0x85, 0xbf, 0x4d, - 0x13, 0xc2, 0xda, 0x2a, 0xf4, 0x61, 0xaa, 0x03, 0xd3, 0xc6, 0xff, 0x19, 0x42, 0xe1, 0x53, 0x7d, - 0xda, 0x3d, 0xb5, 0xd1, 0x13, 0xfc, 0x9d, 0xe1, 0xc4, 0xee, 0xc9, 0x6d, 0x65, 0x21, 0x44, 0xf2, - 0xe8, 0xca, 0x63, 0x7f, 0x6e, 0x08, 0xea, 0x98, 0xe3, 0x3e, 0x8a, 0x5d, 0xc8, 0xd9, 0x4f, 0xc2, - 0xd6, 0x41, 0x82, 0x3e, 0x82, 0xa2, 0x0a, 0xcc, 0x72, 0x9d, 0x11, 0x69, 0x7b, 0x68, 0x48, 0x4d, - 0x07, 0x43, 0x38, 0x38, 0x66, 0x2f, 0xbb, 0x2a, 0xfd, 0xa9, 0x06, 0x25, 0x65, 0xd8, 0x09, 0xa9, - 0x7f, 0x09, 0x3b, 0xbd, 0x03, 0x8b, 0xae, 0xef, 0x26, 0x2e, 0xf1, 0xac, 0xfe, 0x86, 0x65, 0xa6, - 0xd8, 0xb0, 0xab, 0x12, 0xad, 0x26, 0xf4, 0xcf, 0x06, 0x97, 0xa6, 0xe6, 0x05, 0x31, 0xbd, 0xb4, - 0xed, 0xd3, 0x7f, 0x97, 0x3a, 0x6b, 0x0f, 0xdd, 0xa4, 0xed, 0x44, 0xe4, 0xe8, 0xf2, 0xc4, 0x21, - 0xb0, 0xa4, 0x36, 0x20, 0xfd, 0xee, 0xcf, 0x5c, 0xf0, 0xdd, 0x8f, 0x14, 0xd9, 0x60, 0x4e, 0xff, - 0xbd, 0x06, 0x4b, 0x7d, 0x09, 0xe8, 0x11, 0x89, 0x1c, 0xd1, 0x9e, 0x5d, 0xda, 0x1a, 0x2c, 0x40, - 0x11, 0xe7, 0xbd, 0x94, 0x25, 0x5c, 0x93, 0x5c, 0xa9, 0x15, 0xfc, 0x49, 0x83, 0x9c, 0x49, 0x92, - 0x36, 0xaa, 0xc9, 0x5a, 0x37, 0x41, 0xd5, 0x1c, 0xd2, 0x03, 0x89, 0x9a, 0xc7, 0x3a, 0xa1, 0x28, - 0xe8, 0xf2, 0xfb, 0x90, 0x9d, 0xa6, 0x13, 0xe2, 0x20, 0xb4, 0x21, 0xea, 0x42, 0xf6, 0x62, 0x75, - 0x9b, 0x61, 0xf5, 0x3f, 0x6b, 0x30, 0xcb, 0x0c, 0xfc, 0x8d, 0x11, 0x92, 0xa4, 0x3d, 0xc9, 0x1b, - 0x83, 0xad, 0x1f, 0x73, 0x6f, 0xb4, 0x05, 0x25, 0xde, 0x95, 0x59, 0x84, 0x97, 0xae, 0xe9, 0xea, - 0x5c, 0x91, 0x43, 0xc5, 0x80, 0xf5, 0xc5, 0xd4, 0x77, 0x14, 0xcf, 0x54, 0x85, 0x7a, 0x9e, 0xfa, - 0x8e, 0xf8, 0xa9, 0xdf, 0x17, 0xaf, 0x9c, 0x46, 0x8f, 0xda, 0x5d, 0x7e, 0xbb, 0xbf, 0x0d, 0x73, - 0xac, 0x09, 0xa2, 0xf1, 0xb2, 0xc6, 0xb7, 0xf8, 0xe6, 0xb8, 0xf2, 0x49, 0xb1, 0x04, 0xe8, 0x9f, - 0xc1, 0xf5, 0xd3, 0x97, 0x8d, 0x3f, 0xd8, 0xd3, 0x99, 0x55, 0xbb, 0x50, 0x66, 0xfd, 0x1e, 0xbc, - 0x32, 0xe4, 0x16, 0x5c, 0x0e, 0x79, 0xf5, 0x69, 0xe6, 0x0f, 0xcf, 0x57, 0xb5, 0x67, 0xcf, 0x57, - 0xb5, 0x7f, 0x3c, 0x5f, 0xd5, 0x7e, 0xf1, 0x62, 0x75, 0xe6, 0xd9, 0x8b, 0xd5, 0x99, 0xbf, 0xbd, - 0x58, 0x9d, 0x81, 0x55, 0x3b, 0xe8, 0x9c, 0xc3, 0x56, 0x2d, 0xd4, 0x69, 0xcf, 0x8c, 0x82, 0x24, - 0x30, 0xb5, 0xcf, 0xf1, 0x63, 0x37, 0x69, 0x77, 0xf7, 0xcb, 0x76, 0xd0, 0x59, 0xb3, 0x83, 0xb8, - 0x13, 0xc4, 0x6b, 0x11, 0xf5, 0xc8, 0x31, 0x8d, 0xd6, 0x0e, 0x8d, 0xfe, 0x4f, 0xbb, 0x4d, 0x5c, - 0x3f, 0x5e, 0x1b, 0xfd, 0xaf, 0x82, 0xbb, 0x0e, 0xed, 0xa9, 0xdf, 0xbf, 0xce, 0x64, 0xcd, 0x5a, - 0xfd, 0x37, 0x99, 0x15, 0x53, 0x85, 0x50, 0x63, 0x21, 0xd4, 0x69, 0xaf, 0xfc, 0x40, 0xba, 0xfc, - 0x71, 0x60, 0x7c, 0xc4, 0x8c, 0x8f, 0xea, 0xb4, 0xf7, 0x48, 0x19, 0x9f, 0x67, 0xde, 0x1c, 0x6d, - 0x7c, 0xf4, 0x91, 0x59, 0x55, 0xf5, 0xf7, 0x9f, 0x99, 0x57, 0x95, 0xe3, 0xfa, 0x3a, 0xf3, 0x5c, - 0x5f, 0xaf, 0xd3, 0xde, 0xfa, 0xba, 0xf2, 0xdd, 0x9f, 0xe3, 0xff, 0x74, 0x78, 0xe7, 0x7f, 0x01, - 0x00, 0x00, 0xff, 0xff, 0xf2, 0x22, 0xe2, 0x77, 0xe4, 0x18, 0x00, 0x00, + 0x15, 0xcf, 0x8c, 0x9d, 0xc4, 0x39, 0x76, 0x76, 0xb3, 0x37, 0x15, 0x44, 0x41, 0x4d, 0x77, 0x87, + 0xfe, 0x59, 0x5a, 0xe4, 0xd4, 0xd3, 0x22, 0x95, 0x2c, 0xed, 0x36, 0xfe, 0x93, 0xc6, 0xdb, 0xc6, + 0x71, 0x27, 0xe9, 0x2e, 0x2a, 0x2b, 0x46, 0x37, 0x33, 0x37, 0xeb, 0x11, 0xe3, 0x99, 0xd9, 0x99, + 0xeb, 0xc4, 0x79, 0x42, 0x42, 0x20, 0x9e, 0x2a, 0xe8, 0x07, 0x40, 0x68, 0x79, 0xe4, 0x33, 0x20, + 0x78, 0x45, 0x08, 0xa4, 0xbe, 0x2d, 0x4f, 0x08, 0xed, 0x3e, 0x20, 0xf1, 0x01, 0x10, 0x0f, 0x3c, + 0xa0, 0xfb, 0xcf, 0x1e, 0x27, 0x4e, 0xec, 0xc9, 0x86, 0x17, 0xde, 0x7c, 0xe7, 0x9e, 0xdf, 0x6f, + 0x7e, 0xf7, 0x9e, 0x73, 0xcf, 0x39, 0x77, 0x0c, 0xaf, 0x46, 0x24, 0xe8, 0x75, 0x0f, 0x62, 0xbc, + 0xee, 0x84, 0x31, 0x59, 0x77, 0x49, 0x7f, 0xfd, 0xa8, 0x82, 0xfd, 0xa8, 0x83, 0x2b, 0x6c, 0x50, + 0x8e, 0xe2, 0x90, 0x86, 0x68, 0x55, 0x59, 0x95, 0x99, 0x55, 0x99, 0x4d, 0x28, 0xab, 0xd5, 0x37, + 0x47, 0x19, 0x9c, 0xf8, 0x24, 0xa2, 0xe1, 0x90, 0x44, 0x8c, 0x05, 0x8f, 0xf1, 0x13, 0x0d, 0xf2, + 0x7b, 0xc7, 0x38, 0x42, 0x1f, 0xc2, 0x6c, 0x14, 0x87, 0xe1, 0xe1, 0x8a, 0x76, 0x53, 0xbb, 0x5d, + 0x34, 0xdf, 0x2c, 0x8f, 0xbe, 0x40, 0x82, 0x14, 0x49, 0xf9, 0xf3, 0x8f, 0x19, 0xaa, 0xcd, 0x10, + 0x96, 0x00, 0xa2, 0xf7, 0x20, 0x7f, 0x10, 0xba, 0x27, 0x2b, 0x79, 0x4e, 0xf0, 0x6a, 0xf9, 0x7c, + 0x85, 0x65, 0x86, 0xad, 0x86, 0xee, 0x89, 0xc5, 0x11, 0xc6, 0xcf, 0x35, 0x58, 0x60, 0x8f, 0x6a, + 0x3e, 0xf6, 0xba, 0xe8, 0xa5, 0xb4, 0x92, 0x92, 0x62, 0x7f, 0x5f, 0xb2, 0xeb, 0x9c, 0xfd, 0x5b, + 0x93, 0xd8, 0x39, 0xd5, 0xf0, 0x15, 0xe8, 0x35, 0xb8, 0x46, 0xa2, 0xd0, 0xe9, 0xd8, 0x6e, 0x2f, + 0xc6, 0xd4, 0x0b, 0x83, 0x95, 0xf9, 0x9b, 0xda, 0xed, 0xbc, 0xb5, 0xc8, 0x9f, 0xd6, 0xe5, 0x43, + 0xe3, 0xd7, 0x39, 0x58, 0x1c, 0x81, 0xa3, 0x2d, 0x58, 0x08, 0x7a, 0xbe, 0xef, 0x1d, 0x7a, 0x24, + 0x96, 0x7b, 0x73, 0x7b, 0xc2, 0xde, 0xb4, 0x94, 0xbd, 0x35, 0x84, 0xa2, 0x77, 0x21, 0x77, 0x48, + 0x88, 0x94, 0x6f, 0x4c, 0x60, 0xd8, 0x22, 0xc4, 0x62, 0xe6, 0xe8, 0x87, 0xb0, 0x1c, 0xf6, 0x68, + 0xd4, 0xa3, 0x76, 0xc5, 0x76, 0xc2, 0x6e, 0xd7, 0xa3, 0x5d, 0x12, 0xd0, 0x95, 0x1c, 0x67, 0x29, + 0x4f, 0x60, 0xd9, 0xa3, 0x98, 0x92, 0xda, 0x00, 0x65, 0xdd, 0x10, 0x54, 0x95, 0xe1, 0xa3, 0x14, + 0xbf, 0x99, 0xe6, 0xcf, 0xbf, 0x08, 0xbf, 0x99, 0xe2, 0x6f, 0x43, 0x51, 0xf2, 0xbb, 0x98, 0xe2, + 0x95, 0x39, 0xce, 0xbb, 0x7e, 0x91, 0xf3, 0xaa, 0x98, 0x3a, 0x1d, 0xe6, 0x82, 0x5d, 0x8e, 0xab, + 0x63, 0x8a, 0x2d, 0x08, 0x07, 0xbf, 0x8d, 0x7f, 0xeb, 0x50, 0x50, 0xe1, 0x83, 0xee, 0x41, 0x89, + 0xc6, 0xd8, 0xf5, 0x82, 0x47, 0x76, 0x84, 0x3d, 0xe5, 0x9f, 0x37, 0x2e, 0xe2, 0xdf, 0x17, 0xf6, + 0x6d, 0xec, 0xc5, 0x56, 0x91, 0x0e, 0x07, 0x68, 0x13, 0x16, 0x5c, 0xe2, 0x53, 0x6c, 0x57, 0x6c, + 0x4f, 0xba, 0xe9, 0xb5, 0x09, 0x1b, 0xb0, 0xd9, 0x0d, 0x7b, 0x01, 0xb5, 0xe6, 0x39, 0xae, 0xd2, + 0x1c, 0x52, 0x98, 0xb6, 0x27, 0x7d, 0x94, 0x89, 0xc2, 0x6c, 0xa2, 0x07, 0x70, 0xed, 0x90, 0x90, + 0xb3, 0xbe, 0x78, 0x7b, 0x02, 0x4f, 0x15, 0xfb, 0x38, 0x70, 0xd2, 0xde, 0x58, 0x3c, 0x24, 0xa9, + 0x21, 0xda, 0x84, 0xf9, 0x08, 0x9f, 0xf8, 0x21, 0x76, 0x57, 0x66, 0x27, 0xef, 0x12, 0x3f, 0xdc, + 0xc2, 0xdc, 0x52, 0x38, 0xe3, 0xa7, 0x1a, 0x14, 0x53, 0x13, 0xa8, 0x05, 0x90, 0xd2, 0xa9, 0x5d, + 0x2a, 0x66, 0x52, 0x0c, 0xfc, 0x8c, 0x06, 0x1c, 0x40, 0x5c, 0x3b, 0x39, 0xc6, 0x11, 0x77, 0x43, + 0xc9, 0x5a, 0x1c, 0x3c, 0x65, 0x6f, 0x37, 0x7e, 0x26, 0xcf, 0x68, 0xdb, 0xc7, 0x5e, 0x40, 0x49, + 0x9f, 0xfe, 0x1f, 0x86, 0xc1, 0x5d, 0x58, 0x70, 0x58, 0x0a, 0xb2, 0x59, 0xce, 0xc8, 0x4f, 0x9d, + 0x33, 0x0a, 0x1c, 0xb4, 0x45, 0x08, 0xfa, 0x18, 0x16, 0x05, 0x01, 0x76, 0xdd, 0x98, 0x24, 0x89, + 0x74, 0xfa, 0xeb, 0x93, 0x74, 0x08, 0x6b, 0xab, 0xc4, 0xc1, 0x72, 0xc4, 0x32, 0x72, 0x9c, 0x10, + 0xe2, 0xf2, 0xf3, 0x5b, 0xb2, 0xc4, 0xc0, 0xf8, 0x14, 0xd0, 0x4e, 0xe8, 0xfc, 0x68, 0xcb, 0x0f, + 0x8f, 0x6b, 0x5e, 0xd4, 0x21, 0x31, 0xf7, 0xc5, 0x1d, 0x98, 0x3d, 0xc2, 0x7e, 0x8f, 0x48, 0x27, + 0x4c, 0xb9, 0x70, 0x81, 0x31, 0x7e, 0x2c, 0xce, 0x76, 0xdb, 0xc7, 0x01, 0x6a, 0xc3, 0x35, 0x16, + 0x03, 0x76, 0xa4, 0xdc, 0x2c, 0x19, 0x27, 0xa6, 0xfe, 0x41, 0x5c, 0x58, 0x8b, 0xc9, 0x48, 0x98, + 0xdc, 0x82, 0x12, 0x3b, 0x5b, 0x07, 0xbe, 0x17, 0x30, 0x77, 0xcb, 0xe8, 0x2a, 0x1e, 0x12, 0x52, + 0x95, 0x8f, 0x8c, 0x7f, 0x69, 0xa9, 0xfc, 0xff, 0x3f, 0x92, 0xb1, 0x0a, 0x85, 0x28, 0x4c, 0x3c, + 0x5e, 0x84, 0x74, 0x5e, 0x84, 0x06, 0xe3, 0xd3, 0xf9, 0x32, 0xf7, 0xc2, 0xf9, 0x72, 0x4c, 0xe1, + 0xcb, 0x8f, 0x2b, 0x7c, 0xff, 0x91, 0x69, 0xf5, 0xbe, 0x47, 0x8e, 0xd1, 0x36, 0xcc, 0x1f, 0x79, + 0x89, 0x77, 0xe0, 0x2b, 0x2f, 0x7e, 0x7b, 0xd2, 0x62, 0x19, 0xac, 0x7c, 0x5f, 0x60, 0xb6, 0x67, + 0x2c, 0x05, 0x47, 0x0d, 0x98, 0x0b, 0x23, 0xfc, 0xb8, 0xa7, 0x0a, 0xdf, 0x5b, 0x53, 0x11, 0xed, + 0x72, 0xc8, 0xf6, 0x8c, 0x25, 0xc1, 0xab, 0x5f, 0x6a, 0x30, 0x2f, 0xd9, 0xd1, 0xbb, 0x90, 0xe7, + 0xb9, 0x41, 0x28, 0xbb, 0x39, 0x89, 0xd0, 0xe2, 0xd6, 0x63, 0xdc, 0x98, 0x7b, 0x31, 0x37, 0xae, + 0x7e, 0x00, 0x73, 0x42, 0xe7, 0xe5, 0x14, 0x55, 0x8b, 0xb0, 0xc0, 0x15, 0x1d, 0x79, 0xe4, 0xd8, + 0xf8, 0x47, 0xba, 0xef, 0xe0, 0x3e, 0xd8, 0x39, 0xed, 0x83, 0xca, 0x54, 0x2d, 0xcf, 0x79, 0x8e, + 0xb8, 0x77, 0xca, 0x11, 0x6f, 0x4f, 0xcf, 0x76, 0xc6, 0x1b, 0x4f, 0x53, 0xde, 0xa8, 0x03, 0xf0, + 0x55, 0xf0, 0x7c, 0x71, 0xce, 0x99, 0x1f, 0xcf, 0x6d, 0xf1, 0xe5, 0x8b, 0x96, 0xaf, 0x0a, 0x05, + 0xd5, 0xe6, 0x48, 0x7d, 0x6f, 0x4c, 0xea, 0xb1, 0x42, 0x4a, 0x98, 0x3a, 0x6b, 0x5e, 0x36, 0x35, + 0x29, 0x0e, 0x53, 0xfa, 0x36, 0x2b, 0x87, 0xb9, 0xda, 0x1a, 0xf8, 0xf4, 0x4a, 0xd6, 0x55, 0xbd, + 0x01, 0xd7, 0x87, 0x2c, 0xc2, 0xd3, 0xbf, 0xd0, 0xa0, 0x98, 0x2a, 0x3e, 0xe8, 0x2e, 0xcc, 0xe3, + 0x24, 0x21, 0x6c, 0xe5, 0xda, 0x74, 0x29, 0x9a, 0x59, 0x37, 0x5d, 0x6b, 0x8e, 0xc3, 0x2a, 0x43, + 0x02, 0x53, 0x6e, 0x5d, 0x36, 0x02, 0xd3, 0xf8, 0x42, 0x83, 0xe5, 0xba, 0x17, 0x13, 0x87, 0x12, + 0x37, 0xad, 0xec, 0x7b, 0x30, 0x9b, 0x50, 0x1c, 0xd3, 0x8c, 0xba, 0x04, 0x08, 0xbd, 0x07, 0x39, + 0x12, 0xb8, 0x19, 0x25, 0x31, 0x88, 0xf1, 0x45, 0x1e, 0x96, 0xc7, 0x64, 0x35, 0xf4, 0x01, 0xcc, + 0xcb, 0xca, 0x9c, 0xad, 0xb6, 0xcc, 0x89, 0xba, 0x3c, 0xc4, 0x9b, 0xd9, 0xea, 0xba, 0xc0, 0x9b, + 0xa8, 0x06, 0xe0, 0xe3, 0xee, 0x81, 0xcb, 0x5a, 0x83, 0x4a, 0xb6, 0xba, 0x5e, 0x10, 0xc0, 0x4a, + 0x25, 0x45, 0x62, 0xda, 0x15, 0x59, 0xd9, 0xb3, 0x91, 0x98, 0x95, 0x11, 0x25, 0xa6, 0xac, 0xec, + 0x19, 0x95, 0x98, 0x23, 0x4a, 0x4c, 0xd9, 0x99, 0x67, 0x54, 0x62, 0xa2, 0xaf, 0xc1, 0x5c, 0x87, + 0x78, 0x8f, 0x3a, 0x54, 0x5e, 0xa7, 0xe4, 0xe8, 0x4c, 0x47, 0x56, 0xb8, 0x7c, 0x47, 0x66, 0xfc, + 0x4a, 0x83, 0xeb, 0x72, 0x72, 0xab, 0x17, 0x38, 0xbc, 0x4e, 0xee, 0xc0, 0x82, 0x13, 0x76, 0xa3, + 0x30, 0x18, 0x76, 0x9e, 0x13, 0xaa, 0x64, 0x4c, 0x4e, 0x71, 0x58, 0x43, 0x06, 0x74, 0x07, 0xf2, + 0x5c, 0xa6, 0x9e, 0x4d, 0x26, 0x07, 0x19, 0x5f, 0x6a, 0x2c, 0x5e, 0xcf, 0xf0, 0xa3, 0x25, 0x71, + 0xe3, 0x63, 0xea, 0x16, 0xc5, 0x6d, 0xee, 0x1d, 0xd0, 0xa2, 0x6c, 0xb1, 0xa7, 0x45, 0x0c, 0xf4, + 0x38, 0x5b, 0xb4, 0x69, 0x8f, 0x8d, 0x3e, 0x14, 0x2c, 0x92, 0x90, 0xf8, 0x88, 0x24, 0xe8, 0x3b, + 0xa0, 0xc7, 0x19, 0x8f, 0x8c, 0x1e, 0x57, 0x38, 0x2c, 0xe3, 0x49, 0xd1, 0x63, 0xd3, 0xb0, 0xa1, + 0xd0, 0x56, 0xdd, 0xcc, 0xfb, 0x90, 0x8b, 0x3a, 0x9e, 0x7c, 0xf5, 0x5b, 0x53, 0xec, 0xea, 0xc0, + 0x37, 0x0c, 0xc7, 0xda, 0xce, 0x20, 0x0c, 0x1c, 0x22, 0x1b, 0x35, 0x31, 0x30, 0x0c, 0x00, 0xf5, + 0x82, 0xa6, 0xcb, 0x6c, 0xbc, 0x20, 0x90, 0x57, 0xf3, 0x92, 0x25, 0x06, 0xc6, 0x13, 0x1d, 0x16, + 0x95, 0x11, 0xbf, 0x71, 0xa0, 0x4f, 0x79, 0x32, 0xa3, 0xc2, 0x1d, 0xd7, 0xcc, 0x3b, 0x17, 0x89, + 0x19, 0x41, 0x8e, 0x8e, 0x1a, 0x41, 0xaf, 0x6b, 0x09, 0x26, 0xe3, 0x77, 0x1a, 0xdc, 0x38, 0x33, + 0x89, 0xbe, 0x09, 0xaf, 0xb4, 0x77, 0xf7, 0x9a, 0xfb, 0xcd, 0xdd, 0x96, 0xbd, 0xb7, 0xbf, 0xb9, + 0xdf, 0xb0, 0x1b, 0xad, 0xcf, 0x76, 0xec, 0xcf, 0x5a, 0x7b, 0xed, 0x46, 0xad, 0xb9, 0xd5, 0x6c, + 0xd4, 0x97, 0x66, 0xd0, 0x1a, 0xac, 0x8e, 0x33, 0xda, 0x6d, 0x37, 0x5a, 0x8d, 0xfa, 0x92, 0x76, + 0xde, 0x7c, 0xed, 0x93, 0xdd, 0xbd, 0x46, 0x7d, 0x49, 0x47, 0xb7, 0xe0, 0xe5, 0x71, 0xf3, 0x0f, + 0x9a, 0xfb, 0xdb, 0x75, 0x6b, 0xf3, 0x41, 0x6b, 0x29, 0x87, 0x5e, 0x81, 0x6f, 0x8c, 0xa7, 0xd8, + 0x6c, 0xee, 0x34, 0xea, 0x4b, 0x79, 0xe3, 0xa9, 0x06, 0x4b, 0x4a, 0xfe, 0x0e, 0xa1, 0x98, 0x35, + 0x9c, 0xe8, 0xc3, 0x54, 0x6f, 0xaa, 0x4d, 0xfe, 0x8e, 0xa3, 0xf0, 0xa9, 0x0e, 0xf6, 0xae, 0xda, + 0xe8, 0x29, 0x3e, 0xd4, 0x8c, 0xec, 0x9e, 0xdc, 0x56, 0x26, 0x21, 0x96, 0xa1, 0x2b, 0xc3, 0xfe, + 0x42, 0x09, 0x2a, 0xcc, 0xad, 0x01, 0x8a, 0x1d, 0xc8, 0xd9, 0x4f, 0xa2, 0xd6, 0x21, 0x45, 0x1f, + 0x41, 0x51, 0x09, 0xb3, 0x3d, 0xf7, 0x9c, 0x42, 0x36, 0x56, 0x52, 0xd3, 0xb5, 0x20, 0x1a, 0x86, + 0xd9, 0x8b, 0xae, 0xca, 0x78, 0xa2, 0x41, 0x49, 0x4d, 0xec, 0x46, 0x24, 0xb8, 0x82, 0x9d, 0xde, + 0x85, 0x25, 0x2f, 0xf0, 0xa8, 0x87, 0x7d, 0x7b, 0xb0, 0x61, 0x7a, 0x86, 0x0d, 0xbb, 0x2e, 0xd1, + 0xea, 0x81, 0xf1, 0xfd, 0xe1, 0xa1, 0xa9, 0xf9, 0x61, 0x42, 0xae, 0x6c, 0xfb, 0x8c, 0xdf, 0xa7, + 0x62, 0xed, 0x81, 0x47, 0x3b, 0x6e, 0x8c, 0x8f, 0xaf, 0xce, 0x39, 0x18, 0x96, 0xd5, 0x06, 0xa4, + 0x3f, 0x9c, 0xe8, 0x97, 0xfc, 0x70, 0x82, 0x14, 0xd9, 0xf0, 0x99, 0xf1, 0x07, 0x0d, 0x96, 0x07, + 0x2e, 0x20, 0xc7, 0x38, 0x76, 0x45, 0xe3, 0x7a, 0x65, 0x6b, 0xb0, 0x01, 0xc5, 0x9c, 0xf7, 0x4a, + 0x96, 0x70, 0x43, 0x72, 0xa5, 0x56, 0xf0, 0x67, 0x0d, 0xf2, 0x6d, 0x4c, 0x3b, 0xa8, 0x26, 0x6b, + 0xdd, 0x14, 0x55, 0x73, 0x4c, 0x57, 0x28, 0x6a, 0x1e, 0xeb, 0x0d, 0xe3, 0xb0, 0xc7, 0xcf, 0x43, + 0x2e, 0x4b, 0x6f, 0xc8, 0x41, 0x68, 0x53, 0xd4, 0x85, 0xdc, 0xe5, 0xea, 0x36, 0xc3, 0x1a, 0x7f, + 0xd1, 0x60, 0x96, 0x4d, 0xf0, 0xdb, 0x57, 0x84, 0x69, 0x67, 0x9a, 0xdb, 0x17, 0x5b, 0xbf, 0xc5, + 0xad, 0xd1, 0x36, 0x94, 0x78, 0x9f, 0x6a, 0x63, 0x5e, 0xba, 0xb2, 0xd5, 0xb9, 0x22, 0x87, 0x8a, + 0x01, 0xbb, 0x29, 0x90, 0xc0, 0x55, 0x3c, 0x99, 0x0a, 0xf5, 0x02, 0x09, 0x5c, 0xf1, 0xd3, 0xb8, + 0x27, 0xee, 0x7f, 0x8d, 0x3e, 0x71, 0x7a, 0xfc, 0x74, 0x7f, 0x17, 0xe6, 0x58, 0x13, 0x44, 0x92, + 0x15, 0x8d, 0x6f, 0xf1, 0xad, 0x49, 0xe5, 0x93, 0x58, 0x12, 0x60, 0xfc, 0x4d, 0x83, 0x97, 0x4e, + 0x9f, 0x36, 0xfe, 0x2d, 0x23, 0x9d, 0x5a, 0xb5, 0xcb, 0xa4, 0xd6, 0xd3, 0xf1, 0xae, 0x5f, 0x3a, + 0xde, 0x55, 0xc7, 0x95, 0xbb, 0x4c, 0xc7, 0xf5, 0x03, 0xf8, 0xfa, 0x98, 0xc3, 0x78, 0x35, 0x4b, + 0xac, 0x3e, 0xd1, 0xff, 0xf8, 0x6c, 0x4d, 0xfb, 0xea, 0xd9, 0x9a, 0xf6, 0xf7, 0x67, 0x6b, 0xda, + 0x2f, 0x9f, 0xaf, 0xcd, 0x7c, 0xf5, 0x7c, 0x6d, 0xe6, 0xaf, 0xcf, 0xd7, 0x66, 0x60, 0xcd, 0x09, + 0xbb, 0x17, 0xb0, 0x55, 0x0b, 0x75, 0xd2, 0x6f, 0xc7, 0x21, 0x0d, 0xdb, 0xda, 0xe7, 0xd6, 0x23, + 0x8f, 0x76, 0x7a, 0x07, 0x65, 0x27, 0xec, 0xae, 0x3b, 0x61, 0xd2, 0x0d, 0x93, 0xf5, 0x98, 0xf8, + 0xf8, 0x84, 0xc4, 0xeb, 0x47, 0xe6, 0xe0, 0xa7, 0xd3, 0xc1, 0x5e, 0x90, 0xac, 0x9f, 0xff, 0x97, + 0xcf, 0x1d, 0x97, 0xf4, 0xd5, 0xef, 0xdf, 0xe8, 0xb9, 0x76, 0xad, 0xfe, 0x5b, 0x7d, 0xb5, 0xad, + 0x24, 0xd4, 0x98, 0x84, 0x3a, 0xe9, 0x97, 0xef, 0x4b, 0x93, 0x3f, 0x0d, 0x27, 0x1f, 0xb2, 0xc9, + 0x87, 0x75, 0xd2, 0x7f, 0xa8, 0x26, 0x9f, 0xe9, 0xaf, 0x9f, 0x3f, 0xf9, 0xf0, 0xa3, 0x76, 0x55, + 0xb5, 0x01, 0xff, 0xd4, 0x5f, 0x56, 0x86, 0x1b, 0x1b, 0xcc, 0x72, 0x63, 0xa3, 0x4e, 0xfa, 0x1b, + 0x1b, 0xca, 0xf6, 0x60, 0x8e, 0xff, 0x79, 0xf4, 0xce, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x09, + 0x70, 0x9d, 0x73, 0xac, 0x1a, 0x00, 0x00, } func (m *Swap) Marshal() (dAtA []byte, err error) { @@ -2784,10 +2811,17 @@ func (m *MockFlowCiphertext) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.Value != 0 { - i = encodeVarintDex(dAtA, i, uint64(m.Value)) + if m.Value != nil { + { + size, err := m.Value.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintDex(dAtA, i, uint64(size)) + } i-- - dAtA[i] = 0x8 + dAtA[i] = 0xa } return len(dAtA) - i, nil } @@ -3339,42 +3373,84 @@ func (m *BatchSwapOutputData) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintDex(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x3a + dAtA[i] = 0x42 } if m.Height != 0 { i = encodeVarintDex(dAtA, i, uint64(m.Height)) i-- - dAtA[i] = 0x30 + dAtA[i] = 0x38 } - if m.Success { + if m.Lambda_2_2 != nil { + { + size, err := m.Lambda_2_2.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintDex(dAtA, i, uint64(size)) + } i-- - if m.Success { - dAtA[i] = 1 - } else { - dAtA[i] = 0 + dAtA[i] = 0x32 + } + if m.Lambda_1_2 != nil { + { + size, err := m.Lambda_1_2.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintDex(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x28 + dAtA[i] = 0x2a } - if m.Lambda_2 != 0 { - i = encodeVarintDex(dAtA, i, uint64(m.Lambda_2)) + if m.Lambda_2_1 != nil { + { + size, err := m.Lambda_2_1.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintDex(dAtA, i, uint64(size)) + } i-- - dAtA[i] = 0x20 + dAtA[i] = 0x22 } - if m.Lambda_1 != 0 { - i = encodeVarintDex(dAtA, i, uint64(m.Lambda_1)) + if m.Lambda_1_1 != nil { + { + size, err := m.Lambda_1_1.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintDex(dAtA, i, uint64(size)) + } i-- - dAtA[i] = 0x18 + dAtA[i] = 0x1a } - if m.Delta_2 != 0 { - i = encodeVarintDex(dAtA, i, uint64(m.Delta_2)) + if m.Delta_2 != nil { + { + size, err := m.Delta_2.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintDex(dAtA, i, uint64(size)) + } i-- - dAtA[i] = 0x10 + dAtA[i] = 0x12 } - if m.Delta_1 != 0 { - i = encodeVarintDex(dAtA, i, uint64(m.Delta_1)) + if m.Delta_1 != nil { + { + size, err := m.Delta_1.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintDex(dAtA, i, uint64(size)) + } i-- - dAtA[i] = 0x8 + dAtA[i] = 0xa } return len(dAtA) - i, nil } @@ -4084,6 +4160,30 @@ func (m *PositionWithdrawPlan) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.Pair != nil { + { + size, err := m.Pair.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintDex(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + } + if m.PositionId != nil { + { + size, err := m.PositionId.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintDex(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } if m.Reserves != nil { { size, err := m.Reserves.MarshalToSizedBuffer(dAtA[:i]) @@ -4296,8 +4396,9 @@ func (m *MockFlowCiphertext) Size() (n int) { } var l int _ = l - if m.Value != 0 { - n += 1 + sovDex(uint64(m.Value)) + if m.Value != nil { + l = m.Value.Size() + n += 1 + l + sovDex(uint64(l)) } return n } @@ -4518,20 +4619,29 @@ func (m *BatchSwapOutputData) Size() (n int) { } var l int _ = l - if m.Delta_1 != 0 { - n += 1 + sovDex(uint64(m.Delta_1)) + if m.Delta_1 != nil { + l = m.Delta_1.Size() + n += 1 + l + sovDex(uint64(l)) } - if m.Delta_2 != 0 { - n += 1 + sovDex(uint64(m.Delta_2)) + if m.Delta_2 != nil { + l = m.Delta_2.Size() + n += 1 + l + sovDex(uint64(l)) } - if m.Lambda_1 != 0 { - n += 1 + sovDex(uint64(m.Lambda_1)) + if m.Lambda_1_1 != nil { + l = m.Lambda_1_1.Size() + n += 1 + l + sovDex(uint64(l)) } - if m.Lambda_2 != 0 { - n += 1 + sovDex(uint64(m.Lambda_2)) + if m.Lambda_2_1 != nil { + l = m.Lambda_2_1.Size() + n += 1 + l + sovDex(uint64(l)) } - if m.Success { - n += 2 + if m.Lambda_1_2 != nil { + l = m.Lambda_1_2.Size() + n += 1 + l + sovDex(uint64(l)) + } + if m.Lambda_2_2 != nil { + l = m.Lambda_2_2.Size() + n += 1 + l + sovDex(uint64(l)) } if m.Height != 0 { n += 1 + sovDex(uint64(m.Height)) @@ -4810,6 +4920,14 @@ func (m *PositionWithdrawPlan) Size() (n int) { l = m.Reserves.Size() n += 1 + l + sovDex(uint64(l)) } + if m.PositionId != nil { + l = m.PositionId.Size() + n += 1 + l + sovDex(uint64(l)) + } + if m.Pair != nil { + l = m.Pair.Size() + n += 1 + l + sovDex(uint64(l)) + } return n } @@ -5967,10 +6085,10 @@ func (m *MockFlowCiphertext) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: - if wireType != 0 { + if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Value", wireType) } - m.Value = 0 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowDex @@ -5980,11 +6098,28 @@ func (m *MockFlowCiphertext) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Value |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } + if msglen < 0 { + return ErrInvalidLengthDex + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDex + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Value == nil { + m.Value = &v1alpha1.Amount{} + } + if err := m.Value.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipDex(dAtA[iNdEx:]) @@ -6829,7 +6964,7 @@ func (m *SwapClaimView_Visible) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Output_1 == nil { - m.Output_1 = &v1alpha1.Note{} + m.Output_1 = &v1alpha1.NoteView{} } if err := m.Output_1.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -6865,7 +7000,7 @@ func (m *SwapClaimView_Visible) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Output_2 == nil { - m.Output_2 = &v1alpha1.Note{} + m.Output_2 = &v1alpha1.NoteView{} } if err := m.Output_2.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -7252,10 +7387,10 @@ func (m *BatchSwapOutputData) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: - if wireType != 0 { + if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Delta_1", wireType) } - m.Delta_1 = 0 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowDex @@ -7265,16 +7400,33 @@ func (m *BatchSwapOutputData) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Delta_1 |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } + if msglen < 0 { + return ErrInvalidLengthDex + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDex + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Delta_1 == nil { + m.Delta_1 = &v1alpha1.Amount{} + } + if err := m.Delta_1.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex case 2: - if wireType != 0 { + if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Delta_2", wireType) } - m.Delta_2 = 0 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowDex @@ -7284,16 +7436,33 @@ func (m *BatchSwapOutputData) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Delta_2 |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } + if msglen < 0 { + return ErrInvalidLengthDex + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDex + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Delta_2 == nil { + m.Delta_2 = &v1alpha1.Amount{} + } + if err := m.Delta_2.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Lambda_1", wireType) + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Lambda_1_1", wireType) } - m.Lambda_1 = 0 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowDex @@ -7303,16 +7472,33 @@ func (m *BatchSwapOutputData) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Lambda_1 |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } + if msglen < 0 { + return ErrInvalidLengthDex + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDex + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Lambda_1_1 == nil { + m.Lambda_1_1 = &v1alpha1.Amount{} + } + if err := m.Lambda_1_1.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Lambda_2", wireType) + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Lambda_2_1", wireType) } - m.Lambda_2 = 0 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowDex @@ -7322,16 +7508,33 @@ func (m *BatchSwapOutputData) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Lambda_2 |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } + if msglen < 0 { + return ErrInvalidLengthDex + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDex + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Lambda_2_1 == nil { + m.Lambda_2_1 = &v1alpha1.Amount{} + } + if err := m.Lambda_2_1.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex case 5: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Success", wireType) + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Lambda_1_2", wireType) } - var v int + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowDex @@ -7341,13 +7544,65 @@ func (m *BatchSwapOutputData) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= int(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - m.Success = bool(v != 0) + if msglen < 0 { + return ErrInvalidLengthDex + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDex + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Lambda_1_2 == nil { + m.Lambda_1_2 = &v1alpha1.Amount{} + } + if err := m.Lambda_1_2.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Lambda_2_2", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDex + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthDex + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDex + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Lambda_2_2 == nil { + m.Lambda_2_2 = &v1alpha1.Amount{} + } + if err := m.Lambda_2_2.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 7: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) } @@ -7366,7 +7621,7 @@ func (m *BatchSwapOutputData) Unmarshal(dAtA []byte) error { break } } - case 7: + case 8: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field TradingPair", wireType) } @@ -9276,6 +9531,78 @@ func (m *PositionWithdrawPlan) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PositionId", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDex + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthDex + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDex + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.PositionId == nil { + m.PositionId = &PositionId{} + } + if err := m.PositionId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Pair", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDex + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthDex + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDex + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Pair == nil { + m.Pair = &TradingPair{} + } + if err := m.Pair.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipDex(dAtA[iNdEx:]) diff --git a/relayer/chains/penumbra/core/stake/v1alpha1/stake.pb.go b/relayer/chains/penumbra/core/stake/v1alpha1/stake.pb.go index d25bee345..2dab3ab79 100644 --- a/relayer/chains/penumbra/core/stake/v1alpha1/stake.pb.go +++ b/relayer/chains/penumbra/core/stake/v1alpha1/stake.pb.go @@ -974,16 +974,14 @@ type Undelegate struct { ValidatorIdentity *v1alpha1.IdentityKey `protobuf:"bytes,1,opt,name=validator_identity,json=validatorIdentity,proto3" json:"validator_identity,omitempty"` // The index of the epoch in which this undelegation was performed. StartEpochIndex uint64 `protobuf:"varint,2,opt,name=start_epoch_index,json=startEpochIndex,proto3" json:"start_epoch_index,omitempty"` - // The index of the epoch in which unbonding should complete. - EndEpochIndex uint64 `protobuf:"varint,3,opt,name=end_epoch_index,json=endEpochIndex,proto3" json:"end_epoch_index,omitempty"` // The amount to undelegate, in units of unbonding tokens. - UnbondedAmount *v1alpha1.Amount `protobuf:"bytes,4,opt,name=unbonded_amount,json=unbondedAmount,proto3" json:"unbonded_amount,omitempty"` + UnbondedAmount *v1alpha1.Amount `protobuf:"bytes,3,opt,name=unbonded_amount,json=unbondedAmount,proto3" json:"unbonded_amount,omitempty"` // The amount of delegation tokens consumed by this action. // // This is implied by the validator's exchange rate in the specified epoch // (and should be checked in transaction validation!), but including it allows // stateless verification that the transaction is internally consistent. - DelegationAmount *v1alpha1.Amount `protobuf:"bytes,5,opt,name=delegation_amount,json=delegationAmount,proto3" json:"delegation_amount,omitempty"` + DelegationAmount *v1alpha1.Amount `protobuf:"bytes,4,opt,name=delegation_amount,json=delegationAmount,proto3" json:"delegation_amount,omitempty"` } func (m *Undelegate) Reset() { *m = Undelegate{} } @@ -1033,13 +1031,6 @@ func (m *Undelegate) GetStartEpochIndex() uint64 { return 0 } -func (m *Undelegate) GetEndEpochIndex() uint64 { - if m != nil { - return m.EndEpochIndex - } - return 0 -} - func (m *Undelegate) GetUnbondedAmount() *v1alpha1.Amount { if m != nil { return m.UnbondedAmount @@ -1113,13 +1104,11 @@ type UndelegateClaimBody struct { ValidatorIdentity *v1alpha1.IdentityKey `protobuf:"bytes,1,opt,name=validator_identity,json=validatorIdentity,proto3" json:"validator_identity,omitempty"` // The epoch in which unbonding began, used to verify the penalty. StartEpochIndex uint64 `protobuf:"varint,2,opt,name=start_epoch_index,json=startEpochIndex,proto3" json:"start_epoch_index,omitempty"` - // The epoch in which unbonding finished, used to verify the penalty. - EndEpochIndex uint64 `protobuf:"varint,3,opt,name=end_epoch_index,json=endEpochIndex,proto3" json:"end_epoch_index,omitempty"` // The penalty applied to undelegation, in bps^2 (10e-8). // In the happy path (no slashing), this is 0. - Penalty *Penalty `protobuf:"bytes,4,opt,name=penalty,proto3" json:"penalty,omitempty"` + Penalty *Penalty `protobuf:"bytes,3,opt,name=penalty,proto3" json:"penalty,omitempty"` // The action's contribution to the transaction's value balance. - BalanceCommitment *v1alpha1.BalanceCommitment `protobuf:"bytes,5,opt,name=balance_commitment,json=balanceCommitment,proto3" json:"balance_commitment,omitempty"` + BalanceCommitment *v1alpha1.BalanceCommitment `protobuf:"bytes,4,opt,name=balance_commitment,json=balanceCommitment,proto3" json:"balance_commitment,omitempty"` } func (m *UndelegateClaimBody) Reset() { *m = UndelegateClaimBody{} } @@ -1169,13 +1158,6 @@ func (m *UndelegateClaimBody) GetStartEpochIndex() uint64 { return 0 } -func (m *UndelegateClaimBody) GetEndEpochIndex() uint64 { - if m != nil { - return m.EndEpochIndex - } - return 0 -} - func (m *UndelegateClaimBody) GetPenalty() *Penalty { if m != nil { return m.Penalty @@ -1195,8 +1177,6 @@ type UndelegateClaimPlan struct { ValidatorIdentity *v1alpha1.IdentityKey `protobuf:"bytes,1,opt,name=validator_identity,json=validatorIdentity,proto3" json:"validator_identity,omitempty"` // The epoch in which unbonding began, used to verify the penalty. StartEpochIndex uint64 `protobuf:"varint,2,opt,name=start_epoch_index,json=startEpochIndex,proto3" json:"start_epoch_index,omitempty"` - // The epoch in which unbonding finished, used to verify the penalty. - EndEpochIndex uint64 `protobuf:"varint,3,opt,name=end_epoch_index,json=endEpochIndex,proto3" json:"end_epoch_index,omitempty"` // The penalty applied to undelegation, in bps^2 (10e-8). // In the happy path (no slashing), this is 0. Penalty *Penalty `protobuf:"bytes,4,opt,name=penalty,proto3" json:"penalty,omitempty"` @@ -1254,13 +1234,6 @@ func (m *UndelegateClaimPlan) GetStartEpochIndex() uint64 { return 0 } -func (m *UndelegateClaimPlan) GetEndEpochIndex() uint64 { - if m != nil { - return m.EndEpochIndex - } - return 0 -} - func (m *UndelegateClaimPlan) GetPenalty() *Penalty { if m != nil { return m.Penalty @@ -1518,106 +1491,105 @@ func init() { } var fileDescriptor_022d012c8e7b3ca5 = []byte{ - // 1572 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x58, 0xcd, 0x6f, 0x23, 0x49, - 0x15, 0x4f, 0x77, 0x3e, 0xfd, 0x1c, 0x7f, 0xa4, 0x66, 0x01, 0xcf, 0x30, 0x93, 0x78, 0x7b, 0x61, - 0xd7, 0xcc, 0x0c, 0x0e, 0x13, 0x04, 0x87, 0xec, 0x61, 0x71, 0xdb, 0xbd, 0x13, 0xef, 0xce, 0x38, - 0xde, 0xb6, 0x13, 0x09, 0x34, 0x52, 0xab, 0xec, 0xae, 0xd8, 0xcd, 0xd8, 0x55, 0xa6, 0xab, 0x9c, - 0xac, 0xaf, 0x5c, 0xe0, 0xc8, 0x71, 0xcf, 0x1c, 0x38, 0xac, 0xc4, 0x81, 0x3f, 0x00, 0xce, 0x88, - 0xd3, 0x72, 0xe3, 0x06, 0xca, 0x48, 0x8b, 0xc4, 0x5f, 0x81, 0xaa, 0xba, 0xab, 0xfd, 0x91, 0xaf, - 0xc9, 0x30, 0x42, 0x42, 0xdc, 0xfa, 0x7d, 0xfd, 0xea, 0xbd, 0xdf, 0xab, 0x57, 0x5d, 0xdd, 0x50, - 0x1a, 0x11, 0x3a, 0x1e, 0x76, 0x42, 0xbc, 0xdb, 0x65, 0x21, 0xd9, 0xe5, 0x02, 0xbf, 0x24, 0xbb, - 0xa7, 0x4f, 0xf0, 0x60, 0xd4, 0xc7, 0x4f, 0x22, 0xb1, 0x3c, 0x0a, 0x99, 0x60, 0xe8, 0xbe, 0xf6, - 0x2c, 0x4b, 0xcf, 0x72, 0x64, 0xd2, 0x9e, 0xf7, 0x1e, 0xce, 0xe3, 0x74, 0xc3, 0xc9, 0x48, 0xb0, - 0x29, 0x50, 0x24, 0x47, 0x48, 0xd6, 0x1f, 0x97, 0x21, 0x75, 0x8c, 0x07, 0x81, 0x8f, 0x05, 0x0b, - 0xd1, 0x73, 0xd8, 0x0c, 0x7c, 0x42, 0x45, 0x20, 0x26, 0xde, 0x4b, 0x32, 0x29, 0x18, 0x45, 0xa3, - 0x94, 0xde, 0x7b, 0x58, 0x9e, 0x5f, 0x2e, 0x06, 0xd0, 0x80, 0xe5, 0x7a, 0x1c, 0xf2, 0x29, 0x99, - 0xb8, 0xe9, 0x60, 0x2a, 0xa0, 0xf7, 0x20, 0xd3, 0x65, 0x94, 0x13, 0xca, 0xc7, 0x5c, 0xe1, 0x99, - 0x45, 0xa3, 0xb4, 0xe9, 0x6e, 0x26, 0x4a, 0xe9, 0x84, 0x60, 0x85, 0xe2, 0x21, 0x29, 0x2c, 0x17, - 0x8d, 0x52, 0xca, 0x55, 0xcf, 0xa8, 0x00, 0xeb, 0x67, 0xa4, 0xc3, 0x03, 0x41, 0x0a, 0x2b, 0x4a, - 0xad, 0x45, 0x54, 0x84, 0xb4, 0x4f, 0x78, 0x37, 0x0c, 0x46, 0x22, 0x60, 0xb4, 0xb0, 0xaa, 0xac, - 0xb3, 0x2a, 0x19, 0x4b, 0x28, 0xee, 0x0c, 0x88, 0x5f, 0xd8, 0x28, 0x1a, 0xa5, 0x0d, 0x57, 0x8b, - 0xa8, 0x0d, 0xb9, 0x93, 0x31, 0xf5, 0x03, 0xda, 0xf3, 0xb8, 0x08, 0x09, 0x1e, 0xf2, 0xc2, 0x5a, - 0x71, 0xb9, 0x94, 0xde, 0x7b, 0x54, 0xbe, 0x8e, 0xcf, 0xf2, 0xc7, 0x51, 0x50, 0x4b, 0xc5, 0xb8, - 0xd9, 0x93, 0x59, 0x91, 0xa3, 0x0f, 0x20, 0xc7, 0xc9, 0x2f, 0xc6, 0x84, 0x76, 0x89, 0x27, 0x41, - 0x48, 0x58, 0x58, 0x2f, 0x1a, 0xa5, 0x8c, 0x9b, 0xd5, 0xea, 0x86, 0xd2, 0xa2, 0x16, 0x64, 0x7b, - 0xec, 0x94, 0x84, 0x14, 0x4b, 0x57, 0x49, 0x47, 0x4a, 0xd1, 0xfb, 0xf8, 0x06, 0x7a, 0x9f, 0x26, - 0x41, 0x92, 0xe0, 0x4c, 0x6f, 0x56, 0xb4, 0x3a, 0x90, 0x49, 0xda, 0xf7, 0x2c, 0xe0, 0x02, 0x7d, - 0x06, 0xd9, 0x53, 0xad, 0x90, 0x8b, 0xf0, 0x82, 0xa1, 0x6a, 0xbc, 0x4d, 0x13, 0x33, 0x09, 0xc2, - 0xa7, 0x64, 0xc2, 0xad, 0xdf, 0x99, 0x90, 0x99, 0xe3, 0x00, 0x1d, 0x03, 0x08, 0xe6, 0x61, 0xdf, - 0x0f, 0x09, 0xe7, 0xf1, 0x2e, 0xf9, 0xd1, 0x2d, 0x48, 0x2c, 0xb7, 0x59, 0x25, 0x0a, 0x3e, 0x58, - 0x72, 0x53, 0x42, 0x0b, 0xe8, 0x13, 0x58, 0x13, 0xcc, 0xf3, 0x31, 0x53, 0x3b, 0x25, 0xbd, 0xf7, - 0xe4, 0x76, 0x98, 0x35, 0xcc, 0x0e, 0x96, 0xdc, 0x55, 0x21, 0x1f, 0xee, 0xfd, 0x04, 0x52, 0xc9, - 0x2a, 0x72, 0x53, 0xcc, 0x66, 0x9b, 0x72, 0xb5, 0x88, 0xee, 0xc2, 0x46, 0x88, 0x05, 0xf1, 0x3a, - 0x23, 0xae, 0x16, 0xcd, 0xb8, 0xeb, 0x52, 0xb6, 0x47, 0xfc, 0x9e, 0x05, 0xab, 0x0a, 0xf3, 0x1a, - 0x1f, 0x3b, 0x0d, 0xa9, 0x90, 0x74, 0x83, 0x51, 0x40, 0xa8, 0xb0, 0xbe, 0x36, 0x60, 0xc3, 0xc5, - 0x82, 0xd4, 0xb0, 0xc0, 0x6f, 0x7b, 0x96, 0x76, 0x20, 0x4d, 0x46, 0xac, 0xdb, 0xf7, 0x02, 0xea, - 0x93, 0xcf, 0x55, 0x1a, 0x2b, 0x2e, 0x28, 0x55, 0x5d, 0x6a, 0xd0, 0x1e, 0x7c, 0x63, 0xda, 0xf8, - 0x90, 0x9c, 0xe1, 0xd0, 0xf7, 0x64, 0x96, 0x6a, 0x82, 0x56, 0xdc, 0x3b, 0x89, 0xd1, 0x55, 0x36, - 0x99, 0x27, 0xfa, 0x31, 0x7c, 0x6b, 0x1a, 0x43, 0x3e, 0xef, 0xf6, 0x31, 0xed, 0x91, 0x28, 0x6a, - 0x55, 0x45, 0x4d, 0x21, 0x9d, 0xd8, 0x2a, 0xe3, 0xac, 0x5f, 0x19, 0xb0, 0x69, 0x63, 0x4e, 0x92, - 0x62, 0x17, 0xb2, 0x33, 0x2e, 0x64, 0x57, 0x82, 0x7c, 0x07, 0x73, 0x32, 0x97, 0x58, 0x54, 0x43, - 0x56, 0xea, 0x67, 0x72, 0x7a, 0x0c, 0x48, 0x79, 0xce, 0xa7, 0xb3, 0xac, 0x7c, 0x15, 0xc6, 0x5c, - 0x26, 0x5f, 0x98, 0x90, 0x4b, 0x06, 0xa0, 0x25, 0xb0, 0x18, 0xf3, 0xb7, 0xcd, 0xbc, 0x0d, 0xab, - 0x5c, 0xe8, 0x7c, 0x2f, 0x8e, 0xeb, 0xc2, 0x9e, 0x9c, 0x4b, 0x86, 0xb8, 0x51, 0x28, 0x7a, 0x17, - 0x36, 0x4f, 0x99, 0x90, 0x27, 0xcf, 0x88, 0x9d, 0x91, 0x30, 0x2e, 0x27, 0x1d, 0xe9, 0x9a, 0x52, - 0x85, 0x0e, 0x21, 0xd3, 0x61, 0xfa, 0x74, 0xd2, 0x7d, 0xbb, 0x98, 0xf6, 0xc2, 0x72, 0x36, 0x8b, - 0x47, 0x40, 0x2e, 0xb6, 0xd9, 0x99, 0x91, 0xac, 0x3f, 0x99, 0xb0, 0x39, 0x6b, 0x46, 0x9f, 0xe9, - 0x42, 0x24, 0x21, 0xd9, 0xbd, 0x0f, 0x5f, 0x1f, 0x79, 0x4e, 0x70, 0xe8, 0x78, 0xa8, 0xeb, 0x7a, - 0x0c, 0xb9, 0x31, 0xd5, 0x69, 0xab, 0x76, 0x47, 0x5d, 0x3d, 0x58, 0x72, 0xb3, 0x89, 0xc1, 0x91, - 0xfa, 0x5f, 0x1b, 0x86, 0xf5, 0x85, 0x01, 0xf9, 0x45, 0x24, 0x64, 0xc1, 0xb6, 0x7d, 0xd8, 0xa8, - 0xd5, 0x1b, 0x4f, 0xbd, 0x56, 0xbb, 0xd2, 0x76, 0x3c, 0xa7, 0x71, 0xf4, 0xdc, 0x3b, 0x6a, 0xb4, - 0x9a, 0x4e, 0xb5, 0xfe, 0x71, 0xdd, 0xa9, 0xe5, 0x97, 0xd0, 0x03, 0xb8, 0x7b, 0x89, 0x8f, 0x54, - 0x39, 0xb5, 0xbc, 0x81, 0x8a, 0x70, 0xff, 0x52, 0x88, 0x58, 0x99, 0x37, 0xd1, 0x0e, 0x7c, 0xfb, - 0x4a, 0x0f, 0xa7, 0x96, 0x5f, 0xb6, 0x11, 0xe4, 0xbd, 0x85, 0x4a, 0xac, 0xbf, 0x9a, 0x90, 0x9d, - 0x6f, 0x27, 0x3a, 0x9a, 0xa7, 0xf0, 0xa3, 0xdb, 0xec, 0x85, 0x05, 0x71, 0x86, 0x46, 0xeb, 0x9f, - 0x06, 0xa0, 0x8b, 0x56, 0xf4, 0x1d, 0x28, 0x1e, 0x57, 0x9e, 0xd5, 0x6b, 0x95, 0xf6, 0xa1, 0x7b, - 0x35, 0x39, 0xef, 0xc2, 0x83, 0x4b, 0xbd, 0xea, 0x8d, 0x4a, 0xb5, 0x5d, 0x3f, 0x76, 0xf2, 0x86, - 0x2c, 0xff, 0x52, 0x97, 0xd8, 0xc1, 0xbc, 0xd2, 0xe1, 0x93, 0x4a, 0xfd, 0x99, 0xe4, 0x07, 0xbd, - 0x07, 0x3b, 0x97, 0x3a, 0xb4, 0x0f, 0x9f, 0xdb, 0xad, 0xf6, 0x61, 0xc3, 0xa9, 0xe5, 0x57, 0xae, - 0xcc, 0xa4, 0x56, 0x6f, 0x55, 0x6c, 0x89, 0xb3, 0x6a, 0x9d, 0x1b, 0x33, 0x2f, 0xac, 0x3a, 0x3d, - 0x61, 0xc8, 0x81, 0x54, 0x72, 0xc8, 0xc4, 0xa3, 0xfa, 0xc1, 0x6b, 0xd2, 0xea, 0x4e, 0x23, 0x91, - 0x03, 0x6b, 0x5c, 0x8d, 0x7f, 0x3c, 0xa6, 0xdf, 0xbf, 0x45, 0x6b, 0xc6, 0xdc, 0x8d, 0x83, 0x51, - 0x15, 0x52, 0xea, 0xa8, 0xf7, 0xb1, 0xc0, 0x6a, 0x4a, 0xd3, 0x7b, 0xef, 0x5f, 0x8f, 0xa4, 0xcf, - 0x40, 0x57, 0xbd, 0x23, 0xe4, 0x93, 0x75, 0x06, 0x77, 0x12, 0xfc, 0x1a, 0x39, 0x09, 0x68, 0xa0, - 0x6e, 0x26, 0x6f, 0xa9, 0xd2, 0xbb, 0xb0, 0x81, 0xc7, 0xa2, 0xef, 0xf1, 0xa0, 0x17, 0x5f, 0xa8, - 0xd6, 0xa5, 0xdc, 0x0a, 0x7a, 0xd6, 0x97, 0x26, 0x6c, 0xd4, 0xc8, 0x80, 0xf4, 0xe4, 0x5e, 0xfd, - 0x29, 0xa0, 0xe9, 0xe1, 0xae, 0x0f, 0xb4, 0x37, 0x38, 0x0c, 0xb7, 0x12, 0x14, 0xad, 0xbd, 0xf9, - 0x65, 0xd4, 0xd0, 0xe7, 0x02, 0xf1, 0x3d, 0x3c, 0x64, 0x63, 0x2a, 0x62, 0x32, 0xbf, 0x7b, 0xc3, - 0xc2, 0x15, 0xe5, 0xac, 0x0f, 0x0f, 0xe2, 0x47, 0x32, 0x72, 0x61, 0xcb, 0x8f, 0xea, 0x0a, 0x18, - 0xd5, 0x88, 0x2b, 0xb7, 0x41, 0xcc, 0x4f, 0xe3, 0x23, 0x8d, 0xf5, 0x77, 0x13, 0xe0, 0x88, 0xfa, - 0xff, 0x05, 0xba, 0x1e, 0xc2, 0x16, 0x17, 0x38, 0x14, 0xde, 0x45, 0xd2, 0x72, 0xca, 0xe0, 0x4c, - 0x99, 0x7b, 0x1f, 0x72, 0x84, 0xfa, 0x73, 0x9e, 0xd1, 0xcb, 0x22, 0x43, 0xa8, 0xef, 0x5c, 0xcb, - 0xf0, 0xca, 0x5b, 0x67, 0x78, 0xf5, 0x3f, 0x63, 0x98, 0x42, 0x6e, 0x4a, 0x70, 0x75, 0x80, 0x83, - 0x21, 0x72, 0x60, 0xa5, 0xc3, 0x7c, 0xcd, 0xeb, 0x0d, 0xf7, 0xbb, 0x85, 0x60, 0x9b, 0xf9, 0x13, - 0x57, 0x85, 0xa3, 0x77, 0x60, 0x75, 0x14, 0x32, 0x76, 0x12, 0x0f, 0x40, 0x24, 0x58, 0x5f, 0x9b, - 0x70, 0xe7, 0x92, 0x98, 0xff, 0xb5, 0xd6, 0x7e, 0x04, 0xeb, 0x23, 0x42, 0xf1, 0x40, 0x4c, 0xae, - 0x68, 0xe9, 0x02, 0x4d, 0xcd, 0xc8, 0xd9, 0xd5, 0x51, 0xc8, 0x93, 0x57, 0xa8, 0x81, 0xfa, 0xcc, - 0xe8, 0xb2, 0xe1, 0x30, 0x10, 0x43, 0x92, 0x34, 0xf3, 0x07, 0x37, 0xd4, 0x6b, 0x47, 0x81, 0xd5, - 0x24, 0xce, 0xdd, 0xea, 0x2c, 0xaa, 0xac, 0x5f, 0x2e, 0x5f, 0x20, 0xba, 0x39, 0xc0, 0xf4, 0xff, - 0x8e, 0xe8, 0x26, 0xe4, 0xa7, 0x97, 0x86, 0x37, 0x99, 0x99, 0xe9, 0xed, 0x29, 0x1e, 0xc3, 0xef, - 0xc9, 0x7b, 0x72, 0xd4, 0xba, 0xce, 0x20, 0x50, 0x96, 0xc2, 0x9a, 0xda, 0xe3, 0xb9, 0x58, 0x6f, - 0xc7, 0x6a, 0xeb, 0xf7, 0x06, 0x6c, 0xd5, 0x92, 0x91, 0xab, 0xaa, 0x3b, 0x31, 0x47, 0x07, 0xf2, - 0x03, 0x59, 0x2b, 0xf5, 0xc7, 0xdf, 0x0d, 0xaf, 0x30, 0xfd, 0xca, 0x70, 0x67, 0x43, 0x51, 0x03, - 0x32, 0x63, 0x3a, 0x8b, 0x65, 0x2a, 0xac, 0xd2, 0xeb, 0xce, 0xac, 0x3b, 0x1f, 0x6e, 0x0d, 0x60, - 0xed, 0x68, 0x24, 0x82, 0x21, 0x41, 0x8f, 0x00, 0x61, 0xee, 0xb1, 0x13, 0xaf, 0x33, 0x60, 0xdd, - 0x97, 0x5e, 0x9f, 0x04, 0xbd, 0xbe, 0x88, 0x3f, 0x1a, 0x72, 0x98, 0x1f, 0x9e, 0xd8, 0x52, 0x7f, - 0xa0, 0xd4, 0xe8, 0x01, 0xc0, 0x59, 0x40, 0x7d, 0x76, 0xe6, 0x0d, 0x08, 0x8d, 0x3f, 0xbf, 0x52, - 0x91, 0xe6, 0x19, 0xa1, 0xe8, 0x9b, 0xb0, 0xd6, 0x09, 0xc4, 0x29, 0xe9, 0xaa, 0x16, 0x6f, 0xba, - 0xb1, 0x64, 0xfd, 0x1c, 0xde, 0xa9, 0x8e, 0xc3, 0x90, 0x50, 0x51, 0x9d, 0xf9, 0xdb, 0xc0, 0x91, - 0x0b, 0xd9, 0xb9, 0x7f, 0x12, 0x9a, 0xa2, 0x47, 0x37, 0x34, 0x6c, 0x16, 0xc5, 0xcd, 0xcc, 0xfe, - 0xc1, 0xe0, 0xd6, 0x0e, 0xac, 0xc7, 0x5b, 0x43, 0x1e, 0x4c, 0x01, 0xa5, 0x24, 0x8c, 0xab, 0x89, - 0x04, 0xfb, 0x0f, 0xe6, 0x9f, 0xcf, 0xb7, 0x8d, 0xaf, 0xce, 0xb7, 0x8d, 0x7f, 0x9c, 0x6f, 0x1b, - 0xbf, 0x79, 0xb5, 0xbd, 0xf4, 0xd5, 0xab, 0xed, 0xa5, 0xbf, 0xbd, 0xda, 0x5e, 0x82, 0x62, 0x97, - 0x0d, 0xaf, 0x65, 0xd4, 0x86, 0x96, 0x94, 0x9b, 0x21, 0x13, 0xac, 0x69, 0xfc, 0xec, 0xb8, 0x17, - 0x88, 0xfe, 0xb8, 0x53, 0xee, 0xb2, 0xe1, 0x6e, 0x97, 0xf1, 0x21, 0xe3, 0xbb, 0x21, 0x19, 0xe0, - 0x09, 0x09, 0x77, 0x4f, 0xf7, 0x92, 0xc7, 0x6e, 0x1f, 0x07, 0x94, 0xef, 0x5e, 0xf7, 0x43, 0xe9, - 0x43, 0x25, 0x6a, 0xe9, 0xb7, 0xe6, 0x72, 0xb3, 0xda, 0xfa, 0xd2, 0xbc, 0xdf, 0xd4, 0xa9, 0x54, - 0x65, 0x2a, 0x6a, 0xe9, 0xf2, 0x71, 0xec, 0xf4, 0x97, 0xa9, 0xf9, 0x85, 0x34, 0xbf, 0x50, 0xe6, - 0x17, 0xda, 0x7c, 0x6e, 0x96, 0xae, 0x33, 0xbf, 0x78, 0xda, 0xb4, 0x9f, 0x13, 0x81, 0xe5, 0xd5, - 0xea, 0x5f, 0xe6, 0x8e, 0x76, 0xdd, 0xdf, 0x97, 0xbe, 0xfb, 0xfb, 0xca, 0x79, 0x7f, 0x5f, 0x7b, - 0x77, 0xd6, 0xd4, 0x0f, 0xaa, 0x1f, 0xfe, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x80, 0xfc, 0xaf, 0xcd, - 0x16, 0x13, 0x00, 0x00, + // 1554 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0xcd, 0x6f, 0x23, 0x49, + 0x15, 0x4f, 0x3b, 0x76, 0x12, 0x3f, 0x7f, 0xa6, 0x66, 0x01, 0xcf, 0x30, 0x93, 0x78, 0x7b, 0x81, + 0x35, 0x33, 0x83, 0xc3, 0x04, 0xc1, 0x21, 0x7b, 0x58, 0xdc, 0xb6, 0x77, 0xe2, 0xdd, 0xc4, 0xf1, + 0xb6, 0x9d, 0x48, 0xa0, 0x48, 0xad, 0xb2, 0xbb, 0x62, 0x37, 0x63, 0x57, 0x99, 0xae, 0x72, 0xb2, + 0xfe, 0x0b, 0xe0, 0xc8, 0x71, 0xcf, 0x1c, 0x38, 0xac, 0xc4, 0x81, 0x13, 0x27, 0x38, 0x23, 0x4e, + 0xcb, 0x0d, 0x71, 0x42, 0x19, 0x09, 0x24, 0xfe, 0x0a, 0x54, 0xd5, 0x5d, 0xed, 0x8f, 0x7c, 0x4d, + 0x56, 0x23, 0xb4, 0xdc, 0xfa, 0x7d, 0xfd, 0xea, 0xbd, 0xdf, 0xab, 0x57, 0x5d, 0xdd, 0x50, 0x1a, + 0x13, 0x3a, 0x19, 0x75, 0x7d, 0xbc, 0xd3, 0x63, 0x3e, 0xd9, 0xe1, 0x02, 0xbf, 0x22, 0x3b, 0xe7, + 0x2f, 0xf0, 0x70, 0x3c, 0xc0, 0x2f, 0x02, 0xb1, 0x3c, 0xf6, 0x99, 0x60, 0xe8, 0xb1, 0xf6, 0x2c, + 0x4b, 0xcf, 0x72, 0x60, 0xd2, 0x9e, 0x8f, 0x9e, 0x2e, 0xe2, 0xf4, 0xfc, 0xe9, 0x58, 0xb0, 0x19, + 0x50, 0x20, 0x07, 0x48, 0xe6, 0x9f, 0x56, 0x21, 0x79, 0x82, 0x87, 0x9e, 0x8b, 0x05, 0xf3, 0xd1, + 0x21, 0xa4, 0x3d, 0x97, 0x50, 0xe1, 0x89, 0xa9, 0xf3, 0x8a, 0x4c, 0x0b, 0x46, 0xd1, 0x28, 0xa5, + 0x76, 0x9f, 0x96, 0x17, 0x97, 0x0b, 0x01, 0x34, 0x60, 0xb9, 0x11, 0x86, 0x7c, 0x42, 0xa6, 0x76, + 0xca, 0x9b, 0x09, 0xe8, 0x3d, 0xc8, 0xf4, 0x18, 0xe5, 0x84, 0xf2, 0x09, 0x57, 0x78, 0xb1, 0xa2, + 0x51, 0x4a, 0xdb, 0xe9, 0x48, 0x29, 0x9d, 0x10, 0xc4, 0x29, 0x1e, 0x91, 0xc2, 0x6a, 0xd1, 0x28, + 0x25, 0x6d, 0xf5, 0x8c, 0x0a, 0xb0, 0x7e, 0x41, 0xba, 0xdc, 0x13, 0xa4, 0x10, 0x57, 0x6a, 0x2d, + 0xa2, 0x22, 0xa4, 0x5c, 0xc2, 0x7b, 0xbe, 0x37, 0x16, 0x1e, 0xa3, 0x85, 0x84, 0xb2, 0xce, 0xab, + 0x64, 0x2c, 0xa1, 0xb8, 0x3b, 0x24, 0x6e, 0x61, 0xa3, 0x68, 0x94, 0x36, 0x6c, 0x2d, 0xa2, 0x0e, + 0xe4, 0xce, 0x26, 0xd4, 0xf5, 0x68, 0xdf, 0xe1, 0xc2, 0x27, 0x78, 0xc4, 0x0b, 0x6b, 0xc5, 0xd5, + 0x52, 0x6a, 0xf7, 0x59, 0xf9, 0x36, 0x3e, 0xcb, 0x1f, 0x05, 0x41, 0x6d, 0x15, 0x63, 0x67, 0xcf, + 0xe6, 0x45, 0x8e, 0xde, 0x87, 0x1c, 0x27, 0xbf, 0x9c, 0x10, 0xda, 0x23, 0x8e, 0x04, 0x21, 0x7e, + 0x61, 0xbd, 0x68, 0x94, 0x32, 0x76, 0x56, 0xab, 0x9b, 0x4a, 0x8b, 0xda, 0x90, 0xed, 0xb3, 0x73, + 0xe2, 0x53, 0x2c, 0x5d, 0x25, 0x1d, 0x49, 0x45, 0xef, 0xf3, 0x3b, 0xe8, 0x7d, 0x19, 0x05, 0x49, + 0x82, 0x33, 0xfd, 0x79, 0xd1, 0xec, 0x42, 0x26, 0x6a, 0xdf, 0x81, 0xc7, 0x05, 0xfa, 0x14, 0xb2, + 0xe7, 0x5a, 0x21, 0x17, 0xe1, 0x05, 0x43, 0xd5, 0x78, 0x9f, 0x26, 0x66, 0x22, 0x84, 0x4f, 0xc8, + 0x94, 0x9b, 0xbf, 0x8b, 0x41, 0x66, 0x81, 0x03, 0x74, 0x02, 0x20, 0x98, 0x83, 0x5d, 0xd7, 0x27, + 0x9c, 0x87, 0xbb, 0xe4, 0xc7, 0xf7, 0x20, 0xb1, 0xdc, 0x61, 0x95, 0x20, 0x78, 0x7f, 0xc5, 0x4e, + 0x0a, 0x2d, 0xa0, 0x8f, 0x61, 0x4d, 0x30, 0xc7, 0xc5, 0x4c, 0xed, 0x94, 0xd4, 0xee, 0x8b, 0xfb, + 0x61, 0xd6, 0x30, 0xdb, 0x5f, 0xb1, 0x13, 0x42, 0x3e, 0x3c, 0xfa, 0x29, 0x24, 0xa3, 0x55, 0xe4, + 0xa6, 0x98, 0xcf, 0x36, 0x69, 0x6b, 0x11, 0x3d, 0x84, 0x0d, 0x1f, 0x0b, 0xe2, 0x74, 0xc7, 0x5c, + 0x2d, 0x9a, 0xb1, 0xd7, 0xa5, 0x6c, 0x8d, 0xf9, 0x23, 0x13, 0x12, 0x0a, 0xf3, 0x16, 0x1f, 0x2b, + 0x05, 0x49, 0x9f, 0xf4, 0xbc, 0xb1, 0x47, 0xa8, 0x30, 0xff, 0x65, 0xc0, 0x86, 0x8d, 0x05, 0xa9, + 0x61, 0x81, 0xdf, 0xf6, 0x2c, 0x6d, 0x43, 0x8a, 0x8c, 0x59, 0x6f, 0xe0, 0x78, 0xd4, 0x25, 0x9f, + 0xa9, 0x34, 0xe2, 0x36, 0x28, 0x55, 0x43, 0x6a, 0xd0, 0x2e, 0x7c, 0x63, 0xd6, 0x78, 0x9f, 0x5c, + 0x60, 0xdf, 0x75, 0x64, 0x96, 0x6a, 0x82, 0xe2, 0xf6, 0x83, 0xc8, 0x68, 0x2b, 0x9b, 0xcc, 0x13, + 0xfd, 0x04, 0xbe, 0x35, 0x8b, 0x21, 0x9f, 0xf5, 0x06, 0x98, 0xf6, 0x49, 0x10, 0x95, 0x50, 0x51, + 0x33, 0xc8, 0x7a, 0x68, 0x95, 0x71, 0xe6, 0xaf, 0x0c, 0x48, 0x5b, 0x98, 0x93, 0xa8, 0xd8, 0xa5, + 0xec, 0x8c, 0x2b, 0xd9, 0x95, 0x20, 0xdf, 0xc5, 0x9c, 0x2c, 0x24, 0x16, 0xd4, 0x90, 0x95, 0xfa, + 0xb9, 0x9c, 0x9e, 0x03, 0x52, 0x9e, 0x8b, 0xe9, 0xac, 0x2a, 0x5f, 0x85, 0xb1, 0x90, 0xc9, 0xe7, + 0x31, 0xc8, 0x45, 0x03, 0xd0, 0x16, 0x58, 0x4c, 0xf8, 0xdb, 0x66, 0xde, 0x82, 0x04, 0x17, 0x3a, + 0xdf, 0xab, 0xe3, 0xba, 0xb4, 0x27, 0x17, 0x92, 0x21, 0x76, 0x10, 0x8a, 0xde, 0x85, 0xf4, 0x39, + 0x13, 0xf2, 0xe4, 0x19, 0xb3, 0x0b, 0xe2, 0x87, 0xe5, 0xa4, 0x02, 0x5d, 0x4b, 0xaa, 0xd0, 0x11, + 0x64, 0xba, 0x4c, 0x9f, 0x4e, 0xba, 0x6f, 0x57, 0xd3, 0x5e, 0x5a, 0xce, 0x62, 0xe1, 0x08, 0xc8, + 0xc5, 0xd2, 0xdd, 0x39, 0xc9, 0xfc, 0x73, 0x0c, 0xd2, 0xf3, 0x66, 0xf4, 0xa9, 0x2e, 0x44, 0x12, + 0x92, 0xdd, 0xfd, 0xe0, 0xcd, 0x91, 0x17, 0x84, 0x3a, 0x9d, 0x8c, 0x74, 0x5d, 0xcf, 0x21, 0x37, + 0xa1, 0x3a, 0x6d, 0xd5, 0xee, 0xa0, 0xab, 0xfb, 0x2b, 0x76, 0x36, 0x32, 0xd4, 0xa5, 0xfe, 0xd7, + 0x86, 0x61, 0x7e, 0x6e, 0x40, 0x7e, 0x19, 0x09, 0x99, 0xb0, 0x65, 0x1d, 0x35, 0x6b, 0x8d, 0xe6, + 0x4b, 0xa7, 0xdd, 0xa9, 0x74, 0xea, 0x4e, 0xbd, 0x79, 0x7c, 0xe8, 0x1c, 0x37, 0xdb, 0xad, 0x7a, + 0xb5, 0xf1, 0x51, 0xa3, 0x5e, 0xcb, 0xaf, 0xa0, 0x27, 0xf0, 0xf0, 0x1a, 0x1f, 0xa9, 0xaa, 0xd7, + 0xf2, 0x06, 0x2a, 0xc2, 0xe3, 0x6b, 0x21, 0x42, 0x65, 0x3e, 0x86, 0xb6, 0xe1, 0xdb, 0x37, 0x7a, + 0xd4, 0x6b, 0xf9, 0x55, 0x0b, 0x41, 0xde, 0x59, 0xaa, 0xc4, 0xfc, 0x5b, 0x0c, 0xb2, 0x8b, 0xed, + 0x44, 0xc7, 0x8b, 0x14, 0x7e, 0x78, 0x9f, 0xbd, 0xb0, 0x24, 0xce, 0xd1, 0x68, 0xfe, 0xdb, 0x00, + 0x74, 0xd5, 0x8a, 0xbe, 0x03, 0xc5, 0x93, 0xca, 0x41, 0xa3, 0x56, 0xe9, 0x1c, 0xd9, 0x37, 0x93, + 0xf3, 0x2e, 0x3c, 0xb9, 0xd6, 0xab, 0xd1, 0xac, 0x54, 0x3b, 0x8d, 0x93, 0x7a, 0xde, 0x90, 0xe5, + 0x5f, 0xeb, 0x12, 0x3a, 0xc4, 0x6e, 0x74, 0xf8, 0xb8, 0xd2, 0x38, 0x90, 0xfc, 0xa0, 0xf7, 0x60, + 0xfb, 0x5a, 0x87, 0xce, 0xd1, 0xa1, 0xd5, 0xee, 0x1c, 0x35, 0xeb, 0xb5, 0x7c, 0xfc, 0xc6, 0x4c, + 0x6a, 0x8d, 0x76, 0xc5, 0x92, 0x38, 0x09, 0xf3, 0xd2, 0x98, 0x7b, 0x61, 0x35, 0xe8, 0x19, 0x43, + 0x75, 0x48, 0x46, 0x87, 0x4c, 0x38, 0xaa, 0xef, 0xbf, 0x21, 0xad, 0xf6, 0x2c, 0x12, 0xd5, 0x61, + 0x8d, 0xab, 0xf1, 0x0f, 0xc7, 0xf4, 0x07, 0xf7, 0x68, 0xcd, 0x84, 0xdb, 0x61, 0x30, 0xaa, 0x42, + 0x52, 0x1d, 0xf5, 0x2e, 0x16, 0x58, 0x4d, 0x69, 0x6a, 0xf7, 0x7b, 0xb7, 0x23, 0xe9, 0x33, 0xd0, + 0x56, 0xef, 0x08, 0xf9, 0x64, 0x5e, 0xc0, 0x83, 0x08, 0xbf, 0x46, 0xce, 0x3c, 0xea, 0xa9, 0x9b, + 0xc9, 0x5b, 0xaa, 0xf4, 0x21, 0x6c, 0xe0, 0x89, 0x18, 0x38, 0xdc, 0xeb, 0x87, 0x17, 0xaa, 0x75, + 0x29, 0xb7, 0xbd, 0xbe, 0xf9, 0x45, 0x0c, 0x36, 0x6a, 0x64, 0x48, 0xfa, 0x72, 0xaf, 0xfe, 0x0c, + 0xd0, 0xec, 0x70, 0xd7, 0x07, 0xda, 0x57, 0x38, 0x0c, 0x37, 0x23, 0x14, 0xad, 0xbd, 0xfb, 0x65, + 0xd4, 0xd4, 0xe7, 0x02, 0x71, 0x1d, 0x3c, 0x62, 0x13, 0x2a, 0x42, 0x32, 0xbf, 0x7b, 0xc7, 0xc2, + 0x15, 0xe5, 0xac, 0x0f, 0x0f, 0xe2, 0x06, 0x32, 0xb2, 0x61, 0xd3, 0x0d, 0xea, 0xf2, 0x18, 0xd5, + 0x88, 0xf1, 0xfb, 0x20, 0xe6, 0x67, 0xf1, 0x81, 0xc6, 0xfc, 0x63, 0x0c, 0xe0, 0x98, 0xba, 0xff, + 0x03, 0xba, 0x9e, 0xc2, 0x26, 0x17, 0xd8, 0x17, 0xce, 0x55, 0xd2, 0x72, 0xca, 0x50, 0xff, 0xff, + 0x62, 0x8e, 0x42, 0x6e, 0x46, 0x5c, 0x75, 0x88, 0xbd, 0x11, 0xaa, 0x43, 0xbc, 0xcb, 0x5c, 0xcd, + 0xd7, 0x1d, 0xf7, 0xb6, 0xa5, 0x60, 0x8b, 0xb9, 0x53, 0x5b, 0x85, 0xa3, 0x77, 0x20, 0x31, 0xf6, + 0x19, 0x3b, 0x0b, 0x37, 0x76, 0x20, 0xc8, 0x37, 0xd9, 0x83, 0x6b, 0x62, 0xbe, 0x2e, 0x2d, 0xfb, + 0x10, 0xd6, 0xc7, 0x84, 0xe2, 0xa1, 0x98, 0xde, 0xd0, 0xaa, 0xa5, 0xf2, 0x5b, 0x81, 0xb3, 0xad, + 0xa3, 0x90, 0x23, 0xaf, 0x3c, 0x43, 0xf5, 0x59, 0xd0, 0x63, 0xa3, 0x91, 0x27, 0x46, 0x24, 0x6a, + 0xd2, 0x0f, 0xef, 0xa8, 0xc3, 0x0a, 0x02, 0xab, 0x51, 0x9c, 0xbd, 0xd9, 0x5d, 0x56, 0x99, 0xff, + 0xb8, 0x4a, 0x60, 0x6b, 0x88, 0xe9, 0xd7, 0x90, 0xc0, 0xf8, 0x57, 0x22, 0xb0, 0x05, 0xf9, 0xd9, + 0xcb, 0x3b, 0xdc, 0xe3, 0x89, 0xfb, 0xec, 0xf1, 0xd9, 0x2d, 0x26, 0x1c, 0x9b, 0xef, 0xcb, 0xfb, + 0x6a, 0xd0, 0x92, 0xee, 0xd0, 0x53, 0x96, 0xc2, 0x9a, 0xda, 0x93, 0xb9, 0x50, 0x6f, 0x85, 0x6a, + 0xf3, 0xf7, 0x06, 0x6c, 0xd6, 0xa2, 0x11, 0xa9, 0xaa, 0xbb, 0x29, 0x47, 0xfb, 0xf2, 0x43, 0x55, + 0x2b, 0xf5, 0x47, 0xd8, 0x1d, 0xaf, 0x12, 0x7d, 0x74, 0xdb, 0xf3, 0xa1, 0xa8, 0x09, 0x99, 0x09, + 0x9d, 0xc7, 0x8a, 0x29, 0xac, 0xd2, 0x9b, 0xce, 0x98, 0xbd, 0x18, 0x6e, 0x0e, 0x61, 0xed, 0x78, + 0x2c, 0xbc, 0x11, 0x41, 0xcf, 0x00, 0x61, 0xee, 0xb0, 0x33, 0xa7, 0x3b, 0x64, 0xbd, 0x57, 0xce, + 0x80, 0x78, 0xfd, 0x81, 0x08, 0x2f, 0xef, 0x39, 0xcc, 0x8f, 0xce, 0x2c, 0xa9, 0xdf, 0x57, 0x6a, + 0xf4, 0x04, 0xe0, 0xc2, 0xa3, 0x2e, 0xbb, 0x70, 0x86, 0x84, 0x86, 0x9f, 0x41, 0xc9, 0x40, 0x73, + 0x40, 0x28, 0xfa, 0x26, 0xac, 0x75, 0x3d, 0x71, 0x4e, 0x7a, 0x6a, 0x06, 0xd2, 0x76, 0x28, 0x99, + 0xbf, 0x80, 0x77, 0xaa, 0x13, 0xdf, 0x27, 0x54, 0x54, 0xe7, 0xbe, 0xfa, 0x39, 0xb2, 0x21, 0xbb, + 0xf0, 0x6f, 0x40, 0x53, 0xf4, 0xec, 0x8e, 0x86, 0xcd, 0xa3, 0xd8, 0x99, 0xf9, 0x3f, 0x09, 0xdc, + 0xdc, 0x86, 0xf5, 0x70, 0x6b, 0xc8, 0x83, 0xc4, 0xa3, 0x94, 0xf8, 0x61, 0x35, 0x81, 0x60, 0xfd, + 0x21, 0xf6, 0x97, 0xcb, 0x2d, 0xe3, 0xcb, 0xcb, 0x2d, 0xe3, 0x9f, 0x97, 0x5b, 0xc6, 0x6f, 0x5e, + 0x6f, 0xad, 0x7c, 0xf9, 0x7a, 0x6b, 0xe5, 0xef, 0xaf, 0xb7, 0x56, 0xa0, 0xd8, 0x63, 0xa3, 0x5b, + 0x19, 0xb5, 0xa0, 0x2d, 0xe5, 0x96, 0xcf, 0x04, 0x6b, 0x19, 0x3f, 0x3f, 0xe9, 0x7b, 0x62, 0x30, + 0xe9, 0x96, 0x7b, 0x6c, 0xb4, 0xd3, 0x63, 0x7c, 0xc4, 0xf8, 0x8e, 0x4f, 0x86, 0x78, 0x4a, 0xfc, + 0x9d, 0xf3, 0xdd, 0xe8, 0xb1, 0x37, 0xc0, 0x1e, 0xe5, 0x3b, 0xb7, 0xfd, 0xd8, 0xf9, 0x40, 0x89, + 0x5a, 0xfa, 0x6d, 0x6c, 0xb5, 0x55, 0x6d, 0x7f, 0x11, 0x7b, 0xdc, 0xd2, 0xa9, 0x54, 0x65, 0x2a, + 0x6a, 0xe9, 0xf2, 0x49, 0xe8, 0xf4, 0xd7, 0x99, 0xf9, 0x54, 0x9a, 0x4f, 0x95, 0xf9, 0x54, 0x9b, + 0x2f, 0x63, 0xa5, 0xdb, 0xcc, 0xa7, 0x2f, 0x5b, 0xd6, 0x21, 0x11, 0x58, 0x5e, 0x71, 0xfe, 0x13, + 0xdb, 0xd6, 0xae, 0x7b, 0x7b, 0xd2, 0x77, 0x6f, 0x4f, 0x39, 0xef, 0xed, 0x69, 0xef, 0xee, 0x9a, + 0xfa, 0x51, 0xf4, 0xa3, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xba, 0x77, 0x8b, 0xfc, 0x9e, 0x12, + 0x00, 0x00, } func (m *Validator) Marshal() (dAtA []byte, err error) { @@ -2322,7 +2294,7 @@ func (m *Undelegate) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintStake(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x2a + dAtA[i] = 0x22 } if m.UnbondedAmount != nil { { @@ -2334,12 +2306,7 @@ func (m *Undelegate) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintStake(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x22 - } - if m.EndEpochIndex != 0 { - i = encodeVarintStake(dAtA, i, uint64(m.EndEpochIndex)) - i-- - dAtA[i] = 0x18 + dAtA[i] = 0x1a } if m.StartEpochIndex != 0 { i = encodeVarintStake(dAtA, i, uint64(m.StartEpochIndex)) @@ -2433,7 +2400,7 @@ func (m *UndelegateClaimBody) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintStake(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x2a + dAtA[i] = 0x22 } if m.Penalty != nil { { @@ -2445,12 +2412,7 @@ func (m *UndelegateClaimBody) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintStake(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x22 - } - if m.EndEpochIndex != 0 { - i = encodeVarintStake(dAtA, i, uint64(m.EndEpochIndex)) - i-- - dAtA[i] = 0x18 + dAtA[i] = 0x1a } if m.StartEpochIndex != 0 { i = encodeVarintStake(dAtA, i, uint64(m.StartEpochIndex)) @@ -2523,11 +2485,6 @@ func (m *UndelegateClaimPlan) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x22 } - if m.EndEpochIndex != 0 { - i = encodeVarintStake(dAtA, i, uint64(m.EndEpochIndex)) - i-- - dAtA[i] = 0x18 - } if m.StartEpochIndex != 0 { i = encodeVarintStake(dAtA, i, uint64(m.StartEpochIndex)) i-- @@ -3014,9 +2971,6 @@ func (m *Undelegate) Size() (n int) { if m.StartEpochIndex != 0 { n += 1 + sovStake(uint64(m.StartEpochIndex)) } - if m.EndEpochIndex != 0 { - n += 1 + sovStake(uint64(m.EndEpochIndex)) - } if m.UnbondedAmount != nil { l = m.UnbondedAmount.Size() n += 1 + l + sovStake(uint64(l)) @@ -3058,9 +3012,6 @@ func (m *UndelegateClaimBody) Size() (n int) { if m.StartEpochIndex != 0 { n += 1 + sovStake(uint64(m.StartEpochIndex)) } - if m.EndEpochIndex != 0 { - n += 1 + sovStake(uint64(m.EndEpochIndex)) - } if m.Penalty != nil { l = m.Penalty.Size() n += 1 + l + sovStake(uint64(l)) @@ -3085,9 +3036,6 @@ func (m *UndelegateClaimPlan) Size() (n int) { if m.StartEpochIndex != 0 { n += 1 + sovStake(uint64(m.StartEpochIndex)) } - if m.EndEpochIndex != 0 { - n += 1 + sovStake(uint64(m.EndEpochIndex)) - } if m.Penalty != nil { l = m.Penalty.Size() n += 1 + l + sovStake(uint64(l)) @@ -5000,25 +4948,6 @@ func (m *Undelegate) Unmarshal(dAtA []byte) error { } } case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field EndEpochIndex", wireType) - } - m.EndEpochIndex = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStake - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.EndEpochIndex |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field UnbondedAmount", wireType) } @@ -5054,7 +4983,7 @@ func (m *Undelegate) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 5: + case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field DelegationAmount", wireType) } @@ -5316,25 +5245,6 @@ func (m *UndelegateClaimBody) Unmarshal(dAtA []byte) error { } } case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field EndEpochIndex", wireType) - } - m.EndEpochIndex = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStake - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.EndEpochIndex |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Penalty", wireType) } @@ -5370,7 +5280,7 @@ func (m *UndelegateClaimBody) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 5: + case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field BalanceCommitment", wireType) } @@ -5511,25 +5421,6 @@ func (m *UndelegateClaimPlan) Unmarshal(dAtA []byte) error { break } } - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field EndEpochIndex", wireType) - } - m.EndEpochIndex = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStake - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.EndEpochIndex |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Penalty", wireType) diff --git a/relayer/chains/penumbra/core/transaction/v1alpha1/transaction.pb.go b/relayer/chains/penumbra/core/transaction/v1alpha1/transaction.pb.go index 4b501bab7..c7031205e 100644 --- a/relayer/chains/penumbra/core/transaction/v1alpha1/transaction.pb.go +++ b/relayer/chains/penumbra/core/transaction/v1alpha1/transaction.pb.go @@ -136,6 +136,50 @@ func (m *Id) GetHash() []byte { return nil } +type EffectHash struct { + Inner []byte `protobuf:"bytes,1,opt,name=inner,proto3" json:"inner,omitempty"` +} + +func (m *EffectHash) Reset() { *m = EffectHash{} } +func (m *EffectHash) String() string { return proto.CompactTextString(m) } +func (*EffectHash) ProtoMessage() {} +func (*EffectHash) Descriptor() ([]byte, []int) { + return fileDescriptor_cd20ea79758052c4, []int{2} +} +func (m *EffectHash) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *EffectHash) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_EffectHash.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *EffectHash) XXX_Merge(src proto.Message) { + xxx_messageInfo_EffectHash.Merge(m, src) +} +func (m *EffectHash) XXX_Size() int { + return m.Size() +} +func (m *EffectHash) XXX_DiscardUnknown() { + xxx_messageInfo_EffectHash.DiscardUnknown(m) +} + +var xxx_messageInfo_EffectHash proto.InternalMessageInfo + +func (m *EffectHash) GetInner() []byte { + if m != nil { + return m.Inner + } + return nil +} + // The body of a transaction. type TransactionBody struct { // A list of actions (state changes) performed by this transaction. @@ -160,7 +204,7 @@ func (m *TransactionBody) Reset() { *m = TransactionBody{} } func (m *TransactionBody) String() string { return proto.CompactTextString(m) } func (*TransactionBody) ProtoMessage() {} func (*TransactionBody) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{2} + return fileDescriptor_cd20ea79758052c4, []int{3} } func (m *TransactionBody) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -289,7 +333,7 @@ func (m *Action) Reset() { *m = Action{} } func (m *Action) String() string { return proto.CompactTextString(m) } func (*Action) ProtoMessage() {} func (*Action) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{3} + return fileDescriptor_cd20ea79758052c4, []int{4} } func (m *Action) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -613,13 +657,15 @@ type TransactionPerspective struct { AdviceNotes []*v1alpha1.Note `protobuf:"bytes,3,rep,name=advice_notes,json=adviceNotes,proto3" json:"advice_notes,omitempty"` // Any relevant address views. AddressViews []*v1alpha1.AddressView `protobuf:"bytes,4,rep,name=address_views,json=addressViews,proto3" json:"address_views,omitempty"` + // Any relevant denoms for viewed assets. + Denoms []*v1alpha1.Denom `protobuf:"bytes,5,rep,name=denoms,proto3" json:"denoms,omitempty"` } func (m *TransactionPerspective) Reset() { *m = TransactionPerspective{} } func (m *TransactionPerspective) String() string { return proto.CompactTextString(m) } func (*TransactionPerspective) ProtoMessage() {} func (*TransactionPerspective) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{4} + return fileDescriptor_cd20ea79758052c4, []int{5} } func (m *TransactionPerspective) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -676,8 +722,59 @@ func (m *TransactionPerspective) GetAddressViews() []*v1alpha1.AddressView { return nil } +func (m *TransactionPerspective) GetDenoms() []*v1alpha1.Denom { + if m != nil { + return m.Denoms + } + return nil +} + +type PayloadKey struct { + Inner []byte `protobuf:"bytes,1,opt,name=inner,proto3" json:"inner,omitempty"` +} + +func (m *PayloadKey) Reset() { *m = PayloadKey{} } +func (m *PayloadKey) String() string { return proto.CompactTextString(m) } +func (*PayloadKey) ProtoMessage() {} +func (*PayloadKey) Descriptor() ([]byte, []int) { + return fileDescriptor_cd20ea79758052c4, []int{6} +} +func (m *PayloadKey) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *PayloadKey) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_PayloadKey.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *PayloadKey) XXX_Merge(src proto.Message) { + xxx_messageInfo_PayloadKey.Merge(m, src) +} +func (m *PayloadKey) XXX_Size() int { + return m.Size() +} +func (m *PayloadKey) XXX_DiscardUnknown() { + xxx_messageInfo_PayloadKey.DiscardUnknown(m) +} + +var xxx_messageInfo_PayloadKey proto.InternalMessageInfo + +func (m *PayloadKey) GetInner() []byte { + if m != nil { + return m.Inner + } + return nil +} + type PayloadKeyWithCommitment struct { - PayloadKey []byte `protobuf:"bytes,1,opt,name=payload_key,json=payloadKey,proto3" json:"payload_key,omitempty"` + PayloadKey *PayloadKey `protobuf:"bytes,1,opt,name=payload_key,json=payloadKey,proto3" json:"payload_key,omitempty"` Commitment *v1alpha1.StateCommitment `protobuf:"bytes,2,opt,name=commitment,proto3" json:"commitment,omitempty"` } @@ -685,7 +782,7 @@ func (m *PayloadKeyWithCommitment) Reset() { *m = PayloadKeyWithCommitme func (m *PayloadKeyWithCommitment) String() string { return proto.CompactTextString(m) } func (*PayloadKeyWithCommitment) ProtoMessage() {} func (*PayloadKeyWithCommitment) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{5} + return fileDescriptor_cd20ea79758052c4, []int{7} } func (m *PayloadKeyWithCommitment) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -714,7 +811,7 @@ func (m *PayloadKeyWithCommitment) XXX_DiscardUnknown() { var xxx_messageInfo_PayloadKeyWithCommitment proto.InternalMessageInfo -func (m *PayloadKeyWithCommitment) GetPayloadKey() []byte { +func (m *PayloadKeyWithCommitment) GetPayloadKey() *PayloadKey { if m != nil { return m.PayloadKey } @@ -737,7 +834,7 @@ func (m *NullifierWithNote) Reset() { *m = NullifierWithNote{} } func (m *NullifierWithNote) String() string { return proto.CompactTextString(m) } func (*NullifierWithNote) ProtoMessage() {} func (*NullifierWithNote) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{6} + return fileDescriptor_cd20ea79758052c4, []int{8} } func (m *NullifierWithNote) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -780,7 +877,72 @@ func (m *NullifierWithNote) GetNote() *v1alpha1.Note { return nil } +// View of a Penumbra transaction. type TransactionView struct { + // View of the transaction body + BodyView *TransactionBodyView `protobuf:"bytes,1,opt,name=body_view,json=bodyView,proto3" json:"body_view,omitempty"` + // The binding signature is stored separately from the transaction body that it signs. + BindingSig []byte `protobuf:"bytes,2,opt,name=binding_sig,json=bindingSig,proto3" json:"binding_sig,omitempty"` + // The root of some previous state of the state commitment tree, used as an anchor for all + // ZK state transition proofs. + Anchor *v1alpha1.MerkleRoot `protobuf:"bytes,3,opt,name=anchor,proto3" json:"anchor,omitempty"` +} + +func (m *TransactionView) Reset() { *m = TransactionView{} } +func (m *TransactionView) String() string { return proto.CompactTextString(m) } +func (*TransactionView) ProtoMessage() {} +func (*TransactionView) Descriptor() ([]byte, []int) { + return fileDescriptor_cd20ea79758052c4, []int{9} +} +func (m *TransactionView) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *TransactionView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_TransactionView.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *TransactionView) XXX_Merge(src proto.Message) { + xxx_messageInfo_TransactionView.Merge(m, src) +} +func (m *TransactionView) XXX_Size() int { + return m.Size() +} +func (m *TransactionView) XXX_DiscardUnknown() { + xxx_messageInfo_TransactionView.DiscardUnknown(m) +} + +var xxx_messageInfo_TransactionView proto.InternalMessageInfo + +func (m *TransactionView) GetBodyView() *TransactionBodyView { + if m != nil { + return m.BodyView + } + return nil +} + +func (m *TransactionView) GetBindingSig() []byte { + if m != nil { + return m.BindingSig + } + return nil +} + +func (m *TransactionView) GetAnchor() *v1alpha1.MerkleRoot { + if m != nil { + return m.Anchor + } + return nil +} + +type TransactionBodyView struct { // A list views into of actions (state changes) performed by this transaction. ActionViews []*ActionView `protobuf:"bytes,1,rep,name=action_views,json=actionViews,proto3" json:"action_views,omitempty"` // The maximum height that this transaction can be included in the chain. @@ -794,26 +956,24 @@ type TransactionView struct { Fee *v1alpha1.Fee `protobuf:"bytes,4,opt,name=fee,proto3" json:"fee,omitempty"` // A list of clues for use with Fuzzy Message Detection. FmdClues []*v1alpha1.Clue `protobuf:"bytes,5,rep,name=fmd_clues,json=fmdClues,proto3" json:"fmd_clues,omitempty"` - // Types that are valid to be assigned to XMemo: + // Types that are valid to be assigned to XMemoView: // - // *TransactionView_Memo - XMemo isTransactionView_XMemo `protobuf_oneof:"_memo"` - // Any relevant address views. - AddressViews []*v1alpha1.AddressView `protobuf:"bytes,400,rep,name=address_views,json=addressViews,proto3" json:"address_views,omitempty"` + // *TransactionBodyView_MemoView + XMemoView isTransactionBodyView_XMemoView `protobuf_oneof:"_memo_view"` } -func (m *TransactionView) Reset() { *m = TransactionView{} } -func (m *TransactionView) String() string { return proto.CompactTextString(m) } -func (*TransactionView) ProtoMessage() {} -func (*TransactionView) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{7} +func (m *TransactionBodyView) Reset() { *m = TransactionBodyView{} } +func (m *TransactionBodyView) String() string { return proto.CompactTextString(m) } +func (*TransactionBodyView) ProtoMessage() {} +func (*TransactionBodyView) Descriptor() ([]byte, []int) { + return fileDescriptor_cd20ea79758052c4, []int{10} } -func (m *TransactionView) XXX_Unmarshal(b []byte) error { +func (m *TransactionBodyView) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *TransactionView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *TransactionBodyView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_TransactionView.Marshal(b, m, deterministic) + return xxx_messageInfo_TransactionBodyView.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -823,90 +983,83 @@ func (m *TransactionView) XXX_Marshal(b []byte, deterministic bool) ([]byte, err return b[:n], nil } } -func (m *TransactionView) XXX_Merge(src proto.Message) { - xxx_messageInfo_TransactionView.Merge(m, src) +func (m *TransactionBodyView) XXX_Merge(src proto.Message) { + xxx_messageInfo_TransactionBodyView.Merge(m, src) } -func (m *TransactionView) XXX_Size() int { +func (m *TransactionBodyView) XXX_Size() int { return m.Size() } -func (m *TransactionView) XXX_DiscardUnknown() { - xxx_messageInfo_TransactionView.DiscardUnknown(m) +func (m *TransactionBodyView) XXX_DiscardUnknown() { + xxx_messageInfo_TransactionBodyView.DiscardUnknown(m) } -var xxx_messageInfo_TransactionView proto.InternalMessageInfo +var xxx_messageInfo_TransactionBodyView proto.InternalMessageInfo -type isTransactionView_XMemo interface { - isTransactionView_XMemo() +type isTransactionBodyView_XMemoView interface { + isTransactionBodyView_XMemoView() MarshalTo([]byte) (int, error) Size() int } -type TransactionView_Memo struct { - Memo []byte `protobuf:"bytes,6,opt,name=memo,proto3,oneof" json:"memo,omitempty"` +type TransactionBodyView_MemoView struct { + MemoView *MemoView `protobuf:"bytes,6,opt,name=memo_view,json=memoView,proto3,oneof" json:"memo_view,omitempty"` } -func (*TransactionView_Memo) isTransactionView_XMemo() {} +func (*TransactionBodyView_MemoView) isTransactionBodyView_XMemoView() {} -func (m *TransactionView) GetXMemo() isTransactionView_XMemo { +func (m *TransactionBodyView) GetXMemoView() isTransactionBodyView_XMemoView { if m != nil { - return m.XMemo + return m.XMemoView } return nil } -func (m *TransactionView) GetActionViews() []*ActionView { +func (m *TransactionBodyView) GetActionViews() []*ActionView { if m != nil { return m.ActionViews } return nil } -func (m *TransactionView) GetExpiryHeight() uint64 { +func (m *TransactionBodyView) GetExpiryHeight() uint64 { if m != nil { return m.ExpiryHeight } return 0 } -func (m *TransactionView) GetChainId() string { +func (m *TransactionBodyView) GetChainId() string { if m != nil { return m.ChainId } return "" } -func (m *TransactionView) GetFee() *v1alpha1.Fee { +func (m *TransactionBodyView) GetFee() *v1alpha1.Fee { if m != nil { return m.Fee } return nil } -func (m *TransactionView) GetFmdClues() []*v1alpha1.Clue { +func (m *TransactionBodyView) GetFmdClues() []*v1alpha1.Clue { if m != nil { return m.FmdClues } return nil } -func (m *TransactionView) GetMemo() []byte { - if x, ok := m.GetXMemo().(*TransactionView_Memo); ok { - return x.Memo - } - return nil -} - -func (m *TransactionView) GetAddressViews() []*v1alpha1.AddressView { - if m != nil { - return m.AddressViews +func (m *TransactionBodyView) GetMemoView() *MemoView { + if x, ok := m.GetXMemoView().(*TransactionBodyView_MemoView); ok { + return x.MemoView } return nil } // XXX_OneofWrappers is for the internal use of the proto package. -func (*TransactionView) XXX_OneofWrappers() []interface{} { +func (*TransactionBodyView) XXX_OneofWrappers() []interface{} { return []interface{}{ - (*TransactionView_Memo)(nil), + (*TransactionBodyView_MemoView)(nil), } } @@ -943,7 +1096,7 @@ func (m *ActionView) Reset() { *m = ActionView{} } func (m *ActionView) String() string { return proto.CompactTextString(m) } func (*ActionView) ProtoMessage() {} func (*ActionView) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{8} + return fileDescriptor_cd20ea79758052c4, []int{11} } func (m *ActionView) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1269,7 +1422,7 @@ func (m *SpendView) Reset() { *m = SpendView{} } func (m *SpendView) String() string { return proto.CompactTextString(m) } func (*SpendView) ProtoMessage() {} func (*SpendView) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{9} + return fileDescriptor_cd20ea79758052c4, []int{12} } func (m *SpendView) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1344,15 +1497,15 @@ func (*SpendView) XXX_OneofWrappers() []interface{} { } type SpendView_Visible struct { - Spend *Spend `protobuf:"bytes,1,opt,name=spend,proto3" json:"spend,omitempty"` - Note *v1alpha1.Note `protobuf:"bytes,2,opt,name=note,proto3" json:"note,omitempty"` + Spend *Spend `protobuf:"bytes,1,opt,name=spend,proto3" json:"spend,omitempty"` + Note *v1alpha1.NoteView `protobuf:"bytes,2,opt,name=note,proto3" json:"note,omitempty"` } func (m *SpendView_Visible) Reset() { *m = SpendView_Visible{} } func (m *SpendView_Visible) String() string { return proto.CompactTextString(m) } func (*SpendView_Visible) ProtoMessage() {} func (*SpendView_Visible) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{9, 0} + return fileDescriptor_cd20ea79758052c4, []int{12, 0} } func (m *SpendView_Visible) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1388,7 +1541,7 @@ func (m *SpendView_Visible) GetSpend() *Spend { return nil } -func (m *SpendView_Visible) GetNote() *v1alpha1.Note { +func (m *SpendView_Visible) GetNote() *v1alpha1.NoteView { if m != nil { return m.Note } @@ -1403,7 +1556,7 @@ func (m *SpendView_Opaque) Reset() { *m = SpendView_Opaque{} } func (m *SpendView_Opaque) String() string { return proto.CompactTextString(m) } func (*SpendView_Opaque) ProtoMessage() {} func (*SpendView_Opaque) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{9, 1} + return fileDescriptor_cd20ea79758052c4, []int{12, 1} } func (m *SpendView_Opaque) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1451,7 +1604,7 @@ func (m *DelegatorVoteView) Reset() { *m = DelegatorVoteView{} } func (m *DelegatorVoteView) String() string { return proto.CompactTextString(m) } func (*DelegatorVoteView) ProtoMessage() {} func (*DelegatorVoteView) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{10} + return fileDescriptor_cd20ea79758052c4, []int{13} } func (m *DelegatorVoteView) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1527,14 +1680,14 @@ func (*DelegatorVoteView) XXX_OneofWrappers() []interface{} { type DelegatorVoteView_Visible struct { DelegatorVote *v1alpha14.DelegatorVote `protobuf:"bytes,1,opt,name=delegator_vote,json=delegatorVote,proto3" json:"delegator_vote,omitempty"` - Note *v1alpha1.Note `protobuf:"bytes,2,opt,name=note,proto3" json:"note,omitempty"` + Note *v1alpha1.NoteView `protobuf:"bytes,2,opt,name=note,proto3" json:"note,omitempty"` } func (m *DelegatorVoteView_Visible) Reset() { *m = DelegatorVoteView_Visible{} } func (m *DelegatorVoteView_Visible) String() string { return proto.CompactTextString(m) } func (*DelegatorVoteView_Visible) ProtoMessage() {} func (*DelegatorVoteView_Visible) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{10, 0} + return fileDescriptor_cd20ea79758052c4, []int{13, 0} } func (m *DelegatorVoteView_Visible) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1570,7 +1723,7 @@ func (m *DelegatorVoteView_Visible) GetDelegatorVote() *v1alpha14.DelegatorVote return nil } -func (m *DelegatorVoteView_Visible) GetNote() *v1alpha1.Note { +func (m *DelegatorVoteView_Visible) GetNote() *v1alpha1.NoteView { if m != nil { return m.Note } @@ -1585,7 +1738,7 @@ func (m *DelegatorVoteView_Opaque) Reset() { *m = DelegatorVoteView_Opaq func (m *DelegatorVoteView_Opaque) String() string { return proto.CompactTextString(m) } func (*DelegatorVoteView_Opaque) ProtoMessage() {} func (*DelegatorVoteView_Opaque) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{10, 1} + return fileDescriptor_cd20ea79758052c4, []int{13, 1} } func (m *DelegatorVoteView_Opaque) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1633,7 +1786,7 @@ func (m *OutputView) Reset() { *m = OutputView{} } func (m *OutputView) String() string { return proto.CompactTextString(m) } func (*OutputView) ProtoMessage() {} func (*OutputView) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{11} + return fileDescriptor_cd20ea79758052c4, []int{14} } func (m *OutputView) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1708,16 +1861,16 @@ func (*OutputView) XXX_OneofWrappers() []interface{} { } type OutputView_Visible struct { - Output *Output `protobuf:"bytes,1,opt,name=output,proto3" json:"output,omitempty"` - Note *v1alpha1.Note `protobuf:"bytes,2,opt,name=note,proto3" json:"note,omitempty"` - PayloadKey []byte `protobuf:"bytes,3,opt,name=payload_key,json=payloadKey,proto3" json:"payload_key,omitempty"` + Output *Output `protobuf:"bytes,1,opt,name=output,proto3" json:"output,omitempty"` + Note *v1alpha1.NoteView `protobuf:"bytes,2,opt,name=note,proto3" json:"note,omitempty"` + PayloadKey *PayloadKey `protobuf:"bytes,3,opt,name=payload_key,json=payloadKey,proto3" json:"payload_key,omitempty"` } func (m *OutputView_Visible) Reset() { *m = OutputView_Visible{} } func (m *OutputView_Visible) String() string { return proto.CompactTextString(m) } func (*OutputView_Visible) ProtoMessage() {} func (*OutputView_Visible) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{11, 0} + return fileDescriptor_cd20ea79758052c4, []int{14, 0} } func (m *OutputView_Visible) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1753,14 +1906,14 @@ func (m *OutputView_Visible) GetOutput() *Output { return nil } -func (m *OutputView_Visible) GetNote() *v1alpha1.Note { +func (m *OutputView_Visible) GetNote() *v1alpha1.NoteView { if m != nil { return m.Note } return nil } -func (m *OutputView_Visible) GetPayloadKey() []byte { +func (m *OutputView_Visible) GetPayloadKey() *PayloadKey { if m != nil { return m.PayloadKey } @@ -1775,7 +1928,7 @@ func (m *OutputView_Opaque) Reset() { *m = OutputView_Opaque{} } func (m *OutputView_Opaque) String() string { return proto.CompactTextString(m) } func (*OutputView_Opaque) ProtoMessage() {} func (*OutputView_Opaque) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{11, 1} + return fileDescriptor_cd20ea79758052c4, []int{14, 1} } func (m *OutputView_Opaque) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1825,7 +1978,7 @@ func (m *Spend) Reset() { *m = Spend{} } func (m *Spend) String() string { return proto.CompactTextString(m) } func (*Spend) ProtoMessage() {} func (*Spend) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{12} + return fileDescriptor_cd20ea79758052c4, []int{15} } func (m *Spend) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1891,7 +2044,7 @@ func (m *SpendBody) Reset() { *m = SpendBody{} } func (m *SpendBody) String() string { return proto.CompactTextString(m) } func (*SpendBody) ProtoMessage() {} func (*SpendBody) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{13} + return fileDescriptor_cd20ea79758052c4, []int{16} } func (m *SpendBody) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1953,7 +2106,7 @@ func (m *Output) Reset() { *m = Output{} } func (m *Output) String() string { return proto.CompactTextString(m) } func (*Output) ProtoMessage() {} func (*Output) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{14} + return fileDescriptor_cd20ea79758052c4, []int{17} } func (m *Output) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2015,7 +2168,7 @@ func (m *OutputBody) Reset() { *m = OutputBody{} } func (m *OutputBody) String() string { return proto.CompactTextString(m) } func (*OutputBody) ProtoMessage() {} func (*OutputBody) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{15} + return fileDescriptor_cd20ea79758052c4, []int{18} } func (m *OutputBody) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2088,7 +2241,7 @@ func (m *AuthorizationData) Reset() { *m = AuthorizationData{} } func (m *AuthorizationData) String() string { return proto.CompactTextString(m) } func (*AuthorizationData) ProtoMessage() {} func (*AuthorizationData) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{16} + return fileDescriptor_cd20ea79758052c4, []int{19} } func (m *AuthorizationData) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2151,7 +2304,7 @@ func (m *WitnessData) Reset() { *m = WitnessData{} } func (m *WitnessData) String() string { return proto.CompactTextString(m) } func (*WitnessData) ProtoMessage() {} func (*WitnessData) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{17} + return fileDescriptor_cd20ea79758052c4, []int{20} } func (m *WitnessData) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2208,7 +2361,7 @@ func (m *TransactionPlan) Reset() { *m = TransactionPlan{} } func (m *TransactionPlan) String() string { return proto.CompactTextString(m) } func (*TransactionPlan) ProtoMessage() {} func (*TransactionPlan) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{18} + return fileDescriptor_cd20ea79758052c4, []int{21} } func (m *TransactionPlan) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2314,7 +2467,7 @@ func (m *ActionPlan) Reset() { *m = ActionPlan{} } func (m *ActionPlan) String() string { return proto.CompactTextString(m) } func (*ActionPlan) ProtoMessage() {} func (*ActionPlan) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{19} + return fileDescriptor_cd20ea79758052c4, []int{22} } func (m *ActionPlan) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2630,7 +2783,7 @@ func (m *CluePlan) Reset() { *m = CluePlan{} } func (m *CluePlan) String() string { return proto.CompactTextString(m) } func (*CluePlan) ProtoMessage() {} func (*CluePlan) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{20} + return fileDescriptor_cd20ea79758052c4, []int{23} } func (m *CluePlan) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2683,7 +2836,7 @@ func (m *CluePlan) GetPrecisionBits() uint64 { // Describes a plan for forming a `Memo`. type MemoPlan struct { // The plaintext. - Plaintext []byte `protobuf:"bytes,1,opt,name=plaintext,proto3" json:"plaintext,omitempty"` + Plaintext *MemoPlaintext `protobuf:"bytes,1,opt,name=plaintext,proto3" json:"plaintext,omitempty"` // The key to use to encrypt the memo. Key []byte `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"` } @@ -2692,7 +2845,7 @@ func (m *MemoPlan) Reset() { *m = MemoPlan{} } func (m *MemoPlan) String() string { return proto.CompactTextString(m) } func (*MemoPlan) ProtoMessage() {} func (*MemoPlan) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{21} + return fileDescriptor_cd20ea79758052c4, []int{24} } func (m *MemoPlan) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2721,7 +2874,7 @@ func (m *MemoPlan) XXX_DiscardUnknown() { var xxx_messageInfo_MemoPlan proto.InternalMessageInfo -func (m *MemoPlan) GetPlaintext() []byte { +func (m *MemoPlan) GetPlaintext() *MemoPlaintext { if m != nil { return m.Plaintext } @@ -2735,29 +2888,22 @@ func (m *MemoPlan) GetKey() []byte { return nil } -type SpendPlan struct { - // The plaintext note we plan to spend. - Note *v1alpha1.Note `protobuf:"bytes,1,opt,name=note,proto3" json:"note,omitempty"` - // The position of the note we plan to spend. - Position uint64 `protobuf:"varint,2,opt,name=position,proto3" json:"position,omitempty"` - // The randomizer to use for the spend. - Randomizer []byte `protobuf:"bytes,3,opt,name=randomizer,proto3" json:"randomizer,omitempty"` - // The blinding factor to use for the value commitment. - ValueBlinding []byte `protobuf:"bytes,4,opt,name=value_blinding,json=valueBlinding,proto3" json:"value_blinding,omitempty"` +type MemoCiphertext struct { + Inner []byte `protobuf:"bytes,1,opt,name=inner,proto3" json:"inner,omitempty"` } -func (m *SpendPlan) Reset() { *m = SpendPlan{} } -func (m *SpendPlan) String() string { return proto.CompactTextString(m) } -func (*SpendPlan) ProtoMessage() {} -func (*SpendPlan) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{22} +func (m *MemoCiphertext) Reset() { *m = MemoCiphertext{} } +func (m *MemoCiphertext) String() string { return proto.CompactTextString(m) } +func (*MemoCiphertext) ProtoMessage() {} +func (*MemoCiphertext) Descriptor() ([]byte, []int) { + return fileDescriptor_cd20ea79758052c4, []int{25} } -func (m *SpendPlan) XXX_Unmarshal(b []byte) error { +func (m *MemoCiphertext) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *SpendPlan) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MemoCiphertext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_SpendPlan.Marshal(b, m, deterministic) + return xxx_messageInfo_MemoCiphertext.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -2767,69 +2913,97 @@ func (m *SpendPlan) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (m *SpendPlan) XXX_Merge(src proto.Message) { - xxx_messageInfo_SpendPlan.Merge(m, src) +func (m *MemoCiphertext) XXX_Merge(src proto.Message) { + xxx_messageInfo_MemoCiphertext.Merge(m, src) } -func (m *SpendPlan) XXX_Size() int { +func (m *MemoCiphertext) XXX_Size() int { return m.Size() } -func (m *SpendPlan) XXX_DiscardUnknown() { - xxx_messageInfo_SpendPlan.DiscardUnknown(m) +func (m *MemoCiphertext) XXX_DiscardUnknown() { + xxx_messageInfo_MemoCiphertext.DiscardUnknown(m) } -var xxx_messageInfo_SpendPlan proto.InternalMessageInfo +var xxx_messageInfo_MemoCiphertext proto.InternalMessageInfo -func (m *SpendPlan) GetNote() *v1alpha1.Note { +func (m *MemoCiphertext) GetInner() []byte { if m != nil { - return m.Note + return m.Inner } return nil } -func (m *SpendPlan) GetPosition() uint64 { - if m != nil { - return m.Position +type MemoPlaintext struct { + Sender *v1alpha1.Address `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty"` + Text string `protobuf:"bytes,2,opt,name=text,proto3" json:"text,omitempty"` +} + +func (m *MemoPlaintext) Reset() { *m = MemoPlaintext{} } +func (m *MemoPlaintext) String() string { return proto.CompactTextString(m) } +func (*MemoPlaintext) ProtoMessage() {} +func (*MemoPlaintext) Descriptor() ([]byte, []int) { + return fileDescriptor_cd20ea79758052c4, []int{26} +} +func (m *MemoPlaintext) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MemoPlaintext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MemoPlaintext.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil } - return 0 +} +func (m *MemoPlaintext) XXX_Merge(src proto.Message) { + xxx_messageInfo_MemoPlaintext.Merge(m, src) +} +func (m *MemoPlaintext) XXX_Size() int { + return m.Size() +} +func (m *MemoPlaintext) XXX_DiscardUnknown() { + xxx_messageInfo_MemoPlaintext.DiscardUnknown(m) } -func (m *SpendPlan) GetRandomizer() []byte { +var xxx_messageInfo_MemoPlaintext proto.InternalMessageInfo + +func (m *MemoPlaintext) GetSender() *v1alpha1.Address { if m != nil { - return m.Randomizer + return m.Sender } return nil } -func (m *SpendPlan) GetValueBlinding() []byte { +func (m *MemoPlaintext) GetText() string { if m != nil { - return m.ValueBlinding + return m.Text } - return nil + return "" } -type OutputPlan struct { - // The value to send to this output. - Value *v1alpha1.Value `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` - // The destination address to send it to. - DestAddress *v1alpha1.Address `protobuf:"bytes,2,opt,name=dest_address,json=destAddress,proto3" json:"dest_address,omitempty"` - // The rseed to use for the new note. - Rseed []byte `protobuf:"bytes,3,opt,name=rseed,proto3" json:"rseed,omitempty"` - // The blinding factor to use for the value commitment. - ValueBlinding []byte `protobuf:"bytes,4,opt,name=value_blinding,json=valueBlinding,proto3" json:"value_blinding,omitempty"` +type MemoView struct { + // Types that are valid to be assigned to MemoView: + // + // *MemoView_Visible_ + // *MemoView_Opaque_ + MemoView isMemoView_MemoView `protobuf_oneof:"memo_view"` } -func (m *OutputPlan) Reset() { *m = OutputPlan{} } -func (m *OutputPlan) String() string { return proto.CompactTextString(m) } -func (*OutputPlan) ProtoMessage() {} -func (*OutputPlan) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{23} +func (m *MemoView) Reset() { *m = MemoView{} } +func (m *MemoView) String() string { return proto.CompactTextString(m) } +func (*MemoView) ProtoMessage() {} +func (*MemoView) Descriptor() ([]byte, []int) { + return fileDescriptor_cd20ea79758052c4, []int{27} } -func (m *OutputPlan) XXX_Unmarshal(b []byte) error { +func (m *MemoView) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *OutputPlan) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MemoView) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_OutputPlan.Marshal(b, m, deterministic) + return xxx_messageInfo_MemoView.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -2839,22 +3013,279 @@ func (m *OutputPlan) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (m *OutputPlan) XXX_Merge(src proto.Message) { - xxx_messageInfo_OutputPlan.Merge(m, src) +func (m *MemoView) XXX_Merge(src proto.Message) { + xxx_messageInfo_MemoView.Merge(m, src) } -func (m *OutputPlan) XXX_Size() int { +func (m *MemoView) XXX_Size() int { return m.Size() } -func (m *OutputPlan) XXX_DiscardUnknown() { - xxx_messageInfo_OutputPlan.DiscardUnknown(m) +func (m *MemoView) XXX_DiscardUnknown() { + xxx_messageInfo_MemoView.DiscardUnknown(m) } -var xxx_messageInfo_OutputPlan proto.InternalMessageInfo +var xxx_messageInfo_MemoView proto.InternalMessageInfo -func (m *OutputPlan) GetValue() *v1alpha1.Value { - if m != nil { - return m.Value - } +type isMemoView_MemoView interface { + isMemoView_MemoView() + MarshalTo([]byte) (int, error) + Size() int +} + +type MemoView_Visible_ struct { + Visible *MemoView_Visible `protobuf:"bytes,1,opt,name=visible,proto3,oneof" json:"visible,omitempty"` +} +type MemoView_Opaque_ struct { + Opaque *MemoView_Opaque `protobuf:"bytes,2,opt,name=opaque,proto3,oneof" json:"opaque,omitempty"` +} + +func (*MemoView_Visible_) isMemoView_MemoView() {} +func (*MemoView_Opaque_) isMemoView_MemoView() {} + +func (m *MemoView) GetMemoView() isMemoView_MemoView { + if m != nil { + return m.MemoView + } + return nil +} + +func (m *MemoView) GetVisible() *MemoView_Visible { + if x, ok := m.GetMemoView().(*MemoView_Visible_); ok { + return x.Visible + } + return nil +} + +func (m *MemoView) GetOpaque() *MemoView_Opaque { + if x, ok := m.GetMemoView().(*MemoView_Opaque_); ok { + return x.Opaque + } + return nil +} + +// XXX_OneofWrappers is for the internal use of the proto package. +func (*MemoView) XXX_OneofWrappers() []interface{} { + return []interface{}{ + (*MemoView_Visible_)(nil), + (*MemoView_Opaque_)(nil), + } +} + +type MemoView_Visible struct { + Ciphertext *MemoCiphertext `protobuf:"bytes,1,opt,name=ciphertext,proto3" json:"ciphertext,omitempty"` + Plaintext *MemoPlaintext `protobuf:"bytes,2,opt,name=plaintext,proto3" json:"plaintext,omitempty"` +} + +func (m *MemoView_Visible) Reset() { *m = MemoView_Visible{} } +func (m *MemoView_Visible) String() string { return proto.CompactTextString(m) } +func (*MemoView_Visible) ProtoMessage() {} +func (*MemoView_Visible) Descriptor() ([]byte, []int) { + return fileDescriptor_cd20ea79758052c4, []int{27, 0} +} +func (m *MemoView_Visible) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MemoView_Visible) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MemoView_Visible.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *MemoView_Visible) XXX_Merge(src proto.Message) { + xxx_messageInfo_MemoView_Visible.Merge(m, src) +} +func (m *MemoView_Visible) XXX_Size() int { + return m.Size() +} +func (m *MemoView_Visible) XXX_DiscardUnknown() { + xxx_messageInfo_MemoView_Visible.DiscardUnknown(m) +} + +var xxx_messageInfo_MemoView_Visible proto.InternalMessageInfo + +func (m *MemoView_Visible) GetCiphertext() *MemoCiphertext { + if m != nil { + return m.Ciphertext + } + return nil +} + +func (m *MemoView_Visible) GetPlaintext() *MemoPlaintext { + if m != nil { + return m.Plaintext + } + return nil +} + +type MemoView_Opaque struct { + Ciphertext *MemoCiphertext `protobuf:"bytes,1,opt,name=ciphertext,proto3" json:"ciphertext,omitempty"` +} + +func (m *MemoView_Opaque) Reset() { *m = MemoView_Opaque{} } +func (m *MemoView_Opaque) String() string { return proto.CompactTextString(m) } +func (*MemoView_Opaque) ProtoMessage() {} +func (*MemoView_Opaque) Descriptor() ([]byte, []int) { + return fileDescriptor_cd20ea79758052c4, []int{27, 1} +} +func (m *MemoView_Opaque) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MemoView_Opaque) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MemoView_Opaque.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *MemoView_Opaque) XXX_Merge(src proto.Message) { + xxx_messageInfo_MemoView_Opaque.Merge(m, src) +} +func (m *MemoView_Opaque) XXX_Size() int { + return m.Size() +} +func (m *MemoView_Opaque) XXX_DiscardUnknown() { + xxx_messageInfo_MemoView_Opaque.DiscardUnknown(m) +} + +var xxx_messageInfo_MemoView_Opaque proto.InternalMessageInfo + +func (m *MemoView_Opaque) GetCiphertext() *MemoCiphertext { + if m != nil { + return m.Ciphertext + } + return nil +} + +type SpendPlan struct { + // The plaintext note we plan to spend. + Note *v1alpha1.Note `protobuf:"bytes,1,opt,name=note,proto3" json:"note,omitempty"` + // The position of the note we plan to spend. + Position uint64 `protobuf:"varint,2,opt,name=position,proto3" json:"position,omitempty"` + // The randomizer to use for the spend. + Randomizer []byte `protobuf:"bytes,3,opt,name=randomizer,proto3" json:"randomizer,omitempty"` + // The blinding factor to use for the value commitment. + ValueBlinding []byte `protobuf:"bytes,4,opt,name=value_blinding,json=valueBlinding,proto3" json:"value_blinding,omitempty"` +} + +func (m *SpendPlan) Reset() { *m = SpendPlan{} } +func (m *SpendPlan) String() string { return proto.CompactTextString(m) } +func (*SpendPlan) ProtoMessage() {} +func (*SpendPlan) Descriptor() ([]byte, []int) { + return fileDescriptor_cd20ea79758052c4, []int{28} +} +func (m *SpendPlan) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *SpendPlan) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_SpendPlan.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *SpendPlan) XXX_Merge(src proto.Message) { + xxx_messageInfo_SpendPlan.Merge(m, src) +} +func (m *SpendPlan) XXX_Size() int { + return m.Size() +} +func (m *SpendPlan) XXX_DiscardUnknown() { + xxx_messageInfo_SpendPlan.DiscardUnknown(m) +} + +var xxx_messageInfo_SpendPlan proto.InternalMessageInfo + +func (m *SpendPlan) GetNote() *v1alpha1.Note { + if m != nil { + return m.Note + } + return nil +} + +func (m *SpendPlan) GetPosition() uint64 { + if m != nil { + return m.Position + } + return 0 +} + +func (m *SpendPlan) GetRandomizer() []byte { + if m != nil { + return m.Randomizer + } + return nil +} + +func (m *SpendPlan) GetValueBlinding() []byte { + if m != nil { + return m.ValueBlinding + } + return nil +} + +type OutputPlan struct { + // The value to send to this output. + Value *v1alpha1.Value `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` + // The destination address to send it to. + DestAddress *v1alpha1.Address `protobuf:"bytes,2,opt,name=dest_address,json=destAddress,proto3" json:"dest_address,omitempty"` + // The rseed to use for the new note. + Rseed []byte `protobuf:"bytes,3,opt,name=rseed,proto3" json:"rseed,omitempty"` + // The blinding factor to use for the value commitment. + ValueBlinding []byte `protobuf:"bytes,4,opt,name=value_blinding,json=valueBlinding,proto3" json:"value_blinding,omitempty"` +} + +func (m *OutputPlan) Reset() { *m = OutputPlan{} } +func (m *OutputPlan) String() string { return proto.CompactTextString(m) } +func (*OutputPlan) ProtoMessage() {} +func (*OutputPlan) Descriptor() ([]byte, []int) { + return fileDescriptor_cd20ea79758052c4, []int{29} +} +func (m *OutputPlan) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *OutputPlan) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_OutputPlan.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *OutputPlan) XXX_Merge(src proto.Message) { + xxx_messageInfo_OutputPlan.Merge(m, src) +} +func (m *OutputPlan) XXX_Size() int { + return m.Size() +} +func (m *OutputPlan) XXX_DiscardUnknown() { + xxx_messageInfo_OutputPlan.DiscardUnknown(m) +} + +var xxx_messageInfo_OutputPlan proto.InternalMessageInfo + +func (m *OutputPlan) GetValue() *v1alpha1.Value { + if m != nil { + return m.Value + } return nil } @@ -2882,12 +3313,15 @@ func (m *OutputPlan) GetValueBlinding() []byte { func init() { proto.RegisterType((*Transaction)(nil), "penumbra.core.transaction.v1alpha1.Transaction") proto.RegisterType((*Id)(nil), "penumbra.core.transaction.v1alpha1.Id") + proto.RegisterType((*EffectHash)(nil), "penumbra.core.transaction.v1alpha1.EffectHash") proto.RegisterType((*TransactionBody)(nil), "penumbra.core.transaction.v1alpha1.TransactionBody") proto.RegisterType((*Action)(nil), "penumbra.core.transaction.v1alpha1.Action") proto.RegisterType((*TransactionPerspective)(nil), "penumbra.core.transaction.v1alpha1.TransactionPerspective") + proto.RegisterType((*PayloadKey)(nil), "penumbra.core.transaction.v1alpha1.PayloadKey") proto.RegisterType((*PayloadKeyWithCommitment)(nil), "penumbra.core.transaction.v1alpha1.PayloadKeyWithCommitment") proto.RegisterType((*NullifierWithNote)(nil), "penumbra.core.transaction.v1alpha1.NullifierWithNote") proto.RegisterType((*TransactionView)(nil), "penumbra.core.transaction.v1alpha1.TransactionView") + proto.RegisterType((*TransactionBodyView)(nil), "penumbra.core.transaction.v1alpha1.TransactionBodyView") proto.RegisterType((*ActionView)(nil), "penumbra.core.transaction.v1alpha1.ActionView") proto.RegisterType((*SpendView)(nil), "penumbra.core.transaction.v1alpha1.SpendView") proto.RegisterType((*SpendView_Visible)(nil), "penumbra.core.transaction.v1alpha1.SpendView.Visible") @@ -2908,6 +3342,11 @@ func init() { proto.RegisterType((*ActionPlan)(nil), "penumbra.core.transaction.v1alpha1.ActionPlan") proto.RegisterType((*CluePlan)(nil), "penumbra.core.transaction.v1alpha1.CluePlan") proto.RegisterType((*MemoPlan)(nil), "penumbra.core.transaction.v1alpha1.MemoPlan") + proto.RegisterType((*MemoCiphertext)(nil), "penumbra.core.transaction.v1alpha1.MemoCiphertext") + proto.RegisterType((*MemoPlaintext)(nil), "penumbra.core.transaction.v1alpha1.MemoPlaintext") + proto.RegisterType((*MemoView)(nil), "penumbra.core.transaction.v1alpha1.MemoView") + proto.RegisterType((*MemoView_Visible)(nil), "penumbra.core.transaction.v1alpha1.MemoView.Visible") + proto.RegisterType((*MemoView_Opaque)(nil), "penumbra.core.transaction.v1alpha1.MemoView.Opaque") proto.RegisterType((*SpendPlan)(nil), "penumbra.core.transaction.v1alpha1.SpendPlan") proto.RegisterType((*OutputPlan)(nil), "penumbra.core.transaction.v1alpha1.OutputPlan") } @@ -2917,158 +3356,171 @@ func init() { } var fileDescriptor_cd20ea79758052c4 = []byte{ - // 2406 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0xcd, 0x6f, 0x1b, 0xc7, - 0x15, 0xe7, 0x92, 0xfa, 0x7c, 0xa4, 0xbe, 0xc6, 0x1f, 0xd9, 0x0a, 0x85, 0x62, 0x6c, 0x6c, 0x43, - 0xb6, 0x13, 0xca, 0x96, 0xed, 0x04, 0x50, 0x53, 0x34, 0xa2, 0x14, 0x87, 0xb2, 0x23, 0x9b, 0x59, - 0xa7, 0x32, 0xec, 0xba, 0xd9, 0x0e, 0x77, 0x47, 0xe2, 0x42, 0xcb, 0x9d, 0xed, 0xee, 0x92, 0xb2, - 0x72, 0xed, 0x25, 0x45, 0xd1, 0xc2, 0x87, 0x1e, 0x8a, 0xb6, 0xa7, 0x5e, 0x02, 0xf4, 0x2f, 0x28, - 0x0a, 0xf4, 0x1e, 0xf4, 0x50, 0x18, 0xe8, 0xa5, 0x45, 0x2f, 0xad, 0x7d, 0x6a, 0x6f, 0x05, 0xfa, - 0x07, 0x14, 0x33, 0x3b, 0xfb, 0x49, 0xca, 0x5c, 0xd2, 0x0a, 0x82, 0xc4, 0x3e, 0x69, 0xe7, 0xe9, - 0xbd, 0xdf, 0xcc, 0xbc, 0xf7, 0x66, 0xe6, 0x37, 0x6f, 0x08, 0xd7, 0x1c, 0x62, 0x77, 0xda, 0x4d, - 0x17, 0xaf, 0xe8, 0xd4, 0x25, 0x2b, 0xbe, 0x8b, 0x6d, 0x0f, 0xeb, 0xbe, 0x49, 0xed, 0x95, 0xee, - 0x15, 0x6c, 0x39, 0x2d, 0x7c, 0x25, 0x29, 0xac, 0x3a, 0x2e, 0xf5, 0x29, 0x52, 0x42, 0xab, 0x2a, - 0xb3, 0xaa, 0x26, 0x15, 0x42, 0xab, 0xc5, 0x8b, 0x69, 0x64, 0xdd, 0x3d, 0x74, 0x7c, 0x1a, 0x83, - 0x06, 0xed, 0x00, 0x6f, 0x71, 0x39, 0xad, 0xeb, 0xf9, 0x78, 0x9f, 0xc4, 0xaa, 0xbc, 0x29, 0x34, - 0xcf, 0xa6, 0x35, 0xcd, 0xa6, 0x1e, 0xeb, 0x99, 0x4d, 0xbd, 0xbf, 0x96, 0x41, 0x1e, 0xc5, 0x5a, - 0x06, 0x79, 0x24, 0xb4, 0x56, 0xd3, 0x5a, 0x7b, 0xb4, 0x4b, 0x5c, 0x1b, 0xdb, 0x7a, 0xa2, 0xeb, - 0x58, 0x16, 0xd8, 0x28, 0x7f, 0x94, 0xa0, 0xfc, 0x71, 0x3c, 0x5d, 0xf4, 0x01, 0x8c, 0x35, 0xa9, - 0x71, 0x28, 0x4b, 0x67, 0xa4, 0xe5, 0xf2, 0xea, 0xd5, 0xea, 0x60, 0xc7, 0x54, 0x13, 0xe6, 0x35, - 0x6a, 0x1c, 0xaa, 0x1c, 0x00, 0xbd, 0x0e, 0xe5, 0xa6, 0x69, 0x1b, 0xa6, 0xbd, 0xa7, 0x79, 0xe6, - 0x9e, 0x5c, 0x3c, 0x23, 0x2d, 0x57, 0x54, 0x10, 0xa2, 0xbb, 0xe6, 0x1e, 0x5a, 0x87, 0x09, 0x6c, - 0xeb, 0x2d, 0xea, 0xca, 0x25, 0xde, 0xd7, 0x85, 0x4c, 0x5f, 0xc2, 0xa1, 0x51, 0x37, 0xdb, 0xc4, - 0xdd, 0xb7, 0x88, 0x4a, 0xa9, 0xaf, 0x0a, 0x43, 0x45, 0x86, 0xe2, 0x96, 0x81, 0x10, 0x8c, 0xb5, - 0xb0, 0xd7, 0xe2, 0x43, 0xae, 0xa8, 0xfc, 0x5b, 0xf9, 0x4b, 0x11, 0xe6, 0x32, 0xe3, 0x42, 0x9b, - 0x30, 0x19, 0xb4, 0x3c, 0x59, 0x3a, 0x53, 0x5a, 0x2e, 0xaf, 0x5e, 0xcc, 0x33, 0xbb, 0x75, 0xde, - 0x56, 0x43, 0x53, 0xf4, 0x06, 0xcc, 0x90, 0x47, 0x8e, 0xe9, 0x1e, 0x6a, 0x2d, 0x62, 0xee, 0xb5, - 0x7c, 0x3e, 0xb3, 0x31, 0xb5, 0x12, 0x08, 0xeb, 0x5c, 0x86, 0xbe, 0x05, 0x53, 0x7a, 0x0b, 0x9b, - 0xb6, 0x66, 0x1a, 0x7c, 0x76, 0xd3, 0xea, 0x24, 0x6f, 0x6f, 0x19, 0xe8, 0x1a, 0x94, 0x76, 0x09, - 0x91, 0xc7, 0xf8, 0x9c, 0x95, 0x01, 0x73, 0xbe, 0x41, 0x88, 0xca, 0xd4, 0xd1, 0x7b, 0x30, 0xbd, - 0xdb, 0x36, 0x34, 0xdd, 0xea, 0x10, 0x4f, 0x1e, 0xe7, 0xa3, 0x7f, 0x63, 0x80, 0xed, 0x86, 0xd5, - 0x21, 0xea, 0xd4, 0x6e, 0xdb, 0x60, 0x1f, 0x1e, 0xba, 0x08, 0xb3, 0xc4, 0xe6, 0x3a, 0xc4, 0xd0, - 0xda, 0xa4, 0x4d, 0xe5, 0x09, 0xe6, 0xaf, 0x7a, 0x41, 0x9d, 0x89, 0xe4, 0xdb, 0xa4, 0x4d, 0x3f, - 0x93, 0xa4, 0xda, 0x02, 0xcc, 0x69, 0x69, 0x65, 0xe5, 0xaf, 0xb3, 0x30, 0x11, 0xb8, 0x02, 0xad, - 0xc3, 0xb8, 0xe7, 0x10, 0xdb, 0x10, 0x39, 0x72, 0x21, 0x8f, 0x17, 0xef, 0x32, 0x83, 0x7a, 0x41, - 0x0d, 0x2c, 0xd1, 0x26, 0x4c, 0xd0, 0x8e, 0xef, 0x74, 0x02, 0xef, 0xe5, 0x8c, 0xc4, 0x1d, 0x6e, - 0x51, 0x2f, 0xa8, 0xc2, 0x16, 0xbd, 0x0d, 0x63, 0xde, 0x01, 0x76, 0x44, 0xfe, 0x9c, 0xc9, 0x60, - 0xb0, 0x75, 0x11, 0xf7, 0x7f, 0x80, 0x9d, 0x7a, 0x41, 0xe5, 0xfa, 0xe8, 0x06, 0x00, 0xfb, 0xab, - 0xe9, 0x16, 0x36, 0xdb, 0x22, 0x12, 0xe7, 0x06, 0x59, 0x6f, 0x30, 0xe5, 0x7a, 0x41, 0x9d, 0xf6, - 0xc2, 0x06, 0xda, 0x85, 0x93, 0x5d, 0x6c, 0x99, 0x06, 0xf6, 0xa9, 0xab, 0x19, 0x64, 0xd7, 0xb4, - 0x4d, 0x36, 0x62, 0x79, 0x9e, 0x23, 0x5e, 0xc9, 0x20, 0x06, 0xab, 0x3e, 0xc2, 0xdc, 0x09, 0x2d, - 0x37, 0x23, 0xc3, 0x7a, 0x41, 0x3d, 0xd1, 0xed, 0x15, 0xb3, 0xf1, 0x9a, 0x4d, 0x5d, 0x0b, 0xfc, - 0x21, 0x2f, 0xf4, 0x1d, 0x2f, 0xdb, 0x2b, 0x22, 0xec, 0xad, 0xa6, 0x1e, 0xc4, 0x8a, 0x8d, 0xd7, - 0x0c, 0x1b, 0xe8, 0x21, 0xcc, 0x39, 0x2e, 0x75, 0xa8, 0x87, 0x2d, 0xcd, 0xeb, 0x34, 0xdb, 0xa6, - 0x2f, 0xa3, 0xbe, 0x43, 0x4d, 0xec, 0x12, 0x11, 0x66, 0x43, 0x58, 0xde, 0xe5, 0x86, 0xf5, 0x82, - 0x3a, 0xeb, 0xa4, 0x24, 0xa8, 0x09, 0x0b, 0x11, 0xfa, 0x81, 0xe9, 0xb7, 0x0c, 0x17, 0x1f, 0xc8, - 0x27, 0xfa, 0x6e, 0x23, 0xcf, 0xc3, 0xbf, 0x27, 0x4c, 0xeb, 0x05, 0x75, 0xde, 0xc9, 0xc8, 0xd0, - 0x7d, 0x98, 0x8d, 0x3d, 0xde, 0xa5, 0x3e, 0x91, 0x4f, 0xf2, 0x0e, 0x2e, 0xe7, 0xe8, 0x20, 0x72, - 0xf8, 0x0e, 0xf5, 0x09, 0x4b, 0xfb, 0x6e, 0x52, 0xc0, 0xa0, 0x0d, 0x62, 0x91, 0xbd, 0x18, 0xfa, - 0x54, 0x6e, 0xe8, 0xcd, 0xd0, 0x30, 0x84, 0x36, 0x92, 0x02, 0x44, 0xe1, 0x74, 0xe4, 0x19, 0x83, - 0x38, 0xd4, 0x33, 0x7d, 0x91, 0x7b, 0xa7, 0x79, 0x17, 0xef, 0x0c, 0xe1, 0x9e, 0xcd, 0xc0, 0x3e, - 0xcc, 0xc6, 0x93, 0x4e, 0x1f, 0x39, 0xba, 0x03, 0x33, 0xbc, 0x65, 0x52, 0x5b, 0xa3, 0x0e, 0xb1, - 0xe5, 0x25, 0xde, 0xcf, 0xf2, 0xf3, 0x72, 0xbc, 0x21, 0x0c, 0xee, 0x38, 0x84, 0xa5, 0x4d, 0xc5, - 0x49, 0xb4, 0x91, 0x0a, 0xb3, 0x11, 0xa0, 0x6e, 0x51, 0x8f, 0xc8, 0xaf, 0xf7, 0x5d, 0xfb, 0x7d, - 0x11, 0x37, 0x98, 0x01, 0xf3, 0x8a, 0x93, 0x14, 0xa0, 0x1f, 0xc0, 0x42, 0x84, 0x19, 0xe5, 0xcb, - 0x19, 0x0e, 0xfb, 0x66, 0x1e, 0xd8, 0x54, 0xa2, 0x64, 0x64, 0x88, 0xc0, 0xa9, 0x08, 0xdc, 0x25, - 0x07, 0xd8, 0x35, 0x84, 0xc7, 0x15, 0xde, 0xc1, 0x4a, 0x9e, 0x0e, 0x54, 0x6e, 0x17, 0x7a, 0xfa, - 0x84, 0xd3, 0x2b, 0x46, 0x9b, 0x30, 0x25, 0x42, 0x4d, 0xe4, 0x65, 0x8e, 0x7c, 0xfe, 0xf9, 0xab, - 0x5e, 0x64, 0x0a, 0x73, 0x47, 0x64, 0x89, 0x6e, 0x02, 0x74, 0xec, 0x08, 0xe7, 0x42, 0xdf, 0x58, - 0x65, 0x70, 0xbe, 0x1f, 0xe9, 0xd7, 0x0b, 0x6a, 0xc2, 0x1a, 0x3d, 0x80, 0xf9, 0xb8, 0x25, 0xe6, - 0x7c, 0x91, 0x23, 0xbe, 0x95, 0x17, 0x31, 0x9c, 0xf1, 0x5c, 0x27, 0x2d, 0x42, 0x37, 0x61, 0xda, - 0xc0, 0x54, 0x0b, 0x36, 0xff, 0x55, 0x0e, 0x7a, 0x29, 0xcf, 0xea, 0xc0, 0x34, 0xdc, 0xfe, 0xa7, - 0x0c, 0xf1, 0x8d, 0xb6, 0x01, 0x18, 0x96, 0x38, 0x05, 0xae, 0xf6, 0x0d, 0xfb, 0x11, 0x60, 0xd1, - 0x39, 0xc0, 0x46, 0x13, 0x34, 0x50, 0x03, 0xca, 0x0c, 0x4e, 0xac, 0x2e, 0xf9, 0x5a, 0xdf, 0x19, - 0x1f, 0x81, 0x27, 0x96, 0x0e, 0x73, 0xa4, 0x11, 0xb5, 0xd0, 0x7d, 0x98, 0x37, 0x75, 0x6f, 0xf5, - 0x72, 0x94, 0x9b, 0xd8, 0x92, 0xbf, 0x90, 0xfa, 0x4e, 0x3a, 0xbd, 0xf7, 0x32, 0xa3, 0x7b, 0x91, - 0x0d, 0xf3, 0xa3, 0x99, 0x16, 0xd5, 0xa6, 0x60, 0x22, 0xd8, 0xcb, 0x95, 0xff, 0x15, 0xe1, 0x74, - 0x82, 0xa6, 0x34, 0x88, 0xeb, 0x39, 0x44, 0xf7, 0xcd, 0x2e, 0x41, 0x1a, 0x54, 0x1c, 0x7c, 0x68, - 0x51, 0x6c, 0x68, 0xfb, 0xe4, 0x30, 0xa4, 0x2c, 0xef, 0xe6, 0x39, 0x28, 0x1b, 0x81, 0xdd, 0x2d, - 0x72, 0xc8, 0x3a, 0xdd, 0xa0, 0xed, 0xb6, 0xe9, 0xb7, 0x89, 0xed, 0xab, 0x65, 0x27, 0xfa, 0x8f, - 0x87, 0x7e, 0x04, 0xf3, 0x3c, 0x92, 0x9a, 0xdd, 0xb1, 0x2c, 0x73, 0xd7, 0x24, 0xae, 0x27, 0x17, - 0x79, 0x27, 0xd7, 0xf3, 0x74, 0x72, 0x3b, 0xb4, 0x62, 0x7d, 0xdc, 0xa6, 0x3e, 0x51, 0xe7, 0x38, - 0x5c, 0x24, 0xf7, 0xd0, 0x0d, 0xa8, 0x60, 0xa3, 0x6b, 0xea, 0x44, 0xb3, 0xa9, 0x4f, 0x3c, 0xb9, - 0x94, 0x8b, 0xb7, 0x70, 0xac, 0x72, 0x60, 0xc8, 0xbe, 0x3d, 0xb6, 0x9d, 0x61, 0xc3, 0x70, 0x89, - 0xe7, 0x69, 0x5d, 0x93, 0x1c, 0x78, 0xf2, 0x58, 0x5f, 0xfa, 0x96, 0x05, 0x5a, 0x0f, 0x6c, 0x76, - 0x4c, 0x72, 0xa0, 0x56, 0x70, 0xdc, 0xf0, 0x94, 0x9f, 0x49, 0x20, 0x1f, 0xe5, 0x24, 0x46, 0x5c, - 0x13, 0x8e, 0x17, 0xac, 0x12, 0x62, 0xcf, 0xa1, 0xdb, 0x00, 0x7a, 0xa4, 0x2e, 0x08, 0x4c, 0x75, - 0xc0, 0x58, 0xee, 0xfa, 0x6c, 0x15, 0xc5, 0x91, 0x48, 0x20, 0x28, 0xbf, 0x94, 0x60, 0xa1, 0xc7, - 0x9b, 0xe8, 0x06, 0x4c, 0x47, 0x81, 0x11, 0x4c, 0x6b, 0x79, 0x90, 0xe7, 0x42, 0x7d, 0x35, 0x36, - 0x45, 0xef, 0xc0, 0x18, 0xf3, 0xbe, 0x18, 0x67, 0x2e, 0xe7, 0x73, 0x03, 0xe5, 0x71, 0x29, 0x45, - 0xa1, 0x99, 0xe7, 0xd0, 0x47, 0x50, 0x09, 0x5a, 0x22, 0x10, 0x41, 0x52, 0x56, 0xf3, 0xf3, 0x68, - 0x1e, 0x8c, 0x72, 0x8c, 0xf8, 0xf5, 0xe5, 0xd3, 0xaf, 0xc1, 0x58, 0x8a, 0x45, 0xf3, 0xd6, 0x67, - 0x92, 0x84, 0x1a, 0xd9, 0x6c, 0x7d, 0x5c, 0x7a, 0xb1, 0x74, 0xad, 0x4d, 0xc2, 0x78, 0x40, 0xc2, - 0xff, 0x3b, 0x0b, 0x10, 0xfb, 0x11, 0xbd, 0x9f, 0x26, 0xe2, 0x6f, 0xe5, 0x26, 0xe2, 0xcc, 0x3a, - 0x26, 0xe3, 0xf5, 0x0c, 0x19, 0xaf, 0xe6, 0x27, 0xe3, 0x02, 0x28, 0x24, 0xe4, 0x6b, 0x29, 0x42, - 0x7e, 0x76, 0x10, 0xa5, 0x16, 0xd6, 0x01, 0x29, 0xbf, 0xd9, 0x87, 0x94, 0x5f, 0xc8, 0x45, 0xca, - 0x05, 0xcc, 0x2b, 0x62, 0xfe, 0xcd, 0x24, 0xe6, 0x9f, 0x1c, 0x41, 0xcc, 0x73, 0x9d, 0x52, 0x29, - 0x66, 0x2e, 0x12, 0xe5, 0x15, 0x3b, 0x7f, 0x09, 0xd9, 0xf9, 0x85, 0x63, 0x62, 0xe7, 0x17, 0x5f, - 0x88, 0x9d, 0xbf, 0x54, 0x0c, 0xba, 0xdf, 0x55, 0xe4, 0xd2, 0x31, 0x5d, 0x45, 0xbe, 0x44, 0x76, - 0x3e, 0x03, 0xe5, 0x04, 0xc7, 0x51, 0x7e, 0x5e, 0x82, 0xe9, 0xe8, 0xd0, 0x44, 0x1f, 0xc1, 0x64, - 0xd7, 0xf4, 0xcc, 0xa6, 0x45, 0xc4, 0xa1, 0x7b, 0x7d, 0xa8, 0x43, 0xb7, 0xba, 0x13, 0x18, 0xd7, - 0x0b, 0x6a, 0x88, 0x83, 0x6e, 0xc3, 0x04, 0x75, 0xf0, 0x8f, 0x3b, 0x21, 0x45, 0xbb, 0x36, 0x1c, - 0xe2, 0x1d, 0x6e, 0xcb, 0x0f, 0x61, 0xfe, 0xb5, 0xf8, 0x13, 0x09, 0x26, 0x45, 0x37, 0xe8, 0x7b, - 0xa3, 0x96, 0xea, 0x42, 0x6e, 0x30, 0x2a, 0x7b, 0x5c, 0xdc, 0x82, 0x89, 0x60, 0x64, 0x2f, 0x3c, - 0x86, 0x5a, 0x05, 0x20, 0xb8, 0xa8, 0xf0, 0x78, 0xfc, 0xbd, 0x04, 0x0b, 0x3d, 0xbb, 0x3a, 0xba, - 0x9f, 0x8d, 0xcb, 0x77, 0x47, 0x3a, 0x1d, 0xfa, 0xc5, 0x67, 0x27, 0x13, 0x9f, 0x77, 0x47, 0x43, - 0xee, 0x89, 0xd3, 0x6f, 0x12, 0x71, 0xba, 0xd7, 0x73, 0xc6, 0x49, 0xa3, 0x15, 0x9f, 0xb2, 0x87, - 0xdb, 0xc8, 0xf1, 0xc3, 0x51, 0xfc, 0xbe, 0xac, 0xb1, 0xd5, 0xe6, 0xb3, 0xc0, 0xca, 0x1f, 0x4a, - 0x00, 0x31, 0xb1, 0x44, 0x6a, 0x36, 0xa8, 0x6f, 0x0f, 0xc7, 0x4c, 0xfb, 0x45, 0xf3, 0x4e, 0x26, - 0x9a, 0xd7, 0x87, 0x84, 0xec, 0x09, 0xe3, 0xe7, 0x89, 0x30, 0xd6, 0x22, 0x26, 0x2d, 0x0d, 0x5b, - 0xd6, 0x8e, 0x38, 0xf4, 0xa8, 0x11, 0xcb, 0xde, 0x5b, 0x4b, 0xd9, 0x7b, 0xeb, 0xe2, 0x87, 0x51, - 0x48, 0x8f, 0x61, 0x9c, 0x6c, 0x9b, 0x0c, 0xbe, 0x82, 0x65, 0xf9, 0x0f, 0x09, 0xc6, 0x83, 0x73, - 0x69, 0x3d, 0xf5, 0x82, 0x94, 0xff, 0x52, 0x92, 0x78, 0x3b, 0xfa, 0x10, 0xa6, 0x70, 0xc7, 0x6f, - 0x45, 0x0f, 0x47, 0xbd, 0x44, 0xb8, 0xe7, 0x7e, 0xcd, 0x10, 0xd6, 0x3b, 0x7e, 0xeb, 0xae, 0xb9, - 0x67, 0x63, 0xbf, 0xe3, 0x12, 0x75, 0x12, 0x07, 0x4d, 0xb4, 0x0e, 0xe3, 0x8e, 0x4b, 0xe9, 0xae, - 0xb8, 0x96, 0x5c, 0x1a, 0x00, 0xf5, 0xe0, 0x16, 0x07, 0x6b, 0x30, 0x13, 0x35, 0xb0, 0x54, 0x7e, - 0x2d, 0x89, 0x43, 0x80, 0x3f, 0x24, 0x69, 0x80, 0x9a, 0xd8, 0x62, 0x99, 0xae, 0x25, 0x0a, 0x01, - 0xfd, 0x57, 0x45, 0x16, 0xbd, 0x16, 0x18, 0x26, 0x4a, 0x01, 0x0b, 0xcd, 0xac, 0x08, 0x7d, 0x3b, - 0x79, 0xf7, 0x0f, 0x02, 0x99, 0xb8, 0xd1, 0xcf, 0x42, 0xd1, 0xdd, 0xe7, 0x37, 0xa4, 0x8a, 0x5a, - 0x74, 0xf7, 0x95, 0xc7, 0x12, 0x4c, 0x88, 0x43, 0xbc, 0x96, 0xf2, 0xfd, 0x10, 0x17, 0xb9, 0x84, - 0xf3, 0x6b, 0xa1, 0xbb, 0x8a, 0x7d, 0x29, 0x45, 0xaf, 0xbb, 0x02, 0x84, 0x94, 0xbf, 0x7e, 0x51, - 0x0c, 0x17, 0x32, 0x77, 0xd8, 0x36, 0x54, 0x58, 0x8a, 0x6a, 0x22, 0x19, 0x8f, 0xc8, 0xba, 0x7e, - 0xb9, 0x2d, 0xaa, 0x34, 0x6a, 0xd9, 0x8e, 0x1b, 0x47, 0xf8, 0xbf, 0x78, 0x7c, 0xfe, 0x5f, 0x86, - 0xf9, 0x03, 0x17, 0x3b, 0x8e, 0x78, 0xfc, 0x4a, 0xac, 0xa7, 0x59, 0x21, 0xdf, 0x26, 0x6d, 0x7a, - 0x8b, 0x1c, 0xa2, 0xf3, 0x30, 0x47, 0xbb, 0xfb, 0x5a, 0xa8, 0xcd, 0x14, 0x83, 0xc0, 0xcc, 0xd0, - 0xee, 0xfe, 0xbd, 0x40, 0x7a, 0x8b, 0x1c, 0x2a, 0xbf, 0x2a, 0xc2, 0x02, 0x4b, 0x4f, 0xea, 0x9a, - 0x9f, 0x62, 0x16, 0x80, 0x4d, 0xec, 0x63, 0x74, 0x13, 0xca, 0x64, 0x77, 0x97, 0xe8, 0xbe, 0x16, - 0x3d, 0x60, 0x0e, 0x7e, 0x07, 0x7d, 0x9f, 0x5b, 0xd4, 0xb1, 0xd7, 0x52, 0x81, 0x44, 0xdf, 0x48, - 0x85, 0x72, 0x70, 0x4a, 0xb2, 0xb4, 0x0f, 0x2b, 0x79, 0x23, 0x2c, 0x9b, 0xe0, 0xac, 0x65, 0x32, - 0x0f, 0xe9, 0x70, 0x32, 0xbd, 0x43, 0x0b, 0xf0, 0xd2, 0xa8, 0xe0, 0x28, 0x75, 0x02, 0xf0, 0x4e, - 0x94, 0x3f, 0x49, 0x50, 0xbe, 0x67, 0xfa, 0x36, 0xf1, 0x3c, 0xee, 0x94, 0xf8, 0x5d, 0x58, 0x1a, - 0xf1, 0x5d, 0x18, 0xed, 0xc3, 0x6b, 0x9e, 0xcf, 0x49, 0x67, 0x14, 0x53, 0x8d, 0x27, 0x66, 0xe8, - 0x97, 0xab, 0xc3, 0x95, 0xeb, 0x82, 0xdc, 0x3e, 0xe5, 0xf5, 0x91, 0x7a, 0xca, 0xbf, 0xd3, 0x4f, - 0xcd, 0x0d, 0x0b, 0xdb, 0xa8, 0x9e, 0x7d, 0x6a, 0x1e, 0xa2, 0x44, 0xc6, 0x00, 0xbe, 0xea, 0xe7, - 0xe6, 0x5b, 0x00, 0xba, 0xd5, 0x21, 0x9a, 0x63, 0x61, 0x3b, 0xac, 0x8f, 0xbd, 0x99, 0x67, 0x0a, - 0x1b, 0x56, 0x87, 0xf0, 0x09, 0x4c, 0xeb, 0xe2, 0xcb, 0x43, 0x5b, 0x30, 0xcd, 0x57, 0x11, 0x03, - 0xe3, 0xe5, 0xb2, 0x9c, 0x58, 0x6c, 0x8d, 0x71, 0xac, 0xa9, 0xb6, 0xf8, 0x52, 0x7e, 0x1b, 0x15, - 0xc0, 0xb8, 0x9b, 0x47, 0x2e, 0x80, 0x31, 0xeb, 0x63, 0x29, 0x80, 0x09, 0xa0, 0x11, 0x0b, 0x60, - 0xc2, 0xfa, 0x45, 0x0b, 0x60, 0x02, 0xe6, 0x55, 0x01, 0xec, 0x9b, 0x59, 0x00, 0xfb, 0xe1, 0x11, - 0x05, 0xb0, 0x6b, 0xc3, 0x12, 0x70, 0x91, 0x27, 0xaf, 0xea, 0x5f, 0x39, 0xea, 0x5f, 0xda, 0xd1, - 0xf5, 0xaf, 0xcb, 0xc3, 0xd4, 0xbf, 0x84, 0xcf, 0x7b, 0x6b, 0x60, 0xe6, 0xf3, 0x6b, 0x60, 0x57, - 0x87, 0xac, 0x81, 0x89, 0x7e, 0xbe, 0x26, 0xaf, 0xd4, 0x9f, 0x1c, 0xf9, 0x4a, 0x7d, 0x65, 0xa8, - 0xd2, 0x90, 0x98, 0xf5, 0x4b, 0xfd, 0x52, 0x9d, 0x78, 0x4e, 0xfe, 0xa9, 0x04, 0x53, 0xe1, 0x09, - 0x8c, 0xde, 0x83, 0x49, 0xf1, 0x8a, 0x24, 0x8e, 0xc7, 0xf3, 0xf9, 0x1e, 0xa0, 0xd4, 0xd0, 0x0c, - 0x9d, 0x84, 0x71, 0xd7, 0x23, 0xc4, 0x10, 0x3f, 0xde, 0x0b, 0x1a, 0xe8, 0x1c, 0xcc, 0x3a, 0x2e, - 0xd1, 0x4d, 0x8f, 0x65, 0x6e, 0xd3, 0xf4, 0x3d, 0x7e, 0xda, 0x8d, 0xa9, 0x33, 0x91, 0xb4, 0x66, - 0xfa, 0x9e, 0xb2, 0x06, 0x53, 0xe1, 0x01, 0xce, 0xee, 0x33, 0x8e, 0x85, 0x4d, 0xdb, 0x27, 0x8f, - 0x7c, 0xf1, 0xa0, 0x1a, 0x0b, 0xd0, 0x3c, 0x94, 0x18, 0x6f, 0x0e, 0x3a, 0x61, 0x9f, 0xca, 0xe7, - 0xe1, 0x75, 0x8b, 0x5b, 0x87, 0x37, 0x62, 0x69, 0xd8, 0x1b, 0xf1, 0x22, 0x4c, 0x85, 0xcb, 0x41, - 0xd0, 0xa6, 0xa8, 0x8d, 0x96, 0x00, 0x5c, 0x6c, 0x1b, 0xb4, 0x6d, 0x7e, 0x1a, 0xdd, 0xb1, 0x12, - 0x12, 0x36, 0xcb, 0x2e, 0x66, 0x14, 0xa8, 0x69, 0x05, 0x3f, 0x59, 0x0c, 0x79, 0x3d, 0x97, 0xd6, - 0x84, 0x50, 0x79, 0x22, 0x85, 0x17, 0x1d, 0x3e, 0xd4, 0x35, 0x18, 0xe7, 0xff, 0x17, 0x63, 0x3d, - 0x3b, 0x60, 0xac, 0x3b, 0x4c, 0x57, 0x0d, 0x4c, 0xd0, 0x16, 0x54, 0x0c, 0xe2, 0xf9, 0x5a, 0x18, - 0xb4, 0xe2, 0x50, 0x41, 0x2b, 0x33, 0xdb, 0xf5, 0x6c, 0xe0, 0x4a, 0x99, 0xc0, 0xe5, 0x98, 0x52, - 0xed, 0x5f, 0xc5, 0x2f, 0x9e, 0x2e, 0x49, 0x4f, 0x9e, 0x2e, 0x49, 0xff, 0x7c, 0xba, 0x24, 0x3d, - 0x7e, 0xb6, 0x54, 0x78, 0xf2, 0x6c, 0xa9, 0xf0, 0xb7, 0x67, 0x4b, 0x05, 0x38, 0xaf, 0xd3, 0x76, - 0x0e, 0x6e, 0x54, 0x9b, 0x4f, 0xf2, 0x61, 0x97, 0xfa, 0xb4, 0x21, 0x3d, 0x68, 0xee, 0x99, 0x7e, - 0xab, 0xd3, 0xac, 0xea, 0xb4, 0xbd, 0xa2, 0x53, 0xaf, 0x4d, 0xbd, 0x15, 0x97, 0x58, 0xf8, 0x90, - 0xb8, 0x2b, 0xdd, 0xd5, 0xe8, 0x93, 0xd3, 0x56, 0x6f, 0x65, 0xf0, 0x8f, 0x78, 0xbf, 0x93, 0x10, - 0x86, 0xb2, 0xdf, 0x15, 0x4b, 0x8d, 0x8d, 0x8f, 0x7f, 0x5f, 0x54, 0x1a, 0xe1, 0x10, 0x37, 0xd8, - 0x10, 0x13, 0x83, 0xa9, 0xee, 0x08, 0xd5, 0x3f, 0xc7, 0x4a, 0x0f, 0x99, 0xd2, 0xc3, 0x84, 0xd2, - 0xc3, 0x50, 0xe9, 0x69, 0xb1, 0x3a, 0x58, 0xe9, 0xe1, 0x07, 0x8d, 0xda, 0x36, 0xf1, 0xb1, 0x81, - 0x7d, 0xfc, 0x9f, 0xe2, 0xb9, 0xd0, 0x60, 0x6d, 0x8d, 0x59, 0xac, 0xad, 0x25, 0x4c, 0xd6, 0xd6, - 0x42, 0x9b, 0xe6, 0x04, 0xff, 0xf1, 0xed, 0xd5, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0x6d, 0x15, - 0x12, 0x01, 0xae, 0x2c, 0x00, 0x00, + // 2618 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0x4f, 0x6f, 0x1c, 0x49, + 0x15, 0x9f, 0x9e, 0xb1, 0xc7, 0xf6, 0x9b, 0xf1, 0xbf, 0x8a, 0x37, 0x0c, 0x16, 0xf2, 0x46, 0xbd, + 0x49, 0x70, 0x12, 0x76, 0x9c, 0xd8, 0xce, 0x46, 0xf2, 0x06, 0x58, 0x8f, 0xbd, 0xd9, 0x71, 0xb2, + 0x8e, 0x67, 0x3b, 0xc1, 0x51, 0x82, 0xd9, 0xa6, 0xa6, 0xbb, 0xec, 0x69, 0xb9, 0xa7, 0xbb, 0xe9, + 0xee, 0x19, 0xc7, 0xfb, 0x05, 0x80, 0x0b, 0x5a, 0x24, 0x0e, 0x08, 0x21, 0x21, 0x71, 0x41, 0xe2, + 0xc0, 0x81, 0x23, 0x88, 0x33, 0x2b, 0x90, 0x50, 0x24, 0x2e, 0x48, 0x2b, 0x24, 0x48, 0x4e, 0x20, + 0x2e, 0x7c, 0x01, 0x84, 0xaa, 0xba, 0xfa, 0xef, 0xb4, 0x33, 0x3d, 0xb6, 0x03, 0xda, 0x4d, 0x4e, + 0x53, 0xf5, 0xe6, 0xbd, 0x5f, 0x55, 0xbd, 0xf7, 0xaa, 0xea, 0xbd, 0x57, 0x0d, 0xcb, 0x16, 0x31, + 0x3a, 0xed, 0xa6, 0x8d, 0x17, 0x14, 0xd3, 0x26, 0x0b, 0xae, 0x8d, 0x0d, 0x07, 0x2b, 0xae, 0x66, + 0x1a, 0x0b, 0xdd, 0x6b, 0x58, 0xb7, 0x5a, 0xf8, 0x5a, 0x94, 0x58, 0xb5, 0x6c, 0xd3, 0x35, 0x91, + 0xe8, 0x4b, 0x55, 0xa9, 0x54, 0x35, 0xca, 0xe0, 0x4b, 0xcd, 0x5e, 0x8e, 0x23, 0x2b, 0xf6, 0xa1, + 0xe5, 0x9a, 0x21, 0xa8, 0xd7, 0xf7, 0xf0, 0x66, 0xe7, 0xe3, 0xbc, 0x8e, 0x8b, 0xf7, 0x49, 0xc8, + 0xca, 0xba, 0x9c, 0xf3, 0x7c, 0x9c, 0x53, 0x6b, 0x2a, 0x21, 0x9f, 0xd6, 0x54, 0xd2, 0xb9, 0x54, + 0xf2, 0x38, 0xe4, 0x52, 0xc9, 0x63, 0xce, 0xb5, 0x18, 0xe7, 0xda, 0x33, 0xbb, 0xc4, 0x36, 0xb0, + 0xa1, 0x44, 0x86, 0x0e, 0x69, 0x9e, 0x8c, 0xf8, 0x1b, 0x01, 0x4a, 0xf7, 0xc3, 0xe5, 0xa2, 0xf7, + 0x60, 0xa8, 0x69, 0xaa, 0x87, 0x15, 0xe1, 0x9c, 0x30, 0x5f, 0x5a, 0x5c, 0xaa, 0xf6, 0x57, 0x4c, + 0x35, 0x22, 0x5e, 0x33, 0xd5, 0x43, 0x89, 0x01, 0xa0, 0xd7, 0xa1, 0xd4, 0xd4, 0x0c, 0x55, 0x33, + 0xf6, 0x64, 0x47, 0xdb, 0xab, 0xe4, 0xcf, 0x09, 0xf3, 0x65, 0x09, 0x38, 0xe9, 0x9e, 0xb6, 0x87, + 0x56, 0xa1, 0x88, 0x0d, 0xa5, 0x65, 0xda, 0x95, 0x02, 0x1b, 0xeb, 0x52, 0x62, 0x2c, 0xae, 0xd0, + 0x60, 0x98, 0x4d, 0x62, 0xef, 0xeb, 0x44, 0x32, 0x4d, 0x57, 0xe2, 0x82, 0x62, 0x05, 0xf2, 0x1b, + 0x2a, 0x42, 0x30, 0xd4, 0xc2, 0x4e, 0x8b, 0x4d, 0xb9, 0x2c, 0xb1, 0xb6, 0x28, 0x02, 0xbc, 0xbb, + 0xbb, 0x4b, 0x14, 0xb7, 0x8e, 0x9d, 0x16, 0x9a, 0x81, 0x61, 0xcd, 0x30, 0x88, 0xcd, 0x59, 0xbc, + 0x8e, 0xf8, 0xa7, 0x3c, 0x4c, 0x26, 0xe6, 0x8e, 0xd6, 0x61, 0xc4, 0xeb, 0x39, 0x15, 0xe1, 0x5c, + 0x61, 0xbe, 0xb4, 0x78, 0x39, 0x8b, 0x06, 0x56, 0x59, 0x5f, 0xf2, 0x45, 0xd1, 0x1b, 0x30, 0x4e, + 0x1e, 0x5b, 0x9a, 0x7d, 0x28, 0xb7, 0x88, 0xb6, 0xd7, 0x72, 0xd9, 0xea, 0x87, 0xa4, 0xb2, 0x47, + 0xac, 0x33, 0x1a, 0xfa, 0x22, 0x8c, 0x2a, 0x2d, 0xac, 0x19, 0xb2, 0xa6, 0x32, 0x0d, 0x8c, 0x49, + 0x23, 0xac, 0xbf, 0xa1, 0xa2, 0x65, 0x28, 0xec, 0x12, 0x52, 0x19, 0x62, 0x7a, 0x11, 0xfb, 0xe8, + 0xe5, 0x16, 0x21, 0x12, 0x65, 0x47, 0xef, 0xc0, 0xd8, 0x6e, 0x5b, 0x95, 0x15, 0xbd, 0x43, 0x9c, + 0xca, 0x30, 0x9b, 0xfd, 0x1b, 0x7d, 0x64, 0xd7, 0xf4, 0x0e, 0x91, 0x46, 0x77, 0xdb, 0x2a, 0x6d, + 0x38, 0xe8, 0x32, 0x4c, 0x10, 0x83, 0xf1, 0x10, 0x55, 0x6e, 0x93, 0xb6, 0x59, 0x29, 0x52, 0x85, + 0xd5, 0x73, 0xd2, 0x78, 0x40, 0xdf, 0x24, 0x6d, 0xf3, 0x7b, 0x82, 0x50, 0x9b, 0x86, 0x49, 0x39, + 0xce, 0x2c, 0xfe, 0x79, 0x02, 0x8a, 0x9e, 0x2a, 0xd0, 0x2a, 0x0c, 0x3b, 0x16, 0x31, 0x54, 0xee, + 0x47, 0x97, 0xb2, 0x68, 0xf1, 0x1e, 0x15, 0xa8, 0xe7, 0x24, 0x4f, 0x12, 0xad, 0x43, 0xd1, 0xec, + 0xb8, 0x56, 0xc7, 0xd3, 0x5e, 0x46, 0x4b, 0x6c, 0x31, 0x89, 0x7a, 0x4e, 0xe2, 0xb2, 0xe8, 0x2d, + 0x18, 0x72, 0x0e, 0xb0, 0xc5, 0x7d, 0xec, 0x5c, 0x02, 0x83, 0xee, 0x9d, 0x70, 0xfc, 0x03, 0x6c, + 0xd5, 0x73, 0x12, 0xe3, 0x47, 0xb7, 0x00, 0xe8, 0xaf, 0xac, 0xe8, 0x58, 0x6b, 0x73, 0x4b, 0x5c, + 0xe8, 0x27, 0xbd, 0x46, 0x99, 0xeb, 0x39, 0x69, 0xcc, 0xf1, 0x3b, 0x68, 0x17, 0x66, 0xba, 0x58, + 0xd7, 0x54, 0xec, 0x9a, 0xb6, 0xac, 0x92, 0x5d, 0xcd, 0xd0, 0xe8, 0x8c, 0x2b, 0x53, 0x0c, 0xf1, + 0x5a, 0x02, 0xd1, 0x3b, 0x19, 0x02, 0xcc, 0x6d, 0x5f, 0x72, 0x3d, 0x10, 0xac, 0xe7, 0xa4, 0x33, + 0xdd, 0x5e, 0x32, 0x9d, 0xaf, 0xd6, 0x54, 0x64, 0x4f, 0x1f, 0x95, 0xe9, 0xd4, 0xf9, 0xd2, 0xf3, + 0x24, 0xc0, 0xde, 0x68, 0x2a, 0x9e, 0xad, 0xe8, 0x7c, 0x35, 0xbf, 0x83, 0x76, 0x60, 0xd2, 0xb2, + 0x4d, 0xcb, 0x74, 0xb0, 0x2e, 0x3b, 0x9d, 0x66, 0x5b, 0x73, 0x2b, 0x28, 0x75, 0xaa, 0x91, 0x93, + 0x24, 0xc0, 0x6c, 0x70, 0xc9, 0x7b, 0x4c, 0xb0, 0x9e, 0x93, 0x26, 0xac, 0x18, 0x05, 0x35, 0x61, + 0x3a, 0x40, 0x3f, 0xd0, 0xdc, 0x96, 0x6a, 0xe3, 0x83, 0xca, 0x99, 0xd4, 0xa3, 0xe6, 0x79, 0xf8, + 0x0f, 0xb8, 0x68, 0x3d, 0x27, 0x4d, 0x59, 0x09, 0x1a, 0x7a, 0x08, 0x13, 0xa1, 0xc6, 0xbb, 0xa6, + 0x4b, 0x2a, 0x33, 0x6c, 0x80, 0xab, 0x19, 0x06, 0x08, 0x14, 0xbe, 0x6d, 0xba, 0x84, 0xba, 0x7d, + 0x37, 0x4a, 0xa0, 0xd0, 0x2a, 0xd1, 0xc9, 0x5e, 0x08, 0xfd, 0x5a, 0x66, 0xe8, 0x75, 0x5f, 0xd0, + 0x87, 0x56, 0xa3, 0x04, 0x64, 0xc2, 0xd9, 0x40, 0x33, 0x2a, 0xb1, 0x4c, 0x47, 0x73, 0xb9, 0xef, + 0x9d, 0x65, 0x43, 0xdc, 0x18, 0x40, 0x3d, 0xeb, 0x9e, 0xbc, 0xef, 0x8d, 0x33, 0x56, 0x0a, 0x1d, + 0x6d, 0xc1, 0x38, 0xeb, 0x69, 0xa6, 0x21, 0x9b, 0x16, 0x31, 0x2a, 0x73, 0x6c, 0x9c, 0xf9, 0xe7, + 0xf9, 0x78, 0x83, 0x0b, 0x6c, 0x59, 0x84, 0xba, 0x4d, 0xd9, 0x8a, 0xf4, 0x91, 0x04, 0x13, 0x01, + 0xa0, 0xa2, 0x9b, 0x0e, 0xa9, 0xbc, 0x9e, 0xba, 0xf7, 0x53, 0x11, 0xd7, 0xa8, 0x00, 0xd5, 0x8a, + 0x15, 0x25, 0xa0, 0x6f, 0xc2, 0x74, 0x80, 0x19, 0xf8, 0xcb, 0x39, 0x06, 0xfb, 0x95, 0x2c, 0xb0, + 0x31, 0x47, 0x49, 0xd0, 0x10, 0x81, 0xd7, 0x02, 0x70, 0x9b, 0x1c, 0x60, 0x5b, 0xe5, 0x1a, 0x17, + 0xd9, 0x00, 0x0b, 0x59, 0x06, 0x90, 0x98, 0x9c, 0xaf, 0xe9, 0x33, 0x56, 0x2f, 0x19, 0xad, 0xc3, + 0x28, 0x37, 0x35, 0xa9, 0xcc, 0x33, 0xe4, 0x8b, 0xcf, 0xdf, 0xf5, 0xdc, 0x53, 0xa8, 0x3a, 0x02, + 0x49, 0x74, 0x1b, 0xa0, 0x63, 0x04, 0x38, 0x97, 0x52, 0x6d, 0x95, 0xc0, 0xf9, 0x46, 0xc0, 0x5f, + 0xcf, 0x49, 0x11, 0x69, 0xf4, 0x08, 0xa6, 0xc2, 0x1e, 0x5f, 0xf3, 0x65, 0x86, 0xf8, 0x66, 0x56, + 0x44, 0x7f, 0xc5, 0x93, 0x9d, 0x38, 0x09, 0xdd, 0x86, 0x31, 0x15, 0x9b, 0xb2, 0x77, 0xf8, 0x2f, + 0x32, 0xd0, 0x2b, 0x59, 0x76, 0x07, 0x36, 0xfd, 0xe3, 0x7f, 0x54, 0xe5, 0x6d, 0xb4, 0x09, 0x40, + 0xb1, 0xf8, 0x2d, 0xb0, 0x94, 0x6a, 0xf6, 0x23, 0xc0, 0x82, 0x7b, 0x80, 0xce, 0xc6, 0xeb, 0xa0, + 0x06, 0x94, 0x28, 0x1c, 0xdf, 0x5d, 0x95, 0xe5, 0xd4, 0x15, 0x1f, 0x81, 0xc7, 0xb7, 0x0e, 0x55, + 0xa4, 0x1a, 0xf4, 0xd0, 0x43, 0x98, 0xd2, 0x14, 0x67, 0xf1, 0x6a, 0xe0, 0x9b, 0x58, 0xaf, 0x7c, + 0x22, 0xa4, 0x2e, 0x3a, 0x7e, 0xf6, 0x52, 0xa1, 0x07, 0x81, 0x0c, 0xd5, 0xa3, 0x16, 0x27, 0xd5, + 0x46, 0xa1, 0xe8, 0x9d, 0xe5, 0xe2, 0xaf, 0x0b, 0x70, 0x36, 0x12, 0xa6, 0x34, 0x88, 0xed, 0x58, + 0x44, 0x71, 0xb5, 0x2e, 0x41, 0x32, 0x94, 0x2d, 0x7c, 0xa8, 0x9b, 0x58, 0x95, 0xf7, 0xc9, 0xa1, + 0x1f, 0xb2, 0xdc, 0xcc, 0x72, 0x51, 0x36, 0x3c, 0xb9, 0x3b, 0xe4, 0x90, 0x0e, 0xba, 0x66, 0xb6, + 0xdb, 0x9a, 0xdb, 0x26, 0x86, 0x2b, 0x95, 0xac, 0xe0, 0x1f, 0x07, 0x7d, 0x1b, 0xa6, 0x98, 0x25, + 0x65, 0xa3, 0xa3, 0xeb, 0xda, 0xae, 0x46, 0x6c, 0xa7, 0x92, 0x67, 0x83, 0x5c, 0xcf, 0x32, 0xc8, + 0x5d, 0x5f, 0x8a, 0x8e, 0x71, 0xd7, 0x74, 0x89, 0x34, 0xc9, 0xe0, 0x02, 0xba, 0x83, 0x6e, 0x41, + 0x19, 0xab, 0x5d, 0x4d, 0x21, 0xb2, 0x61, 0xba, 0xc4, 0xa9, 0x14, 0x32, 0xc5, 0x2d, 0x0c, 0xab, + 0xe4, 0x09, 0xd2, 0xb6, 0x43, 0x8f, 0x33, 0xac, 0xaa, 0x36, 0x71, 0x1c, 0xb9, 0xab, 0x91, 0x03, + 0xa7, 0x32, 0x94, 0x1a, 0xbe, 0x25, 0x81, 0x56, 0x3d, 0x99, 0x6d, 0x8d, 0x1c, 0x48, 0x65, 0x1c, + 0x76, 0x1c, 0x74, 0x13, 0x8a, 0x2a, 0x31, 0xcc, 0xb6, 0x1f, 0x4a, 0x9d, 0xef, 0x83, 0xb4, 0x4e, + 0x99, 0x25, 0x2e, 0x43, 0xe3, 0xcf, 0x50, 0xc3, 0x47, 0xc4, 0x9f, 0xbf, 0x15, 0xa0, 0x72, 0x94, + 0x19, 0xd0, 0x16, 0x94, 0x22, 0xa6, 0xe5, 0x61, 0x54, 0x75, 0x30, 0xcb, 0x4a, 0x10, 0xda, 0x12, + 0xdd, 0x05, 0x50, 0x02, 0x78, 0x1e, 0x52, 0x55, 0xfb, 0xac, 0xe9, 0x9e, 0x4b, 0xf7, 0x75, 0xe8, + 0x1b, 0x11, 0x04, 0xf1, 0x47, 0x02, 0x4c, 0xf7, 0xd8, 0x17, 0xdd, 0x82, 0xb1, 0xc0, 0x55, 0xf8, + 0xa4, 0xe7, 0xfb, 0xd9, 0xd2, 0xe7, 0x97, 0x42, 0x51, 0x74, 0x03, 0x86, 0xa8, 0x3f, 0xf0, 0x79, + 0x66, 0x72, 0x07, 0x26, 0x20, 0xfe, 0x51, 0x88, 0x05, 0xf5, 0xd4, 0x96, 0xe8, 0x3e, 0x8c, 0xd1, + 0x94, 0x84, 0x39, 0x06, 0x9f, 0xd4, 0x8d, 0x63, 0x24, 0x36, 0xcc, 0x49, 0x46, 0x9b, 0xbc, 0xf5, + 0x3f, 0x49, 0x70, 0xfe, 0x93, 0x87, 0x33, 0x29, 0xb3, 0x40, 0x1f, 0x40, 0xd9, 0xa3, 0x70, 0x67, + 0xf7, 0x36, 0x7e, 0x35, 0x7b, 0xae, 0xc2, 0xd6, 0x52, 0x0a, 0x75, 0xf4, 0xd9, 0xcd, 0x59, 0xee, + 0xc2, 0x18, 0x4d, 0x3e, 0x3c, 0xe3, 0x16, 0x53, 0xef, 0x88, 0x54, 0x3d, 0xd0, 0x3c, 0x86, 0xae, + 0x9c, 0xde, 0x38, 0x6d, 0xde, 0xa6, 0x79, 0x4d, 0x19, 0x40, 0x0e, 0x00, 0xc5, 0x7f, 0x4f, 0x00, + 0x84, 0x1a, 0x43, 0xef, 0xc6, 0xd3, 0x9a, 0x37, 0x33, 0xa7, 0x35, 0x7c, 0x24, 0x9e, 0xda, 0xd4, + 0x13, 0xa9, 0x4d, 0x35, 0x7b, 0x6a, 0xc3, 0x81, 0xfc, 0xf4, 0x66, 0x25, 0x96, 0xde, 0x9c, 0xef, + 0x97, 0xa0, 0x70, 0x69, 0x2f, 0xc5, 0xb9, 0x9d, 0x92, 0xe2, 0x5c, 0xca, 0x94, 0xe2, 0x70, 0x98, + 0x57, 0x69, 0xce, 0xe7, 0x33, 0xcd, 0xf9, 0xf0, 0x88, 0x34, 0x27, 0xd3, 0x9d, 0x1f, 0xcb, 0x73, + 0xb8, 0xa3, 0xbc, 0xca, 0x75, 0x5e, 0xc2, 0x5c, 0xe7, 0xd2, 0x29, 0xe5, 0x3a, 0x97, 0x4f, 0x94, + 0xeb, 0xbc, 0x54, 0xf9, 0x48, 0x5a, 0x62, 0x77, 0xe5, 0x94, 0x12, 0xbb, 0x17, 0x98, 0xeb, 0x8c, + 0x43, 0x29, 0x12, 0xcd, 0x88, 0x3f, 0x2c, 0xc0, 0x58, 0x70, 0x69, 0xa2, 0x0f, 0x60, 0xa4, 0xab, + 0x39, 0x5a, 0x53, 0x27, 0xfc, 0xd2, 0xbd, 0x3e, 0xd0, 0xa5, 0x5b, 0xdd, 0xf6, 0x84, 0xeb, 0x39, + 0xc9, 0xc7, 0x41, 0x77, 0xa1, 0x68, 0x5a, 0xf8, 0x3b, 0x1d, 0x3f, 0xbc, 0x5c, 0x1e, 0x0c, 0x71, + 0x8b, 0xc9, 0xb2, 0x4b, 0x98, 0xb5, 0x66, 0xbf, 0x2b, 0xc0, 0x08, 0x1f, 0x06, 0x7d, 0xfd, 0xb8, + 0x85, 0x4f, 0x3f, 0x36, 0x78, 0x3b, 0x16, 0xf9, 0x7e, 0x39, 0x43, 0xe4, 0xcb, 0x62, 0x39, 0x26, + 0x34, 0xbb, 0x01, 0x45, 0x6f, 0x76, 0x27, 0x9e, 0x07, 0x8d, 0x83, 0xbc, 0xd4, 0x8f, 0xd9, 0xe4, + 0xaf, 0x05, 0x98, 0xee, 0x39, 0xd9, 0xd1, 0xc3, 0xa4, 0x6d, 0xbe, 0x7a, 0xac, 0x1b, 0x22, 0xcd, + 0x46, 0xdb, 0x09, 0x1b, 0xdd, 0x3c, 0x1e, 0x72, 0x8f, 0xad, 0x7e, 0x16, 0xb1, 0xd5, 0x83, 0x9e, + 0x7b, 0x4e, 0x38, 0x5e, 0x39, 0x2f, 0x79, 0xc1, 0x9d, 0xc8, 0x86, 0x38, 0xb0, 0xe1, 0x8b, 0x9a, + 0x5f, 0x6d, 0x2a, 0x09, 0x2c, 0xfe, 0xab, 0x00, 0x10, 0x06, 0x98, 0x48, 0x4a, 0x1a, 0xf6, 0xad, + 0xc1, 0x22, 0xd4, 0x34, 0x8b, 0x6e, 0x25, 0x2c, 0x7a, 0x7d, 0x40, 0xc8, 0x1e, 0x53, 0x7e, 0x1a, + 0x31, 0x65, 0x2d, 0x88, 0xa8, 0x85, 0x41, 0x1f, 0x0b, 0x82, 0x58, 0xfa, 0x24, 0x56, 0x4b, 0xe6, + 0xeb, 0x85, 0x93, 0xe6, 0xeb, 0xb3, 0xef, 0x07, 0x6e, 0x70, 0x0a, 0x6b, 0xa3, 0x47, 0xac, 0xd7, + 0xf2, 0xb6, 0xf3, 0xa7, 0x02, 0x0c, 0x7b, 0x77, 0xda, 0x6a, 0xec, 0xbd, 0x2f, 0x7b, 0x42, 0x13, + 0x79, 0xe9, 0x7b, 0x1f, 0x46, 0x71, 0xc7, 0x6d, 0x05, 0x59, 0x70, 0x6f, 0x10, 0xdd, 0x53, 0x57, + 0xa0, 0x08, 0xab, 0x1d, 0xb7, 0x75, 0x4f, 0xdb, 0x33, 0xb0, 0xdb, 0xb1, 0x89, 0x34, 0x82, 0xbd, + 0x2e, 0x5a, 0x85, 0x61, 0xcb, 0x36, 0xcd, 0x5d, 0xae, 0xc2, 0x2b, 0x7d, 0xa0, 0x1e, 0xdd, 0x61, + 0x60, 0x0d, 0x2a, 0x22, 0x79, 0x92, 0xe2, 0x4f, 0x04, 0x7e, 0x81, 0xb0, 0x27, 0x3d, 0x19, 0x50, + 0x13, 0xeb, 0x74, 0x77, 0xc8, 0x91, 0x02, 0x48, 0xfa, 0x4e, 0x4a, 0xa2, 0xd7, 0x3c, 0xc1, 0x48, + 0x09, 0x64, 0xba, 0x99, 0x24, 0xa1, 0x2f, 0x45, 0x6b, 0x1e, 0x05, 0x56, 0x06, 0x88, 0x54, 0x32, + 0x26, 0x20, 0x6f, 0xef, 0xb3, 0xec, 0xaa, 0x2c, 0xe5, 0xed, 0x7d, 0xf1, 0x63, 0x01, 0x8a, 0x3c, + 0x00, 0xa8, 0xc5, 0x74, 0x3f, 0x40, 0x12, 0x18, 0x51, 0x7e, 0xcd, 0x57, 0x57, 0x3e, 0x35, 0x1c, + 0xe9, 0x55, 0x97, 0x87, 0x10, 0xd3, 0xd7, 0x0f, 0xf2, 0xfe, 0xe6, 0x67, 0x0a, 0xdb, 0x84, 0x32, + 0x75, 0x69, 0x99, 0x3b, 0xe3, 0x11, 0x5e, 0x97, 0xb6, 0x1f, 0xb8, 0x2b, 0x4b, 0x25, 0x23, 0xec, + 0x1c, 0xa1, 0xff, 0xfc, 0xe9, 0xe9, 0x7f, 0x1e, 0xa6, 0x0e, 0x6c, 0x6c, 0x59, 0xfc, 0x19, 0x32, + 0xd8, 0x7f, 0x65, 0x69, 0x82, 0xd3, 0x69, 0xae, 0x7f, 0x87, 0x1c, 0xa2, 0x8b, 0x30, 0x69, 0x76, + 0xf7, 0x65, 0x9f, 0x9b, 0x32, 0x7a, 0x86, 0x19, 0x37, 0xbb, 0xfb, 0x0f, 0x3c, 0xea, 0x1d, 0x72, + 0x28, 0xfe, 0x38, 0x0f, 0xd3, 0xd4, 0x3d, 0x4d, 0x5b, 0xfb, 0x08, 0x53, 0x03, 0xac, 0x63, 0x17, + 0xa3, 0xdb, 0x50, 0x22, 0xec, 0x4d, 0x59, 0x0e, 0x9e, 0x9b, 0xfb, 0x17, 0x75, 0xc2, 0x57, 0x68, + 0x09, 0x48, 0xf8, 0x22, 0x2d, 0x41, 0xc9, 0xbb, 0x5d, 0xa9, 0xdb, 0xfb, 0x35, 0xd5, 0x63, 0x6c, + 0x1b, 0xef, 0x8e, 0xa6, 0x34, 0x07, 0x29, 0x30, 0x13, 0x3f, 0xd5, 0x39, 0x78, 0xe1, 0xb8, 0xe0, + 0x28, 0x76, 0x6b, 0xb0, 0x41, 0xc4, 0xdf, 0x09, 0x50, 0x7a, 0xa0, 0xb9, 0x06, 0x71, 0x1c, 0xa6, + 0x94, 0xb0, 0xc8, 0x25, 0x1c, 0xb3, 0xc8, 0x85, 0xf6, 0xe1, 0x0b, 0x8e, 0xcb, 0x02, 0xd6, 0xc0, + 0xa6, 0x32, 0x73, 0x4c, 0x5f, 0x2f, 0x4b, 0x83, 0x95, 0x29, 0x3d, 0xdf, 0x7e, 0xcd, 0x49, 0xa1, + 0x3a, 0xe2, 0x3f, 0xe2, 0x8f, 0xfe, 0x0d, 0x1d, 0x1b, 0xa8, 0x9e, 0x7c, 0xf4, 0x1f, 0xa0, 0x90, + 0x46, 0x01, 0xfe, 0xdf, 0x0f, 0xff, 0x77, 0x00, 0x14, 0xbd, 0x43, 0x64, 0x4b, 0xc7, 0x86, 0x5f, + 0x45, 0xcb, 0x54, 0x03, 0x5b, 0xd3, 0x3b, 0x84, 0x2d, 0x60, 0x4c, 0xe1, 0x2d, 0x07, 0x6d, 0xf0, + 0x7a, 0x1a, 0x05, 0x1b, 0xb4, 0x9e, 0xc6, 0xb0, 0x58, 0x35, 0x8d, 0xb6, 0xc4, 0x9f, 0x06, 0xc5, + 0x33, 0xa6, 0xe6, 0x63, 0x17, 0xcf, 0xa8, 0xf4, 0xa9, 0x14, 0xcf, 0x38, 0xd0, 0x31, 0x8b, 0x67, + 0x5c, 0xfa, 0xa4, 0xc5, 0x33, 0x0e, 0xf3, 0xaa, 0x78, 0xf6, 0xf9, 0x2c, 0x9e, 0x7d, 0xeb, 0x88, + 0xe2, 0xd9, 0xf2, 0xa0, 0x41, 0x3b, 0xf7, 0x93, 0x57, 0xb5, 0xb3, 0x0c, 0xb5, 0x33, 0xf9, 0xe8, + 0xda, 0xd9, 0xd5, 0x41, 0x6a, 0x67, 0x5c, 0xe7, 0xbd, 0xf5, 0x33, 0xed, 0xf9, 0xf5, 0xb3, 0xa5, + 0x01, 0xeb, 0x67, 0x7c, 0x9c, 0xcf, 0xc8, 0xf7, 0x02, 0x1f, 0x1e, 0xf9, 0xbd, 0xc0, 0xb5, 0x81, + 0xca, 0x4a, 0x7c, 0xd5, 0x2f, 0xf5, 0x37, 0x03, 0x91, 0x87, 0xfd, 0xef, 0x0b, 0x30, 0xea, 0xdf, + 0xc0, 0xe8, 0x1d, 0x18, 0xe1, 0xcf, 0xcf, 0xfc, 0x7a, 0xbc, 0x98, 0xed, 0xe5, 0x5a, 0xf2, 0xc5, + 0xd0, 0x0c, 0x0c, 0xdb, 0x0e, 0x21, 0x2a, 0x7f, 0x89, 0xf4, 0x3a, 0xe8, 0x02, 0x4c, 0x58, 0x36, + 0x51, 0x34, 0x87, 0x7a, 0x6e, 0x53, 0x73, 0x1d, 0x76, 0xdb, 0x0d, 0x49, 0xe3, 0x01, 0xb5, 0xa6, + 0xb9, 0x8e, 0xd8, 0x86, 0x51, 0xff, 0x02, 0x47, 0x5b, 0x30, 0x66, 0xe9, 0x58, 0x33, 0x5c, 0xf2, + 0xd8, 0xcf, 0x93, 0xae, 0x0d, 0x10, 0x01, 0x78, 0x82, 0x52, 0x88, 0x81, 0xa6, 0xa0, 0x40, 0x43, + 0x6d, 0x6f, 0x5e, 0xb4, 0x29, 0x5e, 0x84, 0x09, 0xca, 0xbd, 0xa6, 0x59, 0x2d, 0x62, 0x33, 0x9e, + 0xf4, 0x27, 0x72, 0x05, 0xc6, 0x63, 0xa8, 0xe8, 0x6b, 0x50, 0x74, 0x88, 0xa1, 0x06, 0x8f, 0xcb, + 0x59, 0xb5, 0xc4, 0xa5, 0x10, 0x82, 0x21, 0xb6, 0xac, 0x3c, 0x8b, 0xbb, 0x58, 0x5b, 0xfc, 0x7d, + 0xc1, 0x5b, 0x3c, 0xab, 0x7c, 0x34, 0x92, 0x95, 0x8f, 0xe5, 0x41, 0x1e, 0x13, 0xd3, 0xea, 0x1e, + 0x9b, 0x89, 0xba, 0xc7, 0xd2, 0x40, 0x80, 0x3d, 0x55, 0x8f, 0x5f, 0x45, 0xaa, 0x1e, 0x12, 0x80, + 0x12, 0xa8, 0x90, 0xcf, 0x77, 0x31, 0x2b, 0x7c, 0xa8, 0x7c, 0x29, 0x82, 0x12, 0xb7, 0x7e, 0xfe, + 0xe4, 0xd6, 0x9f, 0xdd, 0x09, 0x0a, 0x19, 0x2f, 0x60, 0xba, 0xb5, 0x52, 0xe4, 0xf9, 0x57, 0xfc, + 0x85, 0x9f, 0xf8, 0x33, 0x3f, 0xf6, 0xbf, 0x21, 0x10, 0x06, 0xfc, 0x86, 0x00, 0xcd, 0xc2, 0xa8, + 0x7f, 0x30, 0xf3, 0x00, 0x3e, 0xe8, 0xa3, 0x39, 0x00, 0x1b, 0x1b, 0xaa, 0xd9, 0xd6, 0x3e, 0x0a, + 0xb2, 0xfd, 0x08, 0x85, 0xee, 0xb7, 0x2e, 0xa6, 0xc1, 0x78, 0x53, 0xf7, 0xbe, 0x04, 0xf0, 0x33, + 0x4c, 0x46, 0xad, 0x71, 0xa2, 0xf8, 0x44, 0xf0, 0x53, 0x6e, 0x36, 0xd5, 0x15, 0x18, 0x66, 0xff, + 0xf3, 0xb9, 0xf6, 0xfb, 0xd6, 0x64, 0x9b, 0xf2, 0x4a, 0x9e, 0x08, 0xda, 0x80, 0xb2, 0x4a, 0x1c, + 0x57, 0xf6, 0x8f, 0x8f, 0xfc, 0x40, 0x1b, 0xa3, 0x44, 0x65, 0x57, 0x93, 0x47, 0x48, 0x21, 0x71, + 0x84, 0x64, 0x58, 0x52, 0xed, 0xef, 0xf9, 0x4f, 0x9e, 0xce, 0x09, 0x4f, 0x9e, 0xce, 0x09, 0x7f, + 0x7b, 0x3a, 0x27, 0x7c, 0xfc, 0x6c, 0x2e, 0xf7, 0xe4, 0xd9, 0x5c, 0xee, 0x2f, 0xcf, 0xe6, 0x72, + 0x70, 0x51, 0x31, 0xdb, 0x19, 0xec, 0x5c, 0x9b, 0x8a, 0x66, 0x66, 0xb6, 0xe9, 0x9a, 0x0d, 0xe1, + 0x51, 0x73, 0x4f, 0x73, 0x5b, 0x9d, 0x66, 0x55, 0x31, 0xdb, 0x0b, 0x8a, 0xe9, 0xb4, 0x4d, 0x67, + 0xc1, 0x26, 0x3a, 0x3e, 0x24, 0xf6, 0x42, 0x77, 0x31, 0x68, 0xb2, 0x04, 0xca, 0x59, 0xe8, 0xff, + 0xf1, 0xff, 0xdb, 0x11, 0xa2, 0x4f, 0xfb, 0x79, 0xbe, 0xd0, 0x58, 0xbb, 0xff, 0xcb, 0xbc, 0xd8, + 0xf0, 0xa7, 0xb8, 0x46, 0xa7, 0x18, 0x99, 0x4c, 0x75, 0x9b, 0xb3, 0xfe, 0x21, 0x64, 0xda, 0xa1, + 0x4c, 0x3b, 0x11, 0xa6, 0x1d, 0x9f, 0xe9, 0x69, 0xbe, 0xda, 0x9f, 0x69, 0xe7, 0xbd, 0x46, 0x6d, + 0x93, 0xb8, 0x58, 0xc5, 0x2e, 0xfe, 0x67, 0xfe, 0x82, 0x2f, 0xb0, 0xb2, 0x42, 0x25, 0x56, 0x56, + 0x22, 0x22, 0x2b, 0x2b, 0xbe, 0x4c, 0xb3, 0xc8, 0x3e, 0xda, 0x5f, 0xfa, 0x6f, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xbd, 0x8d, 0x72, 0x3a, 0xe6, 0x30, 0x00, 0x00, } func (m *Transaction) Marshal() (dAtA []byte, err error) { @@ -3155,6 +3607,36 @@ func (m *Id) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *EffectHash) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *EffectHash) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *EffectHash) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Inner) > 0 { + i -= len(m.Inner) + copy(dAtA[i:], m.Inner) + i = encodeVarintTransaction(dAtA, i, uint64(len(m.Inner))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func (m *TransactionBody) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -3805,6 +4287,20 @@ func (m *TransactionPerspective) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l + if len(m.Denoms) > 0 { + for iNdEx := len(m.Denoms) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Denoms[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTransaction(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x2a + } + } if len(m.AddressViews) > 0 { for iNdEx := len(m.AddressViews) - 1; iNdEx >= 0; iNdEx-- { { @@ -3864,7 +4360,7 @@ func (m *TransactionPerspective) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } -func (m *PayloadKeyWithCommitment) Marshal() (dAtA []byte, err error) { +func (m *PayloadKey) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3874,39 +4370,27 @@ func (m *PayloadKeyWithCommitment) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *PayloadKeyWithCommitment) MarshalTo(dAtA []byte) (int, error) { +func (m *PayloadKey) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *PayloadKeyWithCommitment) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *PayloadKey) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Commitment != nil { - { - size, err := m.Commitment.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTransaction(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if len(m.PayloadKey) > 0 { - i -= len(m.PayloadKey) - copy(dAtA[i:], m.PayloadKey) - i = encodeVarintTransaction(dAtA, i, uint64(len(m.PayloadKey))) + if len(m.Inner) > 0 { + i -= len(m.Inner) + copy(dAtA[i:], m.Inner) + i = encodeVarintTransaction(dAtA, i, uint64(len(m.Inner))) i-- dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *NullifierWithNote) Marshal() (dAtA []byte, err error) { +func (m *PayloadKeyWithCommitment) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3916,7 +4400,54 @@ func (m *NullifierWithNote) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *NullifierWithNote) MarshalTo(dAtA []byte) (int, error) { +func (m *PayloadKeyWithCommitment) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *PayloadKeyWithCommitment) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Commitment != nil { + { + size, err := m.Commitment.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTransaction(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + if m.PayloadKey != nil { + { + size, err := m.PayloadKey.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTransaction(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *NullifierWithNote) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *NullifierWithNote) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } @@ -3973,27 +4504,65 @@ func (m *TransactionView) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.AddressViews) > 0 { - for iNdEx := len(m.AddressViews) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.AddressViews[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTransaction(dAtA, i, uint64(size)) + if m.Anchor != nil { + { + size, err := m.Anchor.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i-- - dAtA[i] = 0x19 - i-- - dAtA[i] = 0x82 + i -= size + i = encodeVarintTransaction(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0x1a + } + if len(m.BindingSig) > 0 { + i -= len(m.BindingSig) + copy(dAtA[i:], m.BindingSig) + i = encodeVarintTransaction(dAtA, i, uint64(len(m.BindingSig))) + i-- + dAtA[i] = 0x12 + } + if m.BodyView != nil { + { + size, err := m.BodyView.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTransaction(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *TransactionBodyView) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } - if m.XMemo != nil { + return dAtA[:n], nil +} + +func (m *TransactionBodyView) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TransactionBodyView) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.XMemoView != nil { { - size := m.XMemo.Size() + size := m.XMemoView.Size() i -= size - if _, err := m.XMemo.MarshalTo(dAtA[i:]); err != nil { + if _, err := m.XMemoView.MarshalTo(dAtA[i:]); err != nil { return 0, err } } @@ -4053,17 +4622,22 @@ func (m *TransactionView) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *TransactionView_Memo) MarshalTo(dAtA []byte) (int, error) { +func (m *TransactionBodyView_MemoView) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *TransactionView_Memo) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *TransactionBodyView_MemoView) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) - if m.Memo != nil { - i -= len(m.Memo) - copy(dAtA[i:], m.Memo) - i = encodeVarintTransaction(dAtA, i, uint64(len(m.Memo))) + if m.MemoView != nil { + { + size, err := m.MemoView.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTransaction(dAtA, i, uint64(size)) + } i-- dAtA[i] = 0x32 } @@ -5005,10 +5579,15 @@ func (m *OutputView_Visible) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.PayloadKey) > 0 { - i -= len(m.PayloadKey) - copy(dAtA[i:], m.PayloadKey) - i = encodeVarintTransaction(dAtA, i, uint64(len(m.PayloadKey))) + if m.PayloadKey != nil { + { + size, err := m.PayloadKey.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTransaction(dAtA, i, uint64(size)) + } i-- dAtA[i] = 0x1a } @@ -6070,17 +6649,22 @@ func (m *MemoPlan) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - if len(m.Plaintext) > 0 { - i -= len(m.Plaintext) - copy(dAtA[i:], m.Plaintext) - i = encodeVarintTransaction(dAtA, i, uint64(len(m.Plaintext))) + if m.Plaintext != nil { + { + size, err := m.Plaintext.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTransaction(dAtA, i, uint64(size)) + } i-- dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *SpendPlan) Marshal() (dAtA []byte, err error) { +func (m *MemoCiphertext) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -6090,38 +6674,56 @@ func (m *SpendPlan) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *SpendPlan) MarshalTo(dAtA []byte) (int, error) { +func (m *MemoCiphertext) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *SpendPlan) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MemoCiphertext) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.ValueBlinding) > 0 { - i -= len(m.ValueBlinding) - copy(dAtA[i:], m.ValueBlinding) - i = encodeVarintTransaction(dAtA, i, uint64(len(m.ValueBlinding))) + if len(m.Inner) > 0 { + i -= len(m.Inner) + copy(dAtA[i:], m.Inner) + i = encodeVarintTransaction(dAtA, i, uint64(len(m.Inner))) i-- - dAtA[i] = 0x22 + dAtA[i] = 0xa } - if len(m.Randomizer) > 0 { - i -= len(m.Randomizer) - copy(dAtA[i:], m.Randomizer) - i = encodeVarintTransaction(dAtA, i, uint64(len(m.Randomizer))) - i-- - dAtA[i] = 0x1a + return len(dAtA) - i, nil +} + +func (m *MemoPlaintext) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } - if m.Position != 0 { - i = encodeVarintTransaction(dAtA, i, uint64(m.Position)) + return dAtA[:n], nil +} + +func (m *MemoPlaintext) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MemoPlaintext) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Text) > 0 { + i -= len(m.Text) + copy(dAtA[i:], m.Text) + i = encodeVarintTransaction(dAtA, i, uint64(len(m.Text))) i-- - dAtA[i] = 0x10 + dAtA[i] = 0x12 } - if m.Note != nil { + if m.Sender != nil { { - size, err := m.Note.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Sender.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -6134,7 +6736,7 @@ func (m *SpendPlan) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *OutputPlan) Marshal() (dAtA []byte, err error) { +func (m *MemoView) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -6144,33 +6746,93 @@ func (m *OutputPlan) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *OutputPlan) MarshalTo(dAtA []byte) (int, error) { +func (m *MemoView) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *OutputPlan) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MemoView) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.ValueBlinding) > 0 { - i -= len(m.ValueBlinding) - copy(dAtA[i:], m.ValueBlinding) - i = encodeVarintTransaction(dAtA, i, uint64(len(m.ValueBlinding))) + if m.MemoView != nil { + { + size := m.MemoView.Size() + i -= size + if _, err := m.MemoView.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + } + } + return len(dAtA) - i, nil +} + +func (m *MemoView_Visible_) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MemoView_Visible_) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + if m.Visible != nil { + { + size, err := m.Visible.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTransaction(dAtA, i, uint64(size)) + } i-- - dAtA[i] = 0x22 + dAtA[i] = 0xa } - if len(m.Rseed) > 0 { - i -= len(m.Rseed) - copy(dAtA[i:], m.Rseed) - i = encodeVarintTransaction(dAtA, i, uint64(len(m.Rseed))) + return len(dAtA) - i, nil +} +func (m *MemoView_Opaque_) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MemoView_Opaque_) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + if m.Opaque != nil { + { + size, err := m.Opaque.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTransaction(dAtA, i, uint64(size)) + } i-- - dAtA[i] = 0x1a + dAtA[i] = 0x12 } - if m.DestAddress != nil { + return len(dAtA) - i, nil +} +func (m *MemoView_Visible) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *MemoView_Visible) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MemoView_Visible) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Plaintext != nil { { - size, err := m.DestAddress.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Plaintext.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -6180,9 +6842,9 @@ func (m *OutputPlan) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - if m.Value != nil { + if m.Ciphertext != nil { { - size, err := m.Value.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Ciphertext.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -6195,16 +6857,166 @@ func (m *OutputPlan) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func encodeVarintTransaction(dAtA []byte, offset int, v uint64) int { - offset -= sovTransaction(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ +func (m *MemoView_Opaque) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } - dAtA[offset] = uint8(v) - return base + return dAtA[:n], nil +} + +func (m *MemoView_Opaque) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MemoView_Opaque) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Ciphertext != nil { + { + size, err := m.Ciphertext.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTransaction(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *SpendPlan) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *SpendPlan) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SpendPlan) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.ValueBlinding) > 0 { + i -= len(m.ValueBlinding) + copy(dAtA[i:], m.ValueBlinding) + i = encodeVarintTransaction(dAtA, i, uint64(len(m.ValueBlinding))) + i-- + dAtA[i] = 0x22 + } + if len(m.Randomizer) > 0 { + i -= len(m.Randomizer) + copy(dAtA[i:], m.Randomizer) + i = encodeVarintTransaction(dAtA, i, uint64(len(m.Randomizer))) + i-- + dAtA[i] = 0x1a + } + if m.Position != 0 { + i = encodeVarintTransaction(dAtA, i, uint64(m.Position)) + i-- + dAtA[i] = 0x10 + } + if m.Note != nil { + { + size, err := m.Note.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTransaction(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *OutputPlan) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *OutputPlan) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OutputPlan) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.ValueBlinding) > 0 { + i -= len(m.ValueBlinding) + copy(dAtA[i:], m.ValueBlinding) + i = encodeVarintTransaction(dAtA, i, uint64(len(m.ValueBlinding))) + i-- + dAtA[i] = 0x22 + } + if len(m.Rseed) > 0 { + i -= len(m.Rseed) + copy(dAtA[i:], m.Rseed) + i = encodeVarintTransaction(dAtA, i, uint64(len(m.Rseed))) + i-- + dAtA[i] = 0x1a + } + if m.DestAddress != nil { + { + size, err := m.DestAddress.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTransaction(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + if m.Value != nil { + { + size, err := m.Value.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTransaction(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func encodeVarintTransaction(dAtA []byte, offset int, v uint64) int { + offset -= sovTransaction(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base } func (m *Transaction) Size() (n int) { if m == nil { @@ -6240,6 +7052,19 @@ func (m *Id) Size() (n int) { return n } +func (m *EffectHash) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Inner) + if l > 0 { + n += 1 + l + sovTransaction(uint64(l)) + } + return n +} + func (m *TransactionBody) Size() (n int) { if m == nil { return 0 @@ -6593,19 +7418,38 @@ func (m *TransactionPerspective) Size() (n int) { n += 1 + l + sovTransaction(uint64(l)) } } + if len(m.Denoms) > 0 { + for _, e := range m.Denoms { + l = e.Size() + n += 1 + l + sovTransaction(uint64(l)) + } + } return n } -func (m *PayloadKeyWithCommitment) Size() (n int) { +func (m *PayloadKey) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = len(m.PayloadKey) + l = len(m.Inner) if l > 0 { n += 1 + l + sovTransaction(uint64(l)) } + return n +} + +func (m *PayloadKeyWithCommitment) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.PayloadKey != nil { + l = m.PayloadKey.Size() + n += 1 + l + sovTransaction(uint64(l)) + } if m.Commitment != nil { l = m.Commitment.Size() n += 1 + l + sovTransaction(uint64(l)) @@ -6631,6 +7475,27 @@ func (m *NullifierWithNote) Size() (n int) { } func (m *TransactionView) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.BodyView != nil { + l = m.BodyView.Size() + n += 1 + l + sovTransaction(uint64(l)) + } + l = len(m.BindingSig) + if l > 0 { + n += 1 + l + sovTransaction(uint64(l)) + } + if m.Anchor != nil { + l = m.Anchor.Size() + n += 1 + l + sovTransaction(uint64(l)) + } + return n +} + +func (m *TransactionBodyView) Size() (n int) { if m == nil { return 0 } @@ -6659,26 +7524,20 @@ func (m *TransactionView) Size() (n int) { n += 1 + l + sovTransaction(uint64(l)) } } - if m.XMemo != nil { - n += m.XMemo.Size() - } - if len(m.AddressViews) > 0 { - for _, e := range m.AddressViews { - l = e.Size() - n += 2 + l + sovTransaction(uint64(l)) - } + if m.XMemoView != nil { + n += m.XMemoView.Size() } return n } -func (m *TransactionView_Memo) Size() (n int) { +func (m *TransactionBodyView_MemoView) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.Memo != nil { - l = len(m.Memo) + if m.MemoView != nil { + l = m.MemoView.Size() n += 1 + l + sovTransaction(uint64(l)) } return n @@ -7141,8 +8000,8 @@ func (m *OutputView_Visible) Size() (n int) { l = m.Note.Size() n += 1 + l + sovTransaction(uint64(l)) } - l = len(m.PayloadKey) - if l > 0 { + if m.PayloadKey != nil { + l = m.PayloadKey.Size() n += 1 + l + sovTransaction(uint64(l)) } return n @@ -7615,8 +8474,8 @@ func (m *MemoPlan) Size() (n int) { } var l int _ = l - l = len(m.Plaintext) - if l > 0 { + if m.Plaintext != nil { + l = m.Plaintext.Size() n += 1 + l + sovTransaction(uint64(l)) } l = len(m.Key) @@ -7626,59 +8485,155 @@ func (m *MemoPlan) Size() (n int) { return n } -func (m *SpendPlan) Size() (n int) { +func (m *MemoCiphertext) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.Note != nil { - l = m.Note.Size() + l = len(m.Inner) + if l > 0 { n += 1 + l + sovTransaction(uint64(l)) } - if m.Position != 0 { - n += 1 + sovTransaction(uint64(m.Position)) + return n +} + +func (m *MemoPlaintext) Size() (n int) { + if m == nil { + return 0 } - l = len(m.Randomizer) - if l > 0 { + var l int + _ = l + if m.Sender != nil { + l = m.Sender.Size() n += 1 + l + sovTransaction(uint64(l)) } - l = len(m.ValueBlinding) + l = len(m.Text) if l > 0 { n += 1 + l + sovTransaction(uint64(l)) } return n } -func (m *OutputPlan) Size() (n int) { +func (m *MemoView) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.Value != nil { - l = m.Value.Size() + if m.MemoView != nil { + n += m.MemoView.Size() + } + return n +} + +func (m *MemoView_Visible_) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Visible != nil { + l = m.Visible.Size() n += 1 + l + sovTransaction(uint64(l)) } - if m.DestAddress != nil { - l = m.DestAddress.Size() + return n +} +func (m *MemoView_Opaque_) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Opaque != nil { + l = m.Opaque.Size() n += 1 + l + sovTransaction(uint64(l)) } - l = len(m.Rseed) - if l > 0 { + return n +} +func (m *MemoView_Visible) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Ciphertext != nil { + l = m.Ciphertext.Size() n += 1 + l + sovTransaction(uint64(l)) } - l = len(m.ValueBlinding) - if l > 0 { + if m.Plaintext != nil { + l = m.Plaintext.Size() n += 1 + l + sovTransaction(uint64(l)) } return n } -func sovTransaction(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozTransaction(x uint64) (n int) { +func (m *MemoView_Opaque) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Ciphertext != nil { + l = m.Ciphertext.Size() + n += 1 + l + sovTransaction(uint64(l)) + } + return n +} + +func (m *SpendPlan) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Note != nil { + l = m.Note.Size() + n += 1 + l + sovTransaction(uint64(l)) + } + if m.Position != 0 { + n += 1 + sovTransaction(uint64(m.Position)) + } + l = len(m.Randomizer) + if l > 0 { + n += 1 + l + sovTransaction(uint64(l)) + } + l = len(m.ValueBlinding) + if l > 0 { + n += 1 + l + sovTransaction(uint64(l)) + } + return n +} + +func (m *OutputPlan) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Value != nil { + l = m.Value.Size() + n += 1 + l + sovTransaction(uint64(l)) + } + if m.DestAddress != nil { + l = m.DestAddress.Size() + n += 1 + l + sovTransaction(uint64(l)) + } + l = len(m.Rseed) + if l > 0 { + n += 1 + l + sovTransaction(uint64(l)) + } + l = len(m.ValueBlinding) + if l > 0 { + n += 1 + l + sovTransaction(uint64(l)) + } + return n +} + +func sovTransaction(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozTransaction(x uint64) (n int) { return sovTransaction(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } func (m *Transaction) Unmarshal(dAtA []byte) error { @@ -7921,6 +8876,90 @@ func (m *Id) Unmarshal(dAtA []byte) error { } return nil } +func (m *EffectHash) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: EffectHash: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: EffectHash: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Inner", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthTransaction + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthTransaction + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Inner = append(m.Inner[:0], dAtA[iNdEx:postIndex]...) + if m.Inner == nil { + m.Inner = []byte{} + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTransaction(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTransaction + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *TransactionBody) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -9144,6 +10183,40 @@ func (m *TransactionPerspective) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Denoms", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTransaction + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTransaction + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Denoms = append(m.Denoms, &v1alpha1.Denom{}) + if err := m.Denoms[len(m.Denoms)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTransaction(dAtA[iNdEx:]) @@ -9165,7 +10238,7 @@ func (m *TransactionPerspective) Unmarshal(dAtA []byte) error { } return nil } -func (m *PayloadKeyWithCommitment) Unmarshal(dAtA []byte) error { +func (m *PayloadKey) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -9188,15 +10261,15 @@ func (m *PayloadKeyWithCommitment) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: PayloadKeyWithCommitment: wiretype end group for non-group") + return fmt.Errorf("proto: PayloadKey: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: PayloadKeyWithCommitment: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: PayloadKey: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PayloadKey", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Inner", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -9223,45 +10296,9 @@ func (m *PayloadKeyWithCommitment) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.PayloadKey = append(m.PayloadKey[:0], dAtA[iNdEx:postIndex]...) - if m.PayloadKey == nil { - m.PayloadKey = []byte{} - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Commitment", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTransaction - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTransaction - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTransaction - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Commitment == nil { - m.Commitment = &v1alpha1.StateCommitment{} - } - if err := m.Commitment.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + m.Inner = append(m.Inner[:0], dAtA[iNdEx:postIndex]...) + if m.Inner == nil { + m.Inner = []byte{} } iNdEx = postIndex default: @@ -9285,7 +10322,7 @@ func (m *PayloadKeyWithCommitment) Unmarshal(dAtA []byte) error { } return nil } -func (m *NullifierWithNote) Unmarshal(dAtA []byte) error { +func (m *PayloadKeyWithCommitment) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -9308,15 +10345,15 @@ func (m *NullifierWithNote) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: NullifierWithNote: wiretype end group for non-group") + return fmt.Errorf("proto: PayloadKeyWithCommitment: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: NullifierWithNote: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: PayloadKeyWithCommitment: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Nullifier", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PayloadKey", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -9343,16 +10380,16 @@ func (m *NullifierWithNote) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Nullifier == nil { - m.Nullifier = &v1alpha1.Nullifier{} + if m.PayloadKey == nil { + m.PayloadKey = &PayloadKey{} } - if err := m.Nullifier.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.PayloadKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Note", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Commitment", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -9379,10 +10416,10 @@ func (m *NullifierWithNote) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Note == nil { - m.Note = &v1alpha1.Note{} + if m.Commitment == nil { + m.Commitment = &v1alpha1.StateCommitment{} } - if err := m.Note.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Commitment.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -9407,7 +10444,7 @@ func (m *NullifierWithNote) Unmarshal(dAtA []byte) error { } return nil } -func (m *TransactionView) Unmarshal(dAtA []byte) error { +func (m *NullifierWithNote) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -9430,15 +10467,15 @@ func (m *TransactionView) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: TransactionView: wiretype end group for non-group") + return fmt.Errorf("proto: NullifierWithNote: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: TransactionView: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: NullifierWithNote: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ActionViews", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Nullifier", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -9465,16 +10502,18 @@ func (m *TransactionView) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ActionViews = append(m.ActionViews, &ActionView{}) - if err := m.ActionViews[len(m.ActionViews)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if m.Nullifier == nil { + m.Nullifier = &v1alpha1.Nullifier{} + } + if err := m.Nullifier.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ExpiryHeight", wireType) + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Note", wireType) } - m.ExpiryHeight = 0 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTransaction @@ -9484,82 +10523,81 @@ func (m *TransactionView) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.ExpiryHeight |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ChainId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTransaction - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthTransaction } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthTransaction } if postIndex > l { return io.ErrUnexpectedEOF } - m.ChainId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Fee", wireType) + if m.Note == nil { + m.Note = &v1alpha1.Note{} } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTransaction - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } + if err := m.Note.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } - if msglen < 0 { - return ErrInvalidLengthTransaction + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTransaction(dAtA[iNdEx:]) + if err != nil { + return err } - postIndex := iNdEx + msglen - if postIndex < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthTransaction } - if postIndex > l { + if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - if m.Fee == nil { - m.Fee = &v1alpha1.Fee{} + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *TransactionView) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction } - if err := m.Fee.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + if iNdEx >= l { + return io.ErrUnexpectedEOF } - iNdEx = postIndex - case 5: + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: TransactionView: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: TransactionView: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field FmdClues", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field BodyView", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -9586,14 +10624,16 @@ func (m *TransactionView) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.FmdClues = append(m.FmdClues, &v1alpha1.Clue{}) - if err := m.FmdClues[len(m.FmdClues)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if m.BodyView == nil { + m.BodyView = &TransactionBodyView{} + } + if err := m.BodyView.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex - case 6: + case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Memo", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field BindingSig", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -9620,13 +10660,14 @@ func (m *TransactionView) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - v := make([]byte, postIndex-iNdEx) - copy(v, dAtA[iNdEx:postIndex]) - m.XMemo = &TransactionView_Memo{v} + m.BindingSig = append(m.BindingSig[:0], dAtA[iNdEx:postIndex]...) + if m.BindingSig == nil { + m.BindingSig = []byte{} + } iNdEx = postIndex - case 400: + case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AddressViews", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Anchor", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -9653,8 +10694,10 @@ func (m *TransactionView) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.AddressViews = append(m.AddressViews, &v1alpha1.AddressView{}) - if err := m.AddressViews[len(m.AddressViews)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if m.Anchor == nil { + m.Anchor = &v1alpha1.MerkleRoot{} + } + if err := m.Anchor.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -9679,7 +10722,7 @@ func (m *TransactionView) Unmarshal(dAtA []byte) error { } return nil } -func (m *ActionView) Unmarshal(dAtA []byte) error { +func (m *TransactionBodyView) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -9702,15 +10745,15 @@ func (m *ActionView) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: ActionView: wiretype end group for non-group") + return fmt.Errorf("proto: TransactionBodyView: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: ActionView: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: TransactionBodyView: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Spend", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ActionViews", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -9737,17 +10780,35 @@ func (m *ActionView) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - v := &SpendView{} - if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.ActionViews = append(m.ActionViews, &ActionView{}) + if err := m.ActionViews[len(m.ActionViews)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } - m.ActionView = &ActionView_Spend{v} iNdEx = postIndex case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ExpiryHeight", wireType) + } + m.ExpiryHeight = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ExpiryHeight |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Output", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ChainId", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTransaction @@ -9757,30 +10818,27 @@ func (m *ActionView) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthTransaction } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthTransaction } if postIndex > l { return io.ErrUnexpectedEOF } - v := &OutputView{} - if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - m.ActionView = &ActionView_Output{v} + m.ChainId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 3: + case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Swap", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Fee", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -9807,15 +10865,16 @@ func (m *ActionView) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - v := &v1alpha11.SwapView{} - if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if m.Fee == nil { + m.Fee = &v1alpha1.Fee{} + } + if err := m.Fee.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } - m.ActionView = &ActionView_Swap{v} iNdEx = postIndex - case 4: + case 5: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SwapClaim", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field FmdClues", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -9842,15 +10901,14 @@ func (m *ActionView) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - v := &v1alpha11.SwapClaimView{} - if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.FmdClues = append(m.FmdClues, &v1alpha1.Clue{}) + if err := m.FmdClues[len(m.FmdClues)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } - m.ActionView = &ActionView_SwapClaim{v} iNdEx = postIndex - case 16: + case 6: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ValidatorDefinition", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field MemoView", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -9877,15 +10935,65 @@ func (m *ActionView) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - v := &v1alpha12.ValidatorDefinition{} + v := &MemoView{} if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } - m.ActionView = &ActionView_ValidatorDefinition{v} + m.XMemoView = &TransactionBodyView_MemoView{v} iNdEx = postIndex - case 17: + default: + iNdEx = preIndex + skippy, err := skipTransaction(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTransaction + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *ActionView) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: ActionView: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: ActionView: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field IbcAction", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Spend", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -9912,15 +11020,190 @@ func (m *ActionView) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - v := &v1alpha13.IbcAction{} + v := &SpendView{} if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } - m.ActionView = &ActionView_IbcAction{v} + m.ActionView = &ActionView_Spend{v} iNdEx = postIndex - case 18: + case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProposalSubmit", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Output", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTransaction + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTransaction + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + v := &OutputView{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.ActionView = &ActionView_Output{v} + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Swap", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTransaction + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTransaction + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + v := &v1alpha11.SwapView{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.ActionView = &ActionView_Swap{v} + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SwapClaim", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTransaction + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTransaction + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + v := &v1alpha11.SwapClaimView{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.ActionView = &ActionView_SwapClaim{v} + iNdEx = postIndex + case 16: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ValidatorDefinition", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTransaction + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTransaction + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + v := &v1alpha12.ValidatorDefinition{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.ActionView = &ActionView_ValidatorDefinition{v} + iNdEx = postIndex + case 17: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field IbcAction", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTransaction + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTransaction + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + v := &v1alpha13.IbcAction{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.ActionView = &ActionView_IbcAction{v} + iNdEx = postIndex + case 18: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ProposalSubmit", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -10714,7 +11997,7 @@ func (m *SpendView_Visible) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Note == nil { - m.Note = &v1alpha1.Note{} + m.Note = &v1alpha1.NoteView{} } if err := m.Note.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -11042,7 +12325,7 @@ func (m *DelegatorVoteView_Visible) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Note == nil { - m.Note = &v1alpha1.Note{} + m.Note = &v1alpha1.NoteView{} } if err := m.Note.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -11370,7 +12653,7 @@ func (m *OutputView_Visible) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Note == nil { - m.Note = &v1alpha1.Note{} + m.Note = &v1alpha1.NoteView{} } if err := m.Note.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -11380,7 +12663,7 @@ func (m *OutputView_Visible) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field PayloadKey", wireType) } - var byteLen int + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTransaction @@ -11390,24 +12673,26 @@ func (m *OutputView_Visible) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + if msglen < 0 { return ErrInvalidLengthTransaction } - postIndex := iNdEx + byteLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthTransaction } if postIndex > l { return io.ErrUnexpectedEOF } - m.PayloadKey = append(m.PayloadKey[:0], dAtA[iNdEx:postIndex]...) if m.PayloadKey == nil { - m.PayloadKey = []byte{} + m.PayloadKey = &PayloadKey{} + } + if err := m.PayloadKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } iNdEx = postIndex default: @@ -13613,7 +14898,7 @@ func (m *MemoPlan) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Plaintext", wireType) } - var byteLen int + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTransaction @@ -13623,24 +14908,26 @@ func (m *MemoPlan) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + if msglen < 0 { return ErrInvalidLengthTransaction } - postIndex := iNdEx + byteLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthTransaction } if postIndex > l { return io.ErrUnexpectedEOF } - m.Plaintext = append(m.Plaintext[:0], dAtA[iNdEx:postIndex]...) if m.Plaintext == nil { - m.Plaintext = []byte{} + m.Plaintext = &MemoPlaintext{} + } + if err := m.Plaintext.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } iNdEx = postIndex case 2: @@ -13698,6 +14985,536 @@ func (m *MemoPlan) Unmarshal(dAtA []byte) error { } return nil } +func (m *MemoCiphertext) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: MemoCiphertext: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MemoCiphertext: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Inner", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthTransaction + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthTransaction + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Inner = append(m.Inner[:0], dAtA[iNdEx:postIndex]...) + if m.Inner == nil { + m.Inner = []byte{} + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTransaction(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTransaction + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *MemoPlaintext) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: MemoPlaintext: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MemoPlaintext: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTransaction + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTransaction + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Sender == nil { + m.Sender = &v1alpha1.Address{} + } + if err := m.Sender.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Text", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTransaction + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTransaction + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Text = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTransaction(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTransaction + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *MemoView) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: MemoView: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MemoView: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Visible", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTransaction + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTransaction + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + v := &MemoView_Visible{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.MemoView = &MemoView_Visible_{v} + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Opaque", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTransaction + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTransaction + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + v := &MemoView_Opaque{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.MemoView = &MemoView_Opaque_{v} + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTransaction(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTransaction + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *MemoView_Visible) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: Visible: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Visible: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Ciphertext", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTransaction + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTransaction + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Ciphertext == nil { + m.Ciphertext = &MemoCiphertext{} + } + if err := m.Ciphertext.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Plaintext", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTransaction + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTransaction + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Plaintext == nil { + m.Plaintext = &MemoPlaintext{} + } + if err := m.Plaintext.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTransaction(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTransaction + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *MemoView_Opaque) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: Opaque: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Opaque: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Ciphertext", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTransaction + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTransaction + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Ciphertext == nil { + m.Ciphertext = &MemoCiphertext{} + } + if err := m.Ciphertext.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTransaction(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTransaction + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *SpendPlan) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/relayer/chains/penumbra/core/transparent_proofs/v1alpha1/transparent_proofs.pb.go b/relayer/chains/penumbra/core/transparent_proofs/v1alpha1/transparent_proofs.pb.go index 95f0f4bf6..da8ab16f7 100644 --- a/relayer/chains/penumbra/core/transparent_proofs/v1alpha1/transparent_proofs.pb.go +++ b/relayer/chains/penumbra/core/transparent_proofs/v1alpha1/transparent_proofs.pb.go @@ -124,8 +124,8 @@ type SwapClaimProof struct { // // @exclude // Describes output amounts - Lambda_1I uint64 `protobuf:"varint,20,opt,name=lambda_1_i,json=lambda1I,proto3" json:"lambda_1_i,omitempty"` - Lambda_2I uint64 `protobuf:"varint,21,opt,name=lambda_2_i,json=lambda2I,proto3" json:"lambda_2_i,omitempty"` + Lambda_1I *v1alpha1.Amount `protobuf:"bytes,20,opt,name=lambda_1_i,json=lambda1I,proto3" json:"lambda_1_i,omitempty"` + Lambda_2I *v1alpha1.Amount `protobuf:"bytes,21,opt,name=lambda_2_i,json=lambda2I,proto3" json:"lambda_2_i,omitempty"` } func (m *SwapClaimProof) Reset() { *m = SwapClaimProof{} } @@ -182,18 +182,18 @@ func (m *SwapClaimProof) GetNk() []byte { return nil } -func (m *SwapClaimProof) GetLambda_1I() uint64 { +func (m *SwapClaimProof) GetLambda_1I() *v1alpha1.Amount { if m != nil { return m.Lambda_1I } - return 0 + return nil } -func (m *SwapClaimProof) GetLambda_2I() uint64 { +func (m *SwapClaimProof) GetLambda_2I() *v1alpha1.Amount { if m != nil { return m.Lambda_2I } - return 0 + return nil } type UndelegateClaimProof struct { @@ -259,45 +259,46 @@ func init() { } var fileDescriptor_1536b20e10cd99e5 = []byte{ - // 606 bytes of a gzipped FileDescriptorProto + // 609 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x4f, 0x6b, 0xd4, 0x40, - 0x14, 0x6f, 0xd2, 0x52, 0xec, 0x54, 0xdb, 0x92, 0xfe, 0x21, 0x14, 0x0d, 0xa5, 0x2a, 0x6c, 0x15, - 0x13, 0x76, 0x2b, 0x08, 0xf1, 0xd4, 0xdd, 0x83, 0xf4, 0xa0, 0x84, 0xb4, 0x7a, 0x90, 0x85, 0xf0, - 0x92, 0x8c, 0xbb, 0x61, 0x93, 0x99, 0x21, 0x99, 0x6c, 0x5b, 0x3f, 0x85, 0xa0, 0xe0, 0x5d, 0x6f, - 0x7e, 0x12, 0xf1, 0xd4, 0xa3, 0x47, 0xd9, 0xde, 0xfc, 0x14, 0x32, 0x93, 0x9d, 0xcd, 0xb6, 0x5b, - 0x68, 0xf1, 0xb6, 0xef, 0xfd, 0xfe, 0xbc, 0xf7, 0x7e, 0xd9, 0x04, 0xb5, 0x19, 0x26, 0x65, 0x16, - 0xe6, 0xe0, 0x44, 0x34, 0xc7, 0x0e, 0xcf, 0x81, 0x14, 0x0c, 0x72, 0x4c, 0x78, 0xc0, 0x72, 0x4a, - 0x3f, 0x14, 0xce, 0xb0, 0x09, 0x29, 0xeb, 0x43, 0xf3, 0x1a, 0xcc, 0x66, 0x39, 0xe5, 0xd4, 0xd8, - 0x53, 0x1e, 0xb6, 0xf0, 0xb0, 0xaf, 0xe1, 0x29, 0x8f, 0xed, 0x27, 0x97, 0xc7, 0x45, 0xf9, 0x19, - 0xe3, 0xb4, 0x1e, 0x51, 0xd5, 0x95, 0xed, 0xf6, 0xa3, 0xcb, 0xdc, 0x18, 0x9f, 0xd6, 0xc4, 0x18, - 0x9f, 0x56, 0xac, 0xdd, 0xef, 0x3a, 0x42, 0x47, 0x0c, 0x93, 0xd8, 0x13, 0xa3, 0x8c, 0x04, 0x6d, - 0x15, 0x1c, 0x38, 0x0e, 0x22, 0x9a, 0x65, 0x09, 0xcf, 0x26, 0x4b, 0x98, 0xda, 0x8e, 0xd6, 0x58, - 0x6e, 0xed, 0xdb, 0x97, 0x97, 0x1d, 0x4f, 0x54, 0xc6, 0xf6, 0x91, 0x10, 0x77, 0x26, 0x5a, 0x69, - 0xea, 0x6f, 0x14, 0xd7, 0x74, 0x8d, 0x17, 0x68, 0x81, 0x50, 0x8e, 0x4d, 0x5d, 0x1a, 0x3f, 0xbc, - 0xc1, 0xf8, 0x0d, 0xe5, 0xd8, 0x97, 0x02, 0xe3, 0x01, 0x42, 0xc3, 0x20, 0x4c, 0x13, 0x12, 0x27, - 0xa4, 0x67, 0x2e, 0xee, 0x68, 0x8d, 0xbb, 0xfe, 0xd2, 0xb0, 0x3d, 0x6e, 0x18, 0x2d, 0xb4, 0x59, - 0x88, 0x83, 0x02, 0x28, 0x79, 0x3f, 0xc8, 0x81, 0xc4, 0x34, 0x4b, 0x3e, 0xe2, 0xdc, 0x5c, 0x92, - 0xcc, 0x75, 0x09, 0x1e, 0x94, 0xbc, 0xef, 0x4f, 0x20, 0x63, 0x05, 0xe9, 0x30, 0x30, 0x91, 0x24, - 0xe8, 0x30, 0x10, 0x35, 0x19, 0x98, 0xcb, 0x55, 0x4d, 0x06, 0xbb, 0x5f, 0x75, 0xb4, 0x72, 0x74, - 0x02, 0xac, 0x93, 0x42, 0x92, 0x55, 0xeb, 0x7b, 0x68, 0xa5, 0x38, 0x01, 0x16, 0xb0, 0x14, 0x12, - 0xc2, 0xf1, 0x29, 0x1f, 0x27, 0xb4, 0x77, 0xe5, 0x10, 0x11, 0x75, 0x1d, 0xcf, 0x09, 0x30, 0x4f, - 0x09, 0xfc, 0x7b, 0xc5, 0x74, 0x69, 0xf4, 0xd0, 0xa6, 0x74, 0x9c, 0x89, 0x7e, 0xe1, 0xff, 0xa3, - 0x5f, 0x17, 0x8e, 0x57, 0x93, 0xaf, 0xae, 0x5b, 0x54, 0xd7, 0x19, 0xf7, 0x11, 0x4a, 0x21, 0x0b, - 0x63, 0x08, 0x9a, 0x41, 0x62, 0x6e, 0xec, 0x68, 0x8d, 0x05, 0xff, 0x4e, 0xd5, 0x69, 0x1e, 0x4e, - 0xa1, 0xad, 0x20, 0x31, 0x37, 0xa7, 0xd1, 0xd6, 0xe1, 0xee, 0x67, 0x0d, 0x6d, 0xbc, 0x25, 0x31, - 0x4e, 0x71, 0x4f, 0x8c, 0x9f, 0xce, 0x67, 0xad, 0x24, 0x21, 0x95, 0xcf, 0x24, 0x80, 0x8c, 0x96, - 0x44, 0x25, 0xf4, 0xf8, 0x86, 0x43, 0x0e, 0x24, 0xd9, 0x5f, 0x9d, 0xc8, 0xab, 0x86, 0xb1, 0x87, - 0xd6, 0x42, 0x48, 0x81, 0x44, 0xb8, 0x7e, 0xfa, 0xba, 0x3c, 0x62, 0x75, 0xdc, 0x57, 0xff, 0x81, - 0xf6, 0x97, 0xf9, 0x9f, 0x23, 0x4b, 0x3b, 0x1f, 0x59, 0xda, 0x9f, 0x91, 0xa5, 0x7d, 0xba, 0xb0, - 0xe6, 0xce, 0x2f, 0xac, 0xb9, 0xdf, 0x17, 0xd6, 0x1c, 0x7a, 0x16, 0xd1, 0xcc, 0xbe, 0xf5, 0x1b, - 0xd7, 0xde, 0x3a, 0xae, 0x41, 0x79, 0x58, 0xe1, 0x89, 0xf7, 0xc6, 0xd3, 0xde, 0xb3, 0x5e, 0xc2, - 0xfb, 0x65, 0x68, 0x47, 0x34, 0x73, 0x22, 0x5a, 0x64, 0xb4, 0x70, 0x72, 0x9c, 0xc2, 0x19, 0xce, - 0x9d, 0x61, 0x6b, 0xf2, 0x33, 0xea, 0x43, 0x42, 0x0a, 0xe7, 0xd6, 0x9f, 0x89, 0x97, 0xb3, 0x98, - 0x82, 0xbe, 0xe9, 0xf3, 0x5e, 0xe7, 0xf8, 0x87, 0xde, 0xf0, 0xd4, 0xf6, 0x1d, 0xb1, 0xfd, 0xcc, - 0x82, 0xf6, 0xbb, 0xb1, 0xe0, 0x57, 0x4d, 0xed, 0x0a, 0x6a, 0x77, 0x86, 0xda, 0x55, 0xd4, 0x91, - 0xfe, 0xfc, 0xb6, 0xd4, 0xee, 0x2b, 0xaf, 0xfd, 0x1a, 0x73, 0x88, 0x81, 0xc3, 0x5f, 0xfd, 0xa9, - 0x92, 0xb9, 0xae, 0xd0, 0xb9, 0xee, 0x8c, 0xd0, 0x75, 0x95, 0x32, 0x5c, 0x94, 0xdf, 0x9c, 0xfd, - 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x1c, 0x1e, 0x6a, 0x61, 0x36, 0x05, 0x00, 0x00, + 0x14, 0x6f, 0xd2, 0x52, 0xec, 0x54, 0xdb, 0x92, 0xfe, 0x21, 0x14, 0x0c, 0xa5, 0x2a, 0xb4, 0x8a, + 0x09, 0xbb, 0x15, 0x84, 0x78, 0xea, 0xee, 0x41, 0x7a, 0x50, 0x42, 0x5a, 0x3d, 0xc8, 0x42, 0x78, + 0x49, 0xc6, 0xdd, 0xb0, 0xc9, 0xcc, 0x90, 0x4c, 0xb6, 0xad, 0x9f, 0x42, 0xd0, 0x4f, 0xa0, 0x37, + 0x3f, 0x89, 0x78, 0xea, 0xd1, 0xa3, 0x6c, 0xf1, 0xe2, 0xa7, 0x90, 0x99, 0x24, 0x9b, 0xdd, 0xee, + 0x42, 0x97, 0xde, 0xf2, 0xde, 0xfb, 0xfd, 0x7e, 0xef, 0xbd, 0x5f, 0x66, 0x06, 0xb5, 0x18, 0x26, + 0x79, 0xe2, 0xa7, 0x60, 0x05, 0x34, 0xc5, 0x16, 0x4f, 0x81, 0x64, 0x0c, 0x52, 0x4c, 0xb8, 0xc7, + 0x52, 0x4a, 0x3f, 0x66, 0xd6, 0xa0, 0x01, 0x31, 0xeb, 0x41, 0x63, 0x46, 0xcd, 0x64, 0x29, 0xe5, + 0x54, 0x3b, 0xac, 0x34, 0x4c, 0xa1, 0x61, 0xce, 0xc0, 0x55, 0x1a, 0xbb, 0x4f, 0x27, 0xdb, 0x05, + 0xe9, 0x25, 0xe3, 0xb4, 0x6e, 0x51, 0xc4, 0x85, 0xec, 0xee, 0xe3, 0x49, 0x6c, 0x88, 0x2f, 0x6a, + 0x60, 0x88, 0x2f, 0x0a, 0xd4, 0xfe, 0x77, 0x15, 0xa1, 0x53, 0x86, 0x49, 0xe8, 0x88, 0x56, 0x5a, + 0x84, 0x76, 0x32, 0x0e, 0x1c, 0x7b, 0x01, 0x4d, 0x92, 0x88, 0x27, 0xa3, 0x21, 0x74, 0x65, 0x4f, + 0x39, 0x58, 0x6d, 0x1e, 0x99, 0x93, 0xc3, 0x96, 0x1d, 0x2b, 0x61, 0xf3, 0x54, 0x90, 0xdb, 0x23, + 0xae, 0x14, 0x75, 0xb7, 0xb2, 0x19, 0x59, 0xed, 0x25, 0x5a, 0x22, 0x94, 0x63, 0x5d, 0x95, 0xc2, + 0x8f, 0x6e, 0x11, 0x7e, 0x4b, 0x39, 0x76, 0x25, 0x41, 0x7b, 0x88, 0xd0, 0xc0, 0xf3, 0xe3, 0x88, + 0x84, 0x11, 0xe9, 0xea, 0xcb, 0x7b, 0xca, 0xc1, 0x7d, 0x77, 0x65, 0xd0, 0x2a, 0x13, 0x5a, 0x13, + 0x6d, 0x67, 0x62, 0x21, 0x0f, 0x72, 0xde, 0xf3, 0x52, 0x20, 0x21, 0x4d, 0xa2, 0x4f, 0x38, 0xd5, + 0x57, 0x24, 0x72, 0x53, 0x16, 0x8f, 0x73, 0xde, 0x73, 0x47, 0x25, 0x6d, 0x0d, 0xa9, 0xd0, 0xd7, + 0x91, 0x04, 0xa8, 0xd0, 0x17, 0x31, 0xe9, 0xeb, 0xab, 0x45, 0x4c, 0xfa, 0xfb, 0x7f, 0x55, 0xb4, + 0x76, 0x7a, 0x0e, 0xac, 0x1d, 0x43, 0x94, 0x14, 0xe3, 0x3b, 0x68, 0x2d, 0x3b, 0x07, 0xe6, 0xb1, + 0x18, 0x22, 0xc2, 0xf1, 0x05, 0x2f, 0x1d, 0x3a, 0xbc, 0xb1, 0x88, 0xb0, 0xba, 0xb6, 0xe7, 0x1c, + 0x98, 0x53, 0x11, 0xdc, 0x07, 0xd9, 0x78, 0xa8, 0x75, 0xd1, 0xb6, 0x54, 0x9c, 0xb2, 0x7e, 0xe9, + 0xee, 0xd6, 0x6f, 0x0a, 0xc5, 0x9b, 0xce, 0x17, 0xdb, 0x2d, 0x57, 0xdb, 0x69, 0x6d, 0x84, 0x62, + 0x48, 0xfc, 0x10, 0xbc, 0x86, 0x17, 0xe9, 0x5b, 0xb2, 0xdb, 0x93, 0x5b, 0xba, 0x1d, 0x27, 0x34, + 0x27, 0xdc, 0xbd, 0x57, 0x10, 0x1b, 0x27, 0x63, 0x22, 0x4d, 0x2f, 0xd2, 0xb7, 0xef, 0x20, 0xd2, + 0x3c, 0xd9, 0xff, 0xa2, 0xa0, 0xad, 0x77, 0x24, 0xc4, 0x31, 0xee, 0x8a, 0x65, 0xc6, 0xdd, 0xde, + 0xc8, 0x89, 0x4f, 0xe5, 0x1f, 0xf6, 0x40, 0xd2, 0x4a, 0xbf, 0xe7, 0xec, 0xb1, 0x3e, 0xa2, 0x17, + 0x09, 0xed, 0x10, 0x6d, 0xf8, 0x10, 0x03, 0x09, 0x70, 0x7d, 0x96, 0x54, 0x69, 0xc9, 0x7a, 0x99, + 0xaf, 0x4e, 0x54, 0xeb, 0xeb, 0xe2, 0xcf, 0xa1, 0xa1, 0x5c, 0x0d, 0x0d, 0xe5, 0xcf, 0xd0, 0x50, + 0x3e, 0x5f, 0x1b, 0x0b, 0x57, 0xd7, 0xc6, 0xc2, 0xef, 0x6b, 0x63, 0x01, 0x3d, 0x0f, 0x68, 0x62, + 0xce, 0x7d, 0x7f, 0x5b, 0x3b, 0x67, 0x75, 0x51, 0x2e, 0x96, 0x39, 0xe2, 0x16, 0x3a, 0xca, 0x07, + 0xd6, 0x8d, 0x78, 0x2f, 0xf7, 0xcd, 0x80, 0x26, 0x56, 0x40, 0xb3, 0x84, 0x66, 0x56, 0x8a, 0x63, + 0xb8, 0xc4, 0xa9, 0x35, 0x68, 0x8e, 0x3e, 0x83, 0x1e, 0x44, 0x24, 0xb3, 0xe6, 0x7e, 0x74, 0x5e, + 0x4d, 0xd7, 0xaa, 0xd2, 0x37, 0x75, 0xd1, 0x69, 0x9f, 0xfd, 0x50, 0x0f, 0x9c, 0x6a, 0xfa, 0xb6, + 0x98, 0x7e, 0x6a, 0x40, 0xf3, 0x7d, 0x49, 0xf8, 0x55, 0x43, 0x3b, 0x02, 0xda, 0x99, 0x82, 0x76, + 0x2a, 0xe8, 0x50, 0x7d, 0x31, 0x2f, 0xb4, 0xf3, 0xda, 0x69, 0xbd, 0xc1, 0x1c, 0x42, 0xe0, 0xf0, + 0x4f, 0x7d, 0x56, 0xd1, 0x6c, 0x5b, 0xf0, 0x6c, 0x7b, 0x8a, 0x68, 0xdb, 0x15, 0xd3, 0x5f, 0x96, + 0x2f, 0xd8, 0xd1, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x85, 0x1d, 0x0f, 0xfc, 0x84, 0x05, 0x00, + 0x00, } func (m *SpendProof) Marshal() (dAtA []byte, err error) { @@ -395,19 +396,33 @@ func (m *SwapClaimProof) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.Lambda_2I != 0 { - i = encodeVarintTransparentProofs(dAtA, i, uint64(m.Lambda_2I)) + if m.Lambda_2I != nil { + { + size, err := m.Lambda_2I.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTransparentProofs(dAtA, i, uint64(size)) + } i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0xa8 + dAtA[i] = 0xaa } - if m.Lambda_1I != 0 { - i = encodeVarintTransparentProofs(dAtA, i, uint64(m.Lambda_1I)) + if m.Lambda_1I != nil { + { + size, err := m.Lambda_1I.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTransparentProofs(dAtA, i, uint64(size)) + } i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0xa0 + dAtA[i] = 0xa2 } if len(m.Nk) > 0 { i -= len(m.Nk) @@ -547,11 +562,13 @@ func (m *SwapClaimProof) Size() (n int) { if l > 0 { n += 1 + l + sovTransparentProofs(uint64(l)) } - if m.Lambda_1I != 0 { - n += 2 + sovTransparentProofs(uint64(m.Lambda_1I)) + if m.Lambda_1I != nil { + l = m.Lambda_1I.Size() + n += 2 + l + sovTransparentProofs(uint64(l)) } - if m.Lambda_2I != 0 { - n += 2 + sovTransparentProofs(uint64(m.Lambda_2I)) + if m.Lambda_2I != nil { + l = m.Lambda_2I.Size() + n += 2 + l + sovTransparentProofs(uint64(l)) } return n } @@ -973,10 +990,10 @@ func (m *SwapClaimProof) Unmarshal(dAtA []byte) error { } iNdEx = postIndex case 20: - if wireType != 0 { + if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Lambda_1I", wireType) } - m.Lambda_1I = 0 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTransparentProofs @@ -986,16 +1003,33 @@ func (m *SwapClaimProof) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Lambda_1I |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } + if msglen < 0 { + return ErrInvalidLengthTransparentProofs + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTransparentProofs + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Lambda_1I == nil { + m.Lambda_1I = &v1alpha1.Amount{} + } + if err := m.Lambda_1I.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex case 21: - if wireType != 0 { + if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Lambda_2I", wireType) } - m.Lambda_2I = 0 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTransparentProofs @@ -1005,11 +1039,28 @@ func (m *SwapClaimProof) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Lambda_2I |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } + if msglen < 0 { + return ErrInvalidLengthTransparentProofs + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTransparentProofs + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Lambda_2I == nil { + m.Lambda_2I = &v1alpha1.Amount{} + } + if err := m.Lambda_2I.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTransparentProofs(dAtA[iNdEx:])