Commit Graph

665 Commits

Author SHA1 Message Date
Łukasz Magiera
aa5bd7bc17 Merge remote-tracking branch 'origin/master' into feat/async-restartable-workers 2020-09-21 22:36:16 +02:00
Steven Allen
4cf0c105eb optimize sector loading
And avoid exposing "arrays" via the miner abstraction. We may change these
structures later.
2020-09-21 12:12:08 -07:00
Łukasz Magiera
f7934b083c Merge remote-tracking branch 'origin/master' into refactor/net-upgrade 2020-09-21 19:10:18 +02:00
Łukasz Magiera
29913f4c41
Merge pull request #3903 from filecoin-project/3605-sector-list-option
Add an option to hide sectors in Removed from `sectors list`.
2020-09-21 19:04:11 +02:00
Łukasz Magiera
1096f8acc6 miner: Invert show-removed option in sectors list 2020-09-21 18:59:05 +02:00
Jerry
c401d2ec4e fix storage find error 2020-09-19 15:48:02 +08:00
Steven Allen
1bf3b4989d rename imports to match actors code
`sed -i 's/\bv0\(\w\)\(\w*\)/\L\1\E\20/g' **/*.go`
2020-09-18 14:59:27 -07:00
Steven Allen
c130806c37 compile fix 2020-09-18 14:59:14 -07:00
Steven Allen
f741ce6e30 fixup some more imports 2020-09-18 14:51:18 -07:00
Steven Allen
8285eda8e5 migrate storage miner info 2020-09-18 14:46:42 -07:00
Łukasz Magiera
6050401652
Merge pull request #3925 from filecoin-project/feat/log-shutdown
log shutdown method for lotus daemon and miner
2020-09-18 23:15:41 +02:00
Łukasz Magiera
7109e95f5e
Merge pull request #3881 from filcloud/issue-3626-SectorState
fix SectorState
2020-09-18 21:30:18 +02:00
Travis Person
eadc61c37a log shutdown method for lotus daemon and miner 2020-09-18 18:07:58 +00:00
Łukasz Magiera
70faa36b7f Merge remote-tracking branch 'origin/master' into refactor/net-upgrade 2020-09-18 19:29:06 +02:00
jennijuju
14a4acec8c Add an option to hide sectors in Removed for sectors list. 2020-09-17 13:19:50 -04:00
Łukasz Magiera
6eda53565f Most tests passing 2020-09-17 17:30:24 +02:00
Aayush Rajasekaran
31ff5230bb Get State API almost working 2020-09-17 05:05:32 -04:00
Frank
d5af25b76c update init sector state list 2020-09-17 10:38:07 +08:00
Ingar Shu
f56602c588
Specify retrieval price in FIL/GiB 2020-09-16 14:30:04 -07:00
Ingar Shu
2aef7f7c07
Clarify help text units 2020-09-16 13:56:46 -07:00
Ingar Shu
665d23cb8e
Add set-ask, get-ask retrieval CLI 2020-09-16 13:56:46 -07:00
Łukasz Magiera
5e09581256 sectorstorage: get new work tracker to run 2020-09-16 22:33:58 +02:00
Frank
ed74091c20 add exist sector state check 2020-09-16 19:49:45 +08:00
Aayush Rajasekaran
72d19f369b Incremental progress towards using new power state interface 2020-09-16 01:57:18 -04:00
Steven Allen
c64f983900 migrate StateMinserSectorCount 2020-09-15 12:09:39 -07:00
Łukasz Magiera
03cf6cca40 Merge remote-tracking branch 'origin/master' into feat/async-restartable-workers 2020-09-15 17:47:03 +02:00
Łukasz Magiera
84fa22110f fix lint 2020-09-15 12:09:43 +02:00
Łukasz Magiera
7fd5c81674 cli: state sector command 2020-09-15 01:36:49 +02:00
Steven Allen
02dcb5e182 Merge branch 'master' into refactor/net-upgrade 2020-09-14 14:53:57 -07:00
Łukasz Magiera
1ebca8f732 more working code 2020-09-14 19:09:01 +02:00
Łukasz Magiera
06ec571c20 Merge remote-tracking branch 'origin/master' into refactor/net-upgrade 2020-09-14 15:09:52 +02:00
Raúl Kripalani
6d29d75724 Merge branch 'master' into inmem-journal 2020-09-14 12:17:45 +01:00
Steven Allen
d3594835c4 [WIP] Network upgrade support
This patch starts adding support for network upgrades.

