diff --git a/CHANGELOG.md b/CHANGELOG.md index 92cb73ce57..44f0e0975b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -67,7 +67,6 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Improvements -* (evm) [#1544](https://github.com/evmos/ethermint/pull/1544) Migrate deprecated event emitting to new TypedEvent * (tests) [#1507](https://github.com/evmos/ethermint/pull/1507) Remove legacy sim tests * (feemarket) [#1508](https://github.com/evmos/ethermint/pull/1508) Remove old x/params migration logic * (evm) [#1499](https://github.com/evmos/ethermint/pull/1499) Add Shanghai and Cancun block diff --git a/proto/ethermint/evm/v1/events.proto b/proto/ethermint/evm/v1/events.proto deleted file mode 100644 index 2f1b2806ee..0000000000 --- a/proto/ethermint/evm/v1/events.proto +++ /dev/null @@ -1,44 +0,0 @@ -syntax = "proto3"; -package ethermint.evm.v1; - -option go_package = "github.com/evmos/ethermint/x/evm/types"; - -// EventEthereumTx defines the event for an Ethereum transaction -message EventEthereumTx { - // amount - string amount = 1; - // eth_hash is the Ethereum hash of the transaction - string eth_hash = 2; - // index of the transaction in the block - string index = 3; - // gas_used is the amount of gas used by the transaction - string gas_used = 4; - // hash is the Tendermint hash of the transaction - string hash = 5; - // recipient of the transaction - string recipient = 6; - // eth_tx_failed contains a VM error should it occur - string eth_tx_failed = 7; -} - -// EventTxLog defines the event for an Ethereum transaction log -message EventTxLog { - // tx_logs is an array of transaction logs - repeated string tx_logs = 1; -} - -// EventMessage -message EventMessage { - // module which emits the event - string module = 1; - // sender of the message - string sender = 2; - // tx_type is the type of the message - string tx_type = 3; -} - -// EventBlockBloom defines an Ethereum block bloom filter event -message EventBlockBloom { - // bloom is the bloom filter of the block - string bloom = 1; -} diff --git a/proto/ethermint/feemarket/v1/events.proto b/proto/ethermint/feemarket/v1/events.proto deleted file mode 100644 index 74dff2e65d..0000000000 --- a/proto/ethermint/feemarket/v1/events.proto +++ /dev/null @@ -1,18 +0,0 @@ -syntax = "proto3"; -package ethermint.feemarket.v1; - -option go_package = "github.com/evmos/ethermint/x/feemarket/types"; - -// EventFeeMarket is the event type for the fee market module -message EventFeeMarket { - // base_fee for EIP-1559 blocks - string base_fee = 1; -} - -// EventBlockGas defines an Ethereum block gas event -message EventBlockGas { - // height of the block - string height = 1; - // amount of gas wanted by the block - string amount = 2; -} diff --git a/scripts/integration-test-all.sh b/scripts/integration-test-all.sh index 7be25b617a..2790ba792f 100755 --- a/scripts/integration-test-all.sh +++ b/scripts/integration-test-all.sh @@ -145,7 +145,7 @@ echo "done sleeping" set +e if [[ -z $TEST || $TEST == "rpc" || $TEST == "pending" ]]; then - time_out=900s + time_out=300s if [[ $TEST == "pending" ]]; then time_out=60m0s fi diff --git a/tests/rpc/rpc_test.go b/tests/rpc/rpc_test.go index 41391a2695..1039951a49 100644 --- a/tests/rpc/rpc_test.go +++ b/tests/rpc/rpc_test.go @@ -347,37 +347,36 @@ func TestEth_IncompleteSendTransaction(t *testing.T) { require.NotEqual(t, err.Error(), "method handler crashed", "no from field dealt with incorrectly") } -// TODO: Investigate why it's failing -//func TestEth_GetFilterChanges_NoTopics(t *testing.T) { -// rpcRes := call(t, "eth_blockNumber", []string{}) -// -// var res hexutil.Uint64 -// err := res.UnmarshalJSON(rpcRes.Result) -// require.NoError(t, err) -// -// param := make([]map[string]interface{}, 1) -// param[0] = make(map[string]interface{}) -// param[0]["topics"] = []string{} -// param[0]["fromBlock"] = res.String() -// -// // instantiate new filter -// rpcRes = call(t, "eth_newFilter", param) -// require.Nil(t, rpcRes.Error) -// var ID string -// err = json.Unmarshal(rpcRes.Result, &ID) -// require.NoError(t, err) -// -// // deploy contract, emitting some event -// deployTestContract(t) -// -// // get filter changes -// changesRes := call(t, "eth_getFilterChanges", []string{ID}) -// -// var logs []*ethtypes.Log -// err = json.Unmarshal(changesRes.Result, &logs) -// require.NoError(t, err) -// require.Equal(t, 1, len(logs)) -//} +func TestEth_GetFilterChanges_NoTopics(t *testing.T) { + rpcRes := call(t, "eth_blockNumber", []string{}) + + var res hexutil.Uint64 + err := res.UnmarshalJSON(rpcRes.Result) + require.NoError(t, err) + + param := make([]map[string]interface{}, 1) + param[0] = make(map[string]interface{}) + param[0]["topics"] = []string{} + param[0]["fromBlock"] = res.String() + + // instantiate new filter + rpcRes = call(t, "eth_newFilter", param) + require.Nil(t, rpcRes.Error) + var ID string + err = json.Unmarshal(rpcRes.Result, &ID) + require.NoError(t, err) + + // deploy contract, emitting some event + deployTestContract(t) + + // get filter changes + changesRes := call(t, "eth_getFilterChanges", []string{ID}) + + var logs []*ethtypes.Log + err = json.Unmarshal(changesRes.Result, &logs) + require.NoError(t, err) + require.Equal(t, 1, len(logs)) +} // hash of Hello event var helloTopic = "0x775a94827b8fd9b519d36cd827093c664f93347070a554f65e4a6f56cd738898" @@ -427,68 +426,66 @@ func deployTestContractWithFunction(t *testing.T) hexutil.Bytes { return hash } -// TODO: Investigate why it's failing // Tests topics case where there are topics in first two positions -//func TestEth_GetFilterChanges_Topics_AB(t *testing.T) { -// rpcRes := call(t, "eth_blockNumber", []string{}) -// -// var res hexutil.Uint64 -// err := res.UnmarshalJSON(rpcRes.Result) -// require.NoError(t, err) -// -// param := make([]map[string]interface{}, 1) -// param[0] = make(map[string]interface{}) -// param[0]["topics"] = []string{helloTopic, worldTopic} -// param[0]["fromBlock"] = res.String() -// -// // instantiate new filter -// rpcRes = call(t, "eth_newFilter", param) -// var ID string -// err = json.Unmarshal(rpcRes.Result, &ID) -// require.NoError(t, err, string(rpcRes.Result)) -// -// deployTestContractWithFunction(t) -// -// // get filter changes -// changesRes := call(t, "eth_getFilterChanges", []string{ID}) -// -// var logs []*ethtypes.Log -// err = json.Unmarshal(changesRes.Result, &logs) -// require.NoError(t, err) -// -// require.Equal(t, 1, len(logs)) -//} +func TestEth_GetFilterChanges_Topics_AB(t *testing.T) { + rpcRes := call(t, "eth_blockNumber", []string{}) -// TODO: Investigate why it's failing -//func TestEth_GetFilterChanges_Topics_XB(t *testing.T) { -// rpcRes := call(t, "eth_blockNumber", []string{}) -// -// var res hexutil.Uint64 -// err := res.UnmarshalJSON(rpcRes.Result) -// require.NoError(t, err) -// -// param := make([]map[string]interface{}, 1) -// param[0] = make(map[string]interface{}) -// param[0]["topics"] = []interface{}{nil, worldTopic} -// param[0]["fromBlock"] = res.String() -// -// // instantiate new filter -// rpcRes = call(t, "eth_newFilter", param) -// var ID string -// err = json.Unmarshal(rpcRes.Result, &ID) -// require.NoError(t, err) -// -// deployTestContractWithFunction(t) -// -// // get filter changes -// changesRes := call(t, "eth_getFilterChanges", []string{ID}) -// -// var logs []*ethtypes.Log -// err = json.Unmarshal(changesRes.Result, &logs) -// require.NoError(t, err) -// -// require.Equal(t, 1, len(logs)) -//} + var res hexutil.Uint64 + err := res.UnmarshalJSON(rpcRes.Result) + require.NoError(t, err) + + param := make([]map[string]interface{}, 1) + param[0] = make(map[string]interface{}) + param[0]["topics"] = []string{helloTopic, worldTopic} + param[0]["fromBlock"] = res.String() + + // instantiate new filter + rpcRes = call(t, "eth_newFilter", param) + var ID string + err = json.Unmarshal(rpcRes.Result, &ID) + require.NoError(t, err, string(rpcRes.Result)) + + deployTestContractWithFunction(t) + + // get filter changes + changesRes := call(t, "eth_getFilterChanges", []string{ID}) + + var logs []*ethtypes.Log + err = json.Unmarshal(changesRes.Result, &logs) + require.NoError(t, err) + + require.Equal(t, 1, len(logs)) +} + +func TestEth_GetFilterChanges_Topics_XB(t *testing.T) { + rpcRes := call(t, "eth_blockNumber", []string{}) + + var res hexutil.Uint64 + err := res.UnmarshalJSON(rpcRes.Result) + require.NoError(t, err) + + param := make([]map[string]interface{}, 1) + param[0] = make(map[string]interface{}) + param[0]["topics"] = []interface{}{nil, worldTopic} + param[0]["fromBlock"] = res.String() + + // instantiate new filter + rpcRes = call(t, "eth_newFilter", param) + var ID string + err = json.Unmarshal(rpcRes.Result, &ID) + require.NoError(t, err) + + deployTestContractWithFunction(t) + + // get filter changes + changesRes := call(t, "eth_getFilterChanges", []string{ID}) + + var logs []*ethtypes.Log + err = json.Unmarshal(changesRes.Result, &logs) + require.NoError(t, err) + + require.Equal(t, 1, len(logs)) +} func TestEth_PendingTransactionFilter(t *testing.T) { rpcRes := call(t, "eth_newPendingTransactionFilter", []string{}) diff --git a/x/evm/keeper/abci_test.go b/x/evm/keeper/abci_test.go index 82fe1ed519..dc7c265cec 100644 --- a/x/evm/keeper/abci_test.go +++ b/x/evm/keeper/abci_test.go @@ -1,6 +1,7 @@ package keeper_test import ( + evmtypes "github.com/evmos/ethermint/x/evm/types" "github.com/tendermint/tendermint/abci/types" ) @@ -13,5 +14,5 @@ func (suite *KeeperTestSuite) TestEndBlock() { // should emit 1 EventTypeBlockBloom event on EndBlock suite.Require().Equal(1, len(em.Events())) - suite.Require().Equal("ethermint.evm.v1.EventBlockBloom", em.Events()[0].Type) + suite.Require().Equal(evmtypes.EventTypeBlockBloom, em.Events()[0].Type) } diff --git a/x/evm/keeper/grpc_query_test.go b/x/evm/keeper/grpc_query_test.go index a56b78ff48..dcddf98d7e 100644 --- a/x/evm/keeper/grpc_query_test.go +++ b/x/evm/keeper/grpc_query_test.go @@ -540,7 +540,10 @@ func (suite *KeeperTestSuite) TestEstimateGas() { "enough balance", func() { args = types.TransactionArgs{To: &common.Address{}, From: &suite.address, Value: (*hexutil.Big)(big.NewInt(100))} - }, false, 0, false, + }, + false, + 0, + false, }, // should success, because gas limit lower than 21000 is ignored { diff --git a/x/evm/keeper/keeper.go b/x/evm/keeper/keeper.go index 7a3e839076..b1cc2a3778 100644 --- a/x/evm/keeper/keeper.go +++ b/x/evm/keeper/keeper.go @@ -152,14 +152,12 @@ func (k Keeper) ChainID() *big.Int { // EmitBlockBloomEvent emit block bloom events func (k Keeper) EmitBlockBloomEvent(ctx sdk.Context, bloom ethtypes.Bloom) { - err := ctx.EventManager().EmitTypedEvent( - &types.EventBlockBloom{ - Bloom: string(bloom.Bytes()), - }, + ctx.EventManager().EmitEvent( + sdk.NewEvent( + types.EventTypeBlockBloom, + sdk.NewAttribute(types.AttributeKeyEthereumBloom, string(bloom.Bytes())), + ), ) - if err != nil { - k.Logger(ctx).Error(err.Error()) - } } // GetAuthority returns the x/evm module authority address diff --git a/x/evm/keeper/msg_server.go b/x/evm/keeper/msg_server.go index ed1fadaecb..0e1b7eb6d5 100644 --- a/x/evm/keeper/msg_server.go +++ b/x/evm/keeper/msg_server.go @@ -89,52 +89,56 @@ func (k *Keeper) EthereumTx(goCtx context.Context, msg *types.MsgEthereumTx) (*t } }() - eventEthereumTx := &types.EventEthereumTx{ - Amount: tx.Value().String(), + attrs := []sdk.Attribute{ + sdk.NewAttribute(sdk.AttributeKeyAmount, tx.Value().String()), // add event for ethereum transaction hash format - EthHash: response.Hash, + sdk.NewAttribute(types.AttributeKeyEthereumTxHash, response.Hash), // add event for index of valid ethereum tx - Index: strconv.FormatUint(txIndex, 10), + sdk.NewAttribute(types.AttributeKeyTxIndex, strconv.FormatUint(txIndex, 10)), // add event for eth tx gas used, we can't get it from cosmos tx result when it contains multiple eth tx msgs. - GasUsed: strconv.FormatUint(response.GasUsed, 10), + sdk.NewAttribute(types.AttributeKeyTxGasUsed, strconv.FormatUint(response.GasUsed, 10)), } if len(ctx.TxBytes()) > 0 { // add event for tendermint transaction hash format hash := tmbytes.HexBytes(tmtypes.Tx(ctx.TxBytes()).Hash()) - eventEthereumTx.Hash = hash.String() + attrs = append(attrs, sdk.NewAttribute(types.AttributeKeyTxHash, hash.String())) } if to := tx.To(); to != nil { - eventEthereumTx.Recipient = to.Hex() + attrs = append(attrs, sdk.NewAttribute(types.AttributeKeyRecipient, to.Hex())) } if response.Failed() { - eventEthereumTx.EthTxFailed = response.VmError + attrs = append(attrs, sdk.NewAttribute(types.AttributeKeyEthereumTxFailed, response.VmError)) } - eventTxLogs := &types.EventTxLog{TxLogs: make([]string, len(response.Logs))} + txLogAttrs := make([]sdk.Attribute, len(response.Logs)) for i, log := range response.Logs { value, err := json.Marshal(log) if err != nil { return nil, errorsmod.Wrap(err, "failed to encode log") } - eventTxLogs.TxLogs[i] = string(value) + txLogAttrs[i] = sdk.NewAttribute(types.AttributeKeyTxLog, string(value)) } - err = ctx.EventManager().EmitTypedEvents( - eventEthereumTx, - eventTxLogs, - &types.EventMessage{ - Module: types.AttributeValueCategory, - Sender: sender, - TxType: fmt.Sprintf("%d", tx.Type()), - }, - ) - - if err != nil { - k.Logger(ctx).Error(err.Error()) - } + // emit events + ctx.EventManager().EmitEvents(sdk.Events{ + sdk.NewEvent( + types.EventTypeEthereumTx, + attrs..., + ), + sdk.NewEvent( + types.EventTypeTxLog, + txLogAttrs..., + ), + sdk.NewEvent( + sdk.EventTypeMessage, + sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), + sdk.NewAttribute(sdk.AttributeKeySender, sender), + sdk.NewAttribute(types.AttributeKeyTxType, fmt.Sprintf("%d", tx.Type())), + ), + }) return response, nil } diff --git a/x/evm/keeper/state_transition.go b/x/evm/keeper/state_transition.go index ad90dba5fd..4254f8144c 100644 --- a/x/evm/keeper/state_transition.go +++ b/x/evm/keeper/state_transition.go @@ -232,7 +232,7 @@ func (k *Keeper) ApplyTransaction(ctx sdk.Context, tx *ethtypes.Transaction) (*t } else if commit != nil { // PostTxProcessing is successful, commit the tmpCtx commit() - // Since the post-processing can alter the log, we need to update the result + // Since the post processing can alter the log, we need to update the result res.Logs = types.NewLogsFromEth(receipt.Logs) ctx.EventManager().EmitEvents(tmpCtx.EventManager().Events()) } diff --git a/x/evm/types/events.pb.go b/x/evm/types/events.pb.go deleted file mode 100644 index 208a90db56..0000000000 --- a/x/evm/types/events.pb.go +++ /dev/null @@ -1,1264 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: ethermint/evm/v1/events.proto - -package types - -import ( - fmt "fmt" - proto "github.com/gogo/protobuf/proto" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -// EventEthereumTx defines the event for a Ethereum transaction -type EventEthereumTx struct { - // amount - Amount string `protobuf:"bytes,1,opt,name=amount,proto3" json:"amount,omitempty"` - // eth_hash Ethereum hash of the transaction - EthHash string `protobuf:"bytes,2,opt,name=eth_hash,json=ethHash,proto3" json:"eth_hash,omitempty"` - // index of the transaction in the block - Index string `protobuf:"bytes,3,opt,name=index,proto3" json:"index,omitempty"` - // gas_used is the amount of gas used by the transaction - GasUsed string `protobuf:"bytes,4,opt,name=gas_used,json=gasUsed,proto3" json:"gas_used,omitempty"` - // hash Tendermint hash of the transaction - Hash string `protobuf:"bytes,5,opt,name=hash,proto3" json:"hash,omitempty"` - // recipient of the transaction - Recipient string `protobuf:"bytes,6,opt,name=recipient,proto3" json:"recipient,omitempty"` - // eth_tx_failed the VM error - EthTxFailed string `protobuf:"bytes,7,opt,name=eth_tx_failed,json=ethTxFailed,proto3" json:"eth_tx_failed,omitempty"` -} - -func (m *EventEthereumTx) Reset() { *m = EventEthereumTx{} } -func (m *EventEthereumTx) String() string { return proto.CompactTextString(m) } -func (*EventEthereumTx) ProtoMessage() {} -func (*EventEthereumTx) Descriptor() ([]byte, []int) { - return fileDescriptor_432e0d592184bde3, []int{0} -} -func (m *EventEthereumTx) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *EventEthereumTx) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_EventEthereumTx.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 *EventEthereumTx) XXX_Merge(src proto.Message) { - xxx_messageInfo_EventEthereumTx.Merge(m, src) -} -func (m *EventEthereumTx) XXX_Size() int { - return m.Size() -} -func (m *EventEthereumTx) XXX_DiscardUnknown() { - xxx_messageInfo_EventEthereumTx.DiscardUnknown(m) -} - -var xxx_messageInfo_EventEthereumTx proto.InternalMessageInfo - -func (m *EventEthereumTx) GetAmount() string { - if m != nil { - return m.Amount - } - return "" -} - -func (m *EventEthereumTx) GetEthHash() string { - if m != nil { - return m.EthHash - } - return "" -} - -func (m *EventEthereumTx) GetIndex() string { - if m != nil { - return m.Index - } - return "" -} - -func (m *EventEthereumTx) GetGasUsed() string { - if m != nil { - return m.GasUsed - } - return "" -} - -func (m *EventEthereumTx) GetHash() string { - if m != nil { - return m.Hash - } - return "" -} - -func (m *EventEthereumTx) GetRecipient() string { - if m != nil { - return m.Recipient - } - return "" -} - -func (m *EventEthereumTx) GetEthTxFailed() string { - if m != nil { - return m.EthTxFailed - } - return "" -} - -// EventTxLog defines the event for a Ethereum transaction log -type EventTxLog struct { - // tx_logs is the log of the transaction - TxLogs []string `protobuf:"bytes,1,rep,name=tx_logs,json=txLogs,proto3" json:"tx_logs,omitempty"` -} - -func (m *EventTxLog) Reset() { *m = EventTxLog{} } -func (m *EventTxLog) String() string { return proto.CompactTextString(m) } -func (*EventTxLog) ProtoMessage() {} -func (*EventTxLog) Descriptor() ([]byte, []int) { - return fileDescriptor_432e0d592184bde3, []int{1} -} -func (m *EventTxLog) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *EventTxLog) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_EventTxLog.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 *EventTxLog) XXX_Merge(src proto.Message) { - xxx_messageInfo_EventTxLog.Merge(m, src) -} -func (m *EventTxLog) XXX_Size() int { - return m.Size() -} -func (m *EventTxLog) XXX_DiscardUnknown() { - xxx_messageInfo_EventTxLog.DiscardUnknown(m) -} - -var xxx_messageInfo_EventTxLog proto.InternalMessageInfo - -func (m *EventTxLog) GetTxLogs() []string { - if m != nil { - return m.TxLogs - } - return nil -} - -// EventMessage -type EventMessage struct { - // module is the module of the message - Module string `protobuf:"bytes,1,opt,name=module,proto3" json:"module,omitempty"` - // sender is the sender of the message - Sender string `protobuf:"bytes,2,opt,name=sender,proto3" json:"sender,omitempty"` - // tx_type is the type of the message - TxType string `protobuf:"bytes,3,opt,name=tx_type,json=txType,proto3" json:"tx_type,omitempty"` -} - -func (m *EventMessage) Reset() { *m = EventMessage{} } -func (m *EventMessage) String() string { return proto.CompactTextString(m) } -func (*EventMessage) ProtoMessage() {} -func (*EventMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_432e0d592184bde3, []int{2} -} -func (m *EventMessage) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *EventMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_EventMessage.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 *EventMessage) XXX_Merge(src proto.Message) { - xxx_messageInfo_EventMessage.Merge(m, src) -} -func (m *EventMessage) XXX_Size() int { - return m.Size() -} -func (m *EventMessage) XXX_DiscardUnknown() { - xxx_messageInfo_EventMessage.DiscardUnknown(m) -} - -var xxx_messageInfo_EventMessage proto.InternalMessageInfo - -func (m *EventMessage) GetModule() string { - if m != nil { - return m.Module - } - return "" -} - -func (m *EventMessage) GetSender() string { - if m != nil { - return m.Sender - } - return "" -} - -func (m *EventMessage) GetTxType() string { - if m != nil { - return m.TxType - } - return "" -} - -type EventBlockBloom struct { - // bloom is the bloom filter of the block - Bloom string `protobuf:"bytes,1,opt,name=bloom,proto3" json:"bloom,omitempty"` -} - -func (m *EventBlockBloom) Reset() { *m = EventBlockBloom{} } -func (m *EventBlockBloom) String() string { return proto.CompactTextString(m) } -func (*EventBlockBloom) ProtoMessage() {} -func (*EventBlockBloom) Descriptor() ([]byte, []int) { - return fileDescriptor_432e0d592184bde3, []int{3} -} -func (m *EventBlockBloom) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *EventBlockBloom) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_EventBlockBloom.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 *EventBlockBloom) XXX_Merge(src proto.Message) { - xxx_messageInfo_EventBlockBloom.Merge(m, src) -} -func (m *EventBlockBloom) XXX_Size() int { - return m.Size() -} -func (m *EventBlockBloom) XXX_DiscardUnknown() { - xxx_messageInfo_EventBlockBloom.DiscardUnknown(m) -} - -var xxx_messageInfo_EventBlockBloom proto.InternalMessageInfo - -func (m *EventBlockBloom) GetBloom() string { - if m != nil { - return m.Bloom - } - return "" -} - -func init() { - proto.RegisterType((*EventEthereumTx)(nil), "ethermint.evm.v1.EventEthereumTx") - proto.RegisterType((*EventTxLog)(nil), "ethermint.evm.v1.EventTxLog") - proto.RegisterType((*EventMessage)(nil), "ethermint.evm.v1.EventMessage") - proto.RegisterType((*EventBlockBloom)(nil), "ethermint.evm.v1.EventBlockBloom") -} - -func init() { proto.RegisterFile("ethermint/evm/v1/events.proto", fileDescriptor_432e0d592184bde3) } - -var fileDescriptor_432e0d592184bde3 = []byte{ - // 360 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x44, 0x51, 0x4d, 0x4b, 0xeb, 0x40, - 0x14, 0x6d, 0x5e, 0xdb, 0xf4, 0x75, 0xde, 0x7b, 0x3c, 0x19, 0x44, 0x23, 0x68, 0x28, 0x01, 0x3f, - 0x56, 0x09, 0xc5, 0x3f, 0x20, 0x85, 0x8a, 0x0b, 0xdd, 0x48, 0x44, 0x70, 0x13, 0xd2, 0xe6, 0x9a, - 0x09, 0x66, 0x32, 0x21, 0x73, 0x13, 0xa6, 0xff, 0xc2, 0x9f, 0x25, 0xb8, 0xe9, 0xd2, 0xa5, 0xb4, - 0x7f, 0x44, 0x66, 0x12, 0xed, 0xee, 0x9e, 0x73, 0xee, 0x07, 0xe7, 0x1e, 0x72, 0x02, 0xc8, 0xa0, - 0xe2, 0x59, 0x81, 0x01, 0x34, 0x3c, 0x68, 0xa6, 0x01, 0x34, 0x50, 0xa0, 0xf4, 0xcb, 0x4a, 0xa0, - 0xa0, 0x7b, 0x3f, 0xb2, 0x0f, 0x0d, 0xf7, 0x9b, 0xa9, 0xf7, 0x6e, 0x91, 0xff, 0x73, 0xdd, 0x32, - 0xd7, 0x0a, 0xd4, 0x3c, 0x54, 0xf4, 0x80, 0xd8, 0x31, 0x17, 0x75, 0x81, 0x8e, 0x35, 0xb1, 0x2e, - 0xc6, 0xf7, 0x1d, 0xa2, 0x47, 0xe4, 0x37, 0x20, 0x8b, 0x58, 0x2c, 0x99, 0xf3, 0xcb, 0x28, 0x23, - 0x40, 0x76, 0x13, 0x4b, 0x46, 0xf7, 0xc9, 0x30, 0x2b, 0x12, 0x50, 0x4e, 0xdf, 0xf0, 0x2d, 0xd0, - 0x03, 0x69, 0x2c, 0xa3, 0x5a, 0x42, 0xe2, 0x0c, 0xda, 0x81, 0x34, 0x96, 0x0f, 0x12, 0x12, 0x4a, - 0xc9, 0xc0, 0xec, 0x19, 0x1a, 0xda, 0xd4, 0xf4, 0x98, 0x8c, 0x2b, 0x58, 0x66, 0x65, 0x06, 0x05, - 0x3a, 0xb6, 0x11, 0x76, 0x04, 0xf5, 0xc8, 0x3f, 0x7d, 0x1d, 0x55, 0xf4, 0x1c, 0x67, 0x39, 0x24, - 0xce, 0xc8, 0x74, 0xfc, 0x01, 0x64, 0xa1, 0xba, 0x36, 0x94, 0x77, 0x4a, 0x88, 0x31, 0x13, 0xaa, - 0x5b, 0x91, 0xd2, 0x43, 0x32, 0x42, 0x15, 0xe5, 0x22, 0x95, 0x8e, 0x35, 0xe9, 0x6b, 0x23, 0xa8, - 0x79, 0xe9, 0x3d, 0x92, 0xbf, 0xa6, 0xed, 0x0e, 0xa4, 0x8c, 0x53, 0xd0, 0x86, 0xb9, 0x48, 0xea, - 0x1c, 0xbe, 0x0d, 0xb7, 0x48, 0xf3, 0x12, 0x8a, 0x04, 0xaa, 0xce, 0x6e, 0x87, 0xba, 0xc5, 0xb8, - 0x2a, 0xa1, 0xf3, 0x6b, 0xa3, 0x0a, 0x57, 0x25, 0x78, 0xe7, 0xdd, 0x33, 0x67, 0xb9, 0x58, 0xbe, - 0xcc, 0x72, 0x21, 0xb8, 0xfe, 0xcc, 0x42, 0x17, 0xdd, 0xea, 0x16, 0xcc, 0xae, 0xde, 0x36, 0xae, - 0xb5, 0xde, 0xb8, 0xd6, 0xe7, 0xc6, 0xb5, 0x5e, 0xb7, 0x6e, 0x6f, 0xbd, 0x75, 0x7b, 0x1f, 0x5b, - 0xb7, 0xf7, 0x74, 0x96, 0x66, 0xc8, 0xea, 0x85, 0xbf, 0x14, 0x5c, 0x47, 0x28, 0x64, 0xb0, 0x8b, - 0x54, 0x99, 0x50, 0xf5, 0x5d, 0xb9, 0xb0, 0x4d, 0xa2, 0x97, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, - 0x4f, 0xb6, 0xd8, 0xd7, 0xf2, 0x01, 0x00, 0x00, -} - -func (m *EventEthereumTx) 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 *EventEthereumTx) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *EventEthereumTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.EthTxFailed) > 0 { - i -= len(m.EthTxFailed) - copy(dAtA[i:], m.EthTxFailed) - i = encodeVarintEvents(dAtA, i, uint64(len(m.EthTxFailed))) - i-- - dAtA[i] = 0x3a - } - if len(m.Recipient) > 0 { - i -= len(m.Recipient) - copy(dAtA[i:], m.Recipient) - i = encodeVarintEvents(dAtA, i, uint64(len(m.Recipient))) - i-- - dAtA[i] = 0x32 - } - if len(m.Hash) > 0 { - i -= len(m.Hash) - copy(dAtA[i:], m.Hash) - i = encodeVarintEvents(dAtA, i, uint64(len(m.Hash))) - i-- - dAtA[i] = 0x2a - } - if len(m.GasUsed) > 0 { - i -= len(m.GasUsed) - copy(dAtA[i:], m.GasUsed) - i = encodeVarintEvents(dAtA, i, uint64(len(m.GasUsed))) - i-- - dAtA[i] = 0x22 - } - if len(m.Index) > 0 { - i -= len(m.Index) - copy(dAtA[i:], m.Index) - i = encodeVarintEvents(dAtA, i, uint64(len(m.Index))) - i-- - dAtA[i] = 0x1a - } - if len(m.EthHash) > 0 { - i -= len(m.EthHash) - copy(dAtA[i:], m.EthHash) - i = encodeVarintEvents(dAtA, i, uint64(len(m.EthHash))) - i-- - dAtA[i] = 0x12 - } - if len(m.Amount) > 0 { - i -= len(m.Amount) - copy(dAtA[i:], m.Amount) - i = encodeVarintEvents(dAtA, i, uint64(len(m.Amount))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *EventTxLog) 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 *EventTxLog) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *EventTxLog) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.TxLogs) > 0 { - for iNdEx := len(m.TxLogs) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.TxLogs[iNdEx]) - copy(dAtA[i:], m.TxLogs[iNdEx]) - i = encodeVarintEvents(dAtA, i, uint64(len(m.TxLogs[iNdEx]))) - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - -func (m *EventMessage) 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 *EventMessage) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *EventMessage) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.TxType) > 0 { - i -= len(m.TxType) - copy(dAtA[i:], m.TxType) - i = encodeVarintEvents(dAtA, i, uint64(len(m.TxType))) - i-- - dAtA[i] = 0x1a - } - if len(m.Sender) > 0 { - i -= len(m.Sender) - copy(dAtA[i:], m.Sender) - i = encodeVarintEvents(dAtA, i, uint64(len(m.Sender))) - i-- - dAtA[i] = 0x12 - } - if len(m.Module) > 0 { - i -= len(m.Module) - copy(dAtA[i:], m.Module) - i = encodeVarintEvents(dAtA, i, uint64(len(m.Module))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *EventBlockBloom) 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 *EventBlockBloom) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *EventBlockBloom) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Bloom) > 0 { - i -= len(m.Bloom) - copy(dAtA[i:], m.Bloom) - i = encodeVarintEvents(dAtA, i, uint64(len(m.Bloom))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintEvents(dAtA []byte, offset int, v uint64) int { - offset -= sovEvents(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *EventEthereumTx) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Amount) - if l > 0 { - n += 1 + l + sovEvents(uint64(l)) - } - l = len(m.EthHash) - if l > 0 { - n += 1 + l + sovEvents(uint64(l)) - } - l = len(m.Index) - if l > 0 { - n += 1 + l + sovEvents(uint64(l)) - } - l = len(m.GasUsed) - if l > 0 { - n += 1 + l + sovEvents(uint64(l)) - } - l = len(m.Hash) - if l > 0 { - n += 1 + l + sovEvents(uint64(l)) - } - l = len(m.Recipient) - if l > 0 { - n += 1 + l + sovEvents(uint64(l)) - } - l = len(m.EthTxFailed) - if l > 0 { - n += 1 + l + sovEvents(uint64(l)) - } - return n -} - -func (m *EventTxLog) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.TxLogs) > 0 { - for _, s := range m.TxLogs { - l = len(s) - n += 1 + l + sovEvents(uint64(l)) - } - } - return n -} - -func (m *EventMessage) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Module) - if l > 0 { - n += 1 + l + sovEvents(uint64(l)) - } - l = len(m.Sender) - if l > 0 { - n += 1 + l + sovEvents(uint64(l)) - } - l = len(m.TxType) - if l > 0 { - n += 1 + l + sovEvents(uint64(l)) - } - return n -} - -func (m *EventBlockBloom) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Bloom) - if l > 0 { - n += 1 + l + sovEvents(uint64(l)) - } - return n -} - -func sovEvents(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozEvents(x uint64) (n int) { - return sovEvents(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *EventEthereumTx) 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 ErrIntOverflowEvents - } - 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: EventEthereumTx: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: EventEthereumTx: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - 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 ErrInvalidLengthEvents - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Amount = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field EthHash", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - 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 ErrInvalidLengthEvents - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.EthHash = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Index", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - 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 ErrInvalidLengthEvents - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Index = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field GasUsed", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - 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 ErrInvalidLengthEvents - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.GasUsed = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Hash", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - 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 ErrInvalidLengthEvents - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Hash = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Recipient", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - 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 ErrInvalidLengthEvents - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Recipient = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 7: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field EthTxFailed", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - 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 ErrInvalidLengthEvents - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.EthTxFailed = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEvents(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvents - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *EventTxLog) 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 ErrIntOverflowEvents - } - 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: EventTxLog: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: EventTxLog: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TxLogs", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - 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 ErrInvalidLengthEvents - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TxLogs = append(m.TxLogs, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEvents(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvents - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *EventMessage) 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 ErrIntOverflowEvents - } - 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: EventMessage: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: EventMessage: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Module", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - 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 ErrInvalidLengthEvents - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Module = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - 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 ErrInvalidLengthEvents - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Sender = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TxType", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - 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 ErrInvalidLengthEvents - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TxType = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEvents(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvents - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *EventBlockBloom) 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 ErrIntOverflowEvents - } - 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: EventBlockBloom: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: EventBlockBloom: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Bloom", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - 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 ErrInvalidLengthEvents - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Bloom = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEvents(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvents - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipEvents(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowEvents - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowEvents - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowEvents - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthEvents - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupEvents - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthEvents - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthEvents = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowEvents = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupEvents = fmt.Errorf("proto: unexpected end of group") -) diff --git a/x/feemarket/keeper/abci.go b/x/feemarket/keeper/abci.go index 49a7ca61a9..db0b980b4e 100644 --- a/x/feemarket/keeper/abci.go +++ b/x/feemarket/keeper/abci.go @@ -41,12 +41,12 @@ func (k *Keeper) BeginBlock(ctx sdk.Context, req abci.RequestBeginBlock) { }() // Store current base fee in event - err := ctx.EventManager().EmitTypedEvent(&types.EventFeeMarket{ - BaseFee: baseFee.String(), + ctx.EventManager().EmitEvents(sdk.Events{ + sdk.NewEvent( + types.EventTypeFeeMarket, + sdk.NewAttribute(types.AttributeKeyBaseFee, baseFee.String()), + ), }) - if err != nil { - k.Logger(ctx).Error(err.Error()) - } } // EndBlock update block gas wanted. @@ -74,11 +74,9 @@ func (k *Keeper) EndBlock(ctx sdk.Context, req abci.RequestEndBlock) { telemetry.SetGauge(float32(gasWanted), "feemarket", "block_gas") }() - err := ctx.EventManager().EmitTypedEvents(&types.EventBlockGas{ - Height: fmt.Sprintf("%d", ctx.BlockHeight()), - Amount: fmt.Sprintf("%d", gasWanted), - }) - if err != nil { - k.Logger(ctx).Error(err.Error()) - } + ctx.EventManager().EmitEvent(sdk.NewEvent( + "block_gas", + sdk.NewAttribute("height", fmt.Sprintf("%d", ctx.BlockHeight())), + sdk.NewAttribute("amount", fmt.Sprintf("%d", gasWanted)), + )) } diff --git a/x/feemarket/types/events.pb.go b/x/feemarket/types/events.pb.go deleted file mode 100644 index 53bc08c5f1..0000000000 --- a/x/feemarket/types/events.pb.go +++ /dev/null @@ -1,546 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: ethermint/feemarket/v1/events.proto - -package types - -import ( - fmt "fmt" - proto "github.com/gogo/protobuf/proto" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -// EventFeeMarket is the event type for the fee market module -type EventFeeMarket struct { - // base_fee for EIP-1559 blocks - BaseFee string `protobuf:"bytes,1,opt,name=base_fee,json=baseFee,proto3" json:"base_fee,omitempty"` -} - -func (m *EventFeeMarket) Reset() { *m = EventFeeMarket{} } -func (m *EventFeeMarket) String() string { return proto.CompactTextString(m) } -func (*EventFeeMarket) ProtoMessage() {} -func (*EventFeeMarket) Descriptor() ([]byte, []int) { - return fileDescriptor_c6edce8d670faff7, []int{0} -} -func (m *EventFeeMarket) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *EventFeeMarket) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_EventFeeMarket.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 *EventFeeMarket) XXX_Merge(src proto.Message) { - xxx_messageInfo_EventFeeMarket.Merge(m, src) -} -func (m *EventFeeMarket) XXX_Size() int { - return m.Size() -} -func (m *EventFeeMarket) XXX_DiscardUnknown() { - xxx_messageInfo_EventFeeMarket.DiscardUnknown(m) -} - -var xxx_messageInfo_EventFeeMarket proto.InternalMessageInfo - -func (m *EventFeeMarket) GetBaseFee() string { - if m != nil { - return m.BaseFee - } - return "" -} - -// EventBlockGas defines the event for a Ethereum block gas -type EventBlockGas struct { - // height is the height of the block - Height string `protobuf:"bytes,1,opt,name=height,proto3" json:"height,omitempty"` - // amount of gas wanted by the block - Amount string `protobuf:"bytes,2,opt,name=amount,proto3" json:"amount,omitempty"` -} - -func (m *EventBlockGas) Reset() { *m = EventBlockGas{} } -func (m *EventBlockGas) String() string { return proto.CompactTextString(m) } -func (*EventBlockGas) ProtoMessage() {} -func (*EventBlockGas) Descriptor() ([]byte, []int) { - return fileDescriptor_c6edce8d670faff7, []int{1} -} -func (m *EventBlockGas) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *EventBlockGas) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_EventBlockGas.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 *EventBlockGas) XXX_Merge(src proto.Message) { - xxx_messageInfo_EventBlockGas.Merge(m, src) -} -func (m *EventBlockGas) XXX_Size() int { - return m.Size() -} -func (m *EventBlockGas) XXX_DiscardUnknown() { - xxx_messageInfo_EventBlockGas.DiscardUnknown(m) -} - -var xxx_messageInfo_EventBlockGas proto.InternalMessageInfo - -func (m *EventBlockGas) GetHeight() string { - if m != nil { - return m.Height - } - return "" -} - -func (m *EventBlockGas) GetAmount() string { - if m != nil { - return m.Amount - } - return "" -} - -func init() { - proto.RegisterType((*EventFeeMarket)(nil), "ethermint.feemarket.v1.EventFeeMarket") - proto.RegisterType((*EventBlockGas)(nil), "ethermint.feemarket.v1.EventBlockGas") -} - -func init() { - proto.RegisterFile("ethermint/feemarket/v1/events.proto", fileDescriptor_c6edce8d670faff7) -} - -var fileDescriptor_c6edce8d670faff7 = []byte{ - // 212 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4e, 0x2d, 0xc9, 0x48, - 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x4f, 0x4b, 0x4d, 0xcd, 0x4d, 0x2c, 0xca, 0x4e, 0x2d, 0xd1, - 0x2f, 0x33, 0xd4, 0x4f, 0x2d, 0x4b, 0xcd, 0x2b, 0x29, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, - 0x12, 0x83, 0x2b, 0xd2, 0x83, 0x2b, 0xd2, 0x2b, 0x33, 0x54, 0xd2, 0xe6, 0xe2, 0x73, 0x05, 0xa9, - 0x73, 0x4b, 0x4d, 0xf5, 0x05, 0x0b, 0x0a, 0x49, 0x72, 0x71, 0x24, 0x25, 0x16, 0xa7, 0xc6, 0xa7, - 0xa5, 0xa6, 0x4a, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x06, 0xb1, 0x83, 0xf8, 0x6e, 0xa9, 0xa9, 0x4a, - 0xf6, 0x5c, 0xbc, 0x60, 0xc5, 0x4e, 0x39, 0xf9, 0xc9, 0xd9, 0xee, 0x89, 0xc5, 0x42, 0x62, 0x5c, - 0x6c, 0x19, 0xa9, 0x99, 0xe9, 0x19, 0x25, 0x50, 0x95, 0x50, 0x1e, 0x48, 0x3c, 0x31, 0x37, 0xbf, - 0x34, 0xaf, 0x44, 0x82, 0x09, 0x22, 0x0e, 0xe1, 0x39, 0xb9, 0x9d, 0x78, 0x24, 0xc7, 0x78, 0xe1, - 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, - 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x4e, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, - 0x7e, 0x6a, 0x59, 0x6e, 0x7e, 0xb1, 0x3e, 0xc2, 0x57, 0x15, 0x48, 0xfe, 0x2a, 0xa9, 0x2c, 0x48, - 0x2d, 0x4e, 0x62, 0x03, 0x7b, 0xca, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0xc9, 0x52, 0xc3, 0x38, - 0xfb, 0x00, 0x00, 0x00, -} - -func (m *EventFeeMarket) 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 *EventFeeMarket) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *EventFeeMarket) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.BaseFee) > 0 { - i -= len(m.BaseFee) - copy(dAtA[i:], m.BaseFee) - i = encodeVarintEvents(dAtA, i, uint64(len(m.BaseFee))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *EventBlockGas) 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 *EventBlockGas) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *EventBlockGas) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Amount) > 0 { - i -= len(m.Amount) - copy(dAtA[i:], m.Amount) - i = encodeVarintEvents(dAtA, i, uint64(len(m.Amount))) - i-- - dAtA[i] = 0x12 - } - if len(m.Height) > 0 { - i -= len(m.Height) - copy(dAtA[i:], m.Height) - i = encodeVarintEvents(dAtA, i, uint64(len(m.Height))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintEvents(dAtA []byte, offset int, v uint64) int { - offset -= sovEvents(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *EventFeeMarket) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.BaseFee) - if l > 0 { - n += 1 + l + sovEvents(uint64(l)) - } - return n -} - -func (m *EventBlockGas) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Height) - if l > 0 { - n += 1 + l + sovEvents(uint64(l)) - } - l = len(m.Amount) - if l > 0 { - n += 1 + l + sovEvents(uint64(l)) - } - return n -} - -func sovEvents(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozEvents(x uint64) (n int) { - return sovEvents(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *EventFeeMarket) 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 ErrIntOverflowEvents - } - 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: EventFeeMarket: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: EventFeeMarket: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field BaseFee", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - 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 ErrInvalidLengthEvents - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.BaseFee = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEvents(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvents - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *EventBlockGas) 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 ErrIntOverflowEvents - } - 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: EventBlockGas: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: EventBlockGas: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - 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 ErrInvalidLengthEvents - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Height = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - 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 ErrInvalidLengthEvents - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Amount = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEvents(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvents - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipEvents(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowEvents - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowEvents - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowEvents - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthEvents - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupEvents - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthEvents - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthEvents = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowEvents = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupEvents = fmt.Errorf("proto: unexpected end of group") -)