Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: merge master into lily branch #472

Merged
merged 19 commits into from
Apr 20, 2021
Merged

chore: merge master into lily branch #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5691280
fix: ignore false positive gosec failure in wait package (#421)
iand Mar 12, 2021
916e869
fix: embed genesis block in executable (#420)
iand Mar 12, 2021
eb26be6
feat: add benchmarking of vectors (#423)
iand Mar 17, 2021
234717d
Chore/sqlotus dag prefetch option (#430)
ribasushi Mar 22, 2021
8c6f0ee
close TipSetObs in walker and watcher
frrist Mar 19, 2021
d8ee048
fix(indexer): only close TIpSetIndexer in walk and watch
frrist Mar 23, 2021
bd672f6
chore: increase linter timout in ci
frrist Mar 23, 2021
b03e03a
chore: update for Lotus 1.5.3 (#439)
iand Mar 25, 2021
0eec6dc
Release notes for v0.5.5 (#440)
iand Mar 26, 2021
5845bbd
chore: update lotus to 1.6.0 (#443)
iand Mar 26, 2021
baf2c25
chore: upgrade lotus dependency to 1.6.0-rc1 (#447)
iand Mar 31, 2021
d57cb96
chore: update lotus to 1.6.0 (#455)
iand Apr 7, 2021
c9cd3f3
Release notes for v0.5.6 (#456)
iand Apr 7, 2021
087cbc9
fix: ensure persistence semaphore channel is drained on close (#457)
iand Apr 9, 2021
ea7d7ce
Release notes for v0.5.7 (#458)
iand Apr 9, 2021
0f71b33
fix(tasks): use correct ActorInfo for actor state extraction (#449)
frrist Apr 16, 2021
c9a1600
Add MinerSectorInfo for extended sectors (#448)
hsanjuan Apr 19, 2021
f6cc391
Merge branch 'master' into lily-master-20210419
iand Apr 19, 2021
18a678b
Fix makefile conflicts
iand Apr 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ jobs:
- prepare
- go/mod-tidy-check
test:
resource_class: large
docker:
- image: cimg/go:1.15.2
- image: timescale/timescaledb:1.7.4-pg12
Expand Down
6 changes: 6 additions & 0 deletions commands/watch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,12 @@ var WatchCmd = &cli.Command{
Value: "",
Destination: &watchFlags.name,
},
&cli.DurationFlag{
Name: "window",
Usage: "Time window in which data extraction must be completed.",
Value: builtin.EpochDurationSeconds * time.Second,
Hidden: true,
},
},
Action: func(cctx *cli.Context) error {
ctx := lotuscli.ReqContext(cctx)
Expand Down
4 changes: 1 addition & 3 deletions lens/lotus/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,7 @@ func (aw *APIWrapper) StateGetActor(ctx context.Context, actor address.Address,
stop := metrics.Timer(ctx, metrics.LensRequestDuration)
defer stop()

// return aw.FullNode.StateGetActor(ctx, actor, tsk)
// TODO idk how to get a store.ChainStore here
return lens.OptimizedStateGetActorWithFallback(ctx, aw.Store(), aw.FullNode, aw.FullNode, actor, tsk)
return aw.FullNode.StateGetActor(ctx, actor, tsk)
}

func (aw *APIWrapper) StateListActors(ctx context.Context, tsk types.TipSetKey) ([]address.Address, error) {
Expand Down
5 changes: 0 additions & 5 deletions lens/lotusrepo/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,6 @@ func (ra *RepoAPI) Store() adt.Store {
return ra.FullNodeAPI.ChainAPI.Chain.ActorStore(ra.Context)
}

// TODO: Remove. See https://github.com/filecoin-project/sentinel-visor/issues/196
func (ra *RepoAPI) StateGetActor(ctx context.Context, actor address.Address, tsk types.TipSetKey) (*types.Actor, error) {
return lens.OptimizedStateGetActorWithFallback(ctx, ra.ChainAPI.Chain.ActorStore(ctx), ra.ChainAPI, ra.StateAPI, actor, tsk)
}

func (ra *RepoAPI) ClientStartDeal(ctx context.Context, params *api.StartDealParams) (*cid.Cid, error) {
return nil, fmt.Errorf("unsupported")
}
Expand Down
58 changes: 0 additions & 58 deletions lens/util.go
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions lens/util/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,6 @@ type LensAPI struct {
cs *store.ChainStore
}

// TODO: Remove. See https://github.com/filecoin-project/sentinel-visor/issues/196
func (ra *LensAPI) StateGetActor(ctx context.Context, actor address.Address, tsk types.TipSetKey) (*types.Actor, error) {
return lens.OptimizedStateGetActorWithFallback(ctx, ra.cs.ActorStore(ctx), ra.FullNodeAPI.ChainAPI, ra.FullNodeAPI.StateAPI, actor, tsk)
}

func (ra *LensAPI) GetExecutedMessagesForTipset(ctx context.Context, ts, pts *types.TipSet) ([]*lens.ExecutedMessage, error) {
return GetExecutedMessagesForTipset(ctx, ra.cs, ts, pts)
}
Expand Down
10 changes: 0 additions & 10 deletions lens/vector/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (
"github.com/ipfs/go-merkledag"
car "github.com/ipld/go-car"

"github.com/filecoin-project/go-address"
"github.com/filecoin-project/go-state-types/abi"
"github.com/filecoin-project/lotus/blockstore"
"github.com/filecoin-project/lotus/chain/stmgr"
Expand Down Expand Up @@ -150,15 +149,6 @@ func (c *CaptureAPI) GetExecutedMessagesForTipset(ctx context.Context, ts, pts *
return util.GetExecutedMessagesForTipset(ctx, c.FullNodeAPI.ChainAPI.Chain, ts, pts)
}

func (c *CaptureAPI) StateGetActor(ctx context.Context, addr address.Address, tsk types.TipSetKey) (*types.Actor, error) {
act, err := lens.OptimizedStateGetActorWithFallback(ctx, c.ChainAPI.Chain.ActorStore(ctx), c.ChainAPI, c.StateAPI, addr, tsk)
if err != nil {
return nil, err
}
// c.tbs.Record(act.Head)
return act, nil
}

// From https://github.com/ribasushi/ltsh/blob/5b0211033020570217b0ae37b50ee304566ac218/cmd/lotus-shed/deallifecycles.go#L41-L171
type fakeVerifier struct{}

Expand Down
11 changes: 11 additions & 0 deletions support/tools/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,39 @@ github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPU
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.0 h1:8pl+sMODzuvGJkmj2W4kZihvVb5mKm8pB/X44PIQHv8=
golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 h1:myAQVi0cGEoqQVR5POX+8RR2mrocKqNN1hmeMqhX27k=
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20200702044944-0cc1aa72b347/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY=
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
Expand Down
Loading