* It adds an actors abstraction layer for loading abstract (cross-version) actors.
* It starts switching over to a shared deadline type.
* It adds an abstraction for ADTs (hamt/amt).
* It removes the callback-based API in the StateManager (difficult to abstract
across actor versions).
* It _does not_ actually add support for actors v2. We can do that in a followup
patch but that should be relatively easy.

This patch is heavily WIP and does not compile. Feel free to push changes
directly to this branch.

Notes:

* State tree access now needs a network version, because the HAMT type will change.
* I haven't figured out a nice way to abstract over changes to the _message_
types. However, many of them will be type aliased to actors v0 in actors v2 so
we can likely continue using the v0 versions (or use the v2 versions
everywhere). I've been renaming imports to `v0*` to make it clear that we're
importing types from a _specific_ actors version.

TODO:

* Consider merging incremental improvements? We'd have to get this compiling
again first but we could merge in the new abstractions, and slowly switch over.
* Finish migrating to the new abstractions.
* Remove all actor state types from the public API. See `miner.State.Info()` for
the planned approach here.
* Fix the tests. This is likely going to be a massive pain.
2020-09-11 20:16:29 -07:00
Łukasz Magiera
5f08fe7ead Merge remote-tracking branch 'origin/master' into feat/async-restartable-workers 2020-09-10 17:30:54 +02:00
Łukasz Magiera
38863d3025 build: Separate API versions per node type 2020-09-08 21:14:53 +02:00
Aayush Rajasekaran
39755a294a Update to specs v0.9.6 2020-09-07 15:48:41 -04:00
Łukasz Magiera
5d73943929 storage: Fix import cycle 2020-09-06 18:54:00 +02:00
Raúl Kripalani
1ec534d607 Merge branch 'master' into inmem-journal 2020-09-04 10:55:40 +01:00
Ingar Shu
1608cd2d53
Add watch option to "lotus-miner storage-deals list" 2020-09-03 10:14:30 -07:00
Raúl Kripalani
3206f92063 Merge branch 'master' into inmem-journal 2020-09-02 19:50:52 +01:00
Łukasz Magiera
11b11e416b sectorstorage: Compact assigned windows 2020-08-28 18:26:38 +02:00
Łukasz Magiera
59f554b658 sealing sched: Show waiting tasks assigned to workers in sealing jobs cli 2020-08-27 23:14:33 +02:00
Łukasz Magiera
d8e58e67c6 storagefsm: Treat PackingFailed sectors as expired 2020-08-27 22:41:35 +02:00
Łukasz Magiera
df635579c4 storagefsm: Handle sectors with expired deals better 2020-08-27 13:51:38 +02:00
Łukasz Magiera
788c7dbf48 storagefsm: Separate satte for submitting commit message 2020-08-27 12:57:28 +02:00
Łukasz Magiera
51ca460f18 miner: Fix sorting of some sector states in miner-info 2020-08-27 12:41:12 +02:00
Łukasz Magiera
e236173417 miner: Print (pre)commit message cids in sector status 2020-08-27 12:40:19 +02:00
Raúl Kripalani
cb8e105a94 reduce diff noise. 2020-08-26 16:44:06 +01:00
Raúl Kripalani
efdfd3ee3e Merge branch 'master' into inmem-journal 2020-08-26 16:38:23 +01:00
Raúl Kripalani
4e1ef09751 make journal a global var. 2020-08-26 16:09:37 +01:00
Whyrusleeping
0009f7c8dc
Merge pull request #3300 from filecoin-project/fix/set-peer-id
fix parsing of peerID in input to set-peer-id
2020-08-25 17:26:05 -07:00
whyrusleeping
9bb862d025 fix parsing of peerID in input to set-peer-id 2020-08-25 17:10:06 -07:00
Steven Allen
7fb4851eb9 update deps for bug fixes
* updates bitswap to include _many_ perf enhancements and bug fixes.
* updates go-fs-lock because the version here is pretty old.
* updates go-libp2p
* updates bbloom _just_ in case, because the version we were depending on had bugs (looks like we're not actually using it).
2020-08-25 17:06:07 -07:00
Łukasz Magiera
71a2dc06d7
Merge pull request #3259 from GFZRZK/master
Bugfix: fix some typo and correct recoveries datasource
2020-08-24 22:44:36 +02:00
Łukasz Magiera
6a7cb669ac
Merge pull request #3250 from filecoin-project/fix/miner-info-avail
miner info: Fix avail calc, print aggregate deal info
2020-08-24 18:10:07 +02:00
WC
119f6ff2e6
Bugfix: fix some typo and correct recoveries datasource
Bugfix: fix some typo and correct recoveries data source
2020-08-24 14:56:44 +08:00
Łukasz Magiera
a236957538
Merge pull request #3232 from filecoin-project/asr/marked-for-upgrade
Indicate whether a sector has been marked for upgrade
2020-08-22 21:48:45 +02:00
Łukasz Magiera
12af420d7e mod tidy 2020-08-22 19:16:45 +02:00
Łukasz Magiera
88016c17e4 miner info: Fix avail calc, print aggregate deal info 2020-08-22 19:15:08 +02:00
Aayush Rajasekaran
984e52acbc Indicate whether a sector has been marked for upgrade 2020-08-21 15:53:39 -04:00
Steven Allen
5733c71c50 Lint everything
We were ignoring quite a few error cases, and had one case where we weren't
actually updating state where we wanted to. Unfortunately, if the linter doesn't
pass, nobody has any reason to actually check lint failures in CI.

There are three remaining XXXs marked in the code for lint.
2020-08-20 20:46:36 -07:00
Whyrusleeping
af3fe206d6
Merge pull request #3122 from filecoin-project/feat/cmd-improvements
sorted deal listings
2020-08-20 13:29:01 -07:00
Łukasz Magiera
364e3229b9
Merge pull request #3178 from filecoin-project/feat/miner-init-from-flag
add a from flag for miner init
2020-08-20 17:09:03 +02:00
hannahhoward
0086f76a90 feat(lotus-miner): add data transfer list cmd
add equivalent command to list data transfers on miner side, extract common functionality for reuse
2020-08-20 01:35:48 -07:00
whyrusleeping
2675ffb128 add a from flag for miner init 2020-08-19 17:34:58 -07:00
Łukasz Magiera
de41f63fa4 miner info: Also print locked pledge 2020-08-20 02:03:42 +02:00
Łukasz Magiera
a4807b18bc gofmt, api docstring 2020-08-20 01:26:13 +02:00
Łukasz Magiera
5ea61abfe1 Wire up miner control addresses, use for post 2020-08-20 01:17:03 +02:00
Łukasz Magiera
e7d65be90a gofmt 2020-08-18 18:27:28 +02:00
Aayush Rajasekaran
4ef5a58b36 strip peerid when setting on-chain addrs 2020-08-17 21:18:26 -04:00
Aayush Rajasekaran
01b5118a08 Add a CLI method to set peerid 2020-08-17 20:53:02 -04:00
whyrusleeping
f05cff478f sorted deal listings 2020-08-17 14:48:49 -07:00
Łukasz Magiera
29db7047a3
Merge pull request #3112 from filecoin-project/fix/sched-hang
Fix sealing sched hands on unclean worker disconnect
2020-08-17 18:43:25 +02:00
Łukasz Magiera
6ef7a30b19
Merge pull request #3089 from filecoin-project/integrate/storage-fsm
integrate extern/{storage-fsm,sector-storage} into lotus source tree
2020-08-17 18:37:54 +02:00
Raúl Kripalani
862bafc63a fix lint errors. 2020-08-17 14:39:33 +01:00
Raúl Kripalani
efdc428d5d keep storage-fsm (renamed to storage-sealing) and sector-storage in extern. 2020-08-17 14:26:18 +01:00
Łukasz Magiera
7595b1d8d4 cli: pprof goroutines command 2020-08-17 11:49:11 +02:00
yaohcn
39bcfab37c make addpiece configurable 2020-08-17 17:39:50 +08:00
Łukasz Magiera
c5c819afca
Merge pull request #3098 from filecoin-project/feat/config-cmd
Add config command that prints the default config file for a storage …
2020-08-17 08:36:51 +02:00
lanzafame
0d3aaabd2c Add config command that prints the default config file for a storage miner 2020-08-17 13:51:04 +10:00
Raúl Kripalani
3c17cd655e integrate extern/sector-storage into lotus proper. 2020-08-16 11:09:58 +01:00
Raúl Kripalani
fb0ccc9260 integrate extern/storage-fsm into lotus proper. 2020-08-16 10:42:13 +01:00
whyrusleeping
8774a7b2dd add a market balance command, and a verbose mode for storage-deals list 2020-08-14 16:45:40 -07:00
Łukasz Magiera
75eaa1bf5b Merge remote-tracking branch 'origin/next' into feat/fix-rename-miner-withdraw 2020-08-14 13:40:12 +02:00
Łukasz Magiera
7fc15b70ec
Merge pull request #3025 from filecoin-project/feat/retdeals-in-allinfo
miner: Add retrieval deal list to miner allinfo
2020-08-13 15:58:12 +02:00
Łukasz Magiera
9a39bb4e78 api: Remove unused StatePledgeCollateral 2020-08-13 14:03:59 +02:00
Łukasz Magiera
069c39fc12 Add reachability info to miner info all 2020-08-13 13:44:03 +02:00
Łukasz Magiera
066bac0607 miner: Add retrieval deal list to miner allinfo 2020-08-13 10:51:13 +02:00
Łukasz Magiera
02650c7f25 miner: drop rewardsCmd from miner cmd list 2020-08-13 10:25:21 +02:00
Łukasz Magiera
936d861df5 gofmt 2020-08-13 10:20:41 +02:00
Łukasz Magiera
f0d32f2c01 miner: fix/rename miner actor withdraw 2020-08-13 10:20:09 +02:00
Łukasz Magiera
e7e068ebb5
Merge pull request #3008 from filecoin-project/fix/lints
Fix lint errors an broken tests
2020-08-12 23:28:01 +02:00
Łukasz Magiera
5561d66082
Merge pull request #3002 from keyko-io/feat/verified-price
Showing verified price in asks
2020-08-12 23:26:53 +02:00
Steven Allen
3ef3f570fb Fix lint errors an broken tests 2020-08-12 23:16:44 +02:00
Łukasz Magiera
12f7e2d9bf Use a struct for send metadata in MpoolPushMessage 2020-08-12 22:17:29 +02:00
Łukasz Magiera
d0147aa50f Add maxFee param to MpoolPushMessage 2020-08-12 19:06:16 +02:00
Sami Mäkelä
b252715f53 bad merge 2020-08-12 17:40:29 +03:00
Sami Mäkelä
8367e79279 now working 2020-08-12 17:36:07 +03:00
Sami Mäkelä
5169785c91 merge 2020-08-12 14:15:03 +03:00
Sami Mäkelä
ac6e716ebd merge 2020-08-12 14:12:33 +03:00
Raúl Kripalani
2ea5abdfb5 wire journal into miner. 2020-08-11 13:48:32 +01:00
yaohcn
6b0f607f4b add space check in StorageFindSector 2020-08-11 15:27:03 +08:00
Jakub Sztandera
ab08858b45
Delete GasPrice from this world
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-08-06 23:08:42 +02:00
Łukasz Magiera
f8b8ecc0c3 Consensus filter 2020-08-06 03:16:39 +02:00
Łukasz Magiera
ca4e4fa964
Merge pull request #2814 from filecoin-project/feat/secstor-fetch-reserve
Update sector-storage with fetch storage reservation
2020-08-05 23:37:30 +02:00
Łukasz Magiera
0073f10b62
Merge pull request #2821 from filecoin-project/feat/miner-allinfo
miner: Command to dump all miner info
2020-08-05 20:33:27 +02:00
Łukasz Magiera
2b7732bc2f Update sector-storage with fetch storage reservation 2020-08-05 20:32:28 +02:00
Ingar Shu
80546d0451 Add "retrieval-deals list" miner CLI 2020-08-05 17:27:15 +02:00
Ingar Shu
9e07b310d1 WIP 2020-08-05 17:27:08 +02:00
Łukasz Magiera
a7acc81490 miner: Command to dump all miner info 2020-08-04 20:57:48 +02:00
hannahhoward
1b38791d94 fix(lotus-miner): output correct proposal CID
update storage-deals list command to output the correct proposal CID. previously we were taking the
CID without the client signature, which will not be the same CID
2020-08-04 08:22:47 -07:00
Jakub Sztandera
81a65fe1bc
Swich gas-price to 0 in many places
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-08-01 16:23:13 +02:00
Łukasz Magiera
3ae55d1da3
Merge pull request #2714 from filecoin-project/feat/user-dealfiter
Support external deal decision logic
2020-07-31 21:56:44 +02:00
Aayush Rajasekaran
c33e38eef2 Update markets 2020-07-31 15:43:34 -04:00
Łukasz Magiera
f993ff1ab8 make lotus-miner storage-deals list less bad 2020-07-31 20:56:47 +02:00
whyrusleeping
146e59fe56 wire through new retrieval apis 2020-07-31 01:47:37 -04:00
whyrusleeping
7fa4cd33f0 WIP: retrieval pieces inspection command 2020-07-31 01:33:30 -04:00
Aayush Rajasekaran
cadf52bb0a Include listen addresses in CLI miner info 2020-07-29 16:34:01 -04:00
Jakub Sztandera
9ec11e2f8f
Set default set-addrs gas limit to 0
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-07-29 10:04:06 +02:00
whyrusleeping
dd8c88b418 improve some seal duration things 2020-07-28 17:40:42 -07:00
Łukasz Magiera
0adfd68fae Better miner proving deadlines 2020-07-27 18:15:47 +02:00
Łukasz Magiera
d557c407c6
Merge pull request #2608 from filecoin-project/feat/storage-remote-improvements
Update sector-storage, sealing sched-diag
2020-07-27 15:17:38 +02:00
刘林欣
26998fca32 add on-chain-info to lotus-miner sectors status command 2020-07-27 13:58:59 +02:00
Łukasz Magiera
e60adb01fa
Merge pull request #2407 from filecoin-project/add-actor-flag
fix --actor flag for `lotus-storage-miner info`
2020-07-27 13:54:18 +02:00
Łukasz Magiera
135b77dab5 Update sector-storage, sealing sched-diag 2020-07-27 13:23:43 +02:00
Łukasz Magiera
8227b7d16f
Merge pull request #2573 from filecoin-project/feat/storage-remote-improvements
Update sector-storage, parallel fetch limit
2020-07-25 23:36:22 +02:00
Aayush Rajasekaran
6cf2fe50dc Add CLI command to calculate pledge collateral of a CC sector 2020-07-24 19:32:48 -04:00
Łukasz Magiera
958cc8b947 Update sector-storage, parallel fetch limit 2020-07-24 22:11:11 +02:00
Peter Rabbitson
c18aba39df Do not double-encode base32 CIDs as hex 2020-07-23 21:42:13 +02:00
Łukasz Magiera
a4d85a88fe
Merge pull request #2551 from filecoin-project/feat/helptext-helpers
add a helper to make printing helptext on errors easier
2020-07-23 21:26:01 +02:00
whyrusleeping
f47fea3751 add a helper to make printing helptext on errors easier 2020-07-23 11:41:53 -07:00
Łukasz Magiera
2633bdd838 miner: sealing jobs command 2020-07-21 20:08:03 +02:00
Łukasz Magiera
ff3236ef36 miner: Group CLI commands 2020-07-21 19:19:47 +02:00
Jakub Sztandera
e6b3ba0178
Slow down pledgeSectors test
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-07-20 21:31:06 +02:00
Jakub Sztandera
7da629d03b
Update gas prices
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-07-20 21:31:05 +02:00
Łukasz Magiera
0c8b451a00 fix miner info 2020-07-18 14:54:21 +02:00
Anton Evangelatov
ef8ab20a31 fix --actor flag for lotus-storage-miner info 2020-07-17 20:20:31 +02:00
Łukasz Magiera
56d13534b4 ProvingSet -> ActiveSectors 2020-07-17 16:26:48 +02:00
Łukasz Magiera
bbc2657023 Fix StateMinerProvingSet 2020-07-17 16:21:00 +02:00
Łukasz Magiera
06acda0ab9 mod tidy, gofmt 2020-07-17 15:18:40 +02:00
Łukasz Magiera
cb6767a02b Merge remote-tracking branch 'origin/next' into feat/actors-miner-refactor 2020-07-17 15:18:11 +02:00
Aayush Rajasekaran
a5ef629cef Add expected seal duration to custom deal logic, reject deals that start too early 2020-07-15 17:31:50 -04:00
Jakub Sztandera
7b14d445b4
Update message gas limits
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
2020-07-15 20:01:57 +02:00
Łukasz Magiera
0f2043d874
Merge pull request #2317 from filcloud/issue-2304
fix issue 2304: ux improvements
2020-07-15 19:38:35 +02:00
Łukasz Magiera
bbfa66636d More test fixing 2020-07-14 22:30:25 +02:00
Łukasz Magiera
59e5144122 fix storage-miner cli 2020-07-14 22:14:37 +02:00
Łukasz Magiera
faebc4c948 WIP Integrating specs-actors with refactored miner state 2020-07-14 13:45:45 +02:00
Frank
14ec9a2068 update storage miner and seal worker document 2020-07-11 16:55:13 +08:00
Łukasz Magiera
8ce35e30dd Merge remote-tracking branch 'origin/master' into next 2020-07-10 21:50:38 +02:00
Frank
5dfb8c9474 add deprecation support 2020-07-10 20:18:09 +08:00