Merge branch 'main' into tt-1806-labelling-readme

Tofel · web-flow · commit 6c6108be0f1b · 2024-11-29T17:15:09.000+01:00
diff --git a/seth/.changeset/v1.50.10.md b/seth/.changeset/v1.50.10.md
@@ -0,0 +1 @@
+- bugfix: return decoded tx error from `DecodeTx` function, if decoding was successful (currently it returns the original error, even if decoding was successful)
diff --git a/seth/decode.go b/seth/decode.go
@@ -105,8 +105,8 @@ func (m *Client) Decode(tx *types.Transaction, txErr error) (*DecodedTransaction
 		return nil, verr.Join(m.Errors...)
 	}
 
-	if m.DecodeSendErr(txErr) != nil {
-		return nil, txErr
+	if decodedErr := m.DecodeSendErr(txErr); decodedErr != nil {
+		return nil, decodedErr
 	}
 
 	return m.DecodeTx(tx)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+- bugfix: return decoded tx error from `DecodeTx` function, if decoding was successful (currently it returns the original error, even if decoding was successful)
Original file line number	Diff line number	Diff line change
`@@ -105,8 +105,8 @@ func (m Client) Decode(tx types.Transaction, txErr error) (*DecodedTransaction`
`105`	`105`	`return nil, verr.Join(m.Errors...)`
`106`	`106`	`}`
`107`	`107`
`108`		`- if m.DecodeSendErr(txErr) != nil {`
`109`		`- return nil, txErr`
	`108`	`+ if decodedErr := m.DecodeSendErr(txErr); decodedErr != nil {`
	`109`	`+ return nil, decodedErr`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`return m.DecodeTx(tx)`