2020-06-22 21:38:40 +00:00
|
|
|
package state
|
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
2020-08-20 04:49:10 +00:00
|
|
|
|
2022-06-14 15:00:51 +00:00
|
|
|
cbor "github.com/ipfs/go-ipld-cbor"
|
2020-09-17 02:34:13 +00:00
|
|
|
|
2020-07-07 23:39:32 +00:00
|
|
|
"github.com/filecoin-project/go-address"
|
2020-09-07 03:49:10 +00:00
|
|
|
"github.com/filecoin-project/go-state-types/abi"
|
|
|
|
"github.com/filecoin-project/go-state-types/big"
|
2020-07-02 01:20:54 +00:00
|
|
|
|
2022-06-14 15:00:51 +00:00
|
|
|
"github.com/filecoin-project/lotus/api"
|
2021-01-29 20:01:00 +00:00
|
|
|
"github.com/filecoin-project/lotus/blockstore"
|
2020-09-18 04:41:36 +00:00
|
|
|
"github.com/filecoin-project/lotus/chain/actors/adt"
|
|
|
|
init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init"
|
|
|
|
"github.com/filecoin-project/lotus/chain/actors/builtin/market"
|
2022-06-14 15:00:51 +00:00
|
|
|
"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
|
2020-09-18 04:41:36 +00:00
|
|
|
"github.com/filecoin-project/lotus/chain/actors/builtin/paych"
|
2020-07-02 01:20:54 +00:00
|
|
|
"github.com/filecoin-project/lotus/chain/types"
|
2020-06-22 21:38:40 +00:00
|
|
|
)
|
|
|
|
|
2020-07-02 01:20:54 +00:00
|
|
|
// UserData is the data returned from the DiffTipSetKeyFunc
|
2020-06-25 21:43:37 +00:00
|
|
|
type UserData interface{}
|
|
|
|
|
2020-06-26 19:36:48 +00:00
|
|
|
// ChainAPI abstracts out calls made by this class to external APIs
|
|
|
|
type ChainAPI interface {
|
2021-01-29 20:01:00 +00:00
|
|
|
api.ChainIO
|
2020-06-25 21:43:37 +00:00
|
|
|
StateGetActor(ctx context.Context, actor address.Address, tsk types.TipSetKey) (*types.Actor, error)
|
|
|
|
}
|
|
|
|
|
2020-06-26 19:36:48 +00:00
|
|
|
// StatePredicates has common predicates for responding to state changes
|
2020-06-22 21:38:40 +00:00
|
|
|
type StatePredicates struct {
|
2020-06-26 19:36:48 +00:00
|
|
|
api ChainAPI
|
2020-06-25 21:43:37 +00:00
|
|
|
cst *cbor.BasicIpldStore
|
2020-06-22 21:38:40 +00:00
|
|
|
}
|
|
|
|
|
2020-06-26 19:36:48 +00:00
|
|
|
func NewStatePredicates(api ChainAPI) *StatePredicates {
|
2020-06-22 21:38:40 +00:00
|
|
|
return &StatePredicates{
|
2020-06-25 21:43:37 +00:00
|
|
|
api: api,
|
2021-01-29 20:01:00 +00:00
|
|
|
cst: cbor.NewCborStore(blockstore.NewAPIBlockstore(api)),
|
2020-06-22 21:38:40 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-07-02 01:20:54 +00:00
|
|
|
// DiffTipSetKeyFunc check if there's a change form oldState to newState, and returns
|
2020-06-26 18:59:23 +00:00
|
|
|
// - changed: was there a change
|
|
|
|
// - user: user-defined data representing the state change
|
|
|
|
// - err
|
2020-07-02 01:20:54 +00:00
|
|
|
type DiffTipSetKeyFunc func(ctx context.Context, oldState, newState types.TipSetKey) (changed bool, user UserData, err error)
|
2020-06-25 21:43:37 +00:00
|
|
|
|
2020-09-16 04:06:04 +00:00
|
|
|
type DiffActorStateFunc func(ctx context.Context, oldActorState *types.Actor, newActorState *types.Actor) (changed bool, user UserData, err error)
|
2020-06-22 21:38:40 +00:00
|
|
|
|
2020-06-26 19:36:48 +00:00
|
|
|
// OnActorStateChanged calls diffStateFunc when the state changes for the given actor
|
2020-07-02 01:20:54 +00:00
|
|
|
func (sp *StatePredicates) OnActorStateChanged(addr address.Address, diffStateFunc DiffActorStateFunc) DiffTipSetKeyFunc {
|
|
|
|
return func(ctx context.Context, oldState, newState types.TipSetKey) (changed bool, user UserData, err error) {
|
|
|
|
oldActor, err := sp.api.StateGetActor(ctx, addr, oldState)
|
2020-06-22 21:38:40 +00:00
|
|
|
if err != nil {
|
|
|
|
return false, nil, err
|
|
|
|
}
|
2020-07-02 01:20:54 +00:00
|
|
|
newActor, err := sp.api.StateGetActor(ctx, addr, newState)
|
2020-06-26 19:36:48 +00:00
|
|
|
if err != nil {
|
|
|
|
return false, nil, err
|
|
|
|
}
|
|
|
|
|
2020-06-22 21:38:40 +00:00
|
|
|
if oldActor.Head.Equals(newActor.Head) {
|
|
|
|
return false, nil, nil
|
|
|
|
}
|
2020-09-16 04:06:04 +00:00
|
|
|
return diffStateFunc(ctx, oldActor, newActor)
|
2020-06-22 21:38:40 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-09-17 02:13:12 +00:00
|
|
|
type DiffStorageMarketStateFunc func(ctx context.Context, oldState market.State, newState market.State) (changed bool, user UserData, err error)
|
2020-06-22 21:38:40 +00:00
|
|
|
|
2020-06-26 19:36:48 +00:00
|
|
|
// OnStorageMarketActorChanged calls diffStorageMarketState when the state changes for the market actor
|
2020-07-02 01:20:54 +00:00
|
|
|
func (sp *StatePredicates) OnStorageMarketActorChanged(diffStorageMarketState DiffStorageMarketStateFunc) DiffTipSetKeyFunc {
|
2020-09-18 04:41:36 +00:00
|
|
|
return sp.OnActorStateChanged(market.Address, func(ctx context.Context, oldActorState, newActorState *types.Actor) (changed bool, user UserData, err error) {
|
2020-09-17 02:13:12 +00:00
|
|
|
oldState, err := market.Load(adt.WrapStore(ctx, sp.cst), oldActorState)
|
|
|
|
if err != nil {
|
2020-06-22 21:38:40 +00:00
|
|
|
return false, nil, err
|
|
|
|
}
|
2020-09-17 02:13:12 +00:00
|
|
|
newState, err := market.Load(adt.WrapStore(ctx, sp.cst), newActorState)
|
|
|
|
if err != nil {
|
2020-06-22 21:38:40 +00:00
|
|
|
return false, nil, err
|
|
|
|
}
|
2020-09-17 02:13:12 +00:00
|
|
|
return diffStorageMarketState(ctx, oldState, newState)
|
2020-06-22 21:38:40 +00:00
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2020-08-05 00:28:05 +00:00
|
|
|
type BalanceTables struct {
|
2020-09-17 02:13:12 +00:00
|
|
|
EscrowTable market.BalanceTable
|
|
|
|
LockedTable market.BalanceTable
|
2020-08-05 00:28:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// DiffBalanceTablesFunc compares two balance tables
|
|
|
|
type DiffBalanceTablesFunc func(ctx context.Context, oldBalanceTable, newBalanceTable BalanceTables) (changed bool, user UserData, err error)
|
|
|
|
|
|
|
|
// OnBalanceChanged runs when the escrow table for available balances changes
|
|
|
|
func (sp *StatePredicates) OnBalanceChanged(diffBalances DiffBalanceTablesFunc) DiffStorageMarketStateFunc {
|
2020-09-17 02:13:12 +00:00
|
|
|
return func(ctx context.Context, oldState market.State, newState market.State) (changed bool, user UserData, err error) {
|
2020-09-23 05:19:43 +00:00
|
|
|
bc, err := oldState.BalancesChanged(newState)
|
|
|
|
if err != nil {
|
|
|
|
return false, nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
if !bc {
|
2020-08-05 00:28:05 +00:00
|
|
|
return false, nil, nil
|
|
|
|
}
|
|
|
|
|
2020-09-17 02:13:12 +00:00
|
|
|
oldEscrowRoot, err := oldState.EscrowTable()
|
2020-08-05 00:28:05 +00:00
|
|
|
if err != nil {
|
|
|
|
return false, nil, err
|
|
|
|
}
|
|
|
|
|
2020-09-17 02:13:12 +00:00
|
|
|
oldLockedRoot, err := oldState.LockedTable()
|
2020-08-05 00:28:05 +00:00
|
|
|
if err != nil {
|
|
|
|
return false, nil, err
|
|
|
|
}
|
|
|
|
|
2020-09-17 02:13:12 +00:00
|
|
|
newEscrowRoot, err := newState.EscrowTable()
|
2020-08-05 00:28:05 +00:00
|
|
|
if err != nil {
|
|
|
|
return false, nil, err
|
|
|
|
}
|
|
|
|
|
2020-09-17 02:13:12 +00:00
|
|
|
newLockedRoot, err := newState.LockedTable()
|
2020-08-05 00:28:05 +00:00
|
|
|
if err != nil {
|
|
|
|
return false, nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return diffBalances(ctx, BalanceTables{oldEscrowRoot, oldLockedRoot}, BalanceTables{newEscrowRoot, newLockedRoot})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-09-17 02:13:12 +00:00
|
|
|
type DiffDealStatesFunc func(ctx context.Context, oldDealStateRoot, newDealStateRoot market.DealStates) (changed bool, user UserData, err error)
|
|
|
|
type DiffDealProposalsFunc func(ctx context.Context, oldDealStateRoot, newDealStateRoot market.DealProposals) (changed bool, user UserData, err error)
|
|
|
|
type DiffAdtArraysFunc func(ctx context.Context, oldDealStateRoot, newDealStateRoot adt.Array) (changed bool, user UserData, err error)
|
2020-06-22 21:38:40 +00:00
|
|
|
|
2020-07-07 23:39:32 +00:00
|
|
|
// OnDealStateChanged calls diffDealStates when the market deal state changes
|
2020-09-17 02:13:12 +00:00
|
|
|
func (sp *StatePredicates) OnDealStateChanged(diffDealStates DiffDealStatesFunc) DiffStorageMarketStateFunc {
|
|
|
|
return func(ctx context.Context, oldState market.State, newState market.State) (changed bool, user UserData, err error) {
|
2020-09-23 05:19:43 +00:00
|
|
|
sc, err := oldState.StatesChanged(newState)
|
|
|
|
if err != nil {
|
|
|
|
return false, nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
if !sc {
|
2020-06-22 21:38:40 +00:00
|
|
|
return false, nil, nil
|
|
|
|
}
|
2020-06-25 21:43:37 +00:00
|
|
|
|
2020-09-17 02:13:12 +00:00
|
|
|
oldRoot, err := oldState.States()
|
2020-06-22 21:38:40 +00:00
|
|
|
if err != nil {
|
|
|
|
return false, nil, err
|
|
|
|
}
|
2020-09-17 02:13:12 +00:00
|
|
|
newRoot, err := newState.States()
|
2020-06-22 21:38:40 +00:00
|
|
|
if err != nil {
|
|
|
|
return false, nil, err
|
|
|
|
}
|
2020-06-25 21:43:37 +00:00
|
|
|
|
2020-06-22 21:38:40 +00:00
|
|
|
return diffDealStates(ctx, oldRoot, newRoot)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-07-07 23:39:32 +00:00
|
|
|
// OnDealProposalChanged calls diffDealProps when the market proposal state changes
|
2020-09-17 02:13:12 +00:00
|
|
|
func (sp *StatePredicates) OnDealProposalChanged(diffDealProps DiffDealProposalsFunc) DiffStorageMarketStateFunc {
|
|
|
|
return func(ctx context.Context, oldState market.State, newState market.State) (changed bool, user UserData, err error) {
|
2020-09-23 05:19:43 +00:00
|
|
|
pc, err := oldState.ProposalsChanged(newState)
|
|
|
|
if err != nil {
|
|
|
|
return false, nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
if !pc {
|
2020-07-07 23:39:32 +00:00
|
|
|
return false, nil, nil
|
|
|
|
}
|
|
|
|
|
2020-09-17 02:13:12 +00:00
|
|
|
oldRoot, err := oldState.Proposals()
|
2020-07-07 23:39:32 +00:00
|
|
|
if err != nil {
|
|
|
|
return false, nil, err
|
|
|
|
}
|
2020-09-17 02:13:12 +00:00
|
|
|
newRoot, err := newState.Proposals()
|
2020-07-07 23:39:32 +00:00
|
|
|
if err != nil {
|
|
|
|
return false, nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return diffDealProps(ctx, oldRoot, newRoot)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// OnDealProposalAmtChanged detects changes in the deal proposal AMT for all deal proposals and returns a MarketProposalsChanges structure containing:
|
|
|
|
// - Added Proposals
|
|
|
|
// - Modified Proposals
|
|
|
|
// - Removed Proposals
|
2020-09-17 02:13:12 +00:00
|
|
|
func (sp *StatePredicates) OnDealProposalAmtChanged() DiffDealProposalsFunc {
|
|
|
|
return func(ctx context.Context, oldDealProps, newDealProps market.DealProposals) (changed bool, user UserData, err error) {
|
2020-09-18 04:48:50 +00:00
|
|
|
proposalChanges, err := market.DiffDealProposals(oldDealProps, newDealProps)
|
2020-09-17 02:13:12 +00:00
|
|
|
if err != nil {
|
2020-07-07 23:39:32 +00:00
|
|
|
return false, nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(proposalChanges.Added)+len(proposalChanges.Removed) == 0 {
|
|
|
|
return false, nil, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
return true, proposalChanges, nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// OnDealStateAmtChanged detects changes in the deal state AMT for all deal states and returns a MarketDealStateChanges structure containing:
|
|
|
|
// - Added Deals
|
|
|
|
// - Modified Deals
|
|
|
|
// - Removed Deals
|
2020-09-17 02:13:12 +00:00
|
|
|
func (sp *StatePredicates) OnDealStateAmtChanged() DiffDealStatesFunc {
|
|
|
|
return func(ctx context.Context, oldDealStates, newDealStates market.DealStates) (changed bool, user UserData, err error) {
|
2020-09-18 04:48:50 +00:00
|
|
|
dealStateChanges, err := market.DiffDealStates(oldDealStates, newDealStates)
|
2020-09-17 02:13:12 +00:00
|
|
|
if err != nil {
|
2020-07-07 23:39:32 +00:00
|
|
|
return false, nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(dealStateChanges.Added)+len(dealStateChanges.Modified)+len(dealStateChanges.Removed) == 0 {
|
|
|
|
return false, nil, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
return true, dealStateChanges, nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-26 19:36:48 +00:00
|
|
|
// ChangedDeals is a set of changes to deal state
|
2020-09-17 07:32:10 +00:00
|
|
|
type ChangedDeals map[abi.DealID]market.DealStateChange
|
2020-06-26 15:51:45 +00:00
|
|
|
|
2020-06-26 19:36:48 +00:00
|
|
|
// DealStateChangedForIDs detects changes in the deal state AMT for the given deal IDs
|
2020-09-17 02:13:12 +00:00
|
|
|
func (sp *StatePredicates) DealStateChangedForIDs(dealIds []abi.DealID) DiffDealStatesFunc {
|
|
|
|
return func(ctx context.Context, oldDealStates, newDealStates market.DealStates) (changed bool, user UserData, err error) {
|
2020-06-26 15:51:45 +00:00
|
|
|
changedDeals := make(ChangedDeals)
|
2020-06-26 19:36:48 +00:00
|
|
|
for _, dealID := range dealIds {
|
2020-06-30 18:33:48 +00:00
|
|
|
|
|
|
|
// If the deal has been removed, we just set it to nil
|
2020-09-17 07:32:10 +00:00
|
|
|
oldDeal, oldFound, err := oldDealStates.Get(dealID)
|
2020-06-25 21:43:37 +00:00
|
|
|
if err != nil {
|
|
|
|
return false, nil, err
|
|
|
|
}
|
2020-07-07 23:39:32 +00:00
|
|
|
|
2020-09-17 07:32:10 +00:00
|
|
|
newDeal, newFound, err := newDealStates.Get(dealID)
|
2020-06-25 21:43:37 +00:00
|
|
|
if err != nil {
|
|
|
|
return false, nil, err
|
|
|
|
}
|
2020-06-30 18:33:48 +00:00
|
|
|
|
2020-09-17 07:32:10 +00:00
|
|
|
existenceChanged := oldFound != newFound
|
chore: Merge nv22 into master (#11699)
* [WIP] feat: Add nv22 skeleton
Addition of Network Version 22 skeleton
* update FFI
* feat: drand: refactor round verification
* feat: sealing: Support nv22 DDO features in the sealing pipeline (#11226)
* Initial work supporting DDO pieces in lotus-miner
* sealing: Update pipeline input to operate on UniversalPiece
* sealing: Update pipeline checks/sealing states to operate on UniversalPiece
* sealing: Make pipeline build with UniversalPiece
* move PieceDealInfo out of api
* make gen
* make sealing pipeline unit tests pass
* fix itest ensemble build
* don't panic in SectorsStatus with deals
* stop linter from complaining about checkPieces
* fix sector import tests
* mod tidy
* sealing: Add logic for (pre)committing DDO sectors
* sealing: state-types with method defs
* DDO non-snap pipeline works(?), DDO Itests
* DDO support in snapdeals pipeline
* make gen
* update actor bundles
* update the gst market fix
* fix: chain: use PreCommitSectorsBatch2 when setting up genesis
* some bug fixes
* integration working changes
* update actor bundles
* Make TestOnboardRawPieceSnap pass
* Appease the linter
* Make deadlines test pass with v12 actors
* Update go-state-types, abstract market DealState
* make gen
* mod tidy, lint fixes
* Fix some more tests
* Bump version in master
Bump version in master
* Make gen
Make gen
* fix sender
* fix: lotus-provider: Fix winning PoSt
* fix: sql Scan cannot write to an object
* Actually show miner-addrs in info-log
Actually show miner-addrs in lotus-provider info-log
* [WIP] feat: Add nv22 skeleton
Addition of Network Version 22 skeleton
* update FFI
* ddo is now nv22
* make gen
* temp actor bundle with ddo
* use working go-state-types
* gst with v13 market migration
* update bundle, builtin.MethodsMiner.ProveCommitSectors2 -> 3
* actually working v13 migration, v13 migration itest
* Address review
* sealing: Correct DDO snap pledge math
* itests: Mixed ddo itest
* pipeline: Fix sectorWeight
* sealing: convert market deals into PAMs in mixed sectors
* sealing: make market to ddo conversion work
* fix lint
* update gst
* Update actors and GST to lastest integ branch
* commit batcher: Update ProveCommitSectors3Params builder logic
* make gen
* use builtin-actors master
* ddo: address review
* itests: Add commd assertions to ddo tests
* make gen
* gst with fixed types
* config knobs for RequireActivationSuccess
* storage: Drop obsolete flaky tasts
---------
Co-authored-by: Jennifer Wang <jiayingw703@gmail.com>
Co-authored-by: Aayush <arajasek94@gmail.com>
Co-authored-by: Shrenuj Bansal <shrenuj.bansal@protocol.ai>
Co-authored-by: Phi <orjan.roren@gmail.com>
Co-authored-by: Andrew Jackson (Ajax) <snadrus@gmail.com>
Co-authored-by: TippyFlits <james.bluett@protocol.ai>
* feat: implement FIP-0063
* chore: deps: update to go-multiaddr v0.12.2 (#11602)
* feat: fvm: update the FVM/FFI to v4.1 (#11608) (#11612)
This:
1. Adds nv22 support.
2. Updates the message tracing format.
Co-authored-by: Steven Allen <steven@stebalien.com>
* AggregateProofType nil when doing batch updates
Use latest nv22 go-state-types version with matching update
* Update to v13.0.0-rc.2 bundle
* chore: Upgrade heights and codename
Update upgrade heights
Co-Authored-By: Steven Allen <steven@stebalien.com>
* Update epoch after nv22 DRAND switch
Update epoch after nv22 DRAND switch
* Update Mango codename to Phoneix
Make the codename for the Drand-change inline with Dragon style.
* Add UpgradePhoenixHeight to API params
* set UpgradePhoenixHeight to be one hour after Dragon
* Make gen
Make gen and UpgradePhoenixHeight in butterfly and local devnet to be in line with Calibration and Mainnet
* Update epoch heights (#11637)
Update epoch heights
* new: add forest bootstrap nodes (#11636)
Signed-off-by: samuelarogbonlo <sbayo971@gmail.com>
* Merge pull request #11491 from filecoin-project/fix/remove-decommissioned-pl-bootstrap-nodes
Remove PL operated bootstrap nodes from mainnet.pi
* feat: api: new verified registry methods to get all allocations and claims (#11631)
* new verireg methods
* update changelog and add itest
* update itest and cli
* update new method's support till v9
* remove gateway APIs
* fix cli internal var names
* chore:: backport #11609 to the feat/nv22 branch (#11644)
* feat: api: improve the correctness of Eth's trace_block (#11609)
* Improve the correctness of Eth's trace_block
- Improve encoding/decoding of parameters and return values:
- Encode "native" parameters and return values with Solidity ABI.
- Correctly decode parameters to "create" calls.
- Use the correct (ish) output for "create" calls.
- Handle all forms of "create".
- Make robust with respect to reverts:
- Use the actor ID/address from the trace instead of looking it up in
the state-tree (may not exist in the state-tree due to a revert).
- Gracefully handle failed actor/contract creation.
- Improve performance:
- We avoid looking anything up in the state-tree when translating the
trace, which should significantly improve performance.
- Improve code readability:
- Remove all "backtracking" logic.
- Use an "environment" struct to store temporary state instead of
attaching it to the trace.
- Fix random bugs:
- Fix an allocation bug in the "address" logic (need to set the
capacity before modifying the slice).
- Improved error checking/handling.
- Use correct types for `trace_block` action/results (create, call, etc.).
- And use the correct types for Result/Action structs instead of reusing the same "Call" action every time.
- Improve error messages.
* Make gen
Make gen
---------
Co-authored-by: Steven Allen <steven@stebalien.com>
* fix: add UpgradePhoenixHeight to StateGetNetworkParams (#11648)
* chore: deps: update to go-state-types v13.0.0-rc.1
* do NOT update the cache when running the real migration
* Merge pull request #11632 from hanabi1224/hm/drand-test
feat: drand quicknet: allow scheduling drand quicknet upgrade before nv22 on 2k devnet
* chore: deps: update to go-state-types v13.0.0-rc.2
chore: deps: update to go-state-types v13.0.0-rc.2
* feat: set migration config UpgradeEpoch for v13 actors upgrade
* Built-in actor events first draft
* itest for DDO non-market verified data w/ builtin actor events
* Tests for builtin actor events API
* Clean up DDO+Events tests, add lots of explainer comments
* Minor tweaks to events types
* Avoid duplicate messages when looking for receipts
* Rename internal events modules for clarity
* Adjust actor event API after review
* s/ActorEvents/Events/g in global config
* Manage event sending rate for SubscribeActorEvents
* Terminate SubscribeActorEvents chan when at max height
* Document future API changes
* More clarity in actor event API docs
* More post-review changes, lots of tests for SubscribeActorEvents
Use BlockDelay as the window for receiving events on the SubscribeActorEvents
channel. We expect the user to have received the initial batch of historical
events (if any) in one block's time. For real-time events we expect them to
not fall behind by roughly one block's time.
* Remove duplicate code from actor event type marshalling tests
Reduce verbosity and remove duplicate test logic from actor event types
JSON marshalling tests.
* Rename actor events test to follow go convention
Add missing `s` to `actor_events` test file to follow golang convention
used across the repo.
* Run actor events table tests in deterministic order
Refactor `map` usage for actor event table tests to ensure deterministic
test execution order, making debugging potential issues easier. If
non-determinism is a target, leverage Go's built-in parallel testing
capabilities.
* Reduce scope for filter removal failure when getting actor events
Use a fresh context to remove the temporary filter installed solely to
get the actor events. This should reduce chances of failure in a case
where the original context may be expired/cancelled.
Refactor removal into a `defer` statement for a more readable, concise
return statement.
* Use fixed RNG seed for actor event tests
Improve determinism in actor event tests by using a fixed RNG seed. This
makes up a more reproducible test suit.
* Use provided libraries to assert eventual conditions
Use the functionalities already provided by `testify` to assert eventual
conditions, and remove the use of `time.Sleep`.
Remove duplicate code in utility functions that are already defined.
Refactor assertion helper functions to use consistent terminology:
"require" implies fatal error, whereas "assert" implies error where the
test may proceed executing.
* Update changelog for actor events APIs
* Fix concerns and docs identified by review
* Update actor bundle to v13.0.0-rc3
Update actor bundle to v13.0.0-rc3
* Prep Lotus v1.26.0-rc1
- For sanity reverting the mainnet upgrade epoch to 99999999, and then only set it when cutting the final release
-Update Calibnet CIDs to v13.0.0-rc3
- Add GetActorEvents, SubscribeActorEvents, GetAllClaims and GetAllAllocations methods to the changelog
Co-Authored-By: Jiaying Wang <42981373+jennijuju@users.noreply.github.com>
* Update CHANGELOG.md
Co-authored-by: Masih H. Derkani <m@derkani.org>
* Make gen
Make gen
* fix: beacon: validate drand change at nv16 correctly
* bump to v1.26.0-rc2
* test: cleanup ddo verified itest, extract steps to functions
also add allocation-removed event case
* test: extract verified DDO test to separate file, add more checks
* test: add additional actor events checks
* Add verification for "deal-activated" actor event
* docs(drand): document the meaning of "IsChained" (#11692)
* Resolve conflicts
I encountered multiple issues when trying to run make gen. And these changes fixed a couple of them:
- go mod tidy
- Remove RaftState/RaftLeader
- Revert `if ts.Height() > claim.TermMax+claim.TermStart || !cctx.IsSet("expired")` to the what is in the release/v1.26.0: `if tsHeight > val.TermMax || !expired`
* fixup imports, make jen
* Update version
Update version in master to v1.27.0-dev
* Update node/impl/full/dummy.go
Co-authored-by: Łukasz Magiera <magik6k@users.noreply.github.com>
* Adjust ListClaimsCmd
Adjust ListClaimsCmd according to review
---------
Signed-off-by: samuelarogbonlo <sbayo971@gmail.com>
Co-authored-by: TippyFlits <james.bluett@protocol.ai>
Co-authored-by: Aayush <arajasek94@gmail.com>
Co-authored-by: Łukasz Magiera <magik6k@users.noreply.github.com>
Co-authored-by: Jennifer Wang <jiayingw703@gmail.com>
Co-authored-by: Shrenuj Bansal <shrenuj.bansal@protocol.ai>
Co-authored-by: Andrew Jackson (Ajax) <snadrus@gmail.com>
Co-authored-by: Steven Allen <steven@stebalien.com>
Co-authored-by: Rod Vagg <rod@vagg.org>
Co-authored-by: Samuel Arogbonlo <47984109+samuelarogbonlo@users.noreply.github.com>
Co-authored-by: LexLuthr <88259624+LexLuthr@users.noreply.github.com>
Co-authored-by: tom123222 <160735201+tom123222@users.noreply.github.com>
Co-authored-by: Aarsh Shah <aarshkshah1992@gmail.com>
Co-authored-by: Masih H. Derkani <m@derkani.org>
Co-authored-by: Jiaying Wang <42981373+jennijuju@users.noreply.github.com>
2024-03-12 09:33:58 +00:00
|
|
|
valueChanged := (oldFound && newFound) && !oldDeal.Equals(newDeal)
|
2020-09-17 02:13:12 +00:00
|
|
|
if existenceChanged || valueChanged {
|
2020-09-17 07:32:10 +00:00
|
|
|
changedDeals[dealID] = market.DealStateChange{ID: dealID, From: oldDeal, To: newDeal}
|
2020-06-25 21:43:37 +00:00
|
|
|
}
|
2020-06-22 21:38:40 +00:00
|
|
|
}
|
2020-06-25 21:43:37 +00:00
|
|
|
if len(changedDeals) > 0 {
|
2020-06-26 15:51:45 +00:00
|
|
|
return true, changedDeals, nil
|
2020-06-22 21:38:40 +00:00
|
|
|
}
|
2020-06-25 21:43:37 +00:00
|
|
|
return false, nil, nil
|
2020-06-22 21:38:40 +00:00
|
|
|
}
|
|
|
|
}
|
2020-07-02 01:20:54 +00:00
|
|
|
|
2020-08-05 00:28:05 +00:00
|
|
|
// ChangedBalances is a set of changes to deal state
|
|
|
|
type ChangedBalances map[address.Address]BalanceChange
|
|
|
|
|
|
|
|
// BalanceChange is a change in balance from -> to
|
|
|
|
type BalanceChange struct {
|
|
|
|
From abi.TokenAmount
|
|
|
|
To abi.TokenAmount
|
|
|
|
}
|
|
|
|
|
|
|
|
// AvailableBalanceChangedForAddresses detects changes in the escrow table for the given addresses
|
|
|
|
func (sp *StatePredicates) AvailableBalanceChangedForAddresses(getAddrs func() []address.Address) DiffBalanceTablesFunc {
|
|
|
|
return func(ctx context.Context, oldBalances, newBalances BalanceTables) (changed bool, user UserData, err error) {
|
|
|
|
changedBalances := make(ChangedBalances)
|
|
|
|
addrs := getAddrs()
|
|
|
|
for _, addr := range addrs {
|
|
|
|
// If the deal has been removed, we just set it to nil
|
|
|
|
oldEscrowBalance, err := oldBalances.EscrowTable.Get(addr)
|
|
|
|
if err != nil {
|
|
|
|
return false, nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
oldLockedBalance, err := oldBalances.LockedTable.Get(addr)
|
|
|
|
if err != nil {
|
|
|
|
return false, nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
oldBalance := big.Sub(oldEscrowBalance, oldLockedBalance)
|
|
|
|
|
|
|
|
newEscrowBalance, err := newBalances.EscrowTable.Get(addr)
|
|
|
|
if err != nil {
|
|
|
|
return false, nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
newLockedBalance, err := newBalances.LockedTable.Get(addr)
|
|
|
|
if err != nil {
|
|
|
|
return false, nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
newBalance := big.Sub(newEscrowBalance, newLockedBalance)
|
|
|
|
|
|
|
|
if !oldBalance.Equals(newBalance) {
|
|
|
|
changedBalances[addr] = BalanceChange{oldBalance, newBalance}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if len(changedBalances) > 0 {
|
|
|
|
return true, changedBalances, nil
|
|
|
|
}
|
|
|
|
return false, nil, nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-09-17 06:34:15 +00:00
|
|
|
type DiffMinerActorStateFunc func(ctx context.Context, oldState miner.State, newState miner.State) (changed bool, user UserData, err error)
|
2020-07-02 01:20:54 +00:00
|
|
|
|
2020-08-12 23:44:09 +00:00
|
|
|
func (sp *StatePredicates) OnInitActorChange(diffInitActorState DiffInitActorStateFunc) DiffTipSetKeyFunc {
|
2020-09-18 04:41:36 +00:00
|
|
|
return sp.OnActorStateChanged(init_.Address, func(ctx context.Context, oldActorState, newActorState *types.Actor) (changed bool, user UserData, err error) {
|
2020-09-17 15:30:15 +00:00
|
|
|
oldState, err := init_.Load(adt.WrapStore(ctx, sp.cst), oldActorState)
|
|
|
|
if err != nil {
|
2020-08-12 23:44:09 +00:00
|
|
|
return false, nil, err
|
|
|
|
}
|
2020-09-17 15:30:15 +00:00
|
|
|
newState, err := init_.Load(adt.WrapStore(ctx, sp.cst), newActorState)
|
|
|
|
if err != nil {
|
2020-08-12 23:44:09 +00:00
|
|
|
return false, nil, err
|
|
|
|
}
|
2020-09-22 17:55:29 +00:00
|
|
|
return diffInitActorState(ctx, oldState, newState)
|
2020-08-12 23:44:09 +00:00
|
|
|
})
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2020-07-02 01:20:54 +00:00
|
|
|
func (sp *StatePredicates) OnMinerActorChange(minerAddr address.Address, diffMinerActorState DiffMinerActorStateFunc) DiffTipSetKeyFunc {
|
2020-09-16 04:06:04 +00:00
|
|
|
return sp.OnActorStateChanged(minerAddr, func(ctx context.Context, oldActorState, newActorState *types.Actor) (changed bool, user UserData, err error) {
|
2020-09-17 15:30:15 +00:00
|
|
|
oldState, err := miner.Load(adt.WrapStore(ctx, sp.cst), oldActorState)
|
|
|
|
if err != nil {
|
2020-07-02 01:20:54 +00:00
|
|
|
return false, nil, err
|
|
|
|
}
|
2020-09-17 15:30:15 +00:00
|
|
|
newState, err := miner.Load(adt.WrapStore(ctx, sp.cst), newActorState)
|
|
|
|
if err != nil {
|
2020-07-02 01:20:54 +00:00
|
|
|
return false, nil, err
|
|
|
|
}
|
2020-09-17 06:34:15 +00:00
|
|
|
return diffMinerActorState(ctx, oldState, newState)
|
2020-07-02 01:20:54 +00:00
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func (sp *StatePredicates) OnMinerSectorChange() DiffMinerActorStateFunc {
|
2020-09-17 06:34:15 +00:00
|
|
|
return func(ctx context.Context, oldState, newState miner.State) (changed bool, user UserData, err error) {
|
2020-09-18 04:39:34 +00:00
|
|
|
sectorChanges, err := miner.DiffSectors(oldState, newState)
|
2020-07-02 01:20:54 +00:00
|
|
|
if err != nil {
|
|
|
|
return false, nil, err
|
|
|
|
}
|
|
|
|
// nothing changed
|
|
|
|
if len(sectorChanges.Added)+len(sectorChanges.Extended)+len(sectorChanges.Removed) == 0 {
|
|
|
|
return false, nil, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
return true, sectorChanges, nil
|
|
|
|
}
|
|
|
|
}
|
2020-07-16 00:22:48 +00:00
|
|
|
|
|
|
|
func (sp *StatePredicates) OnMinerPreCommitChange() DiffMinerActorStateFunc {
|
2020-09-17 06:34:15 +00:00
|
|
|
return func(ctx context.Context, oldState, newState miner.State) (changed bool, user UserData, err error) {
|
2020-09-18 04:39:34 +00:00
|
|
|
precommitChanges, err := miner.DiffPreCommits(oldState, newState)
|
2020-07-16 00:22:48 +00:00
|
|
|
if err != nil {
|
|
|
|
return false, nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(precommitChanges.Added)+len(precommitChanges.Removed) == 0 {
|
|
|
|
return false, nil, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
return true, precommitChanges, nil
|
|
|
|
}
|
|
|
|
}
|
2020-07-18 03:07:02 +00:00
|
|
|
|
|
|
|
// DiffPaymentChannelStateFunc is function that compares two states for the payment channel
|
2020-09-16 04:06:04 +00:00
|
|
|
type DiffPaymentChannelStateFunc func(ctx context.Context, oldState paych.State, newState paych.State) (changed bool, user UserData, err error)
|
2020-07-18 03:07:02 +00:00
|
|
|
|
2024-03-15 01:59:02 +00:00
|
|
|
// OnPaymentChannelActorChanged calls diffPaymentChannelState when the state changes for the payment channel actor
|
2020-07-18 03:07:02 +00:00
|
|
|
func (sp *StatePredicates) OnPaymentChannelActorChanged(paychAddr address.Address, diffPaymentChannelState DiffPaymentChannelStateFunc) DiffTipSetKeyFunc {
|
2020-09-16 04:06:04 +00:00
|
|
|
return sp.OnActorStateChanged(paychAddr, func(ctx context.Context, oldActorState, newActorState *types.Actor) (changed bool, user UserData, err error) {
|
|
|
|
oldState, err := paych.Load(adt.WrapStore(ctx, sp.cst), oldActorState)
|
|
|
|
if err != nil {
|
2020-07-18 03:07:02 +00:00
|
|
|
return false, nil, err
|
|
|
|
}
|
2020-09-16 04:06:04 +00:00
|
|
|
newState, err := paych.Load(adt.WrapStore(ctx, sp.cst), newActorState)
|
|
|
|
if err != nil {
|
2020-07-18 03:07:02 +00:00
|
|
|
return false, nil, err
|
|
|
|
}
|
2020-09-16 04:06:04 +00:00
|
|
|
return diffPaymentChannelState(ctx, oldState, newState)
|
2020-07-18 03:07:02 +00:00
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
// PayChToSendChange is a difference in the amount to send on a payment channel when the money is collected
|
|
|
|
type PayChToSendChange struct {
|
|
|
|
OldToSend abi.TokenAmount
|
|
|
|
NewToSend abi.TokenAmount
|
|
|
|
}
|
|
|
|
|
|
|
|
// OnToSendAmountChanges monitors changes on the total amount to send from one party to the other on a payment channel
|
|
|
|
func (sp *StatePredicates) OnToSendAmountChanges() DiffPaymentChannelStateFunc {
|
2020-09-16 04:06:04 +00:00
|
|
|
return func(ctx context.Context, oldState paych.State, newState paych.State) (changed bool, user UserData, err error) {
|
2020-09-23 05:19:43 +00:00
|
|
|
ots, err := oldState.ToSend()
|
|
|
|
if err != nil {
|
|
|
|
return false, nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
nts, err := newState.ToSend()
|
|
|
|
if err != nil {
|
|
|
|
return false, nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
if ots.Equals(nts) {
|
2020-07-18 03:07:02 +00:00
|
|
|
return false, nil, nil
|
|
|
|
}
|
|
|
|
return true, &PayChToSendChange{
|
2020-09-23 05:19:43 +00:00
|
|
|
OldToSend: ots,
|
|
|
|
NewToSend: nts,
|
2020-07-18 03:07:02 +00:00
|
|
|
}, nil
|
|
|
|
}
|
|
|
|
}
|
2020-08-12 23:44:09 +00:00
|
|
|
|
|
|
|
type AddressPair struct {
|
|
|
|
ID address.Address
|
|
|
|
PK address.Address
|
|
|
|
}
|
|
|
|
|
2020-09-22 17:55:29 +00:00
|
|
|
type DiffInitActorStateFunc func(ctx context.Context, oldState init_.State, newState init_.State) (changed bool, user UserData, err error)
|
2020-08-12 23:44:09 +00:00
|
|
|
|
|
|
|
func (sp *StatePredicates) OnAddressMapChange() DiffInitActorStateFunc {
|
2020-09-22 17:55:29 +00:00
|
|
|
return func(ctx context.Context, oldState, newState init_.State) (changed bool, user UserData, err error) {
|
2020-11-16 19:18:50 +00:00
|
|
|
addressChanges, err := init_.DiffAddressMap(oldState, newState)
|
2020-08-12 23:44:09 +00:00
|
|
|
if err != nil {
|
|
|
|
return false, nil, err
|
|
|
|
}
|
2020-11-16 19:18:50 +00:00
|
|
|
if len(addressChanges.Added)+len(addressChanges.Modified)+len(addressChanges.Removed) == 0 {
|
2020-08-12 23:44:09 +00:00
|
|
|
return false, nil, nil
|
|
|
|
}
|
2020-09-23 06:14:28 +00:00
|
|
|
return true, addressChanges, nil
|
2020-08-12 23:44:09 +00:00
|
|
|
}
|
|
|
|
}
|