diff --git a/abci/types/types.go b/abci/types/types.go index cd9d0fcfad..888182ba56 100644 --- a/abci/types/types.go +++ b/abci/types/types.go @@ -168,3 +168,28 @@ func MarshalTxResults(r []*ExecTxResult) ([][]byte, error) { // ----------------------------------------------- // construct Result data + +type PendingTxCheckerResponse int + +const ( + Accepted PendingTxCheckerResponse = iota + Rejected + Pending +) + +type PendingTxChecker func() PendingTxCheckerResponse +type ExpireTxHandler func() + +// ResponseCheckTxV2 response type contains non-protobuf fields, so non-local ABCI clients will not be able +// to utilize the new fields in V2 type (but still be backwards-compatible) +type ResponseCheckTxV2 struct { + *ResponseCheckTx + IsPendingTransaction bool + Checker PendingTxChecker // must not be nil if IsPendingTransaction is true + ExpireTxHandler ExpireTxHandler + + // helper properties for prioritization in mempool + EVMNonce uint64 + EVMSenderAddress string + IsEVM bool +} diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index 203aeeeb31..51c24da8e9 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -9,10 +9,10 @@ import ( crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" types1 "github.com/cometbft/cometbft/proto/tendermint/types" _ "github.com/cosmos/gogoproto/gogoproto" - grpc1 "github.com/cosmos/gogoproto/grpc" - proto "github.com/cosmos/gogoproto/proto" _ "github.com/cosmos/gogoproto/types" - github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/gogo/protobuf/proto" + github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -3048,14 +3048,15 @@ func (m *EventAttribute) GetIndex() bool { // // * Its structure is equivalent to #ResponseDeliverTx which will be deprecated/deleted type ExecTxResult struct { - Code uint32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` - Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` - Log string `protobuf:"bytes,3,opt,name=log,proto3" json:"log,omitempty"` - Info string `protobuf:"bytes,4,opt,name=info,proto3" json:"info,omitempty"` - GasWanted int64 `protobuf:"varint,5,opt,name=gas_wanted,proto3" json:"gas_wanted,omitempty"` - GasUsed int64 `protobuf:"varint,6,opt,name=gas_used,proto3" json:"gas_used,omitempty"` - Events []Event `protobuf:"bytes,7,rep,name=events,proto3" json:"events,omitempty"` - Codespace string `protobuf:"bytes,8,opt,name=codespace,proto3" json:"codespace,omitempty"` + Code uint32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` + Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` + Log string `protobuf:"bytes,3,opt,name=log,proto3" json:"log,omitempty"` + Info string `protobuf:"bytes,4,opt,name=info,proto3" json:"info,omitempty"` + GasWanted int64 `protobuf:"varint,5,opt,name=gas_wanted,proto3" json:"gas_wanted,omitempty"` + GasUsed int64 `protobuf:"varint,6,opt,name=gas_used,proto3" json:"gas_used,omitempty"` + Events []Event `protobuf:"bytes,7,rep,name=events,proto3" json:"events,omitempty"` + Codespace string `protobuf:"bytes,8,opt,name=codespace,proto3" json:"codespace,omitempty"` + EvmTxInfo *EvmTxInfo `protobuf:"bytes,9,opt,name=evm_tx_info,json=evmTxInfo,proto3" json:"evm_tx_info,omitempty"` } func (m *ExecTxResult) Reset() { *m = ExecTxResult{} } @@ -3147,6 +3148,13 @@ func (m *ExecTxResult) GetCodespace() string { return "" } +func (m *ExecTxResult) GetEvmTxInfo() *EvmTxInfo { + if m != nil { + return m.EvmTxInfo + } + return nil +} + // TxResult contains results of executing the transaction. // // One usage is indexing transaction results. @@ -3605,6 +3613,74 @@ func (m *Snapshot) GetMetadata() []byte { return nil } +type EvmTxInfo struct { + SenderAddress string `protobuf:"bytes,1,opt,name=sender_address,json=senderAddress,proto3" json:"sender_address,omitempty"` + Nonce uint64 `protobuf:"varint,2,opt,name=nonce,proto3" json:"nonce,omitempty"` + TxHash string `protobuf:"bytes,3,opt,name=tx_hash,json=txHash,proto3" json:"tx_hash,omitempty"` + VmError string `protobuf:"bytes,4,opt,name=vm_error,json=vmError,proto3" json:"vm_error,omitempty"` +} + +func (m *EvmTxInfo) Reset() { *m = EvmTxInfo{} } +func (m *EvmTxInfo) String() string { return proto.CompactTextString(m) } +func (*EvmTxInfo) ProtoMessage() {} +func (*EvmTxInfo) Descriptor() ([]byte, []int) { + return fileDescriptor_252557cfdd89a31a, []int{47} +} +func (m *EvmTxInfo) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *EvmTxInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_EvmTxInfo.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 *EvmTxInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_EvmTxInfo.Merge(m, src) +} +func (m *EvmTxInfo) XXX_Size() int { + return m.Size() +} +func (m *EvmTxInfo) XXX_DiscardUnknown() { + xxx_messageInfo_EvmTxInfo.DiscardUnknown(m) +} + +var xxx_messageInfo_EvmTxInfo proto.InternalMessageInfo + +func (m *EvmTxInfo) GetSenderAddress() string { + if m != nil { + return m.SenderAddress + } + return "" +} + +func (m *EvmTxInfo) GetNonce() uint64 { + if m != nil { + return m.Nonce + } + return 0 +} + +func (m *EvmTxInfo) GetTxHash() string { + if m != nil { + return m.TxHash + } + return "" +} + +func (m *EvmTxInfo) GetVmError() string { + if m != nil { + return m.VmError + } + return "" +} + func init() { proto.RegisterEnum("tendermint.abci.CheckTxType", CheckTxType_name, CheckTxType_value) proto.RegisterEnum("tendermint.abci.MisbehaviorType", MisbehaviorType_name, MisbehaviorType_value) @@ -3659,210 +3735,217 @@ func init() { proto.RegisterType((*ExtendedVoteInfo)(nil), "tendermint.abci.ExtendedVoteInfo") proto.RegisterType((*Misbehavior)(nil), "tendermint.abci.Misbehavior") proto.RegisterType((*Snapshot)(nil), "tendermint.abci.Snapshot") + proto.RegisterType((*EvmTxInfo)(nil), "tendermint.abci.EvmTxInfo") } func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } var fileDescriptor_252557cfdd89a31a = []byte{ - // 3167 bytes of a gzipped FileDescriptorProto + // 3251 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0xcb, 0x73, 0x23, 0xd5, - 0xd5, 0x57, 0xeb, 0xad, 0xa3, 0x87, 0xdb, 0xd7, 0x9e, 0x41, 0x23, 0x06, 0xdb, 0x34, 0x05, 0x0c, - 0x03, 0xd8, 0x7c, 0x9e, 0x6f, 0x78, 0xd4, 0xc0, 0x57, 0x25, 0x6b, 0x34, 0x9f, 0xec, 0x31, 0xb6, - 0x69, 0xcb, 0x43, 0x91, 0x07, 0x4d, 0x5b, 0xba, 0xb2, 0x9a, 0x91, 0xd4, 0x4d, 0xf7, 0x95, 0x91, - 0x59, 0xa5, 0x42, 0x52, 0x95, 0x62, 0x45, 0x55, 0xb2, 0x60, 0x11, 0x16, 0x59, 0x64, 0x93, 0xbf, - 0x20, 0xab, 0x64, 0x93, 0x05, 0x8b, 0x2c, 0x58, 0x66, 0x45, 0x52, 0xb0, 0x63, 0x9b, 0x45, 0xb6, - 0xa9, 0xfb, 0xe8, 0x97, 0xa4, 0xb6, 0xa4, 0x81, 0x2c, 0x52, 0xc9, 0xae, 0xef, 0xe9, 0x73, 0xce, - 0xed, 0x7b, 0xee, 0xb9, 0xe7, 0xf1, 0xeb, 0x0b, 0x8f, 0x13, 0x3c, 0x68, 0x63, 0xbb, 0x6f, 0x0c, - 0xc8, 0x96, 0x7e, 0xda, 0x32, 0xb6, 0xc8, 0x85, 0x85, 0x9d, 0x4d, 0xcb, 0x36, 0x89, 0x89, 0x96, - 0xfc, 0x97, 0x9b, 0xf4, 0x65, 0xe5, 0x89, 0x00, 0x77, 0xcb, 0xbe, 0xb0, 0x88, 0xb9, 0x65, 0xd9, - 0xa6, 0xd9, 0xe1, 0xfc, 0x95, 0xeb, 0x93, 0xaf, 0x1f, 0xe2, 0x0b, 0xa1, 0x2d, 0x24, 0xcc, 0x66, - 0xd9, 0xb2, 0x74, 0x5b, 0xef, 0xbb, 0xaf, 0x37, 0x26, 0x5e, 0x9f, 0xeb, 0x3d, 0xa3, 0xad, 0x13, - 0xd3, 0x16, 0x1c, 0xeb, 0x67, 0xa6, 0x79, 0xd6, 0xc3, 0x5b, 0x6c, 0x74, 0x3a, 0xec, 0x6c, 0x11, - 0xa3, 0x8f, 0x1d, 0xa2, 0xf7, 0x2d, 0xc1, 0xb0, 0x7a, 0x66, 0x9e, 0x99, 0xec, 0x71, 0x8b, 0x3e, - 0x71, 0xaa, 0xf2, 0xc7, 0x1c, 0x64, 0x54, 0xfc, 0xc1, 0x10, 0x3b, 0x04, 0x6d, 0x43, 0x12, 0xb7, - 0xba, 0x66, 0x59, 0xda, 0x90, 0x6e, 0xe4, 0xb7, 0xaf, 0x6f, 0x8e, 0x2d, 0x70, 0x53, 0xf0, 0xd5, - 0x5b, 0x5d, 0xb3, 0x11, 0x53, 0x19, 0x2f, 0xba, 0x0d, 0xa9, 0x4e, 0x6f, 0xe8, 0x74, 0xcb, 0x71, - 0x26, 0xf4, 0x44, 0x94, 0xd0, 0x3d, 0xca, 0xd4, 0x88, 0xa9, 0x9c, 0x9b, 0x4e, 0x65, 0x0c, 0x3a, - 0x66, 0x39, 0x71, 0xf9, 0x54, 0xbb, 0x83, 0x0e, 0x9b, 0x8a, 0xf2, 0xa2, 0x1d, 0x00, 0x63, 0x60, - 0x10, 0xad, 0xd5, 0xd5, 0x8d, 0x41, 0x39, 0xc5, 0x24, 0x9f, 0x8c, 0x96, 0x34, 0x48, 0x8d, 0x32, - 0x36, 0x62, 0x6a, 0xce, 0x70, 0x07, 0xf4, 0x73, 0x3f, 0x18, 0x62, 0xfb, 0xa2, 0x9c, 0xbe, 0xfc, - 0x73, 0xdf, 0xa2, 0x4c, 0xf4, 0x73, 0x19, 0x37, 0x7a, 0x1d, 0xb2, 0xad, 0x2e, 0x6e, 0x3d, 0xd4, - 0xc8, 0xa8, 0x9c, 0x65, 0x92, 0xeb, 0x51, 0x92, 0x35, 0xca, 0xd7, 0x1c, 0x35, 0x62, 0x6a, 0xa6, - 0xc5, 0x1f, 0xd1, 0xab, 0x90, 0x6e, 0x99, 0xfd, 0xbe, 0x41, 0xca, 0x79, 0x26, 0xbb, 0x16, 0x29, - 0xcb, 0xb8, 0x1a, 0x31, 0x55, 0xf0, 0xa3, 0x03, 0x28, 0xf5, 0x0c, 0x87, 0x68, 0xce, 0x40, 0xb7, - 0x9c, 0xae, 0x49, 0x9c, 0x72, 0x81, 0x69, 0x78, 0x3a, 0x4a, 0xc3, 0xbe, 0xe1, 0x90, 0x63, 0x97, - 0xb9, 0x11, 0x53, 0x8b, 0xbd, 0x20, 0x81, 0xea, 0x33, 0x3b, 0x1d, 0x6c, 0x7b, 0x0a, 0xcb, 0xc5, - 0xcb, 0xf5, 0x1d, 0x52, 0x6e, 0x57, 0x9e, 0xea, 0x33, 0x83, 0x04, 0xf4, 0x43, 0x58, 0xe9, 0x99, - 0x7a, 0xdb, 0x53, 0xa7, 0xb5, 0xba, 0xc3, 0xc1, 0xc3, 0x72, 0x89, 0x29, 0x7d, 0x2e, 0xf2, 0x23, - 0x4d, 0xbd, 0xed, 0xaa, 0xa8, 0x51, 0x81, 0x46, 0x4c, 0x5d, 0xee, 0x8d, 0x13, 0xd1, 0xbb, 0xb0, - 0xaa, 0x5b, 0x56, 0xef, 0x62, 0x5c, 0xfb, 0x12, 0xd3, 0x7e, 0x33, 0x4a, 0x7b, 0x95, 0xca, 0x8c, - 0xab, 0x47, 0xfa, 0x04, 0x15, 0x35, 0x41, 0xb6, 0x6c, 0x6c, 0xe9, 0x36, 0xd6, 0x2c, 0xdb, 0xb4, - 0x4c, 0x47, 0xef, 0x95, 0x65, 0xa6, 0xfb, 0xd9, 0x28, 0xdd, 0x47, 0x9c, 0xff, 0x48, 0xb0, 0x37, - 0x62, 0xea, 0x92, 0x15, 0x26, 0x71, 0xad, 0x66, 0x0b, 0x3b, 0x8e, 0xaf, 0x75, 0x79, 0x96, 0x56, - 0xc6, 0x1f, 0xd6, 0x1a, 0x22, 0xa1, 0x3a, 0xe4, 0xf1, 0x88, 0x8a, 0x6b, 0xe7, 0x26, 0xc1, 0x65, - 0xc4, 0x14, 0x2a, 0x91, 0x27, 0x94, 0xb1, 0x3e, 0x30, 0x09, 0x6e, 0xc4, 0x54, 0xc0, 0xde, 0x08, - 0xe9, 0x70, 0xe5, 0x1c, 0xdb, 0x46, 0xe7, 0x82, 0xa9, 0xd1, 0xd8, 0x1b, 0xc7, 0x30, 0x07, 0xe5, - 0x15, 0xa6, 0xf0, 0xf9, 0x28, 0x85, 0x0f, 0x98, 0x10, 0x55, 0x51, 0x77, 0x45, 0x1a, 0x31, 0x75, - 0xe5, 0x7c, 0x92, 0x4c, 0x5d, 0xac, 0x63, 0x0c, 0xf4, 0x9e, 0xf1, 0x11, 0xd6, 0x4e, 0x7b, 0x66, - 0xeb, 0x61, 0x79, 0xf5, 0x72, 0x17, 0xbb, 0x27, 0xb8, 0x77, 0x28, 0x33, 0x75, 0xb1, 0x4e, 0x90, - 0xb0, 0x93, 0x81, 0xd4, 0xb9, 0xde, 0x1b, 0xe2, 0xbd, 0x64, 0x36, 0x29, 0xa7, 0xf6, 0x92, 0xd9, - 0x8c, 0x9c, 0xdd, 0x4b, 0x66, 0x73, 0x32, 0xec, 0x25, 0xb3, 0x20, 0xe7, 0x95, 0x67, 0x21, 0x1f, - 0x08, 0x4c, 0xa8, 0x0c, 0x99, 0x3e, 0x76, 0x1c, 0xfd, 0x0c, 0xb3, 0x38, 0x96, 0x53, 0xdd, 0xa1, - 0x52, 0x82, 0x42, 0x30, 0x18, 0x29, 0x9f, 0x4a, 0x9e, 0x24, 0x8d, 0x33, 0x54, 0xf2, 0x1c, 0xdb, - 0xcc, 0x1c, 0x42, 0x52, 0x0c, 0xd1, 0x53, 0x50, 0x64, 0x4b, 0xd1, 0xdc, 0xf7, 0x34, 0xd8, 0x25, - 0xd5, 0x02, 0x23, 0x3e, 0x10, 0x4c, 0xeb, 0x90, 0xb7, 0xb6, 0x2d, 0x8f, 0x25, 0xc1, 0x58, 0xc0, - 0xda, 0xb6, 0x5c, 0x86, 0x27, 0xa1, 0x40, 0xd7, 0xed, 0x71, 0x24, 0xd9, 0x24, 0x79, 0x4a, 0x13, - 0x2c, 0xca, 0x9f, 0xe3, 0x20, 0x8f, 0x07, 0x30, 0xf4, 0x2a, 0x24, 0x69, 0x2c, 0x17, 0x61, 0xb9, - 0xb2, 0xc9, 0x03, 0xfd, 0xa6, 0x1b, 0xe8, 0x37, 0x9b, 0x6e, 0xa0, 0xdf, 0xc9, 0x7e, 0xf1, 0xd5, - 0x7a, 0xec, 0xd3, 0xbf, 0xae, 0x4b, 0x2a, 0x93, 0x40, 0xd7, 0x68, 0xd8, 0xd2, 0x8d, 0x81, 0x66, - 0xb4, 0xd9, 0x27, 0xe7, 0x68, 0x4c, 0xd2, 0x8d, 0xc1, 0x6e, 0x1b, 0xed, 0x83, 0xdc, 0x32, 0x07, - 0x0e, 0x1e, 0x38, 0x43, 0x47, 0xe3, 0xa9, 0x46, 0x04, 0xe3, 0x50, 0x48, 0xe5, 0x09, 0xaf, 0xe6, - 0x72, 0x1e, 0x31, 0x46, 0x75, 0xa9, 0x15, 0x26, 0xa0, 0x7b, 0x00, 0x5e, 0x3e, 0x72, 0xca, 0xc9, - 0x8d, 0xc4, 0x8d, 0xfc, 0xf6, 0xc6, 0xc4, 0x86, 0x3f, 0x70, 0x59, 0x4e, 0xac, 0xb6, 0x4e, 0xf0, - 0x4e, 0x92, 0x7e, 0xae, 0x1a, 0x90, 0x44, 0xcf, 0xc0, 0x92, 0x6e, 0x59, 0x9a, 0x43, 0x74, 0x82, - 0xb5, 0xd3, 0x0b, 0x82, 0x1d, 0x16, 0xe7, 0x0b, 0x6a, 0x51, 0xb7, 0xac, 0x63, 0x4a, 0xdd, 0xa1, - 0x44, 0xf4, 0x34, 0x94, 0x68, 0x4c, 0x37, 0xf4, 0x9e, 0xd6, 0xc5, 0xc6, 0x59, 0x97, 0xb0, 0x78, - 0x9e, 0x50, 0x8b, 0x82, 0xda, 0x60, 0x44, 0xa5, 0xed, 0xed, 0x38, 0x8b, 0xe7, 0x08, 0x41, 0xb2, - 0xad, 0x13, 0x9d, 0x59, 0xb2, 0xa0, 0xb2, 0x67, 0x4a, 0xb3, 0x74, 0xd2, 0x15, 0xf6, 0x61, 0xcf, - 0xe8, 0x2a, 0xa4, 0x85, 0xda, 0x04, 0x53, 0x2b, 0x46, 0x68, 0x15, 0x52, 0x96, 0x6d, 0x9e, 0x63, - 0xb6, 0x75, 0x59, 0x95, 0x0f, 0x14, 0x15, 0x4a, 0xe1, 0xd8, 0x8f, 0x4a, 0x10, 0x27, 0x23, 0x31, - 0x4b, 0x9c, 0x8c, 0xd0, 0x4b, 0x90, 0xa4, 0x86, 0x64, 0x73, 0x94, 0xa6, 0x64, 0x3b, 0x21, 0xd7, - 0xbc, 0xb0, 0xb0, 0xca, 0x38, 0x95, 0x25, 0x28, 0x86, 0x72, 0x82, 0x72, 0x15, 0x56, 0xa7, 0x85, - 0x78, 0xa5, 0xeb, 0xd1, 0x43, 0xa1, 0x1a, 0xdd, 0x86, 0xac, 0x17, 0xe3, 0xb9, 0xe3, 0x5c, 0x9b, - 0x98, 0xd6, 0x65, 0x56, 0x3d, 0x56, 0xea, 0x31, 0x74, 0x03, 0xba, 0xba, 0xc8, 0xe8, 0x05, 0x35, - 0xa3, 0x5b, 0x56, 0x43, 0x77, 0xba, 0xca, 0x7b, 0x50, 0x8e, 0x8a, 0xdf, 0x01, 0x83, 0x49, 0xcc, - 0xed, 0x5d, 0x83, 0x5d, 0x85, 0x74, 0xc7, 0xb4, 0xfb, 0x3a, 0x61, 0xca, 0x8a, 0xaa, 0x18, 0x51, - 0x43, 0xf2, 0x58, 0x9e, 0x60, 0x64, 0x3e, 0x50, 0x34, 0xb8, 0x16, 0x19, 0xc3, 0xa9, 0x88, 0x31, - 0x68, 0x63, 0x6e, 0xd6, 0xa2, 0xca, 0x07, 0xbe, 0x22, 0xfe, 0xb1, 0x7c, 0x40, 0xa7, 0x75, 0xd8, - 0x5a, 0x99, 0xfe, 0x9c, 0x2a, 0x46, 0xca, 0x67, 0x09, 0xb8, 0x3a, 0x3d, 0x92, 0xa3, 0x0d, 0x28, - 0xf4, 0xf5, 0x91, 0x46, 0x46, 0xc2, 0xed, 0x24, 0xb6, 0xf1, 0xd0, 0xd7, 0x47, 0xcd, 0x11, 0xf7, - 0x39, 0x19, 0x12, 0x64, 0xe4, 0x94, 0xe3, 0x1b, 0x89, 0x1b, 0x05, 0x95, 0x3e, 0xa2, 0x13, 0x58, - 0xee, 0x99, 0x2d, 0xbd, 0xa7, 0xf5, 0x74, 0x87, 0x68, 0x22, 0xc5, 0xf3, 0x43, 0xf4, 0xd4, 0x84, - 0xb1, 0x79, 0x4c, 0xc6, 0x6d, 0xbe, 0x9f, 0x34, 0xe0, 0x08, 0xff, 0x5f, 0x62, 0x3a, 0xf6, 0x75, - 0x77, 0xab, 0xd1, 0x5d, 0xc8, 0xf7, 0x0d, 0xe7, 0x14, 0x77, 0xf5, 0x73, 0xc3, 0xb4, 0xc5, 0x69, - 0x9a, 0x74, 0x9a, 0x37, 0x7d, 0x1e, 0xa1, 0x29, 0x28, 0x16, 0xd8, 0x92, 0x54, 0xc8, 0x87, 0xdd, - 0x68, 0x92, 0x5e, 0x38, 0x9a, 0xbc, 0x04, 0xab, 0x03, 0x3c, 0x22, 0x9a, 0x7f, 0x5e, 0xb9, 0x9f, - 0x64, 0x98, 0xe9, 0x11, 0x7d, 0xe7, 0x9d, 0x70, 0x87, 0xba, 0x0c, 0x7a, 0x8e, 0xe5, 0x42, 0xcb, - 0x74, 0xb0, 0xad, 0xe9, 0xed, 0xb6, 0x8d, 0x1d, 0x87, 0x95, 0x4f, 0x05, 0x96, 0xe0, 0x18, 0xbd, - 0xca, 0xc9, 0xca, 0x2f, 0x82, 0x5b, 0x13, 0xce, 0x7d, 0xc2, 0xf0, 0x92, 0x6f, 0xf8, 0x63, 0x58, - 0x15, 0xf2, 0xed, 0x90, 0xed, 0x79, 0x0d, 0xfa, 0xf8, 0xe4, 0xf9, 0x1a, 0xb7, 0x39, 0x72, 0xc5, - 0xa3, 0xcd, 0x9e, 0x78, 0x34, 0xb3, 0x23, 0x48, 0x32, 0xa3, 0x24, 0x79, 0x88, 0xa1, 0xcf, 0xff, - 0x6e, 0x5b, 0xf1, 0x71, 0x02, 0x96, 0x27, 0x0a, 0x09, 0x6f, 0x61, 0xd2, 0xd4, 0x85, 0xc5, 0xa7, - 0x2e, 0x2c, 0xb1, 0xf0, 0xc2, 0xc4, 0x5e, 0x27, 0x67, 0xef, 0x75, 0xea, 0x7b, 0xdc, 0xeb, 0xf4, - 0xa3, 0xed, 0xf5, 0xbf, 0x74, 0x17, 0x7e, 0x2d, 0x41, 0x25, 0xba, 0xfa, 0x9a, 0xba, 0x1d, 0xcf, - 0xc3, 0xb2, 0xf7, 0x29, 0x9e, 0x7a, 0x1e, 0x18, 0x65, 0xef, 0x85, 0xd0, 0x1f, 0x99, 0xe3, 0x9e, - 0x86, 0xd2, 0x58, 0x6d, 0xc8, 0x5d, 0xb9, 0x78, 0x1e, 0x9c, 0x5f, 0xf9, 0x59, 0xc2, 0x4b, 0x3c, - 0xa1, 0x02, 0x6e, 0xca, 0x69, 0x7d, 0x0b, 0x56, 0xda, 0xb8, 0x65, 0xb4, 0x1f, 0xf5, 0xb0, 0x2e, - 0x0b, 0xe9, 0xff, 0x9e, 0xd5, 0x49, 0x2f, 0xf9, 0x15, 0x40, 0x56, 0xc5, 0x8e, 0x45, 0xeb, 0x31, - 0xb4, 0x03, 0x39, 0x3c, 0x6a, 0x61, 0x8b, 0xb8, 0x25, 0xec, 0xf4, 0x16, 0x81, 0x73, 0xd7, 0x5d, - 0x4e, 0xda, 0x20, 0x7b, 0x62, 0xe8, 0x96, 0xc0, 0x00, 0xa2, 0xdb, 0x79, 0x21, 0x1e, 0x04, 0x01, - 0x5e, 0x76, 0x41, 0x80, 0x44, 0x64, 0x7f, 0xcb, 0xa5, 0xc6, 0x50, 0x80, 0x5b, 0x02, 0x05, 0x48, - 0xce, 0x98, 0x2c, 0x04, 0x03, 0xd4, 0x42, 0x30, 0x40, 0x7a, 0xc6, 0x32, 0x23, 0x70, 0x80, 0x97, - 0x5d, 0x1c, 0x20, 0x33, 0xe3, 0x8b, 0xc7, 0x80, 0x80, 0x37, 0x02, 0x40, 0x40, 0x8e, 0x89, 0x6e, - 0x44, 0x8a, 0x4e, 0x41, 0x02, 0x5e, 0xf3, 0x90, 0x80, 0x42, 0x24, 0x8a, 0x20, 0x84, 0xc7, 0xa1, - 0x80, 0xc3, 0x09, 0x28, 0x80, 0xb7, 0xee, 0xcf, 0x44, 0xaa, 0x98, 0x81, 0x05, 0x1c, 0x4e, 0x60, - 0x01, 0xa5, 0x19, 0x0a, 0x67, 0x80, 0x01, 0x3f, 0x9a, 0x0e, 0x06, 0x44, 0xb7, 0xeb, 0xe2, 0x33, - 0xe7, 0x43, 0x03, 0xb4, 0x08, 0x34, 0x40, 0x8e, 0xec, 0x5c, 0xb9, 0xfa, 0xb9, 0xe1, 0x80, 0x93, - 0x29, 0x70, 0x00, 0x6f, 0xdc, 0x6f, 0x44, 0x2a, 0x9f, 0x03, 0x0f, 0x38, 0x99, 0x82, 0x07, 0xa0, - 0x99, 0x6a, 0x67, 0x02, 0x02, 0xf7, 0xc2, 0x80, 0xc0, 0x4a, 0x44, 0xd5, 0xe9, 0x9f, 0xf6, 0x08, - 0x44, 0xe0, 0x34, 0x0a, 0x11, 0xe0, 0x5d, 0xfb, 0x0b, 0x91, 0x1a, 0x17, 0x80, 0x04, 0x0e, 0x27, - 0x20, 0x81, 0x2b, 0x33, 0x3c, 0x6d, 0x7e, 0x4c, 0x20, 0x25, 0xa7, 0xf7, 0x92, 0xd9, 0xac, 0x9c, - 0xe3, 0x68, 0xc0, 0x5e, 0x32, 0x9b, 0x97, 0x0b, 0xca, 0x73, 0xb4, 0x82, 0x19, 0x8b, 0x73, 0xb4, - 0x57, 0xc0, 0xb6, 0x6d, 0xda, 0xa2, 0xbb, 0xe7, 0x03, 0xe5, 0x06, 0xed, 0x11, 0xfd, 0x98, 0x76, - 0x09, 0x7e, 0xc0, 0x7a, 0xb2, 0x40, 0x1c, 0x53, 0x7e, 0x2f, 0xf9, 0xb2, 0x0c, 0x41, 0x08, 0xf6, - 0x97, 0x39, 0xd1, 0x5f, 0x06, 0x50, 0x85, 0x78, 0x18, 0x55, 0x58, 0x87, 0x3c, 0xed, 0xb5, 0xc6, - 0x00, 0x03, 0xdd, 0xf2, 0x00, 0x83, 0x9b, 0xb0, 0xcc, 0x12, 0x26, 0xc7, 0x1e, 0x44, 0x5a, 0x4a, - 0xb2, 0xb4, 0xb4, 0x44, 0x5f, 0x70, 0xeb, 0xf0, 0xfc, 0xf4, 0x22, 0xac, 0x04, 0x78, 0xbd, 0x1e, - 0x8e, 0x77, 0xcf, 0xb2, 0xc7, 0x5d, 0x15, 0xcd, 0xdc, 0x9f, 0x24, 0xdf, 0x42, 0x3e, 0xd2, 0x30, - 0x0d, 0x14, 0x90, 0xbe, 0x27, 0x50, 0x20, 0xfe, 0xc8, 0xa0, 0x40, 0xb0, 0x27, 0x4d, 0x84, 0x7b, - 0xd2, 0x7f, 0x48, 0xfe, 0x9e, 0x78, 0x2d, 0x7e, 0xcb, 0x6c, 0x63, 0xd1, 0x25, 0xb2, 0x67, 0x5a, - 0x92, 0xf4, 0xcc, 0x33, 0xd1, 0x0b, 0xd2, 0x47, 0xca, 0xe5, 0x25, 0x9e, 0x9c, 0xc8, 0x2b, 0x5e, - 0x83, 0xc9, 0x13, 0xbf, 0x68, 0x30, 0x65, 0x48, 0x3c, 0xc4, 0x1c, 0x2e, 0x2e, 0xa8, 0xf4, 0x91, - 0xf2, 0x31, 0xe7, 0x13, 0x09, 0x9c, 0x0f, 0xd0, 0xab, 0x90, 0x63, 0x60, 0xbf, 0x66, 0x5a, 0x8e, - 0x80, 0x88, 0x43, 0xa5, 0x0d, 0x47, 0xfc, 0x37, 0x8f, 0x28, 0xcf, 0xa1, 0xe5, 0xa8, 0x59, 0x4b, - 0x3c, 0x05, 0x2a, 0x8e, 0x5c, 0xa8, 0xe2, 0xb8, 0x0e, 0x39, 0xfa, 0xf5, 0x8e, 0xa5, 0xb7, 0x70, - 0x19, 0xd8, 0x87, 0xfa, 0x04, 0xe5, 0x77, 0x71, 0x58, 0x1a, 0x4b, 0x34, 0x53, 0xd7, 0xee, 0xba, - 0x64, 0x3c, 0x00, 0x79, 0xcc, 0x67, 0x8f, 0x35, 0x80, 0x33, 0xdd, 0xd1, 0x3e, 0xd4, 0x07, 0x04, - 0xb7, 0x85, 0x51, 0x02, 0x14, 0x54, 0x81, 0x2c, 0x1d, 0x0d, 0x1d, 0xdc, 0x16, 0xe8, 0x8b, 0x37, - 0x46, 0x0d, 0x48, 0xe3, 0x73, 0x3c, 0x20, 0x4e, 0x39, 0xc3, 0xb6, 0xfd, 0xea, 0x64, 0x3b, 0x4c, - 0x5f, 0xef, 0x94, 0xe9, 0x66, 0x7f, 0xfb, 0xd5, 0xba, 0xcc, 0xb9, 0x5f, 0x30, 0xfb, 0x06, 0xc1, - 0x7d, 0x8b, 0x5c, 0xa8, 0x42, 0x3e, 0x6c, 0x85, 0xec, 0x98, 0x15, 0x18, 0x0e, 0x58, 0x70, 0xdb, - 0x7b, 0x6a, 0x53, 0xc3, 0xb4, 0x0d, 0x72, 0xa1, 0x16, 0xfb, 0xb8, 0x6f, 0x99, 0x66, 0x4f, 0xe3, - 0x67, 0xbc, 0x0a, 0xa5, 0x70, 0x5e, 0x45, 0x4f, 0x41, 0xd1, 0xc6, 0x44, 0x37, 0x06, 0x5a, 0xa8, - 0x08, 0x2e, 0x70, 0x22, 0x3f, 0x53, 0x7b, 0xc9, 0xac, 0x24, 0xc7, 0xf7, 0x92, 0xd9, 0xb8, 0x9c, - 0x50, 0x8e, 0xe0, 0xca, 0xd4, 0xbc, 0x8a, 0x5e, 0x81, 0x9c, 0x9f, 0x92, 0x25, 0xb6, 0xda, 0x4b, - 0x90, 0x16, 0x9f, 0x57, 0xf9, 0x83, 0xe4, 0xab, 0x0c, 0x63, 0x37, 0x75, 0x48, 0xdb, 0xd8, 0x19, - 0xf6, 0x38, 0x9a, 0x52, 0xda, 0x7e, 0x71, 0xbe, 0x8c, 0x4c, 0xa9, 0xc3, 0x1e, 0x51, 0x85, 0xb0, - 0xf2, 0x2e, 0xa4, 0x39, 0x05, 0xe5, 0x21, 0x73, 0x72, 0x70, 0xff, 0xe0, 0xf0, 0xed, 0x03, 0x39, - 0x86, 0x00, 0xd2, 0xd5, 0x5a, 0xad, 0x7e, 0xd4, 0x94, 0x25, 0x94, 0x83, 0x54, 0x75, 0xe7, 0x50, - 0x6d, 0xca, 0x71, 0x4a, 0x56, 0xeb, 0x7b, 0xf5, 0x5a, 0x53, 0x4e, 0xa0, 0x65, 0x28, 0xf2, 0x67, - 0xed, 0xde, 0xa1, 0xfa, 0x66, 0xb5, 0x29, 0x27, 0x03, 0xa4, 0xe3, 0xfa, 0xc1, 0xdd, 0xba, 0x2a, - 0xa7, 0x94, 0xff, 0x81, 0x6b, 0x91, 0x39, 0xdc, 0x07, 0x66, 0xa4, 0x00, 0x30, 0xa3, 0x7c, 0x16, - 0xa7, 0x4d, 0x4d, 0x54, 0x62, 0x46, 0x7b, 0x63, 0x0b, 0xdf, 0x5e, 0x20, 0xab, 0x8f, 0xad, 0x9e, - 0xf6, 0x31, 0x36, 0xee, 0x60, 0xd2, 0xea, 0xf2, 0x42, 0x81, 0x47, 0xa0, 0xa2, 0x5a, 0x14, 0x54, - 0x26, 0xe4, 0x70, 0xb6, 0xf7, 0x71, 0x8b, 0x68, 0xdc, 0x89, 0x1c, 0xd6, 0x4c, 0xe4, 0x28, 0x1b, - 0xa5, 0x1e, 0x73, 0xa2, 0xf2, 0xde, 0x42, 0xb6, 0xcc, 0x41, 0x4a, 0xad, 0x37, 0xd5, 0x77, 0xe4, - 0x04, 0x42, 0x50, 0x62, 0x8f, 0xda, 0xf1, 0x41, 0xf5, 0xe8, 0xb8, 0x71, 0x48, 0x6d, 0xb9, 0x02, - 0x4b, 0xae, 0x2d, 0x5d, 0x62, 0x4a, 0x79, 0x1e, 0x1e, 0x8b, 0xa8, 0x2a, 0x26, 0x5b, 0x2a, 0xe5, - 0x37, 0x52, 0x90, 0x3b, 0x5c, 0x19, 0x1c, 0x42, 0xda, 0x21, 0x3a, 0x19, 0x3a, 0xc2, 0x88, 0xaf, - 0xcc, 0x5b, 0x66, 0x6c, 0xba, 0x0f, 0xc7, 0x4c, 0x5c, 0x15, 0x6a, 0x94, 0xdb, 0x50, 0x0a, 0xbf, - 0x89, 0xb6, 0x81, 0xef, 0x44, 0x71, 0xe5, 0x0e, 0xa0, 0xc9, 0xea, 0x63, 0x4a, 0x7b, 0x29, 0x4d, - 0x6b, 0x2f, 0x7f, 0x2b, 0xc1, 0xe3, 0x97, 0x54, 0x1a, 0xe8, 0xad, 0xb1, 0x45, 0xbe, 0xb6, 0x48, - 0x9d, 0xb2, 0xc9, 0x69, 0x63, 0xcb, 0xbc, 0x05, 0x85, 0x20, 0x7d, 0xbe, 0x45, 0x7e, 0x1b, 0xf7, - 0x0f, 0x71, 0xb8, 0x0f, 0xf6, 0x43, 0xa0, 0xf4, 0x1d, 0x43, 0xe0, 0xeb, 0x00, 0x64, 0xa4, 0x71, - 0xb7, 0x76, 0xf3, 0xe8, 0x13, 0x53, 0xf0, 0x45, 0xdc, 0x6a, 0x8e, 0xc4, 0x21, 0xc8, 0x11, 0xf1, - 0xe4, 0xa0, 0xe3, 0x20, 0x28, 0x30, 0x64, 0x39, 0xd6, 0x11, 0x0d, 0xf3, 0xbc, 0xc9, 0xd8, 0x07, - 0x0f, 0x38, 0xd9, 0x41, 0xef, 0xc0, 0x63, 0x63, 0x85, 0x82, 0xa7, 0x3a, 0x39, 0x6f, 0xbd, 0x70, - 0x25, 0x5c, 0x2f, 0xb8, 0xaa, 0x83, 0xd9, 0x3e, 0x15, 0xce, 0xf6, 0xef, 0x00, 0xf8, 0xe0, 0x00, - 0x8d, 0x30, 0xb6, 0x39, 0x1c, 0xb4, 0x99, 0x07, 0xa4, 0x54, 0x3e, 0x40, 0xb7, 0x21, 0x45, 0x3d, - 0xc9, 0xb5, 0xd3, 0x64, 0x28, 0xa6, 0x9e, 0x10, 0x00, 0x17, 0x38, 0xb7, 0x62, 0x00, 0x9a, 0x04, - 0x68, 0x23, 0xa6, 0x78, 0x23, 0x3c, 0xc5, 0x93, 0x91, 0x50, 0xef, 0xf4, 0xa9, 0x3e, 0x82, 0x14, - 0xdb, 0x79, 0x9a, 0x74, 0xd9, 0x5f, 0x01, 0x51, 0x2d, 0xd2, 0x67, 0xf4, 0x63, 0x00, 0x9d, 0x10, - 0xdb, 0x38, 0x1d, 0xfa, 0x13, 0xac, 0x4f, 0xf7, 0x9c, 0xaa, 0xcb, 0xb7, 0x73, 0x5d, 0xb8, 0xd0, - 0xaa, 0x2f, 0x1a, 0x70, 0xa3, 0x80, 0x42, 0xe5, 0x00, 0x4a, 0x61, 0x59, 0xb7, 0xbe, 0xe1, 0xdf, - 0x10, 0xae, 0x6f, 0x78, 0xb9, 0x2a, 0xea, 0x1b, 0xaf, 0x3a, 0x4a, 0xf0, 0x5f, 0x1f, 0x6c, 0xa0, - 0xfc, 0x24, 0x0e, 0x85, 0xa0, 0xe3, 0xfd, 0xe7, 0x95, 0x20, 0xca, 0xcf, 0x25, 0xc8, 0x7a, 0xcb, - 0x0f, 0xff, 0x07, 0x09, 0xfd, 0x38, 0xe2, 0xd6, 0x8b, 0x07, 0x7f, 0x5e, 0xf0, 0xdf, 0x44, 0x09, - 0xef, 0x37, 0xd1, 0x1d, 0x2f, 0xfd, 0x45, 0x01, 0x22, 0x41, 0x5b, 0x0b, 0xaf, 0x72, 0xb3, 0xfd, - 0x1d, 0xc8, 0x79, 0xa7, 0x97, 0x36, 0x1d, 0x2e, 0x70, 0x24, 0x89, 0x33, 0x24, 0x60, 0xbf, 0x55, - 0x48, 0x59, 0xe6, 0x87, 0xe2, 0xcf, 0x48, 0x42, 0xe5, 0x03, 0xa5, 0x0d, 0x4b, 0x63, 0x47, 0x1f, - 0xdd, 0x81, 0x8c, 0x35, 0x3c, 0xd5, 0x5c, 0xe7, 0x18, 0x83, 0xd7, 0xdc, 0x72, 0x76, 0x78, 0xda, - 0x33, 0x5a, 0xf7, 0xf1, 0x85, 0xfb, 0x31, 0xd6, 0xf0, 0xf4, 0x3e, 0xf7, 0x21, 0x3e, 0x4b, 0x3c, - 0x38, 0xcb, 0x2f, 0x25, 0xc8, 0xba, 0x67, 0x02, 0xfd, 0x1f, 0xe4, 0xbc, 0xb0, 0xe2, 0xfd, 0xda, - 0x8c, 0x8c, 0x47, 0x42, 0xbf, 0x2f, 0x82, 0xaa, 0xee, 0x3f, 0x59, 0xa3, 0xad, 0x75, 0x7a, 0x3a, - 0xf7, 0xa5, 0x52, 0xd8, 0x66, 0x3c, 0xf0, 0xb0, 0x78, 0xbc, 0x7b, 0xf7, 0x5e, 0x4f, 0x3f, 0x53, - 0xf3, 0x4c, 0x66, 0xb7, 0x4d, 0x07, 0xa2, 0xb2, 0xfb, 0xbb, 0x04, 0xf2, 0xf8, 0x89, 0xfd, 0xce, - 0x5f, 0x37, 0x99, 0xe6, 0x12, 0x53, 0xd2, 0x1c, 0xda, 0x82, 0x15, 0x8f, 0x43, 0x73, 0x8c, 0xb3, - 0x81, 0x4e, 0x86, 0x36, 0x16, 0x80, 0x24, 0xf2, 0x5e, 0x1d, 0xbb, 0x6f, 0x26, 0x57, 0x9d, 0x7a, - 0xc4, 0x55, 0x7f, 0x1c, 0x87, 0x7c, 0x00, 0x1e, 0x45, 0xff, 0x1b, 0x08, 0x46, 0xa5, 0x29, 0x99, - 0x21, 0xc0, 0xeb, 0xff, 0xa6, 0x0c, 0x9b, 0x29, 0xbe, 0xb8, 0x99, 0xa2, 0x40, 0x68, 0x17, 0x6d, - 0x4d, 0x2e, 0x8c, 0xb6, 0xbe, 0x00, 0x88, 0x98, 0x44, 0xef, 0x69, 0xe7, 0x26, 0x31, 0x06, 0x67, - 0x1a, 0x77, 0x43, 0x1e, 0x3a, 0x64, 0xf6, 0xe6, 0x01, 0x7b, 0x71, 0xc4, 0x3c, 0xf2, 0xa7, 0x12, - 0x64, 0xbd, 0xb2, 0x7b, 0xd1, 0x9f, 0x98, 0x57, 0x21, 0x2d, 0x2a, 0x4b, 0xfe, 0x17, 0x53, 0x8c, - 0xa6, 0xc2, 0xca, 0x15, 0xc8, 0xf6, 0x31, 0xd1, 0x59, 0x1c, 0xe4, 0x59, 0xcd, 0x1b, 0xdf, 0x7c, - 0x0d, 0xf2, 0x81, 0x1f, 0xc0, 0x34, 0x34, 0x1e, 0xd4, 0xdf, 0x96, 0x63, 0x95, 0xcc, 0x27, 0x9f, - 0x6f, 0x24, 0x0e, 0xf0, 0x87, 0xf4, 0x34, 0xab, 0xf5, 0x5a, 0xa3, 0x5e, 0xbb, 0x2f, 0x4b, 0x95, - 0xfc, 0x27, 0x9f, 0x6f, 0x64, 0x54, 0xcc, 0x10, 0xc5, 0x9b, 0xf7, 0x61, 0x69, 0x6c, 0x63, 0xc2, - 0x65, 0x0b, 0x82, 0xd2, 0xdd, 0x93, 0xa3, 0xfd, 0xdd, 0x5a, 0xb5, 0x59, 0xd7, 0x1e, 0x1c, 0x36, - 0xeb, 0xb2, 0x84, 0x1e, 0x83, 0x95, 0xfd, 0xdd, 0xff, 0x6f, 0x34, 0xb5, 0xda, 0xfe, 0x6e, 0xfd, - 0xa0, 0xa9, 0x55, 0x9b, 0xcd, 0x6a, 0xed, 0xbe, 0x1c, 0xdf, 0xfe, 0x3c, 0x0f, 0xc9, 0xea, 0x4e, - 0x6d, 0x17, 0xd5, 0x20, 0xc9, 0xa0, 0x90, 0x4b, 0x6f, 0x80, 0x55, 0x2e, 0xc7, 0x86, 0xd1, 0x3d, - 0x48, 0x31, 0x94, 0x04, 0x5d, 0x7e, 0x25, 0xac, 0x32, 0x03, 0x2c, 0xa6, 0x1f, 0xc3, 0x4e, 0xe4, - 0xa5, 0x77, 0xc4, 0x2a, 0x97, 0x63, 0xc7, 0x68, 0x1f, 0x32, 0x6e, 0x93, 0x3c, 0xeb, 0xe2, 0x56, - 0x65, 0x26, 0xa0, 0x4b, 0x97, 0xc6, 0xc1, 0x86, 0xcb, 0xaf, 0x8f, 0x55, 0x66, 0xa0, 0xca, 0x68, - 0x17, 0xd2, 0xa2, 0x1d, 0x9d, 0x71, 0x23, 0xac, 0x32, 0x0b, 0x27, 0x46, 0x2a, 0xe4, 0x7c, 0x18, - 0x67, 0xf6, 0xa5, 0xb8, 0xca, 0x1c, 0x80, 0x39, 0x7a, 0x17, 0x8a, 0xe1, 0x56, 0x77, 0xbe, 0x5b, - 0x67, 0x95, 0x39, 0x11, 0x69, 0xaa, 0x3f, 0xdc, 0xf7, 0xce, 0x77, 0x0b, 0xad, 0x32, 0x27, 0x40, - 0x8d, 0xde, 0x87, 0xe5, 0xc9, 0xbe, 0x74, 0xfe, 0x4b, 0x69, 0x95, 0x05, 0x20, 0x6b, 0xd4, 0x07, - 0x34, 0xa5, 0x9f, 0x5d, 0xe0, 0x8e, 0x5a, 0x65, 0x11, 0x04, 0x1b, 0xb5, 0x61, 0x69, 0xbc, 0x49, - 0x9c, 0xf7, 0xce, 0x5a, 0x65, 0x6e, 0x34, 0x9b, 0xcf, 0x12, 0x6e, 0x2e, 0xe7, 0xbd, 0xc3, 0x56, - 0x99, 0x1b, 0xdc, 0x46, 0x27, 0x00, 0x81, 0xfe, 0x70, 0x8e, 0x3b, 0x6d, 0x95, 0x79, 0x60, 0x6e, - 0x64, 0xc1, 0xca, 0xb4, 0xc6, 0x71, 0x91, 0x2b, 0x6e, 0x95, 0x85, 0xd0, 0x6f, 0xea, 0xcf, 0xe1, - 0x16, 0x70, 0xbe, 0x2b, 0x6f, 0x95, 0x39, 0x61, 0xf0, 0x9d, 0xea, 0x17, 0x5f, 0xaf, 0x49, 0x5f, - 0x7e, 0xbd, 0x26, 0xfd, 0xed, 0xeb, 0x35, 0xe9, 0xd3, 0x6f, 0xd6, 0x62, 0x5f, 0x7e, 0xb3, 0x16, - 0xfb, 0xcb, 0x37, 0x6b, 0xb1, 0x1f, 0x3c, 0x7b, 0x66, 0x90, 0xee, 0xf0, 0x74, 0xb3, 0x65, 0xf6, - 0xb7, 0x5a, 0x66, 0x1f, 0x93, 0xd3, 0x0e, 0xf1, 0x1f, 0xfc, 0x9b, 0xcb, 0xa7, 0x69, 0x96, 0x41, - 0x6f, 0xfd, 0x33, 0x00, 0x00, 0xff, 0xff, 0x64, 0xd0, 0x90, 0x6e, 0xd9, 0x2c, 0x00, 0x00, + 0xd5, 0x57, 0xeb, 0xad, 0xa3, 0x87, 0xdb, 0xd7, 0x9e, 0x19, 0x8d, 0x18, 0x6c, 0xd3, 0x14, 0x30, + 0x0c, 0x60, 0xf3, 0x79, 0xbe, 0xe1, 0xf1, 0x0d, 0x7c, 0x55, 0xb2, 0x46, 0x13, 0xd9, 0x33, 0xd8, + 0xa6, 0x2d, 0x0f, 0x45, 0x1e, 0x34, 0x6d, 0xe9, 0xda, 0x6a, 0x46, 0x52, 0x37, 0xdd, 0x57, 0x42, + 0xa6, 0xb2, 0x0a, 0x49, 0x55, 0x8a, 0x15, 0x55, 0xc9, 0x82, 0x45, 0x58, 0x64, 0x91, 0x4d, 0xfe, + 0x82, 0x2c, 0x52, 0xc9, 0x26, 0x0b, 0x16, 0x59, 0xb0, 0xcc, 0x8a, 0xa4, 0x60, 0xc7, 0x36, 0x8b, + 0x6c, 0x53, 0xf7, 0xd1, 0x2f, 0x49, 0x6d, 0x49, 0x03, 0x59, 0xa4, 0x92, 0x5d, 0xdf, 0xd3, 0xe7, + 0x9c, 0xdb, 0xf7, 0xdc, 0x73, 0xcf, 0xe3, 0xd7, 0x17, 0x1e, 0x23, 0xb8, 0xdf, 0xc6, 0x76, 0xcf, + 0xe8, 0x93, 0x2d, 0xfd, 0xa4, 0x65, 0x6c, 0x91, 0x73, 0x0b, 0x3b, 0x9b, 0x96, 0x6d, 0x12, 0x13, + 0x2d, 0xf9, 0x2f, 0x37, 0xe9, 0xcb, 0xca, 0xe3, 0x01, 0xee, 0x96, 0x7d, 0x6e, 0x11, 0x73, 0xcb, + 0xb2, 0x4d, 0xf3, 0x94, 0xf3, 0x57, 0xae, 0x4d, 0xbe, 0x7e, 0x88, 0xcf, 0x85, 0xb6, 0x90, 0x30, + 0x9b, 0x65, 0xcb, 0xd2, 0x6d, 0xbd, 0xe7, 0xbe, 0xde, 0x98, 0x78, 0x3d, 0xd4, 0xbb, 0x46, 0x5b, + 0x27, 0xa6, 0x2d, 0x38, 0xd6, 0xcf, 0x4c, 0xf3, 0xac, 0x8b, 0xb7, 0xd8, 0xe8, 0x64, 0x70, 0xba, + 0x45, 0x8c, 0x1e, 0x76, 0x88, 0xde, 0xb3, 0x04, 0xc3, 0xea, 0x99, 0x79, 0x66, 0xb2, 0xc7, 0x2d, + 0xfa, 0xc4, 0xa9, 0xca, 0x1f, 0x73, 0x90, 0x51, 0xf1, 0xfb, 0x03, 0xec, 0x10, 0xb4, 0x0d, 0x49, + 0xdc, 0xea, 0x98, 0x65, 0x69, 0x43, 0xba, 0x9e, 0xdf, 0xbe, 0xb6, 0x39, 0xb6, 0xc0, 0x4d, 0xc1, + 0x57, 0x6f, 0x75, 0xcc, 0x46, 0x4c, 0x65, 0xbc, 0xe8, 0x16, 0xa4, 0x4e, 0xbb, 0x03, 0xa7, 0x53, + 0x8e, 0x33, 0xa1, 0xc7, 0xa3, 0x84, 0xee, 0x52, 0xa6, 0x46, 0x4c, 0xe5, 0xdc, 0x74, 0x2a, 0xa3, + 0x7f, 0x6a, 0x96, 0x13, 0x17, 0x4f, 0xb5, 0xdb, 0x3f, 0x65, 0x53, 0x51, 0x5e, 0xb4, 0x03, 0x60, + 0xf4, 0x0d, 0xa2, 0xb5, 0x3a, 0xba, 0xd1, 0x2f, 0xa7, 0x98, 0xe4, 0x13, 0xd1, 0x92, 0x06, 0xa9, + 0x51, 0xc6, 0x46, 0x4c, 0xcd, 0x19, 0xee, 0x80, 0x7e, 0xee, 0xfb, 0x03, 0x6c, 0x9f, 0x97, 0xd3, + 0x17, 0x7f, 0xee, 0x9b, 0x94, 0x89, 0x7e, 0x2e, 0xe3, 0x46, 0xaf, 0x41, 0xb6, 0xd5, 0xc1, 0xad, + 0x87, 0x1a, 0x19, 0x95, 0xb3, 0x4c, 0x72, 0x3d, 0x4a, 0xb2, 0x46, 0xf9, 0x9a, 0xa3, 0x46, 0x4c, + 0xcd, 0xb4, 0xf8, 0x23, 0x7a, 0x05, 0xd2, 0x2d, 0xb3, 0xd7, 0x33, 0x48, 0x39, 0xcf, 0x64, 0xd7, + 0x22, 0x65, 0x19, 0x57, 0x23, 0xa6, 0x0a, 0x7e, 0xb4, 0x0f, 0xa5, 0xae, 0xe1, 0x10, 0xcd, 0xe9, + 0xeb, 0x96, 0xd3, 0x31, 0x89, 0x53, 0x2e, 0x30, 0x0d, 0x4f, 0x45, 0x69, 0xb8, 0x6f, 0x38, 0xe4, + 0xc8, 0x65, 0x6e, 0xc4, 0xd4, 0x62, 0x37, 0x48, 0xa0, 0xfa, 0xcc, 0xd3, 0x53, 0x6c, 0x7b, 0x0a, + 0xcb, 0xc5, 0x8b, 0xf5, 0x1d, 0x50, 0x6e, 0x57, 0x9e, 0xea, 0x33, 0x83, 0x04, 0xf4, 0x03, 0x58, + 0xe9, 0x9a, 0x7a, 0xdb, 0x53, 0xa7, 0xb5, 0x3a, 0x83, 0xfe, 0xc3, 0x72, 0x89, 0x29, 0x7d, 0x36, + 0xf2, 0x23, 0x4d, 0xbd, 0xed, 0xaa, 0xa8, 0x51, 0x81, 0x46, 0x4c, 0x5d, 0xee, 0x8e, 0x13, 0xd1, + 0x3b, 0xb0, 0xaa, 0x5b, 0x56, 0xf7, 0x7c, 0x5c, 0xfb, 0x12, 0xd3, 0x7e, 0x23, 0x4a, 0x7b, 0x95, + 0xca, 0x8c, 0xab, 0x47, 0xfa, 0x04, 0x15, 0x35, 0x41, 0xb6, 0x6c, 0x6c, 0xe9, 0x36, 0xd6, 0x2c, + 0xdb, 0xb4, 0x4c, 0x47, 0xef, 0x96, 0x65, 0xa6, 0xfb, 0x99, 0x28, 0xdd, 0x87, 0x9c, 0xff, 0x50, + 0xb0, 0x37, 0x62, 0xea, 0x92, 0x15, 0x26, 0x71, 0xad, 0x66, 0x0b, 0x3b, 0x8e, 0xaf, 0x75, 0x79, + 0x96, 0x56, 0xc6, 0x1f, 0xd6, 0x1a, 0x22, 0xa1, 0x3a, 0xe4, 0xf1, 0x88, 0x8a, 0x6b, 0x43, 0x93, + 0xe0, 0x32, 0x62, 0x0a, 0x95, 0xc8, 0x13, 0xca, 0x58, 0x1f, 0x98, 0x04, 0x37, 0x62, 0x2a, 0x60, + 0x6f, 0x84, 0x74, 0xb8, 0x34, 0xc4, 0xb6, 0x71, 0x7a, 0xce, 0xd4, 0x68, 0xec, 0x8d, 0x63, 0x98, + 0xfd, 0xf2, 0x0a, 0x53, 0xf8, 0x5c, 0x94, 0xc2, 0x07, 0x4c, 0x88, 0xaa, 0xa8, 0xbb, 0x22, 0x8d, + 0x98, 0xba, 0x32, 0x9c, 0x24, 0x53, 0x17, 0x3b, 0x35, 0xfa, 0x7a, 0xd7, 0xf8, 0x10, 0x6b, 0x27, + 0x5d, 0xb3, 0xf5, 0xb0, 0xbc, 0x7a, 0xb1, 0x8b, 0xdd, 0x15, 0xdc, 0x3b, 0x94, 0x99, 0xba, 0xd8, + 0x69, 0x90, 0xb0, 0x93, 0x81, 0xd4, 0x50, 0xef, 0x0e, 0xf0, 0x5e, 0x32, 0x9b, 0x94, 0x53, 0x7b, + 0xc9, 0x6c, 0x46, 0xce, 0xee, 0x25, 0xb3, 0x39, 0x19, 0xf6, 0x92, 0x59, 0x90, 0xf3, 0xca, 0x33, + 0x90, 0x0f, 0x04, 0x26, 0x54, 0x86, 0x4c, 0x0f, 0x3b, 0x8e, 0x7e, 0x86, 0x59, 0x1c, 0xcb, 0xa9, + 0xee, 0x50, 0x29, 0x41, 0x21, 0x18, 0x8c, 0x94, 0x4f, 0x24, 0x4f, 0x92, 0xc6, 0x19, 0x2a, 0x39, + 0xc4, 0x36, 0x33, 0x87, 0x90, 0x14, 0x43, 0xf4, 0x24, 0x14, 0xd9, 0x52, 0x34, 0xf7, 0x3d, 0x0d, + 0x76, 0x49, 0xb5, 0xc0, 0x88, 0x0f, 0x04, 0xd3, 0x3a, 0xe4, 0xad, 0x6d, 0xcb, 0x63, 0x49, 0x30, + 0x16, 0xb0, 0xb6, 0x2d, 0x97, 0xe1, 0x09, 0x28, 0xd0, 0x75, 0x7b, 0x1c, 0x49, 0x36, 0x49, 0x9e, + 0xd2, 0x04, 0x8b, 0xf2, 0xe7, 0x38, 0xc8, 0xe3, 0x01, 0x0c, 0xbd, 0x02, 0x49, 0x1a, 0xcb, 0x45, + 0x58, 0xae, 0x6c, 0xf2, 0x40, 0xbf, 0xe9, 0x06, 0xfa, 0xcd, 0xa6, 0x1b, 0xe8, 0x77, 0xb2, 0x9f, + 0x7f, 0xb9, 0x1e, 0xfb, 0xe4, 0xaf, 0xeb, 0x92, 0xca, 0x24, 0xd0, 0x55, 0x1a, 0xb6, 0x74, 0xa3, + 0xaf, 0x19, 0x6d, 0xf6, 0xc9, 0x39, 0x1a, 0x93, 0x74, 0xa3, 0xbf, 0xdb, 0x46, 0xf7, 0x41, 0x6e, + 0x99, 0x7d, 0x07, 0xf7, 0x9d, 0x81, 0xa3, 0xf1, 0x54, 0x23, 0x82, 0x71, 0x28, 0xa4, 0xf2, 0x84, + 0x57, 0x73, 0x39, 0x0f, 0x19, 0xa3, 0xba, 0xd4, 0x0a, 0x13, 0xd0, 0x5d, 0x00, 0x2f, 0x1f, 0x39, + 0xe5, 0xe4, 0x46, 0xe2, 0x7a, 0x7e, 0x7b, 0x63, 0x62, 0xc3, 0x1f, 0xb8, 0x2c, 0xc7, 0x56, 0x5b, + 0x27, 0x78, 0x27, 0x49, 0x3f, 0x57, 0x0d, 0x48, 0xa2, 0xa7, 0x61, 0x49, 0xb7, 0x2c, 0xcd, 0x21, + 0x3a, 0xc1, 0xda, 0xc9, 0x39, 0xc1, 0x0e, 0x8b, 0xf3, 0x05, 0xb5, 0xa8, 0x5b, 0xd6, 0x11, 0xa5, + 0xee, 0x50, 0x22, 0x7a, 0x0a, 0x4a, 0x34, 0xa6, 0x1b, 0x7a, 0x57, 0xeb, 0x60, 0xe3, 0xac, 0x43, + 0x58, 0x3c, 0x4f, 0xa8, 0x45, 0x41, 0x6d, 0x30, 0xa2, 0xd2, 0xf6, 0x76, 0x9c, 0xc5, 0x73, 0x84, + 0x20, 0xd9, 0xd6, 0x89, 0xce, 0x2c, 0x59, 0x50, 0xd9, 0x33, 0xa5, 0x59, 0x3a, 0xe9, 0x08, 0xfb, + 0xb0, 0x67, 0x74, 0x19, 0xd2, 0x42, 0x6d, 0x82, 0xa9, 0x15, 0x23, 0xb4, 0x0a, 0x29, 0xcb, 0x36, + 0x87, 0x98, 0x6d, 0x5d, 0x56, 0xe5, 0x03, 0x45, 0x85, 0x52, 0x38, 0xf6, 0xa3, 0x12, 0xc4, 0xc9, + 0x48, 0xcc, 0x12, 0x27, 0x23, 0xf4, 0x22, 0x24, 0xa9, 0x21, 0xd9, 0x1c, 0xa5, 0x29, 0xd9, 0x4e, + 0xc8, 0x35, 0xcf, 0x2d, 0xac, 0x32, 0x4e, 0x65, 0x09, 0x8a, 0xa1, 0x9c, 0xa0, 0x5c, 0x86, 0xd5, + 0x69, 0x21, 0x5e, 0xe9, 0x78, 0xf4, 0x50, 0xa8, 0x46, 0xb7, 0x20, 0xeb, 0xc5, 0x78, 0xee, 0x38, + 0x57, 0x27, 0xa6, 0x75, 0x99, 0x55, 0x8f, 0x95, 0x7a, 0x0c, 0xdd, 0x80, 0x8e, 0x2e, 0x32, 0x7a, + 0x41, 0xcd, 0xe8, 0x96, 0xd5, 0xd0, 0x9d, 0x8e, 0xf2, 0x2e, 0x94, 0xa3, 0xe2, 0x77, 0xc0, 0x60, + 0x12, 0x73, 0x7b, 0xd7, 0x60, 0x97, 0x21, 0x7d, 0x6a, 0xda, 0x3d, 0x9d, 0x30, 0x65, 0x45, 0x55, + 0x8c, 0xa8, 0x21, 0x79, 0x2c, 0x4f, 0x30, 0x32, 0x1f, 0x28, 0x1a, 0x5c, 0x8d, 0x8c, 0xe1, 0x54, + 0xc4, 0xe8, 0xb7, 0x31, 0x37, 0x6b, 0x51, 0xe5, 0x03, 0x5f, 0x11, 0xff, 0x58, 0x3e, 0xa0, 0xd3, + 0x3a, 0x6c, 0xad, 0x4c, 0x7f, 0x4e, 0x15, 0x23, 0xe5, 0xd3, 0x04, 0x5c, 0x9e, 0x1e, 0xc9, 0xd1, + 0x06, 0x14, 0x7a, 0xfa, 0x48, 0x23, 0x23, 0xe1, 0x76, 0x12, 0xdb, 0x78, 0xe8, 0xe9, 0xa3, 0xe6, + 0x88, 0xfb, 0x9c, 0x0c, 0x09, 0x32, 0x72, 0xca, 0xf1, 0x8d, 0xc4, 0xf5, 0x82, 0x4a, 0x1f, 0xd1, + 0x31, 0x2c, 0x77, 0xcd, 0x96, 0xde, 0xd5, 0xba, 0xba, 0x43, 0x34, 0x91, 0xe2, 0xf9, 0x21, 0x7a, + 0x72, 0xc2, 0xd8, 0x3c, 0x26, 0xe3, 0x36, 0xdf, 0x4f, 0x1a, 0x70, 0x84, 0xff, 0x2f, 0x31, 0x1d, + 0xf7, 0x75, 0x77, 0xab, 0xd1, 0x1d, 0xc8, 0xf7, 0x0c, 0xe7, 0x04, 0x77, 0xf4, 0xa1, 0x61, 0xda, + 0xe2, 0x34, 0x4d, 0x3a, 0xcd, 0x1b, 0x3e, 0x8f, 0xd0, 0x14, 0x14, 0x0b, 0x6c, 0x49, 0x2a, 0xe4, + 0xc3, 0x6e, 0x34, 0x49, 0x2f, 0x1c, 0x4d, 0x5e, 0x84, 0xd5, 0x3e, 0x1e, 0x11, 0xcd, 0x3f, 0xaf, + 0xdc, 0x4f, 0x32, 0xcc, 0xf4, 0x88, 0xbe, 0xf3, 0x4e, 0xb8, 0x43, 0x5d, 0x06, 0x3d, 0xcb, 0x72, + 0xa1, 0x65, 0x3a, 0xd8, 0xd6, 0xf4, 0x76, 0xdb, 0xc6, 0x8e, 0xc3, 0xca, 0xa7, 0x02, 0x4b, 0x70, + 0x8c, 0x5e, 0xe5, 0x64, 0xe5, 0xe7, 0xc1, 0xad, 0x09, 0xe7, 0x3e, 0x61, 0x78, 0xc9, 0x37, 0xfc, + 0x11, 0xac, 0x0a, 0xf9, 0x76, 0xc8, 0xf6, 0xbc, 0x06, 0x7d, 0x6c, 0xf2, 0x7c, 0x8d, 0xdb, 0x1c, + 0xb9, 0xe2, 0xd1, 0x66, 0x4f, 0x3c, 0x9a, 0xd9, 0x11, 0x24, 0x99, 0x51, 0x92, 0x3c, 0xc4, 0xd0, + 0xe7, 0x7f, 0xb7, 0xad, 0xf8, 0x28, 0x01, 0xcb, 0x13, 0x85, 0x84, 0xb7, 0x30, 0x69, 0xea, 0xc2, + 0xe2, 0x53, 0x17, 0x96, 0x58, 0x78, 0x61, 0x62, 0xaf, 0x93, 0xb3, 0xf7, 0x3a, 0xf5, 0x1d, 0xee, + 0x75, 0xfa, 0xd1, 0xf6, 0xfa, 0x5f, 0xba, 0x0b, 0xbf, 0x92, 0xa0, 0x12, 0x5d, 0x7d, 0x4d, 0xdd, + 0x8e, 0xe7, 0x60, 0xd9, 0xfb, 0x14, 0x4f, 0x3d, 0x0f, 0x8c, 0xb2, 0xf7, 0x42, 0xe8, 0x8f, 0xcc, + 0x71, 0x4f, 0x41, 0x69, 0xac, 0x36, 0xe4, 0xae, 0x5c, 0x1c, 0x06, 0xe7, 0x57, 0x7e, 0x9a, 0xf0, + 0x12, 0x4f, 0xa8, 0x80, 0x9b, 0x72, 0x5a, 0xdf, 0x84, 0x95, 0x36, 0x6e, 0x19, 0xed, 0x47, 0x3d, + 0xac, 0xcb, 0x42, 0xfa, 0xbf, 0x67, 0x75, 0xd2, 0x4b, 0x7e, 0x09, 0x90, 0x55, 0xb1, 0x63, 0xd1, + 0x7a, 0x0c, 0xed, 0x40, 0x0e, 0x8f, 0x5a, 0xd8, 0x22, 0x6e, 0x09, 0x3b, 0xbd, 0x45, 0xe0, 0xdc, + 0x75, 0x97, 0x93, 0x36, 0xc8, 0x9e, 0x18, 0xba, 0x29, 0x30, 0x80, 0xe8, 0x76, 0x5e, 0x88, 0x07, + 0x41, 0x80, 0x97, 0x5c, 0x10, 0x20, 0x11, 0xd9, 0xdf, 0x72, 0xa9, 0x31, 0x14, 0xe0, 0xa6, 0x40, + 0x01, 0x92, 0x33, 0x26, 0x0b, 0xc1, 0x00, 0xb5, 0x10, 0x0c, 0x90, 0x9e, 0xb1, 0xcc, 0x08, 0x1c, + 0xe0, 0x25, 0x17, 0x07, 0xc8, 0xcc, 0xf8, 0xe2, 0x31, 0x20, 0xe0, 0xf5, 0x00, 0x10, 0x90, 0x63, + 0xa2, 0x1b, 0x91, 0xa2, 0x53, 0x90, 0x80, 0x57, 0x3d, 0x24, 0xa0, 0x10, 0x89, 0x22, 0x08, 0xe1, + 0x71, 0x28, 0xe0, 0x60, 0x02, 0x0a, 0xe0, 0xad, 0xfb, 0xd3, 0x91, 0x2a, 0x66, 0x60, 0x01, 0x07, + 0x13, 0x58, 0x40, 0x69, 0x86, 0xc2, 0x19, 0x60, 0xc0, 0x0f, 0xa7, 0x83, 0x01, 0xd1, 0xed, 0xba, + 0xf8, 0xcc, 0xf9, 0xd0, 0x00, 0x2d, 0x02, 0x0d, 0x90, 0x23, 0x3b, 0x57, 0xae, 0x7e, 0x6e, 0x38, + 0xe0, 0x78, 0x0a, 0x1c, 0xc0, 0x1b, 0xf7, 0xeb, 0x91, 0xca, 0xe7, 0xc0, 0x03, 0x8e, 0xa7, 0xe0, + 0x01, 0x68, 0xa6, 0xda, 0x99, 0x80, 0xc0, 0xdd, 0x30, 0x20, 0xb0, 0x12, 0x51, 0x75, 0xfa, 0xa7, + 0x3d, 0x02, 0x11, 0x38, 0x89, 0x42, 0x04, 0x78, 0xd7, 0xfe, 0x7c, 0xa4, 0xc6, 0x05, 0x20, 0x81, + 0x83, 0x09, 0x48, 0xe0, 0xd2, 0x0c, 0x4f, 0x9b, 0x1f, 0x13, 0x48, 0xc9, 0xe9, 0xbd, 0x64, 0x36, + 0x2b, 0xe7, 0x38, 0x1a, 0xb0, 0x97, 0xcc, 0xe6, 0xe5, 0x82, 0xf2, 0x2c, 0xad, 0x60, 0xc6, 0xe2, + 0x1c, 0xed, 0x15, 0xb0, 0x6d, 0x9b, 0xb6, 0xe8, 0xee, 0xf9, 0x40, 0xb9, 0x4e, 0x7b, 0x44, 0x3f, + 0xa6, 0x5d, 0x80, 0x1f, 0xb0, 0x9e, 0x2c, 0x10, 0xc7, 0x94, 0xdf, 0x49, 0xbe, 0x2c, 0x43, 0x10, + 0x82, 0xfd, 0x65, 0x4e, 0xf4, 0x97, 0x01, 0x54, 0x21, 0x1e, 0x46, 0x15, 0xd6, 0x21, 0x4f, 0x7b, + 0xad, 0x31, 0xc0, 0x40, 0xb7, 0x3c, 0xc0, 0xe0, 0x06, 0x2c, 0xb3, 0x84, 0xc9, 0xb1, 0x07, 0x91, + 0x96, 0x92, 0x2c, 0x2d, 0x2d, 0xd1, 0x17, 0xdc, 0x3a, 0x3c, 0x3f, 0xbd, 0x00, 0x2b, 0x01, 0x5e, + 0xaf, 0x87, 0xe3, 0xdd, 0xb3, 0xec, 0x71, 0x57, 0x45, 0x33, 0xf7, 0x27, 0xc9, 0xb7, 0x90, 0x8f, + 0x34, 0x4c, 0x03, 0x05, 0xa4, 0xef, 0x08, 0x14, 0x88, 0x3f, 0x32, 0x28, 0x10, 0xec, 0x49, 0x13, + 0xe1, 0x9e, 0xf4, 0x1f, 0x92, 0xbf, 0x27, 0x5e, 0x8b, 0xdf, 0x32, 0xdb, 0x58, 0x74, 0x89, 0xec, + 0x99, 0x96, 0x24, 0x5d, 0xf3, 0x4c, 0xf4, 0x82, 0xf4, 0x91, 0x72, 0x79, 0x89, 0x27, 0x27, 0xf2, + 0x8a, 0xd7, 0x60, 0xf2, 0xc4, 0x2f, 0x1a, 0x4c, 0x19, 0x12, 0x0f, 0x31, 0x87, 0x8b, 0x0b, 0x2a, + 0x7d, 0xa4, 0x7c, 0xcc, 0xf9, 0x44, 0x02, 0xe7, 0x03, 0xf4, 0x0a, 0xe4, 0x18, 0xd8, 0xaf, 0x99, + 0x96, 0x23, 0x20, 0xe2, 0x50, 0x69, 0xc3, 0x11, 0xff, 0xcd, 0x43, 0xca, 0x73, 0x60, 0x39, 0x6a, + 0xd6, 0x12, 0x4f, 0x81, 0x8a, 0x23, 0x17, 0xaa, 0x38, 0xae, 0x41, 0x8e, 0x7e, 0xbd, 0x63, 0xe9, + 0x2d, 0x5c, 0x06, 0xf6, 0xa1, 0x3e, 0x41, 0xf9, 0x6d, 0x1c, 0x96, 0xc6, 0x12, 0xcd, 0xd4, 0xb5, + 0xbb, 0x2e, 0x19, 0x0f, 0x40, 0x1e, 0xf3, 0xd9, 0x63, 0x0d, 0xe0, 0x4c, 0x77, 0xb4, 0x0f, 0xf4, + 0x3e, 0xc1, 0x6d, 0x61, 0x94, 0x00, 0x05, 0x55, 0x20, 0x4b, 0x47, 0x03, 0x07, 0xb7, 0x05, 0xfa, + 0xe2, 0x8d, 0x51, 0x03, 0xd2, 0x78, 0x88, 0xfb, 0xc4, 0x29, 0x67, 0xd8, 0xb6, 0x5f, 0x9e, 0x6c, + 0x87, 0xe9, 0xeb, 0x9d, 0x32, 0xdd, 0xec, 0x6f, 0xbe, 0x5c, 0x97, 0x39, 0xf7, 0xf3, 0x66, 0xcf, + 0x20, 0xb8, 0x67, 0x91, 0x73, 0x55, 0xc8, 0x87, 0xad, 0x90, 0x1d, 0xb3, 0x02, 0xc3, 0x01, 0x0b, + 0x6e, 0x7b, 0x4f, 0x6d, 0x6a, 0x98, 0xb6, 0x41, 0xce, 0xd5, 0x62, 0x0f, 0xf7, 0x2c, 0xd3, 0xec, + 0x6a, 0xfc, 0x8c, 0x57, 0xa1, 0x14, 0xce, 0xab, 0xe8, 0x49, 0x28, 0xda, 0x98, 0xe8, 0x46, 0x5f, + 0x0b, 0x15, 0xc1, 0x05, 0x4e, 0xe4, 0x67, 0x6a, 0x2f, 0x99, 0x95, 0xe4, 0xf8, 0x5e, 0x32, 0x1b, + 0x97, 0x13, 0xca, 0x21, 0x5c, 0x9a, 0x9a, 0x57, 0xd1, 0xcb, 0x90, 0xf3, 0x53, 0xb2, 0xc4, 0x56, + 0x7b, 0x01, 0xd2, 0xe2, 0xf3, 0x2a, 0x7f, 0x90, 0x7c, 0x95, 0x61, 0xec, 0xa6, 0x0e, 0x69, 0x1b, + 0x3b, 0x83, 0x2e, 0x47, 0x53, 0x4a, 0xdb, 0x2f, 0xcc, 0x97, 0x91, 0x29, 0x75, 0xd0, 0x25, 0xaa, + 0x10, 0x56, 0xde, 0x81, 0x34, 0xa7, 0xa0, 0x3c, 0x64, 0x8e, 0xf7, 0xef, 0xed, 0x1f, 0xbc, 0xb5, + 0x2f, 0xc7, 0x10, 0x40, 0xba, 0x5a, 0xab, 0xd5, 0x0f, 0x9b, 0xb2, 0x84, 0x72, 0x90, 0xaa, 0xee, + 0x1c, 0xa8, 0x4d, 0x39, 0x4e, 0xc9, 0x6a, 0x7d, 0xaf, 0x5e, 0x6b, 0xca, 0x09, 0xb4, 0x0c, 0x45, + 0xfe, 0xac, 0xdd, 0x3d, 0x50, 0xdf, 0xa8, 0x36, 0xe5, 0x64, 0x80, 0x74, 0x54, 0xdf, 0xbf, 0x53, + 0x57, 0xe5, 0x94, 0xf2, 0x3f, 0x70, 0x35, 0x32, 0x87, 0xfb, 0xc0, 0x8c, 0x14, 0x00, 0x66, 0x94, + 0x4f, 0xe3, 0xb4, 0xa9, 0x89, 0x4a, 0xcc, 0x68, 0x6f, 0x6c, 0xe1, 0xdb, 0x0b, 0x64, 0xf5, 0xb1, + 0xd5, 0xd3, 0x3e, 0xc6, 0xc6, 0xa7, 0x98, 0xb4, 0x3a, 0xbc, 0x50, 0xe0, 0x11, 0xa8, 0xa8, 0x16, + 0x05, 0x95, 0x09, 0x39, 0x9c, 0xed, 0x3d, 0xdc, 0x22, 0x1a, 0x77, 0x22, 0x87, 0x35, 0x13, 0x39, + 0xca, 0x46, 0xa9, 0x47, 0x9c, 0xa8, 0xbc, 0xbb, 0x90, 0x2d, 0x73, 0x90, 0x52, 0xeb, 0x4d, 0xf5, + 0x6d, 0x39, 0x81, 0x10, 0x94, 0xd8, 0xa3, 0x76, 0xb4, 0x5f, 0x3d, 0x3c, 0x6a, 0x1c, 0x50, 0x5b, + 0xae, 0xc0, 0x92, 0x6b, 0x4b, 0x97, 0x98, 0x52, 0x9e, 0x83, 0x2b, 0x11, 0x55, 0xc5, 0x64, 0x4b, + 0xa5, 0xfc, 0x5a, 0x0a, 0x72, 0x87, 0x2b, 0x83, 0x03, 0x48, 0x3b, 0x44, 0x27, 0x03, 0x47, 0x18, + 0xf1, 0xe5, 0x79, 0xcb, 0x8c, 0x4d, 0xf7, 0xe1, 0x88, 0x89, 0xab, 0x42, 0x8d, 0x72, 0x0b, 0x4a, + 0xe1, 0x37, 0xd1, 0x36, 0xf0, 0x9d, 0x28, 0xae, 0xdc, 0x06, 0x34, 0x59, 0x7d, 0x4c, 0x69, 0x2f, + 0xa5, 0x69, 0xed, 0xe5, 0x6f, 0x24, 0x78, 0xec, 0x82, 0x4a, 0x03, 0xbd, 0x39, 0xb6, 0xc8, 0x57, + 0x17, 0xa9, 0x53, 0x36, 0x39, 0x6d, 0x6c, 0x99, 0x37, 0xa1, 0x10, 0xa4, 0xcf, 0xb7, 0xc8, 0x6f, + 0xe2, 0xfe, 0x21, 0x0e, 0xf7, 0xc1, 0x7e, 0x08, 0x94, 0xbe, 0x65, 0x08, 0x7c, 0x0d, 0x80, 0x8c, + 0x34, 0xee, 0xd6, 0x6e, 0x1e, 0x7d, 0x7c, 0x0a, 0xbe, 0x88, 0x5b, 0xcd, 0x91, 0x38, 0x04, 0x39, + 0x22, 0x9e, 0x1c, 0x74, 0x14, 0x04, 0x05, 0x06, 0x2c, 0xc7, 0x3a, 0xa2, 0x61, 0x9e, 0x37, 0x19, + 0xfb, 0xe0, 0x01, 0x27, 0x3b, 0xe8, 0x6d, 0xb8, 0x32, 0x56, 0x28, 0x78, 0xaa, 0x93, 0xf3, 0xd6, + 0x0b, 0x97, 0xc2, 0xf5, 0x82, 0xab, 0x3a, 0x98, 0xed, 0x53, 0xe1, 0x6c, 0xff, 0x36, 0x80, 0x0f, + 0x0e, 0xd0, 0x08, 0x63, 0x9b, 0x83, 0x7e, 0x9b, 0x79, 0x40, 0x4a, 0xe5, 0x03, 0x74, 0x0b, 0x52, + 0xd4, 0x93, 0x5c, 0x3b, 0x4d, 0x86, 0x62, 0xea, 0x09, 0x01, 0x70, 0x81, 0x73, 0x2b, 0x06, 0xa0, + 0x49, 0x80, 0x36, 0x62, 0x8a, 0xd7, 0xc3, 0x53, 0x3c, 0x11, 0x09, 0xf5, 0x4e, 0x9f, 0xea, 0x43, + 0x48, 0xb1, 0x9d, 0xa7, 0x49, 0x97, 0xfd, 0x15, 0x10, 0xd5, 0x22, 0x7d, 0x46, 0x3f, 0x02, 0xd0, + 0x09, 0xb1, 0x8d, 0x93, 0x81, 0x3f, 0xc1, 0xfa, 0x74, 0xcf, 0xa9, 0xba, 0x7c, 0x3b, 0xd7, 0x84, + 0x0b, 0xad, 0xfa, 0xa2, 0x01, 0x37, 0x0a, 0x28, 0x54, 0xf6, 0xa1, 0x14, 0x96, 0x75, 0xeb, 0x1b, + 0xfe, 0x0d, 0xe1, 0xfa, 0x86, 0x97, 0xab, 0xa2, 0xbe, 0xf1, 0xaa, 0xa3, 0x04, 0xff, 0xf5, 0xc1, + 0x06, 0xca, 0xef, 0xe3, 0x50, 0x08, 0x3a, 0xde, 0x7f, 0x5e, 0x09, 0x82, 0xfe, 0x0f, 0xf2, 0x78, + 0xd8, 0xd3, 0xc8, 0x48, 0x63, 0x9f, 0x9f, 0x13, 0xf8, 0xd0, 0xe4, 0x64, 0xbd, 0xe6, 0x88, 0x3a, + 0x83, 0x9a, 0xc3, 0xee, 0xa3, 0xf2, 0x33, 0x09, 0xb2, 0x9e, 0xe9, 0xc2, 0xff, 0x50, 0x42, 0x3f, + 0x9d, 0xb8, 0xe5, 0xe3, 0xc1, 0x1f, 0x1f, 0xfc, 0x17, 0x53, 0xc2, 0xfb, 0xc5, 0x74, 0xdb, 0x4b, + 0x9d, 0x51, 0x60, 0x4a, 0x70, 0x9f, 0x84, 0x47, 0xba, 0x95, 0xc2, 0x6d, 0xc8, 0x79, 0x27, 0x9f, + 0x36, 0x2c, 0x2e, 0xe8, 0x24, 0x89, 0xf3, 0x27, 0x20, 0xc3, 0x55, 0x48, 0x59, 0xe6, 0x07, 0xe2, + 0xaf, 0x4a, 0x42, 0xe5, 0x03, 0xa5, 0x0d, 0x4b, 0x63, 0x61, 0x03, 0xdd, 0x86, 0x8c, 0x35, 0x38, + 0xd1, 0x5c, 0xc7, 0x1a, 0x83, 0xe6, 0xdc, 0x52, 0x78, 0x70, 0xd2, 0x35, 0x5a, 0xf7, 0xf0, 0xb9, + 0xfb, 0x31, 0xd6, 0xe0, 0xe4, 0x1e, 0xf7, 0x3f, 0x3e, 0x4b, 0x3c, 0x38, 0xcb, 0x2f, 0x24, 0xc8, + 0xba, 0xe7, 0x09, 0xfd, 0x3f, 0xe4, 0xbc, 0x90, 0xe4, 0xfd, 0x16, 0x8d, 0x8c, 0x65, 0x42, 0xbf, + 0x2f, 0x82, 0xaa, 0xee, 0xff, 0x5c, 0xa3, 0xad, 0x9d, 0x76, 0x75, 0xee, 0x87, 0xa5, 0xb0, 0xcd, + 0x78, 0xd0, 0x62, 0xb1, 0x7c, 0xf7, 0xce, 0xdd, 0xae, 0x7e, 0xa6, 0xe6, 0x99, 0xcc, 0x6e, 0x9b, + 0x0e, 0x44, 0x55, 0xf8, 0x77, 0x09, 0xe4, 0xf1, 0xd3, 0xfe, 0xad, 0xbf, 0x6e, 0x32, 0x45, 0x26, + 0xa6, 0xa4, 0x48, 0xb4, 0x05, 0x2b, 0x1e, 0x87, 0xe6, 0x18, 0x67, 0x7d, 0x9d, 0x0c, 0x6c, 0x2c, + 0xc0, 0x4c, 0xe4, 0xbd, 0x3a, 0x72, 0xdf, 0x4c, 0xae, 0x3a, 0xf5, 0x88, 0xab, 0xfe, 0x28, 0x0e, + 0xf9, 0x00, 0xb4, 0x8a, 0xfe, 0x37, 0x10, 0xc8, 0x4a, 0x53, 0xb2, 0x4a, 0x80, 0xd7, 0xff, 0xc5, + 0x19, 0x36, 0x53, 0x7c, 0x71, 0x33, 0x45, 0x01, 0xd8, 0x2e, 0x52, 0x9b, 0x5c, 0x18, 0xa9, 0x7d, + 0x1e, 0x10, 0x31, 0x89, 0xde, 0xd5, 0x86, 0x26, 0x31, 0xfa, 0x67, 0x1a, 0x77, 0x43, 0x1e, 0x76, + 0x64, 0xf6, 0xe6, 0x01, 0x7b, 0x71, 0xc8, 0x3c, 0xf2, 0x27, 0x12, 0x64, 0xbd, 0x92, 0x7d, 0xd1, + 0x1f, 0xa0, 0x97, 0x21, 0x2d, 0xaa, 0x52, 0xfe, 0x07, 0x54, 0x8c, 0xa6, 0x42, 0xd2, 0x15, 0xc8, + 0xf6, 0x30, 0xd1, 0x59, 0x0c, 0xe5, 0x19, 0xd1, 0x1b, 0x2b, 0x3f, 0x86, 0x9c, 0x17, 0x59, 0xa8, + 0xe3, 0xf0, 0x22, 0x56, 0x0b, 0x1e, 0xe0, 0x9c, 0x5a, 0xe4, 0xd4, 0xaa, 0x7f, 0x8c, 0xfb, 0x66, + 0xbf, 0x85, 0xc5, 0x2d, 0x06, 0x3e, 0x40, 0x57, 0x20, 0x43, 0x46, 0x7e, 0x93, 0x9d, 0x53, 0xd3, + 0x64, 0xc4, 0xd0, 0xe8, 0xab, 0x90, 0x1d, 0xf6, 0x78, 0x23, 0x25, 0x82, 0x73, 0x66, 0xd8, 0xab, + 0xd3, 0xe1, 0x8d, 0x57, 0x21, 0x1f, 0xf8, 0x75, 0x4d, 0x83, 0xfa, 0x7e, 0xfd, 0x2d, 0x39, 0x56, + 0xc9, 0x7c, 0xfc, 0xd9, 0x46, 0x62, 0x1f, 0x7f, 0x40, 0x63, 0x89, 0x5a, 0xaf, 0x35, 0xea, 0xb5, + 0x7b, 0xb2, 0x54, 0xc9, 0x7f, 0xfc, 0xd9, 0x46, 0x46, 0xc5, 0x0c, 0x0b, 0xbd, 0x71, 0x0f, 0x96, + 0xc6, 0xdc, 0x22, 0x5c, 0x70, 0x21, 0x28, 0xdd, 0x39, 0x3e, 0xbc, 0xbf, 0x5b, 0xab, 0x36, 0xeb, + 0xda, 0x83, 0x83, 0x66, 0x5d, 0x96, 0xd0, 0x15, 0x58, 0xb9, 0xbf, 0xfb, 0xbd, 0x46, 0x53, 0xab, + 0xdd, 0xdf, 0xad, 0xef, 0x37, 0xb5, 0x6a, 0xb3, 0x59, 0xad, 0xdd, 0x93, 0xe3, 0xdb, 0x9f, 0xe5, + 0x21, 0x59, 0xdd, 0xa9, 0xed, 0xa2, 0x1a, 0x24, 0x19, 0x88, 0x73, 0xe1, 0xdd, 0xb5, 0xca, 0xc5, + 0xa8, 0x36, 0xba, 0x0b, 0x29, 0x86, 0xef, 0xa0, 0x8b, 0x2f, 0xb3, 0x55, 0x66, 0xc0, 0xdc, 0xf4, + 0x63, 0xd8, 0xb6, 0x5c, 0x78, 0xbb, 0xad, 0x72, 0x31, 0xea, 0x8d, 0xee, 0x43, 0xc6, 0x6d, 0xef, + 0x67, 0x5d, 0x39, 0xab, 0xcc, 0x84, 0xa2, 0xe9, 0xd2, 0x38, 0x4c, 0x72, 0xf1, 0xc5, 0xb7, 0xca, + 0x0c, 0x3c, 0x1c, 0xed, 0x42, 0x5a, 0x34, 0xd2, 0x33, 0xee, 0xb2, 0x55, 0x66, 0x21, 0xdc, 0x48, + 0x85, 0x9c, 0x0f, 0x40, 0xcd, 0xbe, 0xce, 0x57, 0x99, 0x03, 0xea, 0x47, 0xef, 0x40, 0x31, 0xdc, + 0xa4, 0xcf, 0x77, 0x5f, 0xae, 0x32, 0x27, 0x96, 0x4e, 0xf5, 0x87, 0x3b, 0xf6, 0xf9, 0xee, 0xcf, + 0x55, 0xe6, 0x84, 0xd6, 0xd1, 0x7b, 0xb0, 0x3c, 0xd9, 0x51, 0xcf, 0x7f, 0x9d, 0xae, 0xb2, 0x00, + 0xd8, 0x8e, 0x7a, 0x80, 0xa6, 0x74, 0xe2, 0x0b, 0xdc, 0xae, 0xab, 0x2c, 0x82, 0xbd, 0xa3, 0x36, + 0x2c, 0x8d, 0xb7, 0xb7, 0xf3, 0xde, 0xb6, 0xab, 0xcc, 0x8d, 0xc3, 0xf3, 0x59, 0xc2, 0x6d, 0xf1, + 0xbc, 0xb7, 0xef, 0x2a, 0x73, 0xc3, 0xf2, 0xe8, 0x18, 0x20, 0xd0, 0xd9, 0xce, 0x71, 0x1b, 0xaf, + 0x32, 0x0f, 0x40, 0x8f, 0x2c, 0x58, 0x99, 0xd6, 0xf2, 0x2e, 0x72, 0x39, 0xaf, 0xb2, 0x10, 0x6e, + 0x4f, 0xfd, 0x39, 0xdc, 0xbc, 0xce, 0x77, 0x59, 0xaf, 0x32, 0x27, 0x80, 0xbf, 0x53, 0xfd, 0xfc, + 0xab, 0x35, 0xe9, 0x8b, 0xaf, 0xd6, 0xa4, 0xbf, 0x7d, 0xb5, 0x26, 0x7d, 0xf2, 0xf5, 0x5a, 0xec, + 0x8b, 0xaf, 0xd7, 0x62, 0x7f, 0xf9, 0x7a, 0x2d, 0xf6, 0xfd, 0x67, 0xce, 0x0c, 0xd2, 0x19, 0x9c, + 0x6c, 0xb6, 0xcc, 0xde, 0x56, 0xcb, 0xec, 0x61, 0x72, 0x72, 0x4a, 0xfc, 0x07, 0xff, 0xce, 0xf5, + 0x49, 0x9a, 0xe5, 0xef, 0x9b, 0xff, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x65, 0x23, 0xd6, 0xe6, 0x93, + 0x2d, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -5028,7 +5111,7 @@ func (m *RequestInitChain) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - n18, err18 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time):]) + n18, err18 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) if err18 != nil { return 0, err18 } @@ -5328,7 +5411,7 @@ func (m *RequestPrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) i-- dAtA[i] = 0x3a } - n20, err20 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time):]) + n20, err20 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) if err20 != nil { return 0, err20 } @@ -5416,7 +5499,7 @@ func (m *RequestProcessProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) i-- dAtA[i] = 0x3a } - n22, err22 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time):]) + n22, err22 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) if err22 != nil { return 0, err22 } @@ -5539,7 +5622,7 @@ func (m *RequestExtendVote) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x22 } } - n25, err25 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time):]) + n25, err25 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) if err25 != nil { return 0, err25 } @@ -5645,7 +5728,7 @@ func (m *RequestFinalizeBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x3a } - n26, err26 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time):]) + n26, err26 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) if err26 != nil { return 0, err26 } @@ -7035,6 +7118,18 @@ func (m *ExecTxResult) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.EvmTxInfo != nil { + { + size, err := m.EvmTxInfo.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x4a + } if len(m.Codespace) > 0 { i -= len(m.Codespace) copy(dAtA[i:], m.Codespace) @@ -7333,12 +7428,12 @@ func (m *Misbehavior) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x28 } - n54, err54 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time):]) - if err54 != nil { - return 0, err54 + n55, err55 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) + if err55 != nil { + return 0, err55 } - i -= n54 - i = encodeVarintTypes(dAtA, i, uint64(n54)) + i -= n55 + i = encodeVarintTypes(dAtA, i, uint64(n55)) i-- dAtA[i] = 0x22 if m.Height != 0 { @@ -7416,6 +7511,55 @@ func (m *Snapshot) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *EvmTxInfo) 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 *EvmTxInfo) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *EvmTxInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.VmError) > 0 { + i -= len(m.VmError) + copy(dAtA[i:], m.VmError) + i = encodeVarintTypes(dAtA, i, uint64(len(m.VmError))) + i-- + dAtA[i] = 0x22 + } + if len(m.TxHash) > 0 { + i -= len(m.TxHash) + copy(dAtA[i:], m.TxHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.TxHash))) + i-- + dAtA[i] = 0x1a + } + if m.Nonce != 0 { + i = encodeVarintTypes(dAtA, i, uint64(m.Nonce)) + i-- + dAtA[i] = 0x10 + } + if len(m.SenderAddress) > 0 { + i -= len(m.SenderAddress) + copy(dAtA[i:], m.SenderAddress) + i = encodeVarintTypes(dAtA, i, uint64(len(m.SenderAddress))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func encodeVarintTypes(dAtA []byte, offset int, v uint64) int { offset -= sovTypes(v) base := offset @@ -7682,7 +7826,7 @@ func (m *RequestInitChain) Size() (n int) { } var l int _ = l - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Time) n += 1 + l + sovTypes(uint64(l)) l = len(m.ChainId) if l > 0 { @@ -7846,7 +7990,7 @@ func (m *RequestPrepareProposal) Size() (n int) { if m.Height != 0 { n += 1 + sovTypes(uint64(m.Height)) } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Time) n += 1 + l + sovTypes(uint64(l)) l = len(m.NextValidatorsHash) if l > 0 { @@ -7886,7 +8030,7 @@ func (m *RequestProcessProposal) Size() (n int) { if m.Height != 0 { n += 1 + sovTypes(uint64(m.Height)) } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Time) n += 1 + l + sovTypes(uint64(l)) l = len(m.NextValidatorsHash) if l > 0 { @@ -7912,7 +8056,7 @@ func (m *RequestExtendVote) Size() (n int) { if m.Height != 0 { n += 1 + sovTypes(uint64(m.Height)) } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Time) n += 1 + l + sovTypes(uint64(l)) if len(m.Txs) > 0 { for _, b := range m.Txs { @@ -7990,7 +8134,7 @@ func (m *RequestFinalizeBlock) Size() (n int) { if m.Height != 0 { n += 1 + sovTypes(uint64(m.Height)) } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Time) n += 1 + l + sovTypes(uint64(l)) l = len(m.NextValidatorsHash) if l > 0 { @@ -8662,6 +8806,10 @@ func (m *ExecTxResult) Size() (n int) { if l > 0 { n += 1 + l + sovTypes(uint64(l)) } + if m.EvmTxInfo != nil { + l = m.EvmTxInfo.Size() + n += 1 + l + sovTypes(uint64(l)) + } return n } @@ -8766,7 +8914,7 @@ func (m *Misbehavior) Size() (n int) { if m.Height != 0 { n += 1 + sovTypes(uint64(m.Height)) } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Time) n += 1 + l + sovTypes(uint64(l)) if m.TotalVotingPower != 0 { n += 1 + sovTypes(uint64(m.TotalVotingPower)) @@ -8800,6 +8948,30 @@ func (m *Snapshot) Size() (n int) { return n } +func (m *EvmTxInfo) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.SenderAddress) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + if m.Nonce != 0 { + n += 1 + sovTypes(uint64(m.Nonce)) + } + l = len(m.TxHash) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.VmError) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + return n +} + func sovTypes(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -9758,7 +9930,7 @@ func (m *RequestInitChain) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -10853,7 +11025,7 @@ func (m *RequestPrepareProposal) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -11156,7 +11328,7 @@ func (m *RequestProcessProposal) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -11360,7 +11532,7 @@ func (m *RequestExtendVote) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -11933,7 +12105,7 @@ func (m *RequestFinalizeBlock) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -15518,6 +15690,42 @@ func (m *ExecTxResult) Unmarshal(dAtA []byte) error { } m.Codespace = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 9: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field EvmTxInfo", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.EvmTxInfo == nil { + m.EvmTxInfo = &EvmTxInfo{} + } + if err := m.EvmTxInfo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) @@ -16300,7 +16508,7 @@ func (m *Misbehavior) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -16519,6 +16727,171 @@ func (m *Snapshot) Unmarshal(dAtA []byte) error { } return nil } +func (m *EvmTxInfo) 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 ErrIntOverflowTypes + } + 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: EvmTxInfo: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: EvmTxInfo: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SenderAddress", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + 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 ErrInvalidLengthTypes + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.SenderAddress = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Nonce", wireType) + } + m.Nonce = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Nonce |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TxHash", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + 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 ErrInvalidLengthTypes + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.TxHash = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field VmError", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + 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 ErrInvalidLengthTypes + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.VmError = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTypes(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTypes + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipTypes(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/go.mod b/go.mod index 1105f1b55b..57439734c8 100644 --- a/go.mod +++ b/go.mod @@ -47,6 +47,7 @@ require ( github.com/cosmos/gogoproto v1.4.11 github.com/go-git/go-git/v5 v5.11.0 github.com/gofrs/uuid v4.4.0+incompatible + github.com/gogo/protobuf v1.3.2 github.com/google/uuid v1.4.0 github.com/hashicorp/golang-lru/v2 v2.0.7 github.com/oasisprotocol/curve25519-voi v0.0.0-20220708102147-0a8a51822cae @@ -137,7 +138,6 @@ require ( github.com/gobwas/glob v0.2.3 // indirect github.com/gofrs/flock v0.8.1 // indirect github.com/gofrs/uuid/v5 v5.0.0 // indirect - github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/glog v1.1.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/snappy v0.0.4 // indirect diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto index 89bafb6cd5..e2614a96aa 100644 --- a/proto/tendermint/abci/types.proto +++ b/proto/tendermint/abci/types.proto @@ -415,6 +415,7 @@ message ExecTxResult { repeated Event events = 7 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"]; // nondeterministic string codespace = 8; + EvmTxInfo evm_tx_info = 9; } // TxResult contains results of executing the transaction. @@ -492,3 +493,14 @@ message Snapshot { bytes hash = 4; // Arbitrary snapshot hash, equal only if identical bytes metadata = 5; // Arbitrary application metadata } + + +//---------------------------------------- +// EVM Types + +message EvmTxInfo { + string sender_address = 1; + uint64 nonce = 2; + string tx_hash = 3; + string vm_error = 4; +} \ No newline at end of file diff --git a/proto/tendermint/blocksync/types.pb.go b/proto/tendermint/blocksync/types.pb.go index a979197099..15969798a8 100644 --- a/proto/tendermint/blocksync/types.pb.go +++ b/proto/tendermint/blocksync/types.pb.go @@ -6,7 +6,7 @@ package blocksync import ( fmt "fmt" types "github.com/cometbft/cometbft/proto/tendermint/types" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/proto/tendermint/consensus/types.pb.go b/proto/tendermint/consensus/types.pb.go index e23f0abdde..e492a34c89 100644 --- a/proto/tendermint/consensus/types.pb.go +++ b/proto/tendermint/consensus/types.pb.go @@ -8,7 +8,7 @@ import ( bits "github.com/cometbft/cometbft/proto/tendermint/libs/bits" types "github.com/cometbft/cometbft/proto/tendermint/types" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/proto/tendermint/consensus/wal.pb.go b/proto/tendermint/consensus/wal.pb.go index f870835ef8..62bd800cbd 100644 --- a/proto/tendermint/consensus/wal.pb.go +++ b/proto/tendermint/consensus/wal.pb.go @@ -7,9 +7,9 @@ import ( fmt "fmt" types "github.com/cometbft/cometbft/proto/tendermint/types" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" _ "github.com/cosmos/gogoproto/types" - github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + proto "github.com/gogo/protobuf/proto" + github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" _ "github.com/golang/protobuf/ptypes/duration" io "io" math "math" @@ -484,7 +484,7 @@ func (m *TimeoutInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x10 } - n2, err2 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.Duration, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.Duration):]) + n2, err2 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.Duration, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.Duration):]) if err2 != nil { return 0, err2 } @@ -671,7 +671,7 @@ func (m *TimedWALMessage) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - n8, err8 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time):]) + n8, err8 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) if err8 != nil { return 0, err8 } @@ -714,7 +714,7 @@ func (m *TimeoutInfo) Size() (n int) { } var l int _ = l - l = github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.Duration) + l = github_com_gogo_protobuf_types.SizeOfStdDuration(m.Duration) n += 1 + l + sovWal(uint64(l)) if m.Height != 0 { n += 1 + sovWal(uint64(m.Height)) @@ -806,7 +806,7 @@ func (m *TimedWALMessage) Size() (n int) { } var l int _ = l - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Time) n += 1 + l + sovWal(uint64(l)) if m.Msg != nil { l = m.Msg.Size() @@ -994,7 +994,7 @@ func (m *TimeoutInfo) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdDurationUnmarshal(&m.Duration, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(&m.Duration, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -1393,7 +1393,7 @@ func (m *TimedWALMessage) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/proto/tendermint/crypto/keys.pb.go b/proto/tendermint/crypto/keys.pb.go index 0edb2269f5..742f4ef148 100644 --- a/proto/tendermint/crypto/keys.pb.go +++ b/proto/tendermint/crypto/keys.pb.go @@ -7,7 +7,7 @@ import ( bytes "bytes" fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/proto/tendermint/crypto/proof.pb.go b/proto/tendermint/crypto/proof.pb.go index 1c2273a749..e7c1cfed89 100644 --- a/proto/tendermint/crypto/proof.pb.go +++ b/proto/tendermint/crypto/proof.pb.go @@ -6,7 +6,7 @@ package crypto import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/proto/tendermint/libs/bits/types.pb.go b/proto/tendermint/libs/bits/types.pb.go index 9dc3773363..29fe10c763 100644 --- a/proto/tendermint/libs/bits/types.pb.go +++ b/proto/tendermint/libs/bits/types.pb.go @@ -5,7 +5,7 @@ package bits import ( fmt "fmt" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/proto/tendermint/mempool/types.pb.go b/proto/tendermint/mempool/types.pb.go index 4a6a40ef34..07ca1e387f 100644 --- a/proto/tendermint/mempool/types.pb.go +++ b/proto/tendermint/mempool/types.pb.go @@ -5,7 +5,7 @@ package mempool import ( fmt "fmt" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/proto/tendermint/p2p/conn.pb.go b/proto/tendermint/p2p/conn.pb.go index 4a0f825642..243eb3eccb 100644 --- a/proto/tendermint/p2p/conn.pb.go +++ b/proto/tendermint/p2p/conn.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/proto/tendermint/p2p/pex.pb.go b/proto/tendermint/p2p/pex.pb.go index d8dcb94add..3278745356 100644 --- a/proto/tendermint/p2p/pex.pb.go +++ b/proto/tendermint/p2p/pex.pb.go @@ -6,7 +6,7 @@ package p2p import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/proto/tendermint/p2p/types.pb.go b/proto/tendermint/p2p/types.pb.go index 9de144b349..9c9402c200 100644 --- a/proto/tendermint/p2p/types.pb.go +++ b/proto/tendermint/p2p/types.pb.go @@ -6,7 +6,7 @@ package p2p import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/proto/tendermint/privval/types.pb.go b/proto/tendermint/privval/types.pb.go index cafa0e9278..f983c84901 100644 --- a/proto/tendermint/privval/types.pb.go +++ b/proto/tendermint/privval/types.pb.go @@ -8,7 +8,7 @@ import ( crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" types "github.com/cometbft/cometbft/proto/tendermint/types" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/proto/tendermint/rpc/grpc/types.pb.go b/proto/tendermint/rpc/grpc/types.pb.go index 393c739476..bc79ceeb56 100644 --- a/proto/tendermint/rpc/grpc/types.pb.go +++ b/proto/tendermint/rpc/grpc/types.pb.go @@ -8,7 +8,7 @@ import ( fmt "fmt" types "github.com/cometbft/cometbft/abci/types" grpc1 "github.com/cosmos/gogoproto/grpc" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/proto/tendermint/state/types.pb.go b/proto/tendermint/state/types.pb.go index 4426543ed9..62af1fe8e1 100644 --- a/proto/tendermint/state/types.pb.go +++ b/proto/tendermint/state/types.pb.go @@ -9,9 +9,9 @@ import ( types1 "github.com/cometbft/cometbft/proto/tendermint/types" version "github.com/cometbft/cometbft/proto/tendermint/version" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" _ "github.com/cosmos/gogoproto/types" - github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + proto "github.com/gogo/protobuf/proto" + github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" io "io" math "math" math_bits "math/bits" @@ -1082,7 +1082,7 @@ func (m *State) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x32 } - n13, err13 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.LastBlockTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.LastBlockTime):]) + n13, err13 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.LastBlockTime, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.LastBlockTime):]) if err13 != nil { return 0, err13 } @@ -1281,7 +1281,7 @@ func (m *State) Size() (n int) { } l = m.LastBlockID.Size() n += 1 + l + sovTypes(uint64(l)) - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.LastBlockTime) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.LastBlockTime) n += 1 + l + sovTypes(uint64(l)) if m.NextValidators != nil { l = m.NextValidators.Size() @@ -2355,7 +2355,7 @@ func (m *State) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.LastBlockTime, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.LastBlockTime, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/proto/tendermint/statesync/types.pb.go b/proto/tendermint/statesync/types.pb.go index 84a637f5e2..a45dffaf50 100644 --- a/proto/tendermint/statesync/types.pb.go +++ b/proto/tendermint/statesync/types.pb.go @@ -5,7 +5,7 @@ package statesync import ( fmt "fmt" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/proto/tendermint/store/types.pb.go b/proto/tendermint/store/types.pb.go index e7e553e0e2..ce29389f5a 100644 --- a/proto/tendermint/store/types.pb.go +++ b/proto/tendermint/store/types.pb.go @@ -5,7 +5,7 @@ package store import ( fmt "fmt" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/proto/tendermint/types/block.pb.go b/proto/tendermint/types/block.pb.go index 3b3e3811ff..fde7a3bc7f 100644 --- a/proto/tendermint/types/block.pb.go +++ b/proto/tendermint/types/block.pb.go @@ -6,7 +6,7 @@ package types import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/proto/tendermint/types/canonical.pb.go b/proto/tendermint/types/canonical.pb.go index 7e776e02d5..a8b1709497 100644 --- a/proto/tendermint/types/canonical.pb.go +++ b/proto/tendermint/types/canonical.pb.go @@ -7,9 +7,9 @@ import ( encoding_binary "encoding/binary" fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" _ "github.com/cosmos/gogoproto/types" - github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + proto "github.com/gogo/protobuf/proto" + github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" io "io" math "math" math_bits "math/bits" @@ -527,7 +527,7 @@ func (m *CanonicalProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x3a } - n2, err2 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp):]) + n2, err2 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) if err2 != nil { return 0, err2 } @@ -599,7 +599,7 @@ func (m *CanonicalVote) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x32 } - n4, err4 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp):]) + n4, err4 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) if err4 != nil { return 0, err4 } @@ -752,7 +752,7 @@ func (m *CanonicalProposal) Size() (n int) { l = m.BlockID.Size() n += 1 + l + sovCanonical(uint64(l)) } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp) n += 1 + l + sovCanonical(uint64(l)) l = len(m.ChainID) if l > 0 { @@ -780,7 +780,7 @@ func (m *CanonicalVote) Size() (n int) { l = m.BlockID.Size() n += 1 + l + sovCanonical(uint64(l)) } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp) n += 1 + l + sovCanonical(uint64(l)) l = len(m.ChainID) if l > 0 { @@ -1190,7 +1190,7 @@ func (m *CanonicalProposal) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -1380,7 +1380,7 @@ func (m *CanonicalVote) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/proto/tendermint/types/events.pb.go b/proto/tendermint/types/events.pb.go index 02607e6d9b..1f210e37f7 100644 --- a/proto/tendermint/types/events.pb.go +++ b/proto/tendermint/types/events.pb.go @@ -5,7 +5,7 @@ package types import ( fmt "fmt" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/proto/tendermint/types/evidence.pb.go b/proto/tendermint/types/evidence.pb.go index 1022d4daf4..8da2ebfd50 100644 --- a/proto/tendermint/types/evidence.pb.go +++ b/proto/tendermint/types/evidence.pb.go @@ -6,9 +6,9 @@ package types import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" _ "github.com/cosmos/gogoproto/types" - github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + proto "github.com/gogo/protobuf/proto" + github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" io "io" math "math" math_bits "math/bits" @@ -451,7 +451,7 @@ func (m *DuplicateVoteEvidence) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - n3, err3 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp):]) + n3, err3 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) if err3 != nil { return 0, err3 } @@ -516,7 +516,7 @@ func (m *LightClientAttackEvidence) MarshalToSizedBuffer(dAtA []byte) (int, erro _ = i var l int _ = l - n6, err6 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp):]) + n6, err6 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) if err6 != nil { return 0, err6 } @@ -667,7 +667,7 @@ func (m *DuplicateVoteEvidence) Size() (n int) { if m.ValidatorPower != 0 { n += 1 + sovEvidence(uint64(m.ValidatorPower)) } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp) n += 1 + l + sovEvidence(uint64(l)) return n } @@ -694,7 +694,7 @@ func (m *LightClientAttackEvidence) Size() (n int) { if m.TotalVotingPower != 0 { n += 1 + sovEvidence(uint64(m.TotalVotingPower)) } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp) n += 1 + l + sovEvidence(uint64(l)) return n } @@ -1008,7 +1008,7 @@ func (m *DuplicateVoteEvidence) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -1199,7 +1199,7 @@ func (m *LightClientAttackEvidence) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/proto/tendermint/types/params.pb.go b/proto/tendermint/types/params.pb.go index 3184fdd1a1..225d7afff0 100644 --- a/proto/tendermint/types/params.pb.go +++ b/proto/tendermint/types/params.pb.go @@ -6,8 +6,8 @@ package types import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" - github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + proto "github.com/gogo/protobuf/proto" + github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" _ "github.com/golang/protobuf/ptypes/duration" io "io" math "math" @@ -825,7 +825,7 @@ func (m *EvidenceParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x18 } - n6, err6 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.MaxAgeDuration, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.MaxAgeDuration):]) + n6, err6 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.MaxAgeDuration, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.MaxAgeDuration):]) if err6 != nil { return 0, err6 } @@ -1118,7 +1118,7 @@ func (m *EvidenceParams) Size() (n int) { if m.MaxAgeNumBlocks != 0 { n += 1 + sovParams(uint64(m.MaxAgeNumBlocks)) } - l = github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.MaxAgeDuration) + l = github_com_gogo_protobuf_types.SizeOfStdDuration(m.MaxAgeDuration) n += 1 + l + sovParams(uint64(l)) if m.MaxBytes != 0 { n += 1 + sovParams(uint64(m.MaxBytes)) @@ -1581,7 +1581,7 @@ func (m *EvidenceParams) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdDurationUnmarshal(&m.MaxAgeDuration, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(&m.MaxAgeDuration, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/proto/tendermint/types/types.pb.go b/proto/tendermint/types/types.pb.go index 2b2c819b4f..da8375252c 100644 --- a/proto/tendermint/types/types.pb.go +++ b/proto/tendermint/types/types.pb.go @@ -8,9 +8,9 @@ import ( crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" version "github.com/cometbft/cometbft/proto/tendermint/version" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" _ "github.com/cosmos/gogoproto/types" - github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + proto "github.com/gogo/protobuf/proto" + github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" io "io" math "math" math_bits "math/bits" @@ -1496,7 +1496,7 @@ func (m *Header) MarshalToSizedBuffer(dAtA []byte) (int, error) { } i-- dAtA[i] = 0x2a - n4, err4 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time):]) + n4, err4 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) if err4 != nil { return 0, err4 } @@ -1614,7 +1614,7 @@ func (m *Vote) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x32 } - n6, err6 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp):]) + n6, err6 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) if err6 != nil { return 0, err6 } @@ -1734,7 +1734,7 @@ func (m *CommitSig) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x22 } - n9, err9 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp):]) + n9, err9 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) if err9 != nil { return 0, err9 } @@ -1855,7 +1855,7 @@ func (m *ExtendedCommitSig) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x22 } - n11, err11 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp):]) + n11, err11 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) if err11 != nil { return 0, err11 } @@ -1905,7 +1905,7 @@ func (m *Proposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x3a } - n12, err12 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp):]) + n12, err12 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) if err12 != nil { return 0, err12 } @@ -2217,7 +2217,7 @@ func (m *Header) Size() (n int) { if m.Height != 0 { n += 1 + sovTypes(uint64(m.Height)) } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Time) n += 1 + l + sovTypes(uint64(l)) l = m.LastBlockId.Size() n += 1 + l + sovTypes(uint64(l)) @@ -2292,7 +2292,7 @@ func (m *Vote) Size() (n int) { } l = m.BlockID.Size() n += 1 + l + sovTypes(uint64(l)) - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp) n += 1 + l + sovTypes(uint64(l)) l = len(m.ValidatorAddress) if l > 0 { @@ -2352,7 +2352,7 @@ func (m *CommitSig) Size() (n int) { if l > 0 { n += 1 + l + sovTypes(uint64(l)) } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp) n += 1 + l + sovTypes(uint64(l)) l = len(m.Signature) if l > 0 { @@ -2397,7 +2397,7 @@ func (m *ExtendedCommitSig) Size() (n int) { if l > 0 { n += 1 + l + sovTypes(uint64(l)) } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp) n += 1 + l + sovTypes(uint64(l)) l = len(m.Signature) if l > 0 { @@ -2434,7 +2434,7 @@ func (m *Proposal) Size() (n int) { } l = m.BlockID.Size() n += 1 + l + sovTypes(uint64(l)) - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp) n += 1 + l + sovTypes(uint64(l)) l = len(m.Signature) if l > 0 { @@ -3021,7 +3021,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -3615,7 +3615,7 @@ func (m *Vote) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -4061,7 +4061,7 @@ func (m *CommitSig) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -4386,7 +4386,7 @@ func (m *ExtendedCommitSig) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -4680,7 +4680,7 @@ func (m *Proposal) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/proto/tendermint/types/validator.pb.go b/proto/tendermint/types/validator.pb.go index 45faec7e6e..522bcd35eb 100644 --- a/proto/tendermint/types/validator.pb.go +++ b/proto/tendermint/types/validator.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/proto/tendermint/version/types.pb.go b/proto/tendermint/version/types.pb.go index f7393bf903..561818cb32 100644 --- a/proto/tendermint/version/types.pb.go +++ b/proto/tendermint/version/types.pb.go @@ -6,7 +6,7 @@ package version import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" diff --git a/rpc/grpc/types.pb.go b/rpc/grpc/types.pb.go index 393c739476..bc79ceeb56 100644 --- a/rpc/grpc/types.pb.go +++ b/rpc/grpc/types.pb.go @@ -8,7 +8,7 @@ import ( fmt "fmt" types "github.com/cometbft/cometbft/abci/types" grpc1 "github.com/cosmos/gogoproto/grpc" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status"