[Work in Progress] Decouple extract and transform

chain/actors/adt/diff/generic.go

@@ -28,6 +28,7 @@ type ArrayDiffer interface {
 // - All values that exist in curArr nnd not in prevArr are passed to ArrayDiffer.Add()
 // - All values that exist in preArr and in curArr are passed to ArrayDiffer.Modify()
 //   - It is the responsibility of ArrayDiffer.Modify() to determine if the values it was passed have been modified.
+//
 // If `preArr` and `curArr` are both backed by /v3/AMTs with the same bitwidth use the more efficient Amt method.
 func CompareArray(preArr, curArr adt.Array, out ArrayDiffer) error {
 	notNew := make(map[int64]struct{}, curArr.Length())
@@ -84,6 +85,7 @@ type MapDiffer interface {
 // - All values that exist in curMap nnd not in prevArr are passed to MapDiffer.Add()
 // - All values that exist in preMap and in curMap are passed to MapDiffer.Modify()
 //   - It is the responsibility of ArrayDiffer.Modify() to determine if the values it was passed have been modified.
+//
 // If `preMap` and `curMap` are both backed by /v3/HAMTs with the same bitwidth and hash function use the more efficient Hamt method.
 func CompareMap(preMap, curMap adt.Map, out MapDiffer) error {
 	notNew := make(map[string]struct{})

chain/actors/builtin/datacap/actor.go.template

@@ -64,6 +64,11 @@ type State interface {
 	VerifiedClients() (adt.Map, error)
 	VerifiedClientsMapBitWidth() int
 	VerifiedClientsMapHashFunction() func(input []byte) []byte
+
+    AllowanceMap() (adt.Map, error)
+    AllowanceMapBitWidth() int
+    AllowanceMapHashFunction() func(input []byte) []byte
+    AllowanceMapForOwner(owner address.Address) (adt.Map, error)
 }
 
 func AllCodes() []cid.Cid {

chain/actors/builtin/datacap/datacap.go

@@ -10,10 +10,11 @@ import (
 	"github.com/filecoin-project/go-state-types/cbor"
 	"github.com/ipfs/go-cid"
 
-	"github.com/filecoin-project/lily/chain/actors"
 	lotusactors "github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/types"
+
+	"github.com/filecoin-project/lily/chain/actors"
 )
 
 var (
@@ -65,6 +66,11 @@ type State interface {
 	VerifiedClients() (adt.Map, error)
 	VerifiedClientsMapBitWidth() int
 	VerifiedClientsMapHashFunction() func(input []byte) []byte
+
+	AllowanceMap() (adt.Map, error)
+	AllowanceMapBitWidth() int
+	AllowanceMapHashFunction() func(input []byte) []byte
+	AllowanceMapForOwner(owner address.Address) (adt.Map, error)
 }
 
 func AllCodes() []cid.Cid {

chain/actors/builtin/datacap/state.go.template

@@ -74,6 +74,30 @@ func (s *state{{.v}}) VerifiedClientsMapHashFunction() func(input []byte) []byte
            	}
 }
 
+func (s *state{{.v}}) AllowanceMap() (adt.Map, error) {
+	return adt{{.v}}.AsMap(s.store, s.Token.Allowances, int(s.Token.HamtBitWidth))
+}
+
+func (s *state{{.v}}) AllowanceMapBitWidth() int {
+	return int(s.Token.HamtBitWidth)
+}
+
+func (s *state{{.v}}) AllowanceMapHashFunction() func(input []byte) []byte {
+	return func(input []byte) []byte {
+		res := sha256.Sum256(input)
+		return res[:]
+	}
+}
+
+func (s *state{{.v}}) AllowanceMapForOwner(owner address.Address) (adt.Map, error) {
+	innerHamtCid, err := s.getInnerHamtCid(s.store, abi.IdAddrKey(owner), s.Token.Allowances, int(s.Token.HamtBitWidth))
+	if err != nil {
+		return nil, err
+	}
+	return adt{{.v}}.AsMap(s.store, innerHamtCid, int(s.Token.HamtBitWidth))
+}
+
+
 func (s *state{{.v}}) ActorKey() string {
     return actors.DatacapKey
 }
@@ -90,3 +114,19 @@ func (s *state{{.v}}) Code() cid.Cid {
 
 	return code
 }
+
+func (s *state{{.v}}) getInnerHamtCid(store adt.Store, key abi.Keyer, mapCid cid.Cid, bitwidth int) (cid.Cid, error) {
+	actorToHamtMap, err := adt{{.v}}.AsMap(store, mapCid, bitwidth)
+	if err != nil {
+		return cid.Undef, fmt.Errorf("couldn't get outer map: %x", err)
+	}
+
+	var innerHamtCid cbg.CborCid
+	if found, err := actorToHamtMap.Get(key, &innerHamtCid); err != nil {
+		return cid.Undef, fmt.Errorf("looking up key: %s: %w", key, err)
+	} else if !found {
+		return cid.Undef, fmt.Errorf("did not find key: %s", key)
+	}
+
+	return cid.Cid(innerHamtCid), nil
+}

chain/actors/builtin/datacap/v9.go

@@ -7,10 +7,12 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
+	cbg "github.com/whyrusleeping/cbor-gen"
 
-	"github.com/filecoin-project/lily/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 
+	"github.com/filecoin-project/lily/chain/actors"
+
 	datacap9 "github.com/filecoin-project/go-state-types/builtin/v9/datacap"
 	adt9 "github.com/filecoin-project/go-state-types/builtin/v9/util/adt"
 )
@@ -74,6 +76,29 @@ func (s *state9) VerifiedClientsMapHashFunction() func(input []byte) []byte {
 	}
 }
 
+func (s *state9) AllowanceMap() (adt.Map, error) {
+	return adt9.AsMap(s.store, s.Token.Allowances, int(s.Token.HamtBitWidth))
+}
+
+func (s *state9) AllowanceMapBitWidth() int {
+	return int(s.Token.HamtBitWidth)
+}
+
+func (s *state9) AllowanceMapHashFunction() func(input []byte) []byte {
+	return func(input []byte) []byte {
+		res := sha256.Sum256(input)
+		return res[:]
+	}
+}
+
+func (s *state9) AllowanceMapForOwner(owner address.Address) (adt.Map, error) {
+	innerHamtCid, err := s.getInnerHamtCid(s.store, abi.IdAddrKey(owner), s.Token.Allowances, int(s.Token.HamtBitWidth))
+	if err != nil {
+		return nil, err
+	}
+	return adt9.AsMap(s.store, innerHamtCid, int(s.Token.HamtBitWidth))
+}
+
 func (s *state9) ActorKey() string {
 	return actors.DatacapKey
 }
@@ -90,3 +115,19 @@ func (s *state9) Code() cid.Cid {
 
 	return code
 }
+
+func (s *state9) getInnerHamtCid(store adt.Store, key abi.Keyer, mapCid cid.Cid, bitwidth int) (cid.Cid, error) {
+	actorToHamtMap, err := adt9.AsMap(store, mapCid, bitwidth)
+	if err != nil {
+		return cid.Undef, fmt.Errorf("couldn't get outer map: %x", err)
+	}
+
+	var innerHamtCid cbg.CborCid
+	if found, err := actorToHamtMap.Get(key, &innerHamtCid); err != nil {
+		return cid.Undef, fmt.Errorf("looking up key: %s: %w", key, err)
+	} else if !found {
+		return cid.Undef, fmt.Errorf("did not find key: %s", key)
+	}
+
+	return cid.Cid(innerHamtCid), nil
+}

chain/actors/builtin/market/actor.go.template

@@ -80,15 +80,15 @@ type DealStates interface {
 	ForEach(cb func(id abi.DealID, ds DealState) error) error
 	Get(id abi.DealID) (*DealState, bool, error)
 
-	array() adt.Array
+	AsArray() adt.Array
 	decode(*cbg.Deferred) (*DealState, error)
 }
 
 type DealProposals interface {
 	ForEach(cb func(id abi.DealID, dp markettypes.DealProposal) error) error
 	Get(id abi.DealID) (*markettypes.DealProposal, bool, error)
 
-	array() adt.Array
+	AsArray() adt.Array
 	decode(*cbg.Deferred) (*markettypes.DealProposal, error)
 }
 

chain/actors/builtin/market/diff.go

@@ -34,13 +34,13 @@ func DiffDealProposals(ctx context.Context, store adt.Store, pre, cur State) (*D
 	diffContainer := NewMarketProposalsDiffContainer(preP, curP)
 	if requiresLegacyDiffing(pre, cur, preOpts, curOpts) {
 		log.Warn("actor AMT opts differ, running slower generic array diff", "preCID", pre.Code(), "curCID", cur.Code())
-		if err := diff.CompareArray(preP.array(), curP.array(), diffContainer); err != nil {
+		if err := diff.CompareArray(preP.AsArray(), curP.AsArray(), diffContainer); err != nil {
 			return nil, fmt.Errorf("diffing deal states: %w", err)
 		}
 		return diffContainer.Results, nil
 	}
 
-	changes, err := diff.Amt(ctx, preP.array(), curP.array(), store, store, amt.UseTreeBitWidth(uint(preOpts)))
+	changes, err := diff.Amt(ctx, preP.AsArray(), curP.AsArray(), store, store, amt.UseTreeBitWidth(uint(preOpts)))
 	if err != nil {
 		return nil, err
 	}
@@ -116,13 +116,13 @@ func DiffDealStates(ctx context.Context, store adt.Store, pre, cur State) (*Deal
 	diffContainer := NewMarketStatesDiffContainer(preS, curS)
 	if requiresLegacyDiffing(pre, cur, preOpts, curOpts) {
 		log.Warn("actor AMT opts differ, running slower generic array diff", "preCID", pre.Code(), "curCID", cur.Code())
-		if err := diff.CompareArray(preS.array(), curS.array(), diffContainer); err != nil {
+		if err := diff.CompareArray(preS.AsArray(), curS.AsArray(), diffContainer); err != nil {
 			return nil, fmt.Errorf("diffing deal states: %w", err)
 		}
 		return diffContainer.Results, nil
 	}
 
-	changes, err := diff.Amt(ctx, preS.array(), curS.array(), store, store, amt.UseTreeBitWidth(uint(preOpts)))
+	changes, err := diff.Amt(ctx, preS.AsArray(), curS.AsArray(), store, store, amt.UseTreeBitWidth(uint(preOpts)))
 	if err != nil {
 		return nil, err
 	}

chain/actors/builtin/market/state.go.template

@@ -134,7 +134,7 @@ func (s *dealStates{{.v}}) decode(val *cbg.Deferred) (*DealState, error) {
 	return &ds, nil
 }
 
-func (s *dealStates{{.v}}) array() adt.Array {
+func (s *dealStates{{.v}}) AsArray() adt.Array {
 	return s.Array
 }
 
@@ -199,7 +199,7 @@ func (s *dealProposals{{.v}}) decode(val *cbg.Deferred) (*DealProposal, error) {
     return &dp, nil
 }
 
-func (s *dealProposals{{.v}}) array() adt.Array {
+func (s *dealProposals{{.v}}) AsArray() adt.Array {
 	return s.Array
 }