Merge pull request #361 from blinklabs-io/feat/cbor-value-tags

feat: support for CBOR tags for arbitrarily large ints

Author: agaffney

cbor/value.go

@@ -18,6 +18,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
+	"math/big"
 	"sort"
 	"strings"
 )
@@ -94,7 +95,17 @@ func (v *Value) UnmarshalCBOR(data []byte) error {
 					value:       &newValue,
 				}
 			} else {
-				return fmt.Errorf("unsupported CBOR tag: %d", tmpTag.Number)
+				// Fall back to standard CBOR tag parsing for our supported types
+				var tmpTagDecode interface{}
+				if _, err := Decode(data, &tmpTagDecode); err != nil {
+					return err
+				}
+				switch tmpTagDecode.(type) {
+				case int, uint, int64, uint64, bool, big.Int:
+					v.value = tmpTagDecode
+				default:
+					return fmt.Errorf("unsupported CBOR tag number: %d", tmpTag.Number)
+				}
 			}
 		}
 	default:
@@ -218,6 +229,12 @@ func generateAstJson(obj interface{}) ([]byte, error) {
 		return []byte(tmpJson), nil
 	case Constructor:
 		return json.Marshal(obj)
+	case big.Int:
+		tmpJson := fmt.Sprintf(
+			`{"int":%s}`,
+			v.String(),
+		)
+		return []byte(tmpJson), nil
 	case int, uint, uint64, int64:
 		tmpJsonObj["int"] = v
 	case bool:

cbor/value_test.go

@@ -18,6 +18,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
+	"math/big"
 	"reflect"
 	"strings"
 	"testing"
@@ -70,6 +71,15 @@ var testDefs = []struct {
 		},
 		expectedAstJson: `{"map":[{"k":{"int":1},"v":{"list":[{"int":2}]}},{"k":{"int":3},"v":{"list":[{"int":4}]}}]}`,
 	},
+	// [22318265904693663008365, 8535038193994223137511702528]
+	{
+		cborHex: "82C24A04B9E028911409DC866DC24C1B9404A39BD8000000000000",
+		expectedObject: []any{
+			*(new(big.Int).SetBytes(test.DecodeHexString("04B9E028911409DC866D"))),
+			*(new(big.Int).SetBytes(test.DecodeHexString("1B9404A39BD8000000000000"))),
+		},
+		expectedAstJson: `{"list":[{"int":22318265904693663008365},{"int":8535038193994223137511702528}]}`,
+	},
 }
 
 func TestValueDecode(t *testing.T) {
@@ -198,6 +208,12 @@ func TestLazyValueMarshalJSON(t *testing.T) {
 			strings.ToLower(testDef.cborHex),
 			testDef.expectedAstJson,
 		)
+		if testDef.expectedObject == nil {
+			fullExpectedJson = fmt.Sprintf(
+				`{"cbor":"%s"}`,
+				strings.ToLower(testDef.cborHex),
+			)
+		}
 		if !test.JsonStringsEqual(jsonData, []byte(fullExpectedJson)) {
 			t.Fatalf("CBOR did not marshal to expected JSON\n  got: %s\n  wanted: %s", jsonData, fullExpectedJson)
 		}