fix sector events and datacap diffing

Author: frrist

chain/actors/builtin/datacap/diff.go

@@ -7,9 +7,11 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-hamt-ipld/v3"
 	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/multiformats/go-varint"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
+	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lily/chain/actors/adt"
 	"github.com/filecoin-project/lily/chain/actors/adt/diff"
@@ -122,7 +124,14 @@ func (m *balanceDiffContainer) AsKey(key string) (abi.Keyer, error) {
 }
 
 func (m *balanceDiffContainer) Add(key string, val *cbg.Deferred) error {
-	addr, err := address.NewFromBytes([]byte(key))
+	id, n, err := varint.FromUvarint([]byte(key))
+	if n != len([]byte(key)) {
+		return xerrors.Errorf("could not get varint from address string")
+	}
+	if err != nil {
+		return err
+	}
+	addr, err := address.NewIDAddress(id)
 	if err != nil {
 		return err
 	}
@@ -138,7 +147,14 @@ func (m *balanceDiffContainer) Add(key string, val *cbg.Deferred) error {
 }
 
 func (m *balanceDiffContainer) Modify(key string, before, after *cbg.Deferred) error {
-	addr, err := address.NewFromBytes([]byte(key))
+	id, n, err := varint.FromUvarint([]byte(key))
+	if n != len([]byte(key)) {
+		return xerrors.Errorf("could not get varint from address string")
+	}
+	if err != nil {
+		return err
+	}
+	addr, err := address.NewIDAddress(id)
 	if err != nil {
 		return err
 	}
@@ -164,7 +180,14 @@ func (m *balanceDiffContainer) Modify(key string, before, after *cbg.Deferred) e
 }
 
 func (m *balanceDiffContainer) Remove(key string, val *cbg.Deferred) error {
-	addr, err := address.NewFromBytes([]byte(key))
+	id, n, err := varint.FromUvarint([]byte(key))
+	if n != len([]byte(key)) {
+		return xerrors.Errorf("could not get varint from address string")
+	}
+	if err != nil {
+		return err
+	}
+	addr, err := address.NewIDAddress(id)
 	if err != nil {
 		return err
 	}

tasks/actorstate/datacap/balance.go

@@ -43,8 +43,8 @@ func (BalanceExtractor) Extract(ctx context.Context, a actorstate.ActorInfo, nod
 				Height:    int64(ec.CurrTs.Height()),
 				StateRoot: ec.CurrTs.ParentState().String(),
 				Address:   a.Address.String(),
-				Event:     dcap.String(),
-				DataCap:   datacapmodel.Added,
+				Event:     datacapmodel.Added,
+				DataCap:   dcap.String(),
 			})
 			return nil
 		}); err != nil {

tasks/actorstate/miner/sector_events.go

@@ -11,6 +11,7 @@ import (
 	"go.uber.org/zap"
 	"golang.org/x/sync/errgroup"
 
+	"github.com/filecoin-project/lily/chain/actors"
 	"github.com/filecoin-project/lily/chain/actors/builtin/miner"
 	"github.com/filecoin-project/lily/model"
 	minermodel "github.com/filecoin-project/lily/model/actors/miner"
@@ -67,10 +68,34 @@ func (SectorEventsExtractor) Extract(ctx context.Context, a actorstate.ActorInfo
 		grp.Go(func() error {
 			start := time.Now()
 			// collect changes made to miner precommit map (HAMT)
-			preCommitChanges, err = node.DiffPreCommits(grpCtx, a.Address, a.Current, a.Executed, extState.ParentState(), extState.CurrentState())
-			if err != nil {
-				return fmt.Errorf("diffing precommits %w", err)
+			if extState.CurrentState().ActorVersion() > actors.Version8 {
+				preCommitChanges, err = node.DiffPreCommits(grpCtx, a.Address, a.Current, a.Executed, extState.ParentState(), extState.CurrentState())
+				if err != nil {
+					return fmt.Errorf("diffing precommits %w", err)
+				}
+			} else {
+				var v8PreCommitChanges *miner.PreCommitChangesV8
+				v8PreCommitChanges, err = node.DiffPreCommitsV8(grpCtx, a.Address, a.Current, a.Executed, extState.ParentState(), extState.CurrentState())
+				if err != nil {
+					return fmt.Errorf("diffing precommits: %w", err)
+				}
+				for _, c := range v8PreCommitChanges.Added {
+					preCommitChanges.Added = append(preCommitChanges.Added, minertypes.SectorPreCommitOnChainInfo{
+						Info: minertypes.SectorPreCommitInfo{
+							SealProof:     c.Info.SealProof,
+							SectorNumber:  c.Info.SectorNumber,
+							SealedCID:     c.Info.SealedCID,
+							SealRandEpoch: c.Info.SealRandEpoch,
+							DealIDs:       nil,
+							Expiration:    c.Info.Expiration,
+							UnsealedCid:   nil,
+						},
+						PreCommitDeposit: c.PreCommitDeposit,
+						PreCommitEpoch:   c.PreCommitEpoch,
+					})
+				}
 			}
+
 			log.Debugw("diff precommits", "miner", a.Address, "duration", time.Since(start))
 			return nil
 		})