From a9fdaa3839261dad5c3045ab3e7691711535586f Mon Sep 17 00:00:00 2001
From: Martin Arrivets <arrivets@gmail.com>
Date: Fri, 18 Oct 2024 12:53:22 +0200
Subject: [PATCH] chore: add Reason() method to VmError interface

---
 x/evm/types/errors.go      |  1 +
 x/evm/types/errors_test.go | 51 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/x/evm/types/errors.go b/x/evm/types/errors.go
index 1ab26e2065..43f9fe9c2c 100644
--- a/x/evm/types/errors.go
+++ b/x/evm/types/errors.go
@@ -128,6 +128,7 @@ type VmError interface {
 	Error() string
 	VmError() string
 	Ret() []byte
+	Reason() string
 }
 
 type vmErrorWithRet struct {
diff --git a/x/evm/types/errors_test.go b/x/evm/types/errors_test.go
index d329b76818..eaa0b10096 100644
--- a/x/evm/types/errors_test.go
+++ b/x/evm/types/errors_test.go
@@ -51,3 +51,54 @@ func TestNewExecErrorWithReason(t *testing.T) {
 		require.Equal(t, 3, errWithReason.ErrorCode())
 	}
 }
+
+func TestNewVmErrorWithRet(t *testing.T) {
+	testCases := []struct {
+		name   string
+		vmErr  string
+		reason string
+		ret    []byte
+		hash   string
+	}{
+		{
+			"Empty reason",
+			"execution reverted",
+			"",
+			nil,
+			"0x",
+		},
+		{
+			"With unpackable reason",
+			"execution reverted",
+			"",
+			[]byte("a"),
+			"0x61",
+		},
+		{
+			"With packable reason but empty reason",
+			"execution reverted",
+			"",
+			revertSelector,
+			"0x08c379a0",
+		},
+		{
+			"With packable reason with reason",
+			"execution reverted",
+			"COUNTER_TOO_LOW",
+			hexutils.HexToBytes("08C379A00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000F434F554E5445525F544F4F5F4C4F570000000000000000000000000000000000"),
+			"0x08c379a00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000f434f554e5445525f544f4f5f4c4f570000000000000000000000000000000000",
+		},
+	}
+
+	for _, tc := range testCases {
+		tc := tc
+		vmErrorWithRet := NewVmErrorWithRet(
+			tc.vmErr,
+			tc.ret,
+			tc.hash,
+			0,
+		)
+		require.Equal(t, tc.vmErr, vmErrorWithRet.VmError())
+		require.Equal(t, tc.reason, vmErrorWithRet.Reason())
+	}
+}