Fix decoding of json transactions with type field (#259)

* Fix decoding of json transactions with type field * Add fallback
umbracle · Jan 2, 2024 · 68e48cf · 68e48cf
1 parent 6b06836
commit 68e48cf
Show file tree

Hide file tree

Showing 11 changed files with 176 additions and 27 deletions.
diff --git a/structs_encoding_test.go b/structs_encoding_test.go
@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func compactJSON(s string) string {
@@ -18,6 +19,17 @@ func compactJSON(s string) string {
 	return buffer.String()
 }
 
+func TestDecodeL2Block(t *testing.T) {
+	c := readTestsuite(t, "./testsuite/arbitrum-block-full.json")
+
+	block := new(Block)
+	require.NoError(t, block.UnmarshalJSON(c[0].content))
+
+	for _, txn := range block.Transactions {
+		require.NotEqual(t, txn.Type, 0)
+	}
+}
+
 func TestEncodingJSON_Block(t *testing.T) {
 	for _, c := range readTestsuite(t, "./testsuite/block-*.json") {
 		content := []byte(compactJSON(string(c.content)))
@@ -44,6 +56,10 @@ func TestEncodingJSON_Transaction(t *testing.T) {
 		err := txn.UnmarshalJSON(content)
 		assert.NoError(t, err)
 
+		if c.name == "testsuite/transaction-eip1559-notype.json" {
+			continue
+		}
+
 		// marshal back
 		res2, err := txn.MarshalJSON()
 		assert.NoError(t, err)

diff --git a/structs_marshal.go b/structs_marshal.go
@@ -113,6 +113,7 @@ func (t *Transaction) MarshalJSON() ([]byte, error) {
 
 func (t *Transaction) marshalJSON(a *fastjson.Arena) *fastjson.Value {
 	o := a.NewObject()
+	o.Set("type", a.NewString(fmt.Sprintf("0x%x", t.Type)))
 	o.Set("hash", a.NewString(t.Hash.String()))
 	o.Set("from", a.NewString(t.From.String()))
 	if len(t.Input) != 0 {

diff --git a/structs_unmarshal.go b/structs_unmarshal.go
@@ -141,18 +141,23 @@ func (t *Transaction) unmarshalJSON(v *fastjson.Value) error {
 		return nil
 	}
 
-	// detect transaction type
-	var typ TransactionType
-	if isKeySet(v, "chainId") {
-		if isKeySet(v, "maxFeePerGas") {
-			typ = TransactionDynamicFee
-		} else {
-			typ = TransactionAccessList
+	if isKeySet(v, "type") {
+		txnType, err := decodeUint(v, "type")
+		if err != nil {
+			return err
 		}
+		t.Type = TransactionType(txnType)
 	} else {
-		typ = TransactionLegacy
+		if isKeySet(v, "chainId") {
+			if isKeySet(v, "maxFeePerGas") {
+				t.Type = TransactionDynamicFee
+			} else {
+				t.Type = TransactionAccessList
+			}
+		} else {
+			t.Type = TransactionLegacy
+		}
 	}
-	t.Type = typ
 
 	var err error
 	if err := decodeHash(&t.Hash, v, "hash"); err != nil {
@@ -161,14 +166,14 @@ func (t *Transaction) unmarshalJSON(v *fastjson.Value) error {
 	if err = decodeAddr(&t.From, v, "from"); err != nil {
 		return err
 	}
-	if typ == TransactionDynamicFee {
+	if t.Type == TransactionDynamicFee {
 		if t.MaxPriorityFeePerGas, err = decodeBigInt(t.MaxPriorityFeePerGas, v, "maxPriorityFeePerGas"); err != nil {
 			return err
 		}
 		if t.MaxFeePerGas, err = decodeBigInt(t.MaxFeePerGas, v, "maxFeePerGas"); err != nil {
 			return err
 		}
-	} else {
+	} else if t.Type == TransactionLegacy || t.Type == TransactionAccessList {
 		if t.GasPrice, err = decodeUint(v, "gasPrice"); err != nil {
 			return err
 		}
@@ -206,7 +211,7 @@ func (t *Transaction) unmarshalJSON(v *fastjson.Value) error {
 		return err
 	}
 
-	if typ != TransactionLegacy {
+	if t.Type == TransactionDynamicFee || t.Type == TransactionAccessList {
 		if t.ChainID, err = decodeBigInt(t.ChainID, v, "chainId"); err != nil {
 			return err
 		}

diff --git a/testsuite/arbitrum-block-full.json b/testsuite/arbitrum-block-full.json
diff --git a/testsuite/block-full.json b/testsuite/block-full.json
@@ -20,6 +20,7 @@
     ],
     "transactions": [
         {
+            "type": "0x0",
             "hash": "0x0000000000000000000000000000000000000000000000000000000000000001",
             "from": "0x0000000000000000000000000000000000000001",
             "input": "0x00",

diff --git a/testsuite/transaction-call.json b/testsuite/transaction-call.json
@@ -1,4 +1,5 @@
 {
+    "type": "0x0",
     "hash": "0x0000000000000000000000000000000000000000000000000000000000000001",
     "from": "0x0000000000000000000000000000000000000001",
     "input": "0x00",
@@ -7,9 +8,9 @@
     "gas": "0x10",
     "nonce": "0x10",
     "to": "0x0000000000000000000000000000000000000001",
-    "v":"0x25",
-    "r":"0x0000000000000000000000000000000000000000000000000000000000000001",
-    "s":"0x0000000000000000000000000000000000000000000000000000000000000001",
+    "v": "0x25",
+    "r": "0x0000000000000000000000000000000000000000000000000000000000000001",
+    "s": "0x0000000000000000000000000000000000000000000000000000000000000001",
     "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000001",
     "blockNumber": "0x0",
     "transactionIndex": "0x0"

diff --git a/testsuite/transaction-contract-creation.json b/testsuite/transaction-contract-creation.json
@@ -1,4 +1,5 @@
 {
+    "type": "0x0",
     "hash": "0x0000000000000000000000000000000000000000000000000000000000000001",
     "from": "0x0000000000000000000000000000000000000001",
     "input": "0x00",
@@ -7,9 +8,9 @@
     "gas": "0x10",
     "nonce": "0x10",
     "to": null,
-    "v":"0x25",
-    "r":"0x0000000000000000000000000000000000000000000000000000000000000001",
-    "s":"0x0000000000000000000000000000000000000000000000000000000000000001",
+    "v": "0x25",
+    "r": "0x0000000000000000000000000000000000000000000000000000000000000001",
+    "s": "0x0000000000000000000000000000000000000000000000000000000000000001",
     "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000001",
     "blockNumber": "0x0",
     "transactionIndex": "0x0"

diff --git a/testsuite/transaction-eip1159.json b/testsuite/transaction-eip1159.json
@@ -1,4 +1,5 @@
 {
+    "type": "0x2",
     "hash": "0x0000000000000000000000000000000000000000000000000000000000000001",
     "from": "0x0000000000000000000000000000000000000001",
     "input": "0x00",
@@ -8,9 +9,9 @@
     "gas": "0x10",
     "nonce": "0x10",
     "to": null,
-    "v":"0x25",
-    "r":"0x0000000000000000000000000000000000000000000000000000000000000001",
-    "s":"0x0000000000000000000000000000000000000000000000000000000000000001",
+    "v": "0x25",
+    "r": "0x0000000000000000000000000000000000000000000000000000000000000001",
+    "s": "0x0000000000000000000000000000000000000000000000000000000000000001",
     "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000001",
     "blockNumber": "0x0",
     "transactionIndex": "0x0",

diff --git a/testsuite/transaction-eip1559-notype.json b/testsuite/transaction-eip1559-notype.json
@@ -0,0 +1,26 @@
+{
+    "hash": "0x0000000000000000000000000000000000000000000000000000000000000001",
+    "from": "0x0000000000000000000000000000000000000001",
+    "input": "0x00",
+    "value": "0x0",
+    "maxPriorityFeePerGas": "0x10",
+    "maxFeePerGas": "0x10",
+    "gas": "0x10",
+    "nonce": "0x10",
+    "to": null,
+    "v": "0x25",
+    "r": "0x0000000000000000000000000000000000000000000000000000000000000001",
+    "s": "0x0000000000000000000000000000000000000000000000000000000000000001",
+    "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000001",
+    "blockNumber": "0x0",
+    "transactionIndex": "0x0",
+    "chainId": "0x1",
+    "accessList": [
+        {
+            "address": "0x0000000000000000000000000000000000000001",
+            "storageKeys": [
+                "0x0000000000000000000000000000000000000000000000000000000000000001"
+            ]
+        }
+    ]
+}
diff --git a/testsuite/transaction-eip2930.json b/testsuite/transaction-eip2930.json
@@ -1,4 +1,5 @@
 {
+    "type": "0x1",
     "hash": "0x0000000000000000000000000000000000000000000000000000000000000001",
     "from": "0x0000000000000000000000000000000000000001",
     "input": "0x00",
@@ -7,9 +8,9 @@
     "gas": "0x10",
     "nonce": "0x10",
     "to": null,
-    "v":"0x25",
-    "r":"0x0000000000000000000000000000000000000000000000000000000000000001",
-    "s":"0x0000000000000000000000000000000000000000000000000000000000000001",
+    "v": "0x25",
+    "r": "0x0000000000000000000000000000000000000000000000000000000000000001",
+    "s": "0x0000000000000000000000000000000000000000000000000000000000000001",
     "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000001",
     "blockNumber": "0x0",
     "transactionIndex": "0x0",

diff --git a/testsuite/transaction-pending.json b/testsuite/transaction-pending.json
@@ -1,4 +1,5 @@
 {
+    "type": "0x0",
     "hash": "0x0000000000000000000000000000000000000000000000000000000000000001",
     "from": "0x0000000000000000000000000000000000000001",
     "input": "0x00",
@@ -7,9 +8,9 @@
     "gas": "0x10",
     "nonce": "0x10",
     "to": "0x0000000000000000000000000000000000000001",
-    "v":"0x25",
-    "r":"0x0000000000000000000000000000000000000000000000000000000000000001",
-    "s":"0x0000000000000000000000000000000000000000000000000000000000000001",
+    "v": "0x25",
+    "r": "0x0000000000000000000000000000000000000000000000000000000000000001",
+    "s": "0x0000000000000000000000000000000000000000000000000000000000000001",
     "blockHash": null,
     "blockNumber": null,
     "transactionIndex": null