Custom RemoveExpiredAllocationsReturn

actors/v2/verifiedRegistry/types/removeExpiredAllocations.go

@@ -0,0 +1,85 @@
+package types
+
+import (
+	"fmt"
+	"io"
+
+	"github.com/filecoin-project/go-state-types/batch"
+	"github.com/filecoin-project/go-state-types/big"
+	cbg "github.com/whyrusleeping/cbor-gen"
+)
+
+type RemoveExpiredAllocationsReturn struct {
+	Considered       []uint64
+	Results          batch.BatchReturn
+	DataCapRecovered big.Int
+}
+
+func (t *RemoveExpiredAllocationsReturn) UnmarshalCBOR(r io.Reader) (err error) {
+	*t = RemoveExpiredAllocationsReturn{}
+
+	cr := cbg.NewCborReader(r)
+
+	maj, extra, err := cr.ReadHeader()
+	if err != nil {
+		return err
+	}
+	defer func() {
+		if err == io.EOF {
+			err = io.ErrUnexpectedEOF
+		}
+	}()
+
+	if maj != cbg.MajArray {
+		return fmt.Errorf("cbor input should be of type array")
+	}
+
+	if extra != 3 {
+		return fmt.Errorf("cbor input had wrong number of fields")
+	}
+
+	// t.Considered ([]verifreg.AllocationId) (slice)
+
+	maj, extra, err = cr.ReadHeader()
+	if err != nil {
+		return err
+	}
+
+	// allow a larger []Considered
+	// if extra > 8192 {
+	// 	return fmt.Errorf("t.Considered: array too large (%d)", extra)
+	// }
+
+	if maj != cbg.MajArray {
+		return fmt.Errorf("expected cbor array")
+	}
+
+	if extra > 0 {
+		t.Considered = make([]uint64, extra)
+	}
+
+	for i := 0; i < int(extra); i++ {
+		maj, extra, err := cr.ReadHeader()
+		if err != nil {
+			return err
+		}
+		if maj != cbg.MajUnsignedInt {
+			return fmt.Errorf("wrong type for uint64 field")
+		}
+		t.Considered[i] = extra
+	}
+
+	// t.Results (batch.BatchReturn) (struct)
+
+	if err := t.Results.UnmarshalCBOR(cr); err != nil {
+		return fmt.Errorf("unmarshaling t.Results: %w", err)
+	}
+
+	// t.DataCapRecovered (big.Int) (struct)
+
+	if err := t.DataCapRecovered.UnmarshalCBOR(cr); err != nil {
+		return fmt.Errorf("unmarshaling t.DataCapRecovered: %w", err)
+	}
+
+	return nil
+}

actors/v2/verifiedRegistry/verifiedRegistry.go

@@ -22,6 +22,8 @@ import (
 	verifregv9 "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
 
 	"github.com/zondax/fil-parser/actors"
+	"github.com/zondax/fil-parser/actors/v2/verifiedRegistry/types"
+	"github.com/zondax/fil-parser/parser"
 	"github.com/zondax/fil-parser/tools"
 )
 
@@ -150,7 +152,13 @@ func (*VerifiedRegistry) RemoveExpiredAllocationsExported(network string, height
 		return nil, fmt.Errorf("%w: %d", actors.ErrUnsupportedHeight, height)
 	}
 
-	return parse(raw, rawReturn, true, params(), returnValue())
+	metadata, err := parse(raw, rawReturn, true, params(), returnValue())
+	if err != nil || metadata[parser.ReturnKey] == nil {
+		// if Considered is larger than 8192 the go-state-types parser will return an error
+		// try with a larger allowed slice for the return
+		metadata, err = parse(raw, rawReturn, true, params(), &types.RemoveExpiredAllocationsReturn{})
+	}
+	return metadata, err
 }
 
 func (*VerifiedRegistry) Deprecated1(network string, height int64, raw []byte) (map[string]interface{}, error) {