From debdee72d008e5d1f93c0158a1d66baa120bba3f Mon Sep 17 00:00:00 2001 From: Conor Schaefer Date: Fri, 19 May 2023 08:19:15 -0700 Subject: [PATCH] penumbra: update protos (#1181) Matches the latest protos shipped with the Penumbra Testnet 52. Co-authored-by: Conor Schaefer Co-authored-by: Justin Tieri <37750742+jtieri@users.noreply.github.com> --- .../penumbra/core/chain/v1alpha1/chain.pb.go | 245 +- .../core/crypto/v1alpha1/crypto.pb.go | 1582 +++++++-- .../penumbra/core/dex/v1alpha1/dex.pb.go | 639 ++-- .../penumbra/core/stake/v1alpha1/stake.pb.go | 1 - .../transaction/v1alpha1/transaction.pb.go | 366 +- .../chains/penumbra/view/v1alpha1/view.pb.go | 3065 ++++------------- 6 files changed, 2684 insertions(+), 3214 deletions(-) diff --git a/relayer/chains/penumbra/core/chain/v1alpha1/chain.pb.go b/relayer/chains/penumbra/core/chain/v1alpha1/chain.pb.go index 2d6cf9a53..1a6f00258 100644 --- a/relayer/chains/penumbra/core/chain/v1alpha1/chain.pb.go +++ b/relayer/chains/penumbra/core/chain/v1alpha1/chain.pb.go @@ -54,7 +54,7 @@ type ChainParameters struct { // The number of blocks during which a proposal is voted on. ProposalVotingBlocks uint64 `protobuf:"varint,20,opt,name=proposal_voting_blocks,json=proposalVotingBlocks,proto3" json:"proposal_voting_blocks,omitempty"` // The deposit required to create a proposal. - ProposalDepositAmount uint64 `protobuf:"varint,21,opt,name=proposal_deposit_amount,json=proposalDepositAmount,proto3" json:"proposal_deposit_amount,omitempty"` + ProposalDepositAmount *v1alpha1.Amount `protobuf:"bytes,21,opt,name=proposal_deposit_amount,json=proposalDepositAmount,proto3" json:"proposal_deposit_amount,omitempty"` // The quorum required for a proposal to be considered valid, as a fraction of the total stake // weight of the network. ProposalValidQuorum string `protobuf:"bytes,22,opt,name=proposal_valid_quorum,json=proposalValidQuorum,proto3" json:"proposal_valid_quorum,omitempty"` @@ -191,11 +191,11 @@ func (m *ChainParameters) GetProposalVotingBlocks() uint64 { return 0 } -func (m *ChainParameters) GetProposalDepositAmount() uint64 { +func (m *ChainParameters) GetProposalDepositAmount() *v1alpha1.Amount { if m != nil { return m.ProposalDepositAmount } - return 0 + return nil } func (m *ChainParameters) GetProposalValidQuorum() string { @@ -1105,105 +1105,105 @@ func init() { } var fileDescriptor_b0cedb8b84ba3224 = []byte{ - // 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, + // 1561 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x4b, 0x8f, 0x24, 0x47, + 0x11, 0x9e, 0x9e, 0x77, 0x47, 0xf7, 0xcc, 0x2c, 0xe9, 0x7d, 0xd4, 0x0e, 0xc3, 0x6c, 0xbb, 0xe5, + 0x85, 0xde, 0xb5, 0xe8, 0xc6, 0x6d, 0x0b, 0xac, 0x36, 0x46, 0x3b, 0x8f, 0x65, 0x76, 0x65, 0xef, + 0xba, 0x9d, 0x63, 0x16, 0xb4, 0x5a, 0x54, 0xca, 0xae, 0xca, 0x99, 0x4e, 0x6d, 0x55, 0x66, 0x51, + 0x99, 0x35, 0x8f, 0x3b, 0x48, 0x1c, 0xf9, 0x0d, 0x70, 0xe3, 0x80, 0xc4, 0xbf, 0x40, 0x9c, 0x7c, + 0x44, 0x9c, 0xd0, 0xec, 0x8d, 0x13, 0x07, 0x7e, 0x00, 0xca, 0xc8, 0x7a, 0xf4, 0x34, 0xa6, 0xc7, + 0x83, 0x7c, 0xab, 0x8c, 0xf8, 0xbe, 0x2f, 0xa3, 0x22, 0x32, 0x32, 0xaa, 0xa0, 0x93, 0x70, 0x99, + 0xc5, 0xa3, 0x94, 0xf5, 0x02, 0x95, 0xf2, 0x5e, 0x30, 0x66, 0x42, 0xf6, 0x4e, 0xde, 0x63, 0x51, + 0x32, 0x66, 0xef, 0xb9, 0x65, 0x37, 0x49, 0x95, 0x51, 0x64, 0xab, 0x40, 0x76, 0x2d, 0xb2, 0xeb, + 0x5c, 0x05, 0x72, 0xf3, 0xe1, 0x94, 0x4e, 0x7a, 0x9e, 0x18, 0x35, 0x21, 0x84, 0x6b, 0xa7, 0xb4, + 0x39, 0xb5, 0xa7, 0x36, 0xec, 0x35, 0xaf, 0xa0, 0xb8, 0xcc, 0x91, 0xef, 0x5c, 0x46, 0x86, 0xfc, + 0xac, 0xc2, 0x85, 0xfc, 0xcc, 0xa1, 0xda, 0xff, 0x5e, 0x81, 0x8d, 0x3d, 0x1b, 0xce, 0x90, 0xa5, + 0x2c, 0xe6, 0x86, 0xa7, 0x9a, 0xdc, 0x85, 0x55, 0x8c, 0xd0, 0x17, 0xa1, 0x57, 0x6b, 0xd5, 0x3a, + 0x75, 0xba, 0x82, 0xeb, 0xa7, 0x21, 0xb9, 0x0f, 0xeb, 0x3c, 0x51, 0xc1, 0xd8, 0x0f, 0xb3, 0x94, + 0x19, 0xa1, 0xa4, 0x37, 0xdf, 0xaa, 0x75, 0x16, 0xe9, 0x1a, 0x5a, 0xf7, 0x73, 0x23, 0x79, 0x00, + 0x37, 0x32, 0x39, 0x52, 0x32, 0x14, 0xf2, 0xd8, 0x47, 0x97, 0xf6, 0x16, 0x10, 0xb8, 0x51, 0xda, + 0x1f, 0xa3, 0x99, 0x7c, 0x00, 0xb7, 0x59, 0x60, 0xc4, 0x09, 0xf7, 0x4f, 0x58, 0x24, 0x42, 0x66, + 0x54, 0xea, 0x47, 0x22, 0x16, 0xc6, 0x5b, 0x44, 0xc2, 0x4d, 0xe7, 0x7d, 0x51, 0x38, 0x3f, 0xb5, + 0x3e, 0xd2, 0x81, 0x1b, 0x23, 0xa6, 0xb9, 0x9f, 0xf2, 0x53, 0x96, 0x86, 0x7e, 0xca, 0x0c, 0xf7, + 0xea, 0x88, 0x5f, 0xb7, 0x76, 0x8a, 0x66, 0xca, 0x0c, 0x27, 0x8f, 0x60, 0x4b, 0x47, 0x4c, 0x8f, + 0x6d, 0x24, 0x09, 0x97, 0x2c, 0x32, 0xe7, 0x7e, 0x2c, 0xf4, 0x88, 0x8f, 0xd9, 0x89, 0x50, 0xa9, + 0xb7, 0x84, 0xac, 0xcd, 0x02, 0x33, 0x74, 0x90, 0x67, 0x15, 0x82, 0x0c, 0xe0, 0xee, 0x7f, 0x29, + 0x84, 0xea, 0x54, 0x1a, 0x11, 0x73, 0x0f, 0x90, 0x7e, 0x67, 0x8a, 0xbe, 0x9f, 0xbb, 0xc9, 0x8f, + 0xc0, 0xd3, 0xe2, 0x58, 0xf2, 0xd0, 0x1f, 0x45, 0x2a, 0x78, 0xad, 0xfd, 0x53, 0x21, 0x43, 0x75, + 0xea, 0x47, 0x5c, 0x7a, 0x0d, 0xa4, 0xde, 0x72, 0xfe, 0x5d, 0x74, 0xff, 0x1c, 0xbd, 0x9f, 0x72, + 0x49, 0xfa, 0x70, 0x2b, 0x16, 0x5a, 0x57, 0xc4, 0x98, 0x9d, 0x89, 0x38, 0x8b, 0xbd, 0x26, 0xb2, + 0xde, 0x72, 0x4e, 0xc7, 0x7a, 0xe6, 0x5c, 0xe4, 0x1e, 0x34, 0xc4, 0x28, 0xf0, 0xb9, 0x64, 0xa3, + 0x88, 0x87, 0xde, 0x72, 0xab, 0xd6, 0x59, 0xa5, 0x20, 0x46, 0xc1, 0x63, 0x67, 0x21, 0x8f, 0xe1, + 0x9e, 0x90, 0x23, 0x95, 0xc9, 0xd0, 0x17, 0x81, 0xee, 0xff, 0xc0, 0x37, 0x29, 0x93, 0xfa, 0x88, + 0xa7, 0xba, 0x24, 0xad, 0x20, 0x69, 0x2b, 0x87, 0x3d, 0xb5, 0xa8, 0x2f, 0x0a, 0x50, 0x21, 0x73, + 0x00, 0x2d, 0x95, 0x99, 0xd9, 0x3a, 0xab, 0xa8, 0xf3, 0x9d, 0x02, 0xf7, 0xd5, 0x42, 0x1f, 0xc0, + 0xed, 0x24, 0x55, 0x89, 0xd2, 0x2c, 0xf2, 0x4f, 0x94, 0xb1, 0x09, 0x76, 0x6f, 0xeb, 0xdd, 0x74, + 0xb5, 0x2f, 0xbc, 0x2f, 0xd0, 0xe9, 0xde, 0x96, 0xfc, 0x12, 0xee, 0x94, 0xac, 0x90, 0x27, 0x4a, + 0x0b, 0xe3, 0xb3, 0x58, 0x65, 0xd2, 0x78, 0xb7, 0x5a, 0xb5, 0x4e, 0xa3, 0x7f, 0xbf, 0x3b, 0xd5, + 0x6e, 0xae, 0x81, 0x8a, 0xd3, 0xdf, 0xdd, 0x41, 0x30, 0xbd, 0x55, 0xa8, 0xec, 0x3b, 0x11, 0x67, + 0xb6, 0x99, 0xaf, 0x82, 0xb2, 0xa7, 0xce, 0xff, 0x55, 0xa6, 0xd2, 0x2c, 0xf6, 0x6e, 0x63, 0x2b, + 0xbc, 0x55, 0xc6, 0x64, 0x7d, 0x9f, 0xa3, 0x8b, 0xfc, 0x70, 0x22, 0xa4, 0x84, 0x69, 0xed, 0x9b, + 0x71, 0xca, 0xf5, 0x58, 0x45, 0xa1, 0x77, 0x07, 0x59, 0xa5, 0xe4, 0x90, 0x69, 0xfd, 0x45, 0xe1, + 0x24, 0x1f, 0x82, 0x57, 0xf2, 0xf0, 0x08, 0x4d, 0x10, 0x3d, 0x24, 0x96, 0x09, 0x3a, 0xb4, 0xee, + 0x8a, 0xf9, 0x31, 0x7c, 0x3b, 0x64, 0xca, 0xd7, 0x09, 0x97, 0xa1, 0x5f, 0x60, 0xaa, 0xf4, 0xdf, + 0xc5, 0xf4, 0x7b, 0x21, 0x53, 0x87, 0x16, 0x31, 0x2c, 0x00, 0x79, 0xe6, 0xdb, 0x07, 0xb0, 0x44, + 0x6d, 0xab, 0x92, 0x2d, 0xa8, 0xcb, 0x2c, 0xe6, 0xa9, 0x6d, 0x2d, 0x6c, 0xf6, 0x45, 0x5a, 0x19, + 0x48, 0x0b, 0x1a, 0x21, 0x97, 0x2a, 0x16, 0x12, 0xfd, 0xae, 0xd7, 0x27, 0x4d, 0xed, 0x00, 0xd6, + 0x7e, 0x1a, 0x87, 0x13, 0x97, 0xc7, 0x7d, 0x58, 0x4f, 0x52, 0x1e, 0x08, 0x2d, 0x94, 0xf4, 0x47, + 0xc2, 0x68, 0x54, 0x5d, 0xa3, 0x6b, 0xa5, 0x75, 0x57, 0x18, 0x4d, 0xde, 0x05, 0xc2, 0xb4, 0xaf, + 0x8e, 0x5c, 0xc1, 0xfd, 0x31, 0x17, 0xc7, 0x63, 0x93, 0x6f, 0xb0, 0xc1, 0xf4, 0x67, 0x47, 0x58, + 0xec, 0x27, 0x68, 0x6e, 0xff, 0xbd, 0x06, 0xf5, 0x1d, 0xad, 0xb9, 0x79, 0x2a, 0x8f, 0x14, 0xd9, + 0x81, 0x55, 0x66, 0x17, 0xc5, 0xf5, 0xd4, 0xe8, 0x7f, 0xf7, 0xaa, 0x82, 0x23, 0x37, 0xa4, 0x2b, + 0xcc, 0x3d, 0x90, 0x01, 0x2c, 0xe1, 0x4b, 0xe0, 0x86, 0x8d, 0xfe, 0x3b, 0x57, 0xf0, 0xf7, 0x2d, + 0x96, 0x3a, 0xca, 0xff, 0x88, 0x7c, 0xe1, 0x2b, 0x23, 0x27, 0x6f, 0x43, 0xd3, 0x28, 0x63, 0xab, + 0x9b, 0x25, 0x49, 0x74, 0x9e, 0xdf, 0x69, 0x0d, 0xb4, 0x1d, 0xa2, 0xa9, 0xfd, 0xeb, 0x25, 0x68, + 0xee, 0xa9, 0x38, 0x61, 0x81, 0x41, 0x26, 0xb9, 0x0d, 0xcb, 0xb9, 0xa8, 0xab, 0x47, 0xbe, 0x22, + 0x9f, 0xc3, 0xba, 0x36, 0xcc, 0x70, 0x3f, 0x61, 0xe7, 0x91, 0x62, 0xa1, 0xf6, 0xe6, 0x5b, 0x0b, + 0x9d, 0x46, 0xff, 0x61, 0x77, 0xd6, 0x74, 0xe9, 0x1e, 0x5a, 0xce, 0xd0, 0x51, 0xe8, 0x9a, 0x9e, + 0x58, 0x69, 0xf2, 0x04, 0x40, 0x66, 0x51, 0x24, 0x8e, 0x04, 0x4f, 0xed, 0x0d, 0x6d, 0xe5, 0x3a, + 0x57, 0x24, 0xe3, 0x79, 0x41, 0xa0, 0x13, 0x5c, 0xab, 0xe4, 0xf2, 0x91, 0x2a, 0xe5, 0xae, 0xee, + 0x46, 0xff, 0xc1, 0x15, 0x4a, 0xcf, 0x78, 0xfa, 0x3a, 0xe2, 0x54, 0x29, 0x43, 0xeb, 0x48, 0xb6, + 0x8f, 0x56, 0xc9, 0x8d, 0x18, 0x54, 0xfa, 0xd6, 0xb5, 0x95, 0x90, 0x8c, 0x4a, 0x0f, 0xe0, 0x46, + 0xd5, 0x5d, 0x86, 0xa5, 0x86, 0x87, 0x78, 0xb1, 0xac, 0xd2, 0x8d, 0xb2, 0xab, 0x9c, 0x99, 0x50, + 0x58, 0x3f, 0x8a, 0x43, 0x3f, 0x29, 0xcf, 0xb1, 0x17, 0xe2, 0xc6, 0xef, 0xce, 0xce, 0xed, 0xa5, + 0xa3, 0x4f, 0xd7, 0x8e, 0x2e, 0x75, 0x02, 0x85, 0xa6, 0x3e, 0x65, 0x89, 0xaf, 0x32, 0x93, 0x64, + 0x46, 0x7b, 0x4b, 0x98, 0xde, 0xde, 0x94, 0xa2, 0x1d, 0xc5, 0xa5, 0xde, 0x2e, 0x33, 0xc1, 0xf8, + 0xf0, 0x94, 0x25, 0x9f, 0x21, 0x67, 0x9f, 0x19, 0x46, 0x1b, 0xba, 0x5c, 0x6b, 0xf2, 0x0b, 0xb8, + 0xe1, 0x46, 0xf3, 0x44, 0xa4, 0xcb, 0x18, 0xe9, 0xf7, 0x67, 0x47, 0x3a, 0x35, 0xe3, 0xe9, 0x46, + 0x70, 0xd9, 0xd0, 0xfe, 0xd7, 0x22, 0x34, 0x27, 0x8f, 0x0a, 0xa1, 0x50, 0x4f, 0x55, 0x14, 0xf1, + 0xd0, 0xcf, 0x92, 0xbc, 0xcf, 0xde, 0xff, 0xfa, 0x27, 0xad, 0x4b, 0x91, 0xfb, 0xb3, 0xe4, 0xc9, + 0x1c, 0x5d, 0x4d, 0xf3, 0x67, 0xf2, 0x18, 0x16, 0xa5, 0x32, 0x3c, 0x6f, 0xbb, 0xde, 0x35, 0xe4, + 0x9e, 0x2b, 0xc3, 0x9f, 0xcc, 0x51, 0xa4, 0x5b, 0x19, 0x9b, 0x14, 0x6c, 0xba, 0xeb, 0xc9, 0xd8, + 0xdc, 0x5a, 0x19, 0x4b, 0xdf, 0x7c, 0x09, 0xab, 0x45, 0x94, 0xe4, 0x39, 0x40, 0xa0, 0xe2, 0x58, + 0x98, 0x98, 0x4b, 0x93, 0xbf, 0x6e, 0xf7, 0x8a, 0x53, 0x87, 0xca, 0x7b, 0x25, 0x8b, 0x4e, 0x28, + 0x6c, 0xfe, 0xb6, 0x06, 0x8b, 0x36, 0x66, 0xf2, 0x08, 0x96, 0xb5, 0xca, 0xd2, 0x80, 0xe7, 0xa2, + 0x9d, 0xd9, 0xd1, 0x5a, 0xce, 0x21, 0xe2, 0x69, 0xce, 0x23, 0x3f, 0xb9, 0x94, 0xb4, 0x87, 0x57, + 0xb5, 0xa7, 0xaa, 0xba, 0x1d, 0x79, 0x9b, 0xbf, 0xa9, 0xc1, 0xa2, 0x7d, 0xef, 0x6f, 0x20, 0x94, + 0x8f, 0xf2, 0xc4, 0xbb, 0x50, 0xbe, 0x37, 0xeb, 0x28, 0xdb, 0x1d, 0xcb, 0x38, 0x2c, 0x69, 0x77, + 0x03, 0xd6, 0x2e, 0xdd, 0x5f, 0xed, 0x4f, 0xa0, 0xf1, 0x89, 0x54, 0xa7, 0x12, 0xaf, 0x67, 0x4d, + 0x7e, 0x0c, 0xcb, 0x78, 0x3f, 0xdb, 0x89, 0xb1, 0xf0, 0x35, 0x6e, 0x65, 0xa4, 0xd1, 0x9c, 0xd3, + 0x6e, 0x03, 0x54, 0x01, 0x93, 0x9b, 0xb0, 0x24, 0xa4, 0xe4, 0x6e, 0xa4, 0x35, 0xa9, 0x5b, 0xb4, + 0xcf, 0xa1, 0x8e, 0xe3, 0x10, 0xc7, 0xc8, 0x53, 0x68, 0xd8, 0xf4, 0xf8, 0xff, 0x67, 0x4a, 0x40, + 0x56, 0xbb, 0xbd, 0x0d, 0x4d, 0x37, 0x88, 0x2f, 0x8d, 0xb1, 0x06, 0xda, 0xf2, 0x11, 0xf6, 0xa7, + 0x05, 0xd8, 0x38, 0xe0, 0x92, 0x6b, 0xa1, 0x77, 0x92, 0x04, 0x4f, 0x0e, 0x19, 0x42, 0x73, 0xa2, + 0x99, 0x75, 0x1e, 0xc2, 0x35, 0x1b, 0xb9, 0x51, 0x35, 0xb2, 0x26, 0x07, 0x00, 0xe5, 0x57, 0x74, + 0x31, 0x1e, 0xa6, 0xab, 0xe4, 0xfe, 0x11, 0x4a, 0xbd, 0xf2, 0xc3, 0x9a, 0x4e, 0x50, 0xc9, 0x4b, + 0x68, 0xb0, 0x28, 0x52, 0x01, 0x7e, 0xce, 0x17, 0x93, 0xe1, 0xc3, 0xd9, 0x91, 0x4d, 0xbd, 0x5e, + 0x77, 0xa7, 0x14, 0xa0, 0x93, 0x62, 0x9b, 0x7f, 0xa8, 0x01, 0x54, 0x3e, 0xf2, 0x31, 0x2c, 0xe7, + 0x5f, 0x6f, 0xb5, 0xeb, 0x7c, 0xbd, 0xe5, 0x24, 0x5b, 0xe9, 0x6a, 0x94, 0xd7, 0x8b, 0x21, 0xfd, + 0x08, 0x56, 0x58, 0x18, 0xa6, 0x5c, 0xeb, 0xfc, 0x92, 0xb8, 0xf2, 0x13, 0xc1, 0xa1, 0x69, 0x41, + 0x6b, 0x3f, 0x82, 0x25, 0xfc, 0x43, 0x71, 0x47, 0x29, 0xe4, 0x67, 0xf9, 0x34, 0x76, 0x0b, 0x2c, + 0xb9, 0x9d, 0x1d, 0xd3, 0x25, 0xb7, 0x36, 0x57, 0xf2, 0xdd, 0x3f, 0xcf, 0xff, 0xe5, 0x62, 0xbb, + 0xf6, 0xe5, 0xc5, 0x76, 0xed, 0x1f, 0x17, 0xdb, 0xb5, 0xdf, 0xbd, 0xd9, 0x9e, 0xfb, 0xf2, 0xcd, + 0xf6, 0xdc, 0xdf, 0xde, 0x6c, 0xcf, 0x41, 0x2b, 0x50, 0xf1, 0xcc, 0x64, 0xee, 0x82, 0xab, 0xb3, + 0xfd, 0x47, 0x1b, 0xd6, 0x5e, 0xbe, 0x38, 0x16, 0x66, 0x9c, 0x8d, 0xba, 0x81, 0x8a, 0x7b, 0x81, + 0xd2, 0xb1, 0xd2, 0xbd, 0x94, 0x47, 0xec, 0x9c, 0xa7, 0xbd, 0x93, 0x7e, 0xf9, 0x88, 0x12, 0xba, + 0x37, 0xeb, 0xaf, 0xf4, 0x23, 0x5c, 0x16, 0xab, 0xdf, 0xcf, 0x2f, 0x0c, 0xf7, 0xf6, 0xfe, 0x38, + 0xbf, 0x35, 0x2c, 0x42, 0xd9, 0xb3, 0xa1, 0xe0, 0xd6, 0xdd, 0x17, 0x39, 0xe8, 0xaf, 0x95, 0xfb, + 0x95, 0x75, 0xbf, 0x42, 0xf7, 0xab, 0xc2, 0x7d, 0x31, 0xdf, 0x99, 0xe5, 0x7e, 0x75, 0x30, 0xdc, + 0x7d, 0xc6, 0x0d, 0x0b, 0x99, 0x61, 0xff, 0x9c, 0xbf, 0x57, 0x40, 0x07, 0x03, 0x8b, 0x1d, 0x0c, + 0x10, 0x3c, 0x18, 0x14, 0xe8, 0xd1, 0x32, 0xfe, 0x95, 0xbe, 0xff, 0x9f, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x6a, 0x54, 0x2e, 0xcf, 0x5b, 0x0f, 0x00, 0x00, } func (m *ChainParameters) Marshal() (dAtA []byte, err error) { @@ -1265,12 +1265,19 @@ func (m *ChainParameters) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0xb2 } - if m.ProposalDepositAmount != 0 { - i = encodeVarintChain(dAtA, i, uint64(m.ProposalDepositAmount)) + if m.ProposalDepositAmount != nil { + { + size, err := m.ProposalDepositAmount.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintChain(dAtA, i, uint64(size)) + } i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0xa8 + dAtA[i] = 0xaa } if m.ProposalVotingBlocks != 0 { i = encodeVarintChain(dAtA, i, uint64(m.ProposalVotingBlocks)) @@ -2154,8 +2161,9 @@ func (m *ChainParameters) Size() (n int) { if m.ProposalVotingBlocks != 0 { n += 2 + sovChain(uint64(m.ProposalVotingBlocks)) } - if m.ProposalDepositAmount != 0 { - n += 2 + sovChain(uint64(m.ProposalDepositAmount)) + if m.ProposalDepositAmount != nil { + l = m.ProposalDepositAmount.Size() + n += 2 + l + sovChain(uint64(l)) } l = len(m.ProposalValidQuorum) if l > 0 { @@ -2776,10 +2784,10 @@ func (m *ChainParameters) Unmarshal(dAtA []byte) error { } } case 21: - if wireType != 0 { + if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ProposalDepositAmount", wireType) } - m.ProposalDepositAmount = 0 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowChain @@ -2789,11 +2797,28 @@ func (m *ChainParameters) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.ProposalDepositAmount |= 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.ProposalDepositAmount == nil { + m.ProposalDepositAmount = &v1alpha1.Amount{} + } + if err := m.ProposalDepositAmount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex case 22: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ProposalValidQuorum", wireType) diff --git a/relayer/chains/penumbra/core/crypto/v1alpha1/crypto.pb.go b/relayer/chains/penumbra/core/crypto/v1alpha1/crypto.pb.go index 5c4eb0ff0..344a9012a 100644 --- a/relayer/chains/penumbra/core/crypto/v1alpha1/crypto.pb.go +++ b/relayer/chains/penumbra/core/crypto/v1alpha1/crypto.pb.go @@ -812,6 +812,194 @@ func (m *Denom) GetDenom() string { return "" } +// DenomMetadata represents a struct that describes a basic token. +type DenomMetadata struct { + Description string `protobuf:"bytes,1,opt,name=description,proto3" json:"description,omitempty"` + // denom_units represents the list of DenomUnit's for a given coin + DenomUnits []*DenomUnit `protobuf:"bytes,2,rep,name=denom_units,json=denomUnits,proto3" json:"denom_units,omitempty"` + // base represents the base denom (should be the DenomUnit with exponent = 0). + Base string `protobuf:"bytes,3,opt,name=base,proto3" json:"base,omitempty"` + // display indicates the suggested denom that should be + // displayed in clients. + Display string `protobuf:"bytes,4,opt,name=display,proto3" json:"display,omitempty"` + // name defines the name of the token (eg: Cosmos Atom) + Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"` + // symbol is the token symbol usually shown on exchanges (eg: ATOM). This can + // be the same as the display. + Symbol string `protobuf:"bytes,6,opt,name=symbol,proto3" json:"symbol,omitempty"` + // URI to a document (on or off-chain) that contains additional information. Optional. + Uri string `protobuf:"bytes,7,opt,name=uri,proto3" json:"uri,omitempty"` + // URIHash is a sha256 hash of a document pointed by URI. It's used to verify that + // the document didn't change. Optional. + UriHash string `protobuf:"bytes,8,opt,name=uri_hash,json=uriHash,proto3" json:"uri_hash,omitempty"` + // the asset ID on Penumbra for this denomination. + PenumbraAssetId *AssetId `protobuf:"bytes,1984,opt,name=penumbra_asset_id,json=penumbraAssetId,proto3" json:"penumbra_asset_id,omitempty"` +} + +func (m *DenomMetadata) Reset() { *m = DenomMetadata{} } +func (m *DenomMetadata) String() string { return proto.CompactTextString(m) } +func (*DenomMetadata) ProtoMessage() {} +func (*DenomMetadata) Descriptor() ([]byte, []int) { + return fileDescriptor_5c23a0b4440af102, []int{14} +} +func (m *DenomMetadata) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *DenomMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_DenomMetadata.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 *DenomMetadata) XXX_Merge(src proto.Message) { + xxx_messageInfo_DenomMetadata.Merge(m, src) +} +func (m *DenomMetadata) XXX_Size() int { + return m.Size() +} +func (m *DenomMetadata) XXX_DiscardUnknown() { + xxx_messageInfo_DenomMetadata.DiscardUnknown(m) +} + +var xxx_messageInfo_DenomMetadata proto.InternalMessageInfo + +func (m *DenomMetadata) GetDescription() string { + if m != nil { + return m.Description + } + return "" +} + +func (m *DenomMetadata) GetDenomUnits() []*DenomUnit { + if m != nil { + return m.DenomUnits + } + return nil +} + +func (m *DenomMetadata) GetBase() string { + if m != nil { + return m.Base + } + return "" +} + +func (m *DenomMetadata) GetDisplay() string { + if m != nil { + return m.Display + } + return "" +} + +func (m *DenomMetadata) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *DenomMetadata) GetSymbol() string { + if m != nil { + return m.Symbol + } + return "" +} + +func (m *DenomMetadata) GetUri() string { + if m != nil { + return m.Uri + } + return "" +} + +func (m *DenomMetadata) GetUriHash() string { + if m != nil { + return m.UriHash + } + return "" +} + +func (m *DenomMetadata) GetPenumbraAssetId() *AssetId { + if m != nil { + return m.PenumbraAssetId + } + return nil +} + +// DenomUnit represents a struct that describes a given denomination unit of the basic token. +type DenomUnit struct { + // denom represents the string name of the given denom unit (e.g uatom). + Denom string `protobuf:"bytes,1,opt,name=denom,proto3" json:"denom,omitempty"` + // exponent represents power of 10 exponent that one must + // raise the base_denom to in order to equal the given DenomUnit's denom + // 1 denom = 10^exponent base_denom + // (e.g. with a base_denom of uatom, one can create a DenomUnit of 'atom' with + // exponent = 6, thus: 1 atom = 10^6 uatom). + Exponent uint32 `protobuf:"varint,2,opt,name=exponent,proto3" json:"exponent,omitempty"` + // aliases is a list of string aliases for the given denom + Aliases []string `protobuf:"bytes,3,rep,name=aliases,proto3" json:"aliases,omitempty"` +} + +func (m *DenomUnit) Reset() { *m = DenomUnit{} } +func (m *DenomUnit) String() string { return proto.CompactTextString(m) } +func (*DenomUnit) ProtoMessage() {} +func (*DenomUnit) Descriptor() ([]byte, []int) { + return fileDescriptor_5c23a0b4440af102, []int{15} +} +func (m *DenomUnit) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *DenomUnit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_DenomUnit.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 *DenomUnit) XXX_Merge(src proto.Message) { + xxx_messageInfo_DenomUnit.Merge(m, src) +} +func (m *DenomUnit) XXX_Size() int { + return m.Size() +} +func (m *DenomUnit) XXX_DiscardUnknown() { + xxx_messageInfo_DenomUnit.DiscardUnknown(m) +} + +var xxx_messageInfo_DenomUnit proto.InternalMessageInfo + +func (m *DenomUnit) GetDenom() string { + if m != nil { + return m.Denom + } + return "" +} + +func (m *DenomUnit) GetExponent() uint32 { + if m != nil { + return m.Exponent + } + return 0 +} + +func (m *DenomUnit) GetAliases() []string { + if m != nil { + return m.Aliases + } + return nil +} + type Value 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"` @@ -821,7 +1009,7 @@ func (m *Value) Reset() { *m = Value{} } func (m *Value) String() string { return proto.CompactTextString(m) } func (*Value) ProtoMessage() {} func (*Value) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{14} + return fileDescriptor_5c23a0b4440af102, []int{16} } func (m *Value) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -885,7 +1073,7 @@ 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} + return fileDescriptor_5c23a0b4440af102, []int{17} } func (m *ValueView) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -961,15 +1149,15 @@ func (*ValueView) XXX_OneofWrappers() []interface{} { // 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"` + Amount *Amount `protobuf:"bytes,1,opt,name=amount,proto3" json:"amount,omitempty"` + Denom *DenomMetadata `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} + return fileDescriptor_5c23a0b4440af102, []int{17, 0} } func (m *ValueView_KnownDenom) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1005,7 +1193,7 @@ func (m *ValueView_KnownDenom) GetAmount() *Amount { return nil } -func (m *ValueView_KnownDenom) GetDenom() *Denom { +func (m *ValueView_KnownDenom) GetDenom() *DenomMetadata { if m != nil { return m.Denom } @@ -1021,7 +1209,7 @@ 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} + return fileDescriptor_5c23a0b4440af102, []int{17, 1} } func (m *ValueView_UnknownDenom) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1072,7 +1260,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{16} + return fileDescriptor_5c23a0b4440af102, []int{18} } func (m *MerkleRoot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1117,7 +1305,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{17} + return fileDescriptor_5c23a0b4440af102, []int{19} } func (m *Asset) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1169,7 +1357,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{18} + return fileDescriptor_5c23a0b4440af102, []int{20} } func (m *IdentityKey) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1214,7 +1402,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{19} + return fileDescriptor_5c23a0b4440af102, []int{21} } func (m *GovernanceKey) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1258,7 +1446,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{20} + return fileDescriptor_5c23a0b4440af102, []int{22} } func (m *ConsensusKey) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1304,7 +1492,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{21} + return fileDescriptor_5c23a0b4440af102, []int{23} } func (m *Note) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1364,7 +1552,7 @@ 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} + return fileDescriptor_5c23a0b4440af102, []int{24} } func (m *NoteView) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1424,7 +1612,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{23} + return fileDescriptor_5c23a0b4440af102, []int{25} } func (m *NoteCiphertext) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1468,7 +1656,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{24} + return fileDescriptor_5c23a0b4440af102, []int{26} } func (m *Nullifier) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1512,7 +1700,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{25} + return fileDescriptor_5c23a0b4440af102, []int{27} } func (m *SpendAuthSignature) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1556,7 +1744,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{26} + return fileDescriptor_5c23a0b4440af102, []int{28} } func (m *BindingSignature) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1608,7 +1796,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{27} + return fileDescriptor_5c23a0b4440af102, []int{29} } func (m *NotePayload) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1669,7 +1857,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{28} + return fileDescriptor_5c23a0b4440af102, []int{30} } func (m *StateCommitmentProof) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1730,7 +1918,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{29} + return fileDescriptor_5c23a0b4440af102, []int{31} } func (m *MerklePathChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1789,7 +1977,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{30} + return fileDescriptor_5c23a0b4440af102, []int{32} } func (m *Clue) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1834,7 +2022,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{31} + return fileDescriptor_5c23a0b4440af102, []int{33} } func (m *EffectHash) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1879,7 +2067,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{32} + return fileDescriptor_5c23a0b4440af102, []int{34} } func (m *ZKOutputProof) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1924,7 +2112,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{33} + return fileDescriptor_5c23a0b4440af102, []int{35} } func (m *ZKSpendProof) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1969,7 +2157,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{34} + return fileDescriptor_5c23a0b4440af102, []int{36} } func (m *ZKSwapProof) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2014,7 +2202,7 @@ func (m *ZKUndelegateClaimProof) Reset() { *m = ZKUndelegateClaimProof{} func (m *ZKUndelegateClaimProof) String() string { return proto.CompactTextString(m) } func (*ZKUndelegateClaimProof) ProtoMessage() {} func (*ZKUndelegateClaimProof) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{35} + return fileDescriptor_5c23a0b4440af102, []int{37} } func (m *ZKUndelegateClaimProof) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2059,7 +2247,7 @@ func (m *ZKDelegatorVoteProof) Reset() { *m = ZKDelegatorVoteProof{} } func (m *ZKDelegatorVoteProof) String() string { return proto.CompactTextString(m) } func (*ZKDelegatorVoteProof) ProtoMessage() {} func (*ZKDelegatorVoteProof) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{36} + return fileDescriptor_5c23a0b4440af102, []int{38} } func (m *ZKDelegatorVoteProof) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2095,6 +2283,51 @@ func (m *ZKDelegatorVoteProof) GetInner() []byte { return nil } +// A Penumbra ZK nullifier derivation proof. +type ZKNullifierDerivationProof struct { + Inner []byte `protobuf:"bytes,1,opt,name=inner,proto3" json:"inner,omitempty"` +} + +func (m *ZKNullifierDerivationProof) Reset() { *m = ZKNullifierDerivationProof{} } +func (m *ZKNullifierDerivationProof) String() string { return proto.CompactTextString(m) } +func (*ZKNullifierDerivationProof) ProtoMessage() {} +func (*ZKNullifierDerivationProof) Descriptor() ([]byte, []int) { + return fileDescriptor_5c23a0b4440af102, []int{39} +} +func (m *ZKNullifierDerivationProof) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ZKNullifierDerivationProof) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ZKNullifierDerivationProof.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 *ZKNullifierDerivationProof) XXX_Merge(src proto.Message) { + xxx_messageInfo_ZKNullifierDerivationProof.Merge(m, src) +} +func (m *ZKNullifierDerivationProof) XXX_Size() int { + return m.Size() +} +func (m *ZKNullifierDerivationProof) XXX_DiscardUnknown() { + xxx_messageInfo_ZKNullifierDerivationProof.DiscardUnknown(m) +} + +var xxx_messageInfo_ZKNullifierDerivationProof proto.InternalMessageInfo + +func (m *ZKNullifierDerivationProof) GetInner() []byte { + if m != nil { + return m.Inner + } + return nil +} + func init() { proto.RegisterType((*Fee)(nil), "penumbra.core.crypto.v1alpha1.Fee") proto.RegisterType((*Address)(nil), "penumbra.core.crypto.v1alpha1.Address") @@ -2112,6 +2345,8 @@ func init() { proto.RegisterType((*AssetId)(nil), "penumbra.core.crypto.v1alpha1.AssetId") proto.RegisterType((*Amount)(nil), "penumbra.core.crypto.v1alpha1.Amount") proto.RegisterType((*Denom)(nil), "penumbra.core.crypto.v1alpha1.Denom") + proto.RegisterType((*DenomMetadata)(nil), "penumbra.core.crypto.v1alpha1.DenomMetadata") + proto.RegisterType((*DenomUnit)(nil), "penumbra.core.crypto.v1alpha1.DenomUnit") 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") @@ -2137,6 +2372,7 @@ func init() { proto.RegisterType((*ZKSwapProof)(nil), "penumbra.core.crypto.v1alpha1.ZKSwapProof") proto.RegisterType((*ZKUndelegateClaimProof)(nil), "penumbra.core.crypto.v1alpha1.ZKUndelegateClaimProof") proto.RegisterType((*ZKDelegatorVoteProof)(nil), "penumbra.core.crypto.v1alpha1.ZKDelegatorVoteProof") + proto.RegisterType((*ZKNullifierDerivationProof)(nil), "penumbra.core.crypto.v1alpha1.ZKNullifierDerivationProof") } func init() { @@ -2144,83 +2380,96 @@ func init() { } var fileDescriptor_5c23a0b4440af102 = []byte{ - // 1211 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0xcf, 0xae, 0xf3, 0xf7, 0xf9, 0x4f, 0xcb, 0x2a, 0x42, 0x51, 0x20, 0x6e, 0xba, 0x4d, 0x43, - 0x5b, 0x8a, 0xad, 0x38, 0x82, 0x83, 0x11, 0x88, 0xd8, 0xa1, 0x4d, 0xb0, 0xda, 0x5a, 0x1b, 0xea, - 0x22, 0x2b, 0x92, 0x35, 0xd9, 0x9d, 0x78, 0x47, 0xde, 0x9d, 0x59, 0x76, 0x67, 0x9d, 0x1a, 0x3e, - 0x40, 0xc5, 0xad, 0x67, 0x8e, 0x1c, 0x38, 0xf0, 0x0d, 0xf8, 0x06, 0x88, 0x53, 0x8f, 0x3d, 0x42, - 0x7a, 0x40, 0x42, 0x1c, 0xf8, 0x08, 0x68, 0x76, 0x67, 0x1d, 0x27, 0xea, 0xda, 0x86, 0x08, 0xc1, - 0x6d, 0xdf, 0xbe, 0xdf, 0xfb, 0xcd, 0x6f, 0xde, 0x9b, 0xf7, 0x66, 0x17, 0xee, 0x78, 0x98, 0x86, - 0xee, 0x91, 0x8f, 0xca, 0x26, 0xf3, 0x71, 0xd9, 0xf4, 0x07, 0x1e, 0x67, 0xe5, 0xfe, 0x16, 0x72, - 0x3c, 0x1b, 0x6d, 0x49, 0xbb, 0xe4, 0xf9, 0x8c, 0x33, 0x6d, 0x2d, 0xc1, 0x96, 0x04, 0xb6, 0x24, - 0x7d, 0x09, 0x56, 0x7f, 0xa6, 0x40, 0xe6, 0x1e, 0xc6, 0xda, 0x47, 0x30, 0x8f, 0x5c, 0x16, 0x52, - 0xbe, 0xa2, 0xac, 0x2b, 0xb7, 0xb2, 0x95, 0x9b, 0xa5, 0xb1, 0x71, 0xa5, 0x9d, 0x08, 0x6c, 0xc8, - 0x20, 0x6d, 0x07, 0x16, 0x51, 0x10, 0x60, 0xde, 0x21, 0xd6, 0x8a, 0x1a, 0x11, 0x6c, 0x4e, 0x22, - 0x10, 0xf0, 0x7d, 0xcb, 0x58, 0x40, 0xf1, 0x83, 0x7e, 0x0d, 0x16, 0x76, 0x2c, 0xcb, 0xc7, 0x41, - 0xa0, 0x2d, 0xc3, 0x1c, 0xa1, 0x14, 0xfb, 0x91, 0x96, 0x9c, 0x11, 0x1b, 0xfa, 0x9f, 0x19, 0xc8, - 0x4a, 0x44, 0x8b, 0xe0, 0x13, 0xed, 0x21, 0x2c, 0xf4, 0x49, 0x40, 0x8e, 0x1c, 0x2c, 0x35, 0x57, - 0x26, 0x2d, 0x79, 0x16, 0x5c, 0x6a, 0xc5, 0x91, 0x7b, 0x33, 0x46, 0x42, 0xa2, 0x35, 0x60, 0x9e, - 0x79, 0xe8, 0xcb, 0x10, 0xcb, 0x1d, 0x6c, 0xfd, 0x0d, 0xba, 0x47, 0x51, 0xe0, 0xde, 0x8c, 0x21, - 0x29, 0x56, 0x7f, 0x53, 0x60, 0x41, 0xae, 0xa1, 0x7d, 0x02, 0x0b, 0x28, 0xc6, 0x4a, 0xa1, 0x9b, - 0xd3, 0x31, 0x1b, 0x49, 0x98, 0xb6, 0x23, 0x12, 0x62, 0xe1, 0xa7, 0x52, 0xd9, 0xbb, 0xd3, 0xc5, - 0xef, 0x8b, 0x10, 0x23, 0x8e, 0xd4, 0x9e, 0xc0, 0x55, 0x64, 0x9a, 0xa2, 0x58, 0x9d, 0xae, 0xcf, - 0x42, 0x4f, 0x54, 0x2a, 0x13, 0xb1, 0xbd, 0x37, 0x89, 0x2d, 0x0e, 0xbb, 0x2f, 0xa2, 0xf6, 0x2d, - 0xa3, 0x80, 0xce, 0xd9, 0xab, 0x9f, 0xc1, 0x7c, 0xbc, 0xfb, 0xcb, 0xef, 0xb3, 0x56, 0x80, 0x9c, - 0x7c, 0xec, 0xf4, 0x09, 0x3e, 0xd1, 0xd7, 0x61, 0xf1, 0xc0, 0xc3, 0xd4, 0x6a, 0xe0, 0x41, 0xca, - 0xa1, 0xb8, 0x0b, 0xcb, 0x11, 0xa2, 0x85, 0x7d, 0x72, 0x4c, 0x4c, 0xc4, 0x09, 0xa3, 0xe9, 0xe8, - 0x4d, 0x28, 0xdc, 0x0b, 0x1d, 0x47, 0x94, 0x8c, 0xd0, 0xee, 0x58, 0xdc, 0xf9, 0x5d, 0xa7, 0xe0, - 0x6e, 0x40, 0x76, 0x97, 0xf4, 0xb1, 0x1f, 0x90, 0x63, 0x82, 0xfd, 0x14, 0xd0, 0x1e, 0xe4, 0x46, - 0x0b, 0xa2, 0xad, 0xc0, 0x82, 0x4c, 0x61, 0x54, 0xce, 0xbc, 0x91, 0x98, 0x5a, 0x11, 0xc0, 0x47, - 0xd4, 0x62, 0x2e, 0xf9, 0x0a, 0xfb, 0x51, 0x75, 0x72, 0xc6, 0xc8, 0x1b, 0xfd, 0x1d, 0xb8, 0x72, - 0xc0, 0x11, 0xc7, 0x75, 0xe6, 0xba, 0x84, 0xbb, 0x98, 0xf2, 0x94, 0x25, 0x6f, 0xc3, 0x1b, 0x35, - 0xe4, 0x20, 0x6a, 0x4e, 0x86, 0x8a, 0xb6, 0x8b, 0x3b, 0x30, 0x05, 0x70, 0x0b, 0xe6, 0xe3, 0x66, - 0xd7, 0x0a, 0xa0, 0x3a, 0x2c, 0x72, 0xce, 0x1a, 0xaa, 0xc3, 0x84, 0x6d, 0x93, 0x68, 0x0f, 0xb3, - 0x86, 0x6a, 0x13, 0x7d, 0x0d, 0xe6, 0x76, 0x31, 0x65, 0xae, 0x20, 0xb2, 0xc4, 0x43, 0x84, 0x5d, - 0x32, 0x62, 0x43, 0xff, 0x46, 0x81, 0xb9, 0x16, 0x72, 0xc2, 0xff, 0xc3, 0xb0, 0xf9, 0x23, 0x03, - 0x4b, 0x91, 0x96, 0x68, 0x92, 0xb4, 0x20, 0xdb, 0xa3, 0xec, 0x84, 0x76, 0xce, 0x54, 0x67, 0x2b, - 0xdb, 0x13, 0x38, 0x87, 0xe1, 0xa5, 0x86, 0x88, 0x8d, 0x76, 0xbe, 0x37, 0x63, 0x40, 0x6f, 0x68, - 0x69, 0x87, 0x90, 0x0f, 0xe9, 0x28, 0x73, 0xac, 0xf6, 0xfd, 0xa9, 0x99, 0x1f, 0xd3, 0xde, 0x28, - 0x77, 0x2e, 0x1c, 0xb1, 0x57, 0x9f, 0x29, 0x00, 0x67, 0x4b, 0x5f, 0x36, 0xa9, 0xd5, 0xa4, 0x66, - 0xb1, 0xc6, 0x8d, 0x09, 0xd1, 0xd1, 0x9a, 0xb2, 0xb2, 0xab, 0xcf, 0x15, 0xc8, 0x8d, 0x4a, 0xfd, - 0xef, 0x0b, 0x5c, 0xcb, 0x01, 0xf4, 0x45, 0x1a, 0xe3, 0x39, 0xa2, 0x03, 0x3c, 0xc0, 0x7e, 0xcf, - 0xc1, 0x06, 0x63, 0x69, 0x8d, 0xf0, 0x35, 0xcc, 0x45, 0x2c, 0xda, 0x07, 0xa0, 0x12, 0x6b, 0xda, - 0x09, 0x26, 0xd7, 0x55, 0x89, 0x75, 0x99, 0x0c, 0xea, 0x6b, 0x90, 0xdd, 0xb7, 0x30, 0xe5, 0x84, - 0x0f, 0xc4, 0x54, 0x2a, 0x80, 0x4a, 0x7a, 0x52, 0x9e, 0x4a, 0x7a, 0xfa, 0x35, 0xc8, 0xdf, 0x67, - 0x7d, 0xec, 0x53, 0xd1, 0xd2, 0x12, 0xd0, 0x1d, 0x02, 0xba, 0x3d, 0x7d, 0x03, 0x72, 0x75, 0x46, - 0x03, 0x4c, 0x83, 0x30, 0x48, 0x1f, 0x6b, 0xdf, 0x2a, 0x30, 0xfb, 0x90, 0x71, 0x2c, 0xa4, 0x46, - 0xd9, 0x91, 0xbb, 0xdc, 0x98, 0xe6, 0x40, 0x1a, 0x71, 0x88, 0xa0, 0xf6, 0x03, 0x8c, 0xe3, 0xca, - 0xe4, 0x8c, 0xd8, 0x18, 0x9d, 0xfd, 0x99, 0x7f, 0x34, 0xfb, 0xf5, 0xef, 0x15, 0x58, 0x14, 0xe2, - 0xa2, 0x8e, 0xfc, 0xf8, 0xbc, 0xc0, 0x5b, 0xd3, 0x76, 0xcc, 0x78, 0x91, 0xbb, 0x17, 0x45, 0xde, - 0x99, 0xfe, 0x8a, 0x3f, 0x13, 0xba, 0x09, 0x05, 0xa1, 0xb3, 0x4e, 0x3c, 0x1b, 0xfb, 0x1c, 0x3f, - 0x4d, 0x3b, 0x50, 0xd7, 0x61, 0xe9, 0x61, 0xe8, 0x38, 0xe3, 0xae, 0x86, 0x3b, 0xa0, 0x45, 0xb7, - 0xd7, 0x4e, 0xc8, 0xed, 0x03, 0xd2, 0xa5, 0x88, 0x87, 0x3e, 0x4e, 0x9d, 0xc3, 0x57, 0x6b, 0x84, - 0x5a, 0x84, 0x76, 0x27, 0x21, 0x7f, 0x55, 0x20, 0x2b, 0x14, 0x36, 0xd1, 0xc0, 0x61, 0xc8, 0xd2, - 0x9e, 0xc0, 0x15, 0xca, 0x38, 0xee, 0x98, 0xc3, 0xbb, 0x40, 0xa6, 0xb5, 0x34, 0x61, 0xfb, 0x17, - 0x2e, 0x1b, 0xa3, 0x20, 0x68, 0x46, 0x6e, 0x94, 0x1b, 0x90, 0xc7, 0x9e, 0x8d, 0x5d, 0xec, 0x23, - 0xa7, 0xd3, 0xc3, 0x03, 0x99, 0xed, 0xdc, 0xf0, 0xa5, 0x38, 0x8a, 0x9f, 0x43, 0x01, 0xd3, 0x88, - 0x19, 0x5b, 0x1d, 0x41, 0x30, 0xe5, 0x67, 0xc7, 0xf9, 0x1c, 0x1b, 0xf9, 0x21, 0x89, 0x70, 0xe8, - 0x2f, 0x15, 0x58, 0xbe, 0x20, 0xaf, 0xe9, 0x33, 0x76, 0xfc, 0xef, 0x6d, 0x76, 0x15, 0x16, 0x3d, - 0x16, 0x10, 0xf1, 0x81, 0x21, 0xef, 0xbc, 0xa1, 0xad, 0x35, 0x60, 0x09, 0x85, 0xdc, 0xee, 0x78, - 0x88, 0xdb, 0x2b, 0x99, 0xf5, 0xcc, 0x14, 0xcb, 0xc5, 0xf3, 0xa8, 0x89, 0xb8, 0x5d, 0xb7, 0x43, - 0xda, 0x33, 0x16, 0x05, 0x81, 0x30, 0x75, 0x1b, 0xae, 0x5c, 0x70, 0x6a, 0x6f, 0xc1, 0x92, 0xf8, - 0x94, 0x24, 0xb4, 0xdb, 0xd9, 0x92, 0xb5, 0x5e, 0x94, 0x2f, 0xb6, 0x46, 0x9d, 0x15, 0x59, 0x81, - 0xc4, 0x59, 0x19, 0x75, 0x6e, 0xcb, 0x2f, 0x8a, 0xc4, 0xb9, 0xad, 0xbf, 0x0d, 0xb3, 0x75, 0xd9, - 0x2d, 0xaf, 0x39, 0x46, 0x3a, 0xc0, 0xa7, 0xc7, 0xc7, 0xd8, 0xe4, 0x7b, 0x28, 0xb0, 0x53, 0x30, - 0x37, 0x21, 0xdf, 0x6e, 0x3c, 0x0a, 0xb9, 0x17, 0xca, 0xf4, 0xbf, 0x1e, 0xb6, 0x01, 0xb9, 0x76, - 0x23, 0x3a, 0xe9, 0xe3, 0x50, 0x37, 0x20, 0xdb, 0x6e, 0x1c, 0x9c, 0x20, 0x6f, 0x1c, 0xa8, 0x04, - 0x6f, 0xb6, 0x1b, 0x8f, 0xa9, 0x85, 0x1d, 0xdc, 0x15, 0x05, 0x73, 0x10, 0x71, 0xc7, 0xe1, 0xef, - 0xc2, 0x72, 0xbb, 0xb1, 0x1b, 0xa3, 0x99, 0xdf, 0x12, 0x6d, 0x91, 0x8e, 0xae, 0xfd, 0xa8, 0xfe, - 0x74, 0x5a, 0x54, 0x5e, 0x9c, 0x16, 0x95, 0x5f, 0x4e, 0x8b, 0xca, 0xf3, 0x57, 0xc5, 0x99, 0x17, - 0xaf, 0x8a, 0x33, 0x2f, 0x5f, 0x15, 0x67, 0xe0, 0xba, 0xc9, 0xdc, 0xf1, 0x35, 0xad, 0x65, 0xeb, - 0xd1, 0x8b, 0xa6, 0xf8, 0xf1, 0x6a, 0x2a, 0xed, 0x2f, 0xba, 0x84, 0xdb, 0xe1, 0x51, 0xc9, 0x64, - 0x6e, 0xd9, 0x64, 0x81, 0xcb, 0x82, 0xb2, 0x8f, 0x1d, 0x34, 0xc0, 0x7e, 0xb9, 0x5f, 0x19, 0x3e, - 0x9a, 0x36, 0x22, 0x34, 0x28, 0x8f, 0xfd, 0xa5, 0xfb, 0x30, 0xb6, 0x13, 0xf3, 0x3b, 0x35, 0xd3, - 0xac, 0xd7, 0x7f, 0x50, 0xd7, 0x9a, 0x89, 0x9c, 0xba, 0x90, 0x13, 0xaf, 0x5e, 0x6a, 0x49, 0xd4, - 0xcf, 0x67, 0xfe, 0x43, 0xe1, 0x3f, 0x8c, 0xfd, 0x87, 0x89, 0xff, 0x54, 0xbd, 0x3d, 0xd6, 0x7f, - 0x78, 0xbf, 0x59, 0x7b, 0x80, 0x39, 0xb2, 0x10, 0x47, 0xbf, 0xab, 0xeb, 0x09, 0xb6, 0x5a, 0x15, - 0xe0, 0x6a, 0x35, 0x46, 0x57, 0xab, 0x09, 0xfc, 0x68, 0x3e, 0xfa, 0xe1, 0xdc, 0xfe, 0x2b, 0x00, - 0x00, 0xff, 0xff, 0x4f, 0xe3, 0x78, 0x0b, 0x9e, 0x0e, 0x00, 0x00, + // 1416 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcf, 0x6f, 0x1b, 0xc5, + 0x17, 0xcf, 0xae, 0xf3, 0xc3, 0x79, 0x76, 0x9c, 0x76, 0x14, 0x55, 0xfe, 0xe6, 0x4b, 0xd2, 0x74, + 0x9b, 0x86, 0xb4, 0x14, 0x47, 0x71, 0x04, 0x87, 0x20, 0x10, 0xb1, 0x43, 0x9b, 0x60, 0xb5, 0xb5, + 0x36, 0xd4, 0x45, 0x56, 0x24, 0x6b, 0xe2, 0x9d, 0x78, 0x47, 0xde, 0x9d, 0x59, 0xf6, 0x87, 0x53, + 0xc3, 0x1f, 0x80, 0x38, 0xd1, 0x33, 0x47, 0x0e, 0x1c, 0xf8, 0x0f, 0xb8, 0x71, 0x44, 0x9c, 0x7a, + 0xec, 0x11, 0xd2, 0x03, 0x12, 0x27, 0x0e, 0xfc, 0x01, 0x68, 0x66, 0x67, 0x1d, 0x27, 0x8a, 0x7f, + 0x94, 0x0a, 0xc1, 0x6d, 0xde, 0xbc, 0xcf, 0x7b, 0xf3, 0x99, 0xf7, 0xde, 0xcc, 0x9b, 0x5d, 0xb8, + 0xe3, 0x11, 0x16, 0xb9, 0x47, 0x3e, 0xde, 0x68, 0x72, 0x9f, 0x6c, 0x34, 0xfd, 0xae, 0x17, 0xf2, + 0x8d, 0xce, 0x26, 0x76, 0x3c, 0x1b, 0x6f, 0x2a, 0xb9, 0xe0, 0xf9, 0x3c, 0xe4, 0x68, 0x29, 0xc1, + 0x16, 0x04, 0xb6, 0xa0, 0x74, 0x09, 0xd6, 0xf8, 0x52, 0x83, 0xd4, 0x3d, 0x42, 0xd0, 0xfb, 0x30, + 0x8d, 0x5d, 0x1e, 0xb1, 0x30, 0xaf, 0xad, 0x68, 0xeb, 0x99, 0xe2, 0xad, 0xc2, 0x50, 0xbb, 0xc2, + 0x8e, 0x04, 0x9b, 0xca, 0x08, 0xed, 0x40, 0x1a, 0x07, 0x01, 0x09, 0x1b, 0xd4, 0xca, 0xeb, 0xd2, + 0xc1, 0xda, 0x28, 0x07, 0x02, 0xbe, 0x6f, 0x99, 0x33, 0x38, 0x1e, 0x18, 0xd7, 0x61, 0x66, 0xc7, + 0xb2, 0x7c, 0x12, 0x04, 0x68, 0x01, 0xa6, 0x28, 0x63, 0xc4, 0x97, 0x5c, 0xb2, 0x66, 0x2c, 0x18, + 0x7f, 0xa4, 0x20, 0xa3, 0x10, 0x35, 0x4a, 0x4e, 0xd0, 0x43, 0x98, 0xe9, 0xd0, 0x80, 0x1e, 0x39, + 0x44, 0x71, 0x2e, 0x8e, 0x5a, 0xf2, 0xcc, 0xb8, 0x50, 0x8b, 0x2d, 0xf7, 0x26, 0xcc, 0xc4, 0x09, + 0xaa, 0xc0, 0x34, 0xf7, 0xf0, 0x67, 0x11, 0x51, 0x3b, 0xd8, 0x7c, 0x05, 0x77, 0x8f, 0xa4, 0xe1, + 0xde, 0x84, 0xa9, 0x5c, 0x2c, 0xfe, 0xa6, 0xc1, 0x8c, 0x5a, 0x03, 0x7d, 0x08, 0x33, 0x38, 0xc6, + 0x2a, 0xa2, 0x6b, 0xe3, 0x79, 0x36, 0x13, 0x33, 0xb4, 0x23, 0x02, 0x62, 0x91, 0xa7, 0x8a, 0xd9, + 0x5b, 0xe3, 0xd9, 0xef, 0x0b, 0x13, 0x33, 0xb6, 0x44, 0x4f, 0xe0, 0x0a, 0x6e, 0x36, 0x45, 0xb2, + 0x1a, 0x2d, 0x9f, 0x47, 0x9e, 0xc8, 0x54, 0x4a, 0x7a, 0x7b, 0x7b, 0x94, 0xb7, 0xd8, 0xec, 0xbe, + 0xb0, 0xda, 0xb7, 0xcc, 0x1c, 0x3e, 0x27, 0x2f, 0x7e, 0x0c, 0xd3, 0xf1, 0xee, 0x5f, 0x7f, 0x9f, + 0xa5, 0x1c, 0x64, 0xd5, 0xb0, 0xd1, 0xa1, 0xe4, 0xc4, 0x58, 0x81, 0xf4, 0x81, 0x47, 0x98, 0x55, + 0x21, 0xdd, 0x01, 0x45, 0x71, 0x17, 0x16, 0x24, 0xa2, 0x46, 0x7c, 0x7a, 0x4c, 0x9b, 0x38, 0xa4, + 0x9c, 0x0d, 0x46, 0xaf, 0x41, 0xee, 0x5e, 0xe4, 0x38, 0x22, 0x65, 0x94, 0xb5, 0x86, 0xe2, 0xce, + 0xef, 0x7a, 0x00, 0xee, 0x26, 0x64, 0x76, 0x69, 0x87, 0xf8, 0x01, 0x3d, 0xa6, 0xc4, 0x1f, 0x00, + 0xda, 0x83, 0x6c, 0x7f, 0x42, 0x50, 0x1e, 0x66, 0x54, 0x08, 0x65, 0x3a, 0xe7, 0xcc, 0x44, 0x44, + 0xcb, 0x00, 0x3e, 0x66, 0x16, 0x77, 0xe9, 0xe7, 0xc4, 0x97, 0xd9, 0xc9, 0x9a, 0x7d, 0x33, 0xc6, + 0x9b, 0x30, 0x7f, 0x10, 0xe2, 0x90, 0x94, 0xb9, 0xeb, 0xd2, 0xd0, 0x25, 0x2c, 0x1c, 0xb0, 0xe4, + 0x6d, 0xb8, 0x5a, 0xc2, 0x0e, 0x66, 0xcd, 0xd1, 0x50, 0x71, 0xec, 0xe2, 0x13, 0x38, 0x00, 0xb0, + 0x0e, 0xd3, 0xf1, 0x61, 0x47, 0x39, 0xd0, 0x1d, 0x2e, 0x95, 0x93, 0xa6, 0xee, 0x70, 0x21, 0xdb, + 0x54, 0xee, 0x61, 0xd2, 0xd4, 0x6d, 0x6a, 0x2c, 0xc1, 0xd4, 0x2e, 0x61, 0xdc, 0x15, 0x8e, 0x2c, + 0x31, 0x90, 0xd8, 0x59, 0x33, 0x16, 0x8c, 0x17, 0x3a, 0xcc, 0x49, 0xfd, 0x03, 0x12, 0x62, 0x0b, + 0x87, 0x18, 0xad, 0x40, 0xc6, 0x22, 0x41, 0xd3, 0xa7, 0x9e, 0x48, 0x9b, 0x42, 0xf7, 0x4f, 0xa1, + 0x7d, 0x81, 0x60, 0xdc, 0x6d, 0x44, 0x8c, 0x86, 0x41, 0x5e, 0x5f, 0x49, 0xad, 0x67, 0x8a, 0xeb, + 0x23, 0xca, 0x4a, 0x2e, 0xf2, 0x98, 0xd1, 0xd0, 0x04, 0x2b, 0x19, 0x06, 0x08, 0xc1, 0xe4, 0x11, + 0x0e, 0x88, 0x0c, 0xeb, 0xac, 0x29, 0xc7, 0x22, 0x15, 0x16, 0x0d, 0x3c, 0x07, 0x77, 0xf3, 0x93, + 0x72, 0x3a, 0x11, 0x05, 0x9a, 0x61, 0x97, 0xe4, 0xa7, 0x62, 0xb4, 0x18, 0xa3, 0x6b, 0x30, 0x1d, + 0x74, 0xdd, 0x23, 0xee, 0xe4, 0xa7, 0xe5, 0xac, 0x92, 0xd0, 0x15, 0x48, 0x45, 0x3e, 0xcd, 0xcf, + 0xc8, 0x49, 0x31, 0x44, 0xff, 0x83, 0x74, 0xe4, 0xd3, 0x86, 0x8d, 0x03, 0x3b, 0x9f, 0x8e, 0x1d, + 0x47, 0x3e, 0xdd, 0xc3, 0x81, 0x8d, 0x0e, 0xe0, 0x6a, 0xc2, 0xbe, 0xd1, 0xbb, 0x32, 0x7f, 0x9c, + 0x7f, 0xa5, 0x3b, 0x73, 0x3e, 0x81, 0xa9, 0x09, 0xe3, 0x09, 0xcc, 0xf6, 0x36, 0x7d, 0x79, 0xf4, + 0xd1, 0x22, 0xa4, 0xc9, 0x53, 0x8f, 0x33, 0xd2, 0x2b, 0xbb, 0x9e, 0x2c, 0x2b, 0xd2, 0xa1, 0x38, + 0x20, 0x41, 0x3e, 0xb5, 0x92, 0x12, 0x6c, 0x95, 0x68, 0x7c, 0xa5, 0xc1, 0x54, 0x0d, 0x3b, 0xd1, + 0x7f, 0xa1, 0x41, 0xfc, 0x99, 0x82, 0x59, 0xc9, 0x45, 0xde, 0xfe, 0x35, 0xc8, 0xb4, 0x19, 0x3f, + 0x61, 0x8d, 0xb3, 0xbd, 0x66, 0x8a, 0x5b, 0x23, 0x7c, 0xf6, 0xcc, 0x0b, 0x15, 0x61, 0x2b, 0x63, + 0xb6, 0x37, 0x61, 0x42, 0xbb, 0x27, 0xa1, 0x43, 0x98, 0x8b, 0x58, 0xbf, 0xe7, 0x98, 0xed, 0x3b, + 0x63, 0x7b, 0x7e, 0xcc, 0xda, 0xfd, 0xbe, 0xb3, 0x51, 0x9f, 0xbc, 0xf8, 0xb5, 0x06, 0x70, 0xb6, + 0xf4, 0xeb, 0x06, 0xb5, 0x94, 0x64, 0x3a, 0xe6, 0x78, 0x77, 0x9c, 0x73, 0x91, 0x1c, 0x3e, 0x55, + 0x17, 0x8b, 0xcf, 0x34, 0xc8, 0xf6, 0x53, 0xfe, 0xf7, 0x13, 0x5d, 0xca, 0x02, 0x74, 0x44, 0x38, + 0xe3, 0x1e, 0x60, 0x00, 0x3c, 0x20, 0x7e, 0xdb, 0x21, 0x26, 0xe7, 0x83, 0x2e, 0xb1, 0x2f, 0x60, + 0x4a, 0x7a, 0x41, 0xef, 0x82, 0x4e, 0xad, 0x71, 0xbb, 0x8f, 0x5a, 0x57, 0xa7, 0x16, 0xda, 0x3e, + 0x1f, 0xc9, 0xd5, 0x71, 0x22, 0x99, 0xdc, 0x6b, 0x4b, 0x90, 0xd9, 0xb7, 0x08, 0x0b, 0x69, 0xd8, + 0x15, 0x1d, 0x25, 0x07, 0x3a, 0x6d, 0x2b, 0x7a, 0x3a, 0x6d, 0x1b, 0xd7, 0x61, 0xee, 0x3e, 0xef, + 0x10, 0x9f, 0x89, 0xeb, 0x58, 0x01, 0x5a, 0x3d, 0x40, 0xab, 0x6d, 0xac, 0x42, 0xb6, 0xcc, 0x59, + 0x40, 0x58, 0x10, 0x05, 0x83, 0x5b, 0xd2, 0x37, 0x1a, 0x4c, 0x3e, 0xe4, 0x21, 0x11, 0x54, 0x65, + 0x74, 0xd4, 0x2e, 0x57, 0xc7, 0x29, 0x4c, 0x33, 0x36, 0x11, 0xae, 0xfd, 0x80, 0x90, 0x38, 0x33, + 0x59, 0x33, 0x16, 0xfa, 0xfb, 0x76, 0xea, 0x6f, 0xf5, 0x6d, 0xe3, 0x3b, 0x0d, 0xd2, 0x82, 0x9c, + 0x3c, 0x99, 0x1f, 0x9c, 0x27, 0xb8, 0x3e, 0xee, 0xc9, 0x19, 0x4e, 0x72, 0xf7, 0x22, 0xc9, 0x3b, + 0xe3, 0x3f, 0xcf, 0xce, 0x88, 0xae, 0x41, 0x4e, 0xf0, 0x2c, 0x53, 0xcf, 0x26, 0x7e, 0x48, 0x9e, + 0x0e, 0x2a, 0xa8, 0x1b, 0x30, 0xfb, 0x30, 0x72, 0x9c, 0x61, 0x6d, 0xfd, 0x0e, 0x20, 0xf9, 0xf2, + 0xd8, 0x89, 0x42, 0xfb, 0x80, 0xb6, 0x18, 0x0e, 0x23, 0x9f, 0x0c, 0xec, 0xa1, 0x57, 0x4a, 0x94, + 0x59, 0x94, 0xb5, 0x46, 0x21, 0x7f, 0xd5, 0x20, 0x23, 0x18, 0x56, 0x71, 0xd7, 0xe1, 0xd8, 0x42, + 0x4f, 0x60, 0x9e, 0xf1, 0x90, 0x34, 0x9a, 0xbd, 0x3e, 0xae, 0xc2, 0x5a, 0x18, 0xb1, 0xfd, 0x0b, + 0x0f, 0x05, 0x33, 0x27, 0xdc, 0xf4, 0xbd, 0x06, 0x6e, 0xc2, 0x1c, 0xf1, 0x6c, 0xe2, 0x12, 0x1f, + 0x3b, 0x8d, 0x36, 0xe9, 0xaa, 0x68, 0x67, 0x7b, 0x93, 0xa2, 0x14, 0x3f, 0x81, 0x1c, 0x61, 0xd2, + 0x33, 0xb1, 0x1a, 0xc2, 0xc1, 0x98, 0x4f, 0xc6, 0xf3, 0x31, 0x36, 0xe7, 0x7a, 0x4e, 0x84, 0xc2, + 0x78, 0xa1, 0xc1, 0xc2, 0x05, 0x7a, 0x55, 0x9f, 0xf3, 0xe3, 0x7f, 0x6e, 0xb3, 0x8b, 0x90, 0xf6, + 0x78, 0x40, 0xe5, 0x2b, 0x23, 0x7e, 0xaf, 0xf4, 0x64, 0x54, 0x81, 0x59, 0x1c, 0x85, 0x76, 0xc3, + 0xc3, 0xa1, 0x2d, 0xdb, 0xdf, 0xe8, 0xe5, 0xe2, 0xfb, 0xa8, 0x8a, 0x43, 0xbb, 0x6c, 0x47, 0xac, + 0x6d, 0xa6, 0x85, 0x03, 0x21, 0x1a, 0x36, 0xcc, 0x5f, 0x50, 0xa2, 0xff, 0xc3, 0xac, 0xf8, 0x0c, + 0xa0, 0xac, 0xd5, 0xd8, 0x54, 0xb9, 0x4e, 0xab, 0x89, 0xcd, 0x7e, 0x65, 0x51, 0x65, 0x20, 0x51, + 0x16, 0xfb, 0x95, 0x5b, 0xea, 0x35, 0x98, 0x28, 0xb7, 0x8c, 0x37, 0x60, 0xb2, 0xac, 0x4e, 0xcb, + 0x25, 0x65, 0x64, 0x00, 0x7c, 0x74, 0x7c, 0x4c, 0x9a, 0xa1, 0x7c, 0x73, 0x5c, 0x8e, 0xb9, 0x05, + 0x73, 0xf5, 0xca, 0xa3, 0x28, 0xf4, 0x22, 0x15, 0xfe, 0xcb, 0x61, 0xab, 0x90, 0xad, 0x57, 0x64, + 0xa5, 0x0f, 0x43, 0xdd, 0x84, 0x4c, 0xbd, 0x72, 0x70, 0x82, 0xbd, 0x61, 0xa0, 0x02, 0x5c, 0xab, + 0x57, 0x1e, 0x33, 0x8b, 0x38, 0xa4, 0x25, 0x12, 0xe6, 0x60, 0xea, 0x0e, 0xc3, 0xdf, 0x85, 0x85, + 0x7a, 0x65, 0x37, 0x46, 0x73, 0xbf, 0x26, 0x8e, 0xc5, 0x10, 0x74, 0x11, 0x16, 0xeb, 0x95, 0xde, + 0xa9, 0xdd, 0x25, 0x3e, 0xed, 0xc8, 0xcf, 0x81, 0x21, 0x36, 0xa5, 0x1f, 0xf4, 0x9f, 0x4e, 0x97, + 0xb5, 0xe7, 0xa7, 0xcb, 0xda, 0x2f, 0xa7, 0xcb, 0xda, 0xb3, 0x97, 0xcb, 0x13, 0xcf, 0x5f, 0x2e, + 0x4f, 0xbc, 0x78, 0xb9, 0x3c, 0x01, 0x37, 0x9a, 0xdc, 0x1d, 0x5e, 0x07, 0xa5, 0x4c, 0x59, 0x4e, + 0x54, 0xc5, 0x87, 0x76, 0x55, 0xab, 0x7f, 0xda, 0xa2, 0xa1, 0x1d, 0x1d, 0x15, 0x9a, 0xdc, 0xdd, + 0x68, 0xf2, 0xc0, 0xe5, 0xc1, 0x86, 0x4f, 0x1c, 0xdc, 0x25, 0xfe, 0x46, 0xa7, 0xd8, 0x1b, 0x36, + 0x6d, 0x4c, 0x59, 0xb0, 0x31, 0xf4, 0x13, 0xfe, 0xbd, 0x58, 0x4e, 0xc4, 0x6f, 0xf5, 0x54, 0xb5, + 0x5c, 0xfe, 0x5e, 0x5f, 0xaa, 0x26, 0x74, 0xca, 0x82, 0x4e, 0xbc, 0x7a, 0xa1, 0xa6, 0x50, 0x3f, + 0x9f, 0xe9, 0x0f, 0x85, 0xfe, 0x30, 0xd6, 0x1f, 0x26, 0xfa, 0x53, 0xfd, 0xf6, 0x50, 0xfd, 0xe1, + 0xfd, 0x6a, 0x29, 0x79, 0x1d, 0xfc, 0xae, 0xaf, 0x24, 0xd8, 0xed, 0x6d, 0x01, 0xde, 0xde, 0x8e, + 0xd1, 0xdb, 0xdb, 0x09, 0xfc, 0x68, 0x5a, 0xfe, 0x60, 0xd8, 0xfa, 0x2b, 0x00, 0x00, 0xff, 0xff, + 0xfa, 0xd5, 0x1e, 0x48, 0x8e, 0x10, 0x00, 0x00, } func (m *Fee) Marshal() (dAtA []byte, err error) { @@ -2806,7 +3055,7 @@ func (m *Denom) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *Value) Marshal() (dAtA []byte, err error) { +func (m *DenomMetadata) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2816,19 +3065,19 @@ func (m *Value) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *Value) MarshalTo(dAtA []byte) (int, error) { +func (m *DenomMetadata) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *Value) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *DenomMetadata) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.AssetId != nil { + if m.PenumbraAssetId != nil { { - size, err := m.AssetId.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.PenumbraAssetId.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2836,24 +3085,77 @@ func (m *Value) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintCrypto(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x12 + dAtA[i] = 0x7c + i-- + dAtA[i] = 0x82 } - if m.Amount != nil { - { - size, err := m.Amount.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if len(m.UriHash) > 0 { + i -= len(m.UriHash) + copy(dAtA[i:], m.UriHash) + i = encodeVarintCrypto(dAtA, i, uint64(len(m.UriHash))) + i-- + dAtA[i] = 0x42 + } + if len(m.Uri) > 0 { + i -= len(m.Uri) + copy(dAtA[i:], m.Uri) + i = encodeVarintCrypto(dAtA, i, uint64(len(m.Uri))) + i-- + dAtA[i] = 0x3a + } + if len(m.Symbol) > 0 { + i -= len(m.Symbol) + copy(dAtA[i:], m.Symbol) + i = encodeVarintCrypto(dAtA, i, uint64(len(m.Symbol))) + i-- + dAtA[i] = 0x32 + } + if len(m.Name) > 0 { + i -= len(m.Name) + copy(dAtA[i:], m.Name) + i = encodeVarintCrypto(dAtA, i, uint64(len(m.Name))) + i-- + dAtA[i] = 0x2a + } + if len(m.Display) > 0 { + i -= len(m.Display) + copy(dAtA[i:], m.Display) + i = encodeVarintCrypto(dAtA, i, uint64(len(m.Display))) + i-- + dAtA[i] = 0x22 + } + if len(m.Base) > 0 { + i -= len(m.Base) + copy(dAtA[i:], m.Base) + i = encodeVarintCrypto(dAtA, i, uint64(len(m.Base))) + i-- + dAtA[i] = 0x1a + } + if len(m.DenomUnits) > 0 { + for iNdEx := len(m.DenomUnits) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.DenomUnits[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintCrypto(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintCrypto(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x12 } + } + if len(m.Description) > 0 { + i -= len(m.Description) + copy(dAtA[i:], m.Description) + i = encodeVarintCrypto(dAtA, i, uint64(len(m.Description))) i-- dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *ValueView) Marshal() (dAtA []byte, err error) { +func (m *DenomUnit) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2863,38 +3165,63 @@ func (m *ValueView) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *ValueView) MarshalTo(dAtA []byte) (int, error) { +func (m *DenomUnit) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ValueView) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *DenomUnit) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.ValueView != nil { - { - size := m.ValueView.Size() - i -= size - if _, err := m.ValueView.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } + if len(m.Aliases) > 0 { + for iNdEx := len(m.Aliases) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Aliases[iNdEx]) + copy(dAtA[i:], m.Aliases[iNdEx]) + i = encodeVarintCrypto(dAtA, i, uint64(len(m.Aliases[iNdEx]))) + i-- + dAtA[i] = 0x1a } } + if m.Exponent != 0 { + i = encodeVarintCrypto(dAtA, i, uint64(m.Exponent)) + i-- + dAtA[i] = 0x10 + } + if len(m.Denom) > 0 { + i -= len(m.Denom) + copy(dAtA[i:], m.Denom) + i = encodeVarintCrypto(dAtA, i, uint64(len(m.Denom))) + i-- + dAtA[i] = 0xa + } return len(dAtA) - i, nil } -func (m *ValueView_KnownDenom_) MarshalTo(dAtA []byte) (int, error) { +func (m *Value) 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 *Value) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ValueView_KnownDenom_) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *Value) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) - if m.KnownDenom != nil { + _ = i + var l int + _ = l + if m.AssetId != nil { { - size, err := m.KnownDenom.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.AssetId.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2902,9 +3229,75 @@ func (m *ValueView_KnownDenom_) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintCrypto(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0xa + dAtA[i] = 0x12 } - return len(dAtA) - i, nil + 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 *ValueView) 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 *ValueView) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ValueView) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + 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() @@ -3778,6 +4171,36 @@ func (m *ZKDelegatorVoteProof) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *ZKNullifierDerivationProof) 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 *ZKNullifierDerivationProof) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ZKNullifierDerivationProof) 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 encodeVarintCrypto(dAtA []byte, offset int, v uint64) int { offset -= sovCrypto(v) base := offset @@ -4037,6 +4460,75 @@ func (m *Denom) Size() (n int) { return n } +func (m *DenomMetadata) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Description) + if l > 0 { + n += 1 + l + sovCrypto(uint64(l)) + } + if len(m.DenomUnits) > 0 { + for _, e := range m.DenomUnits { + l = e.Size() + n += 1 + l + sovCrypto(uint64(l)) + } + } + l = len(m.Base) + if l > 0 { + n += 1 + l + sovCrypto(uint64(l)) + } + l = len(m.Display) + if l > 0 { + n += 1 + l + sovCrypto(uint64(l)) + } + l = len(m.Name) + if l > 0 { + n += 1 + l + sovCrypto(uint64(l)) + } + l = len(m.Symbol) + if l > 0 { + n += 1 + l + sovCrypto(uint64(l)) + } + l = len(m.Uri) + if l > 0 { + n += 1 + l + sovCrypto(uint64(l)) + } + l = len(m.UriHash) + if l > 0 { + n += 1 + l + sovCrypto(uint64(l)) + } + if m.PenumbraAssetId != nil { + l = m.PenumbraAssetId.Size() + n += 2 + l + sovCrypto(uint64(l)) + } + return n +} + +func (m *DenomUnit) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Denom) + if l > 0 { + n += 1 + l + sovCrypto(uint64(l)) + } + if m.Exponent != 0 { + n += 1 + sovCrypto(uint64(m.Exponent)) + } + if len(m.Aliases) > 0 { + for _, s := range m.Aliases { + l = len(s) + n += 1 + l + sovCrypto(uint64(l)) + } + } + return n +} + func (m *Value) Size() (n int) { if m == nil { return 0 @@ -4442,6 +4934,19 @@ func (m *ZKDelegatorVoteProof) Size() (n int) { return n } +func (m *ZKNullifierDerivationProof) 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 sovCrypto(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -5668,81 +6173,593 @@ func (m *BalanceCommitment) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + 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 *AssetId) 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: AssetId: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: AssetId: 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 *Amount) 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: Amount: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Amount: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Lo", wireType) + } + m.Lo = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCrypto + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Lo |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Hi", wireType) + } + m.Hi = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCrypto + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Hi |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + 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 *Denom) 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: Denom: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Denom: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Denom", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCrypto + } + 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 ErrInvalidLengthCrypto + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCrypto + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Denom = string(dAtA[iNdEx:postIndex]) + 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 *DenomMetadata) 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: DenomMetadata: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: DenomMetadata: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Description", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCrypto + } + 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 ErrInvalidLengthCrypto + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCrypto + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Description = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DenomUnits", 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 + } + m.DenomUnits = append(m.DenomUnits, &DenomUnit{}) + if err := m.DenomUnits[len(m.DenomUnits)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Base", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCrypto + } + 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 ErrInvalidLengthCrypto + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCrypto + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Base = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Display", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCrypto + } + 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 ErrInvalidLengthCrypto + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCrypto + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Display = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCrypto + } + 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 ErrInvalidLengthCrypto + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCrypto + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Name = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Symbol", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCrypto + } + 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 ErrInvalidLengthCrypto + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCrypto + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Symbol = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Uri", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCrypto + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthCrypto } - postIndex := iNdEx + byteLen + postIndex := iNdEx + intStringLen 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{} - } + m.Uri = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipCrypto(dAtA[iNdEx:]) - if err != nil { - return err + case 8: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field UriHash", wireType) } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthCrypto + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCrypto + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthCrypto } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *AssetId) 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 + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCrypto } - if iNdEx >= l { + if postIndex > 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: AssetId: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: AssetId: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: + m.UriHash = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 1984: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Inner", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PenumbraAssetId", wireType) } - var byteLen int + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowCrypto @@ -5752,24 +6769,26 @@ func (m *AssetId) 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{} + if m.PenumbraAssetId == nil { + m.PenumbraAssetId = &AssetId{} + } + if err := m.PenumbraAssetId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } iNdEx = postIndex default: @@ -5793,7 +6812,7 @@ func (m *AssetId) Unmarshal(dAtA []byte) error { } return nil } -func (m *Amount) Unmarshal(dAtA []byte) error { +func (m *DenomUnit) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5816,17 +6835,17 @@ func (m *Amount) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: Amount: wiretype end group for non-group") + return fmt.Errorf("proto: DenomUnit: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: Amount: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: DenomUnit: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Lo", wireType) + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Denom", wireType) } - m.Lo = 0 + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowCrypto @@ -5836,16 +6855,29 @@ func (m *Amount) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Lo |= uint64(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthCrypto + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCrypto + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Denom = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex case 2: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Hi", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Exponent", wireType) } - m.Hi = 0 + m.Exponent = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowCrypto @@ -5855,64 +6887,14 @@ func (m *Amount) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Hi |= uint64(b&0x7F) << shift + m.Exponent |= uint32(b&0x7F) << shift if b < 0x80 { break } } - 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 *Denom) 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: Denom: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Denom: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: + case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Denom", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Aliases", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -5940,7 +6922,7 @@ func (m *Denom) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Denom = string(dAtA[iNdEx:postIndex]) + m.Aliases = append(m.Aliases, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex default: iNdEx = preIndex @@ -6300,7 +7282,7 @@ func (m *ValueView_KnownDenom) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Denom == nil { - m.Denom = &Denom{} + m.Denom = &DenomMetadata{} } if err := m.Denom.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -8590,6 +9572,90 @@ func (m *ZKDelegatorVoteProof) Unmarshal(dAtA []byte) error { } return nil } +func (m *ZKNullifierDerivationProof) 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: ZKNullifierDerivationProof: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: ZKNullifierDerivationProof: 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 skipCrypto(dAtA []byte) (n int, err 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 61ef18d9c..0fa502019 100644 --- a/relayer/chains/penumbra/core/dex/v1alpha1/dex.pb.go +++ b/relayer/chains/penumbra/core/dex/v1alpha1/dex.pb.go @@ -674,7 +674,6 @@ func (m *SwapClaimPlan) GetEpochDuration() uint64 { type SwapView struct { // Types that are valid to be assigned to SwapView: - // // *SwapView_Visible_ // *SwapView_Opaque_ SwapView isSwapView_SwapView `protobuf_oneof:"swap_view"` @@ -1166,18 +1165,20 @@ type BatchSwapOutputData struct { 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 *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"` + Lambda_1 *v1alpha1.Amount `protobuf:"bytes,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 for 1=>2 trades. + Lambda_2 *v1alpha1.Amount `protobuf:"bytes,4,opt,name=lambda_2,json=lambda2,proto3" json:"lambda_2,omitempty"` + // The total amount of asset 1 that was returned unfilled from the batch swap for 1=>2 trades. + Unfilled_1 *v1alpha1.Amount `protobuf:"bytes,5,opt,name=unfilled_1,json=unfilled1,proto3" json:"unfilled_1,omitempty"` + // The total amount of asset 2 that was returned unfilled from the batch swap for 2=>1 trades. + Unfilled_2 *v1alpha1.Amount `protobuf:"bytes,6,opt,name=unfilled_2,json=unfilled2,proto3" json:"unfilled_2,omitempty"` // The height for which the batch swap data is valid. Height uint64 `protobuf:"varint,7,opt,name=height,proto3" json:"height,omitempty"` // The trading pair associated with the batch swap. TradingPair *TradingPair `protobuf:"bytes,8,opt,name=trading_pair,json=tradingPair,proto3" json:"trading_pair,omitempty"` + // The starting block height of the epoch for which the batch swap data is valid. + EpochHeight uint64 `protobuf:"varint,9,opt,name=epoch_height,json=epochHeight,proto3" json:"epoch_height,omitempty"` } func (m *BatchSwapOutputData) Reset() { *m = BatchSwapOutputData{} } @@ -1227,30 +1228,30 @@ func (m *BatchSwapOutputData) GetDelta_2() *v1alpha1.Amount { return nil } -func (m *BatchSwapOutputData) GetLambda_1_1() *v1alpha1.Amount { +func (m *BatchSwapOutputData) GetLambda_1() *v1alpha1.Amount { if m != nil { - return m.Lambda_1_1 + return m.Lambda_1 } return nil } -func (m *BatchSwapOutputData) GetLambda_2_1() *v1alpha1.Amount { +func (m *BatchSwapOutputData) GetLambda_2() *v1alpha1.Amount { if m != nil { - return m.Lambda_2_1 + return m.Lambda_2 } return nil } -func (m *BatchSwapOutputData) GetLambda_1_2() *v1alpha1.Amount { +func (m *BatchSwapOutputData) GetUnfilled_1() *v1alpha1.Amount { if m != nil { - return m.Lambda_1_2 + return m.Unfilled_1 } return nil } -func (m *BatchSwapOutputData) GetLambda_2_2() *v1alpha1.Amount { +func (m *BatchSwapOutputData) GetUnfilled_2() *v1alpha1.Amount { if m != nil { - return m.Lambda_2_2 + return m.Unfilled_2 } return nil } @@ -1269,6 +1270,13 @@ func (m *BatchSwapOutputData) GetTradingPair() *TradingPair { return nil } +func (m *BatchSwapOutputData) GetEpochHeight() uint64 { + if m != nil { + return m.EpochHeight + } + return 0 +} + // The trading function for a specific pair. // For a pair (asset_1, asset_2), a trading function is defined by: // `phi(R) = p*R_1 + q*R_2` and `gamma = 1 - fee`. @@ -1968,28 +1976,23 @@ func (m *Path) GetPhi() *BareTradingFunction { return nil } -// A path and the amount of the assets on either side that were traded. -type Trade struct { - // The path taken by the trade. - Path *Path `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` - // The amount of the start asset being traded. - StartAmount *v1alpha1.Amount `protobuf:"bytes,2,opt,name=start_amount,json=startAmount,proto3" json:"start_amount,omitempty"` - // The amount of end asset being received. - EndAmount *v1alpha1.Amount `protobuf:"bytes,3,opt,name=end_amount,json=endAmount,proto3" json:"end_amount,omitempty"` +// Contains the entire execution of a particular swap. +type SwapExecution struct { + Traces []*SwapExecution_Trace `protobuf:"bytes,1,rep,name=traces,proto3" json:"traces,omitempty"` } -func (m *Trade) Reset() { *m = Trade{} } -func (m *Trade) String() string { return proto.CompactTextString(m) } -func (*Trade) ProtoMessage() {} -func (*Trade) Descriptor() ([]byte, []int) { +func (m *SwapExecution) Reset() { *m = SwapExecution{} } +func (m *SwapExecution) String() string { return proto.CompactTextString(m) } +func (*SwapExecution) ProtoMessage() {} +func (*SwapExecution) Descriptor() ([]byte, []int) { return fileDescriptor_d1eba752ca2f0d70, []int{26} } -func (m *Trade) XXX_Unmarshal(b []byte) error { +func (m *SwapExecution) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *Trade) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *SwapExecution) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_Trade.Marshal(b, m, deterministic) + return xxx_messageInfo_SwapExecution.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1999,56 +2002,43 @@ func (m *Trade) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (m *Trade) XXX_Merge(src proto.Message) { - xxx_messageInfo_Trade.Merge(m, src) +func (m *SwapExecution) XXX_Merge(src proto.Message) { + xxx_messageInfo_SwapExecution.Merge(m, src) } -func (m *Trade) XXX_Size() int { +func (m *SwapExecution) XXX_Size() int { return m.Size() } -func (m *Trade) XXX_DiscardUnknown() { - xxx_messageInfo_Trade.DiscardUnknown(m) -} - -var xxx_messageInfo_Trade proto.InternalMessageInfo - -func (m *Trade) GetPath() *Path { - if m != nil { - return m.Path - } - return nil +func (m *SwapExecution) XXX_DiscardUnknown() { + xxx_messageInfo_SwapExecution.DiscardUnknown(m) } -func (m *Trade) GetStartAmount() *v1alpha1.Amount { - if m != nil { - return m.StartAmount - } - return nil -} +var xxx_messageInfo_SwapExecution proto.InternalMessageInfo -func (m *Trade) GetEndAmount() *v1alpha1.Amount { +func (m *SwapExecution) GetTraces() []*SwapExecution_Trace { if m != nil { - return m.EndAmount + return m.Traces } return nil } -// Contains the entire execution of a particular swap. -type SwapExecution struct { - Trades []*Trade `protobuf:"bytes,1,rep,name=trades,proto3" json:"trades,omitempty"` +// Contains all individual steps consisting of a trade trace. +type SwapExecution_Trace struct { + // Each step in the trade trace. + Value []*v1alpha1.Value `protobuf:"bytes,1,rep,name=value,proto3" json:"value,omitempty"` } -func (m *SwapExecution) Reset() { *m = SwapExecution{} } -func (m *SwapExecution) String() string { return proto.CompactTextString(m) } -func (*SwapExecution) ProtoMessage() {} -func (*SwapExecution) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{27} +func (m *SwapExecution_Trace) Reset() { *m = SwapExecution_Trace{} } +func (m *SwapExecution_Trace) String() string { return proto.CompactTextString(m) } +func (*SwapExecution_Trace) ProtoMessage() {} +func (*SwapExecution_Trace) Descriptor() ([]byte, []int) { + return fileDescriptor_d1eba752ca2f0d70, []int{26, 0} } -func (m *SwapExecution) XXX_Unmarshal(b []byte) error { +func (m *SwapExecution_Trace) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *SwapExecution) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *SwapExecution_Trace) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_SwapExecution.Marshal(b, m, deterministic) + return xxx_messageInfo_SwapExecution_Trace.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -2058,21 +2048,21 @@ func (m *SwapExecution) XXX_Marshal(b []byte, deterministic bool) ([]byte, error return b[:n], nil } } -func (m *SwapExecution) XXX_Merge(src proto.Message) { - xxx_messageInfo_SwapExecution.Merge(m, src) +func (m *SwapExecution_Trace) XXX_Merge(src proto.Message) { + xxx_messageInfo_SwapExecution_Trace.Merge(m, src) } -func (m *SwapExecution) XXX_Size() int { +func (m *SwapExecution_Trace) XXX_Size() int { return m.Size() } -func (m *SwapExecution) XXX_DiscardUnknown() { - xxx_messageInfo_SwapExecution.DiscardUnknown(m) +func (m *SwapExecution_Trace) XXX_DiscardUnknown() { + xxx_messageInfo_SwapExecution_Trace.DiscardUnknown(m) } -var xxx_messageInfo_SwapExecution proto.InternalMessageInfo +var xxx_messageInfo_SwapExecution_Trace proto.InternalMessageInfo -func (m *SwapExecution) GetTrades() []*Trade { +func (m *SwapExecution_Trace) GetValue() []*v1alpha1.Value { if m != nil { - return m.Trades + return m.Value } return nil } @@ -2088,7 +2078,7 @@ func (m *PositionWithdrawPlan) Reset() { *m = PositionWithdrawPlan{} } func (m *PositionWithdrawPlan) String() string { return proto.CompactTextString(m) } func (*PositionWithdrawPlan) ProtoMessage() {} func (*PositionWithdrawPlan) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{28} + return fileDescriptor_d1eba752ca2f0d70, []int{27} } func (m *PositionWithdrawPlan) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2147,7 +2137,7 @@ func (m *PositionRewardClaimPlan) Reset() { *m = PositionRewardClaimPlan func (m *PositionRewardClaimPlan) String() string { return proto.CompactTextString(m) } func (*PositionRewardClaimPlan) ProtoMessage() {} func (*PositionRewardClaimPlan) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{29} + return fileDescriptor_d1eba752ca2f0d70, []int{28} } func (m *PositionRewardClaimPlan) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2215,8 +2205,8 @@ func init() { proto.RegisterType((*PositionWithdraw)(nil), "penumbra.core.dex.v1alpha1.PositionWithdraw") proto.RegisterType((*PositionRewardClaim)(nil), "penumbra.core.dex.v1alpha1.PositionRewardClaim") proto.RegisterType((*Path)(nil), "penumbra.core.dex.v1alpha1.Path") - proto.RegisterType((*Trade)(nil), "penumbra.core.dex.v1alpha1.Trade") proto.RegisterType((*SwapExecution)(nil), "penumbra.core.dex.v1alpha1.SwapExecution") + proto.RegisterType((*SwapExecution_Trace)(nil), "penumbra.core.dex.v1alpha1.SwapExecution.Trace") proto.RegisterType((*PositionWithdrawPlan)(nil), "penumbra.core.dex.v1alpha1.PositionWithdrawPlan") proto.RegisterType((*PositionRewardClaimPlan)(nil), "penumbra.core.dex.v1alpha1.PositionRewardClaimPlan") } @@ -2226,119 +2216,119 @@ func init() { } var fileDescriptor_d1eba752ca2f0d70 = []byte{ - // 1788 bytes of a gzipped FileDescriptorProto + // 1781 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x59, 0x4f, 0x6f, 0xe3, 0xc6, - 0x15, 0xf7, 0x50, 0xb2, 0x2d, 0x3f, 0xc9, 0x1b, 0xef, 0x38, 0x68, 0x0d, 0x17, 0x71, 0x76, 0xd9, - 0xfc, 0xd9, 0x26, 0x85, 0x1c, 0x31, 0x29, 0x90, 0x7a, 0x9b, 0x6c, 0xac, 0x3f, 0x8e, 0xb5, 0x89, - 0x65, 0x86, 0x76, 0x76, 0x8b, 0xd4, 0x28, 0x31, 0x26, 0xc7, 0x2b, 0xa2, 0x14, 0xc9, 0x25, 0x47, - 0xb6, 0x7c, 0x2a, 0x50, 0xb4, 0xe8, 0x29, 0x68, 0xf3, 0x01, 0x8a, 0x22, 0x3d, 0xf6, 0x33, 0x14, - 0xed, 0xb5, 0x28, 0x5a, 0x60, 0x6f, 0xed, 0xa9, 0x28, 0xbc, 0x87, 0x02, 0xfd, 0x00, 0x45, 0x0f, - 0x3d, 0x14, 0x33, 0x1c, 0x8a, 0xb4, 0x2d, 0xaf, 0x44, 0xad, 0x7b, 0xc9, 0x4d, 0x33, 0xf3, 0x7e, - 0x3f, 0xbe, 0x99, 0xf7, 0xe6, 0xfd, 0x1e, 0x29, 0x78, 0x25, 0xa0, 0x5e, 0xbf, 0x77, 0x18, 0x92, - 0x75, 0xcb, 0x0f, 0xe9, 0xba, 0x4d, 0x07, 0xeb, 0xc7, 0x35, 0xe2, 0x06, 0x5d, 0x52, 0xe3, 0x83, - 0x6a, 0x10, 0xfa, 0xcc, 0xc7, 0xab, 0x89, 0x55, 0x95, 0x5b, 0x55, 0xf9, 0x42, 0x62, 0xb5, 0xfa, - 0xc6, 0x79, 0x06, 0x2b, 0x3c, 0x0d, 0x98, 0x9f, 0x92, 0xc4, 0xe3, 0x98, 0x47, 0xfd, 0x09, 0x82, - 0xe2, 0xde, 0x09, 0x09, 0xf0, 0x07, 0x30, 0x1b, 0x84, 0xbe, 0x7f, 0xb4, 0x82, 0x6e, 0xa1, 0x3b, - 0x65, 0xed, 0x8d, 0xea, 0xf9, 0x07, 0x48, 0x50, 0x42, 0x52, 0xfd, 0xec, 0x23, 0x8e, 0xd2, 0x39, - 0xc2, 0x88, 0x81, 0xf8, 0x5d, 0x28, 0x1e, 0xfa, 0xf6, 0xe9, 0x4a, 0x51, 0x10, 0xbc, 0x52, 0xbd, - 0xda, 0xc3, 0x2a, 0xc7, 0xd6, 0x7d, 0xfb, 0xd4, 0x10, 0x08, 0xf5, 0xe7, 0x08, 0x16, 0xf8, 0x54, - 0xc3, 0x25, 0x4e, 0x0f, 0xbf, 0x98, 0xf5, 0xa4, 0x92, 0xb0, 0xbf, 0x27, 0xd9, 0x15, 0xc1, 0xfe, - 0xad, 0x71, 0xec, 0x82, 0x2a, 0x7d, 0x04, 0x7e, 0x15, 0x6e, 0xd0, 0xc0, 0xb7, 0xba, 0xa6, 0xdd, - 0x0f, 0x09, 0x73, 0x7c, 0x6f, 0x65, 0xfe, 0x16, 0xba, 0x53, 0x34, 0x16, 0xc5, 0x6c, 0x53, 0x4e, - 0xaa, 0xbf, 0x2e, 0xc0, 0xe2, 0x39, 0x38, 0xde, 0x82, 0x05, 0xaf, 0xef, 0xba, 0xce, 0x91, 0x43, - 0x43, 0x79, 0x36, 0x77, 0xc6, 0x9c, 0x4d, 0x27, 0xb1, 0x37, 0x52, 0x28, 0x7e, 0x07, 0x0a, 0x47, - 0x94, 0x4a, 0xf7, 0xd5, 0x31, 0x0c, 0x5b, 0x94, 0x1a, 0xdc, 0x1c, 0xff, 0x10, 0x96, 0xfd, 0x3e, - 0x0b, 0xfa, 0xcc, 0xac, 0x99, 0x96, 0xdf, 0xeb, 0x39, 0xac, 0x47, 0x3d, 0xb6, 0x52, 0x10, 0x2c, - 0xd5, 0x31, 0x2c, 0x7b, 0x8c, 0x30, 0xda, 0x18, 0xa2, 0x8c, 0x9b, 0x31, 0x55, 0x2d, 0x9d, 0xca, - 0xf0, 0x6b, 0x59, 0xfe, 0xe2, 0xf3, 0xf0, 0x6b, 0x19, 0x7e, 0x1d, 0xca, 0x92, 0xdf, 0x26, 0x8c, - 0xac, 0xcc, 0x09, 0xde, 0xf5, 0x67, 0x05, 0xaf, 0x4e, 0x98, 0xd5, 0xe5, 0x21, 0xd8, 0x15, 0xb8, - 0x26, 0x61, 0xc4, 0x00, 0x7f, 0xf8, 0x5b, 0xfd, 0x8f, 0x02, 0xa5, 0x24, 0x7d, 0xf0, 0x7d, 0xa8, - 0xb0, 0x90, 0xd8, 0x8e, 0xf7, 0xc8, 0x0c, 0x88, 0x93, 0xc4, 0xe7, 0xf5, 0x67, 0xf1, 0xef, 0xc7, - 0xf6, 0x3a, 0x71, 0x42, 0xa3, 0xcc, 0xd2, 0x01, 0xde, 0x84, 0x05, 0x9b, 0xba, 0x8c, 0x98, 0x35, - 0xd3, 0x91, 0x61, 0x7a, 0x75, 0xcc, 0x01, 0x6c, 0xf6, 0xfc, 0xbe, 0xc7, 0x8c, 0x79, 0x81, 0xab, - 0xb5, 0x53, 0x0a, 0xcd, 0x74, 0x64, 0x8c, 0x72, 0x51, 0x68, 0x6d, 0xfc, 0x10, 0x6e, 0x1c, 0x51, - 0x7a, 0x39, 0x16, 0x6f, 0x8d, 0xe1, 0xa9, 0x13, 0x97, 0x78, 0x56, 0x36, 0x1a, 0x8b, 0x47, 0x34, - 0x33, 0xc4, 0x9b, 0x30, 0x1f, 0x90, 0x53, 0xd7, 0x27, 0xf6, 0xca, 0xec, 0xf8, 0x53, 0x12, 0x97, - 0x3b, 0x36, 0x37, 0x12, 0x9c, 0xfa, 0x53, 0x04, 0xe5, 0xcc, 0x02, 0xee, 0x00, 0x64, 0xfc, 0x44, - 0x53, 0xe5, 0x4c, 0x86, 0x41, 0xdc, 0x51, 0x4f, 0x00, 0xa8, 0x6d, 0x46, 0x27, 0x24, 0x10, 0x61, - 0xa8, 0x18, 0x8b, 0xc3, 0x59, 0xfe, 0x74, 0xf5, 0x67, 0xf2, 0x8e, 0xea, 0x2e, 0x71, 0x3c, 0x46, - 0x07, 0xec, 0x2b, 0x98, 0x06, 0xf7, 0x60, 0xc1, 0xe2, 0x25, 0xc8, 0xe4, 0x35, 0xa3, 0x38, 0x71, - 0xcd, 0x28, 0x09, 0xd0, 0x16, 0xa5, 0xf8, 0x23, 0x58, 0x8c, 0x09, 0x88, 0x6d, 0x87, 0x34, 0x8a, - 0x64, 0xd0, 0x5f, 0x1b, 0xe7, 0x47, 0x6c, 0x6d, 0x54, 0x04, 0x58, 0x8e, 0x78, 0x45, 0x0e, 0x23, - 0x4a, 0x6d, 0x71, 0x7f, 0x2b, 0x46, 0x3c, 0x50, 0x3f, 0x01, 0xbc, 0xe3, 0x5b, 0x3f, 0xda, 0x72, - 0xfd, 0x93, 0x86, 0x13, 0x74, 0x69, 0x28, 0x62, 0x71, 0x17, 0x66, 0x8f, 0x89, 0xdb, 0xa7, 0x32, - 0x08, 0x13, 0x6e, 0x3c, 0xc6, 0xa8, 0x3f, 0x8e, 0xef, 0xb6, 0xee, 0x12, 0x0f, 0xeb, 0x70, 0x83, - 0xe7, 0x80, 0x19, 0x24, 0x61, 0x96, 0x8c, 0x63, 0x4b, 0xff, 0x30, 0x2f, 0x8c, 0xc5, 0xe8, 0x5c, - 0x9a, 0xdc, 0x86, 0x0a, 0xbf, 0x5b, 0x87, 0xae, 0xe3, 0xf1, 0x70, 0xcb, 0xec, 0x2a, 0x1f, 0x51, - 0x5a, 0x97, 0x53, 0xea, 0xbf, 0x51, 0xa6, 0xfe, 0xff, 0x9f, 0xdc, 0x58, 0x85, 0x52, 0xe0, 0x47, - 0x8e, 0x10, 0x21, 0x45, 0x88, 0xd0, 0x70, 0x7c, 0xb1, 0x5e, 0x16, 0x9e, 0xbb, 0x5e, 0x8e, 0x10, - 0xbe, 0xe2, 0x28, 0xe1, 0xfb, 0xaf, 0x2c, 0xab, 0x0f, 0x1c, 0x7a, 0x82, 0xb7, 0x61, 0xfe, 0xd8, - 0x89, 0x9c, 0x43, 0x37, 0x89, 0xe2, 0xb7, 0xc7, 0x6d, 0x96, 0xc3, 0xaa, 0x0f, 0x62, 0xcc, 0xf6, - 0x8c, 0x91, 0xc0, 0x71, 0x0b, 0xe6, 0xfc, 0x80, 0x3c, 0xee, 0x27, 0xc2, 0xf7, 0xe6, 0x44, 0x44, - 0xbb, 0x02, 0xb2, 0x3d, 0x63, 0x48, 0xf0, 0xea, 0x17, 0x08, 0xe6, 0x25, 0x3b, 0x7e, 0x07, 0x8a, - 0xa2, 0x36, 0xc4, 0x9e, 0xdd, 0x1a, 0x47, 0x68, 0x08, 0xeb, 0x11, 0x61, 0x2c, 0x3c, 0x5f, 0x18, - 0x57, 0xdf, 0x87, 0xb9, 0xd8, 0xcf, 0xe9, 0x3c, 0xaa, 0x97, 0x61, 0x41, 0x78, 0x74, 0xec, 0xd0, - 0x13, 0xf5, 0x9f, 0xd9, 0xbe, 0x43, 0xc4, 0x60, 0xe7, 0x62, 0x0c, 0x6a, 0x13, 0xb5, 0x3c, 0x57, - 0x05, 0xe2, 0xfe, 0x85, 0x40, 0xbc, 0x35, 0x39, 0xdb, 0xa5, 0x68, 0xfc, 0x35, 0x13, 0x8d, 0x26, - 0x80, 0xd8, 0x85, 0xa8, 0x17, 0x57, 0xdc, 0xf9, 0xd1, 0xdc, 0x86, 0xd8, 0x7e, 0xdc, 0xf2, 0xd5, - 0xa1, 0x94, 0xb4, 0x39, 0xd2, 0xbf, 0xd7, 0xc7, 0xf5, 0x58, 0x3e, 0xa3, 0xdc, 0x3b, 0x63, 0x5e, - 0x36, 0x35, 0x19, 0x0e, 0x4d, 0xc6, 0x36, 0x2f, 0x87, 0xb6, 0xda, 0x19, 0xc6, 0xf4, 0x5a, 0xf6, - 0x55, 0xbf, 0x09, 0x2f, 0xa4, 0x2c, 0x71, 0xa4, 0x7f, 0x81, 0xa0, 0x9c, 0x11, 0x1f, 0x7c, 0x0f, - 0xe6, 0x49, 0x14, 0x51, 0xbe, 0x73, 0x34, 0x59, 0x89, 0xe6, 0xd6, 0x6d, 0xdb, 0x98, 0x13, 0xb0, - 0x5a, 0x4a, 0xa0, 0xc9, 0xa3, 0xcb, 0x47, 0xa0, 0xa9, 0x9f, 0x23, 0x58, 0x6e, 0x3a, 0x21, 0xb5, - 0x18, 0xb5, 0xb3, 0x9e, 0x7d, 0x0f, 0x66, 0x23, 0x46, 0x42, 0x96, 0xd3, 0xaf, 0x18, 0x84, 0xdf, - 0x85, 0x02, 0xf5, 0xec, 0x9c, 0x2e, 0x71, 0x88, 0xfa, 0x79, 0x11, 0x96, 0x47, 0x54, 0x35, 0xfc, - 0x3e, 0xcc, 0x4b, 0x65, 0xce, 0xa7, 0x2d, 0x73, 0xb1, 0x2e, 0xa7, 0x78, 0x2d, 0x9f, 0xae, 0xc7, - 0x78, 0x0d, 0x37, 0x00, 0x5c, 0xd2, 0x3b, 0xb4, 0x79, 0x6b, 0x50, 0xcb, 0xa7, 0xeb, 0xa5, 0x18, - 0x58, 0xab, 0x65, 0x48, 0x34, 0xb3, 0x26, 0x95, 0x3d, 0x1f, 0x89, 0x56, 0x3b, 0xe7, 0x89, 0x26, - 0x95, 0x3d, 0xa7, 0x27, 0xda, 0x39, 0x4f, 0x34, 0xd9, 0x99, 0xe7, 0xf4, 0x44, 0xc3, 0x5f, 0x83, - 0xb9, 0x2e, 0x75, 0x1e, 0x75, 0x99, 0x7c, 0x9d, 0x92, 0xa3, 0x4b, 0x1d, 0x59, 0x69, 0xfa, 0x8e, - 0x4c, 0xfd, 0x15, 0x82, 0x17, 0xe4, 0xe2, 0x56, 0xdf, 0xb3, 0x84, 0x4e, 0xee, 0xc0, 0x82, 0xe5, - 0xf7, 0x02, 0xdf, 0x4b, 0x3b, 0xcf, 0x31, 0x2a, 0x19, 0xd2, 0x0b, 0x1c, 0x46, 0xca, 0x80, 0xef, - 0x42, 0x51, 0xb8, 0xa9, 0xe4, 0x73, 0x53, 0x80, 0xd4, 0x2f, 0x10, 0xcf, 0xd7, 0x4b, 0xfc, 0x78, - 0x29, 0x7e, 0xe3, 0xe3, 0xde, 0x2d, 0xc6, 0x6f, 0x73, 0x6f, 0x03, 0x0a, 0xf2, 0xe5, 0x1e, 0x0a, - 0x38, 0xe8, 0x71, 0xbe, 0x6c, 0x43, 0x8f, 0xd5, 0x01, 0x94, 0x0c, 0x1a, 0xd1, 0xf0, 0x98, 0x46, - 0xf8, 0x3b, 0xa0, 0x84, 0x39, 0xaf, 0x8c, 0x12, 0xd6, 0x04, 0x2c, 0xe7, 0x4d, 0x51, 0x42, 0x4d, - 0x3d, 0x43, 0x50, 0xd2, 0x93, 0x76, 0xe6, 0x3d, 0x28, 0x04, 0x5d, 0x47, 0x3e, 0xfb, 0xcd, 0x09, - 0x8e, 0x75, 0x18, 0x1c, 0x8e, 0xe3, 0x7d, 0xa7, 0xe7, 0x7b, 0x16, 0x95, 0x9d, 0x5a, 0x3c, 0xc0, - 0xf7, 0x44, 0x5d, 0x62, 0x74, 0x12, 0x05, 0x4f, 0x3c, 0x11, 0xaf, 0x1d, 0x46, 0x8c, 0xc3, 0x1f, - 0x40, 0x29, 0x94, 0x87, 0x33, 0xc9, 0xc7, 0x8a, 0xe4, 0x20, 0x8d, 0x21, 0x4a, 0x55, 0x01, 0x12, - 0xe6, 0xb6, 0xcd, 0xdd, 0x74, 0x3c, 0x4f, 0x7e, 0x1e, 0xa8, 0x18, 0xf1, 0x40, 0xfd, 0x52, 0x81, - 0xc5, 0x73, 0x8f, 0xc7, 0x9f, 0x24, 0x8e, 0x73, 0xbb, 0x1b, 0xda, 0xdd, 0x89, 0x1d, 0x3f, 0x3f, - 0x6a, 0x79, 0xfd, 0x9e, 0xdc, 0x8a, 0xfa, 0x3b, 0x04, 0x37, 0x2f, 0x2d, 0xe2, 0x6f, 0xc2, 0xcb, - 0xfa, 0xee, 0x5e, 0x7b, 0xbf, 0xbd, 0xdb, 0x31, 0xf7, 0xf6, 0x37, 0xf7, 0x5b, 0x66, 0xab, 0xf3, - 0xe9, 0x8e, 0xf9, 0x69, 0x67, 0x4f, 0x6f, 0x35, 0xda, 0x5b, 0xed, 0x56, 0x73, 0x69, 0x06, 0xaf, - 0xc1, 0xea, 0x28, 0xa3, 0x5d, 0xbd, 0xd5, 0x69, 0x35, 0x97, 0xd0, 0x55, 0xeb, 0x8d, 0x8f, 0x77, - 0xf7, 0x5a, 0xcd, 0x25, 0x05, 0xdf, 0x86, 0x97, 0x46, 0xad, 0x3f, 0x6c, 0xef, 0x6f, 0x37, 0x8d, - 0xcd, 0x87, 0x9d, 0xa5, 0x02, 0x7e, 0x19, 0xbe, 0x31, 0x9a, 0x62, 0xb3, 0xbd, 0xd3, 0x6a, 0x2e, - 0x15, 0xf9, 0xd5, 0x99, 0xfd, 0x38, 0xe8, 0x1c, 0x31, 0xfc, 0x21, 0x94, 0x93, 0x26, 0xd8, 0x74, - 0xec, 0x2b, 0x24, 0x67, 0xe4, 0x09, 0xb5, 0x6d, 0x03, 0x82, 0x34, 0x18, 0xc3, 0xec, 0x50, 0xa6, - 0xcb, 0x0e, 0x55, 0x87, 0x4a, 0x32, 0xbf, 0x1b, 0x50, 0x8f, 0x67, 0xcb, 0xb0, 0x5d, 0x47, 0xe3, - 0xb3, 0x25, 0xc1, 0xa6, 0x4d, 0xbd, 0xfa, 0xfd, 0x34, 0x11, 0x1a, 0xae, 0x1f, 0xd1, 0x6b, 0xdb, - 0xac, 0xfa, 0x7b, 0x04, 0x4b, 0xc9, 0xd2, 0x43, 0x87, 0x75, 0xed, 0x90, 0x9c, 0x5c, 0xdf, 0x51, - 0x12, 0x58, 0x4e, 0x32, 0x3e, 0xfb, 0x41, 0x42, 0x99, 0xf2, 0x83, 0x04, 0x4e, 0xc8, 0xd2, 0x39, - 0xf5, 0x0f, 0x08, 0x96, 0x87, 0x27, 0x46, 0x4f, 0x48, 0x68, 0xc7, 0x0d, 0xe1, 0xb5, 0xed, 0xc1, - 0x04, 0x1c, 0x0a, 0xde, 0x6b, 0xd9, 0xc2, 0x4d, 0xc9, 0x95, 0xd9, 0xc1, 0x9f, 0x11, 0x14, 0x75, - 0xc2, 0xba, 0xb8, 0x21, 0x35, 0x64, 0x02, 0x35, 0x1a, 0xd1, 0x6d, 0xc5, 0x5a, 0xc2, 0x7b, 0xae, - 0xd0, 0xef, 0x8b, 0xec, 0x2d, 0xe4, 0xe9, 0xb9, 0x04, 0x08, 0x6f, 0xc6, 0xe5, 0xb6, 0x30, 0x9d, - 0x1e, 0x72, 0xac, 0xfa, 0x17, 0x04, 0xb3, 0x7c, 0x41, 0xbc, 0xd5, 0x04, 0x84, 0x75, 0x27, 0x79, - 0xab, 0xe1, 0xfb, 0x37, 0x84, 0x35, 0xde, 0x86, 0x8a, 0xe8, 0xff, 0x4c, 0x22, 0x24, 0x21, 0x9f, - 0x7e, 0x94, 0x05, 0x34, 0x1e, 0xf0, 0x0e, 0x9c, 0x7a, 0x76, 0xc2, 0x93, 0x4b, 0x00, 0x17, 0xa8, - 0x67, 0xc7, 0x3f, 0xd5, 0xfb, 0xf1, 0x7b, 0x55, 0x6b, 0x40, 0xad, 0xbe, 0x90, 0xa4, 0xef, 0xc2, - 0x1c, 0x6f, 0x2e, 0x68, 0xb4, 0x82, 0xc4, 0x11, 0xdf, 0x1e, 0xa7, 0x4a, 0xd4, 0x90, 0x00, 0xf5, - 0xef, 0x08, 0x5e, 0xbc, 0x78, 0xdb, 0xc4, 0x37, 0x82, 0xac, 0xa0, 0xa0, 0x69, 0x04, 0xe5, 0x62, - 0xbe, 0x2b, 0x53, 0xe7, 0x7b, 0xd2, 0xc9, 0x14, 0xa6, 0xe9, 0x64, 0x7e, 0x00, 0x5f, 0x1f, 0x71, - 0x19, 0xaf, 0x67, 0x8b, 0xf5, 0x2f, 0x95, 0x3f, 0x9e, 0xad, 0xa1, 0x27, 0x67, 0x6b, 0xe8, 0x1f, - 0x67, 0x6b, 0xe8, 0x97, 0x4f, 0xd7, 0x66, 0x9e, 0x3c, 0x5d, 0x9b, 0xf9, 0xdb, 0xd3, 0xb5, 0x19, - 0x58, 0xb3, 0xfc, 0xde, 0x33, 0xd8, 0xea, 0xa5, 0x26, 0x1d, 0xe8, 0xa1, 0xcf, 0x7c, 0x1d, 0x7d, - 0x66, 0x3c, 0x72, 0x58, 0xb7, 0x7f, 0x58, 0xb5, 0xfc, 0xde, 0xba, 0xe5, 0x47, 0x3d, 0x3f, 0x5a, - 0x0f, 0xa9, 0x4b, 0x4e, 0x69, 0xb8, 0x7e, 0xac, 0x0d, 0x7f, 0x5a, 0x5d, 0xe2, 0x78, 0xd1, 0xfa, - 0xd5, 0x7f, 0xa5, 0xdc, 0xb5, 0xe9, 0x20, 0xf9, 0xfd, 0x1b, 0xa5, 0xa0, 0x37, 0x9a, 0xbf, 0x55, - 0x56, 0xf5, 0xc4, 0x85, 0x06, 0x77, 0xa1, 0x49, 0x07, 0xd5, 0x07, 0xd2, 0xe4, 0x4f, 0xe9, 0xe2, - 0x01, 0x5f, 0x3c, 0x68, 0xd2, 0xc1, 0x41, 0xb2, 0x78, 0xa6, 0xbc, 0x76, 0xf5, 0xe2, 0xc1, 0x87, - 0x7a, 0x7d, 0x87, 0x32, 0x62, 0x13, 0x46, 0xfe, 0xa5, 0xbc, 0x94, 0x18, 0x6e, 0x6c, 0x70, 0xcb, - 0x8d, 0x8d, 0x26, 0x1d, 0x6c, 0x6c, 0x24, 0xb6, 0x87, 0x73, 0xe2, 0x4f, 0x99, 0xb7, 0xff, 0x17, - 0x00, 0x00, 0xff, 0xff, 0x38, 0x61, 0x76, 0x55, 0x04, 0x1a, 0x00, 0x00, + 0x15, 0x37, 0x29, 0xd9, 0x96, 0x9f, 0xe4, 0x8d, 0x77, 0x1c, 0xb4, 0x86, 0x8a, 0x38, 0xbb, 0x6c, + 0xfe, 0x6c, 0x93, 0x42, 0x8a, 0x98, 0x14, 0x08, 0xbc, 0x4d, 0x36, 0xd6, 0x1f, 0xaf, 0x95, 0xc4, + 0x32, 0x43, 0x3b, 0xbb, 0x45, 0xba, 0x28, 0x31, 0x26, 0xc7, 0x2b, 0xa2, 0x14, 0xc9, 0x25, 0x47, + 0xb6, 0x7c, 0x2a, 0x50, 0xb4, 0xe8, 0xa9, 0x68, 0xf3, 0x01, 0x8a, 0x22, 0x3d, 0x16, 0xfd, 0x08, + 0x45, 0x7b, 0x2d, 0x8a, 0x1e, 0x72, 0x6b, 0x4f, 0x45, 0xe1, 0x3d, 0x14, 0xe8, 0x07, 0x28, 0x7a, + 0xe8, 0xa1, 0x98, 0xe1, 0x8c, 0x48, 0xdb, 0xf2, 0x4a, 0xf4, 0xba, 0x97, 0xdc, 0x34, 0x33, 0xef, + 0xf7, 0xe3, 0x7b, 0xf3, 0xfe, 0x92, 0x82, 0x57, 0x42, 0xe2, 0x0f, 0x07, 0x07, 0x11, 0xae, 0xdb, + 0x41, 0x44, 0xea, 0x0e, 0x19, 0xd5, 0x8f, 0x1a, 0xd8, 0x0b, 0xfb, 0xb8, 0xc1, 0x16, 0xb5, 0x30, + 0x0a, 0x68, 0x80, 0xaa, 0x52, 0xaa, 0xc6, 0xa4, 0x6a, 0xec, 0x40, 0x4a, 0x55, 0xdf, 0x38, 0xcb, + 0x60, 0x47, 0x27, 0x21, 0x0d, 0x52, 0x92, 0x64, 0x9d, 0xf0, 0x68, 0x3f, 0x56, 0xa0, 0xb8, 0x77, + 0x8c, 0x43, 0xf4, 0x01, 0xcc, 0x87, 0x51, 0x10, 0x1c, 0xae, 0x29, 0xb7, 0x94, 0x3b, 0x65, 0xfd, + 0x8d, 0xda, 0xd9, 0x07, 0x08, 0x90, 0x24, 0xa9, 0x7d, 0xf6, 0x11, 0x43, 0x19, 0x0c, 0x61, 0x26, + 0x40, 0xf4, 0x2e, 0x14, 0x0f, 0x02, 0xe7, 0x64, 0xad, 0xc8, 0x09, 0x5e, 0xa9, 0x5d, 0xae, 0x61, + 0x8d, 0x61, 0x9b, 0x81, 0x73, 0x62, 0x72, 0x84, 0xf6, 0x33, 0x05, 0x96, 0xd8, 0x56, 0xcb, 0xc3, + 0xee, 0x00, 0xbd, 0x98, 0xd5, 0xa4, 0x22, 0xd9, 0xdf, 0x13, 0xec, 0x2a, 0x67, 0xff, 0xd6, 0x34, + 0x76, 0x4e, 0x95, 0x3e, 0x02, 0xbd, 0x0a, 0x37, 0x48, 0x18, 0xd8, 0x7d, 0xcb, 0x19, 0x46, 0x98, + 0xba, 0x81, 0xbf, 0xb6, 0x78, 0x4b, 0xb9, 0x53, 0x34, 0x97, 0xf9, 0x6e, 0x5b, 0x6c, 0x6a, 0xbf, + 0x2e, 0xc0, 0xf2, 0x19, 0x38, 0xda, 0x82, 0x25, 0x7f, 0xe8, 0x79, 0xee, 0xa1, 0x4b, 0x22, 0x71, + 0x37, 0x77, 0xa6, 0xdc, 0x4d, 0x4f, 0xca, 0x9b, 0x29, 0x14, 0xbd, 0x03, 0x85, 0x43, 0x42, 0x84, + 0xfa, 0xda, 0x14, 0x86, 0x2d, 0x42, 0x4c, 0x26, 0x8e, 0x7e, 0x00, 0xab, 0xc1, 0x90, 0x86, 0x43, + 0x6a, 0x35, 0x2c, 0x3b, 0x18, 0x0c, 0x5c, 0x3a, 0x20, 0x3e, 0x5d, 0x2b, 0x70, 0x96, 0xda, 0x14, + 0x96, 0x3d, 0x8a, 0x29, 0x69, 0x8d, 0x51, 0xe6, 0xcd, 0x84, 0xaa, 0x91, 0x6e, 0x65, 0xf8, 0xf5, + 0x2c, 0x7f, 0xf1, 0x79, 0xf8, 0xf5, 0x0c, 0xbf, 0x01, 0x65, 0xc1, 0xef, 0x60, 0x8a, 0xd7, 0x16, + 0x38, 0x6f, 0xfd, 0x59, 0xce, 0x6b, 0x62, 0x6a, 0xf7, 0x99, 0x0b, 0x76, 0x39, 0xae, 0x8d, 0x29, + 0x36, 0x21, 0x18, 0xff, 0xd6, 0xfe, 0xa3, 0x42, 0x49, 0x86, 0x0f, 0xfa, 0x10, 0x2a, 0x34, 0xc2, + 0x8e, 0xeb, 0x3f, 0xb6, 0x42, 0xec, 0x4a, 0xff, 0xbc, 0xfe, 0x2c, 0xfe, 0xfd, 0x44, 0xde, 0xc0, + 0x6e, 0x64, 0x96, 0x69, 0xba, 0x40, 0x9b, 0xb0, 0xe4, 0x10, 0x8f, 0x62, 0xab, 0x61, 0xb9, 0xc2, + 0x4d, 0xaf, 0x4e, 0xb9, 0x80, 0xcd, 0x41, 0x30, 0xf4, 0xa9, 0xb9, 0xc8, 0x71, 0x8d, 0x6e, 0x4a, + 0xa1, 0x5b, 0xae, 0xf0, 0x51, 0x2e, 0x0a, 0xbd, 0x8b, 0x1e, 0xc2, 0x8d, 0x43, 0x42, 0x2e, 0xfa, + 0xe2, 0xad, 0x29, 0x3c, 0x4d, 0xec, 0x61, 0xdf, 0xce, 0x7a, 0x63, 0xf9, 0x90, 0x64, 0x96, 0x68, + 0x13, 0x16, 0x43, 0x7c, 0xe2, 0x05, 0xd8, 0x59, 0x9b, 0x9f, 0x7e, 0x4b, 0x3c, 0xb9, 0x13, 0x71, + 0x53, 0xe2, 0xb4, 0x9f, 0x28, 0x50, 0xce, 0x1c, 0xa0, 0x1e, 0x40, 0x46, 0x4f, 0xe5, 0x4a, 0x31, + 0x93, 0x61, 0xe0, 0x39, 0xea, 0x73, 0x00, 0x71, 0xac, 0xf8, 0x18, 0x87, 0xdc, 0x0d, 0x15, 0x73, + 0x79, 0xbc, 0xcb, 0x9e, 0xae, 0xfd, 0x54, 0xe4, 0xa8, 0xe1, 0x61, 0xd7, 0xa7, 0x64, 0x44, 0xbf, + 0x82, 0x61, 0x70, 0x0f, 0x96, 0x6c, 0x56, 0x82, 0x2c, 0x56, 0x33, 0x8a, 0x33, 0xd7, 0x8c, 0x12, + 0x07, 0x6d, 0x11, 0x82, 0x3e, 0x82, 0xe5, 0x84, 0x00, 0x3b, 0x4e, 0x44, 0xe2, 0x58, 0x38, 0xfd, + 0xb5, 0x69, 0x7a, 0x24, 0xd2, 0x66, 0x85, 0x83, 0xc5, 0x8a, 0x55, 0xe4, 0x28, 0x26, 0xc4, 0xe1, + 0xf9, 0x5b, 0x31, 0x93, 0x85, 0xf6, 0x09, 0xa0, 0x9d, 0xc0, 0xfe, 0xe1, 0x96, 0x17, 0x1c, 0xb7, + 0xdc, 0xb0, 0x4f, 0x22, 0xee, 0x8b, 0xbb, 0x30, 0x7f, 0x84, 0xbd, 0x21, 0x11, 0x4e, 0x98, 0xd1, + 0xf0, 0x04, 0xa3, 0xfd, 0x28, 0xc9, 0x6d, 0xc3, 0xc3, 0x3e, 0x32, 0xe0, 0x06, 0x8b, 0x01, 0x2b, + 0x94, 0x6e, 0x16, 0x8c, 0x53, 0x4b, 0xff, 0x38, 0x2e, 0xcc, 0xe5, 0xf8, 0x4c, 0x98, 0xdc, 0x86, + 0x0a, 0xcb, 0xad, 0x03, 0xcf, 0xf5, 0x99, 0xbb, 0x45, 0x74, 0x95, 0x0f, 0x09, 0x69, 0x8a, 0x2d, + 0xed, 0xdf, 0x4a, 0xa6, 0xfe, 0xff, 0x9f, 0xd4, 0xa8, 0x42, 0x29, 0x0c, 0x62, 0x97, 0x37, 0x21, + 0x95, 0x37, 0xa1, 0xf1, 0xfa, 0x7c, 0xbd, 0x2c, 0x3c, 0x77, 0xbd, 0x9c, 0xd0, 0xf8, 0x8a, 0x93, + 0x1a, 0xdf, 0x7f, 0x45, 0x59, 0x7d, 0xe0, 0x92, 0x63, 0xb4, 0x0d, 0x8b, 0x47, 0x6e, 0xec, 0x1e, + 0x78, 0xd2, 0x8b, 0xdf, 0x9e, 0x66, 0x2c, 0x83, 0xd5, 0x1e, 0x24, 0x98, 0xed, 0x39, 0x53, 0xc2, + 0x51, 0x07, 0x16, 0x82, 0x10, 0x3f, 0x19, 0xca, 0xc6, 0xf7, 0xe6, 0x4c, 0x44, 0xbb, 0x1c, 0xb2, + 0x3d, 0x67, 0x0a, 0x70, 0xf5, 0x73, 0x05, 0x16, 0x05, 0x3b, 0x7a, 0x07, 0x8a, 0xbc, 0x36, 0x24, + 0x9a, 0xdd, 0x9a, 0x46, 0x68, 0x72, 0xe9, 0x09, 0x6e, 0x2c, 0x3c, 0x9f, 0x1b, 0xab, 0xef, 0xc3, + 0x42, 0xa2, 0xe7, 0xd5, 0x34, 0x6a, 0x96, 0x61, 0x89, 0x6b, 0x74, 0xe4, 0x92, 0x63, 0xed, 0x9f, + 0xd9, 0xb9, 0x83, 0xfb, 0x60, 0xe7, 0xbc, 0x0f, 0x1a, 0x33, 0x8d, 0x3c, 0x97, 0x39, 0xe2, 0xc3, + 0x73, 0x8e, 0x78, 0x6b, 0x76, 0xb6, 0x0b, 0xde, 0xf8, 0x6b, 0xc6, 0x1b, 0x6d, 0x00, 0x6e, 0x05, + 0xaf, 0x17, 0x97, 0xe4, 0xfc, 0x64, 0x6e, 0x93, 0x9b, 0x9f, 0x8c, 0x7c, 0x4d, 0x28, 0xc9, 0x31, + 0x47, 0xe8, 0xf7, 0xfa, 0xb4, 0x19, 0x2b, 0xa0, 0x84, 0x69, 0x67, 0x2e, 0x8a, 0xa1, 0x26, 0xc3, + 0xa1, 0x0b, 0xdf, 0xe6, 0xe5, 0xd0, 0xab, 0xbd, 0xb1, 0x4f, 0xaf, 0xc5, 0xae, 0xe6, 0x4d, 0x78, + 0x21, 0x65, 0x49, 0x3c, 0xfd, 0x0b, 0x05, 0xca, 0x99, 0xe6, 0x83, 0xee, 0xc1, 0x22, 0x8e, 0x63, + 0xc2, 0x2c, 0x57, 0x66, 0x2b, 0xd1, 0x4c, 0xba, 0xeb, 0x98, 0x0b, 0x1c, 0xd6, 0x48, 0x09, 0x74, + 0x71, 0x75, 0xf9, 0x08, 0x74, 0xed, 0xe7, 0x0a, 0xac, 0xb6, 0xdd, 0x88, 0xd8, 0x94, 0x38, 0x59, + 0xcd, 0xbe, 0x0b, 0xf3, 0x31, 0xc5, 0x11, 0xcd, 0xa9, 0x57, 0x02, 0x42, 0xef, 0x42, 0x81, 0xf8, + 0x4e, 0x4e, 0x95, 0x18, 0x44, 0xfb, 0x5d, 0x11, 0x56, 0x27, 0x54, 0x35, 0xf4, 0x3e, 0x2c, 0x8a, + 0xce, 0x9c, 0xaf, 0xb7, 0x2c, 0x24, 0x7d, 0x39, 0xc5, 0xeb, 0xf9, 0xfa, 0x7a, 0x82, 0xd7, 0xd1, + 0x07, 0x50, 0xf2, 0xf0, 0xe0, 0xc0, 0x61, 0x0a, 0xe4, 0xeb, 0xea, 0x09, 0xac, 0x91, 0x61, 0xd0, + 0x45, 0x53, 0xcf, 0xc7, 0xa0, 0xb3, 0xb0, 0x1c, 0xfa, 0x87, 0xae, 0xe7, 0x11, 0xc7, 0x6a, 0x88, + 0x9e, 0x3e, 0x23, 0xc7, 0x92, 0x04, 0x36, 0xce, 0xb0, 0xe8, 0x62, 0x28, 0xcf, 0xcb, 0xa2, 0xa3, + 0xaf, 0xc1, 0x42, 0x9f, 0xb8, 0x8f, 0xfb, 0x54, 0xbc, 0x4a, 0x89, 0xd5, 0x85, 0x69, 0xac, 0xf4, + 0x1c, 0xd3, 0xd8, 0x6d, 0xa8, 0x24, 0xdd, 0x4b, 0x3c, 0x69, 0x89, 0x3f, 0xa9, 0xcc, 0xf7, 0xb6, + 0xf9, 0x96, 0xf6, 0x2b, 0x05, 0x5e, 0x10, 0xf8, 0xad, 0xa1, 0x6f, 0xf3, 0x36, 0xba, 0x03, 0x4b, + 0x76, 0x30, 0x08, 0x03, 0x3f, 0x1d, 0x4c, 0xa7, 0x34, 0xd1, 0x88, 0x9c, 0xe3, 0x30, 0x53, 0x06, + 0x74, 0x17, 0x8a, 0xdc, 0x12, 0x35, 0x9f, 0x25, 0x1c, 0xa4, 0x7d, 0xae, 0xb0, 0x70, 0xbe, 0xc0, + 0x8f, 0x56, 0x92, 0x17, 0x42, 0xa6, 0xdd, 0x72, 0xf2, 0xb2, 0xf7, 0x36, 0x28, 0x61, 0xbe, 0xd0, + 0x54, 0x42, 0x06, 0x7a, 0x92, 0x2f, 0x1c, 0x95, 0x27, 0xda, 0x08, 0x4a, 0x26, 0x89, 0x49, 0x74, + 0x44, 0x62, 0xf4, 0x1d, 0x50, 0xa3, 0x9c, 0x19, 0xa5, 0x46, 0x0d, 0x0e, 0xcb, 0x99, 0x48, 0x6a, + 0xa4, 0x6b, 0xa7, 0x0a, 0x94, 0x0c, 0x39, 0xed, 0xbc, 0x07, 0x85, 0xb0, 0xef, 0x8a, 0x67, 0xbf, + 0x39, 0xc3, 0xb5, 0x8e, 0x9d, 0xc3, 0x70, 0x6c, 0x2c, 0xf5, 0x03, 0xdf, 0x26, 0x62, 0x90, 0x4b, + 0x16, 0xe8, 0x1e, 0x2f, 0x5b, 0x94, 0xcc, 0xd2, 0xe0, 0xa5, 0x26, 0xfc, 0xad, 0xc4, 0x4c, 0x70, + 0x2c, 0x4b, 0x23, 0x71, 0x39, 0xb3, 0x7c, 0xcb, 0x90, 0x17, 0x69, 0x8e, 0x51, 0x9a, 0x06, 0x20, + 0x99, 0xbb, 0x0e, 0x53, 0xd3, 0xf5, 0x7d, 0xf1, 0xf5, 0xa0, 0x62, 0x26, 0x0b, 0xed, 0x0b, 0x15, + 0x96, 0xcf, 0x3c, 0x1e, 0x7d, 0x22, 0x15, 0x67, 0x72, 0x37, 0xf4, 0xbb, 0x33, 0x2b, 0x7e, 0x76, + 0xd5, 0xf1, 0x87, 0x03, 0x61, 0x8a, 0xf6, 0x7b, 0x05, 0x6e, 0x5e, 0x38, 0x44, 0xdf, 0x84, 0x97, + 0x8d, 0xdd, 0xbd, 0xee, 0x7e, 0x77, 0xb7, 0x67, 0xed, 0xed, 0x6f, 0xee, 0x77, 0xac, 0x4e, 0xef, + 0xd3, 0x1d, 0xeb, 0xd3, 0xde, 0x9e, 0xd1, 0x69, 0x75, 0xb7, 0xba, 0x9d, 0xf6, 0xca, 0x1c, 0x5a, + 0x87, 0xea, 0x24, 0xa1, 0x5d, 0xa3, 0xd3, 0xeb, 0xb4, 0x57, 0x94, 0xcb, 0xce, 0x5b, 0x1f, 0xef, + 0xee, 0x75, 0xda, 0x2b, 0x2a, 0xba, 0x0d, 0x2f, 0x4d, 0x3a, 0x7f, 0xd8, 0xdd, 0xdf, 0x6e, 0x9b, + 0x9b, 0x0f, 0x7b, 0x2b, 0x05, 0xf4, 0x32, 0x7c, 0x63, 0x32, 0xc5, 0x66, 0x77, 0xa7, 0xd3, 0x5e, + 0x29, 0xb2, 0xd4, 0x99, 0xff, 0x38, 0xec, 0x1d, 0x52, 0x74, 0x1f, 0xca, 0x72, 0x46, 0xb6, 0x5c, + 0xe7, 0x92, 0x8e, 0x34, 0xf1, 0x86, 0xba, 0x8e, 0x09, 0x61, 0xea, 0x8c, 0x71, 0x74, 0xa8, 0x57, + 0x8b, 0x0e, 0xcd, 0x80, 0x8a, 0xdc, 0xdf, 0x0d, 0x89, 0xcf, 0xa2, 0x65, 0x3c, 0xcd, 0x2b, 0xd3, + 0xa3, 0x45, 0x62, 0xd3, 0x99, 0x5f, 0xfb, 0x5e, 0x1a, 0x08, 0x2d, 0x2f, 0x88, 0xc9, 0xb5, 0x19, + 0xab, 0xfd, 0x41, 0x81, 0x15, 0x79, 0xf4, 0xd0, 0xa5, 0x7d, 0x27, 0xc2, 0xc7, 0xd7, 0x77, 0x95, + 0x18, 0x56, 0x65, 0xc4, 0x67, 0xbf, 0x57, 0xa8, 0x57, 0xfc, 0x5e, 0x81, 0x24, 0x59, 0xba, 0xa7, + 0xfd, 0x51, 0x81, 0xd5, 0xf1, 0x8d, 0x91, 0x63, 0x1c, 0x39, 0xc9, 0xbc, 0x78, 0x6d, 0x36, 0x58, + 0x80, 0x22, 0xce, 0x7b, 0x2d, 0x26, 0xdc, 0x14, 0x5c, 0x19, 0x0b, 0xfe, 0xa2, 0x40, 0xd1, 0xc0, + 0xb4, 0x8f, 0x5a, 0xa2, 0x87, 0xcc, 0xd0, 0x8d, 0x26, 0x0c, 0x63, 0x49, 0x2f, 0x61, 0x23, 0x59, + 0x14, 0x0c, 0x79, 0xf4, 0x16, 0xf2, 0x8c, 0x64, 0x1c, 0x84, 0x36, 0x93, 0x72, 0x5b, 0xb8, 0x5a, + 0x3f, 0x64, 0x58, 0xd6, 0x6c, 0xf9, 0x7b, 0x4a, 0x67, 0x44, 0xec, 0x21, 0xaf, 0xe1, 0xf7, 0x61, + 0x81, 0x46, 0xd8, 0x26, 0xf1, 0x9a, 0xc2, 0x75, 0xaa, 0x4f, 0x1b, 0x92, 0xc7, 0x50, 0x56, 0xd4, + 0x6d, 0x62, 0x0a, 0x78, 0xb5, 0x05, 0xf3, 0x7c, 0x03, 0x6d, 0xa4, 0x5f, 0x10, 0x0a, 0x13, 0xd2, + 0xe9, 0xbc, 0x91, 0x0f, 0x98, 0xac, 0xfc, 0x80, 0xf0, 0x77, 0x05, 0x5e, 0x3c, 0x1f, 0xf1, 0xfc, + 0x35, 0x3e, 0x5b, 0xd4, 0x95, 0xab, 0x14, 0xf5, 0xf3, 0x31, 0xa7, 0x5e, 0x39, 0xe6, 0xe4, 0x34, + 0x51, 0xb8, 0xca, 0x34, 0xf1, 0x7d, 0xf8, 0xfa, 0x84, 0x84, 0xb8, 0x1e, 0x13, 0x9b, 0x5f, 0xa8, + 0x7f, 0x3a, 0x5d, 0x57, 0xbe, 0x3c, 0x5d, 0x57, 0xfe, 0x71, 0xba, 0xae, 0xfc, 0xf2, 0xe9, 0xfa, + 0xdc, 0x97, 0x4f, 0xd7, 0xe7, 0xfe, 0xf6, 0x74, 0x7d, 0x0e, 0xd6, 0xed, 0x60, 0xf0, 0x0c, 0xb6, + 0x66, 0xa9, 0x4d, 0x46, 0x46, 0x14, 0xd0, 0xc0, 0x50, 0x3e, 0x33, 0x1f, 0xbb, 0xb4, 0x3f, 0x3c, + 0xa8, 0xd9, 0xc1, 0xa0, 0x6e, 0x07, 0xf1, 0x20, 0x88, 0xeb, 0x11, 0xf1, 0xf0, 0x09, 0x89, 0xea, + 0x47, 0xfa, 0xf8, 0xa7, 0xdd, 0xc7, 0xae, 0x1f, 0xd7, 0x2f, 0xff, 0xb7, 0xe3, 0xae, 0x43, 0x46, + 0xf2, 0xf7, 0x6f, 0xd4, 0x82, 0xd1, 0x6a, 0xff, 0x56, 0xad, 0x1a, 0x52, 0x85, 0x16, 0x53, 0xa1, + 0x4d, 0x46, 0xb5, 0x07, 0x42, 0xe4, 0xcf, 0xe9, 0xe1, 0x23, 0x76, 0xf8, 0xa8, 0x4d, 0x46, 0x8f, + 0xe4, 0xe1, 0xa9, 0xfa, 0xda, 0xe5, 0x87, 0x8f, 0xee, 0x1b, 0xcd, 0x1d, 0x42, 0xb1, 0x83, 0x29, + 0xfe, 0x97, 0xfa, 0x92, 0x14, 0xdc, 0xd8, 0x60, 0x92, 0x1b, 0x1b, 0x6d, 0x32, 0xda, 0xd8, 0x90, + 0xb2, 0x07, 0x0b, 0xfc, 0x7f, 0x93, 0xb7, 0xff, 0x17, 0x00, 0x00, 0xff, 0xff, 0x95, 0x49, 0x5f, + 0xa1, 0xa7, 0x19, 0x00, 0x00, } func (m *Swap) Marshal() (dAtA []byte, err error) { @@ -3305,6 +3295,11 @@ func (m *BatchSwapOutputData) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.EpochHeight != 0 { + i = encodeVarintDex(dAtA, i, uint64(m.EpochHeight)) + i-- + dAtA[i] = 0x48 + } if m.TradingPair != nil { { size, err := m.TradingPair.MarshalToSizedBuffer(dAtA[:i]) @@ -3322,9 +3317,9 @@ func (m *BatchSwapOutputData) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x38 } - if m.Lambda_2_2 != nil { + if m.Unfilled_2 != nil { { - size, err := m.Lambda_2_2.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Unfilled_2.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -3334,9 +3329,9 @@ func (m *BatchSwapOutputData) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x32 } - if m.Lambda_1_2 != nil { + if m.Unfilled_1 != nil { { - size, err := m.Lambda_1_2.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Unfilled_1.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -3346,9 +3341,9 @@ func (m *BatchSwapOutputData) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x2a } - if m.Lambda_2_1 != nil { + if m.Lambda_2 != nil { { - size, err := m.Lambda_2_1.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Lambda_2.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -3358,9 +3353,9 @@ func (m *BatchSwapOutputData) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x22 } - if m.Lambda_1_1 != nil { + if m.Lambda_1 != nil { { - size, err := m.Lambda_1_1.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Lambda_1.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -3939,7 +3934,7 @@ func (m *Path) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *Trade) Marshal() (dAtA []byte, err error) { +func (m *SwapExecution) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3949,56 +3944,34 @@ func (m *Trade) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *Trade) MarshalTo(dAtA []byte) (int, error) { +func (m *SwapExecution) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *Trade) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *SwapExecution) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.EndAmount != nil { - { - size, err := m.EndAmount.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDex(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - } - if m.StartAmount != nil { - { - size, err := m.StartAmount.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDex(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if m.Path != nil { - { - size, err := m.Path.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if len(m.Traces) > 0 { + for iNdEx := len(m.Traces) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Traces[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintDex(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintDex(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *SwapExecution) Marshal() (dAtA []byte, err error) { +func (m *SwapExecution_Trace) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4008,20 +3981,20 @@ func (m *SwapExecution) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *SwapExecution) MarshalTo(dAtA []byte) (int, error) { +func (m *SwapExecution_Trace) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *SwapExecution) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *SwapExecution_Trace) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.Trades) > 0 { - for iNdEx := len(m.Trades) - 1; iNdEx >= 0; iNdEx-- { + if len(m.Value) > 0 { + for iNdEx := len(m.Value) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.Trades[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Value[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -4522,20 +4495,20 @@ func (m *BatchSwapOutputData) Size() (n int) { l = m.Delta_2.Size() n += 1 + l + sovDex(uint64(l)) } - if m.Lambda_1_1 != nil { - l = m.Lambda_1_1.Size() + if m.Lambda_1 != nil { + l = m.Lambda_1.Size() n += 1 + l + sovDex(uint64(l)) } - if m.Lambda_2_1 != nil { - l = m.Lambda_2_1.Size() + if m.Lambda_2 != nil { + l = m.Lambda_2.Size() n += 1 + l + sovDex(uint64(l)) } - if m.Lambda_1_2 != nil { - l = m.Lambda_1_2.Size() + if m.Unfilled_1 != nil { + l = m.Unfilled_1.Size() n += 1 + l + sovDex(uint64(l)) } - if m.Lambda_2_2 != nil { - l = m.Lambda_2_2.Size() + if m.Unfilled_2 != nil { + l = m.Unfilled_2.Size() n += 1 + l + sovDex(uint64(l)) } if m.Height != 0 { @@ -4545,6 +4518,9 @@ func (m *BatchSwapOutputData) Size() (n int) { l = m.TradingPair.Size() n += 1 + l + sovDex(uint64(l)) } + if m.EpochHeight != 0 { + n += 1 + sovDex(uint64(m.EpochHeight)) + } return n } @@ -4752,35 +4728,29 @@ func (m *Path) Size() (n int) { return n } -func (m *Trade) Size() (n int) { +func (m *SwapExecution) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.Path != nil { - l = m.Path.Size() - n += 1 + l + sovDex(uint64(l)) - } - if m.StartAmount != nil { - l = m.StartAmount.Size() - n += 1 + l + sovDex(uint64(l)) - } - if m.EndAmount != nil { - l = m.EndAmount.Size() - n += 1 + l + sovDex(uint64(l)) + if len(m.Traces) > 0 { + for _, e := range m.Traces { + l = e.Size() + n += 1 + l + sovDex(uint64(l)) + } } return n } -func (m *SwapExecution) Size() (n int) { +func (m *SwapExecution_Trace) Size() (n int) { if m == nil { return 0 } var l int _ = l - if len(m.Trades) > 0 { - for _, e := range m.Trades { + if len(m.Value) > 0 { + for _, e := range m.Value { l = e.Size() n += 1 + l + sovDex(uint64(l)) } @@ -7338,7 +7308,7 @@ func (m *BatchSwapOutputData) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Lambda_1_1", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Lambda_1", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -7365,16 +7335,16 @@ func (m *BatchSwapOutputData) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Lambda_1_1 == nil { - m.Lambda_1_1 = &v1alpha1.Amount{} + if m.Lambda_1 == nil { + m.Lambda_1 = &v1alpha1.Amount{} } - if err := m.Lambda_1_1.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Lambda_1.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Lambda_2_1", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Lambda_2", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -7401,16 +7371,16 @@ func (m *BatchSwapOutputData) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Lambda_2_1 == nil { - m.Lambda_2_1 = &v1alpha1.Amount{} + if m.Lambda_2 == nil { + m.Lambda_2 = &v1alpha1.Amount{} } - if err := m.Lambda_2_1.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Lambda_2.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex case 5: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Lambda_1_2", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Unfilled_1", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -7437,16 +7407,16 @@ func (m *BatchSwapOutputData) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Lambda_1_2 == nil { - m.Lambda_1_2 = &v1alpha1.Amount{} + if m.Unfilled_1 == nil { + m.Unfilled_1 = &v1alpha1.Amount{} } - if err := m.Lambda_1_2.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Unfilled_1.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) + return fmt.Errorf("proto: wrong wireType = %d for field Unfilled_2", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -7473,10 +7443,10 @@ func (m *BatchSwapOutputData) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Lambda_2_2 == nil { - m.Lambda_2_2 = &v1alpha1.Amount{} + if m.Unfilled_2 == nil { + m.Unfilled_2 = &v1alpha1.Amount{} } - if err := m.Lambda_2_2.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Unfilled_2.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -7535,6 +7505,25 @@ func (m *BatchSwapOutputData) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 9: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field EpochHeight", wireType) + } + m.EpochHeight = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDex + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.EpochHeight |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipDex(dAtA[iNdEx:]) @@ -8980,7 +8969,7 @@ func (m *Path) Unmarshal(dAtA []byte) error { } return nil } -func (m *Trade) Unmarshal(dAtA []byte) error { +func (m *SwapExecution) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -9003,15 +8992,15 @@ func (m *Trade) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: Trade: wiretype end group for non-group") + return fmt.Errorf("proto: SwapExecution: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: Trade: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: SwapExecution: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Path", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Traces", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -9038,82 +9027,8 @@ func (m *Trade) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Path == nil { - m.Path = &Path{} - } - if err := m.Path.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field StartAmount", 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.StartAmount == nil { - m.StartAmount = &v1alpha1.Amount{} - } - if err := m.StartAmount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field EndAmount", 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.EndAmount == nil { - m.EndAmount = &v1alpha1.Amount{} - } - if err := m.EndAmount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.Traces = append(m.Traces, &SwapExecution_Trace{}) + if err := m.Traces[len(m.Traces)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -9138,7 +9053,7 @@ func (m *Trade) Unmarshal(dAtA []byte) error { } return nil } -func (m *SwapExecution) Unmarshal(dAtA []byte) error { +func (m *SwapExecution_Trace) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -9161,15 +9076,15 @@ func (m *SwapExecution) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: SwapExecution: wiretype end group for non-group") + return fmt.Errorf("proto: Trace: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: SwapExecution: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: Trace: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Trades", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Value", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -9196,8 +9111,8 @@ func (m *SwapExecution) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Trades = append(m.Trades, &Trade{}) - if err := m.Trades[len(m.Trades)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.Value = append(m.Value, &v1alpha1.Value{}) + if err := m.Value[len(m.Value)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/relayer/chains/penumbra/core/stake/v1alpha1/stake.pb.go b/relayer/chains/penumbra/core/stake/v1alpha1/stake.pb.go index 2dab3ab79..2228a0a81 100644 --- a/relayer/chains/penumbra/core/stake/v1alpha1/stake.pb.go +++ b/relayer/chains/penumbra/core/stake/v1alpha1/stake.pb.go @@ -650,7 +650,6 @@ func (m *ValidatorStatus) GetBondingState() *BondingState { type BondingState struct { State BondingState_BondingStateEnum `protobuf:"varint,1,opt,name=state,proto3,enum=penumbra.core.stake.v1alpha1.BondingState_BondingStateEnum" json:"state,omitempty"` // Types that are valid to be assigned to XUnbondingEpoch: - // // *BondingState_UnbondingEpoch XUnbondingEpoch isBondingState_XUnbondingEpoch `protobuf_oneof:"_unbonding_epoch"` } diff --git a/relayer/chains/penumbra/core/transaction/v1alpha1/transaction.pb.go b/relayer/chains/penumbra/core/transaction/v1alpha1/transaction.pb.go index e11591783..027751ff9 100644 --- a/relayer/chains/penumbra/core/transaction/v1alpha1/transaction.pb.go +++ b/relayer/chains/penumbra/core/transaction/v1alpha1/transaction.pb.go @@ -658,7 +658,9 @@ type TransactionPerspective struct { // 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"` + Denoms []*v1alpha1.DenomMetadata `protobuf:"bytes,5,rep,name=denoms,proto3" json:"denoms,omitempty"` + // The transaction ID associated with this TransactionPerspective + TransactionId *Id `protobuf:"bytes,6,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"` } func (m *TransactionPerspective) Reset() { *m = TransactionPerspective{} } @@ -722,13 +724,20 @@ func (m *TransactionPerspective) GetAddressViews() []*v1alpha1.AddressView { return nil } -func (m *TransactionPerspective) GetDenoms() []*v1alpha1.Denom { +func (m *TransactionPerspective) GetDenoms() []*v1alpha1.DenomMetadata { if m != nil { return m.Denoms } return nil } +func (m *TransactionPerspective) GetTransactionId() *Id { + if m != nil { + return m.TransactionId + } + return nil +} + type PayloadKey struct { Inner []byte `protobuf:"bytes,1,opt,name=inner,proto3" json:"inner,omitempty"` } @@ -3369,172 +3378,173 @@ func init() { } var fileDescriptor_cd20ea79758052c4 = []byte{ - // 2631 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5b, 0xcd, 0x6f, 0x1c, 0x49, - 0x15, 0x9f, 0x9e, 0xb1, 0xc7, 0xf6, 0x9b, 0xf1, 0x57, 0xc5, 0x9b, 0x1d, 0x2c, 0xe4, 0x8d, 0x7a, - 0x93, 0xe0, 0x24, 0xec, 0x38, 0xb1, 0x9d, 0x8d, 0xe4, 0x0d, 0xb0, 0x1e, 0x7b, 0xb3, 0xe3, 0x64, - 0x1d, 0xcf, 0x76, 0x82, 0xa3, 0x04, 0xb3, 0x4d, 0x4d, 0x77, 0xd9, 0xd3, 0x72, 0x4f, 0x77, 0xd3, - 0xdd, 0x33, 0x8e, 0xf7, 0x1f, 0x00, 0x2e, 0x68, 0x91, 0x38, 0x20, 0x2e, 0x48, 0x5c, 0x90, 0x38, - 0x70, 0xe0, 0x08, 0xe2, 0xcc, 0x0a, 0x24, 0x14, 0x89, 0x0b, 0xd2, 0x0a, 0x09, 0x92, 0x13, 0x1f, - 0x17, 0xfe, 0x01, 0x84, 0xaa, 0xba, 0xfa, 0x73, 0xda, 0x99, 0x1e, 0x3b, 0x61, 0x95, 0x4d, 0x4e, - 0xae, 0x7a, 0x7e, 0xef, 0x57, 0x55, 0xef, 0xbd, 0xaa, 0x7a, 0xef, 0x55, 0x0f, 0x2c, 0x5b, 0xc4, + // 2656 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5b, 0x4f, 0x6f, 0x1c, 0x49, + 0x15, 0x9f, 0x9e, 0xb1, 0xc7, 0xf6, 0x9b, 0xf1, 0xbf, 0x8a, 0x93, 0x1d, 0x2c, 0xe4, 0x8d, 0x7a, + 0x93, 0xe0, 0x24, 0xbb, 0xe3, 0xc4, 0x76, 0x36, 0x92, 0x77, 0x81, 0xf5, 0xd8, 0x9b, 0x1d, 0x27, + 0xeb, 0x78, 0xb6, 0x13, 0x1c, 0x25, 0x98, 0x6d, 0x6a, 0xba, 0xcb, 0x9e, 0x96, 0x7b, 0xba, 0x9b, + 0xee, 0x9e, 0x71, 0xbc, 0x5f, 0x00, 0xb8, 0xa0, 0x45, 0xe2, 0x80, 0xb8, 0x20, 0x71, 0x41, 0xe2, + 0xc0, 0x07, 0x00, 0x71, 0x66, 0x05, 0x12, 0x8a, 0xc4, 0x05, 0x69, 0x85, 0x04, 0xc9, 0x89, 0x3f, + 0x17, 0xbe, 0x00, 0x42, 0x55, 0x5d, 0xfd, 0x77, 0xda, 0x99, 0x1e, 0x3b, 0x61, 0x95, 0x4d, 0x4e, + 0xae, 0x7a, 0xf3, 0xde, 0xaf, 0xaa, 0xde, 0x7b, 0x55, 0xf5, 0xde, 0xab, 0x36, 0x2c, 0x5b, 0xc4, 0xe8, 0xb4, 0x9b, 0x36, 0x5e, 0x50, 0x4c, 0x9b, 0x2c, 0xb8, 0x36, 0x36, 0x1c, 0xac, 0xb8, 0x9a, - 0x69, 0x2c, 0x74, 0xaf, 0x60, 0xdd, 0x6a, 0xe1, 0x2b, 0x51, 0x62, 0xd5, 0xb2, 0x4d, 0xd7, 0x44, - 0xa2, 0x2f, 0x55, 0xa5, 0x52, 0xd5, 0x28, 0x83, 0x2f, 0x35, 0x7b, 0x31, 0x8e, 0xac, 0xd8, 0x87, + 0x69, 0x2c, 0x74, 0xaf, 0x62, 0xdd, 0x6a, 0xe1, 0xab, 0x51, 0x62, 0xd5, 0xb2, 0x4d, 0xd7, 0x44, + 0xa2, 0x2f, 0x55, 0xa5, 0x52, 0xd5, 0x28, 0x83, 0x2f, 0x35, 0x7b, 0x29, 0x8e, 0xac, 0xd8, 0x87, 0x96, 0x6b, 0x86, 0xa0, 0x5e, 0xdf, 0xc3, 0x9b, 0x9d, 0x8f, 0xf3, 0x3a, 0x2e, 0xde, 0x27, 0x21, - 0x2b, 0xeb, 0x72, 0xce, 0xb3, 0x71, 0x4e, 0xad, 0xa9, 0x84, 0x7c, 0x5a, 0x53, 0x49, 0xe7, 0x52, + 0x2b, 0xeb, 0x72, 0xce, 0x73, 0x71, 0x4e, 0xad, 0xa9, 0x84, 0x7c, 0x5a, 0x53, 0x49, 0xe7, 0x52, 0xc9, 0xc3, 0x90, 0x4b, 0x25, 0x0f, 0x39, 0xd7, 0x62, 0x9c, 0x6b, 0xcf, 0xec, 0x12, 0xdb, 0xc0, - 0x86, 0x12, 0x19, 0x3a, 0xa4, 0x79, 0x32, 0xe2, 0x6f, 0x04, 0x28, 0xdd, 0x0d, 0x97, 0x8b, 0xde, - 0x87, 0xa1, 0xa6, 0xa9, 0x1e, 0x56, 0x84, 0x33, 0xc2, 0x7c, 0x69, 0x71, 0xa9, 0xda, 0x5f, 0x31, - 0xd5, 0x88, 0x78, 0xcd, 0x54, 0x0f, 0x25, 0x06, 0x80, 0xde, 0x80, 0x52, 0x53, 0x33, 0x54, 0xcd, - 0xd8, 0x93, 0x1d, 0x6d, 0xaf, 0x92, 0x3f, 0x23, 0xcc, 0x97, 0x25, 0xe0, 0xa4, 0x3b, 0xda, 0x1e, - 0x5a, 0x85, 0x22, 0x36, 0x94, 0x96, 0x69, 0x57, 0x0a, 0x6c, 0xac, 0x0b, 0x89, 0xb1, 0xb8, 0x42, + 0x86, 0x12, 0x19, 0x3a, 0xa4, 0x79, 0x32, 0xe2, 0x6f, 0x04, 0x28, 0xdd, 0x0d, 0x97, 0x8b, 0x3e, + 0x80, 0xa1, 0xa6, 0xa9, 0x1e, 0x56, 0x84, 0xb3, 0xc2, 0x7c, 0x69, 0x71, 0xa9, 0xda, 0x5f, 0x31, + 0xd5, 0x88, 0x78, 0xcd, 0x54, 0x0f, 0x25, 0x06, 0x80, 0x5e, 0x87, 0x52, 0x53, 0x33, 0x54, 0xcd, + 0xd8, 0x93, 0x1d, 0x6d, 0xaf, 0x92, 0x3f, 0x2b, 0xcc, 0x97, 0x25, 0xe0, 0xa4, 0x3b, 0xda, 0x1e, + 0x5a, 0x85, 0x22, 0x36, 0x94, 0x96, 0x69, 0x57, 0x0a, 0x6c, 0xac, 0x8b, 0x89, 0xb1, 0xb8, 0x42, 0x83, 0x61, 0x36, 0x89, 0xbd, 0xaf, 0x13, 0xc9, 0x34, 0x5d, 0x89, 0x0b, 0x8a, 0x15, 0xc8, 0x6f, - 0xa8, 0x08, 0xc1, 0x50, 0x0b, 0x3b, 0x2d, 0x36, 0xe5, 0xb2, 0xc4, 0xda, 0xa2, 0x08, 0xf0, 0xde, + 0xa8, 0x08, 0xc1, 0x50, 0x0b, 0x3b, 0x2d, 0x36, 0xe5, 0xb2, 0xc4, 0xda, 0xa2, 0x08, 0xf0, 0xfe, 0xee, 0x2e, 0x51, 0xdc, 0x3a, 0x76, 0x5a, 0x68, 0x06, 0x86, 0x35, 0xc3, 0x20, 0x36, 0x67, 0xf1, - 0x3a, 0xe2, 0x9f, 0xf2, 0x30, 0x99, 0x98, 0x3b, 0x5a, 0x87, 0x11, 0xaf, 0xe7, 0x54, 0x84, 0x33, - 0x85, 0xf9, 0xd2, 0xe2, 0xc5, 0x2c, 0x1a, 0x58, 0x65, 0x7d, 0xc9, 0x17, 0x45, 0x6f, 0xc2, 0x38, + 0x3a, 0xe2, 0x9f, 0xf2, 0x30, 0x99, 0x98, 0x3b, 0x5a, 0x87, 0x11, 0xaf, 0xe7, 0x54, 0x84, 0xb3, + 0x85, 0xf9, 0xd2, 0xe2, 0xa5, 0x2c, 0x1a, 0x58, 0x65, 0x7d, 0xc9, 0x17, 0x45, 0x6f, 0xc0, 0x38, 0x79, 0x68, 0x69, 0xf6, 0xa1, 0xdc, 0x22, 0xda, 0x5e, 0xcb, 0x65, 0xab, 0x1f, 0x92, 0xca, 0x1e, - 0xb1, 0xce, 0x68, 0xe8, 0x4b, 0x30, 0xaa, 0xb4, 0xb0, 0x66, 0xc8, 0x9a, 0xca, 0x34, 0x30, 0x26, + 0xb1, 0xce, 0x68, 0xe8, 0x2b, 0x30, 0xaa, 0xb4, 0xb0, 0x66, 0xc8, 0x9a, 0xca, 0x34, 0x30, 0x26, 0x8d, 0xb0, 0xfe, 0x86, 0x8a, 0x96, 0xa1, 0xb0, 0x4b, 0x48, 0x65, 0x88, 0xe9, 0x45, 0xec, 0xa3, - 0x97, 0x1b, 0x84, 0x48, 0x94, 0x1d, 0xbd, 0x0b, 0x63, 0xbb, 0x6d, 0x55, 0x56, 0xf4, 0x0e, 0x71, - 0x2a, 0xc3, 0x6c, 0xf6, 0x6f, 0xf6, 0x91, 0x5d, 0xd3, 0x3b, 0x44, 0x1a, 0xdd, 0x6d, 0xab, 0xb4, - 0xe1, 0xa0, 0x8b, 0x30, 0x41, 0x0c, 0xc6, 0x43, 0x54, 0xb9, 0x4d, 0xda, 0x66, 0xa5, 0x48, 0x15, - 0x56, 0xcf, 0x49, 0xe3, 0x01, 0x7d, 0x93, 0xb4, 0xcd, 0xef, 0x0b, 0x42, 0x6d, 0x1a, 0x26, 0xe5, + 0x97, 0x1b, 0x84, 0x48, 0x94, 0x1d, 0xbd, 0x07, 0x63, 0xbb, 0x6d, 0x55, 0x56, 0xf4, 0x0e, 0x71, + 0x2a, 0xc3, 0x6c, 0xf6, 0x6f, 0xf4, 0x91, 0x5d, 0xd3, 0x3b, 0x44, 0x1a, 0xdd, 0x6d, 0xab, 0xb4, + 0xe1, 0xa0, 0x4b, 0x30, 0x41, 0x0c, 0xc6, 0x43, 0x54, 0xb9, 0x4d, 0xda, 0x66, 0xa5, 0x48, 0x15, + 0x56, 0xcf, 0x49, 0xe3, 0x01, 0x7d, 0x93, 0xb4, 0xcd, 0x1f, 0x08, 0x42, 0x6d, 0x1a, 0x26, 0xe5, 0x38, 0xb3, 0xf8, 0xe7, 0x09, 0x28, 0x7a, 0xaa, 0x40, 0xab, 0x30, 0xec, 0x58, 0xc4, 0x50, 0xb9, - 0x1f, 0x5d, 0xc8, 0xa2, 0xc5, 0x3b, 0x54, 0xa0, 0x9e, 0x93, 0x3c, 0x49, 0xb4, 0x0e, 0x45, 0xb3, + 0x1f, 0x5d, 0xcc, 0xa2, 0xc5, 0x3b, 0x54, 0xa0, 0x9e, 0x93, 0x3c, 0x49, 0xb4, 0x0e, 0x45, 0xb3, 0xe3, 0x5a, 0x1d, 0x4f, 0x7b, 0x19, 0x2d, 0xb1, 0xc5, 0x24, 0xea, 0x39, 0x89, 0xcb, 0xa2, 0xb7, - 0x61, 0xc8, 0x39, 0xc0, 0x16, 0xf7, 0xb1, 0x33, 0x09, 0x0c, 0xba, 0x77, 0xc2, 0xf1, 0x0f, 0xb0, + 0x61, 0xc8, 0x39, 0xc0, 0x16, 0xf7, 0xb1, 0xb3, 0x09, 0x0c, 0xba, 0x77, 0xc2, 0xf1, 0x0f, 0xb0, 0x55, 0xcf, 0x49, 0x8c, 0x1f, 0xdd, 0x00, 0xa0, 0x7f, 0x65, 0x45, 0xc7, 0x5a, 0x9b, 0x5b, 0xe2, - 0x5c, 0x3f, 0xe9, 0x35, 0xca, 0x5c, 0xcf, 0x49, 0x63, 0x8e, 0xdf, 0x41, 0xbb, 0x30, 0xd3, 0xc5, + 0x7c, 0x3f, 0xe9, 0x35, 0xca, 0x5c, 0xcf, 0x49, 0x63, 0x8e, 0xdf, 0x41, 0xbb, 0x30, 0xd3, 0xc5, 0xba, 0xa6, 0x62, 0xd7, 0xb4, 0x65, 0x95, 0xec, 0x6a, 0x86, 0x46, 0x67, 0x5c, 0x99, 0x62, 0x88, - 0x57, 0x12, 0x88, 0xde, 0xc9, 0x10, 0x60, 0x6e, 0xfb, 0x92, 0xeb, 0x81, 0x60, 0x3d, 0x27, 0x9d, + 0x57, 0x13, 0x88, 0xde, 0xc9, 0x10, 0x60, 0x6e, 0xfb, 0x92, 0xeb, 0x81, 0x60, 0x3d, 0x27, 0x9d, 0xea, 0xf6, 0x92, 0xe9, 0x7c, 0xb5, 0xa6, 0x22, 0x7b, 0xfa, 0xa8, 0x4c, 0xa7, 0xce, 0x97, 0x9e, 0x27, 0x01, 0xf6, 0x46, 0x53, 0xf1, 0x6c, 0x45, 0xe7, 0xab, 0xf9, 0x1d, 0xb4, 0x03, 0x93, 0x96, 0x6d, 0x5a, 0xa6, 0x83, 0x75, 0xd9, 0xe9, 0x34, 0xdb, 0x9a, 0x5b, 0x41, 0xa9, 0x53, 0x8d, 0x9c, 0x24, 0x01, 0x66, 0x83, 0x4b, 0xde, 0x61, 0x82, 0xf5, 0x9c, 0x34, 0x61, 0xc5, 0x28, 0xa8, 0x09, 0xd3, 0x01, 0xfa, 0x81, 0xe6, 0xb6, 0x54, 0x1b, 0x1f, 0x54, 0x4e, 0xa5, 0x1e, 0x35, 0x4f, 0xc3, 0xbf, 0xc7, 0x45, 0xeb, 0x39, 0x69, 0xca, 0x4a, 0xd0, 0xd0, 0x7d, 0x98, 0x08, 0x35, 0xde, 0x35, - 0x5d, 0x52, 0x99, 0x61, 0x03, 0x5c, 0xce, 0x30, 0x40, 0xa0, 0xf0, 0x6d, 0xd3, 0x25, 0xd4, 0xed, - 0xbb, 0x51, 0x02, 0x85, 0x56, 0x89, 0x4e, 0xf6, 0x42, 0xe8, 0xd7, 0x32, 0x43, 0xaf, 0xfb, 0x82, - 0x3e, 0xb4, 0x1a, 0x25, 0x20, 0x13, 0x4e, 0x07, 0x9a, 0x51, 0x89, 0x65, 0x3a, 0x9a, 0xcb, 0x7d, - 0xef, 0x34, 0x1b, 0xe2, 0xda, 0x00, 0xea, 0x59, 0xf7, 0xe4, 0x7d, 0x6f, 0x9c, 0xb1, 0x52, 0xe8, - 0x68, 0x0b, 0xc6, 0x59, 0x4f, 0x33, 0x0d, 0xd9, 0xb4, 0x88, 0x51, 0x99, 0x63, 0xe3, 0xcc, 0x3f, - 0xcd, 0xc7, 0x1b, 0x5c, 0x60, 0xcb, 0x22, 0xd4, 0x6d, 0xca, 0x56, 0xa4, 0x8f, 0x24, 0x98, 0x08, - 0x00, 0x15, 0xdd, 0x74, 0x48, 0xe5, 0x8d, 0xd4, 0xbd, 0x9f, 0x8a, 0xb8, 0x46, 0x05, 0xa8, 0x56, - 0xac, 0x28, 0x01, 0x7d, 0x0b, 0xa6, 0x03, 0xcc, 0xc0, 0x5f, 0xce, 0x30, 0xd8, 0xaf, 0x66, 0x81, - 0x8d, 0x39, 0x4a, 0x82, 0x86, 0x08, 0xbc, 0x16, 0x80, 0xdb, 0xe4, 0x00, 0xdb, 0x2a, 0xd7, 0xb8, - 0xc8, 0x06, 0x58, 0xc8, 0x32, 0x80, 0xc4, 0xe4, 0x7c, 0x4d, 0x9f, 0xb2, 0x7a, 0xc9, 0x68, 0x1d, - 0x46, 0xb9, 0xa9, 0x49, 0x65, 0x9e, 0x21, 0x9f, 0x7f, 0xfa, 0xae, 0xe7, 0x9e, 0x42, 0xd5, 0x11, - 0x48, 0xa2, 0x9b, 0x00, 0x1d, 0x23, 0xc0, 0xb9, 0x90, 0x6a, 0xab, 0x04, 0xce, 0x37, 0x03, 0xfe, - 0x7a, 0x4e, 0x8a, 0x48, 0xa3, 0x07, 0x30, 0x15, 0xf6, 0xf8, 0x9a, 0x2f, 0x32, 0xc4, 0xb7, 0xb2, - 0x22, 0xfa, 0x2b, 0x9e, 0xec, 0xc4, 0x49, 0xe8, 0x26, 0x8c, 0xa9, 0xd8, 0x94, 0xbd, 0xc3, 0x7f, - 0x91, 0x81, 0x5e, 0xca, 0xb2, 0x3b, 0xb0, 0xe9, 0x1f, 0xff, 0xa3, 0x2a, 0x6f, 0xa3, 0x4d, 0x00, - 0x8a, 0xc5, 0x6f, 0x81, 0xa5, 0x54, 0xb3, 0x1f, 0x01, 0x16, 0xdc, 0x03, 0x74, 0x36, 0x5e, 0x07, - 0x35, 0xa0, 0x44, 0xe1, 0xf8, 0xee, 0xaa, 0x2c, 0xa7, 0xae, 0xf8, 0x08, 0x3c, 0xbe, 0x75, 0xa8, - 0x22, 0xd5, 0xa0, 0x87, 0xee, 0xc3, 0x94, 0xa6, 0x38, 0x8b, 0x97, 0x03, 0xdf, 0xc4, 0x7a, 0xe5, - 0x53, 0x21, 0x75, 0xd1, 0xf1, 0xb3, 0x97, 0x0a, 0xdd, 0x0b, 0x64, 0xa8, 0x1e, 0xb5, 0x38, 0xa9, - 0x36, 0x0a, 0x45, 0xef, 0x2c, 0x17, 0x7f, 0x5d, 0x80, 0xd3, 0x91, 0x30, 0xa5, 0x41, 0x6c, 0xc7, - 0x22, 0x8a, 0xab, 0x75, 0x09, 0x92, 0xa1, 0x6c, 0xe1, 0x43, 0xdd, 0xc4, 0xaa, 0xbc, 0x4f, 0x0e, - 0xfd, 0x90, 0xe5, 0x7a, 0x96, 0x8b, 0xb2, 0xe1, 0xc9, 0xdd, 0x22, 0x87, 0x74, 0xd0, 0x35, 0xb3, - 0xdd, 0xd6, 0xdc, 0x36, 0x31, 0x5c, 0xa9, 0x64, 0x05, 0xff, 0x71, 0xd0, 0x77, 0x60, 0x8a, 0x59, - 0x52, 0x36, 0x3a, 0xba, 0xae, 0xed, 0x6a, 0xc4, 0x76, 0x2a, 0x79, 0x36, 0xc8, 0xd5, 0x2c, 0x83, - 0xdc, 0xf6, 0xa5, 0xe8, 0x18, 0xb7, 0x4d, 0x97, 0x48, 0x93, 0x0c, 0x2e, 0xa0, 0x3b, 0xe8, 0x06, - 0x94, 0xb1, 0xda, 0xd5, 0x14, 0x22, 0x1b, 0xa6, 0x4b, 0x9c, 0x4a, 0x21, 0x53, 0xdc, 0xc2, 0xb0, - 0x4a, 0x9e, 0x20, 0x6d, 0x3b, 0xf4, 0x38, 0xc3, 0xaa, 0x6a, 0x13, 0xc7, 0x91, 0xbb, 0x1a, 0x39, - 0x70, 0x2a, 0x43, 0xa9, 0xe1, 0x5b, 0x12, 0x68, 0xd5, 0x93, 0xd9, 0xd6, 0xc8, 0x81, 0x54, 0xc6, - 0x61, 0xc7, 0x41, 0xd7, 0xa1, 0xa8, 0x12, 0xc3, 0x6c, 0xfb, 0xa1, 0xd4, 0xd9, 0x3e, 0x48, 0xeb, - 0x94, 0x59, 0xe2, 0x32, 0x34, 0xfe, 0x0c, 0x35, 0x7c, 0x44, 0xfc, 0xf9, 0x5b, 0x01, 0x2a, 0x47, - 0x99, 0x01, 0x6d, 0x41, 0x29, 0x62, 0x5a, 0x1e, 0x46, 0x55, 0x07, 0xb3, 0xac, 0x04, 0xa1, 0x2d, - 0xd1, 0x6d, 0x00, 0x25, 0x80, 0xe7, 0x21, 0x55, 0xb5, 0xcf, 0x9a, 0xee, 0xb8, 0x74, 0x5f, 0x87, - 0xbe, 0x11, 0x41, 0x10, 0x7f, 0x2c, 0xc0, 0x74, 0x8f, 0x7d, 0xd1, 0x0d, 0x18, 0x0b, 0x5c, 0x85, - 0x4f, 0x7a, 0xbe, 0x9f, 0x2d, 0x7d, 0x7e, 0x29, 0x14, 0x45, 0xd7, 0x60, 0x88, 0xfa, 0x03, 0x9f, - 0x67, 0x26, 0x77, 0x60, 0x02, 0xe2, 0x1f, 0x85, 0x58, 0x50, 0x4f, 0x6d, 0x89, 0xee, 0xc2, 0x18, - 0x4d, 0x49, 0x98, 0x63, 0xf0, 0x49, 0x5d, 0x3b, 0x46, 0x62, 0xc3, 0x9c, 0x64, 0xb4, 0xc9, 0x5b, - 0xff, 0x97, 0x04, 0xe7, 0xbf, 0x79, 0x38, 0x95, 0x32, 0x0b, 0xf4, 0x21, 0x94, 0x3d, 0x0a, 0x77, - 0x76, 0x6f, 0xe3, 0x57, 0xb3, 0xe7, 0x2a, 0x6c, 0x2d, 0xa5, 0x50, 0x47, 0x2f, 0x6e, 0xce, 0x72, - 0x1b, 0xc6, 0x68, 0xf2, 0xe1, 0x19, 0xb7, 0x98, 0x7a, 0x47, 0xa4, 0xea, 0x81, 0xe6, 0x31, 0x74, - 0xe5, 0xf4, 0xc6, 0x69, 0xf3, 0x36, 0xcd, 0x6b, 0xca, 0x00, 0x72, 0x00, 0x28, 0xfe, 0x67, 0x02, - 0x20, 0xd4, 0x18, 0x7a, 0x2f, 0x9e, 0xd6, 0xbc, 0x95, 0x39, 0xad, 0xe1, 0x23, 0xf1, 0xd4, 0xa6, - 0x9e, 0x48, 0x6d, 0xaa, 0xd9, 0x53, 0x1b, 0x0e, 0xe4, 0xa7, 0x37, 0x2b, 0xb1, 0xf4, 0xe6, 0x6c, - 0xbf, 0x04, 0x85, 0x4b, 0x7b, 0x29, 0xce, 0xcd, 0x94, 0x14, 0xe7, 0x42, 0xa6, 0x14, 0x87, 0xc3, - 0xbc, 0x4a, 0x73, 0xbe, 0x98, 0x69, 0xce, 0x47, 0x47, 0xa4, 0x39, 0x99, 0xee, 0xfc, 0x58, 0x9e, - 0xc3, 0x1d, 0xe5, 0x55, 0xae, 0xf3, 0x12, 0xe6, 0x3a, 0x17, 0x9e, 0x51, 0xae, 0x73, 0xf1, 0x44, - 0xb9, 0xce, 0x4b, 0x95, 0x8f, 0xa4, 0x25, 0x76, 0x97, 0x9e, 0x51, 0x62, 0xf7, 0x1c, 0x73, 0x9d, - 0x71, 0x28, 0x45, 0xa2, 0x19, 0xf1, 0x47, 0x05, 0x18, 0x0b, 0x2e, 0x4d, 0xf4, 0x21, 0x8c, 0x74, - 0x35, 0x47, 0x6b, 0xea, 0x84, 0x5f, 0xba, 0x57, 0x07, 0xba, 0x74, 0xab, 0xdb, 0x9e, 0x70, 0x3d, - 0x27, 0xf9, 0x38, 0xe8, 0x36, 0x14, 0x4d, 0x0b, 0x7f, 0xb7, 0xe3, 0x87, 0x97, 0xcb, 0x83, 0x21, - 0x6e, 0x31, 0x59, 0x76, 0x09, 0xb3, 0xd6, 0xec, 0xf7, 0x04, 0x18, 0xe1, 0xc3, 0xa0, 0x6f, 0x1c, - 0xb7, 0xf0, 0xe9, 0xc7, 0x06, 0xef, 0xc4, 0x22, 0xdf, 0xaf, 0x64, 0x88, 0x7c, 0x59, 0x2c, 0xc7, - 0x84, 0x66, 0x37, 0xa0, 0xe8, 0xcd, 0xee, 0xc4, 0xf3, 0xa0, 0x71, 0x90, 0x97, 0xfa, 0x31, 0x9b, - 0xfc, 0xb5, 0x00, 0xd3, 0x3d, 0x27, 0x3b, 0xba, 0x9f, 0xb4, 0xcd, 0xd7, 0x8e, 0x75, 0x43, 0xa4, - 0xd9, 0x68, 0x3b, 0x61, 0xa3, 0xeb, 0xc7, 0x43, 0xee, 0xb1, 0xd5, 0xcf, 0x22, 0xb6, 0xba, 0xd7, - 0x73, 0xcf, 0x09, 0xc7, 0x2b, 0xe7, 0x25, 0x2f, 0xb8, 0x13, 0xd9, 0x10, 0x07, 0x36, 0x7c, 0x5e, - 0xf3, 0xab, 0x4d, 0x25, 0x81, 0xc5, 0x7f, 0x17, 0x00, 0xc2, 0x00, 0x13, 0x49, 0x49, 0xc3, 0xbe, - 0x3d, 0x58, 0x84, 0x9a, 0x66, 0xd1, 0xad, 0x84, 0x45, 0xaf, 0x0e, 0x08, 0xd9, 0x63, 0xca, 0xcf, - 0x22, 0xa6, 0xac, 0x05, 0x11, 0xb5, 0x30, 0xe8, 0x63, 0x41, 0x10, 0x4b, 0x9f, 0xc4, 0x6a, 0xc9, - 0x7c, 0xbd, 0x70, 0xd2, 0x7c, 0x7d, 0xf6, 0x83, 0xc0, 0x0d, 0x9e, 0xc1, 0xda, 0xe8, 0x11, 0xeb, - 0xb5, 0xbc, 0xed, 0xfc, 0x99, 0x00, 0xc3, 0xde, 0x9d, 0xb6, 0x1a, 0x7b, 0xef, 0xcb, 0x9e, 0xd0, - 0x44, 0x5e, 0xfa, 0x3e, 0x80, 0x51, 0xdc, 0x71, 0x5b, 0x41, 0x16, 0xdc, 0x1b, 0x44, 0xf7, 0xd4, - 0x15, 0x28, 0xc2, 0x6a, 0xc7, 0x6d, 0xdd, 0xd1, 0xf6, 0x0c, 0xec, 0x76, 0x6c, 0x22, 0x8d, 0x60, - 0xaf, 0x8b, 0x56, 0x61, 0xd8, 0xb2, 0x4d, 0x73, 0x97, 0xab, 0xf0, 0x52, 0x1f, 0xa8, 0x07, 0xb7, - 0x18, 0x58, 0x83, 0x8a, 0x48, 0x9e, 0xa4, 0xf8, 0x53, 0x81, 0x5f, 0x20, 0xec, 0x49, 0x4f, 0x06, - 0xd4, 0xc4, 0x3a, 0xdd, 0x1d, 0x72, 0xa4, 0x00, 0x92, 0xbe, 0x93, 0x92, 0xe8, 0x35, 0x4f, 0x30, - 0x52, 0x02, 0x99, 0x6e, 0x26, 0x49, 0xe8, 0xcb, 0xd1, 0x9a, 0x47, 0x81, 0x95, 0x01, 0x22, 0x95, - 0x8c, 0x09, 0xc8, 0xdb, 0xfb, 0x2c, 0xbb, 0x2a, 0x4b, 0x79, 0x7b, 0x5f, 0xfc, 0x44, 0x80, 0x22, - 0x0f, 0x00, 0x6a, 0x31, 0xdd, 0x0f, 0x90, 0x04, 0x46, 0x94, 0x5f, 0xf3, 0xd5, 0x95, 0x4f, 0x0d, - 0x47, 0x7a, 0xd5, 0xe5, 0x21, 0xc4, 0xf4, 0xf5, 0xc3, 0xbc, 0xbf, 0xf9, 0x99, 0xc2, 0x36, 0xa1, - 0x4c, 0x5d, 0x5a, 0xe6, 0xce, 0x78, 0x84, 0xd7, 0xa5, 0xed, 0x07, 0xee, 0xca, 0x52, 0xc9, 0x08, - 0x3b, 0x47, 0xe8, 0x3f, 0xff, 0xec, 0xf4, 0x3f, 0x0f, 0x53, 0x07, 0x36, 0xb6, 0x2c, 0xfe, 0x0c, - 0x19, 0xec, 0xbf, 0xb2, 0x34, 0xc1, 0xe9, 0x34, 0xd7, 0xbf, 0x45, 0x0e, 0xd1, 0x79, 0x98, 0x34, - 0xbb, 0xfb, 0xb2, 0xcf, 0x4d, 0x19, 0x3d, 0xc3, 0x8c, 0x9b, 0xdd, 0xfd, 0x7b, 0x1e, 0xf5, 0x16, - 0x39, 0x14, 0x7f, 0x92, 0x87, 0x69, 0xea, 0x9e, 0xa6, 0xad, 0x7d, 0x8c, 0xa9, 0x01, 0xd6, 0xb1, - 0x8b, 0xd1, 0x4d, 0x28, 0x11, 0xf6, 0xa6, 0x2c, 0x07, 0xcf, 0xcd, 0xfd, 0x8b, 0x3a, 0xe1, 0x2b, - 0xb4, 0x04, 0x24, 0x7c, 0x91, 0x96, 0xa0, 0xe4, 0xdd, 0xae, 0xd4, 0xed, 0xfd, 0x9a, 0xea, 0x31, - 0xb6, 0x8d, 0x77, 0x47, 0x53, 0x9a, 0x83, 0x14, 0x98, 0x89, 0x9f, 0xea, 0x1c, 0xbc, 0x70, 0x5c, - 0x70, 0x14, 0xbb, 0x35, 0xd8, 0x20, 0xe2, 0xef, 0x04, 0x28, 0xdd, 0xd3, 0x5c, 0x83, 0x38, 0x0e, - 0x53, 0x4a, 0x58, 0xe4, 0x12, 0x8e, 0x59, 0xe4, 0x42, 0xfb, 0xf0, 0xba, 0xe3, 0xb2, 0x80, 0x35, - 0xb0, 0xa9, 0xcc, 0x1c, 0xd3, 0xd7, 0xcb, 0xd2, 0x60, 0x65, 0x4a, 0xcf, 0xb7, 0x5f, 0x73, 0x52, - 0xa8, 0x8e, 0xf8, 0x8f, 0xf8, 0xa3, 0x7f, 0x43, 0xc7, 0x06, 0xaa, 0x27, 0x1f, 0xfd, 0x07, 0x28, - 0xa4, 0x51, 0x80, 0xcf, 0xfb, 0xe1, 0xff, 0x16, 0x80, 0xa2, 0x77, 0x88, 0x6c, 0xe9, 0xd8, 0xf0, - 0xab, 0x68, 0x99, 0x6a, 0x60, 0x6b, 0x7a, 0x87, 0xb0, 0x05, 0x8c, 0x29, 0xbc, 0xe5, 0xa0, 0x0d, - 0x5e, 0x4f, 0xa3, 0x60, 0x83, 0xd6, 0xd3, 0x18, 0x16, 0xab, 0xa6, 0xd1, 0x96, 0xf8, 0xaf, 0xa0, - 0x78, 0xc6, 0xd4, 0x7c, 0xec, 0xe2, 0x19, 0x95, 0x7e, 0x26, 0xc5, 0x33, 0x0e, 0x74, 0xcc, 0xe2, - 0x19, 0x97, 0x3e, 0x69, 0xf1, 0x8c, 0xc3, 0xbc, 0x2a, 0x9e, 0x7d, 0x31, 0x8b, 0x67, 0xdf, 0x3e, - 0xa2, 0x78, 0xb6, 0x3c, 0x68, 0xd0, 0xce, 0xfd, 0xe4, 0xf3, 0xae, 0x9d, 0x6d, 0x02, 0x44, 0x32, - 0xfe, 0xd7, 0x8f, 0x93, 0xf0, 0x47, 0x00, 0x5e, 0x8c, 0x52, 0x9c, 0x7c, 0x74, 0x29, 0xee, 0xf2, - 0x20, 0xa5, 0x38, 0x6e, 0xc2, 0xde, 0x72, 0x9c, 0xf6, 0xf4, 0x72, 0xdc, 0xd2, 0x80, 0xe5, 0x38, - 0x3e, 0xce, 0x0b, 0xf2, 0xf9, 0xc1, 0x47, 0x47, 0x7e, 0x7e, 0x70, 0x65, 0xa0, 0x2a, 0x15, 0x5f, - 0xf5, 0x4b, 0xfd, 0x09, 0x42, 0xe4, 0x3b, 0x81, 0x1f, 0x08, 0x30, 0xea, 0x5f, 0xe8, 0xe8, 0x5d, - 0x18, 0xe1, 0xaf, 0xd9, 0xfc, 0xb6, 0x3d, 0x9f, 0xed, 0x21, 0x5c, 0xf2, 0xc5, 0xd0, 0x0c, 0x0c, - 0xdb, 0x0e, 0x21, 0x2a, 0x7f, 0xd8, 0xf4, 0x3a, 0xe8, 0x1c, 0x4c, 0x58, 0x36, 0x51, 0x34, 0x87, - 0x7a, 0x6e, 0x53, 0x73, 0x1d, 0x76, 0x79, 0x0e, 0x49, 0xe3, 0x01, 0xb5, 0xa6, 0xb9, 0x8e, 0xd8, - 0x86, 0x51, 0x3f, 0x1e, 0x40, 0x5b, 0x30, 0x66, 0xe9, 0x58, 0x33, 0x5c, 0xf2, 0xd0, 0x4f, 0xbb, - 0xae, 0x0c, 0x10, 0x50, 0x78, 0x82, 0x52, 0x88, 0x81, 0xa6, 0xa0, 0x40, 0x23, 0x77, 0x6f, 0x5e, - 0xb4, 0x29, 0x9e, 0x87, 0x09, 0xca, 0xbd, 0xa6, 0x59, 0x2d, 0x62, 0x33, 0x9e, 0xf4, 0x17, 0x77, - 0x05, 0xc6, 0x63, 0xa8, 0xe8, 0xeb, 0x50, 0x74, 0x88, 0xa1, 0x06, 0x6f, 0xd5, 0x59, 0xb5, 0xc4, - 0xa5, 0x10, 0x82, 0x21, 0xb6, 0xac, 0x3c, 0x0b, 0xe3, 0x58, 0x5b, 0xfc, 0x7d, 0xc1, 0x5b, 0x3c, - 0x2b, 0xa4, 0x34, 0x92, 0x85, 0x94, 0xe5, 0x41, 0xde, 0x26, 0xd3, 0xca, 0x28, 0x9b, 0x89, 0x32, - 0xca, 0xd2, 0x40, 0x80, 0x3d, 0x45, 0x94, 0x5f, 0x45, 0x8a, 0x28, 0x12, 0x80, 0x12, 0xa8, 0x90, - 0xcf, 0x77, 0x31, 0x2b, 0x7c, 0xa8, 0x7c, 0x29, 0x82, 0x12, 0xb7, 0x7e, 0xfe, 0xe4, 0xd6, 0x9f, - 0xdd, 0x09, 0xea, 0x22, 0xcf, 0x61, 0xba, 0xb5, 0x52, 0xe4, 0x35, 0x59, 0xfc, 0x85, 0x5f, 0x47, - 0x60, 0x7e, 0xec, 0x7f, 0x92, 0x20, 0x0c, 0xf8, 0x49, 0x02, 0x9a, 0x85, 0x51, 0xff, 0x60, 0xe6, - 0xf9, 0x40, 0xd0, 0x47, 0x73, 0x00, 0x36, 0x36, 0x54, 0xb3, 0xad, 0x7d, 0x1c, 0x14, 0x0f, 0x22, - 0x14, 0xba, 0xdf, 0xba, 0x98, 0xc6, 0xf6, 0x4d, 0xdd, 0xfb, 0xb0, 0xc0, 0x4f, 0x58, 0x19, 0xb5, - 0xc6, 0x89, 0xe2, 0x23, 0xc1, 0xcf, 0xe0, 0xd9, 0x54, 0x57, 0x60, 0x98, 0xfd, 0x9f, 0xcf, 0xb5, - 0xdf, 0xa7, 0x2b, 0xdb, 0x94, 0x57, 0xf2, 0x44, 0xd0, 0x06, 0x94, 0x55, 0xe2, 0xb8, 0xb2, 0x7f, - 0x7c, 0xe4, 0x07, 0xda, 0x18, 0x25, 0x2a, 0xbb, 0x9a, 0x3c, 0x42, 0x0a, 0x89, 0x23, 0x24, 0xc3, - 0x92, 0x6a, 0x7f, 0xcf, 0x7f, 0xfa, 0x78, 0x4e, 0x78, 0xf4, 0x78, 0x4e, 0xf8, 0xdb, 0xe3, 0x39, - 0xe1, 0x93, 0x27, 0x73, 0xb9, 0x47, 0x4f, 0xe6, 0x72, 0x7f, 0x79, 0x32, 0x97, 0x83, 0xf3, 0x8a, - 0xd9, 0xce, 0x60, 0xe7, 0xda, 0x54, 0x34, 0xd1, 0xb3, 0x4d, 0xd7, 0x6c, 0x08, 0x0f, 0x9a, 0x7b, - 0x9a, 0xdb, 0xea, 0x34, 0xab, 0x8a, 0xd9, 0x5e, 0x50, 0x4c, 0xa7, 0x6d, 0x3a, 0x0b, 0x36, 0xd1, - 0xf1, 0x21, 0xb1, 0x17, 0xba, 0x8b, 0x41, 0x93, 0xe5, 0x63, 0xce, 0x42, 0xff, 0xdf, 0x12, 0xbc, - 0x13, 0x21, 0xfa, 0xb4, 0x9f, 0xe7, 0x0b, 0x8d, 0xb5, 0xbb, 0xbf, 0xcc, 0x8b, 0x0d, 0x7f, 0x8a, - 0x6b, 0x74, 0x8a, 0x91, 0xc9, 0x54, 0xb7, 0x39, 0xeb, 0x1f, 0x42, 0xa6, 0x1d, 0xca, 0xb4, 0x13, - 0x61, 0xda, 0xf1, 0x99, 0x1e, 0xe7, 0xab, 0xfd, 0x99, 0x76, 0xde, 0x6f, 0xd4, 0x36, 0x89, 0x8b, - 0x55, 0xec, 0xe2, 0x7f, 0xe6, 0xcf, 0xf9, 0x02, 0x2b, 0x2b, 0x54, 0x62, 0x65, 0x25, 0x22, 0xb2, - 0xb2, 0xe2, 0xcb, 0x34, 0x8b, 0xec, 0x37, 0x00, 0x4b, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0xa7, - 0x60, 0xeb, 0xa7, 0x35, 0x31, 0x00, 0x00, + 0x5d, 0x52, 0x99, 0x61, 0x03, 0x5c, 0xc9, 0x30, 0x40, 0xa0, 0xf0, 0x6d, 0xd3, 0x25, 0xd4, 0xed, + 0xbb, 0x51, 0x02, 0x85, 0x56, 0x89, 0x4e, 0xf6, 0x42, 0xe8, 0xd3, 0x99, 0xa1, 0xd7, 0x7d, 0x41, + 0x1f, 0x5a, 0x8d, 0x12, 0x90, 0x09, 0x67, 0x02, 0xcd, 0xa8, 0xc4, 0x32, 0x1d, 0xcd, 0xe5, 0xbe, + 0x77, 0x86, 0x0d, 0x71, 0x7d, 0x00, 0xf5, 0xac, 0x7b, 0xf2, 0xbe, 0x37, 0xce, 0x58, 0x29, 0x74, + 0xb4, 0x05, 0xe3, 0xac, 0xa7, 0x99, 0x86, 0x6c, 0x5a, 0xc4, 0xa8, 0xcc, 0xb1, 0x71, 0xe6, 0x9f, + 0xe6, 0xe3, 0x0d, 0x2e, 0xb0, 0x65, 0x11, 0xea, 0x36, 0x65, 0x2b, 0xd2, 0x47, 0x12, 0x4c, 0x04, + 0x80, 0x8a, 0x6e, 0x3a, 0xa4, 0xf2, 0x7a, 0xea, 0xde, 0x4f, 0x45, 0x5c, 0xa3, 0x02, 0x54, 0x2b, + 0x56, 0x94, 0x80, 0xbe, 0x0d, 0xd3, 0x01, 0x66, 0xe0, 0x2f, 0x67, 0x19, 0xec, 0x9b, 0x59, 0x60, + 0x63, 0x8e, 0x92, 0xa0, 0x21, 0x02, 0xa7, 0x03, 0x70, 0x9b, 0x1c, 0x60, 0x5b, 0xe5, 0x1a, 0x17, + 0xd9, 0x00, 0x0b, 0x59, 0x06, 0x90, 0x98, 0x9c, 0xaf, 0xe9, 0x53, 0x56, 0x2f, 0x19, 0xad, 0xc3, + 0x28, 0x37, 0x35, 0xa9, 0xcc, 0x33, 0xe4, 0x0b, 0x4f, 0xdf, 0xf5, 0xdc, 0x53, 0xa8, 0x3a, 0x02, + 0x49, 0x74, 0x13, 0xa0, 0x63, 0x04, 0x38, 0x17, 0x53, 0x6d, 0x95, 0xc0, 0xf9, 0x56, 0xc0, 0x5f, + 0xcf, 0x49, 0x11, 0x69, 0xf4, 0x00, 0xa6, 0xc2, 0x1e, 0x5f, 0xf3, 0x25, 0x86, 0xf8, 0x56, 0x56, + 0x44, 0x7f, 0xc5, 0x93, 0x9d, 0x38, 0x09, 0xdd, 0x84, 0x31, 0x15, 0x9b, 0xb2, 0x77, 0xf8, 0x2f, + 0x32, 0xd0, 0xcb, 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, 0x7d, 0x98, 0xd2, 0x14, 0x67, 0xf1, 0x4a, 0xe0, 0x9b, 0x58, 0xaf, 0x7c, + 0x26, 0xa4, 0x2e, 0x3a, 0x7e, 0xf6, 0x52, 0xa1, 0x7b, 0x81, 0x0c, 0xd5, 0xa3, 0x16, 0x27, 0xd5, + 0x46, 0xa1, 0xe8, 0x9d, 0xe5, 0xe2, 0x0f, 0x87, 0xe0, 0x4c, 0x24, 0x4c, 0x69, 0x10, 0xdb, 0xb1, + 0x88, 0xe2, 0x6a, 0x5d, 0x82, 0x64, 0x28, 0x5b, 0xf8, 0x50, 0x37, 0xb1, 0x2a, 0xef, 0x93, 0x43, + 0x3f, 0x64, 0x79, 0x37, 0xcb, 0x45, 0xd9, 0xf0, 0xe4, 0x6e, 0x91, 0x43, 0x3a, 0xe8, 0x9a, 0xd9, + 0x6e, 0x6b, 0x6e, 0x9b, 0x18, 0xae, 0x54, 0xb2, 0x82, 0x5f, 0x1c, 0xf4, 0x5d, 0x98, 0x62, 0x96, + 0x94, 0x8d, 0x8e, 0xae, 0x6b, 0xbb, 0x1a, 0xb1, 0x9d, 0x4a, 0x9e, 0x0d, 0x72, 0x2d, 0xcb, 0x20, + 0xb7, 0x7d, 0x29, 0x3a, 0xc6, 0x6d, 0xd3, 0x25, 0xd2, 0x24, 0x83, 0x0b, 0xe8, 0x0e, 0xba, 0x01, + 0x65, 0xac, 0x76, 0x35, 0x85, 0xc8, 0x86, 0xe9, 0x12, 0xa7, 0x52, 0xc8, 0x14, 0xb7, 0x30, 0xac, + 0x92, 0x27, 0x48, 0xdb, 0x0e, 0x3d, 0xce, 0xb0, 0xaa, 0xda, 0xc4, 0x71, 0xe4, 0xae, 0x46, 0x0e, + 0x9c, 0xca, 0x50, 0x6a, 0xf8, 0x96, 0x04, 0x5a, 0xf5, 0x64, 0xb6, 0x35, 0x72, 0x20, 0x95, 0x71, + 0xd8, 0x71, 0x68, 0xf8, 0xa1, 0x12, 0xc3, 0x6c, 0xfb, 0xa1, 0xd4, 0x9b, 0x7d, 0x90, 0xd6, 0x29, + 0xf3, 0x26, 0x71, 0xb1, 0x8a, 0x5d, 0x2c, 0x71, 0x59, 0xb4, 0x09, 0x13, 0x11, 0xcd, 0xd0, 0x50, + 0xaf, 0x98, 0x7a, 0x04, 0xa4, 0xaa, 0x6f, 0x43, 0x95, 0xc6, 0x23, 0x3f, 0x6c, 0xa8, 0x34, 0xac, + 0x0d, 0x0d, 0x77, 0x44, 0x58, 0xfb, 0x5b, 0x01, 0x2a, 0x47, 0x59, 0x17, 0x6d, 0x41, 0x29, 0xe2, + 0x31, 0x3c, 0x3a, 0xab, 0x0e, 0xe6, 0x30, 0x12, 0x84, 0x2e, 0x82, 0x6e, 0x03, 0x28, 0x01, 0x3c, + 0x8f, 0xd4, 0xaa, 0x7d, 0x54, 0x75, 0xc7, 0xa5, 0xc7, 0x45, 0xe8, 0x72, 0x11, 0x04, 0xf1, 0x27, + 0x02, 0x4c, 0xf7, 0xb8, 0x0d, 0xba, 0x01, 0x63, 0x81, 0x07, 0xf2, 0x49, 0xcf, 0xf7, 0x73, 0x11, + 0x9f, 0x5f, 0x0a, 0x45, 0xd1, 0x75, 0x18, 0xa2, 0x6e, 0xc6, 0xe7, 0x99, 0xc9, 0xcb, 0x98, 0x80, + 0xf8, 0x47, 0x21, 0x96, 0x2b, 0x50, 0x17, 0x41, 0x77, 0x61, 0x8c, 0x66, 0x3a, 0xcc, 0xdf, 0xf8, + 0xa4, 0xae, 0x1f, 0x23, 0x5f, 0x62, 0xbe, 0x37, 0xda, 0xe4, 0xad, 0xff, 0x4b, 0xde, 0xf4, 0xdf, + 0x3c, 0x9c, 0x4a, 0x99, 0x05, 0xfa, 0x08, 0xca, 0xdc, 0x51, 0xbd, 0x3d, 0xe4, 0x9d, 0x27, 0xd5, + 0xec, 0x29, 0x10, 0x5b, 0x4b, 0x29, 0xd4, 0xd1, 0x8b, 0x9b, 0x0a, 0xdd, 0x86, 0x31, 0x9a, 0xd3, + 0x78, 0xc6, 0x2d, 0xa6, 0x5e, 0x3d, 0xa9, 0x7a, 0xa0, 0xe9, 0x11, 0x5d, 0x39, 0xbd, 0xc8, 0xda, + 0xbc, 0x4d, 0xd3, 0xa5, 0x32, 0x80, 0x1c, 0x00, 0x8a, 0xff, 0x99, 0x00, 0x08, 0x35, 0x86, 0xde, + 0x8f, 0x67, 0x4b, 0x6f, 0x65, 0xce, 0x96, 0xf8, 0x48, 0x3c, 0x63, 0xaa, 0x27, 0x32, 0xa6, 0x6a, + 0xf6, 0x8c, 0x89, 0x03, 0xf9, 0x59, 0xd3, 0x4a, 0x2c, 0x6b, 0x3a, 0xd7, 0x2f, 0xef, 0xe1, 0xd2, + 0x5e, 0xe6, 0x74, 0x33, 0x25, 0x73, 0xba, 0x98, 0x29, 0x73, 0xe2, 0x30, 0xaf, 0xb2, 0xa7, 0x2f, + 0x67, 0xf6, 0xf4, 0xf1, 0x11, 0xd9, 0x53, 0xa6, 0x50, 0x22, 0x96, 0x3e, 0x71, 0x47, 0x79, 0x95, + 0x42, 0xbd, 0x84, 0x29, 0xd4, 0xc5, 0x67, 0x94, 0x42, 0x5d, 0x3a, 0x51, 0x0a, 0xf5, 0x52, 0xa5, + 0x39, 0x69, 0xf9, 0xe2, 0xe5, 0x67, 0x94, 0x2f, 0x3e, 0xc7, 0x14, 0x6a, 0x1c, 0x4a, 0x91, 0x68, + 0x46, 0xfc, 0x71, 0x01, 0xc6, 0x82, 0x4b, 0x13, 0x7d, 0x04, 0x23, 0x5d, 0xcd, 0xd1, 0x9a, 0x3a, + 0xe1, 0x97, 0xee, 0xb5, 0x81, 0x2e, 0xdd, 0xea, 0xb6, 0x27, 0x5c, 0xcf, 0x49, 0x3e, 0x0e, 0xba, + 0x0d, 0x45, 0xd3, 0xc2, 0xdf, 0xeb, 0xf8, 0xe1, 0xe5, 0xf2, 0x60, 0x88, 0x5b, 0x4c, 0x96, 0x5d, + 0xc2, 0xac, 0x35, 0xfb, 0x7d, 0x01, 0x46, 0xf8, 0x30, 0xe8, 0x9b, 0xc7, 0xad, 0xa7, 0xfa, 0xb1, + 0xc1, 0x3b, 0xb1, 0xc8, 0xf7, 0x6b, 0x19, 0x22, 0x5f, 0x16, 0xcb, 0x31, 0xa1, 0xd9, 0x0d, 0x28, + 0x7a, 0xb3, 0x3b, 0xf1, 0x3c, 0x68, 0x1c, 0xe4, 0x65, 0x94, 0xcc, 0x26, 0x7f, 0x2d, 0xc0, 0x74, + 0xcf, 0xc9, 0x8e, 0xee, 0x27, 0x6d, 0xf3, 0xf5, 0x63, 0xdd, 0x10, 0x69, 0x36, 0xda, 0x4e, 0xd8, + 0xe8, 0xdd, 0xe3, 0x21, 0xf7, 0xd8, 0xea, 0xe7, 0x11, 0x5b, 0xdd, 0xeb, 0xb9, 0xe7, 0x84, 0xe3, + 0x55, 0x09, 0x93, 0x17, 0xdc, 0x89, 0x6c, 0x88, 0x03, 0x1b, 0x3e, 0xaf, 0xf9, 0xd5, 0xa6, 0x92, + 0xc0, 0xe2, 0xbf, 0x0b, 0x00, 0x61, 0x80, 0x89, 0xa4, 0xa4, 0x61, 0xdf, 0x1e, 0x2c, 0x42, 0x4d, + 0xb3, 0xe8, 0x56, 0xc2, 0xa2, 0xd7, 0x06, 0x84, 0xec, 0x31, 0xe5, 0xe7, 0x11, 0x53, 0xd6, 0x82, + 0x88, 0x5a, 0x18, 0xf4, 0x0d, 0x22, 0x88, 0xa5, 0x4f, 0x62, 0xb5, 0x64, 0xbe, 0x5e, 0x38, 0x69, + 0xbe, 0x3e, 0xfb, 0x61, 0xe0, 0x06, 0xcf, 0x60, 0x6d, 0xf4, 0x88, 0xf5, 0x5a, 0xde, 0x76, 0xfe, + 0x5c, 0x80, 0x61, 0xef, 0x4e, 0x5b, 0x8d, 0x3d, 0x23, 0x66, 0x4f, 0x68, 0x22, 0x0f, 0x88, 0x1f, + 0xc2, 0x28, 0xee, 0xb8, 0xad, 0x20, 0x0b, 0xee, 0x0d, 0xa2, 0x7b, 0xea, 0x0a, 0x14, 0x61, 0xb5, + 0xe3, 0xb6, 0xee, 0x68, 0x7b, 0x06, 0x76, 0x3b, 0x36, 0x91, 0x46, 0xb0, 0xd7, 0x45, 0xab, 0x30, + 0x6c, 0xd9, 0xa6, 0xb9, 0xcb, 0x55, 0x78, 0xb9, 0x0f, 0xd4, 0x83, 0x5b, 0x0c, 0xac, 0x41, 0x45, + 0x24, 0x4f, 0x52, 0xfc, 0x99, 0xc0, 0x2f, 0x10, 0xf6, 0x52, 0x28, 0x03, 0x6a, 0x62, 0x9d, 0xee, + 0x0e, 0x39, 0x52, 0x00, 0x49, 0xdf, 0x49, 0x49, 0xf4, 0x9a, 0x27, 0x18, 0x29, 0x81, 0x4c, 0x37, + 0x93, 0x24, 0xf4, 0xd5, 0x68, 0xcd, 0xa3, 0xc0, 0xca, 0x00, 0x91, 0x4a, 0xc6, 0x04, 0xe4, 0xed, + 0x7d, 0x96, 0x5d, 0x95, 0xa5, 0xbc, 0xbd, 0x2f, 0x7e, 0x2a, 0x40, 0x91, 0x07, 0x00, 0xb5, 0x98, + 0xee, 0x07, 0x48, 0x02, 0x23, 0xca, 0xaf, 0xf9, 0xea, 0xca, 0xa7, 0x86, 0x23, 0xbd, 0xea, 0xf2, + 0x10, 0x62, 0xfa, 0xfa, 0x51, 0xde, 0xdf, 0xfc, 0x4c, 0x61, 0x9b, 0x50, 0xa6, 0x2e, 0x2d, 0x73, + 0x67, 0x3c, 0xc2, 0xeb, 0xd2, 0xf6, 0x03, 0x77, 0x65, 0xa9, 0x64, 0x84, 0x9d, 0x23, 0xf4, 0x9f, + 0x7f, 0x76, 0xfa, 0x9f, 0x87, 0xa9, 0x03, 0x1b, 0x5b, 0x16, 0x7f, 0xdd, 0x0c, 0xf6, 0x5f, 0x59, + 0x9a, 0xe0, 0x74, 0x9a, 0xeb, 0xdf, 0x22, 0x87, 0xe8, 0x02, 0x4c, 0x9a, 0xdd, 0x7d, 0xd9, 0xe7, + 0xa6, 0x8c, 0x9e, 0x61, 0xc6, 0xcd, 0xee, 0xfe, 0x3d, 0x8f, 0x7a, 0x8b, 0x1c, 0x8a, 0x3f, 0xcd, + 0xc3, 0x34, 0x75, 0x4f, 0xd3, 0xd6, 0x3e, 0xc1, 0xd4, 0x00, 0xeb, 0xd8, 0xc5, 0xe8, 0x26, 0x94, + 0x08, 0x7b, 0xaa, 0x96, 0x83, 0x57, 0xec, 0xfe, 0x45, 0x9d, 0xf0, 0x71, 0x5b, 0x02, 0x12, 0x3e, + 0x74, 0x4b, 0x50, 0xf2, 0x6e, 0x57, 0xea, 0xf6, 0x7e, 0xa9, 0xf6, 0x18, 0xdb, 0xc6, 0xbb, 0xa3, + 0x29, 0xcd, 0x41, 0x0a, 0xcc, 0xc4, 0x4f, 0x75, 0x0e, 0x5e, 0x38, 0x2e, 0x38, 0x8a, 0xdd, 0x1a, + 0x6c, 0x10, 0xf1, 0x77, 0x02, 0x94, 0xee, 0x69, 0xae, 0x41, 0x1c, 0x87, 0x29, 0x25, 0x2c, 0x72, + 0x09, 0xc7, 0x2c, 0x72, 0xa1, 0x7d, 0x78, 0xcd, 0x71, 0x59, 0xc0, 0x1a, 0xd8, 0x54, 0x66, 0x8e, + 0xe9, 0xeb, 0x65, 0x69, 0xb0, 0x32, 0xa5, 0xe7, 0xdb, 0xa7, 0x9d, 0x14, 0xaa, 0x23, 0xfe, 0x23, + 0xfe, 0x2d, 0x41, 0x43, 0xc7, 0x06, 0xaa, 0x27, 0xbf, 0x25, 0x18, 0xa0, 0x90, 0x46, 0x01, 0xbe, + 0xe8, 0xef, 0x09, 0x6e, 0x01, 0x28, 0x7a, 0x87, 0xc8, 0x96, 0x8e, 0x8d, 0xa3, 0xaa, 0xe0, 0xa9, + 0x4b, 0x58, 0xd3, 0x3b, 0x84, 0x2d, 0x60, 0x4c, 0xe1, 0x2d, 0x07, 0x6d, 0xf0, 0x7a, 0x1a, 0x05, + 0x1b, 0xb4, 0x9e, 0xc6, 0xb0, 0x58, 0x35, 0x8d, 0xb6, 0xc4, 0x7f, 0x05, 0xc5, 0x33, 0xa6, 0xe6, + 0x63, 0x17, 0xcf, 0xa8, 0xf4, 0x33, 0x29, 0x9e, 0x71, 0xa0, 0x63, 0x16, 0xcf, 0xb8, 0xf4, 0x49, + 0x8b, 0x67, 0x1c, 0xe6, 0x55, 0xf1, 0xec, 0xcb, 0x59, 0x3c, 0xfb, 0xce, 0x11, 0xc5, 0xb3, 0xe5, + 0x41, 0x83, 0x76, 0xee, 0x27, 0x5f, 0x74, 0xed, 0x6c, 0x13, 0x20, 0x92, 0xf1, 0xbf, 0x76, 0x9c, + 0x84, 0x3f, 0x02, 0xf0, 0x62, 0x94, 0xe2, 0xe4, 0xa3, 0x4b, 0x71, 0x57, 0x06, 0x29, 0xc5, 0x71, + 0x13, 0xf6, 0x96, 0xe3, 0xb4, 0xa7, 0x97, 0xe3, 0x96, 0x06, 0x2c, 0xc7, 0xf1, 0x71, 0x5e, 0x90, + 0xaf, 0x1a, 0x3e, 0x3e, 0xf2, 0xab, 0x86, 0xab, 0x03, 0x55, 0xa9, 0xf8, 0xaa, 0x5f, 0xea, 0x2f, + 0x1b, 0xa2, 0x9f, 0x1f, 0x08, 0x30, 0xea, 0x5f, 0xe8, 0xe8, 0x3d, 0x18, 0xe1, 0x8f, 0xe4, 0xfc, + 0xb6, 0xbd, 0x90, 0xed, 0x7d, 0x5d, 0xf2, 0xc5, 0xd0, 0x0c, 0x0c, 0xdb, 0x0e, 0x21, 0x2a, 0x7f, + 0xd8, 0xf4, 0x3a, 0xe8, 0x3c, 0x4c, 0x58, 0x36, 0x51, 0x34, 0x87, 0x7a, 0x6e, 0x53, 0x73, 0x1d, + 0x76, 0x79, 0x0e, 0x49, 0xe3, 0x01, 0xb5, 0xa6, 0xb9, 0x8e, 0xd8, 0x86, 0x51, 0x3f, 0x1e, 0x40, + 0x5b, 0x30, 0x66, 0xe9, 0x58, 0x33, 0x5c, 0xf2, 0xd0, 0x4f, 0xbb, 0xae, 0x0e, 0x10, 0x50, 0x78, + 0x82, 0x52, 0x88, 0x81, 0xa6, 0xa0, 0x40, 0x23, 0x77, 0x6f, 0x5e, 0xb4, 0x29, 0x5e, 0x80, 0x09, + 0xca, 0xbd, 0xa6, 0x59, 0x2d, 0x62, 0x33, 0x9e, 0xf4, 0x17, 0x77, 0x05, 0xc6, 0x63, 0xa8, 0xe8, + 0x1b, 0x50, 0x74, 0x88, 0xa1, 0x06, 0x6f, 0xd5, 0x59, 0xb5, 0xc4, 0xa5, 0x10, 0x82, 0x21, 0xb6, + 0xac, 0x3c, 0x0b, 0xe3, 0x58, 0x5b, 0xfc, 0x7d, 0xc1, 0x5b, 0x3c, 0x2b, 0xa4, 0x34, 0x92, 0x85, + 0x94, 0xe5, 0x41, 0xde, 0x26, 0xd3, 0xca, 0x28, 0x9b, 0x89, 0x32, 0xca, 0xd2, 0x40, 0x80, 0x3d, + 0x45, 0x94, 0x5f, 0x47, 0x8a, 0x28, 0x12, 0x80, 0x12, 0xa8, 0x90, 0xcf, 0x77, 0x31, 0x2b, 0x7c, + 0xa8, 0x7c, 0x29, 0x82, 0x12, 0xb7, 0x7e, 0xfe, 0xe4, 0xd6, 0x9f, 0xdd, 0x09, 0xea, 0x22, 0xcf, + 0x61, 0xba, 0xb5, 0x52, 0xe4, 0x35, 0x59, 0xfc, 0xa5, 0x5f, 0x47, 0x60, 0x7e, 0xec, 0x7f, 0x92, + 0x20, 0x0c, 0xf8, 0x49, 0x02, 0x9a, 0x85, 0x51, 0xff, 0x60, 0xe6, 0xf9, 0x40, 0xd0, 0x47, 0x73, + 0x00, 0x36, 0x36, 0x54, 0xb3, 0xad, 0x7d, 0x12, 0x14, 0x0f, 0x22, 0x14, 0xba, 0xdf, 0xba, 0x98, + 0xc6, 0xf6, 0x4d, 0xdd, 0xfb, 0xb0, 0xc0, 0x4f, 0x58, 0x19, 0xb5, 0xc6, 0x89, 0xe2, 0x23, 0xc1, + 0xcf, 0xe0, 0xd9, 0x54, 0x57, 0x60, 0x98, 0xfd, 0xce, 0xe7, 0x7a, 0xae, 0xcf, 0x5c, 0xb7, 0x29, + 0xaf, 0xe4, 0x89, 0xa0, 0x0d, 0x28, 0xab, 0xc4, 0x71, 0x65, 0xff, 0xf8, 0xc8, 0x0f, 0xb4, 0x31, + 0x4a, 0x54, 0x76, 0x35, 0x79, 0x84, 0x14, 0x12, 0x47, 0x48, 0x86, 0x25, 0xd5, 0xfe, 0x9e, 0xff, + 0xec, 0xf1, 0x9c, 0xf0, 0xe8, 0xf1, 0x9c, 0xf0, 0xb7, 0xc7, 0x73, 0xc2, 0xa7, 0x4f, 0xe6, 0x72, + 0x8f, 0x9e, 0xcc, 0xe5, 0xfe, 0xf2, 0x64, 0x2e, 0x07, 0x17, 0x14, 0xb3, 0x9d, 0xc1, 0xce, 0xb5, + 0xa9, 0x68, 0xa2, 0x67, 0x9b, 0xae, 0xd9, 0x10, 0x1e, 0x34, 0xf7, 0x34, 0xb7, 0xd5, 0x69, 0x56, + 0x15, 0xb3, 0xbd, 0xa0, 0x98, 0x4e, 0xdb, 0x74, 0x16, 0x6c, 0xa2, 0xe3, 0x43, 0x62, 0x2f, 0x74, + 0x17, 0x83, 0x26, 0xcb, 0xc7, 0x9c, 0x85, 0xfe, 0xff, 0xa2, 0xf0, 0x4e, 0x84, 0xe8, 0xd3, 0x7e, + 0x91, 0x2f, 0x34, 0xd6, 0xee, 0xfe, 0x2a, 0x2f, 0x36, 0xfc, 0x29, 0xae, 0xd1, 0x29, 0x46, 0x26, + 0x53, 0xdd, 0xe6, 0xac, 0x7f, 0x08, 0x99, 0x76, 0x28, 0xd3, 0x4e, 0x84, 0x69, 0xc7, 0x67, 0x7a, + 0x9c, 0xaf, 0xf6, 0x67, 0xda, 0xf9, 0xa0, 0x51, 0xf3, 0x3f, 0x6a, 0xfa, 0x67, 0xfe, 0xbc, 0x2f, + 0xb0, 0xb2, 0x42, 0x25, 0x56, 0x56, 0x22, 0x22, 0x2b, 0x2b, 0xbe, 0x4c, 0xb3, 0xc8, 0xfe, 0xb5, + 0x60, 0xe9, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc0, 0x83, 0x14, 0xde, 0x8c, 0x31, 0x00, 0x00, } func (m *Transaction) Marshal() (dAtA []byte, err error) { @@ -4301,6 +4311,18 @@ func (m *TransactionPerspective) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l + if m.TransactionId != nil { + { + size, err := m.TransactionId.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTransaction(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x32 + } if len(m.Denoms) > 0 { for iNdEx := len(m.Denoms) - 1; iNdEx >= 0; iNdEx-- { { @@ -7461,6 +7483,10 @@ func (m *TransactionPerspective) Size() (n int) { n += 1 + l + sovTransaction(uint64(l)) } } + if m.TransactionId != nil { + l = m.TransactionId.Size() + n += 1 + l + sovTransaction(uint64(l)) + } return n } @@ -10261,11 +10287,47 @@ func (m *TransactionPerspective) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Denoms = append(m.Denoms, &v1alpha1.Denom{}) + m.Denoms = append(m.Denoms, &v1alpha1.DenomMetadata{}) if err := m.Denoms[len(m.Denoms)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TransactionId", 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.TransactionId == nil { + m.TransactionId = &Id{} + } + if err := m.TransactionId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTransaction(dAtA[iNdEx:]) diff --git a/relayer/chains/penumbra/view/v1alpha1/view.pb.go b/relayer/chains/penumbra/view/v1alpha1/view.pb.go index 5e28b5218..217129d5f 100644 --- a/relayer/chains/penumbra/view/v1alpha1/view.pb.go +++ b/relayer/chains/penumbra/view/v1alpha1/view.pb.go @@ -89,6 +89,9 @@ func (m *BroadcastTransactionRequest) GetAwaitDetection() bool { type BroadcastTransactionResponse struct { // The hash of the transaction that was broadcast. Id *v1alpha1.Id `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + // The height in which the transaction was detected as included in the chain, if any. + // Will not be included unless await_detection was true. + DetectionHeight uint64 `protobuf:"varint,2,opt,name=detection_height,json=detectionHeight,proto3" json:"detection_height,omitempty"` } func (m *BroadcastTransactionResponse) Reset() { *m = BroadcastTransactionResponse{} } @@ -131,6 +134,13 @@ func (m *BroadcastTransactionResponse) GetId() *v1alpha1.Id { return nil } +func (m *BroadcastTransactionResponse) GetDetectionHeight() uint64 { + if m != nil { + return m.DetectionHeight + } + return 0 +} + type TransactionPlannerRequest struct { // The expiry height for the requested TransactionPlan ExpiryHeight uint64 `protobuf:"varint,1,opt,name=expiry_height,json=expiryHeight,proto3" json:"expiry_height,omitempty"` @@ -141,9 +151,6 @@ type TransactionPlannerRequest struct { // Types that are valid to be assigned to XAccountGroupId: // *TransactionPlannerRequest_AccountGroupId XAccountGroupId isTransactionPlannerRequest_XAccountGroupId `protobuf_oneof:"_account_group_id"` - // Types that are valid to be assigned to XToken: - // *TransactionPlannerRequest_Token - XToken isTransactionPlannerRequest_XToken `protobuf_oneof:"_token"` // Request contents Outputs []*TransactionPlannerRequest_Output `protobuf:"bytes,20,rep,name=outputs,proto3" json:"outputs,omitempty"` Swaps []*TransactionPlannerRequest_Swap `protobuf:"bytes,30,rep,name=swaps,proto3" json:"swaps,omitempty"` @@ -190,21 +197,12 @@ type isTransactionPlannerRequest_XAccountGroupId interface { MarshalTo([]byte) (int, error) Size() int } -type isTransactionPlannerRequest_XToken interface { - isTransactionPlannerRequest_XToken() - MarshalTo([]byte) (int, error) - Size() int -} type TransactionPlannerRequest_AccountGroupId struct { AccountGroupId *v1alpha11.AccountGroupId `protobuf:"bytes,14,opt,name=account_group_id,json=accountGroupId,proto3,oneof" json:"account_group_id,omitempty"` } -type TransactionPlannerRequest_Token struct { - Token *ViewAuthToken `protobuf:"bytes,15,opt,name=token,proto3,oneof" json:"token,omitempty"` -} func (*TransactionPlannerRequest_AccountGroupId) isTransactionPlannerRequest_XAccountGroupId() {} -func (*TransactionPlannerRequest_Token) isTransactionPlannerRequest_XToken() {} func (m *TransactionPlannerRequest) GetXAccountGroupId() isTransactionPlannerRequest_XAccountGroupId { if m != nil { @@ -212,12 +210,6 @@ func (m *TransactionPlannerRequest) GetXAccountGroupId() isTransactionPlannerReq } return nil } -func (m *TransactionPlannerRequest) GetXToken() isTransactionPlannerRequest_XToken { - if m != nil { - return m.XToken - } - return nil -} func (m *TransactionPlannerRequest) GetExpiryHeight() uint64 { if m != nil { @@ -247,13 +239,6 @@ func (m *TransactionPlannerRequest) GetAccountGroupId() *v1alpha11.AccountGroupI return nil } -func (m *TransactionPlannerRequest) GetToken() *ViewAuthToken { - if x, ok := m.GetXToken().(*TransactionPlannerRequest_Token); ok { - return x.Token - } - return nil -} - func (m *TransactionPlannerRequest) GetOutputs() []*TransactionPlannerRequest_Output { if m != nil { return m.Outputs @@ -293,7 +278,6 @@ func (m *TransactionPlannerRequest) GetIbcActions() []*v1alpha12.IbcAction { func (*TransactionPlannerRequest) XXX_OneofWrappers() []interface{} { return []interface{}{ (*TransactionPlannerRequest_AccountGroupId)(nil), - (*TransactionPlannerRequest_Token)(nil), } } @@ -939,8 +923,6 @@ func (m *BalanceByAddressResponse) GetAmount() *v1alpha11.Amount { } // Scaffolding for bearer-token authentication for the ViewService. -// The `account_group_id` and `token` fields are both optional, -// and numbered as 14 & 15 throughout the view service protocol. type ViewAuthToken struct { Inner []byte `protobuf:"bytes,1,opt,name=inner,proto3" json:"inner,omitempty"` } @@ -1078,9 +1060,6 @@ type StatusRequest struct { // Types that are valid to be assigned to XAccountGroupId: // *StatusRequest_AccountGroupId XAccountGroupId isStatusRequest_XAccountGroupId `protobuf_oneof:"_account_group_id"` - // Types that are valid to be assigned to XToken: - // *StatusRequest_Token - XToken isStatusRequest_XToken `protobuf_oneof:"_token"` } func (m *StatusRequest) Reset() { *m = StatusRequest{} } @@ -1121,21 +1100,12 @@ type isStatusRequest_XAccountGroupId interface { MarshalTo([]byte) (int, error) Size() int } -type isStatusRequest_XToken interface { - isStatusRequest_XToken() - MarshalTo([]byte) (int, error) - Size() int -} type StatusRequest_AccountGroupId struct { AccountGroupId *v1alpha11.AccountGroupId `protobuf:"bytes,14,opt,name=account_group_id,json=accountGroupId,proto3,oneof" json:"account_group_id,omitempty"` } -type StatusRequest_Token struct { - Token *ViewAuthToken `protobuf:"bytes,15,opt,name=token,proto3,oneof" json:"token,omitempty"` -} func (*StatusRequest_AccountGroupId) isStatusRequest_XAccountGroupId() {} -func (*StatusRequest_Token) isStatusRequest_XToken() {} func (m *StatusRequest) GetXAccountGroupId() isStatusRequest_XAccountGroupId { if m != nil { @@ -1143,12 +1113,6 @@ func (m *StatusRequest) GetXAccountGroupId() isStatusRequest_XAccountGroupId { } return nil } -func (m *StatusRequest) GetXToken() isStatusRequest_XToken { - if m != nil { - return m.XToken - } - return nil -} func (m *StatusRequest) GetAccountGroupId() *v1alpha11.AccountGroupId { if x, ok := m.GetXAccountGroupId().(*StatusRequest_AccountGroupId); ok { @@ -1157,18 +1121,10 @@ func (m *StatusRequest) GetAccountGroupId() *v1alpha11.AccountGroupId { return nil } -func (m *StatusRequest) GetToken() *ViewAuthToken { - if x, ok := m.GetXToken().(*StatusRequest_Token); ok { - return x.Token - } - return nil -} - // XXX_OneofWrappers is for the internal use of the proto package. func (*StatusRequest) XXX_OneofWrappers() []interface{} { return []interface{}{ (*StatusRequest_AccountGroupId)(nil), - (*StatusRequest_Token)(nil), } } @@ -1232,9 +1188,6 @@ type StatusStreamRequest struct { // Types that are valid to be assigned to XAccountGroupId: // *StatusStreamRequest_AccountGroupId XAccountGroupId isStatusStreamRequest_XAccountGroupId `protobuf_oneof:"_account_group_id"` - // Types that are valid to be assigned to XToken: - // *StatusStreamRequest_Token - XToken isStatusStreamRequest_XToken `protobuf_oneof:"_token"` } func (m *StatusStreamRequest) Reset() { *m = StatusStreamRequest{} } @@ -1275,21 +1228,12 @@ type isStatusStreamRequest_XAccountGroupId interface { MarshalTo([]byte) (int, error) Size() int } -type isStatusStreamRequest_XToken interface { - isStatusStreamRequest_XToken() - MarshalTo([]byte) (int, error) - Size() int -} type StatusStreamRequest_AccountGroupId struct { AccountGroupId *v1alpha11.AccountGroupId `protobuf:"bytes,14,opt,name=account_group_id,json=accountGroupId,proto3,oneof" json:"account_group_id,omitempty"` } -type StatusStreamRequest_Token struct { - Token *ViewAuthToken `protobuf:"bytes,15,opt,name=token,proto3,oneof" json:"token,omitempty"` -} func (*StatusStreamRequest_AccountGroupId) isStatusStreamRequest_XAccountGroupId() {} -func (*StatusStreamRequest_Token) isStatusStreamRequest_XToken() {} func (m *StatusStreamRequest) GetXAccountGroupId() isStatusStreamRequest_XAccountGroupId { if m != nil { @@ -1297,12 +1241,6 @@ func (m *StatusStreamRequest) GetXAccountGroupId() isStatusStreamRequest_XAccoun } return nil } -func (m *StatusStreamRequest) GetXToken() isStatusStreamRequest_XToken { - if m != nil { - return m.XToken - } - return nil -} func (m *StatusStreamRequest) GetAccountGroupId() *v1alpha11.AccountGroupId { if x, ok := m.GetXAccountGroupId().(*StatusStreamRequest_AccountGroupId); ok { @@ -1311,18 +1249,10 @@ func (m *StatusStreamRequest) GetAccountGroupId() *v1alpha11.AccountGroupId { return nil } -func (m *StatusStreamRequest) GetToken() *ViewAuthToken { - if x, ok := m.GetXToken().(*StatusStreamRequest_Token); ok { - return x.Token - } - return nil -} - // XXX_OneofWrappers is for the internal use of the proto package. func (*StatusStreamRequest) XXX_OneofWrappers() []interface{} { return []interface{}{ (*StatusStreamRequest_AccountGroupId)(nil), - (*StatusStreamRequest_Token)(nil), } } @@ -1393,13 +1323,10 @@ type NotesRequest struct { // If set, stop returning notes once the total exceeds this amount. // // Ignored if `asset_id` is unset or if `include_spent` is set. - AmountToSpend uint64 `protobuf:"varint,5,opt,name=amount_to_spend,json=amountToSpend,proto3" json:"amount_to_spend,omitempty"` + AmountToSpend *v1alpha11.Amount `protobuf:"bytes,6,opt,name=amount_to_spend,json=amountToSpend,proto3" json:"amount_to_spend,omitempty"` // Types that are valid to be assigned to XAccountGroupId: // *NotesRequest_AccountGroupId XAccountGroupId isNotesRequest_XAccountGroupId `protobuf_oneof:"_account_group_id"` - // Types that are valid to be assigned to XToken: - // *NotesRequest_Token - XToken isNotesRequest_XToken `protobuf_oneof:"_token"` } func (m *NotesRequest) Reset() { *m = NotesRequest{} } @@ -1440,21 +1367,12 @@ type isNotesRequest_XAccountGroupId interface { MarshalTo([]byte) (int, error) Size() int } -type isNotesRequest_XToken interface { - isNotesRequest_XToken() - MarshalTo([]byte) (int, error) - Size() int -} type NotesRequest_AccountGroupId struct { AccountGroupId *v1alpha11.AccountGroupId `protobuf:"bytes,14,opt,name=account_group_id,json=accountGroupId,proto3,oneof" json:"account_group_id,omitempty"` } -type NotesRequest_Token struct { - Token *ViewAuthToken `protobuf:"bytes,15,opt,name=token,proto3,oneof" json:"token,omitempty"` -} func (*NotesRequest_AccountGroupId) isNotesRequest_XAccountGroupId() {} -func (*NotesRequest_Token) isNotesRequest_XToken() {} func (m *NotesRequest) GetXAccountGroupId() isNotesRequest_XAccountGroupId { if m != nil { @@ -1462,12 +1380,6 @@ func (m *NotesRequest) GetXAccountGroupId() isNotesRequest_XAccountGroupId { } return nil } -func (m *NotesRequest) GetXToken() isNotesRequest_XToken { - if m != nil { - return m.XToken - } - return nil -} func (m *NotesRequest) GetIncludeSpent() bool { if m != nil { @@ -1490,11 +1402,11 @@ func (m *NotesRequest) GetAddressIndex() *v1alpha11.AddressIndex { return nil } -func (m *NotesRequest) GetAmountToSpend() uint64 { +func (m *NotesRequest) GetAmountToSpend() *v1alpha11.Amount { if m != nil { return m.AmountToSpend } - return 0 + return nil } func (m *NotesRequest) GetAccountGroupId() *v1alpha11.AccountGroupId { @@ -1504,18 +1416,10 @@ func (m *NotesRequest) GetAccountGroupId() *v1alpha11.AccountGroupId { return nil } -func (m *NotesRequest) GetToken() *ViewAuthToken { - if x, ok := m.GetXToken().(*NotesRequest_Token); ok { - return x.Token - } - return nil -} - // XXX_OneofWrappers is for the internal use of the proto package. func (*NotesRequest) XXX_OneofWrappers() []interface{} { return []interface{}{ (*NotesRequest_AccountGroupId)(nil), - (*NotesRequest_Token)(nil), } } @@ -1528,9 +1432,6 @@ type NotesForVotingRequest struct { // Types that are valid to be assigned to XAccountGroupId: // *NotesForVotingRequest_AccountGroupId XAccountGroupId isNotesForVotingRequest_XAccountGroupId `protobuf_oneof:"_account_group_id"` - // Types that are valid to be assigned to XToken: - // *NotesForVotingRequest_Token - XToken isNotesForVotingRequest_XToken `protobuf_oneof:"_token"` } func (m *NotesForVotingRequest) Reset() { *m = NotesForVotingRequest{} } @@ -1571,21 +1472,12 @@ type isNotesForVotingRequest_XAccountGroupId interface { MarshalTo([]byte) (int, error) Size() int } -type isNotesForVotingRequest_XToken interface { - isNotesForVotingRequest_XToken() - MarshalTo([]byte) (int, error) - Size() int -} type NotesForVotingRequest_AccountGroupId struct { AccountGroupId *v1alpha11.AccountGroupId `protobuf:"bytes,14,opt,name=account_group_id,json=accountGroupId,proto3,oneof" json:"account_group_id,omitempty"` } -type NotesForVotingRequest_Token struct { - Token *ViewAuthToken `protobuf:"bytes,15,opt,name=token,proto3,oneof" json:"token,omitempty"` -} func (*NotesForVotingRequest_AccountGroupId) isNotesForVotingRequest_XAccountGroupId() {} -func (*NotesForVotingRequest_Token) isNotesForVotingRequest_XToken() {} func (m *NotesForVotingRequest) GetXAccountGroupId() isNotesForVotingRequest_XAccountGroupId { if m != nil { @@ -1593,12 +1485,6 @@ func (m *NotesForVotingRequest) GetXAccountGroupId() isNotesForVotingRequest_XAc } return nil } -func (m *NotesForVotingRequest) GetXToken() isNotesForVotingRequest_XToken { - if m != nil { - return m.XToken - } - return nil -} func (m *NotesForVotingRequest) GetVotableAtHeight() uint64 { if m != nil { @@ -1621,18 +1507,10 @@ func (m *NotesForVotingRequest) GetAccountGroupId() *v1alpha11.AccountGroupId { return nil } -func (m *NotesForVotingRequest) GetToken() *ViewAuthToken { - if x, ok := m.GetXToken().(*NotesForVotingRequest_Token); ok { - return x.Token - } - return nil -} - // XXX_OneofWrappers is for the internal use of the proto package. func (*NotesForVotingRequest) XXX_OneofWrappers() []interface{} { return []interface{}{ (*NotesForVotingRequest_AccountGroupId)(nil), - (*NotesForVotingRequest_Token)(nil), } } @@ -1644,9 +1522,6 @@ type WitnessRequest struct { // Types that are valid to be assigned to XAccountGroupId: // *WitnessRequest_AccountGroupId XAccountGroupId isWitnessRequest_XAccountGroupId `protobuf_oneof:"_account_group_id"` - // Types that are valid to be assigned to XToken: - // *WitnessRequest_Token - XToken isWitnessRequest_XToken `protobuf_oneof:"_token"` } func (m *WitnessRequest) Reset() { *m = WitnessRequest{} } @@ -1687,21 +1562,12 @@ type isWitnessRequest_XAccountGroupId interface { MarshalTo([]byte) (int, error) Size() int } -type isWitnessRequest_XToken interface { - isWitnessRequest_XToken() - MarshalTo([]byte) (int, error) - Size() int -} type WitnessRequest_AccountGroupId struct { AccountGroupId *v1alpha11.AccountGroupId `protobuf:"bytes,14,opt,name=account_group_id,json=accountGroupId,proto3,oneof" json:"account_group_id,omitempty"` } -type WitnessRequest_Token struct { - Token *ViewAuthToken `protobuf:"bytes,15,opt,name=token,proto3,oneof" json:"token,omitempty"` -} func (*WitnessRequest_AccountGroupId) isWitnessRequest_XAccountGroupId() {} -func (*WitnessRequest_Token) isWitnessRequest_XToken() {} func (m *WitnessRequest) GetXAccountGroupId() isWitnessRequest_XAccountGroupId { if m != nil { @@ -1709,12 +1575,6 @@ func (m *WitnessRequest) GetXAccountGroupId() isWitnessRequest_XAccountGroupId { } return nil } -func (m *WitnessRequest) GetXToken() isWitnessRequest_XToken { - if m != nil { - return m.XToken - } - return nil -} func (m *WitnessRequest) GetNoteCommitments() []*v1alpha11.StateCommitment { if m != nil { @@ -1737,18 +1597,10 @@ func (m *WitnessRequest) GetAccountGroupId() *v1alpha11.AccountGroupId { return nil } -func (m *WitnessRequest) GetToken() *ViewAuthToken { - if x, ok := m.GetXToken().(*WitnessRequest_Token); ok { - return x.Token - } - return nil -} - // XXX_OneofWrappers is for the internal use of the proto package. func (*WitnessRequest) XXX_OneofWrappers() []interface{} { return []interface{}{ (*WitnessRequest_AccountGroupId)(nil), - (*WitnessRequest_Token)(nil), } } @@ -2207,9 +2059,6 @@ type NoteByCommitmentRequest struct { // Types that are valid to be assigned to XAccountGroupId: // *NoteByCommitmentRequest_AccountGroupId XAccountGroupId isNoteByCommitmentRequest_XAccountGroupId `protobuf_oneof:"_account_group_id"` - // Types that are valid to be assigned to XToken: - // *NoteByCommitmentRequest_Token - XToken isNoteByCommitmentRequest_XToken `protobuf_oneof:"_token"` } func (m *NoteByCommitmentRequest) Reset() { *m = NoteByCommitmentRequest{} } @@ -2250,21 +2099,12 @@ type isNoteByCommitmentRequest_XAccountGroupId interface { MarshalTo([]byte) (int, error) Size() int } -type isNoteByCommitmentRequest_XToken interface { - isNoteByCommitmentRequest_XToken() - MarshalTo([]byte) (int, error) - Size() int -} type NoteByCommitmentRequest_AccountGroupId struct { AccountGroupId *v1alpha11.AccountGroupId `protobuf:"bytes,14,opt,name=account_group_id,json=accountGroupId,proto3,oneof" json:"account_group_id,omitempty"` } -type NoteByCommitmentRequest_Token struct { - Token *ViewAuthToken `protobuf:"bytes,15,opt,name=token,proto3,oneof" json:"token,omitempty"` -} func (*NoteByCommitmentRequest_AccountGroupId) isNoteByCommitmentRequest_XAccountGroupId() {} -func (*NoteByCommitmentRequest_Token) isNoteByCommitmentRequest_XToken() {} func (m *NoteByCommitmentRequest) GetXAccountGroupId() isNoteByCommitmentRequest_XAccountGroupId { if m != nil { @@ -2272,12 +2112,6 @@ func (m *NoteByCommitmentRequest) GetXAccountGroupId() isNoteByCommitmentRequest } return nil } -func (m *NoteByCommitmentRequest) GetXToken() isNoteByCommitmentRequest_XToken { - if m != nil { - return m.XToken - } - return nil -} func (m *NoteByCommitmentRequest) GetNoteCommitment() *v1alpha11.StateCommitment { if m != nil { @@ -2300,18 +2134,10 @@ func (m *NoteByCommitmentRequest) GetAccountGroupId() *v1alpha11.AccountGroupId return nil } -func (m *NoteByCommitmentRequest) GetToken() *ViewAuthToken { - if x, ok := m.GetXToken().(*NoteByCommitmentRequest_Token); ok { - return x.Token - } - return nil -} - // XXX_OneofWrappers is for the internal use of the proto package. func (*NoteByCommitmentRequest) XXX_OneofWrappers() []interface{} { return []interface{}{ (*NoteByCommitmentRequest_AccountGroupId)(nil), - (*NoteByCommitmentRequest_Token)(nil), } } @@ -2366,9 +2192,6 @@ type SwapByCommitmentRequest struct { // Types that are valid to be assigned to XAccountGroupId: // *SwapByCommitmentRequest_AccountGroupId XAccountGroupId isSwapByCommitmentRequest_XAccountGroupId `protobuf_oneof:"_account_group_id"` - // Types that are valid to be assigned to XToken: - // *SwapByCommitmentRequest_Token - XToken isSwapByCommitmentRequest_XToken `protobuf_oneof:"_token"` } func (m *SwapByCommitmentRequest) Reset() { *m = SwapByCommitmentRequest{} } @@ -2409,21 +2232,12 @@ type isSwapByCommitmentRequest_XAccountGroupId interface { MarshalTo([]byte) (int, error) Size() int } -type isSwapByCommitmentRequest_XToken interface { - isSwapByCommitmentRequest_XToken() - MarshalTo([]byte) (int, error) - Size() int -} type SwapByCommitmentRequest_AccountGroupId struct { AccountGroupId *v1alpha11.AccountGroupId `protobuf:"bytes,14,opt,name=account_group_id,json=accountGroupId,proto3,oneof" json:"account_group_id,omitempty"` } -type SwapByCommitmentRequest_Token struct { - Token *ViewAuthToken `protobuf:"bytes,15,opt,name=token,proto3,oneof" json:"token,omitempty"` -} func (*SwapByCommitmentRequest_AccountGroupId) isSwapByCommitmentRequest_XAccountGroupId() {} -func (*SwapByCommitmentRequest_Token) isSwapByCommitmentRequest_XToken() {} func (m *SwapByCommitmentRequest) GetXAccountGroupId() isSwapByCommitmentRequest_XAccountGroupId { if m != nil { @@ -2431,12 +2245,6 @@ func (m *SwapByCommitmentRequest) GetXAccountGroupId() isSwapByCommitmentRequest } return nil } -func (m *SwapByCommitmentRequest) GetXToken() isSwapByCommitmentRequest_XToken { - if m != nil { - return m.XToken - } - return nil -} func (m *SwapByCommitmentRequest) GetSwapCommitment() *v1alpha11.StateCommitment { if m != nil { @@ -2459,18 +2267,10 @@ func (m *SwapByCommitmentRequest) GetAccountGroupId() *v1alpha11.AccountGroupId return nil } -func (m *SwapByCommitmentRequest) GetToken() *ViewAuthToken { - if x, ok := m.GetXToken().(*SwapByCommitmentRequest_Token); ok { - return x.Token - } - return nil -} - // XXX_OneofWrappers is for the internal use of the proto package. func (*SwapByCommitmentRequest) XXX_OneofWrappers() []interface{} { return []interface{}{ (*SwapByCommitmentRequest_AccountGroupId)(nil), - (*SwapByCommitmentRequest_Token)(nil), } } @@ -2524,9 +2324,6 @@ type NullifierStatusRequest struct { // Types that are valid to be assigned to XAccountGroupId: // *NullifierStatusRequest_AccountGroupId XAccountGroupId isNullifierStatusRequest_XAccountGroupId `protobuf_oneof:"_account_group_id"` - // Types that are valid to be assigned to XToken: - // *NullifierStatusRequest_Token - XToken isNullifierStatusRequest_XToken `protobuf_oneof:"_token"` } func (m *NullifierStatusRequest) Reset() { *m = NullifierStatusRequest{} } @@ -2567,21 +2364,12 @@ type isNullifierStatusRequest_XAccountGroupId interface { MarshalTo([]byte) (int, error) Size() int } -type isNullifierStatusRequest_XToken interface { - isNullifierStatusRequest_XToken() - MarshalTo([]byte) (int, error) - Size() int -} type NullifierStatusRequest_AccountGroupId struct { AccountGroupId *v1alpha11.AccountGroupId `protobuf:"bytes,14,opt,name=account_group_id,json=accountGroupId,proto3,oneof" json:"account_group_id,omitempty"` } -type NullifierStatusRequest_Token struct { - Token *ViewAuthToken `protobuf:"bytes,15,opt,name=token,proto3,oneof" json:"token,omitempty"` -} func (*NullifierStatusRequest_AccountGroupId) isNullifierStatusRequest_XAccountGroupId() {} -func (*NullifierStatusRequest_Token) isNullifierStatusRequest_XToken() {} func (m *NullifierStatusRequest) GetXAccountGroupId() isNullifierStatusRequest_XAccountGroupId { if m != nil { @@ -2589,12 +2377,6 @@ func (m *NullifierStatusRequest) GetXAccountGroupId() isNullifierStatusRequest_X } return nil } -func (m *NullifierStatusRequest) GetXToken() isNullifierStatusRequest_XToken { - if m != nil { - return m.XToken - } - return nil -} func (m *NullifierStatusRequest) GetNullifier() *v1alpha11.Nullifier { if m != nil { @@ -2617,18 +2399,10 @@ func (m *NullifierStatusRequest) GetAccountGroupId() *v1alpha11.AccountGroupId { return nil } -func (m *NullifierStatusRequest) GetToken() *ViewAuthToken { - if x, ok := m.GetXToken().(*NullifierStatusRequest_Token); ok { - return x.Token - } - return nil -} - // XXX_OneofWrappers is for the internal use of the proto package. func (*NullifierStatusRequest) XXX_OneofWrappers() []interface{} { return []interface{}{ (*NullifierStatusRequest_AccountGroupId)(nil), - (*NullifierStatusRequest_Token)(nil), } } @@ -2676,27 +2450,72 @@ func (m *NullifierStatusResponse) GetSpent() bool { return false } -type TransactionHashesRequest struct { +type TransactionInfoByHashRequest struct { + // The transaction hash to query for. + Id *v1alpha1.Id `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"` +} + +func (m *TransactionInfoByHashRequest) Reset() { *m = TransactionInfoByHashRequest{} } +func (m *TransactionInfoByHashRequest) String() string { return proto.CompactTextString(m) } +func (*TransactionInfoByHashRequest) ProtoMessage() {} +func (*TransactionInfoByHashRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_0aa947b204e6a7c2, []int{37} +} +func (m *TransactionInfoByHashRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *TransactionInfoByHashRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_TransactionInfoByHashRequest.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 *TransactionInfoByHashRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_TransactionInfoByHashRequest.Merge(m, src) +} +func (m *TransactionInfoByHashRequest) XXX_Size() int { + return m.Size() +} +func (m *TransactionInfoByHashRequest) XXX_DiscardUnknown() { + xxx_messageInfo_TransactionInfoByHashRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_TransactionInfoByHashRequest proto.InternalMessageInfo + +func (m *TransactionInfoByHashRequest) GetId() *v1alpha1.Id { + if m != nil { + return m.Id + } + return nil +} + +type TransactionInfoRequest struct { // Types that are valid to be assigned to XStartHeight: - // *TransactionHashesRequest_StartHeight - XStartHeight isTransactionHashesRequest_XStartHeight `protobuf_oneof:"_start_height"` + // *TransactionInfoRequest_StartHeight + XStartHeight isTransactionInfoRequest_XStartHeight `protobuf_oneof:"_start_height"` // Types that are valid to be assigned to XEndHeight: - // *TransactionHashesRequest_EndHeight - XEndHeight isTransactionHashesRequest_XEndHeight `protobuf_oneof:"_end_height"` + // *TransactionInfoRequest_EndHeight + XEndHeight isTransactionInfoRequest_XEndHeight `protobuf_oneof:"_end_height"` } -func (m *TransactionHashesRequest) Reset() { *m = TransactionHashesRequest{} } -func (m *TransactionHashesRequest) String() string { return proto.CompactTextString(m) } -func (*TransactionHashesRequest) ProtoMessage() {} -func (*TransactionHashesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{37} +func (m *TransactionInfoRequest) Reset() { *m = TransactionInfoRequest{} } +func (m *TransactionInfoRequest) String() string { return proto.CompactTextString(m) } +func (*TransactionInfoRequest) ProtoMessage() {} +func (*TransactionInfoRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_0aa947b204e6a7c2, []int{38} } -func (m *TransactionHashesRequest) XXX_Unmarshal(b []byte) error { +func (m *TransactionInfoRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *TransactionHashesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *TransactionInfoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_TransactionHashesRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_TransactionInfoRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -2706,91 +2525,100 @@ func (m *TransactionHashesRequest) XXX_Marshal(b []byte, deterministic bool) ([] return b[:n], nil } } -func (m *TransactionHashesRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_TransactionHashesRequest.Merge(m, src) +func (m *TransactionInfoRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_TransactionInfoRequest.Merge(m, src) } -func (m *TransactionHashesRequest) XXX_Size() int { +func (m *TransactionInfoRequest) XXX_Size() int { return m.Size() } -func (m *TransactionHashesRequest) XXX_DiscardUnknown() { - xxx_messageInfo_TransactionHashesRequest.DiscardUnknown(m) +func (m *TransactionInfoRequest) XXX_DiscardUnknown() { + xxx_messageInfo_TransactionInfoRequest.DiscardUnknown(m) } -var xxx_messageInfo_TransactionHashesRequest proto.InternalMessageInfo +var xxx_messageInfo_TransactionInfoRequest proto.InternalMessageInfo -type isTransactionHashesRequest_XStartHeight interface { - isTransactionHashesRequest_XStartHeight() +type isTransactionInfoRequest_XStartHeight interface { + isTransactionInfoRequest_XStartHeight() MarshalTo([]byte) (int, error) Size() int } -type isTransactionHashesRequest_XEndHeight interface { - isTransactionHashesRequest_XEndHeight() +type isTransactionInfoRequest_XEndHeight interface { + isTransactionInfoRequest_XEndHeight() MarshalTo([]byte) (int, error) Size() int } -type TransactionHashesRequest_StartHeight struct { +type TransactionInfoRequest_StartHeight struct { StartHeight uint64 `protobuf:"varint,1,opt,name=start_height,json=startHeight,proto3,oneof" json:"start_height,omitempty"` } -type TransactionHashesRequest_EndHeight struct { +type TransactionInfoRequest_EndHeight struct { EndHeight uint64 `protobuf:"varint,2,opt,name=end_height,json=endHeight,proto3,oneof" json:"end_height,omitempty"` } -func (*TransactionHashesRequest_StartHeight) isTransactionHashesRequest_XStartHeight() {} -func (*TransactionHashesRequest_EndHeight) isTransactionHashesRequest_XEndHeight() {} +func (*TransactionInfoRequest_StartHeight) isTransactionInfoRequest_XStartHeight() {} +func (*TransactionInfoRequest_EndHeight) isTransactionInfoRequest_XEndHeight() {} -func (m *TransactionHashesRequest) GetXStartHeight() isTransactionHashesRequest_XStartHeight { +func (m *TransactionInfoRequest) GetXStartHeight() isTransactionInfoRequest_XStartHeight { if m != nil { return m.XStartHeight } return nil } -func (m *TransactionHashesRequest) GetXEndHeight() isTransactionHashesRequest_XEndHeight { +func (m *TransactionInfoRequest) GetXEndHeight() isTransactionInfoRequest_XEndHeight { if m != nil { return m.XEndHeight } return nil } -func (m *TransactionHashesRequest) GetStartHeight() uint64 { - if x, ok := m.GetXStartHeight().(*TransactionHashesRequest_StartHeight); ok { +func (m *TransactionInfoRequest) GetStartHeight() uint64 { + if x, ok := m.GetXStartHeight().(*TransactionInfoRequest_StartHeight); ok { return x.StartHeight } return 0 } -func (m *TransactionHashesRequest) GetEndHeight() uint64 { - if x, ok := m.GetXEndHeight().(*TransactionHashesRequest_EndHeight); ok { +func (m *TransactionInfoRequest) GetEndHeight() uint64 { + if x, ok := m.GetXEndHeight().(*TransactionInfoRequest_EndHeight); ok { return x.EndHeight } return 0 } // XXX_OneofWrappers is for the internal use of the proto package. -func (*TransactionHashesRequest) XXX_OneofWrappers() []interface{} { +func (*TransactionInfoRequest) XXX_OneofWrappers() []interface{} { return []interface{}{ - (*TransactionHashesRequest_StartHeight)(nil), - (*TransactionHashesRequest_EndHeight)(nil), + (*TransactionInfoRequest_StartHeight)(nil), + (*TransactionInfoRequest_EndHeight)(nil), } } -type TransactionHashesResponse struct { - BlockHeight uint64 `protobuf:"varint,1,opt,name=block_height,json=blockHeight,proto3" json:"block_height,omitempty"` - TxHash []byte `protobuf:"bytes,2,opt,name=tx_hash,json=txHash,proto3" json:"tx_hash,omitempty"` +type TransactionInfo struct { + // Types that are valid to be assigned to XHeight: + // *TransactionInfo_Height + XHeight isTransactionInfo_XHeight `protobuf_oneof:"_height"` + // The hash of the transaction. + Id *v1alpha1.Id `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"` + // The transaction data itself. + Transaction *v1alpha1.Transaction `protobuf:"bytes,3,opt,name=transaction,proto3" json:"transaction,omitempty"` + // The transaction perspective, as seen by this view server. + Perspective *v1alpha1.TransactionPerspective `protobuf:"bytes,4,opt,name=perspective,proto3" json:"perspective,omitempty"` + // A precomputed transaction view of `transaction` from `perspective`, included for convenience of clients that don't have support for viewing transactions on their own. + View *v1alpha1.TransactionView `protobuf:"bytes,5,opt,name=view,proto3" json:"view,omitempty"` } -func (m *TransactionHashesResponse) Reset() { *m = TransactionHashesResponse{} } -func (m *TransactionHashesResponse) String() string { return proto.CompactTextString(m) } -func (*TransactionHashesResponse) ProtoMessage() {} -func (*TransactionHashesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{38} +func (m *TransactionInfo) Reset() { *m = TransactionInfo{} } +func (m *TransactionInfo) String() string { return proto.CompactTextString(m) } +func (*TransactionInfo) ProtoMessage() {} +func (*TransactionInfo) Descriptor() ([]byte, []int) { + return fileDescriptor_0aa947b204e6a7c2, []int{39} } -func (m *TransactionHashesResponse) XXX_Unmarshal(b []byte) error { +func (m *TransactionInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *TransactionHashesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *TransactionInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_TransactionHashesResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_TransactionInfo.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -2800,49 +2628,95 @@ func (m *TransactionHashesResponse) XXX_Marshal(b []byte, deterministic bool) ([ return b[:n], nil } } -func (m *TransactionHashesResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_TransactionHashesResponse.Merge(m, src) +func (m *TransactionInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_TransactionInfo.Merge(m, src) } -func (m *TransactionHashesResponse) XXX_Size() int { +func (m *TransactionInfo) XXX_Size() int { return m.Size() } -func (m *TransactionHashesResponse) XXX_DiscardUnknown() { - xxx_messageInfo_TransactionHashesResponse.DiscardUnknown(m) +func (m *TransactionInfo) XXX_DiscardUnknown() { + xxx_messageInfo_TransactionInfo.DiscardUnknown(m) +} + +var xxx_messageInfo_TransactionInfo proto.InternalMessageInfo + +type isTransactionInfo_XHeight interface { + isTransactionInfo_XHeight() + MarshalTo([]byte) (int, error) + Size() int +} + +type TransactionInfo_Height struct { + Height uint64 `protobuf:"varint,1,opt,name=height,proto3,oneof" json:"height,omitempty"` } -var xxx_messageInfo_TransactionHashesResponse proto.InternalMessageInfo +func (*TransactionInfo_Height) isTransactionInfo_XHeight() {} -func (m *TransactionHashesResponse) GetBlockHeight() uint64 { +func (m *TransactionInfo) GetXHeight() isTransactionInfo_XHeight { if m != nil { - return m.BlockHeight + return m.XHeight + } + return nil +} + +func (m *TransactionInfo) GetHeight() uint64 { + if x, ok := m.GetXHeight().(*TransactionInfo_Height); ok { + return x.Height } return 0 } -func (m *TransactionHashesResponse) GetTxHash() []byte { +func (m *TransactionInfo) GetId() *v1alpha1.Id { + if m != nil { + return m.Id + } + return nil +} + +func (m *TransactionInfo) GetTransaction() *v1alpha1.Transaction { if m != nil { - return m.TxHash + return m.Transaction } return nil } -type TransactionByHashRequest struct { - // The transaction hash to query for. - TxHash []byte `protobuf:"bytes,1,opt,name=tx_hash,json=txHash,proto3" json:"tx_hash,omitempty"` +func (m *TransactionInfo) GetPerspective() *v1alpha1.TransactionPerspective { + if m != nil { + return m.Perspective + } + return nil } -func (m *TransactionByHashRequest) Reset() { *m = TransactionByHashRequest{} } -func (m *TransactionByHashRequest) String() string { return proto.CompactTextString(m) } -func (*TransactionByHashRequest) ProtoMessage() {} -func (*TransactionByHashRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{39} +func (m *TransactionInfo) GetView() *v1alpha1.TransactionView { + if m != nil { + return m.View + } + return nil +} + +// XXX_OneofWrappers is for the internal use of the proto package. +func (*TransactionInfo) XXX_OneofWrappers() []interface{} { + return []interface{}{ + (*TransactionInfo_Height)(nil), + } +} + +type TransactionInfoResponse struct { + TxInfo *TransactionInfo `protobuf:"bytes,1,opt,name=tx_info,json=txInfo,proto3" json:"tx_info,omitempty"` +} + +func (m *TransactionInfoResponse) Reset() { *m = TransactionInfoResponse{} } +func (m *TransactionInfoResponse) String() string { return proto.CompactTextString(m) } +func (*TransactionInfoResponse) ProtoMessage() {} +func (*TransactionInfoResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_0aa947b204e6a7c2, []int{40} } -func (m *TransactionByHashRequest) XXX_Unmarshal(b []byte) error { +func (m *TransactionInfoResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *TransactionByHashRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *TransactionInfoResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_TransactionByHashRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_TransactionInfoResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -2852,42 +2726,41 @@ func (m *TransactionByHashRequest) XXX_Marshal(b []byte, deterministic bool) ([] return b[:n], nil } } -func (m *TransactionByHashRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_TransactionByHashRequest.Merge(m, src) +func (m *TransactionInfoResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_TransactionInfoResponse.Merge(m, src) } -func (m *TransactionByHashRequest) XXX_Size() int { +func (m *TransactionInfoResponse) XXX_Size() int { return m.Size() } -func (m *TransactionByHashRequest) XXX_DiscardUnknown() { - xxx_messageInfo_TransactionByHashRequest.DiscardUnknown(m) +func (m *TransactionInfoResponse) XXX_DiscardUnknown() { + xxx_messageInfo_TransactionInfoResponse.DiscardUnknown(m) } -var xxx_messageInfo_TransactionByHashRequest proto.InternalMessageInfo +var xxx_messageInfo_TransactionInfoResponse proto.InternalMessageInfo -func (m *TransactionByHashRequest) GetTxHash() []byte { +func (m *TransactionInfoResponse) GetTxInfo() *TransactionInfo { if m != nil { - return m.TxHash + return m.TxInfo } return nil } -// A full transaction response -type TransactionByHashResponse struct { - Tx *v1alpha1.Transaction `protobuf:"bytes,1,opt,name=tx,proto3" json:"tx,omitempty"` +type TransactionInfoByHashResponse struct { + TxInfo *TransactionInfo `protobuf:"bytes,1,opt,name=tx_info,json=txInfo,proto3" json:"tx_info,omitempty"` } -func (m *TransactionByHashResponse) Reset() { *m = TransactionByHashResponse{} } -func (m *TransactionByHashResponse) String() string { return proto.CompactTextString(m) } -func (*TransactionByHashResponse) ProtoMessage() {} -func (*TransactionByHashResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{40} +func (m *TransactionInfoByHashResponse) Reset() { *m = TransactionInfoByHashResponse{} } +func (m *TransactionInfoByHashResponse) String() string { return proto.CompactTextString(m) } +func (*TransactionInfoByHashResponse) ProtoMessage() {} +func (*TransactionInfoByHashResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_0aa947b204e6a7c2, []int{41} } -func (m *TransactionByHashResponse) XXX_Unmarshal(b []byte) error { +func (m *TransactionInfoByHashResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *TransactionByHashResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *TransactionInfoByHashResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_TransactionByHashResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_TransactionInfoByHashResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -2897,46 +2770,41 @@ func (m *TransactionByHashResponse) XXX_Marshal(b []byte, deterministic bool) ([ return b[:n], nil } } -func (m *TransactionByHashResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_TransactionByHashResponse.Merge(m, src) +func (m *TransactionInfoByHashResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_TransactionInfoByHashResponse.Merge(m, src) } -func (m *TransactionByHashResponse) XXX_Size() int { +func (m *TransactionInfoByHashResponse) XXX_Size() int { return m.Size() } -func (m *TransactionByHashResponse) XXX_DiscardUnknown() { - xxx_messageInfo_TransactionByHashResponse.DiscardUnknown(m) +func (m *TransactionInfoByHashResponse) XXX_DiscardUnknown() { + xxx_messageInfo_TransactionInfoByHashResponse.DiscardUnknown(m) } -var xxx_messageInfo_TransactionByHashResponse proto.InternalMessageInfo +var xxx_messageInfo_TransactionInfoByHashResponse proto.InternalMessageInfo -func (m *TransactionByHashResponse) GetTx() *v1alpha1.Transaction { +func (m *TransactionInfoByHashResponse) GetTxInfo() *TransactionInfo { if m != nil { - return m.Tx + return m.TxInfo } return nil } -type TransactionsRequest struct { - // Types that are valid to be assigned to XStartHeight: - // *TransactionsRequest_StartHeight - XStartHeight isTransactionsRequest_XStartHeight `protobuf_oneof:"_start_height"` - // Types that are valid to be assigned to XEndHeight: - // *TransactionsRequest_EndHeight - XEndHeight isTransactionsRequest_XEndHeight `protobuf_oneof:"_end_height"` +type NotesResponse struct { + NoteRecord *SpendableNoteRecord `protobuf:"bytes,1,opt,name=note_record,json=noteRecord,proto3" json:"note_record,omitempty"` } -func (m *TransactionsRequest) Reset() { *m = TransactionsRequest{} } -func (m *TransactionsRequest) String() string { return proto.CompactTextString(m) } -func (*TransactionsRequest) ProtoMessage() {} -func (*TransactionsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{41} +func (m *NotesResponse) Reset() { *m = NotesResponse{} } +func (m *NotesResponse) String() string { return proto.CompactTextString(m) } +func (*NotesResponse) ProtoMessage() {} +func (*NotesResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_0aa947b204e6a7c2, []int{42} } -func (m *TransactionsRequest) XXX_Unmarshal(b []byte) error { +func (m *NotesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *TransactionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *NotesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_TransactionsRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_NotesResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -2946,93 +2814,42 @@ func (m *TransactionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *TransactionsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_TransactionsRequest.Merge(m, src) +func (m *NotesResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_NotesResponse.Merge(m, src) } -func (m *TransactionsRequest) XXX_Size() int { +func (m *NotesResponse) XXX_Size() int { return m.Size() } -func (m *TransactionsRequest) XXX_DiscardUnknown() { - xxx_messageInfo_TransactionsRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_TransactionsRequest proto.InternalMessageInfo - -type isTransactionsRequest_XStartHeight interface { - isTransactionsRequest_XStartHeight() - MarshalTo([]byte) (int, error) - Size() int -} -type isTransactionsRequest_XEndHeight interface { - isTransactionsRequest_XEndHeight() - MarshalTo([]byte) (int, error) - Size() int -} - -type TransactionsRequest_StartHeight struct { - StartHeight uint64 `protobuf:"varint,1,opt,name=start_height,json=startHeight,proto3,oneof" json:"start_height,omitempty"` -} -type TransactionsRequest_EndHeight struct { - EndHeight uint64 `protobuf:"varint,2,opt,name=end_height,json=endHeight,proto3,oneof" json:"end_height,omitempty"` +func (m *NotesResponse) XXX_DiscardUnknown() { + xxx_messageInfo_NotesResponse.DiscardUnknown(m) } -func (*TransactionsRequest_StartHeight) isTransactionsRequest_XStartHeight() {} -func (*TransactionsRequest_EndHeight) isTransactionsRequest_XEndHeight() {} +var xxx_messageInfo_NotesResponse proto.InternalMessageInfo -func (m *TransactionsRequest) GetXStartHeight() isTransactionsRequest_XStartHeight { - if m != nil { - return m.XStartHeight - } - return nil -} -func (m *TransactionsRequest) GetXEndHeight() isTransactionsRequest_XEndHeight { +func (m *NotesResponse) GetNoteRecord() *SpendableNoteRecord { if m != nil { - return m.XEndHeight + return m.NoteRecord } return nil } -func (m *TransactionsRequest) GetStartHeight() uint64 { - if x, ok := m.GetXStartHeight().(*TransactionsRequest_StartHeight); ok { - return x.StartHeight - } - return 0 -} - -func (m *TransactionsRequest) GetEndHeight() uint64 { - if x, ok := m.GetXEndHeight().(*TransactionsRequest_EndHeight); ok { - return x.EndHeight - } - return 0 -} - -// XXX_OneofWrappers is for the internal use of the proto package. -func (*TransactionsRequest) XXX_OneofWrappers() []interface{} { - return []interface{}{ - (*TransactionsRequest_StartHeight)(nil), - (*TransactionsRequest_EndHeight)(nil), - } -} - -// A streaming full transaction response -type TransactionsResponse struct { - BlockHeight uint64 `protobuf:"varint,1,opt,name=block_height,json=blockHeight,proto3" json:"block_height,omitempty"` - TxHash []byte `protobuf:"bytes,2,opt,name=tx_hash,json=txHash,proto3" json:"tx_hash,omitempty"` - Tx *v1alpha1.Transaction `protobuf:"bytes,3,opt,name=tx,proto3" json:"tx,omitempty"` +type NotesForVotingResponse struct { + NoteRecord *SpendableNoteRecord `protobuf:"bytes,1,opt,name=note_record,json=noteRecord,proto3" json:"note_record,omitempty"` + IdentityKey *v1alpha11.IdentityKey `protobuf:"bytes,2,opt,name=identity_key,json=identityKey,proto3" json:"identity_key,omitempty"` } -func (m *TransactionsResponse) Reset() { *m = TransactionsResponse{} } -func (m *TransactionsResponse) String() string { return proto.CompactTextString(m) } -func (*TransactionsResponse) ProtoMessage() {} -func (*TransactionsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{42} +func (m *NotesForVotingResponse) Reset() { *m = NotesForVotingResponse{} } +func (m *NotesForVotingResponse) String() string { return proto.CompactTextString(m) } +func (*NotesForVotingResponse) ProtoMessage() {} +func (*NotesForVotingResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_0aa947b204e6a7c2, []int{43} } -func (m *TransactionsResponse) XXX_Unmarshal(b []byte) error { +func (m *NotesForVotingResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *TransactionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *NotesForVotingResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_TransactionsResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_NotesForVotingResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -3042,217 +2859,10 @@ func (m *TransactionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } -func (m *TransactionsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_TransactionsResponse.Merge(m, src) +func (m *NotesForVotingResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_NotesForVotingResponse.Merge(m, src) } -func (m *TransactionsResponse) XXX_Size() int { - return m.Size() -} -func (m *TransactionsResponse) XXX_DiscardUnknown() { - xxx_messageInfo_TransactionsResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_TransactionsResponse proto.InternalMessageInfo - -func (m *TransactionsResponse) GetBlockHeight() uint64 { - if m != nil { - return m.BlockHeight - } - return 0 -} - -func (m *TransactionsResponse) GetTxHash() []byte { - if m != nil { - return m.TxHash - } - return nil -} - -func (m *TransactionsResponse) GetTx() *v1alpha1.Transaction { - if m != nil { - return m.Tx - } - return nil -} - -type TransactionPerspectiveRequest struct { - TxHash []byte `protobuf:"bytes,1,opt,name=tx_hash,json=txHash,proto3" json:"tx_hash,omitempty"` -} - -func (m *TransactionPerspectiveRequest) Reset() { *m = TransactionPerspectiveRequest{} } -func (m *TransactionPerspectiveRequest) String() string { return proto.CompactTextString(m) } -func (*TransactionPerspectiveRequest) ProtoMessage() {} -func (*TransactionPerspectiveRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{43} -} -func (m *TransactionPerspectiveRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *TransactionPerspectiveRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_TransactionPerspectiveRequest.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 *TransactionPerspectiveRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_TransactionPerspectiveRequest.Merge(m, src) -} -func (m *TransactionPerspectiveRequest) XXX_Size() int { - return m.Size() -} -func (m *TransactionPerspectiveRequest) XXX_DiscardUnknown() { - xxx_messageInfo_TransactionPerspectiveRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_TransactionPerspectiveRequest proto.InternalMessageInfo - -func (m *TransactionPerspectiveRequest) GetTxHash() []byte { - if m != nil { - return m.TxHash - } - return nil -} - -type TransactionPerspectiveResponse struct { - Txp *v1alpha1.TransactionPerspective `protobuf:"bytes,1,opt,name=txp,proto3" json:"txp,omitempty"` - Tx *v1alpha1.Transaction `protobuf:"bytes,2,opt,name=tx,proto3" json:"tx,omitempty"` - Txv *v1alpha1.TransactionView `protobuf:"bytes,3,opt,name=txv,proto3" json:"txv,omitempty"` -} - -func (m *TransactionPerspectiveResponse) Reset() { *m = TransactionPerspectiveResponse{} } -func (m *TransactionPerspectiveResponse) String() string { return proto.CompactTextString(m) } -func (*TransactionPerspectiveResponse) ProtoMessage() {} -func (*TransactionPerspectiveResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{44} -} -func (m *TransactionPerspectiveResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *TransactionPerspectiveResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_TransactionPerspectiveResponse.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 *TransactionPerspectiveResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_TransactionPerspectiveResponse.Merge(m, src) -} -func (m *TransactionPerspectiveResponse) XXX_Size() int { - return m.Size() -} -func (m *TransactionPerspectiveResponse) XXX_DiscardUnknown() { - xxx_messageInfo_TransactionPerspectiveResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_TransactionPerspectiveResponse proto.InternalMessageInfo - -func (m *TransactionPerspectiveResponse) GetTxp() *v1alpha1.TransactionPerspective { - if m != nil { - return m.Txp - } - return nil -} - -func (m *TransactionPerspectiveResponse) GetTx() *v1alpha1.Transaction { - if m != nil { - return m.Tx - } - return nil -} - -func (m *TransactionPerspectiveResponse) GetTxv() *v1alpha1.TransactionView { - if m != nil { - return m.Txv - } - return nil -} - -type NotesResponse struct { - NoteRecord *SpendableNoteRecord `protobuf:"bytes,1,opt,name=note_record,json=noteRecord,proto3" json:"note_record,omitempty"` -} - -func (m *NotesResponse) Reset() { *m = NotesResponse{} } -func (m *NotesResponse) String() string { return proto.CompactTextString(m) } -func (*NotesResponse) ProtoMessage() {} -func (*NotesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{45} -} -func (m *NotesResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *NotesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_NotesResponse.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 *NotesResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_NotesResponse.Merge(m, src) -} -func (m *NotesResponse) XXX_Size() int { - return m.Size() -} -func (m *NotesResponse) XXX_DiscardUnknown() { - xxx_messageInfo_NotesResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_NotesResponse proto.InternalMessageInfo - -func (m *NotesResponse) GetNoteRecord() *SpendableNoteRecord { - if m != nil { - return m.NoteRecord - } - return nil -} - -type NotesForVotingResponse struct { - NoteRecord *SpendableNoteRecord `protobuf:"bytes,1,opt,name=note_record,json=noteRecord,proto3" json:"note_record,omitempty"` - IdentityKey *v1alpha11.IdentityKey `protobuf:"bytes,2,opt,name=identity_key,json=identityKey,proto3" json:"identity_key,omitempty"` -} - -func (m *NotesForVotingResponse) Reset() { *m = NotesForVotingResponse{} } -func (m *NotesForVotingResponse) String() string { return proto.CompactTextString(m) } -func (*NotesForVotingResponse) ProtoMessage() {} -func (*NotesForVotingResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{46} -} -func (m *NotesForVotingResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *NotesForVotingResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_NotesForVotingResponse.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 *NotesForVotingResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_NotesForVotingResponse.Merge(m, src) -} -func (m *NotesForVotingResponse) XXX_Size() int { +func (m *NotesForVotingResponse) XXX_Size() int { return m.Size() } func (m *NotesForVotingResponse) XXX_DiscardUnknown() { @@ -3300,7 +2910,7 @@ func (m *SpendableNoteRecord) Reset() { *m = SpendableNoteRecord{} } func (m *SpendableNoteRecord) String() string { return proto.CompactTextString(m) } func (*SpendableNoteRecord) ProtoMessage() {} func (*SpendableNoteRecord) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{47} + return fileDescriptor_0aa947b204e6a7c2, []int{44} } func (m *SpendableNoteRecord) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3427,7 +3037,7 @@ func (m *SwapRecord) Reset() { *m = SwapRecord{} } func (m *SwapRecord) String() string { return proto.CompactTextString(m) } func (*SwapRecord) ProtoMessage() {} func (*SwapRecord) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{48} + return fileDescriptor_0aa947b204e6a7c2, []int{45} } func (m *SwapRecord) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3573,14 +3183,11 @@ func init() { proto.RegisterType((*SwapByCommitmentResponse)(nil), "penumbra.view.v1alpha1.SwapByCommitmentResponse") proto.RegisterType((*NullifierStatusRequest)(nil), "penumbra.view.v1alpha1.NullifierStatusRequest") proto.RegisterType((*NullifierStatusResponse)(nil), "penumbra.view.v1alpha1.NullifierStatusResponse") - proto.RegisterType((*TransactionHashesRequest)(nil), "penumbra.view.v1alpha1.TransactionHashesRequest") - proto.RegisterType((*TransactionHashesResponse)(nil), "penumbra.view.v1alpha1.TransactionHashesResponse") - proto.RegisterType((*TransactionByHashRequest)(nil), "penumbra.view.v1alpha1.TransactionByHashRequest") - proto.RegisterType((*TransactionByHashResponse)(nil), "penumbra.view.v1alpha1.TransactionByHashResponse") - proto.RegisterType((*TransactionsRequest)(nil), "penumbra.view.v1alpha1.TransactionsRequest") - proto.RegisterType((*TransactionsResponse)(nil), "penumbra.view.v1alpha1.TransactionsResponse") - proto.RegisterType((*TransactionPerspectiveRequest)(nil), "penumbra.view.v1alpha1.TransactionPerspectiveRequest") - proto.RegisterType((*TransactionPerspectiveResponse)(nil), "penumbra.view.v1alpha1.TransactionPerspectiveResponse") + proto.RegisterType((*TransactionInfoByHashRequest)(nil), "penumbra.view.v1alpha1.TransactionInfoByHashRequest") + proto.RegisterType((*TransactionInfoRequest)(nil), "penumbra.view.v1alpha1.TransactionInfoRequest") + proto.RegisterType((*TransactionInfo)(nil), "penumbra.view.v1alpha1.TransactionInfo") + proto.RegisterType((*TransactionInfoResponse)(nil), "penumbra.view.v1alpha1.TransactionInfoResponse") + proto.RegisterType((*TransactionInfoByHashResponse)(nil), "penumbra.view.v1alpha1.TransactionInfoByHashResponse") proto.RegisterType((*NotesResponse)(nil), "penumbra.view.v1alpha1.NotesResponse") proto.RegisterType((*NotesForVotingResponse)(nil), "penumbra.view.v1alpha1.NotesForVotingResponse") proto.RegisterType((*SpendableNoteRecord)(nil), "penumbra.view.v1alpha1.SpendableNoteRecord") @@ -3590,180 +3197,176 @@ func init() { func init() { proto.RegisterFile("penumbra/view/v1alpha1/view.proto", fileDescriptor_0aa947b204e6a7c2) } var fileDescriptor_0aa947b204e6a7c2 = []byte{ - // 2768 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0xcf, 0x73, 0xe4, 0xc4, - 0xf5, 0x5f, 0xcd, 0xf8, 0xd7, 0xbe, 0x19, 0xcf, 0x78, 0x65, 0xaf, 0x3d, 0xcc, 0x17, 0xcc, 0x22, - 0x76, 0x17, 0x7f, 0x97, 0x30, 0xde, 0xf5, 0x02, 0x21, 0x06, 0x0a, 0x3c, 0x18, 0x63, 0x17, 0xbb, - 0xe0, 0xc8, 0xac, 0x37, 0x10, 0x13, 0x55, 0x5b, 0x6a, 0x7b, 0x14, 0x6b, 0x24, 0x21, 0xf5, 0xf8, - 0x07, 0x39, 0x71, 0x21, 0x14, 0xa7, 0x54, 0xe5, 0x90, 0xe4, 0x9a, 0x5b, 0x52, 0xa9, 0xca, 0x29, - 0x7f, 0x41, 0x2e, 0x54, 0x0e, 0x29, 0x0e, 0xa4, 0x2a, 0x95, 0x54, 0xa5, 0x52, 0xcb, 0x2d, 0x7f, - 0x40, 0xae, 0x49, 0xf5, 0x2f, 0x8d, 0xa4, 0x91, 0x98, 0x19, 0xdb, 0x54, 0xb2, 0xe1, 0x36, 0xea, - 0x7e, 0xef, 0xf3, 0x5e, 0xbf, 0xd7, 0xfd, 0xfa, 0xbd, 0x37, 0x0d, 0x4f, 0xf8, 0xd8, 0xed, 0xb4, - 0x77, 0x03, 0xb4, 0x78, 0x68, 0xe3, 0xa3, 0xc5, 0xc3, 0x5b, 0xc8, 0xf1, 0x5b, 0xe8, 0x16, 0xfb, - 0x6a, 0xf8, 0x81, 0x47, 0x3c, 0x75, 0x56, 0x92, 0x34, 0xd8, 0xa0, 0x24, 0xa9, 0x2f, 0x44, 0xac, - 0xa6, 0x17, 0xe0, 0x45, 0xb3, 0x85, 0x6c, 0xb7, 0x0b, 0xc0, 0x3e, 0x39, 0x42, 0xfd, 0x46, 0x8a, - 0x32, 0x38, 0xf1, 0x89, 0x17, 0x23, 0x65, 0xdf, 0x82, 0xf6, 0x6a, 0x92, 0xd6, 0xc2, 0xc7, 0x5d, - 0x42, 0x0b, 0x1f, 0x0b, 0xaa, 0x67, 0x93, 0x54, 0x24, 0x40, 0x6e, 0x88, 0x4c, 0x62, 0x7b, 0x31, - 0x0d, 0x62, 0x83, 0xd9, 0xd8, 0xf6, 0xae, 0xd9, 0xa5, 0xb6, 0x77, 0x4d, 0x4e, 0xa5, 0xfd, 0x42, - 0x81, 0xff, 0x6b, 0x06, 0x1e, 0xb2, 0x4c, 0x14, 0x92, 0x77, 0xba, 0x20, 0x3a, 0xfe, 0xa0, 0x83, - 0x43, 0xa2, 0x7e, 0x17, 0x4a, 0x31, 0xe8, 0x9a, 0x72, 0x45, 0x59, 0x28, 0x2d, 0x2d, 0x36, 0x22, - 0x2b, 0x51, 0xec, 0x46, 0x5c, 0xb8, 0x94, 0xd1, 0x88, 0x83, 0xc5, 0x31, 0xd4, 0xa7, 0xa0, 0x8a, - 0x8e, 0x90, 0x4d, 0x0c, 0x0b, 0x13, 0xcc, 0x61, 0x0b, 0x57, 0x94, 0x85, 0x09, 0xbd, 0xc2, 0x86, - 0x57, 0xe5, 0xa8, 0xb6, 0x0d, 0x8f, 0x66, 0xab, 0x16, 0xfa, 0x9e, 0x1b, 0x62, 0xf5, 0x79, 0x28, - 0xd8, 0x96, 0x50, 0xe9, 0xfa, 0x20, 0x2a, 0x6d, 0x58, 0x7a, 0xc1, 0xb6, 0xb4, 0x5f, 0x01, 0x3c, - 0x12, 0xc3, 0xdb, 0x74, 0x90, 0xeb, 0xe2, 0x40, 0xae, 0xf8, 0x49, 0x98, 0xc4, 0xc7, 0xbe, 0x1d, - 0x9c, 0x18, 0x2d, 0x6c, 0xef, 0xb7, 0x08, 0x13, 0x30, 0xa2, 0x97, 0xf9, 0xe0, 0x3a, 0x1b, 0x53, - 0x9f, 0x85, 0xe2, 0x1e, 0xc6, 0x4c, 0xef, 0xd2, 0x92, 0x96, 0x92, 0x2d, 0x5c, 0x1c, 0x89, 0x5d, - 0xc3, 0x58, 0xa7, 0xe4, 0xaa, 0x0a, 0x23, 0x6d, 0xdc, 0xf6, 0x6a, 0xc5, 0x2b, 0xca, 0xc2, 0x45, - 0x9d, 0xfd, 0x56, 0x77, 0x60, 0x0a, 0x99, 0xa6, 0xd7, 0x71, 0x89, 0xb1, 0x1f, 0x78, 0x1d, 0xdf, - 0xb0, 0xad, 0x5a, 0x85, 0xc1, 0x3e, 0xd3, 0x07, 0x76, 0x85, 0xb3, 0xbd, 0x41, 0xb9, 0x36, 0xac, - 0xf5, 0x0b, 0x7a, 0x05, 0x25, 0x46, 0x3e, 0x51, 0x14, 0xf5, 0x55, 0x18, 0x25, 0xde, 0x01, 0x76, - 0x6b, 0x55, 0x06, 0x79, 0xad, 0x91, 0xbd, 0xbd, 0x1b, 0xdb, 0x36, 0x3e, 0x5a, 0xe9, 0x90, 0xd6, - 0x3b, 0x94, 0x78, 0x5d, 0xd1, 0x39, 0x17, 0x45, 0xd0, 0x61, 0xdc, 0xeb, 0x10, 0xbf, 0x43, 0xc2, - 0xda, 0xcc, 0x95, 0xe2, 0x42, 0x69, 0xe9, 0x85, 0x3c, 0x8c, 0x5c, 0x93, 0x36, 0xde, 0x66, 0x00, - 0xba, 0x04, 0x52, 0xef, 0xc0, 0x68, 0x78, 0x84, 0xfc, 0xb0, 0x36, 0xcf, 0x10, 0x9f, 0x1f, 0x1e, - 0x71, 0xeb, 0x08, 0xf9, 0x3a, 0x07, 0x51, 0x77, 0xa0, 0x64, 0x61, 0x07, 0xef, 0x23, 0x4a, 0x17, - 0xd6, 0x16, 0x18, 0xe6, 0xf2, 0xf0, 0x98, 0xab, 0x1c, 0x04, 0xeb, 0x71, 0x38, 0x75, 0x17, 0x26, - 0x3b, 0x6e, 0x1c, 0x7f, 0x89, 0xe1, 0xbf, 0x34, 0x3c, 0xfe, 0x3d, 0x09, 0x83, 0xf5, 0x24, 0xa4, - 0xba, 0x06, 0x25, 0x7b, 0xd7, 0x34, 0x38, 0x57, 0x58, 0x7b, 0x89, 0x49, 0xb8, 0x96, 0x72, 0x3f, - 0x3d, 0xb3, 0xdd, 0x9d, 0xbc, 0x6b, 0xae, 0xf0, 0xc3, 0x00, 0xb6, 0xfc, 0x19, 0xd6, 0x3f, 0x56, - 0x60, 0x8c, 0xdb, 0x5a, 0x5d, 0x86, 0xd1, 0x43, 0xe4, 0x74, 0xb0, 0x38, 0x1e, 0x57, 0xfb, 0xec, - 0xa5, 0x6d, 0x4a, 0xab, 0x73, 0x16, 0xf5, 0x55, 0x18, 0x47, 0x96, 0x15, 0xe0, 0x30, 0x14, 0x1b, - 0xfc, 0x7a, 0xbf, 0x9d, 0xc8, 0xa9, 0x75, 0xc9, 0x56, 0xff, 0xbd, 0x02, 0x23, 0xd4, 0x45, 0x67, - 0x52, 0x63, 0x03, 0xca, 0x04, 0x05, 0xfb, 0x98, 0x18, 0x28, 0x0c, 0x31, 0x19, 0x54, 0x17, 0x4a, - 0xbb, 0x61, 0xe9, 0x25, 0xce, 0xcb, 0x3e, 0xe5, 0x71, 0x2d, 0x0e, 0x75, 0x5c, 0xeb, 0x3f, 0x57, - 0x60, 0x42, 0x6e, 0x0a, 0xf5, 0x65, 0x18, 0x43, 0x6d, 0x7a, 0xba, 0xc4, 0x52, 0xae, 0xf5, 0xd3, - 0x83, 0x11, 0xeb, 0x82, 0x49, 0xbd, 0x0b, 0x65, 0xdb, 0xc2, 0x2e, 0xb1, 0xc9, 0x89, 0x71, 0x80, - 0x4f, 0xc4, 0x62, 0x6e, 0xf4, 0x01, 0xd9, 0x10, 0x2c, 0x6f, 0xe2, 0x13, 0xbd, 0x64, 0x77, 0x3f, - 0xea, 0xeb, 0x00, 0xdd, 0xed, 0x74, 0x16, 0x2b, 0x37, 0xa7, 0xe1, 0x92, 0x91, 0x0e, 0x40, 0xcd, - 0x09, 0x18, 0x33, 0x58, 0x04, 0xd0, 0x30, 0xd4, 0xb3, 0x76, 0xb4, 0x88, 0xc0, 0x6f, 0xc0, 0x88, - 0xef, 0x20, 0x79, 0x2d, 0xdc, 0x1e, 0xf2, 0x5a, 0xa0, 0x68, 0x3a, 0x03, 0xd0, 0x6c, 0xb8, 0x2c, - 0x36, 0x51, 0xf3, 0x64, 0xc3, 0xb5, 0xf0, 0xb1, 0x8c, 0xc6, 0x9b, 0x30, 0x29, 0x36, 0x95, 0x61, - 0xd3, 0x71, 0x21, 0xea, 0xe9, 0xc1, 0x76, 0x24, 0x87, 0x2a, 0xa3, 0xd8, 0x97, 0xf6, 0x1e, 0xcc, - 0xa6, 0x45, 0x89, 0xd5, 0xc4, 0xf6, 0xbd, 0x72, 0xaa, 0x7d, 0xaf, 0xbd, 0x0b, 0x97, 0x19, 0x64, - 0xf3, 0x44, 0x4e, 0x89, 0x65, 0x9c, 0x1d, 0xfa, 0x23, 0x05, 0x66, 0xd3, 0xd8, 0x42, 0xef, 0x7b, - 0x67, 0xb7, 0xd1, 0xfa, 0x85, 0xa4, 0x95, 0x3e, 0x51, 0x94, 0xe6, 0x14, 0x54, 0x8c, 0x04, 0xae, - 0x76, 0x00, 0x73, 0xaf, 0xfb, 0x2d, 0xdc, 0xc6, 0x01, 0x72, 0x52, 0x0b, 0x3c, 0x7f, 0x3f, 0xed, - 0x40, 0xad, 0x57, 0xd8, 0xb9, 0x79, 0xea, 0xfb, 0x30, 0xd7, 0x44, 0x0e, 0x72, 0x4d, 0xfc, 0x35, - 0xf8, 0xea, 0x67, 0x0a, 0xd4, 0x7a, 0xd1, 0x85, 0xee, 0x2f, 0xc1, 0x28, 0x8f, 0x67, 0xca, 0x50, - 0xf1, 0x8c, 0x33, 0xc5, 0xc2, 0x50, 0xe1, 0x14, 0x61, 0x48, 0xbb, 0x06, 0x93, 0x89, 0xab, 0x5e, - 0x9d, 0x81, 0x51, 0x9b, 0x1e, 0x69, 0xa6, 0x4d, 0x59, 0xe7, 0x1f, 0x9a, 0x0e, 0x55, 0x49, 0x26, - 0xad, 0xf2, 0x0a, 0x14, 0xf7, 0x0e, 0x0f, 0x84, 0xd2, 0xfd, 0x52, 0x93, 0xb5, 0x8e, 0xe3, 0x50, - 0x00, 0xdb, 0xdd, 0xa7, 0xa1, 0x8b, 0x72, 0x6a, 0x6f, 0xc3, 0x54, 0x17, 0x53, 0xd8, 0xe2, 0x45, - 0x99, 0x9e, 0x28, 0x43, 0xa4, 0x27, 0x22, 0x39, 0xd1, 0xfe, 0xa8, 0xc0, 0xe4, 0x16, 0x41, 0xa4, - 0x13, 0x79, 0xee, 0xbf, 0x3c, 0x97, 0xea, 0x17, 0x6b, 0x75, 0xa8, 0xc8, 0xf5, 0x08, 0xfb, 0x3c, - 0x0e, 0xa5, 0xf0, 0xc4, 0x35, 0x93, 0x99, 0x28, 0xd0, 0x21, 0x91, 0x87, 0x3e, 0x0e, 0x25, 0x13, - 0x11, 0xb3, 0x65, 0xbb, 0xfb, 0x46, 0xc7, 0x17, 0x79, 0x34, 0xc8, 0xa1, 0x7b, 0xbe, 0xf6, 0x85, - 0x02, 0xd3, 0x1c, 0x74, 0x8b, 0x04, 0x18, 0xb5, 0xff, 0x47, 0x4c, 0x15, 0xc0, 0x4c, 0x72, 0x55, - 0xc2, 0x60, 0xdf, 0x81, 0x47, 0x1c, 0x44, 0x70, 0x48, 0x8c, 0x03, 0xd7, 0x3b, 0x72, 0x8d, 0x5d, - 0xc7, 0x33, 0x0f, 0x92, 0xe6, 0x9b, 0xe5, 0x04, 0x6f, 0xd2, 0xf9, 0x26, 0x9d, 0xee, 0x9a, 0x32, - 0x6e, 0xeb, 0x42, 0xda, 0xd6, 0xda, 0x6f, 0x8b, 0x50, 0x7e, 0xcb, 0x23, 0x38, 0x8c, 0x55, 0x0a, - 0xb6, 0x6b, 0x3a, 0x1d, 0x0b, 0x1b, 0xa1, 0x8f, 0xc5, 0x91, 0x9c, 0xd0, 0xcb, 0x62, 0x70, 0x8b, - 0x8e, 0xa9, 0x2b, 0x30, 0xc1, 0x4e, 0x2e, 0x35, 0x70, 0x71, 0xa8, 0x13, 0x3f, 0x8e, 0xf8, 0x8f, - 0xde, 0xd8, 0x3a, 0x72, 0xc6, 0xd8, 0xaa, 0x5e, 0x87, 0x2a, 0x0f, 0x08, 0x06, 0xf1, 0x98, 0xee, - 0x56, 0x6d, 0x94, 0xad, 0x77, 0x92, 0x0f, 0xbf, 0xe3, 0x51, 0xe5, 0xad, 0x87, 0x7d, 0x97, 0x7c, - 0x51, 0x80, 0xcb, 0xcc, 0x63, 0x6b, 0x5e, 0xb0, 0xed, 0x11, 0xdb, 0xdd, 0x97, 0xae, 0xbb, 0x01, - 0x97, 0x0e, 0x3d, 0x82, 0x76, 0x1d, 0x6c, 0x20, 0x92, 0xdc, 0x1f, 0x55, 0x31, 0xb1, 0x42, 0xc4, - 0xc6, 0xe8, 0x31, 0x7f, 0xf1, 0xac, 0xe6, 0x7f, 0xc8, 0xcd, 0xfa, 0x69, 0x11, 0x2a, 0xf7, 0x6d, - 0xe2, 0xc6, 0xee, 0xcc, 0x77, 0x61, 0xca, 0xf5, 0x08, 0x36, 0x4c, 0xaf, 0xdd, 0xb6, 0x49, 0x1b, - 0xbb, 0x84, 0xd6, 0x0e, 0xb4, 0x8c, 0x69, 0xf4, 0x59, 0x11, 0x3d, 0xc6, 0xf8, 0xb5, 0x88, 0x4d, - 0xaf, 0x52, 0x9c, 0xee, 0x77, 0xa8, 0xfe, 0x00, 0xa6, 0x62, 0x89, 0xa4, 0xc1, 0xf2, 0xcd, 0xe2, - 0xe9, 0xf3, 0xcd, 0x2a, 0x49, 0x0e, 0x3c, 0xec, 0xce, 0xc0, 0x50, 0x8d, 0x7c, 0x21, 0x82, 0xa0, - 0x0e, 0xe5, 0x23, 0x3e, 0x64, 0x58, 0x88, 0xa0, 0x61, 0x9a, 0x36, 0x02, 0x6a, 0x15, 0x11, 0xa4, - 0x97, 0x8e, 0xba, 0x1f, 0xda, 0xdf, 0x14, 0x98, 0x15, 0x93, 0x2b, 0xae, 0xd5, 0xec, 0xd8, 0x8e, - 0x25, 0x7d, 0x9f, 0xe5, 0x20, 0xe5, 0x1c, 0x1d, 0x64, 0x81, 0x8a, 0x3a, 0xa4, 0xe5, 0x05, 0xf6, - 0x87, 0xac, 0x5e, 0xe6, 0x8b, 0xe2, 0xe9, 0xcf, 0x73, 0x83, 0x48, 0x58, 0x89, 0x73, 0xb3, 0xa5, - 0x5d, 0x42, 0xe9, 0x21, 0xcd, 0x81, 0xb9, 0x9e, 0xf5, 0x09, 0x7b, 0x9e, 0x7f, 0x0f, 0x4c, 0xfb, - 0x4d, 0x11, 0x26, 0x59, 0x9c, 0x8f, 0x4e, 0x50, 0x1d, 0x26, 0xf6, 0x6c, 0x87, 0xe0, 0x00, 0xf3, - 0x96, 0xd6, 0x84, 0x1e, 0x7d, 0xab, 0x3f, 0x84, 0xf9, 0xd8, 0x45, 0x63, 0xda, 0x7b, 0xb6, 0x69, - 0x58, 0xd8, 0xf5, 0xda, 0xb6, 0x2b, 0x9a, 0x12, 0xfc, 0xac, 0xf5, 0x2b, 0xfc, 0x56, 0x29, 0x8f, - 0xfe, 0x68, 0xf7, 0x7e, 0x62, 0x50, 0xab, 0x71, 0x24, 0x75, 0x19, 0x1e, 0x91, 0xb2, 0xba, 0x2d, - 0x0a, 0xbe, 0xd7, 0x42, 0x76, 0xee, 0x26, 0xf4, 0x39, 0x41, 0xb0, 0x1a, 0xcd, 0xb3, 0x5d, 0x1b, - 0xaa, 0x2f, 0x40, 0x4d, 0xf2, 0x76, 0xdc, 0x5d, 0xcf, 0xb5, 0x68, 0x5a, 0x22, 0x58, 0x47, 0x18, - 0xeb, 0xac, 0x98, 0xbf, 0x27, 0xa7, 0x05, 0xe7, 0x75, 0xa8, 0x4a, 0x4e, 0xc7, 0x37, 0xdc, 0x3d, - 0x12, 0xb2, 0x0b, 0x69, 0x42, 0x97, 0x37, 0xec, 0x1d, 0xff, 0xad, 0x3d, 0x12, 0xaa, 0x4b, 0x70, - 0x59, 0xd2, 0xf9, 0x81, 0xe7, 0x7b, 0x21, 0x72, 0x38, 0xf5, 0x18, 0xa3, 0x9e, 0x16, 0x93, 0x9b, - 0x62, 0x8e, 0xf1, 0xac, 0xc0, 0x63, 0x92, 0xe7, 0x90, 0x5d, 0x02, 0x46, 0x80, 0x4d, 0x6c, 0xfb, - 0x44, 0xaa, 0x36, 0xce, 0x78, 0xeb, 0x82, 0x48, 0x5e, 0x14, 0x8c, 0x84, 0xab, 0xa7, 0xdd, 0x81, - 0x8a, 0xf4, 0x96, 0xd8, 0x13, 0xcb, 0xc9, 0x2c, 0xfe, 0xea, 0x20, 0x77, 0xba, 0xc8, 0xe1, 0xb5, - 0x1a, 0xcc, 0xbe, 0xd6, 0x42, 0xb6, 0xbb, 0x89, 0x02, 0xd4, 0xc6, 0x04, 0x07, 0x72, 0x13, 0x68, - 0x2d, 0x98, 0xeb, 0x99, 0x11, 0x02, 0xef, 0x02, 0xf8, 0xd1, 0x68, 0x5e, 0x1a, 0xce, 0xda, 0xd0, - 0x91, 0xd0, 0x34, 0x54, 0x0c, 0x40, 0x9b, 0x85, 0x99, 0xb5, 0xbb, 0xab, 0xbd, 0x1a, 0x58, 0x70, - 0x39, 0x35, 0x2e, 0xe4, 0xbf, 0x99, 0x21, 0xff, 0xe9, 0xaf, 0x96, 0xbf, 0xd6, 0xb6, 0x72, 0xa4, - 0xff, 0xa5, 0x00, 0x73, 0xf4, 0x62, 0x6e, 0x9e, 0xc4, 0x22, 0xbf, 0x38, 0x08, 0xf7, 0xa1, 0x9a, - 0xba, 0x4a, 0xc4, 0x59, 0x1f, 0xf6, 0x26, 0xa9, 0x24, 0x6f, 0x92, 0xac, 0xbe, 0x73, 0x31, 0xab, - 0xef, 0xfc, 0xb0, 0xdf, 0x08, 0x2e, 0xd4, 0x7a, 0x6d, 0x1b, 0x5d, 0x0d, 0x15, 0x96, 0xee, 0xb1, - 0xcc, 0x87, 0xda, 0xa7, 0xd7, 0x93, 0x49, 0x2d, 0xb6, 0x24, 0x35, 0x85, 0xd4, 0xb1, 0xe9, 0x05, - 0x96, 0x3e, 0x19, 0xc6, 0x07, 0x99, 0x33, 0xb7, 0x8e, 0x90, 0x9f, 0xe3, 0xcc, 0xf0, 0x08, 0xf9, - 0xe7, 0xe0, 0x4c, 0x0a, 0xf3, 0x0d, 0x74, 0xa6, 0x0e, 0xb5, 0x5e, 0xdb, 0x46, 0xff, 0x7f, 0x8c, - 0x50, 0xab, 0x08, 0x17, 0x6a, 0xb9, 0x2e, 0x3c, 0x42, 0xbe, 0xf0, 0x1c, 0xa3, 0xd7, 0x3e, 0x2b, - 0xc0, 0xec, 0x5b, 0x1d, 0xc7, 0xb1, 0xf7, 0x6c, 0x1c, 0x24, 0x2b, 0xe8, 0x35, 0xb8, 0xe8, 0xca, - 0x19, 0xe1, 0xa9, 0x85, 0x3e, 0x66, 0x8a, 0x90, 0xf4, 0x2e, 0xeb, 0x37, 0xc6, 0x3d, 0x8b, 0x30, - 0xd7, 0x63, 0x49, 0xe1, 0x9d, 0x19, 0x18, 0xe5, 0x55, 0x21, 0xbf, 0xcd, 0xf9, 0x87, 0xf6, 0xb1, - 0x02, 0xb5, 0x58, 0x56, 0xb0, 0x8e, 0xc2, 0x56, 0xb7, 0xa0, 0xbc, 0x0e, 0xe5, 0x90, 0xa0, 0x20, - 0x59, 0x90, 0xac, 0x5f, 0xd0, 0x4b, 0x6c, 0x94, 0x97, 0x23, 0x74, 0x59, 0x1a, 0x00, 0x76, 0xad, - 0x44, 0xa5, 0xba, 0xae, 0xe8, 0x17, 0xb1, 0x6b, 0x45, 0x34, 0xcd, 0x2a, 0x4c, 0x1a, 0x71, 0xb0, - 0xe6, 0x24, 0x94, 0x8c, 0x2e, 0x97, 0x76, 0x3f, 0xf1, 0x1f, 0x98, 0xd4, 0x43, 0xe8, 0xfe, 0x04, - 0x94, 0x33, 0x2a, 0xe7, 0xd2, 0x6e, 0xac, 0x5c, 0x9e, 0x83, 0x71, 0x72, 0x6c, 0xb4, 0x50, 0xd8, - 0x62, 0x0a, 0x94, 0xf5, 0x31, 0x72, 0x4c, 0x51, 0xb4, 0xdb, 0x89, 0x05, 0x36, 0x4f, 0xe8, 0xa0, - 0x5c, 0x60, 0x8c, 0x49, 0x49, 0x30, 0xed, 0x24, 0xb4, 0x91, 0x4c, 0x42, 0x9b, 0x57, 0xa0, 0x40, - 0x8e, 0x4f, 0x9b, 0x76, 0x15, 0xc8, 0xb1, 0xf6, 0x91, 0x02, 0xd3, 0xb1, 0xb1, 0xff, 0x88, 0xbd, - 0x7f, 0xaa, 0xc0, 0x4c, 0x52, 0x87, 0xb3, 0xdb, 0x5a, 0x58, 0xa6, 0x78, 0x7a, 0xcb, 0xbc, 0x00, - 0x8f, 0xc5, 0xf3, 0x6f, 0x1c, 0xd0, 0xfc, 0x92, 0xd8, 0x87, 0xb8, 0xaf, 0xc7, 0xfe, 0xa9, 0xc0, - 0x7c, 0x1e, 0xab, 0x58, 0xd9, 0x1d, 0x28, 0x92, 0x63, 0x19, 0x9e, 0x96, 0x87, 0xad, 0x05, 0x62, - 0x80, 0x14, 0x46, 0xac, 0xb5, 0x70, 0xea, 0xb5, 0xaa, 0xaf, 0x53, 0x75, 0x0e, 0x4f, 0x59, 0x3b, - 0xd2, 0x08, 0x41, 0xf5, 0x38, 0xd4, 0xde, 0x87, 0x49, 0xd1, 0x05, 0x8a, 0x96, 0x59, 0x62, 0x09, - 0x4b, 0xc0, 0x62, 0xec, 0x69, 0x2e, 0x54, 0x70, 0xa3, 0xdf, 0xda, 0xef, 0x14, 0x98, 0x4d, 0xf7, - 0x2c, 0xbe, 0x0e, 0x41, 0xe7, 0xfc, 0x8f, 0x94, 0xf6, 0xaf, 0x22, 0x4c, 0x67, 0x88, 0xcc, 0x4a, - 0xe7, 0x94, 0x73, 0x49, 0xe7, 0xbe, 0x0d, 0x23, 0x2c, 0x81, 0xe1, 0x7a, 0x3f, 0xd9, 0xef, 0x96, - 0xa2, 0x1a, 0x31, 0x86, 0xaf, 0xa1, 0x9f, 0x93, 0xb8, 0x35, 0x47, 0x4e, 0x7f, 0x6b, 0x5e, 0x83, - 0x0a, 0x0f, 0x02, 0x86, 0x19, 0x60, 0x44, 0x70, 0xd4, 0x95, 0xe3, 0xa3, 0xaf, 0xf1, 0x41, 0x1a, - 0xb6, 0x04, 0x19, 0xbf, 0x60, 0xc6, 0x64, 0xd8, 0xe2, 0xa3, 0xac, 0xef, 0x48, 0xc3, 0x56, 0x1d, - 0x26, 0x7c, 0x2f, 0xb4, 0xd9, 0xed, 0x3b, 0xce, 0x80, 0xa2, 0x6f, 0xf5, 0x55, 0x18, 0x0b, 0xbd, - 0x4e, 0x60, 0xe2, 0xda, 0x44, 0xb6, 0xbe, 0xc9, 0x54, 0x9e, 0x9a, 0x6f, 0x8b, 0xd1, 0xeb, 0x82, - 0x8f, 0x05, 0xbc, 0xb8, 0x1a, 0xda, 0x5f, 0x8b, 0x00, 0xdd, 0x5c, 0x23, 0x2b, 0xf5, 0x53, 0xce, - 0x25, 0xf5, 0x7b, 0x59, 0xa4, 0x3d, 0xdc, 0xf1, 0xff, 0x9f, 0x42, 0xb3, 0xf0, 0x71, 0x32, 0xf5, - 0xd9, 0x74, 0x90, 0xed, 0x12, 0x7c, 0x4c, 0x78, 0xf6, 0x93, 0xb0, 0x4a, 0x31, 0x65, 0x95, 0xf3, - 0x72, 0xe4, 0x26, 0x94, 0xf8, 0x5b, 0x07, 0xde, 0xab, 0x18, 0xcd, 0x0c, 0x5a, 0x09, 0x4d, 0x9b, - 0x88, 0x98, 0x2d, 0xaa, 0x2e, 0xff, 0xff, 0x9e, 0x75, 0x29, 0xc0, 0x8b, 0x7e, 0xab, 0x37, 0xba, - 0x5b, 0xc3, 0x41, 0x76, 0x1b, 0x5b, 0x91, 0xd7, 0xe5, 0xe6, 0xe0, 0xc3, 0x3c, 0xeb, 0x91, 0xbe, - 0x1d, 0x3f, 0xa5, 0x6f, 0x2f, 0x41, 0xd5, 0x48, 0x8a, 0x5b, 0xfa, 0xd3, 0x34, 0x4c, 0xd3, 0x20, - 0xb8, 0x19, 0x78, 0xc4, 0x33, 0x3d, 0x67, 0x0b, 0x07, 0x87, 0xb6, 0x89, 0xd5, 0xfb, 0x30, 0xc6, - 0x13, 0x1f, 0x35, 0x37, 0xbb, 0x4a, 0xa4, 0x98, 0xf5, 0xeb, 0xfd, 0xc8, 0x44, 0xb4, 0x3b, 0x80, - 0x72, 0xbc, 0xc5, 0xaf, 0x3e, 0xfd, 0xd5, 0x7c, 0x89, 0xbf, 0x37, 0xea, 0xdf, 0x1a, 0x8c, 0x98, - 0x8b, 0xba, 0xa9, 0xa8, 0xdb, 0x30, 0xca, 0x82, 0xae, 0x7a, 0x35, 0x8f, 0x31, 0xde, 0xf9, 0xaf, - 0x5f, 0xeb, 0x43, 0x15, 0xe1, 0x7e, 0x00, 0x95, 0x64, 0x30, 0x57, 0x9f, 0xf9, 0x4a, 0xd6, 0x74, - 0xa3, 0xba, 0xde, 0x18, 0x94, 0x3c, 0x12, 0xf9, 0x1e, 0x8c, 0x8b, 0x46, 0x96, 0x9a, 0x6b, 0xea, - 0x64, 0xf7, 0xb6, 0xfe, 0x54, 0x5f, 0x3a, 0xe1, 0x93, 0x20, 0x6a, 0x36, 0xca, 0x26, 0x99, 0xda, - 0xe8, 0xc3, 0x9b, 0xea, 0x16, 0xd6, 0x17, 0x07, 0xa6, 0x17, 0x32, 0xdf, 0x85, 0x31, 0xde, 0x7b, - 0xc9, 0xdf, 0x60, 0x89, 0x4e, 0x5a, 0xfe, 0x06, 0x4b, 0xb6, 0x70, 0x6e, 0x2a, 0x74, 0x39, 0xa9, - 0x1e, 0x49, 0xfe, 0x72, 0xb2, 0x3b, 0x36, 0xf9, 0xcb, 0xc9, 0xeb, 0xe3, 0x38, 0x30, 0x99, 0x68, - 0xb0, 0xa8, 0xb9, 0x5b, 0x35, 0xab, 0x3f, 0x53, 0x7f, 0x66, 0x40, 0x6a, 0x21, 0xcd, 0x83, 0x4a, - 0xf2, 0xb1, 0x43, 0xfe, 0xfe, 0xcb, 0x7c, 0x7f, 0x91, 0xbf, 0xff, 0x72, 0xde, 0x50, 0x78, 0x50, - 0x49, 0xbe, 0x52, 0xc8, 0x17, 0x98, 0xf9, 0x52, 0x22, 0x5f, 0x60, 0xce, 0xe3, 0x87, 0x0e, 0x4c, - 0xa5, 0x9f, 0x09, 0xa8, 0xb9, 0x4e, 0xc9, 0x79, 0xbd, 0x50, 0xbf, 0x39, 0x38, 0x83, 0x10, 0x7b, - 0x04, 0x53, 0xe9, 0x7f, 0xf8, 0xf3, 0xc5, 0xe6, 0xbc, 0x34, 0xc8, 0x17, 0x9b, 0xf7, 0x78, 0xe0, - 0xa6, 0x42, 0xd7, 0x9b, 0xee, 0xee, 0xe4, 0x0b, 0xce, 0xe9, 0xb1, 0xe5, 0x0b, 0xce, 0x6d, 0x1c, - 0x75, 0x60, 0x2a, 0xdd, 0x87, 0xc8, 0x17, 0x9b, 0xd3, 0x0d, 0xca, 0x17, 0x9b, 0xdb, 0xe2, 0x08, - 0xa0, 0x9a, 0xaa, 0xaf, 0xf3, 0x4f, 0x68, 0x76, 0x4b, 0x23, 0xff, 0x84, 0xe6, 0x15, 0xee, 0x1f, - 0xc2, 0xa5, 0x9e, 0xca, 0x58, 0xbd, 0x39, 0xc0, 0x7b, 0xbf, 0x44, 0x31, 0x5f, 0xbf, 0x35, 0x04, - 0x47, 0xe4, 0xdd, 0xe3, 0x84, 0x6c, 0x5e, 0x07, 0x0f, 0x24, 0x3b, 0x51, 0x67, 0x0f, 0x24, 0x3b, - 0x55, 0x64, 0x1f, 0x40, 0x39, 0x5e, 0x9e, 0xe6, 0x5f, 0xb7, 0x19, 0x85, 0x74, 0xfe, 0x75, 0x9b, - 0x55, 0xf1, 0xde, 0x54, 0xd4, 0x1f, 0x2b, 0x30, 0x9b, 0x5d, 0xeb, 0xa9, 0xcf, 0x0d, 0xf2, 0xb0, - 0xb2, 0xa7, 0x4e, 0xad, 0x3f, 0x3f, 0x2c, 0x9b, 0x58, 0xf6, 0x8f, 0x40, 0xed, 0x7d, 0xdf, 0xa6, - 0xde, 0x1a, 0xfa, 0x75, 0x67, 0x7d, 0x69, 0x18, 0x16, 0x21, 0xfc, 0x23, 0x05, 0x66, 0xb2, 0x5e, - 0x38, 0xab, 0xb7, 0x73, 0x03, 0x43, 0xfe, 0x53, 0xed, 0xfa, 0xb3, 0xc3, 0x31, 0x71, 0x1d, 0x96, - 0xfc, 0xee, 0x53, 0x1f, 0x99, 0xd2, 0xbd, 0x0f, 0x13, 0x72, 0x48, 0x7d, 0xaa, 0x5f, 0xcb, 0x4c, - 0x4a, 0x5f, 0xe8, 0x4f, 0xc8, 0x25, 0x36, 0x3f, 0x2d, 0x7c, 0xf6, 0x60, 0x5e, 0xf9, 0xfc, 0xc1, - 0xbc, 0xf2, 0xf7, 0x07, 0xf3, 0xca, 0x4f, 0xbe, 0x9c, 0xbf, 0xf0, 0xf9, 0x97, 0xf3, 0x17, 0xfe, - 0xfc, 0xe5, 0xfc, 0x05, 0xa8, 0x9b, 0x5e, 0x3b, 0x07, 0xa7, 0x79, 0x31, 0xca, 0x3e, 0x37, 0x95, - 0xf7, 0xde, 0xde, 0xb7, 0x49, 0xab, 0xb3, 0xdb, 0x30, 0xbd, 0xf6, 0xa2, 0xe9, 0x85, 0x6d, 0x2f, - 0x5c, 0x0c, 0xb0, 0x83, 0x4e, 0x70, 0xb0, 0x78, 0xb8, 0x14, 0xfd, 0x64, 0x89, 0x6e, 0xb8, 0x98, - 0xfd, 0xea, 0xff, 0x45, 0xfa, 0x25, 0x3f, 0x7e, 0x59, 0x28, 0x6e, 0x6e, 0x7f, 0xef, 0xd7, 0x85, - 0xd9, 0x4d, 0x29, 0x9c, 0x4a, 0x6b, 0x6c, 0x8b, 0xe9, 0x3f, 0x74, 0x27, 0x76, 0xe8, 0xc4, 0x8e, - 0x9c, 0x78, 0x50, 0xd0, 0xb2, 0x27, 0x76, 0xde, 0xd8, 0x6c, 0xde, 0xc5, 0x04, 0xd1, 0xfc, 0xff, - 0x1f, 0x85, 0x9a, 0x24, 0x5a, 0x5e, 0xa6, 0x54, 0xcb, 0xcb, 0x92, 0x6c, 0x77, 0x8c, 0x3d, 0xc3, - 0xbf, 0xfd, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xbd, 0x21, 0xb6, 0x6c, 0x9b, 0x30, 0x00, 0x00, + // 2695 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0xcd, 0x73, 0x23, 0x47, + 0x15, 0xf7, 0x48, 0xfe, 0x7c, 0xb2, 0x24, 0x6f, 0xaf, 0x3f, 0x14, 0x25, 0x71, 0x96, 0xc9, 0x7e, + 0x38, 0x1b, 0x22, 0x6f, 0x9c, 0x4d, 0x08, 0x4e, 0x52, 0xc4, 0x8a, 0xf1, 0xda, 0x95, 0xdd, 0xc4, + 0x8c, 0xb3, 0x0e, 0x49, 0x1c, 0xa6, 0xda, 0x33, 0x6d, 0x6b, 0xf0, 0x68, 0x66, 0x32, 0xd3, 0xb2, + 0x6c, 0x38, 0x85, 0x4a, 0x51, 0x5b, 0x39, 0x50, 0xdc, 0x80, 0x2b, 0x47, 0x8a, 0x2b, 0x57, 0x2e, + 0x5c, 0x28, 0x4e, 0x39, 0x52, 0x45, 0x41, 0x51, 0x9b, 0xe2, 0x02, 0xff, 0x02, 0x55, 0x50, 0xfd, + 0x31, 0xa3, 0x99, 0x91, 0x66, 0x25, 0xd9, 0xde, 0x5a, 0x38, 0x49, 0xdd, 0xfd, 0xde, 0xef, 0xbd, + 0x7e, 0xdd, 0xfd, 0xfa, 0xbd, 0xd7, 0x03, 0xdf, 0xf0, 0x88, 0xd3, 0x6a, 0xee, 0xfb, 0x78, 0xf9, + 0xd8, 0x22, 0xed, 0xe5, 0xe3, 0x97, 0xb1, 0xed, 0x35, 0xf0, 0xcb, 0xbc, 0x55, 0xf3, 0x7c, 0x97, + 0xba, 0x68, 0x3e, 0x24, 0xa9, 0xf1, 0xce, 0x90, 0xa4, 0xba, 0x14, 0xb1, 0x1a, 0xae, 0x4f, 0x96, + 0x8d, 0x06, 0xb6, 0x9c, 0x0e, 0x00, 0x6f, 0x0a, 0x84, 0xea, 0xcd, 0x14, 0xa5, 0x7f, 0xea, 0x51, + 0x37, 0x46, 0xca, 0xdb, 0x92, 0xf6, 0x6a, 0x92, 0xd6, 0x24, 0x27, 0x1d, 0x42, 0x93, 0x9c, 0x48, + 0xaa, 0xdb, 0x49, 0x2a, 0xea, 0x63, 0x27, 0xc0, 0x06, 0xb5, 0xdc, 0x98, 0x06, 0xb1, 0xce, 0xde, + 0xd8, 0xd6, 0xbe, 0xd1, 0xa1, 0xb6, 0xf6, 0x0d, 0x41, 0xa5, 0xfe, 0x4a, 0x81, 0xa7, 0xeb, 0xbe, + 0x8b, 0x4d, 0x03, 0x07, 0xf4, 0x83, 0x0e, 0x88, 0x46, 0x3e, 0x6b, 0x91, 0x80, 0xa2, 0xef, 0x41, + 0x21, 0x06, 0x5d, 0x51, 0xae, 0x28, 0x4b, 0x85, 0x95, 0xe5, 0x5a, 0x64, 0x25, 0x86, 0x5d, 0x8b, + 0x0b, 0x0f, 0x65, 0xd4, 0xe2, 0x60, 0x71, 0x0c, 0x74, 0x03, 0xca, 0xb8, 0x8d, 0x2d, 0xaa, 0x9b, + 0x84, 0x12, 0x01, 0x9b, 0xbb, 0xa2, 0x2c, 0x4d, 0x6a, 0x25, 0xde, 0xbd, 0x1e, 0xf6, 0xaa, 0x9f, + 0x2b, 0xf0, 0x4c, 0x6f, 0xdd, 0x02, 0xcf, 0x75, 0x02, 0x82, 0x5e, 0x83, 0x9c, 0x65, 0x4a, 0x9d, + 0xae, 0x0f, 0xa2, 0xd3, 0x96, 0xa9, 0xe5, 0x2c, 0x13, 0xbd, 0x00, 0x33, 0x91, 0x6c, 0xbd, 0x41, + 0xac, 0xc3, 0x06, 0xe5, 0x2a, 0x8c, 0x6a, 0xe5, 0xa8, 0x7f, 0x93, 0x77, 0xab, 0x7f, 0x9d, 0x82, + 0xa7, 0x62, 0xa2, 0xb7, 0x6d, 0xec, 0x38, 0xc4, 0x0f, 0xad, 0xf3, 0x3c, 0x14, 0xc9, 0x89, 0x67, + 0xf9, 0xa7, 0x21, 0x8a, 0xc2, 0x51, 0xa6, 0x45, 0xa7, 0x80, 0x40, 0xb7, 0x21, 0x7f, 0x40, 0x08, + 0x17, 0x50, 0x58, 0x51, 0x53, 0x6a, 0xca, 0xed, 0x10, 0x69, 0xb8, 0x41, 0x88, 0xc6, 0xc8, 0x11, + 0x82, 0xd1, 0x26, 0x69, 0xba, 0x95, 0xfc, 0x15, 0x65, 0x69, 0x4a, 0xe3, 0xff, 0xd1, 0x1e, 0xcc, + 0x60, 0xc3, 0x70, 0x5b, 0x0e, 0xd5, 0x0f, 0x7d, 0xb7, 0xe5, 0xe9, 0x96, 0x59, 0x29, 0x71, 0xd8, + 0x97, 0xfa, 0xc0, 0xae, 0x09, 0xb6, 0x3b, 0x8c, 0x6b, 0xcb, 0xdc, 0x1c, 0xd1, 0x4a, 0x38, 0xd1, + 0xf3, 0x40, 0x51, 0x90, 0x06, 0x13, 0x6e, 0x8b, 0x7a, 0x2d, 0x1a, 0x54, 0x66, 0xaf, 0xe4, 0x97, + 0x0a, 0x2b, 0xaf, 0xd7, 0x7a, 0x1f, 0x86, 0x5a, 0xa6, 0x41, 0x6a, 0xef, 0x73, 0x00, 0x2d, 0x04, + 0x42, 0x77, 0x61, 0x2c, 0x68, 0x63, 0x2f, 0xa8, 0x2c, 0x72, 0xc4, 0xd7, 0x86, 0x47, 0xdc, 0x69, + 0x63, 0x4f, 0x13, 0x20, 0x68, 0x0f, 0x0a, 0x26, 0xb1, 0xc9, 0x21, 0x66, 0x74, 0x41, 0x65, 0x89, + 0x63, 0xae, 0x0e, 0x8f, 0xb9, 0x2e, 0x40, 0x88, 0x16, 0x87, 0x43, 0xfb, 0x50, 0x6c, 0x39, 0x71, + 0xfc, 0x15, 0x8e, 0xff, 0xe6, 0xf0, 0xf8, 0xf7, 0x43, 0x18, 0xa2, 0x25, 0x21, 0xd1, 0x06, 0x14, + 0xac, 0x7d, 0x43, 0x17, 0x5c, 0x41, 0xe5, 0x4d, 0x2e, 0xe1, 0x5a, 0x6a, 0xf1, 0xd8, 0xe9, 0xec, + 0x6c, 0xd9, 0x7d, 0x63, 0x4d, 0xec, 0x7a, 0xb0, 0xc2, 0xbf, 0x41, 0xf5, 0xa7, 0x0a, 0x8c, 0x0b, + 0x5b, 0xa3, 0x55, 0x18, 0x3b, 0xc6, 0x76, 0x8b, 0xc8, 0x73, 0x70, 0xb5, 0xcf, 0x4e, 0xd8, 0x65, + 0xb4, 0x9a, 0x60, 0x41, 0x6f, 0xc3, 0x04, 0x36, 0x4d, 0x9f, 0x04, 0x81, 0xdc, 0x9e, 0xd7, 0xfb, + 0xed, 0x23, 0x41, 0xad, 0x85, 0x6c, 0xd5, 0x3f, 0x28, 0x30, 0xca, 0x96, 0xe8, 0x5c, 0x6a, 0x6c, + 0xc1, 0x34, 0xc5, 0xfe, 0x21, 0xa1, 0x3a, 0x0e, 0x02, 0x42, 0x07, 0xd5, 0x85, 0xd1, 0x6e, 0x99, + 0x5a, 0x41, 0xf0, 0xf2, 0x66, 0x78, 0xd8, 0xf2, 0x43, 0x1d, 0xb6, 0xea, 0x2f, 0x15, 0x98, 0x0c, + 0x37, 0x05, 0x7a, 0x0b, 0xc6, 0x71, 0x93, 0x9d, 0x0d, 0x39, 0x95, 0x6b, 0xfd, 0xf4, 0xe0, 0xc4, + 0x9a, 0x64, 0x42, 0xf7, 0x60, 0xda, 0x32, 0x89, 0x43, 0x2d, 0x7a, 0xaa, 0x1f, 0x91, 0x53, 0x39, + 0x99, 0x9b, 0x7d, 0x40, 0xb6, 0x24, 0xcb, 0xbb, 0xe4, 0x54, 0x2b, 0x58, 0x9d, 0x46, 0x75, 0x13, + 0xa0, 0xb3, 0x9d, 0xce, 0x63, 0xe5, 0xfa, 0x65, 0xb8, 0xa4, 0xa7, 0xdd, 0x87, 0x4a, 0xa0, 0xda, + 0x6b, 0x1f, 0x4b, 0x07, 0x7b, 0x07, 0x46, 0x3d, 0x1b, 0x87, 0x6e, 0xff, 0x95, 0x21, 0xdd, 0x3e, + 0x43, 0xd3, 0x38, 0x80, 0x6a, 0xc1, 0x9c, 0xdc, 0x3a, 0xf5, 0xd3, 0x2d, 0xc7, 0x24, 0x27, 0xa1, + 0x07, 0xdd, 0x86, 0xa2, 0xdc, 0x4a, 0xba, 0xc5, 0xfa, 0xa5, 0xa8, 0x17, 0x07, 0xdb, 0x87, 0x02, + 0x6a, 0x1a, 0xc7, 0x5a, 0xea, 0xc7, 0x30, 0x9f, 0x16, 0x25, 0x67, 0x13, 0xdb, 0xed, 0xca, 0x99, + 0x76, 0xbb, 0xfa, 0x11, 0xcc, 0x71, 0xc8, 0xfa, 0x69, 0x38, 0x24, 0xa7, 0x71, 0x7e, 0xe8, 0xcf, + 0x15, 0x98, 0x4f, 0x63, 0x4b, 0xbd, 0xef, 0x9f, 0xdf, 0x46, 0x9b, 0x23, 0x49, 0x2b, 0x3d, 0x50, + 0x94, 0xfa, 0x0c, 0x94, 0xf4, 0x04, 0xae, 0x7a, 0x04, 0x0b, 0xdf, 0xf5, 0x1a, 0xa4, 0x49, 0x7c, + 0x6c, 0xa7, 0x26, 0x78, 0xf1, 0xeb, 0xb4, 0x07, 0x95, 0x6e, 0x61, 0x17, 0xb6, 0x52, 0x9f, 0xc0, + 0x42, 0x1d, 0xdb, 0xd8, 0x31, 0xc8, 0x63, 0x58, 0xab, 0x5f, 0x28, 0x50, 0xe9, 0x46, 0x97, 0xba, + 0xbf, 0x09, 0x63, 0xc2, 0x8b, 0x29, 0x43, 0x79, 0x31, 0xc1, 0x14, 0x73, 0x3e, 0xb9, 0x33, 0x38, + 0x1f, 0xf5, 0x1a, 0x14, 0x77, 0x2d, 0xd2, 0x5e, 0x6b, 0xd1, 0xc6, 0x07, 0xee, 0x11, 0x71, 0xd0, + 0x2c, 0x8c, 0x59, 0xec, 0x48, 0x73, 0x6d, 0xa6, 0x35, 0xd1, 0x50, 0x35, 0x28, 0x87, 0x64, 0xa1, + 0x55, 0xbe, 0x03, 0xf9, 0x83, 0xe3, 0x23, 0xa9, 0x74, 0xbf, 0x70, 0x62, 0xa3, 0x65, 0xdb, 0x0c, + 0xc0, 0x72, 0x0e, 0x99, 0xc3, 0x62, 0x9c, 0xea, 0xfb, 0x30, 0xd3, 0xc1, 0x94, 0xb6, 0x78, 0x03, + 0xc6, 0x28, 0x53, 0xa3, 0xdb, 0x93, 0x26, 0xaf, 0xd2, 0x84, 0xce, 0x9a, 0xe0, 0x51, 0x7f, 0xa2, + 0x40, 0x71, 0x87, 0x62, 0xda, 0x8a, 0x56, 0xee, 0xb1, 0xc6, 0x3f, 0xbd, 0xfd, 0xa3, 0x06, 0xa5, + 0x50, 0x07, 0x39, 0xa7, 0xe7, 0xa0, 0x10, 0x9c, 0x3a, 0x46, 0x32, 0xe2, 0x03, 0xd6, 0x25, 0xe3, + 0xbd, 0xe7, 0xa0, 0x60, 0x60, 0x6a, 0x34, 0x2c, 0xe7, 0x50, 0x6f, 0x79, 0x32, 0xb6, 0x85, 0xb0, + 0xeb, 0xbe, 0xa7, 0x3e, 0x50, 0xe0, 0xb2, 0x00, 0xdd, 0xa1, 0x3e, 0xc1, 0xcd, 0x27, 0x38, 0x3d, + 0x1f, 0x66, 0x93, 0x9a, 0xc8, 0x49, 0x7e, 0x1b, 0x9e, 0xb2, 0x31, 0x25, 0x01, 0xd5, 0x8f, 0x1c, + 0xb7, 0xed, 0xe8, 0xfb, 0xb6, 0x6b, 0x1c, 0x25, 0xa7, 0x3c, 0x2f, 0x08, 0xde, 0x65, 0xe3, 0x75, + 0x36, 0xdc, 0x99, 0x7e, 0xdc, 0x3e, 0xb9, 0xb4, 0x7d, 0xd4, 0x2f, 0xf3, 0x30, 0xfd, 0x9e, 0x4b, + 0x49, 0x10, 0x8b, 0xa2, 0x2d, 0xc7, 0xb0, 0x5b, 0x26, 0xd1, 0x03, 0x8f, 0xc8, 0xad, 0x3f, 0xa9, + 0x4d, 0xcb, 0xce, 0x1d, 0xd6, 0x87, 0xd6, 0x60, 0x92, 0x9f, 0x10, 0x66, 0x94, 0xfc, 0x50, 0x27, + 0x6b, 0x02, 0x8b, 0x3f, 0xdd, 0x3e, 0x6c, 0xf4, 0x9c, 0x3e, 0x0c, 0xdd, 0x83, 0xb2, 0x38, 0x78, + 0x3a, 0x75, 0xb9, 0xee, 0x66, 0x65, 0x7c, 0x98, 0x63, 0x5b, 0x14, 0xdc, 0x1f, 0xb8, 0x6c, 0x8e, + 0xe6, 0x93, 0xd8, 0x00, 0x0f, 0x72, 0x30, 0xc7, 0x17, 0x63, 0xc3, 0xf5, 0x77, 0x5d, 0x6a, 0x39, + 0x87, 0xe1, 0xaa, 0xdc, 0x84, 0x4b, 0xc7, 0x2e, 0xc5, 0xfb, 0x36, 0xd1, 0x31, 0x4d, 0x2e, 0x7d, + 0x59, 0x0e, 0xac, 0x51, 0xb9, 0xe6, 0x5d, 0x96, 0xcd, 0x9f, 0xd7, 0xb2, 0x4f, 0xc0, 0x14, 0xbf, + 0xcf, 0x41, 0xe9, 0x43, 0x8b, 0x3a, 0xb1, 0xab, 0xe2, 0x23, 0x98, 0x71, 0x5c, 0x4a, 0x74, 0xc3, + 0x6d, 0x36, 0x2d, 0xda, 0x24, 0x0e, 0x65, 0x81, 0x32, 0x8b, 0xd9, 0x6b, 0x7d, 0xb4, 0x60, 0xa7, + 0x8a, 0xbc, 0x13, 0xb1, 0x69, 0x65, 0x86, 0xd3, 0x69, 0x07, 0xe8, 0x07, 0x30, 0x13, 0x8b, 0x9f, + 0x74, 0x1e, 0x66, 0xe5, 0xcf, 0x1e, 0x66, 0x95, 0x69, 0xb2, 0xe3, 0x49, 0x18, 0x90, 0x40, 0x39, + 0xb2, 0x9f, 0xf4, 0x23, 0x1a, 0x4c, 0xb7, 0x45, 0x97, 0x6e, 0x62, 0x8a, 0x87, 0xa9, 0x1f, 0x48, + 0xa8, 0x75, 0x4c, 0xb1, 0x56, 0x68, 0x77, 0x1a, 0xea, 0xdf, 0x14, 0x98, 0x97, 0x83, 0x6b, 0x8e, + 0x59, 0x6f, 0x59, 0xb6, 0x19, 0xae, 0x57, 0x2f, 0xa3, 0x2a, 0x17, 0x68, 0x54, 0x13, 0x10, 0x6e, + 0xd1, 0x86, 0xeb, 0x5b, 0x3f, 0xe2, 0x09, 0x9d, 0x98, 0x94, 0xb8, 0xa9, 0x5f, 0x1d, 0x44, 0xc2, + 0x5a, 0x9c, 0x9b, 0x4f, 0xed, 0x12, 0x4e, 0x77, 0xa9, 0x36, 0x2c, 0x74, 0xcd, 0x4f, 0xda, 0xf3, + 0xe2, 0xcb, 0x31, 0xea, 0x6f, 0xf3, 0x50, 0xe4, 0xae, 0x32, 0xda, 0xf5, 0x55, 0x98, 0x3c, 0xb0, + 0x6c, 0x4a, 0x7c, 0x22, 0x8a, 0x2b, 0x93, 0x5a, 0xd4, 0x46, 0x3f, 0x84, 0xc5, 0x98, 0xaf, 0x36, + 0xac, 0x03, 0xcb, 0xd0, 0x4d, 0xe2, 0xb8, 0x4d, 0xcb, 0x91, 0x59, 0xb3, 0x38, 0x1f, 0xfd, 0x32, + 0x93, 0x75, 0xc6, 0xa3, 0x3d, 0xd3, 0x71, 0xf1, 0x1c, 0x6a, 0x3d, 0x8e, 0x84, 0x56, 0xe1, 0xa9, + 0x50, 0x56, 0x27, 0x87, 0xd6, 0x79, 0x70, 0x10, 0xf0, 0xb3, 0x32, 0xa9, 0x2d, 0x48, 0x82, 0xf5, + 0x68, 0x9c, 0x87, 0x10, 0x01, 0x7a, 0x1d, 0x2a, 0x21, 0x6f, 0xcb, 0xd9, 0x77, 0x1d, 0x93, 0xdd, + 0xc6, 0x92, 0x75, 0x94, 0xb3, 0xce, 0xcb, 0xf1, 0xfb, 0xe1, 0xb0, 0xe4, 0xbc, 0x0e, 0xe5, 0x90, + 0xd3, 0xf6, 0x74, 0xe7, 0x80, 0x06, 0x95, 0x31, 0xce, 0x10, 0x5e, 0x52, 0x77, 0xbd, 0xf7, 0x0e, + 0x68, 0x80, 0x56, 0x60, 0x2e, 0xa4, 0xf3, 0x7c, 0xd7, 0x73, 0x03, 0x6c, 0x0b, 0xea, 0x71, 0x4e, + 0x7d, 0x59, 0x0e, 0x6e, 0xcb, 0x31, 0xce, 0xb3, 0x06, 0xcf, 0x86, 0x3c, 0xc7, 0xdc, 0xd9, 0xea, + 0x3e, 0x31, 0x88, 0xe5, 0xd1, 0x50, 0xb5, 0x09, 0xce, 0x5b, 0x95, 0x44, 0xa1, 0x43, 0xe6, 0x24, + 0x42, 0x3d, 0xf5, 0x2e, 0x94, 0xc2, 0xd5, 0x92, 0x7b, 0x62, 0x35, 0x19, 0x70, 0x5e, 0x1d, 0xe4, + 0x5a, 0x94, 0xe1, 0xa6, 0x5a, 0x81, 0xf9, 0x77, 0x1a, 0xd8, 0x72, 0xb6, 0xb1, 0x8f, 0x9b, 0x84, + 0x12, 0x3f, 0xdc, 0x04, 0x6a, 0x03, 0x16, 0xba, 0x46, 0xa4, 0xc0, 0x7b, 0x00, 0x5e, 0xd4, 0x9b, + 0x15, 0x31, 0xf2, 0x8a, 0x68, 0x24, 0x34, 0x0d, 0x15, 0x03, 0x50, 0xe7, 0x61, 0x76, 0xe3, 0xde, + 0x7a, 0xb7, 0x06, 0x26, 0xcc, 0xa5, 0xfa, 0xa5, 0xfc, 0x77, 0x7b, 0xc8, 0x7f, 0xf1, 0xd1, 0xf2, + 0x37, 0x9a, 0x66, 0x86, 0xf4, 0x9f, 0xe5, 0x60, 0x81, 0x5d, 0x80, 0xf5, 0xd3, 0x98, 0xb7, 0x96, + 0x07, 0xe1, 0x43, 0x28, 0xa7, 0xdc, 0xbf, 0x3c, 0xeb, 0xc3, 0x7a, 0xff, 0x52, 0xd2, 0xfb, 0xf7, + 0x2a, 0x81, 0xe6, 0x7b, 0x95, 0x40, 0x9f, 0x84, 0x17, 0x77, 0xa0, 0xd2, 0x6d, 0x8f, 0xc8, 0x9d, + 0x97, 0x78, 0x94, 0xc3, 0xa3, 0x02, 0x36, 0xa7, 0x6e, 0xeb, 0x27, 0x03, 0xfb, 0x9d, 0x90, 0x9a, + 0x41, 0x6a, 0xc4, 0x70, 0x7d, 0x53, 0x2b, 0x06, 0xf1, 0x4e, 0xbe, 0x00, 0x3b, 0x6d, 0xec, 0x65, + 0x2c, 0x40, 0xd0, 0xc6, 0xde, 0x05, 0x2c, 0x00, 0x83, 0xf9, 0x3f, 0x59, 0x00, 0x0d, 0x2a, 0xdd, + 0xf6, 0x88, 0x2a, 0xde, 0xa3, 0x6c, 0x26, 0xd2, 0xec, 0x6a, 0xa6, 0xd9, 0xdb, 0xd8, 0x93, 0xd6, + 0xe6, 0xf4, 0xea, 0xbf, 0x15, 0x98, 0x7f, 0xaf, 0x65, 0xdb, 0xd6, 0x81, 0x45, 0xfc, 0x64, 0x52, + 0xb5, 0x01, 0x53, 0x4e, 0x38, 0x22, 0xad, 0xbb, 0xd4, 0x67, 0x6a, 0x11, 0x92, 0xd6, 0x61, 0xfd, + 0x9f, 0x36, 0xe9, 0x32, 0x2c, 0x74, 0xcd, 0x5e, 0x5a, 0x74, 0x16, 0xc6, 0x44, 0xd2, 0x21, 0x6e, + 0x3a, 0xd1, 0x50, 0x77, 0xe1, 0x99, 0xd8, 0x85, 0xb9, 0xe5, 0x1c, 0xb8, 0xf5, 0xd3, 0x4d, 0x1c, + 0x44, 0xd9, 0xb2, 0x78, 0x79, 0xc8, 0x0d, 0xfb, 0xf2, 0xa0, 0x7e, 0xa1, 0xc0, 0x7c, 0x0a, 0x38, + 0x84, 0xbc, 0x0e, 0xd3, 0x01, 0xc5, 0x7e, 0x32, 0xd4, 0xde, 0x1c, 0xd1, 0x0a, 0xbc, 0x57, 0x04, + 0xda, 0x0f, 0x14, 0x05, 0xa9, 0x00, 0xc4, 0x31, 0x13, 0xe9, 0xd5, 0xa6, 0xa2, 0x4d, 0x11, 0xc7, + 0x8c, 0x68, 0xea, 0x65, 0x28, 0xea, 0x71, 0xb0, 0x7a, 0x11, 0x0a, 0x7a, 0x87, 0x4b, 0xfd, 0x57, + 0x0e, 0xca, 0x29, 0x35, 0xd0, 0xd3, 0x30, 0x9e, 0x92, 0x2c, 0xdb, 0x4c, 0xe8, 0x19, 0xe7, 0x9b, + 0x8e, 0x57, 0xf2, 0x17, 0xf0, 0x7c, 0xb4, 0x07, 0x05, 0x8f, 0xf8, 0x2c, 0xf8, 0xa0, 0xd6, 0x31, + 0x91, 0x39, 0xdc, 0xea, 0xb0, 0xe1, 0x5d, 0x07, 0x41, 0x8b, 0xc3, 0xa1, 0x3b, 0x30, 0xca, 0x8e, + 0x12, 0xbf, 0xf2, 0x87, 0x8f, 0x1a, 0x77, 0x2d, 0xd2, 0xd6, 0x38, 0x40, 0x7d, 0x0a, 0x26, 0x42, + 0x6b, 0x7f, 0x02, 0x0b, 0x5d, 0x6b, 0xde, 0x29, 0x74, 0xd1, 0x13, 0xdd, 0x72, 0x0e, 0x5c, 0x79, + 0xa4, 0x6f, 0x0c, 0xf0, 0xda, 0xc0, 0x11, 0xc6, 0xe9, 0x09, 0xfb, 0x55, 0x31, 0x3c, 0x9b, 0xb1, + 0x53, 0x2f, 0x4c, 0xc4, 0xa7, 0x50, 0x94, 0xf9, 0xba, 0x84, 0xbc, 0x0b, 0x05, 0x7e, 0x2f, 0xfa, + 0xdc, 0xc5, 0x9c, 0xe5, 0x0e, 0x00, 0x27, 0xfa, 0xaf, 0xfe, 0x8e, 0xf9, 0xa6, 0x54, 0x0a, 0xfa, + 0x38, 0x04, 0x5d, 0x70, 0x65, 0x5e, 0xfd, 0x4f, 0x1e, 0x2e, 0xf7, 0x10, 0xd9, 0x2b, 0x6a, 0x50, + 0x2e, 0x24, 0x6a, 0xf8, 0x16, 0x8c, 0xf2, 0x3b, 0x57, 0xe8, 0xfd, 0x7c, 0x3f, 0x27, 0xcd, 0x34, + 0xe2, 0x0c, 0x8f, 0x21, 0x3d, 0x4f, 0x5c, 0x1a, 0xa3, 0x67, 0xbf, 0x34, 0xae, 0x41, 0x49, 0x1c, + 0x12, 0xdd, 0xf0, 0x09, 0xa6, 0xc4, 0xe4, 0x07, 0x6f, 0x54, 0x2b, 0x8a, 0xde, 0x77, 0x44, 0x27, + 0xf3, 0x8d, 0x92, 0x4c, 0xf8, 0xea, 0xf1, 0xd0, 0x37, 0x8a, 0x5e, 0x5e, 0x21, 0x62, 0x6e, 0xaa, + 0x0a, 0x93, 0x9e, 0x1b, 0x58, 0xdc, 0xd7, 0x4c, 0x70, 0xa0, 0xa8, 0x8d, 0xde, 0x86, 0xf1, 0xc0, + 0x6d, 0xf9, 0x06, 0xa9, 0x4c, 0xf6, 0xd6, 0x37, 0x19, 0x31, 0x32, 0xf3, 0xed, 0x70, 0x7a, 0x4d, + 0xf2, 0x71, 0xaf, 0x1a, 0x57, 0x43, 0xfd, 0x4b, 0x1e, 0xa0, 0x73, 0xd5, 0xf6, 0x8a, 0x56, 0x94, + 0x0b, 0x89, 0x56, 0xde, 0x92, 0xb7, 0xbe, 0x58, 0xf8, 0x17, 0x52, 0x68, 0x26, 0x39, 0x49, 0xde, + 0xfc, 0xdb, 0x36, 0xb6, 0x1c, 0x4a, 0x4e, 0xa8, 0xb8, 0xfc, 0x13, 0x56, 0xc9, 0xa7, 0xac, 0x72, + 0x51, 0x0b, 0xb9, 0x0d, 0x05, 0xf1, 0xe6, 0x2b, 0x52, 0xe2, 0xb1, 0x9e, 0x8e, 0x3e, 0xa1, 0x69, + 0x1d, 0x53, 0xa3, 0xc1, 0xd4, 0x15, 0xef, 0x98, 0x3c, 0x19, 0x06, 0x37, 0xfa, 0x8f, 0x6e, 0x76, + 0xb6, 0x86, 0x8d, 0xad, 0x26, 0x31, 0xa3, 0x55, 0x0f, 0x37, 0x87, 0xe8, 0x66, 0xeb, 0xde, 0x59, + 0xdb, 0x89, 0x33, 0xae, 0xed, 0x25, 0x28, 0xeb, 0x49, 0x71, 0x2b, 0xff, 0xb8, 0x04, 0x97, 0x99, + 0x43, 0xdf, 0xf6, 0x5d, 0xea, 0x1a, 0xae, 0xbd, 0x43, 0xfc, 0x63, 0xcb, 0x20, 0xe8, 0x43, 0x18, + 0x17, 0x31, 0x04, 0xca, 0xac, 0x67, 0x27, 0x22, 0xac, 0xea, 0xf5, 0x7e, 0x64, 0xd2, 0xdb, 0x1d, + 0xc1, 0x74, 0xbc, 0x18, 0x8b, 0x5e, 0x7c, 0x34, 0x5f, 0xa2, 0x78, 0x5c, 0xfd, 0xe6, 0x60, 0xc4, + 0x42, 0xd4, 0x2d, 0x05, 0xed, 0xc2, 0x18, 0x77, 0xba, 0xe8, 0x6a, 0x16, 0x63, 0xbc, 0x46, 0x5b, + 0xbd, 0xd6, 0x87, 0x2a, 0xc2, 0xfd, 0x0c, 0x4a, 0x49, 0x67, 0x8e, 0x5e, 0x7a, 0x24, 0x6b, 0xba, + 0xee, 0x58, 0xad, 0x0d, 0x4a, 0x1e, 0x89, 0xfc, 0x18, 0x26, 0x64, 0xbd, 0x04, 0x65, 0x9a, 0x3a, + 0x59, 0xd8, 0xab, 0xde, 0xe8, 0x4b, 0x27, 0xd7, 0xc4, 0x8f, 0x6a, 0x5a, 0x61, 0x2d, 0x06, 0xd5, + 0xfa, 0xf0, 0xa6, 0x8a, 0x52, 0xd5, 0xe5, 0x81, 0xe9, 0xa5, 0xcc, 0x8f, 0x60, 0x5c, 0xa4, 0xf8, + 0xd9, 0x1b, 0x2c, 0x51, 0xb0, 0xc9, 0xde, 0x60, 0xc9, 0x4a, 0xc1, 0x2d, 0x85, 0x4d, 0x27, 0x95, + 0x8a, 0x67, 0x4f, 0xa7, 0x77, 0x61, 0x20, 0x7b, 0x3a, 0x59, 0xe5, 0x02, 0x1b, 0x8a, 0x89, 0x3c, + 0x1e, 0x65, 0x6e, 0xd5, 0x5e, 0x65, 0x80, 0xea, 0x4b, 0x03, 0x52, 0x4b, 0x69, 0x2e, 0x94, 0x92, + 0xcf, 0xbf, 0xd9, 0xfb, 0xaf, 0xe7, 0x8b, 0x74, 0xf6, 0xfe, 0xcb, 0x78, 0x55, 0x76, 0xa1, 0x94, + 0x7c, 0xb7, 0xcd, 0x16, 0xd8, 0xf3, 0xed, 0x38, 0x5b, 0x60, 0xc6, 0x73, 0x70, 0x0b, 0x66, 0xd2, + 0x0f, 0xa7, 0x28, 0x73, 0x51, 0x32, 0xde, 0x73, 0xab, 0xb7, 0x06, 0x67, 0x90, 0x62, 0xdb, 0x30, + 0x93, 0x7e, 0xf3, 0xcc, 0x16, 0x9b, 0xf1, 0xf6, 0x9a, 0x2d, 0x36, 0xeb, 0x39, 0xf5, 0x96, 0xc2, + 0xe6, 0x9b, 0x2e, 0x48, 0x64, 0x0b, 0xce, 0x28, 0xe5, 0x64, 0x0b, 0xce, 0xac, 0x75, 0xb4, 0x60, + 0x26, 0x9d, 0x86, 0x67, 0x8b, 0xcd, 0x28, 0x60, 0x64, 0x8b, 0xcd, 0xcc, 0xf0, 0x7d, 0x28, 0xa7, + 0x52, 0xd5, 0xec, 0x13, 0xda, 0x3b, 0xa3, 0xcf, 0x3e, 0xa1, 0x59, 0x39, 0xf0, 0x17, 0x0a, 0xcc, + 0xf5, 0x4c, 0x22, 0xd0, 0xed, 0x01, 0x73, 0x85, 0x44, 0x76, 0x5c, 0x7d, 0x75, 0x48, 0x2e, 0xa9, + 0x06, 0xed, 0x4e, 0x4a, 0x6b, 0x83, 0xe6, 0x2a, 0xfd, 0xa6, 0x9e, 0x91, 0x80, 0xdd, 0x52, 0xd0, + 0x8f, 0x01, 0x75, 0x7f, 0x01, 0x83, 0x5e, 0x1e, 0xfa, 0xab, 0xaf, 0xea, 0xca, 0x30, 0x2c, 0x72, + 0xca, 0x9f, 0x2b, 0x30, 0xdb, 0xeb, 0x13, 0x47, 0xf4, 0x4a, 0xe6, 0x41, 0xc9, 0xfe, 0x58, 0xb3, + 0x7a, 0x7b, 0x38, 0x26, 0xa1, 0xc3, 0x8a, 0xd7, 0xf9, 0x18, 0x20, 0x0c, 0x71, 0x3e, 0x85, 0xc9, + 0xb0, 0x0b, 0xdd, 0xe8, 0xf7, 0x68, 0x1f, 0x4a, 0x5f, 0xea, 0x4f, 0x28, 0x24, 0xd6, 0xbf, 0xcc, + 0xfd, 0xf1, 0xe1, 0xa2, 0xf2, 0xd5, 0xc3, 0x45, 0xe5, 0xef, 0x0f, 0x17, 0x95, 0x9f, 0x7f, 0xbd, + 0x38, 0xf2, 0xd5, 0xd7, 0x8b, 0x23, 0x7f, 0xfe, 0x7a, 0x71, 0x04, 0xaa, 0x86, 0xdb, 0xcc, 0xc0, + 0xa9, 0x4f, 0x45, 0xd1, 0xd8, 0xb6, 0xf2, 0xf1, 0xfb, 0x87, 0x16, 0x6d, 0xb4, 0xf6, 0x6b, 0x86, + 0xdb, 0x5c, 0x36, 0xdc, 0xa0, 0xe9, 0x06, 0xcb, 0x3e, 0xb1, 0xf1, 0x29, 0xf1, 0x97, 0x8f, 0x57, + 0xa2, 0xbf, 0x3c, 0xf0, 0x0b, 0x96, 0x7b, 0x7f, 0xf7, 0xfb, 0x06, 0x6b, 0x85, 0x8d, 0x5f, 0xe7, + 0xf2, 0xdb, 0xbb, 0xdf, 0xff, 0x4d, 0x6e, 0x7e, 0x3b, 0x14, 0xce, 0xa4, 0xd5, 0x76, 0xe5, 0xf0, + 0x9f, 0x3a, 0x03, 0x7b, 0x6c, 0x60, 0x2f, 0x1c, 0x78, 0x98, 0x53, 0x7b, 0x0f, 0xec, 0xdd, 0xd9, + 0xae, 0xdf, 0x23, 0x14, 0xb3, 0x78, 0xf8, 0x9f, 0xb9, 0x4a, 0x48, 0xb4, 0xba, 0xca, 0xa8, 0x56, + 0x57, 0x43, 0xb2, 0xfd, 0x71, 0xfe, 0x21, 0xee, 0x2b, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x30, + 0x99, 0x71, 0xd0, 0x9d, 0x2c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3813,14 +3416,10 @@ type ViewProtocolServiceClient interface { SwapByCommitment(ctx context.Context, in *SwapByCommitmentRequest, opts ...grpc.CallOption) (*SwapByCommitmentResponse, error) // Query for whether a nullifier has been spent, optionally waiting until it is spent. NullifierStatus(ctx context.Context, in *NullifierStatusRequest, opts ...grpc.CallOption) (*NullifierStatusResponse, error) - // Query for the transaction hashes in the given range of blocks. - TransactionHashes(ctx context.Context, in *TransactionHashesRequest, opts ...grpc.CallOption) (ViewProtocolService_TransactionHashesClient, error) - // Query for a given transaction hash. - TransactionByHash(ctx context.Context, in *TransactionByHashRequest, opts ...grpc.CallOption) (*TransactionByHashResponse, error) + // Query for a given transaction by its hash. + TransactionInfoByHash(ctx context.Context, in *TransactionInfoByHashRequest, opts ...grpc.CallOption) (*TransactionInfoByHashResponse, error) // Query for the full transactions in the given range of blocks. - Transactions(ctx context.Context, in *TransactionsRequest, opts ...grpc.CallOption) (ViewProtocolService_TransactionsClient, error) - // Query for the transaction perspective of the given transaction - TransactionPerspective(ctx context.Context, in *TransactionPerspectiveRequest, opts ...grpc.CallOption) (*TransactionPerspectiveResponse, error) + TransactionInfo(ctx context.Context, in *TransactionInfoRequest, opts ...grpc.CallOption) (ViewProtocolService_TransactionInfoClient, error) // Query for a transaction plan TransactionPlanner(ctx context.Context, in *TransactionPlannerRequest, opts ...grpc.CallOption) (*TransactionPlannerResponse, error) // Broadcast a transaction to the network, optionally waiting for full confirmation. @@ -4094,53 +3693,21 @@ func (c *viewProtocolServiceClient) NullifierStatus(ctx context.Context, in *Nul return out, nil } -func (c *viewProtocolServiceClient) TransactionHashes(ctx context.Context, in *TransactionHashesRequest, opts ...grpc.CallOption) (ViewProtocolService_TransactionHashesClient, error) { - stream, err := c.cc.NewStream(ctx, &_ViewProtocolService_serviceDesc.Streams[5], "/penumbra.view.v1alpha1.ViewProtocolService/TransactionHashes", opts...) - if err != nil { - return nil, err - } - x := &viewProtocolServiceTransactionHashesClient{stream} - if err := x.ClientStream.SendMsg(in); err != nil { - return nil, err - } - if err := x.ClientStream.CloseSend(); err != nil { - return nil, err - } - return x, nil -} - -type ViewProtocolService_TransactionHashesClient interface { - Recv() (*TransactionHashesResponse, error) - grpc.ClientStream -} - -type viewProtocolServiceTransactionHashesClient struct { - grpc.ClientStream -} - -func (x *viewProtocolServiceTransactionHashesClient) Recv() (*TransactionHashesResponse, error) { - m := new(TransactionHashesResponse) - if err := x.ClientStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} - -func (c *viewProtocolServiceClient) TransactionByHash(ctx context.Context, in *TransactionByHashRequest, opts ...grpc.CallOption) (*TransactionByHashResponse, error) { - out := new(TransactionByHashResponse) - err := c.cc.Invoke(ctx, "/penumbra.view.v1alpha1.ViewProtocolService/TransactionByHash", in, out, opts...) +func (c *viewProtocolServiceClient) TransactionInfoByHash(ctx context.Context, in *TransactionInfoByHashRequest, opts ...grpc.CallOption) (*TransactionInfoByHashResponse, error) { + out := new(TransactionInfoByHashResponse) + err := c.cc.Invoke(ctx, "/penumbra.view.v1alpha1.ViewProtocolService/TransactionInfoByHash", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *viewProtocolServiceClient) Transactions(ctx context.Context, in *TransactionsRequest, opts ...grpc.CallOption) (ViewProtocolService_TransactionsClient, error) { - stream, err := c.cc.NewStream(ctx, &_ViewProtocolService_serviceDesc.Streams[6], "/penumbra.view.v1alpha1.ViewProtocolService/Transactions", opts...) +func (c *viewProtocolServiceClient) TransactionInfo(ctx context.Context, in *TransactionInfoRequest, opts ...grpc.CallOption) (ViewProtocolService_TransactionInfoClient, error) { + stream, err := c.cc.NewStream(ctx, &_ViewProtocolService_serviceDesc.Streams[5], "/penumbra.view.v1alpha1.ViewProtocolService/TransactionInfo", opts...) if err != nil { return nil, err } - x := &viewProtocolServiceTransactionsClient{stream} + x := &viewProtocolServiceTransactionInfoClient{stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -4150,32 +3717,23 @@ func (c *viewProtocolServiceClient) Transactions(ctx context.Context, in *Transa return x, nil } -type ViewProtocolService_TransactionsClient interface { - Recv() (*TransactionsResponse, error) +type ViewProtocolService_TransactionInfoClient interface { + Recv() (*TransactionInfoResponse, error) grpc.ClientStream } -type viewProtocolServiceTransactionsClient struct { +type viewProtocolServiceTransactionInfoClient struct { grpc.ClientStream } -func (x *viewProtocolServiceTransactionsClient) Recv() (*TransactionsResponse, error) { - m := new(TransactionsResponse) +func (x *viewProtocolServiceTransactionInfoClient) Recv() (*TransactionInfoResponse, error) { + m := new(TransactionInfoResponse) if err := x.ClientStream.RecvMsg(m); err != nil { return nil, err } return m, nil } -func (c *viewProtocolServiceClient) TransactionPerspective(ctx context.Context, in *TransactionPerspectiveRequest, opts ...grpc.CallOption) (*TransactionPerspectiveResponse, error) { - out := new(TransactionPerspectiveResponse) - err := c.cc.Invoke(ctx, "/penumbra.view.v1alpha1.ViewProtocolService/TransactionPerspective", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - func (c *viewProtocolServiceClient) TransactionPlanner(ctx context.Context, in *TransactionPlannerRequest, opts ...grpc.CallOption) (*TransactionPlannerResponse, error) { out := new(TransactionPlannerResponse) err := c.cc.Invoke(ctx, "/penumbra.view.v1alpha1.ViewProtocolService/TransactionPlanner", in, out, opts...) @@ -4231,14 +3789,10 @@ type ViewProtocolServiceServer interface { SwapByCommitment(context.Context, *SwapByCommitmentRequest) (*SwapByCommitmentResponse, error) // Query for whether a nullifier has been spent, optionally waiting until it is spent. NullifierStatus(context.Context, *NullifierStatusRequest) (*NullifierStatusResponse, error) - // Query for the transaction hashes in the given range of blocks. - TransactionHashes(*TransactionHashesRequest, ViewProtocolService_TransactionHashesServer) error - // Query for a given transaction hash. - TransactionByHash(context.Context, *TransactionByHashRequest) (*TransactionByHashResponse, error) + // Query for a given transaction by its hash. + TransactionInfoByHash(context.Context, *TransactionInfoByHashRequest) (*TransactionInfoByHashResponse, error) // Query for the full transactions in the given range of blocks. - Transactions(*TransactionsRequest, ViewProtocolService_TransactionsServer) error - // Query for the transaction perspective of the given transaction - TransactionPerspective(context.Context, *TransactionPerspectiveRequest) (*TransactionPerspectiveResponse, error) + TransactionInfo(*TransactionInfoRequest, ViewProtocolService_TransactionInfoServer) error // Query for a transaction plan TransactionPlanner(context.Context, *TransactionPlannerRequest) (*TransactionPlannerResponse, error) // Broadcast a transaction to the network, optionally waiting for full confirmation. @@ -4297,17 +3851,11 @@ func (*UnimplementedViewProtocolServiceServer) SwapByCommitment(ctx context.Cont func (*UnimplementedViewProtocolServiceServer) NullifierStatus(ctx context.Context, req *NullifierStatusRequest) (*NullifierStatusResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method NullifierStatus not implemented") } -func (*UnimplementedViewProtocolServiceServer) TransactionHashes(req *TransactionHashesRequest, srv ViewProtocolService_TransactionHashesServer) error { - return status.Errorf(codes.Unimplemented, "method TransactionHashes not implemented") -} -func (*UnimplementedViewProtocolServiceServer) TransactionByHash(ctx context.Context, req *TransactionByHashRequest) (*TransactionByHashResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method TransactionByHash not implemented") +func (*UnimplementedViewProtocolServiceServer) TransactionInfoByHash(ctx context.Context, req *TransactionInfoByHashRequest) (*TransactionInfoByHashResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method TransactionInfoByHash not implemented") } -func (*UnimplementedViewProtocolServiceServer) Transactions(req *TransactionsRequest, srv ViewProtocolService_TransactionsServer) error { - return status.Errorf(codes.Unimplemented, "method Transactions not implemented") -} -func (*UnimplementedViewProtocolServiceServer) TransactionPerspective(ctx context.Context, req *TransactionPerspectiveRequest) (*TransactionPerspectiveResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method TransactionPerspective not implemented") +func (*UnimplementedViewProtocolServiceServer) TransactionInfo(req *TransactionInfoRequest, srv ViewProtocolService_TransactionInfoServer) error { + return status.Errorf(codes.Unimplemented, "method TransactionInfo not implemented") } func (*UnimplementedViewProtocolServiceServer) TransactionPlanner(ctx context.Context, req *TransactionPlannerRequest) (*TransactionPlannerResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method TransactionPlanner not implemented") @@ -4623,84 +4171,45 @@ func _ViewProtocolService_NullifierStatus_Handler(srv interface{}, ctx context.C return interceptor(ctx, in, info, handler) } -func _ViewProtocolService_TransactionHashes_Handler(srv interface{}, stream grpc.ServerStream) error { - m := new(TransactionHashesRequest) - if err := stream.RecvMsg(m); err != nil { - return err - } - return srv.(ViewProtocolServiceServer).TransactionHashes(m, &viewProtocolServiceTransactionHashesServer{stream}) -} - -type ViewProtocolService_TransactionHashesServer interface { - Send(*TransactionHashesResponse) error - grpc.ServerStream -} - -type viewProtocolServiceTransactionHashesServer struct { - grpc.ServerStream -} - -func (x *viewProtocolServiceTransactionHashesServer) Send(m *TransactionHashesResponse) error { - return x.ServerStream.SendMsg(m) -} - -func _ViewProtocolService_TransactionByHash_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(TransactionByHashRequest) +func _ViewProtocolService_TransactionInfoByHash_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(TransactionInfoByHashRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ViewProtocolServiceServer).TransactionByHash(ctx, in) + return srv.(ViewProtocolServiceServer).TransactionInfoByHash(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/penumbra.view.v1alpha1.ViewProtocolService/TransactionByHash", + FullMethod: "/penumbra.view.v1alpha1.ViewProtocolService/TransactionInfoByHash", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ViewProtocolServiceServer).TransactionByHash(ctx, req.(*TransactionByHashRequest)) + return srv.(ViewProtocolServiceServer).TransactionInfoByHash(ctx, req.(*TransactionInfoByHashRequest)) } return interceptor(ctx, in, info, handler) } -func _ViewProtocolService_Transactions_Handler(srv interface{}, stream grpc.ServerStream) error { - m := new(TransactionsRequest) +func _ViewProtocolService_TransactionInfo_Handler(srv interface{}, stream grpc.ServerStream) error { + m := new(TransactionInfoRequest) if err := stream.RecvMsg(m); err != nil { return err } - return srv.(ViewProtocolServiceServer).Transactions(m, &viewProtocolServiceTransactionsServer{stream}) + return srv.(ViewProtocolServiceServer).TransactionInfo(m, &viewProtocolServiceTransactionInfoServer{stream}) } -type ViewProtocolService_TransactionsServer interface { - Send(*TransactionsResponse) error +type ViewProtocolService_TransactionInfoServer interface { + Send(*TransactionInfoResponse) error grpc.ServerStream } -type viewProtocolServiceTransactionsServer struct { +type viewProtocolServiceTransactionInfoServer struct { grpc.ServerStream } -func (x *viewProtocolServiceTransactionsServer) Send(m *TransactionsResponse) error { +func (x *viewProtocolServiceTransactionInfoServer) Send(m *TransactionInfoResponse) error { return x.ServerStream.SendMsg(m) } -func _ViewProtocolService_TransactionPerspective_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(TransactionPerspectiveRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(ViewProtocolServiceServer).TransactionPerspective(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/penumbra.view.v1alpha1.ViewProtocolService/TransactionPerspective", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ViewProtocolServiceServer).TransactionPerspective(ctx, req.(*TransactionPerspectiveRequest)) - } - return interceptor(ctx, in, info, handler) -} - func _ViewProtocolService_TransactionPlanner_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(TransactionPlannerRequest) if err := dec(in); err != nil { @@ -4786,12 +4295,8 @@ var _ViewProtocolService_serviceDesc = grpc.ServiceDesc{ Handler: _ViewProtocolService_NullifierStatus_Handler, }, { - MethodName: "TransactionByHash", - Handler: _ViewProtocolService_TransactionByHash_Handler, - }, - { - MethodName: "TransactionPerspective", - Handler: _ViewProtocolService_TransactionPerspective_Handler, + MethodName: "TransactionInfoByHash", + Handler: _ViewProtocolService_TransactionInfoByHash_Handler, }, { MethodName: "TransactionPlanner", @@ -4829,13 +4334,8 @@ var _ViewProtocolService_serviceDesc = grpc.ServiceDesc{ ServerStreams: true, }, { - StreamName: "TransactionHashes", - Handler: _ViewProtocolService_TransactionHashes_Handler, - ServerStreams: true, - }, - { - StreamName: "Transactions", - Handler: _ViewProtocolService_Transactions_Handler, + StreamName: "TransactionInfo", + Handler: _ViewProtocolService_TransactionInfo_Handler, ServerStreams: true, }, }, @@ -4979,6 +4479,11 @@ func (m *BroadcastTransactionResponse) MarshalToSizedBuffer(dAtA []byte) (int, e _ = i var l int _ = l + if m.DetectionHeight != 0 { + i = encodeVarintView(dAtA, i, uint64(m.DetectionHeight)) + i-- + dAtA[i] = 0x10 + } if m.Id != nil { { size, err := m.Id.MarshalToSizedBuffer(dAtA[:i]) @@ -5094,15 +4599,6 @@ func (m *TransactionPlannerRequest) MarshalToSizedBuffer(dAtA []byte) (int, erro dAtA[i] = 0xa2 } } - if m.XToken != nil { - { - size := m.XToken.Size() - i -= size - if _, err := m.XToken.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - } - } if m.XAccountGroupId != nil { { size := m.XAccountGroupId.Size() @@ -5160,27 +4656,6 @@ func (m *TransactionPlannerRequest_AccountGroupId) MarshalToSizedBuffer(dAtA []b } return len(dAtA) - i, nil } -func (m *TransactionPlannerRequest_Token) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *TransactionPlannerRequest_Token) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - if m.Token != nil { - { - size, err := m.Token.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintView(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x7a - } - return len(dAtA) - i, nil -} func (m *TransactionPlannerRequest_Output) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -5834,15 +5309,6 @@ func (m *StatusRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XToken != nil { - { - size := m.XToken.Size() - i -= size - if _, err := m.XToken.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - } - } if m.XAccountGroupId != nil { { size := m.XAccountGroupId.Size() @@ -5876,27 +5342,6 @@ func (m *StatusRequest_AccountGroupId) MarshalToSizedBuffer(dAtA []byte) (int, e } return len(dAtA) - i, nil } -func (m *StatusRequest_Token) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *StatusRequest_Token) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - if m.Token != nil { - { - size, err := m.Token.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintView(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x7a - } - return len(dAtA) - i, nil -} func (m *StatusResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -5955,15 +5400,6 @@ func (m *StatusStreamRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XToken != nil { - { - size := m.XToken.Size() - i -= size - if _, err := m.XToken.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - } - } if m.XAccountGroupId != nil { { size := m.XAccountGroupId.Size() @@ -5997,27 +5433,6 @@ func (m *StatusStreamRequest_AccountGroupId) MarshalToSizedBuffer(dAtA []byte) ( } return len(dAtA) - i, nil } -func (m *StatusStreamRequest_Token) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *StatusStreamRequest_Token) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - if m.Token != nil { - { - size, err := m.Token.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintView(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x7a - } - return len(dAtA) - i, nil -} func (m *StatusStreamResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -6071,28 +5486,26 @@ func (m *NotesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XToken != nil { + if m.XAccountGroupId != nil { { - size := m.XToken.Size() + size := m.XAccountGroupId.Size() i -= size - if _, err := m.XToken.MarshalTo(dAtA[i:]); err != nil { + if _, err := m.XAccountGroupId.MarshalTo(dAtA[i:]); err != nil { return 0, err } } } - if m.XAccountGroupId != nil { + if m.AmountToSpend != nil { { - size := m.XAccountGroupId.Size() - i -= size - if _, err := m.XAccountGroupId.MarshalTo(dAtA[i:]); err != nil { + size, err := m.AmountToSpend.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { return 0, err } + i -= size + i = encodeVarintView(dAtA, i, uint64(size)) } - } - if m.AmountToSpend != 0 { - i = encodeVarintView(dAtA, i, uint64(m.AmountToSpend)) i-- - dAtA[i] = 0x28 + dAtA[i] = 0x32 } if m.AddressIndex != nil { { @@ -6152,27 +5565,6 @@ func (m *NotesRequest_AccountGroupId) MarshalToSizedBuffer(dAtA []byte) (int, er } return len(dAtA) - i, nil } -func (m *NotesRequest_Token) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *NotesRequest_Token) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - if m.Token != nil { - { - size, err := m.Token.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintView(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x7a - } - return len(dAtA) - i, nil -} func (m *NotesForVotingRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -6193,15 +5585,6 @@ func (m *NotesForVotingRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XToken != nil { - { - size := m.XToken.Size() - i -= size - if _, err := m.XToken.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - } - } if m.XAccountGroupId != nil { { size := m.XAccountGroupId.Size() @@ -6252,27 +5635,6 @@ func (m *NotesForVotingRequest_AccountGroupId) MarshalToSizedBuffer(dAtA []byte) } return len(dAtA) - i, nil } -func (m *NotesForVotingRequest_Token) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *NotesForVotingRequest_Token) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - if m.Token != nil { - { - size, err := m.Token.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintView(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x7a - } - return len(dAtA) - i, nil -} func (m *WitnessRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -6293,15 +5655,6 @@ func (m *WitnessRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XToken != nil { - { - size := m.XToken.Size() - i -= size - if _, err := m.XToken.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - } - } if m.XAccountGroupId != nil { { size := m.XAccountGroupId.Size() @@ -6361,27 +5714,6 @@ func (m *WitnessRequest_AccountGroupId) MarshalToSizedBuffer(dAtA []byte) (int, } return len(dAtA) - i, nil } -func (m *WitnessRequest_Token) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *WitnessRequest_Token) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - if m.Token != nil { - { - size, err := m.Token.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintView(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x7a - } - return len(dAtA) - i, nil -} func (m *WitnessResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -6767,15 +6099,6 @@ func (m *NoteByCommitmentRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l - if m.XToken != nil { - { - size := m.XToken.Size() - i -= size - if _, err := m.XToken.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - } - } if m.XAccountGroupId != nil { { size := m.XAccountGroupId.Size() @@ -6831,27 +6154,6 @@ func (m *NoteByCommitmentRequest_AccountGroupId) MarshalToSizedBuffer(dAtA []byt } return len(dAtA) - i, nil } -func (m *NoteByCommitmentRequest_Token) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *NoteByCommitmentRequest_Token) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - if m.Token != nil { - { - size, err := m.Token.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintView(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x7a - } - return len(dAtA) - i, nil -} func (m *NoteByCommitmentResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -6907,15 +6209,6 @@ func (m *SwapByCommitmentRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l - if m.XToken != nil { - { - size := m.XToken.Size() - i -= size - if _, err := m.XToken.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - } - } if m.XAccountGroupId != nil { { size := m.XAccountGroupId.Size() @@ -6971,27 +6264,6 @@ func (m *SwapByCommitmentRequest_AccountGroupId) MarshalToSizedBuffer(dAtA []byt } return len(dAtA) - i, nil } -func (m *SwapByCommitmentRequest_Token) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *SwapByCommitmentRequest_Token) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - if m.Token != nil { - { - size, err := m.Token.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintView(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x7a - } - return len(dAtA) - i, nil -} func (m *SwapByCommitmentResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -7047,15 +6319,6 @@ func (m *NullifierStatusRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l - if m.XToken != nil { - { - size := m.XToken.Size() - i -= size - if _, err := m.XToken.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - } - } if m.XAccountGroupId != nil { { size := m.XAccountGroupId.Size() @@ -7111,27 +6374,6 @@ func (m *NullifierStatusRequest_AccountGroupId) MarshalToSizedBuffer(dAtA []byte } return len(dAtA) - i, nil } -func (m *NullifierStatusRequest_Token) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *NullifierStatusRequest_Token) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - if m.Token != nil { - { - size, err := m.Token.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintView(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x7a - } - return len(dAtA) - i, nil -} func (m *NullifierStatusResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -7165,7 +6407,7 @@ func (m *NullifierStatusResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } -func (m *TransactionHashesRequest) Marshal() (dAtA []byte, err error) { +func (m *TransactionInfoByHashRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -7175,12 +6417,47 @@ func (m *TransactionHashesRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *TransactionHashesRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *TransactionInfoByHashRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *TransactionHashesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *TransactionInfoByHashRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Id != nil { + { + size, err := m.Id.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintView(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + return len(dAtA) - i, nil +} + +func (m *TransactionInfoRequest) 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 *TransactionInfoRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TransactionInfoRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -7206,31 +6483,31 @@ func (m *TransactionHashesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error return len(dAtA) - i, nil } -func (m *TransactionHashesRequest_StartHeight) MarshalTo(dAtA []byte) (int, error) { +func (m *TransactionInfoRequest_StartHeight) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *TransactionHashesRequest_StartHeight) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *TransactionInfoRequest_StartHeight) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) i = encodeVarintView(dAtA, i, uint64(m.StartHeight)) i-- dAtA[i] = 0x8 return len(dAtA) - i, nil } -func (m *TransactionHashesRequest_EndHeight) MarshalTo(dAtA []byte) (int, error) { +func (m *TransactionInfoRequest_EndHeight) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *TransactionHashesRequest_EndHeight) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *TransactionInfoRequest_EndHeight) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) i = encodeVarintView(dAtA, i, uint64(m.EndHeight)) i-- dAtA[i] = 0x10 return len(dAtA) - i, nil } -func (m *TransactionHashesResponse) Marshal() (dAtA []byte, err error) { +func (m *TransactionInfo) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -7240,84 +6517,43 @@ func (m *TransactionHashesResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *TransactionHashesResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *TransactionInfo) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *TransactionHashesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *TransactionInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.TxHash) > 0 { - i -= len(m.TxHash) - copy(dAtA[i:], m.TxHash) - i = encodeVarintView(dAtA, i, uint64(len(m.TxHash))) + if m.View != nil { + { + size, err := m.View.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintView(dAtA, i, uint64(size)) + } i-- - dAtA[i] = 0x12 + dAtA[i] = 0x2a } - if m.BlockHeight != 0 { - i = encodeVarintView(dAtA, i, uint64(m.BlockHeight)) + if m.Perspective != nil { + { + size, err := m.Perspective.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintView(dAtA, i, uint64(size)) + } i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *TransactionByHashRequest) 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[i] = 0x22 } - return dAtA[:n], nil -} - -func (m *TransactionByHashRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *TransactionByHashRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.TxHash) > 0 { - i -= len(m.TxHash) - copy(dAtA[i:], m.TxHash) - i = encodeVarintView(dAtA, i, uint64(len(m.TxHash))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *TransactionByHashResponse) 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 *TransactionByHashResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *TransactionByHashResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Tx != nil { + if m.Transaction != nil { { - size, err := m.Tx.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Transaction.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -7325,45 +6561,25 @@ func (m *TransactionByHashResponse) MarshalToSizedBuffer(dAtA []byte) (int, erro i = encodeVarintView(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *TransactionsRequest) 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[i] = 0x1a } - return dAtA[:n], nil -} - -func (m *TransactionsRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *TransactionsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.XEndHeight != nil { + if m.Id != nil { { - size := m.XEndHeight.Size() - i -= size - if _, err := m.XEndHeight.MarshalTo(dAtA[i:]); err != nil { + size, err := m.Id.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { return 0, err } + i -= size + i = encodeVarintView(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0x12 } - if m.XStartHeight != nil { + if m.XHeight != nil { { - size := m.XStartHeight.Size() + size := m.XHeight.Size() i -= size - if _, err := m.XStartHeight.MarshalTo(dAtA[i:]); err != nil { + if _, err := m.XHeight.MarshalTo(dAtA[i:]); err != nil { return 0, err } } @@ -7371,31 +6587,19 @@ func (m *TransactionsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *TransactionsRequest_StartHeight) MarshalTo(dAtA []byte) (int, error) { +func (m *TransactionInfo_Height) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *TransactionsRequest_StartHeight) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *TransactionInfo_Height) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) - i = encodeVarintView(dAtA, i, uint64(m.StartHeight)) + i = encodeVarintView(dAtA, i, uint64(m.Height)) i-- dAtA[i] = 0x8 return len(dAtA) - i, nil } -func (m *TransactionsRequest_EndHeight) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *TransactionsRequest_EndHeight) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - i = encodeVarintView(dAtA, i, uint64(m.EndHeight)) - i-- - dAtA[i] = 0x10 - return len(dAtA) - i, nil -} -func (m *TransactionsResponse) Marshal() (dAtA []byte, err error) { +func (m *TransactionInfoResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -7405,19 +6609,19 @@ func (m *TransactionsResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *TransactionsResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *TransactionInfoResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *TransactionsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *TransactionInfoResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Tx != nil { + if m.TxInfo != nil { { - size, err := m.Tx.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.TxInfo.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -7425,54 +6629,12 @@ func (m *TransactionsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintView(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x1a - } - if len(m.TxHash) > 0 { - i -= len(m.TxHash) - copy(dAtA[i:], m.TxHash) - i = encodeVarintView(dAtA, i, uint64(len(m.TxHash))) - i-- - dAtA[i] = 0x12 - } - if m.BlockHeight != 0 { - i = encodeVarintView(dAtA, i, uint64(m.BlockHeight)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *TransactionPerspectiveRequest) 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 *TransactionPerspectiveRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *TransactionPerspectiveRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.TxHash) > 0 { - i -= len(m.TxHash) - copy(dAtA[i:], m.TxHash) - i = encodeVarintView(dAtA, i, uint64(len(m.TxHash))) - i-- dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *TransactionPerspectiveResponse) Marshal() (dAtA []byte, err error) { +func (m *TransactionInfoByHashResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -7482,43 +6644,19 @@ func (m *TransactionPerspectiveResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *TransactionPerspectiveResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *TransactionInfoByHashResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *TransactionPerspectiveResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *TransactionInfoByHashResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Txv != nil { - { - size, err := m.Txv.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintView(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - } - if m.Tx != nil { - { - size, err := m.Tx.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintView(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if m.Txp != nil { + if m.TxInfo != nil { { - size, err := m.Txp.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.TxInfo.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -7873,6 +7011,9 @@ func (m *BroadcastTransactionResponse) Size() (n int) { l = m.Id.Size() n += 1 + l + sovView(uint64(l)) } + if m.DetectionHeight != 0 { + n += 1 + sovView(uint64(m.DetectionHeight)) + } return n } @@ -7896,9 +7037,6 @@ func (m *TransactionPlannerRequest) Size() (n int) { if m.XAccountGroupId != nil { n += m.XAccountGroupId.Size() } - if m.XToken != nil { - n += m.XToken.Size() - } if len(m.Outputs) > 0 { for _, e := range m.Outputs { l = e.Size() @@ -7944,18 +7082,6 @@ func (m *TransactionPlannerRequest_AccountGroupId) Size() (n int) { } return n } -func (m *TransactionPlannerRequest_Token) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Token != nil { - l = m.Token.Size() - n += 1 + l + sovView(uint64(l)) - } - return n -} func (m *TransactionPlannerRequest_Output) Size() (n int) { if m == nil { return 0 @@ -8204,9 +7330,6 @@ func (m *StatusRequest) Size() (n int) { if m.XAccountGroupId != nil { n += m.XAccountGroupId.Size() } - if m.XToken != nil { - n += m.XToken.Size() - } return n } @@ -8222,18 +7345,6 @@ func (m *StatusRequest_AccountGroupId) Size() (n int) { } return n } -func (m *StatusRequest_Token) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Token != nil { - l = m.Token.Size() - n += 1 + l + sovView(uint64(l)) - } - return n -} func (m *StatusResponse) Size() (n int) { if m == nil { return 0 @@ -8258,9 +7369,6 @@ func (m *StatusStreamRequest) Size() (n int) { if m.XAccountGroupId != nil { n += m.XAccountGroupId.Size() } - if m.XToken != nil { - n += m.XToken.Size() - } return n } @@ -8276,18 +7384,6 @@ func (m *StatusStreamRequest_AccountGroupId) Size() (n int) { } return n } -func (m *StatusStreamRequest_Token) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Token != nil { - l = m.Token.Size() - n += 1 + l + sovView(uint64(l)) - } - return n -} func (m *StatusStreamResponse) Size() (n int) { if m == nil { return 0 @@ -8320,15 +7416,13 @@ func (m *NotesRequest) Size() (n int) { l = m.AddressIndex.Size() n += 1 + l + sovView(uint64(l)) } - if m.AmountToSpend != 0 { - n += 1 + sovView(uint64(m.AmountToSpend)) + if m.AmountToSpend != nil { + l = m.AmountToSpend.Size() + n += 1 + l + sovView(uint64(l)) } if m.XAccountGroupId != nil { n += m.XAccountGroupId.Size() } - if m.XToken != nil { - n += m.XToken.Size() - } return n } @@ -8344,18 +7438,6 @@ func (m *NotesRequest_AccountGroupId) Size() (n int) { } return n } -func (m *NotesRequest_Token) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Token != nil { - l = m.Token.Size() - n += 1 + l + sovView(uint64(l)) - } - return n -} func (m *NotesForVotingRequest) Size() (n int) { if m == nil { return 0 @@ -8372,9 +7454,6 @@ func (m *NotesForVotingRequest) Size() (n int) { if m.XAccountGroupId != nil { n += m.XAccountGroupId.Size() } - if m.XToken != nil { - n += m.XToken.Size() - } return n } @@ -8390,18 +7469,6 @@ func (m *NotesForVotingRequest_AccountGroupId) Size() (n int) { } return n } -func (m *NotesForVotingRequest_Token) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Token != nil { - l = m.Token.Size() - n += 1 + l + sovView(uint64(l)) - } - return n -} func (m *WitnessRequest) Size() (n int) { if m == nil { return 0 @@ -8421,9 +7488,6 @@ func (m *WitnessRequest) Size() (n int) { if m.XAccountGroupId != nil { n += m.XAccountGroupId.Size() } - if m.XToken != nil { - n += m.XToken.Size() - } return n } @@ -8439,18 +7503,6 @@ func (m *WitnessRequest_AccountGroupId) Size() (n int) { } return n } -func (m *WitnessRequest_Token) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Token != nil { - l = m.Token.Size() - n += 1 + l + sovView(uint64(l)) - } - return n -} func (m *WitnessResponse) Size() (n int) { if m == nil { return 0 @@ -8600,9 +7652,6 @@ func (m *NoteByCommitmentRequest) Size() (n int) { if m.XAccountGroupId != nil { n += m.XAccountGroupId.Size() } - if m.XToken != nil { - n += m.XToken.Size() - } return n } @@ -8618,18 +7667,6 @@ func (m *NoteByCommitmentRequest_AccountGroupId) Size() (n int) { } return n } -func (m *NoteByCommitmentRequest_Token) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Token != nil { - l = m.Token.Size() - n += 1 + l + sovView(uint64(l)) - } - return n -} func (m *NoteByCommitmentResponse) Size() (n int) { if m == nil { return 0 @@ -8659,9 +7696,6 @@ func (m *SwapByCommitmentRequest) Size() (n int) { if m.XAccountGroupId != nil { n += m.XAccountGroupId.Size() } - if m.XToken != nil { - n += m.XToken.Size() - } return n } @@ -8677,18 +7711,6 @@ func (m *SwapByCommitmentRequest_AccountGroupId) Size() (n int) { } return n } -func (m *SwapByCommitmentRequest_Token) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Token != nil { - l = m.Token.Size() - n += 1 + l + sovView(uint64(l)) - } - return n -} func (m *SwapByCommitmentResponse) Size() (n int) { if m == nil { return 0 @@ -8718,9 +7740,6 @@ func (m *NullifierStatusRequest) Size() (n int) { if m.XAccountGroupId != nil { n += m.XAccountGroupId.Size() } - if m.XToken != nil { - n += m.XToken.Size() - } return n } @@ -8736,31 +7755,32 @@ func (m *NullifierStatusRequest_AccountGroupId) Size() (n int) { } return n } -func (m *NullifierStatusRequest_Token) Size() (n int) { +func (m *NullifierStatusResponse) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.Token != nil { - l = m.Token.Size() - n += 1 + l + sovView(uint64(l)) + if m.Spent { + n += 2 } return n } -func (m *NullifierStatusResponse) Size() (n int) { + +func (m *TransactionInfoByHashRequest) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.Spent { - n += 2 + if m.Id != nil { + l = m.Id.Size() + n += 1 + l + sovView(uint64(l)) } return n } -func (m *TransactionHashesRequest) Size() (n int) { +func (m *TransactionInfoRequest) Size() (n int) { if m == nil { return 0 } @@ -8775,7 +7795,7 @@ func (m *TransactionHashesRequest) Size() (n int) { return n } -func (m *TransactionHashesRequest_StartHeight) Size() (n int) { +func (m *TransactionInfoRequest_StartHeight) Size() (n int) { if m == nil { return 0 } @@ -8784,7 +7804,7 @@ func (m *TransactionHashesRequest_StartHeight) Size() (n int) { n += 1 + sovView(uint64(m.StartHeight)) return n } -func (m *TransactionHashesRequest_EndHeight) Size() (n int) { +func (m *TransactionInfoRequest_EndHeight) Size() (n int) { if m == nil { return 0 } @@ -8793,130 +7813,64 @@ func (m *TransactionHashesRequest_EndHeight) Size() (n int) { n += 1 + sovView(uint64(m.EndHeight)) return n } -func (m *TransactionHashesResponse) Size() (n int) { +func (m *TransactionInfo) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.BlockHeight != 0 { - n += 1 + sovView(uint64(m.BlockHeight)) + if m.XHeight != nil { + n += m.XHeight.Size() } - l = len(m.TxHash) - if l > 0 { + if m.Id != nil { + l = m.Id.Size() + n += 1 + l + sovView(uint64(l)) + } + if m.Transaction != nil { + l = m.Transaction.Size() + n += 1 + l + sovView(uint64(l)) + } + if m.Perspective != nil { + l = m.Perspective.Size() + n += 1 + l + sovView(uint64(l)) + } + if m.View != nil { + l = m.View.Size() n += 1 + l + sovView(uint64(l)) } return n } -func (m *TransactionByHashRequest) Size() (n int) { +func (m *TransactionInfo_Height) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = len(m.TxHash) - if l > 0 { - n += 1 + l + sovView(uint64(l)) - } + n += 1 + sovView(uint64(m.Height)) return n } - -func (m *TransactionByHashResponse) Size() (n int) { +func (m *TransactionInfoResponse) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.Tx != nil { - l = m.Tx.Size() + if m.TxInfo != nil { + l = m.TxInfo.Size() n += 1 + l + sovView(uint64(l)) } return n } -func (m *TransactionsRequest) Size() (n int) { +func (m *TransactionInfoByHashResponse) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.XStartHeight != nil { - n += m.XStartHeight.Size() - } - if m.XEndHeight != nil { - n += m.XEndHeight.Size() - } - return n -} - -func (m *TransactionsRequest_StartHeight) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - n += 1 + sovView(uint64(m.StartHeight)) - return n -} -func (m *TransactionsRequest_EndHeight) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - n += 1 + sovView(uint64(m.EndHeight)) - return n -} -func (m *TransactionsResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.BlockHeight != 0 { - n += 1 + sovView(uint64(m.BlockHeight)) - } - l = len(m.TxHash) - if l > 0 { - n += 1 + l + sovView(uint64(l)) - } - if m.Tx != nil { - l = m.Tx.Size() - n += 1 + l + sovView(uint64(l)) - } - return n -} - -func (m *TransactionPerspectiveRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.TxHash) - if l > 0 { - n += 1 + l + sovView(uint64(l)) - } - return n -} - -func (m *TransactionPerspectiveResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Txp != nil { - l = m.Txp.Size() - n += 1 + l + sovView(uint64(l)) - } - if m.Tx != nil { - l = m.Tx.Size() - n += 1 + l + sovView(uint64(l)) - } - if m.Txv != nil { - l = m.Txv.Size() + if m.TxInfo != nil { + l = m.TxInfo.Size() n += 1 + l + sovView(uint64(l)) } return n @@ -9221,6 +8175,25 @@ func (m *BroadcastTransactionResponse) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field DetectionHeight", wireType) + } + m.DetectionHeight = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowView + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.DetectionHeight |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipView(dAtA[iNdEx:]) @@ -9393,41 +8366,6 @@ func (m *TransactionPlannerRequest) Unmarshal(dAtA []byte) error { } m.XAccountGroupId = &TransactionPlannerRequest_AccountGroupId{v} iNdEx = postIndex - case 15: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Token", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthView - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthView - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - v := &ViewAuthToken{} - if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - m.XToken = &TransactionPlannerRequest_Token{v} - iNdEx = postIndex case 20: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Outputs", wireType) @@ -11236,41 +10174,6 @@ func (m *StatusRequest) Unmarshal(dAtA []byte) error { } m.XAccountGroupId = &StatusRequest_AccountGroupId{v} iNdEx = postIndex - case 15: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Token", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthView - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthView - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - v := &ViewAuthToken{} - if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - m.XToken = &StatusRequest_Token{v} - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipView(dAtA[iNdEx:]) @@ -11445,41 +10348,6 @@ func (m *StatusStreamRequest) Unmarshal(dAtA []byte) error { } m.XAccountGroupId = &StatusStreamRequest_AccountGroupId{v} iNdEx = postIndex - case 15: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Token", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthView - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthView - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - v := &ViewAuthToken{} - if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - m.XToken = &StatusStreamRequest_Token{v} - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipView(dAtA[iNdEx:]) @@ -11710,28 +10578,9 @@ func (m *NotesRequest) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 5: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field AmountToSpend", wireType) - } - m.AmountToSpend = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.AmountToSpend |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 14: + case 6: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AccountGroupId", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field AmountToSpend", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -11758,15 +10607,16 @@ func (m *NotesRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - v := &v1alpha11.AccountGroupId{} - if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if m.AmountToSpend == nil { + m.AmountToSpend = &v1alpha11.Amount{} + } + if err := m.AmountToSpend.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } - m.XAccountGroupId = &NotesRequest_AccountGroupId{v} iNdEx = postIndex - case 15: + case 14: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Token", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field AccountGroupId", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -11793,11 +10643,11 @@ func (m *NotesRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - v := &ViewAuthToken{} + v := &v1alpha11.AccountGroupId{} if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } - m.XToken = &NotesRequest_Token{v} + m.XAccountGroupId = &NotesRequest_AccountGroupId{v} iNdEx = postIndex default: iNdEx = preIndex @@ -11939,41 +10789,6 @@ func (m *NotesForVotingRequest) Unmarshal(dAtA []byte) error { } m.XAccountGroupId = &NotesForVotingRequest_AccountGroupId{v} iNdEx = postIndex - case 15: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Token", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthView - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthView - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - v := &ViewAuthToken{} - if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - m.XToken = &NotesForVotingRequest_Token{v} - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipView(dAtA[iNdEx:]) @@ -12129,48 +10944,13 @@ func (m *WitnessRequest) Unmarshal(dAtA []byte) error { } m.XAccountGroupId = &WitnessRequest_AccountGroupId{v} iNdEx = postIndex - case 15: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Token", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } + default: + iNdEx = preIndex + skippy, err := skipView(dAtA[iNdEx:]) + if err != nil { + return err } - if msglen < 0 { - return ErrInvalidLengthView - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthView - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - v := &ViewAuthToken{} - if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - m.XToken = &WitnessRequest_Token{v} - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipView(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthView } if (iNdEx + skippy) > l { @@ -13161,41 +11941,6 @@ func (m *NoteByCommitmentRequest) Unmarshal(dAtA []byte) error { } m.XAccountGroupId = &NoteByCommitmentRequest_AccountGroupId{v} iNdEx = postIndex - case 15: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Token", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthView - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthView - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - v := &ViewAuthToken{} - if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - m.XToken = &NoteByCommitmentRequest_Token{v} - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipView(dAtA[iNdEx:]) @@ -13423,41 +12168,6 @@ func (m *SwapByCommitmentRequest) Unmarshal(dAtA []byte) error { } m.XAccountGroupId = &SwapByCommitmentRequest_AccountGroupId{v} iNdEx = postIndex - case 15: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Token", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthView - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthView - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - v := &ViewAuthToken{} - if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - m.XToken = &SwapByCommitmentRequest_Token{v} - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipView(dAtA[iNdEx:]) @@ -13685,41 +12395,6 @@ func (m *NullifierStatusRequest) Unmarshal(dAtA []byte) error { } m.XAccountGroupId = &NullifierStatusRequest_AccountGroupId{v} iNdEx = postIndex - case 15: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Token", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthView - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthView - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - v := &ViewAuthToken{} - if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - m.XToken = &NullifierStatusRequest_Token{v} - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipView(dAtA[iNdEx:]) @@ -13811,7 +12486,7 @@ func (m *NullifierStatusResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *TransactionHashesRequest) Unmarshal(dAtA []byte) error { +func (m *TransactionInfoByHashRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -13834,17 +12509,17 @@ func (m *TransactionHashesRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: TransactionHashesRequest: wiretype end group for non-group") + return fmt.Errorf("proto: TransactionInfoByHashRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: TransactionHashesRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: TransactionInfoByHashRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field StartHeight", wireType) + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType) } - var v uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowView @@ -13854,32 +12529,28 @@ func (m *TransactionHashesRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - m.XStartHeight = &TransactionHashesRequest_StartHeight{v} - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field EndHeight", wireType) + if msglen < 0 { + return ErrInvalidLengthView } - var v uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthView + } + if postIndex > l { + return io.ErrUnexpectedEOF } - m.XEndHeight = &TransactionHashesRequest_EndHeight{v} + if m.Id == nil { + m.Id = &v1alpha1.Id{} + } + if err := m.Id.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipView(dAtA[iNdEx:]) @@ -13901,7 +12572,7 @@ func (m *TransactionHashesRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *TransactionHashesResponse) Unmarshal(dAtA []byte) error { +func (m *TransactionInfoRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -13924,17 +12595,17 @@ func (m *TransactionHashesResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: TransactionHashesResponse: wiretype end group for non-group") + return fmt.Errorf("proto: TransactionInfoRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: TransactionHashesResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: TransactionInfoRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field BlockHeight", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field StartHeight", wireType) } - m.BlockHeight = 0 + var v uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowView @@ -13944,16 +12615,17 @@ func (m *TransactionHashesResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.BlockHeight |= uint64(b&0x7F) << shift + v |= uint64(b&0x7F) << shift if b < 0x80 { break } } + m.XStartHeight = &TransactionInfoRequest_StartHeight{v} case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TxHash", wireType) + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field EndHeight", wireType) } - var byteLen int + var v uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowView @@ -13963,26 +12635,12 @@ func (m *TransactionHashesResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + v |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { - return ErrInvalidLengthView - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthView - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TxHash = append(m.TxHash[:0], dAtA[iNdEx:postIndex]...) - if m.TxHash == nil { - m.TxHash = []byte{} - } - iNdEx = postIndex + m.XEndHeight = &TransactionInfoRequest_EndHeight{v} default: iNdEx = preIndex skippy, err := skipView(dAtA[iNdEx:]) @@ -14004,7 +12662,7 @@ func (m *TransactionHashesResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *TransactionByHashRequest) Unmarshal(dAtA []byte) error { +func (m *TransactionInfo) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -14027,17 +12685,17 @@ func (m *TransactionByHashRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: TransactionByHashRequest: wiretype end group for non-group") + return fmt.Errorf("proto: TransactionInfo: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: TransactionByHashRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: TransactionInfo: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TxHash", wireType) + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) } - var byteLen int + var v uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowView @@ -14047,79 +12705,15 @@ func (m *TransactionByHashRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + v |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { - return ErrInvalidLengthView - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthView - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TxHash = append(m.TxHash[:0], dAtA[iNdEx:postIndex]...) - if m.TxHash == nil { - m.TxHash = []byte{} - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipView(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthView - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *TransactionByHashResponse) 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 ErrIntOverflowView - } - 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: TransactionByHashResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: TransactionByHashResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: + m.XHeight = &TransactionInfo_Height{v} + case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Tx", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -14146,88 +12740,18 @@ func (m *TransactionByHashResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Tx == nil { - m.Tx = &v1alpha1.Transaction{} + if m.Id == nil { + m.Id = &v1alpha1.Id{} } - if err := m.Tx.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Id.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipView(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthView - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *TransactionsRequest) 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 ErrIntOverflowView - } - 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: TransactionsRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: TransactionsRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field StartHeight", wireType) - } - var v uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.XStartHeight = &TransactionsRequest_StartHeight{v} - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field EndHeight", wireType) + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Transaction", wireType) } - var v uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowView @@ -14237,86 +12761,33 @@ func (m *TransactionsRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - m.XEndHeight = &TransactionsRequest_EndHeight{v} - default: - iNdEx = preIndex - skippy, err := skipView(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if msglen < 0 { return ErrInvalidLengthView } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *TransactionsResponse) 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 ErrIntOverflowView + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthView } - if iNdEx >= l { + if postIndex > 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: TransactionsResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: TransactionsResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field BlockHeight", wireType) + if m.Transaction == nil { + m.Transaction = &v1alpha1.Transaction{} } - m.BlockHeight = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.BlockHeight |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } + if err := m.Transaction.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } - case 2: + iNdEx = postIndex + case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TxHash", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Perspective", wireType) } - var byteLen int + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowView @@ -14326,29 +12797,31 @@ func (m *TransactionsResponse) 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 ErrInvalidLengthView } - postIndex := iNdEx + byteLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthView } if postIndex > l { return io.ErrUnexpectedEOF } - m.TxHash = append(m.TxHash[:0], dAtA[iNdEx:postIndex]...) - if m.TxHash == nil { - m.TxHash = []byte{} + if m.Perspective == nil { + m.Perspective = &v1alpha1.TransactionPerspective{} + } + if err := m.Perspective.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } iNdEx = postIndex - case 3: + case 5: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Tx", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field View", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -14375,10 +12848,10 @@ func (m *TransactionsResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Tx == nil { - m.Tx = &v1alpha1.Transaction{} + if m.View == nil { + m.View = &v1alpha1.TransactionView{} } - if err := m.Tx.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.View.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -14403,7 +12876,7 @@ func (m *TransactionsResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *TransactionPerspectiveRequest) Unmarshal(dAtA []byte) error { +func (m *TransactionInfoResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -14426,17 +12899,17 @@ func (m *TransactionPerspectiveRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: TransactionPerspectiveRequest: wiretype end group for non-group") + return fmt.Errorf("proto: TransactionInfoResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: TransactionPerspectiveRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: TransactionInfoResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TxHash", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TxInfo", wireType) } - var byteLen int + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowView @@ -14446,24 +12919,26 @@ func (m *TransactionPerspectiveRequest) 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 ErrInvalidLengthView } - postIndex := iNdEx + byteLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthView } if postIndex > l { return io.ErrUnexpectedEOF } - m.TxHash = append(m.TxHash[:0], dAtA[iNdEx:postIndex]...) - if m.TxHash == nil { - m.TxHash = []byte{} + if m.TxInfo == nil { + m.TxInfo = &TransactionInfo{} + } + if err := m.TxInfo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } iNdEx = postIndex default: @@ -14487,7 +12962,7 @@ func (m *TransactionPerspectiveRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *TransactionPerspectiveResponse) Unmarshal(dAtA []byte) error { +func (m *TransactionInfoByHashResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -14510,87 +12985,15 @@ func (m *TransactionPerspectiveResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: TransactionPerspectiveResponse: wiretype end group for non-group") + return fmt.Errorf("proto: TransactionInfoByHashResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: TransactionPerspectiveResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: TransactionInfoByHashResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Txp", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthView - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthView - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Txp == nil { - m.Txp = &v1alpha1.TransactionPerspective{} - } - if err := m.Txp.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Tx", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthView - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthView - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Tx == nil { - m.Tx = &v1alpha1.Transaction{} - } - if err := m.Tx.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Txv", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TxInfo", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -14617,10 +13020,10 @@ func (m *TransactionPerspectiveResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Txv == nil { - m.Txv = &v1alpha1.TransactionView{} + if m.TxInfo == nil { + m.TxInfo = &TransactionInfo{} } - if err := m.Txv.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.TxInfo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex