various fixes for the encoding/decoding of the execution data with post values (#393)

* fix missing newvalue in json

* fix tests

* add debug error messages

* JSON marshal the new value

* add a json-decoding test from kaustinen

* remove debug trace

Author: gballet

proof_json.go

@@ -147,7 +147,7 @@ func (vp *VerkleProof) UnmarshalJSON(data []byte) error {
 	var aux verkleProofMarshaller
 	err := json.Unmarshal(data, &aux)
 	if err != nil {
-		return err
+		return fmt.Errorf("verkle proof unmarshal error: %w", err)
 	}
 
 	vp.DepthExtensionPresent, err = PrefixedHexStringToBytes(aux.DepthExtensionPresent)
@@ -198,7 +198,7 @@ func (ssd StemStateDiff) MarshalJSON() ([]byte, error) {
 func (ssd *StemStateDiff) UnmarshalJSON(data []byte) error {
 	var aux stemStateDiffMarshaller
 	if err := json.Unmarshal(data, &aux); err != nil {
-		return err
+		return fmt.Errorf("stemdiff unmarshal error: %w", err)
 	}
 
 	stem, err := PrefixedHexStringToBytes(aux.Stem)
@@ -219,22 +219,27 @@ type suffixStateDiffMarshaller struct {
 }
 
 func (ssd SuffixStateDiff) MarshalJSON() ([]byte, error) {
-	var cvstr *string
+	var cvstr, nvstr *string
 	if ssd.CurrentValue != nil {
 		tempstr := HexToPrefixedString(ssd.CurrentValue[:])
 		cvstr = &tempstr
 	}
+	if ssd.NewValue != nil {
+		tempstr := HexToPrefixedString(ssd.NewValue[:])
+		nvstr = &tempstr
+	}
 	return json.Marshal(&suffixStateDiffMarshaller{
 		Suffix:       ssd.Suffix,
 		CurrentValue: cvstr,
+		NewValue:     nvstr,
 	})
 }
 
 func (ssd *SuffixStateDiff) UnmarshalJSON(data []byte) error {
 	aux := &suffixStateDiffMarshaller{}
 
 	if err := json.Unmarshal(data, &aux); err != nil {
-		return err
+		return fmt.Errorf("suffix diff unmarshal error: %w", err)
 	}
 
 	if aux.CurrentValue != nil && len(*aux.CurrentValue) != 64 && len(*aux.CurrentValue) != 0 && len(*aux.CurrentValue) != 66 {

proof_json_test.go

@@ -0,0 +1,24 @@
+package verkle
+
+import (
+	"encoding/json"
+	"testing"
+)
+
+func TestJSONDeserialization(t *testing.T) {
+	str := `{                                                                                                                                                                                                                                                                                       
+      "stem": "0x97233a822ee74c294ccec8e4e0c65106b374d4423d5d09236d0f6c6647e185",
+      "suffixDiffs": [
+        { "suffix": 0, "currentValue": null, "newValue": null },
+        { "suffix": 1, "currentValue": null, "newValue": null },
+        { "suffix": 2, "currentValue": null, "newValue": null },
+        { "suffix": 3, "currentValue": null, "newValue": null },
+        { "suffix": 4, "currentValue": null, "newValue": null }
+      ]                                                                                                                                                                                                                                                                                     
+    }`
+	var statediff StemStateDiff
+	err := json.Unmarshal([]byte(str), &statediff)
+	if err != nil {
+		t.Fatal(err)
+	}
+}

proof_test.go

@@ -473,7 +473,7 @@ func TestSuffixStateDiffJSONMarshalUn(t *testing.T) {
 		},
 	}
 
-	expectedJSON := `{"suffix":65,"currentValue":"0x102030405060708090a0b0c0d0e0f000112233445566778899aabbccddeeff00"}`
+	expectedJSON := `{"suffix":65,"currentValue":"0x102030405060708090a0b0c0d0e0f000112233445566778899aabbccddeeff00","newValue":null}`
 	actualJSON, err := json.Marshal(ssd)
 	if err != nil {
 		t.Errorf("error marshalling SuffixStateDiff to JSON: %v", err)
@@ -514,7 +514,7 @@ func TestStemStateDiffJSONMarshalUn(t *testing.T) {
 		}},
 	}
 
-	expectedJSON := `{"stem":"0x0a000000000000000000000000000000000000000000000000000000000000","suffixDiffs":[{"suffix":65,"currentValue":"0x102030405060708090a0b0c0d0e0f000112233445566778899aabbccddeeff00"}]}`
+	expectedJSON := `{"stem":"0x0a000000000000000000000000000000000000000000000000000000000000","suffixDiffs":[{"suffix":65,"currentValue":"0x102030405060708090a0b0c0d0e0f000112233445566778899aabbccddeeff00","newValue":null}]}`
 	actualJSON, err := json.Marshal(ssd)
 	if err != nil {
 		t.Errorf("error marshalling SuffixStateDiff to JSON: %v", err)
@@ -543,7 +543,7 @@ func TestSuffixStateDiffJSONMarshalUnCurrentValueNil(t *testing.T) {
 		CurrentValue: nil,
 	}
 
-	expectedJSON := `{"suffix":65,"currentValue":null}`
+	expectedJSON := `{"suffix":65,"currentValue":null,"newValue":null}`
 	actualJSON, err := json.Marshal(ssd)
 	if err != nil {
 		t.Errorf("error marshalling SuffixStateDiff to JSON: %v", err)