From db8ce86ea56c8f972c64eb1527004290154eed75 Mon Sep 17 00:00:00 2001 From: Vladislav Varadinov Date: Mon, 23 Jan 2023 19:08:29 +0200 Subject: [PATCH] fix: renamed vars to avoid duplicate proto --- x/evm/migrations/v4/migrate_test.go | 6 +- x/evm/migrations/v4/types/evm.pb.go | 452 ++++++++++++++-------------- 2 files changed, 229 insertions(+), 229 deletions(-) diff --git a/x/evm/migrations/v4/migrate_test.go b/x/evm/migrations/v4/migrate_test.go index 082706b3a1..ddea2dc4dd 100644 --- a/x/evm/migrations/v4/migrate_test.go +++ b/x/evm/migrations/v4/migrate_test.go @@ -48,7 +48,7 @@ func TestMigrate(t *testing.T) { enableCreate := kvStore.Has(types.ParamStoreKeyEnableCreate) enableCall := kvStore.Has(types.ParamStoreKeyEnableCall) - var chainCfg v4types.ChainConfig + var chainCfg v4types.V4ChainConfig bz = kvStore.Get(types.ParamStoreKeyChainConfig) cdc.MustUnmarshal(bz, &chainCfg) @@ -62,7 +62,7 @@ func TestMigrate(t *testing.T) { AllowUnprotectedTxs: allowUnprotectedTx, EnableCreate: enableCreate, EnableCall: enableCall, - ChainConfig: chainCfg, + V4ChainConfig: chainCfg, ExtraEIPs: extraEIPs, } @@ -70,5 +70,5 @@ func TestMigrate(t *testing.T) { require.Equal(t, legacySubspace.ps.EnableCreate, params.EnableCreate) require.Equal(t, legacySubspace.ps.AllowUnprotectedTxs, params.AllowUnprotectedTxs) require.Equal(t, legacySubspace.ps.ExtraEIPs, params.ExtraEIPs.EIPs) - require.EqualValues(t, legacySubspace.ps.ChainConfig, params.ChainConfig) + require.EqualValues(t, legacySubspace.ps.ChainConfig, params.V4ChainConfig) } diff --git a/x/evm/migrations/v4/types/evm.pb.go b/x/evm/migrations/v4/types/evm.pb.go index e14ce95424..03a44429ad 100644 --- a/x/evm/migrations/v4/types/evm.pb.go +++ b/x/evm/migrations/v4/types/evm.pb.go @@ -26,19 +26,19 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // V4Params defines the EVM module parameters type V4Params struct { - // evm_denom represents the token denomination used to run the EVM state + // evm_denom represents the token denomination used to run the EVM V4State // transitions. EvmDenom string `protobuf:"bytes,1,opt,name=evm_denom,json=evmDenom,proto3" json:"evm_denom,omitempty" yaml:"evm_denom"` - // enable_create toggles state transitions that use the vm.Create function + // enable_create toggles V4State transitions that use the vm.Create function EnableCreate bool `protobuf:"varint,2,opt,name=enable_create,json=enableCreate,proto3" json:"enable_create,omitempty" yaml:"enable_create"` - // enable_call toggles state transitions that use the vm.Call function + // enable_call toggles V4State transitions that use the vm.Call function EnableCall bool `protobuf:"varint,3,opt,name=enable_call,json=enableCall,proto3" json:"enable_call,omitempty" yaml:"enable_call"` // extra_eips defines the additional EIPs for the vm.Config ExtraEIPs ExtraEIPs `protobuf:"bytes,4,opt,name=extra_eips,json=extraEips,proto3" json:"extra_eips" yaml:"extra_eips"` // chain_config defines the EVM chain configuration parameters - ChainConfig ChainConfig `protobuf:"bytes,5,opt,name=chain_config,json=chainConfig,proto3" json:"chain_config" yaml:"chain_config"` + V4ChainConfig V4ChainConfig `protobuf:"bytes,5,opt,name=chain_config,json=V4ChainConfig,proto3" json:"chain_config" yaml:"chain_config"` // allow_unprotected_txs defines if replay-protected (i.e non EIP155 - // signed) transactions can be executed on the state machine. + // signed) transactions can be executed on the V4State machine. AllowUnprotectedTxs bool `protobuf:"varint,6,opt,name=allow_unprotected_txs,json=allowUnprotectedTxs,proto3" json:"allow_unprotected_txs,omitempty"` } @@ -103,11 +103,11 @@ func (m *V4Params) GetExtraEIPs() ExtraEIPs { return ExtraEIPs{} } -func (m *V4Params) GetChainConfig() ChainConfig { +func (m *V4Params) GetV4ChainConfig() V4ChainConfig { if m != nil { - return m.ChainConfig + return m.V4ChainConfig } - return ChainConfig{} + return V4ChainConfig{} } func (m *V4Params) GetAllowUnprotectedTxs() bool { @@ -163,9 +163,9 @@ func (m *ExtraEIPs) GetEIPs() []int64 { return nil } -// ChainConfig defines the Ethereum ChainConfig parameters using *sdk.Int values +// V4ChainConfig defines the Ethereum V4ChainConfig parameters using *sdk.Int values // instead of *big.Int. -type ChainConfig struct { +type V4ChainConfig struct { // homestead_block switch (nil no fork, 0 = already homestead) HomesteadBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=homestead_block,json=homesteadBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"homestead_block,omitempty" yaml:"homestead_block"` // dao_fork_block corresponds to TheDAO hard-fork switch block (nil no fork) @@ -207,18 +207,18 @@ type ChainConfig struct { CancunBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,23,opt,name=cancun_block,json=cancunBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"cancun_block,omitempty" yaml:"cancun_block"` } -func (m *ChainConfig) Reset() { *m = ChainConfig{} } -func (m *ChainConfig) String() string { return proto.CompactTextString(m) } -func (*ChainConfig) ProtoMessage() {} -func (*ChainConfig) Descriptor() ([]byte, []int) { +func (m *V4ChainConfig) Reset() { *m = V4ChainConfig{} } +func (m *V4ChainConfig) String() string { return proto.CompactTextString(m) } +func (*V4ChainConfig) ProtoMessage() {} +func (*V4ChainConfig) Descriptor() ([]byte, []int) { return fileDescriptor_d21ecc92c8c8583e, []int{2} } -func (m *ChainConfig) XXX_Unmarshal(b []byte) error { +func (m *V4ChainConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *ChainConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *V4ChainConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_ChainConfig.Marshal(b, m, deterministic) + return xxx_messageInfo_V4ChainConfig.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -228,52 +228,52 @@ func (m *ChainConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) return b[:n], nil } } -func (m *ChainConfig) XXX_Merge(src proto.Message) { - xxx_messageInfo_ChainConfig.Merge(m, src) +func (m *V4ChainConfig) XXX_Merge(src proto.Message) { + xxx_messageInfo_V4ChainConfig.Merge(m, src) } -func (m *ChainConfig) XXX_Size() int { +func (m *V4ChainConfig) XXX_Size() int { return m.Size() } -func (m *ChainConfig) XXX_DiscardUnknown() { - xxx_messageInfo_ChainConfig.DiscardUnknown(m) +func (m *V4ChainConfig) XXX_DiscardUnknown() { + xxx_messageInfo_V4ChainConfig.DiscardUnknown(m) } -var xxx_messageInfo_ChainConfig proto.InternalMessageInfo +var xxx_messageInfo_V4ChainConfig proto.InternalMessageInfo -func (m *ChainConfig) GetDAOForkSupport() bool { +func (m *V4ChainConfig) GetDAOForkSupport() bool { if m != nil { return m.DAOForkSupport } return false } -func (m *ChainConfig) GetEIP150Hash() string { +func (m *V4ChainConfig) GetEIP150Hash() string { if m != nil { return m.EIP150Hash } return "" } -// State represents a single Storage key value pair item. -type State struct { +// V4State represents a single Storage key value pair item. +type V4State struct { // key is the stored key Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` // value is the stored value for the given key Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` } -func (m *State) Reset() { *m = State{} } -func (m *State) String() string { return proto.CompactTextString(m) } -func (*State) ProtoMessage() {} -func (*State) Descriptor() ([]byte, []int) { +func (m *V4State) Reset() { *m = V4State{} } +func (m *V4State) String() string { return proto.CompactTextString(m) } +func (*V4State) ProtoMessage() {} +func (*V4State) Descriptor() ([]byte, []int) { return fileDescriptor_d21ecc92c8c8583e, []int{3} } -func (m *State) XXX_Unmarshal(b []byte) error { +func (m *V4State) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *State) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *V4State) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_State.Marshal(b, m, deterministic) + return xxx_messageInfo_V4State.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -283,54 +283,54 @@ func (m *State) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (m *State) XXX_Merge(src proto.Message) { - xxx_messageInfo_State.Merge(m, src) +func (m *V4State) XXX_Merge(src proto.Message) { + xxx_messageInfo_V4State.Merge(m, src) } -func (m *State) XXX_Size() int { +func (m *V4State) XXX_Size() int { return m.Size() } -func (m *State) XXX_DiscardUnknown() { - xxx_messageInfo_State.DiscardUnknown(m) +func (m *V4State) XXX_DiscardUnknown() { + xxx_messageInfo_V4State.DiscardUnknown(m) } -var xxx_messageInfo_State proto.InternalMessageInfo +var xxx_messageInfo_V4State proto.InternalMessageInfo -func (m *State) GetKey() string { +func (m *V4State) GetKey() string { if m != nil { return m.Key } return "" } -func (m *State) GetValue() string { +func (m *V4State) GetValue() string { if m != nil { return m.Value } return "" } -// TransactionLogs define the logs generated from a transaction execution +// TransactionV4Logs define the V4Logs generated from a transaction execution // with a given hash. It it used for import/export data as transactions are not -// persisted on blockchain state after an upgrade. -type TransactionLogs struct { +// persisted on blockchain V4State after an upgrade. +type TransactionV4Logs struct { // hash of the transaction Hash string `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"` - // logs is an array of Logs for the given transaction hash - Logs []*Log `protobuf:"bytes,2,rep,name=logs,proto3" json:"logs,omitempty"` + // V4Logs is an array of V4Logs for the given transaction hash + V4Logs []*V4Log `protobuf:"bytes,2,rep,name=V4Logs,proto3" json:"V4Logs,omitempty"` } -func (m *TransactionLogs) Reset() { *m = TransactionLogs{} } -func (m *TransactionLogs) String() string { return proto.CompactTextString(m) } -func (*TransactionLogs) ProtoMessage() {} -func (*TransactionLogs) Descriptor() ([]byte, []int) { +func (m *TransactionV4Logs) Reset() { *m = TransactionV4Logs{} } +func (m *TransactionV4Logs) String() string { return proto.CompactTextString(m) } +func (*TransactionV4Logs) ProtoMessage() {} +func (*TransactionV4Logs) Descriptor() ([]byte, []int) { return fileDescriptor_d21ecc92c8c8583e, []int{4} } -func (m *TransactionLogs) XXX_Unmarshal(b []byte) error { +func (m *TransactionV4Logs) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *TransactionLogs) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *TransactionV4Logs) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_TransactionLogs.Marshal(b, m, deterministic) + return xxx_messageInfo_TransactionV4Logs.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -340,39 +340,39 @@ func (m *TransactionLogs) XXX_Marshal(b []byte, deterministic bool) ([]byte, err return b[:n], nil } } -func (m *TransactionLogs) XXX_Merge(src proto.Message) { - xxx_messageInfo_TransactionLogs.Merge(m, src) +func (m *TransactionV4Logs) XXX_Merge(src proto.Message) { + xxx_messageInfo_TransactionV4Logs.Merge(m, src) } -func (m *TransactionLogs) XXX_Size() int { +func (m *TransactionV4Logs) XXX_Size() int { return m.Size() } -func (m *TransactionLogs) XXX_DiscardUnknown() { - xxx_messageInfo_TransactionLogs.DiscardUnknown(m) +func (m *TransactionV4Logs) XXX_DiscardUnknown() { + xxx_messageInfo_TransactionV4Logs.DiscardUnknown(m) } -var xxx_messageInfo_TransactionLogs proto.InternalMessageInfo +var xxx_messageInfo_TransactionV4Logs proto.InternalMessageInfo -func (m *TransactionLogs) GetHash() string { +func (m *TransactionV4Logs) GetHash() string { if m != nil { return m.Hash } return "" } -func (m *TransactionLogs) GetLogs() []*Log { +func (m *TransactionV4Logs) GetV4Logs() []*V4Log { if m != nil { - return m.Logs + return m.V4Logs } return nil } -// Log represents an protobuf compatible Ethereum Log that defines a contract -// log event. These events are generated by the LOG opcode and stored/indexed by +// V4Log represents an protobuf compatible Ethereum V4Log that defines a contract +// V4Log event. These events are generated by the V4Log opcode and stored/indexed by // the node. // // NOTE: address, topics and data are consensus fields. The rest of the fields // are derived, i.e. filled in by the nodes, but not secured by consensus. -type Log struct { +type V4Log struct { // address of the contract that generated the event Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` // topics is a list of topics provided by the contract. @@ -387,26 +387,26 @@ type Log struct { TxIndex uint64 `protobuf:"varint,6,opt,name=tx_index,json=txIndex,proto3" json:"transactionIndex"` // block_hash of the block in which the transaction was included BlockHash string `protobuf:"bytes,7,opt,name=block_hash,json=blockHash,proto3" json:"blockHash"` - // index of the log in the block - Index uint64 `protobuf:"varint,8,opt,name=index,proto3" json:"logIndex"` - // removed is true if this log was reverted due to a chain - // reorganisation. You must pay attention to this field if you receive logs + // index of the V4Log in the block + Index uint64 `protobuf:"varint,8,opt,name=index,proto3" json:"V4LogIndex"` + // removed is true if this V4Log was reverted due to a chain + // reorganisation. You must pay attention to this field if you receive V4Logs // through a filter query. Removed bool `protobuf:"varint,9,opt,name=removed,proto3" json:"removed,omitempty"` } -func (m *Log) Reset() { *m = Log{} } -func (m *Log) String() string { return proto.CompactTextString(m) } -func (*Log) ProtoMessage() {} -func (*Log) Descriptor() ([]byte, []int) { +func (m *V4Log) Reset() { *m = V4Log{} } +func (m *V4Log) String() string { return proto.CompactTextString(m) } +func (*V4Log) ProtoMessage() {} +func (*V4Log) Descriptor() ([]byte, []int) { return fileDescriptor_d21ecc92c8c8583e, []int{5} } -func (m *Log) XXX_Unmarshal(b []byte) error { +func (m *V4Log) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *Log) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *V4Log) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_Log.Marshal(b, m, deterministic) + return xxx_messageInfo_V4Log.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -416,92 +416,92 @@ func (m *Log) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (m *Log) XXX_Merge(src proto.Message) { - xxx_messageInfo_Log.Merge(m, src) +func (m *V4Log) XXX_Merge(src proto.Message) { + xxx_messageInfo_V4Log.Merge(m, src) } -func (m *Log) XXX_Size() int { +func (m *V4Log) XXX_Size() int { return m.Size() } -func (m *Log) XXX_DiscardUnknown() { - xxx_messageInfo_Log.DiscardUnknown(m) +func (m *V4Log) XXX_DiscardUnknown() { + xxx_messageInfo_V4Log.DiscardUnknown(m) } -var xxx_messageInfo_Log proto.InternalMessageInfo +var xxx_messageInfo_V4Log proto.InternalMessageInfo -func (m *Log) GetAddress() string { +func (m *V4Log) GetAddress() string { if m != nil { return m.Address } return "" } -func (m *Log) GetTopics() []string { +func (m *V4Log) GetTopics() []string { if m != nil { return m.Topics } return nil } -func (m *Log) GetData() []byte { +func (m *V4Log) GetData() []byte { if m != nil { return m.Data } return nil } -func (m *Log) GetBlockNumber() uint64 { +func (m *V4Log) GetBlockNumber() uint64 { if m != nil { return m.BlockNumber } return 0 } -func (m *Log) GetTxHash() string { +func (m *V4Log) GetTxHash() string { if m != nil { return m.TxHash } return "" } -func (m *Log) GetTxIndex() uint64 { +func (m *V4Log) GetTxIndex() uint64 { if m != nil { return m.TxIndex } return 0 } -func (m *Log) GetBlockHash() string { +func (m *V4Log) GetBlockHash() string { if m != nil { return m.BlockHash } return "" } -func (m *Log) GetIndex() uint64 { +func (m *V4Log) GetIndex() uint64 { if m != nil { return m.Index } return 0 } -func (m *Log) GetRemoved() bool { +func (m *V4Log) GetRemoved() bool { if m != nil { return m.Removed } return false } -// TxResult stores results of Tx execution. -type TxResult struct { +// V4TxResult stores results of Tx execution. +type V4TxResult struct { // contract_address contains the ethereum address of the created contract (if - // any). If the state transition is an evm.Call, the contract address will be + // any). If the V4State transition is an evm.Call, the contract address will be // empty. ContractAddress string `protobuf:"bytes,1,opt,name=contract_address,json=contractAddress,proto3" json:"contract_address,omitempty" yaml:"contract_address"` // bloom represents the bloom filter bytes Bloom []byte `protobuf:"bytes,2,opt,name=bloom,proto3" json:"bloom,omitempty"` - // tx_logs contains the transaction hash and the proto-compatible ethereum - // logs. - TxLogs TransactionLogs `protobuf:"bytes,3,opt,name=tx_logs,json=txLogs,proto3" json:"tx_logs" yaml:"tx_logs"` + // tx_V4Logs contains the transaction hash and the proto-compatible ethereum + // V4Logs. + TxV4Logs TransactionV4Logs `protobuf:"bytes,3,opt,name=tx_V4Logs,json=txV4Logs,proto3" json:"tx_V4Logs" yaml:"tx_V4Logs"` // ret defines the bytes from the execution. Ret []byte `protobuf:"bytes,4,opt,name=ret,proto3" json:"ret,omitempty"` // reverted flag is set to true when the call has been reverted @@ -510,18 +510,18 @@ type TxResult struct { GasUsed uint64 `protobuf:"varint,6,opt,name=gas_used,json=gasUsed,proto3" json:"gas_used,omitempty"` } -func (m *TxResult) Reset() { *m = TxResult{} } -func (m *TxResult) String() string { return proto.CompactTextString(m) } -func (*TxResult) ProtoMessage() {} -func (*TxResult) Descriptor() ([]byte, []int) { +func (m *V4TxResult) Reset() { *m = V4TxResult{} } +func (m *V4TxResult) String() string { return proto.CompactTextString(m) } +func (*V4TxResult) ProtoMessage() {} +func (*V4TxResult) Descriptor() ([]byte, []int) { return fileDescriptor_d21ecc92c8c8583e, []int{6} } -func (m *TxResult) XXX_Unmarshal(b []byte) error { +func (m *V4TxResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *TxResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *V4TxResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_TxResult.Marshal(b, m, deterministic) + return xxx_messageInfo_V4TxResult.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -531,38 +531,38 @@ func (m *TxResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (m *TxResult) XXX_Merge(src proto.Message) { - xxx_messageInfo_TxResult.Merge(m, src) +func (m *V4TxResult) XXX_Merge(src proto.Message) { + xxx_messageInfo_V4TxResult.Merge(m, src) } -func (m *TxResult) XXX_Size() int { +func (m *V4TxResult) XXX_Size() int { return m.Size() } -func (m *TxResult) XXX_DiscardUnknown() { - xxx_messageInfo_TxResult.DiscardUnknown(m) +func (m *V4TxResult) XXX_DiscardUnknown() { + xxx_messageInfo_V4TxResult.DiscardUnknown(m) } -var xxx_messageInfo_TxResult proto.InternalMessageInfo +var xxx_messageInfo_V4TxResult proto.InternalMessageInfo -// AccessTuple is the element type of an access list. -type AccessTuple struct { +// V4AccessTuple is the element type of an access list. +type V4AccessTuple struct { // address is a hex formatted ethereum address Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` // storage_keys are hex formatted hashes of the storage keys StorageKeys []string `protobuf:"bytes,2,rep,name=storage_keys,json=storageKeys,proto3" json:"storageKeys"` } -func (m *AccessTuple) Reset() { *m = AccessTuple{} } -func (m *AccessTuple) String() string { return proto.CompactTextString(m) } -func (*AccessTuple) ProtoMessage() {} -func (*AccessTuple) Descriptor() ([]byte, []int) { +func (m *V4AccessTuple) Reset() { *m = V4AccessTuple{} } +func (m *V4AccessTuple) String() string { return proto.CompactTextString(m) } +func (*V4AccessTuple) ProtoMessage() {} +func (*V4AccessTuple) Descriptor() ([]byte, []int) { return fileDescriptor_d21ecc92c8c8583e, []int{7} } -func (m *AccessTuple) XXX_Unmarshal(b []byte) error { +func (m *V4AccessTuple) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *AccessTuple) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *V4AccessTuple) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_AccessTuple.Marshal(b, m, deterministic) + return xxx_messageInfo_V4AccessTuple.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -572,20 +572,20 @@ func (m *AccessTuple) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) return b[:n], nil } } -func (m *AccessTuple) XXX_Merge(src proto.Message) { - xxx_messageInfo_AccessTuple.Merge(m, src) +func (m *V4AccessTuple) XXX_Merge(src proto.Message) { + xxx_messageInfo_V4AccessTuple.Merge(m, src) } -func (m *AccessTuple) XXX_Size() int { +func (m *V4AccessTuple) XXX_Size() int { return m.Size() } -func (m *AccessTuple) XXX_DiscardUnknown() { - xxx_messageInfo_AccessTuple.DiscardUnknown(m) +func (m *V4AccessTuple) XXX_DiscardUnknown() { + xxx_messageInfo_V4AccessTuple.DiscardUnknown(m) } -var xxx_messageInfo_AccessTuple proto.InternalMessageInfo +var xxx_messageInfo_V4AccessTuple proto.InternalMessageInfo -// TraceConfig holds extra parameters to trace functions. -type TraceConfig struct { +// V4TraceConfig holds extra parameters to trace functions. +type V4TraceConfig struct { // tracer is a custom javascript tracer Tracer string `protobuf:"bytes,1,opt,name=tracer,proto3" json:"tracer,omitempty"` // timeout overrides the default timeout of 5 seconds for JavaScript-based tracing @@ -602,7 +602,7 @@ type TraceConfig struct { // limit defines the maximum length of output, but zero means unlimited Limit int32 `protobuf:"varint,9,opt,name=limit,proto3" json:"limit,omitempty"` // overrides can be used to execute a trace using future fork rules - Overrides *ChainConfig `protobuf:"bytes,10,opt,name=overrides,proto3" json:"overrides,omitempty"` + Overrides *V4ChainConfig `protobuf:"bytes,10,opt,name=overrides,proto3" json:"overrides,omitempty"` // enable_memory switches memory capture EnableMemory bool `protobuf:"varint,11,opt,name=enable_memory,json=enableMemory,proto3" json:"enableMemory"` // enable_return_data switches the capture of return data @@ -611,18 +611,18 @@ type TraceConfig struct { TracerJsonConfig string `protobuf:"bytes,13,opt,name=tracer_json_config,json=tracerJsonConfig,proto3" json:"tracerConfig"` } -func (m *TraceConfig) Reset() { *m = TraceConfig{} } -func (m *TraceConfig) String() string { return proto.CompactTextString(m) } -func (*TraceConfig) ProtoMessage() {} -func (*TraceConfig) Descriptor() ([]byte, []int) { +func (m *V4TraceConfig) Reset() { *m = V4TraceConfig{} } +func (m *V4TraceConfig) String() string { return proto.CompactTextString(m) } +func (*V4TraceConfig) ProtoMessage() {} +func (*V4TraceConfig) Descriptor() ([]byte, []int) { return fileDescriptor_d21ecc92c8c8583e, []int{8} } -func (m *TraceConfig) XXX_Unmarshal(b []byte) error { +func (m *V4TraceConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *TraceConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *V4TraceConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_TraceConfig.Marshal(b, m, deterministic) + return xxx_messageInfo_V4TraceConfig.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -632,89 +632,89 @@ func (m *TraceConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) return b[:n], nil } } -func (m *TraceConfig) XXX_Merge(src proto.Message) { - xxx_messageInfo_TraceConfig.Merge(m, src) +func (m *V4TraceConfig) XXX_Merge(src proto.Message) { + xxx_messageInfo_V4TraceConfig.Merge(m, src) } -func (m *TraceConfig) XXX_Size() int { +func (m *V4TraceConfig) XXX_Size() int { return m.Size() } -func (m *TraceConfig) XXX_DiscardUnknown() { - xxx_messageInfo_TraceConfig.DiscardUnknown(m) +func (m *V4TraceConfig) XXX_DiscardUnknown() { + xxx_messageInfo_V4TraceConfig.DiscardUnknown(m) } -var xxx_messageInfo_TraceConfig proto.InternalMessageInfo +var xxx_messageInfo_V4TraceConfig proto.InternalMessageInfo -func (m *TraceConfig) GetTracer() string { +func (m *V4TraceConfig) GetTracer() string { if m != nil { return m.Tracer } return "" } -func (m *TraceConfig) GetTimeout() string { +func (m *V4TraceConfig) GetTimeout() string { if m != nil { return m.Timeout } return "" } -func (m *TraceConfig) GetReexec() uint64 { +func (m *V4TraceConfig) GetReexec() uint64 { if m != nil { return m.Reexec } return 0 } -func (m *TraceConfig) GetDisableStack() bool { +func (m *V4TraceConfig) GetDisableStack() bool { if m != nil { return m.DisableStack } return false } -func (m *TraceConfig) GetDisableStorage() bool { +func (m *V4TraceConfig) GetDisableStorage() bool { if m != nil { return m.DisableStorage } return false } -func (m *TraceConfig) GetDebug() bool { +func (m *V4TraceConfig) GetDebug() bool { if m != nil { return m.Debug } return false } -func (m *TraceConfig) GetLimit() int32 { +func (m *V4TraceConfig) GetLimit() int32 { if m != nil { return m.Limit } return 0 } -func (m *TraceConfig) GetOverrides() *ChainConfig { +func (m *V4TraceConfig) GetOverrides() *V4ChainConfig { if m != nil { return m.Overrides } return nil } -func (m *TraceConfig) GetEnableMemory() bool { +func (m *V4TraceConfig) GetEnableMemory() bool { if m != nil { return m.EnableMemory } return false } -func (m *TraceConfig) GetEnableReturnData() bool { +func (m *V4TraceConfig) GetEnableReturnData() bool { if m != nil { return m.EnableReturnData } return false } -func (m *TraceConfig) GetTracerJsonConfig() string { +func (m *V4TraceConfig) GetTracerJsonConfig() string { if m != nil { return m.TracerJsonConfig } @@ -724,13 +724,13 @@ func (m *TraceConfig) GetTracerJsonConfig() string { func init() { proto.RegisterType((*V4Params)(nil), "ethermint.evm.v1.V4Params") proto.RegisterType((*ExtraEIPs)(nil), "ethermint.evm.v1.ExtraEIPs") - proto.RegisterType((*ChainConfig)(nil), "ethermint.evm.v1.ChainConfig") - proto.RegisterType((*State)(nil), "ethermint.evm.v1.State") - proto.RegisterType((*TransactionLogs)(nil), "ethermint.evm.v1.TransactionLogs") - proto.RegisterType((*Log)(nil), "ethermint.evm.v1.Log") - proto.RegisterType((*TxResult)(nil), "ethermint.evm.v1.TxResult") - proto.RegisterType((*AccessTuple)(nil), "ethermint.evm.v1.AccessTuple") - proto.RegisterType((*TraceConfig)(nil), "ethermint.evm.v1.TraceConfig") + proto.RegisterType((*V4ChainConfig)(nil), "ethermint.evm.v1.V4ChainConfig") + proto.RegisterType((*V4State)(nil), "ethermint.evm.v1.V4State") + proto.RegisterType((*TransactionV4Logs)(nil), "ethermint.evm.v1.TransactionV4Logs") + proto.RegisterType((*V4Log)(nil), "ethermint.evm.v1.V4Log") + proto.RegisterType((*V4TxResult)(nil), "ethermint.evm.v1.V4TxResult") + proto.RegisterType((*V4AccessTuple)(nil), "ethermint.evm.v1.V4AccessTuple") + proto.RegisterType((*V4TraceConfig)(nil), "ethermint.evm.v1.V4TraceConfig") } func init() { proto.RegisterFile("ethermint/evm/v1/evm.proto", fileDescriptor_d21ecc92c8c8583e) } @@ -873,7 +873,7 @@ func (m *V4Params) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x30 } { - size, err := m.ChainConfig.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.V4ChainConfig.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -964,7 +964,7 @@ func (m *ExtraEIPs) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *ChainConfig) Marshal() (dAtA []byte, err error) { +func (m *V4ChainConfig) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -974,12 +974,12 @@ func (m *ChainConfig) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *ChainConfig) MarshalTo(dAtA []byte) (int, error) { +func (m *V4ChainConfig) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ChainConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *V4ChainConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1220,7 +1220,7 @@ func (m *ChainConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *State) Marshal() (dAtA []byte, err error) { +func (m *V4State) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1230,12 +1230,12 @@ func (m *State) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *State) MarshalTo(dAtA []byte) (int, error) { +func (m *V4State) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *State) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *V4State) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1257,7 +1257,7 @@ func (m *State) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *TransactionLogs) Marshal() (dAtA []byte, err error) { +func (m *TransactionV4Logs) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1267,20 +1267,20 @@ func (m *TransactionLogs) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *TransactionLogs) MarshalTo(dAtA []byte) (int, error) { +func (m *TransactionV4Logs) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *TransactionLogs) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *TransactionV4Logs) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.Logs) > 0 { - for iNdEx := len(m.Logs) - 1; iNdEx >= 0; iNdEx-- { + if len(m.V4Logs) > 0 { + for iNdEx := len(m.V4Logs) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.Logs[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.V4Logs[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -1301,7 +1301,7 @@ func (m *TransactionLogs) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *Log) Marshal() (dAtA []byte, err error) { +func (m *V4Log) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1311,12 +1311,12 @@ func (m *Log) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *Log) MarshalTo(dAtA []byte) (int, error) { +func (m *V4Log) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *Log) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *V4Log) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1386,7 +1386,7 @@ func (m *Log) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *TxResult) Marshal() (dAtA []byte, err error) { +func (m *V4TxResult) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1396,12 +1396,12 @@ func (m *TxResult) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *TxResult) MarshalTo(dAtA []byte) (int, error) { +func (m *V4TxResult) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *TxResult) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *V4TxResult) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1429,7 +1429,7 @@ func (m *TxResult) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x22 } { - size, err := m.TxLogs.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.TxV4Logs.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -1455,7 +1455,7 @@ func (m *TxResult) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *AccessTuple) Marshal() (dAtA []byte, err error) { +func (m *V4AccessTuple) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1465,12 +1465,12 @@ func (m *AccessTuple) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *AccessTuple) MarshalTo(dAtA []byte) (int, error) { +func (m *V4AccessTuple) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *AccessTuple) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *V4AccessTuple) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1494,7 +1494,7 @@ func (m *AccessTuple) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *TraceConfig) Marshal() (dAtA []byte, err error) { +func (m *V4TraceConfig) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1504,12 +1504,12 @@ func (m *TraceConfig) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *TraceConfig) MarshalTo(dAtA []byte) (int, error) { +func (m *V4TraceConfig) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *TraceConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *V4TraceConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1639,7 +1639,7 @@ func (m *V4Params) Size() (n int) { } l = m.ExtraEIPs.Size() n += 1 + l + sovEvm(uint64(l)) - l = m.ChainConfig.Size() + l = m.V4ChainConfig.Size() n += 1 + l + sovEvm(uint64(l)) if m.AllowUnprotectedTxs { n += 2 @@ -1663,7 +1663,7 @@ func (m *ExtraEIPs) Size() (n int) { return n } -func (m *ChainConfig) Size() (n int) { +func (m *V4ChainConfig) Size() (n int) { if m == nil { return 0 } @@ -1747,7 +1747,7 @@ func (m *ChainConfig) Size() (n int) { return n } -func (m *State) Size() (n int) { +func (m *V4State) Size() (n int) { if m == nil { return 0 } @@ -1764,7 +1764,7 @@ func (m *State) Size() (n int) { return n } -func (m *TransactionLogs) Size() (n int) { +func (m *TransactionV4Logs) Size() (n int) { if m == nil { return 0 } @@ -1774,8 +1774,8 @@ func (m *TransactionLogs) Size() (n int) { if l > 0 { n += 1 + l + sovEvm(uint64(l)) } - if len(m.Logs) > 0 { - for _, e := range m.Logs { + if len(m.V4Logs) > 0 { + for _, e := range m.V4Logs { l = e.Size() n += 1 + l + sovEvm(uint64(l)) } @@ -1783,7 +1783,7 @@ func (m *TransactionLogs) Size() (n int) { return n } -func (m *Log) Size() (n int) { +func (m *V4Log) Size() (n int) { if m == nil { return 0 } @@ -1826,7 +1826,7 @@ func (m *Log) Size() (n int) { return n } -func (m *TxResult) Size() (n int) { +func (m *V4TxResult) Size() (n int) { if m == nil { return 0 } @@ -1840,7 +1840,7 @@ func (m *TxResult) Size() (n int) { if l > 0 { n += 1 + l + sovEvm(uint64(l)) } - l = m.TxLogs.Size() + l = m.TxV4Logs.Size() n += 1 + l + sovEvm(uint64(l)) l = len(m.Ret) if l > 0 { @@ -1855,7 +1855,7 @@ func (m *TxResult) Size() (n int) { return n } -func (m *AccessTuple) Size() (n int) { +func (m *V4AccessTuple) Size() (n int) { if m == nil { return 0 } @@ -1874,7 +1874,7 @@ func (m *AccessTuple) Size() (n int) { return n } -func (m *TraceConfig) Size() (n int) { +func (m *V4TraceConfig) Size() (n int) { if m == nil { return 0 } @@ -2062,7 +2062,7 @@ func (m *V4Params) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 5: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ChainConfig", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field V4ChainConfig", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -2089,7 +2089,7 @@ func (m *V4Params) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.ChainConfig.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.V4ChainConfig.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -2260,7 +2260,7 @@ func (m *ExtraEIPs) Unmarshal(dAtA []byte) error { } return nil } -func (m *ChainConfig) Unmarshal(dAtA []byte) error { +func (m *V4ChainConfig) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2283,10 +2283,10 @@ func (m *ChainConfig) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: ChainConfig: wiretype end group for non-group") + return fmt.Errorf("proto: V4ChainConfig: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: ChainConfig: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: V4ChainConfig: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -2974,7 +2974,7 @@ func (m *ChainConfig) Unmarshal(dAtA []byte) error { } return nil } -func (m *State) Unmarshal(dAtA []byte) error { +func (m *V4State) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2997,10 +2997,10 @@ func (m *State) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: State: wiretype end group for non-group") + return fmt.Errorf("proto: V4State: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: State: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: V4State: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3088,7 +3088,7 @@ func (m *State) Unmarshal(dAtA []byte) error { } return nil } -func (m *TransactionLogs) Unmarshal(dAtA []byte) error { +func (m *TransactionV4Logs) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3111,10 +3111,10 @@ func (m *TransactionLogs) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: TransactionLogs: wiretype end group for non-group") + return fmt.Errorf("proto: TransactionV4Logs: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: TransactionLogs: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: TransactionV4Logs: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3151,7 +3151,7 @@ func (m *TransactionLogs) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Logs", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field V4Logs", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -3178,8 +3178,8 @@ func (m *TransactionLogs) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Logs = append(m.Logs, &Log{}) - if err := m.Logs[len(m.Logs)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.V4Logs = append(m.V4Logs, &V4Log{}) + if err := m.V4Logs[len(m.V4Logs)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -3204,7 +3204,7 @@ func (m *TransactionLogs) Unmarshal(dAtA []byte) error { } return nil } -func (m *Log) Unmarshal(dAtA []byte) error { +func (m *V4Log) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3227,10 +3227,10 @@ func (m *Log) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: Log: wiretype end group for non-group") + return fmt.Errorf("proto: V4Log: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: Log: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: V4Log: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3493,7 +3493,7 @@ func (m *Log) Unmarshal(dAtA []byte) error { } return nil } -func (m *TxResult) Unmarshal(dAtA []byte) error { +func (m *V4TxResult) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3516,10 +3516,10 @@ func (m *TxResult) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: TxResult: wiretype end group for non-group") + return fmt.Errorf("proto: V4TxResult: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: TxResult: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: V4TxResult: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3590,7 +3590,7 @@ func (m *TxResult) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TxLogs", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TxV4Logs", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -3617,7 +3617,7 @@ func (m *TxResult) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.TxLogs.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.TxV4Logs.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -3715,7 +3715,7 @@ func (m *TxResult) Unmarshal(dAtA []byte) error { } return nil } -func (m *AccessTuple) Unmarshal(dAtA []byte) error { +func (m *V4AccessTuple) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3738,10 +3738,10 @@ func (m *AccessTuple) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: AccessTuple: wiretype end group for non-group") + return fmt.Errorf("proto: V4AccessTuple: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: AccessTuple: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: V4AccessTuple: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3829,7 +3829,7 @@ func (m *AccessTuple) Unmarshal(dAtA []byte) error { } return nil } -func (m *TraceConfig) Unmarshal(dAtA []byte) error { +func (m *V4TraceConfig) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3852,10 +3852,10 @@ func (m *TraceConfig) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: TraceConfig: wiretype end group for non-group") + return fmt.Errorf("proto: V4TraceConfig: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: TraceConfig: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: V4TraceConfig: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -4050,7 +4050,7 @@ func (m *TraceConfig) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Overrides == nil { - m.Overrides = &ChainConfig{} + m.Overrides = &V4ChainConfig{} } if err := m.Overrides.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err