change the way to handle default errors (Error and Panic)

Signed-off-by: Masanori Yoshida <[email protected]>
datachainlab · Apr 26, 2024 · d972fff · d972fff
1 parent f6fc68e
commit d972fff
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/pkg/relay/ethereum/error_parse.go b/pkg/relay/ethereum/error_parse.go
@@ -12,6 +12,22 @@ import (
 
 type ErrorRepository map[[4]byte]abi.Error
 
+func defaultErrorABIs() ([]abi.Error, error) {
+	strT, err := abi.NewType("string", "", nil)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create string type: %v", err)
+	}
+	uintT, err := abi.NewType("uint256", "", nil)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create uint256 type: %v", err)
+	}
+
+	return []abi.Error{
+		abi.NewError("Error", []abi.Argument{{Name: "desc", Type: strT}}),
+		abi.NewError("Panic", []abi.Argument{{Name: "reason", Type: uintT}}),
+	}, nil
+}
+
 func CreateErrorRepository(abiPaths []string) (ErrorRepository, error) {
 	var errABIs []abi.Error
 
@@ -46,6 +62,13 @@ func CreateErrorRepository(abiPaths []string) (ErrorRepository, error) {
 }
 
 func NewErrorRepository(errABIs []abi.Error) (ErrorRepository, error) {
+	defaultErrABIs, err := defaultErrorABIs()
+	if err != nil {
+		return nil, fmt.Errorf("failed to create default error ABIs: %v", err)
+	}
+
+	errABIs = append(errABIs, defaultErrABIs...)
+
 	repo := make(ErrorRepository)
 	for _, errABI := range errABIs {
 		if err := repo.Add(errABI); err != nil {
@@ -102,12 +125,6 @@ func errorToJSON(errVal interface{}, errABI abi.Error) (string, error) {
 }
 
 func (r ErrorRepository) ParseError(errorData []byte) (string, error) {
-	// handle Error(string) and Panic(uint256)
-	if revertReason, err := abi.UnpackRevert(errorData); err == nil {
-		return revertReason, nil
-	}
-
-	// handle custom error
 	errABI, err := r.Get(errorData)
 	if err != nil {
 		return "", fmt.Errorf("failed to find error ABI: %v", err)

diff --git a/pkg/relay/ethereum/error_parse_test.go b/pkg/relay/ethereum/error_parse_test.go
@@ -18,7 +18,7 @@ func TestRevertReasonParserDefault(t *testing.T) {
 		common.FromHex("0x08c379a00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001a4e6f7420656e6f7567682045746865722070726f76696465642e000000000000"),
 	)
 	require.NoError(t, err)
-	require.Equal(t, "Not enough Ether provided.", revertReason)
+	require.Equal(t, `Error{"desc":"Not enough Ether provided."}`, revertReason)
 }
 
 func TestRevertReasonParserAddedCustomError(t *testing.T) {
@@ -37,7 +37,7 @@ func TestRevertReasonParserAddedCustomError(t *testing.T) {
 		common.FromHex("0x08c379a00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001a4e6f7420656e6f7567682045746865722070726f76696465642e000000000000"),
 	)
 	require.NoError(t, err)
-	require.Equal(t, "Not enough Ether provided.", revertReason)
+	require.Equal(t, `Error{"desc":"Not enough Ether provided."}`, revertReason)
 }
 
 func TestRevertReasonParserCustomError(t *testing.T) {