diff --git a/CHANGELOG.md b/CHANGELOG.md index b22b4c30b..5df6215c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ ### FEATURES - [\#346](https://github.com/cosmos/evm/pull/346) Add eth_createAccessList method and implementation +- [\#502](https://github.com/cosmos/evm/pull/502) Add block time in derived logs. ### STATE BREAKING diff --git a/api/cosmos/evm/vm/v1/evm.pulsar.go b/api/cosmos/evm/vm/v1/evm.pulsar.go index 9026cb946..7980ded78 100644 --- a/api/cosmos/evm/vm/v1/evm.pulsar.go +++ b/api/cosmos/evm/vm/v1/evm.pulsar.go @@ -4995,16 +4995,17 @@ func (x *_Log_2_list) IsValid() bool { } var ( - md_Log protoreflect.MessageDescriptor - fd_Log_address protoreflect.FieldDescriptor - fd_Log_topics protoreflect.FieldDescriptor - fd_Log_data protoreflect.FieldDescriptor - fd_Log_block_number protoreflect.FieldDescriptor - fd_Log_tx_hash protoreflect.FieldDescriptor - fd_Log_tx_index protoreflect.FieldDescriptor - fd_Log_block_hash protoreflect.FieldDescriptor - fd_Log_index protoreflect.FieldDescriptor - fd_Log_removed protoreflect.FieldDescriptor + md_Log protoreflect.MessageDescriptor + fd_Log_address protoreflect.FieldDescriptor + fd_Log_topics protoreflect.FieldDescriptor + fd_Log_data protoreflect.FieldDescriptor + fd_Log_block_number protoreflect.FieldDescriptor + fd_Log_tx_hash protoreflect.FieldDescriptor + fd_Log_tx_index protoreflect.FieldDescriptor + fd_Log_block_hash protoreflect.FieldDescriptor + fd_Log_index protoreflect.FieldDescriptor + fd_Log_removed protoreflect.FieldDescriptor + fd_Log_block_timestamp protoreflect.FieldDescriptor ) func init() { @@ -5019,6 +5020,7 @@ func init() { fd_Log_block_hash = md_Log.Fields().ByName("block_hash") fd_Log_index = md_Log.Fields().ByName("index") fd_Log_removed = md_Log.Fields().ByName("removed") + fd_Log_block_timestamp = md_Log.Fields().ByName("block_timestamp") } var _ protoreflect.Message = (*fastReflection_Log)(nil) @@ -5140,6 +5142,12 @@ func (x *fastReflection_Log) Range(f func(protoreflect.FieldDescriptor, protoref return } } + if x.BlockTimestamp != uint64(0) { + value := protoreflect.ValueOfUint64(x.BlockTimestamp) + if !f(fd_Log_block_timestamp, value) { + return + } + } } // Has reports whether a field is populated. @@ -5173,6 +5181,8 @@ func (x *fastReflection_Log) Has(fd protoreflect.FieldDescriptor) bool { return x.Index != uint64(0) case "cosmos.evm.vm.v1.Log.removed": return x.Removed != false + case "cosmos.evm.vm.v1.Log.block_timestamp": + return x.BlockTimestamp != uint64(0) default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.evm.vm.v1.Log")) @@ -5207,6 +5217,8 @@ func (x *fastReflection_Log) Clear(fd protoreflect.FieldDescriptor) { x.Index = uint64(0) case "cosmos.evm.vm.v1.Log.removed": x.Removed = false + case "cosmos.evm.vm.v1.Log.block_timestamp": + x.BlockTimestamp = uint64(0) default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.evm.vm.v1.Log")) @@ -5253,6 +5265,9 @@ func (x *fastReflection_Log) Get(descriptor protoreflect.FieldDescriptor) protor case "cosmos.evm.vm.v1.Log.removed": value := x.Removed return protoreflect.ValueOfBool(value) + case "cosmos.evm.vm.v1.Log.block_timestamp": + value := x.BlockTimestamp + return protoreflect.ValueOfUint64(value) default: if descriptor.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.evm.vm.v1.Log")) @@ -5293,6 +5308,8 @@ func (x *fastReflection_Log) Set(fd protoreflect.FieldDescriptor, value protoref x.Index = value.Uint() case "cosmos.evm.vm.v1.Log.removed": x.Removed = value.Bool() + case "cosmos.evm.vm.v1.Log.block_timestamp": + x.BlockTimestamp = value.Uint() default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.evm.vm.v1.Log")) @@ -5335,6 +5352,8 @@ func (x *fastReflection_Log) Mutable(fd protoreflect.FieldDescriptor) protorefle panic(fmt.Errorf("field index of message cosmos.evm.vm.v1.Log is not mutable")) case "cosmos.evm.vm.v1.Log.removed": panic(fmt.Errorf("field removed of message cosmos.evm.vm.v1.Log is not mutable")) + case "cosmos.evm.vm.v1.Log.block_timestamp": + panic(fmt.Errorf("field block_timestamp of message cosmos.evm.vm.v1.Log is not mutable")) default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.evm.vm.v1.Log")) @@ -5367,6 +5386,8 @@ func (x *fastReflection_Log) NewField(fd protoreflect.FieldDescriptor) protorefl return protoreflect.ValueOfUint64(uint64(0)) case "cosmos.evm.vm.v1.Log.removed": return protoreflect.ValueOfBool(false) + case "cosmos.evm.vm.v1.Log.block_timestamp": + return protoreflect.ValueOfUint64(uint64(0)) default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.evm.vm.v1.Log")) @@ -5470,6 +5491,9 @@ func (x *fastReflection_Log) ProtoMethods() *protoiface.Methods { if x.Removed { n += 2 } + if x.BlockTimestamp != 0 { + n += 1 + runtime.Sov(uint64(x.BlockTimestamp)) + } if x.unknownFields != nil { n += len(x.unknownFields) } @@ -5499,6 +5523,11 @@ func (x *fastReflection_Log) ProtoMethods() *protoiface.Methods { i -= len(x.unknownFields) copy(dAtA[i:], x.unknownFields) } + if x.BlockTimestamp != 0 { + i = runtime.EncodeVarint(dAtA, i, uint64(x.BlockTimestamp)) + i-- + dAtA[i] = 0x50 + } if x.Removed { i-- if x.Removed { @@ -5849,6 +5878,25 @@ func (x *fastReflection_Log) ProtoMethods() *protoiface.Methods { } } x.Removed = bool(v != 0) + case 10: + if wireType != 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field BlockTimestamp", wireType) + } + x.BlockTimestamp = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow + } + if iNdEx >= l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + x.BlockTimestamp |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := runtime.Skip(dAtA[iNdEx:]) @@ -9330,6 +9378,8 @@ type Log struct { // reorganisation. You must pay attention to this field if you receive logs // through a filter query. Removed bool `protobuf:"varint,9,opt,name=removed,proto3" json:"removed,omitempty"` + // block_timestamp is the timestamp of the block in which the transaction was + BlockTimestamp uint64 `protobuf:"varint,10,opt,name=block_timestamp,json=blockTimestamp,proto3" json:"block_timestamp,omitempty"` } func (x *Log) Reset() { @@ -9415,6 +9465,13 @@ func (x *Log) GetRemoved() bool { return false } +func (x *Log) GetBlockTimestamp() uint64 { + if x != nil { + return x.BlockTimestamp + } + return 0 +} + // TxResult stores results of Tx execution. type TxResult struct { state protoimpl.MessageState @@ -9928,7 +9985,7 @@ var file_cosmos_evm_vm_v1_evm_proto_rawDesc = []byte{ 0x04, 0x68, 0x61, 0x73, 0x68, 0x12, 0x29, 0x0a, 0x04, 0x6c, 0x6f, 0x67, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x65, 0x76, 0x6d, 0x2e, 0x76, 0x6d, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x6f, 0x67, 0x52, 0x04, 0x6c, 0x6f, 0x67, 0x73, - 0x22, 0xca, 0x02, 0x0a, 0x03, 0x4c, 0x6f, 0x67, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, + 0x22, 0x87, 0x03, 0x0a, 0x03, 0x4c, 0x6f, 0x67, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, @@ -9948,93 +10005,97 @@ var file_cosmos_evm_vm_v1_evm_proto_rawDesc = []byte{ 0x22, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x08, 0x20, 0x01, 0x28, 0x04, 0x42, 0x0c, 0xea, 0xde, 0x1f, 0x08, 0x6c, 0x6f, 0x67, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x18, 0x09, - 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x22, 0x90, 0x02, - 0x0a, 0x08, 0x54, 0x78, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x46, 0x0a, 0x10, 0x63, 0x6f, - 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x42, 0x1b, 0xf2, 0xde, 0x1f, 0x17, 0x79, 0x61, 0x6d, 0x6c, 0x3a, 0x22, - 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, - 0x22, 0x52, 0x0f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, - 0x73, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6c, 0x6f, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0c, 0x52, 0x05, 0x62, 0x6c, 0x6f, 0x6f, 0x6d, 0x12, 0x57, 0x0a, 0x07, 0x74, 0x78, 0x5f, 0x6c, - 0x6f, 0x67, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x63, 0x6f, 0x73, 0x6d, - 0x6f, 0x73, 0x2e, 0x65, 0x76, 0x6d, 0x2e, 0x76, 0x6d, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x61, - 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x6f, 0x67, 0x73, 0x42, 0x1b, 0xc8, 0xde, - 0x1f, 0x00, 0xf2, 0xde, 0x1f, 0x0e, 0x79, 0x61, 0x6d, 0x6c, 0x3a, 0x22, 0x74, 0x78, 0x5f, 0x6c, - 0x6f, 0x67, 0x73, 0x22, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x06, 0x74, 0x78, 0x4c, 0x6f, 0x67, - 0x73, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x03, - 0x72, 0x65, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x76, 0x65, 0x72, 0x74, 0x65, 0x64, 0x18, - 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x72, 0x65, 0x76, 0x65, 0x72, 0x74, 0x65, 0x64, 0x12, - 0x19, 0x0a, 0x08, 0x67, 0x61, 0x73, 0x5f, 0x75, 0x73, 0x65, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, - 0x04, 0x52, 0x07, 0x67, 0x61, 0x73, 0x55, 0x73, 0x65, 0x64, 0x3a, 0x04, 0x88, 0xa0, 0x1f, 0x00, - 0x22, 0x61, 0x0a, 0x0b, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x54, 0x75, 0x70, 0x6c, 0x65, 0x12, - 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x32, 0x0a, 0x0c, 0x73, 0x74, 0x6f, - 0x72, 0x61, 0x67, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x42, - 0x0f, 0xea, 0xde, 0x1f, 0x0b, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x4b, 0x65, 0x79, 0x73, - 0x52, 0x0b, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x4b, 0x65, 0x79, 0x73, 0x3a, 0x04, 0x88, - 0xa0, 0x1f, 0x00, 0x22, 0xa0, 0x04, 0x0a, 0x0b, 0x54, 0x72, 0x61, 0x63, 0x65, 0x43, 0x6f, 0x6e, - 0x66, 0x69, 0x67, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x72, 0x61, 0x63, 0x65, 0x72, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x72, 0x61, 0x63, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x74, - 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x69, - 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x65, 0x78, 0x65, 0x63, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x72, 0x65, 0x65, 0x78, 0x65, 0x63, 0x12, 0x35, 0x0a, - 0x0d, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x18, 0x05, - 0x20, 0x01, 0x28, 0x08, 0x42, 0x10, 0xea, 0xde, 0x1f, 0x0c, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, - 0x65, 0x53, 0x74, 0x61, 0x63, 0x6b, 0x52, 0x0c, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x53, - 0x74, 0x61, 0x63, 0x6b, 0x12, 0x3b, 0x0a, 0x0f, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, - 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x42, 0x12, 0xea, - 0xde, 0x1f, 0x0e, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, - 0x65, 0x52, 0x0e, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, - 0x65, 0x12, 0x14, 0x0a, 0x05, 0x64, 0x65, 0x62, 0x75, 0x67, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, - 0x52, 0x05, 0x64, 0x65, 0x62, 0x75, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, - 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x3b, 0x0a, - 0x09, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x1d, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x65, 0x76, 0x6d, 0x2e, 0x76, 0x6d, - 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, - 0x09, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x73, 0x12, 0x35, 0x0a, 0x0d, 0x65, 0x6e, - 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, - 0x08, 0x42, 0x10, 0xea, 0xde, 0x1f, 0x0c, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x4d, 0x65, 0x6d, - 0x6f, 0x72, 0x79, 0x52, 0x0c, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x72, - 0x79, 0x12, 0x42, 0x0a, 0x12, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x72, 0x65, 0x74, 0x75, - 0x72, 0x6e, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x42, 0x14, 0xea, - 0xde, 0x1f, 0x10, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x44, - 0x61, 0x74, 0x61, 0x52, 0x10, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x74, 0x75, 0x72, - 0x6e, 0x44, 0x61, 0x74, 0x61, 0x12, 0x3e, 0x0a, 0x12, 0x74, 0x72, 0x61, 0x63, 0x65, 0x72, 0x5f, - 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x0d, 0x20, 0x01, 0x28, - 0x09, 0x42, 0x10, 0xea, 0xde, 0x1f, 0x0c, 0x74, 0x72, 0x61, 0x63, 0x65, 0x72, 0x43, 0x6f, 0x6e, - 0x66, 0x69, 0x67, 0x52, 0x10, 0x74, 0x72, 0x61, 0x63, 0x65, 0x72, 0x4a, 0x73, 0x6f, 0x6e, 0x43, - 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05, 0x4a, 0x04, 0x08, 0x07, 0x10, - 0x08, 0x52, 0x0e, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6d, 0x65, 0x6d, 0x6f, 0x72, - 0x79, 0x52, 0x13, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x72, 0x65, 0x74, 0x75, 0x72, - 0x6e, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x22, 0x4e, 0x0a, 0x0a, 0x50, 0x72, 0x65, 0x69, 0x6e, 0x73, - 0x74, 0x61, 0x6c, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, - 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, - 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x2a, 0xc0, 0x01, 0x0a, 0x0a, 0x41, 0x63, 0x63, 0x65, 0x73, - 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x3c, 0x0a, 0x1a, 0x41, 0x43, 0x43, 0x45, 0x53, 0x53, 0x5f, - 0x54, 0x59, 0x50, 0x45, 0x5f, 0x50, 0x45, 0x52, 0x4d, 0x49, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x4c, - 0x45, 0x53, 0x53, 0x10, 0x00, 0x1a, 0x1c, 0x8a, 0x9d, 0x20, 0x18, 0x41, 0x63, 0x63, 0x65, 0x73, - 0x73, 0x54, 0x79, 0x70, 0x65, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x6c, - 0x65, 0x73, 0x73, 0x12, 0x34, 0x0a, 0x16, 0x41, 0x43, 0x43, 0x45, 0x53, 0x53, 0x5f, 0x54, 0x59, - 0x50, 0x45, 0x5f, 0x52, 0x45, 0x53, 0x54, 0x52, 0x49, 0x43, 0x54, 0x45, 0x44, 0x10, 0x01, 0x1a, - 0x18, 0x8a, 0x9d, 0x20, 0x14, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x54, 0x79, 0x70, 0x65, 0x52, - 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x65, 0x64, 0x12, 0x38, 0x0a, 0x18, 0x41, 0x43, 0x43, - 0x45, 0x53, 0x53, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x50, 0x45, 0x52, 0x4d, 0x49, 0x53, 0x53, - 0x49, 0x4f, 0x4e, 0x45, 0x44, 0x10, 0x02, 0x1a, 0x1a, 0x8a, 0x9d, 0x20, 0x16, 0x41, 0x63, 0x63, - 0x65, 0x73, 0x73, 0x54, 0x79, 0x70, 0x65, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, - 0x6e, 0x65, 0x64, 0x1a, 0x04, 0x88, 0xa3, 0x1e, 0x00, 0x42, 0xab, 0x01, 0x0a, 0x14, 0x63, 0x6f, - 0x6d, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x65, 0x76, 0x6d, 0x2e, 0x76, 0x6d, 0x2e, - 0x76, 0x31, 0x42, 0x08, 0x45, 0x76, 0x6d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x26, - 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, - 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x65, 0x76, 0x6d, 0x2f, 0x76, 0x6d, 0x2f, 0x76, - 0x31, 0x3b, 0x76, 0x6d, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x45, 0x56, 0xaa, 0x02, 0x10, 0x43, - 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x45, 0x76, 0x6d, 0x2e, 0x56, 0x6d, 0x2e, 0x56, 0x31, 0xca, - 0x02, 0x10, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x45, 0x76, 0x6d, 0x5c, 0x56, 0x6d, 0x5c, - 0x56, 0x31, 0xe2, 0x02, 0x1c, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x45, 0x76, 0x6d, 0x5c, - 0x56, 0x6d, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, - 0x61, 0xea, 0x02, 0x13, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x3a, 0x3a, 0x45, 0x76, 0x6d, 0x3a, - 0x3a, 0x56, 0x6d, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x12, 0x3b, 0x0a, + 0x0f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, + 0x18, 0x0a, 0x20, 0x01, 0x28, 0x04, 0x42, 0x12, 0xea, 0xde, 0x1f, 0x0e, 0x62, 0x6c, 0x6f, 0x63, + 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0e, 0x62, 0x6c, 0x6f, 0x63, + 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0x90, 0x02, 0x0a, 0x08, 0x54, + 0x78, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x46, 0x0a, 0x10, 0x63, 0x6f, 0x6e, 0x74, 0x72, + 0x61, 0x63, 0x74, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x42, 0x1b, 0xf2, 0xde, 0x1f, 0x17, 0x79, 0x61, 0x6d, 0x6c, 0x3a, 0x22, 0x63, 0x6f, 0x6e, + 0x74, 0x72, 0x61, 0x63, 0x74, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0x52, 0x0f, + 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, + 0x14, 0x0a, 0x05, 0x62, 0x6c, 0x6f, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, + 0x62, 0x6c, 0x6f, 0x6f, 0x6d, 0x12, 0x57, 0x0a, 0x07, 0x74, 0x78, 0x5f, 0x6c, 0x6f, 0x67, 0x73, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, + 0x65, 0x76, 0x6d, 0x2e, 0x76, 0x6d, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x6f, 0x67, 0x73, 0x42, 0x1b, 0xc8, 0xde, 0x1f, 0x00, 0xf2, + 0xde, 0x1f, 0x0e, 0x79, 0x61, 0x6d, 0x6c, 0x3a, 0x22, 0x74, 0x78, 0x5f, 0x6c, 0x6f, 0x67, 0x73, + 0x22, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x06, 0x74, 0x78, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x10, + 0x0a, 0x03, 0x72, 0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x03, 0x72, 0x65, 0x74, + 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x76, 0x65, 0x72, 0x74, 0x65, 0x64, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x08, 0x72, 0x65, 0x76, 0x65, 0x72, 0x74, 0x65, 0x64, 0x12, 0x19, 0x0a, 0x08, + 0x67, 0x61, 0x73, 0x5f, 0x75, 0x73, 0x65, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x04, 0x52, 0x07, + 0x67, 0x61, 0x73, 0x55, 0x73, 0x65, 0x64, 0x3a, 0x04, 0x88, 0xa0, 0x1f, 0x00, 0x22, 0x61, 0x0a, + 0x0b, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x54, 0x75, 0x70, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, + 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, + 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x32, 0x0a, 0x0c, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, + 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x42, 0x0f, 0xea, 0xde, + 0x1f, 0x0b, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x4b, 0x65, 0x79, 0x73, 0x52, 0x0b, 0x73, + 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x4b, 0x65, 0x79, 0x73, 0x3a, 0x04, 0x88, 0xa0, 0x1f, 0x00, + 0x22, 0xa0, 0x04, 0x0a, 0x0b, 0x54, 0x72, 0x61, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, + 0x12, 0x16, 0x0a, 0x06, 0x74, 0x72, 0x61, 0x63, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x06, 0x74, 0x72, 0x61, 0x63, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, + 0x6f, 0x75, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, + 0x75, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x65, 0x78, 0x65, 0x63, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x04, 0x52, 0x06, 0x72, 0x65, 0x65, 0x78, 0x65, 0x63, 0x12, 0x35, 0x0a, 0x0d, 0x64, 0x69, + 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x08, 0x42, 0x10, 0xea, 0xde, 0x1f, 0x0c, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, + 0x61, 0x63, 0x6b, 0x52, 0x0c, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x63, + 0x6b, 0x12, 0x3b, 0x0a, 0x0f, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x73, 0x74, 0x6f, + 0x72, 0x61, 0x67, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x42, 0x12, 0xea, 0xde, 0x1f, 0x0e, + 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x52, 0x0e, + 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x12, 0x14, + 0x0a, 0x05, 0x64, 0x65, 0x62, 0x75, 0x67, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x64, + 0x65, 0x62, 0x75, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x09, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x3b, 0x0a, 0x09, 0x6f, 0x76, + 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, + 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x65, 0x76, 0x6d, 0x2e, 0x76, 0x6d, 0x2e, 0x76, 0x31, + 0x2e, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x09, 0x6f, 0x76, + 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x73, 0x12, 0x35, 0x0a, 0x0d, 0x65, 0x6e, 0x61, 0x62, 0x6c, + 0x65, 0x5f, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x42, 0x10, + 0xea, 0xde, 0x1f, 0x0c, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, + 0x52, 0x0c, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x12, 0x42, + 0x0a, 0x12, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x5f, + 0x64, 0x61, 0x74, 0x61, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x42, 0x14, 0xea, 0xde, 0x1f, 0x10, + 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x44, 0x61, 0x74, 0x61, + 0x52, 0x10, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x44, 0x61, + 0x74, 0x61, 0x12, 0x3e, 0x0a, 0x12, 0x74, 0x72, 0x61, 0x63, 0x65, 0x72, 0x5f, 0x6a, 0x73, 0x6f, + 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x42, 0x10, + 0xea, 0xde, 0x1f, 0x0c, 0x74, 0x72, 0x61, 0x63, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, + 0x52, 0x10, 0x74, 0x72, 0x61, 0x63, 0x65, 0x72, 0x4a, 0x73, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, + 0x69, 0x67, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05, 0x4a, 0x04, 0x08, 0x07, 0x10, 0x08, 0x52, 0x0e, + 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x52, 0x13, + 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x5f, 0x64, + 0x61, 0x74, 0x61, 0x22, 0x4e, 0x0a, 0x0a, 0x50, 0x72, 0x65, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, + 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, + 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, + 0x6f, 0x64, 0x65, 0x2a, 0xc0, 0x01, 0x0a, 0x0a, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x54, 0x79, + 0x70, 0x65, 0x12, 0x3c, 0x0a, 0x1a, 0x41, 0x43, 0x43, 0x45, 0x53, 0x53, 0x5f, 0x54, 0x59, 0x50, + 0x45, 0x5f, 0x50, 0x45, 0x52, 0x4d, 0x49, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x4c, 0x45, 0x53, 0x53, + 0x10, 0x00, 0x1a, 0x1c, 0x8a, 0x9d, 0x20, 0x18, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x54, 0x79, + 0x70, 0x65, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x6c, 0x65, 0x73, 0x73, + 0x12, 0x34, 0x0a, 0x16, 0x41, 0x43, 0x43, 0x45, 0x53, 0x53, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, + 0x52, 0x45, 0x53, 0x54, 0x52, 0x49, 0x43, 0x54, 0x45, 0x44, 0x10, 0x01, 0x1a, 0x18, 0x8a, 0x9d, + 0x20, 0x14, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x54, 0x79, 0x70, 0x65, 0x52, 0x65, 0x73, 0x74, + 0x72, 0x69, 0x63, 0x74, 0x65, 0x64, 0x12, 0x38, 0x0a, 0x18, 0x41, 0x43, 0x43, 0x45, 0x53, 0x53, + 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x50, 0x45, 0x52, 0x4d, 0x49, 0x53, 0x53, 0x49, 0x4f, 0x4e, + 0x45, 0x44, 0x10, 0x02, 0x1a, 0x1a, 0x8a, 0x9d, 0x20, 0x16, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, + 0x54, 0x79, 0x70, 0x65, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x64, + 0x1a, 0x04, 0x88, 0xa3, 0x1e, 0x00, 0x42, 0xab, 0x01, 0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x2e, 0x63, + 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x65, 0x76, 0x6d, 0x2e, 0x76, 0x6d, 0x2e, 0x76, 0x31, 0x42, + 0x08, 0x45, 0x76, 0x6d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x26, 0x63, 0x6f, 0x73, + 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, + 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x65, 0x76, 0x6d, 0x2f, 0x76, 0x6d, 0x2f, 0x76, 0x31, 0x3b, 0x76, + 0x6d, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x45, 0x56, 0xaa, 0x02, 0x10, 0x43, 0x6f, 0x73, 0x6d, + 0x6f, 0x73, 0x2e, 0x45, 0x76, 0x6d, 0x2e, 0x56, 0x6d, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x10, 0x43, + 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x45, 0x76, 0x6d, 0x5c, 0x56, 0x6d, 0x5c, 0x56, 0x31, 0xe2, + 0x02, 0x1c, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x45, 0x76, 0x6d, 0x5c, 0x56, 0x6d, 0x5c, + 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, + 0x13, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x3a, 0x3a, 0x45, 0x76, 0x6d, 0x3a, 0x3a, 0x56, 0x6d, + 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/mempool/blockchain.go b/mempool/blockchain.go index 00fc7dd40..fa7428786 100644 --- a/mempool/blockchain.go +++ b/mempool/blockchain.go @@ -199,7 +199,7 @@ func (b Blockchain) StateAt(hash common.Hash) (vm.StateDB, error) { } appHash := ctx.BlockHeader().AppHash - stateDB := statedb.New(ctx, b.vmKeeper, statedb.NewEmptyTxConfig(common.Hash(appHash))) + stateDB := statedb.New(ctx, b.vmKeeper, statedb.NewEmptyTxConfig()) b.logger.Debug("StateDB created successfully", "app_hash", common.Hash(appHash).Hex()) return stateDB, nil diff --git a/precompiles/common/balance_handler_test.go b/precompiles/common/balance_handler_test.go index 1466e97aa..c0ea5fe0b 100644 --- a/precompiles/common/balance_handler_test.go +++ b/precompiles/common/balance_handler_test.go @@ -149,7 +149,7 @@ func TestAfterBalanceChange(t *testing.T) { tKey := storetypes.NewTransientStoreKey("test_t") ctx := sdktestutil.DefaultContext(storeKey, tKey) - stateDB := statedb.New(ctx, mocks.NewEVMKeeper(), statedb.NewEmptyTxConfig(common.BytesToHash(ctx.HeaderHash()))) + stateDB := statedb.New(ctx, mocks.NewEVMKeeper(), statedb.NewEmptyTxConfig()) _, addrs, err := testutil.GeneratePrivKeyAddressPairs(2) require.NoError(t, err) @@ -191,7 +191,7 @@ func TestAfterBalanceChangeErrors(t *testing.T) { storeKey := storetypes.NewKVStoreKey("test") tKey := storetypes.NewTransientStoreKey("test_t") ctx := sdktestutil.DefaultContext(storeKey, tKey) - stateDB := statedb.New(ctx, mocks.NewEVMKeeper(), statedb.NewEmptyTxConfig(common.BytesToHash(ctx.HeaderHash()))) + stateDB := statedb.New(ctx, mocks.NewEVMKeeper(), statedb.NewEmptyTxConfig()) _, addrs, err := testutil.GeneratePrivKeyAddressPairs(1) require.NoError(t, err) diff --git a/proto/cosmos/evm/vm/v1/evm.proto b/proto/cosmos/evm/vm/v1/evm.proto index 71636d4bc..dda6eade0 100644 --- a/proto/cosmos/evm/vm/v1/evm.proto +++ b/proto/cosmos/evm/vm/v1/evm.proto @@ -265,6 +265,9 @@ message Log { // reorganisation. You must pay attention to this field if you receive logs // through a filter query. bool removed = 9; + + // block_timestamp is the timestamp of the block in which the transaction was + uint64 block_timestamp = 10 [ (gogoproto.jsontag) = "blockTimestamp" ]; } // TxResult stores results of Tx execution. diff --git a/tests/integration/precompiles/gov/test_gov.go b/tests/integration/precompiles/gov/test_gov.go index 1b37f7ff7..b2a2aee96 100644 --- a/tests/integration/precompiles/gov/test_gov.go +++ b/tests/integration/precompiles/gov/test_gov.go @@ -107,11 +107,10 @@ func (s *PrecompileTestSuite) TestRun() { s.Require().NoError(err, "failed to instantiate EVM config") // Instantiate EVM - headerHash := ctx.HeaderHash() stDB := statedb.New( ctx, s.network.App.GetEVMKeeper(), - statedb.NewEmptyTxConfig(common.BytesToHash(headerHash)), + statedb.NewEmptyTxConfig(), ) evm := s.network.App.GetEVMKeeper().NewEVM( ctx, *msg, cfg, nil, stDB, diff --git a/tests/integration/precompiles/staking/test_staking.go b/tests/integration/precompiles/staking/test_staking.go index b61c2cad1..d8b5149dc 100644 --- a/tests/integration/precompiles/staking/test_staking.go +++ b/tests/integration/precompiles/staking/test_staking.go @@ -436,11 +436,10 @@ func (s *PrecompileTestSuite) TestRun() { s.Require().NoError(err, "failed to instantiate EVM config") // Instantiate EVM - headerHash := ctx.HeaderHash() stDB := statedb.New( ctx, s.network.App.GetEVMKeeper(), - statedb.NewEmptyTxConfig(common.BytesToHash(headerHash)), + statedb.NewEmptyTxConfig(), ) evm := s.network.App.GetEVMKeeper().NewEVM( ctx, *msg, cfg, nil, stDB, diff --git a/tests/integration/x/vm/test_genesis.go b/tests/integration/x/vm/test_genesis.go index a927310cf..10e5f407c 100644 --- a/tests/integration/x/vm/test_genesis.go +++ b/tests/integration/x/vm/test_genesis.go @@ -119,7 +119,7 @@ func (s *GenesisTestSuite) TestInitGenesis() { ctx = s.network.GetContext() vmdb = statedb.New( ctx, s.network.App.GetEVMKeeper(), - statedb.NewEmptyTxConfig(common.BytesToHash(ctx.HeaderHash()))) + statedb.NewEmptyTxConfig()) tc.malleate(s.network) err := vmdb.Commit() diff --git a/tests/integration/x/vm/test_grpc_query.go b/tests/integration/x/vm/test_grpc_query.go index 0a6af97a2..f9b55fac3 100644 --- a/tests/integration/x/vm/test_grpc_query.go +++ b/tests/integration/x/vm/test_grpc_query.go @@ -425,7 +425,6 @@ func (s *KeeperTestSuite) TestQueryTxLogs() { for _, tc := range testCases { s.Run(fmt.Sprintf("Case %s", tc.msg), func() { txCfg := statedb.NewTxConfig( - common.BytesToHash(s.Network.GetContext().HeaderHash()), txHash, txIndex, logIndex, diff --git a/tests/integration/x/vm/test_hooks.go b/tests/integration/x/vm/test_hooks.go index 9127cf9d0..23aef41ac 100644 --- a/tests/integration/x/vm/test_hooks.go +++ b/tests/integration/x/vm/test_hooks.go @@ -70,7 +70,6 @@ func (s *KeeperTestSuite) TestEvmHooks() { ctx := s.Network.GetContext() txHash := common.BigToHash(big.NewInt(1)) vmdb := statedb.New(ctx, k, statedb.NewTxConfig( - common.BytesToHash(ctx.HeaderHash()), txHash, 0, 0, diff --git a/tests/integration/x/vm/test_statedb.go b/tests/integration/x/vm/test_statedb.go index fe801ac04..b78480b90 100644 --- a/tests/integration/x/vm/test_statedb.go +++ b/tests/integration/x/vm/test_statedb.go @@ -754,7 +754,6 @@ func (s *KeeperTestSuite) TestAddLog() { s.Run(tc.name, func() { s.SetupTest() vmdb := statedb.New(s.Network.GetContext(), s.Network.App.GetEVMKeeper(), statedb.NewTxConfig( - common.BytesToHash(s.Network.GetContext().HeaderHash()), tc.hash, 0, 0, )) diff --git a/tests/integration/x/vm/utils.go b/tests/integration/x/vm/utils.go index c22b8b1ee..ab5b0b30a 100644 --- a/tests/integration/x/vm/utils.go +++ b/tests/integration/x/vm/utils.go @@ -24,7 +24,7 @@ func (s *KeeperTestSuite) EvmDenom() string { } func (s *KeeperTestSuite) StateDB() *statedb.StateDB { - return statedb.New(s.Network.GetContext(), s.Network.App.GetEVMKeeper(), statedb.NewEmptyTxConfig(common.BytesToHash(s.Network.GetContext().HeaderHash()))) + return statedb.New(s.Network.GetContext(), s.Network.App.GetEVMKeeper(), statedb.NewEmptyTxConfig()) } // DeployTestContract deploy a test erc20 contract and returns the contract address diff --git a/testutil/integration/evm/network/unit_network.go b/testutil/integration/evm/network/unit_network.go index 9e23559f7..ff068b8f5 100644 --- a/testutil/integration/evm/network/unit_network.go +++ b/testutil/integration/evm/network/unit_network.go @@ -1,8 +1,6 @@ package network import ( - "github.com/ethereum/go-ethereum/common" - "github.com/cosmos/evm" "github.com/cosmos/evm/x/vm/statedb" @@ -36,11 +34,10 @@ func NewUnitTestNetwork(createEvmApp CreateEvmApp, opts ...ConfigOption) *UnitTe // GetStateDB returns the state database for the current block. func (n *UnitTestNetwork) GetStateDB() *statedb.StateDB { - headerHash := n.GetContext().HeaderHash() return statedb.New( n.GetContext(), n.app.GetEVMKeeper(), - statedb.NewEmptyTxConfig(common.BytesToHash(headerHash)), + statedb.NewEmptyTxConfig(), ) } diff --git a/testutil/statedb.go b/testutil/statedb.go index f248ae4d3..cbae8b280 100644 --- a/testutil/statedb.go +++ b/testutil/statedb.go @@ -1,8 +1,6 @@ package testutil import ( - "github.com/ethereum/go-ethereum/common" - anteinterfaces "github.com/cosmos/evm/ante/interfaces" "github.com/cosmos/evm/x/vm/statedb" @@ -11,5 +9,5 @@ import ( // NewStateDB returns a new StateDB for testing purposes. func NewStateDB(ctx sdk.Context, evmKeeper anteinterfaces.EVMKeeper) *statedb.StateDB { - return statedb.New(ctx, evmKeeper, statedb.NewEmptyTxConfig(common.BytesToHash(ctx.HeaderHash()))) + return statedb.New(ctx, evmKeeper, statedb.NewEmptyTxConfig()) } diff --git a/x/vm/keeper/config.go b/x/vm/keeper/config.go index dbbe308ba..c957bee34 100644 --- a/x/vm/keeper/config.go +++ b/x/vm/keeper/config.go @@ -35,10 +35,9 @@ func (k *Keeper) EVMConfig(ctx sdk.Context, proposerAddress sdk.ConsAddress) (*s // TxConfig loads `TxConfig` from current transient storage func (k *Keeper) TxConfig(ctx sdk.Context, txHash common.Hash) statedb.TxConfig { return statedb.NewTxConfig( - common.BytesToHash(ctx.HeaderHash()), // BlockHash - txHash, // TxHash - uint(k.GetTxIndexTransient(ctx)), // TxIndex - uint(k.GetLogSizeTransient(ctx)), // LogIndex + txHash, // TxHash + uint(k.GetTxIndexTransient(ctx)), // TxIndex + uint(k.GetLogSizeTransient(ctx)), // LogIndex ) } diff --git a/x/vm/keeper/grpc_query.go b/x/vm/keeper/grpc_query.go index 9f2413cd8..a748d29d6 100644 --- a/x/vm/keeper/grpc_query.go +++ b/x/vm/keeper/grpc_query.go @@ -251,7 +251,7 @@ func (k Keeper) EthCall(c context.Context, req *types.EthCallRequest) (*types.Ms } msg := args.ToMessage(cfg.BaseFee, false, false) - txConfig := statedb.NewEmptyTxConfig(common.BytesToHash(ctx.HeaderHash())) + txConfig := statedb.NewEmptyTxConfig() // pass false to not commit StateDB res, err := k.ApplyMessageWithConfig(ctx, *msg, nil, false, cfg, txConfig, false) @@ -324,7 +324,7 @@ func (k Keeper) EstimateGasInternal(c context.Context, req *types.EthCallRequest nonce := k.GetNonce(ctx, args.GetFrom()) args.Nonce = (*hexutil.Uint64)(&nonce) - txConfig := statedb.NewEmptyTxConfig(common.BytesToHash(ctx.HeaderHash())) + txConfig := statedb.NewEmptyTxConfig() if args.Gas == nil { args.Gas = new(hexutil.Uint64) @@ -524,7 +524,7 @@ func (k Keeper) TraceTx(c context.Context, req *types.QueryTraceTxRequest) (*typ } signer := ethtypes.MakeSigner(types.GetEthChainConfig(), big.NewInt(ctx.BlockHeight()), uint64(ctx.BlockTime().Unix())) //#nosec G115 -- int overflow is not a concern here - txConfig := statedb.NewEmptyTxConfig(common.BytesToHash(ctx.HeaderHash())) + txConfig := statedb.NewEmptyTxConfig() // gas used at this point corresponds to GetProposerAddress & CalculateBaseFee // need to reset gas meter per transaction to be consistent with tx execution @@ -618,7 +618,7 @@ func (k Keeper) TraceBlock(c context.Context, req *types.QueryTraceBlockRequest) txsLength := len(req.Txs) results := make([]*types.TxTraceResult, 0, txsLength) - txConfig := statedb.NewEmptyTxConfig(common.BytesToHash(ctx.HeaderHash())) + txConfig := statedb.NewEmptyTxConfig() for i, tx := range req.Txs { result := types.TxTraceResult{} @@ -698,7 +698,7 @@ func (k *Keeper) traceTx( } tCtx := &tracers.Context{ - BlockHash: txConfig.BlockHash, + BlockHash: common.BytesToHash(ctx.HeaderHash()), TxIndex: int(txConfig.TxIndex), //#nosec G115 -- int overflow is not a concern here TxHash: txConfig.TxHash, } diff --git a/x/vm/keeper/state_transition.go b/x/vm/keeper/state_transition.go index 7811bc334..2188b13f4 100644 --- a/x/vm/keeper/state_transition.go +++ b/x/vm/keeper/state_transition.go @@ -207,7 +207,7 @@ func (k *Keeper) ApplyTransaction(ctx sdk.Context, tx *ethtypes.Transaction) (*t TxHash: txConfig.TxHash, ContractAddress: contractAddr, GasUsed: res.GasUsed, - BlockHash: txConfig.BlockHash, + BlockHash: common.BytesToHash(ctx.HeaderHash()), BlockNumber: big.NewInt(ctx.BlockHeight()), TransactionIndex: txConfig.TxIndex, } @@ -308,7 +308,7 @@ func (k *Keeper) ApplyMessage(ctx sdk.Context, msg core.Message, tracer *tracing return nil, errorsmod.Wrap(err, "failed to load evm config") } - txConfig := statedb.NewEmptyTxConfig(common.BytesToHash(ctx.HeaderHash())) + txConfig := statedb.NewEmptyTxConfig() return k.ApplyMessageWithConfig(ctx, msg, tracer, commit, cfg, txConfig, internal) } @@ -394,7 +394,7 @@ func (k *Keeper) ApplyMessageWithConfig(ctx sdk.Context, msg core.Message, trace return nil, errorsmod.Wrap(core.ErrIntrinsicGas, "apply message") } // Gas limit suffices for the floor data cost (EIP-7623) - rules := ethCfg.Rules(big.NewInt(ctx.BlockHeight()), true, uint64(ctx.BlockTime().Unix())) //#nosec G115 -- int overflow is not a concern here + rules := ethCfg.Rules(evm.Context.BlockNumber, true, evm.Context.Time) if rules.IsPrague { floorDataGas, err := core.FloorDataGas(msg.Data) if err != nil { @@ -507,12 +507,13 @@ func (k *Keeper) ApplyMessageWithConfig(ctx sdk.Context, msg core.Message, trace ret = evm.Interpreter().ReturnData() } + logs := stateDB.GetLogs(uint64(ctx.BlockHeight()), common.BytesToHash(ctx.HeaderHash()), evm.Context.Time) //#nosec G115 -- int overflow is not a concern here return &types.MsgEthereumTxResponse{ GasUsed: gasUsed.TruncateInt().Uint64(), MaxUsedGas: maxUsedGas, VmError: vmError, Ret: ret, - Logs: types.NewLogsFromEth(stateDB.Logs()), + Logs: types.NewLogsFromEth(logs), Hash: txConfig.TxHash.Hex(), }, nil } diff --git a/x/vm/statedb/config.go b/x/vm/statedb/config.go index e92152efa..c7bc3f351 100644 --- a/x/vm/statedb/config.go +++ b/x/vm/statedb/config.go @@ -10,30 +10,27 @@ import ( // TxConfig encapulates the readonly information of current tx for `StateDB`. type TxConfig struct { - BlockHash common.Hash // hash of current block - TxHash common.Hash // hash of current tx - TxIndex uint // the index of current transaction - LogIndex uint // the index of next log within current block + TxHash common.Hash // hash of current tx + TxIndex uint // the index of current transaction + LogIndex uint // the index of next log within current block } // NewTxConfig returns a TxConfig -func NewTxConfig(bhash, thash common.Hash, txIndex, logIndex uint) TxConfig { +func NewTxConfig(thash common.Hash, txIndex, logIndex uint) TxConfig { return TxConfig{ - BlockHash: bhash, - TxHash: thash, - TxIndex: txIndex, - LogIndex: logIndex, + TxHash: thash, + TxIndex: txIndex, + LogIndex: logIndex, } } // NewEmptyTxConfig construct an empty TxConfig, // used in context where there's no transaction, e.g. `eth_call`/`eth_estimateGas`. -func NewEmptyTxConfig(bhash common.Hash) TxConfig { +func NewEmptyTxConfig() TxConfig { return TxConfig{ - BlockHash: bhash, - TxHash: common.Hash{}, - TxIndex: 0, - LogIndex: 0, + TxHash: common.Hash{}, + TxIndex: 0, + LogIndex: 0, } } diff --git a/x/vm/statedb/statedb.go b/x/vm/statedb/statedb.go index a4601ec13..b86963230 100644 --- a/x/vm/statedb/statedb.go +++ b/x/vm/statedb/statedb.go @@ -219,12 +219,22 @@ func (s *StateDB) AddLog(log *ethtypes.Log) { s.journal.append(addLogChange{}) log.TxHash = s.txConfig.TxHash - log.BlockHash = s.txConfig.BlockHash log.TxIndex = s.txConfig.TxIndex log.Index = s.txConfig.LogIndex + uint(len(s.logs)) s.logs = append(s.logs, log) } +// GetLogs returns the logs matching the specified transaction hash, and annotates +// them with the given blockNumber and blockHash. +func (s *StateDB) GetLogs(blockNumber uint64, blockHash common.Hash, blockTime uint64) []*ethtypes.Log { + for _, l := range s.logs { + l.BlockNumber = blockNumber + l.BlockHash = blockHash + l.BlockTimestamp = blockTime + } + return s.logs +} + // Logs returns the logs of current transaction. func (s *StateDB) Logs() []*ethtypes.Log { return s.logs diff --git a/x/vm/statedb/statedb_test.go b/x/vm/statedb/statedb_test.go index 07b54bf1c..45497c270 100644 --- a/x/vm/statedb/statedb_test.go +++ b/x/vm/statedb/statedb_test.go @@ -25,7 +25,7 @@ var ( address2 common.Address = common.BigToAddress(big.NewInt(102)) address3 common.Address = common.BigToAddress(big.NewInt(103)) blockHash common.Hash = common.BigToHash(big.NewInt(9999)) - emptyTxConfig statedb.TxConfig = statedb.NewEmptyTxConfig(blockHash) + emptyTxConfig statedb.TxConfig = statedb.NewEmptyTxConfig() ) type StateDBTestSuite struct { @@ -587,7 +587,6 @@ func (suite *StateDBTestSuite) TestLog() { txHash := common.BytesToHash([]byte("tx")) // use a non-default tx config txConfig := statedb.NewTxConfig( - blockHash, txHash, 1, 1, ) @@ -601,16 +600,17 @@ func (suite *StateDBTestSuite) TestLog() { }) suite.Require().Equal(1, len(db.Logs())) expecedLog := ðtypes.Log{ - Address: address, - Topics: []common.Hash{}, - Data: data, - BlockNumber: 1, - BlockHash: blockHash, - TxHash: txHash, - TxIndex: 1, - Index: 1, + Address: address, + Topics: []common.Hash{}, + Data: data, + BlockNumber: 1, + BlockHash: blockHash, + BlockTimestamp: 1, + TxHash: txHash, + TxIndex: 1, + Index: 1, } - suite.Require().Equal(expecedLog, db.Logs()[0]) + suite.Require().Equal(expecedLog, db.GetLogs(1, blockHash, 1)[0]) db.AddLog(ðtypes.Log{ Address: address, @@ -620,7 +620,7 @@ func (suite *StateDBTestSuite) TestLog() { }) suite.Require().Equal(2, len(db.Logs())) expecedLog.Index++ - suite.Require().Equal(expecedLog, db.Logs()[1]) + suite.Require().Equal(expecedLog, db.GetLogs(1, blockHash, 1)[1]) } func (suite *StateDBTestSuite) TestRefund() { diff --git a/x/vm/types/evm.pb.go b/x/vm/types/evm.pb.go index 3d8430bf4..e472085c9 100644 --- a/x/vm/types/evm.pb.go +++ b/x/vm/types/evm.pb.go @@ -529,6 +529,8 @@ type Log struct { // reorganisation. You must pay attention to this field if you receive logs // through a filter query. Removed bool `protobuf:"varint,9,opt,name=removed,proto3" json:"removed,omitempty"` + // block_timestamp is the timestamp of the block in which the transaction was + BlockTimestamp uint64 `protobuf:"varint,10,opt,name=block_timestamp,json=blockTimestamp,proto3" json:"blockTimestamp"` } func (m *Log) Reset() { *m = Log{} } @@ -627,6 +629,13 @@ func (m *Log) GetRemoved() bool { return false } +func (m *Log) GetBlockTimestamp() uint64 { + if m != nil { + return m.BlockTimestamp + } + return 0 +} + // TxResult stores results of Tx execution. type TxResult struct { // contract_address contains the ethereum address of the created contract (if @@ -940,132 +949,133 @@ func init() { func init() { proto.RegisterFile("cosmos/evm/vm/v1/evm.proto", fileDescriptor_d1129b8db63d55c7) } var fileDescriptor_d1129b8db63d55c7 = []byte{ - // 1988 bytes of a gzipped FileDescriptorProto + // 2007 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x58, 0x4d, 0x6f, 0x1b, 0xc7, 0x19, 0x16, 0xc5, 0x95, 0xb4, 0x1c, 0x52, 0xd2, 0x7a, 0x44, 0xcb, 0x34, 0xed, 0x68, 0xd5, 0x6d, 0x0f, 0xaa, 0x91, 0x4a, 0x96, 0x1c, 0xb5, 0x86, 0xd3, 0x0f, 0x88, 0x32, 0xd3, 0x4a, 0xb5, 0x1d, 0x61, 0xa8, 0xc6, 0x48, 0xd1, 0x62, 0x31, 0xdc, 0x1d, 0x2f, 0x37, 0xda, 0xdd, 0x21, 0x66, 0x96, - 0xb4, 0xd8, 0x5f, 0x10, 0xf8, 0x94, 0xfe, 0x00, 0x03, 0x01, 0x7a, 0xc9, 0x31, 0x87, 0xfe, 0x80, - 0x1e, 0x83, 0x9e, 0x72, 0x2c, 0x0a, 0x74, 0x51, 0xd0, 0x87, 0x00, 0x3a, 0xea, 0x17, 0x14, 0xf3, - 0xc1, 0x4f, 0x29, 0xac, 0x02, 0x08, 0xf6, 0x3c, 0xef, 0xc7, 0xf3, 0xcc, 0xc7, 0xbb, 0x3b, 0xef, - 0x12, 0x54, 0x3d, 0xca, 0x63, 0xca, 0x77, 0x48, 0x37, 0xde, 0x11, 0x7f, 0xbb, 0x62, 0xb4, 0xdd, - 0x66, 0x34, 0xa5, 0xd0, 0x52, 0xbe, 0x6d, 0x61, 0x11, 0x7f, 0xbb, 0xd5, 0x5b, 0x38, 0x0e, 0x13, - 0xba, 0x23, 0xff, 0x55, 0x41, 0xd5, 0x72, 0x40, 0x03, 0x2a, 0x87, 0x3b, 0x62, 0xa4, 0xac, 0xce, - 0xdf, 0xf3, 0x60, 0xf1, 0x04, 0x33, 0x1c, 0x73, 0xb8, 0x0b, 0x0a, 0xa4, 0x1b, 0xbb, 0x3e, 0x49, - 0x68, 0x5c, 0xc9, 0x6d, 0xe6, 0xb6, 0x0a, 0xb5, 0xf2, 0x65, 0x66, 0x5b, 0x3d, 0x1c, 0x47, 0x4f, - 0x9c, 0xa1, 0xcb, 0x41, 0x26, 0xe9, 0xc6, 0x4f, 0xc5, 0x10, 0x1e, 0x00, 0x40, 0xce, 0x53, 0x86, - 0x5d, 0x12, 0xb6, 0x79, 0xc5, 0xd8, 0xcc, 0x6f, 0xe5, 0x6b, 0x4e, 0x3f, 0xb3, 0x0b, 0x75, 0x61, - 0xad, 0x1f, 0x9d, 0xf0, 0xcb, 0xcc, 0xbe, 0xa5, 0x09, 0x86, 0x81, 0x0e, 0x2a, 0x48, 0x50, 0x0f, - 0xdb, 0x1c, 0xee, 0x81, 0x92, 0xa0, 0xf6, 0x5a, 0x38, 0x49, 0x48, 0xc4, 0x2b, 0x4b, 0x9b, 0xf9, - 0xad, 0x42, 0x6d, 0xb5, 0x9f, 0xd9, 0xc5, 0xfa, 0x27, 0xcf, 0x0f, 0xb5, 0x19, 0x15, 0x49, 0x37, - 0x1e, 0x00, 0xf8, 0x67, 0xb0, 0x82, 0x3d, 0x8f, 0x70, 0xee, 0x7a, 0x34, 0x49, 0x19, 0x8d, 0x2a, - 0xe6, 0x66, 0x6e, 0xab, 0xb8, 0x67, 0x6f, 0x4f, 0x6f, 0xc4, 0xf6, 0x81, 0x8c, 0x3b, 0x54, 0x61, - 0xb5, 0xdb, 0xdf, 0x64, 0xf6, 0x5c, 0x3f, 0xb3, 0x97, 0x27, 0xcc, 0x68, 0x19, 0x8f, 0x43, 0xf8, - 0x04, 0xdc, 0xc5, 0x5e, 0x1a, 0x76, 0x89, 0xcb, 0x53, 0x9c, 0x86, 0x9e, 0xdb, 0x66, 0xc4, 0xa3, - 0x71, 0x3b, 0x8c, 0x08, 0xaf, 0x14, 0xc4, 0xfc, 0xd0, 0x1d, 0x15, 0xd0, 0x90, 0xfe, 0x93, 0x91, - 0x1b, 0x3e, 0x04, 0xe5, 0x56, 0xc8, 0x53, 0xca, 0x7a, 0x2e, 0x27, 0xac, 0x4b, 0xdc, 0xd7, 0x61, - 0xe2, 0xd3, 0xd7, 0x15, 0xb0, 0x99, 0xdb, 0x32, 0x10, 0xd4, 0xbe, 0x86, 0x70, 0xbd, 0x94, 0x9e, - 0x27, 0xf7, 0xde, 0x7c, 0xf7, 0xf5, 0x83, 0xf5, 0xb1, 0xd3, 0x3d, 0x17, 0xe7, 0xab, 0xce, 0xe4, - 0xd8, 0x30, 0xe7, 0xad, 0xfc, 0xb1, 0x61, 0xe6, 0x2d, 0xe3, 0xd8, 0x30, 0x17, 0xac, 0xc5, 0x63, - 0xc3, 0x5c, 0xb4, 0x96, 0x9c, 0xbf, 0xe6, 0xc0, 0xe4, 0x1a, 0xe0, 0x01, 0x58, 0xf4, 0x18, 0xc1, - 0x29, 0x91, 0x47, 0x57, 0xdc, 0xfb, 0xf1, 0xff, 0xd9, 0x8b, 0xd3, 0x5e, 0x9b, 0xd4, 0x0c, 0xb1, - 0x1f, 0x48, 0x27, 0xc2, 0x5f, 0x01, 0xc3, 0xc3, 0x51, 0x54, 0x99, 0xff, 0xa1, 0x04, 0x32, 0xcd, - 0xf9, 0x4f, 0x0e, 0xdc, 0xba, 0x12, 0x01, 0x3d, 0x50, 0xd4, 0x67, 0x95, 0xf6, 0xda, 0x6a, 0x72, - 0x2b, 0x7b, 0xf7, 0xbf, 0x8f, 0x5b, 0x92, 0xfe, 0xa4, 0x9f, 0xd9, 0x60, 0x84, 0x2f, 0x33, 0x1b, - 0xaa, 0x12, 0x1a, 0x23, 0x72, 0x10, 0xc0, 0xc3, 0x08, 0xe8, 0x81, 0xb5, 0xc9, 0x82, 0x70, 0xa3, - 0x90, 0xa7, 0x95, 0x79, 0x59, 0x4b, 0x8f, 0xfa, 0x99, 0x3d, 0x39, 0xb1, 0x67, 0x21, 0x4f, 0x2f, - 0x33, 0xbb, 0x3a, 0xc1, 0x3a, 0x9e, 0xe9, 0xa0, 0x5b, 0x78, 0x3a, 0xc1, 0xf9, 0xca, 0x02, 0xc5, - 0xc3, 0x16, 0x0e, 0x93, 0x43, 0x9a, 0xbc, 0x0a, 0x03, 0xf8, 0x27, 0xb0, 0xda, 0xa2, 0x31, 0xe1, - 0x29, 0xc1, 0xbe, 0xdb, 0x8c, 0xa8, 0x77, 0xa6, 0x9f, 0x9a, 0x47, 0xff, 0xce, 0xec, 0xdb, 0x6a, - 0x81, 0xdc, 0x3f, 0xdb, 0x0e, 0xe9, 0x4e, 0x8c, 0xd3, 0xd6, 0xf6, 0x51, 0x22, 0x44, 0xd7, 0x95, - 0xe8, 0x54, 0xa6, 0x83, 0x56, 0x86, 0x96, 0x9a, 0x30, 0xc0, 0x16, 0x58, 0xf1, 0x31, 0x75, 0x5f, - 0x51, 0x76, 0xa6, 0xc9, 0xe7, 0x25, 0x79, 0xed, 0x7b, 0xc9, 0xfb, 0x99, 0x5d, 0x7a, 0x7a, 0xf0, - 0xf1, 0x47, 0x94, 0x9d, 0x49, 0x8a, 0xcb, 0xcc, 0xbe, 0xad, 0xc4, 0x26, 0x89, 0x1c, 0x54, 0xf2, - 0x31, 0x1d, 0x86, 0xc1, 0x97, 0xc0, 0x1a, 0x06, 0xf0, 0x4e, 0xbb, 0x4d, 0x59, 0x5a, 0xc9, 0x6f, - 0xe6, 0xb6, 0xcc, 0xda, 0xcf, 0xfa, 0x99, 0xbd, 0xa2, 0x29, 0x1b, 0xca, 0x73, 0x99, 0xd9, 0x77, - 0xa6, 0x48, 0x75, 0x8e, 0x83, 0x56, 0x34, 0xad, 0x0e, 0x85, 0x4d, 0x50, 0x22, 0x61, 0x7b, 0x77, - 0xff, 0xa1, 0x5e, 0x80, 0x21, 0x17, 0xf0, 0x9b, 0x59, 0x0b, 0x28, 0xd6, 0x8f, 0x4e, 0x76, 0xf7, - 0x1f, 0x0e, 0xe6, 0xbf, 0xa6, 0x5f, 0x1d, 0x63, 0x2c, 0x0e, 0x2a, 0x2a, 0xa8, 0x26, 0x3f, 0xd0, - 0xd8, 0xd7, 0x1a, 0x8b, 0x37, 0xd5, 0xd8, 0xbf, 0x4e, 0x63, 0x7f, 0x52, 0x63, 0x7f, 0x52, 0xe3, - 0xb1, 0xd6, 0x58, 0xba, 0xa9, 0xc6, 0xe3, 0xeb, 0x34, 0x1e, 0x4f, 0x6a, 0xa8, 0x18, 0x51, 0x4c, - 0xcd, 0xde, 0x5f, 0x70, 0x92, 0x86, 0x9d, 0x58, 0xcb, 0x98, 0x37, 0x2e, 0xa6, 0xa9, 0x4c, 0x07, - 0xad, 0x0c, 0x2d, 0x8a, 0xfd, 0x0c, 0x94, 0x3d, 0x9a, 0xf0, 0x54, 0xd8, 0x12, 0xda, 0x8e, 0x88, - 0x96, 0x28, 0x48, 0x89, 0xc7, 0xb3, 0x24, 0xee, 0x29, 0x89, 0xeb, 0xd2, 0x1d, 0xb4, 0x36, 0x69, - 0x56, 0x62, 0x2e, 0xb0, 0xda, 0x24, 0x25, 0x8c, 0x37, 0x3b, 0x2c, 0xd0, 0x42, 0x40, 0x0a, 0x7d, - 0x30, 0x4b, 0x48, 0x97, 0xd5, 0x74, 0xaa, 0x83, 0x56, 0x47, 0x26, 0x25, 0xf0, 0x29, 0x58, 0x09, - 0x85, 0x6a, 0xb3, 0x13, 0x69, 0xfa, 0xa2, 0xa4, 0xdf, 0x9b, 0x45, 0xaf, 0x1f, 0x85, 0xc9, 0x44, - 0x07, 0x2d, 0x0f, 0x0c, 0x8a, 0xda, 0x07, 0x30, 0xee, 0x84, 0xcc, 0x0d, 0x22, 0xec, 0x85, 0x84, - 0x69, 0xfa, 0x92, 0xa4, 0xff, 0xf9, 0x2c, 0xfa, 0xbb, 0x8a, 0xfe, 0x6a, 0xb2, 0x83, 0x2c, 0x61, - 0xfc, 0xad, 0xb2, 0x29, 0x95, 0x06, 0x28, 0x35, 0x09, 0x8b, 0xc2, 0x44, 0xf3, 0x2f, 0x4b, 0xfe, - 0x87, 0xb3, 0xf8, 0x75, 0x05, 0x8d, 0xa7, 0x39, 0xa8, 0xa8, 0xe0, 0x90, 0x34, 0xa2, 0x89, 0x4f, - 0x07, 0xa4, 0xb7, 0x6e, 0x4c, 0x3a, 0x9e, 0xe6, 0xa0, 0xa2, 0x82, 0x8a, 0x34, 0x00, 0x6b, 0x98, - 0x31, 0xfa, 0x7a, 0x6a, 0x43, 0xa0, 0xe4, 0xfe, 0xc5, 0x2c, 0xee, 0xc1, 0xcb, 0xf5, 0x6a, 0xb6, - 0x78, 0xb9, 0x0a, 0xeb, 0xc4, 0x96, 0xf8, 0x00, 0x06, 0x0c, 0xf7, 0xa6, 0x74, 0xca, 0x37, 0xde, - 0xf8, 0xab, 0xc9, 0x0e, 0xb2, 0x84, 0x71, 0x42, 0xe5, 0x33, 0x50, 0x8e, 0x09, 0x0b, 0x88, 0x9b, - 0x90, 0x94, 0xb7, 0xa3, 0x30, 0xd5, 0x3a, 0xb7, 0x6f, 0xfc, 0x1c, 0x5c, 0x97, 0xee, 0x20, 0x28, - 0xcd, 0x2f, 0xb4, 0x55, 0x69, 0xdd, 0x05, 0xa6, 0x27, 0x6e, 0x0b, 0x37, 0xf4, 0x2b, 0x15, 0x79, - 0xfb, 0x2f, 0x49, 0x7c, 0xe4, 0xc3, 0x32, 0x58, 0x50, 0x5d, 0xd6, 0x5d, 0xa1, 0x8b, 0x14, 0x80, - 0x55, 0x60, 0xfa, 0xc4, 0x0b, 0x63, 0x1c, 0xf1, 0x4a, 0x55, 0x26, 0x0c, 0x31, 0xfc, 0x04, 0x2c, - 0xf3, 0x16, 0x4e, 0x82, 0x16, 0x0e, 0xdd, 0x34, 0x8c, 0x49, 0xe5, 0x9e, 0x9c, 0xf1, 0xee, 0xac, - 0x19, 0x97, 0xd5, 0x8c, 0x27, 0xf2, 0x1c, 0x54, 0x1a, 0xe0, 0xd3, 0x30, 0x26, 0xf0, 0x04, 0x14, - 0x3d, 0x9c, 0x78, 0x9d, 0x44, 0xb1, 0xde, 0x97, 0xac, 0x3b, 0xb3, 0x58, 0xf5, 0x55, 0x3c, 0x96, - 0xe5, 0x20, 0xa0, 0xd0, 0x80, 0xb1, 0xcd, 0x70, 0xd0, 0x21, 0x8a, 0xf1, 0xbd, 0x1b, 0x33, 0x8e, - 0x65, 0x39, 0x08, 0x28, 0x34, 0x60, 0xec, 0x12, 0x76, 0x16, 0x69, 0xc6, 0x8d, 0x1b, 0x33, 0x8e, - 0x65, 0x39, 0x08, 0x28, 0x24, 0x19, 0x9f, 0x03, 0x40, 0x39, 0x3e, 0xc3, 0x8a, 0xd0, 0x96, 0x84, - 0xdb, 0xb3, 0x08, 0x75, 0x0b, 0x3b, 0x4a, 0x72, 0x50, 0x41, 0x02, 0x41, 0x37, 0x6c, 0xcc, 0xd6, - 0xad, 0x3b, 0xc7, 0x86, 0x79, 0xc7, 0xaa, 0x38, 0x3b, 0x60, 0x41, 0xb4, 0x86, 0x04, 0x5a, 0x20, - 0x7f, 0x46, 0x7a, 0xaa, 0x2f, 0x40, 0x62, 0x28, 0xce, 0xbe, 0x8b, 0xa3, 0x0e, 0x51, 0xd7, 0x39, - 0x52, 0xc0, 0x39, 0x01, 0xab, 0xa7, 0x0c, 0x27, 0x5c, 0xb4, 0x95, 0x34, 0x79, 0x46, 0x03, 0x0e, - 0x21, 0x30, 0x5a, 0x98, 0xb7, 0x74, 0xae, 0x1c, 0xc3, 0x9f, 0x02, 0x23, 0xa2, 0x01, 0x97, 0x8d, - 0x4d, 0x71, 0xef, 0xf6, 0xd5, 0x2e, 0xea, 0x19, 0x0d, 0x90, 0x0c, 0x71, 0xfe, 0x39, 0x0f, 0xf2, - 0xcf, 0x68, 0x00, 0x2b, 0x60, 0x09, 0xfb, 0x3e, 0x23, 0x9c, 0x6b, 0xa6, 0x01, 0x84, 0xeb, 0x60, - 0x31, 0xa5, 0xed, 0xd0, 0x53, 0x74, 0x05, 0xa4, 0x91, 0x10, 0xf6, 0x71, 0x8a, 0x65, 0x0f, 0x50, - 0x42, 0x72, 0x2c, 0xba, 0x74, 0x59, 0xea, 0x6e, 0xd2, 0x89, 0x9b, 0x84, 0xc9, 0xab, 0xdc, 0xa8, - 0xad, 0x5e, 0x64, 0x76, 0x51, 0xda, 0x5f, 0x48, 0x33, 0x1a, 0x07, 0xf0, 0x7d, 0xb0, 0x94, 0x9e, - 0xbb, 0x72, 0x0d, 0x0b, 0x72, 0x8b, 0xd7, 0x2e, 0x32, 0x7b, 0x35, 0x1d, 0x2d, 0xf3, 0x77, 0x98, - 0xb7, 0xd0, 0x62, 0x7a, 0x2e, 0xfe, 0x87, 0x3b, 0xc0, 0x4c, 0xcf, 0xdd, 0x30, 0xf1, 0xc9, 0xb9, - 0xbc, 0xc4, 0x8d, 0x5a, 0xf9, 0x22, 0xb3, 0xad, 0xb1, 0xf0, 0x23, 0xe1, 0x43, 0x4b, 0xe9, 0xb9, - 0x1c, 0xc0, 0xf7, 0x01, 0x50, 0x53, 0x92, 0x0a, 0xea, 0x4e, 0x5e, 0xbe, 0xc8, 0xec, 0x82, 0xb4, - 0x4a, 0xee, 0xd1, 0x10, 0x3a, 0x60, 0x41, 0x71, 0x9b, 0x92, 0xbb, 0x74, 0x91, 0xd9, 0x66, 0x44, - 0x03, 0xc5, 0xa9, 0x5c, 0x62, 0xab, 0x18, 0x89, 0x69, 0x97, 0xf8, 0xf2, 0x62, 0x34, 0xd1, 0x00, - 0x3a, 0x5f, 0xcc, 0x03, 0xf3, 0xf4, 0x1c, 0x11, 0xde, 0x89, 0x52, 0xf8, 0x11, 0xb0, 0x64, 0xaf, - 0x88, 0xbd, 0xd4, 0x9d, 0xd8, 0xda, 0xda, 0xbd, 0xd1, 0x35, 0x36, 0x1d, 0xe1, 0xa0, 0xd5, 0x81, - 0xe9, 0x40, 0xef, 0x7f, 0x19, 0x2c, 0x34, 0x23, 0x4a, 0x63, 0x59, 0x09, 0x25, 0xa4, 0x00, 0x7c, - 0x29, 0x77, 0x4d, 0x9e, 0x72, 0x5e, 0xf6, 0xe1, 0x3f, 0xba, 0x7a, 0xca, 0x53, 0xa5, 0x52, 0xbb, - 0x27, 0xba, 0xf0, 0xcb, 0xcc, 0x5e, 0x51, 0xda, 0x3a, 0xdf, 0xf9, 0xea, 0xbb, 0xaf, 0x1f, 0xe4, - 0xc4, 0x06, 0xcb, 0x7a, 0xb2, 0x40, 0x9e, 0x91, 0x54, 0x9e, 0x5c, 0x09, 0x89, 0xa1, 0x78, 0xe1, - 0x30, 0xd2, 0x25, 0x2c, 0x25, 0xbe, 0x3c, 0x21, 0x13, 0x0d, 0xb1, 0x78, 0x7b, 0x05, 0x98, 0xbb, - 0x1d, 0x4e, 0x7c, 0x75, 0x1c, 0x68, 0x29, 0xc0, 0xfc, 0x0f, 0x9c, 0xf8, 0x4f, 0x8c, 0xcf, 0xbf, - 0xb4, 0xe7, 0x1c, 0x0c, 0x8a, 0xba, 0x45, 0xef, 0xb4, 0x23, 0x32, 0xa3, 0xcc, 0xf6, 0x40, 0x49, - 0x7c, 0xf3, 0xe0, 0x80, 0xb8, 0x67, 0xa4, 0xa7, 0x8b, 0x4d, 0x95, 0x8e, 0xb6, 0xff, 0x9e, 0xf4, - 0x38, 0x1a, 0x07, 0x5a, 0xe2, 0x4b, 0x03, 0x14, 0x4f, 0x19, 0xf6, 0x88, 0x6e, 0xb8, 0x45, 0xc1, - 0x0a, 0xc8, 0xb4, 0x84, 0x46, 0x42, 0x5b, 0x3c, 0x93, 0xb4, 0x93, 0xea, 0x87, 0x6a, 0x00, 0x45, - 0x06, 0x23, 0xe4, 0x9c, 0x78, 0x72, 0x2f, 0x0d, 0xa4, 0x11, 0xdc, 0x07, 0xcb, 0x7e, 0xc8, 0x71, - 0x33, 0x92, 0x9f, 0x78, 0xde, 0x99, 0x5a, 0x7e, 0xcd, 0xba, 0xc8, 0xec, 0x92, 0x76, 0x34, 0x84, - 0x1d, 0x4d, 0x20, 0xf8, 0x21, 0x58, 0x1d, 0xa5, 0xc9, 0xd9, 0xca, 0xbd, 0x31, 0x6b, 0xf0, 0x22, - 0xb3, 0x57, 0x86, 0xa1, 0xd2, 0x83, 0xa6, 0xb0, 0x7a, 0xe9, 0x37, 0x3b, 0x81, 0xac, 0x40, 0x13, - 0x29, 0x20, 0xac, 0x51, 0x18, 0x87, 0xa9, 0xac, 0xb8, 0x05, 0xa4, 0x00, 0xfc, 0x10, 0x14, 0x68, - 0x97, 0x30, 0x16, 0xfa, 0x84, 0xcb, 0xde, 0xa9, 0xb8, 0xf7, 0xde, 0xd5, 0x32, 0x18, 0xfb, 0x18, - 0x41, 0xa3, 0x78, 0xb1, 0x38, 0x92, 0xc8, 0x49, 0xc6, 0x24, 0xa6, 0xac, 0x27, 0xbb, 0x23, 0xbd, - 0x38, 0xe5, 0x78, 0x2e, 0xed, 0x68, 0x02, 0xc1, 0x1a, 0x80, 0x3a, 0x8d, 0x91, 0xb4, 0xc3, 0x12, - 0x57, 0xbe, 0x04, 0x4a, 0x32, 0x57, 0x3e, 0x8a, 0xca, 0x8b, 0xa4, 0xf3, 0x29, 0x4e, 0x31, 0xba, - 0x62, 0x81, 0xbf, 0x06, 0x50, 0x9d, 0x89, 0xfb, 0x19, 0xa7, 0x89, 0xf8, 0xa4, 0x7a, 0x15, 0x06, - 0xba, 0xbd, 0x91, 0xfa, 0xca, 0xab, 0xe7, 0x6c, 0x29, 0x74, 0xcc, 0xa9, 0x5e, 0xc5, 0xb1, 0x61, - 0x1a, 0xd6, 0xc2, 0xb1, 0x61, 0x2e, 0x59, 0xe6, 0x70, 0xff, 0xf4, 0x2a, 0xd0, 0xda, 0x00, 0x8f, - 0x4d, 0xcf, 0x79, 0x01, 0xc0, 0x09, 0x23, 0xa1, 0x68, 0x42, 0xa3, 0x48, 0xbc, 0xb9, 0x12, 0x1c, - 0x93, 0xc1, 0x2b, 0x53, 0x8c, 0xc7, 0x0b, 0x73, 0x7e, 0xb2, 0x30, 0x21, 0x30, 0x3c, 0xea, 0x13, - 0x59, 0x1a, 0x05, 0x24, 0xc7, 0x0f, 0xfe, 0x91, 0x03, 0x63, 0x5f, 0x9e, 0xf0, 0x97, 0xa0, 0x7a, - 0x70, 0x78, 0x58, 0x6f, 0x34, 0xdc, 0xd3, 0x4f, 0x4f, 0xea, 0xee, 0x49, 0x1d, 0x3d, 0x3f, 0x6a, - 0x34, 0x8e, 0x3e, 0x7e, 0xf1, 0xac, 0xde, 0x68, 0x58, 0x73, 0xd5, 0xfb, 0x6f, 0xde, 0x6e, 0x56, - 0x46, 0xf1, 0x27, 0x84, 0xc5, 0x21, 0xe7, 0x21, 0x4d, 0x22, 0x21, 0xf0, 0x01, 0x58, 0x1f, 0xcf, - 0x46, 0xf5, 0xc6, 0x29, 0x3a, 0x3a, 0x3c, 0xad, 0x3f, 0xb5, 0x72, 0xd5, 0xca, 0x9b, 0xb7, 0x9b, - 0xe5, 0x51, 0x26, 0x22, 0x3c, 0x65, 0xa1, 0x27, 0x9e, 0xbc, 0xc7, 0xa0, 0x72, 0xbd, 0x66, 0xfd, - 0xa9, 0x35, 0x5f, 0xad, 0xbe, 0x79, 0xbb, 0xb9, 0x7e, 0x9d, 0x22, 0xf1, 0xab, 0xc6, 0xe7, 0x7f, - 0xdb, 0x98, 0xab, 0x3d, 0xf9, 0xa6, 0xbf, 0x91, 0xfb, 0xb6, 0xbf, 0x91, 0xfb, 0x6f, 0x7f, 0x23, - 0xf7, 0xc5, 0xbb, 0x8d, 0xb9, 0x6f, 0xdf, 0x6d, 0xcc, 0xfd, 0xeb, 0xdd, 0xc6, 0xdc, 0x1f, 0x37, - 0x83, 0x30, 0x6d, 0x75, 0x9a, 0xdb, 0x1e, 0x8d, 0x77, 0xa6, 0x7f, 0x6f, 0x10, 0xdf, 0xd4, 0xbc, - 0xb9, 0x28, 0x7f, 0x14, 0x7a, 0xf4, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe4, 0x51, 0x6f, 0x71, - 0x6d, 0x12, 0x00, 0x00, + 0xb4, 0xd8, 0x3f, 0xd0, 0xc0, 0xa7, 0xf4, 0x07, 0x18, 0x08, 0xd0, 0x4b, 0x8e, 0x39, 0xf4, 0x07, + 0xf4, 0x98, 0x63, 0x8e, 0x45, 0x81, 0x2e, 0x0a, 0xfa, 0x10, 0x40, 0x47, 0xfd, 0x82, 0x62, 0x3e, + 0xf8, 0x29, 0x85, 0x55, 0x00, 0xc1, 0x9e, 0xe7, 0xfd, 0x78, 0x9e, 0xf9, 0x78, 0x77, 0xe7, 0x5d, + 0x82, 0xaa, 0x47, 0x79, 0x4c, 0xf9, 0x0e, 0xe9, 0xc6, 0x3b, 0xe2, 0x6f, 0x57, 0x8c, 0xb6, 0xdb, + 0x8c, 0xa6, 0x14, 0x5a, 0xca, 0xb7, 0x2d, 0x2c, 0xe2, 0x6f, 0xb7, 0x7a, 0x0b, 0xc7, 0x61, 0x42, + 0x77, 0xe4, 0xbf, 0x2a, 0xa8, 0x5a, 0x0e, 0x68, 0x40, 0xe5, 0x70, 0x47, 0x8c, 0x94, 0xd5, 0xf9, + 0x47, 0x1e, 0x2c, 0x9e, 0x60, 0x86, 0x63, 0x0e, 0x77, 0x41, 0x81, 0x74, 0x63, 0xd7, 0x27, 0x09, + 0x8d, 0x2b, 0xb9, 0xcd, 0xdc, 0x56, 0xa1, 0x56, 0xbe, 0xcc, 0x6c, 0xab, 0x87, 0xe3, 0xe8, 0x89, + 0x33, 0x74, 0x39, 0xc8, 0x24, 0xdd, 0xf8, 0xa9, 0x18, 0xc2, 0x03, 0x00, 0xc8, 0x79, 0xca, 0xb0, + 0x4b, 0xc2, 0x36, 0xaf, 0x18, 0x9b, 0xf9, 0xad, 0x7c, 0xcd, 0xe9, 0x67, 0x76, 0xa1, 0x2e, 0xac, + 0xf5, 0xa3, 0x13, 0x7e, 0x99, 0xd9, 0xb7, 0x34, 0xc1, 0x30, 0xd0, 0x41, 0x05, 0x09, 0xea, 0x61, + 0x9b, 0xc3, 0x3d, 0x50, 0x12, 0xd4, 0x5e, 0x0b, 0x27, 0x09, 0x89, 0x78, 0x65, 0x69, 0x33, 0xbf, + 0x55, 0xa8, 0xad, 0xf6, 0x33, 0xbb, 0x58, 0xff, 0xe4, 0xf9, 0xa1, 0x36, 0xa3, 0x22, 0xe9, 0xc6, + 0x03, 0x00, 0xff, 0x0c, 0x56, 0xb0, 0xe7, 0x11, 0xce, 0x5d, 0x8f, 0x26, 0x29, 0xa3, 0x51, 0xc5, + 0xdc, 0xcc, 0x6d, 0x15, 0xf7, 0xec, 0xed, 0xe9, 0x8d, 0xd8, 0x3e, 0x90, 0x71, 0x87, 0x2a, 0xac, + 0x76, 0xfb, 0x9b, 0xcc, 0x9e, 0xeb, 0x67, 0xf6, 0xf2, 0x84, 0x19, 0x2d, 0xe3, 0x71, 0x08, 0x9f, + 0x80, 0xbb, 0xd8, 0x4b, 0xc3, 0x2e, 0x71, 0x79, 0x8a, 0xd3, 0xd0, 0x73, 0xdb, 0x8c, 0x78, 0x34, + 0x6e, 0x87, 0x11, 0xe1, 0x95, 0x82, 0x98, 0x1f, 0xba, 0xa3, 0x02, 0x1a, 0xd2, 0x7f, 0x32, 0x72, + 0xc3, 0x87, 0xa0, 0xdc, 0x0a, 0x79, 0x4a, 0x59, 0xcf, 0xe5, 0x84, 0x75, 0x89, 0xfb, 0x3a, 0x4c, + 0x7c, 0xfa, 0xba, 0x02, 0x36, 0x73, 0x5b, 0x06, 0x82, 0xda, 0xd7, 0x10, 0xae, 0x97, 0xd2, 0xf3, + 0xe4, 0xde, 0x9b, 0xef, 0xbe, 0x7e, 0xb0, 0x3e, 0x76, 0xba, 0xe7, 0xe2, 0x7c, 0xd5, 0x99, 0x1c, + 0x1b, 0xe6, 0xbc, 0x95, 0x3f, 0x36, 0xcc, 0xbc, 0x65, 0x1c, 0x1b, 0xe6, 0x82, 0xb5, 0x78, 0x6c, + 0x98, 0x8b, 0xd6, 0x92, 0xf3, 0xb7, 0x1c, 0x98, 0x5c, 0x03, 0x3c, 0x00, 0x8b, 0x1e, 0x23, 0x38, + 0x25, 0xf2, 0xe8, 0x8a, 0x7b, 0x3f, 0xfe, 0x3f, 0x7b, 0x71, 0xda, 0x6b, 0x93, 0x9a, 0x21, 0xf6, + 0x03, 0xe9, 0x44, 0xf8, 0x2b, 0x60, 0x78, 0x38, 0x8a, 0x2a, 0xf3, 0x3f, 0x94, 0x40, 0xa6, 0x39, + 0xff, 0xc9, 0x81, 0x5b, 0x57, 0x22, 0xa0, 0x07, 0x8a, 0xfa, 0xac, 0xd2, 0x5e, 0x5b, 0x4d, 0x6e, + 0x65, 0xef, 0xfe, 0xf7, 0x71, 0x4b, 0xd2, 0x9f, 0xf4, 0x33, 0x1b, 0x8c, 0xf0, 0x65, 0x66, 0x43, + 0x55, 0x42, 0x63, 0x44, 0x0e, 0x02, 0x78, 0x18, 0x01, 0x3d, 0xb0, 0x36, 0x59, 0x10, 0x6e, 0x14, + 0xf2, 0xb4, 0x32, 0x2f, 0x6b, 0xe9, 0x51, 0x3f, 0xb3, 0x27, 0x27, 0xf6, 0x2c, 0xe4, 0xe9, 0x65, + 0x66, 0x57, 0x27, 0x58, 0xc7, 0x33, 0x1d, 0x74, 0x0b, 0x4f, 0x27, 0x38, 0x5f, 0x59, 0xa0, 0x78, + 0xd8, 0xc2, 0x61, 0x72, 0x48, 0x93, 0x57, 0x61, 0x00, 0xff, 0x04, 0x56, 0x5b, 0x34, 0x26, 0x3c, + 0x25, 0xd8, 0x77, 0x9b, 0x11, 0xf5, 0xce, 0xf4, 0x53, 0xf3, 0xe8, 0xdf, 0x99, 0x7d, 0x5b, 0x2d, + 0x90, 0xfb, 0x67, 0xdb, 0x21, 0xdd, 0x89, 0x71, 0xda, 0xda, 0x3e, 0x4a, 0x84, 0xe8, 0xba, 0x12, + 0x9d, 0xca, 0x74, 0xd0, 0xca, 0xd0, 0x52, 0x13, 0x06, 0xd8, 0x02, 0x2b, 0x3e, 0xa6, 0xee, 0x2b, + 0xca, 0xce, 0x34, 0xf9, 0xbc, 0x24, 0xaf, 0x7d, 0x2f, 0x79, 0x3f, 0xb3, 0x4b, 0x4f, 0x0f, 0x3e, + 0xfe, 0x88, 0xb2, 0x33, 0x49, 0x71, 0x99, 0xd9, 0xb7, 0x95, 0xd8, 0x24, 0x91, 0x83, 0x4a, 0x3e, + 0xa6, 0xc3, 0x30, 0xf8, 0x12, 0x58, 0xc3, 0x00, 0xde, 0x69, 0xb7, 0x29, 0x4b, 0x2b, 0xf9, 0xcd, + 0xdc, 0x96, 0x59, 0xfb, 0x59, 0x3f, 0xb3, 0x57, 0x34, 0x65, 0x43, 0x79, 0x2e, 0x33, 0xfb, 0xce, + 0x14, 0xa9, 0xce, 0x71, 0xd0, 0x8a, 0xa6, 0xd5, 0xa1, 0xb0, 0x09, 0x4a, 0x24, 0x6c, 0xef, 0xee, + 0x3f, 0xd4, 0x0b, 0x30, 0xe4, 0x02, 0x7e, 0x33, 0x6b, 0x01, 0xc5, 0xfa, 0xd1, 0xc9, 0xee, 0xfe, + 0xc3, 0xc1, 0xfc, 0xd7, 0xf4, 0xab, 0x63, 0x8c, 0xc5, 0x41, 0x45, 0x05, 0xd5, 0xe4, 0x07, 0x1a, + 0xfb, 0x5a, 0x63, 0xf1, 0xa6, 0x1a, 0xfb, 0xd7, 0x69, 0xec, 0x4f, 0x6a, 0xec, 0x4f, 0x6a, 0x3c, + 0xd6, 0x1a, 0x4b, 0x37, 0xd5, 0x78, 0x7c, 0x9d, 0xc6, 0xe3, 0x49, 0x0d, 0x15, 0x23, 0x8a, 0xa9, + 0xd9, 0xfb, 0x0b, 0x4e, 0xd2, 0xb0, 0x13, 0x6b, 0x19, 0xf3, 0xc6, 0xc5, 0x34, 0x95, 0xe9, 0xa0, + 0x95, 0xa1, 0x45, 0xb1, 0x9f, 0x81, 0xb2, 0x47, 0x13, 0x9e, 0x0a, 0x5b, 0x42, 0xdb, 0x11, 0xd1, + 0x12, 0x05, 0x29, 0xf1, 0x78, 0x96, 0xc4, 0x3d, 0x25, 0x71, 0x5d, 0xba, 0x83, 0xd6, 0x26, 0xcd, + 0x4a, 0xcc, 0x05, 0x56, 0x9b, 0xa4, 0x84, 0xf1, 0x66, 0x87, 0x05, 0x5a, 0x08, 0x48, 0xa1, 0x0f, + 0x66, 0x09, 0xe9, 0xb2, 0x9a, 0x4e, 0x75, 0xd0, 0xea, 0xc8, 0xa4, 0x04, 0x3e, 0x05, 0x2b, 0xa1, + 0x50, 0x6d, 0x76, 0x22, 0x4d, 0x5f, 0x94, 0xf4, 0x7b, 0xb3, 0xe8, 0xf5, 0xa3, 0x30, 0x99, 0xe8, + 0xa0, 0xe5, 0x81, 0x41, 0x51, 0xfb, 0x00, 0xc6, 0x9d, 0x90, 0xb9, 0x41, 0x84, 0xbd, 0x90, 0x30, + 0x4d, 0x5f, 0x92, 0xf4, 0x3f, 0x9f, 0x45, 0x7f, 0x57, 0xd1, 0x5f, 0x4d, 0x76, 0x90, 0x25, 0x8c, + 0xbf, 0x55, 0x36, 0xa5, 0xd2, 0x00, 0xa5, 0x26, 0x61, 0x51, 0x98, 0x68, 0xfe, 0x65, 0xc9, 0xff, + 0x70, 0x16, 0xbf, 0xae, 0xa0, 0xf1, 0x34, 0x07, 0x15, 0x15, 0x1c, 0x92, 0x46, 0x34, 0xf1, 0xe9, + 0x80, 0xf4, 0xd6, 0x8d, 0x49, 0xc7, 0xd3, 0x1c, 0x54, 0x54, 0x50, 0x91, 0x06, 0x60, 0x0d, 0x33, + 0x46, 0x5f, 0x4f, 0x6d, 0x08, 0x94, 0xdc, 0xbf, 0x98, 0xc5, 0x3d, 0x78, 0xb9, 0x5e, 0xcd, 0x16, + 0x2f, 0x57, 0x61, 0x9d, 0xd8, 0x12, 0x1f, 0xc0, 0x80, 0xe1, 0xde, 0x94, 0x4e, 0xf9, 0xc6, 0x1b, + 0x7f, 0x35, 0xd9, 0x41, 0x96, 0x30, 0x4e, 0xa8, 0x7c, 0x06, 0xca, 0x31, 0x61, 0x01, 0x71, 0x13, + 0x92, 0xf2, 0x76, 0x14, 0xa6, 0x5a, 0xe7, 0xf6, 0x8d, 0x9f, 0x83, 0xeb, 0xd2, 0x1d, 0x04, 0xa5, + 0xf9, 0x85, 0xb6, 0x2a, 0xad, 0xbb, 0xc0, 0xf4, 0xc4, 0x6d, 0xe1, 0x86, 0x7e, 0xa5, 0x22, 0x6f, + 0xff, 0x25, 0x89, 0x8f, 0x7c, 0x58, 0x06, 0x0b, 0xaa, 0xcb, 0xba, 0x2b, 0x74, 0x91, 0x02, 0xb0, + 0x0a, 0x4c, 0x9f, 0x78, 0x61, 0x8c, 0x23, 0x5e, 0xa9, 0xca, 0x84, 0x21, 0x86, 0x9f, 0x80, 0x65, + 0xde, 0xc2, 0x49, 0xd0, 0xc2, 0xa1, 0x9b, 0x86, 0x31, 0xa9, 0xdc, 0x93, 0x33, 0xde, 0x9d, 0x35, + 0xe3, 0xb2, 0x9a, 0xf1, 0x44, 0x9e, 0x83, 0x4a, 0x03, 0x7c, 0x1a, 0xc6, 0x04, 0x9e, 0x80, 0xa2, + 0x87, 0x13, 0xaf, 0x93, 0x28, 0xd6, 0xfb, 0x92, 0x75, 0x67, 0x16, 0xab, 0xbe, 0x8a, 0xc7, 0xb2, + 0x1c, 0x04, 0x14, 0x1a, 0x30, 0xb6, 0x19, 0x0e, 0x3a, 0x44, 0x31, 0xbe, 0x77, 0x63, 0xc6, 0xb1, + 0x2c, 0x07, 0x01, 0x85, 0x06, 0x8c, 0x5d, 0xc2, 0xce, 0x22, 0xcd, 0xb8, 0x71, 0x63, 0xc6, 0xb1, + 0x2c, 0x07, 0x01, 0x85, 0x24, 0xe3, 0x73, 0x00, 0x28, 0xc7, 0x67, 0x58, 0x11, 0xda, 0x92, 0x70, + 0x7b, 0x16, 0xa1, 0x6e, 0x61, 0x47, 0x49, 0x0e, 0x2a, 0x48, 0x20, 0xe8, 0x86, 0x8d, 0xd9, 0xba, + 0x75, 0xe7, 0xd8, 0x30, 0xef, 0x58, 0x15, 0x67, 0x07, 0x2c, 0x88, 0xd6, 0x90, 0x40, 0x0b, 0xe4, + 0xcf, 0x48, 0x4f, 0xf5, 0x05, 0x48, 0x0c, 0xc5, 0xd9, 0x77, 0x71, 0xd4, 0x21, 0xea, 0x3a, 0x47, + 0x0a, 0x38, 0x27, 0x60, 0xf5, 0x94, 0xe1, 0x84, 0x8b, 0xb6, 0x92, 0x26, 0xcf, 0x68, 0xc0, 0x21, + 0x04, 0x46, 0x0b, 0xf3, 0x96, 0xce, 0x95, 0x63, 0xf8, 0x53, 0x60, 0x44, 0x34, 0xe0, 0xb2, 0xb1, + 0x29, 0xee, 0xdd, 0xbe, 0xda, 0x45, 0x3d, 0xa3, 0x01, 0x92, 0x21, 0xce, 0x5f, 0xf3, 0x20, 0xff, + 0x8c, 0x06, 0xb0, 0x02, 0x96, 0xb0, 0xef, 0x33, 0xc2, 0xb9, 0x66, 0x1a, 0x40, 0xb8, 0x0e, 0x16, + 0x53, 0xda, 0x0e, 0x3d, 0x45, 0x57, 0x40, 0x1a, 0x09, 0x61, 0x1f, 0xa7, 0x58, 0xf6, 0x00, 0x25, + 0x24, 0xc7, 0xa2, 0x4b, 0x97, 0xa5, 0xee, 0x26, 0x9d, 0xb8, 0x49, 0x98, 0xbc, 0xca, 0x8d, 0xda, + 0xea, 0x45, 0x66, 0x17, 0xa5, 0xfd, 0x85, 0x34, 0xa3, 0x71, 0x00, 0xdf, 0x07, 0x4b, 0xe9, 0xb9, + 0x2b, 0xd7, 0xb0, 0x20, 0xb7, 0x78, 0xed, 0x22, 0xb3, 0x57, 0xd3, 0xd1, 0x32, 0x7f, 0x87, 0x79, + 0x0b, 0x2d, 0xa6, 0xe7, 0xe2, 0x7f, 0xb8, 0x03, 0xcc, 0xf4, 0xdc, 0x0d, 0x13, 0x9f, 0x9c, 0xcb, + 0x4b, 0xdc, 0xa8, 0x95, 0x2f, 0x32, 0xdb, 0x1a, 0x0b, 0x3f, 0x12, 0x3e, 0xb4, 0x94, 0x9e, 0xcb, + 0x01, 0x7c, 0x1f, 0x00, 0x35, 0x25, 0xa9, 0xa0, 0xee, 0xe4, 0xe5, 0x8b, 0xcc, 0x2e, 0x48, 0xab, + 0xe4, 0x1e, 0x0d, 0xa1, 0x03, 0x16, 0x14, 0xb7, 0x29, 0xb9, 0x4b, 0x17, 0x99, 0x6d, 0x46, 0x34, + 0x50, 0x9c, 0xca, 0x25, 0xb6, 0x8a, 0x91, 0x98, 0x76, 0x89, 0x2f, 0x2f, 0x46, 0x13, 0x0d, 0x20, + 0xfc, 0x10, 0xac, 0x2a, 0x2d, 0x71, 0xf6, 0x3c, 0xc5, 0x71, 0x5b, 0x35, 0xf4, 0x35, 0x78, 0x91, + 0xd9, 0x2b, 0xd2, 0x75, 0x3a, 0xf0, 0xa0, 0x29, 0xec, 0x7c, 0x31, 0x0f, 0xcc, 0xd3, 0x73, 0x44, + 0x78, 0x27, 0x4a, 0xe1, 0x47, 0xc0, 0x92, 0x8d, 0x26, 0xf6, 0x52, 0x77, 0xe2, 0x5c, 0x6a, 0xf7, + 0x46, 0x77, 0xe0, 0x74, 0x84, 0x83, 0x56, 0x07, 0xa6, 0x03, 0x7d, 0x78, 0x65, 0xb0, 0xd0, 0x8c, + 0x28, 0x8d, 0x65, 0x19, 0x95, 0x90, 0x02, 0xf0, 0xa5, 0xdc, 0x72, 0x59, 0x22, 0x79, 0xd9, 0xc4, + 0xff, 0xe8, 0x6a, 0x89, 0x4c, 0xd5, 0x59, 0xed, 0x9e, 0x68, 0xe1, 0x2f, 0x33, 0x7b, 0x45, 0x69, + 0xeb, 0x7c, 0xe7, 0xab, 0xef, 0xbe, 0x7e, 0x90, 0x13, 0xa7, 0x23, 0x8b, 0xd1, 0x02, 0x79, 0x46, + 0x52, 0x79, 0xec, 0x25, 0x24, 0x86, 0xe2, 0x6d, 0xc5, 0x48, 0x97, 0xb0, 0x94, 0xf8, 0xf2, 0x78, + 0x4d, 0x34, 0xc4, 0xe2, 0xd5, 0x17, 0x60, 0xee, 0x76, 0x38, 0xf1, 0xd5, 0x59, 0xa2, 0xa5, 0x00, + 0xf3, 0x3f, 0x70, 0xe2, 0x3f, 0x31, 0x3e, 0xff, 0xd2, 0x9e, 0x73, 0x30, 0x28, 0xea, 0xfe, 0xbe, + 0xd3, 0x8e, 0xc8, 0x8c, 0x1a, 0xdd, 0x03, 0x25, 0xf1, 0xc1, 0x84, 0x03, 0xe2, 0x9e, 0x91, 0x9e, + 0xae, 0x54, 0x55, 0x77, 0xda, 0xfe, 0x7b, 0xd2, 0xe3, 0x68, 0x1c, 0x68, 0x89, 0x2f, 0x0d, 0x50, + 0x3c, 0x65, 0xd8, 0x23, 0xba, 0x5b, 0x17, 0xd5, 0x2e, 0x20, 0xd3, 0x12, 0x1a, 0x09, 0x6d, 0x71, + 0xa8, 0xb4, 0x93, 0xea, 0x27, 0x72, 0x00, 0x45, 0x06, 0x23, 0xe4, 0x9c, 0x78, 0x72, 0x2f, 0x0d, + 0xa4, 0x11, 0xdc, 0x07, 0xcb, 0x7e, 0xc8, 0x71, 0x33, 0x92, 0xdf, 0x87, 0xde, 0x99, 0x5a, 0x7e, + 0xcd, 0xba, 0xc8, 0xec, 0x92, 0x76, 0x34, 0x84, 0x1d, 0x4d, 0x20, 0x51, 0x43, 0xa3, 0x34, 0x39, + 0x5b, 0xb9, 0x37, 0xa6, 0xaa, 0xa1, 0x61, 0xa8, 0xf4, 0xa0, 0x29, 0xac, 0x6e, 0x8c, 0x66, 0x27, + 0x90, 0xe5, 0x6b, 0x22, 0x05, 0x84, 0x35, 0x0a, 0xe3, 0x30, 0x95, 0xe5, 0xba, 0x80, 0x14, 0x80, + 0x1f, 0x82, 0x02, 0xed, 0x12, 0xc6, 0x42, 0x9f, 0x70, 0x59, 0xa6, 0xc5, 0xbd, 0xf7, 0xae, 0x96, + 0xc1, 0xd8, 0x97, 0x0c, 0x1a, 0xc5, 0x8b, 0xc5, 0x91, 0x44, 0x4e, 0x32, 0x26, 0x31, 0x65, 0x3d, + 0xd9, 0x5a, 0xe9, 0xc5, 0x29, 0xc7, 0x73, 0x69, 0x47, 0x13, 0x08, 0xd6, 0x00, 0xd4, 0x69, 0x8c, + 0xa4, 0x1d, 0x96, 0xb8, 0xf2, 0x0d, 0x52, 0x92, 0xb9, 0xf2, 0x39, 0x56, 0x5e, 0x24, 0x9d, 0x4f, + 0x71, 0x8a, 0xd1, 0x15, 0x0b, 0xfc, 0x35, 0x80, 0xea, 0x4c, 0xdc, 0xcf, 0x38, 0x4d, 0xc4, 0xf7, + 0xd8, 0xab, 0x30, 0xd0, 0xbd, 0x91, 0xd4, 0x57, 0x5e, 0x3d, 0x67, 0x4b, 0xa1, 0x63, 0x4e, 0xf5, + 0x2a, 0x8e, 0x0d, 0xd3, 0xb0, 0x16, 0x8e, 0x0d, 0x73, 0xc9, 0x32, 0x87, 0xfb, 0xa7, 0x57, 0x81, + 0xd6, 0x06, 0x78, 0x6c, 0x7a, 0xce, 0x0b, 0x00, 0x4e, 0x18, 0x09, 0x45, 0x07, 0x1b, 0x45, 0xe2, + 0xb5, 0x97, 0xe0, 0x98, 0x0c, 0xde, 0xb7, 0x62, 0x3c, 0x5e, 0x98, 0xf3, 0x93, 0x85, 0x09, 0x81, + 0xe1, 0x51, 0x9f, 0xc8, 0xd2, 0x28, 0x20, 0x39, 0x7e, 0xf0, 0xcf, 0x1c, 0x18, 0xfb, 0x6c, 0x85, + 0xbf, 0x04, 0xd5, 0x83, 0xc3, 0xc3, 0x7a, 0xa3, 0xe1, 0x9e, 0x7e, 0x7a, 0x52, 0x77, 0x4f, 0xea, + 0xe8, 0xf9, 0x51, 0xa3, 0x71, 0xf4, 0xf1, 0x8b, 0x67, 0xf5, 0x46, 0xc3, 0x9a, 0xab, 0xde, 0x7f, + 0xf3, 0x76, 0xb3, 0x32, 0x8a, 0x3f, 0x21, 0x2c, 0x0e, 0x39, 0x0f, 0x69, 0x12, 0x09, 0x81, 0x0f, + 0xc0, 0xfa, 0x78, 0x36, 0xaa, 0x37, 0x4e, 0xd1, 0xd1, 0xe1, 0x69, 0xfd, 0xa9, 0x95, 0xab, 0x56, + 0xde, 0xbc, 0xdd, 0x2c, 0x8f, 0x32, 0x11, 0xe1, 0x29, 0x0b, 0x3d, 0xf1, 0xe4, 0x3d, 0x06, 0x95, + 0xeb, 0x35, 0xeb, 0x4f, 0xad, 0xf9, 0x6a, 0xf5, 0xcd, 0xdb, 0xcd, 0xf5, 0xeb, 0x14, 0x89, 0x5f, + 0x35, 0x3e, 0xff, 0xfb, 0xc6, 0x5c, 0xed, 0xc9, 0x37, 0xfd, 0x8d, 0xdc, 0xb7, 0xfd, 0x8d, 0xdc, + 0x7f, 0xfb, 0x1b, 0xb9, 0x2f, 0xde, 0x6d, 0xcc, 0x7d, 0xfb, 0x6e, 0x63, 0xee, 0x5f, 0xef, 0x36, + 0xe6, 0xfe, 0xb8, 0x19, 0x84, 0x69, 0xab, 0xd3, 0xdc, 0xf6, 0x68, 0xbc, 0x33, 0xfd, 0x63, 0x85, + 0xf8, 0x20, 0xe7, 0xcd, 0x45, 0xf9, 0x8b, 0xd2, 0xa3, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0xc6, + 0x17, 0xe6, 0x54, 0xaa, 0x12, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { @@ -1645,6 +1655,11 @@ func (m *Log) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.BlockTimestamp != 0 { + i = encodeVarintEvm(dAtA, i, uint64(m.BlockTimestamp)) + i-- + dAtA[i] = 0x50 + } if m.Removed { i-- if m.Removed { @@ -2235,6 +2250,9 @@ func (m *Log) Size() (n int) { if m.Removed { n += 2 } + if m.BlockTimestamp != 0 { + n += 1 + sovEvm(uint64(m.BlockTimestamp)) + } return n } @@ -4208,6 +4226,25 @@ func (m *Log) Unmarshal(dAtA []byte) error { } } m.Removed = bool(v != 0) + case 10: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field BlockTimestamp", wireType) + } + m.BlockTimestamp = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowEvm + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.BlockTimestamp |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipEvm(dAtA[iNdEx:]) diff --git a/x/vm/types/logs.go b/x/vm/types/logs.go index 85f029ca6..5409a2097 100644 --- a/x/vm/types/logs.go +++ b/x/vm/types/logs.go @@ -114,14 +114,15 @@ func NewLogFromEth(log *ethtypes.Log) *Log { } return &Log{ - Address: log.Address.String(), - Topics: topics, - Data: log.Data, - BlockNumber: log.BlockNumber, - TxHash: log.TxHash.String(), - TxIndex: uint64(log.TxIndex), - Index: uint64(log.Index), - BlockHash: log.BlockHash.String(), - Removed: log.Removed, + Address: log.Address.String(), + Topics: topics, + Data: log.Data, + BlockNumber: log.BlockNumber, + BlockHash: log.BlockHash.String(), + BlockTimestamp: log.BlockTimestamp, + TxHash: log.TxHash.String(), + TxIndex: uint64(log.TxIndex), + Index: uint64(log.Index), + Removed: log.Removed, } }