From af734164d32953a81f9e259566839f7c360aedce Mon Sep 17 00:00:00 2001 From: Ava Howell Date: Fri, 21 Jul 2023 20:14:04 -0700 Subject: [PATCH] penumbra provider: update protos (#1245) --- proto/cosmos/crypto/sr25519/keys.proto | 9 +- .../core/crypto/v1alpha1/crypto.pb.go | 253 ++- .../penumbra/core/dex/v1alpha1/dex.pb.go | 707 +++---- .../core/governance/v1alpha1/governance.pb.go | 302 ++- .../penumbra/core/stake/v1alpha1/stake.pb.go | 299 ++- .../transaction/v1alpha1/transaction.pb.go | 1636 ++++++++++++----- relayer/chains/penumbra/tx.go | 6 +- .../chains/penumbra/view/v1alpha1/view.pb.go | 1374 ++++++++++---- 8 files changed, 3176 insertions(+), 1410 deletions(-) diff --git a/proto/cosmos/crypto/sr25519/keys.proto b/proto/cosmos/crypto/sr25519/keys.proto index eed481375..384cafe3a 100644 --- a/proto/cosmos/crypto/sr25519/keys.proto +++ b/proto/cosmos/crypto/sr25519/keys.proto @@ -8,13 +8,14 @@ import "gogoproto/gogo.proto"; // Originally github.com/cosmos/cosmos-sdk/crypto/keys/sr25519 option go_package = "github.com/cosmos/relayer/v2/relayer/chains/cosmos/keys/sr25519"; -option (gogoproto.messagename_all) = true; +option (gogoproto.messagename_all) = true; option (gogoproto.goproto_stringer_all) = false; -option (gogoproto.goproto_getters_all) = false; +option (gogoproto.goproto_getters_all) = false; // PubKey defines a sr25519 ECDSA public key. message PubKey { - option (gogoproto.goproto_stringer) = false; + option (gogoproto.goproto_stringer) = false; - bytes key = 1 [(gogoproto.casttype) = "github.com/cometbft/cometbft/crypto/sr25519.PubKey"]; + bytes key = 1 [ (gogoproto.casttype) = + "github.com/cometbft/cometbft/crypto/sr25519.PubKey" ]; } diff --git a/relayer/chains/penumbra/core/crypto/v1alpha1/crypto.pb.go b/relayer/chains/penumbra/core/crypto/v1alpha1/crypto.pb.go index f15473c9f..088785c8e 100644 --- a/relayer/chains/penumbra/core/crypto/v1alpha1/crypto.pb.go +++ b/relayer/chains/penumbra/core/crypto/v1alpha1/crypto.pb.go @@ -78,9 +78,11 @@ func (m *Fee) GetAssetId() *AssetId { return nil } -// A Penumbra address. +// A Penumbra address. An address in Penumbra is a Bech32m-encoded +// string, with the human-readable prefix (HRP) `penumbrav2t`. type Address struct { - // The bytes of the address. + // The bytes of the address. Must be represented as a series of + // `uint8` (i.e. values 0 through 255), with a length of 80 elements. Inner []byte `protobuf:"bytes,1,opt,name=inner,proto3" json:"inner,omitempty"` // Alternatively, a Bech32m-encoded string representation of the `inner` // bytes. @@ -697,10 +699,17 @@ type AssetId struct { // bytes. // // NOTE: implementations are not required to support parsing this field. - // Implementations should prefer to encode the bytes in all messages they + // Implementations should prefer to encode the `inner` bytes in all messages they // produce. Implementations must not accept messages with both `inner` and - // `alt_bech32m` set. + // `alt_bech32m` set. This field exists for convenience of RPC users. AltBech32M string `protobuf:"bytes,2,opt,name=alt_bech32m,json=altBech32m,proto3" json:"alt_bech32m,omitempty"` + // Alternatively, a base denomination string which should be hashed to obtain the asset ID. + // + // NOTE: implementations are not required to support parsing this field. + // Implementations should prefer to encode the bytes in all messages they + // produce. Implementations must not accept messages with both `inner` and + // `alt_base_denom` set. This field exists for convenience of RPC users. + AltBaseDenom string `protobuf:"bytes,3,opt,name=alt_base_denom,json=altBaseDenom,proto3" json:"alt_base_denom,omitempty"` } func (m *AssetId) Reset() { *m = AssetId{} } @@ -750,6 +759,18 @@ func (m *AssetId) GetAltBech32M() string { return "" } +func (m *AssetId) GetAltBaseDenom() string { + if m != nil { + return m.AltBaseDenom + } + return "" +} + +// The quantity of a particular Asset. Represented as a 128-bit unsigned integer, +// split over two fields, `lo` and `hi`, representing the low- and high-order bytes +// of the 128-bit value, respectively. Clients must assemble these bits in their +// implementation into a `uint128` or comparable data structure, in order to model +// the Amount accurately. type Amount struct { Lo uint64 `protobuf:"varint,1,opt,name=lo,proto3" json:"lo,omitempty"` Hi uint64 `protobuf:"varint,2,opt,name=hi,proto3" json:"hi,omitempty"` @@ -2407,96 +2428,97 @@ func init() { } var fileDescriptor_5c23a0b4440af102 = []byte{ - // 1420 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcf, 0x6f, 0x1b, 0xc5, - 0x17, 0xcf, 0xda, 0xf9, 0x61, 0x3f, 0x3b, 0x4e, 0xba, 0x8a, 0x2a, 0x7f, 0xf3, 0x25, 0x69, 0xba, - 0x6d, 0x43, 0x5a, 0x8a, 0xa3, 0x38, 0xe2, 0x12, 0x04, 0x6a, 0xec, 0xd0, 0x26, 0x58, 0x6d, 0xad, - 0x0d, 0x4d, 0x51, 0x14, 0xc9, 0x1a, 0xef, 0x4e, 0xbc, 0x23, 0xef, 0xce, 0x2c, 0xbb, 0xb3, 0x4e, - 0xcd, 0x3f, 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, - 0xb4, 0x15, 0x82, 0xdb, 0xbc, 0xf7, 0x3e, 0xef, 0xcd, 0x67, 0xde, 0x7b, 0xb3, 0x6f, 0x6c, 0xb8, - 0xe3, 0x63, 0x1a, 0x79, 0xcd, 0x00, 0xad, 0x5b, 0x2c, 0xc0, 0xeb, 0x56, 0xd0, 0xf5, 0x39, 0x5b, - 0xef, 0x6c, 0x20, 0xd7, 0x77, 0xd0, 0x86, 0x92, 0x4b, 0x7e, 0xc0, 0x38, 0xd3, 0x97, 0x12, 0x6c, - 0x49, 0x60, 0x4b, 0xca, 0x96, 0x60, 0x8d, 0xaf, 0x34, 0x48, 0xdf, 0xc7, 0x58, 0xff, 0x08, 0xa6, - 0x91, 0xc7, 0x22, 0xca, 0x8b, 0xda, 0x8a, 0xb6, 0x96, 0x2b, 0xdf, 0x2a, 0x0d, 0xf5, 0x2b, 0x6d, - 0x4b, 0xb0, 0xa9, 0x9c, 0xf4, 0x6d, 0xc8, 0xa0, 0x30, 0xc4, 0xbc, 0x41, 0xec, 0x62, 0x4a, 0x06, - 0x58, 0x1d, 0x15, 0x40, 0xc0, 0xf7, 0x6c, 0x73, 0x06, 0xc5, 0x0b, 0xe3, 0x1e, 0xcc, 0x6c, 0xdb, - 0x76, 0x80, 0xc3, 0x50, 0x5f, 0x80, 0x29, 0x42, 0x29, 0x0e, 0x24, 0x97, 0xbc, 0x19, 0x0b, 0xfa, - 0x35, 0xc8, 0x21, 0x97, 0x37, 0x9a, 0xd8, 0x72, 0x36, 0xcb, 0x9e, 0xdc, 0x26, 0x6b, 0x02, 0x72, - 0x79, 0x25, 0xd6, 0x18, 0x7f, 0xa6, 0x21, 0xa7, 0x42, 0x1c, 0x10, 0x7c, 0xa2, 0x3f, 0x82, 0x99, - 0x0e, 0x09, 0x49, 0xd3, 0xc5, 0xea, 0x50, 0xe5, 0x51, 0x9c, 0xce, 0x9c, 0x4b, 0x07, 0xb1, 0xe7, - 0xee, 0x84, 0x99, 0x04, 0xd1, 0x6b, 0x30, 0xcd, 0x7c, 0xf4, 0x45, 0x84, 0xd5, 0x11, 0x37, 0x5e, - 0x23, 0xdc, 0x63, 0xe9, 0xb8, 0x3b, 0x61, 0xaa, 0x10, 0x8b, 0xbf, 0x6b, 0x30, 0xa3, 0xf6, 0xd0, - 0xef, 0xc1, 0x0c, 0x8a, 0xb1, 0x8a, 0xe8, 0xea, 0x78, 0x91, 0xcd, 0xc4, 0x4d, 0xdf, 0x16, 0x19, - 0xb3, 0xf1, 0x33, 0xc5, 0xec, 0xbd, 0xf1, 0xfc, 0xf7, 0x84, 0x8b, 0x19, 0x7b, 0xea, 0x4f, 0x61, - 0x1e, 0x59, 0x96, 0xa8, 0x66, 0xa3, 0x15, 0xb0, 0xc8, 0x17, 0xa5, 0x4c, 0xcb, 0x68, 0xef, 0x8f, - 0x8a, 0x16, 0xbb, 0x3d, 0x10, 0x5e, 0x7b, 0xb6, 0x59, 0x40, 0xe7, 0xe4, 0xc5, 0x4f, 0x61, 0x3a, - 0x3e, 0xfd, 0xdb, 0x9f, 0xb3, 0x52, 0x80, 0xbc, 0x5a, 0x36, 0x3a, 0x04, 0x9f, 0x18, 0x2b, 0x90, - 0xd9, 0xf7, 0x31, 0xb5, 0x6b, 0xb8, 0x7b, 0x79, 0xd7, 0x18, 0x77, 0x61, 0x41, 0x22, 0x0e, 0x70, - 0x40, 0x8e, 0x89, 0x85, 0x38, 0x61, 0x74, 0x30, 0x7a, 0x15, 0x0a, 0xf7, 0x23, 0xd7, 0x15, 0x25, - 0x23, 0xb4, 0x35, 0x14, 0x77, 0xfe, 0xd4, 0x03, 0x70, 0x37, 0x20, 0xb7, 0x43, 0x3a, 0x38, 0x08, - 0xc9, 0x31, 0xc1, 0xc1, 0x00, 0xd0, 0x2e, 0xe4, 0xfb, 0x0b, 0xa2, 0x17, 0x61, 0x46, 0xa5, 0x50, - 0x96, 0x73, 0xd6, 0x4c, 0x44, 0x7d, 0x19, 0x20, 0x40, 0xd4, 0x66, 0x1e, 0xf9, 0x12, 0x07, 0xb2, - 0x3a, 0x79, 0xb3, 0x4f, 0x63, 0xbc, 0x0b, 0x73, 0xfb, 0x1c, 0x71, 0x5c, 0x65, 0x9e, 0x47, 0xb8, - 0x87, 0x29, 0x1f, 0xb0, 0xe5, 0x6d, 0xb8, 0x52, 0x41, 0x2e, 0xa2, 0xd6, 0x68, 0xa8, 0xb8, 0x97, - 0xf1, 0x15, 0x7d, 0xd3, 0x7b, 0xb9, 0x06, 0xd3, 0xf1, 0xe7, 0x42, 0x2f, 0x40, 0xca, 0x65, 0xd2, - 0x7b, 0xd2, 0x4c, 0xb9, 0x4c, 0xc8, 0x0e, 0x91, 0x1e, 0x93, 0x66, 0xca, 0x21, 0xc6, 0x12, 0x4c, - 0xed, 0x60, 0xca, 0x3c, 0xb1, 0x93, 0x2d, 0x16, 0x12, 0x9b, 0x35, 0x63, 0xc1, 0x78, 0x99, 0x82, - 0x59, 0x69, 0x7f, 0x88, 0x39, 0xb2, 0x11, 0x47, 0xfa, 0x0a, 0xe4, 0x6c, 0x1c, 0x5a, 0x01, 0xf1, - 0x45, 0x5d, 0x15, 0xba, 0x5f, 0xa5, 0xef, 0x09, 0x04, 0x65, 0x5e, 0x23, 0xa2, 0x84, 0x87, 0xc5, - 0xd4, 0x4a, 0x7a, 0x2d, 0x57, 0x5e, 0x1b, 0xd1, 0x77, 0x72, 0x93, 0x27, 0x94, 0x70, 0x13, 0xec, - 0x64, 0x19, 0xea, 0x3a, 0x4c, 0x36, 0x51, 0x88, 0x65, 0xde, 0xb3, 0xa6, 0x5c, 0x8b, 0x5a, 0xd9, - 0x24, 0xf4, 0x5d, 0xd4, 0x2d, 0x4e, 0x4a, 0x75, 0x22, 0x0a, 0x34, 0x45, 0x1e, 0x2e, 0x4e, 0xc5, - 0x68, 0xb1, 0xd6, 0xaf, 0xc2, 0x74, 0xd8, 0xf5, 0x9a, 0xcc, 0x2d, 0x4e, 0x4b, 0xad, 0x92, 0xf4, - 0x79, 0x48, 0x47, 0x01, 0x29, 0xce, 0x48, 0xa5, 0x58, 0xea, 0xff, 0x83, 0x4c, 0x14, 0x90, 0x86, - 0x83, 0x42, 0xa7, 0x98, 0x89, 0x03, 0x47, 0x01, 0xd9, 0x45, 0xa1, 0xa3, 0xef, 0xc3, 0x95, 0x84, - 0x7d, 0xa3, 0xf7, 0xd1, 0xfd, 0x69, 0xee, 0xb5, 0xbe, 0xba, 0x73, 0x09, 0x4c, 0x29, 0x8c, 0xa7, - 0x90, 0xed, 0x1d, 0xfa, 0xf2, 0xec, 0xeb, 0x8b, 0x90, 0xc1, 0xcf, 0x7c, 0x46, 0x71, 0xaf, 0x2f, - 0x7b, 0xb2, 0x6c, 0x59, 0x97, 0xa0, 0x10, 0x87, 0xc5, 0xf4, 0x4a, 0x5a, 0xb0, 0x55, 0xa2, 0xf1, - 0xb5, 0x06, 0x53, 0x07, 0xc8, 0x8d, 0xfe, 0x0b, 0x23, 0xe6, 0xaf, 0x34, 0x64, 0x25, 0x17, 0x39, - 0x1e, 0x0e, 0x20, 0xd7, 0xa6, 0xec, 0x84, 0x36, 0xce, 0xce, 0x9a, 0x2b, 0x6f, 0x8e, 0x88, 0xd9, - 0x73, 0x2f, 0xd5, 0x84, 0xaf, 0xcc, 0xd9, 0xee, 0x84, 0x09, 0xed, 0x9e, 0xa4, 0x1f, 0xc1, 0x6c, - 0x44, 0xfb, 0x23, 0xc7, 0x6c, 0x3f, 0x18, 0x3b, 0xf2, 0x13, 0xda, 0xee, 0x8f, 0x9d, 0x8f, 0xfa, - 0xe4, 0xc5, 0x6f, 0x34, 0x80, 0xb3, 0xad, 0xdf, 0x36, 0xa9, 0x95, 0xa4, 0xd2, 0x31, 0xc7, 0xbb, - 0xe3, 0xdc, 0x8b, 0xe4, 0xf2, 0xa9, 0xbe, 0x58, 0x7c, 0xae, 0x41, 0xbe, 0x9f, 0xf2, 0xbf, 0x5f, - 0xe8, 0x4a, 0x1e, 0xa0, 0x23, 0xd2, 0x19, 0x0f, 0x09, 0x03, 0xe0, 0x21, 0x0e, 0xda, 0x2e, 0x36, - 0x19, 0x1b, 0xf4, 0x95, 0x5b, 0x82, 0xdc, 0x9e, 0x8d, 0x29, 0x27, 0xbc, 0x2b, 0xbe, 0xfa, 0x05, - 0x48, 0x91, 0xb6, 0x42, 0xa4, 0x48, 0xdb, 0xb8, 0x06, 0xb3, 0x0f, 0x58, 0x07, 0x07, 0x54, 0x7c, - 0x32, 0x15, 0xa0, 0xd5, 0x03, 0xb4, 0xda, 0xc6, 0x4d, 0xc8, 0x57, 0x19, 0x0d, 0x31, 0x0d, 0xa3, - 0x70, 0xf0, 0xd8, 0xf8, 0x56, 0x83, 0xc9, 0x47, 0x8c, 0x63, 0x7d, 0x0b, 0xa6, 0x24, 0x41, 0x95, - 0xa1, 0x9b, 0xe3, 0xf4, 0x86, 0x19, 0xbb, 0x88, 0xd0, 0x41, 0x88, 0x71, 0x9c, 0x9c, 0xbc, 0x19, - 0x0b, 0xfd, 0xb3, 0x35, 0xfd, 0x46, 0xb3, 0xd5, 0xf8, 0x5e, 0x83, 0x8c, 0x20, 0x27, 0x2f, 0xc7, - 0xc7, 0xe7, 0x09, 0xae, 0x8d, 0xdb, 0xbc, 0xc3, 0x49, 0xee, 0x5c, 0x24, 0x79, 0x67, 0xfc, 0x27, - 0xd4, 0x19, 0xd1, 0x55, 0x28, 0x08, 0x9e, 0x55, 0xe2, 0x3b, 0x38, 0xe0, 0xf8, 0xd9, 0xa0, 0x9a, - 0x5e, 0x87, 0xec, 0xa3, 0xc8, 0x75, 0x87, 0x8d, 0xde, 0x3b, 0xa0, 0xcb, 0xd7, 0xc1, 0x76, 0xc4, - 0x9d, 0x7d, 0xd2, 0xa2, 0x88, 0x47, 0x01, 0x1e, 0x80, 0x5d, 0x83, 0xf9, 0x0a, 0xa1, 0x36, 0xa1, - 0xad, 0x51, 0xc8, 0xdf, 0x34, 0xc8, 0x09, 0x86, 0x75, 0xd4, 0x75, 0x19, 0xb2, 0xf5, 0xa7, 0x30, - 0x47, 0x19, 0xc7, 0x0d, 0xab, 0x37, 0x6b, 0x55, 0x5a, 0x4b, 0x23, 0x8e, 0x7f, 0x61, 0x98, 0x9b, - 0x05, 0x11, 0xa6, 0x6f, 0x62, 0xdf, 0x80, 0x59, 0xec, 0x3b, 0xd8, 0xc3, 0x01, 0x72, 0x1b, 0x6d, - 0xdc, 0x55, 0xd9, 0xce, 0xf7, 0x94, 0xa2, 0x15, 0x3f, 0x83, 0x02, 0xa6, 0x32, 0x32, 0xb6, 0x1b, - 0x22, 0xc0, 0x98, 0xcf, 0xba, 0xf3, 0x39, 0x36, 0x67, 0x7b, 0x41, 0x84, 0xc1, 0x78, 0xa9, 0xc1, - 0xc2, 0x05, 0x7a, 0xf5, 0x80, 0xb1, 0xe3, 0x7f, 0xee, 0xb0, 0x8b, 0x90, 0xf1, 0x59, 0x48, 0xe4, - 0xa0, 0x8f, 0x9f, 0x0c, 0x3d, 0x59, 0xaf, 0x41, 0x16, 0x45, 0xdc, 0x69, 0xf8, 0x88, 0x3b, 0x72, - 0x02, 0x8d, 0xde, 0x2e, 0xfe, 0x24, 0xd4, 0x11, 0x77, 0xaa, 0x4e, 0x44, 0xdb, 0x66, 0x46, 0x04, - 0x10, 0xa2, 0xe1, 0xc0, 0xdc, 0x05, 0xa3, 0xfe, 0x7f, 0xc8, 0x8a, 0xa7, 0x3a, 0xa1, 0xad, 0xc6, - 0x86, 0xaa, 0x75, 0x46, 0x29, 0x36, 0xfa, 0x8d, 0x65, 0x55, 0x81, 0xc4, 0x58, 0xee, 0x37, 0x6e, - 0xaa, 0x17, 0x5b, 0x62, 0xdc, 0x34, 0xde, 0x81, 0xc9, 0xaa, 0xba, 0x2d, 0x97, 0xb4, 0x91, 0x01, - 0xf0, 0xc9, 0xf1, 0x31, 0xb6, 0xb8, 0x1c, 0xfb, 0x97, 0x63, 0x6e, 0xc1, 0xec, 0x61, 0xed, 0x71, - 0xc4, 0xfd, 0x48, 0xa5, 0xff, 0x72, 0xd8, 0x4d, 0xc8, 0x1f, 0xd6, 0x64, 0xa7, 0x0f, 0x43, 0xdd, - 0x80, 0xdc, 0x61, 0x6d, 0xff, 0x04, 0xf9, 0xc3, 0x40, 0x6b, 0x30, 0x1f, 0x83, 0xaa, 0x2e, 0x22, - 0xde, 0x30, 0x64, 0x09, 0xae, 0x1e, 0xd6, 0x9e, 0x50, 0x1b, 0xbb, 0xb8, 0x25, 0x4a, 0x3b, 0x0a, - 0x7f, 0x17, 0x16, 0x0e, 0x6b, 0x3b, 0x31, 0x9a, 0x05, 0x07, 0xe2, 0x02, 0x0d, 0x41, 0x97, 0x61, - 0xf1, 0xb0, 0xd6, 0xbb, 0xdf, 0x3b, 0x38, 0x20, 0x1d, 0xf9, 0xb8, 0x1f, 0xe2, 0x53, 0xf9, 0x31, - 0xf5, 0xf3, 0xe9, 0xb2, 0xf6, 0xe2, 0x74, 0x59, 0xfb, 0xf5, 0x74, 0x59, 0x7b, 0xfe, 0x6a, 0x79, - 0xe2, 0xc5, 0xab, 0xe5, 0x89, 0x97, 0xaf, 0x96, 0x27, 0xe0, 0xba, 0xc5, 0xbc, 0xe1, 0x1d, 0x53, - 0xc9, 0x55, 0xa5, 0xa2, 0x2e, 0x7e, 0x57, 0xd7, 0xb5, 0xc3, 0xcf, 0x5b, 0x84, 0x3b, 0x51, 0xb3, - 0x64, 0x31, 0x6f, 0xdd, 0x62, 0xa1, 0xc7, 0xc2, 0xf5, 0x00, 0xbb, 0xa8, 0x8b, 0x83, 0xf5, 0x4e, - 0xb9, 0xb7, 0xb4, 0x1c, 0x44, 0x68, 0xb8, 0x3e, 0xf4, 0x17, 0xfb, 0x87, 0xb1, 0x9c, 0x88, 0xdf, - 0xa5, 0xd2, 0xf5, 0x6a, 0xf5, 0x87, 0xd4, 0x52, 0x3d, 0xa1, 0x53, 0x15, 0x74, 0xe2, 0xdd, 0x4b, - 0x07, 0x0a, 0xf5, 0xcb, 0x99, 0xfd, 0x48, 0xd8, 0x8f, 0x62, 0xfb, 0x51, 0x62, 0x3f, 0x4d, 0xdd, - 0x1e, 0x6a, 0x3f, 0x7a, 0x50, 0xaf, 0x24, 0xa3, 0xfc, 0x8f, 0xd4, 0x4a, 0x82, 0xdd, 0xda, 0x12, - 0xe0, 0xad, 0xad, 0x18, 0xbd, 0xb5, 0x95, 0xc0, 0x9b, 0xd3, 0xf2, 0xff, 0x84, 0xcd, 0xbf, 0x03, - 0x00, 0x00, 0xff, 0xff, 0xd9, 0xd1, 0xde, 0xc4, 0x7d, 0x10, 0x00, 0x00, + // 1437 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcd, 0x6e, 0x1b, 0xb7, + 0x16, 0xf6, 0x48, 0xb6, 0x25, 0x1f, 0xc9, 0xb2, 0x43, 0x18, 0x81, 0xae, 0xef, 0xb5, 0xe3, 0x4c, + 0x1c, 0x5f, 0x27, 0x37, 0x57, 0x86, 0x65, 0x74, 0xe3, 0xa2, 0x45, 0x2c, 0xb9, 0x89, 0x5d, 0x21, + 0x89, 0x30, 0x6e, 0x9c, 0x42, 0x30, 0x20, 0xd0, 0x33, 0xb4, 0x86, 0xd0, 0x0c, 0x39, 0x9d, 0x1f, + 0x39, 0xea, 0x0b, 0x14, 0x5d, 0x35, 0xeb, 0x2e, 0xbb, 0xe8, 0xa2, 0x6f, 0xd0, 0x5d, 0x97, 0x45, + 0x57, 0x59, 0x66, 0xd9, 0x3a, 0x8b, 0x02, 0x5d, 0x75, 0xd1, 0x07, 0x28, 0xc8, 0xe1, 0xc8, 0xb2, + 0x61, 0xfd, 0x24, 0x41, 0xd1, 0xee, 0x78, 0x78, 0xbe, 0xf3, 0xf1, 0xe3, 0x39, 0xe4, 0x1c, 0x4a, + 0x70, 0xd7, 0x23, 0x2c, 0x72, 0x8f, 0x7d, 0xbc, 0x61, 0x72, 0x9f, 0x6c, 0x98, 0x7e, 0xd7, 0x0b, + 0xf9, 0x46, 0x67, 0x13, 0x3b, 0x9e, 0x8d, 0x37, 0x95, 0x5d, 0xf2, 0x7c, 0x1e, 0x72, 0xb4, 0x94, + 0x60, 0x4b, 0x02, 0x5b, 0x52, 0xbe, 0x04, 0xab, 0x7f, 0xa1, 0x41, 0xfa, 0x01, 0x21, 0xe8, 0x03, + 0x98, 0xc6, 0x2e, 0x8f, 0x58, 0x58, 0xd4, 0x56, 0xb4, 0xf5, 0x5c, 0xf9, 0x76, 0x69, 0x68, 0x5c, + 0x69, 0x47, 0x82, 0x0d, 0x15, 0x84, 0x76, 0x20, 0x8b, 0x83, 0x80, 0x84, 0x4d, 0x6a, 0x15, 0x53, + 0x92, 0x60, 0x6d, 0x14, 0x81, 0x80, 0xef, 0x5b, 0x46, 0x06, 0xc7, 0x03, 0xfd, 0x3e, 0x64, 0x76, + 0x2c, 0xcb, 0x27, 0x41, 0x80, 0x16, 0x60, 0x8a, 0x32, 0x46, 0x7c, 0xa9, 0x25, 0x6f, 0xc4, 0x06, + 0xba, 0x01, 0x39, 0xec, 0x84, 0xcd, 0x63, 0x62, 0xda, 0x5b, 0x65, 0x57, 0x2e, 0x33, 0x63, 0x00, + 0x76, 0xc2, 0x4a, 0x3c, 0xa3, 0xff, 0x9e, 0x86, 0x9c, 0xa2, 0x38, 0xa4, 0xe4, 0x14, 0x3d, 0x86, + 0x4c, 0x87, 0x06, 0xf4, 0xd8, 0x21, 0x6a, 0x53, 0xe5, 0x51, 0x9a, 0xce, 0x83, 0x4b, 0x87, 0x71, + 0xe4, 0xde, 0x84, 0x91, 0x90, 0xa0, 0x1a, 0x4c, 0x73, 0x0f, 0x7f, 0x16, 0x11, 0xb5, 0xc5, 0xcd, + 0x37, 0xa0, 0x7b, 0x22, 0x03, 0xf7, 0x26, 0x0c, 0x45, 0xb1, 0xf8, 0xab, 0x06, 0x19, 0xb5, 0x06, + 0xba, 0x0f, 0x19, 0x1c, 0x63, 0x95, 0xd0, 0xb5, 0xf1, 0x98, 0x8d, 0x24, 0x0c, 0xed, 0x88, 0x8c, + 0x59, 0xe4, 0xb9, 0x52, 0xf6, 0xbf, 0xf1, 0xe2, 0xf7, 0x45, 0x88, 0x11, 0x47, 0xa2, 0x67, 0x30, + 0x8f, 0x4d, 0x53, 0x54, 0xb3, 0xd9, 0xf2, 0x79, 0xe4, 0x89, 0x52, 0xa6, 0x25, 0xdb, 0xff, 0x47, + 0xb1, 0xc5, 0x61, 0x0f, 0x45, 0xd4, 0xbe, 0x65, 0x14, 0xf0, 0x05, 0x7b, 0xf1, 0x63, 0x98, 0x8e, + 0x77, 0xff, 0xee, 0xfb, 0xac, 0x14, 0x20, 0xaf, 0x86, 0xcd, 0x0e, 0x25, 0xa7, 0xfa, 0x0a, 0x64, + 0x0f, 0x3c, 0xc2, 0xac, 0x1a, 0xe9, 0x5e, 0x7d, 0x6a, 0xf4, 0x7b, 0xb0, 0x20, 0x11, 0x87, 0xc4, + 0xa7, 0x27, 0xd4, 0xc4, 0x21, 0xe5, 0x6c, 0x30, 0x7a, 0x0d, 0x0a, 0x0f, 0x22, 0xc7, 0x11, 0x25, + 0xa3, 0xac, 0x35, 0x14, 0x77, 0x71, 0xd7, 0x03, 0x70, 0xb7, 0x20, 0xb7, 0x4b, 0x3b, 0xc4, 0x0f, + 0xe8, 0x09, 0x25, 0xfe, 0x00, 0xd0, 0x1e, 0xe4, 0xfb, 0x0b, 0x82, 0x8a, 0x90, 0x51, 0x29, 0x94, + 0xe5, 0x9c, 0x35, 0x12, 0x13, 0x2d, 0x03, 0xf8, 0x98, 0x59, 0xdc, 0xa5, 0x9f, 0x13, 0x5f, 0x56, + 0x27, 0x6f, 0xf4, 0xcd, 0xe8, 0xff, 0x85, 0xb9, 0x83, 0x10, 0x87, 0xa4, 0xca, 0x5d, 0x97, 0x86, + 0x2e, 0x61, 0xe1, 0x80, 0x25, 0xef, 0xc0, 0xb5, 0x0a, 0x76, 0x30, 0x33, 0x47, 0x43, 0x4f, 0x20, + 0xa3, 0xee, 0xea, 0x5b, 0xde, 0x4b, 0xb4, 0x0a, 0x05, 0x09, 0xc0, 0x01, 0x69, 0x5a, 0x84, 0x71, + 0x57, 0x2a, 0x9f, 0x31, 0xf2, 0x02, 0x83, 0x03, 0xb2, 0x2b, 0xe6, 0xf4, 0x75, 0x98, 0x8e, 0x3f, + 0x2a, 0xa8, 0x00, 0x29, 0x87, 0xcb, 0x35, 0x26, 0x8d, 0x94, 0xc3, 0x85, 0x6d, 0x53, 0xc9, 0x3b, + 0x69, 0xa4, 0x6c, 0xaa, 0x2f, 0xc1, 0x94, 0x0c, 0x11, 0x7a, 0x62, 0x3e, 0x4d, 0xf2, 0xc5, 0x86, + 0xfe, 0x2a, 0x05, 0xb3, 0xd2, 0xff, 0x88, 0x84, 0xd8, 0xc2, 0x21, 0x46, 0x2b, 0x90, 0xb3, 0x48, + 0x60, 0xfa, 0xd4, 0x13, 0xd5, 0x57, 0xe8, 0xfe, 0x29, 0xb4, 0x2f, 0x10, 0x8c, 0xbb, 0xcd, 0x88, + 0xd1, 0x30, 0x28, 0xa6, 0x56, 0xd2, 0xeb, 0xb9, 0xf2, 0xfa, 0x88, 0xd3, 0x29, 0x17, 0x79, 0xca, + 0x68, 0x68, 0x80, 0x95, 0x0c, 0x03, 0x84, 0x60, 0x52, 0xec, 0x54, 0xed, 0x51, 0x8e, 0x45, 0x45, + 0x2d, 0x1a, 0x78, 0x0e, 0xee, 0x16, 0x27, 0xe5, 0x74, 0x62, 0x0a, 0x34, 0xc3, 0x2e, 0x29, 0x4e, + 0xc5, 0x68, 0x31, 0x46, 0xd7, 0x61, 0x3a, 0xe8, 0xba, 0xc7, 0xdc, 0x29, 0x4e, 0xcb, 0x59, 0x65, + 0xa1, 0x79, 0x48, 0x47, 0x3e, 0x2d, 0x66, 0xe4, 0xa4, 0x18, 0xa2, 0x7f, 0x41, 0x36, 0xf2, 0x69, + 0xd3, 0xc6, 0x81, 0x5d, 0xcc, 0xc6, 0xc4, 0x91, 0x4f, 0xf7, 0x70, 0x60, 0xa3, 0x03, 0xb8, 0x96, + 0xa8, 0x6f, 0xf6, 0x3e, 0xcd, 0x3f, 0xcc, 0xbd, 0xd1, 0xb7, 0x79, 0x2e, 0x81, 0xa9, 0x09, 0xfd, + 0x19, 0xcc, 0xf4, 0x36, 0x7d, 0x75, 0xf6, 0xd1, 0x22, 0x64, 0xc9, 0x73, 0x8f, 0x33, 0xd2, 0x3b, + 0xbd, 0x3d, 0x5b, 0x1e, 0x6c, 0x87, 0xe2, 0x80, 0x04, 0xc5, 0xf4, 0x4a, 0x5a, 0xa8, 0x55, 0xa6, + 0xfe, 0xa5, 0x06, 0x53, 0x87, 0xd8, 0x89, 0xfe, 0x09, 0x8d, 0xe8, 0x8f, 0x34, 0xcc, 0x48, 0x2d, + 0xb2, 0x89, 0x1c, 0x42, 0xae, 0xcd, 0xf8, 0x29, 0x6b, 0x9e, 0xef, 0x35, 0x57, 0xde, 0x1a, 0xc1, + 0xd9, 0x0b, 0x2f, 0xd5, 0x44, 0xac, 0xcc, 0xd9, 0xde, 0x84, 0x01, 0xed, 0x9e, 0x85, 0x8e, 0x60, + 0x36, 0x62, 0xfd, 0xcc, 0xb1, 0xda, 0xf7, 0xc6, 0x66, 0x7e, 0xca, 0xda, 0xfd, 0xdc, 0xf9, 0xa8, + 0xcf, 0x5e, 0xfc, 0x4a, 0x03, 0x38, 0x5f, 0xfa, 0x5d, 0x93, 0x5a, 0x49, 0x2a, 0x1d, 0x6b, 0xbc, + 0x37, 0xce, 0xbd, 0x48, 0x2e, 0x9f, 0x3a, 0x17, 0x8b, 0x2f, 0x34, 0xc8, 0xf7, 0x4b, 0xfe, 0xfb, + 0x0b, 0x5d, 0xc9, 0x03, 0x74, 0x44, 0x3a, 0xe3, 0x56, 0xa2, 0x03, 0x3c, 0x22, 0x7e, 0xdb, 0x21, + 0x06, 0xe7, 0x83, 0xbe, 0x85, 0x4b, 0x90, 0xdb, 0xb7, 0x08, 0x0b, 0x69, 0xd8, 0x15, 0xbd, 0xa1, + 0x00, 0x29, 0xda, 0x56, 0x88, 0x14, 0x6d, 0xeb, 0x37, 0x60, 0xf6, 0x21, 0xef, 0x10, 0x9f, 0x89, + 0x0f, 0xab, 0x02, 0xb4, 0x7a, 0x80, 0x56, 0x5b, 0x5f, 0x85, 0x7c, 0x95, 0xb3, 0x80, 0xb0, 0x20, + 0x0a, 0x06, 0x37, 0x97, 0xaf, 0x35, 0x98, 0x7c, 0xcc, 0x43, 0x82, 0xb6, 0x61, 0x4a, 0x0a, 0x54, + 0x19, 0x5a, 0x1d, 0xe7, 0x6c, 0x18, 0x71, 0x88, 0xa0, 0xf6, 0x03, 0x42, 0xe2, 0xe4, 0xe4, 0x8d, + 0xd8, 0xe8, 0xef, 0xc0, 0xe9, 0xb7, 0xea, 0xc0, 0xfa, 0xb7, 0x1a, 0x64, 0x85, 0x38, 0x79, 0x39, + 0x3e, 0xbc, 0x28, 0x70, 0x7d, 0xdc, 0xc3, 0x3b, 0x5c, 0xe4, 0xee, 0x65, 0x91, 0x77, 0xc7, 0x7f, + 0x68, 0x9d, 0x0b, 0x5d, 0x83, 0x82, 0xd0, 0x59, 0xa5, 0x9e, 0x4d, 0xfc, 0x90, 0x3c, 0x1f, 0x54, + 0xd3, 0x9b, 0x30, 0xf3, 0x38, 0x72, 0x9c, 0x61, 0x0d, 0xfa, 0x2e, 0x20, 0xf9, 0x86, 0xd8, 0x89, + 0x42, 0xfb, 0x80, 0xb6, 0x18, 0x0e, 0x23, 0x9f, 0x0c, 0xc0, 0xae, 0xc3, 0x7c, 0x85, 0x32, 0x8b, + 0xb2, 0xd6, 0x28, 0xe4, 0x2f, 0x1a, 0xe4, 0x84, 0xc2, 0x3a, 0xee, 0x3a, 0x1c, 0x5b, 0xe8, 0x19, + 0xcc, 0x31, 0x1e, 0x92, 0xa6, 0xd9, 0xeb, 0xc8, 0x2a, 0xad, 0xa5, 0x11, 0xdb, 0xbf, 0xd4, 0xf2, + 0x8d, 0x82, 0xa0, 0xe9, 0xeb, 0xeb, 0xb7, 0x60, 0x96, 0x78, 0x36, 0x71, 0x89, 0x8f, 0x9d, 0x66, + 0x9b, 0x74, 0x55, 0xb6, 0xf3, 0xbd, 0x49, 0x71, 0x14, 0x3f, 0x81, 0x02, 0x61, 0x92, 0x99, 0x58, + 0x4d, 0x41, 0x30, 0xe6, 0xe3, 0xef, 0x62, 0x8e, 0x8d, 0xd9, 0x1e, 0x89, 0x70, 0xe8, 0xaf, 0x34, + 0x58, 0xb8, 0x24, 0xaf, 0xee, 0x73, 0x7e, 0xf2, 0xd7, 0x6d, 0x76, 0x11, 0xb2, 0x1e, 0x0f, 0xa8, + 0x6c, 0xf4, 0xf1, 0x93, 0xa1, 0x67, 0xa3, 0x1a, 0xcc, 0xe0, 0x28, 0xb4, 0x9b, 0x1e, 0x0e, 0x6d, + 0xd9, 0x81, 0x46, 0x2f, 0x17, 0x7f, 0x12, 0xea, 0x38, 0xb4, 0xab, 0x76, 0xc4, 0xda, 0x46, 0x56, + 0x10, 0x08, 0x53, 0xb7, 0x61, 0xee, 0x92, 0x13, 0xfd, 0x1b, 0x66, 0xc4, 0x83, 0x9e, 0xb2, 0x56, + 0x73, 0x53, 0xd5, 0x3a, 0xab, 0x26, 0x36, 0xfb, 0x9d, 0x65, 0x55, 0x81, 0xc4, 0x59, 0xee, 0x77, + 0x6e, 0xa9, 0x77, 0x5d, 0xe2, 0xdc, 0xd2, 0xff, 0x03, 0x93, 0x55, 0x75, 0x5b, 0xae, 0x38, 0x46, + 0x3a, 0xc0, 0x47, 0x27, 0x27, 0xc4, 0x0c, 0x65, 0xdb, 0xbf, 0x1a, 0x73, 0x1b, 0x66, 0x1b, 0xb5, + 0x27, 0x51, 0xe8, 0x45, 0x2a, 0xfd, 0x57, 0xc3, 0x56, 0x21, 0xdf, 0xa8, 0xc9, 0x93, 0x3e, 0x0c, + 0x75, 0x0b, 0x72, 0x8d, 0xda, 0xc1, 0x29, 0xf6, 0x86, 0x81, 0xd6, 0x61, 0x3e, 0x06, 0x55, 0x1d, + 0x4c, 0xdd, 0x61, 0xc8, 0x12, 0x5c, 0x6f, 0xd4, 0x9e, 0x32, 0x8b, 0x38, 0xa4, 0x25, 0x4a, 0x3b, + 0x0a, 0x7f, 0x0f, 0x16, 0x1a, 0xb5, 0xdd, 0x18, 0xcd, 0xfd, 0x43, 0x71, 0x81, 0x86, 0xa0, 0xcb, + 0xb0, 0xd8, 0xa8, 0xf5, 0xee, 0xf7, 0x2e, 0xf1, 0x69, 0x47, 0xfe, 0x04, 0x18, 0x12, 0x53, 0xf9, + 0x3e, 0xf5, 0xe3, 0xd9, 0xb2, 0xf6, 0xf2, 0x6c, 0x59, 0xfb, 0xf9, 0x6c, 0x59, 0x7b, 0xf1, 0x7a, + 0x79, 0xe2, 0xe5, 0xeb, 0xe5, 0x89, 0x57, 0xaf, 0x97, 0x27, 0xe0, 0xa6, 0xc9, 0xdd, 0xe1, 0x27, + 0xa6, 0x92, 0xab, 0xca, 0x89, 0xba, 0xf8, 0xf5, 0x5d, 0xd7, 0x1a, 0x9f, 0xb6, 0x68, 0x68, 0x47, + 0xc7, 0x25, 0x93, 0xbb, 0x1b, 0x26, 0x0f, 0x5c, 0x1e, 0x6c, 0xf8, 0xc4, 0xc1, 0x5d, 0xe2, 0x6f, + 0x74, 0xca, 0xbd, 0xa1, 0x69, 0x63, 0xca, 0x82, 0x8d, 0xa1, 0xbf, 0xeb, 0xdf, 0x8f, 0xed, 0xc4, + 0xfc, 0x26, 0x95, 0xae, 0x57, 0xab, 0xdf, 0xa5, 0x96, 0xea, 0x89, 0x9c, 0xaa, 0x90, 0x13, 0xaf, + 0x5e, 0x3a, 0x54, 0xa8, 0x9f, 0xce, 0xfd, 0x47, 0xc2, 0x7f, 0x14, 0xfb, 0x8f, 0x12, 0xff, 0x59, + 0xea, 0xce, 0x50, 0xff, 0xd1, 0xc3, 0x7a, 0x25, 0x69, 0xe5, 0xbf, 0xa5, 0x56, 0x12, 0xec, 0xf6, + 0xb6, 0x00, 0x6f, 0x6f, 0xc7, 0xe8, 0xed, 0xed, 0x04, 0x7e, 0x3c, 0x2d, 0xff, 0x75, 0xd8, 0xfa, + 0x33, 0x00, 0x00, 0xff, 0xff, 0x88, 0xb9, 0x8c, 0xd5, 0xa3, 0x10, 0x00, 0x00, } func (m *Fee) Marshal() (dAtA []byte, err error) { @@ -3016,6 +3038,13 @@ func (m *AssetId) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.AltBaseDenom) > 0 { + i -= len(m.AltBaseDenom) + copy(dAtA[i:], m.AltBaseDenom) + i = encodeVarintCrypto(dAtA, i, uint64(len(m.AltBaseDenom))) + i-- + dAtA[i] = 0x1a + } if len(m.AltBech32M) > 0 { i -= len(m.AltBech32M) copy(dAtA[i:], m.AltBech32M) @@ -4461,6 +4490,10 @@ func (m *AssetId) Size() (n int) { if l > 0 { n += 1 + l + sovCrypto(uint64(l)) } + l = len(m.AltBaseDenom) + if l > 0 { + n += 1 + l + sovCrypto(uint64(l)) + } return n } @@ -6369,6 +6402,38 @@ func (m *AssetId) Unmarshal(dAtA []byte) error { } m.AltBech32M = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AltBaseDenom", 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.AltBaseDenom = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipCrypto(dAtA[iNdEx:]) diff --git a/relayer/chains/penumbra/core/dex/v1alpha1/dex.pb.go b/relayer/chains/penumbra/core/dex/v1alpha1/dex.pb.go index 45a51020b..9456bbbb2 100644 --- a/relayer/chains/penumbra/core/dex/v1alpha1/dex.pb.go +++ b/relayer/chains/penumbra/core/dex/v1alpha1/dex.pb.go @@ -62,18 +62,13 @@ func (x PositionState_PositionStateEnum) String() string { } func (PositionState_PositionStateEnum) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{19, 0} + return fileDescriptor_d1eba752ca2f0d70, []int{18, 0} } // A transaction action that submits a swap to the dex. type Swap struct { // Contains the Swap proof. Proof *v1alpha1.ZKSwapProof `protobuf:"bytes,1,opt,name=proof,proto3" json:"proof,omitempty"` - // MockFlowCiphertext dropped until flow encryption/ABCI++ available - // // Encrypted amount of asset 1 of the trading pair. - // MockFlowCiphertext enc_amount_1 = 2; - // // Encrypted amount of asset 2 of the trading pair. - // MockFlowCiphertext enc_amount_2 = 3; // Encapsulates the authorized fields of the Swap action, used in signing. Body *SwapBody `protobuf:"bytes,4,opt,name=body,proto3" json:"body,omitempty"` } @@ -501,63 +496,22 @@ func (m *SwapPlaintext) GetRseed() []byte { return nil } -type MockFlowCiphertext struct { - // Represents this transaction's contribution to flow's value. - Value *v1alpha1.Amount `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` -} - -func (m *MockFlowCiphertext) Reset() { *m = MockFlowCiphertext{} } -func (m *MockFlowCiphertext) String() string { return proto.CompactTextString(m) } -func (*MockFlowCiphertext) ProtoMessage() {} -func (*MockFlowCiphertext) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{6} -} -func (m *MockFlowCiphertext) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MockFlowCiphertext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MockFlowCiphertext.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 *MockFlowCiphertext) XXX_Merge(src proto.Message) { - xxx_messageInfo_MockFlowCiphertext.Merge(m, src) -} -func (m *MockFlowCiphertext) XXX_Size() int { - return m.Size() -} -func (m *MockFlowCiphertext) XXX_DiscardUnknown() { - xxx_messageInfo_MockFlowCiphertext.DiscardUnknown(m) -} - -var xxx_messageInfo_MockFlowCiphertext proto.InternalMessageInfo - -func (m *MockFlowCiphertext) GetValue() *v1alpha1.Amount { - if m != nil { - return m.Value - } - return nil -} - type SwapPlan struct { // The plaintext version of the swap to be performed. SwapPlaintext *SwapPlaintext `protobuf:"bytes,1,opt,name=swap_plaintext,json=swapPlaintext,proto3" json:"swap_plaintext,omitempty"` // The blinding factor for the fee commitment. The fee in the SwapPlan is private to prevent linkability with the SwapClaim. FeeBlinding []byte `protobuf:"bytes,2,opt,name=fee_blinding,json=feeBlinding,proto3" json:"fee_blinding,omitempty"` + // The first blinding factor to use for the ZK swap proof. + ProofBlindingR []byte `protobuf:"bytes,3,opt,name=proof_blinding_r,json=proofBlindingR,proto3" json:"proof_blinding_r,omitempty"` + // The second blinding factor to use for the ZK swap proof. + ProofBlindingS []byte `protobuf:"bytes,4,opt,name=proof_blinding_s,json=proofBlindingS,proto3" json:"proof_blinding_s,omitempty"` } func (m *SwapPlan) Reset() { *m = SwapPlan{} } func (m *SwapPlan) String() string { return proto.CompactTextString(m) } func (*SwapPlan) ProtoMessage() {} func (*SwapPlan) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{7} + return fileDescriptor_d1eba752ca2f0d70, []int{6} } func (m *SwapPlan) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -600,6 +554,20 @@ func (m *SwapPlan) GetFeeBlinding() []byte { return nil } +func (m *SwapPlan) GetProofBlindingR() []byte { + if m != nil { + return m.ProofBlindingR + } + return nil +} + +func (m *SwapPlan) GetProofBlindingS() []byte { + if m != nil { + return m.ProofBlindingS + } + return nil +} + type SwapClaimPlan struct { // The plaintext version of the swap to be performed. SwapPlaintext *SwapPlaintext `protobuf:"bytes,1,opt,name=swap_plaintext,json=swapPlaintext,proto3" json:"swap_plaintext,omitempty"` @@ -609,13 +577,17 @@ type SwapClaimPlan struct { OutputData *BatchSwapOutputData `protobuf:"bytes,3,opt,name=output_data,json=outputData,proto3" json:"output_data,omitempty"` // The epoch duration, used in proving. EpochDuration uint64 `protobuf:"varint,4,opt,name=epoch_duration,json=epochDuration,proto3" json:"epoch_duration,omitempty"` + // The first blinding factor to use for the ZK swap claim proof. + ProofBlindingR []byte `protobuf:"bytes,5,opt,name=proof_blinding_r,json=proofBlindingR,proto3" json:"proof_blinding_r,omitempty"` + // The second blinding factor to use for the ZK swap claim proof. + ProofBlindingS []byte `protobuf:"bytes,6,opt,name=proof_blinding_s,json=proofBlindingS,proto3" json:"proof_blinding_s,omitempty"` } func (m *SwapClaimPlan) Reset() { *m = SwapClaimPlan{} } func (m *SwapClaimPlan) String() string { return proto.CompactTextString(m) } func (*SwapClaimPlan) ProtoMessage() {} func (*SwapClaimPlan) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{8} + return fileDescriptor_d1eba752ca2f0d70, []int{7} } func (m *SwapClaimPlan) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -672,8 +644,23 @@ func (m *SwapClaimPlan) GetEpochDuration() uint64 { return 0 } +func (m *SwapClaimPlan) GetProofBlindingR() []byte { + if m != nil { + return m.ProofBlindingR + } + return nil +} + +func (m *SwapClaimPlan) GetProofBlindingS() []byte { + if m != nil { + return m.ProofBlindingS + } + return nil +} + type SwapView struct { // Types that are valid to be assigned to SwapView: + // // *SwapView_Visible_ // *SwapView_Opaque_ SwapView isSwapView_SwapView `protobuf_oneof:"swap_view"` @@ -683,7 +670,7 @@ func (m *SwapView) Reset() { *m = SwapView{} } func (m *SwapView) String() string { return proto.CompactTextString(m) } func (*SwapView) ProtoMessage() {} func (*SwapView) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{9} + return fileDescriptor_d1eba752ca2f0d70, []int{8} } func (m *SwapView) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -766,7 +753,7 @@ func (m *SwapView_Visible) Reset() { *m = SwapView_Visible{} } func (m *SwapView_Visible) String() string { return proto.CompactTextString(m) } func (*SwapView_Visible) ProtoMessage() {} func (*SwapView_Visible) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{9, 0} + return fileDescriptor_d1eba752ca2f0d70, []int{8, 0} } func (m *SwapView_Visible) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -817,7 +804,7 @@ func (m *SwapView_Opaque) Reset() { *m = SwapView_Opaque{} } func (m *SwapView_Opaque) String() string { return proto.CompactTextString(m) } func (*SwapView_Opaque) ProtoMessage() {} func (*SwapView_Opaque) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{9, 1} + return fileDescriptor_d1eba752ca2f0d70, []int{8, 1} } func (m *SwapView_Opaque) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -865,7 +852,7 @@ func (m *SwapClaimView) Reset() { *m = SwapClaimView{} } func (m *SwapClaimView) String() string { return proto.CompactTextString(m) } func (*SwapClaimView) ProtoMessage() {} func (*SwapClaimView) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{10} + return fileDescriptor_d1eba752ca2f0d70, []int{9} } func (m *SwapClaimView) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -949,7 +936,7 @@ func (m *SwapClaimView_Visible) Reset() { *m = SwapClaimView_Visible{} } func (m *SwapClaimView_Visible) String() string { return proto.CompactTextString(m) } func (*SwapClaimView_Visible) ProtoMessage() {} func (*SwapClaimView_Visible) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{10, 0} + return fileDescriptor_d1eba752ca2f0d70, []int{9, 0} } func (m *SwapClaimView_Visible) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1007,7 +994,7 @@ func (m *SwapClaimView_Opaque) Reset() { *m = SwapClaimView_Opaque{} } func (m *SwapClaimView_Opaque) String() string { return proto.CompactTextString(m) } func (*SwapClaimView_Opaque) ProtoMessage() {} func (*SwapClaimView_Opaque) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{10, 1} + return fileDescriptor_d1eba752ca2f0d70, []int{9, 1} } func (m *SwapClaimView_Opaque) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1057,7 +1044,7 @@ func (m *TradingPair) Reset() { *m = TradingPair{} } func (m *TradingPair) String() string { return proto.CompactTextString(m) } func (*TradingPair) ProtoMessage() {} func (*TradingPair) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{11} + return fileDescriptor_d1eba752ca2f0d70, []int{10} } func (m *TradingPair) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1113,7 +1100,7 @@ func (m *DirectedTradingPair) Reset() { *m = DirectedTradingPair{} } func (m *DirectedTradingPair) String() string { return proto.CompactTextString(m) } func (*DirectedTradingPair) ProtoMessage() {} func (*DirectedTradingPair) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{12} + return fileDescriptor_d1eba752ca2f0d70, []int{11} } func (m *DirectedTradingPair) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1178,14 +1165,14 @@ type BatchSwapOutputData struct { // 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"` + EpochStartingHeight uint64 `protobuf:"varint,9,opt,name=epoch_starting_height,json=epochStartingHeight,proto3" json:"epoch_starting_height,omitempty"` } func (m *BatchSwapOutputData) Reset() { *m = BatchSwapOutputData{} } func (m *BatchSwapOutputData) String() string { return proto.CompactTextString(m) } func (*BatchSwapOutputData) ProtoMessage() {} func (*BatchSwapOutputData) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{13} + return fileDescriptor_d1eba752ca2f0d70, []int{12} } func (m *BatchSwapOutputData) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1270,9 +1257,9 @@ func (m *BatchSwapOutputData) GetTradingPair() *TradingPair { return nil } -func (m *BatchSwapOutputData) GetEpochHeight() uint64 { +func (m *BatchSwapOutputData) GetEpochStartingHeight() uint64 { if m != nil { - return m.EpochHeight + return m.EpochStartingHeight } return 0 } @@ -1290,7 +1277,7 @@ func (m *TradingFunction) Reset() { *m = TradingFunction{} } func (m *TradingFunction) String() string { return proto.CompactTextString(m) } func (*TradingFunction) ProtoMessage() {} func (*TradingFunction) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{14} + return fileDescriptor_d1eba752ca2f0d70, []int{13} } func (m *TradingFunction) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1350,7 +1337,7 @@ func (m *BareTradingFunction) Reset() { *m = BareTradingFunction{} } func (m *BareTradingFunction) String() string { return proto.CompactTextString(m) } func (*BareTradingFunction) ProtoMessage() {} func (*BareTradingFunction) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{15} + return fileDescriptor_d1eba752ca2f0d70, []int{14} } func (m *BareTradingFunction) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1415,7 +1402,7 @@ func (m *Reserves) Reset() { *m = Reserves{} } func (m *Reserves) String() string { return proto.CompactTextString(m) } func (*Reserves) ProtoMessage() {} func (*Reserves) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{16} + return fileDescriptor_d1eba752ca2f0d70, []int{15} } func (m *Reserves) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1469,13 +1456,16 @@ type Position struct { Nonce []byte `protobuf:"bytes,2,opt,name=nonce,proto3" json:"nonce,omitempty"` State *PositionState `protobuf:"bytes,3,opt,name=state,proto3" json:"state,omitempty"` Reserves *Reserves `protobuf:"bytes,4,opt,name=reserves,proto3" json:"reserves,omitempty"` + // / If set to true, the position is a limit-order and will be closed + // / immediately after being filled. + CloseOnFill bool `protobuf:"varint,5,opt,name=close_on_fill,json=closeOnFill,proto3" json:"close_on_fill,omitempty"` } func (m *Position) Reset() { *m = Position{} } func (m *Position) String() string { return proto.CompactTextString(m) } func (*Position) ProtoMessage() {} func (*Position) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{17} + return fileDescriptor_d1eba752ca2f0d70, []int{16} } func (m *Position) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1532,6 +1522,13 @@ func (m *Position) GetReserves() *Reserves { return nil } +func (m *Position) GetCloseOnFill() bool { + if m != nil { + return m.CloseOnFill + } + return false +} + // A hash of a `Position`. type PositionId struct { // The bytes of the position ID. @@ -1550,7 +1547,7 @@ func (m *PositionId) Reset() { *m = PositionId{} } func (m *PositionId) String() string { return proto.CompactTextString(m) } func (*PositionId) ProtoMessage() {} func (*PositionId) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{18} + return fileDescriptor_d1eba752ca2f0d70, []int{17} } func (m *PositionId) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1602,7 +1599,7 @@ func (m *PositionState) Reset() { *m = PositionState{} } func (m *PositionState) String() string { return proto.CompactTextString(m) } func (*PositionState) ProtoMessage() {} func (*PositionState) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{19} + return fileDescriptor_d1eba752ca2f0d70, []int{18} } func (m *PositionState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1662,7 +1659,7 @@ func (m *LpNft) Reset() { *m = LpNft{} } func (m *LpNft) String() string { return proto.CompactTextString(m) } func (*LpNft) ProtoMessage() {} func (*LpNft) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{20} + return fileDescriptor_d1eba752ca2f0d70, []int{19} } func (m *LpNft) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1721,7 +1718,7 @@ func (m *PositionOpen) Reset() { *m = PositionOpen{} } func (m *PositionOpen) String() string { return proto.CompactTextString(m) } func (*PositionOpen) ProtoMessage() {} func (*PositionOpen) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{21} + return fileDescriptor_d1eba752ca2f0d70, []int{20} } func (m *PositionOpen) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1774,7 +1771,7 @@ func (m *PositionClose) Reset() { *m = PositionClose{} } func (m *PositionClose) String() string { return proto.CompactTextString(m) } func (*PositionClose) ProtoMessage() {} func (*PositionClose) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{22} + return fileDescriptor_d1eba752ca2f0d70, []int{21} } func (m *PositionClose) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1827,7 +1824,7 @@ func (m *PositionWithdraw) Reset() { *m = PositionWithdraw{} } func (m *PositionWithdraw) String() string { return proto.CompactTextString(m) } func (*PositionWithdraw) ProtoMessage() {} func (*PositionWithdraw) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{23} + return fileDescriptor_d1eba752ca2f0d70, []int{22} } func (m *PositionWithdraw) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1887,7 +1884,7 @@ func (m *PositionRewardClaim) Reset() { *m = PositionRewardClaim{} } func (m *PositionRewardClaim) String() string { return proto.CompactTextString(m) } func (*PositionRewardClaim) ProtoMessage() {} func (*PositionRewardClaim) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{24} + return fileDescriptor_d1eba752ca2f0d70, []int{23} } func (m *PositionRewardClaim) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1943,7 +1940,7 @@ 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{25} + return fileDescriptor_d1eba752ca2f0d70, []int{24} } func (m *SwapExecution) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2003,7 +2000,7 @@ 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{25, 0} + return fileDescriptor_d1eba752ca2f0d70, []int{24, 0} } func (m *SwapExecution_Trace) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2050,7 +2047,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{26} + return fileDescriptor_d1eba752ca2f0d70, []int{25} } func (m *PositionWithdrawPlan) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2109,7 +2106,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{27} + return fileDescriptor_d1eba752ca2f0d70, []int{26} } func (m *PositionRewardClaimPlan) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2153,7 +2150,6 @@ func init() { proto.RegisterType((*SwapBody)(nil), "penumbra.core.dex.v1alpha1.SwapBody") proto.RegisterType((*SwapPayload)(nil), "penumbra.core.dex.v1alpha1.SwapPayload") proto.RegisterType((*SwapPlaintext)(nil), "penumbra.core.dex.v1alpha1.SwapPlaintext") - proto.RegisterType((*MockFlowCiphertext)(nil), "penumbra.core.dex.v1alpha1.MockFlowCiphertext") proto.RegisterType((*SwapPlan)(nil), "penumbra.core.dex.v1alpha1.SwapPlan") proto.RegisterType((*SwapClaimPlan)(nil), "penumbra.core.dex.v1alpha1.SwapClaimPlan") proto.RegisterType((*SwapView)(nil), "penumbra.core.dex.v1alpha1.SwapView") @@ -2187,119 +2183,121 @@ func init() { } var fileDescriptor_d1eba752ca2f0d70 = []byte{ - // 1786 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x59, 0x4f, 0x6f, 0x1b, 0xc7, - 0x15, 0xd7, 0x2e, 0x29, 0x8a, 0x7c, 0xa4, 0x1c, 0x79, 0x14, 0xb4, 0x02, 0x8b, 0xc8, 0xf6, 0xd6, - 0x49, 0xdc, 0xa4, 0xa0, 0xc2, 0x75, 0x0a, 0x04, 0x72, 0x12, 0x47, 0xfc, 0x23, 0x8b, 0x49, 0x44, - 0x31, 0x2b, 0xc5, 0x2e, 0x52, 0xa3, 0x8b, 0xd1, 0xee, 0xc8, 0x5c, 0x74, 0xb9, 0xbb, 0xde, 0x1d, - 0x4a, 0xd4, 0xa9, 0x40, 0xd1, 0xa2, 0xa7, 0xa2, 0xcd, 0xa9, 0xa7, 0xa2, 0x48, 0x8f, 0x45, 0x3f, - 0x42, 0xd1, 0x5e, 0x8b, 0x9e, 0x7c, 0x6b, 0x4f, 0x45, 0x21, 0x1f, 0x0a, 0xf4, 0x03, 0x14, 0x3d, - 0xf4, 0x50, 0xcc, 0x3f, 0x72, 0x25, 0x51, 0x26, 0x29, 0xab, 0x97, 0xde, 0x38, 0x33, 0xef, 0xf7, - 0xdb, 0xf7, 0xe6, 0xbd, 0x79, 0xef, 0xcd, 0x10, 0x6e, 0x47, 0x24, 0xe8, 0xf7, 0xf6, 0x63, 0xbc, - 0xe6, 0x84, 0x31, 0x59, 0x73, 0xc9, 0x60, 0xed, 0xb0, 0x8a, 0xfd, 0xa8, 0x8b, 0xab, 0x6c, 0x50, - 0x89, 0xe2, 0x90, 0x86, 0xa8, 0xac, 0xa4, 0x2a, 0x4c, 0xaa, 0xc2, 0x16, 0x94, 0x54, 0xf9, 0xad, - 0xd3, 0x0c, 0x4e, 0x7c, 0x1c, 0xd1, 0x70, 0x44, 0x22, 0xc6, 0x82, 0xc7, 0xf8, 0x91, 0x06, 0xd9, - 0xdd, 0x23, 0x1c, 0xa1, 0x8f, 0x60, 0x3e, 0x8a, 0xc3, 0xf0, 0x60, 0x45, 0xbb, 0xa9, 0xdd, 0x29, - 0x9a, 0x6f, 0x55, 0x4e, 0x7f, 0x40, 0x82, 0x14, 0x49, 0xe5, 0x8b, 0x4f, 0x18, 0xaa, 0xc3, 0x10, - 0x96, 0x00, 0xa2, 0xf7, 0x20, 0xbb, 0x1f, 0xba, 0xc7, 0x2b, 0x59, 0x4e, 0x70, 0xbb, 0x72, 0xb1, - 0x86, 0x15, 0x86, 0xad, 0x85, 0xee, 0xb1, 0xc5, 0x11, 0xc6, 0x4f, 0x35, 0x28, 0xb0, 0xa9, 0xba, - 0x8f, 0xbd, 0x1e, 0x7a, 0x35, 0xad, 0x49, 0x49, 0xb1, 0x7f, 0x20, 0xd9, 0x75, 0xce, 0xfe, 0xad, - 0x49, 0xec, 0x9c, 0x6a, 0xf4, 0x09, 0xf4, 0x3a, 0x5c, 0x23, 0x51, 0xe8, 0x74, 0x6d, 0xb7, 0x1f, - 0x63, 0xea, 0x85, 0xc1, 0xca, 0xc2, 0x4d, 0xed, 0x4e, 0xd6, 0x5a, 0xe4, 0xb3, 0x0d, 0x39, 0x69, - 0xfc, 0x3a, 0x03, 0x8b, 0xa7, 0xe0, 0x68, 0x13, 0x0a, 0x41, 0xdf, 0xf7, 0xbd, 0x03, 0x8f, 0xc4, - 0x72, 0x6f, 0xee, 0x4c, 0xd8, 0x9b, 0xb6, 0x92, 0xb7, 0x46, 0x50, 0xf4, 0x2e, 0x64, 0x0e, 0x08, - 0x91, 0xea, 0x1b, 0x13, 0x18, 0x36, 0x09, 0xb1, 0x98, 0x38, 0xfa, 0x3e, 0x2c, 0x87, 0x7d, 0x1a, - 0xf5, 0xa9, 0x5d, 0xb5, 0x9d, 0xb0, 0xd7, 0xf3, 0x68, 0x8f, 0x04, 0x74, 0x25, 0xc3, 0x59, 0x2a, - 0x13, 0x58, 0x76, 0x29, 0xa6, 0xa4, 0x3e, 0x44, 0x59, 0xd7, 0x05, 0x55, 0x75, 0x34, 0x95, 0xe2, - 0x37, 0xd3, 0xfc, 0xd9, 0x97, 0xe1, 0x37, 0x53, 0xfc, 0x1d, 0x28, 0x4a, 0x7e, 0x17, 0x53, 0xbc, - 0x92, 0xe3, 0xbc, 0x6b, 0x2f, 0x72, 0x5e, 0x0d, 0x53, 0xa7, 0xcb, 0x5c, 0xb0, 0xc3, 0x71, 0x0d, - 0x4c, 0xb1, 0x05, 0xe1, 0xf0, 0xb7, 0xf1, 0x6f, 0x1d, 0xf2, 0x2a, 0x7c, 0xd0, 0xc7, 0x50, 0xa2, - 0x31, 0x76, 0xbd, 0xe0, 0x89, 0x1d, 0x61, 0x4f, 0xf9, 0xe7, 0xcd, 0x17, 0xf1, 0xef, 0x09, 0xf9, - 0x0e, 0xf6, 0x62, 0xab, 0x48, 0x47, 0x03, 0xb4, 0x01, 0x05, 0x97, 0xf8, 0x14, 0xdb, 0x55, 0xdb, - 0x93, 0x6e, 0x7a, 0x7d, 0xc2, 0x06, 0x6c, 0xf4, 0xc2, 0x7e, 0x40, 0xad, 0x05, 0x8e, 0xab, 0xb6, - 0x46, 0x14, 0xa6, 0xed, 0x49, 0x1f, 0xcd, 0x44, 0x61, 0xb6, 0xd0, 0x23, 0xb8, 0x76, 0x40, 0xc8, - 0x79, 0x5f, 0xbc, 0x33, 0x81, 0xa7, 0x86, 0x7d, 0x1c, 0x38, 0x69, 0x6f, 0x2c, 0x1e, 0x90, 0xd4, - 0x10, 0x6d, 0xc0, 0x42, 0x84, 0x8f, 0xfd, 0x10, 0xbb, 0x2b, 0xf3, 0x93, 0x77, 0x89, 0x1f, 0x6e, - 0x21, 0x6e, 0x29, 0x9c, 0xf1, 0x63, 0x0d, 0x8a, 0xa9, 0x05, 0xd4, 0x06, 0x48, 0xe9, 0xa9, 0x5d, - 0x2a, 0x66, 0x52, 0x0c, 0xfc, 0x8c, 0x06, 0x1c, 0x40, 0x5c, 0x3b, 0x39, 0xc2, 0x11, 0x77, 0x43, - 0xc9, 0x5a, 0x1c, 0xce, 0xb2, 0xaf, 0x1b, 0x3f, 0x91, 0x67, 0xb4, 0xe3, 0x63, 0x2f, 0xa0, 0x64, - 0x40, 0xff, 0x0f, 0xc3, 0xe0, 0x3e, 0x14, 0x1c, 0x96, 0x82, 0x6c, 0x96, 0x33, 0xb2, 0x53, 0xe7, - 0x8c, 0x3c, 0x07, 0x6d, 0x12, 0x82, 0x3e, 0x81, 0x45, 0x41, 0x80, 0x5d, 0x37, 0x26, 0x49, 0x22, - 0x9d, 0xfe, 0xc6, 0x24, 0x3d, 0x84, 0xb4, 0x55, 0xe2, 0x60, 0x39, 0x62, 0x19, 0x39, 0x4e, 0x08, - 0x71, 0xf9, 0xf9, 0x2d, 0x59, 0x62, 0x60, 0x7c, 0x06, 0x68, 0x3b, 0x74, 0x7e, 0xb0, 0xe9, 0x87, - 0x47, 0x75, 0x2f, 0xea, 0x92, 0x98, 0xfb, 0xe2, 0x1e, 0xcc, 0x1f, 0x62, 0xbf, 0x4f, 0xa4, 0x13, - 0xa6, 0x34, 0x5c, 0x60, 0x8c, 0x1f, 0x8a, 0xb3, 0xdd, 0xf1, 0x71, 0x80, 0x3a, 0x70, 0x8d, 0xc5, - 0x80, 0x1d, 0x29, 0x37, 0x4b, 0xc6, 0x89, 0xa9, 0x7f, 0x18, 0x17, 0xd6, 0x62, 0x72, 0x2a, 0x4c, - 0x6e, 0x41, 0x89, 0x9d, 0xad, 0x7d, 0xdf, 0x0b, 0x98, 0xbb, 0x65, 0x74, 0x15, 0x0f, 0x08, 0xa9, - 0xc9, 0x29, 0xe3, 0x5f, 0x5a, 0x2a, 0xff, 0xff, 0x8f, 0xd4, 0x28, 0x43, 0x3e, 0x0a, 0x13, 0x8f, - 0x17, 0x21, 0x9d, 0x17, 0xa1, 0xe1, 0xf8, 0x6c, 0xbe, 0xcc, 0xbc, 0x74, 0xbe, 0x1c, 0x53, 0xf8, - 0xb2, 0xe3, 0x0a, 0xdf, 0x7f, 0x64, 0x5a, 0x7d, 0xe8, 0x91, 0x23, 0xb4, 0x05, 0x0b, 0x87, 0x5e, - 0xe2, 0xed, 0xfb, 0xca, 0x8b, 0xdf, 0x9e, 0x64, 0x2c, 0x83, 0x55, 0x1e, 0x0a, 0xcc, 0xd6, 0x9c, - 0xa5, 0xe0, 0xa8, 0x09, 0xb9, 0x30, 0xc2, 0x4f, 0xfb, 0xaa, 0xf0, 0xbd, 0x3d, 0x15, 0xd1, 0x0e, - 0x87, 0x6c, 0xcd, 0x59, 0x12, 0x5c, 0xfe, 0x52, 0x83, 0x05, 0xc9, 0x8e, 0xde, 0x85, 0x2c, 0xcf, - 0x0d, 0x42, 0xb3, 0x9b, 0x93, 0x08, 0x2d, 0x2e, 0x3d, 0xc6, 0x8d, 0x99, 0x97, 0x73, 0x63, 0xf9, - 0x43, 0xc8, 0x09, 0x3d, 0x2f, 0xa7, 0x51, 0xad, 0x08, 0x05, 0xae, 0xd1, 0xa1, 0x47, 0x8e, 0x8c, - 0x7f, 0xa4, 0xfb, 0x0e, 0xee, 0x83, 0xed, 0xb3, 0x3e, 0xa8, 0x4e, 0xd5, 0xf2, 0x5c, 0xe4, 0x88, - 0x8f, 0xcf, 0x38, 0xe2, 0x9d, 0xe9, 0xd9, 0xce, 0x79, 0xe3, 0x2f, 0x29, 0x6f, 0x34, 0x00, 0xb8, - 0x15, 0x3c, 0x5f, 0x5c, 0x70, 0xe6, 0xc7, 0x73, 0x5b, 0xdc, 0x7c, 0xd1, 0xf2, 0xd5, 0x20, 0xaf, - 0xda, 0x1c, 0xa9, 0xdf, 0x9b, 0x93, 0x7a, 0xac, 0x90, 0x12, 0xa6, 0x9d, 0xb5, 0x20, 0x9b, 0x9a, - 0x14, 0x87, 0x29, 0x7d, 0x3b, 0x2b, 0x87, 0x59, 0x6e, 0x0f, 0x7d, 0x7a, 0x25, 0x76, 0xd5, 0xae, - 0xc3, 0x2b, 0x23, 0x16, 0xe1, 0xe9, 0x9f, 0x6b, 0x50, 0x4c, 0x15, 0x1f, 0x74, 0x1f, 0x16, 0x70, - 0x92, 0x10, 0x66, 0xb9, 0x36, 0x5d, 0x8a, 0x66, 0xd2, 0x2d, 0xd7, 0xca, 0x71, 0x58, 0x75, 0x44, - 0x60, 0xca, 0xad, 0x9b, 0x8d, 0xc0, 0x34, 0x7e, 0xa6, 0xc1, 0x72, 0xc3, 0x8b, 0x89, 0x43, 0x89, - 0x9b, 0xd6, 0xec, 0x7d, 0x98, 0x4f, 0x28, 0x8e, 0xe9, 0x8c, 0x7a, 0x09, 0x10, 0x7a, 0x0f, 0x32, - 0x24, 0x70, 0x67, 0x54, 0x89, 0x41, 0x8c, 0xdf, 0x65, 0x61, 0x79, 0x4c, 0x56, 0x43, 0x1f, 0xc2, - 0x82, 0xac, 0xcc, 0xb3, 0xd5, 0x96, 0x9c, 0xa8, 0xcb, 0x23, 0xbc, 0x39, 0x5b, 0x5d, 0x17, 0x78, - 0x13, 0x7d, 0x04, 0x79, 0x1f, 0xf7, 0xf6, 0x5d, 0xa6, 0xc0, 0x6c, 0x55, 0x5d, 0xc0, 0xaa, 0x29, - 0x06, 0x53, 0x16, 0xf5, 0xd9, 0x18, 0x4c, 0x16, 0x96, 0xfd, 0xe0, 0xc0, 0xf3, 0x7d, 0xe2, 0xda, - 0x55, 0x59, 0xd3, 0xa7, 0xe4, 0x28, 0x28, 0x60, 0xf5, 0x14, 0x8b, 0x29, 0x9b, 0xf2, 0x59, 0x59, - 0x4c, 0xf4, 0x35, 0xc8, 0x75, 0x89, 0xf7, 0xa4, 0x4b, 0xe5, 0x55, 0x4a, 0x8e, 0xce, 0x75, 0x63, - 0xf9, 0x97, 0xe8, 0xc6, 0x6e, 0x41, 0x49, 0x54, 0x2f, 0xf9, 0xa5, 0x02, 0xff, 0x52, 0x91, 0xcf, - 0x6d, 0xf1, 0x29, 0xe3, 0x57, 0x1a, 0xbc, 0x22, 0xf1, 0x9b, 0xfd, 0xc0, 0xe1, 0x65, 0x74, 0x1b, - 0x0a, 0x4e, 0xd8, 0x8b, 0xc2, 0x60, 0xd4, 0x98, 0x4e, 0x28, 0xa2, 0x31, 0x39, 0xc3, 0x61, 0x8d, - 0x18, 0xd0, 0x3d, 0xc8, 0x72, 0x4b, 0xf4, 0xd9, 0x2c, 0xe1, 0x20, 0xe3, 0x4b, 0x8d, 0x85, 0xf3, - 0x39, 0x7e, 0xb4, 0x24, 0x2e, 0x84, 0x4c, 0xbb, 0x45, 0x71, 0xd9, 0xbb, 0x0b, 0x5a, 0x34, 0x5b, - 0x68, 0x6a, 0x11, 0x03, 0x3d, 0x9d, 0x2d, 0x1c, 0xb5, 0xa7, 0xc6, 0x00, 0xf2, 0x16, 0x49, 0x48, - 0x7c, 0x48, 0x12, 0xf4, 0x1d, 0xd0, 0xe3, 0x19, 0x4f, 0x94, 0x1e, 0x57, 0x39, 0x6c, 0xc6, 0x83, - 0xa4, 0xc7, 0xa6, 0x71, 0xa2, 0x41, 0xbe, 0xa3, 0xba, 0x9d, 0x0f, 0x20, 0x13, 0x75, 0x3d, 0xf9, - 0xed, 0xb7, 0xa7, 0xd8, 0xd6, 0xa1, 0x73, 0x18, 0x8e, 0xb5, 0xa5, 0x41, 0x18, 0x38, 0x44, 0x36, - 0x72, 0x62, 0x80, 0xee, 0xf3, 0xb4, 0x45, 0xc9, 0x34, 0x05, 0x5e, 0x69, 0xc2, 0x6f, 0x25, 0x96, - 0xc0, 0xb1, 0x53, 0x1a, 0xcb, 0xcd, 0x99, 0xe6, 0x2d, 0x43, 0x6d, 0xa4, 0x35, 0x44, 0x19, 0x75, - 0x00, 0xc5, 0xdc, 0x72, 0x99, 0x9a, 0x5e, 0x10, 0xc8, 0xd7, 0x83, 0x92, 0x25, 0x06, 0xe8, 0x06, - 0x14, 0xb1, 0x4f, 0xed, 0x7d, 0xe2, 0x74, 0xef, 0x9a, 0x3d, 0x6e, 0x42, 0xc1, 0x02, 0xec, 0xd3, - 0x9a, 0x98, 0x31, 0xbe, 0xd2, 0x61, 0xf1, 0x94, 0x7e, 0xe8, 0x33, 0x65, 0x19, 0x23, 0xba, 0x66, - 0xde, 0x9b, 0xda, 0xb2, 0xd3, 0xa3, 0x66, 0xd0, 0xef, 0x49, 0x5b, 0x8d, 0xdf, 0x6b, 0x70, 0xfd, - 0xdc, 0x22, 0xfa, 0x26, 0xdc, 0xe8, 0xec, 0xec, 0xb6, 0xf6, 0x5a, 0x3b, 0x6d, 0x7b, 0x77, 0x6f, - 0x63, 0xaf, 0x69, 0x37, 0xdb, 0x9f, 0x6f, 0xdb, 0x9f, 0xb7, 0x77, 0x3b, 0xcd, 0x7a, 0x6b, 0xb3, - 0xd5, 0x6c, 0x2c, 0xcd, 0xa1, 0x55, 0x28, 0x8f, 0x13, 0xda, 0xe9, 0x34, 0xdb, 0xcd, 0xc6, 0x92, - 0x76, 0xd1, 0x7a, 0xfd, 0xd3, 0x9d, 0xdd, 0x66, 0x63, 0x49, 0x47, 0xb7, 0xe0, 0xb5, 0x71, 0xeb, - 0x8f, 0x5a, 0x7b, 0x5b, 0x0d, 0x6b, 0xe3, 0x51, 0x7b, 0x29, 0x83, 0x6e, 0xc0, 0x37, 0xc6, 0x53, - 0x6c, 0xb4, 0xb6, 0x9b, 0x8d, 0xa5, 0x2c, 0x3b, 0x5b, 0xf3, 0x9f, 0x46, 0xed, 0x03, 0x8a, 0x1e, - 0x40, 0x51, 0x35, 0xd1, 0xb6, 0xe7, 0x5e, 0x50, 0xb2, 0xc6, 0xee, 0x50, 0xcb, 0xb5, 0x20, 0x1a, - 0x79, 0x6b, 0x18, 0x3e, 0xfa, 0xe5, 0xc2, 0xc7, 0xe8, 0x40, 0x49, 0xcd, 0xef, 0x44, 0x24, 0x60, - 0xe1, 0x34, 0x6c, 0xf7, 0xb5, 0xc9, 0xe1, 0xa4, 0xb0, 0xa3, 0x4b, 0x81, 0xf1, 0xdd, 0x51, 0x20, - 0xd4, 0xfd, 0x30, 0x21, 0x57, 0x66, 0xac, 0xf1, 0x07, 0x0d, 0x96, 0xd4, 0xd2, 0x23, 0x8f, 0x76, - 0xdd, 0x18, 0x1f, 0x5d, 0xdd, 0x56, 0x62, 0x58, 0x56, 0x47, 0x22, 0xfd, 0xa0, 0xa1, 0x5f, 0xf2, - 0x41, 0x03, 0x29, 0xb2, 0xd1, 0x9c, 0xf1, 0x47, 0x0d, 0x96, 0x87, 0x3b, 0x46, 0x8e, 0x70, 0xec, - 0x8a, 0x86, 0xf2, 0xca, 0x6c, 0xb0, 0x01, 0xc5, 0x9c, 0xf7, 0x4a, 0x4c, 0xb8, 0x2e, 0xb9, 0x52, - 0x16, 0xfc, 0x52, 0x17, 0x9d, 0x7f, 0x73, 0x40, 0x9c, 0x3e, 0xcf, 0x8a, 0x0f, 0x20, 0x47, 0x63, - 0xec, 0x90, 0x64, 0x45, 0xbb, 0x99, 0x99, 0x54, 0xb9, 0x4e, 0x41, 0x59, 0x9a, 0x74, 0x88, 0x25, - 0xe1, 0x68, 0x9d, 0x25, 0x9e, 0xa8, 0xaf, 0xd4, 0xbd, 0x3d, 0x41, 0xdd, 0x87, 0xec, 0x0a, 0x6e, - 0x09, 0x08, 0x7a, 0x1f, 0x72, 0xa2, 0x29, 0x96, 0x69, 0x74, 0x3a, 0xb0, 0xc4, 0x94, 0xeb, 0x30, - 0xcf, 0x55, 0x61, 0x2a, 0xa8, 0xd7, 0x80, 0xcc, 0xf4, 0x2a, 0x88, 0xc7, 0x80, 0xbf, 0x69, 0xf0, - 0xea, 0xd9, 0xe0, 0xe4, 0x57, 0xf2, 0x74, 0x82, 0xd6, 0x2e, 0x93, 0xa0, 0xcf, 0x86, 0x87, 0x7e, - 0xe9, 0xf0, 0x50, 0x9d, 0x41, 0xe6, 0x32, 0x9d, 0xc1, 0xf7, 0xe0, 0xeb, 0x63, 0x62, 0xf7, 0x6a, - 0x4c, 0xac, 0x7d, 0xa5, 0xff, 0xe9, 0x64, 0x55, 0x7b, 0x76, 0xb2, 0xaa, 0xfd, 0xfd, 0x64, 0x55, - 0xfb, 0xc5, 0xf3, 0xd5, 0xb9, 0x67, 0xcf, 0x57, 0xe7, 0xfe, 0xfa, 0x7c, 0x75, 0x0e, 0x56, 0x9d, - 0xb0, 0xf7, 0x02, 0xb6, 0x5a, 0xbe, 0x41, 0x06, 0x9d, 0x38, 0xa4, 0x61, 0x47, 0xfb, 0xc2, 0x7a, - 0xe2, 0xd1, 0x6e, 0x7f, 0xbf, 0xe2, 0x84, 0xbd, 0x35, 0x27, 0x4c, 0x7a, 0x61, 0xb2, 0x16, 0x13, - 0x1f, 0x1f, 0x93, 0x78, 0xed, 0xd0, 0x1c, 0xfe, 0x74, 0xba, 0xd8, 0x0b, 0x92, 0xb5, 0x8b, 0xff, - 0xb9, 0xb8, 0xe7, 0x92, 0x81, 0xfa, 0xfd, 0x1b, 0x3d, 0xd3, 0xa9, 0x37, 0x7e, 0xab, 0x97, 0x3b, - 0x4a, 0x85, 0x3a, 0x53, 0xa1, 0x41, 0x06, 0x95, 0x87, 0x52, 0xe4, 0xcf, 0xa3, 0xc5, 0xc7, 0x6c, - 0xf1, 0x71, 0x83, 0x0c, 0x1e, 0xab, 0xc5, 0x13, 0xfd, 0x8d, 0x8b, 0x17, 0x1f, 0x3f, 0xe8, 0xd4, - 0xb6, 0x09, 0xc5, 0x2e, 0xa6, 0xf8, 0x9f, 0xfa, 0x6b, 0x4a, 0x70, 0x7d, 0x9d, 0x49, 0xae, 0xaf, - 0x37, 0xc8, 0x60, 0x7d, 0x5d, 0xc9, 0xee, 0xe7, 0xf8, 0x7f, 0x20, 0x77, 0xff, 0x1b, 0x00, 0x00, - 0xff, 0xff, 0xd6, 0xd7, 0x3e, 0x19, 0x73, 0x19, 0x00, 0x00, + // 1824 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x59, 0xcd, 0x6f, 0x1b, 0xc7, + 0x15, 0xd7, 0x2e, 0x29, 0x8a, 0x7c, 0xa4, 0x14, 0x79, 0x94, 0xb6, 0x02, 0x8b, 0xc8, 0xce, 0xd6, + 0x4e, 0xdc, 0xa4, 0xa0, 0xc2, 0x75, 0x0a, 0x04, 0x72, 0x12, 0x47, 0xfc, 0x90, 0xc5, 0x24, 0xa2, + 0xd8, 0x91, 0x62, 0x17, 0xa9, 0xd1, 0xc5, 0x68, 0x77, 0x64, 0x2e, 0xb0, 0xdc, 0x5d, 0xef, 0x0e, + 0x25, 0xea, 0x5a, 0xf4, 0xe3, 0x54, 0xb4, 0x39, 0xf5, 0x54, 0x14, 0xe9, 0xb1, 0x7f, 0x43, 0x3f, + 0xae, 0x45, 0x4e, 0x06, 0x7a, 0x68, 0x4f, 0x45, 0x61, 0x1f, 0x0a, 0xf4, 0x2f, 0xe8, 0xa1, 0x87, + 0x62, 0x66, 0x67, 0xc8, 0x95, 0x44, 0x99, 0xa4, 0xac, 0x5e, 0x7a, 0xe3, 0xcc, 0xbc, 0xdf, 0x6f, + 0xdf, 0xd7, 0xbc, 0xf7, 0x76, 0x09, 0x37, 0x43, 0xea, 0xf7, 0x7b, 0x07, 0x11, 0x59, 0xb7, 0x83, + 0x88, 0xae, 0x3b, 0x74, 0xb0, 0x7e, 0x54, 0x25, 0x5e, 0xd8, 0x25, 0x55, 0xbe, 0xa8, 0x84, 0x51, + 0xc0, 0x02, 0x54, 0x56, 0x52, 0x15, 0x2e, 0x55, 0xe1, 0x07, 0x4a, 0xaa, 0xfc, 0xd6, 0x69, 0x06, + 0x3b, 0x3a, 0x09, 0x59, 0x30, 0x22, 0x49, 0xd6, 0x09, 0x8f, 0xf1, 0x23, 0x0d, 0xb2, 0x7b, 0xc7, + 0x24, 0x44, 0x1f, 0xc1, 0x7c, 0x18, 0x05, 0xc1, 0xe1, 0xaa, 0x76, 0x43, 0xbb, 0x5d, 0x34, 0xdf, + 0xaa, 0x9c, 0x7e, 0x80, 0x04, 0x29, 0x92, 0xca, 0xe7, 0x9f, 0x70, 0x54, 0x87, 0x23, 0x70, 0x02, + 0x44, 0xef, 0x41, 0xf6, 0x20, 0x70, 0x4e, 0x56, 0xb3, 0x82, 0xe0, 0x66, 0xe5, 0x62, 0x0d, 0x2b, + 0x1c, 0x5b, 0x0b, 0x9c, 0x13, 0x2c, 0x10, 0xc6, 0xcf, 0x34, 0x28, 0xf0, 0xad, 0xba, 0x47, 0xdc, + 0x1e, 0x7a, 0x35, 0xad, 0x49, 0x49, 0xb1, 0x7f, 0x20, 0xd9, 0x75, 0xc1, 0xfe, 0xed, 0x49, 0xec, + 0x82, 0x6a, 0xf4, 0x08, 0x74, 0x0b, 0x96, 0x68, 0x18, 0xd8, 0x5d, 0xcb, 0xe9, 0x47, 0x84, 0xb9, + 0x81, 0xbf, 0xba, 0x70, 0x43, 0xbb, 0x9d, 0xc5, 0x8b, 0x62, 0xb7, 0x21, 0x37, 0x8d, 0xdf, 0x64, + 0x60, 0xf1, 0x14, 0x1c, 0x6d, 0x41, 0xc1, 0xef, 0x7b, 0x9e, 0x7b, 0xe8, 0xd2, 0x48, 0xfa, 0xe6, + 0xf6, 0x04, 0xdf, 0xb4, 0x95, 0x3c, 0x1e, 0x41, 0xd1, 0xbb, 0x90, 0x39, 0xa4, 0x54, 0xaa, 0x6f, + 0x4c, 0x60, 0xd8, 0xa2, 0x14, 0x73, 0x71, 0xf4, 0x43, 0x58, 0x09, 0xfa, 0x2c, 0xec, 0x33, 0xab, + 0x6a, 0xd9, 0x41, 0xaf, 0xe7, 0xb2, 0x1e, 0xf5, 0xd9, 0x6a, 0x46, 0xb0, 0x54, 0x26, 0xb0, 0xec, + 0x31, 0xc2, 0x68, 0x7d, 0x88, 0xc2, 0xd7, 0x12, 0xaa, 0xea, 0x68, 0x2b, 0xc5, 0x6f, 0xa6, 0xf9, + 0xb3, 0x2f, 0xc3, 0x6f, 0xa6, 0xf8, 0x3b, 0x50, 0x94, 0xfc, 0x0e, 0x61, 0x64, 0x35, 0x27, 0x78, + 0xd7, 0x5f, 0x14, 0xbc, 0x1a, 0x61, 0x76, 0x97, 0x87, 0x60, 0x57, 0xe0, 0x1a, 0x84, 0x11, 0x0c, + 0xc1, 0xf0, 0xb7, 0xf1, 0x6f, 0x1d, 0xf2, 0x2a, 0x7d, 0xd0, 0xc7, 0x50, 0x62, 0x11, 0x71, 0x5c, + 0xff, 0xb1, 0x15, 0x12, 0x57, 0xc5, 0xe7, 0xcd, 0x17, 0xf1, 0xef, 0x27, 0xf2, 0x1d, 0xe2, 0x46, + 0xb8, 0xc8, 0x46, 0x0b, 0xb4, 0x09, 0x05, 0x87, 0x7a, 0x8c, 0x58, 0x55, 0xcb, 0x95, 0x61, 0xba, + 0x35, 0xc1, 0x01, 0x9b, 0xbd, 0xa0, 0xef, 0x33, 0xbc, 0x20, 0x70, 0xd5, 0xd6, 0x88, 0xc2, 0xb4, + 0x5c, 0x19, 0xa3, 0x99, 0x28, 0xcc, 0x16, 0x7a, 0x08, 0x4b, 0x87, 0x94, 0x9e, 0x8f, 0xc5, 0x3b, + 0x13, 0x78, 0x6a, 0xc4, 0x23, 0xbe, 0x9d, 0x8e, 0xc6, 0xe2, 0x21, 0x4d, 0x2d, 0xd1, 0x26, 0x2c, + 0x84, 0xe4, 0xc4, 0x0b, 0x88, 0xb3, 0x3a, 0x3f, 0xd9, 0x4b, 0xe2, 0x72, 0x27, 0xe2, 0x58, 0xe1, + 0x8c, 0x1f, 0x6b, 0x50, 0x4c, 0x1d, 0xa0, 0x36, 0x40, 0x4a, 0x4f, 0xed, 0x52, 0x39, 0x93, 0x62, + 0x10, 0x77, 0xd4, 0x17, 0x00, 0xea, 0x58, 0xf1, 0x31, 0x09, 0x45, 0x18, 0x4a, 0x78, 0x71, 0xb8, + 0xcb, 0x9f, 0x6e, 0xfc, 0x44, 0xde, 0xd1, 0x8e, 0x47, 0x5c, 0x9f, 0xd1, 0x01, 0xfb, 0x3f, 0x4c, + 0x83, 0x7b, 0x50, 0xb0, 0x79, 0x09, 0xb2, 0x78, 0xcd, 0xc8, 0x4e, 0x5d, 0x33, 0xf2, 0x02, 0xb4, + 0x45, 0x29, 0xfa, 0x04, 0x16, 0x13, 0x02, 0xe2, 0x38, 0x11, 0x8d, 0x63, 0x19, 0xf4, 0x37, 0x26, + 0xe9, 0x91, 0x48, 0xe3, 0x92, 0x00, 0xcb, 0x15, 0xaf, 0xc8, 0x51, 0x4c, 0xa9, 0x23, 0xee, 0x6f, + 0x09, 0x27, 0x0b, 0xe3, 0x2f, 0x5a, 0x72, 0x13, 0x3b, 0x1e, 0xf1, 0x51, 0x07, 0x96, 0x78, 0xc4, + 0xac, 0x50, 0x05, 0x45, 0x06, 0x61, 0x62, 0xa1, 0x1e, 0x46, 0x11, 0x2f, 0xc6, 0xa7, 0x82, 0xfa, + 0x3a, 0x94, 0xf8, 0x4d, 0x38, 0xf0, 0x5c, 0x9f, 0x07, 0x47, 0xe6, 0x42, 0xf1, 0x90, 0xd2, 0x9a, + 0xdc, 0x42, 0xb7, 0x61, 0x59, 0x34, 0x87, 0xa1, 0x90, 0x15, 0x09, 0x7f, 0x97, 0xf0, 0x92, 0xd8, + 0x57, 0x82, 0x78, 0x8c, 0x64, 0x2c, 0xdc, 0x7a, 0x56, 0x72, 0xcf, 0xf8, 0x4a, 0x4f, 0x75, 0x80, + 0xff, 0x91, 0x69, 0x65, 0xc8, 0x87, 0x41, 0xec, 0x8a, 0x36, 0xa4, 0x8b, 0x36, 0x34, 0x5c, 0x9f, + 0xad, 0x98, 0x99, 0x97, 0xae, 0x98, 0x63, 0x5a, 0x5f, 0x76, 0x4c, 0xeb, 0x1b, 0xeb, 0xcc, 0xf9, + 0xa9, 0x9d, 0x99, 0x1b, 0xeb, 0xcc, 0xff, 0xc8, 0x62, 0xfd, 0xc0, 0xa5, 0xc7, 0x68, 0x1b, 0x16, + 0x8e, 0xdc, 0xd8, 0x3d, 0xf0, 0xa8, 0x74, 0xe0, 0x77, 0x26, 0x39, 0x90, 0xc3, 0x2a, 0x0f, 0x12, + 0xcc, 0xf6, 0x1c, 0x56, 0x70, 0xd4, 0x84, 0x5c, 0x10, 0x92, 0x27, 0x7d, 0xd5, 0x4e, 0xdf, 0x9e, + 0x8a, 0x68, 0x57, 0x40, 0xb6, 0xe7, 0xb0, 0x04, 0x97, 0xbf, 0xd0, 0x60, 0x41, 0xb2, 0xa3, 0x77, + 0x21, 0x2b, 0x2a, 0x4e, 0xa2, 0xd9, 0x8d, 0x49, 0x84, 0x58, 0x48, 0x8f, 0x49, 0x8d, 0xcc, 0xcb, + 0xa5, 0x46, 0xf9, 0x43, 0xc8, 0x25, 0x7a, 0x5e, 0x4e, 0xa3, 0x5a, 0x11, 0x0a, 0x42, 0xa3, 0x23, + 0x97, 0x1e, 0x1b, 0xff, 0x4c, 0x4f, 0x33, 0x22, 0x06, 0x3b, 0x67, 0x63, 0x50, 0x9d, 0x6a, 0x90, + 0xba, 0x28, 0x10, 0x1f, 0x9f, 0x09, 0xc4, 0x3b, 0xd3, 0xb3, 0x9d, 0x8b, 0xc6, 0x5f, 0x53, 0xd1, + 0x68, 0x00, 0x08, 0x2b, 0x44, 0x15, 0x92, 0x9a, 0xde, 0x9a, 0x8a, 0x1b, 0x0b, 0xf3, 0x93, 0x41, + 0xb2, 0x06, 0x79, 0x35, 0x3c, 0x49, 0xfd, 0xde, 0x9c, 0x34, 0xb9, 0x05, 0x8c, 0x72, 0xed, 0xf0, + 0x82, 0x1c, 0x95, 0x52, 0x1c, 0xa6, 0x8c, 0xed, 0xac, 0x1c, 0x66, 0xb9, 0x3d, 0x8c, 0xe9, 0x95, + 0xd8, 0x55, 0xbb, 0x06, 0xaf, 0x8c, 0x58, 0x92, 0x48, 0xff, 0x42, 0x83, 0x62, 0xaa, 0xa5, 0xa1, + 0x7b, 0xb0, 0x40, 0xe2, 0x98, 0x72, 0xcb, 0xb5, 0xe9, 0x0a, 0x3f, 0x97, 0x6e, 0x39, 0x38, 0x27, + 0x60, 0xd5, 0x11, 0x81, 0x29, 0x5d, 0x37, 0x1b, 0x81, 0x69, 0xfc, 0x5c, 0x83, 0x95, 0x86, 0x1b, + 0x51, 0x9b, 0x51, 0x27, 0xad, 0xd9, 0xfb, 0x30, 0x1f, 0x33, 0x12, 0xb1, 0x19, 0xf5, 0x4a, 0x40, + 0xe8, 0x3d, 0xc8, 0x50, 0xdf, 0x99, 0x51, 0x25, 0x0e, 0x31, 0xfe, 0x90, 0x85, 0x95, 0x31, 0x95, + 0x12, 0x7d, 0x08, 0x0b, 0xb2, 0xdf, 0x5f, 0x10, 0x8f, 0x0b, 0x5a, 0x75, 0x2e, 0xe9, 0xf6, 0x23, + 0xbc, 0x39, 0xdb, 0xb4, 0x90, 0xe0, 0x4d, 0xf4, 0x11, 0xe4, 0x3d, 0xd2, 0x3b, 0x70, 0xb8, 0x02, + 0xb3, 0xcd, 0x0a, 0x09, 0xac, 0x9a, 0x62, 0x30, 0xe5, 0xa8, 0x30, 0x1b, 0x83, 0xc9, 0xd3, 0xb2, + 0xef, 0x1f, 0xba, 0x9e, 0x47, 0x1d, 0xab, 0x2a, 0x27, 0x85, 0x29, 0x39, 0x0a, 0x0a, 0x58, 0x3d, + 0xc5, 0x62, 0xca, 0x51, 0x7f, 0x56, 0x16, 0x13, 0x7d, 0x1d, 0x72, 0x5d, 0xea, 0x3e, 0xee, 0x32, + 0xf9, 0x82, 0x26, 0x57, 0xe7, 0x66, 0xbc, 0xfc, 0x4b, 0xcc, 0x78, 0x26, 0x7c, 0x2d, 0xe9, 0x88, + 0x22, 0xa9, 0x38, 0xa5, 0x7c, 0x64, 0x41, 0x3c, 0x72, 0x45, 0x1c, 0xee, 0xc9, 0xb3, 0x6d, 0x71, + 0x64, 0xfc, 0x5a, 0x83, 0x57, 0x24, 0xe1, 0x56, 0xdf, 0xb7, 0x45, 0xcb, 0xdc, 0x81, 0x82, 0x1d, + 0xf4, 0xc2, 0xc0, 0x1f, 0xcd, 0xbf, 0x13, 0x3a, 0x75, 0x44, 0xcf, 0x70, 0xe0, 0x11, 0x03, 0xba, + 0x0b, 0x59, 0x61, 0x9a, 0x3e, 0x9b, 0x69, 0x02, 0x64, 0x7c, 0xa1, 0xf1, 0xfc, 0x3e, 0xc7, 0x8f, + 0x96, 0x93, 0xf7, 0x4e, 0xae, 0xdd, 0x62, 0xf2, 0x4e, 0x79, 0x07, 0xb4, 0x70, 0xb6, 0x5c, 0xd5, + 0x42, 0x0e, 0x7a, 0x32, 0x5b, 0x7e, 0x6a, 0x4f, 0x8c, 0x01, 0xe4, 0x31, 0x8d, 0x69, 0x74, 0x44, + 0x63, 0xf4, 0x5d, 0xd0, 0xa3, 0x19, 0xaf, 0x98, 0x1e, 0x55, 0x05, 0x6c, 0xc6, 0x9b, 0xa5, 0x47, + 0xa6, 0xf1, 0x53, 0x1d, 0xf2, 0x1d, 0x35, 0x52, 0x7d, 0x00, 0x99, 0xb0, 0xeb, 0xca, 0x67, 0xbf, + 0x3d, 0x85, 0x5b, 0x87, 0xc1, 0xe1, 0x38, 0x3e, 0xfd, 0xfa, 0x81, 0x6f, 0x53, 0x39, 0x81, 0x26, + 0x0b, 0x74, 0x4f, 0xd4, 0x31, 0x46, 0xa7, 0xe9, 0xf8, 0x4a, 0x13, 0xf1, 0xf2, 0x83, 0x13, 0x1c, + 0xbf, 0xb6, 0x91, 0x74, 0xce, 0x34, 0x9f, 0x4c, 0x94, 0x23, 0xf1, 0x10, 0x85, 0x0c, 0x3e, 0xe3, + 0x07, 0x31, 0xb5, 0x02, 0xdf, 0xe2, 0xd7, 0x47, 0xdc, 0xdc, 0x3c, 0x2e, 0x8a, 0xcd, 0x5d, 0x7f, + 0xcb, 0xf5, 0x3c, 0xa3, 0x0e, 0xa0, 0x9e, 0xde, 0x72, 0xb8, 0x29, 0xae, 0xef, 0xcb, 0x0f, 0x19, + 0x25, 0x9c, 0x2c, 0xd0, 0x75, 0x28, 0x12, 0x8f, 0x59, 0x07, 0xd4, 0xee, 0xde, 0x31, 0x7b, 0xc2, + 0xcc, 0x02, 0x06, 0xe2, 0xb1, 0x5a, 0xb2, 0x63, 0x7c, 0xa9, 0xc3, 0xe2, 0x29, 0x1b, 0xd0, 0xf7, + 0x94, 0xf5, 0x9c, 0x68, 0xc9, 0xbc, 0x3b, 0xb5, 0xf5, 0xa7, 0x57, 0x4d, 0xbf, 0xdf, 0x93, 0xfe, + 0x30, 0x7e, 0xaf, 0xc1, 0xb5, 0x73, 0x87, 0xe8, 0x5b, 0x70, 0xbd, 0xb3, 0xbb, 0xd7, 0xda, 0x6f, + 0xed, 0xb6, 0xad, 0xbd, 0xfd, 0xcd, 0xfd, 0xa6, 0xd5, 0x6c, 0x7f, 0xb6, 0x63, 0x7d, 0xd6, 0xde, + 0xeb, 0x34, 0xeb, 0xad, 0xad, 0x56, 0xb3, 0xb1, 0x3c, 0x87, 0xd6, 0xa0, 0x3c, 0x4e, 0x68, 0xb7, + 0xd3, 0x6c, 0x37, 0x1b, 0xcb, 0xda, 0x45, 0xe7, 0xf5, 0x4f, 0x77, 0xf7, 0x9a, 0x8d, 0x65, 0x1d, + 0xbd, 0x0e, 0xaf, 0x8d, 0x3b, 0x7f, 0xd8, 0xda, 0xdf, 0x6e, 0xe0, 0xcd, 0x87, 0xed, 0xe5, 0x0c, + 0xba, 0x0e, 0xdf, 0x1c, 0x4f, 0xb1, 0xd9, 0xda, 0x69, 0x36, 0x96, 0xb3, 0xfc, 0xfe, 0xcd, 0x7f, + 0x1a, 0xb6, 0x0f, 0x19, 0xba, 0x0f, 0x45, 0x35, 0xcd, 0x5b, 0xae, 0x73, 0x41, 0x9f, 0x1b, 0xeb, + 0xa1, 0x96, 0x83, 0x21, 0x1c, 0x45, 0x6b, 0x98, 0x62, 0xfa, 0xe5, 0x52, 0xcc, 0xe8, 0x40, 0x49, + 0xed, 0xef, 0x86, 0xd4, 0xe7, 0x29, 0x37, 0x7c, 0xef, 0xd0, 0x26, 0xa7, 0x9c, 0xc2, 0x8e, 0xde, + 0x4e, 0x8c, 0xef, 0x8f, 0x12, 0xa1, 0xce, 0xb3, 0xec, 0xca, 0x8c, 0x35, 0xfe, 0xa8, 0xc1, 0xb2, + 0x3a, 0x7a, 0xe8, 0xb2, 0xae, 0x13, 0x91, 0xe3, 0xab, 0x73, 0x25, 0x81, 0x15, 0x75, 0x6d, 0xd2, + 0xdf, 0x56, 0xf4, 0x4b, 0x7e, 0x5b, 0x41, 0x8a, 0x6c, 0xb4, 0x67, 0xfc, 0x49, 0x83, 0x95, 0xa1, + 0xc7, 0xe8, 0x31, 0x89, 0x9c, 0x64, 0x0a, 0xbd, 0x32, 0x1b, 0x2c, 0x40, 0x91, 0xe0, 0xbd, 0x12, + 0x13, 0xae, 0x49, 0xae, 0x94, 0x05, 0xbf, 0x92, 0xaf, 0xbe, 0xcd, 0x01, 0xb5, 0xfb, 0xa2, 0x72, + 0xde, 0x87, 0x1c, 0x8b, 0x88, 0x4d, 0xe3, 0x55, 0xed, 0x46, 0x66, 0x52, 0x77, 0x3b, 0x05, 0xe5, + 0xa5, 0xd4, 0xa6, 0x58, 0xc2, 0xd1, 0x06, 0x2f, 0x3c, 0x61, 0x5f, 0xa9, 0x7b, 0x73, 0x82, 0xba, + 0x0f, 0x88, 0xd7, 0xa7, 0x38, 0x81, 0xa0, 0xf7, 0x21, 0x97, 0x4c, 0xd2, 0xb2, 0xd4, 0x4e, 0x07, + 0x96, 0x98, 0x72, 0x1d, 0xe6, 0x85, 0x2a, 0x5c, 0x85, 0x23, 0x7e, 0x22, 0x4d, 0x99, 0x52, 0x05, + 0x01, 0x31, 0xfe, 0xae, 0xc1, 0xab, 0x67, 0x93, 0x53, 0x7c, 0x1b, 0x48, 0x17, 0x71, 0xed, 0x52, + 0x45, 0xfc, 0x4c, 0x7a, 0xe8, 0x97, 0x4e, 0x0f, 0x35, 0x3d, 0x64, 0x2e, 0x33, 0x3d, 0xfc, 0x00, + 0xbe, 0x31, 0x26, 0x77, 0xaf, 0xc6, 0xc4, 0xda, 0x97, 0xfa, 0x9f, 0x9f, 0xad, 0x69, 0x4f, 0x9f, + 0xad, 0x69, 0xff, 0x78, 0xb6, 0xa6, 0xfd, 0xf2, 0xf9, 0xda, 0xdc, 0xd3, 0xe7, 0x6b, 0x73, 0x7f, + 0x7b, 0xbe, 0x36, 0x07, 0x6b, 0x76, 0xd0, 0x7b, 0x01, 0x5b, 0x2d, 0xdf, 0xa0, 0x83, 0x4e, 0x14, + 0xb0, 0xa0, 0xa3, 0x7d, 0x8e, 0x1f, 0xbb, 0xac, 0xdb, 0x3f, 0xa8, 0xd8, 0x41, 0x6f, 0xdd, 0x0e, + 0xe2, 0x5e, 0x10, 0xaf, 0x47, 0xd4, 0x23, 0x27, 0x34, 0x5a, 0x3f, 0x32, 0x87, 0x3f, 0xed, 0x2e, + 0x71, 0xfd, 0x78, 0xfd, 0xe2, 0x3f, 0x51, 0xee, 0x3a, 0x74, 0xa0, 0x7e, 0xff, 0x56, 0xcf, 0x74, + 0xea, 0x8d, 0xdf, 0xe9, 0xe5, 0x8e, 0x52, 0xa1, 0xce, 0x55, 0x68, 0xd0, 0x41, 0xe5, 0x81, 0x14, + 0xf9, 0x6a, 0x74, 0xf8, 0x88, 0x1f, 0x3e, 0x6a, 0xd0, 0xc1, 0x23, 0x75, 0xf8, 0x4c, 0x7f, 0xe3, + 0xe2, 0xc3, 0x47, 0xf7, 0x3b, 0xb5, 0x1d, 0xca, 0x88, 0x43, 0x18, 0xf9, 0x97, 0xfe, 0x9a, 0x12, + 0xdc, 0xd8, 0xe0, 0x92, 0x1b, 0x1b, 0x0d, 0x3a, 0xd8, 0xd8, 0x50, 0xb2, 0x07, 0x39, 0xf1, 0x77, + 0xcc, 0x9d, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x37, 0xdb, 0x43, 0xeb, 0xfe, 0x19, 0x00, 0x00, } func (m *Swap) Marshal() (dAtA []byte, err error) { @@ -2694,41 +2692,6 @@ func (m *SwapPlaintext) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *MockFlowCiphertext) 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 *MockFlowCiphertext) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MockFlowCiphertext) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Value != nil { - { - size, err := m.Value.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDex(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - func (m *SwapPlan) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -2749,6 +2712,20 @@ func (m *SwapPlan) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.ProofBlindingS) > 0 { + i -= len(m.ProofBlindingS) + copy(dAtA[i:], m.ProofBlindingS) + i = encodeVarintDex(dAtA, i, uint64(len(m.ProofBlindingS))) + i-- + dAtA[i] = 0x22 + } + if len(m.ProofBlindingR) > 0 { + i -= len(m.ProofBlindingR) + copy(dAtA[i:], m.ProofBlindingR) + i = encodeVarintDex(dAtA, i, uint64(len(m.ProofBlindingR))) + i-- + dAtA[i] = 0x1a + } if len(m.FeeBlinding) > 0 { i -= len(m.FeeBlinding) copy(dAtA[i:], m.FeeBlinding) @@ -2791,6 +2768,20 @@ func (m *SwapClaimPlan) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.ProofBlindingS) > 0 { + i -= len(m.ProofBlindingS) + copy(dAtA[i:], m.ProofBlindingS) + i = encodeVarintDex(dAtA, i, uint64(len(m.ProofBlindingS))) + i-- + dAtA[i] = 0x32 + } + if len(m.ProofBlindingR) > 0 { + i -= len(m.ProofBlindingR) + copy(dAtA[i:], m.ProofBlindingR) + i = encodeVarintDex(dAtA, i, uint64(len(m.ProofBlindingR))) + i-- + dAtA[i] = 0x2a + } if m.EpochDuration != 0 { i = encodeVarintDex(dAtA, i, uint64(m.EpochDuration)) i-- @@ -3266,8 +3257,8 @@ func (m *BatchSwapOutputData) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.EpochHeight != 0 { - i = encodeVarintDex(dAtA, i, uint64(m.EpochHeight)) + if m.EpochStartingHeight != 0 { + i = encodeVarintDex(dAtA, i, uint64(m.EpochStartingHeight)) i-- dAtA[i] = 0x48 } @@ -3529,6 +3520,16 @@ func (m *Position) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.CloseOnFill { + i-- + if m.CloseOnFill { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x28 + } if m.Reserves != nil { { size, err := m.Reserves.MarshalToSizedBuffer(dAtA[:i]) @@ -4199,19 +4200,6 @@ func (m *SwapPlaintext) Size() (n int) { return n } -func (m *MockFlowCiphertext) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Value != nil { - l = m.Value.Size() - n += 1 + l + sovDex(uint64(l)) - } - return n -} - func (m *SwapPlan) Size() (n int) { if m == nil { return 0 @@ -4226,6 +4214,14 @@ func (m *SwapPlan) Size() (n int) { if l > 0 { n += 1 + l + sovDex(uint64(l)) } + l = len(m.ProofBlindingR) + if l > 0 { + n += 1 + l + sovDex(uint64(l)) + } + l = len(m.ProofBlindingS) + if l > 0 { + n += 1 + l + sovDex(uint64(l)) + } return n } @@ -4249,6 +4245,14 @@ func (m *SwapClaimPlan) Size() (n int) { if m.EpochDuration != 0 { n += 1 + sovDex(uint64(m.EpochDuration)) } + l = len(m.ProofBlindingR) + if l > 0 { + n += 1 + l + sovDex(uint64(l)) + } + l = len(m.ProofBlindingS) + if l > 0 { + n += 1 + l + sovDex(uint64(l)) + } return n } @@ -4459,8 +4463,8 @@ 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)) + if m.EpochStartingHeight != 0 { + n += 1 + sovDex(uint64(m.EpochStartingHeight)) } return n } @@ -4541,6 +4545,9 @@ func (m *Position) Size() (n int) { l = m.Reserves.Size() n += 1 + l + sovDex(uint64(l)) } + if m.CloseOnFill { + n += 2 + } return n } @@ -5833,7 +5840,7 @@ func (m *SwapPlaintext) Unmarshal(dAtA []byte) error { } return nil } -func (m *MockFlowCiphertext) Unmarshal(dAtA []byte) error { +func (m *SwapPlan) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5856,15 +5863,15 @@ func (m *MockFlowCiphertext) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MockFlowCiphertext: wiretype end group for non-group") + return fmt.Errorf("proto: SwapPlan: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MockFlowCiphertext: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: SwapPlan: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Value", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field SwapPlaintext", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -5891,68 +5898,52 @@ func (m *MockFlowCiphertext) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Value == nil { - m.Value = &v1alpha1.Amount{} + if m.SwapPlaintext == nil { + m.SwapPlaintext = &SwapPlaintext{} } - if err := m.Value.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.SwapPlaintext.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipDex(dAtA[iNdEx:]) - if err != nil { - return err + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field FeeBlinding", wireType) } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthDex + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDex + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF + if byteLen < 0 { + return ErrInvalidLengthDex } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *SwapPlan) 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 ErrIntOverflowDex + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthDex } - if iNdEx >= l { + if postIndex > l { return io.ErrUnexpectedEOF } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break + m.FeeBlinding = append(m.FeeBlinding[:0], dAtA[iNdEx:postIndex]...) + if m.FeeBlinding == nil { + m.FeeBlinding = []byte{} } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: SwapPlan: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: SwapPlan: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: + iNdEx = postIndex + case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SwapPlaintext", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ProofBlindingR", wireType) } - var msglen int + var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowDex @@ -5962,31 +5953,29 @@ func (m *SwapPlan) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + byteLen |= int(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + if byteLen < 0 { return ErrInvalidLengthDex } - postIndex := iNdEx + msglen + postIndex := iNdEx + byteLen if postIndex < 0 { return ErrInvalidLengthDex } if postIndex > l { return io.ErrUnexpectedEOF } - if m.SwapPlaintext == nil { - m.SwapPlaintext = &SwapPlaintext{} - } - if err := m.SwapPlaintext.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + m.ProofBlindingR = append(m.ProofBlindingR[:0], dAtA[iNdEx:postIndex]...) + if m.ProofBlindingR == nil { + m.ProofBlindingR = []byte{} } iNdEx = postIndex - case 2: + case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field FeeBlinding", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ProofBlindingS", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -6013,9 +6002,9 @@ func (m *SwapPlan) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.FeeBlinding = append(m.FeeBlinding[:0], dAtA[iNdEx:postIndex]...) - if m.FeeBlinding == nil { - m.FeeBlinding = []byte{} + m.ProofBlindingS = append(m.ProofBlindingS[:0], dAtA[iNdEx:postIndex]...) + if m.ProofBlindingS == nil { + m.ProofBlindingS = []byte{} } iNdEx = postIndex default: @@ -6178,6 +6167,74 @@ func (m *SwapClaimPlan) Unmarshal(dAtA []byte) error { break } } + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ProofBlindingR", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDex + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthDex + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthDex + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ProofBlindingR = append(m.ProofBlindingR[:0], dAtA[iNdEx:postIndex]...) + if m.ProofBlindingR == nil { + m.ProofBlindingR = []byte{} + } + iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ProofBlindingS", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDex + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthDex + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthDex + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ProofBlindingS = append(m.ProofBlindingS[:0], dAtA[iNdEx:postIndex]...) + if m.ProofBlindingS == nil { + m.ProofBlindingS = []byte{} + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipDex(dAtA[iNdEx:]) @@ -7437,9 +7494,9 @@ func (m *BatchSwapOutputData) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 9: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field EpochHeight", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field EpochStartingHeight", wireType) } - m.EpochHeight = 0 + m.EpochStartingHeight = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowDex @@ -7449,7 +7506,7 @@ func (m *BatchSwapOutputData) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.EpochHeight |= uint64(b&0x7F) << shift + m.EpochStartingHeight |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -8031,6 +8088,26 @@ func (m *Position) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 5: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field CloseOnFill", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDex + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.CloseOnFill = bool(v != 0) default: iNdEx = preIndex skippy, err := skipDex(dAtA[iNdEx:]) diff --git a/relayer/chains/penumbra/core/governance/v1alpha1/governance.pb.go b/relayer/chains/penumbra/core/governance/v1alpha1/governance.pb.go index 51a916c78..80977b8d4 100644 --- a/relayer/chains/penumbra/core/governance/v1alpha1/governance.pb.go +++ b/relayer/chains/penumbra/core/governance/v1alpha1/governance.pb.go @@ -531,6 +531,10 @@ type DelegatorVotePlan struct { UnbondedAmount *v1alpha1.Amount `protobuf:"bytes,6,opt,name=unbonded_amount,json=unbondedAmount,proto3" json:"unbonded_amount,omitempty"` // The randomizer to use for the proof of spend capability. Randomizer []byte `protobuf:"bytes,7,opt,name=randomizer,proto3" json:"randomizer,omitempty"` + // The first blinding factor to use for the ZK delegator vote proof. + ProofBlindingR []byte `protobuf:"bytes,8,opt,name=proof_blinding_r,json=proofBlindingR,proto3" json:"proof_blinding_r,omitempty"` + // The second blinding factor to use for the ZK delegator vote proof. + ProofBlindingS []byte `protobuf:"bytes,9,opt,name=proof_blinding_s,json=proofBlindingS,proto3" json:"proof_blinding_s,omitempty"` } func (m *DelegatorVotePlan) Reset() { *m = DelegatorVotePlan{} } @@ -615,6 +619,20 @@ func (m *DelegatorVotePlan) GetRandomizer() []byte { return nil } +func (m *DelegatorVotePlan) GetProofBlindingR() []byte { + if m != nil { + return m.ProofBlindingR + } + return nil +} + +func (m *DelegatorVotePlan) GetProofBlindingS() []byte { + if m != nil { + return m.ProofBlindingS + } + return nil +} + type DaoDeposit struct { // The value to deposit into the DAO. Value *v1alpha1.Value `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` @@ -1811,102 +1829,104 @@ func init() { } var fileDescriptor_1bc89f5bf0aed114 = []byte{ - // 1512 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcd, 0x6f, 0x1b, 0x45, - 0x14, 0xf7, 0x3a, 0x8e, 0x3f, 0x5e, 0x12, 0xc7, 0x1d, 0x42, 0x65, 0x0c, 0x44, 0xe9, 0xb6, 0x85, - 0xa8, 0x50, 0x9b, 0xa6, 0xa0, 0x52, 0xf7, 0x40, 0x63, 0xe7, 0x53, 0x6d, 0x13, 0x77, 0x1d, 0x52, - 0x28, 0x91, 0x96, 0xb1, 0x77, 0x62, 0xaf, 0xb2, 0x9e, 0x59, 0xed, 0x8e, 0x13, 0x99, 0xbf, 0x00, - 0x6e, 0x95, 0xf8, 0x0f, 0x90, 0x10, 0x12, 0xff, 0x03, 0x77, 0x84, 0x04, 0xea, 0xb1, 0xdc, 0x50, - 0x72, 0xe3, 0xc8, 0x95, 0x0b, 0x9a, 0xdd, 0xd9, 0x8f, 0x24, 0xa5, 0xae, 0x13, 0x2a, 0x6e, 0xfb, - 0xde, 0xbe, 0xdf, 0xef, 0x7d, 0xcc, 0x9b, 0x99, 0xb7, 0x0b, 0x0b, 0x36, 0xa1, 0xfd, 0x5e, 0xcb, - 0xc1, 0x95, 0x36, 0x73, 0x48, 0xa5, 0xc3, 0xf6, 0x89, 0x43, 0x31, 0x6d, 0x93, 0xca, 0xfe, 0x0d, - 0x6c, 0xd9, 0x5d, 0x7c, 0x23, 0xa6, 0x2b, 0xdb, 0x0e, 0xe3, 0x0c, 0x5d, 0x0a, 0x30, 0x65, 0x81, - 0x29, 0xc7, 0xde, 0x07, 0x98, 0xd2, 0x1b, 0x1d, 0xc6, 0x3a, 0x16, 0xa9, 0x78, 0x80, 0x56, 0x7f, - 0xb7, 0x82, 0xe9, 0xc0, 0x47, 0x97, 0xae, 0x1d, 0xf7, 0xd8, 0x76, 0x06, 0x36, 0x67, 0x91, 0x37, - 0x5f, 0x96, 0xb6, 0xf3, 0x27, 0x6c, 0xbb, 0xd8, 0xa4, 0x31, 0x53, 0x21, 0xfa, 0x96, 0xea, 0x0f, - 0x0a, 0xe4, 0x1b, 0x0e, 0xb3, 0x99, 0x8b, 0xad, 0x66, 0xbf, 0xd5, 0x33, 0x39, 0x5a, 0x85, 0xac, - 0x2d, 0x35, 0x45, 0x65, 0x4e, 0x99, 0x9f, 0x58, 0x78, 0xaf, 0x3c, 0x34, 0xf2, 0x72, 0x40, 0xa2, - 0x85, 0x60, 0x74, 0x1f, 0xf2, 0x06, 0xb1, 0x99, 0x6b, 0x72, 0x1d, 0xf7, 0x58, 0x9f, 0xf2, 0xe2, - 0x98, 0x47, 0x77, 0xf5, 0x04, 0x9d, 0x0c, 0x3d, 0xa4, 0x5a, 0xf4, 0x8c, 0xb5, 0x29, 0x09, 0xf6, - 0x45, 0x75, 0x05, 0x0a, 0x81, 0x8f, 0x47, 0x26, 0xef, 0x1a, 0x0e, 0x3e, 0x40, 0xa5, 0x13, 0xa1, - 0xa6, 0x62, 0xde, 0x2f, 0x42, 0xda, 0x21, 0xd8, 0x65, 0xb4, 0x98, 0x9c, 0x53, 0xe6, 0x73, 0x9a, - 0x94, 0xd4, 0xdf, 0x14, 0x98, 0x09, 0x88, 0x96, 0x7c, 0x0f, 0x75, 0x0b, 0x9b, 0xbd, 0x17, 0x92, - 0x9d, 0x4e, 0x25, 0x79, 0xf6, 0x54, 0xd0, 0x7d, 0xc8, 0xb0, 0x3e, 0x6f, 0xb3, 0x1e, 0x91, 0x15, - 0x59, 0x18, 0xa1, 0xc0, 0x9b, 0x3e, 0x52, 0x0b, 0x28, 0xc4, 0x12, 0x4e, 0x6d, 0x63, 0xcb, 0x34, - 0x30, 0x67, 0xce, 0x36, 0xe3, 0x04, 0xad, 0x41, 0xaa, 0xc5, 0x8c, 0x81, 0x5c, 0xbd, 0x0f, 0x5f, - 0x82, 0xfc, 0x18, 0xbe, 0xc6, 0x8c, 0x81, 0xe6, 0x31, 0xa0, 0xfb, 0x90, 0xc5, 0x7d, 0xde, 0xd5, - 0x5d, 0xb3, 0x23, 0x33, 0xbe, 0x31, 0x24, 0xe3, 0xa6, 0x4d, 0xa8, 0xb1, 0xd8, 0xe7, 0xdd, 0xa6, - 0xd9, 0xa1, 0x98, 0xf7, 0x1d, 0xa2, 0x65, 0xb0, 0x2f, 0xaa, 0x4f, 0x92, 0x70, 0xe1, 0x94, 0xa7, - 0x17, 0xd6, 0xfd, 0x0e, 0xa4, 0xf6, 0x19, 0x27, 0xd2, 0xf7, 0xbb, 0x2f, 0x93, 0x09, 0xe3, 0x44, - 0xf3, 0x40, 0xe8, 0x01, 0x4c, 0x9a, 0x06, 0xa1, 0xdc, 0xe4, 0x03, 0x7d, 0x8f, 0x0c, 0x64, 0xad, - 0xaf, 0x0d, 0x49, 0x60, 0x5d, 0x42, 0xee, 0x91, 0x81, 0x36, 0x61, 0x46, 0x02, 0x6a, 0x42, 0x3e, - 0x72, 0xe8, 0x11, 0xa6, 0x3c, 0xc2, 0xf7, 0x87, 0x10, 0xae, 0x86, 0x20, 0x41, 0x39, 0xd5, 0x89, - 0x8b, 0xea, 0x5f, 0x0a, 0x4c, 0x2d, 0x11, 0x8b, 0x74, 0xce, 0xb1, 0x78, 0xc7, 0xf0, 0xaf, 0x6a, - 0xf1, 0xd0, 0x3a, 0x8c, 0xdb, 0x0e, 0x63, 0xbb, 0xb2, 0x8c, 0x37, 0x87, 0x50, 0x3d, 0xbe, 0x77, - 0x2c, 0xac, 0x86, 0x80, 0x6a, 0x3e, 0x83, 0xfa, 0x6b, 0x12, 0x2e, 0x9c, 0x0a, 0xfa, 0x85, 0x7d, - 0x70, 0x15, 0xf2, 0x2e, 0xc7, 0x0e, 0xd7, 0xbd, 0x6d, 0x64, 0xca, 0x4d, 0x9d, 0xd2, 0xa6, 0x3c, - 0x6d, 0x43, 0x2a, 0xc3, 0x76, 0x19, 0x3b, 0x4b, 0xbb, 0x54, 0x61, 0x7c, 0x1f, 0x5b, 0x7d, 0x22, - 0x97, 0xf5, 0xca, 0x90, 0x04, 0xb7, 0x85, 0xad, 0xe6, 0x43, 0xd0, 0x06, 0x4c, 0xf7, 0x69, 0x8b, - 0x51, 0x83, 0x18, 0xc1, 0x01, 0x31, 0x3e, 0xca, 0x01, 0x91, 0x0f, 0xd0, 0xf2, 0x84, 0x78, 0x0b, - 0x72, 0xb4, 0x6f, 0x59, 0xe6, 0xae, 0x49, 0x9c, 0x62, 0x7a, 0x4e, 0x99, 0x9f, 0xd4, 0x22, 0x05, - 0xca, 0x43, 0xd2, 0xd9, 0x2b, 0x66, 0x3c, 0x75, 0xd2, 0xd9, 0x53, 0xff, 0x3e, 0x59, 0xcf, 0x86, - 0x85, 0xe9, 0xff, 0x5e, 0xcf, 0x25, 0x98, 0x70, 0x39, 0xde, 0x23, 0x86, 0x4e, 0x05, 0x87, 0x5f, - 0xd5, 0xcb, 0x43, 0xea, 0xb1, 0x21, 0xf0, 0xe0, 0xe3, 0xc4, 0x33, 0xfa, 0x00, 0x66, 0x62, 0x2c, - 0x51, 0xbc, 0xe3, 0x5e, 0xbc, 0x28, 0xb2, 0x0c, 0x83, 0x7e, 0xce, 0x5a, 0xa4, 0xcf, 0xb3, 0x16, - 0xb3, 0x00, 0x0e, 0xa6, 0x06, 0xeb, 0x99, 0x5f, 0x11, 0x47, 0x56, 0x3d, 0xa6, 0x51, 0xd7, 0x00, - 0x96, 0x30, 0x93, 0x57, 0x49, 0xd4, 0x45, 0xca, 0xc8, 0x5d, 0xa4, 0xae, 0x40, 0x76, 0x09, 0x33, - 0x6f, 0x13, 0x9e, 0x8b, 0xe7, 0x1b, 0x05, 0x72, 0x4b, 0x98, 0x6d, 0xf6, 0xb9, 0xdd, 0x3f, 0x57, - 0x44, 0xe8, 0x2e, 0x64, 0xb0, 0x61, 0x38, 0xc4, 0x75, 0xe5, 0x09, 0xf2, 0xce, 0xb0, 0x1a, 0xfa, - 0xd6, 0x5a, 0x00, 0x53, 0xbf, 0x55, 0x20, 0xe5, 0x9d, 0x6b, 0x77, 0x65, 0x2f, 0x89, 0x28, 0xf2, - 0xa7, 0x0e, 0xcd, 0x7f, 0xeb, 0xa5, 0x58, 0x43, 0xa9, 0xeb, 0x92, 0x69, 0x06, 0x0a, 0xdb, 0x9b, - 0x5b, 0xcb, 0xfa, 0xa7, 0x1b, 0xcd, 0xc6, 0x72, 0x7d, 0x7d, 0x65, 0x7d, 0x79, 0xa9, 0x90, 0x40, - 0x05, 0x98, 0xf4, 0xb4, 0x8b, 0xb5, 0xe6, 0xd6, 0xe2, 0xfa, 0x46, 0x41, 0x41, 0x93, 0x90, 0xf5, - 0x34, 0x9f, 0x2f, 0x37, 0x0b, 0x49, 0x34, 0x01, 0x19, 0x4f, 0xda, 0xd8, 0x2c, 0x8c, 0xa9, 0xcf, - 0x52, 0x30, 0x15, 0x8e, 0x3d, 0x1c, 0x73, 0x82, 0x1e, 0x42, 0x7a, 0x9f, 0x71, 0x93, 0x06, 0x47, - 0xe5, 0xad, 0x11, 0xae, 0x64, 0x8f, 0x41, 0x44, 0x6a, 0xd2, 0xce, 0x5a, 0x42, 0x93, 0x44, 0xe8, - 0x31, 0xe4, 0x0e, 0xe4, 0xa4, 0x42, 0xe5, 0x16, 0xaa, 0x8e, 0xcc, 0x1a, 0xcc, 0x3a, 0x74, 0x2d, - 0xa1, 0x45, 0x74, 0xe8, 0x11, 0x64, 0x77, 0x4d, 0x6a, 0xba, 0x5d, 0x62, 0xc8, 0x9d, 0x75, 0x7b, - 0x64, 0xea, 0x15, 0x49, 0xb0, 0x96, 0xd0, 0x42, 0x32, 0xb4, 0x05, 0x99, 0xb6, 0x18, 0x87, 0x88, - 0x21, 0x4f, 0xb0, 0x8f, 0x47, 0xe6, 0xad, 0xfb, 0xf8, 0xb5, 0x84, 0x16, 0x50, 0x95, 0xb2, 0x90, - 0xf6, 0xcb, 0x53, 0xba, 0x0c, 0xb9, 0x30, 0xa5, 0xd8, 0x8c, 0xa6, 0xc4, 0x67, 0xb4, 0xd2, 0x67, - 0x90, 0x0d, 0x82, 0x8b, 0x0f, 0x4b, 0xca, 0xb9, 0x87, 0xa5, 0xd2, 0x23, 0xc8, 0xc8, 0xf0, 0xfe, - 0x5b, 0xe2, 0x5a, 0x06, 0xc6, 0x5d, 0x91, 0xbd, 0x7a, 0x34, 0x06, 0xd3, 0x27, 0xac, 0x50, 0x13, - 0xd2, 0x36, 0x76, 0x5d, 0x62, 0x48, 0x4f, 0xb7, 0x47, 0xf7, 0x54, 0x6e, 0x78, 0x04, 0xa2, 0xbd, - 0x7c, 0x2a, 0x41, 0xba, 0x8b, 0x4d, 0x8b, 0x18, 0xb2, 0x63, 0xcf, 0x42, 0xba, 0xe2, 0x11, 0x08, - 0x52, 0x9f, 0x0a, 0x6d, 0x43, 0xc6, 0xb5, 0xb0, 0xd7, 0x56, 0xa3, 0x77, 0x6c, 0xc0, 0xda, 0xf4, - 0x19, 0x44, 0x03, 0x48, 0x32, 0xd1, 0x00, 0x7e, 0x02, 0xa5, 0x2f, 0x20, 0xed, 0x7b, 0x45, 0xb7, - 0xe0, 0xf5, 0xb0, 0xa1, 0x75, 0xf1, 0xa4, 0xc7, 0x9b, 0x61, 0x2d, 0xa1, 0xbd, 0x16, 0xbe, 0x16, - 0x2d, 0xa3, 0x79, 0x2f, 0xbf, 0x56, 0x94, 0x5a, 0x11, 0x2e, 0xea, 0xcf, 0x45, 0x96, 0x76, 0x20, - 0x23, 0x9d, 0xbf, 0x02, 0xf6, 0x5a, 0x2e, 0xec, 0x18, 0xb5, 0x0e, 0xe3, 0x5b, 0xd8, 0xb2, 0x06, - 0xa8, 0x00, 0x63, 0x03, 0xe2, 0xca, 0x0b, 0x56, 0x3c, 0x8a, 0xdb, 0x99, 0x32, 0x79, 0x9f, 0x26, - 0x29, 0x43, 0x45, 0xc8, 0xe0, 0x96, 0xcb, 0xb1, 0xe9, 0x1f, 0x02, 0x29, 0x2d, 0x10, 0xd5, 0xef, - 0xd3, 0x90, 0x0d, 0x6a, 0x27, 0x60, 0xa6, 0xbf, 0x97, 0x53, 0x5a, 0xd2, 0x34, 0xd0, 0x0c, 0x8c, - 0x73, 0x93, 0x5b, 0x44, 0x6e, 0x0d, 0x5f, 0x40, 0x73, 0x30, 0x61, 0x10, 0xb7, 0xed, 0x98, 0x76, - 0x78, 0x6b, 0xe7, 0xb4, 0xb8, 0x0a, 0x35, 0x21, 0xe7, 0x8a, 0xe9, 0xcd, 0x12, 0x67, 0x99, 0xbf, - 0x85, 0x3f, 0x1a, 0x61, 0x0d, 0xcb, 0xcd, 0x00, 0xac, 0x45, 0x3c, 0x82, 0x94, 0xf4, 0x88, 0xd3, - 0x21, 0xb4, 0x3d, 0x90, 0xb7, 0xe9, 0x48, 0xa4, 0xcb, 0x01, 0x58, 0x8b, 0x78, 0xd0, 0x2e, 0x14, - 0x6c, 0xec, 0xe0, 0x1e, 0xe1, 0xc4, 0xd1, 0xdb, 0x5d, 0x4c, 0x3b, 0xc4, 0xbb, 0x5e, 0x27, 0x16, - 0xee, 0x8c, 0xc2, 0xdd, 0x08, 0x38, 0xea, 0x1e, 0x85, 0x36, 0x6d, 0x1f, 0x57, 0xa0, 0x87, 0x90, - 0x33, 0x30, 0xd3, 0x5d, 0x71, 0xaf, 0x16, 0xb3, 0x2f, 0x3d, 0x56, 0x87, 0x0e, 0x82, 0x3b, 0x59, - 0xcb, 0x1a, 0xf2, 0xa9, 0x74, 0x13, 0x72, 0x61, 0x9d, 0xd0, 0x9b, 0x90, 0x6e, 0xb3, 0x5e, 0xcf, - 0xe4, 0x61, 0x6b, 0x49, 0x59, 0x74, 0x53, 0x0e, 0x32, 0xba, 0x2f, 0x95, 0xae, 0x41, 0x2e, 0xac, - 0x03, 0x7a, 0x1b, 0xa0, 0x8b, 0x2d, 0xae, 0x7b, 0x1f, 0xe3, 0x1e, 0x30, 0xab, 0xe5, 0x84, 0xa6, - 0x2e, 0x14, 0xa5, 0x9f, 0x14, 0x98, 0x3e, 0x91, 0x18, 0xda, 0x82, 0x3c, 0xb3, 0x0c, 0x3d, 0x4c, - 0xcf, 0x95, 0xa7, 0xc9, 0xf5, 0x93, 0x77, 0xb2, 0xf7, 0x7d, 0x1f, 0xe6, 0xe1, 0x11, 0x86, 0x5c, - 0xae, 0x36, 0xc5, 0x2c, 0x23, 0x12, 0x05, 0x2b, 0x25, 0x07, 0x71, 0xd6, 0xe4, 0x99, 0x58, 0x29, - 0x39, 0x88, 0xc4, 0xd2, 0xbd, 0xd8, 0x28, 0xf3, 0x09, 0x14, 0xb8, 0x83, 0xa9, 0x8b, 0xdb, 0xa2, - 0x41, 0x75, 0xdb, 0xc2, 0x54, 0xfa, 0x98, 0x29, 0xfb, 0xff, 0x3b, 0xca, 0xc1, 0xff, 0x8e, 0xf2, - 0x22, 0x1d, 0x68, 0xd3, 0x31, 0x6b, 0x31, 0xc9, 0xd6, 0x7e, 0x4f, 0xfe, 0x7c, 0x38, 0xab, 0x3c, - 0x3d, 0x9c, 0x55, 0xfe, 0x38, 0x9c, 0x55, 0x9e, 0x1c, 0xcd, 0x26, 0x9e, 0x1e, 0xcd, 0x26, 0x9e, - 0x1d, 0xcd, 0x26, 0xe0, 0x6a, 0x9b, 0xf5, 0x86, 0xaf, 0x65, 0x6d, 0x3a, 0xfa, 0x08, 0x6b, 0x08, - 0x57, 0x0d, 0xe5, 0xf1, 0x97, 0x1d, 0x93, 0x77, 0xfb, 0xad, 0x72, 0x9b, 0xf5, 0x2a, 0x6d, 0xe6, - 0xf6, 0x98, 0x5b, 0x71, 0x88, 0x85, 0x07, 0xc4, 0xa9, 0xec, 0x2f, 0x84, 0x8f, 0x5e, 0xd6, 0x6e, - 0x65, 0xe8, 0xdf, 0x9e, 0x3b, 0x91, 0x2e, 0x50, 0x7d, 0x97, 0x1c, 0x6b, 0xd4, 0x57, 0x7f, 0x4c, - 0x5e, 0x6a, 0x04, 0xe1, 0xd5, 0x45, 0x78, 0x51, 0x24, 0xe5, 0x6d, 0x69, 0xf9, 0x4b, 0x64, 0xb3, - 0x23, 0x6c, 0x76, 0x22, 0x9b, 0x9d, 0xc0, 0xe6, 0x30, 0x79, 0x7d, 0xa8, 0xcd, 0xce, 0x6a, 0xa3, - 0xf6, 0x80, 0x70, 0x6c, 0x60, 0x8e, 0xff, 0x4c, 0x5e, 0x09, 0xec, 0xab, 0x55, 0x01, 0xa8, 0x56, - 0x23, 0x44, 0xb5, 0x1a, 0x40, 0x5a, 0x69, 0xaf, 0xf4, 0x37, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, - 0x57, 0x45, 0x3e, 0x65, 0xd1, 0x12, 0x00, 0x00, + // 1546 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x5d, 0x6f, 0x1b, 0x45, + 0x17, 0xf6, 0x3a, 0x8e, 0x3f, 0x4e, 0x12, 0xc7, 0x9d, 0x37, 0x6f, 0xe5, 0xd7, 0x2f, 0x44, 0xa9, + 0xdb, 0x42, 0x54, 0xa8, 0x4d, 0x53, 0x50, 0xa9, 0x7b, 0x41, 0x63, 0xe7, 0x53, 0x6d, 0x13, 0x77, + 0x1d, 0x52, 0x28, 0x91, 0x96, 0xb1, 0x77, 0x62, 0xaf, 0xb2, 0x9e, 0xb1, 0x76, 0xc7, 0x89, 0xcc, + 0x2f, 0x80, 0xbb, 0x4a, 0xfc, 0x03, 0x24, 0x84, 0xc4, 0x7f, 0xe0, 0x1e, 0x21, 0x01, 0xbd, 0x2c, + 0x77, 0x28, 0xb9, 0xe3, 0x92, 0x5f, 0x80, 0x66, 0x76, 0xf6, 0x23, 0x1f, 0xd4, 0x75, 0x42, 0xc5, + 0xdd, 0x9c, 0xe3, 0xf3, 0x3c, 0xe7, 0x63, 0xce, 0xcc, 0x1c, 0x2f, 0x2c, 0xf4, 0x08, 0xed, 0x77, + 0x9b, 0x0e, 0x2e, 0xb7, 0x98, 0x43, 0xca, 0x6d, 0xb6, 0x4f, 0x1c, 0x8a, 0x69, 0x8b, 0x94, 0xf7, + 0x6f, 0x61, 0xbb, 0xd7, 0xc1, 0xb7, 0x22, 0xba, 0x52, 0xcf, 0x61, 0x9c, 0xa1, 0x2b, 0x3e, 0xa6, + 0x24, 0x30, 0xa5, 0xc8, 0xef, 0x3e, 0xa6, 0xf0, 0xbf, 0x36, 0x63, 0x6d, 0x9b, 0x94, 0x25, 0xa0, + 0xd9, 0xdf, 0x2d, 0x63, 0x3a, 0xf0, 0xd0, 0x85, 0x1b, 0xc7, 0x3d, 0xb6, 0x9c, 0x41, 0x8f, 0xb3, + 0xd0, 0x9b, 0x27, 0x2b, 0xdb, 0xf9, 0x13, 0xb6, 0x1d, 0x6c, 0xd1, 0x88, 0xa9, 0x10, 0x3d, 0xcb, + 0xe2, 0x77, 0x1a, 0x64, 0xeb, 0x0e, 0xeb, 0x31, 0x17, 0xdb, 0x8d, 0x7e, 0xb3, 0x6b, 0x71, 0xb4, + 0x0a, 0xe9, 0x9e, 0xd2, 0xe4, 0xb5, 0x39, 0x6d, 0x7e, 0x62, 0xe1, 0x9d, 0xd2, 0xd0, 0xc8, 0x4b, + 0x3e, 0x89, 0x1e, 0x80, 0xd1, 0x43, 0xc8, 0x9a, 0xa4, 0xc7, 0x5c, 0x8b, 0x1b, 0xb8, 0xcb, 0xfa, + 0x94, 0xe7, 0xc7, 0x24, 0xdd, 0xf5, 0x13, 0x74, 0x2a, 0xf4, 0x80, 0x6a, 0x51, 0x1a, 0xeb, 0x53, + 0x0a, 0xec, 0x89, 0xc5, 0x15, 0xc8, 0xf9, 0x3e, 0x9e, 0x58, 0xbc, 0x63, 0x3a, 0xf8, 0x00, 0x15, + 0x4e, 0x84, 0x9a, 0x88, 0x78, 0xbf, 0x0c, 0x49, 0x87, 0x60, 0x97, 0xd1, 0x7c, 0x7c, 0x4e, 0x9b, + 0xcf, 0xe8, 0x4a, 0x2a, 0xfe, 0xa2, 0xc1, 0x8c, 0x4f, 0xb4, 0xe4, 0x79, 0xa8, 0xd9, 0xd8, 0xea, + 0xbe, 0x94, 0xec, 0x74, 0x2a, 0xf1, 0xf3, 0xa7, 0x82, 0x1e, 0x42, 0x8a, 0xf5, 0x79, 0x8b, 0x75, + 0x89, 0xaa, 0xc8, 0xc2, 0x08, 0x05, 0xde, 0xf4, 0x90, 0xba, 0x4f, 0x21, 0xb6, 0x70, 0x6a, 0x1b, + 0xdb, 0x96, 0x89, 0x39, 0x73, 0xb6, 0x19, 0x27, 0x68, 0x0d, 0x12, 0x4d, 0x66, 0x0e, 0xd4, 0xee, + 0xbd, 0xff, 0x0a, 0xe4, 0xc7, 0xf0, 0x55, 0x66, 0x0e, 0x74, 0xc9, 0x80, 0x1e, 0x42, 0x1a, 0xf7, + 0x79, 0xc7, 0x70, 0xad, 0xb6, 0xca, 0xf8, 0xd6, 0x90, 0x8c, 0x1b, 0x3d, 0x42, 0xcd, 0xc5, 0x3e, + 0xef, 0x34, 0xac, 0x36, 0xc5, 0xbc, 0xef, 0x10, 0x3d, 0x85, 0x3d, 0xb1, 0xf8, 0x2c, 0x0e, 0x97, + 0x4e, 0x79, 0x7a, 0x69, 0xdd, 0xef, 0x41, 0x62, 0x9f, 0x71, 0xa2, 0x7c, 0xbf, 0xfd, 0x2a, 0x99, + 0x30, 0x4e, 0x74, 0x09, 0x42, 0x8f, 0x60, 0xd2, 0x32, 0x09, 0xe5, 0x16, 0x1f, 0x18, 0x7b, 0x64, + 0xa0, 0x6a, 0x7d, 0x63, 0x48, 0x02, 0xeb, 0x0a, 0xf2, 0x80, 0x0c, 0xf4, 0x09, 0x2b, 0x14, 0x50, + 0x03, 0xb2, 0xa1, 0x43, 0x49, 0x98, 0x90, 0x84, 0xef, 0x0e, 0x21, 0x5c, 0x0d, 0x40, 0x82, 0x72, + 0xaa, 0x1d, 0x15, 0x8b, 0x7f, 0x6a, 0x30, 0xb5, 0x44, 0x6c, 0xd2, 0xbe, 0xc0, 0xe6, 0x1d, 0xc3, + 0xbf, 0xae, 0xcd, 0x43, 0xeb, 0x30, 0xde, 0x73, 0x18, 0xdb, 0x55, 0x65, 0xbc, 0x3d, 0x84, 0xea, + 0xe9, 0x83, 0x63, 0x61, 0xd5, 0x05, 0x54, 0xf7, 0x18, 0x8a, 0x3f, 0xc7, 0xe1, 0xd2, 0xa9, 0xa0, + 0x5f, 0xda, 0x07, 0xd7, 0x21, 0xeb, 0x72, 0xec, 0x70, 0x43, 0x1e, 0x23, 0x4b, 0x1d, 0xea, 0x84, + 0x3e, 0x25, 0xb5, 0x75, 0xa5, 0x0c, 0xda, 0x65, 0xec, 0x3c, 0xed, 0x52, 0x81, 0xf1, 0x7d, 0x6c, + 0xf7, 0x89, 0xda, 0xd6, 0x6b, 0x43, 0x12, 0xdc, 0x16, 0xb6, 0xba, 0x07, 0x41, 0x1b, 0x30, 0xdd, + 0xa7, 0x4d, 0x46, 0x4d, 0x62, 0xfa, 0x17, 0xc4, 0xf8, 0x28, 0x17, 0x44, 0xd6, 0x47, 0xab, 0x1b, + 0xe2, 0x0d, 0xc8, 0xd0, 0xbe, 0x6d, 0x5b, 0xbb, 0x16, 0x71, 0xf2, 0xc9, 0x39, 0x6d, 0x7e, 0x52, + 0x0f, 0x15, 0x28, 0x0b, 0x71, 0x67, 0x2f, 0x9f, 0x92, 0xea, 0xb8, 0xb3, 0x57, 0xfc, 0x75, 0xec, + 0x44, 0x3d, 0xeb, 0x36, 0xa6, 0xff, 0x7a, 0x3d, 0x97, 0x60, 0xc2, 0xe5, 0x78, 0x8f, 0x98, 0x06, + 0x15, 0x1c, 0x5e, 0x55, 0xaf, 0x0e, 0xa9, 0xc7, 0x86, 0xc0, 0x83, 0x87, 0x13, 0x6b, 0xf4, 0x1e, + 0xcc, 0x44, 0x58, 0xc2, 0x78, 0xc7, 0x65, 0xbc, 0x28, 0xb4, 0x0c, 0x82, 0x3e, 0x63, 0x2f, 0x92, + 0x17, 0xd9, 0x8b, 0x59, 0x00, 0x07, 0x53, 0x93, 0x75, 0xad, 0x2f, 0x88, 0xa3, 0xaa, 0x1e, 0xd1, + 0xa0, 0x79, 0xc8, 0xc9, 0xb6, 0x36, 0x9a, 0xb6, 0x45, 0x4d, 0x8b, 0xb6, 0x0d, 0x27, 0x9f, 0x96, + 0x56, 0x59, 0xa9, 0xaf, 0x2a, 0xb5, 0x7e, 0x86, 0xa5, 0x9b, 0xcf, 0x9c, 0x61, 0xd9, 0x28, 0xae, + 0x01, 0x2c, 0x61, 0xa6, 0x9e, 0xa7, 0xb0, 0x33, 0xb5, 0x91, 0x3b, 0xb3, 0xb8, 0x02, 0xe9, 0x25, + 0xcc, 0xe4, 0xc1, 0xbe, 0x10, 0xcf, 0x57, 0x1a, 0x64, 0x96, 0x30, 0xdb, 0xec, 0xf3, 0x5e, 0xff, + 0x42, 0x11, 0xa1, 0xfb, 0x90, 0xc2, 0xa6, 0xe9, 0x10, 0xd7, 0x55, 0xb7, 0xd2, 0x5b, 0xc3, 0xf6, + 0xc5, 0xb3, 0xd6, 0x7d, 0x58, 0xf1, 0x6b, 0x0d, 0x12, 0xf2, 0xae, 0xbc, 0xaf, 0xfa, 0x53, 0x44, + 0x91, 0x3d, 0x75, 0x11, 0xff, 0x5d, 0x7f, 0x46, 0x9a, 0xb4, 0xb8, 0xae, 0x98, 0x66, 0x20, 0xb7, + 0xbd, 0xb9, 0xb5, 0x6c, 0x7c, 0xbc, 0xd1, 0xa8, 0x2f, 0xd7, 0xd6, 0x57, 0xd6, 0x97, 0x97, 0x72, + 0x31, 0x94, 0x83, 0x49, 0xa9, 0x5d, 0xac, 0x36, 0xb6, 0x16, 0xd7, 0x37, 0x72, 0x1a, 0x9a, 0x84, + 0xb4, 0xd4, 0x7c, 0xba, 0xdc, 0xc8, 0xc5, 0xd1, 0x04, 0xa4, 0xa4, 0xb4, 0xb1, 0x99, 0x1b, 0x2b, + 0xbe, 0x48, 0xc0, 0x54, 0x30, 0x4a, 0x71, 0xcc, 0x09, 0x7a, 0x0c, 0xc9, 0x7d, 0xc6, 0x2d, 0xea, + 0x5f, 0xbf, 0x77, 0x46, 0x78, 0xe6, 0x25, 0x83, 0x88, 0xd4, 0xa2, 0xed, 0xb5, 0x98, 0xae, 0x88, + 0xd0, 0x53, 0xc8, 0x1c, 0xa8, 0xe9, 0x87, 0xaa, 0x63, 0x59, 0x19, 0x99, 0xd5, 0x9f, 0x9f, 0xe8, + 0x5a, 0x4c, 0x0f, 0xe9, 0xd0, 0x13, 0x48, 0xef, 0x5a, 0xd4, 0x72, 0x3b, 0xc4, 0x54, 0xa7, 0xf5, + 0xee, 0xc8, 0xd4, 0x2b, 0x8a, 0x60, 0x2d, 0xa6, 0x07, 0x64, 0x68, 0x0b, 0x52, 0x2d, 0x31, 0x62, + 0x11, 0x53, 0xdd, 0x8a, 0x1f, 0x8e, 0xcc, 0x5b, 0xf3, 0xf0, 0x6b, 0x31, 0xdd, 0xa7, 0x2a, 0xa4, + 0x21, 0xe9, 0x95, 0xa7, 0x70, 0x15, 0x32, 0x41, 0x4a, 0x91, 0xb9, 0x4f, 0x8b, 0xce, 0x7d, 0x85, + 0x4f, 0x20, 0xed, 0x07, 0x17, 0x1d, 0xc0, 0xb4, 0x0b, 0x0f, 0x60, 0x85, 0x27, 0x90, 0x52, 0xe1, + 0xfd, 0xb3, 0xc4, 0xd5, 0x14, 0x8c, 0xbb, 0x22, 0xfb, 0xe2, 0xd1, 0x18, 0x4c, 0x9f, 0xb0, 0x42, + 0x0d, 0x48, 0xf6, 0xb0, 0xeb, 0x12, 0x53, 0x79, 0xba, 0x3b, 0xba, 0xa7, 0x52, 0x5d, 0x12, 0x88, + 0xf6, 0xf2, 0xa8, 0x04, 0xe9, 0x2e, 0xb6, 0x6c, 0x62, 0xaa, 0x8e, 0x3d, 0x0f, 0xe9, 0x8a, 0x24, + 0x10, 0xa4, 0x1e, 0x15, 0xda, 0x86, 0x94, 0x6b, 0x63, 0xd9, 0x56, 0xa3, 0x77, 0xac, 0xcf, 0xda, + 0xf0, 0x18, 0x44, 0x03, 0x28, 0x32, 0xd1, 0x00, 0x5e, 0x02, 0x85, 0xcf, 0x20, 0xe9, 0x79, 0x45, + 0x77, 0xe0, 0xbf, 0x41, 0x43, 0x1b, 0x62, 0x65, 0x44, 0x9b, 0x61, 0x2d, 0xa6, 0xff, 0x27, 0xf8, + 0x59, 0xb4, 0x8c, 0x2e, 0x7f, 0xfc, 0x52, 0xd3, 0xaa, 0x79, 0xb8, 0x6c, 0x9c, 0x89, 0x2c, 0xec, + 0x40, 0x4a, 0x39, 0x7f, 0x0d, 0xec, 0xd5, 0x4c, 0xd0, 0x31, 0xc5, 0x1a, 0x8c, 0x6f, 0x61, 0xdb, + 0x1e, 0xa0, 0x1c, 0x8c, 0x0d, 0x88, 0xab, 0x1e, 0x6d, 0xb1, 0x14, 0x2f, 0x3e, 0x65, 0xea, 0x8d, + 0x8e, 0x53, 0x86, 0xf2, 0x90, 0xc2, 0x4d, 0x97, 0x63, 0xcb, 0xbb, 0x04, 0x12, 0xba, 0x2f, 0x16, + 0xbf, 0x4d, 0x42, 0xda, 0xaf, 0x9d, 0x80, 0x59, 0xde, 0x59, 0x4e, 0xe8, 0x71, 0xcb, 0x44, 0x33, + 0x30, 0xce, 0x2d, 0x6e, 0x13, 0x75, 0x34, 0x3c, 0x01, 0xcd, 0xc1, 0x84, 0x49, 0xdc, 0x96, 0x63, + 0xf5, 0x82, 0x49, 0x20, 0xa3, 0x47, 0x55, 0xa8, 0x01, 0x19, 0x57, 0x4c, 0x84, 0xb6, 0xb8, 0xcb, + 0xbc, 0x23, 0xfc, 0xc1, 0x08, 0x7b, 0x58, 0x6a, 0xf8, 0x60, 0x3d, 0xe4, 0x11, 0xa4, 0xa4, 0x4b, + 0x9c, 0x36, 0xa1, 0xad, 0x81, 0x7a, 0xa1, 0x47, 0x22, 0x5d, 0xf6, 0xc1, 0x7a, 0xc8, 0x83, 0x76, + 0x21, 0xd7, 0xc3, 0x0e, 0xee, 0x12, 0x4e, 0x1c, 0xa3, 0xd5, 0xc1, 0xb4, 0x4d, 0xe4, 0x93, 0x3d, + 0xb1, 0x70, 0x6f, 0x14, 0xee, 0xba, 0xcf, 0x51, 0x93, 0x14, 0xfa, 0x74, 0xef, 0xb8, 0x02, 0x3d, + 0x86, 0x8c, 0x89, 0x99, 0xe1, 0x8a, 0x77, 0x55, 0xbe, 0xf6, 0xaf, 0x36, 0xaa, 0x07, 0x0e, 0xfc, + 0x37, 0x59, 0x4f, 0x9b, 0x6a, 0x55, 0xb8, 0x0d, 0x99, 0xa0, 0x4e, 0xe8, 0xff, 0x90, 0x6c, 0xb1, + 0x6e, 0xd7, 0xe2, 0x41, 0x6b, 0x29, 0x59, 0x74, 0x53, 0x06, 0x52, 0x86, 0x27, 0x15, 0x6e, 0x40, + 0x26, 0xa8, 0x03, 0x7a, 0x13, 0xa0, 0x83, 0x6d, 0x6e, 0xc8, 0x3f, 0xf8, 0x12, 0x98, 0xd6, 0x33, + 0x42, 0x53, 0x13, 0x8a, 0xc2, 0x0f, 0x1a, 0x4c, 0x9f, 0x48, 0x0c, 0x6d, 0x41, 0x96, 0xd9, 0xa6, + 0x11, 0xa4, 0xe7, 0xaa, 0xdb, 0xe4, 0xe6, 0xc9, 0x37, 0x59, 0x7e, 0x33, 0x08, 0xf2, 0x90, 0x84, + 0x01, 0x97, 0xab, 0x4f, 0x31, 0xdb, 0x0c, 0x45, 0xc1, 0x4a, 0xc9, 0x41, 0x94, 0x35, 0x7e, 0x2e, + 0x56, 0x4a, 0x0e, 0x42, 0xb1, 0xf0, 0x20, 0x32, 0xca, 0x7c, 0x04, 0x39, 0xee, 0x60, 0xea, 0xe2, + 0x96, 0x68, 0x50, 0xa3, 0x67, 0x63, 0xaa, 0x7c, 0xcc, 0x94, 0xbc, 0x6f, 0x28, 0x25, 0xff, 0x1b, + 0x4a, 0x69, 0x91, 0x0e, 0xf4, 0xe9, 0x88, 0xb5, 0x98, 0x8e, 0xab, 0xbf, 0xc5, 0x7f, 0x3c, 0x9c, + 0xd5, 0x9e, 0x1f, 0xce, 0x6a, 0xbf, 0x1f, 0xce, 0x6a, 0xcf, 0x8e, 0x66, 0x63, 0xcf, 0x8f, 0x66, + 0x63, 0x2f, 0x8e, 0x66, 0x63, 0x70, 0xbd, 0xc5, 0xba, 0xc3, 0xf7, 0xb2, 0x3a, 0x1d, 0xfe, 0xb1, + 0xab, 0x0b, 0x57, 0x75, 0xed, 0xe9, 0xe7, 0x6d, 0x8b, 0x77, 0xfa, 0xcd, 0x52, 0x8b, 0x75, 0xcb, + 0x2d, 0xe6, 0x76, 0x99, 0x5b, 0x76, 0x88, 0x8d, 0x07, 0xc4, 0x29, 0xef, 0x2f, 0x04, 0x4b, 0x99, + 0xb5, 0x5b, 0x1e, 0xfa, 0x05, 0xe9, 0x5e, 0xa8, 0xf3, 0x55, 0xdf, 0xc4, 0xc7, 0xea, 0xb5, 0xd5, + 0xef, 0xe3, 0x57, 0xea, 0x7e, 0x78, 0x35, 0x11, 0x5e, 0x18, 0x49, 0x69, 0x5b, 0x59, 0xfe, 0x14, + 0xda, 0xec, 0x08, 0x9b, 0x9d, 0xd0, 0x66, 0xc7, 0xb7, 0x39, 0x8c, 0xdf, 0x1c, 0x6a, 0xb3, 0xb3, + 0x5a, 0xaf, 0x3e, 0x22, 0x1c, 0x9b, 0x98, 0xe3, 0x3f, 0xe2, 0xd7, 0x7c, 0xfb, 0x4a, 0x45, 0x00, + 0x2a, 0x95, 0x10, 0x51, 0xa9, 0xf8, 0x90, 0x66, 0x52, 0x96, 0xfe, 0xf6, 0x5f, 0x01, 0x00, 0x00, + 0xff, 0xff, 0x07, 0xf0, 0xab, 0xae, 0x25, 0x13, 0x00, 0x00, } func (m *ProposalSubmit) Marshal() (dAtA []byte, err error) { @@ -2316,6 +2336,20 @@ func (m *DelegatorVotePlan) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.ProofBlindingS) > 0 { + i -= len(m.ProofBlindingS) + copy(dAtA[i:], m.ProofBlindingS) + i = encodeVarintGovernance(dAtA, i, uint64(len(m.ProofBlindingS))) + i-- + dAtA[i] = 0x4a + } + if len(m.ProofBlindingR) > 0 { + i -= len(m.ProofBlindingR) + copy(dAtA[i:], m.ProofBlindingR) + i = encodeVarintGovernance(dAtA, i, uint64(len(m.ProofBlindingR))) + i-- + dAtA[i] = 0x42 + } if len(m.Randomizer) > 0 { i -= len(m.Randomizer) copy(dAtA[i:], m.Randomizer) @@ -3452,6 +3486,14 @@ func (m *DelegatorVotePlan) Size() (n int) { if l > 0 { n += 1 + l + sovGovernance(uint64(l)) } + l = len(m.ProofBlindingR) + if l > 0 { + n += 1 + l + sovGovernance(uint64(l)) + } + l = len(m.ProofBlindingS) + if l > 0 { + n += 1 + l + sovGovernance(uint64(l)) + } return n } @@ -5156,6 +5198,74 @@ func (m *DelegatorVotePlan) Unmarshal(dAtA []byte) error { m.Randomizer = []byte{} } iNdEx = postIndex + case 8: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ProofBlindingR", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGovernance + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthGovernance + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthGovernance + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ProofBlindingR = append(m.ProofBlindingR[:0], dAtA[iNdEx:postIndex]...) + if m.ProofBlindingR == nil { + m.ProofBlindingR = []byte{} + } + iNdEx = postIndex + case 9: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ProofBlindingS", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGovernance + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthGovernance + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthGovernance + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ProofBlindingS = append(m.ProofBlindingS[:0], dAtA[iNdEx:postIndex]...) + if m.ProofBlindingS == nil { + m.ProofBlindingS = []byte{} + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGovernance(dAtA[iNdEx:]) diff --git a/relayer/chains/penumbra/core/stake/v1alpha1/stake.pb.go b/relayer/chains/penumbra/core/stake/v1alpha1/stake.pb.go index 2228a0a81..690e79f23 100644 --- a/relayer/chains/penumbra/core/stake/v1alpha1/stake.pb.go +++ b/relayer/chains/penumbra/core/stake/v1alpha1/stake.pb.go @@ -1184,6 +1184,10 @@ type UndelegateClaimPlan struct { UnbondingAmount *v1alpha1.Amount `protobuf:"bytes,5,opt,name=unbonding_amount,json=unbondingAmount,proto3" json:"unbonding_amount,omitempty"` // The blinding factor to use for the balance commitment. BalanceBlinding []byte `protobuf:"bytes,6,opt,name=balance_blinding,json=balanceBlinding,proto3" json:"balance_blinding,omitempty"` + // The first blinding factor to use for the ZK undelegate claim proof. + ProofBlindingR []byte `protobuf:"bytes,7,opt,name=proof_blinding_r,json=proofBlindingR,proto3" json:"proof_blinding_r,omitempty"` + // The second blinding factor to use for the ZK undelegate claim proof. + ProofBlindingS []byte `protobuf:"bytes,8,opt,name=proof_blinding_s,json=proofBlindingS,proto3" json:"proof_blinding_s,omitempty"` } func (m *UndelegateClaimPlan) Reset() { *m = UndelegateClaimPlan{} } @@ -1254,6 +1258,20 @@ func (m *UndelegateClaimPlan) GetBalanceBlinding() []byte { return nil } +func (m *UndelegateClaimPlan) GetProofBlindingR() []byte { + if m != nil { + return m.ProofBlindingR + } + return nil +} + +func (m *UndelegateClaimPlan) GetProofBlindingS() []byte { + if m != nil { + return m.ProofBlindingS + } + return nil +} + // A list of pending delegations and undelegations. type DelegationChanges struct { Delegations []*Delegate `protobuf:"bytes,1,rep,name=delegations,proto3" json:"delegations,omitempty"` @@ -1490,105 +1508,106 @@ func init() { } var fileDescriptor_022d012c8e7b3ca5 = []byte{ - // 1554 bytes of a gzipped FileDescriptorProto + // 1578 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0xcd, 0x6f, 0x23, 0x49, 0x15, 0x4f, 0x3b, 0x76, 0x12, 0x3f, 0x7f, 0xa6, 0x66, 0x01, 0xcf, 0x30, 0x93, 0x78, 0x7b, 0x81, 0x35, 0x33, 0x83, 0xc3, 0x04, 0xc1, 0x21, 0x7b, 0x58, 0xdc, 0xb6, 0x77, 0xe2, 0xdd, 0xc4, 0xf1, 0xb6, 0x9d, 0x48, 0xa0, 0x48, 0xad, 0xb2, 0xbb, 0x62, 0x37, 0x63, 0x57, 0x99, 0xae, 0x72, 0xb2, - 0xfe, 0x0b, 0xe0, 0xc8, 0x71, 0xcf, 0x1c, 0x38, 0xac, 0xc4, 0x81, 0x13, 0x27, 0x38, 0x23, 0x4e, - 0xcb, 0x0d, 0x71, 0x42, 0x19, 0x09, 0x24, 0xfe, 0x0a, 0x54, 0xd5, 0x5d, 0xed, 0x8f, 0x7c, 0x4d, - 0x56, 0x23, 0xb4, 0xdc, 0xfa, 0x7d, 0xfd, 0xea, 0xbd, 0xdf, 0xab, 0x57, 0x5d, 0xdd, 0x50, 0x1a, - 0x13, 0x3a, 0x19, 0x75, 0x7d, 0xbc, 0xd3, 0x63, 0x3e, 0xd9, 0xe1, 0x02, 0xbf, 0x22, 0x3b, 0xe7, - 0x2f, 0xf0, 0x70, 0x3c, 0xc0, 0x2f, 0x02, 0xb1, 0x3c, 0xf6, 0x99, 0x60, 0xe8, 0xb1, 0xf6, 0x2c, - 0x4b, 0xcf, 0x72, 0x60, 0xd2, 0x9e, 0x8f, 0x9e, 0x2e, 0xe2, 0xf4, 0xfc, 0xe9, 0x58, 0xb0, 0x19, - 0x50, 0x20, 0x07, 0x48, 0xe6, 0x9f, 0x56, 0x21, 0x79, 0x82, 0x87, 0x9e, 0x8b, 0x05, 0xf3, 0xd1, - 0x21, 0xa4, 0x3d, 0x97, 0x50, 0xe1, 0x89, 0xa9, 0xf3, 0x8a, 0x4c, 0x0b, 0x46, 0xd1, 0x28, 0xa5, - 0x76, 0x9f, 0x96, 0x17, 0x97, 0x0b, 0x01, 0x34, 0x60, 0xb9, 0x11, 0x86, 0x7c, 0x42, 0xa6, 0x76, - 0xca, 0x9b, 0x09, 0xe8, 0x3d, 0xc8, 0xf4, 0x18, 0xe5, 0x84, 0xf2, 0x09, 0x57, 0x78, 0xb1, 0xa2, - 0x51, 0x4a, 0xdb, 0xe9, 0x48, 0x29, 0x9d, 0x10, 0xc4, 0x29, 0x1e, 0x91, 0xc2, 0x6a, 0xd1, 0x28, - 0x25, 0x6d, 0xf5, 0x8c, 0x0a, 0xb0, 0x7e, 0x41, 0xba, 0xdc, 0x13, 0xa4, 0x10, 0x57, 0x6a, 0x2d, - 0xa2, 0x22, 0xa4, 0x5c, 0xc2, 0x7b, 0xbe, 0x37, 0x16, 0x1e, 0xa3, 0x85, 0x84, 0xb2, 0xce, 0xab, - 0x64, 0x2c, 0xa1, 0xb8, 0x3b, 0x24, 0x6e, 0x61, 0xa3, 0x68, 0x94, 0x36, 0x6c, 0x2d, 0xa2, 0x0e, - 0xe4, 0xce, 0x26, 0xd4, 0xf5, 0x68, 0xdf, 0xe1, 0xc2, 0x27, 0x78, 0xc4, 0x0b, 0x6b, 0xc5, 0xd5, - 0x52, 0x6a, 0xf7, 0x59, 0xf9, 0x36, 0x3e, 0xcb, 0x1f, 0x05, 0x41, 0x6d, 0x15, 0x63, 0x67, 0xcf, - 0xe6, 0x45, 0x8e, 0xde, 0x87, 0x1c, 0x27, 0xbf, 0x9c, 0x10, 0xda, 0x23, 0x8e, 0x04, 0x21, 0x7e, - 0x61, 0xbd, 0x68, 0x94, 0x32, 0x76, 0x56, 0xab, 0x9b, 0x4a, 0x8b, 0xda, 0x90, 0xed, 0xb3, 0x73, - 0xe2, 0x53, 0x2c, 0x5d, 0x25, 0x1d, 0x49, 0x45, 0xef, 0xf3, 0x3b, 0xe8, 0x7d, 0x19, 0x05, 0x49, - 0x82, 0x33, 0xfd, 0x79, 0xd1, 0xec, 0x42, 0x26, 0x6a, 0xdf, 0x81, 0xc7, 0x05, 0xfa, 0x14, 0xb2, - 0xe7, 0x5a, 0x21, 0x17, 0xe1, 0x05, 0x43, 0xd5, 0x78, 0x9f, 0x26, 0x66, 0x22, 0x84, 0x4f, 0xc8, - 0x94, 0x9b, 0xbf, 0x8b, 0x41, 0x66, 0x81, 0x03, 0x74, 0x02, 0x20, 0x98, 0x83, 0x5d, 0xd7, 0x27, - 0x9c, 0x87, 0xbb, 0xe4, 0xc7, 0xf7, 0x20, 0xb1, 0xdc, 0x61, 0x95, 0x20, 0x78, 0x7f, 0xc5, 0x4e, - 0x0a, 0x2d, 0xa0, 0x8f, 0x61, 0x4d, 0x30, 0xc7, 0xc5, 0x4c, 0xed, 0x94, 0xd4, 0xee, 0x8b, 0xfb, - 0x61, 0xd6, 0x30, 0xdb, 0x5f, 0xb1, 0x13, 0x42, 0x3e, 0x3c, 0xfa, 0x29, 0x24, 0xa3, 0x55, 0xe4, - 0xa6, 0x98, 0xcf, 0x36, 0x69, 0x6b, 0x11, 0x3d, 0x84, 0x0d, 0x1f, 0x0b, 0xe2, 0x74, 0xc7, 0x5c, - 0x2d, 0x9a, 0xb1, 0xd7, 0xa5, 0x6c, 0x8d, 0xf9, 0x23, 0x13, 0x12, 0x0a, 0xf3, 0x16, 0x1f, 0x2b, - 0x05, 0x49, 0x9f, 0xf4, 0xbc, 0xb1, 0x47, 0xa8, 0x30, 0xff, 0x65, 0xc0, 0x86, 0x8d, 0x05, 0xa9, - 0x61, 0x81, 0xdf, 0xf6, 0x2c, 0x6d, 0x43, 0x8a, 0x8c, 0x59, 0x6f, 0xe0, 0x78, 0xd4, 0x25, 0x9f, - 0xa9, 0x34, 0xe2, 0x36, 0x28, 0x55, 0x43, 0x6a, 0xd0, 0x2e, 0x7c, 0x63, 0xd6, 0x78, 0x9f, 0x5c, - 0x60, 0xdf, 0x75, 0x64, 0x96, 0x6a, 0x82, 0xe2, 0xf6, 0x83, 0xc8, 0x68, 0x2b, 0x9b, 0xcc, 0x13, - 0xfd, 0x04, 0xbe, 0x35, 0x8b, 0x21, 0x9f, 0xf5, 0x06, 0x98, 0xf6, 0x49, 0x10, 0x95, 0x50, 0x51, - 0x33, 0xc8, 0x7a, 0x68, 0x95, 0x71, 0xe6, 0xaf, 0x0c, 0x48, 0x5b, 0x98, 0x93, 0xa8, 0xd8, 0xa5, - 0xec, 0x8c, 0x2b, 0xd9, 0x95, 0x20, 0xdf, 0xc5, 0x9c, 0x2c, 0x24, 0x16, 0xd4, 0x90, 0x95, 0xfa, - 0xb9, 0x9c, 0x9e, 0x03, 0x52, 0x9e, 0x8b, 0xe9, 0xac, 0x2a, 0x5f, 0x85, 0xb1, 0x90, 0xc9, 0xe7, - 0x31, 0xc8, 0x45, 0x03, 0xd0, 0x16, 0x58, 0x4c, 0xf8, 0xdb, 0x66, 0xde, 0x82, 0x04, 0x17, 0x3a, - 0xdf, 0xab, 0xe3, 0xba, 0xb4, 0x27, 0x17, 0x92, 0x21, 0x76, 0x10, 0x8a, 0xde, 0x85, 0xf4, 0x39, - 0x13, 0xf2, 0xe4, 0x19, 0xb3, 0x0b, 0xe2, 0x87, 0xe5, 0xa4, 0x02, 0x5d, 0x4b, 0xaa, 0xd0, 0x11, - 0x64, 0xba, 0x4c, 0x9f, 0x4e, 0xba, 0x6f, 0x57, 0xd3, 0x5e, 0x5a, 0xce, 0x62, 0xe1, 0x08, 0xc8, - 0xc5, 0xd2, 0xdd, 0x39, 0xc9, 0xfc, 0x73, 0x0c, 0xd2, 0xf3, 0x66, 0xf4, 0xa9, 0x2e, 0x44, 0x12, - 0x92, 0xdd, 0xfd, 0xe0, 0xcd, 0x91, 0x17, 0x84, 0x3a, 0x9d, 0x8c, 0x74, 0x5d, 0xcf, 0x21, 0x37, - 0xa1, 0x3a, 0x6d, 0xd5, 0xee, 0xa0, 0xab, 0xfb, 0x2b, 0x76, 0x36, 0x32, 0xd4, 0xa5, 0xfe, 0xd7, - 0x86, 0x61, 0x7e, 0x6e, 0x40, 0x7e, 0x19, 0x09, 0x99, 0xb0, 0x65, 0x1d, 0x35, 0x6b, 0x8d, 0xe6, - 0x4b, 0xa7, 0xdd, 0xa9, 0x74, 0xea, 0x4e, 0xbd, 0x79, 0x7c, 0xe8, 0x1c, 0x37, 0xdb, 0xad, 0x7a, - 0xb5, 0xf1, 0x51, 0xa3, 0x5e, 0xcb, 0xaf, 0xa0, 0x27, 0xf0, 0xf0, 0x1a, 0x1f, 0xa9, 0xaa, 0xd7, - 0xf2, 0x06, 0x2a, 0xc2, 0xe3, 0x6b, 0x21, 0x42, 0x65, 0x3e, 0x86, 0xb6, 0xe1, 0xdb, 0x37, 0x7a, - 0xd4, 0x6b, 0xf9, 0x55, 0x0b, 0x41, 0xde, 0x59, 0xaa, 0xc4, 0xfc, 0x5b, 0x0c, 0xb2, 0x8b, 0xed, - 0x44, 0xc7, 0x8b, 0x14, 0x7e, 0x78, 0x9f, 0xbd, 0xb0, 0x24, 0xce, 0xd1, 0x68, 0xfe, 0xdb, 0x00, - 0x74, 0xd5, 0x8a, 0xbe, 0x03, 0xc5, 0x93, 0xca, 0x41, 0xa3, 0x56, 0xe9, 0x1c, 0xd9, 0x37, 0x93, - 0xf3, 0x2e, 0x3c, 0xb9, 0xd6, 0xab, 0xd1, 0xac, 0x54, 0x3b, 0x8d, 0x93, 0x7a, 0xde, 0x90, 0xe5, - 0x5f, 0xeb, 0x12, 0x3a, 0xc4, 0x6e, 0x74, 0xf8, 0xb8, 0xd2, 0x38, 0x90, 0xfc, 0xa0, 0xf7, 0x60, - 0xfb, 0x5a, 0x87, 0xce, 0xd1, 0xa1, 0xd5, 0xee, 0x1c, 0x35, 0xeb, 0xb5, 0x7c, 0xfc, 0xc6, 0x4c, - 0x6a, 0x8d, 0x76, 0xc5, 0x92, 0x38, 0x09, 0xf3, 0xd2, 0x98, 0x7b, 0x61, 0x35, 0xe8, 0x19, 0x43, - 0x75, 0x48, 0x46, 0x87, 0x4c, 0x38, 0xaa, 0xef, 0xbf, 0x21, 0xad, 0xf6, 0x2c, 0x12, 0xd5, 0x61, - 0x8d, 0xab, 0xf1, 0x0f, 0xc7, 0xf4, 0x07, 0xf7, 0x68, 0xcd, 0x84, 0xdb, 0x61, 0x30, 0xaa, 0x42, - 0x52, 0x1d, 0xf5, 0x2e, 0x16, 0x58, 0x4d, 0x69, 0x6a, 0xf7, 0x7b, 0xb7, 0x23, 0xe9, 0x33, 0xd0, - 0x56, 0xef, 0x08, 0xf9, 0x64, 0x5e, 0xc0, 0x83, 0x08, 0xbf, 0x46, 0xce, 0x3c, 0xea, 0xa9, 0x9b, - 0xc9, 0x5b, 0xaa, 0xf4, 0x21, 0x6c, 0xe0, 0x89, 0x18, 0x38, 0xdc, 0xeb, 0x87, 0x17, 0xaa, 0x75, - 0x29, 0xb7, 0xbd, 0xbe, 0xf9, 0x45, 0x0c, 0x36, 0x6a, 0x64, 0x48, 0xfa, 0x72, 0xaf, 0xfe, 0x0c, - 0xd0, 0xec, 0x70, 0xd7, 0x07, 0xda, 0x57, 0x38, 0x0c, 0x37, 0x23, 0x14, 0xad, 0xbd, 0xfb, 0x65, - 0xd4, 0xd4, 0xe7, 0x02, 0x71, 0x1d, 0x3c, 0x62, 0x13, 0x2a, 0x42, 0x32, 0xbf, 0x7b, 0xc7, 0xc2, - 0x15, 0xe5, 0xac, 0x0f, 0x0f, 0xe2, 0x06, 0x32, 0xb2, 0x61, 0xd3, 0x0d, 0xea, 0xf2, 0x18, 0xd5, - 0x88, 0xf1, 0xfb, 0x20, 0xe6, 0x67, 0xf1, 0x81, 0xc6, 0xfc, 0x63, 0x0c, 0xe0, 0x98, 0xba, 0xff, - 0x03, 0xba, 0x9e, 0xc2, 0x26, 0x17, 0xd8, 0x17, 0xce, 0x55, 0xd2, 0x72, 0xca, 0x50, 0xff, 0xff, - 0x62, 0x8e, 0x42, 0x6e, 0x46, 0x5c, 0x75, 0x88, 0xbd, 0x11, 0xaa, 0x43, 0xbc, 0xcb, 0x5c, 0xcd, - 0xd7, 0x1d, 0xf7, 0xb6, 0xa5, 0x60, 0x8b, 0xb9, 0x53, 0x5b, 0x85, 0xa3, 0x77, 0x20, 0x31, 0xf6, - 0x19, 0x3b, 0x0b, 0x37, 0x76, 0x20, 0xc8, 0x37, 0xd9, 0x83, 0x6b, 0x62, 0xbe, 0x2e, 0x2d, 0xfb, - 0x10, 0xd6, 0xc7, 0x84, 0xe2, 0xa1, 0x98, 0xde, 0xd0, 0xaa, 0xa5, 0xf2, 0x5b, 0x81, 0xb3, 0xad, - 0xa3, 0x90, 0x23, 0xaf, 0x3c, 0x43, 0xf5, 0x59, 0xd0, 0x63, 0xa3, 0x91, 0x27, 0x46, 0x24, 0x6a, - 0xd2, 0x0f, 0xef, 0xa8, 0xc3, 0x0a, 0x02, 0xab, 0x51, 0x9c, 0xbd, 0xd9, 0x5d, 0x56, 0x99, 0xff, - 0xb8, 0x4a, 0x60, 0x6b, 0x88, 0xe9, 0xd7, 0x90, 0xc0, 0xf8, 0x57, 0x22, 0xb0, 0x05, 0xf9, 0xd9, - 0xcb, 0x3b, 0xdc, 0xe3, 0x89, 0xfb, 0xec, 0xf1, 0xd9, 0x2d, 0x26, 0x1c, 0x9b, 0xef, 0xcb, 0xfb, - 0x6a, 0xd0, 0x92, 0xee, 0xd0, 0x53, 0x96, 0xc2, 0x9a, 0xda, 0x93, 0xb9, 0x50, 0x6f, 0x85, 0x6a, - 0xf3, 0xf7, 0x06, 0x6c, 0xd6, 0xa2, 0x11, 0xa9, 0xaa, 0xbb, 0x29, 0x47, 0xfb, 0xf2, 0x43, 0x55, - 0x2b, 0xf5, 0x47, 0xd8, 0x1d, 0xaf, 0x12, 0x7d, 0x74, 0xdb, 0xf3, 0xa1, 0xa8, 0x09, 0x99, 0x09, - 0x9d, 0xc7, 0x8a, 0x29, 0xac, 0xd2, 0x9b, 0xce, 0x98, 0xbd, 0x18, 0x6e, 0x0e, 0x61, 0xed, 0x78, - 0x2c, 0xbc, 0x11, 0x41, 0xcf, 0x00, 0x61, 0xee, 0xb0, 0x33, 0xa7, 0x3b, 0x64, 0xbd, 0x57, 0xce, - 0x80, 0x78, 0xfd, 0x81, 0x08, 0x2f, 0xef, 0x39, 0xcc, 0x8f, 0xce, 0x2c, 0xa9, 0xdf, 0x57, 0x6a, - 0xf4, 0x04, 0xe0, 0xc2, 0xa3, 0x2e, 0xbb, 0x70, 0x86, 0x84, 0x86, 0x9f, 0x41, 0xc9, 0x40, 0x73, - 0x40, 0x28, 0xfa, 0x26, 0xac, 0x75, 0x3d, 0x71, 0x4e, 0x7a, 0x6a, 0x06, 0xd2, 0x76, 0x28, 0x99, - 0xbf, 0x80, 0x77, 0xaa, 0x13, 0xdf, 0x27, 0x54, 0x54, 0xe7, 0xbe, 0xfa, 0x39, 0xb2, 0x21, 0xbb, - 0xf0, 0x6f, 0x40, 0x53, 0xf4, 0xec, 0x8e, 0x86, 0xcd, 0xa3, 0xd8, 0x99, 0xf9, 0x3f, 0x09, 0xdc, - 0xdc, 0x86, 0xf5, 0x70, 0x6b, 0xc8, 0x83, 0xc4, 0xa3, 0x94, 0xf8, 0x61, 0x35, 0x81, 0x60, 0xfd, - 0x21, 0xf6, 0x97, 0xcb, 0x2d, 0xe3, 0xcb, 0xcb, 0x2d, 0xe3, 0x9f, 0x97, 0x5b, 0xc6, 0x6f, 0x5e, - 0x6f, 0xad, 0x7c, 0xf9, 0x7a, 0x6b, 0xe5, 0xef, 0xaf, 0xb7, 0x56, 0xa0, 0xd8, 0x63, 0xa3, 0x5b, - 0x19, 0xb5, 0xa0, 0x2d, 0xe5, 0x96, 0xcf, 0x04, 0x6b, 0x19, 0x3f, 0x3f, 0xe9, 0x7b, 0x62, 0x30, - 0xe9, 0x96, 0x7b, 0x6c, 0xb4, 0xd3, 0x63, 0x7c, 0xc4, 0xf8, 0x8e, 0x4f, 0x86, 0x78, 0x4a, 0xfc, - 0x9d, 0xf3, 0xdd, 0xe8, 0xb1, 0x37, 0xc0, 0x1e, 0xe5, 0x3b, 0xb7, 0xfd, 0xd8, 0xf9, 0x40, 0x89, - 0x5a, 0xfa, 0x6d, 0x6c, 0xb5, 0x55, 0x6d, 0x7f, 0x11, 0x7b, 0xdc, 0xd2, 0xa9, 0x54, 0x65, 0x2a, - 0x6a, 0xe9, 0xf2, 0x49, 0xe8, 0xf4, 0xd7, 0x99, 0xf9, 0x54, 0x9a, 0x4f, 0x95, 0xf9, 0x54, 0x9b, - 0x2f, 0x63, 0xa5, 0xdb, 0xcc, 0xa7, 0x2f, 0x5b, 0xd6, 0x21, 0x11, 0x58, 0x5e, 0x71, 0xfe, 0x13, - 0xdb, 0xd6, 0xae, 0x7b, 0x7b, 0xd2, 0x77, 0x6f, 0x4f, 0x39, 0xef, 0xed, 0x69, 0xef, 0xee, 0x9a, - 0xfa, 0x51, 0xf4, 0xa3, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xba, 0x77, 0x8b, 0xfc, 0x9e, 0x12, - 0x00, 0x00, + 0xfe, 0x0b, 0xe0, 0xc8, 0x71, 0xcf, 0x1c, 0x38, 0xac, 0x04, 0x12, 0x27, 0x4e, 0x70, 0x46, 0x9c, + 0x96, 0x1b, 0x47, 0x94, 0x91, 0x40, 0xe2, 0xaf, 0x40, 0x55, 0xdd, 0xd5, 0xfe, 0xc8, 0xd7, 0x64, + 0x35, 0x42, 0xcb, 0xad, 0xdf, 0x7b, 0xbf, 0xf7, 0xea, 0xbd, 0x5f, 0xd5, 0xab, 0x8f, 0x86, 0xd2, + 0x98, 0xd0, 0xc9, 0xa8, 0xeb, 0xe3, 0x9d, 0x1e, 0xf3, 0xc9, 0x0e, 0x17, 0xf8, 0x15, 0xd9, 0x39, + 0x7f, 0x81, 0x87, 0xe3, 0x01, 0x7e, 0x11, 0x88, 0xe5, 0xb1, 0xcf, 0x04, 0x43, 0x8f, 0x35, 0xb2, + 0x2c, 0x91, 0xe5, 0xc0, 0xa4, 0x91, 0x8f, 0x9e, 0x2e, 0xc6, 0xe9, 0xf9, 0xd3, 0xb1, 0x60, 0xb3, + 0x40, 0x81, 0x1c, 0x44, 0x32, 0xff, 0xbc, 0x0a, 0xc9, 0x13, 0x3c, 0xf4, 0x5c, 0x2c, 0x98, 0x8f, + 0x0e, 0x21, 0xed, 0xb9, 0x84, 0x0a, 0x4f, 0x4c, 0x9d, 0x57, 0x64, 0x5a, 0x30, 0x8a, 0x46, 0x29, + 0xb5, 0xfb, 0xb4, 0xbc, 0x38, 0x5c, 0x18, 0x40, 0x07, 0x2c, 0x37, 0x42, 0x97, 0x4f, 0xc8, 0xd4, + 0x4e, 0x79, 0x33, 0x01, 0xbd, 0x07, 0x99, 0x1e, 0xa3, 0x9c, 0x50, 0x3e, 0xe1, 0x2a, 0x5e, 0xac, + 0x68, 0x94, 0xd2, 0x76, 0x3a, 0x52, 0x4a, 0x10, 0x82, 0x38, 0xc5, 0x23, 0x52, 0x58, 0x2d, 0x1a, + 0xa5, 0xa4, 0xad, 0xbe, 0x51, 0x01, 0xd6, 0x2f, 0x48, 0x97, 0x7b, 0x82, 0x14, 0xe2, 0x4a, 0xad, + 0x45, 0x54, 0x84, 0x94, 0x4b, 0x78, 0xcf, 0xf7, 0xc6, 0xc2, 0x63, 0xb4, 0x90, 0x50, 0xd6, 0x79, + 0x95, 0xf4, 0x25, 0x14, 0x77, 0x87, 0xc4, 0x2d, 0x6c, 0x14, 0x8d, 0xd2, 0x86, 0xad, 0x45, 0xd4, + 0x81, 0xdc, 0xd9, 0x84, 0xba, 0x1e, 0xed, 0x3b, 0x5c, 0xf8, 0x04, 0x8f, 0x78, 0x61, 0xad, 0xb8, + 0x5a, 0x4a, 0xed, 0x3e, 0x2b, 0xdf, 0xc6, 0x67, 0xf9, 0xa3, 0xc0, 0xa9, 0xad, 0x7c, 0xec, 0xec, + 0xd9, 0xbc, 0xc8, 0xd1, 0xfb, 0x90, 0xe3, 0xe4, 0x97, 0x13, 0x42, 0x7b, 0xc4, 0x91, 0x41, 0x88, + 0x5f, 0x58, 0x2f, 0x1a, 0xa5, 0x8c, 0x9d, 0xd5, 0xea, 0xa6, 0xd2, 0xa2, 0x36, 0x64, 0xfb, 0xec, + 0x9c, 0xf8, 0x14, 0x4b, 0xa8, 0xa4, 0x23, 0xa9, 0xe8, 0x7d, 0x7e, 0x07, 0xbd, 0x2f, 0x23, 0x27, + 0x49, 0x70, 0xa6, 0x3f, 0x2f, 0x9a, 0x5d, 0xc8, 0x44, 0xd3, 0x77, 0xe0, 0x71, 0x81, 0x3e, 0x85, + 0xec, 0xb9, 0x56, 0xc8, 0x41, 0x78, 0xc1, 0x50, 0x35, 0xde, 0x67, 0x12, 0x33, 0x51, 0x84, 0x4f, + 0xc8, 0x94, 0x9b, 0xbf, 0x8b, 0x41, 0x66, 0x81, 0x03, 0x74, 0x02, 0x20, 0x98, 0x83, 0x5d, 0xd7, + 0x27, 0x9c, 0x87, 0xab, 0xe4, 0xc7, 0xf7, 0x20, 0xb1, 0xdc, 0x61, 0x95, 0xc0, 0x79, 0x7f, 0xc5, + 0x4e, 0x0a, 0x2d, 0xa0, 0x8f, 0x61, 0x4d, 0x30, 0xc7, 0xc5, 0x4c, 0xad, 0x94, 0xd4, 0xee, 0x8b, + 0xfb, 0xc5, 0xac, 0x61, 0xb6, 0xbf, 0x62, 0x27, 0x84, 0xfc, 0x78, 0xf4, 0x53, 0x48, 0x46, 0xa3, + 0xc8, 0x45, 0x31, 0x9f, 0x6d, 0xd2, 0xd6, 0x22, 0x7a, 0x08, 0x1b, 0x3e, 0x16, 0xc4, 0xe9, 0x8e, + 0xb9, 0x1a, 0x34, 0x63, 0xaf, 0x4b, 0xd9, 0x1a, 0xf3, 0x47, 0x26, 0x24, 0x54, 0xcc, 0x5b, 0x30, + 0x56, 0x0a, 0x92, 0x3e, 0xe9, 0x79, 0x63, 0x8f, 0x50, 0x61, 0xfe, 0xcb, 0x80, 0x0d, 0x1b, 0x0b, + 0x52, 0xc3, 0x02, 0xbf, 0xed, 0x5e, 0xda, 0x86, 0x14, 0x19, 0xb3, 0xde, 0xc0, 0xf1, 0xa8, 0x4b, + 0x3e, 0x53, 0x69, 0xc4, 0x6d, 0x50, 0xaa, 0x86, 0xd4, 0xa0, 0x5d, 0xf8, 0xc6, 0x6c, 0xe2, 0x7d, + 0x72, 0x81, 0x7d, 0xd7, 0x91, 0x59, 0xaa, 0x0e, 0x8a, 0xdb, 0x0f, 0x22, 0xa3, 0xad, 0x6c, 0x32, + 0x4f, 0xf4, 0x13, 0xf8, 0xd6, 0xcc, 0x87, 0x7c, 0xd6, 0x1b, 0x60, 0xda, 0x27, 0x81, 0x57, 0x42, + 0x79, 0xcd, 0x42, 0xd6, 0x43, 0xab, 0xf4, 0x33, 0x7f, 0x65, 0x40, 0xda, 0xc2, 0x9c, 0x44, 0xc5, + 0x2e, 0x65, 0x67, 0x5c, 0xc9, 0xae, 0x04, 0xf9, 0x2e, 0xe6, 0x64, 0x21, 0xb1, 0xa0, 0x86, 0xac, + 0xd4, 0xcf, 0xe5, 0xf4, 0x1c, 0x90, 0x42, 0x2e, 0xa6, 0xb3, 0xaa, 0xb0, 0x2a, 0xc6, 0x42, 0x26, + 0x9f, 0xc7, 0x20, 0x17, 0x35, 0x40, 0x5b, 0x60, 0x31, 0xe1, 0x6f, 0x9b, 0x79, 0x0b, 0x12, 0x5c, + 0xe8, 0x7c, 0xaf, 0xb6, 0xeb, 0xd2, 0x9a, 0x5c, 0x48, 0x86, 0xd8, 0x81, 0x2b, 0x7a, 0x17, 0xd2, + 0xe7, 0x4c, 0xc8, 0x9d, 0x67, 0xcc, 0x2e, 0x88, 0x1f, 0x96, 0x93, 0x0a, 0x74, 0x2d, 0xa9, 0x42, + 0x47, 0x90, 0xe9, 0x32, 0xbd, 0x3b, 0xe9, 0x79, 0xbb, 0x9a, 0xf6, 0xd2, 0x70, 0x16, 0x0b, 0x5b, + 0x40, 0x0e, 0x96, 0xee, 0xce, 0x49, 0xe6, 0x5f, 0x62, 0x90, 0x9e, 0x37, 0xa3, 0x4f, 0x75, 0x21, + 0x92, 0x90, 0xec, 0xee, 0x07, 0x6f, 0x1e, 0x79, 0x41, 0xa8, 0xd3, 0xc9, 0x48, 0xd7, 0xf5, 0x1c, + 0x72, 0x13, 0xaa, 0xd3, 0x56, 0xd3, 0x1d, 0xcc, 0xea, 0xfe, 0x8a, 0x9d, 0x8d, 0x0c, 0x75, 0xa9, + 0xff, 0xb5, 0x61, 0x98, 0x9f, 0x1b, 0x90, 0x5f, 0x8e, 0x84, 0x4c, 0xd8, 0xb2, 0x8e, 0x9a, 0xb5, + 0x46, 0xf3, 0xa5, 0xd3, 0xee, 0x54, 0x3a, 0x75, 0xa7, 0xde, 0x3c, 0x3e, 0x74, 0x8e, 0x9b, 0xed, + 0x56, 0xbd, 0xda, 0xf8, 0xa8, 0x51, 0xaf, 0xe5, 0x57, 0xd0, 0x13, 0x78, 0x78, 0x0d, 0x46, 0xaa, + 0xea, 0xb5, 0xbc, 0x81, 0x8a, 0xf0, 0xf8, 0xda, 0x10, 0xa1, 0x32, 0x1f, 0x43, 0xdb, 0xf0, 0xed, + 0x1b, 0x11, 0xf5, 0x5a, 0x7e, 0xd5, 0x42, 0x90, 0x77, 0x96, 0x2a, 0x31, 0xff, 0x1e, 0x83, 0xec, + 0xe2, 0x74, 0xa2, 0xe3, 0x45, 0x0a, 0x3f, 0xbc, 0xcf, 0x5a, 0x58, 0x12, 0xe7, 0x68, 0x34, 0xff, + 0x6d, 0x00, 0xba, 0x6a, 0x45, 0xdf, 0x81, 0xe2, 0x49, 0xe5, 0xa0, 0x51, 0xab, 0x74, 0x8e, 0xec, + 0x9b, 0xc9, 0x79, 0x17, 0x9e, 0x5c, 0x8b, 0x6a, 0x34, 0x2b, 0xd5, 0x4e, 0xe3, 0xa4, 0x9e, 0x37, + 0x64, 0xf9, 0xd7, 0x42, 0x42, 0x40, 0xec, 0x46, 0xc0, 0xc7, 0x95, 0xc6, 0x81, 0xe4, 0x07, 0xbd, + 0x07, 0xdb, 0xd7, 0x02, 0x3a, 0x47, 0x87, 0x56, 0xbb, 0x73, 0xd4, 0xac, 0xd7, 0xf2, 0xf1, 0x1b, + 0x33, 0xa9, 0x35, 0xda, 0x15, 0x4b, 0xc6, 0x49, 0x98, 0x97, 0xc6, 0xdc, 0x81, 0xd5, 0xa0, 0x67, + 0x0c, 0xd5, 0x21, 0x19, 0x6d, 0x32, 0x61, 0xab, 0xbe, 0xff, 0x86, 0xb4, 0xda, 0x33, 0x4f, 0x54, + 0x87, 0x35, 0xae, 0xda, 0x3f, 0x6c, 0xd3, 0x1f, 0xdc, 0x63, 0x6a, 0x26, 0xdc, 0x0e, 0x9d, 0x51, + 0x15, 0x92, 0x6a, 0xab, 0x77, 0xb1, 0xc0, 0xaa, 0x4b, 0x53, 0xbb, 0xdf, 0xbb, 0x3d, 0x92, 0xde, + 0x03, 0x6d, 0x75, 0x46, 0xc8, 0x2f, 0xf3, 0x02, 0x1e, 0x44, 0xf1, 0x6b, 0xe4, 0xcc, 0xa3, 0x9e, + 0xba, 0x99, 0xbc, 0xa5, 0x4a, 0x1f, 0xc2, 0x06, 0x9e, 0x88, 0x81, 0xc3, 0xbd, 0x7e, 0x78, 0xa1, + 0x5a, 0x97, 0x72, 0xdb, 0xeb, 0x9b, 0x5f, 0xc4, 0x60, 0xa3, 0x46, 0x86, 0xa4, 0x2f, 0xd7, 0xea, + 0xcf, 0x00, 0xcd, 0x36, 0x77, 0xbd, 0xa1, 0x7d, 0x85, 0xcd, 0x70, 0x33, 0x8a, 0xa2, 0xb5, 0x77, + 0x1f, 0x46, 0x4d, 0xbd, 0x2f, 0x10, 0xd7, 0xc1, 0x23, 0x36, 0xa1, 0x22, 0x24, 0xf3, 0xbb, 0x77, + 0x0c, 0x5c, 0x51, 0x60, 0xbd, 0x79, 0x10, 0x37, 0x90, 0x91, 0x0d, 0x9b, 0x6e, 0x50, 0x97, 0xc7, + 0xa8, 0x8e, 0x18, 0xbf, 0x4f, 0xc4, 0xfc, 0xcc, 0x3f, 0xd0, 0x98, 0x7f, 0x8a, 0x01, 0x1c, 0x53, + 0xf7, 0x7f, 0x40, 0xd7, 0x53, 0xd8, 0xe4, 0x02, 0xfb, 0xc2, 0xb9, 0x4a, 0x5a, 0x4e, 0x19, 0xea, + 0xff, 0x5f, 0xcc, 0x51, 0xc8, 0xcd, 0x88, 0xab, 0x0e, 0xb1, 0x37, 0x42, 0x75, 0x88, 0x77, 0x99, + 0xab, 0xf9, 0xba, 0xe3, 0xde, 0xb6, 0xe4, 0x6c, 0x31, 0x77, 0x6a, 0x2b, 0x77, 0xf4, 0x0e, 0x24, + 0xc6, 0x3e, 0x63, 0x67, 0xe1, 0xc2, 0x0e, 0x04, 0x79, 0x92, 0x3d, 0xb8, 0xc6, 0xe7, 0xeb, 0x32, + 0x65, 0x1f, 0xc2, 0xfa, 0x98, 0x50, 0x3c, 0x14, 0xd3, 0x1b, 0xa6, 0x6a, 0xa9, 0xfc, 0x56, 0x00, + 0xb6, 0xb5, 0x17, 0x72, 0xe4, 0x95, 0x67, 0xa8, 0x9e, 0x05, 0x3d, 0x36, 0x1a, 0x79, 0x62, 0x44, + 0xa2, 0x49, 0xfa, 0xe1, 0x1d, 0x75, 0x58, 0x81, 0x63, 0x35, 0xf2, 0xb3, 0x37, 0xbb, 0xcb, 0x2a, + 0xf3, 0x0f, 0xab, 0x57, 0x08, 0x6c, 0x0d, 0x31, 0xfd, 0x1a, 0x12, 0x18, 0xff, 0x4a, 0x04, 0xb6, + 0x20, 0x3f, 0x3b, 0xbc, 0xc3, 0x35, 0x9e, 0xb8, 0xcf, 0x1a, 0x9f, 0xdd, 0x62, 0xc2, 0xb6, 0xf9, + 0xbe, 0xbc, 0xaf, 0x06, 0x53, 0xd2, 0x1d, 0x7a, 0xca, 0x52, 0x58, 0x53, 0x6b, 0x32, 0x17, 0xea, + 0xad, 0x50, 0x2d, 0xaf, 0xb6, 0x6a, 0x99, 0x46, 0x40, 0x27, 0x78, 0x01, 0xa6, 0xed, 0xac, 0xd2, + 0x6b, 0xa0, 0x7d, 0x0d, 0x92, 0xab, 0x37, 0xea, 0x32, 0xb2, 0x6d, 0xfe, 0xde, 0x80, 0xcd, 0x5a, + 0xd4, 0x76, 0x55, 0x75, 0xdf, 0xe5, 0x68, 0x5f, 0x3e, 0x7e, 0xb5, 0x52, 0x3f, 0xec, 0xee, 0x38, + 0x9e, 0xf4, 0x71, 0x60, 0xcf, 0xbb, 0xa2, 0x26, 0x64, 0x26, 0x74, 0x3e, 0x56, 0x4c, 0xc5, 0x2a, + 0xbd, 0x69, 0xdf, 0xda, 0x8b, 0xee, 0xe6, 0x10, 0xd6, 0x8e, 0xc7, 0xc2, 0x1b, 0x11, 0xf4, 0x0c, + 0x10, 0xe6, 0x8e, 0xaa, 0x91, 0xf5, 0x5e, 0x39, 0x03, 0xe2, 0xf5, 0x07, 0x22, 0x7c, 0x10, 0xe4, + 0x30, 0x3f, 0x3a, 0xb3, 0xa4, 0x7e, 0x5f, 0xa9, 0xd1, 0x13, 0x80, 0x0b, 0x8f, 0xba, 0xec, 0xc2, + 0x19, 0x12, 0x1a, 0x3e, 0xad, 0x92, 0x81, 0xe6, 0x80, 0x50, 0xf4, 0x4d, 0x58, 0xeb, 0x7a, 0xe2, + 0x9c, 0xf4, 0x54, 0x5f, 0xa5, 0xed, 0x50, 0x32, 0x7f, 0x01, 0xef, 0x54, 0x27, 0xbe, 0x4f, 0xa8, + 0xa8, 0xce, 0xfd, 0x49, 0xe0, 0xc8, 0x86, 0xec, 0xc2, 0xff, 0x06, 0x4d, 0xd1, 0xb3, 0x3b, 0x16, + 0xc1, 0x7c, 0x14, 0x3b, 0x33, 0xff, 0x77, 0x82, 0x9b, 0xdb, 0xb0, 0x1e, 0x2e, 0x37, 0xb9, 0x39, + 0x79, 0x94, 0x12, 0x3f, 0xac, 0x26, 0x10, 0xac, 0x3f, 0xc6, 0xfe, 0x7a, 0xb9, 0x65, 0x7c, 0x79, + 0xb9, 0x65, 0xfc, 0xf3, 0x72, 0xcb, 0xf8, 0xcd, 0xeb, 0xad, 0x95, 0x2f, 0x5f, 0x6f, 0xad, 0xfc, + 0xe3, 0xf5, 0xd6, 0x0a, 0x14, 0x7b, 0x6c, 0x74, 0x2b, 0xa3, 0x16, 0xb4, 0xa5, 0xdc, 0xf2, 0x99, + 0x60, 0x2d, 0xe3, 0xe7, 0x27, 0x7d, 0x4f, 0x0c, 0x26, 0xdd, 0x72, 0x8f, 0x8d, 0x76, 0x7a, 0x8c, + 0x8f, 0x18, 0xdf, 0xf1, 0xc9, 0x10, 0x4f, 0x89, 0xbf, 0x73, 0xbe, 0x1b, 0x7d, 0xf6, 0x06, 0xd8, + 0xa3, 0x7c, 0xe7, 0xb6, 0x9f, 0x45, 0x1f, 0x28, 0x51, 0x4b, 0xbf, 0x8d, 0xad, 0xb6, 0xaa, 0xed, + 0x2f, 0x62, 0x8f, 0x5b, 0x3a, 0x95, 0xaa, 0x4c, 0x45, 0x0d, 0x5d, 0x3e, 0x09, 0x41, 0x7f, 0x9b, + 0x99, 0x4f, 0xa5, 0xf9, 0x54, 0x99, 0x4f, 0xb5, 0xf9, 0x32, 0x56, 0xba, 0xcd, 0x7c, 0xfa, 0xb2, + 0x65, 0x1d, 0x12, 0x81, 0xe5, 0xb5, 0xe9, 0x3f, 0xb1, 0x6d, 0x0d, 0xdd, 0xdb, 0x93, 0xd8, 0xbd, + 0x3d, 0x05, 0xde, 0xdb, 0xd3, 0xe8, 0xee, 0x9a, 0xfa, 0xf9, 0xf4, 0xa3, 0xff, 0x06, 0x00, 0x00, + 0xff, 0xff, 0x34, 0xe3, 0xd1, 0x50, 0xf2, 0x12, 0x00, 0x00, } func (m *Validator) Marshal() (dAtA []byte, err error) { @@ -2453,6 +2472,20 @@ func (m *UndelegateClaimPlan) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.ProofBlindingS) > 0 { + i -= len(m.ProofBlindingS) + copy(dAtA[i:], m.ProofBlindingS) + i = encodeVarintStake(dAtA, i, uint64(len(m.ProofBlindingS))) + i-- + dAtA[i] = 0x42 + } + if len(m.ProofBlindingR) > 0 { + i -= len(m.ProofBlindingR) + copy(dAtA[i:], m.ProofBlindingR) + i = encodeVarintStake(dAtA, i, uint64(len(m.ProofBlindingR))) + i-- + dAtA[i] = 0x3a + } if len(m.BalanceBlinding) > 0 { i -= len(m.BalanceBlinding) copy(dAtA[i:], m.BalanceBlinding) @@ -3047,6 +3080,14 @@ func (m *UndelegateClaimPlan) Size() (n int) { if l > 0 { n += 1 + l + sovStake(uint64(l)) } + l = len(m.ProofBlindingR) + if l > 0 { + n += 1 + l + sovStake(uint64(l)) + } + l = len(m.ProofBlindingS) + if l > 0 { + n += 1 + l + sovStake(uint64(l)) + } return n } @@ -5526,6 +5567,74 @@ func (m *UndelegateClaimPlan) Unmarshal(dAtA []byte) error { m.BalanceBlinding = []byte{} } iNdEx = postIndex + case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ProofBlindingR", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStake + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthStake + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthStake + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ProofBlindingR = append(m.ProofBlindingR[:0], dAtA[iNdEx:postIndex]...) + if m.ProofBlindingR == nil { + m.ProofBlindingR = []byte{} + } + iNdEx = postIndex + case 8: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ProofBlindingS", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStake + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthStake + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthStake + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ProofBlindingS = append(m.ProofBlindingS[:0], dAtA[iNdEx:postIndex]...) + if m.ProofBlindingS == nil { + m.ProofBlindingS = []byte{} + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipStake(dAtA[iNdEx:]) diff --git a/relayer/chains/penumbra/core/transaction/v1alpha1/transaction.pb.go b/relayer/chains/penumbra/core/transaction/v1alpha1/transaction.pb.go index 027751ff9..bb0efd7c7 100644 --- a/relayer/chains/penumbra/core/transaction/v1alpha1/transaction.pb.go +++ b/relayer/chains/penumbra/core/transaction/v1alpha1/transaction.pb.go @@ -184,20 +184,14 @@ func (m *EffectHash) GetInner() []byte { type TransactionBody struct { // A list of actions (state changes) performed by this transaction. Actions []*Action `protobuf:"bytes,1,rep,name=actions,proto3" json:"actions,omitempty"` - // The maximum height that this transaction can be included in the chain. - // - // If zero, there is no maximum. - ExpiryHeight uint64 `protobuf:"varint,2,opt,name=expiry_height,json=expiryHeight,proto3" json:"expiry_height,omitempty"` - // The chain this transaction is intended for. Including this prevents - // replaying a transaction on one chain onto a different chain. - ChainId string `protobuf:"bytes,3,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` + // Parameters determining if a transaction should be accepted by this chain. + TransactionParameters *TransactionParameters `protobuf:"bytes,2,opt,name=transaction_parameters,json=transactionParameters,proto3" json:"transaction_parameters,omitempty"` // The transaction fee. - Fee *v1alpha1.Fee `protobuf:"bytes,4,opt,name=fee,proto3" json:"fee,omitempty"` - // A list of clues for use with Fuzzy Message Detection. - FmdClues []*v1alpha1.Clue `protobuf:"bytes,5,rep,name=fmd_clues,json=fmdClues,proto3" json:"fmd_clues,omitempty"` - // Types that are valid to be assigned to XEncryptedMemo: - // *TransactionBody_EncryptedMemo - XEncryptedMemo isTransactionBody_XEncryptedMemo `protobuf_oneof:"_encrypted_memo"` + Fee *v1alpha1.Fee `protobuf:"bytes,3,opt,name=fee,proto3" json:"fee,omitempty"` + // Detection data for use with Fuzzy Message Detection + DetectionData *DetectionData `protobuf:"bytes,4,opt,name=detection_data,json=detectionData,proto3" json:"detection_data,omitempty"` + // Sub-message containing memo ciphertext if a memo was added to the transaction. + MemoData *MemoData `protobuf:"bytes,5,opt,name=memo_data,json=memoData,proto3" json:"memo_data,omitempty"` } func (m *TransactionBody) Reset() { *m = TransactionBody{} } @@ -233,72 +227,216 @@ func (m *TransactionBody) XXX_DiscardUnknown() { var xxx_messageInfo_TransactionBody proto.InternalMessageInfo -type isTransactionBody_XEncryptedMemo interface { - isTransactionBody_XEncryptedMemo() - MarshalTo([]byte) (int, error) - Size() int -} - -type TransactionBody_EncryptedMemo struct { - EncryptedMemo []byte `protobuf:"bytes,6,opt,name=encrypted_memo,json=encryptedMemo,proto3,oneof" json:"encrypted_memo,omitempty"` -} - -func (*TransactionBody_EncryptedMemo) isTransactionBody_XEncryptedMemo() {} - -func (m *TransactionBody) GetXEncryptedMemo() isTransactionBody_XEncryptedMemo { +func (m *TransactionBody) GetActions() []*Action { if m != nil { - return m.XEncryptedMemo + return m.Actions } return nil } -func (m *TransactionBody) GetActions() []*Action { +func (m *TransactionBody) GetTransactionParameters() *TransactionParameters { if m != nil { - return m.Actions + return m.TransactionParameters } return nil } -func (m *TransactionBody) GetExpiryHeight() uint64 { +func (m *TransactionBody) GetFee() *v1alpha1.Fee { if m != nil { - return m.ExpiryHeight + return m.Fee } - return 0 + return nil } -func (m *TransactionBody) GetChainId() string { +func (m *TransactionBody) GetDetectionData() *DetectionData { if m != nil { - return m.ChainId + return m.DetectionData } - return "" + return nil } -func (m *TransactionBody) GetFee() *v1alpha1.Fee { +func (m *TransactionBody) GetMemoData() *MemoData { if m != nil { - return m.Fee + return m.MemoData } return nil } -func (m *TransactionBody) GetFmdClues() []*v1alpha1.Clue { +// Represents the encrypted memo data. +type MemoData struct { + // Types that are valid to be assigned to XEncryptedMemo: + // *MemoData_EncryptedMemo + XEncryptedMemo isMemoData_XEncryptedMemo `protobuf_oneof:"_encrypted_memo"` +} + +func (m *MemoData) Reset() { *m = MemoData{} } +func (m *MemoData) String() string { return proto.CompactTextString(m) } +func (*MemoData) ProtoMessage() {} +func (*MemoData) Descriptor() ([]byte, []int) { + return fileDescriptor_cd20ea79758052c4, []int{4} +} +func (m *MemoData) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MemoData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MemoData.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 *MemoData) XXX_Merge(src proto.Message) { + xxx_messageInfo_MemoData.Merge(m, src) +} +func (m *MemoData) XXX_Size() int { + return m.Size() +} +func (m *MemoData) XXX_DiscardUnknown() { + xxx_messageInfo_MemoData.DiscardUnknown(m) +} + +var xxx_messageInfo_MemoData proto.InternalMessageInfo + +type isMemoData_XEncryptedMemo interface { + isMemoData_XEncryptedMemo() + MarshalTo([]byte) (int, error) + Size() int +} + +type MemoData_EncryptedMemo struct { + EncryptedMemo []byte `protobuf:"bytes,1,opt,name=encrypted_memo,json=encryptedMemo,proto3,oneof" json:"encrypted_memo,omitempty"` +} + +func (*MemoData_EncryptedMemo) isMemoData_XEncryptedMemo() {} + +func (m *MemoData) GetXEncryptedMemo() isMemoData_XEncryptedMemo { if m != nil { - return m.FmdClues + return m.XEncryptedMemo } return nil } -func (m *TransactionBody) GetEncryptedMemo() []byte { - if x, ok := m.GetXEncryptedMemo().(*TransactionBody_EncryptedMemo); ok { +func (m *MemoData) GetEncryptedMemo() []byte { + if x, ok := m.GetXEncryptedMemo().(*MemoData_EncryptedMemo); ok { return x.EncryptedMemo } return nil } // XXX_OneofWrappers is for the internal use of the proto package. -func (*TransactionBody) XXX_OneofWrappers() []interface{} { +func (*MemoData) XXX_OneofWrappers() []interface{} { return []interface{}{ - (*TransactionBody_EncryptedMemo)(nil), + (*MemoData_EncryptedMemo)(nil), + } +} + +// The parameters determining if a transaction should be accepted by the chain. +type TransactionParameters struct { + // The maximum height that this transaction can be included in the chain. + // + // If zero, there is no maximum. + ExpiryHeight uint64 `protobuf:"varint,1,opt,name=expiry_height,json=expiryHeight,proto3" json:"expiry_height,omitempty"` + // The chain this transaction is intended for. Including this prevents + // replaying a transaction on one chain onto a different chain. + ChainId string `protobuf:"bytes,2,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` +} + +func (m *TransactionParameters) Reset() { *m = TransactionParameters{} } +func (m *TransactionParameters) String() string { return proto.CompactTextString(m) } +func (*TransactionParameters) ProtoMessage() {} +func (*TransactionParameters) Descriptor() ([]byte, []int) { + return fileDescriptor_cd20ea79758052c4, []int{5} +} +func (m *TransactionParameters) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *TransactionParameters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_TransactionParameters.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 *TransactionParameters) XXX_Merge(src proto.Message) { + xxx_messageInfo_TransactionParameters.Merge(m, src) +} +func (m *TransactionParameters) XXX_Size() int { + return m.Size() +} +func (m *TransactionParameters) XXX_DiscardUnknown() { + xxx_messageInfo_TransactionParameters.DiscardUnknown(m) +} + +var xxx_messageInfo_TransactionParameters proto.InternalMessageInfo + +func (m *TransactionParameters) GetExpiryHeight() uint64 { + if m != nil { + return m.ExpiryHeight + } + return 0 +} + +func (m *TransactionParameters) GetChainId() string { + if m != nil { + return m.ChainId + } + return "" +} + +// Detection data used by a detection server performing Fuzzy Message Detection. +type DetectionData struct { + // A list of clues for use with Fuzzy Message Detection. + FmdClues []*v1alpha1.Clue `protobuf:"bytes,4,rep,name=fmd_clues,json=fmdClues,proto3" json:"fmd_clues,omitempty"` +} + +func (m *DetectionData) Reset() { *m = DetectionData{} } +func (m *DetectionData) String() string { return proto.CompactTextString(m) } +func (*DetectionData) ProtoMessage() {} +func (*DetectionData) Descriptor() ([]byte, []int) { + return fileDescriptor_cd20ea79758052c4, []int{6} +} +func (m *DetectionData) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *DetectionData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_DetectionData.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 *DetectionData) XXX_Merge(src proto.Message) { + xxx_messageInfo_DetectionData.Merge(m, src) +} +func (m *DetectionData) XXX_Size() int { + return m.Size() +} +func (m *DetectionData) XXX_DiscardUnknown() { + xxx_messageInfo_DetectionData.DiscardUnknown(m) +} + +var xxx_messageInfo_DetectionData proto.InternalMessageInfo + +func (m *DetectionData) GetFmdClues() []*v1alpha1.Clue { + if m != nil { + return m.FmdClues } + return nil } // A state change performed by a transaction. @@ -333,7 +471,7 @@ func (m *Action) Reset() { *m = Action{} } func (m *Action) String() string { return proto.CompactTextString(m) } func (*Action) ProtoMessage() {} func (*Action) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{4} + return fileDescriptor_cd20ea79758052c4, []int{7} } func (m *Action) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -667,7 +805,7 @@ func (m *TransactionPerspective) Reset() { *m = TransactionPerspective{} func (m *TransactionPerspective) String() string { return proto.CompactTextString(m) } func (*TransactionPerspective) ProtoMessage() {} func (*TransactionPerspective) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{5} + return fileDescriptor_cd20ea79758052c4, []int{8} } func (m *TransactionPerspective) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -746,7 +884,7 @@ func (m *PayloadKey) Reset() { *m = PayloadKey{} } func (m *PayloadKey) String() string { return proto.CompactTextString(m) } func (*PayloadKey) ProtoMessage() {} func (*PayloadKey) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{6} + return fileDescriptor_cd20ea79758052c4, []int{9} } func (m *PayloadKey) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -791,7 +929,7 @@ func (m *PayloadKeyWithCommitment) Reset() { *m = PayloadKeyWithCommitme func (m *PayloadKeyWithCommitment) String() string { return proto.CompactTextString(m) } func (*PayloadKeyWithCommitment) ProtoMessage() {} func (*PayloadKeyWithCommitment) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{7} + return fileDescriptor_cd20ea79758052c4, []int{10} } func (m *PayloadKeyWithCommitment) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -843,7 +981,7 @@ func (m *NullifierWithNote) Reset() { *m = NullifierWithNote{} } func (m *NullifierWithNote) String() string { return proto.CompactTextString(m) } func (*NullifierWithNote) ProtoMessage() {} func (*NullifierWithNote) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{8} + return fileDescriptor_cd20ea79758052c4, []int{11} } func (m *NullifierWithNote) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -901,7 +1039,7 @@ func (m *TransactionView) Reset() { *m = TransactionView{} } func (m *TransactionView) String() string { return proto.CompactTextString(m) } func (*TransactionView) ProtoMessage() {} func (*TransactionView) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{9} + return fileDescriptor_cd20ea79758052c4, []int{12} } func (m *TransactionView) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -954,17 +1092,14 @@ func (m *TransactionView) GetAnchor() *v1alpha1.MerkleRoot { type TransactionBodyView struct { // A list views into of actions (state changes) performed by this transaction. ActionViews []*ActionView `protobuf:"bytes,1,rep,name=action_views,json=actionViews,proto3" json:"action_views,omitempty"` - // The maximum height that this transaction can be included in the chain. - // - // If zero, there is no maximum. - ExpiryHeight uint64 `protobuf:"varint,2,opt,name=expiry_height,json=expiryHeight,proto3" json:"expiry_height,omitempty"` - // The chain this transaction is intended for. Including this prevents - // replaying a transaction on one chain onto a different chain. - ChainId string `protobuf:"bytes,3,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` + // Transaction parameters. + TransactionParameters *TransactionParameters `protobuf:"bytes,2,opt,name=transaction_parameters,json=transactionParameters,proto3" json:"transaction_parameters,omitempty"` // The transaction fee. - Fee *v1alpha1.Fee `protobuf:"bytes,4,opt,name=fee,proto3" json:"fee,omitempty"` - // A list of clues for use with Fuzzy Message Detection. - FmdClues []*v1alpha1.Clue `protobuf:"bytes,5,rep,name=fmd_clues,json=fmdClues,proto3" json:"fmd_clues,omitempty"` + Fee *v1alpha1.Fee `protobuf:"bytes,3,opt,name=fee,proto3" json:"fee,omitempty"` + // Types that are valid to be assigned to XDetectionData: + // + // *TransactionBodyView_DetectionData + XDetectionData isTransactionBodyView_XDetectionData `protobuf_oneof:"_detection_data"` // Types that are valid to be assigned to XMemoView: // // *TransactionBodyView_MemoView @@ -975,7 +1110,7 @@ func (m *TransactionBodyView) Reset() { *m = TransactionBodyView{} } func (m *TransactionBodyView) String() string { return proto.CompactTextString(m) } func (*TransactionBodyView) ProtoMessage() {} func (*TransactionBodyView) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{10} + return fileDescriptor_cd20ea79758052c4, []int{13} } func (m *TransactionBodyView) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1004,18 +1139,33 @@ func (m *TransactionBodyView) XXX_DiscardUnknown() { var xxx_messageInfo_TransactionBodyView proto.InternalMessageInfo +type isTransactionBodyView_XDetectionData interface { + isTransactionBodyView_XDetectionData() + MarshalTo([]byte) (int, error) + Size() int +} type isTransactionBodyView_XMemoView interface { isTransactionBodyView_XMemoView() MarshalTo([]byte) (int, error) Size() int } +type TransactionBodyView_DetectionData struct { + DetectionData *DetectionData `protobuf:"bytes,4,opt,name=detection_data,json=detectionData,proto3,oneof" json:"detection_data,omitempty"` +} type TransactionBodyView_MemoView struct { - MemoView *MemoView `protobuf:"bytes,6,opt,name=memo_view,json=memoView,proto3,oneof" json:"memo_view,omitempty"` + MemoView *MemoView `protobuf:"bytes,5,opt,name=memo_view,json=memoView,proto3,oneof" json:"memo_view,omitempty"` } -func (*TransactionBodyView_MemoView) isTransactionBodyView_XMemoView() {} +func (*TransactionBodyView_DetectionData) isTransactionBodyView_XDetectionData() {} +func (*TransactionBodyView_MemoView) isTransactionBodyView_XMemoView() {} +func (m *TransactionBodyView) GetXDetectionData() isTransactionBodyView_XDetectionData { + if m != nil { + return m.XDetectionData + } + return nil +} func (m *TransactionBodyView) GetXMemoView() isTransactionBodyView_XMemoView { if m != nil { return m.XMemoView @@ -1030,18 +1180,11 @@ func (m *TransactionBodyView) GetActionViews() []*ActionView { return nil } -func (m *TransactionBodyView) GetExpiryHeight() uint64 { - if m != nil { - return m.ExpiryHeight - } - return 0 -} - -func (m *TransactionBodyView) GetChainId() string { +func (m *TransactionBodyView) GetTransactionParameters() *TransactionParameters { if m != nil { - return m.ChainId + return m.TransactionParameters } - return "" + return nil } func (m *TransactionBodyView) GetFee() *v1alpha1.Fee { @@ -1051,9 +1194,9 @@ func (m *TransactionBodyView) GetFee() *v1alpha1.Fee { return nil } -func (m *TransactionBodyView) GetFmdClues() []*v1alpha1.Clue { - if m != nil { - return m.FmdClues +func (m *TransactionBodyView) GetDetectionData() *DetectionData { + if x, ok := m.GetXDetectionData().(*TransactionBodyView_DetectionData); ok { + return x.DetectionData } return nil } @@ -1068,6 +1211,7 @@ func (m *TransactionBodyView) GetMemoView() *MemoView { // XXX_OneofWrappers is for the internal use of the proto package. func (*TransactionBodyView) XXX_OneofWrappers() []interface{} { return []interface{}{ + (*TransactionBodyView_DetectionData)(nil), (*TransactionBodyView_MemoView)(nil), } } @@ -1105,7 +1249,7 @@ func (m *ActionView) Reset() { *m = ActionView{} } func (m *ActionView) String() string { return proto.CompactTextString(m) } func (*ActionView) ProtoMessage() {} func (*ActionView) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{11} + return fileDescriptor_cd20ea79758052c4, []int{14} } func (m *ActionView) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1431,7 +1575,7 @@ func (m *SpendView) Reset() { *m = SpendView{} } func (m *SpendView) String() string { return proto.CompactTextString(m) } func (*SpendView) ProtoMessage() {} func (*SpendView) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{12} + return fileDescriptor_cd20ea79758052c4, []int{15} } func (m *SpendView) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1514,7 +1658,7 @@ func (m *SpendView_Visible) Reset() { *m = SpendView_Visible{} } func (m *SpendView_Visible) String() string { return proto.CompactTextString(m) } func (*SpendView_Visible) ProtoMessage() {} func (*SpendView_Visible) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{12, 0} + return fileDescriptor_cd20ea79758052c4, []int{15, 0} } func (m *SpendView_Visible) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1565,7 +1709,7 @@ func (m *SpendView_Opaque) Reset() { *m = SpendView_Opaque{} } func (m *SpendView_Opaque) String() string { return proto.CompactTextString(m) } func (*SpendView_Opaque) ProtoMessage() {} func (*SpendView_Opaque) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{12, 1} + return fileDescriptor_cd20ea79758052c4, []int{15, 1} } func (m *SpendView_Opaque) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1613,7 +1757,7 @@ func (m *DelegatorVoteView) Reset() { *m = DelegatorVoteView{} } func (m *DelegatorVoteView) String() string { return proto.CompactTextString(m) } func (*DelegatorVoteView) ProtoMessage() {} func (*DelegatorVoteView) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{13} + return fileDescriptor_cd20ea79758052c4, []int{16} } func (m *DelegatorVoteView) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1696,7 +1840,7 @@ func (m *DelegatorVoteView_Visible) Reset() { *m = DelegatorVoteView_Vis func (m *DelegatorVoteView_Visible) String() string { return proto.CompactTextString(m) } func (*DelegatorVoteView_Visible) ProtoMessage() {} func (*DelegatorVoteView_Visible) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{13, 0} + return fileDescriptor_cd20ea79758052c4, []int{16, 0} } func (m *DelegatorVoteView_Visible) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1747,7 +1891,7 @@ func (m *DelegatorVoteView_Opaque) Reset() { *m = DelegatorVoteView_Opaq func (m *DelegatorVoteView_Opaque) String() string { return proto.CompactTextString(m) } func (*DelegatorVoteView_Opaque) ProtoMessage() {} func (*DelegatorVoteView_Opaque) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{13, 1} + return fileDescriptor_cd20ea79758052c4, []int{16, 1} } func (m *DelegatorVoteView_Opaque) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1795,7 +1939,7 @@ func (m *OutputView) Reset() { *m = OutputView{} } func (m *OutputView) String() string { return proto.CompactTextString(m) } func (*OutputView) ProtoMessage() {} func (*OutputView) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{14} + return fileDescriptor_cd20ea79758052c4, []int{17} } func (m *OutputView) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1879,7 +2023,7 @@ func (m *OutputView_Visible) Reset() { *m = OutputView_Visible{} } func (m *OutputView_Visible) String() string { return proto.CompactTextString(m) } func (*OutputView_Visible) ProtoMessage() {} func (*OutputView_Visible) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{14, 0} + return fileDescriptor_cd20ea79758052c4, []int{17, 0} } func (m *OutputView_Visible) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1937,7 +2081,7 @@ func (m *OutputView_Opaque) Reset() { *m = OutputView_Opaque{} } func (m *OutputView_Opaque) String() string { return proto.CompactTextString(m) } func (*OutputView_Opaque) ProtoMessage() {} func (*OutputView_Opaque) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{14, 1} + return fileDescriptor_cd20ea79758052c4, []int{17, 1} } func (m *OutputView_Opaque) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1987,7 +2131,7 @@ func (m *Spend) Reset() { *m = Spend{} } func (m *Spend) String() string { return proto.CompactTextString(m) } func (*Spend) ProtoMessage() {} func (*Spend) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{15} + return fileDescriptor_cd20ea79758052c4, []int{18} } func (m *Spend) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2053,7 +2197,7 @@ func (m *SpendBody) Reset() { *m = SpendBody{} } func (m *SpendBody) String() string { return proto.CompactTextString(m) } func (*SpendBody) ProtoMessage() {} func (*SpendBody) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{16} + return fileDescriptor_cd20ea79758052c4, []int{19} } func (m *SpendBody) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2115,7 +2259,7 @@ func (m *Output) Reset() { *m = Output{} } func (m *Output) String() string { return proto.CompactTextString(m) } func (*Output) ProtoMessage() {} func (*Output) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{17} + return fileDescriptor_cd20ea79758052c4, []int{20} } func (m *Output) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2177,7 +2321,7 @@ func (m *OutputBody) Reset() { *m = OutputBody{} } func (m *OutputBody) String() string { return proto.CompactTextString(m) } func (*OutputBody) ProtoMessage() {} func (*OutputBody) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{18} + return fileDescriptor_cd20ea79758052c4, []int{21} } func (m *OutputBody) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2250,7 +2394,7 @@ func (m *AuthorizationData) Reset() { *m = AuthorizationData{} } func (m *AuthorizationData) String() string { return proto.CompactTextString(m) } func (*AuthorizationData) ProtoMessage() {} func (*AuthorizationData) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{19} + return fileDescriptor_cd20ea79758052c4, []int{22} } func (m *AuthorizationData) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2313,7 +2457,7 @@ func (m *WitnessData) Reset() { *m = WitnessData{} } func (m *WitnessData) String() string { return proto.CompactTextString(m) } func (*WitnessData) ProtoMessage() {} func (*WitnessData) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{20} + return fileDescriptor_cd20ea79758052c4, []int{23} } func (m *WitnessData) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2370,7 +2514,7 @@ func (m *TransactionPlan) Reset() { *m = TransactionPlan{} } func (m *TransactionPlan) String() string { return proto.CompactTextString(m) } func (*TransactionPlan) ProtoMessage() {} func (*TransactionPlan) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{21} + return fileDescriptor_cd20ea79758052c4, []int{24} } func (m *TransactionPlan) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2477,7 +2621,7 @@ func (m *ActionPlan) Reset() { *m = ActionPlan{} } func (m *ActionPlan) String() string { return proto.CompactTextString(m) } func (*ActionPlan) ProtoMessage() {} func (*ActionPlan) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{22} + return fileDescriptor_cd20ea79758052c4, []int{25} } func (m *ActionPlan) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2805,7 +2949,7 @@ func (m *CluePlan) Reset() { *m = CluePlan{} } func (m *CluePlan) String() string { return proto.CompactTextString(m) } func (*CluePlan) ProtoMessage() {} func (*CluePlan) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{23} + return fileDescriptor_cd20ea79758052c4, []int{26} } func (m *CluePlan) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2867,7 +3011,7 @@ func (m *MemoPlan) Reset() { *m = MemoPlan{} } func (m *MemoPlan) String() string { return proto.CompactTextString(m) } func (*MemoPlan) ProtoMessage() {} func (*MemoPlan) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{24} + return fileDescriptor_cd20ea79758052c4, []int{27} } func (m *MemoPlan) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2918,7 +3062,7 @@ func (m *MemoCiphertext) Reset() { *m = MemoCiphertext{} } func (m *MemoCiphertext) String() string { return proto.CompactTextString(m) } func (*MemoCiphertext) ProtoMessage() {} func (*MemoCiphertext) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{25} + return fileDescriptor_cd20ea79758052c4, []int{28} } func (m *MemoCiphertext) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2963,7 +3107,7 @@ func (m *MemoPlaintext) Reset() { *m = MemoPlaintext{} } func (m *MemoPlaintext) String() string { return proto.CompactTextString(m) } func (*MemoPlaintext) ProtoMessage() {} func (*MemoPlaintext) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{26} + return fileDescriptor_cd20ea79758052c4, []int{29} } func (m *MemoPlaintext) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3018,7 +3162,7 @@ func (m *MemoView) Reset() { *m = MemoView{} } func (m *MemoView) String() string { return proto.CompactTextString(m) } func (*MemoView) ProtoMessage() {} func (*MemoView) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{27} + return fileDescriptor_cd20ea79758052c4, []int{30} } func (m *MemoView) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3101,7 +3245,7 @@ func (m *MemoView_Visible) Reset() { *m = MemoView_Visible{} } func (m *MemoView_Visible) String() string { return proto.CompactTextString(m) } func (*MemoView_Visible) ProtoMessage() {} func (*MemoView_Visible) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{27, 0} + return fileDescriptor_cd20ea79758052c4, []int{30, 0} } func (m *MemoView_Visible) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3152,7 +3296,7 @@ func (m *MemoView_Opaque) Reset() { *m = MemoView_Opaque{} } func (m *MemoView_Opaque) String() string { return proto.CompactTextString(m) } func (*MemoView_Opaque) ProtoMessage() {} func (*MemoView_Opaque) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{27, 1} + return fileDescriptor_cd20ea79758052c4, []int{30, 1} } func (m *MemoView_Opaque) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3197,13 +3341,17 @@ type SpendPlan struct { Randomizer []byte `protobuf:"bytes,3,opt,name=randomizer,proto3" json:"randomizer,omitempty"` // The blinding factor to use for the value commitment. ValueBlinding []byte `protobuf:"bytes,4,opt,name=value_blinding,json=valueBlinding,proto3" json:"value_blinding,omitempty"` + // The first blinding factor to use for the ZK spend proof. + ProofBlindingR []byte `protobuf:"bytes,5,opt,name=proof_blinding_r,json=proofBlindingR,proto3" json:"proof_blinding_r,omitempty"` + // The second blinding factor to use for the ZK spend proof. + ProofBlindingS []byte `protobuf:"bytes,6,opt,name=proof_blinding_s,json=proofBlindingS,proto3" json:"proof_blinding_s,omitempty"` } func (m *SpendPlan) Reset() { *m = SpendPlan{} } func (m *SpendPlan) String() string { return proto.CompactTextString(m) } func (*SpendPlan) ProtoMessage() {} func (*SpendPlan) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{28} + return fileDescriptor_cd20ea79758052c4, []int{31} } func (m *SpendPlan) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3260,6 +3408,20 @@ func (m *SpendPlan) GetValueBlinding() []byte { return nil } +func (m *SpendPlan) GetProofBlindingR() []byte { + if m != nil { + return m.ProofBlindingR + } + return nil +} + +func (m *SpendPlan) GetProofBlindingS() []byte { + if m != nil { + return m.ProofBlindingS + } + return nil +} + type OutputPlan struct { // The value to send to this output. Value *v1alpha1.Value `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` @@ -3269,13 +3431,17 @@ type OutputPlan struct { Rseed []byte `protobuf:"bytes,3,opt,name=rseed,proto3" json:"rseed,omitempty"` // The blinding factor to use for the value commitment. ValueBlinding []byte `protobuf:"bytes,4,opt,name=value_blinding,json=valueBlinding,proto3" json:"value_blinding,omitempty"` + // The first blinding factor to use for the ZK output proof. + ProofBlindingR []byte `protobuf:"bytes,5,opt,name=proof_blinding_r,json=proofBlindingR,proto3" json:"proof_blinding_r,omitempty"` + // The second blinding factor to use for the ZK output proof. + ProofBlindingS []byte `protobuf:"bytes,6,opt,name=proof_blinding_s,json=proofBlindingS,proto3" json:"proof_blinding_s,omitempty"` } func (m *OutputPlan) Reset() { *m = OutputPlan{} } func (m *OutputPlan) String() string { return proto.CompactTextString(m) } func (*OutputPlan) ProtoMessage() {} func (*OutputPlan) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{29} + return fileDescriptor_cd20ea79758052c4, []int{32} } func (m *OutputPlan) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3332,11 +3498,28 @@ func (m *OutputPlan) GetValueBlinding() []byte { return nil } +func (m *OutputPlan) GetProofBlindingR() []byte { + if m != nil { + return m.ProofBlindingR + } + return nil +} + +func (m *OutputPlan) GetProofBlindingS() []byte { + if m != nil { + return m.ProofBlindingS + } + return nil +} + func init() { proto.RegisterType((*Transaction)(nil), "penumbra.core.transaction.v1alpha1.Transaction") proto.RegisterType((*Id)(nil), "penumbra.core.transaction.v1alpha1.Id") proto.RegisterType((*EffectHash)(nil), "penumbra.core.transaction.v1alpha1.EffectHash") proto.RegisterType((*TransactionBody)(nil), "penumbra.core.transaction.v1alpha1.TransactionBody") + proto.RegisterType((*MemoData)(nil), "penumbra.core.transaction.v1alpha1.MemoData") + proto.RegisterType((*TransactionParameters)(nil), "penumbra.core.transaction.v1alpha1.TransactionParameters") + proto.RegisterType((*DetectionData)(nil), "penumbra.core.transaction.v1alpha1.DetectionData") proto.RegisterType((*Action)(nil), "penumbra.core.transaction.v1alpha1.Action") proto.RegisterType((*TransactionPerspective)(nil), "penumbra.core.transaction.v1alpha1.TransactionPerspective") proto.RegisterType((*PayloadKey)(nil), "penumbra.core.transaction.v1alpha1.PayloadKey") @@ -3378,173 +3561,182 @@ func init() { } var fileDescriptor_cd20ea79758052c4 = []byte{ - // 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, - 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, 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, 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, + // 2795 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5b, 0xcf, 0x6f, 0xe3, 0xc6, + 0xf5, 0x17, 0x25, 0xdb, 0x6b, 0x3f, 0xc9, 0x5a, 0x7b, 0xf6, 0x47, 0xf4, 0x35, 0xbe, 0x70, 0x16, + 0x4c, 0xb2, 0xf5, 0x6e, 0x12, 0x39, 0xeb, 0xdd, 0x4d, 0x50, 0x27, 0x6d, 0x63, 0xd9, 0xd9, 0xc8, + 0xbb, 0xf1, 0x5a, 0xa1, 0x53, 0xbb, 0x49, 0x9d, 0xb0, 0x23, 0x72, 0x6c, 0x11, 0x96, 0x48, 0x96, + 0xa4, 0xe4, 0x75, 0xfe, 0x81, 0xa6, 0x97, 0x22, 0x05, 0x7a, 0x28, 0x7a, 0x29, 0x50, 0xe4, 0xd4, + 0x43, 0xff, 0x80, 0x16, 0x3d, 0x37, 0x68, 0x2f, 0x01, 0x7a, 0x29, 0x10, 0x14, 0x48, 0x37, 0xa7, + 0xfe, 0xb8, 0xf4, 0xdc, 0x4b, 0x31, 0x3f, 0x38, 0x24, 0x25, 0x7a, 0x45, 0xd9, 0x4e, 0x83, 0xfc, + 0x38, 0x99, 0xf3, 0xfc, 0xde, 0x67, 0x66, 0xde, 0x7b, 0x33, 0xf3, 0xde, 0x9b, 0x11, 0xdc, 0x72, + 0x89, 0xdd, 0xed, 0x34, 0x3d, 0xbc, 0x68, 0x38, 0x1e, 0x59, 0x0c, 0x3c, 0x6c, 0xfb, 0xd8, 0x08, + 0x2c, 0xc7, 0x5e, 0xec, 0xdd, 0xc0, 0x6d, 0xb7, 0x85, 0x6f, 0xc4, 0x89, 0x55, 0xd7, 0x73, 0x02, + 0x07, 0xa9, 0xa1, 0x54, 0x95, 0x4a, 0x55, 0xe3, 0x0c, 0xa1, 0xd4, 0xdc, 0xf5, 0x24, 0xb2, 0xe1, + 0x1d, 0xb9, 0x81, 0x13, 0x81, 0xf2, 0x36, 0xc7, 0x9b, 0x5b, 0x48, 0xf2, 0xfa, 0x01, 0x3e, 0x20, + 0x11, 0x2b, 0x6b, 0x0a, 0xce, 0x27, 0x93, 0x9c, 0x56, 0xd3, 0x88, 0xf8, 0xac, 0xa6, 0x91, 0xce, + 0x65, 0x92, 0x07, 0x11, 0x97, 0x49, 0x1e, 0x08, 0xae, 0xa5, 0x24, 0xd7, 0xbe, 0xd3, 0x23, 0x9e, + 0x8d, 0x6d, 0x23, 0xd6, 0x75, 0x44, 0xe3, 0x32, 0xea, 0x6f, 0x15, 0x28, 0xbe, 0x11, 0x4d, 0x17, + 0xbd, 0x0a, 0x63, 0x4d, 0xc7, 0x3c, 0xaa, 0x28, 0x57, 0x94, 0x85, 0xe2, 0xd2, 0xcd, 0xea, 0x70, + 0xc5, 0x54, 0x63, 0xe2, 0x35, 0xc7, 0x3c, 0xd2, 0x18, 0x00, 0x7a, 0x1c, 0x8a, 0x4d, 0xcb, 0x36, + 0x2d, 0x7b, 0x5f, 0xf7, 0xad, 0xfd, 0x4a, 0xfe, 0x8a, 0xb2, 0x50, 0xd2, 0x40, 0x90, 0xb6, 0xac, + 0x7d, 0xb4, 0x02, 0x13, 0xd8, 0x36, 0x5a, 0x8e, 0x57, 0x29, 0xb0, 0xbe, 0xae, 0xf5, 0xf5, 0x25, + 0x14, 0x2a, 0xbb, 0xd9, 0x20, 0xde, 0x41, 0x9b, 0x68, 0x8e, 0x13, 0x68, 0x42, 0x50, 0xad, 0x40, + 0x7e, 0xdd, 0x44, 0x08, 0xc6, 0x5a, 0xd8, 0x6f, 0xb1, 0x21, 0x97, 0x34, 0xf6, 0xad, 0xaa, 0x00, + 0xaf, 0xec, 0xed, 0x11, 0x23, 0xa8, 0x63, 0xbf, 0x85, 0x2e, 0xc2, 0xb8, 0x65, 0xdb, 0xc4, 0x13, + 0x2c, 0xbc, 0xa1, 0x7e, 0x50, 0x80, 0xf3, 0x7d, 0x63, 0x47, 0x6b, 0x70, 0x8e, 0xb7, 0xfc, 0x8a, + 0x72, 0xa5, 0xb0, 0x50, 0x5c, 0xba, 0x9e, 0x45, 0x03, 0x2b, 0xac, 0xad, 0x85, 0xa2, 0xc8, 0x85, + 0xcb, 0x31, 0x3e, 0xdd, 0xc5, 0x1e, 0xee, 0x90, 0x80, 0x78, 0x3e, 0x53, 0x43, 0x71, 0xe9, 0x9b, + 0x23, 0xaa, 0xb5, 0x21, 0x01, 0xb4, 0x4b, 0x41, 0x1a, 0x19, 0xdd, 0x82, 0xc2, 0x1e, 0x21, 0x42, + 0x93, 0xea, 0x10, 0x4d, 0xde, 0x21, 0x44, 0xa3, 0xec, 0xe8, 0x7b, 0x50, 0x36, 0x49, 0x40, 0xf8, + 0x28, 0x4d, 0x1c, 0xe0, 0xca, 0x18, 0x03, 0xb8, 0x91, 0x65, 0x7c, 0x6b, 0xa1, 0xe4, 0x1a, 0x0e, + 0xb0, 0x36, 0x6d, 0xc6, 0x9b, 0x68, 0x1d, 0xa6, 0x3a, 0xa4, 0xe3, 0x70, 0xd0, 0x71, 0x06, 0xfa, + 0x4c, 0x16, 0xd0, 0x0d, 0xd2, 0x71, 0x18, 0xde, 0x64, 0x47, 0x7c, 0xa9, 0xeb, 0x30, 0x19, 0x52, + 0xd1, 0x75, 0x28, 0x13, 0x9b, 0x4d, 0x87, 0x98, 0x3a, 0xe5, 0xe0, 0x16, 0xad, 0xe7, 0xb4, 0x69, + 0x49, 0xa7, 0xcc, 0xef, 0x29, 0x4a, 0x6d, 0x16, 0xce, 0xeb, 0x49, 0x66, 0x75, 0x07, 0x2e, 0xa5, + 0x6a, 0x15, 0x3d, 0x01, 0xd3, 0xe4, 0x81, 0x6b, 0x79, 0x47, 0x7a, 0x8b, 0x58, 0xfb, 0xad, 0x80, + 0xc1, 0x8e, 0x69, 0x25, 0x4e, 0xac, 0x33, 0x1a, 0xfa, 0x3f, 0x98, 0x34, 0x5a, 0xd8, 0xb2, 0x75, + 0xcb, 0x64, 0x76, 0x9c, 0xd2, 0xce, 0xb1, 0xf6, 0xba, 0xa9, 0xbe, 0x0e, 0xd3, 0x09, 0x75, 0xa0, + 0x97, 0x61, 0x6a, 0xaf, 0x63, 0xea, 0x46, 0xbb, 0x4b, 0xfc, 0xca, 0x18, 0xf3, 0xa4, 0x27, 0x86, + 0x58, 0x65, 0xb5, 0xdd, 0x25, 0xda, 0xe4, 0x5e, 0xc7, 0xa4, 0x1f, 0xbe, 0xfa, 0xe7, 0x32, 0x4c, + 0x70, 0xbf, 0x42, 0x2b, 0x30, 0xee, 0xbb, 0xc4, 0x36, 0xc5, 0xa2, 0xbc, 0x96, 0x45, 0x91, 0x5b, + 0x54, 0xa0, 0x9e, 0xd3, 0xb8, 0x24, 0x5a, 0x83, 0x09, 0xa7, 0x1b, 0xb8, 0xdd, 0x40, 0x78, 0x60, + 0x26, 0xb7, 0xde, 0x64, 0x12, 0xf5, 0x9c, 0x26, 0x64, 0xd1, 0xf3, 0x30, 0xe6, 0x1f, 0x62, 0x57, + 0xb8, 0xd9, 0x95, 0x3e, 0x0c, 0xba, 0x11, 0x45, 0xfd, 0x1f, 0x62, 0xb7, 0x9e, 0xd3, 0x18, 0x3f, + 0xba, 0x03, 0x40, 0xff, 0xea, 0x46, 0x1b, 0x5b, 0x1d, 0xe1, 0x63, 0x4f, 0x0d, 0x93, 0x5e, 0xa5, + 0xcc, 0xf5, 0x9c, 0x36, 0xe5, 0x87, 0x0d, 0xb4, 0x07, 0x17, 0x7b, 0xb8, 0x6d, 0x99, 0x38, 0x70, + 0x3c, 0xdd, 0x24, 0x7b, 0x96, 0x6d, 0xd1, 0x11, 0x57, 0x66, 0x52, 0xbd, 0x96, 0x6f, 0xb3, 0x12, + 0x73, 0x3b, 0x94, 0x5c, 0x93, 0x82, 0xf5, 0x9c, 0x76, 0xa1, 0x37, 0x48, 0xa6, 0xe3, 0xb5, 0x9a, + 0x86, 0xce, 0xf5, 0x51, 0x99, 0x4d, 0x1d, 0x2f, 0xdd, 0x9c, 0x25, 0xf6, 0x7a, 0xd3, 0xe0, 0xb6, + 0xa2, 0xe3, 0xb5, 0xc2, 0x06, 0xda, 0x85, 0xf3, 0xae, 0xe7, 0xb8, 0x8e, 0x8f, 0xdb, 0xba, 0xdf, + 0x6d, 0x76, 0xac, 0xa0, 0x82, 0x52, 0x87, 0x1a, 0xdb, 0x96, 0x25, 0x66, 0x43, 0x48, 0x6e, 0x31, + 0xc1, 0x7a, 0x4e, 0x2b, 0xbb, 0x09, 0x0a, 0x6a, 0xc2, 0xac, 0x44, 0x3f, 0xb4, 0x82, 0x96, 0xe9, + 0xe1, 0xc3, 0xca, 0x85, 0xd4, 0x7d, 0xfb, 0x51, 0xf8, 0x3b, 0x42, 0xb4, 0x9e, 0xd3, 0x66, 0xdc, + 0x3e, 0x1a, 0x7a, 0x13, 0xca, 0x91, 0xc6, 0x7b, 0x4e, 0x40, 0x2a, 0x17, 0x59, 0x07, 0xcf, 0x65, + 0xe8, 0x40, 0x2a, 0x7c, 0xdb, 0x09, 0x08, 0x5d, 0xa2, 0xbd, 0x38, 0x81, 0x42, 0x9b, 0xa4, 0x4d, + 0xf6, 0x23, 0xe8, 0x4b, 0x99, 0xa1, 0xd7, 0x42, 0xc1, 0x10, 0xda, 0x8c, 0x13, 0x90, 0x03, 0x97, + 0xa5, 0x66, 0x4c, 0xe2, 0x3a, 0xbe, 0x15, 0x08, 0xdf, 0xbb, 0xcc, 0xba, 0x78, 0x61, 0x04, 0xf5, + 0xac, 0x71, 0xf9, 0xd0, 0x1b, 0x2f, 0xba, 0x29, 0x74, 0xb4, 0x09, 0xd3, 0xac, 0x45, 0xf7, 0x51, + 0xc7, 0x25, 0x76, 0x65, 0x9e, 0xf5, 0xb3, 0xf0, 0x28, 0x1f, 0x6f, 0x08, 0x81, 0x4d, 0x97, 0x50, + 0xb7, 0x29, 0xb9, 0xb1, 0x36, 0xd2, 0xa0, 0x2c, 0x01, 0x8d, 0xb6, 0xe3, 0x93, 0xca, 0xe3, 0xa9, + 0x6b, 0x3f, 0x15, 0x71, 0x95, 0x0a, 0x50, 0xad, 0xb8, 0x71, 0x02, 0xfa, 0x3e, 0xcc, 0x4a, 0x4c, + 0xe9, 0x2f, 0x57, 0x52, 0xf7, 0xe6, 0x54, 0xd8, 0x84, 0xa3, 0xf4, 0xd1, 0x10, 0x81, 0x4b, 0x12, + 0xdc, 0x23, 0x87, 0xd8, 0x33, 0x85, 0xc6, 0x55, 0xd6, 0xc1, 0x62, 0x96, 0x0e, 0x34, 0x26, 0x17, + 0x6a, 0xfa, 0x82, 0x3b, 0x48, 0x46, 0x6b, 0x30, 0x29, 0x4c, 0x4d, 0x2a, 0x0b, 0x0c, 0xf9, 0xea, + 0xa3, 0x57, 0xbd, 0xf0, 0x14, 0xaa, 0x0e, 0x29, 0x89, 0xee, 0x02, 0x74, 0x6d, 0x89, 0x73, 0x2d, + 0xd5, 0x56, 0x7d, 0x38, 0xdf, 0x95, 0xfc, 0xf5, 0x9c, 0x16, 0x93, 0x46, 0x6f, 0xc1, 0x4c, 0xd4, + 0x12, 0x73, 0xbe, 0xce, 0x10, 0x9f, 0xcd, 0x8a, 0x18, 0xce, 0xf8, 0x7c, 0x37, 0x49, 0x42, 0x77, + 0x61, 0xca, 0xc4, 0x8e, 0xce, 0x37, 0xff, 0x25, 0x06, 0xfa, 0x74, 0x96, 0xd5, 0x81, 0x9d, 0x70, + 0xfb, 0x9f, 0x34, 0xc5, 0x37, 0xda, 0x00, 0xa0, 0x58, 0xe2, 0x14, 0xb8, 0x99, 0x6a, 0xf6, 0x63, + 0xc0, 0xe4, 0x39, 0x40, 0x47, 0xc3, 0x1b, 0xa8, 0x01, 0x45, 0x0a, 0x27, 0x56, 0x57, 0xe5, 0x56, + 0xea, 0x8c, 0x8f, 0xc1, 0x13, 0x4b, 0x87, 0x2a, 0xd2, 0x94, 0x2d, 0xf4, 0x26, 0xcc, 0x58, 0x86, + 0xbf, 0xf4, 0x9c, 0xf4, 0x4d, 0xdc, 0xae, 0x7c, 0xa8, 0xa4, 0x4e, 0x3a, 0xb9, 0xf7, 0x52, 0xa1, + 0x1d, 0x29, 0x43, 0xf5, 0x68, 0x25, 0x49, 0xb5, 0x49, 0x98, 0xe0, 0x7b, 0xb9, 0xfa, 0xe3, 0x31, + 0xb8, 0x1c, 0x0f, 0x01, 0x88, 0xe7, 0xbb, 0xf4, 0xd8, 0xee, 0x11, 0xa4, 0x43, 0xc9, 0xc5, 0x47, + 0x6d, 0x07, 0x9b, 0xfa, 0x01, 0x39, 0x0a, 0xe3, 0xbf, 0x97, 0xb2, 0x1c, 0x94, 0x0d, 0x2e, 0x77, + 0x8f, 0x1c, 0xd1, 0x4e, 0x57, 0x9d, 0x4e, 0xc7, 0x0a, 0x3a, 0xc4, 0x0e, 0xb4, 0xa2, 0x2b, 0xff, + 0xe3, 0xa3, 0x1f, 0xc0, 0x0c, 0xb3, 0xa4, 0x6e, 0x77, 0xdb, 0x6d, 0x6b, 0xcf, 0xe2, 0xf1, 0x20, + 0xed, 0xe4, 0x76, 0x96, 0x4e, 0xee, 0x87, 0x52, 0xb4, 0x8f, 0xfb, 0x4e, 0x40, 0xb4, 0xf3, 0x0c, + 0x4e, 0xd2, 0x7d, 0x74, 0x07, 0x4a, 0xd8, 0xec, 0x59, 0x06, 0xd1, 0x6d, 0x27, 0x20, 0x7e, 0xa5, + 0x90, 0x29, 0xf0, 0x60, 0x58, 0x45, 0x2e, 0x48, 0xbf, 0x7d, 0xba, 0x9d, 0x61, 0xd3, 0xf4, 0x88, + 0xef, 0xeb, 0x3d, 0x8b, 0x1c, 0x86, 0x11, 0xcc, 0xf5, 0x21, 0x40, 0x2b, 0x5c, 0x66, 0xdb, 0x22, + 0x87, 0x5a, 0x09, 0x47, 0x0d, 0x9f, 0x86, 0x1f, 0x26, 0xb1, 0x9d, 0x8e, 0x5f, 0x19, 0x67, 0x48, + 0xcf, 0x0c, 0x41, 0x5a, 0xa3, 0xcc, 0x1b, 0x24, 0xc0, 0x34, 0x7e, 0xd4, 0x84, 0x2c, 0xda, 0x80, + 0x72, 0x3c, 0xac, 0xb6, 0xcc, 0xca, 0x44, 0xea, 0x16, 0x90, 0xaa, 0xbe, 0x75, 0x53, 0x9b, 0x8e, + 0xfd, 0x63, 0xdd, 0xa4, 0x39, 0x42, 0x64, 0xb8, 0x63, 0x72, 0x84, 0xdf, 0x29, 0x50, 0x39, 0xce, + 0xba, 0x68, 0x13, 0x8a, 0x31, 0x8f, 0x11, 0xd1, 0x59, 0x75, 0x34, 0x87, 0xd1, 0x20, 0x72, 0x11, + 0x74, 0x1f, 0xc0, 0x90, 0xf0, 0x22, 0x52, 0xab, 0x0e, 0x51, 0xd5, 0x56, 0x40, 0xb7, 0x8b, 0xc8, + 0xe5, 0x62, 0x08, 0xea, 0xcf, 0x14, 0x98, 0x1d, 0x70, 0x1b, 0x74, 0x07, 0xa6, 0xa4, 0x07, 0x8a, + 0x41, 0x2f, 0x0c, 0x73, 0x91, 0x90, 0x5f, 0x8b, 0x44, 0xd1, 0x0b, 0x30, 0x46, 0xdd, 0x4c, 0x8c, + 0x33, 0x93, 0x97, 0x31, 0x01, 0xf5, 0x4f, 0x4a, 0x22, 0xf1, 0xa2, 0x2e, 0x82, 0xde, 0x80, 0x29, + 0x9a, 0x36, 0x32, 0x7f, 0x13, 0x83, 0x7a, 0xe1, 0x04, 0xc9, 0x27, 0xf3, 0xbd, 0xc9, 0xa6, 0xf8, + 0xfa, 0x9f, 0x24, 0xa1, 0x9f, 0x14, 0xe0, 0x42, 0xca, 0x28, 0xd0, 0xeb, 0x50, 0x12, 0x8e, 0xca, + 0xd7, 0x10, 0xdf, 0x4f, 0xaa, 0xd9, 0xf3, 0x49, 0x36, 0x97, 0x62, 0xa4, 0xa3, 0x2f, 0x4e, 0x5e, + 0xf9, 0xf6, 0x99, 0xe5, 0x95, 0x3c, 0xb6, 0x8b, 0x11, 0xde, 0x53, 0x14, 0x74, 0x5f, 0x24, 0x97, + 0xcc, 0x57, 0x46, 0x4c, 0x2e, 0xa9, 0x22, 0xeb, 0x0a, 0x4f, 0x2f, 0xe9, 0x77, 0x98, 0x29, 0x26, + 0xc7, 0x5b, 0x2b, 0x01, 0xe8, 0xb2, 0x0f, 0xf5, 0xdf, 0x65, 0x80, 0xc8, 0x26, 0xe8, 0x95, 0x64, + 0x3e, 0xf6, 0x6c, 0xe6, 0x7c, 0x8c, 0x75, 0x2e, 0x73, 0xb2, 0x7a, 0x5f, 0x4e, 0x56, 0xcd, 0x9e, + 0x93, 0x09, 0xa0, 0x30, 0x2f, 0x5b, 0x4e, 0xe4, 0x65, 0x4f, 0x0e, 0xcb, 0xac, 0x84, 0x34, 0xcf, + 0xcd, 0xee, 0xa6, 0xe4, 0x66, 0xd7, 0x32, 0xe5, 0x66, 0x02, 0xe6, 0xeb, 0xfc, 0xec, 0xcb, 0x99, + 0x9f, 0xbd, 0x73, 0x4c, 0x7e, 0x76, 0x3b, 0xdb, 0x22, 0x8e, 0xe5, 0x63, 0xc2, 0x51, 0xbe, 0x4e, + 0xd2, 0xbe, 0x82, 0x49, 0xda, 0xb5, 0x33, 0x4a, 0xd2, 0xae, 0x9f, 0x2a, 0x49, 0xfb, 0x4a, 0x25, + 0x52, 0x69, 0x19, 0xe9, 0xd3, 0x67, 0x94, 0x91, 0x7e, 0x86, 0x49, 0xda, 0x34, 0x14, 0x63, 0xf1, + 0x92, 0xfa, 0xd3, 0x02, 0x4c, 0xc9, 0x43, 0x13, 0xbd, 0x0e, 0xe7, 0x7a, 0x96, 0x6f, 0x35, 0xdb, + 0x44, 0x1c, 0xba, 0xb7, 0x47, 0x3a, 0x74, 0xab, 0xdb, 0x5c, 0xb8, 0x9e, 0xd3, 0x42, 0x1c, 0x74, + 0x1f, 0x26, 0x1c, 0x17, 0xff, 0xb0, 0x1b, 0x06, 0xb0, 0xb7, 0x46, 0x43, 0xdc, 0x64, 0xb2, 0xec, + 0x10, 0x66, 0x5f, 0x73, 0x3f, 0x52, 0xe0, 0x9c, 0xe8, 0x06, 0x7d, 0xe7, 0xa4, 0x15, 0xdb, 0x30, + 0x36, 0x78, 0x31, 0x11, 0x5b, 0x7f, 0x23, 0x43, 0x6c, 0xcd, 0xa2, 0x45, 0x26, 0x34, 0xb7, 0x0e, + 0x13, 0x7c, 0x74, 0xa7, 0x1e, 0x07, 0x8d, 0x83, 0x78, 0xce, 0xca, 0x6c, 0xf2, 0xd7, 0x02, 0xcc, + 0x0e, 0xec, 0xec, 0xe8, 0xcd, 0x7e, 0xdb, 0x7c, 0xeb, 0x44, 0x27, 0x44, 0x9a, 0x8d, 0xb6, 0xfb, + 0x6c, 0xf4, 0xd2, 0xc9, 0x90, 0x07, 0x6c, 0xf5, 0xcb, 0x98, 0xad, 0x76, 0x06, 0xce, 0x39, 0xe5, + 0x64, 0x75, 0xc8, 0xfe, 0x03, 0xee, 0x54, 0x36, 0xc4, 0xd2, 0x86, 0x9f, 0xd5, 0xf8, 0x6a, 0x33, + 0xfd, 0xc0, 0xea, 0xbf, 0x0a, 0x00, 0x51, 0x80, 0x89, 0xb4, 0x7e, 0xc3, 0x3e, 0x3f, 0x5a, 0x84, + 0x9a, 0x66, 0xd1, 0xcd, 0x3e, 0x8b, 0xde, 0x1e, 0x11, 0x72, 0xc0, 0x94, 0x1f, 0xc7, 0x4c, 0x59, + 0x93, 0x11, 0xb5, 0x32, 0xea, 0x2d, 0x87, 0x8c, 0xa5, 0x4f, 0x63, 0xb5, 0xfe, 0x8a, 0x40, 0xe1, + 0xb4, 0x15, 0x81, 0xb9, 0xd7, 0xa4, 0x1b, 0x9c, 0xc1, 0xdc, 0xe8, 0x16, 0xcb, 0xbf, 0xf8, 0x72, + 0xfe, 0x58, 0x81, 0x71, 0x7e, 0xa6, 0xad, 0x24, 0x6e, 0x7d, 0xb3, 0x27, 0x34, 0xb1, 0xfb, 0xde, + 0xd7, 0x60, 0x12, 0x77, 0x83, 0x96, 0xcc, 0xb3, 0x07, 0x83, 0xe8, 0x81, 0xca, 0x05, 0x45, 0x58, + 0xe9, 0x06, 0xad, 0x2d, 0x6b, 0xdf, 0xc6, 0x41, 0xd7, 0x23, 0xda, 0x39, 0xcc, 0x9b, 0x68, 0x05, + 0xc6, 0x5d, 0xcf, 0x71, 0xf6, 0x84, 0x0a, 0x9f, 0x1e, 0x02, 0xf5, 0xd6, 0x3d, 0x06, 0xd6, 0xa0, + 0x22, 0x1a, 0x97, 0x54, 0x7f, 0xa1, 0x88, 0x03, 0x84, 0x5d, 0xec, 0xea, 0x80, 0x9a, 0xb8, 0x4d, + 0x57, 0x87, 0x1e, 0x2b, 0xb1, 0xa4, 0xaf, 0xa4, 0x7e, 0xf4, 0x1a, 0x17, 0x8c, 0x15, 0x59, 0x66, + 0x9b, 0xfd, 0x24, 0xf4, 0xff, 0xf1, 0xaa, 0x4a, 0x81, 0x15, 0x1a, 0x62, 0xb5, 0x92, 0x32, 0xe4, + 0xbd, 0x03, 0x96, 0x5d, 0x95, 0xb4, 0xbc, 0x77, 0xa0, 0xbe, 0xaf, 0xc0, 0x84, 0x08, 0x00, 0x6a, + 0x09, 0xdd, 0x8f, 0x90, 0x04, 0xc6, 0x94, 0x5f, 0x0b, 0xd5, 0x95, 0x4f, 0x0d, 0x47, 0x06, 0xd5, + 0xc5, 0x11, 0x12, 0xfa, 0xfa, 0x49, 0x3e, 0x5c, 0xfc, 0x4c, 0x61, 0x1b, 0x50, 0xa2, 0x2e, 0xad, + 0x0b, 0x67, 0x3c, 0xc6, 0xeb, 0xd2, 0xd6, 0x83, 0x70, 0x65, 0xad, 0x68, 0x47, 0x8d, 0x63, 0xf4, + 0x9f, 0x3f, 0x3b, 0xfd, 0x2f, 0xc0, 0xcc, 0xa1, 0x87, 0x5d, 0x57, 0xdc, 0xf5, 0xca, 0xf5, 0x57, + 0xd2, 0xca, 0x82, 0x4e, 0xd3, 0xff, 0x7b, 0xe4, 0x08, 0x5d, 0x85, 0xf3, 0x4e, 0xef, 0x40, 0x0f, + 0xb9, 0x29, 0x23, 0x37, 0xcc, 0xb4, 0xd3, 0x3b, 0xd8, 0xe1, 0xd4, 0x7b, 0xe4, 0x48, 0xfd, 0x79, + 0x1e, 0x66, 0xa9, 0x7b, 0x3a, 0x9e, 0xf5, 0x2e, 0x96, 0x37, 0xbb, 0x77, 0xa1, 0x48, 0xd8, 0xcb, + 0x02, 0x5d, 0x3e, 0x3a, 0x18, 0x5e, 0x36, 0x8a, 0xde, 0x22, 0x68, 0x40, 0xa2, 0x77, 0x09, 0x1a, + 0x14, 0xf9, 0xe9, 0x4a, 0xdd, 0x3e, 0x2c, 0x06, 0x9f, 0x60, 0xd9, 0xf0, 0x33, 0x9a, 0xd2, 0x7c, + 0x64, 0xc0, 0xc5, 0xe4, 0xae, 0x2e, 0xc0, 0x0b, 0x27, 0x05, 0x47, 0x89, 0x53, 0x83, 0x75, 0xa2, + 0xfe, 0x5e, 0x81, 0xe2, 0x8e, 0x15, 0xd8, 0xc4, 0xf7, 0x99, 0x52, 0xa2, 0x32, 0x9a, 0x72, 0xc2, + 0x32, 0x1a, 0x3a, 0x80, 0xc7, 0xfc, 0x80, 0x05, 0xac, 0xd2, 0xa6, 0x3a, 0x73, 0xcc, 0x50, 0x2f, + 0x37, 0x47, 0x2b, 0x84, 0x72, 0xdf, 0xbe, 0xe4, 0xa7, 0x50, 0x7d, 0xf5, 0xef, 0xf9, 0x44, 0x05, + 0xb2, 0xd1, 0xc6, 0x36, 0xaa, 0xf7, 0x3f, 0xfd, 0x18, 0xa1, 0x54, 0x47, 0x01, 0xa2, 0xe7, 0x1f, + 0x03, 0xaf, 0x09, 0xf2, 0x43, 0x5e, 0x13, 0x14, 0x12, 0xaf, 0x09, 0xc2, 0xa2, 0xdb, 0xd8, 0x68, + 0x45, 0xb7, 0x7b, 0x00, 0x46, 0xbb, 0x4b, 0x74, 0xb7, 0x8d, 0xed, 0xe3, 0xea, 0xec, 0xa9, 0x53, + 0x58, 0x6d, 0x77, 0x09, 0x9b, 0xc0, 0x94, 0x21, 0xbe, 0x7c, 0xf9, 0x7e, 0x83, 0x82, 0x89, 0x2a, + 0x7b, 0xe6, 0x12, 0x1b, 0xc3, 0x62, 0x05, 0x36, 0xfa, 0xa5, 0xfe, 0x53, 0x16, 0xcf, 0x98, 0x9a, + 0x4f, 0x5c, 0x3c, 0xa3, 0xd2, 0x67, 0x52, 0x3c, 0x13, 0x40, 0x27, 0x2c, 0x9e, 0x09, 0xe9, 0xd3, + 0x16, 0xcf, 0x04, 0xcc, 0xd7, 0xc5, 0xb3, 0x2f, 0x67, 0xf1, 0xec, 0xed, 0x63, 0x8a, 0x67, 0xb7, + 0x46, 0x0d, 0xda, 0x85, 0x9f, 0x7c, 0xde, 0xb5, 0xb3, 0x0d, 0x80, 0x58, 0xc6, 0xff, 0xd8, 0x49, + 0x12, 0xfe, 0x18, 0xc0, 0x17, 0xa3, 0x14, 0xa7, 0x1f, 0x5f, 0x8a, 0x7b, 0x6e, 0x94, 0x52, 0x9c, + 0x30, 0xe1, 0x60, 0x39, 0xce, 0x7a, 0x74, 0x39, 0xee, 0xe6, 0x88, 0xe5, 0x38, 0xd1, 0xcf, 0x17, + 0xe4, 0xdd, 0xc4, 0x3b, 0xc7, 0xbe, 0x9b, 0xb8, 0x31, 0x52, 0x95, 0x4a, 0xcc, 0xfa, 0x2b, 0xfd, + 0x76, 0x22, 0xfe, 0xc0, 0x41, 0x81, 0xc9, 0xf0, 0x40, 0x47, 0x2f, 0xc3, 0x39, 0x71, 0x0d, 0x2f, + 0x4e, 0xdb, 0xab, 0xd9, 0x6e, 0xf0, 0xb5, 0x50, 0x0c, 0x5d, 0x84, 0x71, 0xcf, 0x27, 0xc4, 0x14, + 0x57, 0xa7, 0xbc, 0x81, 0x9e, 0x82, 0xb2, 0xeb, 0x11, 0xc3, 0xf2, 0xa9, 0xe7, 0x36, 0xad, 0xc0, + 0x67, 0x87, 0xe7, 0x98, 0x36, 0x2d, 0xa9, 0x35, 0x2b, 0xf0, 0xd5, 0x0e, 0x7f, 0xb9, 0xc9, 0x86, + 0xb2, 0x09, 0x53, 0x6e, 0x1b, 0x5b, 0x76, 0x40, 0x1e, 0x84, 0x69, 0xd7, 0x8d, 0x11, 0x02, 0x0a, + 0x2e, 0xa8, 0x45, 0x18, 0x68, 0x06, 0x0a, 0x34, 0x72, 0xe7, 0xe3, 0xa2, 0x9f, 0xea, 0x55, 0x28, + 0x53, 0xee, 0x55, 0xcb, 0x6d, 0x11, 0x8f, 0xf1, 0xa4, 0xdf, 0xe9, 0x1b, 0x30, 0x9d, 0x40, 0x45, + 0xdf, 0x86, 0x09, 0x9f, 0xd8, 0xa6, 0xbc, 0x0d, 0xcf, 0xaa, 0x25, 0x21, 0x85, 0x10, 0x8c, 0xb1, + 0x69, 0xf1, 0x47, 0xa1, 0xec, 0x5b, 0xfd, 0x43, 0x81, 0x4f, 0x9e, 0x15, 0x52, 0x1a, 0xfd, 0x85, + 0x94, 0x5b, 0xa3, 0x5c, 0x57, 0xa6, 0x95, 0x51, 0x36, 0xfa, 0xca, 0x28, 0x37, 0x47, 0x02, 0x1c, + 0x28, 0xa2, 0xfc, 0x26, 0x56, 0x44, 0xd1, 0x00, 0x0c, 0xa9, 0x42, 0x31, 0xde, 0xa5, 0xac, 0xf0, + 0x91, 0xf2, 0xb5, 0x18, 0x4a, 0xd2, 0xfa, 0xf9, 0xd3, 0x5b, 0x7f, 0x6e, 0x57, 0xd6, 0x45, 0x3e, + 0x83, 0xe1, 0xd6, 0x8a, 0xb1, 0x0b, 0x66, 0xf5, 0x3f, 0x61, 0x1d, 0x81, 0xf9, 0x71, 0xf8, 0xe8, + 0x41, 0x19, 0xf1, 0xd1, 0x03, 0x9a, 0x83, 0xc9, 0x70, 0x63, 0x16, 0xf9, 0x80, 0x6c, 0xa3, 0x79, + 0x00, 0x0f, 0xdb, 0xa6, 0xd3, 0xb1, 0xde, 0x95, 0xc5, 0x83, 0x18, 0x85, 0xae, 0xb7, 0x1e, 0xa6, + 0xb1, 0x7d, 0xb3, 0xcd, 0x9f, 0x2e, 0x84, 0x09, 0x2b, 0xa3, 0xd6, 0x04, 0x91, 0xa6, 0xc0, 0x2c, + 0x63, 0x92, 0x6c, 0xba, 0xc7, 0xae, 0xc7, 0x4b, 0x2c, 0xba, 0x72, 0xf6, 0x42, 0x46, 0x2d, 0x85, + 0xd3, 0x67, 0x51, 0x7e, 0x3f, 0xe7, 0x96, 0xfa, 0x81, 0xac, 0x0a, 0xb0, 0xe9, 0x2f, 0xc3, 0x38, + 0xeb, 0x53, 0xcc, 0xff, 0xc9, 0x21, 0xf3, 0xdf, 0xa6, 0xbc, 0x1a, 0x17, 0x41, 0xeb, 0x50, 0x32, + 0x89, 0x1f, 0xe8, 0xe1, 0x96, 0x94, 0x1f, 0x69, 0xb1, 0x15, 0xa9, 0xec, 0x4a, 0xff, 0xb6, 0x54, + 0xe8, 0xdb, 0x96, 0x3e, 0x27, 0x35, 0xd5, 0xfe, 0x96, 0xff, 0xf0, 0xe1, 0xbc, 0xf2, 0xd1, 0xc3, + 0x79, 0xe5, 0x93, 0x87, 0xf3, 0xca, 0xfb, 0x9f, 0xce, 0xe7, 0x3e, 0xfa, 0x74, 0x3e, 0xf7, 0x97, + 0x4f, 0xe7, 0x73, 0x70, 0xd5, 0x70, 0x3a, 0x19, 0xfc, 0xb1, 0x36, 0x13, 0x4f, 0x48, 0x3d, 0x27, + 0x70, 0x1a, 0xca, 0x5b, 0xcd, 0x7d, 0x2b, 0x68, 0x75, 0x9b, 0x55, 0xc3, 0xe9, 0x2c, 0x1a, 0x8e, + 0xdf, 0x71, 0xfc, 0x45, 0x8f, 0xb4, 0xf1, 0x11, 0xf1, 0x16, 0x7b, 0x4b, 0xf2, 0x93, 0xe5, 0x8d, + 0xfe, 0xe2, 0xf0, 0x5f, 0xbe, 0xbc, 0x18, 0x23, 0x86, 0xb4, 0x5f, 0xe5, 0x0b, 0x8d, 0xd5, 0x37, + 0x7e, 0x9d, 0x57, 0x1b, 0xe1, 0x10, 0x57, 0xe9, 0x10, 0x63, 0x83, 0xa9, 0x6e, 0x0b, 0xd6, 0x3f, + 0x46, 0x4c, 0xbb, 0x94, 0x69, 0x37, 0xc6, 0xb4, 0x1b, 0x32, 0x3d, 0xcc, 0x57, 0x87, 0x33, 0xed, + 0xbe, 0xda, 0xa8, 0x85, 0xcf, 0xbb, 0xfe, 0x91, 0x7f, 0x2a, 0x14, 0x58, 0x5e, 0xa6, 0x12, 0xcb, + 0xcb, 0x31, 0x91, 0xe5, 0xe5, 0x50, 0xa6, 0x39, 0xc1, 0x7e, 0xb1, 0x72, 0xf3, 0xbf, 0x01, 0x00, + 0x00, 0xff, 0xff, 0x96, 0xcf, 0xfa, 0xae, 0xe3, 0x33, 0x00, 0x00, } func (m *Transaction) Marshal() (dAtA []byte, err error) { @@ -3681,28 +3873,29 @@ func (m *TransactionBody) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XEncryptedMemo != nil { + if m.MemoData != nil { { - size := m.XEncryptedMemo.Size() - i -= size - if _, err := m.XEncryptedMemo.MarshalTo(dAtA[i:]); err != nil { + size, err := m.MemoData.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { return 0, err } + i -= size + i = encodeVarintTransaction(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0x2a } - if len(m.FmdClues) > 0 { - for iNdEx := len(m.FmdClues) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.FmdClues[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTransaction(dAtA, i, uint64(size)) + if m.DetectionData != nil { + { + size, err := m.DetectionData.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i-- - dAtA[i] = 0x2a + i -= size + i = encodeVarintTransaction(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0x22 } if m.Fee != nil { { @@ -3714,19 +3907,19 @@ func (m *TransactionBody) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTransaction(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x22 + dAtA[i] = 0x1a } - if len(m.ChainId) > 0 { - i -= len(m.ChainId) - copy(dAtA[i:], m.ChainId) - i = encodeVarintTransaction(dAtA, i, uint64(len(m.ChainId))) - i-- - dAtA[i] = 0x1a - } - if m.ExpiryHeight != 0 { - i = encodeVarintTransaction(dAtA, i, uint64(m.ExpiryHeight)) + if m.TransactionParameters != nil { + { + size, err := m.TransactionParameters.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTransaction(dAtA, i, uint64(size)) + } i-- - dAtA[i] = 0x10 + dAtA[i] = 0x12 } if len(m.Actions) > 0 { for iNdEx := len(m.Actions) - 1; iNdEx >= 0; iNdEx-- { @@ -3745,22 +3938,126 @@ func (m *TransactionBody) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *TransactionBody_EncryptedMemo) MarshalTo(dAtA []byte) (int, error) { +func (m *MemoData) 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 *MemoData) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *TransactionBody_EncryptedMemo) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MemoData) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.XEncryptedMemo != nil { + { + size := m.XEncryptedMemo.Size() + i -= size + if _, err := m.XEncryptedMemo.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + } + } + return len(dAtA) - i, nil +} + +func (m *MemoData_EncryptedMemo) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MemoData_EncryptedMemo) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) if m.EncryptedMemo != nil { i -= len(m.EncryptedMemo) copy(dAtA[i:], m.EncryptedMemo) i = encodeVarintTransaction(dAtA, i, uint64(len(m.EncryptedMemo))) i-- - dAtA[i] = 0x32 + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} +func (m *TransactionParameters) 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 *TransactionParameters) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TransactionParameters) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.ChainId) > 0 { + i -= len(m.ChainId) + copy(dAtA[i:], m.ChainId) + i = encodeVarintTransaction(dAtA, i, uint64(len(m.ChainId))) + i-- + dAtA[i] = 0x12 + } + if m.ExpiryHeight != 0 { + i = encodeVarintTransaction(dAtA, i, uint64(m.ExpiryHeight)) + i-- + dAtA[i] = 0x8 } return len(dAtA) - i, nil } + +func (m *DetectionData) 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 *DetectionData) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *DetectionData) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.FmdClues) > 0 { + for iNdEx := len(m.FmdClues) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.FmdClues[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTransaction(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } + } + return len(dAtA) - i, nil +} + func (m *Action) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -4603,18 +4900,13 @@ func (m *TransactionBodyView) MarshalToSizedBuffer(dAtA []byte) (int, error) { } } } - if len(m.FmdClues) > 0 { - for iNdEx := len(m.FmdClues) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.FmdClues[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTransaction(dAtA, i, uint64(size)) + if m.XDetectionData != nil { + { + size := m.XDetectionData.Size() + i -= size + if _, err := m.XDetectionData.MarshalTo(dAtA[i:]); err != nil { + return 0, err } - i-- - dAtA[i] = 0x2a } } if m.Fee != nil { @@ -4627,19 +4919,19 @@ func (m *TransactionBodyView) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTransaction(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x22 - } - if len(m.ChainId) > 0 { - i -= len(m.ChainId) - copy(dAtA[i:], m.ChainId) - i = encodeVarintTransaction(dAtA, i, uint64(len(m.ChainId))) - i-- dAtA[i] = 0x1a } - if m.ExpiryHeight != 0 { - i = encodeVarintTransaction(dAtA, i, uint64(m.ExpiryHeight)) + if m.TransactionParameters != nil { + { + size, err := m.TransactionParameters.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTransaction(dAtA, i, uint64(size)) + } i-- - dAtA[i] = 0x10 + dAtA[i] = 0x12 } if len(m.ActionViews) > 0 { for iNdEx := len(m.ActionViews) - 1; iNdEx >= 0; iNdEx-- { @@ -4658,6 +4950,27 @@ func (m *TransactionBodyView) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *TransactionBodyView_DetectionData) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TransactionBodyView_DetectionData) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + if m.DetectionData != nil { + { + size, err := m.DetectionData.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTransaction(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } + return len(dAtA) - i, nil +} func (m *TransactionBodyView_MemoView) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) @@ -4675,7 +4988,7 @@ func (m *TransactionBodyView_MemoView) MarshalToSizedBuffer(dAtA []byte) (int, e i = encodeVarintTransaction(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x32 + dAtA[i] = 0x2a } return len(dAtA) - i, nil } @@ -6971,6 +7284,20 @@ func (m *SpendPlan) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.ProofBlindingS) > 0 { + i -= len(m.ProofBlindingS) + copy(dAtA[i:], m.ProofBlindingS) + i = encodeVarintTransaction(dAtA, i, uint64(len(m.ProofBlindingS))) + i-- + dAtA[i] = 0x32 + } + if len(m.ProofBlindingR) > 0 { + i -= len(m.ProofBlindingR) + copy(dAtA[i:], m.ProofBlindingR) + i = encodeVarintTransaction(dAtA, i, uint64(len(m.ProofBlindingR))) + i-- + dAtA[i] = 0x2a + } if len(m.ValueBlinding) > 0 { i -= len(m.ValueBlinding) copy(dAtA[i:], m.ValueBlinding) @@ -7025,6 +7352,20 @@ func (m *OutputPlan) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.ProofBlindingS) > 0 { + i -= len(m.ProofBlindingS) + copy(dAtA[i:], m.ProofBlindingS) + i = encodeVarintTransaction(dAtA, i, uint64(len(m.ProofBlindingS))) + i-- + dAtA[i] = 0x32 + } + if len(m.ProofBlindingR) > 0 { + i -= len(m.ProofBlindingR) + copy(dAtA[i:], m.ProofBlindingR) + i = encodeVarintTransaction(dAtA, i, uint64(len(m.ProofBlindingR))) + i-- + dAtA[i] = 0x2a + } if len(m.ValueBlinding) > 0 { i -= len(m.ValueBlinding) copy(dAtA[i:], m.ValueBlinding) @@ -7136,30 +7477,38 @@ func (m *TransactionBody) Size() (n int) { n += 1 + l + sovTransaction(uint64(l)) } } - if m.ExpiryHeight != 0 { - n += 1 + sovTransaction(uint64(m.ExpiryHeight)) - } - l = len(m.ChainId) - if l > 0 { + if m.TransactionParameters != nil { + l = m.TransactionParameters.Size() n += 1 + l + sovTransaction(uint64(l)) } if m.Fee != nil { l = m.Fee.Size() n += 1 + l + sovTransaction(uint64(l)) } - if len(m.FmdClues) > 0 { - for _, e := range m.FmdClues { - l = e.Size() - n += 1 + l + sovTransaction(uint64(l)) - } + if m.DetectionData != nil { + l = m.DetectionData.Size() + n += 1 + l + sovTransaction(uint64(l)) + } + if m.MemoData != nil { + l = m.MemoData.Size() + n += 1 + l + sovTransaction(uint64(l)) + } + return n +} + +func (m *MemoData) Size() (n int) { + if m == nil { + return 0 } + var l int + _ = l if m.XEncryptedMemo != nil { n += m.XEncryptedMemo.Size() } return n } -func (m *TransactionBody_EncryptedMemo) Size() (n int) { +func (m *MemoData_EncryptedMemo) Size() (n int) { if m == nil { return 0 } @@ -7171,6 +7520,37 @@ func (m *TransactionBody_EncryptedMemo) Size() (n int) { } return n } +func (m *TransactionParameters) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.ExpiryHeight != 0 { + n += 1 + sovTransaction(uint64(m.ExpiryHeight)) + } + l = len(m.ChainId) + if l > 0 { + n += 1 + l + sovTransaction(uint64(l)) + } + return n +} + +func (m *DetectionData) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.FmdClues) > 0 { + for _, e := range m.FmdClues { + l = e.Size() + n += 1 + l + sovTransaction(uint64(l)) + } + } + return n +} + func (m *Action) Size() (n int) { if m == nil { return 0 @@ -7570,22 +7950,16 @@ func (m *TransactionBodyView) Size() (n int) { n += 1 + l + sovTransaction(uint64(l)) } } - if m.ExpiryHeight != 0 { - n += 1 + sovTransaction(uint64(m.ExpiryHeight)) - } - l = len(m.ChainId) - if l > 0 { + if m.TransactionParameters != nil { + l = m.TransactionParameters.Size() n += 1 + l + sovTransaction(uint64(l)) } if m.Fee != nil { l = m.Fee.Size() n += 1 + l + sovTransaction(uint64(l)) } - if len(m.FmdClues) > 0 { - for _, e := range m.FmdClues { - l = e.Size() - n += 1 + l + sovTransaction(uint64(l)) - } + if m.XDetectionData != nil { + n += m.XDetectionData.Size() } if m.XMemoView != nil { n += m.XMemoView.Size() @@ -7593,6 +7967,18 @@ func (m *TransactionBodyView) Size() (n int) { return n } +func (m *TransactionBodyView_DetectionData) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.DetectionData != nil { + l = m.DetectionData.Size() + n += 1 + l + sovTransaction(uint64(l)) + } + return n +} func (m *TransactionBodyView_MemoView) Size() (n int) { if m == nil { return 0 @@ -8677,6 +9063,14 @@ func (m *SpendPlan) Size() (n int) { if l > 0 { n += 1 + l + sovTransaction(uint64(l)) } + l = len(m.ProofBlindingR) + if l > 0 { + n += 1 + l + sovTransaction(uint64(l)) + } + l = len(m.ProofBlindingS) + if l > 0 { + n += 1 + l + sovTransaction(uint64(l)) + } return n } @@ -8702,6 +9096,14 @@ func (m *OutputPlan) Size() (n int) { if l > 0 { n += 1 + l + sovTransaction(uint64(l)) } + l = len(m.ProofBlindingR) + if l > 0 { + n += 1 + l + sovTransaction(uint64(l)) + } + l = len(m.ProofBlindingS) + if l > 0 { + n += 1 + l + sovTransaction(uint64(l)) + } return n } @@ -9099,10 +9501,10 @@ func (m *TransactionBody) Unmarshal(dAtA []byte) error { } iNdEx = postIndex case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ExpiryHeight", wireType) + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TransactionParameters", wireType) } - m.ExpiryHeight = 0 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTransaction @@ -9112,16 +9514,33 @@ func (m *TransactionBody) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.ExpiryHeight |= uint64(b&0x7F) << shift + 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.TransactionParameters == nil { + m.TransactionParameters = &TransactionParameters{} + } + if err := m.TransactionParameters.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ChainId", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Fee", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTransaction @@ -9131,27 +9550,31 @@ func (m *TransactionBody) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthTransaction } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthTransaction } if postIndex > l { return io.ErrUnexpectedEOF } - m.ChainId = string(dAtA[iNdEx:postIndex]) + if m.Fee == nil { + m.Fee = &v1alpha1.Fee{} + } + if err := m.Fee.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Fee", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field DetectionData", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -9163,29 +9586,299 @@ func (m *TransactionBody) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + 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.DetectionData == nil { + m.DetectionData = &DetectionData{} + } + if err := m.DetectionData.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field MemoData", 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.MemoData == nil { + m.MemoData = &MemoData{} + } + if err := m.MemoData.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTransaction(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTransaction + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *MemoData) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: MemoData: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MemoData: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field EncryptedMemo", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthTransaction + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthTransaction + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + v := make([]byte, postIndex-iNdEx) + copy(v, dAtA[iNdEx:postIndex]) + m.XEncryptedMemo = &MemoData_EncryptedMemo{v} + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTransaction(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTransaction + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *TransactionParameters) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: TransactionParameters: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: TransactionParameters: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ExpiryHeight", wireType) + } + m.ExpiryHeight = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ExpiryHeight |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ChainId", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthTransaction } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthTransaction } if postIndex > l { return io.ErrUnexpectedEOF } - if m.Fee == nil { - m.Fee = &v1alpha1.Fee{} - } - if err := m.Fee.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.ChainId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTransaction(dAtA[iNdEx:]) + if err != nil { return err } - iNdEx = postIndex - case 5: + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTransaction + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *DetectionData) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: DetectionData: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: DetectionData: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field FmdClues", wireType) } @@ -9219,39 +9912,6 @@ func (m *TransactionBody) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field EncryptedMemo", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTransaction - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthTransaction - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthTransaction - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - v := make([]byte, postIndex-iNdEx) - copy(v, dAtA[iNdEx:postIndex]) - m.XEncryptedMemo = &TransactionBody_EncryptedMemo{v} - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTransaction(dAtA[iNdEx:]) @@ -10897,29 +11557,10 @@ func (m *TransactionBodyView) Unmarshal(dAtA []byte) error { } iNdEx = postIndex case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ExpiryHeight", wireType) - } - m.ExpiryHeight = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTransaction - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ExpiryHeight |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ChainId", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TransactionParameters", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTransaction @@ -10929,25 +11570,29 @@ func (m *TransactionBodyView) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthTransaction } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthTransaction } if postIndex > l { return io.ErrUnexpectedEOF } - m.ChainId = string(dAtA[iNdEx:postIndex]) + if m.TransactionParameters == nil { + m.TransactionParameters = &TransactionParameters{} + } + if err := m.TransactionParameters.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex - case 4: + case 3: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Fee", wireType) } @@ -10983,9 +11628,9 @@ func (m *TransactionBodyView) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 5: + case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field FmdClues", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field DetectionData", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -11012,12 +11657,13 @@ func (m *TransactionBodyView) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.FmdClues = append(m.FmdClues, &v1alpha1.Clue{}) - if err := m.FmdClues[len(m.FmdClues)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + v := &DetectionData{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } + m.XDetectionData = &TransactionBodyView_DetectionData{v} iNdEx = postIndex - case 6: + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field MemoView", wireType) } @@ -15813,6 +16459,74 @@ func (m *SpendPlan) Unmarshal(dAtA []byte) error { m.ValueBlinding = []byte{} } iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ProofBlindingR", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthTransaction + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthTransaction + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ProofBlindingR = append(m.ProofBlindingR[:0], dAtA[iNdEx:postIndex]...) + if m.ProofBlindingR == nil { + m.ProofBlindingR = []byte{} + } + iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ProofBlindingS", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthTransaction + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthTransaction + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ProofBlindingS = append(m.ProofBlindingS[:0], dAtA[iNdEx:postIndex]...) + if m.ProofBlindingS == nil { + m.ProofBlindingS = []byte{} + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTransaction(dAtA[iNdEx:]) @@ -16003,6 +16717,74 @@ func (m *OutputPlan) Unmarshal(dAtA []byte) error { m.ValueBlinding = []byte{} } iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ProofBlindingR", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthTransaction + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthTransaction + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ProofBlindingR = append(m.ProofBlindingR[:0], dAtA[iNdEx:postIndex]...) + if m.ProofBlindingR == nil { + m.ProofBlindingR = []byte{} + } + iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ProofBlindingS", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthTransaction + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthTransaction + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ProofBlindingS = append(m.ProofBlindingS[:0], dAtA[iNdEx:postIndex]...) + if m.ProofBlindingS == nil { + m.ProofBlindingS = []byte{} + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTransaction(dAtA[iNdEx:]) diff --git a/relayer/chains/penumbra/tx.go b/relayer/chains/penumbra/tx.go index 5f0827957..4ef4c8d30 100644 --- a/relayer/chains/penumbra/tx.go +++ b/relayer/chains/penumbra/tx.go @@ -313,8 +313,10 @@ func (cc *PenumbraProvider) sendMessagesInner(ctx context.Context, msgs []provid // will have a signing protocol for this. txBody := penumbratypes.TransactionBody{ - Actions: make([]*penumbratypes.Action, 0), - Fee: &penumbracrypto.Fee{Amount: &penumbracrypto.Amount{Lo: 0, Hi: 0}}, + Actions: make([]*penumbratypes.Action, 0), + Fee: &penumbracrypto.Fee{Amount: &penumbracrypto.Amount{Lo: 0, Hi: 0}}, + MemoData: &penumbratypes.MemoData{}, + TransactionParameters: &penumbratypes.TransactionParameters{}, } for _, msg := range PenumbraMsgs(msgs...) { diff --git a/relayer/chains/penumbra/view/v1alpha1/view.pb.go b/relayer/chains/penumbra/view/v1alpha1/view.pb.go index d8dcd6e9e..aacce5f7e 100644 --- a/relayer/chains/penumbra/view/v1alpha1/view.pb.go +++ b/relayer/chains/penumbra/view/v1alpha1/view.pb.go @@ -33,6 +33,105 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package +type AuthorizeAndBuildRequest struct { + // The transaction plan to authorize and build. + TransactionPlan *v1alpha1.TransactionPlan `protobuf:"bytes,1,opt,name=transaction_plan,json=transactionPlan,proto3" json:"transaction_plan,omitempty"` + // The authorization data to use to authorize the transaction plan. + AuthorizationData *v1alpha1.AuthorizationData `protobuf:"bytes,2,opt,name=authorization_data,json=authorizationData,proto3" json:"authorization_data,omitempty"` +} + +func (m *AuthorizeAndBuildRequest) Reset() { *m = AuthorizeAndBuildRequest{} } +func (m *AuthorizeAndBuildRequest) String() string { return proto.CompactTextString(m) } +func (*AuthorizeAndBuildRequest) ProtoMessage() {} +func (*AuthorizeAndBuildRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_0aa947b204e6a7c2, []int{0} +} +func (m *AuthorizeAndBuildRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *AuthorizeAndBuildRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_AuthorizeAndBuildRequest.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 *AuthorizeAndBuildRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_AuthorizeAndBuildRequest.Merge(m, src) +} +func (m *AuthorizeAndBuildRequest) XXX_Size() int { + return m.Size() +} +func (m *AuthorizeAndBuildRequest) XXX_DiscardUnknown() { + xxx_messageInfo_AuthorizeAndBuildRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_AuthorizeAndBuildRequest proto.InternalMessageInfo + +func (m *AuthorizeAndBuildRequest) GetTransactionPlan() *v1alpha1.TransactionPlan { + if m != nil { + return m.TransactionPlan + } + return nil +} + +func (m *AuthorizeAndBuildRequest) GetAuthorizationData() *v1alpha1.AuthorizationData { + if m != nil { + return m.AuthorizationData + } + return nil +} + +type AuthorizeAndBuildResponse struct { + // The transaction that was built. + Transaction *v1alpha1.Transaction `protobuf:"bytes,1,opt,name=transaction,proto3" json:"transaction,omitempty"` +} + +func (m *AuthorizeAndBuildResponse) Reset() { *m = AuthorizeAndBuildResponse{} } +func (m *AuthorizeAndBuildResponse) String() string { return proto.CompactTextString(m) } +func (*AuthorizeAndBuildResponse) ProtoMessage() {} +func (*AuthorizeAndBuildResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_0aa947b204e6a7c2, []int{1} +} +func (m *AuthorizeAndBuildResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *AuthorizeAndBuildResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_AuthorizeAndBuildResponse.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 *AuthorizeAndBuildResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_AuthorizeAndBuildResponse.Merge(m, src) +} +func (m *AuthorizeAndBuildResponse) XXX_Size() int { + return m.Size() +} +func (m *AuthorizeAndBuildResponse) XXX_DiscardUnknown() { + xxx_messageInfo_AuthorizeAndBuildResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_AuthorizeAndBuildResponse proto.InternalMessageInfo + +func (m *AuthorizeAndBuildResponse) GetTransaction() *v1alpha1.Transaction { + if m != nil { + return m.Transaction + } + return nil +} + type BroadcastTransactionRequest struct { // The transaction to broadcast. Transaction *v1alpha1.Transaction `protobuf:"bytes,1,opt,name=transaction,proto3" json:"transaction,omitempty"` @@ -44,7 +143,7 @@ func (m *BroadcastTransactionRequest) Reset() { *m = BroadcastTransactio func (m *BroadcastTransactionRequest) String() string { return proto.CompactTextString(m) } func (*BroadcastTransactionRequest) ProtoMessage() {} func (*BroadcastTransactionRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{0} + return fileDescriptor_0aa947b204e6a7c2, []int{2} } func (m *BroadcastTransactionRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -99,7 +198,7 @@ func (m *BroadcastTransactionResponse) Reset() { *m = BroadcastTransacti func (m *BroadcastTransactionResponse) String() string { return proto.CompactTextString(m) } func (*BroadcastTransactionResponse) ProtoMessage() {} func (*BroadcastTransactionResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{1} + return fileDescriptor_0aa947b204e6a7c2, []int{3} } func (m *BroadcastTransactionResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -164,7 +263,7 @@ func (m *TransactionPlannerRequest) Reset() { *m = TransactionPlannerReq func (m *TransactionPlannerRequest) String() string { return proto.CompactTextString(m) } func (*TransactionPlannerRequest) ProtoMessage() {} func (*TransactionPlannerRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{2} + return fileDescriptor_0aa947b204e6a7c2, []int{4} } func (m *TransactionPlannerRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -292,7 +391,7 @@ func (m *TransactionPlannerRequest_Output) Reset() { *m = TransactionPla func (m *TransactionPlannerRequest_Output) String() string { return proto.CompactTextString(m) } func (*TransactionPlannerRequest_Output) ProtoMessage() {} func (*TransactionPlannerRequest_Output) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{2, 0} + return fileDescriptor_0aa947b204e6a7c2, []int{4, 0} } func (m *TransactionPlannerRequest_Output) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -345,7 +444,7 @@ func (m *TransactionPlannerRequest_Swap) Reset() { *m = TransactionPlann func (m *TransactionPlannerRequest_Swap) String() string { return proto.CompactTextString(m) } func (*TransactionPlannerRequest_Swap) ProtoMessage() {} func (*TransactionPlannerRequest_Swap) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{2, 1} + return fileDescriptor_0aa947b204e6a7c2, []int{4, 1} } func (m *TransactionPlannerRequest_Swap) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -404,7 +503,7 @@ func (m *TransactionPlannerRequest_Delegate) Reset() { *m = TransactionP func (m *TransactionPlannerRequest_Delegate) String() string { return proto.CompactTextString(m) } func (*TransactionPlannerRequest_Delegate) ProtoMessage() {} func (*TransactionPlannerRequest_Delegate) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{2, 2} + return fileDescriptor_0aa947b204e6a7c2, []int{4, 2} } func (m *TransactionPlannerRequest_Delegate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -456,7 +555,7 @@ func (m *TransactionPlannerRequest_Undelegate) Reset() { *m = Transactio func (m *TransactionPlannerRequest_Undelegate) String() string { return proto.CompactTextString(m) } func (*TransactionPlannerRequest_Undelegate) ProtoMessage() {} func (*TransactionPlannerRequest_Undelegate) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{2, 3} + return fileDescriptor_0aa947b204e6a7c2, []int{4, 3} } func (m *TransactionPlannerRequest_Undelegate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -507,7 +606,7 @@ func (m *TransactionPlannerResponse) Reset() { *m = TransactionPlannerRe func (m *TransactionPlannerResponse) String() string { return proto.CompactTextString(m) } func (*TransactionPlannerResponse) ProtoMessage() {} func (*TransactionPlannerResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{3} + return fileDescriptor_0aa947b204e6a7c2, []int{5} } func (m *TransactionPlannerResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -544,14 +643,15 @@ func (m *TransactionPlannerResponse) GetPlan() *v1alpha1.TransactionPlan { } type AddressByIndexRequest struct { - AddressIndex *v1alpha11.AddressIndex `protobuf:"bytes,1,opt,name=address_index,json=addressIndex,proto3" json:"address_index,omitempty"` + AddressIndex *v1alpha11.AddressIndex `protobuf:"bytes,1,opt,name=address_index,json=addressIndex,proto3" json:"address_index,omitempty"` + DisplayConfirm bool `protobuf:"varint,2,opt,name=display_confirm,json=displayConfirm,proto3" json:"display_confirm,omitempty"` } func (m *AddressByIndexRequest) Reset() { *m = AddressByIndexRequest{} } func (m *AddressByIndexRequest) String() string { return proto.CompactTextString(m) } func (*AddressByIndexRequest) ProtoMessage() {} func (*AddressByIndexRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{4} + return fileDescriptor_0aa947b204e6a7c2, []int{6} } func (m *AddressByIndexRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -587,6 +687,13 @@ func (m *AddressByIndexRequest) GetAddressIndex() *v1alpha11.AddressIndex { return nil } +func (m *AddressByIndexRequest) GetDisplayConfirm() bool { + if m != nil { + return m.DisplayConfirm + } + return false +} + type AddressByIndexResponse struct { Address *v1alpha11.Address `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` } @@ -595,7 +702,7 @@ func (m *AddressByIndexResponse) Reset() { *m = AddressByIndexResponse{} func (m *AddressByIndexResponse) String() string { return proto.CompactTextString(m) } func (*AddressByIndexResponse) ProtoMessage() {} func (*AddressByIndexResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{5} + return fileDescriptor_0aa947b204e6a7c2, []int{7} } func (m *AddressByIndexResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -639,7 +746,7 @@ func (m *IndexByAddressRequest) Reset() { *m = IndexByAddressRequest{} } func (m *IndexByAddressRequest) String() string { return proto.CompactTextString(m) } func (*IndexByAddressRequest) ProtoMessage() {} func (*IndexByAddressRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{6} + return fileDescriptor_0aa947b204e6a7c2, []int{8} } func (m *IndexByAddressRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -685,7 +792,7 @@ func (m *IndexByAddressResponse) Reset() { *m = IndexByAddressResponse{} func (m *IndexByAddressResponse) String() string { return proto.CompactTextString(m) } func (*IndexByAddressResponse) ProtoMessage() {} func (*IndexByAddressResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{7} + return fileDescriptor_0aa947b204e6a7c2, []int{9} } func (m *IndexByAddressResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -748,14 +855,15 @@ func (*IndexByAddressResponse) XXX_OneofWrappers() []interface{} { } type EphemeralAddressRequest struct { - AddressIndex *v1alpha11.AddressIndex `protobuf:"bytes,1,opt,name=address_index,json=addressIndex,proto3" json:"address_index,omitempty"` + AddressIndex *v1alpha11.AddressIndex `protobuf:"bytes,1,opt,name=address_index,json=addressIndex,proto3" json:"address_index,omitempty"` + DisplayConfirm bool `protobuf:"varint,2,opt,name=display_confirm,json=displayConfirm,proto3" json:"display_confirm,omitempty"` } func (m *EphemeralAddressRequest) Reset() { *m = EphemeralAddressRequest{} } func (m *EphemeralAddressRequest) String() string { return proto.CompactTextString(m) } func (*EphemeralAddressRequest) ProtoMessage() {} func (*EphemeralAddressRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{8} + return fileDescriptor_0aa947b204e6a7c2, []int{10} } func (m *EphemeralAddressRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -791,6 +899,13 @@ func (m *EphemeralAddressRequest) GetAddressIndex() *v1alpha11.AddressIndex { return nil } +func (m *EphemeralAddressRequest) GetDisplayConfirm() bool { + if m != nil { + return m.DisplayConfirm + } + return false +} + type EphemeralAddressResponse struct { Address *v1alpha11.Address `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` } @@ -799,7 +914,7 @@ func (m *EphemeralAddressResponse) Reset() { *m = EphemeralAddressRespon func (m *EphemeralAddressResponse) String() string { return proto.CompactTextString(m) } func (*EphemeralAddressResponse) ProtoMessage() {} func (*EphemeralAddressResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{9} + return fileDescriptor_0aa947b204e6a7c2, []int{11} } func (m *EphemeralAddressResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -835,22 +950,25 @@ func (m *EphemeralAddressResponse) GetAddress() *v1alpha11.Address { return nil } -type BalanceByAddressRequest struct { - Address *v1alpha11.Address `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` +type BalancesRequest struct { + // If present, filter balances to only include the account specified by the `AddressIndex`. + AccountFilter *v1alpha11.AddressIndex `protobuf:"bytes,1,opt,name=account_filter,json=accountFilter,proto3" json:"account_filter,omitempty"` + // If present, filter balances to only include the specified asset ID. + AssetIdFilter *v1alpha11.AssetId `protobuf:"bytes,2,opt,name=asset_id_filter,json=assetIdFilter,proto3" json:"asset_id_filter,omitempty"` } -func (m *BalanceByAddressRequest) Reset() { *m = BalanceByAddressRequest{} } -func (m *BalanceByAddressRequest) String() string { return proto.CompactTextString(m) } -func (*BalanceByAddressRequest) ProtoMessage() {} -func (*BalanceByAddressRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{10} +func (m *BalancesRequest) Reset() { *m = BalancesRequest{} } +func (m *BalancesRequest) String() string { return proto.CompactTextString(m) } +func (*BalancesRequest) ProtoMessage() {} +func (*BalancesRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_0aa947b204e6a7c2, []int{12} } -func (m *BalanceByAddressRequest) XXX_Unmarshal(b []byte) error { +func (m *BalancesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *BalanceByAddressRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *BalancesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_BalanceByAddressRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_BalancesRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -860,42 +978,49 @@ func (m *BalanceByAddressRequest) XXX_Marshal(b []byte, deterministic bool) ([]b return b[:n], nil } } -func (m *BalanceByAddressRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_BalanceByAddressRequest.Merge(m, src) +func (m *BalancesRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_BalancesRequest.Merge(m, src) } -func (m *BalanceByAddressRequest) XXX_Size() int { +func (m *BalancesRequest) XXX_Size() int { return m.Size() } -func (m *BalanceByAddressRequest) XXX_DiscardUnknown() { - xxx_messageInfo_BalanceByAddressRequest.DiscardUnknown(m) +func (m *BalancesRequest) XXX_DiscardUnknown() { + xxx_messageInfo_BalancesRequest.DiscardUnknown(m) } -var xxx_messageInfo_BalanceByAddressRequest proto.InternalMessageInfo +var xxx_messageInfo_BalancesRequest proto.InternalMessageInfo -func (m *BalanceByAddressRequest) GetAddress() *v1alpha11.Address { +func (m *BalancesRequest) GetAccountFilter() *v1alpha11.AddressIndex { if m != nil { - return m.Address + return m.AccountFilter + } + return nil +} + +func (m *BalancesRequest) GetAssetIdFilter() *v1alpha11.AssetId { + if m != nil { + return m.AssetIdFilter } return nil } -type BalanceByAddressResponse struct { - Asset *v1alpha11.AssetId `protobuf:"bytes,1,opt,name=asset,proto3" json:"asset,omitempty"` - Amount *v1alpha11.Amount `protobuf:"bytes,2,opt,name=amount,proto3" json:"amount,omitempty"` +type BalancesResponse struct { + Account *v1alpha11.AddressIndex `protobuf:"bytes,1,opt,name=account,proto3" json:"account,omitempty"` + Balance *v1alpha11.Value `protobuf:"bytes,2,opt,name=balance,proto3" json:"balance,omitempty"` } -func (m *BalanceByAddressResponse) Reset() { *m = BalanceByAddressResponse{} } -func (m *BalanceByAddressResponse) String() string { return proto.CompactTextString(m) } -func (*BalanceByAddressResponse) ProtoMessage() {} -func (*BalanceByAddressResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{11} +func (m *BalancesResponse) Reset() { *m = BalancesResponse{} } +func (m *BalancesResponse) String() string { return proto.CompactTextString(m) } +func (*BalancesResponse) ProtoMessage() {} +func (*BalancesResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_0aa947b204e6a7c2, []int{13} } -func (m *BalanceByAddressResponse) XXX_Unmarshal(b []byte) error { +func (m *BalancesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *BalanceByAddressResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *BalancesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_BalanceByAddressResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_BalancesResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -905,28 +1030,28 @@ func (m *BalanceByAddressResponse) XXX_Marshal(b []byte, deterministic bool) ([] return b[:n], nil } } -func (m *BalanceByAddressResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_BalanceByAddressResponse.Merge(m, src) +func (m *BalancesResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_BalancesResponse.Merge(m, src) } -func (m *BalanceByAddressResponse) XXX_Size() int { +func (m *BalancesResponse) XXX_Size() int { return m.Size() } -func (m *BalanceByAddressResponse) XXX_DiscardUnknown() { - xxx_messageInfo_BalanceByAddressResponse.DiscardUnknown(m) +func (m *BalancesResponse) XXX_DiscardUnknown() { + xxx_messageInfo_BalancesResponse.DiscardUnknown(m) } -var xxx_messageInfo_BalanceByAddressResponse proto.InternalMessageInfo +var xxx_messageInfo_BalancesResponse proto.InternalMessageInfo -func (m *BalanceByAddressResponse) GetAsset() *v1alpha11.AssetId { +func (m *BalancesResponse) GetAccount() *v1alpha11.AddressIndex { if m != nil { - return m.Asset + return m.Account } return nil } -func (m *BalanceByAddressResponse) GetAmount() *v1alpha11.Amount { +func (m *BalancesResponse) GetBalance() *v1alpha11.Value { if m != nil { - return m.Amount + return m.Balance } return nil } @@ -940,7 +1065,7 @@ func (m *ViewAuthToken) Reset() { *m = ViewAuthToken{} } func (m *ViewAuthToken) String() string { return proto.CompactTextString(m) } func (*ViewAuthToken) ProtoMessage() {} func (*ViewAuthToken) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{12} + return fileDescriptor_0aa947b204e6a7c2, []int{14} } func (m *ViewAuthToken) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -984,7 +1109,7 @@ func (m *ViewAuthRequest) Reset() { *m = ViewAuthRequest{} } func (m *ViewAuthRequest) String() string { return proto.CompactTextString(m) } func (*ViewAuthRequest) ProtoMessage() {} func (*ViewAuthRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{13} + return fileDescriptor_0aa947b204e6a7c2, []int{15} } func (m *ViewAuthRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1028,7 +1153,7 @@ func (m *ViewAuthResponse) Reset() { *m = ViewAuthResponse{} } func (m *ViewAuthResponse) String() string { return proto.CompactTextString(m) } func (*ViewAuthResponse) ProtoMessage() {} func (*ViewAuthResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{14} + return fileDescriptor_0aa947b204e6a7c2, []int{16} } func (m *ViewAuthResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1075,7 +1200,7 @@ func (m *StatusRequest) Reset() { *m = StatusRequest{} } func (m *StatusRequest) String() string { return proto.CompactTextString(m) } func (*StatusRequest) ProtoMessage() {} func (*StatusRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{15} + return fileDescriptor_0aa947b204e6a7c2, []int{17} } func (m *StatusRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1149,7 +1274,7 @@ func (m *StatusResponse) Reset() { *m = StatusResponse{} } func (m *StatusResponse) String() string { return proto.CompactTextString(m) } func (*StatusResponse) ProtoMessage() {} func (*StatusResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{16} + return fileDescriptor_0aa947b204e6a7c2, []int{18} } func (m *StatusResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1203,7 +1328,7 @@ func (m *StatusStreamRequest) Reset() { *m = StatusStreamRequest{} } func (m *StatusStreamRequest) String() string { return proto.CompactTextString(m) } func (*StatusStreamRequest) ProtoMessage() {} func (*StatusStreamRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{17} + return fileDescriptor_0aa947b204e6a7c2, []int{19} } func (m *StatusStreamRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1275,7 +1400,7 @@ func (m *StatusStreamResponse) Reset() { *m = StatusStreamResponse{} } func (m *StatusStreamResponse) String() string { return proto.CompactTextString(m) } func (*StatusStreamResponse) ProtoMessage() {} func (*StatusStreamResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{18} + return fileDescriptor_0aa947b204e6a7c2, []int{20} } func (m *StatusStreamResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1342,7 +1467,7 @@ func (m *NotesRequest) Reset() { *m = NotesRequest{} } func (m *NotesRequest) String() string { return proto.CompactTextString(m) } func (*NotesRequest) ProtoMessage() {} func (*NotesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{19} + return fileDescriptor_0aa947b204e6a7c2, []int{21} } func (m *NotesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1447,7 +1572,7 @@ func (m *NotesForVotingRequest) Reset() { *m = NotesForVotingRequest{} } func (m *NotesForVotingRequest) String() string { return proto.CompactTextString(m) } func (*NotesForVotingRequest) ProtoMessage() {} func (*NotesForVotingRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{20} + return fileDescriptor_0aa947b204e6a7c2, []int{22} } func (m *NotesForVotingRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1537,7 +1662,7 @@ func (m *WitnessRequest) Reset() { *m = WitnessRequest{} } func (m *WitnessRequest) String() string { return proto.CompactTextString(m) } func (*WitnessRequest) ProtoMessage() {} func (*WitnessRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{21} + return fileDescriptor_0aa947b204e6a7c2, []int{23} } func (m *WitnessRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1621,7 +1746,7 @@ func (m *WitnessResponse) Reset() { *m = WitnessResponse{} } func (m *WitnessResponse) String() string { return proto.CompactTextString(m) } func (*WitnessResponse) ProtoMessage() {} func (*WitnessResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{22} + return fileDescriptor_0aa947b204e6a7c2, []int{24} } func (m *WitnessResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1666,7 +1791,7 @@ func (m *WitnessAndBuildRequest) Reset() { *m = WitnessAndBuildRequest{} func (m *WitnessAndBuildRequest) String() string { return proto.CompactTextString(m) } func (*WitnessAndBuildRequest) ProtoMessage() {} func (*WitnessAndBuildRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{23} + return fileDescriptor_0aa947b204e6a7c2, []int{25} } func (m *WitnessAndBuildRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1717,7 +1842,7 @@ func (m *WitnessAndBuildResponse) Reset() { *m = WitnessAndBuildResponse func (m *WitnessAndBuildResponse) String() string { return proto.CompactTextString(m) } func (*WitnessAndBuildResponse) ProtoMessage() {} func (*WitnessAndBuildResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{24} + return fileDescriptor_0aa947b204e6a7c2, []int{26} } func (m *WitnessAndBuildResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1776,7 +1901,7 @@ func (m *AssetsRequest) Reset() { *m = AssetsRequest{} } func (m *AssetsRequest) String() string { return proto.CompactTextString(m) } func (*AssetsRequest) ProtoMessage() {} func (*AssetsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{25} + return fileDescriptor_0aa947b204e6a7c2, []int{27} } func (m *AssetsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1863,7 +1988,7 @@ func (m *AssetsResponse) Reset() { *m = AssetsResponse{} } func (m *AssetsResponse) String() string { return proto.CompactTextString(m) } func (*AssetsResponse) ProtoMessage() {} func (*AssetsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{26} + return fileDescriptor_0aa947b204e6a7c2, []int{28} } func (m *AssetsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1907,7 +2032,7 @@ func (m *ChainParametersRequest) Reset() { *m = ChainParametersRequest{} func (m *ChainParametersRequest) String() string { return proto.CompactTextString(m) } func (*ChainParametersRequest) ProtoMessage() {} func (*ChainParametersRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{27} + return fileDescriptor_0aa947b204e6a7c2, []int{29} } func (m *ChainParametersRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1944,7 +2069,7 @@ func (m *ChainParametersResponse) Reset() { *m = ChainParametersResponse func (m *ChainParametersResponse) String() string { return proto.CompactTextString(m) } func (*ChainParametersResponse) ProtoMessage() {} func (*ChainParametersResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{28} + return fileDescriptor_0aa947b204e6a7c2, []int{30} } func (m *ChainParametersResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1988,7 +2113,7 @@ func (m *FMDParametersRequest) Reset() { *m = FMDParametersRequest{} } func (m *FMDParametersRequest) String() string { return proto.CompactTextString(m) } func (*FMDParametersRequest) ProtoMessage() {} func (*FMDParametersRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{29} + return fileDescriptor_0aa947b204e6a7c2, []int{31} } func (m *FMDParametersRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2025,7 +2150,7 @@ func (m *FMDParametersResponse) Reset() { *m = FMDParametersResponse{} } func (m *FMDParametersResponse) String() string { return proto.CompactTextString(m) } func (*FMDParametersResponse) ProtoMessage() {} func (*FMDParametersResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{30} + return fileDescriptor_0aa947b204e6a7c2, []int{32} } func (m *FMDParametersResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2074,7 +2199,7 @@ func (m *NoteByCommitmentRequest) Reset() { *m = NoteByCommitmentRequest func (m *NoteByCommitmentRequest) String() string { return proto.CompactTextString(m) } func (*NoteByCommitmentRequest) ProtoMessage() {} func (*NoteByCommitmentRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{31} + return fileDescriptor_0aa947b204e6a7c2, []int{33} } func (m *NoteByCommitmentRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2158,7 +2283,7 @@ func (m *NoteByCommitmentResponse) Reset() { *m = NoteByCommitmentRespon func (m *NoteByCommitmentResponse) String() string { return proto.CompactTextString(m) } func (*NoteByCommitmentResponse) ProtoMessage() {} func (*NoteByCommitmentResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{32} + return fileDescriptor_0aa947b204e6a7c2, []int{34} } func (m *NoteByCommitmentResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2207,7 +2332,7 @@ func (m *SwapByCommitmentRequest) Reset() { *m = SwapByCommitmentRequest func (m *SwapByCommitmentRequest) String() string { return proto.CompactTextString(m) } func (*SwapByCommitmentRequest) ProtoMessage() {} func (*SwapByCommitmentRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{33} + return fileDescriptor_0aa947b204e6a7c2, []int{35} } func (m *SwapByCommitmentRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2291,7 +2416,7 @@ func (m *SwapByCommitmentResponse) Reset() { *m = SwapByCommitmentRespon func (m *SwapByCommitmentResponse) String() string { return proto.CompactTextString(m) } func (*SwapByCommitmentResponse) ProtoMessage() {} func (*SwapByCommitmentResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{34} + return fileDescriptor_0aa947b204e6a7c2, []int{36} } func (m *SwapByCommitmentResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2339,7 +2464,7 @@ func (m *NullifierStatusRequest) Reset() { *m = NullifierStatusRequest{} func (m *NullifierStatusRequest) String() string { return proto.CompactTextString(m) } func (*NullifierStatusRequest) ProtoMessage() {} func (*NullifierStatusRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{35} + return fileDescriptor_0aa947b204e6a7c2, []int{37} } func (m *NullifierStatusRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2423,7 +2548,7 @@ func (m *NullifierStatusResponse) Reset() { *m = NullifierStatusResponse func (m *NullifierStatusResponse) String() string { return proto.CompactTextString(m) } func (*NullifierStatusResponse) ProtoMessage() {} func (*NullifierStatusResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{36} + return fileDescriptor_0aa947b204e6a7c2, []int{38} } func (m *NullifierStatusResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2468,7 +2593,7 @@ func (m *TransactionInfoByHashRequest) Reset() { *m = TransactionInfoByH func (m *TransactionInfoByHashRequest) String() string { return proto.CompactTextString(m) } func (*TransactionInfoByHashRequest) ProtoMessage() {} func (*TransactionInfoByHashRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{37} + return fileDescriptor_0aa947b204e6a7c2, []int{39} } func (m *TransactionInfoByHashRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2517,7 +2642,7 @@ 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} + return fileDescriptor_0aa947b204e6a7c2, []int{40} } func (m *TransactionInfoRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2620,7 +2745,7 @@ 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} + return fileDescriptor_0aa947b204e6a7c2, []int{41} } func (m *TransactionInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2718,7 +2843,7 @@ 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} + return fileDescriptor_0aa947b204e6a7c2, []int{42} } func (m *TransactionInfoResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2762,7 +2887,7 @@ func (m *TransactionInfoByHashResponse) Reset() { *m = TransactionInfoBy func (m *TransactionInfoByHashResponse) String() string { return proto.CompactTextString(m) } func (*TransactionInfoByHashResponse) ProtoMessage() {} func (*TransactionInfoByHashResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{41} + return fileDescriptor_0aa947b204e6a7c2, []int{43} } func (m *TransactionInfoByHashResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2806,7 +2931,7 @@ 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} + return fileDescriptor_0aa947b204e6a7c2, []int{44} } func (m *NotesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2851,7 +2976,7 @@ 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} + return fileDescriptor_0aa947b204e6a7c2, []int{45} } func (m *NotesForVotingResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2919,7 +3044,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{44} + return fileDescriptor_0aa947b204e6a7c2, []int{46} } func (m *SpendableNoteRecord) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3046,7 +3171,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{45} + return fileDescriptor_0aa947b204e6a7c2, []int{47} } func (m *SwapRecord) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3163,7 +3288,7 @@ func (m *OwnedPositionIdsRequest) Reset() { *m = OwnedPositionIdsRequest func (m *OwnedPositionIdsRequest) String() string { return proto.CompactTextString(m) } func (*OwnedPositionIdsRequest) ProtoMessage() {} func (*OwnedPositionIdsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{46} + return fileDescriptor_0aa947b204e6a7c2, []int{48} } func (m *OwnedPositionIdsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3256,7 +3381,7 @@ func (m *OwnedPositionIdsResponse) Reset() { *m = OwnedPositionIdsRespon func (m *OwnedPositionIdsResponse) String() string { return proto.CompactTextString(m) } func (*OwnedPositionIdsResponse) ProtoMessage() {} func (*OwnedPositionIdsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{47} + return fileDescriptor_0aa947b204e6a7c2, []int{49} } func (m *OwnedPositionIdsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3293,6 +3418,8 @@ func (m *OwnedPositionIdsResponse) GetPositionIds() []*v1alpha15.PositionId { } func init() { + proto.RegisterType((*AuthorizeAndBuildRequest)(nil), "penumbra.view.v1alpha1.AuthorizeAndBuildRequest") + proto.RegisterType((*AuthorizeAndBuildResponse)(nil), "penumbra.view.v1alpha1.AuthorizeAndBuildResponse") proto.RegisterType((*BroadcastTransactionRequest)(nil), "penumbra.view.v1alpha1.BroadcastTransactionRequest") proto.RegisterType((*BroadcastTransactionResponse)(nil), "penumbra.view.v1alpha1.BroadcastTransactionResponse") proto.RegisterType((*TransactionPlannerRequest)(nil), "penumbra.view.v1alpha1.TransactionPlannerRequest") @@ -3307,8 +3434,8 @@ func init() { proto.RegisterType((*IndexByAddressResponse)(nil), "penumbra.view.v1alpha1.IndexByAddressResponse") proto.RegisterType((*EphemeralAddressRequest)(nil), "penumbra.view.v1alpha1.EphemeralAddressRequest") proto.RegisterType((*EphemeralAddressResponse)(nil), "penumbra.view.v1alpha1.EphemeralAddressResponse") - proto.RegisterType((*BalanceByAddressRequest)(nil), "penumbra.view.v1alpha1.BalanceByAddressRequest") - proto.RegisterType((*BalanceByAddressResponse)(nil), "penumbra.view.v1alpha1.BalanceByAddressResponse") + proto.RegisterType((*BalancesRequest)(nil), "penumbra.view.v1alpha1.BalancesRequest") + proto.RegisterType((*BalancesResponse)(nil), "penumbra.view.v1alpha1.BalancesResponse") proto.RegisterType((*ViewAuthToken)(nil), "penumbra.view.v1alpha1.ViewAuthToken") proto.RegisterType((*ViewAuthRequest)(nil), "penumbra.view.v1alpha1.ViewAuthRequest") proto.RegisterType((*ViewAuthResponse)(nil), "penumbra.view.v1alpha1.ViewAuthResponse") @@ -3350,187 +3477,192 @@ func init() { func init() { proto.RegisterFile("penumbra/view/v1alpha1/view.proto", fileDescriptor_0aa947b204e6a7c2) } var fileDescriptor_0aa947b204e6a7c2 = []byte{ - // 2865 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0xdd, 0x6f, 0x1b, 0xc7, - 0xb5, 0xf7, 0x92, 0xfa, 0xf2, 0xa1, 0x48, 0xca, 0x63, 0x5b, 0x62, 0x98, 0x44, 0xf1, 0xdd, 0xc4, - 0xb6, 0xe2, 0x24, 0x94, 0xa3, 0x38, 0xb9, 0xb9, 0x4a, 0x82, 0x1b, 0xd1, 0xba, 0xb2, 0x04, 0xc7, - 0x31, 0xef, 0xca, 0x56, 0x9a, 0x44, 0xe9, 0x62, 0xb4, 0x3b, 0x92, 0xb6, 0x22, 0x77, 0x37, 0xbb, - 0x43, 0x51, 0x6a, 0x9f, 0x52, 0x04, 0x85, 0x11, 0xa0, 0x41, 0xdf, 0x8a, 0xbc, 0xf6, 0xb1, 0xe8, - 0x6b, 0x5f, 0xfb, 0xd2, 0x97, 0xa2, 0x4f, 0x79, 0x2c, 0xd0, 0xa2, 0x28, 0x1c, 0xf4, 0xa5, 0xfd, - 0x17, 0x0a, 0xb4, 0x98, 0xaf, 0xe5, 0xee, 0x92, 0x6b, 0x92, 0xb2, 0x0c, 0xb7, 0x4f, 0xe4, 0xcc, - 0x9c, 0xf3, 0x3b, 0x67, 0xce, 0x9c, 0x39, 0x73, 0xe6, 0xcc, 0xc2, 0x7f, 0xf9, 0xc4, 0x6d, 0xb7, - 0x76, 0x02, 0xbc, 0x78, 0xe8, 0x90, 0xce, 0xe2, 0xe1, 0xeb, 0xb8, 0xe9, 0xef, 0xe3, 0xd7, 0x79, - 0xab, 0xe6, 0x07, 0x1e, 0xf5, 0xd0, 0xac, 0x22, 0xa9, 0xf1, 0x4e, 0x45, 0x52, 0x5d, 0x88, 0x58, - 0x2d, 0x2f, 0x20, 0x8b, 0xd6, 0x3e, 0x76, 0xdc, 0x2e, 0x00, 0x6f, 0x0a, 0x84, 0xea, 0xb5, 0x14, - 0x65, 0x70, 0xec, 0x53, 0x2f, 0x46, 0xca, 0xdb, 0x92, 0xf6, 0xa5, 0x24, 0xad, 0x4d, 0x8e, 0xba, - 0x84, 0x36, 0x39, 0x92, 0x54, 0x37, 0x92, 0x54, 0x34, 0xc0, 0x6e, 0x88, 0x2d, 0xea, 0x78, 0x31, - 0x0d, 0x62, 0x9d, 0xfd, 0xb1, 0x9d, 0x1d, 0xab, 0x4b, 0xed, 0xec, 0x58, 0x92, 0x2a, 0x35, 0xaf, - 0x90, 0xe2, 0x03, 0xd2, 0xa5, 0xe3, 0x4d, 0x41, 0xa9, 0x7f, 0xa3, 0xc1, 0xb3, 0xf5, 0xc0, 0xc3, - 0xb6, 0x85, 0x43, 0x7a, 0xaf, 0x2b, 0xce, 0x20, 0x9f, 0xb7, 0x49, 0x48, 0xd1, 0xff, 0x43, 0x21, - 0xa6, 0x44, 0x45, 0xbb, 0xa4, 0x2d, 0x14, 0x96, 0x16, 0x6b, 0x91, 0x3d, 0x19, 0x7e, 0x2d, 0xae, - 0xa6, 0x92, 0x52, 0x8b, 0x83, 0xc5, 0x31, 0xd0, 0x55, 0x28, 0xe3, 0x0e, 0x76, 0xa8, 0x69, 0x13, - 0x4a, 0x04, 0x6c, 0xee, 0x92, 0xb6, 0x30, 0x65, 0x94, 0x78, 0xf7, 0xaa, 0xea, 0xd5, 0xbf, 0xd0, - 0xe0, 0xb9, 0xfe, 0xba, 0x85, 0xbe, 0xe7, 0x86, 0x04, 0xbd, 0x05, 0x39, 0xc7, 0x96, 0x3a, 0x5d, - 0x19, 0x46, 0xa7, 0x0d, 0xdb, 0xc8, 0x39, 0x36, 0x7a, 0x19, 0x66, 0x22, 0xd9, 0xe6, 0x3e, 0x71, - 0xf6, 0xf6, 0x29, 0x57, 0x61, 0xcc, 0x28, 0x47, 0xfd, 0xeb, 0xbc, 0x5b, 0xff, 0x06, 0xe0, 0x99, - 0x98, 0xe8, 0x46, 0x13, 0xbb, 0x2e, 0x09, 0x94, 0x75, 0x5e, 0x84, 0x22, 0x39, 0xf2, 0x9d, 0xe0, - 0x58, 0xa1, 0x68, 0x1c, 0x65, 0x5a, 0x74, 0x0a, 0x08, 0x74, 0x03, 0xf2, 0xbb, 0x84, 0x70, 0x01, - 0x85, 0x25, 0x3d, 0xa5, 0xa6, 0x74, 0x9c, 0x48, 0xc3, 0x35, 0x42, 0x0c, 0x46, 0x8e, 0x10, 0x8c, - 0xb5, 0x48, 0xcb, 0xab, 0xe4, 0x2f, 0x69, 0x0b, 0x67, 0x0d, 0xfe, 0x1f, 0x6d, 0xc3, 0x0c, 0xb6, - 0x2c, 0xaf, 0xed, 0x52, 0x73, 0x2f, 0xf0, 0xda, 0xbe, 0xe9, 0xd8, 0x95, 0x12, 0x87, 0x7d, 0x6d, - 0x00, 0xec, 0x8a, 0x60, 0xbb, 0xc5, 0xb8, 0x36, 0xec, 0xf5, 0x33, 0x46, 0x09, 0x27, 0x7a, 0x1e, - 0x68, 0x1a, 0x32, 0x60, 0xd2, 0x6b, 0x53, 0xbf, 0x4d, 0xc3, 0xca, 0x85, 0x4b, 0xf9, 0x85, 0xc2, - 0xd2, 0xdb, 0xb5, 0xfe, 0xdb, 0xa6, 0x96, 0x69, 0x90, 0xda, 0x5d, 0x0e, 0x60, 0x28, 0x20, 0xf4, - 0x01, 0x8c, 0x87, 0x1d, 0xec, 0x87, 0x95, 0x79, 0x8e, 0xf8, 0xd6, 0xe8, 0x88, 0x9b, 0x1d, 0xec, - 0x1b, 0x02, 0x04, 0x6d, 0x43, 0xc1, 0x26, 0x4d, 0xb2, 0x87, 0x19, 0x5d, 0x58, 0x59, 0xe0, 0x98, - 0xcb, 0xa3, 0x63, 0xae, 0x0a, 0x10, 0x62, 0xc4, 0xe1, 0xd0, 0x0e, 0x14, 0xdb, 0x6e, 0x1c, 0x7f, - 0x89, 0xe3, 0xbf, 0x3b, 0x3a, 0xfe, 0x7d, 0x05, 0x43, 0x8c, 0x24, 0x24, 0x5a, 0x83, 0x82, 0xb3, - 0x63, 0x99, 0x82, 0x2b, 0xac, 0xbc, 0xcb, 0x25, 0x5c, 0x4e, 0x2d, 0x1e, 0xdb, 0xc7, 0x5d, 0x97, - 0xdd, 0xb1, 0x56, 0x84, 0xd7, 0x83, 0xa3, 0xfe, 0x86, 0xd5, 0x9f, 0x68, 0x30, 0x21, 0x6c, 0x8d, - 0x96, 0x61, 0xfc, 0x10, 0x37, 0xdb, 0x44, 0xee, 0x83, 0x97, 0x06, 0x78, 0xc2, 0x16, 0xa3, 0x35, - 0x04, 0x0b, 0x7a, 0x1f, 0x26, 0xb1, 0x6d, 0x07, 0x24, 0x0c, 0xa5, 0x7b, 0x5e, 0x19, 0xe4, 0x47, - 0x82, 0xda, 0x50, 0x6c, 0xd5, 0xdf, 0x6a, 0x30, 0xc6, 0x96, 0xe8, 0xb1, 0xd4, 0xd8, 0x80, 0x69, - 0x8a, 0x83, 0x3d, 0x42, 0x4d, 0x1c, 0x86, 0x84, 0x0e, 0xab, 0x0b, 0xa3, 0xdd, 0xb0, 0x8d, 0x82, - 0xe0, 0xe5, 0x4d, 0xb5, 0xd9, 0xf2, 0x23, 0x6d, 0xb6, 0xea, 0xd7, 0x1a, 0x4c, 0x29, 0xa7, 0x40, - 0xef, 0xc1, 0x04, 0x6e, 0xb1, 0xbd, 0x21, 0xa7, 0x72, 0x79, 0x90, 0x1e, 0x9c, 0xd8, 0x90, 0x4c, - 0xe8, 0x26, 0x9c, 0x0d, 0x30, 0x25, 0xa6, 0x8d, 0x29, 0x96, 0x7a, 0xa4, 0x67, 0x22, 0x02, 0x70, - 0x04, 0x60, 0x60, 0x4a, 0x56, 0x31, 0xc5, 0xc6, 0x54, 0x20, 0xff, 0x55, 0x7f, 0xaa, 0x01, 0x74, - 0xbd, 0xe8, 0xb1, 0x8c, 0x9b, 0xd0, 0x27, 0x77, 0x32, 0x7d, 0xea, 0xe7, 0xe1, 0x9c, 0x99, 0x0e, - 0x3d, 0x3a, 0x81, 0x6a, 0xbf, 0x3d, 0x20, 0x83, 0xf3, 0x2d, 0x18, 0xf3, 0x9b, 0x58, 0x1d, 0x19, - 0x6f, 0x8c, 0x78, 0x64, 0x30, 0x34, 0x83, 0x03, 0xe8, 0x0e, 0x5c, 0x94, 0x6e, 0x57, 0x3f, 0xde, - 0x70, 0x6d, 0x72, 0xa4, 0xa2, 0x6f, 0x03, 0x8a, 0xd2, 0x0d, 0x4d, 0x87, 0xf5, 0x4b, 0x51, 0xaf, - 0x0c, 0xe7, 0xc3, 0x02, 0x6a, 0x1a, 0xc7, 0x5a, 0xfa, 0x27, 0x30, 0x9b, 0x16, 0x25, 0x67, 0x13, - 0xdb, 0x29, 0xda, 0x89, 0x76, 0x8a, 0xfe, 0x31, 0x5c, 0xe4, 0x90, 0xf5, 0x63, 0x35, 0x24, 0xa7, - 0xf1, 0xf8, 0xd0, 0x5f, 0x68, 0x30, 0x9b, 0xc6, 0x96, 0x7a, 0xdf, 0x7f, 0x7c, 0x1b, 0xad, 0x9f, - 0x49, 0x5a, 0xe9, 0x81, 0xa6, 0xd5, 0x67, 0xa0, 0x64, 0x26, 0x70, 0xf5, 0x03, 0x98, 0xfb, 0x3f, - 0x7f, 0x9f, 0xb4, 0x48, 0x80, 0x9b, 0xa9, 0x09, 0x9e, 0xfe, 0x3a, 0x6d, 0x43, 0xa5, 0x57, 0xd8, - 0xa9, 0xad, 0xd4, 0xa7, 0x30, 0x57, 0xc7, 0x4d, 0xec, 0x5a, 0xe4, 0x09, 0xac, 0xd5, 0xcf, 0x35, - 0xa8, 0xf4, 0xa2, 0x4b, 0xdd, 0xdf, 0x85, 0x71, 0x11, 0x01, 0xb5, 0x91, 0x22, 0xa0, 0x60, 0x8a, - 0x05, 0xae, 0xdc, 0x09, 0x02, 0x97, 0x7e, 0x19, 0x8a, 0x5b, 0x0e, 0xe9, 0xac, 0xb4, 0xe9, 0xfe, - 0x3d, 0xef, 0x80, 0xb8, 0xe8, 0x02, 0x8c, 0x3b, 0x6c, 0x4b, 0x73, 0x6d, 0xa6, 0x0d, 0xd1, 0xd0, - 0x0d, 0x28, 0x2b, 0x32, 0x65, 0x95, 0xff, 0x85, 0xfc, 0xee, 0xe1, 0x81, 0x54, 0x7a, 0x50, 0x2a, - 0xb2, 0xd6, 0x6e, 0x36, 0x19, 0x80, 0xe3, 0xee, 0xdd, 0x26, 0xc7, 0x06, 0xe3, 0xd4, 0xef, 0xc2, - 0x4c, 0x17, 0x53, 0xda, 0xe2, 0x1d, 0x18, 0xa7, 0x4c, 0x8d, 0xde, 0x28, 0x9c, 0x3c, 0x86, 0x13, - 0x3a, 0x1b, 0x82, 0x47, 0xff, 0xb1, 0x06, 0xc5, 0x4d, 0x8a, 0x69, 0x3b, 0x5a, 0xb9, 0x27, 0x9a, - 0x3b, 0xf5, 0x8f, 0x8f, 0x06, 0x94, 0x94, 0x0e, 0x72, 0x4e, 0x2f, 0x40, 0x21, 0x3c, 0x76, 0xad, - 0x64, 0xb6, 0x08, 0xac, 0x4b, 0xe6, 0x8a, 0x2f, 0x40, 0xc1, 0xc2, 0xd4, 0xda, 0x77, 0xdc, 0x3d, - 0xb3, 0xed, 0xcb, 0xbc, 0x18, 0x54, 0xd7, 0x7d, 0x5f, 0x7f, 0xa0, 0xc1, 0x79, 0x01, 0xba, 0x49, - 0x03, 0x82, 0x5b, 0x4f, 0x71, 0x7a, 0x01, 0x5c, 0x48, 0x6a, 0x22, 0x27, 0xf9, 0x3f, 0xf0, 0x4c, - 0x13, 0x53, 0x12, 0x52, 0xf3, 0xc0, 0xf5, 0x3a, 0xae, 0xb9, 0xd3, 0xf4, 0xac, 0x83, 0xe4, 0x94, - 0x67, 0x05, 0xc1, 0x6d, 0x36, 0x5e, 0x67, 0xc3, 0xdd, 0xe9, 0xc7, 0xed, 0x93, 0x4b, 0xdb, 0x47, - 0xff, 0x2a, 0x0f, 0xd3, 0x1f, 0x7a, 0x94, 0x84, 0xb1, 0x0c, 0xdc, 0x71, 0xad, 0x66, 0xdb, 0x26, - 0x66, 0xe8, 0x13, 0xe9, 0xfa, 0x53, 0xc6, 0xb4, 0xec, 0xdc, 0x64, 0x7d, 0x68, 0x05, 0xa6, 0xf8, - 0x0e, 0x61, 0x46, 0xc9, 0x8f, 0xb4, 0xb3, 0x26, 0xb1, 0xf8, 0xd3, 0x1b, 0xc3, 0xc6, 0x1e, 0x33, - 0x86, 0xa1, 0x3b, 0x50, 0x16, 0x1b, 0xcf, 0xa4, 0x1e, 0xd7, 0xdd, 0xae, 0x4c, 0x8c, 0xb2, 0x6d, - 0x8b, 0x82, 0xfb, 0x9e, 0xc7, 0xe6, 0x68, 0x3f, 0x0d, 0x07, 0x78, 0x90, 0x83, 0x8b, 0x7c, 0x31, - 0xd6, 0xbc, 0x60, 0xcb, 0xa3, 0x8e, 0xbb, 0xa7, 0x56, 0xe5, 0x1a, 0x9c, 0x3b, 0xf4, 0x28, 0xde, - 0x69, 0x12, 0x13, 0xd3, 0xe4, 0xd2, 0x97, 0xe5, 0xc0, 0x0a, 0x95, 0x6b, 0xde, 0x63, 0xd9, 0xfc, - 0xe3, 0x5a, 0xf6, 0x29, 0x98, 0xe2, 0x37, 0x39, 0x28, 0x7d, 0xe4, 0x50, 0x37, 0x76, 0x54, 0x7c, - 0x0c, 0x33, 0xae, 0x47, 0x89, 0x69, 0x79, 0xad, 0x96, 0x43, 0x5b, 0xc4, 0xa5, 0x2c, 0xc9, 0x66, - 0xf9, 0x7e, 0x6d, 0x80, 0x16, 0x6c, 0x57, 0x91, 0x9b, 0x11, 0x9b, 0x51, 0x66, 0x38, 0xdd, 0x76, - 0x88, 0xbe, 0x0f, 0x33, 0xb1, 0xfc, 0xc9, 0xe4, 0x69, 0x56, 0xfe, 0xe4, 0x69, 0x56, 0x99, 0x26, - 0x3b, 0x9e, 0x86, 0x01, 0x09, 0x94, 0x23, 0xfb, 0xc9, 0x38, 0x62, 0xc0, 0x74, 0x47, 0x74, 0x89, - 0xdc, 0x75, 0x84, 0xda, 0x83, 0x84, 0xe2, 0x49, 0x6c, 0xa1, 0xd3, 0x6d, 0xe8, 0x7f, 0xd6, 0x60, - 0x56, 0x0e, 0xae, 0xb8, 0x76, 0xbd, 0xed, 0x34, 0x6d, 0xb5, 0x5e, 0xfd, 0x8c, 0xaa, 0x9d, 0xa2, - 0x51, 0x6d, 0x40, 0xb8, 0x4d, 0xf7, 0xbd, 0xc0, 0xf9, 0x21, 0xbf, 0x0c, 0xc6, 0x13, 0xf2, 0x37, - 0x87, 0x91, 0xb0, 0x12, 0xe7, 0xe6, 0x53, 0x3b, 0x87, 0xd3, 0x5d, 0x7a, 0x13, 0xe6, 0x7a, 0xe6, - 0x27, 0xed, 0x79, 0xfa, 0xa5, 0x1c, 0xfd, 0x57, 0x79, 0x28, 0xf2, 0x50, 0x19, 0x79, 0x7d, 0x15, - 0xa6, 0x76, 0x9d, 0x26, 0x25, 0x01, 0x11, 0x85, 0x99, 0x29, 0x23, 0x6a, 0xa3, 0x1f, 0xc0, 0x7c, - 0x2c, 0x56, 0x5b, 0xce, 0xae, 0x63, 0x99, 0x36, 0x71, 0xbd, 0x96, 0xe3, 0xca, 0x1b, 0xb7, 0xd8, - 0x1f, 0x83, 0xae, 0x37, 0xab, 0x8c, 0xc7, 0x78, 0xae, 0x1b, 0xe2, 0x39, 0xd4, 0x6a, 0x1c, 0x09, - 0x2d, 0xc3, 0x33, 0x4a, 0x56, 0xf7, 0xfe, 0x6d, 0xf2, 0xe4, 0x20, 0xe4, 0x7b, 0x65, 0xca, 0x98, - 0x93, 0x04, 0xab, 0xd1, 0x38, 0x4f, 0x21, 0x42, 0xf4, 0x36, 0x54, 0x14, 0x6f, 0xdb, 0xdd, 0xf1, - 0x5c, 0x9b, 0x9d, 0xc6, 0x92, 0x75, 0x8c, 0xb3, 0xce, 0xca, 0xf1, 0xfb, 0x6a, 0x58, 0x72, 0x5e, - 0x81, 0xb2, 0xe2, 0x6c, 0xfa, 0xa6, 0xbb, 0x4b, 0xc3, 0xca, 0x38, 0x67, 0x50, 0x87, 0xd4, 0x07, - 0xfe, 0x87, 0xbb, 0x34, 0x44, 0x4b, 0x70, 0x51, 0xd1, 0xf9, 0x81, 0xe7, 0x7b, 0x21, 0x6e, 0x0a, - 0xea, 0x09, 0x4e, 0x7d, 0x5e, 0x0e, 0x36, 0xe4, 0x18, 0xe7, 0x59, 0x81, 0xe7, 0x15, 0xcf, 0x21, - 0x0f, 0xb6, 0x66, 0x40, 0x2c, 0xe2, 0xf8, 0x54, 0xa9, 0x36, 0xc9, 0x79, 0xab, 0x92, 0x48, 0x05, - 0x64, 0x4e, 0x22, 0xd4, 0xd3, 0x09, 0x94, 0xd4, 0x6a, 0x49, 0x9f, 0xd8, 0x84, 0x12, 0x5f, 0x01, - 0xb3, 0x45, 0x28, 0x8e, 0x39, 0xe4, 0xab, 0xc3, 0x2c, 0xc1, 0x1d, 0xc9, 0x63, 0x14, 0xed, 0x78, - 0x53, 0xaf, 0xc0, 0xec, 0xcd, 0x7d, 0xec, 0xb8, 0x0d, 0x1c, 0xe0, 0x16, 0xa1, 0x24, 0x50, 0xde, - 0xa1, 0xef, 0xc3, 0x5c, 0xcf, 0x88, 0xd4, 0xe4, 0x0e, 0x80, 0x1f, 0xf5, 0x66, 0xa5, 0x92, 0xbc, - 0x20, 0x1b, 0x29, 0x91, 0x86, 0x8a, 0x01, 0xe8, 0xb3, 0x70, 0x61, 0xed, 0xce, 0x6a, 0xaf, 0x06, - 0x36, 0x5c, 0x4c, 0xf5, 0x4b, 0xf9, 0xb7, 0xfb, 0xc8, 0x7f, 0xe5, 0xd1, 0xf2, 0xd7, 0x5a, 0x76, - 0x86, 0xf4, 0xaf, 0x73, 0x30, 0xc7, 0x4e, 0xc6, 0xfa, 0x71, 0x2c, 0x8c, 0xcb, 0x1d, 0xf2, 0x11, - 0x94, 0x53, 0xe7, 0x82, 0xb4, 0xf9, 0xa8, 0xc7, 0x42, 0x29, 0x79, 0x2c, 0xf4, 0xab, 0xab, 0xe6, - 0xfb, 0xd5, 0x55, 0x9f, 0x46, 0x78, 0x77, 0xa1, 0xd2, 0x6b, 0x8f, 0x28, 0xce, 0x97, 0x78, 0xfa, - 0xc3, 0xd3, 0x05, 0x36, 0xa7, 0x5e, 0xeb, 0x27, 0x33, 0xfe, 0x4d, 0x45, 0xcd, 0x20, 0x0d, 0x62, - 0x79, 0x81, 0x6d, 0x14, 0xc3, 0x78, 0x27, 0x5f, 0x80, 0xcd, 0x0e, 0xf6, 0x33, 0x16, 0x20, 0xec, - 0x60, 0xff, 0x14, 0x16, 0x80, 0xc1, 0xfc, 0x87, 0x2c, 0x80, 0x01, 0x95, 0x5e, 0x7b, 0x44, 0x65, - 0xf4, 0x31, 0x36, 0x13, 0x69, 0x76, 0x3d, 0xd3, 0xec, 0x1d, 0xec, 0x4b, 0x6b, 0x73, 0x7a, 0xfd, - 0x1f, 0x1a, 0xcc, 0x7e, 0xd8, 0x6e, 0x36, 0x9d, 0x5d, 0x87, 0x04, 0xc9, 0xdb, 0xd6, 0x1a, 0x9c, - 0x75, 0xd5, 0x88, 0xb4, 0xee, 0xc2, 0x80, 0xa9, 0x45, 0x48, 0x46, 0x97, 0xf5, 0xdf, 0xda, 0xa4, - 0x8b, 0x30, 0xd7, 0x33, 0x7b, 0x69, 0xd1, 0x0b, 0x30, 0x2e, 0x6e, 0x23, 0xe2, 0x08, 0x14, 0x0d, - 0x7d, 0x0b, 0x9e, 0x8b, 0x9d, 0xa4, 0x1b, 0xee, 0xae, 0x57, 0x3f, 0x5e, 0xc7, 0x61, 0x74, 0x8d, - 0x16, 0xcf, 0x19, 0xb9, 0x51, 0x9f, 0x33, 0xf4, 0x2f, 0x35, 0x98, 0x4d, 0x01, 0x2b, 0xc8, 0x2b, - 0x30, 0x1d, 0x52, 0x1c, 0x24, 0x73, 0xf0, 0xf5, 0x33, 0x46, 0x81, 0xf7, 0x8a, 0x0c, 0xfc, 0x81, - 0xa6, 0x21, 0x1d, 0x80, 0xb8, 0x76, 0xe2, 0xde, 0xb5, 0xae, 0x19, 0x67, 0x89, 0x6b, 0x47, 0x34, - 0xf5, 0x32, 0x14, 0xcd, 0x38, 0x58, 0xbd, 0x08, 0x05, 0xb3, 0xcb, 0xa5, 0xff, 0x3d, 0x07, 0xe5, - 0x94, 0x1a, 0xe8, 0x59, 0x98, 0x48, 0x49, 0x96, 0x6d, 0x26, 0xf4, 0x84, 0xf3, 0x4d, 0x27, 0x32, - 0xf9, 0x53, 0x78, 0x93, 0xda, 0x86, 0x82, 0x4f, 0x02, 0x96, 0x95, 0x50, 0xe7, 0x90, 0xc8, 0xcb, - 0xdd, 0xf2, 0xa8, 0x79, 0x5f, 0x17, 0xc1, 0x88, 0xc3, 0xa1, 0x5b, 0x30, 0xc6, 0xb6, 0x12, 0xcf, - 0x05, 0x46, 0x4f, 0x27, 0xb7, 0x1c, 0xd2, 0x31, 0x38, 0x40, 0xfd, 0x2c, 0x4c, 0x2a, 0x6b, 0x7f, - 0x0a, 0x73, 0x3d, 0x6b, 0xde, 0xad, 0x80, 0xd1, 0x23, 0xd3, 0x71, 0x77, 0x3d, 0xb9, 0xa5, 0xaf, - 0x0e, 0xf1, 0x84, 0xc1, 0x11, 0x26, 0xe8, 0x11, 0xfb, 0xd5, 0x31, 0x3c, 0x9f, 0xe1, 0xa9, 0xa7, - 0x26, 0xe2, 0x33, 0x28, 0xca, 0x8b, 0xbc, 0x84, 0xfc, 0x00, 0x0a, 0xfc, 0x5c, 0x0c, 0x78, 0x88, - 0x39, 0xc9, 0x19, 0x00, 0x6e, 0xf4, 0x5f, 0xff, 0x35, 0x8b, 0x4d, 0xa9, 0xbb, 0xe9, 0x93, 0x10, - 0x84, 0xee, 0xc0, 0xb4, 0x63, 0x13, 0x97, 0x3a, 0xf4, 0xd8, 0x3c, 0x20, 0xc7, 0xd2, 0x9d, 0xaf, - 0x0d, 0x08, 0x3a, 0x1b, 0x92, 0xe5, 0x36, 0x39, 0x36, 0x0a, 0x4e, 0xb7, 0xa1, 0xff, 0x33, 0x0f, - 0xe7, 0xfb, 0x88, 0xec, 0x97, 0x35, 0x68, 0xa7, 0x92, 0x35, 0xfc, 0x37, 0x8c, 0xf1, 0x33, 0x57, - 0xe8, 0xfd, 0xe2, 0xa0, 0x20, 0xcd, 0x34, 0xe2, 0x0c, 0x4f, 0xe0, 0xde, 0x9e, 0x38, 0x34, 0xc6, - 0x4e, 0x7e, 0x68, 0x5c, 0x86, 0x92, 0xd8, 0x24, 0xa6, 0x15, 0x10, 0x4c, 0x89, 0xcd, 0x37, 0xde, - 0x98, 0x51, 0x14, 0xbd, 0x37, 0x45, 0x27, 0x8b, 0x8d, 0x92, 0x4c, 0xc4, 0xea, 0x09, 0x15, 0x1b, - 0x45, 0x2f, 0x2f, 0x1d, 0xb1, 0x30, 0x55, 0x85, 0x29, 0xdf, 0x0b, 0x1d, 0x1e, 0x6b, 0x26, 0x39, - 0x50, 0xd4, 0x46, 0xef, 0xc3, 0x44, 0xe8, 0xb5, 0x03, 0x8b, 0x54, 0xa6, 0xfa, 0xeb, 0x9b, 0xcc, - 0x18, 0x99, 0xf9, 0x36, 0x39, 0xbd, 0x21, 0xf9, 0x78, 0x54, 0x8d, 0xab, 0xa1, 0xff, 0x31, 0x0f, - 0xd0, 0x3d, 0x6a, 0xfb, 0x65, 0x2b, 0xda, 0xa9, 0x64, 0x2b, 0xef, 0xc9, 0x53, 0x5f, 0x2c, 0xfc, - 0xcb, 0x29, 0x34, 0x9b, 0x1c, 0x25, 0x4f, 0xfe, 0x46, 0x13, 0x3b, 0x2e, 0x25, 0x47, 0x54, 0x1c, - 0xfe, 0x09, 0xab, 0xe4, 0x53, 0x56, 0x39, 0xad, 0x85, 0x6c, 0x40, 0x41, 0x3c, 0x24, 0x8b, 0xbb, - 0xf2, 0x78, 0xdf, 0x40, 0x9f, 0xd0, 0xb4, 0x8e, 0xa9, 0xb5, 0xcf, 0xd4, 0x15, 0x8f, 0xa3, 0xfc, - 0x96, 0x0c, 0x5e, 0xf4, 0x1f, 0x5d, 0xeb, 0xba, 0x46, 0x13, 0x3b, 0x2d, 0x62, 0x47, 0xab, 0xae, - 0x9c, 0x43, 0x74, 0xb3, 0x75, 0xef, 0xae, 0xed, 0xe4, 0x09, 0xd7, 0xf6, 0x1c, 0x94, 0xcd, 0xa4, - 0x38, 0xfd, 0xaf, 0x1a, 0xcc, 0xdd, 0xed, 0xb8, 0xc4, 0x6e, 0x48, 0x63, 0x6d, 0xd8, 0x51, 0xd2, - 0x74, 0x1f, 0x4a, 0xca, 0x84, 0xec, 0xa0, 0x8d, 0x12, 0xe1, 0x47, 0xae, 0x8d, 0xc2, 0xe1, 0xcb, - 0xcd, 0xe6, 0xe1, 0xc7, 0x3b, 0xd8, 0x3c, 0xee, 0xc2, 0x34, 0x0d, 0x30, 0xbf, 0xc4, 0xfa, 0xd8, - 0x51, 0xe9, 0xd8, 0xd5, 0x47, 0x81, 0xde, 0x13, 0xf4, 0x0d, 0xec, 0x04, 0xeb, 0x1a, 0x3f, 0x29, - 0x55, 0x93, 0x25, 0x02, 0x6c, 0x5a, 0x49, 0x45, 0xb9, 0x17, 0xc7, 0x85, 0xe8, 0x04, 0x2a, 0xbd, - 0xd3, 0x94, 0x01, 0x78, 0x03, 0xa6, 0x23, 0x76, 0xc7, 0x66, 0x97, 0xad, 0x7c, 0x9f, 0x0c, 0xa0, - 0xef, 0x2c, 0x37, 0x6c, 0xa3, 0xe0, 0x77, 0x21, 0x97, 0xfe, 0x84, 0xe0, 0x3c, 0x3b, 0x1f, 0x1b, - 0x81, 0x47, 0x3d, 0xcb, 0x6b, 0x6e, 0x92, 0xe0, 0xd0, 0xb1, 0x08, 0xfa, 0x08, 0x26, 0x44, 0x4a, - 0x86, 0x32, 0xdf, 0x0d, 0x12, 0x09, 0x6b, 0xf5, 0xca, 0x20, 0x32, 0xa9, 0xfb, 0x01, 0x4c, 0xc7, - 0x8b, 0xde, 0xe8, 0x95, 0x47, 0xf3, 0x25, 0x8a, 0xf4, 0xd5, 0x57, 0x87, 0x23, 0x16, 0xa2, 0xae, - 0x6b, 0x68, 0x0b, 0xc6, 0xf9, 0x19, 0x86, 0x5e, 0xca, 0x62, 0x8c, 0xd7, 0xc2, 0xab, 0x97, 0x07, - 0x50, 0x45, 0xb8, 0x9f, 0x43, 0x29, 0x79, 0x36, 0xa2, 0xd7, 0x1e, 0xc9, 0x9a, 0xae, 0xef, 0x56, - 0x6b, 0xc3, 0x92, 0x47, 0x22, 0x3f, 0x81, 0x49, 0x59, 0x97, 0x42, 0x99, 0xa6, 0x4e, 0x16, 0x50, - 0xab, 0x57, 0x07, 0xd2, 0xc9, 0x35, 0x09, 0xa2, 0xda, 0xa1, 0xaa, 0x79, 0xa1, 0xda, 0x00, 0xde, - 0x54, 0xf1, 0xaf, 0xba, 0x38, 0x34, 0xbd, 0x94, 0xf9, 0x31, 0x4c, 0x88, 0x52, 0x4a, 0xb6, 0x83, - 0x25, 0x0a, 0x63, 0xd9, 0x0e, 0x96, 0xac, 0xc8, 0x5c, 0xd7, 0xd8, 0x74, 0x52, 0x95, 0x8d, 0xec, - 0xe9, 0xf4, 0xaf, 0xb3, 0x64, 0x4f, 0x27, 0xab, 0xfa, 0xd2, 0x84, 0x62, 0xa2, 0x2c, 0x82, 0x32, - 0x5d, 0xb5, 0x5f, 0x55, 0xa5, 0xfa, 0xda, 0x90, 0xd4, 0x52, 0x9a, 0x07, 0xa5, 0xe4, 0x33, 0x7b, - 0xb6, 0xff, 0xf5, 0x7d, 0xf9, 0xcf, 0xf6, 0xbf, 0x8c, 0xd7, 0x7b, 0x0f, 0x4a, 0xc9, 0xf7, 0xf1, - 0x6c, 0x81, 0x7d, 0xdf, 0xe8, 0xb3, 0x05, 0x66, 0x3c, 0xbb, 0xb7, 0x61, 0x26, 0xfd, 0x40, 0x8d, - 0x32, 0x17, 0x25, 0xe3, 0xdd, 0xbc, 0x7a, 0x7d, 0x78, 0x06, 0x29, 0xb6, 0x03, 0x33, 0xe9, 0xb7, - 0xe5, 0x6c, 0xb1, 0x19, 0x6f, 0xdc, 0xd9, 0x62, 0xb3, 0x9e, 0xad, 0xaf, 0x6b, 0x6c, 0xbe, 0xe9, - 0xfa, 0x4e, 0xb6, 0xe0, 0x8c, 0xca, 0x58, 0xb6, 0xe0, 0xcc, 0xd2, 0x51, 0x1b, 0x66, 0xd2, 0x55, - 0x8d, 0x6c, 0xb1, 0x19, 0xf5, 0xa0, 0x6c, 0xb1, 0x99, 0x05, 0x93, 0x00, 0xca, 0xa9, 0x9b, 0x7f, - 0xf6, 0x0e, 0xed, 0x5f, 0x20, 0xc9, 0xde, 0xa1, 0x59, 0x25, 0x85, 0x2f, 0x35, 0xb8, 0xd8, 0xf7, - 0x4e, 0x86, 0x6e, 0x0c, 0x79, 0xf5, 0x4a, 0x14, 0x1b, 0xaa, 0x6f, 0x8e, 0xc8, 0x25, 0xd5, 0xa0, - 0xbd, 0x77, 0xfc, 0xda, 0xb0, 0x57, 0xbf, 0x41, 0x53, 0xcf, 0xb8, 0xcf, 0x5e, 0xd7, 0xd0, 0x8f, - 0x00, 0xf5, 0x7e, 0x69, 0x84, 0x5e, 0x1f, 0xf9, 0xcb, 0xbc, 0xea, 0xd2, 0x28, 0x2c, 0x72, 0xca, - 0x5f, 0x68, 0x70, 0xa1, 0xdf, 0x67, 0xa8, 0xe8, 0x8d, 0xcc, 0x8d, 0x92, 0xfd, 0x41, 0x6d, 0xf5, - 0xc6, 0x68, 0x4c, 0x5d, 0x47, 0x4f, 0xa7, 0x53, 0xd9, 0x8e, 0x9e, 0x91, 0x5f, 0x66, 0x3b, 0x7a, - 0x56, 0xa6, 0xb6, 0xe4, 0x77, 0xbf, 0xf5, 0x50, 0x99, 0xd5, 0x67, 0x30, 0xa5, 0xba, 0xd0, 0xd5, - 0x41, 0xdf, 0x64, 0x28, 0xc9, 0x0b, 0x83, 0x09, 0x85, 0xc4, 0xfa, 0x57, 0xb9, 0xdf, 0x3d, 0x9c, - 0xd7, 0xbe, 0x7d, 0x38, 0xaf, 0xfd, 0xe5, 0xe1, 0xbc, 0xf6, 0xb3, 0xef, 0xe6, 0xcf, 0x7c, 0xfb, - 0xdd, 0xfc, 0x99, 0x3f, 0x7c, 0x37, 0x7f, 0x06, 0xaa, 0x96, 0xd7, 0xca, 0xc0, 0xa9, 0x9f, 0x8d, - 0x92, 0xc0, 0x86, 0xf6, 0xc9, 0xdd, 0x3d, 0x87, 0xee, 0xb7, 0x77, 0x6a, 0x96, 0xd7, 0x5a, 0xb4, - 0xbc, 0xb0, 0xe5, 0x85, 0x8b, 0x01, 0x69, 0xe2, 0x63, 0x12, 0x2c, 0x1e, 0x2e, 0x45, 0x7f, 0x79, - 0xfa, 0x1e, 0x2e, 0xf6, 0xff, 0x78, 0xfc, 0x1d, 0xd6, 0x52, 0x8d, 0x5f, 0xe4, 0xf2, 0x8d, 0xad, - 0xef, 0xfd, 0x32, 0x37, 0xdb, 0x50, 0xc2, 0x99, 0xb4, 0xda, 0x96, 0x1c, 0xfe, 0x7d, 0x77, 0x60, - 0x9b, 0x0d, 0x6c, 0xab, 0x81, 0x87, 0x39, 0xbd, 0xff, 0xc0, 0xf6, 0xad, 0x46, 0x5d, 0xbd, 0x96, - 0xfc, 0x2d, 0x57, 0x51, 0x44, 0xcb, 0xcb, 0x8c, 0x6a, 0x79, 0x59, 0x91, 0xed, 0x4c, 0xf0, 0x6f, - 0xb4, 0xdf, 0xf8, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x91, 0xe9, 0x08, 0x47, 0xe2, 0x2e, 0x00, - 0x00, + // 2954 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x5b, 0xcd, 0x6f, 0xdc, 0xc6, + 0x15, 0x37, 0x77, 0xf5, 0xe5, 0xb7, 0xda, 0x5d, 0x99, 0xb6, 0xa5, 0xf5, 0x26, 0x51, 0x52, 0x26, + 0xb6, 0x15, 0x27, 0x59, 0xd9, 0x8a, 0x93, 0xa6, 0x4a, 0xd2, 0x46, 0x6b, 0x45, 0x96, 0xe0, 0xd8, + 0x56, 0x29, 0x5b, 0x69, 0x52, 0xa5, 0xc4, 0x88, 0x1c, 0x49, 0xac, 0x76, 0x49, 0x86, 0x9c, 0xd5, + 0x47, 0x7b, 0x4a, 0x11, 0x14, 0x46, 0x80, 0x06, 0x45, 0xd1, 0x4b, 0xae, 0x3d, 0x16, 0xbd, 0xe6, + 0x9a, 0x4b, 0x2f, 0x45, 0x4f, 0x39, 0x16, 0x28, 0x50, 0x04, 0x0e, 0x7a, 0x69, 0xff, 0x85, 0x02, + 0x2d, 0xe6, 0x8b, 0x5f, 0x4b, 0x7a, 0x77, 0x25, 0x19, 0x6e, 0x7b, 0xd2, 0xce, 0xf0, 0xbd, 0xdf, + 0xfb, 0x98, 0x37, 0x6f, 0xde, 0x3c, 0x52, 0xf0, 0x1d, 0x0f, 0x3b, 0x9d, 0xf6, 0xa6, 0x8f, 0x66, + 0xf7, 0x6c, 0xbc, 0x3f, 0xbb, 0x77, 0x0d, 0xb5, 0xbc, 0x1d, 0x74, 0x8d, 0x8d, 0x1a, 0x9e, 0xef, + 0x12, 0x57, 0x9d, 0x94, 0x24, 0x0d, 0x36, 0x29, 0x49, 0xea, 0x33, 0x21, 0xab, 0xe9, 0xfa, 0x78, + 0xd6, 0xdc, 0x41, 0xb6, 0x13, 0x01, 0xb0, 0x21, 0x47, 0xa8, 0x5f, 0x49, 0x51, 0xfa, 0x87, 0x1e, + 0x71, 0x63, 0xa4, 0x6c, 0x2c, 0x68, 0x5f, 0x48, 0xd2, 0x5a, 0xf8, 0x20, 0x22, 0xb4, 0xf0, 0x81, + 0xa0, 0xba, 0x9e, 0xa4, 0x22, 0x3e, 0x72, 0x02, 0x64, 0x12, 0xdb, 0x8d, 0x69, 0x10, 0x9b, 0xcc, + 0xc6, 0xb6, 0x37, 0xcd, 0x88, 0xda, 0xde, 0x34, 0x05, 0x55, 0xca, 0xae, 0x80, 0xa0, 0x5d, 0x1c, + 0xd1, 0xb1, 0x21, 0xa7, 0xd4, 0xbe, 0x51, 0xa0, 0xb6, 0xd0, 0x21, 0x3b, 0xae, 0x6f, 0xff, 0x0c, + 0x2f, 0x38, 0x56, 0xb3, 0x63, 0xb7, 0x2c, 0x1d, 0x7f, 0xdc, 0xc1, 0x01, 0x51, 0x7f, 0x02, 0x13, + 0x31, 0x0d, 0x0c, 0xaf, 0x85, 0x9c, 0x9a, 0xf2, 0x9c, 0x32, 0x53, 0x9a, 0x7b, 0xb5, 0x11, 0x7a, + 0x94, 0x4a, 0x68, 0xc4, 0x15, 0x95, 0x72, 0x1a, 0xf7, 0xa2, 0xc9, 0xd5, 0x16, 0x72, 0xf4, 0x2a, + 0x49, 0x4e, 0xa8, 0x16, 0xa8, 0x48, 0xc8, 0x46, 0x4c, 0x82, 0x85, 0x08, 0xaa, 0x15, 0x98, 0x84, + 0xd7, 0xfa, 0x91, 0xb0, 0x10, 0xe7, 0x5e, 0x44, 0x04, 0xe9, 0x67, 0x50, 0x7a, 0x4a, 0x73, 0xe0, + 0x42, 0x86, 0x85, 0x81, 0xe7, 0x3a, 0x01, 0x56, 0x7f, 0x08, 0xa5, 0x18, 0xb2, 0xb0, 0x6e, 0x76, + 0x40, 0xeb, 0xf4, 0x38, 0x86, 0xf6, 0x85, 0x02, 0x4f, 0x35, 0x7d, 0x17, 0x59, 0x26, 0x0a, 0x48, + 0x9c, 0x4a, 0x78, 0xf5, 0xe4, 0x45, 0xaa, 0x97, 0xa1, 0x8a, 0xf6, 0x91, 0x4d, 0x0c, 0x0b, 0x13, + 0xcc, 0x61, 0xa9, 0x17, 0xc7, 0xf4, 0x0a, 0x9b, 0x5e, 0x94, 0xb3, 0xda, 0x27, 0x0a, 0x3c, 0x9d, + 0xad, 0x9b, 0xf0, 0xc7, 0xeb, 0x50, 0xb0, 0x2d, 0xa1, 0xd3, 0xa5, 0x7e, 0x74, 0x5a, 0xb1, 0xf4, + 0x82, 0x6d, 0xa9, 0x2f, 0xc2, 0x44, 0x28, 0xdb, 0xd8, 0xc1, 0xf6, 0xf6, 0x0e, 0x61, 0x2a, 0x0c, + 0xe9, 0xd5, 0x70, 0x7e, 0x99, 0x4d, 0x6b, 0x5f, 0x00, 0x5c, 0x48, 0x85, 0x86, 0x83, 0x7d, 0xe9, + 0x9d, 0xe7, 0xa1, 0x8c, 0x0f, 0x3c, 0xdb, 0x3f, 0x94, 0x28, 0x0a, 0x43, 0x19, 0xe7, 0x93, 0x1c, + 0x42, 0xbd, 0x0e, 0xc5, 0x2d, 0x8c, 0x45, 0xa4, 0x68, 0x29, 0x35, 0xc5, 0x5e, 0x0c, 0x35, 0x5c, + 0xc2, 0x58, 0xa7, 0xe4, 0xaa, 0x0a, 0x43, 0x6d, 0xdc, 0x76, 0x6b, 0xc5, 0xe7, 0x94, 0x99, 0xd3, + 0x3a, 0xfb, 0xad, 0x6e, 0xc0, 0x04, 0x32, 0x4d, 0xb7, 0xe3, 0x10, 0x63, 0xdb, 0x77, 0x3b, 0x9e, + 0x61, 0x5b, 0xb5, 0x0a, 0x83, 0x7d, 0xa5, 0x07, 0xec, 0x02, 0x67, 0xbb, 0x49, 0xb9, 0x56, 0xac, + 0xe5, 0x53, 0x7a, 0x05, 0x25, 0x66, 0x1e, 0x28, 0x8a, 0xaa, 0xc3, 0xa8, 0xdb, 0x21, 0x5e, 0x87, + 0x04, 0xb5, 0x73, 0xcf, 0x15, 0x67, 0x4a, 0x73, 0x6f, 0x34, 0xb2, 0x33, 0x51, 0x23, 0xd7, 0x21, + 0x8d, 0xbb, 0x0c, 0x40, 0x97, 0x40, 0xea, 0x7b, 0x30, 0x1c, 0xec, 0x23, 0x2f, 0xa8, 0x4d, 0x33, + 0xc4, 0xd7, 0x07, 0x47, 0x5c, 0xdb, 0x47, 0x9e, 0xce, 0x41, 0xd4, 0x0d, 0x28, 0x59, 0xb8, 0x85, + 0xb7, 0xd9, 0x76, 0x09, 0x6a, 0x33, 0x0c, 0x73, 0x7e, 0x70, 0xcc, 0x45, 0x0e, 0x82, 0xf5, 0x38, + 0x9c, 0xba, 0x09, 0xe5, 0x8e, 0x13, 0xc7, 0x9f, 0x63, 0xf8, 0x6f, 0x0d, 0x8e, 0x7f, 0x5f, 0xc2, + 0x60, 0x3d, 0x09, 0xa9, 0x2e, 0x41, 0xc9, 0xde, 0x34, 0x0d, 0xce, 0x15, 0xd4, 0xde, 0x62, 0x12, + 0x2e, 0xa6, 0x16, 0x8f, 0xa6, 0xc6, 0x28, 0x64, 0x37, 0xcd, 0x05, 0x1e, 0xf5, 0x60, 0xcb, 0x9f, + 0x41, 0xfd, 0x97, 0x0a, 0x8c, 0x70, 0x5f, 0xab, 0xf3, 0x30, 0xbc, 0x87, 0x5a, 0x1d, 0x2c, 0xf6, + 0xc1, 0x0b, 0x3d, 0x22, 0x61, 0x9d, 0xd2, 0xea, 0x9c, 0x45, 0x7d, 0x07, 0x46, 0x91, 0x65, 0xf9, + 0x38, 0x08, 0x44, 0x78, 0x5e, 0xea, 0x15, 0x47, 0x9c, 0x5a, 0x97, 0x6c, 0xf5, 0x3f, 0x2a, 0x30, + 0x44, 0x97, 0xe8, 0x58, 0x6a, 0xac, 0xc0, 0x38, 0x41, 0xfe, 0x36, 0x26, 0x06, 0x0a, 0x02, 0x4c, + 0xfa, 0xd5, 0x85, 0xd2, 0xae, 0x58, 0x7a, 0x89, 0xf3, 0xb2, 0xa1, 0xdc, 0x6c, 0xc5, 0x81, 0x36, + 0x5b, 0xfd, 0x73, 0x05, 0xc6, 0x64, 0x50, 0xa8, 0x6f, 0xc3, 0x08, 0x6a, 0xd3, 0xbd, 0x21, 0x4c, + 0xb9, 0xd8, 0x4b, 0x0f, 0x46, 0xac, 0x0b, 0x26, 0xf5, 0x06, 0x9c, 0xf6, 0x11, 0xc1, 0xfc, 0x78, + 0x28, 0x66, 0x5a, 0xc2, 0xcf, 0xb4, 0x10, 0x40, 0x47, 0x04, 0xb3, 0xf3, 0x60, 0xcc, 0x17, 0xbf, + 0xea, 0xbf, 0x52, 0x00, 0xa2, 0x28, 0x3a, 0x96, 0x73, 0x13, 0xfa, 0x14, 0x8e, 0xa6, 0x4f, 0xf3, + 0x2c, 0x9c, 0x31, 0xd2, 0xa9, 0x47, 0xc3, 0x50, 0xcf, 0xda, 0x03, 0x22, 0x39, 0xdf, 0x84, 0xa1, + 0xe3, 0x9e, 0xc1, 0x0c, 0x40, 0xfb, 0x8d, 0x02, 0xe7, 0x45, 0xdc, 0x35, 0x0f, 0x57, 0x1c, 0x0b, + 0x1f, 0xc8, 0xf4, 0xbb, 0x0a, 0x65, 0x11, 0x87, 0x86, 0x4d, 0xe7, 0x85, 0xac, 0x97, 0xfa, 0x0b, + 0x62, 0x0e, 0x35, 0x8e, 0x62, 0x23, 0x7a, 0x36, 0x59, 0x76, 0xe0, 0xb5, 0xd0, 0xa1, 0x61, 0xba, + 0xce, 0x96, 0xed, 0xb7, 0xe5, 0xd9, 0x24, 0xa6, 0x6f, 0xf0, 0x59, 0xed, 0x43, 0x98, 0x4c, 0xeb, + 0x24, 0xec, 0x8e, 0xed, 0x29, 0xe5, 0x48, 0x7b, 0x4a, 0xfb, 0x00, 0xce, 0x33, 0xc8, 0xe6, 0xa1, + 0x7c, 0x24, 0xec, 0x3d, 0x3e, 0xf4, 0x27, 0x0a, 0x4c, 0xa6, 0xb1, 0x85, 0xde, 0xf7, 0x8f, 0xef, + 0xcc, 0xe5, 0x53, 0x49, 0x77, 0x3e, 0x50, 0x94, 0xe6, 0x04, 0x54, 0x8c, 0x04, 0xae, 0xf6, 0x5b, + 0x05, 0xa6, 0xde, 0xf5, 0x76, 0x70, 0x1b, 0xfb, 0xa8, 0x95, 0xb2, 0xf0, 0x09, 0xae, 0xe8, 0x06, + 0xd4, 0xba, 0xb5, 0x3a, 0xb1, 0x35, 0xfd, 0x52, 0x81, 0x6a, 0x13, 0xb5, 0x90, 0x63, 0xe2, 0xd0, + 0x58, 0x1d, 0xe4, 0x29, 0x6c, 0x6c, 0xd9, 0x2d, 0x82, 0xfd, 0xa3, 0x58, 0x5b, 0x16, 0x10, 0x4b, + 0x0c, 0x41, 0xbd, 0x03, 0x55, 0x96, 0x43, 0x0d, 0xdb, 0x92, 0xa0, 0x83, 0x65, 0xd3, 0x32, 0xe2, + 0x3f, 0x38, 0x1e, 0xad, 0x0f, 0x27, 0x22, 0xbd, 0x85, 0x3b, 0xde, 0x85, 0x51, 0x21, 0xf5, 0x28, + 0x1a, 0x4b, 0x5e, 0xf5, 0xfb, 0x30, 0xba, 0xc9, 0xa1, 0x85, 0x8e, 0xfd, 0xe5, 0x35, 0xc9, 0xa4, + 0x5d, 0x84, 0xf2, 0xba, 0x8d, 0xf7, 0x69, 0xbd, 0x7c, 0xcf, 0xdd, 0xc5, 0x8e, 0x7a, 0x0e, 0x86, + 0x6d, 0x9a, 0x83, 0x98, 0x56, 0xe3, 0x3a, 0x1f, 0x68, 0x3a, 0x54, 0x25, 0x99, 0xf4, 0xfc, 0x0f, + 0xa0, 0xb8, 0xb5, 0xb7, 0x2b, 0x94, 0xef, 0x55, 0x3b, 0x2d, 0x75, 0x5a, 0x2d, 0x0a, 0x60, 0x3b, + 0xdb, 0xb7, 0xf0, 0xa1, 0x4e, 0x39, 0xb5, 0xbb, 0x30, 0x11, 0x61, 0x0a, 0xaf, 0xbc, 0x09, 0xc3, + 0x84, 0xaa, 0xd1, 0x7d, 0x6c, 0x24, 0xeb, 0x86, 0x84, 0xce, 0x3a, 0xe7, 0xd1, 0x7e, 0xa1, 0x40, + 0x79, 0x8d, 0x20, 0xd2, 0x09, 0xa3, 0xe3, 0xb1, 0x16, 0x7b, 0xd9, 0x09, 0x5d, 0x87, 0x8a, 0xd4, + 0x41, 0xd8, 0xf4, 0x2c, 0x94, 0x82, 0x43, 0xc7, 0x4c, 0x96, 0xb7, 0x40, 0xa7, 0x44, 0x71, 0xfb, + 0x2c, 0x94, 0x4c, 0x44, 0xcc, 0x1d, 0xdb, 0xd9, 0x36, 0x3a, 0x9e, 0xd8, 0x5a, 0x20, 0xa7, 0xee, + 0x7b, 0xda, 0x03, 0x05, 0xce, 0x72, 0xd0, 0x35, 0xe2, 0x63, 0xd4, 0x7e, 0x82, 0xe6, 0xf9, 0x70, + 0x2e, 0xa9, 0x89, 0x30, 0xf2, 0x7b, 0x70, 0xa1, 0x85, 0x08, 0x0e, 0x88, 0xb1, 0xeb, 0xb8, 0xfb, + 0x8e, 0xb1, 0xd9, 0x72, 0xcd, 0xdd, 0xa4, 0xc9, 0x93, 0x9c, 0xe0, 0x16, 0x7d, 0xde, 0xa4, 0x8f, + 0x23, 0xf3, 0xe3, 0xfe, 0x29, 0xa4, 0xfd, 0xa3, 0x7d, 0x56, 0x84, 0xf1, 0x3b, 0x2e, 0x89, 0x36, + 0xfd, 0xf3, 0x50, 0xb6, 0x1d, 0xb3, 0xd5, 0xb1, 0xb0, 0x11, 0x78, 0xd8, 0x21, 0xc2, 0x65, 0xe3, + 0x62, 0x72, 0x8d, 0xce, 0xa9, 0x0b, 0x30, 0x26, 0x77, 0x71, 0x4e, 0x09, 0x91, 0xb7, 0x7d, 0x47, + 0xc5, 0xf6, 0xed, 0xce, 0xa4, 0x43, 0xc7, 0xcd, 0xa4, 0xb7, 0xa1, 0xca, 0x4b, 0x1c, 0x83, 0xb8, + 0x4c, 0x77, 0xab, 0x36, 0x32, 0x48, 0x81, 0x54, 0xe6, 0xdc, 0xf7, 0x5c, 0x6a, 0xa3, 0xf5, 0x24, + 0x02, 0xe0, 0x41, 0x01, 0xce, 0xb3, 0xc5, 0x58, 0x72, 0xfd, 0x75, 0x97, 0xd8, 0xce, 0xb6, 0x5c, + 0x95, 0x2b, 0x70, 0x66, 0xcf, 0x25, 0x68, 0xb3, 0x85, 0x0d, 0x44, 0x92, 0x4b, 0x5f, 0x15, 0x0f, + 0x16, 0x88, 0x58, 0xf3, 0x2e, 0xcf, 0x16, 0x8f, 0xeb, 0xd9, 0x27, 0xe0, 0x8a, 0xaf, 0x0a, 0x50, + 0x79, 0xdf, 0x26, 0x4e, 0xec, 0xec, 0xfd, 0x00, 0x26, 0x1c, 0x97, 0x60, 0xc3, 0x74, 0xdb, 0x6d, + 0x9b, 0xb4, 0xb1, 0x43, 0xe8, 0xad, 0x80, 0x5e, 0x50, 0x1a, 0x3d, 0xb4, 0xa0, 0xbb, 0x0a, 0xdf, + 0x08, 0xd9, 0xf4, 0x2a, 0xc5, 0x89, 0xc6, 0x41, 0x66, 0x6f, 0xa6, 0x78, 0x82, 0xbd, 0x99, 0x27, + 0xe0, 0x40, 0x0c, 0xd5, 0xd0, 0x7f, 0x22, 0x8f, 0xe8, 0x30, 0xbe, 0xcf, 0xa7, 0x78, 0xb1, 0x3d, + 0x40, 0xb3, 0x44, 0x40, 0xb1, 0xaa, 0xbb, 0xb4, 0x1f, 0x0d, 0xb4, 0xbf, 0x29, 0x30, 0x29, 0x1e, + 0xfe, 0x7f, 0x36, 0xbc, 0x5a, 0x30, 0xd5, 0x65, 0xdf, 0xe3, 0x6b, 0x77, 0xfd, 0xa1, 0x08, 0x65, + 0x96, 0x2a, 0xc3, 0xa8, 0xaf, 0xc3, 0x18, 0xaf, 0x93, 0x30, 0xef, 0x24, 0x8d, 0xe9, 0xe1, 0x58, + 0xfd, 0x29, 0x4c, 0xc7, 0x72, 0xb5, 0x69, 0x6f, 0xd9, 0xa6, 0x61, 0x61, 0xc7, 0x6d, 0xdb, 0x8e, + 0x68, 0x11, 0xf0, 0xfd, 0xd1, 0xab, 0x6e, 0x59, 0xa4, 0x3c, 0xfa, 0xd3, 0x51, 0x8a, 0x67, 0x50, + 0x8b, 0x71, 0x24, 0x75, 0x1e, 0x2e, 0x48, 0x59, 0x51, 0xc3, 0xc0, 0x60, 0xc5, 0x41, 0xc0, 0xf6, + 0xca, 0x98, 0x3e, 0x25, 0x08, 0x16, 0xc3, 0xe7, 0xac, 0x84, 0x08, 0xd4, 0x37, 0xa0, 0x26, 0x79, + 0x3b, 0xce, 0xa6, 0xeb, 0x58, 0xf4, 0x34, 0x16, 0xac, 0x43, 0x8c, 0x75, 0x52, 0x3c, 0xbf, 0x2f, + 0x1f, 0x0b, 0xce, 0x4b, 0x50, 0x95, 0x9c, 0x2d, 0xcf, 0x70, 0xb6, 0x48, 0x50, 0x1b, 0x66, 0x0c, + 0xf2, 0x90, 0x7a, 0xcf, 0xbb, 0xb3, 0x45, 0x02, 0x75, 0x0e, 0xce, 0x4b, 0x3a, 0xcf, 0x77, 0x3d, + 0x37, 0x40, 0x2d, 0x4e, 0x3d, 0xc2, 0xa8, 0xcf, 0x8a, 0x87, 0xab, 0xe2, 0x19, 0xe3, 0x59, 0x80, + 0x67, 0x24, 0xcf, 0x1e, 0x4b, 0xb6, 0x86, 0x8f, 0x4d, 0x6c, 0x7b, 0x44, 0xaa, 0x36, 0xca, 0x78, + 0xeb, 0x82, 0x48, 0x26, 0x64, 0x46, 0xc2, 0xd5, 0xd3, 0x30, 0x54, 0xe4, 0x6a, 0x89, 0x98, 0x58, + 0x83, 0x0a, 0x5b, 0x01, 0xa3, 0x8d, 0x09, 0x8a, 0x05, 0xe4, 0xcb, 0xfd, 0x2c, 0xc1, 0x6d, 0xc1, + 0xa3, 0x97, 0xad, 0xf8, 0x50, 0xab, 0xc1, 0xe4, 0x8d, 0x1d, 0x64, 0x3b, 0xab, 0xc8, 0x47, 0x6d, + 0x4c, 0xb0, 0x2f, 0xa3, 0x43, 0xdb, 0x81, 0xa9, 0xae, 0x27, 0x42, 0x93, 0xdb, 0x00, 0x5e, 0x38, + 0x9b, 0x57, 0x4a, 0xb2, 0xa6, 0x7c, 0xa8, 0x44, 0x1a, 0x2a, 0x06, 0xa0, 0x4d, 0xc2, 0xb9, 0xa5, + 0xdb, 0x8b, 0xdd, 0x1a, 0x58, 0x70, 0x3e, 0x35, 0x2f, 0xe4, 0xdf, 0xca, 0x90, 0xff, 0xd2, 0xa3, + 0xe5, 0x2f, 0xb5, 0xad, 0x1c, 0xe9, 0x9f, 0x17, 0x60, 0x8a, 0x9e, 0x8c, 0xcd, 0xc3, 0x58, 0x1a, + 0x17, 0x3b, 0xe4, 0x7d, 0xa8, 0xa6, 0xce, 0x05, 0xe1, 0xf3, 0x41, 0x8f, 0x85, 0x4a, 0xf2, 0x58, + 0xc8, 0x6a, 0x04, 0x17, 0xb3, 0x1a, 0xc1, 0x4f, 0x22, 0xbd, 0x3b, 0x50, 0xeb, 0xf6, 0x47, 0x98, + 0xe7, 0x2b, 0xac, 0xfc, 0x61, 0xe5, 0x02, 0xb5, 0xa9, 0xdb, 0xfb, 0xc9, 0x8a, 0x7f, 0x4d, 0x52, + 0x53, 0x48, 0x1d, 0x9b, 0xae, 0x6f, 0xe9, 0xe5, 0x20, 0x3e, 0xc9, 0x16, 0x60, 0x6d, 0x1f, 0x79, + 0x39, 0x0b, 0x10, 0xec, 0x23, 0xef, 0x04, 0x16, 0x80, 0xc2, 0xfc, 0x8f, 0x2c, 0x80, 0x0e, 0xb5, + 0x6e, 0x7f, 0x84, 0x7d, 0xff, 0x21, 0x6a, 0x89, 0x70, 0xbb, 0x96, 0xeb, 0xf6, 0x7d, 0xe4, 0x09, + 0x6f, 0x33, 0x7a, 0xed, 0x5f, 0x0a, 0x4c, 0xde, 0xe9, 0xb4, 0x5a, 0xf6, 0x96, 0x8d, 0xfd, 0xe4, + 0x6d, 0x6b, 0x09, 0x4e, 0x3b, 0xf2, 0x89, 0xf0, 0xee, 0x4c, 0x0f, 0xd3, 0x42, 0x24, 0x3d, 0x62, + 0xfd, 0xaf, 0x76, 0xe9, 0x2c, 0x4c, 0x75, 0x59, 0x2f, 0x3c, 0x7a, 0x0e, 0x86, 0xf9, 0x6d, 0x84, + 0x1f, 0x81, 0x7c, 0xa0, 0xad, 0xc3, 0xd3, 0xb1, 0x93, 0x74, 0xc5, 0xd9, 0x72, 0x9b, 0x87, 0xcb, + 0x28, 0x08, 0xaf, 0xd1, 0xfc, 0xfd, 0x4b, 0x61, 0xd0, 0xf7, 0x2f, 0xda, 0xa7, 0x0a, 0x4c, 0xa6, + 0x80, 0x25, 0xe4, 0x25, 0x18, 0x0f, 0x08, 0xf2, 0x93, 0x35, 0xf8, 0xf2, 0x29, 0xbd, 0xc4, 0x66, + 0x79, 0x05, 0xfe, 0x40, 0x51, 0x54, 0x0d, 0x00, 0x3b, 0x56, 0xe2, 0xde, 0xb5, 0xac, 0xe8, 0xa7, + 0xb1, 0x63, 0x85, 0x34, 0xcd, 0x2a, 0x94, 0x8d, 0x38, 0x58, 0xb3, 0x0c, 0x25, 0x23, 0xe2, 0xd2, + 0xfe, 0x59, 0x80, 0x6a, 0x4a, 0x0d, 0xf5, 0x29, 0x18, 0x49, 0x49, 0x16, 0x63, 0x2a, 0xf4, 0x88, + 0xf6, 0xa6, 0x0b, 0x99, 0xe2, 0x09, 0xbc, 0x44, 0xdb, 0x80, 0x92, 0x87, 0x7d, 0x5a, 0x95, 0x10, + 0x7b, 0x0f, 0x8b, 0xcb, 0xdd, 0xfc, 0xa0, 0x75, 0x5f, 0x84, 0xa0, 0xc7, 0xe1, 0xd4, 0x9b, 0x30, + 0x44, 0xb7, 0x12, 0xab, 0x05, 0x06, 0x2f, 0x27, 0xd7, 0x6d, 0xbc, 0xaf, 0x33, 0x80, 0xe6, 0x69, + 0x18, 0x95, 0xde, 0xfe, 0x31, 0x4c, 0x75, 0xad, 0x79, 0xd4, 0x5e, 0x23, 0x07, 0x86, 0xed, 0x6c, + 0xb9, 0x62, 0x4b, 0x5f, 0xee, 0xe3, 0x9d, 0x0b, 0x43, 0x18, 0x21, 0x07, 0xf4, 0xaf, 0x86, 0xe0, + 0x99, 0x9c, 0x48, 0x3d, 0x31, 0x11, 0x1f, 0x41, 0x59, 0x5c, 0xe4, 0x05, 0xe4, 0x7b, 0x50, 0x62, + 0xe7, 0xa2, 0xcf, 0x52, 0xcc, 0x51, 0xce, 0x00, 0x70, 0xc2, 0xdf, 0xda, 0x97, 0x34, 0x37, 0xa5, + 0xee, 0xa6, 0x8f, 0x43, 0x90, 0x7a, 0x1b, 0xc6, 0x6d, 0x0b, 0x3b, 0xc4, 0x26, 0x87, 0xc6, 0x2e, + 0x3e, 0x14, 0xe1, 0x7c, 0xa5, 0x47, 0xd2, 0x59, 0x11, 0x2c, 0xb7, 0xf0, 0xa1, 0x5e, 0xb2, 0xa3, + 0x81, 0xf6, 0xef, 0x22, 0x9c, 0xcd, 0x10, 0x99, 0x55, 0x35, 0x28, 0x27, 0x52, 0x35, 0x7c, 0x17, + 0x86, 0xd8, 0x99, 0xcb, 0xf5, 0x7e, 0xbe, 0x57, 0x92, 0xa6, 0x1a, 0x31, 0x86, 0xc7, 0x70, 0x6f, + 0x4f, 0x1c, 0x1a, 0x43, 0x47, 0x3f, 0x34, 0x2e, 0x42, 0x85, 0x6f, 0x12, 0xc3, 0xf4, 0x31, 0x22, + 0xd8, 0x62, 0x1b, 0x6f, 0x48, 0x2f, 0xf3, 0xd9, 0x1b, 0x7c, 0x92, 0xe6, 0x46, 0x41, 0xc6, 0x73, + 0xf5, 0x88, 0xcc, 0x8d, 0x7c, 0x96, 0xb5, 0x8e, 0x68, 0x9a, 0xaa, 0xc3, 0x98, 0xe7, 0x06, 0x36, + 0xcb, 0x35, 0xa3, 0x0c, 0x28, 0x1c, 0xab, 0xef, 0xc0, 0x48, 0xe0, 0x76, 0x7c, 0x13, 0xd7, 0xc6, + 0xb2, 0xf5, 0x4d, 0x56, 0x8c, 0xd4, 0x7d, 0x6b, 0x8c, 0x5e, 0x17, 0x7c, 0x2c, 0xab, 0xc6, 0xd5, + 0xd0, 0xfe, 0x5a, 0x04, 0x88, 0x8e, 0xda, 0xac, 0x6a, 0x45, 0x39, 0x91, 0x6a, 0xe5, 0x6d, 0x71, + 0xea, 0xf3, 0x85, 0x7f, 0x31, 0x85, 0x66, 0xe1, 0x83, 0xe4, 0xc9, 0xbf, 0xda, 0x42, 0xb6, 0x43, + 0xf0, 0x01, 0xe1, 0x87, 0x7f, 0xc2, 0x2b, 0xc5, 0x94, 0x57, 0x4e, 0x6a, 0x21, 0x57, 0xa1, 0xc4, + 0xdf, 0x7c, 0xf3, 0xbb, 0xf2, 0x70, 0x66, 0xa2, 0x4f, 0x68, 0xda, 0x44, 0xc4, 0xdc, 0xa1, 0xea, + 0xf2, 0xb7, 0xb9, 0xec, 0x96, 0x0c, 0x6e, 0xf8, 0x5b, 0xbd, 0x12, 0x85, 0x46, 0x0b, 0xd9, 0x6d, + 0x6c, 0x85, 0xab, 0x2e, 0x83, 0x83, 0x4f, 0xd3, 0x75, 0x8f, 0xd6, 0x76, 0xf4, 0x88, 0x6b, 0x7b, + 0x06, 0xaa, 0x46, 0x52, 0x9c, 0xf6, 0x77, 0x05, 0xa6, 0xee, 0xee, 0x3b, 0xd8, 0x5a, 0x15, 0xce, + 0x5a, 0xb1, 0xc2, 0xa2, 0xe9, 0x3e, 0x54, 0xa4, 0x0b, 0xe9, 0x41, 0x1b, 0x16, 0xc2, 0x8f, 0x5c, + 0x1b, 0x89, 0xc3, 0x96, 0x9b, 0xda, 0xe1, 0xc5, 0x27, 0xa8, 0x1d, 0x77, 0x61, 0x9c, 0xf8, 0x88, + 0x5d, 0x62, 0x3d, 0x64, 0xcb, 0x72, 0xec, 0xf2, 0xa3, 0x40, 0xef, 0x71, 0xfa, 0x55, 0x64, 0xfb, + 0xcb, 0x0a, 0x3b, 0x29, 0xe5, 0x90, 0x16, 0x02, 0xd4, 0xac, 0xa4, 0xa2, 0x2c, 0x8a, 0xe3, 0x42, + 0x34, 0x0c, 0xb5, 0x6e, 0x33, 0x45, 0x02, 0x5e, 0x81, 0xf1, 0x90, 0xdd, 0xb6, 0xe8, 0x65, 0xab, + 0x98, 0x51, 0x01, 0x64, 0x5a, 0xb9, 0x62, 0xe9, 0x25, 0x2f, 0x82, 0x9c, 0xfb, 0xea, 0x2c, 0x9c, + 0xa5, 0xe7, 0xe3, 0xaa, 0xef, 0x12, 0xd7, 0x74, 0x5b, 0x6b, 0xd8, 0xdf, 0xb3, 0x4d, 0xac, 0xbe, + 0x0f, 0x23, 0xbc, 0x24, 0x53, 0x73, 0xdf, 0x1b, 0x24, 0x0a, 0xd6, 0xfa, 0xa5, 0x5e, 0x64, 0x42, + 0xf7, 0x5d, 0x18, 0x8f, 0x37, 0xbd, 0xd5, 0x97, 0x1e, 0xcd, 0x97, 0x68, 0xd2, 0xd7, 0x5f, 0xee, + 0x8f, 0x98, 0x8b, 0xba, 0xaa, 0xa8, 0xeb, 0x30, 0xcc, 0xce, 0x30, 0xf5, 0x85, 0x3c, 0xc6, 0x78, + 0x2f, 0xbc, 0x7e, 0xb1, 0x07, 0x55, 0x88, 0xfb, 0x31, 0x54, 0x92, 0x67, 0xa3, 0xfa, 0xca, 0x23, + 0x59, 0xd3, 0xfd, 0xdd, 0x7a, 0xa3, 0x5f, 0xf2, 0x50, 0xe4, 0x87, 0x30, 0x2a, 0xfa, 0x52, 0x6a, + 0xae, 0xab, 0x93, 0x0d, 0xd4, 0xfa, 0xe5, 0x9e, 0x74, 0x62, 0x4d, 0xfc, 0xb0, 0x77, 0x28, 0x7b, + 0x5e, 0x6a, 0xa3, 0x07, 0x6f, 0xaa, 0xf9, 0x57, 0x9f, 0xed, 0x9b, 0x5e, 0xc8, 0xfc, 0x00, 0x46, + 0x78, 0x2b, 0x25, 0x3f, 0xc0, 0x12, 0x8d, 0xb1, 0xfc, 0x00, 0x4b, 0x76, 0x64, 0xae, 0x2a, 0xd4, + 0x9c, 0x54, 0x67, 0x23, 0xdf, 0x9c, 0xec, 0x3e, 0x4b, 0xbe, 0x39, 0x79, 0xdd, 0x97, 0x16, 0x94, + 0x13, 0x6d, 0x11, 0x35, 0x37, 0x54, 0xb3, 0xba, 0x2a, 0xf5, 0x57, 0xfa, 0xa4, 0x16, 0xd2, 0x5c, + 0xa8, 0x24, 0xdf, 0xf6, 0xe7, 0xc7, 0x5f, 0xe6, 0x97, 0x0a, 0xf9, 0xf1, 0x97, 0xf3, 0x11, 0x81, + 0x0b, 0x95, 0xe4, 0x6b, 0xfa, 0x7c, 0x81, 0x99, 0x9f, 0x0a, 0xe4, 0x0b, 0xcc, 0x79, 0xfb, 0xdf, + 0x81, 0x89, 0xf4, 0xdb, 0x6f, 0x35, 0x77, 0x51, 0x72, 0xde, 0xde, 0xd7, 0xaf, 0xf6, 0xcf, 0x20, + 0xc4, 0x1a, 0x30, 0x26, 0xdf, 0x2e, 0xab, 0xb9, 0xdb, 0x27, 0xf5, 0xde, 0xbc, 0x3e, 0xd3, 0x9b, + 0x30, 0x8c, 0xcd, 0x0e, 0x4c, 0xa4, 0xfb, 0x38, 0xf9, 0x76, 0xe5, 0x74, 0xc0, 0xf2, 0xed, 0xca, + 0x6d, 0x11, 0x75, 0x60, 0x22, 0xdd, 0xbd, 0xc8, 0x17, 0x9b, 0xd3, 0xf7, 0xc9, 0x17, 0x9b, 0xdb, + 0x18, 0xf1, 0xa1, 0x9a, 0xba, 0xe1, 0xe7, 0xef, 0xc4, 0xec, 0x46, 0x48, 0xfe, 0x4e, 0xcc, 0x6b, + 0x1d, 0x7c, 0xaa, 0xc0, 0xf9, 0xcc, 0xbb, 0x97, 0x7a, 0xbd, 0xcf, 0x2b, 0x56, 0xa2, 0xa9, 0x50, + 0x7f, 0x6d, 0x40, 0x2e, 0xa1, 0x06, 0xe9, 0xbe, 0xcb, 0x37, 0xfa, 0xbd, 0xe2, 0xf5, 0x32, 0x3d, + 0xe7, 0xde, 0x7a, 0x55, 0x51, 0x7f, 0x0e, 0x6a, 0xf7, 0x27, 0x50, 0xea, 0xb5, 0x81, 0x3f, 0x19, + 0xac, 0xcf, 0x0d, 0xc2, 0x22, 0x4c, 0xfe, 0x44, 0x81, 0x73, 0x59, 0xdf, 0xc7, 0xaa, 0xaf, 0xe6, + 0x6e, 0x90, 0xfc, 0x2f, 0x7d, 0xeb, 0xd7, 0x07, 0x63, 0x8a, 0x02, 0x3d, 0x5d, 0x36, 0xe5, 0x07, + 0x7a, 0x4e, 0x1d, 0x99, 0x1f, 0xe8, 0xb9, 0x15, 0xd9, 0x01, 0x9c, 0xe9, 0xfa, 0x4c, 0x5a, 0xcd, + 0x85, 0xc9, 0xfb, 0x66, 0xbc, 0x7e, 0x6d, 0x00, 0x0e, 0x2e, 0x79, 0xce, 0x8b, 0xbe, 0x26, 0x91, + 0xb5, 0xdb, 0x47, 0x30, 0x26, 0xa7, 0xf2, 0x93, 0x58, 0xea, 0x13, 0x94, 0xfc, 0x24, 0x96, 0xfe, + 0xae, 0xa4, 0xf9, 0x59, 0xe1, 0x4f, 0x0f, 0xa7, 0x95, 0xaf, 0x1f, 0x4e, 0x2b, 0xdf, 0x3c, 0x9c, + 0x56, 0x7e, 0xfd, 0xed, 0xf4, 0xa9, 0xaf, 0xbf, 0x9d, 0x3e, 0xf5, 0x97, 0x6f, 0xa7, 0x4f, 0x41, + 0xdd, 0x74, 0xdb, 0x39, 0x38, 0xcd, 0xd3, 0x61, 0x99, 0xb9, 0xaa, 0x7c, 0x78, 0x77, 0xdb, 0x26, + 0x3b, 0x9d, 0xcd, 0x86, 0xe9, 0xb6, 0x67, 0x4d, 0x37, 0x68, 0xbb, 0xc1, 0xac, 0x8f, 0x5b, 0xe8, + 0x10, 0xfb, 0xb3, 0x7b, 0x73, 0xe1, 0x4f, 0x76, 0x41, 0x08, 0x66, 0xb3, 0xff, 0x45, 0xe1, 0x4d, + 0x3a, 0x92, 0x83, 0xdf, 0x15, 0x8a, 0xab, 0xeb, 0x3f, 0xfa, 0x7d, 0x61, 0x72, 0x55, 0x0a, 0xa7, + 0xd2, 0x1a, 0xeb, 0xe2, 0xf1, 0x9f, 0xa3, 0x07, 0x1b, 0xf4, 0xc1, 0x86, 0x7c, 0xf0, 0xb0, 0xa0, + 0x65, 0x3f, 0xd8, 0xb8, 0xb9, 0xda, 0x94, 0xef, 0x63, 0xfe, 0x51, 0xa8, 0x49, 0xa2, 0xf9, 0x79, + 0x4a, 0x35, 0x3f, 0x2f, 0xc9, 0x36, 0x47, 0xd8, 0x7f, 0x02, 0xbc, 0xfa, 0x9f, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xa1, 0x4b, 0xc5, 0x96, 0x48, 0x31, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3548,9 +3680,12 @@ type ViewProtocolServiceClient interface { // Get current status of chain sync Status(ctx context.Context, in *StatusRequest, opts ...grpc.CallOption) (*StatusResponse, error) // Stream sync status updates until the view service has caught up with the core.chain.v1alpha1. + // Returns a stream of `StatusStreamResponse`s. StatusStream(ctx context.Context, in *StatusStreamRequest, opts ...grpc.CallOption) (ViewProtocolService_StatusStreamClient, error) // Queries for notes that have been accepted by the core.chain.v1alpha1. + // Returns a stream of `NotesResponse`s. Notes(ctx context.Context, in *NotesRequest, opts ...grpc.CallOption) (ViewProtocolService_NotesClient, error) + // Returns a stream of `NotesForVotingResponse`s. NotesForVoting(ctx context.Context, in *NotesForVotingRequest, opts ...grpc.CallOption) (ViewProtocolService_NotesForVotingClient, error) // Returns authentication paths for the given note commitments. // @@ -3561,6 +3696,7 @@ type ViewProtocolServiceClient interface { Witness(ctx context.Context, in *WitnessRequest, opts ...grpc.CallOption) (*WitnessResponse, error) WitnessAndBuild(ctx context.Context, in *WitnessAndBuildRequest, opts ...grpc.CallOption) (*WitnessAndBuildResponse, error) // Queries for assets. + // Returns a stream of `AssetsResponse`s. Assets(ctx context.Context, in *AssetsRequest, opts ...grpc.CallOption) (ViewProtocolService_AssetsClient, error) // Query for the current chain parameters. ChainParameters(ctx context.Context, in *ChainParametersRequest, opts ...grpc.CallOption) (*ChainParametersResponse, error) @@ -3572,8 +3708,9 @@ type ViewProtocolServiceClient interface { IndexByAddress(ctx context.Context, in *IndexByAddressRequest, opts ...grpc.CallOption) (*IndexByAddressResponse, error) // Query for an ephemeral address EphemeralAddress(ctx context.Context, in *EphemeralAddressRequest, opts ...grpc.CallOption) (*EphemeralAddressResponse, error) - // Query for balance of a given address - BalanceByAddress(ctx context.Context, in *BalanceByAddressRequest, opts ...grpc.CallOption) (ViewProtocolService_BalanceByAddressClient, error) + // Query for balance of a given address. + // Returns a stream of `BalancesResponses`. + Balances(ctx context.Context, in *BalancesRequest, opts ...grpc.CallOption) (ViewProtocolService_BalancesClient, error) // Query for a note by its note commitment, optionally waiting until the note is detected. NoteByCommitment(ctx context.Context, in *NoteByCommitmentRequest, opts ...grpc.CallOption) (*NoteByCommitmentResponse, error) // Query for a swap by its swap commitment, optionally waiting until the swap is detected. @@ -3583,6 +3720,7 @@ type ViewProtocolServiceClient interface { // 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. + // Returns a stream of `TransactionInfoResponse`s. 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) @@ -3590,6 +3728,8 @@ type ViewProtocolServiceClient interface { BroadcastTransaction(ctx context.Context, in *BroadcastTransactionRequest, opts ...grpc.CallOption) (*BroadcastTransactionResponse, error) // Query for owned position IDs for the given trading pair and in the given position state. OwnedPositionIds(ctx context.Context, in *OwnedPositionIdsRequest, opts ...grpc.CallOption) (*OwnedPositionIdsResponse, error) + // Authorize a transaction plan and build the transaction. + AuthorizeAndBuild(ctx context.Context, in *AuthorizeAndBuildRequest, opts ...grpc.CallOption) (*AuthorizeAndBuildResponse, error) } type viewProtocolServiceClient struct { @@ -3800,12 +3940,12 @@ func (c *viewProtocolServiceClient) EphemeralAddress(ctx context.Context, in *Ep return out, nil } -func (c *viewProtocolServiceClient) BalanceByAddress(ctx context.Context, in *BalanceByAddressRequest, opts ...grpc.CallOption) (ViewProtocolService_BalanceByAddressClient, error) { - stream, err := c.cc.NewStream(ctx, &_ViewProtocolService_serviceDesc.Streams[4], "/penumbra.view.v1alpha1.ViewProtocolService/BalanceByAddress", opts...) +func (c *viewProtocolServiceClient) Balances(ctx context.Context, in *BalancesRequest, opts ...grpc.CallOption) (ViewProtocolService_BalancesClient, error) { + stream, err := c.cc.NewStream(ctx, &_ViewProtocolService_serviceDesc.Streams[4], "/penumbra.view.v1alpha1.ViewProtocolService/Balances", opts...) if err != nil { return nil, err } - x := &viewProtocolServiceBalanceByAddressClient{stream} + x := &viewProtocolServiceBalancesClient{stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -3815,17 +3955,17 @@ func (c *viewProtocolServiceClient) BalanceByAddress(ctx context.Context, in *Ba return x, nil } -type ViewProtocolService_BalanceByAddressClient interface { - Recv() (*BalanceByAddressResponse, error) +type ViewProtocolService_BalancesClient interface { + Recv() (*BalancesResponse, error) grpc.ClientStream } -type viewProtocolServiceBalanceByAddressClient struct { +type viewProtocolServiceBalancesClient struct { grpc.ClientStream } -func (x *viewProtocolServiceBalanceByAddressClient) Recv() (*BalanceByAddressResponse, error) { - m := new(BalanceByAddressResponse) +func (x *viewProtocolServiceBalancesClient) Recv() (*BalancesResponse, error) { + m := new(BalancesResponse) if err := x.ClientStream.RecvMsg(m); err != nil { return nil, err } @@ -3927,14 +4067,26 @@ func (c *viewProtocolServiceClient) OwnedPositionIds(ctx context.Context, in *Ow return out, nil } +func (c *viewProtocolServiceClient) AuthorizeAndBuild(ctx context.Context, in *AuthorizeAndBuildRequest, opts ...grpc.CallOption) (*AuthorizeAndBuildResponse, error) { + out := new(AuthorizeAndBuildResponse) + err := c.cc.Invoke(ctx, "/penumbra.view.v1alpha1.ViewProtocolService/AuthorizeAndBuild", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // ViewProtocolServiceServer is the server API for ViewProtocolService service. type ViewProtocolServiceServer interface { // Get current status of chain sync Status(context.Context, *StatusRequest) (*StatusResponse, error) // Stream sync status updates until the view service has caught up with the core.chain.v1alpha1. + // Returns a stream of `StatusStreamResponse`s. StatusStream(*StatusStreamRequest, ViewProtocolService_StatusStreamServer) error // Queries for notes that have been accepted by the core.chain.v1alpha1. + // Returns a stream of `NotesResponse`s. Notes(*NotesRequest, ViewProtocolService_NotesServer) error + // Returns a stream of `NotesForVotingResponse`s. NotesForVoting(*NotesForVotingRequest, ViewProtocolService_NotesForVotingServer) error // Returns authentication paths for the given note commitments. // @@ -3945,6 +4097,7 @@ type ViewProtocolServiceServer interface { Witness(context.Context, *WitnessRequest) (*WitnessResponse, error) WitnessAndBuild(context.Context, *WitnessAndBuildRequest) (*WitnessAndBuildResponse, error) // Queries for assets. + // Returns a stream of `AssetsResponse`s. Assets(*AssetsRequest, ViewProtocolService_AssetsServer) error // Query for the current chain parameters. ChainParameters(context.Context, *ChainParametersRequest) (*ChainParametersResponse, error) @@ -3956,8 +4109,9 @@ type ViewProtocolServiceServer interface { IndexByAddress(context.Context, *IndexByAddressRequest) (*IndexByAddressResponse, error) // Query for an ephemeral address EphemeralAddress(context.Context, *EphemeralAddressRequest) (*EphemeralAddressResponse, error) - // Query for balance of a given address - BalanceByAddress(*BalanceByAddressRequest, ViewProtocolService_BalanceByAddressServer) error + // Query for balance of a given address. + // Returns a stream of `BalancesResponses`. + Balances(*BalancesRequest, ViewProtocolService_BalancesServer) error // Query for a note by its note commitment, optionally waiting until the note is detected. NoteByCommitment(context.Context, *NoteByCommitmentRequest) (*NoteByCommitmentResponse, error) // Query for a swap by its swap commitment, optionally waiting until the swap is detected. @@ -3967,6 +4121,7 @@ type ViewProtocolServiceServer interface { // 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. + // Returns a stream of `TransactionInfoResponse`s. TransactionInfo(*TransactionInfoRequest, ViewProtocolService_TransactionInfoServer) error // Query for a transaction plan TransactionPlanner(context.Context, *TransactionPlannerRequest) (*TransactionPlannerResponse, error) @@ -3974,6 +4129,8 @@ type ViewProtocolServiceServer interface { BroadcastTransaction(context.Context, *BroadcastTransactionRequest) (*BroadcastTransactionResponse, error) // Query for owned position IDs for the given trading pair and in the given position state. OwnedPositionIds(context.Context, *OwnedPositionIdsRequest) (*OwnedPositionIdsResponse, error) + // Authorize a transaction plan and build the transaction. + AuthorizeAndBuild(context.Context, *AuthorizeAndBuildRequest) (*AuthorizeAndBuildResponse, error) } // UnimplementedViewProtocolServiceServer can be embedded to have forward compatible implementations. @@ -4016,8 +4173,8 @@ func (*UnimplementedViewProtocolServiceServer) IndexByAddress(ctx context.Contex func (*UnimplementedViewProtocolServiceServer) EphemeralAddress(ctx context.Context, req *EphemeralAddressRequest) (*EphemeralAddressResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method EphemeralAddress not implemented") } -func (*UnimplementedViewProtocolServiceServer) BalanceByAddress(req *BalanceByAddressRequest, srv ViewProtocolService_BalanceByAddressServer) error { - return status.Errorf(codes.Unimplemented, "method BalanceByAddress not implemented") +func (*UnimplementedViewProtocolServiceServer) Balances(req *BalancesRequest, srv ViewProtocolService_BalancesServer) error { + return status.Errorf(codes.Unimplemented, "method Balances not implemented") } func (*UnimplementedViewProtocolServiceServer) NoteByCommitment(ctx context.Context, req *NoteByCommitmentRequest) (*NoteByCommitmentResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method NoteByCommitment not implemented") @@ -4043,6 +4200,9 @@ func (*UnimplementedViewProtocolServiceServer) BroadcastTransaction(ctx context. func (*UnimplementedViewProtocolServiceServer) OwnedPositionIds(ctx context.Context, req *OwnedPositionIdsRequest) (*OwnedPositionIdsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method OwnedPositionIds not implemented") } +func (*UnimplementedViewProtocolServiceServer) AuthorizeAndBuild(ctx context.Context, req *AuthorizeAndBuildRequest) (*AuthorizeAndBuildResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method AuthorizeAndBuild not implemented") +} func RegisterViewProtocolServiceServer(s grpc1.Server, srv ViewProtocolServiceServer) { s.RegisterService(&_ViewProtocolService_serviceDesc, srv) @@ -4276,24 +4436,24 @@ func _ViewProtocolService_EphemeralAddress_Handler(srv interface{}, ctx context. return interceptor(ctx, in, info, handler) } -func _ViewProtocolService_BalanceByAddress_Handler(srv interface{}, stream grpc.ServerStream) error { - m := new(BalanceByAddressRequest) +func _ViewProtocolService_Balances_Handler(srv interface{}, stream grpc.ServerStream) error { + m := new(BalancesRequest) if err := stream.RecvMsg(m); err != nil { return err } - return srv.(ViewProtocolServiceServer).BalanceByAddress(m, &viewProtocolServiceBalanceByAddressServer{stream}) + return srv.(ViewProtocolServiceServer).Balances(m, &viewProtocolServiceBalancesServer{stream}) } -type ViewProtocolService_BalanceByAddressServer interface { - Send(*BalanceByAddressResponse) error +type ViewProtocolService_BalancesServer interface { + Send(*BalancesResponse) error grpc.ServerStream } -type viewProtocolServiceBalanceByAddressServer struct { +type viewProtocolServiceBalancesServer struct { grpc.ServerStream } -func (x *viewProtocolServiceBalanceByAddressServer) Send(m *BalanceByAddressResponse) error { +func (x *viewProtocolServiceBalancesServer) Send(m *BalancesResponse) error { return x.ServerStream.SendMsg(m) } @@ -4444,6 +4604,24 @@ func _ViewProtocolService_OwnedPositionIds_Handler(srv interface{}, ctx context. return interceptor(ctx, in, info, handler) } +func _ViewProtocolService_AuthorizeAndBuild_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(AuthorizeAndBuildRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ViewProtocolServiceServer).AuthorizeAndBuild(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/penumbra.view.v1alpha1.ViewProtocolService/AuthorizeAndBuild", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ViewProtocolServiceServer).AuthorizeAndBuild(ctx, req.(*AuthorizeAndBuildRequest)) + } + return interceptor(ctx, in, info, handler) +} + var _ViewProtocolService_serviceDesc = grpc.ServiceDesc{ ServiceName: "penumbra.view.v1alpha1.ViewProtocolService", HandlerType: (*ViewProtocolServiceServer)(nil), @@ -4508,6 +4686,10 @@ var _ViewProtocolService_serviceDesc = grpc.ServiceDesc{ MethodName: "OwnedPositionIds", Handler: _ViewProtocolService_OwnedPositionIds_Handler, }, + { + MethodName: "AuthorizeAndBuild", + Handler: _ViewProtocolService_AuthorizeAndBuild_Handler, + }, }, Streams: []grpc.StreamDesc{ { @@ -4531,8 +4713,8 @@ var _ViewProtocolService_serviceDesc = grpc.ServiceDesc{ ServerStreams: true, }, { - StreamName: "BalanceByAddress", - Handler: _ViewProtocolService_BalanceByAddress_Handler, + StreamName: "Balances", + Handler: _ViewProtocolService_Balances_Handler, ServerStreams: true, }, { @@ -4616,7 +4798,7 @@ var _ViewAuthService_serviceDesc = grpc.ServiceDesc{ Metadata: "penumbra/view/v1alpha1/view.proto", } -func (m *BroadcastTransactionRequest) Marshal() (dAtA []byte, err error) { +func (m *AuthorizeAndBuildRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4626,29 +4808,31 @@ func (m *BroadcastTransactionRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *BroadcastTransactionRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *AuthorizeAndBuildRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *BroadcastTransactionRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *AuthorizeAndBuildRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.AwaitDetection { - i-- - if m.AwaitDetection { - dAtA[i] = 1 - } else { - dAtA[i] = 0 + if m.AuthorizationData != nil { + { + size, err := m.AuthorizationData.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintView(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x10 + dAtA[i] = 0x12 } - if m.Transaction != nil { + if m.TransactionPlan != nil { { - size, err := m.Transaction.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.TransactionPlan.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -4661,7 +4845,7 @@ func (m *BroadcastTransactionRequest) MarshalToSizedBuffer(dAtA []byte) (int, er return len(dAtA) - i, nil } -func (m *BroadcastTransactionResponse) Marshal() (dAtA []byte, err error) { +func (m *AuthorizeAndBuildResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4671,24 +4855,19 @@ func (m *BroadcastTransactionResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *BroadcastTransactionResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *AuthorizeAndBuildResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *BroadcastTransactionResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *AuthorizeAndBuildResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.DetectionHeight != 0 { - i = encodeVarintView(dAtA, i, uint64(m.DetectionHeight)) - i-- - dAtA[i] = 0x10 - } - if m.Id != nil { + if m.Transaction != nil { { - size, err := m.Id.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Transaction.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -4701,7 +4880,7 @@ func (m *BroadcastTransactionResponse) MarshalToSizedBuffer(dAtA []byte) (int, e return len(dAtA) - i, nil } -func (m *TransactionPlannerRequest) Marshal() (dAtA []byte, err error) { +func (m *BroadcastTransactionRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4711,33 +4890,118 @@ func (m *TransactionPlannerRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *TransactionPlannerRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *BroadcastTransactionRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *TransactionPlannerRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *BroadcastTransactionRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.IbcActions) > 0 { - for iNdEx := len(m.IbcActions) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.IbcActions[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintView(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x3 - i-- - dAtA[i] = 0xe2 - } - } - if len(m.Undelegations) > 0 { + if m.AwaitDetection { + i-- + if m.AwaitDetection { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x10 + } + if m.Transaction != nil { + { + size, err := m.Transaction.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintView(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *BroadcastTransactionResponse) 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 *BroadcastTransactionResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *BroadcastTransactionResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = 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]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintView(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *TransactionPlannerRequest) 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 *TransactionPlannerRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TransactionPlannerRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.IbcActions) > 0 { + for iNdEx := len(m.IbcActions) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.IbcActions[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintView(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x3 + i-- + dAtA[i] = 0xe2 + } + } + if len(m.Undelegations) > 0 { for iNdEx := len(m.Undelegations) - 1; iNdEx >= 0; iNdEx-- { { size, err := m.Undelegations[iNdEx].MarshalToSizedBuffer(dAtA[:i]) @@ -5113,6 +5377,16 @@ func (m *AddressByIndexRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.DisplayConfirm { + i-- + if m.DisplayConfirm { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x10 + } if m.AddressIndex != nil { { size, err := m.AddressIndex.MarshalToSizedBuffer(dAtA[:i]) @@ -5271,6 +5545,16 @@ func (m *EphemeralAddressRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l + if m.DisplayConfirm { + i-- + if m.DisplayConfirm { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x10 + } if m.AddressIndex != nil { { size, err := m.AddressIndex.MarshalToSizedBuffer(dAtA[:i]) @@ -5321,7 +5605,7 @@ func (m *EphemeralAddressResponse) MarshalToSizedBuffer(dAtA []byte) (int, error return len(dAtA) - i, nil } -func (m *BalanceByAddressRequest) Marshal() (dAtA []byte, err error) { +func (m *BalancesRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -5331,19 +5615,31 @@ func (m *BalanceByAddressRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *BalanceByAddressRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *BalancesRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *BalanceByAddressRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *BalancesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Address != nil { + if m.AssetIdFilter != nil { { - size, err := m.Address.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.AssetIdFilter.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintView(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + if m.AccountFilter != nil { + { + size, err := m.AccountFilter.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -5356,7 +5652,7 @@ func (m *BalanceByAddressRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } -func (m *BalanceByAddressResponse) Marshal() (dAtA []byte, err error) { +func (m *BalancesResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -5366,19 +5662,19 @@ func (m *BalanceByAddressResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *BalanceByAddressResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *BalancesResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *BalanceByAddressResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *BalancesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Amount != nil { + if m.Balance != nil { { - size, err := m.Amount.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Balance.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -5388,9 +5684,9 @@ func (m *BalanceByAddressResponse) MarshalToSizedBuffer(dAtA []byte) (int, error i-- dAtA[i] = 0x12 } - if m.Asset != nil { + if m.Account != nil { { - size, err := m.Asset.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Account.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -7319,6 +7615,36 @@ func encodeVarintView(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } +func (m *AuthorizeAndBuildRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.TransactionPlan != nil { + l = m.TransactionPlan.Size() + n += 1 + l + sovView(uint64(l)) + } + if m.AuthorizationData != nil { + l = m.AuthorizationData.Size() + n += 1 + l + sovView(uint64(l)) + } + return n +} + +func (m *AuthorizeAndBuildResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Transaction != nil { + l = m.Transaction.Size() + n += 1 + l + sovView(uint64(l)) + } + return n +} + func (m *BroadcastTransactionRequest) Size() (n int) { if m == nil { return 0 @@ -7511,6 +7837,9 @@ func (m *AddressByIndexRequest) Size() (n int) { l = m.AddressIndex.Size() n += 1 + l + sovView(uint64(l)) } + if m.DisplayConfirm { + n += 2 + } return n } @@ -7574,6 +7903,9 @@ func (m *EphemeralAddressRequest) Size() (n int) { l = m.AddressIndex.Size() n += 1 + l + sovView(uint64(l)) } + if m.DisplayConfirm { + n += 2 + } return n } @@ -7590,31 +7922,35 @@ func (m *EphemeralAddressResponse) Size() (n int) { return n } -func (m *BalanceByAddressRequest) Size() (n int) { +func (m *BalancesRequest) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.Address != nil { - l = m.Address.Size() + if m.AccountFilter != nil { + l = m.AccountFilter.Size() + n += 1 + l + sovView(uint64(l)) + } + if m.AssetIdFilter != nil { + l = m.AssetIdFilter.Size() n += 1 + l + sovView(uint64(l)) } return n } -func (m *BalanceByAddressResponse) Size() (n int) { +func (m *BalancesResponse) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.Asset != nil { - l = m.Asset.Size() + if m.Account != nil { + l = m.Account.Size() n += 1 + l + sovView(uint64(l)) } - if m.Amount != nil { - l = m.Amount.Size() + if m.Balance != nil { + l = m.Balance.Size() n += 1 + l + sovView(uint64(l)) } return n @@ -8395,6 +8731,214 @@ func sovView(x uint64) (n int) { func sozView(x uint64) (n int) { return sovView(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } +func (m *AuthorizeAndBuildRequest) 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: AuthorizeAndBuildRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: AuthorizeAndBuildRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TransactionPlan", 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.TransactionPlan == nil { + m.TransactionPlan = &v1alpha1.TransactionPlan{} + } + if err := m.TransactionPlan.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AuthorizationData", 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.AuthorizationData == nil { + m.AuthorizationData = &v1alpha1.AuthorizationData{} + } + if err := m.AuthorizationData.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 *AuthorizeAndBuildResponse) 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: AuthorizeAndBuildResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: AuthorizeAndBuildResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Transaction", 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.Transaction == nil { + m.Transaction = &v1alpha1.Transaction{} + } + if err := m.Transaction.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 *BroadcastTransactionRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -9623,6 +10167,26 @@ func (m *AddressByIndexRequest) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field DisplayConfirm", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowView + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.DisplayConfirm = bool(v != 0) default: iNdEx = preIndex skippy, err := skipView(dAtA[iNdEx:]) @@ -9966,6 +10530,26 @@ func (m *EphemeralAddressRequest) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field DisplayConfirm", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowView + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.DisplayConfirm = bool(v != 0) default: iNdEx = preIndex skippy, err := skipView(dAtA[iNdEx:]) @@ -10073,7 +10657,7 @@ func (m *EphemeralAddressResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *BalanceByAddressRequest) Unmarshal(dAtA []byte) error { +func (m *BalancesRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -10096,15 +10680,15 @@ func (m *BalanceByAddressRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: BalanceByAddressRequest: wiretype end group for non-group") + return fmt.Errorf("proto: BalancesRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: BalanceByAddressRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: BalancesRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field AccountFilter", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -10131,10 +10715,46 @@ func (m *BalanceByAddressRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Address == nil { - m.Address = &v1alpha11.Address{} + if m.AccountFilter == nil { + m.AccountFilter = &v1alpha11.AddressIndex{} } - if err := m.Address.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.AccountFilter.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AssetIdFilter", 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.AssetIdFilter == nil { + m.AssetIdFilter = &v1alpha11.AssetId{} + } + if err := m.AssetIdFilter.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -10159,7 +10779,7 @@ func (m *BalanceByAddressRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *BalanceByAddressResponse) Unmarshal(dAtA []byte) error { +func (m *BalancesResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -10182,15 +10802,15 @@ func (m *BalanceByAddressResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: BalanceByAddressResponse: wiretype end group for non-group") + return fmt.Errorf("proto: BalancesResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: BalanceByAddressResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: BalancesResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Asset", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Account", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -10217,16 +10837,16 @@ func (m *BalanceByAddressResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Asset == nil { - m.Asset = &v1alpha11.AssetId{} + if m.Account == nil { + m.Account = &v1alpha11.AddressIndex{} } - if err := m.Asset.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Account.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Balance", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -10253,10 +10873,10 @@ func (m *BalanceByAddressResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Amount == nil { - m.Amount = &v1alpha11.Amount{} + if m.Balance == nil { + m.Balance = &v1alpha11.Value{} } - if err := m.Amount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Balance.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex