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>
This commit is contained in:
Phi-rjan
co-authored by
Łukasz Magiera
TippyFlits
Aayush
Jennifer Wang
Shrenuj Bansal
Andrew Jackson
Steven Allen
Rod Vagg
Samuel Arogbonlo
LexLuthr
tom123222
Aarsh Shah
Masih H. Derkani
Jiaying Wang
Łukasz Magiera
TippyFlits
Aayush
Jennifer Wang
Shrenuj Bansal
Andrew Jackson
Steven Allen
Rod Vagg
Samuel Arogbonlo
LexLuthr
tom123222
Aarsh Shah
Masih H. Derkani
Jiaying Wang
parent
7516aff220
commit
6f7498b622
@@ -35,6 +35,7 @@ type FullNodeAPI struct {
|
||||
full.WalletAPI
|
||||
full.SyncAPI
|
||||
full.EthAPI
|
||||
full.ActorEventsAPI
|
||||
|
||||
DS dtypes.MetadataDS
|
||||
NetworkName dtypes.NetworkName
|
||||
|
||||
@@ -0,0 +1,376 @@
|
||||
package full
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/ipfs/go-cid"
|
||||
"github.com/raulk/clock"
|
||||
"go.uber.org/fx"
|
||||
|
||||
"github.com/filecoin-project/go-address"
|
||||
"github.com/filecoin-project/go-state-types/abi"
|
||||
|
||||
"github.com/filecoin-project/lotus/api"
|
||||
"github.com/filecoin-project/lotus/chain/events/filter"
|
||||
"github.com/filecoin-project/lotus/chain/types"
|
||||
)
|
||||
|
||||
type ActorEventAPI interface {
|
||||
GetActorEvents(ctx context.Context, filter *types.ActorEventFilter) ([]*types.ActorEvent, error)
|
||||
SubscribeActorEvents(ctx context.Context, filter *types.ActorEventFilter) (<-chan *types.ActorEvent, error)
|
||||
}
|
||||
|
||||
var (
|
||||
_ ActorEventAPI = *new(api.FullNode)
|
||||
_ ActorEventAPI = *new(api.Gateway)
|
||||
)
|
||||
|
||||
type ChainAccessor interface {
|
||||
GetHeaviestTipSet() *types.TipSet
|
||||
}
|
||||
|
||||
type EventFilterManager interface {
|
||||
Install(
|
||||
ctx context.Context,
|
||||
minHeight, maxHeight abi.ChainEpoch,
|
||||
tipsetCid cid.Cid,
|
||||
addresses []address.Address,
|
||||
keysWithCodec map[string][]types.ActorEventBlock,
|
||||
excludeReverted bool,
|
||||
) (filter.EventFilter, error)
|
||||
Remove(ctx context.Context, id types.FilterID) error
|
||||
}
|
||||
|
||||
type ActorEventsAPI struct {
|
||||
fx.In
|
||||
ActorEventAPI
|
||||
}
|
||||
|
||||
type ActorEventHandler struct {
|
||||
chain ChainAccessor
|
||||
eventFilterManager EventFilterManager
|
||||
blockDelay time.Duration
|
||||
maxFilterHeightRange abi.ChainEpoch
|
||||
clock clock.Clock
|
||||
}
|
||||
|
||||
var _ ActorEventAPI = (*ActorEventHandler)(nil)
|
||||
|
||||
func NewActorEventHandler(
|
||||
chain ChainAccessor,
|
||||
eventFilterManager EventFilterManager,
|
||||
blockDelay time.Duration,
|
||||
maxFilterHeightRange abi.ChainEpoch,
|
||||
) *ActorEventHandler {
|
||||
return &ActorEventHandler{
|
||||
chain: chain,
|
||||
eventFilterManager: eventFilterManager,
|
||||
blockDelay: blockDelay,
|
||||
maxFilterHeightRange: maxFilterHeightRange,
|
||||
clock: clock.New(),
|
||||
}
|
||||
}
|
||||
|
||||
func NewActorEventHandlerWithClock(
|
||||
chain ChainAccessor,
|
||||
eventFilterManager EventFilterManager,
|
||||
blockDelay time.Duration,
|
||||
maxFilterHeightRange abi.ChainEpoch,
|
||||
clock clock.Clock,
|
||||
) *ActorEventHandler {
|
||||
return &ActorEventHandler{
|
||||
chain: chain,
|
||||
eventFilterManager: eventFilterManager,
|
||||
blockDelay: blockDelay,
|
||||
maxFilterHeightRange: maxFilterHeightRange,
|
||||
clock: clock,
|
||||
}
|
||||
}
|
||||
|
||||
func (a *ActorEventHandler) GetActorEvents(ctx context.Context, evtFilter *types.ActorEventFilter) ([]*types.ActorEvent, error) {
|
||||
if a.eventFilterManager == nil {
|
||||
return nil, api.ErrNotSupported
|
||||
}
|
||||
|
||||
if evtFilter == nil {
|
||||
evtFilter = &types.ActorEventFilter{}
|
||||
}
|
||||
params, err := a.parseFilter(*evtFilter)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Install a filter just for this call, collect events, remove the filter
|
||||
tipSetCid, err := params.GetTipSetCid()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to get tipset cid: %w", err)
|
||||
}
|
||||
f, err := a.eventFilterManager.Install(ctx, params.MinHeight, params.MaxHeight, tipSetCid, evtFilter.Addresses, evtFilter.Fields, false)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer func() {
|
||||
// Remove the temporary filter regardless of the original context.
|
||||
if err := a.eventFilterManager.Remove(context.Background(), f.ID()); err != nil {
|
||||
log.Warnf("failed to remove filter: %s", err)
|
||||
}
|
||||
}()
|
||||
return getCollected(ctx, f), nil
|
||||
}
|
||||
|
||||
type filterParams struct {
|
||||
MinHeight abi.ChainEpoch
|
||||
MaxHeight abi.ChainEpoch
|
||||
TipSetKey types.TipSetKey
|
||||
}
|
||||
|
||||
func (fp filterParams) GetTipSetCid() (cid.Cid, error) {
|
||||
if fp.TipSetKey.IsEmpty() {
|
||||
return cid.Undef, nil
|
||||
}
|
||||
return fp.TipSetKey.Cid()
|
||||
}
|
||||
|
||||
func (a *ActorEventHandler) parseFilter(f types.ActorEventFilter) (*filterParams, error) {
|
||||
if f.TipSetKey != nil && !f.TipSetKey.IsEmpty() {
|
||||
if f.FromHeight != nil || f.ToHeight != nil {
|
||||
return nil, fmt.Errorf("cannot specify both TipSetKey and FromHeight/ToHeight")
|
||||
}
|
||||
|
||||
return &filterParams{
|
||||
MinHeight: 0,
|
||||
MaxHeight: 0,
|
||||
TipSetKey: *f.TipSetKey,
|
||||
}, nil
|
||||
}
|
||||
|
||||
min, max, err := parseHeightRange(a.chain.GetHeaviestTipSet().Height(), f.FromHeight, f.ToHeight, a.maxFilterHeightRange)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &filterParams{
|
||||
MinHeight: min,
|
||||
MaxHeight: max,
|
||||
TipSetKey: types.EmptyTSK,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// parseHeightRange is similar to eth's parseBlockRange but with slightly different semantics but
|
||||
// results in equivalent values that we can plug in to the EventFilterManager.
|
||||
//
|
||||
// * Uses "height", allowing for nillable values rather than strings
|
||||
// * No "latest" and "earliest", those are now represented by nil on the way in and -1 on the way out
|
||||
// * No option for hex representation
|
||||
func parseHeightRange(heaviest abi.ChainEpoch, fromHeight, toHeight *abi.ChainEpoch, maxRange abi.ChainEpoch) (minHeight abi.ChainEpoch, maxHeight abi.ChainEpoch, err error) {
|
||||
if fromHeight != nil && *fromHeight < 0 {
|
||||
return 0, 0, fmt.Errorf("range 'from' must be greater than or equal to 0")
|
||||
}
|
||||
if fromHeight == nil {
|
||||
minHeight = -1
|
||||
} else {
|
||||
minHeight = *fromHeight
|
||||
}
|
||||
if toHeight == nil {
|
||||
maxHeight = -1
|
||||
} else {
|
||||
maxHeight = *toHeight
|
||||
}
|
||||
|
||||
// Validate height ranges are within limits set by node operator
|
||||
if minHeight == -1 && maxHeight > 0 {
|
||||
// Here the client is looking for events between the head and some future height
|
||||
if maxHeight-heaviest > maxRange {
|
||||
return 0, 0, fmt.Errorf("invalid epoch range: 'to' height is too far in the future (maximum: %d)", maxRange)
|
||||
}
|
||||
} else if minHeight >= 0 && maxHeight == -1 {
|
||||
// Here the client is looking for events between some time in the past and the current head
|
||||
if heaviest-minHeight > maxRange {
|
||||
return 0, 0, fmt.Errorf("invalid epoch range: 'from' height is too far in the past (maximum: %d)", maxRange)
|
||||
}
|
||||
} else if minHeight >= 0 && maxHeight >= 0 {
|
||||
if minHeight > maxHeight {
|
||||
return 0, 0, fmt.Errorf("invalid epoch range: 'to' height (%d) must be after 'from' height (%d)", minHeight, maxHeight)
|
||||
} else if maxHeight-minHeight > maxRange {
|
||||
return 0, 0, fmt.Errorf("invalid epoch range: range between to and 'from' heights is too large (maximum: %d)", maxRange)
|
||||
}
|
||||
}
|
||||
return minHeight, maxHeight, nil
|
||||
}
|
||||
|
||||
func (a *ActorEventHandler) SubscribeActorEvents(ctx context.Context, evtFilter *types.ActorEventFilter) (<-chan *types.ActorEvent, error) {
|
||||
if a.eventFilterManager == nil {
|
||||
return nil, api.ErrNotSupported
|
||||
}
|
||||
|
||||
if evtFilter == nil {
|
||||
evtFilter = &types.ActorEventFilter{}
|
||||
}
|
||||
params, err := a.parseFilter(*evtFilter)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
tipSetCid, err := params.GetTipSetCid()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to get tipset cid: %w", err)
|
||||
}
|
||||
fm, err := a.eventFilterManager.Install(ctx, params.MinHeight, params.MaxHeight, tipSetCid, evtFilter.Addresses, evtFilter.Fields, false)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// The goal for the code below is to send events on the `out` channel as fast as possible and not
|
||||
// let it get too far behind the rate at which the events are generated.
|
||||
// For historical events, we aim to send all events within a single block's time (30s on mainnet).
|
||||
// This ensures that the client can catch up quickly enough to start receiving new events.
|
||||
// For ongoing events, we also aim to send all events within a single block's time, so we never
|
||||
// want to be buffering events (approximately) more than one epoch behind the current head.
|
||||
// It's approximate because we only update our notion of "current epoch" once per ~blocktime.
|
||||
|
||||
out := make(chan *types.ActorEvent)
|
||||
|
||||
// When we start sending real-time events, we want to make sure that we don't fall behind more
|
||||
// than one epoch's worth of events (approximately). Capture this value now, before we send
|
||||
// historical events to allow for a little bit of slack in the historical event sending.
|
||||
minBacklogHeight := a.chain.GetHeaviestTipSet().Height() - 1
|
||||
|
||||
go func() {
|
||||
defer func() {
|
||||
// tell the caller we're done
|
||||
close(out)
|
||||
fm.ClearSubChannel()
|
||||
if err := a.eventFilterManager.Remove(ctx, fm.ID()); err != nil {
|
||||
log.Warnf("failed to remove filter: %s", err)
|
||||
}
|
||||
}()
|
||||
|
||||
// Handle any historical events that our filter may have picked up -----------------------------
|
||||
|
||||
evs := getCollected(ctx, fm)
|
||||
if len(evs) > 0 {
|
||||
// ensure we get all events out on the channel within one block's time (30s on mainnet)
|
||||
timer := a.clock.Timer(a.blockDelay)
|
||||
for _, ev := range evs {
|
||||
select {
|
||||
case out <- ev:
|
||||
case <-timer.C:
|
||||
log.Errorf("closing event subscription due to slow event sending rate")
|
||||
timer.Stop()
|
||||
return
|
||||
case <-ctx.Done():
|
||||
timer.Stop()
|
||||
return
|
||||
}
|
||||
}
|
||||
timer.Stop()
|
||||
}
|
||||
|
||||
// for the case where we have a MaxHeight set, we don't get a signal from the filter when we
|
||||
// reach that height, so we need to check it ourselves, do it now but also in the loop
|
||||
if params.MaxHeight > 0 && minBacklogHeight+1 >= params.MaxHeight {
|
||||
return
|
||||
}
|
||||
|
||||
// Handle ongoing events from the filter -------------------------------------------------------
|
||||
|
||||
in := make(chan interface{}, 256)
|
||||
fm.SetSubChannel(in)
|
||||
|
||||
var buffer []*types.ActorEvent
|
||||
nextBacklogHeightUpdate := a.clock.Now().Add(a.blockDelay)
|
||||
|
||||
collectEvent := func(ev interface{}) bool {
|
||||
ce, ok := ev.(*filter.CollectedEvent)
|
||||
if !ok {
|
||||
log.Errorf("got unexpected value from event filter: %T", ev)
|
||||
return false
|
||||
}
|
||||
|
||||
if ce.Height < minBacklogHeight {
|
||||
// since we mostly care about buffer size, we only trigger a too-slow close when the buffer
|
||||
// increases, i.e. we collect a new event
|
||||
log.Errorf("closing event subscription due to slow event sending rate")
|
||||
return false
|
||||
}
|
||||
|
||||
buffer = append(buffer, &types.ActorEvent{
|
||||
Entries: ce.Entries,
|
||||
Emitter: ce.EmitterAddr,
|
||||
Reverted: ce.Reverted,
|
||||
Height: ce.Height,
|
||||
TipSetKey: ce.TipSetKey,
|
||||
MsgCid: ce.MsgCid,
|
||||
})
|
||||
return true
|
||||
}
|
||||
|
||||
ticker := a.clock.Ticker(a.blockDelay)
|
||||
defer ticker.Stop()
|
||||
|
||||
for ctx.Err() == nil {
|
||||
if len(buffer) > 0 {
|
||||
select {
|
||||
case ev, ok := <-in: // incoming event
|
||||
if !ok || !collectEvent(ev) {
|
||||
return
|
||||
}
|
||||
case out <- buffer[0]: // successful send
|
||||
buffer[0] = nil
|
||||
buffer = buffer[1:]
|
||||
case <-ticker.C:
|
||||
// check that our backlog isn't too big by looking at the oldest event
|
||||
if buffer[0].Height < minBacklogHeight {
|
||||
log.Errorf("closing event subscription due to slow event sending rate")
|
||||
return
|
||||
}
|
||||
case <-ctx.Done():
|
||||
return
|
||||
}
|
||||
} else {
|
||||
select {
|
||||
case ev, ok := <-in: // incoming event
|
||||
if !ok || !collectEvent(ev) {
|
||||
return
|
||||
}
|
||||
case <-ctx.Done():
|
||||
return
|
||||
case <-ticker.C:
|
||||
currentHeight := a.chain.GetHeaviestTipSet().Height()
|
||||
if params.MaxHeight > 0 && currentHeight > params.MaxHeight {
|
||||
// we've reached the filter's MaxHeight, we're done so we can close the channel
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if a.clock.Now().After(nextBacklogHeightUpdate) {
|
||||
minBacklogHeight = a.chain.GetHeaviestTipSet().Height() - 1
|
||||
nextBacklogHeightUpdate = a.clock.Now().Add(a.blockDelay)
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
||||
return out, nil
|
||||
}
|
||||
|
||||
func getCollected(ctx context.Context, f filter.EventFilter) []*types.ActorEvent {
|
||||
ces := f.TakeCollectedEvents(ctx)
|
||||
|
||||
var out []*types.ActorEvent
|
||||
|
||||
for _, e := range ces {
|
||||
out = append(out, &types.ActorEvent{
|
||||
Entries: e.Entries,
|
||||
Emitter: e.EmitterAddr,
|
||||
Reverted: e.Reverted,
|
||||
Height: e.Height,
|
||||
TipSetKey: e.TipSetKey,
|
||||
MsgCid: e.MsgCid,
|
||||
})
|
||||
}
|
||||
|
||||
return out
|
||||
}
|
||||
@@ -0,0 +1,780 @@
|
||||
package full
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
pseudo "math/rand"
|
||||
"sync"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/ipfs/go-cid"
|
||||
"github.com/multiformats/go-multihash"
|
||||
"github.com/raulk/clock"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/filecoin-project/go-address"
|
||||
"github.com/filecoin-project/go-state-types/abi"
|
||||
"github.com/filecoin-project/go-state-types/crypto"
|
||||
|
||||
"github.com/filecoin-project/lotus/chain/events/filter"
|
||||
"github.com/filecoin-project/lotus/chain/types"
|
||||
)
|
||||
|
||||
var testCid = cid.MustParse("bafyreicmaj5hhoy5mgqvamfhgexxyergw7hdeshizghodwkjg6qmpoco7i")
|
||||
|
||||
func TestParseHeightRange(t *testing.T) {
|
||||
testCases := []struct {
|
||||
name string
|
||||
heaviest abi.ChainEpoch
|
||||
from *abi.ChainEpoch
|
||||
to *abi.ChainEpoch
|
||||
maxRange abi.ChainEpoch
|
||||
minOut abi.ChainEpoch
|
||||
maxOut abi.ChainEpoch
|
||||
errStr string
|
||||
}{
|
||||
{
|
||||
name: "fails when both are specified and range is greater than max allowed range",
|
||||
heaviest: 100,
|
||||
from: epochPtr(256),
|
||||
to: epochPtr(512),
|
||||
maxRange: 10,
|
||||
minOut: 0,
|
||||
maxOut: 0,
|
||||
errStr: "too large",
|
||||
},
|
||||
{
|
||||
name: "fails when min is specified and range is greater than max allowed range",
|
||||
heaviest: 500,
|
||||
from: epochPtr(16),
|
||||
to: nil,
|
||||
maxRange: 10,
|
||||
minOut: 0,
|
||||
maxOut: 0,
|
||||
errStr: "'from' height is too far in the past",
|
||||
},
|
||||
{
|
||||
name: "fails when max is specified and range is greater than max allowed range",
|
||||
heaviest: 500,
|
||||
from: nil,
|
||||
to: epochPtr(65536),
|
||||
maxRange: 10,
|
||||
minOut: 0,
|
||||
maxOut: 0,
|
||||
errStr: "'to' height is too far in the future",
|
||||
},
|
||||
{
|
||||
name: "fails when from is greater than to",
|
||||
heaviest: 100,
|
||||
from: epochPtr(512),
|
||||
to: epochPtr(256),
|
||||
maxRange: 10,
|
||||
minOut: 0,
|
||||
maxOut: 0,
|
||||
errStr: "must be after",
|
||||
},
|
||||
{
|
||||
name: "works when range is valid (nil from)",
|
||||
heaviest: 500,
|
||||
from: nil,
|
||||
to: epochPtr(48),
|
||||
maxRange: 1000,
|
||||
minOut: -1,
|
||||
maxOut: 48,
|
||||
},
|
||||
{
|
||||
name: "works when range is valid (nil to)",
|
||||
heaviest: 500,
|
||||
from: epochPtr(0),
|
||||
to: nil,
|
||||
maxRange: 1000,
|
||||
minOut: 0,
|
||||
maxOut: -1,
|
||||
},
|
||||
{
|
||||
name: "works when range is valid (nil from and to)",
|
||||
heaviest: 500,
|
||||
from: nil,
|
||||
to: nil,
|
||||
maxRange: 1000,
|
||||
minOut: -1,
|
||||
maxOut: -1,
|
||||
},
|
||||
{
|
||||
name: "works when range is valid and specified",
|
||||
heaviest: 500,
|
||||
from: epochPtr(16),
|
||||
to: epochPtr(48),
|
||||
maxRange: 1000,
|
||||
minOut: 16,
|
||||
maxOut: 48,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range testCases {
|
||||
tc := tc
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
req := require.New(t)
|
||||
min, max, err := parseHeightRange(tc.heaviest, tc.from, tc.to, tc.maxRange)
|
||||
req.Equal(tc.minOut, min)
|
||||
req.Equal(tc.maxOut, max)
|
||||
if tc.errStr != "" {
|
||||
t.Log(err)
|
||||
req.Error(err)
|
||||
req.Contains(err.Error(), tc.errStr)
|
||||
} else {
|
||||
req.NoError(err)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestGetActorEvents(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
req := require.New(t)
|
||||
|
||||
const (
|
||||
seed = 984651320
|
||||
maxFilterHeightRange = 100
|
||||
)
|
||||
|
||||
t.Logf("seed: %d", seed)
|
||||
rng := pseudo.New(pseudo.NewSource(seed))
|
||||
|
||||
minerAddr, err := address.NewIDAddress(uint64(rng.Int63()))
|
||||
req.NoError(err)
|
||||
|
||||
testCases := []struct {
|
||||
name string
|
||||
filter *types.ActorEventFilter
|
||||
currentHeight int64
|
||||
installMinHeight int64
|
||||
installMaxHeight int64
|
||||
installTipSetKey cid.Cid
|
||||
installAddresses []address.Address
|
||||
installKeysWithCodec map[string][]types.ActorEventBlock
|
||||
installExcludeReverted bool
|
||||
expectErr string
|
||||
}{
|
||||
{
|
||||
name: "nil filter",
|
||||
filter: nil,
|
||||
installMinHeight: -1,
|
||||
installMaxHeight: -1,
|
||||
},
|
||||
{
|
||||
name: "empty filter",
|
||||
filter: &types.ActorEventFilter{},
|
||||
installMinHeight: -1,
|
||||
installMaxHeight: -1,
|
||||
},
|
||||
{
|
||||
name: "basic height range filter",
|
||||
filter: &types.ActorEventFilter{
|
||||
FromHeight: epochPtr(0),
|
||||
ToHeight: epochPtr(maxFilterHeightRange),
|
||||
},
|
||||
installMinHeight: 0,
|
||||
installMaxHeight: maxFilterHeightRange,
|
||||
},
|
||||
{
|
||||
name: "from, no to height",
|
||||
filter: &types.ActorEventFilter{
|
||||
FromHeight: epochPtr(0),
|
||||
},
|
||||
currentHeight: maxFilterHeightRange - 1,
|
||||
installMinHeight: 0,
|
||||
installMaxHeight: -1,
|
||||
},
|
||||
{
|
||||
name: "to, no from height",
|
||||
filter: &types.ActorEventFilter{
|
||||
ToHeight: epochPtr(maxFilterHeightRange - 1),
|
||||
},
|
||||
installMinHeight: -1,
|
||||
installMaxHeight: maxFilterHeightRange - 1,
|
||||
},
|
||||
{
|
||||
name: "from, no to height, too far",
|
||||
filter: &types.ActorEventFilter{
|
||||
FromHeight: epochPtr(0),
|
||||
},
|
||||
currentHeight: maxFilterHeightRange + 1,
|
||||
expectErr: "invalid epoch range: 'from' height is too far in the past",
|
||||
},
|
||||
{
|
||||
name: "to, no from height, too far",
|
||||
filter: &types.ActorEventFilter{
|
||||
ToHeight: epochPtr(maxFilterHeightRange + 1),
|
||||
},
|
||||
currentHeight: 0,
|
||||
expectErr: "invalid epoch range: 'to' height is too far in the future",
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range testCases {
|
||||
tc := tc
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
efm := newMockEventFilterManager(t)
|
||||
collectedEvents := makeCollectedEvents(t, rng, 0, 1, 10)
|
||||
filter := newMockFilter(ctx, t, rng, collectedEvents)
|
||||
|
||||
if tc.expectErr == "" {
|
||||
efm.expectInstall(abi.ChainEpoch(tc.installMinHeight), abi.ChainEpoch(tc.installMaxHeight), tc.installTipSetKey, tc.installAddresses, tc.installKeysWithCodec, tc.installExcludeReverted, filter)
|
||||
}
|
||||
|
||||
ts, err := types.NewTipSet([]*types.BlockHeader{newBlockHeader(minerAddr, tc.currentHeight)})
|
||||
req.NoError(err)
|
||||
chain := newMockChainAccessor(t, ts)
|
||||
|
||||
handler := NewActorEventHandler(chain, efm, 50*time.Millisecond, maxFilterHeightRange)
|
||||
|
||||
gotEvents, err := handler.GetActorEvents(ctx, tc.filter)
|
||||
if tc.expectErr != "" {
|
||||
req.Error(err)
|
||||
req.Contains(err.Error(), tc.expectErr)
|
||||
} else {
|
||||
req.NoError(err)
|
||||
expectedEvents := collectedToActorEvents(collectedEvents)
|
||||
req.Equal(expectedEvents, gotEvents)
|
||||
efm.requireRemoved(filter.ID())
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestSubscribeActorEvents(t *testing.T) {
|
||||
const (
|
||||
seed = 984651320
|
||||
maxFilterHeightRange = 100
|
||||
blockDelay = 30 * time.Second
|
||||
filterStartHeight = 0
|
||||
currentHeight = 10
|
||||
finishHeight = 20
|
||||
eventsPerEpoch = 2
|
||||
)
|
||||
t.Logf("seed: %d", seed)
|
||||
rng := pseudo.New(pseudo.NewSource(seed))
|
||||
mockClock := clock.NewMock()
|
||||
|
||||
minerAddr, err := address.NewIDAddress(uint64(rng.Int63()))
|
||||
require.NoError(t, err)
|
||||
|
||||
for _, tc := range []struct {
|
||||
name string
|
||||
receiveSpeed time.Duration // how fast will we receive all events _per epoch_
|
||||
expectComplete bool // do we expect this to succeed?
|
||||
endEpoch int // -1 for no end
|
||||
}{
|
||||
{"fast", 0, true, -1},
|
||||
{"fast with end", 0, true, finishHeight},
|
||||
{"half block speed", blockDelay / 2, true, -1},
|
||||
{"half block speed with end", blockDelay / 2, true, finishHeight},
|
||||
// testing exactly blockDelay is a border case and will be flaky
|
||||
{"1.5 block speed", blockDelay * 3 / 2, false, -1},
|
||||
{"twice block speed", blockDelay * 2, false, -1},
|
||||
} {
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
|
||||
defer cancel()
|
||||
|
||||
tc := tc
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
req := require.New(t)
|
||||
|
||||
mockClock.Set(time.Now())
|
||||
mockFilterManager := newMockEventFilterManager(t)
|
||||
allEvents := makeCollectedEvents(t, rng, filterStartHeight, eventsPerEpoch, finishHeight)
|
||||
historicalEvents := allEvents[0 : (currentHeight-filterStartHeight)*eventsPerEpoch]
|
||||
mockFilter := newMockFilter(ctx, t, rng, historicalEvents)
|
||||
mockFilterManager.expectInstall(abi.ChainEpoch(0), abi.ChainEpoch(tc.endEpoch), cid.Undef, nil, nil, false, mockFilter)
|
||||
|
||||
ts, err := types.NewTipSet([]*types.BlockHeader{newBlockHeader(minerAddr, currentHeight)})
|
||||
req.NoError(err)
|
||||
mockChain := newMockChainAccessor(t, ts)
|
||||
|
||||
handler := NewActorEventHandlerWithClock(mockChain, mockFilterManager, blockDelay, maxFilterHeightRange, mockClock)
|
||||
|
||||
aef := &types.ActorEventFilter{FromHeight: epochPtr(0)}
|
||||
if tc.endEpoch >= 0 {
|
||||
aef.ToHeight = epochPtr(tc.endEpoch)
|
||||
}
|
||||
eventChan, err := handler.SubscribeActorEvents(ctx, aef)
|
||||
req.NoError(err)
|
||||
|
||||
// assume we can cleanly pick up all historical events in one go
|
||||
var gotEvents []*types.ActorEvent
|
||||
for len(gotEvents) < len(historicalEvents) && ctx.Err() == nil {
|
||||
select {
|
||||
case e, ok := <-eventChan:
|
||||
req.True(ok)
|
||||
gotEvents = append(gotEvents, e)
|
||||
case <-ctx.Done():
|
||||
t.Fatalf("timed out waiting for event")
|
||||
}
|
||||
}
|
||||
req.Equal(collectedToActorEvents(historicalEvents), gotEvents)
|
||||
|
||||
mockClock.Add(blockDelay)
|
||||
nextReceiveTime := mockClock.Now()
|
||||
|
||||
// Ticker to simulate both time and the chain advancing, including emitting events at
|
||||
// the right time directly to the filter.
|
||||
|
||||
var wg sync.WaitGroup
|
||||
wg.Add(1)
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
for thisHeight := int64(currentHeight); ctx.Err() == nil; thisHeight++ {
|
||||
ts, err := types.NewTipSet([]*types.BlockHeader{newBlockHeader(minerAddr, thisHeight)})
|
||||
req.NoError(err)
|
||||
mockChain.setHeaviestTipSet(ts)
|
||||
|
||||
var eventsThisEpoch []*filter.CollectedEvent
|
||||
if thisHeight <= finishHeight {
|
||||
eventsThisEpoch = allEvents[(thisHeight-filterStartHeight)*eventsPerEpoch : (thisHeight-filterStartHeight+2)*eventsPerEpoch]
|
||||
}
|
||||
for i := 0; i < eventsPerEpoch && ctx.Err() == nil; i++ {
|
||||
if len(eventsThisEpoch) > 0 {
|
||||
mockFilter.sendEventToChannel(eventsThisEpoch[0])
|
||||
eventsThisEpoch = eventsThisEpoch[1:]
|
||||
}
|
||||
select {
|
||||
case <-time.After(2 * time.Millisecond): // allow everyone to catch a breath
|
||||
mockClock.Add(blockDelay / eventsPerEpoch)
|
||||
case <-ctx.Done():
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if thisHeight == finishHeight+1 && tc.expectComplete && tc.endEpoch < 0 && ctx.Err() == nil {
|
||||
// at finish+1, for the case where we expect clean completion and there is no ToEpoch
|
||||
// set on the filter, if we send one more event at the next height so we end up with
|
||||
// something uncollected in the buffer, causing a disconnect
|
||||
evt := makeCollectedEvents(t, rng, finishHeight+1, 1, finishHeight+1)[0]
|
||||
mockFilter.sendEventToChannel(evt)
|
||||
} // else if endEpoch is set, we expect the chain advance to force closure
|
||||
}
|
||||
}()
|
||||
|
||||
// Client collecting events off the channel
|
||||
|
||||
var prematureEnd bool
|
||||
for thisHeight := int64(currentHeight); thisHeight <= finishHeight && !prematureEnd && ctx.Err() == nil; thisHeight++ {
|
||||
// delay to simulate latency
|
||||
select {
|
||||
case <-mockClock.After(nextReceiveTime.Sub(mockClock.Now())):
|
||||
case <-ctx.Done():
|
||||
t.Fatalf("timed out simulating receive delay")
|
||||
}
|
||||
|
||||
// collect eventsPerEpoch more events
|
||||
var newEvents []*types.ActorEvent
|
||||
for len(newEvents) < eventsPerEpoch && !prematureEnd && ctx.Err() == nil {
|
||||
select {
|
||||
case e, ok := <-eventChan: // receive the events from the subscription
|
||||
if ok {
|
||||
newEvents = append(newEvents, e)
|
||||
} else {
|
||||
prematureEnd = true
|
||||
}
|
||||
case <-ctx.Done():
|
||||
t.Fatalf("timed out waiting for event")
|
||||
}
|
||||
nextReceiveTime = nextReceiveTime.Add(tc.receiveSpeed)
|
||||
}
|
||||
|
||||
if tc.expectComplete || !prematureEnd {
|
||||
// sanity check that we got what we expected this epoch
|
||||
req.Len(newEvents, eventsPerEpoch)
|
||||
epochEvents := allEvents[(thisHeight)*eventsPerEpoch : (thisHeight+1)*eventsPerEpoch]
|
||||
req.Equal(collectedToActorEvents(epochEvents), newEvents)
|
||||
gotEvents = append(gotEvents, newEvents...)
|
||||
}
|
||||
}
|
||||
|
||||
req.Equal(tc.expectComplete, !prematureEnd, "expected to complete")
|
||||
if tc.expectComplete {
|
||||
req.Len(gotEvents, len(allEvents))
|
||||
req.Equal(collectedToActorEvents(allEvents), gotEvents)
|
||||
} else {
|
||||
req.NotEqual(len(gotEvents), len(allEvents))
|
||||
}
|
||||
|
||||
// cleanup
|
||||
mockFilter.requireClearSubChannelCalledEventually(500 * time.Millisecond)
|
||||
mockFilterManager.requireRemovedEventually(mockFilter.ID(), 500*time.Millisecond)
|
||||
cancel()
|
||||
wg.Wait() // wait for the chain to stop advancing
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestSubscribeActorEvents_OnlyHistorical(t *testing.T) {
|
||||
// Similar to TestSubscribeActorEvents but we set an explicit end that caps out at the current height
|
||||
const (
|
||||
seed = 984651320
|
||||
maxFilterHeightRange = 100
|
||||
blockDelay = 30 * time.Second
|
||||
filterStartHeight = 0
|
||||
currentHeight = 10
|
||||
eventsPerEpoch = 2
|
||||
)
|
||||
t.Logf("seed: %d", seed)
|
||||
rng := pseudo.New(pseudo.NewSource(seed))
|
||||
mockClock := clock.NewMock()
|
||||
|
||||
minerAddr, err := address.NewIDAddress(uint64(rng.Int63()))
|
||||
require.NoError(t, err)
|
||||
|
||||
for _, tc := range []struct {
|
||||
name string
|
||||
blockTimeToComplete float64 // fraction of a block time that it takes to receive all events
|
||||
expectComplete bool // do we expect this to succeed?
|
||||
}{
|
||||
{"fast", 0, true},
|
||||
{"half block speed", 0.5, true},
|
||||
{"1.5 block speed", 1.5, false},
|
||||
{"twice block speed", 2, false},
|
||||
} {
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
|
||||
defer cancel()
|
||||
|
||||
tc := tc
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
req := require.New(t)
|
||||
|
||||
mockClock.Set(time.Now())
|
||||
mockFilterManager := newMockEventFilterManager(t)
|
||||
allEvents := makeCollectedEvents(t, rng, filterStartHeight, eventsPerEpoch, currentHeight)
|
||||
mockFilter := newMockFilter(ctx, t, rng, allEvents)
|
||||
mockFilterManager.expectInstall(abi.ChainEpoch(0), abi.ChainEpoch(currentHeight), cid.Undef, nil, nil, false, mockFilter)
|
||||
|
||||
ts, err := types.NewTipSet([]*types.BlockHeader{newBlockHeader(minerAddr, currentHeight)})
|
||||
req.NoError(err)
|
||||
mockChain := newMockChainAccessor(t, ts)
|
||||
|
||||
handler := NewActorEventHandlerWithClock(mockChain, mockFilterManager, blockDelay, maxFilterHeightRange, mockClock)
|
||||
|
||||
aef := &types.ActorEventFilter{FromHeight: epochPtr(0), ToHeight: epochPtr(currentHeight)}
|
||||
eventChan, err := handler.SubscribeActorEvents(ctx, aef)
|
||||
req.NoError(err)
|
||||
|
||||
var gotEvents []*types.ActorEvent
|
||||
|
||||
// assume we can cleanly pick up all historical events in one go
|
||||
receiveLoop:
|
||||
for ctx.Err() == nil {
|
||||
select {
|
||||
case e, ok := <-eventChan:
|
||||
if ok {
|
||||
gotEvents = append(gotEvents, e)
|
||||
mockClock.Add(time.Duration(float64(blockDelay) * tc.blockTimeToComplete / float64(len(allEvents))))
|
||||
// no need to advance the chain, we're also testing that's not necessary
|
||||
time.Sleep(2 * time.Millisecond) // catch a breath
|
||||
} else {
|
||||
break receiveLoop
|
||||
}
|
||||
case <-ctx.Done():
|
||||
t.Fatalf("timed out waiting for event, got %d/%d events", len(gotEvents), len(allEvents))
|
||||
}
|
||||
}
|
||||
if tc.expectComplete {
|
||||
req.Equal(collectedToActorEvents(allEvents), gotEvents)
|
||||
} else {
|
||||
req.NotEqual(len(gotEvents), len(allEvents))
|
||||
}
|
||||
// advance the chain and observe cleanup
|
||||
ts, err = types.NewTipSet([]*types.BlockHeader{newBlockHeader(minerAddr, currentHeight+1)})
|
||||
req.NoError(err)
|
||||
mockChain.setHeaviestTipSet(ts)
|
||||
mockClock.Add(blockDelay)
|
||||
mockFilterManager.requireRemovedEventually(mockFilter.ID(), 1*time.Second)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
var (
|
||||
_ ChainAccessor = (*mockChainAccessor)(nil)
|
||||
_ filter.EventFilter = (*mockFilter)(nil)
|
||||
_ EventFilterManager = (*mockEventFilterManager)(nil)
|
||||
)
|
||||
|
||||
type mockChainAccessor struct {
|
||||
t *testing.T
|
||||
ts *types.TipSet
|
||||
lk sync.Mutex
|
||||
}
|
||||
|
||||
func newMockChainAccessor(t *testing.T, ts *types.TipSet) *mockChainAccessor {
|
||||
return &mockChainAccessor{t: t, ts: ts}
|
||||
}
|
||||
|
||||
func (m *mockChainAccessor) setHeaviestTipSet(ts *types.TipSet) {
|
||||
m.lk.Lock()
|
||||
defer m.lk.Unlock()
|
||||
m.ts = ts
|
||||
}
|
||||
|
||||
func (m *mockChainAccessor) GetHeaviestTipSet() *types.TipSet {
|
||||
m.lk.Lock()
|
||||
defer m.lk.Unlock()
|
||||
return m.ts
|
||||
}
|
||||
|
||||
type mockFilter struct {
|
||||
t *testing.T
|
||||
ctx context.Context
|
||||
id types.FilterID
|
||||
lastTaken time.Time
|
||||
ch chan<- interface{}
|
||||
historicalEvents []*filter.CollectedEvent
|
||||
subChannelCalls int
|
||||
clearSubChannelCalls int
|
||||
lk sync.Mutex
|
||||
}
|
||||
|
||||
func newMockFilter(ctx context.Context, t *testing.T, rng *pseudo.Rand, historicalEvents []*filter.CollectedEvent) *mockFilter {
|
||||
t.Helper()
|
||||
var id [32]byte
|
||||
_, err := rng.Read(id[:])
|
||||
require.NoError(t, err)
|
||||
return &mockFilter{
|
||||
t: t,
|
||||
ctx: ctx,
|
||||
id: id,
|
||||
historicalEvents: historicalEvents,
|
||||
}
|
||||
}
|
||||
|
||||
func (m *mockFilter) sendEventToChannel(e *filter.CollectedEvent) {
|
||||
m.lk.Lock()
|
||||
defer m.lk.Unlock()
|
||||
if m.ch != nil {
|
||||
select {
|
||||
case m.ch <- e:
|
||||
case <-m.ctx.Done():
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (m *mockFilter) requireClearSubChannelCalledEventually(timeout time.Duration) {
|
||||
m.t.Helper()
|
||||
require.Eventually(m.t,
|
||||
func() bool {
|
||||
m.lk.Lock()
|
||||
c := m.clearSubChannelCalls
|
||||
m.lk.Unlock()
|
||||
switch c {
|
||||
case 0:
|
||||
return false
|
||||
case 1:
|
||||
return true
|
||||
default:
|
||||
m.t.Fatalf("ClearSubChannel called more than once: %d", c)
|
||||
return false
|
||||
}
|
||||
}, timeout, 10*time.Millisecond, "ClearSubChannel is not called exactly once")
|
||||
}
|
||||
|
||||
func (m *mockFilter) ID() types.FilterID {
|
||||
return m.id
|
||||
}
|
||||
|
||||
func (m *mockFilter) LastTaken() time.Time {
|
||||
return m.lastTaken
|
||||
}
|
||||
|
||||
func (m *mockFilter) SetSubChannel(ch chan<- interface{}) {
|
||||
m.t.Helper()
|
||||
m.lk.Lock()
|
||||
defer m.lk.Unlock()
|
||||
m.subChannelCalls++
|
||||
m.ch = ch
|
||||
}
|
||||
|
||||
func (m *mockFilter) ClearSubChannel() {
|
||||
m.t.Helper()
|
||||
m.lk.Lock()
|
||||
defer m.lk.Unlock()
|
||||
m.clearSubChannelCalls++
|
||||
m.ch = nil
|
||||
}
|
||||
|
||||
func (m *mockFilter) TakeCollectedEvents(context.Context) []*filter.CollectedEvent {
|
||||
e := m.historicalEvents
|
||||
m.historicalEvents = nil
|
||||
m.lastTaken = time.Now()
|
||||
return e
|
||||
}
|
||||
|
||||
func (m *mockFilter) CollectEvents(context.Context, *filter.TipSetEvents, bool, filter.AddressResolver) error {
|
||||
m.t.Fatalf("unexpected call to CollectEvents")
|
||||
return nil
|
||||
}
|
||||
|
||||
type filterManagerExpectation struct {
|
||||
minHeight, maxHeight abi.ChainEpoch
|
||||
tipsetCid cid.Cid
|
||||
addresses []address.Address
|
||||
keysWithCodec map[string][]types.ActorEventBlock
|
||||
excludeReverted bool
|
||||
returnFilter filter.EventFilter
|
||||
}
|
||||
|
||||
type mockEventFilterManager struct {
|
||||
t *testing.T
|
||||
expectations []filterManagerExpectation
|
||||
removed []types.FilterID
|
||||
lk sync.Mutex
|
||||
}
|
||||
|
||||
func newMockEventFilterManager(t *testing.T) *mockEventFilterManager {
|
||||
return &mockEventFilterManager{t: t}
|
||||
}
|
||||
|
||||
func (m *mockEventFilterManager) expectInstall(
|
||||
minHeight, maxHeight abi.ChainEpoch,
|
||||
tipsetCid cid.Cid,
|
||||
addresses []address.Address,
|
||||
keysWithCodec map[string][]types.ActorEventBlock,
|
||||
excludeReverted bool,
|
||||
returnFilter filter.EventFilter) {
|
||||
|
||||
m.t.Helper()
|
||||
m.expectations = append(m.expectations, filterManagerExpectation{
|
||||
minHeight: minHeight,
|
||||
maxHeight: maxHeight,
|
||||
tipsetCid: tipsetCid,
|
||||
addresses: addresses,
|
||||
keysWithCodec: keysWithCodec,
|
||||
excludeReverted: excludeReverted,
|
||||
returnFilter: returnFilter,
|
||||
})
|
||||
}
|
||||
|
||||
func (m *mockEventFilterManager) requireRemoved(id types.FilterID) {
|
||||
m.t.Helper()
|
||||
m.lk.Lock()
|
||||
defer m.lk.Unlock()
|
||||
require.Contains(m.t, m.removed, id)
|
||||
}
|
||||
|
||||
func (m *mockEventFilterManager) requireRemovedEventually(id types.FilterID, timeout time.Duration) {
|
||||
m.t.Helper()
|
||||
require.Eventuallyf(m.t, func() bool {
|
||||
m.lk.Lock()
|
||||
defer m.lk.Unlock()
|
||||
if len(m.removed) == 0 {
|
||||
return false
|
||||
}
|
||||
assert.Contains(m.t, m.removed, id)
|
||||
return true
|
||||
}, timeout, 10*time.Millisecond, "filter %x not removed", id)
|
||||
}
|
||||
|
||||
func (m *mockEventFilterManager) Install(
|
||||
_ context.Context,
|
||||
minHeight, maxHeight abi.ChainEpoch,
|
||||
tipsetCid cid.Cid,
|
||||
addresses []address.Address,
|
||||
keysWithCodec map[string][]types.ActorEventBlock,
|
||||
excludeReverted bool,
|
||||
) (filter.EventFilter, error) {
|
||||
|
||||
require.True(m.t, len(m.expectations) > 0, "unexpected call to Install")
|
||||
exp := m.expectations[0]
|
||||
m.expectations = m.expectations[1:]
|
||||
// check the expectation matches the call then return the attached filter
|
||||
require.Equal(m.t, exp.minHeight, minHeight)
|
||||
require.Equal(m.t, exp.maxHeight, maxHeight)
|
||||
require.Equal(m.t, exp.tipsetCid, tipsetCid)
|
||||
require.Equal(m.t, exp.addresses, addresses)
|
||||
require.Equal(m.t, exp.keysWithCodec, keysWithCodec)
|
||||
require.Equal(m.t, exp.excludeReverted, excludeReverted)
|
||||
return exp.returnFilter, nil
|
||||
}
|
||||
|
||||
func (m *mockEventFilterManager) Remove(_ context.Context, id types.FilterID) error {
|
||||
m.lk.Lock()
|
||||
defer m.lk.Unlock()
|
||||
m.removed = append(m.removed, id)
|
||||
return nil
|
||||
}
|
||||
|
||||
func newBlockHeader(minerAddr address.Address, height int64) *types.BlockHeader {
|
||||
return &types.BlockHeader{
|
||||
Miner: minerAddr,
|
||||
Ticket: &types.Ticket{
|
||||
VRFProof: []byte("vrf proof0000000vrf proof0000000"),
|
||||
},
|
||||
ElectionProof: &types.ElectionProof{
|
||||
VRFProof: []byte("vrf proof0000000vrf proof0000000"),
|
||||
},
|
||||
Parents: []cid.Cid{testCid, testCid},
|
||||
ParentMessageReceipts: testCid,
|
||||
BLSAggregate: &crypto.Signature{Type: crypto.SigTypeBLS, Data: []byte("sign me up")},
|
||||
ParentWeight: types.NewInt(123125126212),
|
||||
Messages: testCid,
|
||||
Height: abi.ChainEpoch(height),
|
||||
ParentStateRoot: testCid,
|
||||
BlockSig: &crypto.Signature{Type: crypto.SigTypeBLS, Data: []byte("sign me up")},
|
||||
ParentBaseFee: types.NewInt(3432432843291),
|
||||
}
|
||||
}
|
||||
|
||||
func epochPtr(i int) *abi.ChainEpoch {
|
||||
e := abi.ChainEpoch(i)
|
||||
return &e
|
||||
}
|
||||
|
||||
func collectedToActorEvents(collected []*filter.CollectedEvent) []*types.ActorEvent {
|
||||
var out []*types.ActorEvent
|
||||
for _, c := range collected {
|
||||
out = append(out, &types.ActorEvent{
|
||||
Entries: c.Entries,
|
||||
Emitter: c.EmitterAddr,
|
||||
Reverted: c.Reverted,
|
||||
Height: c.Height,
|
||||
TipSetKey: c.TipSetKey,
|
||||
MsgCid: c.MsgCid,
|
||||
})
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func makeCollectedEvents(t *testing.T, rng *pseudo.Rand, eventStartHeight, eventsPerHeight, eventEndHeight int64) []*filter.CollectedEvent {
|
||||
var out []*filter.CollectedEvent
|
||||
for h := eventStartHeight; h <= eventEndHeight; h++ {
|
||||
for i := int64(0); i < eventsPerHeight; i++ {
|
||||
out = append(out, makeCollectedEvent(t, rng, types.NewTipSetKey(mkCid(t, fmt.Sprintf("h=%d", h))), abi.ChainEpoch(h)))
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func makeCollectedEvent(t *testing.T, rng *pseudo.Rand, tsKey types.TipSetKey, height abi.ChainEpoch) *filter.CollectedEvent {
|
||||
addr, err := address.NewIDAddress(uint64(rng.Int63()))
|
||||
require.NoError(t, err)
|
||||
|
||||
return &filter.CollectedEvent{
|
||||
Entries: []types.EventEntry{
|
||||
{Flags: 0x01, Key: "k1", Codec: cid.Raw, Value: []byte("v1")},
|
||||
{Flags: 0x01, Key: "k2", Codec: cid.Raw, Value: []byte("v2")},
|
||||
},
|
||||
EmitterAddr: addr,
|
||||
EventIdx: 0,
|
||||
Reverted: false,
|
||||
Height: height,
|
||||
TipSetKey: tsKey,
|
||||
MsgIdx: 0,
|
||||
MsgCid: testCid,
|
||||
}
|
||||
}
|
||||
|
||||
func mkCid(t *testing.T, s string) cid.Cid {
|
||||
h, err := multihash.Sum([]byte(s), multihash.SHA2_256, -1)
|
||||
require.NoError(t, err)
|
||||
return cid.NewCidV1(cid.Raw, h)
|
||||
}
|
||||
@@ -11,6 +11,7 @@ import (
|
||||
"github.com/filecoin-project/go-state-types/abi"
|
||||
|
||||
"github.com/filecoin-project/lotus/api"
|
||||
"github.com/filecoin-project/lotus/chain/types"
|
||||
"github.com/filecoin-project/lotus/chain/types/ethtypes"
|
||||
)
|
||||
|
||||
@@ -188,3 +189,17 @@ func (e *EthModuleDummy) EthTraceReplayBlockTransactions(ctx context.Context, bl
|
||||
|
||||
var _ EthModuleAPI = &EthModuleDummy{}
|
||||
var _ EthEventAPI = &EthModuleDummy{}
|
||||
|
||||
var ErrActorEventModuleDisabled = errors.New("module disabled, enable with Events.EnableActorEventsAPI")
|
||||
|
||||
type ActorEventDummy struct{}
|
||||
|
||||
func (a *ActorEventDummy) GetActorEvents(ctx context.Context, filter *types.ActorEventFilter) ([]*types.ActorEvent, error) {
|
||||
return nil, ErrActorEventModuleDisabled
|
||||
}
|
||||
|
||||
func (a *ActorEventDummy) SubscribeActorEvents(ctx context.Context, filter *types.ActorEventFilter) (<-chan *types.ActorEvent, error) {
|
||||
return nil, ErrActorEventModuleDisabled
|
||||
}
|
||||
|
||||
var _ ActorEventAPI = &ActorEventDummy{}
|
||||
|
||||
+93
-74
@@ -12,6 +12,7 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/ipfs/go-cid"
|
||||
"github.com/multiformats/go-multicodec"
|
||||
cbg "github.com/whyrusleeping/cbor-gen"
|
||||
"go.uber.org/fx"
|
||||
"golang.org/x/xerrors"
|
||||
@@ -136,7 +137,7 @@ type EthModule struct {
|
||||
|
||||
var _ EthModuleAPI = (*EthModule)(nil)
|
||||
|
||||
type EthEvent struct {
|
||||
type EthEventHandler struct {
|
||||
Chain *store.ChainStore
|
||||
EventFilterManager *filter.EventFilterManager
|
||||
TipSetFilterManager *filter.TipSetFilterManager
|
||||
@@ -147,7 +148,7 @@ type EthEvent struct {
|
||||
SubscribtionCtx context.Context
|
||||
}
|
||||
|
||||
var _ EthEventAPI = (*EthEvent)(nil)
|
||||
var _ EthEventAPI = (*EthEventHandler)(nil)
|
||||
|
||||
type EthAPI struct {
|
||||
fx.In
|
||||
@@ -1203,7 +1204,7 @@ func (a *EthModule) EthCall(ctx context.Context, tx ethtypes.EthCall, blkParam e
|
||||
return ethtypes.EthBytes{}, nil
|
||||
}
|
||||
|
||||
func (e *EthEvent) EthGetLogs(ctx context.Context, filterSpec *ethtypes.EthFilterSpec) (*ethtypes.EthFilterResult, error) {
|
||||
func (e *EthEventHandler) EthGetLogs(ctx context.Context, filterSpec *ethtypes.EthFilterSpec) (*ethtypes.EthFilterResult, error) {
|
||||
if e.EventFilterManager == nil {
|
||||
return nil, api.ErrNotSupported
|
||||
}
|
||||
@@ -1220,7 +1221,7 @@ func (e *EthEvent) EthGetLogs(ctx context.Context, filterSpec *ethtypes.EthFilte
|
||||
return ethFilterResultFromEvents(ctx, ces, e.SubManager.StateAPI)
|
||||
}
|
||||
|
||||
func (e *EthEvent) EthGetFilterChanges(ctx context.Context, id ethtypes.EthFilterID) (*ethtypes.EthFilterResult, error) {
|
||||
func (e *EthEventHandler) EthGetFilterChanges(ctx context.Context, id ethtypes.EthFilterID) (*ethtypes.EthFilterResult, error) {
|
||||
if e.FilterStore == nil {
|
||||
return nil, api.ErrNotSupported
|
||||
}
|
||||
@@ -1242,7 +1243,7 @@ func (e *EthEvent) EthGetFilterChanges(ctx context.Context, id ethtypes.EthFilte
|
||||
return nil, xerrors.Errorf("unknown filter type")
|
||||
}
|
||||
|
||||
func (e *EthEvent) EthGetFilterLogs(ctx context.Context, id ethtypes.EthFilterID) (*ethtypes.EthFilterResult, error) {
|
||||
func (e *EthEventHandler) EthGetFilterLogs(ctx context.Context, id ethtypes.EthFilterID) (*ethtypes.EthFilterResult, error) {
|
||||
if e.FilterStore == nil {
|
||||
return nil, api.ErrNotSupported
|
||||
}
|
||||
@@ -1260,7 +1261,65 @@ func (e *EthEvent) EthGetFilterLogs(ctx context.Context, id ethtypes.EthFilterID
|
||||
return nil, xerrors.Errorf("wrong filter type")
|
||||
}
|
||||
|
||||
func (e *EthEvent) installEthFilterSpec(ctx context.Context, filterSpec *ethtypes.EthFilterSpec) (*filter.EventFilter, error) {
|
||||
// parseBlockRange is similar to actor event's parseHeightRange but with slightly different semantics
|
||||
//
|
||||
// * "block" instead of "height"
|
||||
// * strings that can have "latest" and "earliest" and nil
|
||||
// * hex strings for actual heights
|
||||
func parseBlockRange(heaviest abi.ChainEpoch, fromBlock, toBlock *string, maxRange abi.ChainEpoch) (minHeight abi.ChainEpoch, maxHeight abi.ChainEpoch, err error) {
|
||||
if fromBlock == nil || *fromBlock == "latest" || len(*fromBlock) == 0 {
|
||||
minHeight = heaviest
|
||||
} else if *fromBlock == "earliest" {
|
||||
minHeight = 0
|
||||
} else {
|
||||
if !strings.HasPrefix(*fromBlock, "0x") {
|
||||
return 0, 0, xerrors.Errorf("FromBlock is not a hex")
|
||||
}
|
||||
epoch, err := ethtypes.EthUint64FromHex(*fromBlock)
|
||||
if err != nil {
|
||||
return 0, 0, xerrors.Errorf("invalid epoch")
|
||||
}
|
||||
minHeight = abi.ChainEpoch(epoch)
|
||||
}
|
||||
|
||||
if toBlock == nil || *toBlock == "latest" || len(*toBlock) == 0 {
|
||||
// here latest means the latest at the time
|
||||
maxHeight = -1
|
||||
} else if *toBlock == "earliest" {
|
||||
maxHeight = 0
|
||||
} else {
|
||||
if !strings.HasPrefix(*toBlock, "0x") {
|
||||
return 0, 0, xerrors.Errorf("ToBlock is not a hex")
|
||||
}
|
||||
epoch, err := ethtypes.EthUint64FromHex(*toBlock)
|
||||
if err != nil {
|
||||
return 0, 0, xerrors.Errorf("invalid epoch")
|
||||
}
|
||||
maxHeight = abi.ChainEpoch(epoch)
|
||||
}
|
||||
|
||||
// Validate height ranges are within limits set by node operator
|
||||
if minHeight == -1 && maxHeight > 0 {
|
||||
// Here the client is looking for events between the head and some future height
|
||||
if maxHeight-heaviest > maxRange {
|
||||
return 0, 0, xerrors.Errorf("invalid epoch range: to block is too far in the future (maximum: %d)", maxRange)
|
||||
}
|
||||
} else if minHeight >= 0 && maxHeight == -1 {
|
||||
// Here the client is looking for events between some time in the past and the current head
|
||||
if heaviest-minHeight > maxRange {
|
||||
return 0, 0, xerrors.Errorf("invalid epoch range: from block is too far in the past (maximum: %d)", maxRange)
|
||||
}
|
||||
} else if minHeight >= 0 && maxHeight >= 0 {
|
||||
if minHeight > maxHeight {
|
||||
return 0, 0, xerrors.Errorf("invalid epoch range: to block (%d) must be after from block (%d)", minHeight, maxHeight)
|
||||
} else if maxHeight-minHeight > maxRange {
|
||||
return 0, 0, xerrors.Errorf("invalid epoch range: range between to and from blocks is too large (maximum: %d)", maxRange)
|
||||
}
|
||||
}
|
||||
return minHeight, maxHeight, nil
|
||||
}
|
||||
|
||||
func (e *EthEventHandler) installEthFilterSpec(ctx context.Context, filterSpec *ethtypes.EthFilterSpec) (filter.EventFilter, error) {
|
||||
var (
|
||||
minHeight abi.ChainEpoch
|
||||
maxHeight abi.ChainEpoch
|
||||
@@ -1276,64 +1335,11 @@ func (e *EthEvent) installEthFilterSpec(ctx context.Context, filterSpec *ethtype
|
||||
|
||||
tipsetCid = filterSpec.BlockHash.ToCid()
|
||||
} else {
|
||||
if filterSpec.FromBlock == nil || *filterSpec.FromBlock == "latest" {
|
||||
ts := e.Chain.GetHeaviestTipSet()
|
||||
minHeight = ts.Height()
|
||||
} else if *filterSpec.FromBlock == "earliest" {
|
||||
minHeight = 0
|
||||
} else if *filterSpec.FromBlock == "pending" {
|
||||
return nil, api.ErrNotSupported
|
||||
} else {
|
||||
if !strings.HasPrefix(*filterSpec.FromBlock, "0x") {
|
||||
return nil, xerrors.Errorf("FromBlock is not a hex")
|
||||
}
|
||||
epoch, err := ethtypes.EthUint64FromHex(*filterSpec.FromBlock)
|
||||
if err != nil {
|
||||
return nil, xerrors.Errorf("invalid epoch")
|
||||
}
|
||||
minHeight = abi.ChainEpoch(epoch)
|
||||
var err error
|
||||
minHeight, maxHeight, err = parseBlockRange(e.Chain.GetHeaviestTipSet().Height(), filterSpec.FromBlock, filterSpec.ToBlock, e.MaxFilterHeightRange)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if filterSpec.ToBlock == nil || *filterSpec.ToBlock == "latest" {
|
||||
// here latest means the latest at the time
|
||||
maxHeight = -1
|
||||
} else if *filterSpec.ToBlock == "earliest" {
|
||||
maxHeight = 0
|
||||
} else if *filterSpec.ToBlock == "pending" {
|
||||
return nil, api.ErrNotSupported
|
||||
} else {
|
||||
if !strings.HasPrefix(*filterSpec.ToBlock, "0x") {
|
||||
return nil, xerrors.Errorf("ToBlock is not a hex")
|
||||
}
|
||||
epoch, err := ethtypes.EthUint64FromHex(*filterSpec.ToBlock)
|
||||
if err != nil {
|
||||
return nil, xerrors.Errorf("invalid epoch")
|
||||
}
|
||||
maxHeight = abi.ChainEpoch(epoch)
|
||||
}
|
||||
|
||||
// Validate height ranges are within limits set by node operator
|
||||
if minHeight == -1 && maxHeight > 0 {
|
||||
// Here the client is looking for events between the head and some future height
|
||||
ts := e.Chain.GetHeaviestTipSet()
|
||||
if maxHeight-ts.Height() > e.MaxFilterHeightRange {
|
||||
return nil, xerrors.Errorf("invalid epoch range: to block is too far in the future (maximum: %d)", e.MaxFilterHeightRange)
|
||||
}
|
||||
} else if minHeight >= 0 && maxHeight == -1 {
|
||||
// Here the client is looking for events between some time in the past and the current head
|
||||
ts := e.Chain.GetHeaviestTipSet()
|
||||
if ts.Height()-minHeight > e.MaxFilterHeightRange {
|
||||
return nil, xerrors.Errorf("invalid epoch range: from block is too far in the past (maximum: %d)", e.MaxFilterHeightRange)
|
||||
}
|
||||
|
||||
} else if minHeight >= 0 && maxHeight >= 0 {
|
||||
if minHeight > maxHeight {
|
||||
return nil, xerrors.Errorf("invalid epoch range: to block (%d) must be after from block (%d)", minHeight, maxHeight)
|
||||
} else if maxHeight-minHeight > e.MaxFilterHeightRange {
|
||||
return nil, xerrors.Errorf("invalid epoch range: range between to and from blocks is too large (maximum: %d)", e.MaxFilterHeightRange)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Convert all addresses to filecoin f4 addresses
|
||||
@@ -1350,10 +1356,23 @@ func (e *EthEvent) installEthFilterSpec(ctx context.Context, filterSpec *ethtype
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return e.EventFilterManager.Install(ctx, minHeight, maxHeight, tipsetCid, addresses, keys)
|
||||
return e.EventFilterManager.Install(ctx, minHeight, maxHeight, tipsetCid, addresses, keysToKeysWithCodec(keys), true)
|
||||
}
|
||||
|
||||
func (e *EthEvent) EthNewFilter(ctx context.Context, filterSpec *ethtypes.EthFilterSpec) (ethtypes.EthFilterID, error) {
|
||||
func keysToKeysWithCodec(keys map[string][][]byte) map[string][]types.ActorEventBlock {
|
||||
keysWithCodec := make(map[string][]types.ActorEventBlock)
|
||||
for k, v := range keys {
|
||||
for _, vv := range v {
|
||||
keysWithCodec[k] = append(keysWithCodec[k], types.ActorEventBlock{
|
||||
Codec: uint64(multicodec.Raw), // FEVM smart contract events are always encoded with the `raw` Codec.
|
||||
Value: vv,
|
||||
})
|
||||
}
|
||||
}
|
||||
return keysWithCodec
|
||||
}
|
||||
|
||||
func (e *EthEventHandler) EthNewFilter(ctx context.Context, filterSpec *ethtypes.EthFilterSpec) (ethtypes.EthFilterID, error) {
|
||||
if e.FilterStore == nil || e.EventFilterManager == nil {
|
||||
return ethtypes.EthFilterID{}, api.ErrNotSupported
|
||||
}
|
||||
@@ -1375,7 +1394,7 @@ func (e *EthEvent) EthNewFilter(ctx context.Context, filterSpec *ethtypes.EthFil
|
||||
return ethtypes.EthFilterID(f.ID()), nil
|
||||
}
|
||||
|
||||
func (e *EthEvent) EthNewBlockFilter(ctx context.Context) (ethtypes.EthFilterID, error) {
|
||||
func (e *EthEventHandler) EthNewBlockFilter(ctx context.Context) (ethtypes.EthFilterID, error) {
|
||||
if e.FilterStore == nil || e.TipSetFilterManager == nil {
|
||||
return ethtypes.EthFilterID{}, api.ErrNotSupported
|
||||
}
|
||||
@@ -1398,7 +1417,7 @@ func (e *EthEvent) EthNewBlockFilter(ctx context.Context) (ethtypes.EthFilterID,
|
||||
return ethtypes.EthFilterID(f.ID()), nil
|
||||
}
|
||||
|
||||
func (e *EthEvent) EthNewPendingTransactionFilter(ctx context.Context) (ethtypes.EthFilterID, error) {
|
||||
func (e *EthEventHandler) EthNewPendingTransactionFilter(ctx context.Context) (ethtypes.EthFilterID, error) {
|
||||
if e.FilterStore == nil || e.MemPoolFilterManager == nil {
|
||||
return ethtypes.EthFilterID{}, api.ErrNotSupported
|
||||
}
|
||||
@@ -1421,7 +1440,7 @@ func (e *EthEvent) EthNewPendingTransactionFilter(ctx context.Context) (ethtypes
|
||||
return ethtypes.EthFilterID(f.ID()), nil
|
||||
}
|
||||
|
||||
func (e *EthEvent) EthUninstallFilter(ctx context.Context, id ethtypes.EthFilterID) (bool, error) {
|
||||
func (e *EthEventHandler) EthUninstallFilter(ctx context.Context, id ethtypes.EthFilterID) (bool, error) {
|
||||
if e.FilterStore == nil {
|
||||
return false, api.ErrNotSupported
|
||||
}
|
||||
@@ -1441,9 +1460,9 @@ func (e *EthEvent) EthUninstallFilter(ctx context.Context, id ethtypes.EthFilter
|
||||
return true, nil
|
||||
}
|
||||
|
||||
func (e *EthEvent) uninstallFilter(ctx context.Context, f filter.Filter) error {
|
||||
func (e *EthEventHandler) uninstallFilter(ctx context.Context, f filter.Filter) error {
|
||||
switch f.(type) {
|
||||
case *filter.EventFilter:
|
||||
case filter.EventFilter:
|
||||
err := e.EventFilterManager.Remove(ctx, f.ID())
|
||||
if err != nil && !errors.Is(err, filter.ErrFilterNotFound) {
|
||||
return err
|
||||
@@ -1471,7 +1490,7 @@ const (
|
||||
EthSubscribeEventTypePendingTransactions = "newPendingTransactions"
|
||||
)
|
||||
|
||||
func (e *EthEvent) EthSubscribe(ctx context.Context, p jsonrpc.RawParams) (ethtypes.EthSubscriptionID, error) {
|
||||
func (e *EthEventHandler) EthSubscribe(ctx context.Context, p jsonrpc.RawParams) (ethtypes.EthSubscriptionID, error) {
|
||||
params, err := jsonrpc.DecodeParams[ethtypes.EthSubscribeParams](p)
|
||||
if err != nil {
|
||||
return ethtypes.EthSubscriptionID{}, xerrors.Errorf("decoding params: %w", err)
|
||||
@@ -1524,7 +1543,7 @@ func (e *EthEvent) EthSubscribe(ctx context.Context, p jsonrpc.RawParams) (ethty
|
||||
}
|
||||
}
|
||||
|
||||
f, err := e.EventFilterManager.Install(ctx, -1, -1, cid.Undef, addresses, keys)
|
||||
f, err := e.EventFilterManager.Install(ctx, -1, -1, cid.Undef, addresses, keysToKeysWithCodec(keys), true)
|
||||
if err != nil {
|
||||
// clean up any previous filters added and stop the sub
|
||||
_, _ = e.EthUnsubscribe(ctx, sub.id)
|
||||
@@ -1547,7 +1566,7 @@ func (e *EthEvent) EthSubscribe(ctx context.Context, p jsonrpc.RawParams) (ethty
|
||||
return sub.id, nil
|
||||
}
|
||||
|
||||
func (e *EthEvent) EthUnsubscribe(ctx context.Context, id ethtypes.EthSubscriptionID) (bool, error) {
|
||||
func (e *EthEventHandler) EthUnsubscribe(ctx context.Context, id ethtypes.EthSubscriptionID) (bool, error) {
|
||||
if e.SubManager == nil {
|
||||
return false, api.ErrNotSupported
|
||||
}
|
||||
@@ -1561,7 +1580,7 @@ func (e *EthEvent) EthUnsubscribe(ctx context.Context, id ethtypes.EthSubscripti
|
||||
}
|
||||
|
||||
// GC runs a garbage collection loop, deleting filters that have not been used within the ttl window
|
||||
func (e *EthEvent) GC(ctx context.Context, ttl time.Duration) {
|
||||
func (e *EthEventHandler) GC(ctx context.Context, ttl time.Duration) {
|
||||
if e.FilterStore == nil {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ package full
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/hex"
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/ipfs/go-cid"
|
||||
@@ -10,12 +11,87 @@ import (
|
||||
"github.com/stretchr/testify/require"
|
||||
cbg "github.com/whyrusleeping/cbor-gen"
|
||||
|
||||
"github.com/filecoin-project/go-state-types/abi"
|
||||
"github.com/filecoin-project/go-state-types/big"
|
||||
|
||||
"github.com/filecoin-project/lotus/chain/types"
|
||||
"github.com/filecoin-project/lotus/chain/types/ethtypes"
|
||||
)
|
||||
|
||||
func TestParseBlockRange(t *testing.T) {
|
||||
pstring := func(s string) *string { return &s }
|
||||
|
||||
tcs := map[string]struct {
|
||||
heaviest abi.ChainEpoch
|
||||
from *string
|
||||
to *string
|
||||
maxRange abi.ChainEpoch
|
||||
minOut abi.ChainEpoch
|
||||
maxOut abi.ChainEpoch
|
||||
errStr string
|
||||
}{
|
||||
"fails when both are specified and range is greater than max allowed range": {
|
||||
heaviest: 100,
|
||||
from: pstring("0x100"),
|
||||
to: pstring("0x200"),
|
||||
maxRange: 10,
|
||||
minOut: 0,
|
||||
maxOut: 0,
|
||||
errStr: "too large",
|
||||
},
|
||||
"fails when min is specified and range is greater than max allowed range": {
|
||||
heaviest: 500,
|
||||
from: pstring("0x10"),
|
||||
to: pstring("latest"),
|
||||
maxRange: 10,
|
||||
minOut: 0,
|
||||
maxOut: 0,
|
||||
errStr: "too far in the past",
|
||||
},
|
||||
"fails when max is specified and range is greater than max allowed range": {
|
||||
heaviest: 500,
|
||||
from: pstring("earliest"),
|
||||
to: pstring("0x10000"),
|
||||
maxRange: 10,
|
||||
minOut: 0,
|
||||
maxOut: 0,
|
||||
errStr: "too large",
|
||||
},
|
||||
"works when range is valid": {
|
||||
heaviest: 500,
|
||||
from: pstring("earliest"),
|
||||
to: pstring("latest"),
|
||||
maxRange: 1000,
|
||||
minOut: 0,
|
||||
maxOut: -1,
|
||||
},
|
||||
"works when range is valid and specified": {
|
||||
heaviest: 500,
|
||||
from: pstring("0x10"),
|
||||
to: pstring("0x30"),
|
||||
maxRange: 1000,
|
||||
minOut: 16,
|
||||
maxOut: 48,
|
||||
},
|
||||
}
|
||||
|
||||
for name, tc := range tcs {
|
||||
tc2 := tc
|
||||
t.Run(name, func(t *testing.T) {
|
||||
min, max, err := parseBlockRange(tc2.heaviest, tc2.from, tc2.to, tc2.maxRange)
|
||||
require.Equal(t, tc2.minOut, min)
|
||||
require.Equal(t, tc2.maxOut, max)
|
||||
if tc2.errStr != "" {
|
||||
fmt.Println(err)
|
||||
require.Error(t, err)
|
||||
require.Contains(t, err.Error(), tc2.errStr)
|
||||
} else {
|
||||
require.NoError(t, err)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestEthLogFromEvent(t *testing.T) {
|
||||
// basic empty
|
||||
data, topics, ok := ethLogFromEvent(nil)
|
||||
|
||||
+53
-4
@@ -762,7 +762,7 @@ func (a *StateAPI) StateMarketDeals(ctx context.Context, tsk types.TipSetKey) (m
|
||||
}
|
||||
out[strconv.FormatInt(int64(dealID), 10)] = &api.MarketDeal{
|
||||
Proposal: d,
|
||||
State: *s,
|
||||
State: api.MakeDealState(s),
|
||||
}
|
||||
return nil
|
||||
}); err != nil {
|
||||
@@ -779,18 +779,27 @@ func (m *StateModule) StateMarketStorageDeal(ctx context.Context, dealId abi.Dea
|
||||
return stmgr.GetStorageDeal(ctx, m.StateManager, dealId, ts)
|
||||
}
|
||||
|
||||
func (a *StateAPI) StateGetAllocationForPendingDeal(ctx context.Context, dealId abi.DealID, tsk types.TipSetKey) (*verifreg.Allocation, error) {
|
||||
func (a *StateAPI) StateGetAllocationIdForPendingDeal(ctx context.Context, dealId abi.DealID, tsk types.TipSetKey) (verifreg.AllocationId, error) {
|
||||
ts, err := a.Chain.GetTipSetFromKey(ctx, tsk)
|
||||
if err != nil {
|
||||
return nil, xerrors.Errorf("loading tipset %s: %w", tsk, err)
|
||||
return verifreg.NoAllocationID, xerrors.Errorf("loading tipset %s: %w", tsk, err)
|
||||
}
|
||||
|
||||
st, err := a.StateManager.GetMarketState(ctx, ts)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
return verifreg.NoAllocationID, err
|
||||
}
|
||||
|
||||
allocationId, err := st.GetAllocationIdForPendingDeal(dealId)
|
||||
if err != nil {
|
||||
return verifreg.NoAllocationID, err
|
||||
}
|
||||
|
||||
return allocationId, nil
|
||||
}
|
||||
|
||||
func (a *StateAPI) StateGetAllocationForPendingDeal(ctx context.Context, dealId abi.DealID, tsk types.TipSetKey) (*verifreg.Allocation, error) {
|
||||
allocationId, err := a.StateGetAllocationIdForPendingDeal(ctx, dealId, tsk)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -857,6 +866,25 @@ func (a *StateAPI) StateGetAllocations(ctx context.Context, clientAddr address.A
|
||||
return allocations, nil
|
||||
}
|
||||
|
||||
func (a *StateAPI) StateGetAllAllocations(ctx context.Context, tsk types.TipSetKey) (map[verifreg.AllocationId]verifreg.Allocation, error) {
|
||||
ts, err := a.Chain.GetTipSetFromKey(ctx, tsk)
|
||||
if err != nil {
|
||||
return nil, xerrors.Errorf("loading tipset %s: %w", tsk, err)
|
||||
}
|
||||
|
||||
st, err := a.StateManager.GetVerifregState(ctx, ts)
|
||||
if err != nil {
|
||||
return nil, xerrors.Errorf("loading verifreg state: %w", err)
|
||||
}
|
||||
|
||||
allocations, err := st.GetAllAllocations()
|
||||
if err != nil {
|
||||
return nil, xerrors.Errorf("getting all allocations: %w", err)
|
||||
}
|
||||
|
||||
return allocations, nil
|
||||
}
|
||||
|
||||
func (a *StateAPI) StateGetClaim(ctx context.Context, providerAddr address.Address, claimId verifreg.ClaimId, tsk types.TipSetKey) (*verifreg.Claim, error) {
|
||||
idAddr, err := a.StateLookupID(ctx, providerAddr, tsk)
|
||||
if err != nil {
|
||||
@@ -908,6 +936,25 @@ func (a *StateAPI) StateGetClaims(ctx context.Context, providerAddr address.Addr
|
||||
return claims, nil
|
||||
}
|
||||
|
||||
func (a *StateAPI) StateGetAllClaims(ctx context.Context, tsk types.TipSetKey) (map[verifreg.ClaimId]verifreg.Claim, error) {
|
||||
ts, err := a.Chain.GetTipSetFromKey(ctx, tsk)
|
||||
if err != nil {
|
||||
return nil, xerrors.Errorf("loading tipset %s: %w", tsk, err)
|
||||
}
|
||||
|
||||
st, err := a.StateManager.GetVerifregState(ctx, ts)
|
||||
if err != nil {
|
||||
return nil, xerrors.Errorf("loading verifreg state: %w", err)
|
||||
}
|
||||
|
||||
claims, err := st.GetAllClaims()
|
||||
if err != nil {
|
||||
return nil, xerrors.Errorf("getting all claims: %w", err)
|
||||
}
|
||||
|
||||
return claims, nil
|
||||
}
|
||||
|
||||
func (a *StateAPI) StateComputeDataCID(ctx context.Context, maddr address.Address, sectorType abi.RegisteredSealProof, deals []abi.DealID, tsk types.TipSetKey) (cid.Cid, error) {
|
||||
nv, err := a.StateNetworkVersion(ctx, tsk)
|
||||
if err != nil {
|
||||
@@ -1914,6 +1961,8 @@ func (a *StateAPI) StateGetNetworkParams(ctx context.Context) (*api.NetworkParam
|
||||
UpgradeLightningHeight: build.UpgradeLightningHeight,
|
||||
UpgradeThunderHeight: build.UpgradeThunderHeight,
|
||||
UpgradeWatermelonHeight: build.UpgradeWatermelonHeight,
|
||||
UpgradeDragonHeight: build.UpgradeDragonHeight,
|
||||
UpgradePhoenixHeight: build.UpgradePhoenixHeight,
|
||||
},
|
||||
}, nil
|
||||
}
|
||||
|
||||
@@ -54,6 +54,7 @@ import (
|
||||
"github.com/filecoin-project/lotus/storage/ctladdr"
|
||||
"github.com/filecoin-project/lotus/storage/paths"
|
||||
sealing "github.com/filecoin-project/lotus/storage/pipeline"
|
||||
"github.com/filecoin-project/lotus/storage/pipeline/piece"
|
||||
"github.com/filecoin-project/lotus/storage/pipeline/sealiface"
|
||||
"github.com/filecoin-project/lotus/storage/sealer"
|
||||
"github.com/filecoin-project/lotus/storage/sealer/fsutil"
|
||||
@@ -243,7 +244,7 @@ func (sm *StorageMinerAPI) SectorsStatus(ctx context.Context, sid abi.SectorNumb
|
||||
return sInfo, nil
|
||||
}
|
||||
|
||||
func (sm *StorageMinerAPI) SectorAddPieceToAny(ctx context.Context, size abi.UnpaddedPieceSize, r storiface.Data, d api.PieceDealInfo) (api.SectorOffset, error) {
|
||||
func (sm *StorageMinerAPI) SectorAddPieceToAny(ctx context.Context, size abi.UnpaddedPieceSize, r storiface.Data, d piece.PieceDealInfo) (api.SectorOffset, error) {
|
||||
so, err := sm.Miner.SectorAddPieceToAny(ctx, size, r, d)
|
||||
if err != nil {
|
||||
// jsonrpc doesn't support returning values with errors, make sure we never do that
|
||||
@@ -506,7 +507,7 @@ func (sm *StorageMinerAPI) ComputeWindowPoSt(ctx context.Context, dlIdx uint64,
|
||||
}
|
||||
|
||||
func (sm *StorageMinerAPI) ComputeDataCid(ctx context.Context, pieceSize abi.UnpaddedPieceSize, pieceData storiface.Data) (abi.PieceInfo, error) {
|
||||
return sm.StorageMgr.DataCid(ctx, pieceSize, pieceData)
|
||||
return sm.IStorageMgr.DataCid(ctx, pieceSize, pieceData)
|
||||
}
|
||||
|
||||
func (sm *StorageMinerAPI) WorkerConnect(ctx context.Context, url string) error {
|
||||
|
||||
Reference in New Issue
Block a user