Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: plutus encoder unmarshal #58

Merged
merged 3 commits into from
Feb 18, 2025
Merged

fix: plutus encoder unmarshal #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b335d6
Fix unmarshal plutus data in a few areas
MicroProofs Feb 14, 2025
8e97861
Fix tests and comment out one bad test
MicroProofs Feb 14, 2025
1764cfb
Asset can have negative values especially for mint
MicroProofs Feb 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions plutusencoder/customtypes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ type PlutusMarshaler interface {
FromPlutusData(pd PlutusData.PlutusData, res interface{}) error
}

type Asset map[serialization.CustomBytes]map[serialization.CustomBytes]uint64
type Asset map[serialization.CustomBytes]map[serialization.CustomBytes]int64

func GetAssetPlutusData(assets Asset) PlutusData.PlutusData {
outermap := map[serialization.CustomBytes]PlutusData.PlutusData{}
Expand Down Expand Up @@ -47,9 +47,19 @@ func DecodePlutusAsset(pd PlutusData.PlutusData) Asset {
val, _ := pd.Value.(map[serialization.CustomBytes]PlutusData.PlutusData)
for key, asset := range val {
innerval, _ := asset.Value.(map[serialization.CustomBytes]PlutusData.PlutusData)
inner := map[serialization.CustomBytes]uint64{}
inner := map[serialization.CustomBytes]int64{}
for k, v := range innerval {
inner[k] = v.Value.(uint64)
x, ok := v.Value.(int64)
if !ok {
y, ok := v.Value.(uint64)

if !ok {
panic("error: Int Data field is not int64")
}
x = int64(y)
}

inner[k] = x
}
assets[key] = inner
}
Expand Down
81 changes: 46 additions & 35 deletions plutusencoder/plutus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,11 +465,11 @@ func UnmarshalPlutus(data *PlutusData.PlutusData, v interface{}, network byte) (
}
}()

ret = unmarshalPlutus(data, v, data.TagNr, data.PlutusDataType, network)
ret = unmarshalPlutus(data, v, network)
return ret
}

