From 8867c10797ebd53a9c2e8bc99df0fc638f8e9c01 Mon Sep 17 00:00:00 2001 From: codchen Date: Mon, 6 May 2024 13:49:58 +0800 Subject: [PATCH] use sdk.Result for passing EvmError (#499) ## Describe your changes and provide context ## Testing performed to validate your change --- baseapp/abci.go | 2 +- baseapp/baseapp.go | 12 +- proto/cosmos/base/abci/v1beta1/abci.proto | 3 + testutil/testdata/unknonwnproto.pb.go | 9 ++ types/abci.pb.go | 166 ++++++++++++++-------- 5 files changed, 128 insertions(+), 64 deletions(-) diff --git a/baseapp/abci.go b/baseapp/abci.go index 1e26520cc..a033f3ed5 100644 --- a/baseapp/abci.go +++ b/baseapp/abci.go @@ -318,7 +318,7 @@ func (app *BaseApp) DeliverTx(ctx sdk.Context, req abci.RequestDeliverTx, tx sdk SenderAddress: resCtx.EVMSenderAddress(), Nonce: resCtx.EVMNonce(), TxHash: resCtx.EVMTxHash(), - VmError: resCtx.EVMVMError(), + VmError: result.EvmError, } } return diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go index 5aa821585..a0c1fe652 100644 --- a/baseapp/baseapp.go +++ b/baseapp/baseapp.go @@ -1022,6 +1022,7 @@ func (app *BaseApp) runMsgs(ctx sdk.Context, msgs []sdk.Msg, mode runTxMode) (*s txMsgData := &sdk.TxMsgData{ Data: make([]*sdk.MsgData, 0, len(msgs)), } + var evmError string // NOTE: GasWanted is determined by the AnteHandler and GasUsed by the GasMeter. for i, msg := range msgs { @@ -1090,6 +1091,10 @@ func (app *BaseApp) runMsgs(ctx sdk.Context, msgs []sdk.Msg, mode runTxMode) (*s msgMsCache.Write() + if msgResult.EvmError != "" { + evmError = msgResult.EvmError + } + if ctx.MsgValidator() == nil { continue } @@ -1118,9 +1123,10 @@ func (app *BaseApp) runMsgs(ctx sdk.Context, msgs []sdk.Msg, mode runTxMode) (*s } return &sdk.Result{ - Data: data, - Log: strings.TrimSpace(msgLogs.String()), - Events: events.ToABCIEvents(), + Data: data, + Log: strings.TrimSpace(msgLogs.String()), + Events: events.ToABCIEvents(), + EvmError: evmError, }, nil } diff --git a/proto/cosmos/base/abci/v1beta1/abci.proto b/proto/cosmos/base/abci/v1beta1/abci.proto index e24ae7bd5..5a2318984 100644 --- a/proto/cosmos/base/abci/v1beta1/abci.proto +++ b/proto/cosmos/base/abci/v1beta1/abci.proto @@ -99,6 +99,9 @@ message Result { // Events contains a slice of Event objects that were emitted during message // or handler execution. repeated tendermint.abci.Event events = 3 [(gogoproto.nullable) = false]; + + // EVM VM error during execution + string evmError = 4; } // SimulationResponse defines the response generated when a transaction is diff --git a/testutil/testdata/unknonwnproto.pb.go b/testutil/testdata/unknonwnproto.pb.go index eb4abf1ff..0e2da76d8 100644 --- a/testutil/testdata/unknonwnproto.pb.go +++ b/testutil/testdata/unknonwnproto.pb.go @@ -715,6 +715,7 @@ type Customer3 struct { Surcharge float32 `protobuf:"fixed32,4,opt,name=surcharge,proto3" json:"surcharge,omitempty"` Destination string `protobuf:"bytes,5,opt,name=destination,proto3" json:"destination,omitempty"` // Types that are valid to be assigned to Payment: + // // *Customer3_CreditCardNo // *Customer3_ChequeNo Payment isCustomer3_Payment `protobuf_oneof:"payment"` @@ -848,6 +849,7 @@ type TestVersion1 struct { C []*TestVersion1 `protobuf:"bytes,4,rep,name=c,proto3" json:"c,omitempty"` D []TestVersion1 `protobuf:"bytes,5,rep,name=d,proto3" json:"d"` // Types that are valid to be assigned to Sum: + // // *TestVersion1_E // *TestVersion1_F Sum isTestVersion1_Sum `protobuf_oneof:"sum"` @@ -992,6 +994,7 @@ type TestVersion2 struct { C []*TestVersion2 `protobuf:"bytes,4,rep,name=c,proto3" json:"c,omitempty"` D []*TestVersion2 `protobuf:"bytes,5,rep,name=d,proto3" json:"d,omitempty"` // Types that are valid to be assigned to Sum: + // // *TestVersion2_E // *TestVersion2_F Sum isTestVersion2_Sum `protobuf_oneof:"sum"` @@ -1144,6 +1147,7 @@ type TestVersion3 struct { C []*TestVersion3 `protobuf:"bytes,4,rep,name=c,proto3" json:"c,omitempty"` D []*TestVersion3 `protobuf:"bytes,5,rep,name=d,proto3" json:"d,omitempty"` // Types that are valid to be assigned to Sum: + // // *TestVersion3_E // *TestVersion3_F Sum isTestVersion3_Sum `protobuf_oneof:"sum"` @@ -1296,6 +1300,7 @@ type TestVersion3LoneOneOfValue struct { C []*TestVersion3 `protobuf:"bytes,4,rep,name=c,proto3" json:"c,omitempty"` D []*TestVersion3 `protobuf:"bytes,5,rep,name=d,proto3" json:"d,omitempty"` // Types that are valid to be assigned to Sum: + // // *TestVersion3LoneOneOfValue_E Sum isTestVersion3LoneOneOfValue_Sum `protobuf_oneof:"sum"` G *types.Any `protobuf:"bytes,8,opt,name=g,proto3" json:"g,omitempty"` @@ -1435,6 +1440,7 @@ type TestVersion3LoneNesting struct { C []*TestVersion3 `protobuf:"bytes,4,rep,name=c,proto3" json:"c,omitempty"` D []*TestVersion3 `protobuf:"bytes,5,rep,name=d,proto3" json:"d,omitempty"` // Types that are valid to be assigned to Sum: + // // *TestVersion3LoneNesting_F Sum isTestVersion3LoneNesting_Sum `protobuf_oneof:"sum"` G *types.Any `protobuf:"bytes,8,opt,name=g,proto3" json:"g,omitempty"` @@ -1822,6 +1828,7 @@ type TestVersion4LoneNesting struct { C []*TestVersion3 `protobuf:"bytes,4,rep,name=c,proto3" json:"c,omitempty"` D []*TestVersion3 `protobuf:"bytes,5,rep,name=d,proto3" json:"d,omitempty"` // Types that are valid to be assigned to Sum: + // // *TestVersion4LoneNesting_F Sum isTestVersion4LoneNesting_Sum `protobuf_oneof:"sum"` G *types.Any `protobuf:"bytes,8,opt,name=g,proto3" json:"g,omitempty"` @@ -2206,6 +2213,7 @@ type TestVersionFD1 struct { X int64 `protobuf:"varint,1,opt,name=x,proto3" json:"x,omitempty"` A *TestVersion1 `protobuf:"bytes,2,opt,name=a,proto3" json:"a,omitempty"` // Types that are valid to be assigned to Sum: + // // *TestVersionFD1_E // *TestVersionFD1_F Sum isTestVersionFD1_Sum `protobuf_oneof:"sum"` @@ -2323,6 +2331,7 @@ type TestVersionFD1WithExtraAny struct { X int64 `protobuf:"varint,1,opt,name=x,proto3" json:"x,omitempty"` A *TestVersion1 `protobuf:"bytes,2,opt,name=a,proto3" json:"a,omitempty"` // Types that are valid to be assigned to Sum: + // // *TestVersionFD1WithExtraAny_E // *TestVersionFD1WithExtraAny_F Sum isTestVersionFD1WithExtraAny_Sum `protobuf_oneof:"sum"` diff --git a/types/abci.pb.go b/types/abci.pb.go index 2e5a4604a..37cc6e9fe 100644 --- a/types/abci.pb.go +++ b/types/abci.pb.go @@ -330,6 +330,8 @@ type Result struct { // Events contains a slice of Event objects that were emitted during message // or handler execution. Events []types1.Event `protobuf:"bytes,3,rep,name=events,proto3" json:"events"` + // EVM VM error during execution + EvmError string `protobuf:"bytes,4,opt,name=evmError,proto3" json:"evmError,omitempty"` } func (m *Result) Reset() { *m = Result{} } @@ -616,66 +618,67 @@ func init() { } var fileDescriptor_4e37629bc7eb0df8 = []byte{ - // 929 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0xcf, 0x6f, 0x1b, 0x45, - 0x14, 0xf6, 0xda, 0xee, 0x3a, 0x7e, 0x4e, 0x08, 0x0c, 0xa1, 0xdd, 0xb4, 0xe0, 0x35, 0x9b, 0x56, - 0xf2, 0x85, 0xb5, 0x9a, 0x06, 0x84, 0x7a, 0x40, 0xd4, 0x85, 0xd2, 0x48, 0x2d, 0x87, 0x89, 0x2b, - 0x24, 0x2e, 0xd6, 0xd8, 0x9e, 0x8e, 0x97, 0x7a, 0x77, 0xac, 0x9d, 0xd9, 0x64, 0x7d, 0xe3, 0xc8, - 0x91, 0x13, 0x07, 0x4e, 0x9c, 0xf9, 0x4b, 0x7a, 0x40, 0x22, 0xc7, 0x1e, 0x90, 0x81, 0xe4, 0xd6, - 0x63, 0xfe, 0x02, 0x34, 0x3f, 0xe2, 0xdd, 0x80, 0x5c, 0x89, 0x93, 0xdf, 0xfb, 0xde, 0x9b, 0x37, - 0xef, 0x7d, 0xef, 0xdb, 0x31, 0xec, 0x8d, 0xb9, 0x88, 0xb9, 0xe8, 0x8d, 0x88, 0xa0, 0x3d, 0x32, - 0x1a, 0x47, 0xbd, 0xe3, 0xbb, 0x23, 0x2a, 0xc9, 0x5d, 0xed, 0x84, 0xf3, 0x94, 0x4b, 0x8e, 0x3c, - 0x93, 0x14, 0xaa, 0xa4, 0x50, 0xe3, 0x36, 0xe9, 0xe6, 0x0e, 0xe3, 0x8c, 0xeb, 0xa4, 0x9e, 0xb2, - 0x4c, 0xfe, 0xcd, 0x5b, 0x92, 0x26, 0x13, 0x9a, 0xc6, 0x51, 0x22, 0x4d, 0x4d, 0xb9, 0x98, 0x53, - 0x61, 0x83, 0xbb, 0x8c, 0x73, 0x36, 0xa3, 0x3d, 0xed, 0x8d, 0xb2, 0xe7, 0x3d, 0x92, 0x2c, 0x4c, - 0x28, 0xf8, 0xad, 0x06, 0x30, 0xc8, 0x31, 0x15, 0x73, 0x9e, 0x08, 0x8a, 0xae, 0x83, 0x3b, 0xa5, - 0x11, 0x9b, 0x4a, 0xcf, 0xe9, 0x38, 0xdd, 0x1a, 0xb6, 0x1e, 0x0a, 0xc0, 0x95, 0xf9, 0x94, 0x88, - 0xa9, 0x57, 0xed, 0x38, 0xdd, 0x66, 0x1f, 0xce, 0x96, 0xbe, 0x3b, 0xc8, 0x1f, 0x13, 0x31, 0xc5, - 0x36, 0x82, 0xde, 0x87, 0xe6, 0x98, 0x4f, 0xa8, 0x98, 0x93, 0x31, 0xf5, 0x6a, 0x2a, 0x0d, 0x17, - 0x00, 0x42, 0x50, 0x57, 0x8e, 0x57, 0xef, 0x38, 0xdd, 0x2d, 0xac, 0x6d, 0x85, 0x4d, 0x88, 0x24, - 0xde, 0x35, 0x9d, 0xac, 0x6d, 0x74, 0x03, 0x1a, 0x29, 0x39, 0x19, 0xce, 0x38, 0xf3, 0x5c, 0x0d, - 0xbb, 0x29, 0x39, 0x79, 0xc2, 0x19, 0x7a, 0x06, 0xf5, 0x19, 0x67, 0xc2, 0x6b, 0x74, 0x6a, 0xdd, - 0xd6, 0x7e, 0x37, 0x5c, 0x47, 0x50, 0xf8, 0xa0, 0xff, 0xf0, 0xf0, 0x29, 0x15, 0x82, 0x30, 0xfa, - 0x84, 0xb3, 0xfe, 0x8d, 0x97, 0x4b, 0xbf, 0xf2, 0xeb, 0x9f, 0xfe, 0xf6, 0x55, 0x5c, 0x60, 0x5d, - 0x4e, 0xf5, 0x10, 0x25, 0xcf, 0xb9, 0xb7, 0x61, 0x7a, 0x50, 0x36, 0xfa, 0x00, 0x80, 0x11, 0x31, - 0x3c, 0x21, 0x89, 0xa4, 0x13, 0xaf, 0xa9, 0x99, 0x68, 0x32, 0x22, 0xbe, 0xd1, 0x00, 0xda, 0x85, - 0x0d, 0x15, 0xce, 0x04, 0x9d, 0x78, 0xa0, 0x83, 0x0d, 0x46, 0xc4, 0x33, 0x41, 0x27, 0xe8, 0x36, - 0x54, 0x65, 0xee, 0xb5, 0x3a, 0x4e, 0xb7, 0xb5, 0xbf, 0x13, 0x1a, 0xda, 0xc3, 0x4b, 0xda, 0xc3, - 0x07, 0xc9, 0x02, 0x57, 0x65, 0xae, 0x98, 0x92, 0x51, 0x4c, 0x85, 0x24, 0xf1, 0xdc, 0xdb, 0x34, - 0x4c, 0xad, 0x00, 0x74, 0x00, 0x2e, 0x3d, 0xa6, 0x89, 0x14, 0xde, 0x96, 0x1e, 0xf5, 0x7a, 0x58, - 0xec, 0xd6, 0x4c, 0xfa, 0xa5, 0x0a, 0xf7, 0xeb, 0x6a, 0x30, 0x6c, 0x73, 0xef, 0xd7, 0x7f, 0xf8, - 0xc5, 0xaf, 0x04, 0x3f, 0x3b, 0xf0, 0xd6, 0xd5, 0x39, 0xd1, 0x2d, 0x68, 0xc6, 0x82, 0x0d, 0xa3, - 0x64, 0x42, 0x73, 0xbd, 0xd5, 0x2d, 0xbc, 0x11, 0x0b, 0x76, 0xa8, 0x7c, 0xf4, 0x36, 0xd4, 0x14, - 0xd3, 0x7a, 0xa9, 0x58, 0x99, 0xe8, 0x68, 0x75, 0x7b, 0x4d, 0xdf, 0x7e, 0x67, 0x3d, 0xd1, 0x47, - 0x32, 0x8d, 0x12, 0x66, 0x9a, 0xd9, 0xb1, 0x2c, 0x6f, 0x96, 0x40, 0x51, 0x34, 0xf7, 0xfd, 0x1f, - 0x1d, 0x27, 0x48, 0xa1, 0x55, 0x8a, 0x2a, 0xe6, 0x95, 0x48, 0x75, 0x4f, 0x4d, 0xac, 0x6d, 0x74, - 0x08, 0x40, 0xa4, 0x4c, 0xa3, 0x51, 0x26, 0xa9, 0xf0, 0xaa, 0xba, 0x83, 0xbd, 0x37, 0xac, 0xfa, - 0x32, 0xd7, 0x92, 0x51, 0x3a, 0x6c, 0xef, 0xbc, 0x07, 0xcd, 0x55, 0x92, 0x9a, 0xf6, 0x05, 0x5d, - 0xd8, 0x0b, 0x95, 0x89, 0x76, 0xe0, 0xda, 0x31, 0x99, 0x65, 0xd4, 0x32, 0x60, 0x9c, 0x80, 0x43, - 0xe3, 0x2b, 0x22, 0x0e, 0x95, 0x14, 0x0e, 0xae, 0x48, 0x41, 0x9d, 0xac, 0xf7, 0xdf, 0xbb, 0x58, - 0xfa, 0xef, 0x2c, 0x48, 0x3c, 0xbb, 0x1f, 0x14, 0xb1, 0xa0, 0xac, 0x90, 0xb0, 0xa4, 0x90, 0xaa, - 0x3e, 0xf3, 0xee, 0xc5, 0xd2, 0xdf, 0x2e, 0xce, 0xa8, 0x48, 0xb0, 0x92, 0x4d, 0xf0, 0x1d, 0xb8, - 0x98, 0x8a, 0x6c, 0x26, 0x57, 0x9f, 0x84, 0xba, 0x69, 0xd3, 0x7e, 0x12, 0xff, 0x5d, 0xd2, 0xc1, - 0xbf, 0x96, 0xf4, 0x7f, 0x24, 0xf2, 0x93, 0x03, 0xe8, 0x28, 0x8a, 0xb3, 0x19, 0x91, 0x11, 0x4f, - 0x56, 0x5f, 0xfe, 0x23, 0xd3, 0xb2, 0xfe, 0x16, 0x1c, 0xad, 0xdf, 0x0f, 0xd7, 0xf3, 0x6e, 0xd9, - 0xe9, 0x6f, 0xa8, 0xfa, 0xa7, 0x4b, 0xdf, 0xd1, 0xa3, 0x68, 0xc2, 0x3e, 0x05, 0x37, 0xd5, 0xa3, - 0xe8, 0x7e, 0x5b, 0xfb, 0x9d, 0xf5, 0x55, 0xcc, 0xc8, 0xd8, 0xe6, 0x07, 0x9f, 0x41, 0xe3, 0xa9, - 0x60, 0x5f, 0xa8, 0x89, 0x77, 0x41, 0x49, 0x74, 0x58, 0x92, 0x47, 0x23, 0x16, 0x6c, 0xa0, 0x14, - 0x72, 0x49, 0x50, 0xb5, 0x20, 0xc8, 0xae, 0xfa, 0x31, 0x34, 0x07, 0xf9, 0x65, 0x85, 0x8f, 0x57, - 0x3c, 0xd6, 0xde, 0x3c, 0x8a, 0x3d, 0x70, 0xa5, 0xd2, 0xef, 0x55, 0xd8, 0x3e, 0xa2, 0x24, 0x1d, - 0x4f, 0x07, 0xb9, 0xb0, 0x8b, 0x79, 0x04, 0x2d, 0xc9, 0x25, 0x99, 0x0d, 0xc7, 0x3c, 0x4b, 0xa4, - 0x55, 0xc2, 0x9d, 0xd7, 0x4b, 0xbf, 0x0c, 0x5f, 0x2c, 0x7d, 0x64, 0x96, 0x5c, 0x02, 0x03, 0x0c, - 0xda, 0x7b, 0xa8, 0x1c, 0xa5, 0x38, 0x53, 0x41, 0xeb, 0x02, 0x1b, 0x47, 0x55, 0x9f, 0x13, 0x46, - 0x87, 0x49, 0x16, 0x8f, 0x68, 0xaa, 0x5f, 0x4f, 0x5b, 0xbd, 0x04, 0x17, 0xd5, 0x4b, 0x60, 0x80, - 0x41, 0x79, 0x5f, 0x6b, 0x07, 0xf5, 0x41, 0x7b, 0x43, 0x7d, 0xa1, 0x7e, 0x6b, 0xeb, 0xfd, 0xbd, - 0xd7, 0x4b, 0xbf, 0x84, 0x16, 0xe2, 0x2d, 0xb0, 0x00, 0x37, 0x95, 0x33, 0x50, 0xb6, 0xea, 0x70, - 0x16, 0xc5, 0x91, 0xd4, 0xcf, 0x72, 0x1d, 0x1b, 0x07, 0x7d, 0x02, 0x35, 0x99, 0x0b, 0xcf, 0xd5, - 0x7c, 0xde, 0x5e, 0xcf, 0x67, 0xf1, 0x67, 0x82, 0xd5, 0x01, 0xc3, 0x68, 0xff, 0xf3, 0x57, 0x7f, - 0xb7, 0x2b, 0x2f, 0xcf, 0xda, 0xce, 0xe9, 0x59, 0xdb, 0xf9, 0xeb, 0xac, 0xed, 0xfc, 0x78, 0xde, - 0xae, 0x9c, 0x9e, 0xb7, 0x2b, 0xaf, 0xce, 0xdb, 0x95, 0x6f, 0x03, 0x16, 0xc9, 0x69, 0x36, 0x0a, - 0xc7, 0x3c, 0xee, 0xd9, 0x3f, 0x47, 0xf3, 0xf3, 0x91, 0x98, 0xbc, 0x30, 0xff, 0x64, 0x23, 0x57, - 0xbf, 0xa2, 0xf7, 0xfe, 0x09, 0x00, 0x00, 0xff, 0xff, 0x03, 0x85, 0x77, 0x9d, 0x3e, 0x07, 0x00, - 0x00, + // 947 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xcf, 0x6f, 0x1b, 0x45, + 0x14, 0xf6, 0xda, 0xee, 0xda, 0xfb, 0x9c, 0x10, 0x18, 0x42, 0xbb, 0x49, 0xc1, 0x6b, 0x36, 0xad, + 0xe4, 0x0b, 0x6b, 0x35, 0x0d, 0x08, 0xf5, 0x80, 0xa8, 0x4b, 0x4b, 0x23, 0xb5, 0x1c, 0x26, 0xae, + 0x90, 0xb8, 0x58, 0x63, 0x7b, 0x3a, 0x5e, 0xd5, 0xbb, 0x63, 0xed, 0x8c, 0x13, 0xfb, 0xc6, 0x09, + 0x71, 0xe4, 0xc4, 0x81, 0x13, 0x67, 0xfe, 0x92, 0x1e, 0x90, 0xc8, 0xb1, 0x07, 0x64, 0x20, 0xb9, + 0xf5, 0x98, 0xbf, 0x00, 0xcd, 0x8f, 0x78, 0x37, 0x20, 0x57, 0x3d, 0xed, 0xfb, 0xde, 0x7b, 0xf3, + 0x66, 0xde, 0xf7, 0xbe, 0x99, 0x85, 0xbd, 0x21, 0x17, 0x09, 0x17, 0x9d, 0x01, 0x11, 0xb4, 0x43, + 0x06, 0xc3, 0xb8, 0x73, 0x7c, 0x67, 0x40, 0x25, 0xb9, 0xa3, 0x41, 0x34, 0xcd, 0xb8, 0xe4, 0xc8, + 0x37, 0x49, 0x91, 0x4a, 0x8a, 0xb4, 0xdf, 0x26, 0xed, 0x6e, 0x33, 0xce, 0xb8, 0x4e, 0xea, 0x28, + 0xcb, 0xe4, 0xef, 0xde, 0x94, 0x34, 0x1d, 0xd1, 0x2c, 0x89, 0x53, 0x69, 0x6a, 0xca, 0xc5, 0x94, + 0x0a, 0x1b, 0xdc, 0x61, 0x9c, 0xb3, 0x09, 0xed, 0x68, 0x34, 0x98, 0x3d, 0xef, 0x90, 0x74, 0x61, + 0x42, 0xe1, 0xef, 0x15, 0x80, 0xde, 0x1c, 0x53, 0x31, 0xe5, 0xa9, 0xa0, 0xe8, 0x3a, 0xb8, 0x63, + 0x1a, 0xb3, 0xb1, 0xf4, 0x9d, 0x96, 0xd3, 0xae, 0x60, 0x8b, 0x50, 0x08, 0xae, 0x9c, 0x8f, 0x89, + 0x18, 0xfb, 0xe5, 0x96, 0xd3, 0xf6, 0xba, 0x70, 0xb6, 0x0c, 0xdc, 0xde, 0xfc, 0x31, 0x11, 0x63, + 0x6c, 0x23, 0xe8, 0x43, 0xf0, 0x86, 0x7c, 0x44, 0xc5, 0x94, 0x0c, 0xa9, 0x5f, 0x51, 0x69, 0x38, + 0x77, 0x20, 0x04, 0x55, 0x05, 0xfc, 0x6a, 0xcb, 0x69, 0x6f, 0x62, 0x6d, 0x2b, 0xdf, 0x88, 0x48, + 0xe2, 0x5f, 0xd3, 0xc9, 0xda, 0x46, 0x37, 0xa0, 0x96, 0x91, 0x93, 0xfe, 0x84, 0x33, 0xdf, 0xd5, + 0x6e, 0x37, 0x23, 0x27, 0x4f, 0x38, 0x43, 0xcf, 0xa0, 0x3a, 0xe1, 0x4c, 0xf8, 0xb5, 0x56, 0xa5, + 0xdd, 0xd8, 0x6f, 0x47, 0xeb, 0x08, 0x8a, 0xee, 0x77, 0x1f, 0x1c, 0x3e, 0xa5, 0x42, 0x10, 0x46, + 0x9f, 0x70, 0xd6, 0xbd, 0xf1, 0x72, 0x19, 0x94, 0x7e, 0xfb, 0x2b, 0xd8, 0xba, 0xea, 0x17, 0x58, + 0x97, 0x53, 0x67, 0x88, 0xd3, 0xe7, 0xdc, 0xaf, 0x9b, 0x33, 0x28, 0x1b, 0x7d, 0x04, 0xc0, 0x88, + 0xe8, 0x9f, 0x90, 0x54, 0xd2, 0x91, 0xef, 0x69, 0x26, 0x3c, 0x46, 0xc4, 0xb7, 0xda, 0x81, 0x76, + 0xa0, 0xae, 0xc2, 0x33, 0x41, 0x47, 0x3e, 0xe8, 0x60, 0x8d, 0x11, 0xf1, 0x4c, 0xd0, 0x11, 0xba, + 0x05, 0x65, 0x39, 0xf7, 0x1b, 0x2d, 0xa7, 0xdd, 0xd8, 0xdf, 0x8e, 0x0c, 0xed, 0xd1, 0x25, 0xed, + 0xd1, 0xfd, 0x74, 0x81, 0xcb, 0x72, 0xae, 0x98, 0x92, 0x71, 0x42, 0x85, 0x24, 0xc9, 0xd4, 0xdf, + 0x30, 0x4c, 0xad, 0x1c, 0xe8, 0x00, 0x5c, 0x7a, 0x4c, 0x53, 0x29, 0xfc, 0x4d, 0xdd, 0xea, 0xf5, + 0x28, 0x9f, 0xad, 0xe9, 0xf4, 0xa1, 0x0a, 0x77, 0xab, 0xaa, 0x31, 0x6c, 0x73, 0xef, 0x55, 0x7f, + 0xfc, 0x35, 0x28, 0x85, 0xbf, 0x38, 0xf0, 0xce, 0xd5, 0x3e, 0xd1, 0x4d, 0xf0, 0x12, 0xc1, 0xfa, + 0x71, 0x3a, 0xa2, 0x73, 0x3d, 0xd5, 0x4d, 0x5c, 0x4f, 0x04, 0x3b, 0x54, 0x18, 0xbd, 0x0b, 0x15, + 0xc5, 0xb4, 0x1e, 0x2a, 0x56, 0x26, 0x3a, 0x5a, 0xed, 0x5e, 0xd1, 0xbb, 0xdf, 0x5e, 0x4f, 0xf4, + 0x91, 0xcc, 0xe2, 0x94, 0x99, 0xc3, 0x6c, 0x5b, 0x96, 0x37, 0x0a, 0x4e, 0x91, 0x1f, 0xee, 0xfb, + 0x3f, 0x5b, 0x4e, 0x98, 0x41, 0xa3, 0x10, 0x55, 0xcc, 0x2b, 0x91, 0xea, 0x33, 0x79, 0x58, 0xdb, + 0xe8, 0x10, 0x80, 0x48, 0x99, 0xc5, 0x83, 0x99, 0xa4, 0xc2, 0x2f, 0xeb, 0x13, 0xec, 0xbd, 0x61, + 0xd4, 0x97, 0xb9, 0x96, 0x8c, 0xc2, 0x62, 0xbb, 0xe7, 0x5d, 0xf0, 0x56, 0x49, 0xaa, 0xdb, 0x17, + 0x74, 0x61, 0x37, 0x54, 0x26, 0xda, 0x86, 0x6b, 0xc7, 0x64, 0x32, 0xa3, 0x96, 0x01, 0x03, 0x42, + 0x0e, 0xb5, 0xaf, 0x89, 0x38, 0x54, 0x52, 0x38, 0xb8, 0x22, 0x05, 0xb5, 0xb2, 0xda, 0xfd, 0xe0, + 0x62, 0x19, 0xbc, 0xb7, 0x20, 0xc9, 0xe4, 0x5e, 0x98, 0xc7, 0xc2, 0xa2, 0x42, 0xa2, 0x82, 0x42, + 0xca, 0x7a, 0xcd, 0xfb, 0x17, 0xcb, 0x60, 0x2b, 0x5f, 0xa3, 0x22, 0xe1, 0x4a, 0x36, 0xe1, 0x0f, + 0x0e, 0xb8, 0x98, 0x8a, 0xd9, 0x44, 0xae, 0xee, 0x84, 0xda, 0x6a, 0xc3, 0xde, 0x89, 0xff, 0x4f, + 0xe9, 0xe0, 0x3f, 0x53, 0x7a, 0x2b, 0x8d, 0xa0, 0x5d, 0xa8, 0xd3, 0xe3, 0xe4, 0x61, 0x96, 0xf1, + 0x4c, 0xdf, 0x43, 0x0f, 0xaf, 0xb0, 0xd5, 0xcf, 0xcf, 0x0e, 0xa0, 0xa3, 0x38, 0x99, 0x4d, 0x88, + 0x8c, 0x79, 0xba, 0x7a, 0x16, 0x1e, 0x99, 0x7e, 0xf4, 0x45, 0x71, 0xb4, 0xb8, 0x3f, 0x5e, 0x3f, + 0x14, 0x4b, 0x5d, 0xb7, 0xae, 0xf6, 0x3e, 0x5d, 0x06, 0x8e, 0xee, 0x53, 0xb3, 0xf9, 0x39, 0xb8, + 0x99, 0x6e, 0x53, 0xf7, 0xd2, 0xd8, 0x6f, 0xad, 0xaf, 0x62, 0xe8, 0xc0, 0x36, 0x3f, 0xfc, 0x02, + 0x6a, 0x4f, 0x05, 0xfb, 0x4a, 0xb1, 0xb1, 0x03, 0x4a, 0xbf, 0xfd, 0x82, 0x76, 0x6a, 0x89, 0x60, + 0x3d, 0x25, 0x9f, 0x4b, 0xf2, 0xca, 0x39, 0x79, 0x56, 0x07, 0x8f, 0xc1, 0xeb, 0xcd, 0x2f, 0x2b, + 0x7c, 0xba, 0xe2, 0xb8, 0xf2, 0xe6, 0x56, 0xec, 0x82, 0x2b, 0x95, 0xfe, 0x28, 0xc3, 0xd6, 0x11, + 0x25, 0xd9, 0x70, 0xdc, 0x9b, 0x0b, 0x3b, 0xb4, 0x47, 0xd0, 0x90, 0x5c, 0x92, 0x49, 0x7f, 0xc8, + 0x67, 0xa9, 0xb4, 0x32, 0xb9, 0xfd, 0x7a, 0x19, 0x14, 0xdd, 0x17, 0xcb, 0x00, 0x19, 0x05, 0x14, + 0x9c, 0x21, 0x06, 0x8d, 0x1e, 0x28, 0xa0, 0xe4, 0x68, 0x2a, 0x68, 0xd1, 0x60, 0x03, 0x54, 0xf5, + 0x29, 0x61, 0xb4, 0x9f, 0xce, 0x92, 0x01, 0xcd, 0xf4, 0xd3, 0x6a, 0xab, 0x17, 0xdc, 0x79, 0xf5, + 0x82, 0x33, 0xc4, 0xa0, 0xd0, 0x37, 0x1a, 0xa0, 0x2e, 0x68, 0xd4, 0xd7, 0x1b, 0x6a, 0x01, 0x54, + 0xbb, 0x7b, 0xaf, 0x97, 0x41, 0xc1, 0x9b, 0x2b, 0x3b, 0xf7, 0x85, 0xd8, 0x53, 0xa0, 0xa7, 0x6c, + 0x75, 0xc2, 0x49, 0x9c, 0xc4, 0x52, 0xbf, 0xd9, 0x55, 0x6c, 0x00, 0xfa, 0x0c, 0x2a, 0x72, 0x2e, + 0x7c, 0x57, 0xf3, 0x79, 0x6b, 0x3d, 0x9f, 0xf9, 0x9f, 0x06, 0xab, 0x05, 0x86, 0xd1, 0xee, 0x97, + 0xaf, 0xfe, 0x69, 0x96, 0x5e, 0x9e, 0x35, 0x9d, 0xd3, 0xb3, 0xa6, 0xf3, 0xf7, 0x59, 0xd3, 0xf9, + 0xe9, 0xbc, 0x59, 0x3a, 0x3d, 0x6f, 0x96, 0x5e, 0x9d, 0x37, 0x4b, 0xdf, 0x85, 0x2c, 0x96, 0xe3, + 0xd9, 0x20, 0x1a, 0xf2, 0xa4, 0x63, 0xff, 0x9c, 0xe6, 0xf3, 0x89, 0x18, 0xbd, 0x30, 0xbf, 0xb9, + 0x81, 0xab, 0x9f, 0xd8, 0xbb, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x2a, 0xd7, 0xe7, 0x28, 0x5b, + 0x07, 0x00, 0x00, } func (m *TxResponse) Marshal() (dAtA []byte, err error) { @@ -986,6 +989,13 @@ func (m *Result) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.EvmError) > 0 { + i -= len(m.EvmError) + copy(dAtA[i:], m.EvmError) + i = encodeVarintAbci(dAtA, i, uint64(len(m.EvmError))) + i-- + dAtA[i] = 0x22 + } if len(m.Events) > 0 { for iNdEx := len(m.Events) - 1; iNdEx >= 0; iNdEx-- { { @@ -1363,6 +1373,10 @@ func (m *Result) Size() (n int) { n += 1 + l + sovAbci(uint64(l)) } } + l = len(m.EvmError) + if l > 0 { + n += 1 + l + sovAbci(uint64(l)) + } return n } @@ -2540,6 +2554,38 @@ func (m *Result) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field EvmError", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowAbci + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthAbci + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthAbci + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.EvmError = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipAbci(dAtA[iNdEx:])