-
Notifications
You must be signed in to change notification settings - Fork 46
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
perf: minor optimization of market actor diffing (#78)
* perf: minor optimization of market actor diffing * Combine deal and proposal change diffing into a single predicate
- Loading branch information
Showing
12 changed files
with
548 additions
and
57 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,237 @@ | ||
| package actorstate | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "github.com/filecoin-project/go-address" | ||
| "github.com/filecoin-project/go-state-types/abi" | ||
| "github.com/filecoin-project/go-state-types/big" | ||
| "github.com/filecoin-project/go-state-types/crypto" | ||
| "github.com/filecoin-project/lotus/api" | ||
| "github.com/filecoin-project/lotus/chain/types" | ||
| bstore "github.com/filecoin-project/lotus/lib/blockstore" | ||
| samarket "github.com/filecoin-project/specs-actors/actors/builtin/market" | ||
| "github.com/filecoin-project/specs-actors/actors/util/adt" | ||
| "github.com/ipfs/go-cid" | ||
| cbornode "github.com/ipfs/go-ipld-cbor" | ||
| "golang.org/x/xerrors" | ||
|
|
||
| "github.com/filecoin-project/sentinel-visor/testutil" | ||
| ) | ||
|
|
||
| func mockTipset(minerAddr address.Address, timestamp uint64) (*types.TipSet, error) { | ||
| return types.NewTipSet([]*types.BlockHeader{{ | ||
| Miner: minerAddr, | ||
| Height: 5, | ||
| ParentStateRoot: testutil.RandomCid(), | ||
| Messages: testutil.RandomCid(), | ||
| ParentMessageReceipts: testutil.RandomCid(), | ||
| BlockSig: &crypto.Signature{Type: crypto.SigTypeBLS}, | ||
| BLSAggregate: &crypto.Signature{Type: crypto.SigTypeBLS}, | ||
| Timestamp: timestamp, | ||
| }}) | ||
| } | ||
|
|
||
| var _ ActorStateAPI = (*MockAPI)(nil) | ||
|
|
||
| type MockAPI struct { | ||
| actors map[actorKey]*types.Actor | ||
| bs bstore.Blockstore | ||
| store adt.Store | ||
| } | ||
|
|
||
| func NewMockAPI() *MockAPI { | ||
| bs := bstore.NewTemporarySync() | ||
| return &MockAPI{ | ||
| bs: bs, | ||
| actors: make(map[actorKey]*types.Actor), | ||
| store: adt.WrapStore(context.Background(), cbornode.NewCborStore(bs)), | ||
| } | ||
| } | ||
|
|
||
| type actorKey struct { | ||
| tsk types.TipSetKey | ||
| addr address.Address | ||
| } | ||
|
|
||
| func (m *MockAPI) Store() adt.Store { | ||
| return m.store | ||
| } | ||
|
|
||
| func (m *MockAPI) ChainHasObj(ctx context.Context, c cid.Cid) (bool, error) { | ||
| return m.bs.Has(c) | ||
| } | ||
|
|
||
| func (m *MockAPI) ChainReadObj(ctx context.Context, c cid.Cid) ([]byte, error) { | ||
| blk, err := m.bs.Get(c) | ||
| if err != nil { | ||
| return nil, xerrors.Errorf("blockstore get: %w", err) | ||
| } | ||
|
|
||
| return blk.RawData(), nil | ||
| } | ||
|
|
||
| func (m *MockAPI) StateReadState(ctx context.Context, actor address.Address, tsk types.TipSetKey) (*api.ActorState, error) { | ||
| act, err := m.StateGetActor(ctx, actor, tsk) | ||
| if err != nil { | ||
| return nil, xerrors.Errorf("getting actor: %w", err) | ||
| } | ||
|
|
||
| var state interface{} | ||
| if err := m.store.Get(ctx, act.Head, &state); err != nil { | ||
| return nil, xerrors.Errorf("getting actor head: %w", err) | ||
| } | ||
|
|
||
| return &api.ActorState{ | ||
| Balance: act.Balance, | ||
| State: state, | ||
| }, nil | ||
| } | ||
|
|
||
| func (m *MockAPI) StateGetActor(ctx context.Context, actor address.Address, tsk types.TipSetKey) (*types.Actor, error) { | ||
| key := actorKey{ | ||
| tsk: tsk, | ||
| addr: actor, | ||
| } | ||
| act, ok := m.actors[key] | ||
| if !ok { | ||
| return nil, xerrors.Errorf("actor not found addr:%s tsk=%s", actor, tsk) | ||
| } | ||
| return act, nil | ||
| } | ||
|
|
||
| func (m *MockAPI) StateMinerPower(ctx context.Context, addr address.Address, tsk types.TipSetKey) (*api.MinerPower, error) { | ||
| panic("not implemented yet") | ||
| } | ||
|
|
||
| // ----------------- MockAPI Helpers ---------------------------- | ||
|
|
||
| func (m *MockAPI) setActor(tsk types.TipSetKey, addr address.Address, actor *types.Actor) { | ||
| key := actorKey{ | ||
| tsk: tsk, | ||
| addr: addr, | ||
| } | ||
| m.actors[key] = actor | ||
| } | ||
|
|
||
| func (m *MockAPI) createMarketState(ctx context.Context, deals map[abi.DealID]*samarket.DealState, props map[abi.DealID]*samarket.DealProposal, balances map[address.Address]balance) (cid.Cid, error) { | ||
| dealRootCid, err := m.createDealAMT(deals) | ||
| if err != nil { | ||
| return cid.Undef, err | ||
| } | ||
|
|
||
| propRootCid, err := m.createProposalAMT(props) | ||
| if err != nil { | ||
| return cid.Undef, err | ||
| } | ||
|
|
||
| balancesCids, err := m.createBalanceTable(balances) | ||
| if err != nil { | ||
| return cid.Undef, err | ||
| } | ||
| state, err := m.newEmptyMarketState() | ||
| if err != nil { | ||
| return cid.Undef, err | ||
| } | ||
|
|
||
| state.States = dealRootCid | ||
| state.Proposals = propRootCid | ||
| state.EscrowTable = balancesCids[0] | ||
| state.LockedTable = balancesCids[1] | ||
|
|
||
| stateCid, err := m.store.Put(ctx, state) | ||
| if err != nil { | ||
| return cid.Undef, err | ||
| } | ||
|
|
||
| return stateCid, nil | ||
| } | ||
|
|
||
| func (m *MockAPI) newEmptyMarketState() (*samarket.State, error) { | ||
| emptyArrayCid, err := adt.MakeEmptyArray(m.store).Root() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| emptyMap, err := adt.MakeEmptyMap(m.store).Root() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return samarket.ConstructState(emptyArrayCid, emptyMap, emptyMap), nil | ||
| } | ||
|
|
||
| func (m *MockAPI) createDealAMT(deals map[abi.DealID]*samarket.DealState) (cid.Cid, error) { | ||
| root := adt.MakeEmptyArray(m.store) | ||
| for dealID, dealState := range deals { | ||
| err := root.Set(uint64(dealID), dealState) | ||
| if err != nil { | ||
| return cid.Undef, err | ||
| } | ||
| } | ||
| rootCid, err := root.Root() | ||
| if err != nil { | ||
| return cid.Undef, err | ||
| } | ||
| return rootCid, nil | ||
| } | ||
|
|
||
| func (m *MockAPI) createProposalAMT(props map[abi.DealID]*samarket.DealProposal) (cid.Cid, error) { | ||
| root := adt.MakeEmptyArray(m.store) | ||
| for dealID, prop := range props { | ||
| err := root.Set(uint64(dealID), prop) | ||
| if err != nil { | ||
| return cid.Undef, err | ||
| } | ||
| } | ||
| rootCid, err := root.Root() | ||
| if err != nil { | ||
| return cid.Undef, err | ||
| } | ||
| return rootCid, nil | ||
| } | ||
|
|
||
| func (m *MockAPI) createBalanceTable(balances map[address.Address]balance) ([2]cid.Cid, error) { | ||
| escrowMapRoot := adt.MakeEmptyMap(m.store) | ||
| escrowMapRootCid, err := escrowMapRoot.Root() | ||
| if err != nil { | ||
| return [2]cid.Cid{}, err | ||
| } | ||
| escrowRoot, err := adt.AsBalanceTable(m.store, escrowMapRootCid) | ||
| if err != nil { | ||
| return [2]cid.Cid{}, err | ||
| } | ||
|
|
||
| lockedMapRoot := adt.MakeEmptyMap(m.store) | ||
| lockedMapRootCid, err := lockedMapRoot.Root() | ||
| if err != nil { | ||
| return [2]cid.Cid{}, err | ||
| } | ||
|
|
||
| lockedRoot, err := adt.AsBalanceTable(m.store, lockedMapRootCid) | ||
| if err != nil { | ||
| return [2]cid.Cid{}, err | ||
| } | ||
|
|
||
| for addr, balance := range balances { | ||
| err := escrowRoot.Add(addr, big.Add(balance.available, balance.locked)) | ||
| if err != nil { | ||
| return [2]cid.Cid{}, err | ||
| } | ||
|
|
||
| err = lockedRoot.Add(addr, balance.locked) | ||
| if err != nil { | ||
| return [2]cid.Cid{}, err | ||
| } | ||
|
|
||
| } | ||
| escrowRootCid, err := escrowRoot.Root() | ||
| if err != nil { | ||
| return [2]cid.Cid{}, err | ||
| } | ||
|
|
||
| lockedRootCid, err := lockedRoot.Root() | ||
| if err != nil { | ||
| return [2]cid.Cid{}, err | ||
| } | ||
|
|
||
| return [2]cid.Cid{escrowRootCid, lockedRootCid}, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.