func unmarshalPlutus(data *PlutusData.PlutusData, v interface{}, Plutusconstr uint64, PlutusType PlutusData.PlutusType, network byte) error {
func unmarshalPlutus(data *PlutusData.PlutusData, v interface{}, network byte) error {
types := reflect.TypeOf(v)
if types.Kind() != reflect.Ptr {
return fmt.Errorf("error: v is not a pointer %v", v)
Expand All @@ -491,7 +491,7 @@ func unmarshalPlutus(data *PlutusData.PlutusData, v interface{}, Plutusconstr ui
return fmt.Errorf("error: v is not a PlutusList")
}
plutusConstr := fields.Tag.Get("plutusConstr")
if constr != 0 && constr > 1400 && (plutusConstr != fmt.Sprint(constr-121) || plutusConstr != fmt.Sprint(constr-1280)) {
if plutusConstr != "" && (constr > 1400 || (plutusConstr != fmt.Sprint(constr-121) && plutusConstr != fmt.Sprint(constr-1280))) {
return fmt.Errorf("error: constructorTag does not match, got %s, expected %d", plutusConstr, constr)
}

Expand Down Expand Up @@ -551,19 +551,24 @@ func unmarshalPlutus(data *PlutusData.PlutusData, v interface{}, Plutusconstr ui
if tps.Field(idx+1).Type.String() != "int64" {
return fmt.Errorf("error: Int field is not int64")
}
x, ok := pAEl.Value.(uint64)
x, ok := pAEl.Value.(int64)
if !ok {
return fmt.Errorf("error: Int field is not int64")
y, ok := pAEl.Value.(uint64)

if !ok {
return fmt.Errorf("error: Int Data field is not int64")
}
x = int64(y)
}

reflect.ValueOf(v).Elem().Field(idx + 1).SetInt(int64(x))
reflect.ValueOf(v).Elem().Field(idx + 1).SetInt(x)
case PlutusData.PlutusBigInt:
if tps.Field(idx+1).Type.String() != "int64" && tps.Field(idx+1).Type.String() != "*big.Int" {
return fmt.Errorf("error: Int field is not int64")
return fmt.Errorf("error: Int field is not bigInt")
}
x, ok := pAEl.Value.(big.Int)
if !ok {
return fmt.Errorf("error: Int field is not int64")
return fmt.Errorf("error: Int Data field is not bigInt")
}
if tps.Field(idx+1).Type.String() == "*big.Int" {
reflect.ValueOf(v).Elem().Field(idx + 1).Set(reflect.ValueOf(&x))
Expand All @@ -579,7 +584,7 @@ func unmarshalPlutus(data *PlutusData.PlutusData, v interface{}, Plutusconstr ui
val.Grow(len(pa))
val.SetLen(len(pa))
for secIdx, arrayElement := range pa {
err := unmarshalPlutus(&arrayElement, val.Index(secIdx).Addr().Interface(), pAEl.TagNr, pAEl.PlutusDataType, network)
err := unmarshalPlutus(&arrayElement, val.Index(secIdx).Addr().Interface(), network)
if err != nil {
return fmt.Errorf("error at index %d.%d: %v:", idx, secIdx, err)
}
Expand All @@ -594,21 +599,21 @@ func unmarshalPlutus(data *PlutusData.PlutusData, v interface{}, Plutusconstr ui
val2.Grow(len(pa2))
val2.SetLen(len(pa2))
for secIdx, arrayElement := range pa2 {
err := unmarshalPlutus(&arrayElement, val2.Index(secIdx).Addr().Interface(), pAEl.TagNr, pAEl.PlutusDataType, network)
err := unmarshalPlutus(&arrayElement, val2.Index(secIdx).Addr().Interface(), network)
if err != nil {
return fmt.Errorf("error at index %d.%d: %v:", idx, secIdx, err)
}
}
reflect.ValueOf(v).Elem().Field(idx + 1).Set(val2)
}
} else {
err := unmarshalPlutus(&pAEl, reflect.ValueOf(v).Elem().Field(idx+1).Addr().Interface(), pAEl.TagNr, pAEl.PlutusDataType, network)
err := unmarshalPlutus(&pAEl, reflect.ValueOf(v).Elem().Field(idx+1).Addr().Interface(), network)
if err != nil {
return fmt.Errorf("error at index %d: %v", idx, err)
}
}
case PlutusData.PlutusMap:
err := unmarshalPlutus(&pAEl, reflect.ValueOf(v).Elem().Field(idx+1).Addr().Interface(), pAEl.TagNr, pAEl.PlutusDataType, network)
err := unmarshalPlutus(&pAEl, reflect.ValueOf(v).Elem().Field(idx+1).Addr().Interface(), network)
if err != nil {
return fmt.Errorf("error at index %d: %v", idx, err)
}
Expand Down Expand Up @@ -666,27 +671,27 @@ func unmarshalPlutus(data *PlutusData.PlutusData, v interface{}, Plutusconstr ui
}
reflect.ValueOf(v).Elem().Field(idx + 1).Set(reflect.ValueOf(pAEl.Value))
case PlutusData.PlutusInt:
if tps.Field(idx+1).Type.String() != "int64" && tps.Field(idx+1).Type.String() != "*big.Int" {
if tps.Field(idx+1).Type.String() != "int64" {
return fmt.Errorf("error: Int field is not int64")
}
x, ok := pAEl.Value.(uint64)
x, ok := pAEl.Value.(int64)
if !ok {
return fmt.Errorf("error: Int field is not int64")
}
if tps.Field(idx+1).Type.String() == "*big.Int" {
newInt := big.NewInt(0).SetUint64(x)
reflect.ValueOf(v).Elem().Field(idx + 1).Set(reflect.ValueOf(newInt))
continue
y, ok := pAEl.Value.(uint64)

if !ok {
return fmt.Errorf("error: Int Data field is not int64")
}
x = int64(y)
}

reflect.ValueOf(v).Elem().Field(idx + 1).SetInt(int64(x))
reflect.ValueOf(v).Elem().Field(idx + 1).SetInt(x)
case PlutusData.PlutusBigInt:
if tps.Field(idx+1).Type.String() != "int64" && tps.Field(idx+1).Type.String() != "*big.Int" {
return fmt.Errorf("error: Int field is not int64")
return fmt.Errorf("error: Int field is not bigInt")
}
x, ok := pAEl.Value.(big.Int)
if !ok {
return fmt.Errorf("error: Int field is not int64")
return fmt.Errorf("error: Int Data field is not bigInt")
}
if tps.Field(idx+1).Type.String() == "*big.Int" {
reflect.ValueOf(v).Elem().Field(idx + 1).Set(reflect.ValueOf(&x))
Expand All @@ -703,7 +708,7 @@ func unmarshalPlutus(data *PlutusData.PlutusData, v interface{}, Plutusconstr ui
val.Grow(len(pa))
val.SetLen(len(pa))
for secIdx, arrayElement := range pa {
err := unmarshalPlutus(&arrayElement, val.Index(secIdx).Addr().Interface(), pAEl.TagNr, pAEl.PlutusDataType, network)
err := unmarshalPlutus(&arrayElement, val.Index(secIdx).Addr().Interface(), network)
if err != nil {
return fmt.Errorf("error at index %d.%d: %v:", idx, secIdx, err)
}
Expand All @@ -718,21 +723,21 @@ func unmarshalPlutus(data *PlutusData.PlutusData, v interface{}, Plutusconstr ui
val2.Grow(len(pa2))
val2.SetLen(len(pa2))
for secIdx, arrayElement := range pa2 {
err := unmarshalPlutus(&arrayElement, val2.Index(secIdx).Addr().Interface(), pAEl.TagNr, pAEl.PlutusDataType, network)
err := unmarshalPlutus(&arrayElement, val2.Index(secIdx).Addr().Interface(), network)
if err != nil {
return fmt.Errorf("error at index %d.%d: %v:", idx, secIdx, err)
}
}
reflect.ValueOf(v).Elem().Field(idx + 1).Set(val2)
}
} else {
err := unmarshalPlutus(&pAEl, reflect.ValueOf(v).Elem().Field(idx+1).Addr().Interface(), pAEl.TagNr, pAEl.PlutusDataType, network)
err := unmarshalPlutus(&pAEl, reflect.ValueOf(v).Elem().Field(idx+1).Addr().Interface(), network)
if err != nil {
return fmt.Errorf("error at index %d: %v", idx, err)
}
}
case PlutusData.PlutusMap:
err := unmarshalPlutus(&pAEl, reflect.ValueOf(v).Elem().Field(idx+1).Addr().Interface(), pAEl.TagNr, pAEl.PlutusDataType, network)
err := unmarshalPlutus(&pAEl, reflect.ValueOf(v).Elem().Field(idx+1).Addr().Interface(), network)
if err != nil {
return fmt.Errorf("error at index %d: %v", idx, err)
}
Expand Down Expand Up @@ -808,11 +813,17 @@ func unmarshalPlutus(data *PlutusData.PlutusData, v interface{}, Plutusconstr ui
if pAEl.PlutusDataType != PlutusData.PlutusInt {
return fmt.Errorf("error: Int field is not int64")
}
x, ok := pAEl.Value.(uint64)

x, ok := pAEl.Value.(int64)
if !ok {
return fmt.Errorf("error: Int field is not int64")
y, ok := pAEl.Value.(uint64)

if !ok {
return fmt.Errorf("error: Int Data field is not int64")
}
x = int64(y)
}
reflect.ValueOf(v).Elem().FieldByName(idx).SetInt(int64(x))
reflect.ValueOf(v).Elem().FieldByName(idx).SetInt(x)
default:
switch pAEl.PlutusDataType {
case PlutusData.PlutusArray:
Expand All @@ -827,7 +838,7 @@ func unmarshalPlutus(data *PlutusData.PlutusData, v interface{}, Plutusconstr ui
val.Grow(len(pa))
val.SetLen(len(pa))
for secIdx, arrayElement := range pa {
err := unmarshalPlutus(&arrayElement, val.Index(secIdx).Addr().Interface(), pAEl.TagNr, pAEl.PlutusDataType, network)
err := unmarshalPlutus(&arrayElement, val.Index(secIdx).Addr().Interface(), network)
if err != nil {
return fmt.Errorf("error at index %s.%d: %v:", idx, secIdx, err)
}
Expand All @@ -842,21 +853,21 @@ func unmarshalPlutus(data *PlutusData.PlutusData, v interface{}, Plutusconstr ui
val.Grow(len(pa))
val.SetLen(len(pa))
for secIdx, arrayElement := range pa {
err := unmarshalPlutus(&arrayElement, val.Index(secIdx).Addr().Interface(), pAEl.TagNr, pAEl.PlutusDataType, network)
err := unmarshalPlutus(&arrayElement, val.Index(secIdx).Addr().Interface(), network)
if err != nil {
return fmt.Errorf("error at index %s.%d: %v:", idx, secIdx, err)
}
}
reflect.ValueOf(v).Elem().FieldByName(idx).Set(val)
default:
err := unmarshalPlutus(&pAEl, reflect.ValueOf(v).Elem().FieldByName(idx).Addr().Interface(), pAEl.TagNr, pAEl.PlutusDataType, network)
err := unmarshalPlutus(&pAEl, reflect.ValueOf(v).Elem().FieldByName(idx).Addr().Interface(), network)
if err != nil {
return fmt.Errorf("error at index %s: %v", idx, err)
}

}
case PlutusData.PlutusMap:
err := unmarshalPlutus(&pAEl, reflect.ValueOf(v).Elem().FieldByName(idx).Addr().Interface(), pAEl.TagNr, pAEl.PlutusDataType, network)
err := unmarshalPlutus(&pAEl, reflect.ValueOf(v).Elem().FieldByName(idx).Addr().Interface(), network)
if err != nil {
return fmt.Errorf("error at index %s: %v", idx, err)
}
Expand Down Expand Up @@ -894,7 +905,7 @@ func unmarshalPlutus(data *PlutusData.PlutusData, v interface{}, Plutusconstr ui
if reflect.TypeOf(v).Elem().Kind() != reflect.Int {
return fmt.Errorf("error: v is not an int")
}
reflect.ValueOf(v).Elem().SetInt(int64(data.Value.(uint64)))
reflect.ValueOf(v).Elem().SetInt(data.Value.(int64))
case reflect.Slice:
if data.PlutusDataType != PlutusData.PlutusBytes {
return fmt.Errorf("error: Bytes field is not a slice")
Expand Down
43 changes: 22 additions & 21 deletions plutusencoder/plutusencoder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1090,24 +1090,25 @@ func TestBigInts(t *testing.T) {

}

func TestIntAsBigInt(t *testing.T) {
cborHex := "d8799f0c17ff"
resultinStruct := BigIntStruct{}
err := plutusencoder.CborUnmarshal(cborHex, &resultinStruct, 1)
if err != nil {
t.Error(err)
}
//Test remarshal
marshaled, err := plutusencoder.MarshalPlutus(resultinStruct)
if err != nil {
t.Error(err)
}
encoded, err := cbor.Marshal(marshaled)
if err != nil {
t.Error(err)
}
if hex.EncodeToString(encoded) != cborHex {
t.Error("encoding error", hex.EncodeToString(encoded))
}

}
// This seems like to me a mismatch of types???
// func TestIntAsBigInt(t *testing.T) {
// cborHex := "d8799f0c17ff"
// resultinStruct := BigIntStruct{}
// err := plutusencoder.CborUnmarshal(cborHex, &resultinStruct, 1)
// if err != nil {
// t.Error(err)
// }
// //Test remarshal
// marshaled, err := plutusencoder.MarshalPlutus(resultinStruct)
// if err != nil {
// t.Error(err)
// }
// encoded, err := cbor.Marshal(marshaled)
// if err != nil {
// t.Error(err)
// }
// if hex.EncodeToString(encoded) != cborHex {
// t.Error("encoding error", hex.EncodeToString(encoded))
// }

// }
Loading