Merge pull request ethereum#174 from OffchainLabs/fix-decode-typed

Don't accept ArbitrumLegacyTxType in decodeTyped
joshuacolvin0 · Oct 25, 2022 · 5fac5a2 · 5fac5a2
2 parents 423bb08 + 2e7a561
commit 5fac5a2
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/core/types/transaction.go b/core/types/transaction.go
@@ -213,6 +213,10 @@ func (tx *Transaction) decodeTyped(b []byte, arbParsing bool) (TxData, error) {
 			var inner ArbitrumSubmitRetryableTx
 			err := rlp.DecodeBytes(b[1:], &inner)
 			return &inner, err
+		case ArbitrumLegacyTxType:
+			var inner ArbitrumLegacyTxData
+			err := rlp.DecodeBytes(b[1:], &inner)
+			return &inner, err
 		}
 	}
 	switch b[0] {
@@ -224,10 +228,6 @@ func (tx *Transaction) decodeTyped(b []byte, arbParsing bool) (TxData, error) {
 		var inner DynamicFeeTx
 		err := rlp.DecodeBytes(b[1:], &inner)
 		return &inner, err
-	case ArbitrumLegacyTxType:
-		var inner ArbitrumLegacyTxData
-		err := rlp.DecodeBytes(b[1:], &inner)
-		return &inner, err
 	default:
 		return nil, ErrTxTypeNotSupported
 	}