Merge pull request #6835 from filecoin-project/feat/dag-store-ds

Create DAG store datastore under DAG store dir

.circleci/config.yml

@@ -735,45 +735,6 @@ jobs:
       - packer/build:
           template: tools/packer/lotus.pkr.hcl
           args: "-var ci_workspace_bins=./linux-nerpanet -var lotus_network=nerpanet -var git_tag=$CIRCLE_TAG"
-  publish-dockerhub:
-    description: publish to dockerhub
-    machine:
-      image: ubuntu-2004:202010-01
-    parameters:
-      tag:
-        type: string
-        default: latest
-    steps:
-      - checkout
-      - run:
-          name: dockerhub login
-          command: echo $DOCKERHUB_PASSWORD | docker login --username $DOCKERHUB_USERNAME --password-stdin
-      - run:
-          name: docker build
-          command: |
-            docker build --target lotus -t filecoin/lotus:<< parameters.tag >> -f Dockerfile.lotus .
-            docker build --target lotus-all-in-one -t filecoin/lotus-all-in-one:<< parameters.tag >> -f Dockerfile.lotus .
-            if [[ ! -z $CIRCLE_SHA1 ]]; then
-              docker build --target lotus -t filecoin/lotus:$CIRCLE_SHA1 -f Dockerfile.lotus .
-              docker build --target lotus-all-in-one -t filecoin/lotus-all-in-one:$CIRCLE_SHA1 -f Dockerfile.lotus .
-            fi
-            if [[ ! -z $CIRCLE_TAG ]]; then
-              docker build --target lotus -t filecoin/lotus:$CIRCLE_TAG -f Dockerfile.lotus .
-              docker build --target lotus-all-in-one -t filecoin/lotus-all-in-one:$CIRCLE_TAG -f Dockerfile.lotus .
-            fi
-      - run:
-          name: docker push
-          command: |
-            docker push filecoin/lotus:<< parameters.tag >>
-            docker push filecoin/lotus-all-in-one:<< parameters.tag >>
-            if [[ ! -z $CIRCLE_SHA1 ]]; then
-              docker push filecoin/lotus:$CIRCLE_SHA1
-              docker push filecoin/lotus-all-in-one:$CIRCLE_SHA1
-            fi
-            if [[ ! -z $CIRCLE_TAG ]]; then
-              docker push filecoin/lotus:$CIRCLE_TAG
-              docker push filecoin/lotus-all-in-one:$CIRCLE_TAG
-            fi
 
 workflows:
   version: 2.1
@@ -820,11 +781,6 @@ workflows:
           suite: itest-deals_offline
           target: "./itests/deals_offline_test.go"
       
-      - test:
-          name: test-itest-deals_padding
-          suite: itest-deals_padding
-          target: "./itests/deals_padding_test.go"
-      
       - test:
           name: test-itest-deals_power
           suite: itest-deals_power
@@ -1061,16 +1017,6 @@ workflows:
             tags:
               only:
                 - /^v\d+\.\d+\.\d+(-rc\d+)?$/
-      - publish-dockerhub:
-          name: publish-dockerhub
-          tag: stable
-          filters:
-            branches:
-              ignore:
-                - /.*/
-            tags:
-              only:
-                - /^v\d+\.\d+\.\d+(-rc\d+)?$/
 
   nightly:
     triggers:
@@ -1084,6 +1030,3 @@ workflows:
       - publish-snapcraft:
           name: publish-snapcraft-nightly
           channel: edge
-      - publish-dockerhub:
-          name: publish-dockerhub-nightly
-          tag: nightly

.circleci/template.yml

@@ -735,45 +735,6 @@ jobs:
       - packer/build:
           template: tools/packer/lotus.pkr.hcl
           args: "-var ci_workspace_bins=./linux-nerpanet -var lotus_network=nerpanet -var git_tag=$CIRCLE_TAG"
-  publish-dockerhub:
-    description: publish to dockerhub
-    machine:
-      image: ubuntu-2004:202010-01
-    parameters:
-      tag:
-        type: string
-        default: latest
-    steps:
-      - checkout
-      - run:
-          name: dockerhub login
-          command: echo $DOCKERHUB_PASSWORD | docker login --username $DOCKERHUB_USERNAME --password-stdin
-      - run:
-          name: docker build
-          command: |
-            docker build --target lotus -t filecoin/lotus:<< parameters.tag >> -f Dockerfile.lotus .
-            docker build --target lotus-all-in-one -t filecoin/lotus-all-in-one:<< parameters.tag >> -f Dockerfile.lotus .
-            if [["[[ ! -z $CIRCLE_SHA1 ]]"]]; then
-              docker build --target lotus -t filecoin/lotus:$CIRCLE_SHA1 -f Dockerfile.lotus .
-              docker build --target lotus-all-in-one -t filecoin/lotus-all-in-one:$CIRCLE_SHA1 -f Dockerfile.lotus .
-            fi
-            if [["[[ ! -z $CIRCLE_TAG ]]"]]; then
-              docker build --target lotus -t filecoin/lotus:$CIRCLE_TAG -f Dockerfile.lotus .
-              docker build --target lotus-all-in-one -t filecoin/lotus-all-in-one:$CIRCLE_TAG -f Dockerfile.lotus .
-            fi
-      - run:
-          name: docker push
-          command: |
-            docker push filecoin/lotus:<< parameters.tag >>
-            docker push filecoin/lotus-all-in-one:<< parameters.tag >>
-            if [["[[ ! -z $CIRCLE_SHA1 ]]"]]; then
-              docker push filecoin/lotus:$CIRCLE_SHA1
-              docker push filecoin/lotus-all-in-one:$CIRCLE_SHA1
-            fi
-            if [["[[ ! -z $CIRCLE_TAG ]]"]]; then
-              docker push filecoin/lotus:$CIRCLE_TAG
-              docker push filecoin/lotus-all-in-one:$CIRCLE_TAG
-            fi
 
 workflows:
   version: 2.1
@@ -926,16 +887,6 @@ workflows:
             tags:
               only:
                 - /^v\d+\.\d+\.\d+(-rc\d+)?$/
-      - publish-dockerhub:
-          name: publish-dockerhub
-          tag: stable
-          filters:
-            branches:
-              ignore:
-                - /.*/
-            tags:
-              only:
-                - /^v\d+\.\d+\.\d+(-rc\d+)?$/
 
   nightly:
     triggers:
@@ -949,6 +900,3 @@ workflows:
       - publish-snapcraft:
           name: publish-snapcraft-nightly
           channel: edge
-      - publish-dockerhub:
-          name: publish-dockerhub-nightly
-          tag: nightly

.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,33 @@
+---
+name: Bug Report
+about: Create a report to help us improve
+title: "[BUG] "
+labels: hint/needs-triaging, kind/bug
+assignees: ''
+
+---
+
+> Note: For security-related bugs/issues, please follow the [security policy](https://github.com/filecoin-project/lotus/security/policy).
+
+**Describe the bug**
+A clear and concise description of what the bug is. 
+(If you are not sure what the bug is, try to figure it out via a [discussion](https://github.com/filecoin-project/lotus/discussions/new) first!
+
+**Version (run `lotus version`):**
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Run '...'
+2. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Logs**
+Provide daemon/miner/worker logs, and goroutines(if available) for troubleshooting.
+ 
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,92 +0,0 @@
-name: "Bug Report"
-description: "File a bug report to help us improve"
-labels: [need/triage, kind/bug]
-body:
-- type: checkboxes
-  attributes:
-    label: Checklist
-    description: Please check off the following boxes before continuing to file a bug report!
-    options:
-      - label: This is **not** a security-related bug/issue. If it is, please follow please follow the [security policy](https://github.com/filecoin-project/lotus/security/policy).
-        required: true
-      - label: This is **not** a question or a support request. If you have any lotus related questions, please ask in the [lotus forum](https://github.com/filecoin-project/lotus/discussions).
-        required: true
-      - label: This is **not** a new feature request. If it is, please file a [feature request](https://github.com/filecoin-project/lotus/issues/new?assignees=&labels=need%2Ftriage%2Ckind%2Ffeature&template=feature_request.yml) instead.
-        required: true
-      - label: This is **not** an enhancement request. If it is, please file a [improvement suggestion](https://github.com/filecoin-project/lotus/issues/new?assignees=&labels=need%2Ftriage%2Ckind%2Fenhancement&template=enhancement.yml) instead.
-        required: true
-      - label: I **have** searched on the [issue tracker](https://github.com/filecoin-project/lotus/issues) and the [lotus forum](https://github.com/filecoin-project/lotus/discussions), and there is no existing related issue or discussion.
-        required: true
-      - label: I am running the [`Latest release`](https://github.com/filecoin-project/lotus/releases), or the most recent RC(release canadiate) for the upcoming release or the dev branch(master), or have an issue updating to any of these.
-        required: true
-      - label: I did not make any code changes to lotus.
-        required: false
-- type: dropdown 
-  id: component-and-area
-  validations:
-    required: true
-  attributes:
-    label: Lotus component
-    description: Please select the lotus component you are filing a bug for
-    options:
-    - lotus daemon - chain sync
-    - lotus miner - mining and block production
-    - lotus miner/worker - sealing
-    - lotus miner - proving(WindowPoSt)
-    - lotus miner/market - storage deal
-    - lotus miner/market - retrieval deal
-    - lotus client
-    - lotus JSON-RPC API
-    - lotus message management (mpool)
-    - Other
-- type: textarea
-  id: version
-  attributes:
-    label: Lotus Version
-    description: Enter the output of `lotus version` and `lotus-miner version` if applicable.
-    placeholder: |
-      e.g. 
-      Daemon:1.11.0-rc2+debug+git.0519cd371.dirty+api1.3.0 
-      Local: lotus version 1.11.0-rc2+debug+git.0519cd371.dirty
-  validations:
-    reuiqred: true
-- type: textarea
-  id: Description
-  attributes:
-    label: Describe the Bug
-    description: |
-      This is where you get to tell us what went wrong, when doing so, please try to provide a clear and concise description of the bug with all related information:
-      * What you were doding when you experienced the bug?
-      * Any *error* messages you saw, *where* you saw them, and what you believe may have caused them (if you have any ideas).
-      * What is the expected behaviour?
-      * For sealing issues, include the output of `lotus-miner sectors status --log <sectorId>` for the failed sector(s).
-      * For proving issues, include the output of `lotus-miner proving` info.
-      * For deal making issues, include the output of `lotus client list-deals -v` and/or `lotus-miner storage-deals|retrieval-deals|data-transfers list [-v]` commands for the deal(s) in question.
-    render: bash
-  validations:
-    required: true
-- type: textarea
-  id: extraInfo
-  attributes:
-    label: Logging Information
-    description: |
-      Please provide debug logs of the problem, remember you can get set log level control for:
-      * lotus: use `lotus log list` to get all log systems available and set level by `lotus log set-level`. An example can be found [here](https://docs.filecoin.io/get-started/lotus/configuration-and-advanced-usage/#log-level-control).
-      * lotus-miner:`lotus-miner log list` to get all log systems available and set level by `lotus-miner log set-level
-      If you don't provide detailed logs when you raise the issue it will almost certainly be the first request I make before furthur diagnosing the problem.
-      render: bash
-  validations:
-    required: true
-- type: textarea
-  id: RepoSteps
-  attributes:
-    label: Repo Steps
-    description: "Steps to reproduce the behavior"
-    value: |
-      1. Run '...'
-      2. Do '...'
-      3. See error '...'
-      ...
-    render: bash
-  validations:
-    required: false

.github/ISSUE_TEMPLATE/deal-making-issues.md

@@ -0,0 +1,49 @@
+---
+name: Deal Making Issues
+about: Create a report for help with deal making failures.
+title: "[Deal Making Issue]"
+labels: hint/needs-triaging, area/markets
+assignees: ''
+
+---
+
+> Note: For security-related bugs/issues, please follow the [security policy](https://github.com/filecoin-project/lotus/security/policy).
+
+Please provide all the information requested here to help us troubleshoot "deal making failed" issues.
+If the information requested is missing, we will probably have to just ask you to provide it anyway,
+before we can help debug.
+
+**Basic Information**
+Including information like, Are you the client or the miner? Is this a storage deal or a retrieval deal? Is it an offline deal?
+
+**Describe the problem**
+
+A brief description of the problem you encountered while trying to make a deal. 
+
+**Version**
+
+The output of `lotus --version`.
+
+**Setup**
+
+You miner(if applicable) and daemon setup, i.e: What hardware do you use, how much ram and etc.
+
+**To Reproduce**
+ Steps to reproduce the behavior:
+ 1. Run '...'
+ 2. See error
+
+**Deal status**
+
+The output of `lotus client list-deals -v` and/or `lotus-miner storage-deals|retrieval-deals|data-transfers list [-v]` commands for the deal(s) in question.
+
+**Lotus daemon and miner logs**
+
+Please go through the logs of your daemon and miner(if applicable), and include screenshots of any error/warning-like messages you find.
+
+Alternatively please upload full log files and share a link here
+
+** Code modifications **
+
+If you have modified parts of lotus, please describe which areas were modified,
+and the scope of those modifications

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -1,44 +0,0 @@
-name: Enhancement
-description:  Suggest an improvement to an existing lotus feature.
-labels: [need/triage, kind/enhancement]
-body:
-- type: checkboxes
-  attributes:
-    label: Checklist
-    description: Please check off the following boxes before continuing to create an improvement suggestion!
-    options:
-      - label: This is **not** a new feature or an enhancement to the Filecoin protocol. If it is,  please open an [FIP issue](https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0001.md).
-        required: true
-      - label: This is **not** a new feature request. If it is, please file a [feature request](https://github.com/filecoin-project/lotus/issues/new?assignees=&labels=need%2Ftriage%2Ckind%2Ffeature&template=feature_request.yml) instead.
-        required: true
-      - label: This is **not** brainstorming ideas. If you have an idea you'd like to discuss, please open a new discussion on [the lotus forum](https://github.com/filecoin-project/lotus/discussions/categories/ideas) and select the category as `Ideas`.
-        required: true
-      - label: I **have** a specific, actionable, and well motivated improvement to propose.
-        required: true
-- type: dropdown 
-  id: component
-  validations:
-    required: true
-  attributes:
-    label: Lotus component
-    description: Please select the lotus component you are propoing improvement for
-    options:
-      - lotus daemon - chain sync
-      - lotus miner - mining and block production
-      - lotus miner/worker - sealing
-      - lotus miner - proving(WindowPoSt)
-      - lotus miner/market - storage deal
-      - lotus miner/market - retrieval deal
-      - lotus client
-      - lotus JSON-RPC API
-      - lotus message management (mpool)
-      - Other
-- type: textarea
-  id: request
-  attributes:
-    label: Improvement Suggestion
-    description: A clear and concise description of what the motivation or the current problem is and what is the suggested improvement?
-    placeholder: Ex. Currently lotus... However, as a storage provider, I'd like...
-  validations:
-    required: true
-

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[Feature Request]"
+labels: hint/needs-triaging
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,63 +0,0 @@
-name: Feature request
-description:  Suggest an idea for lotus
-labels: [need/triage, kind/feature]
-body:
-- type: checkboxes
-  attributes:
-    label: Checklist
-    description: Please check off the following boxes before continuing to create a new feature request!
-    options:
-      - label: This is **not** a new feature or an enhancement to the Filecoin protocol. If it is,  please open an [FIP issue](https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0001.md).
-        required: true
-      - label: This is **not** brainstorming ideas. If you have an idea you'd like to discuss, please open a new discussion on [the lotus forum](https://github.com/filecoin-project/lotus/discussions/categories/ideas) and select the category as `Ideas`.
-        required: true
-      - label: I **have** a specific, actionable, and well motivated feature request to propose.
-        required: true
-- type: dropdown 
-  id: component
-  validations:
-    required: true
-  attributes:
-    label: Lotus component
-    description: Please select the lotus component you are requesting a new feature for
-    options:
-      - lotus daemon - chain sync
-      - lotus miner - mining and block production
-      - lotus miner/worker - sealing
-      - lotus miner - proving(WindowPoSt)
-      - lotus miner/market - storage deal
-      - lotus miner/market - retrieval deal
-      - lotus client
-      - lotus JSON-RPC API
-      - lotus message management (mpool)
-      - Other
-- type: textarea
-  id: request
-  attributes:
-    label: What is the motivation behind this feature request? Is your feature request related to a problem? Please describe.
-    description: A clear and concise description of what the motivation or the problem is. 
-    placeholder: Ex. I'm always frustrated when [...]
-  validations:
-    required: true
-- type: textarea
-  id: solution
-  attributes:
-    label: Describe the solution you'd like
-    description: A clear and concise description of what you want to happen. 
-  validations:
-    required: true
-- type: textarea
-  id: alternates
-  attributes:
-    label: Describe alternatives you've considered
-    description: A clear and concise description of any alternative solutions or features you've considered.
-  validations:
-    required: false
-- type: textarea
-  id: extra
-  attributes:
-    label: Additional context
-    description: Add any other context, design docs or screenshots about the feature request here.
-  validations:
-    required: false
-

.github/ISSUE_TEMPLATE/m1_bug_report_deal.yml

@@ -1,91 +0,0 @@
-name: "M1 Bug Report For Deal Making"
-description: "File a bug report around deal making for the M1 releases"
-labels: [need/triage, kind/bug, M1-release]
-body:
-- type: checkboxes
-  id: checklist
-  attributes:
-    label: Checklist
-    description: Please check off the following boxes before continuing to file a bug report!
-    options:
-      - label: This is **not** a question or a support request. If you have any lotus related questions, please ask in the [lotus forum](https://github.com/filecoin-project/lotus/discussions).
-        required: true
-      - label: I **am** reporting a bug w.r.t one of the [M1 tags](https://github.com/filecoin-project/lotus/discussions/6852#discussioncomment-1043951). If not, choose another issue option [here](https://github.com/filecoin-project/lotus/issues/new/choose).
-        required: true
-      - label: I **am** reporting a bug around deal making. If not, create a [M1 Bug Report For Non Deal Making Issue](https://github.com/filecoin-project/lotus/issues/new?assignees=&labels=need%2Ftriage%2Ckind%2Fbug%2CM1-release&template=m1_bug_report_non_deal.yml).
-        required: true
-      - label: I have my log level set as instructed [here](https://github.com/filecoin-project/lotus/discussions/6852#discussioncomment-1043678) and have logs available for troubleshooting.
-        required: true
-      - label: The deal is coming from one of the M1 clients(communitcated in the coordination slack channel).
-        required: true
-      - label: I **have** searched on the [issue tracker](https://github.com/filecoin-project/lotus/issues) and the [lotus forum](https://github.com/filecoin-project/lotus/discussions), and there is no existing related issue or discussion.
-        required: true
-- type: dropdown 
-  id: lotus-componets
-  validations:
-    required: true
-  attributes:
-    label: Lotus Component
-    description: Please select the lotus component you are filing a bug for
-    options:
-    - lotus miner market subsystem - storage deal
-    - lotus miner market subsystem - retrieval deal
-    - lotus miner - storage deal
-    - lotus miner - retrieval deal
-- type: textarea
-  id: version
-  attributes:
-    label: Lotus Tag and  Version
-    description: Enter the  lotus tag, output of `lotus version` and `lotus-miner version`.
-  validations:
-    reuiqred: true
-- type: textarea
-  id: Description
-  attributes:
-    label: Describe the Bug
-    description: |
-      This is where you get to tell us what went wrong, when doing so, please try to provide a clear and concise description of the bug with all related information:
-      * What you were doding when you experienced the bug?
-      * Any *error* messages you saw, *where* you saw them, and what you believe may have caused them (if you have any ideas).
-      * What is the expected behaviour?
-    render: bash
-  validations:
-    required: true
-- type: textarea
-  id: deal-status
-  attributes:
-    label: Deal Status
-    description: What's the status of the deal?
-    placeholder: |
-      Please share the output of `lotus-miner storage-deals|retrieval-deals list [-v]` commands for the deal(s) in question.
-  validations:
-    required: true
-- type: textarea
-  id: data-transfer-status
-  attributes:
-    label: Data Transfer Status
-    description: What's the status of the data transfer?
-    placeholder: |
-      Please share the output of `lotus-miner data-transfers list -v` commands for the deal(s) in question.
-  validations:
-    required: true
-- type: textarea
-  id: logging
-  attributes:
-    label: Logging Information
-    description: Please link to the whole of the miner logs on your side of the transaction. You can upload the logs to a [gist](https://gist.github.com).
-  validations:
-    required: true
-- type: textarea
-  id: RepoSteps
-  attributes:
-    label: Repo Steps (optional)
-    description: "Steps to reproduce the behavior"
-    value: |
-      1. Run '...'
-      2. Do '...'
-      3. See error '...'
-      ...
-    render: bash
-  validations:
-    required: false

.github/ISSUE_TEMPLATE/m1_bug_report_non_deal.yml

@@ -1,81 +0,0 @@
-name: "M1 Bug Report For Non Deal Making Issue"
-description: "File a bug report around non deal making issue for the M1 releases"
-labels: [need/triage, kind/bug, M1-release]
-body:
-- type: checkboxes
-  id: checklist
-  attributes:
-    label: Checklist
-    description: Please check off the following boxes before continuing to file a bug report!
-    options:
-      - label: This is **not** a question or a support request. If you have any lotus related questions, please ask in the [lotus forum](https://github.com/filecoin-project/lotus/discussions).
-        required: true
-      - label: I **am** reporting a bug w.r.t one of the [M1 tags](https://github.com/filecoin-project/lotus/discussions/6852#discussioncomment-1043951). If not, choose another issue option [here](https://github.com/filecoin-project/lotus/issues/new/choose).
-        required: true
-      - label: I am **not** reporting a bug around deal making. If yes, create a [M1 Bug Report For Deal Making](https://github.com/filecoin-project/lotus/issues/new?assignees=&labels=need%2Ftriage%2Ckind%2Fbug%2CM1-release&template=m1_bug_report_deal.yml).
-        required: true
-      - label: I **have** searched on the [issue tracker](https://github.com/filecoin-project/lotus/issues) and the [lotus forum](https://github.com/filecoin-project/lotus/discussions), and there is no existing related issue or discussion.
-        required: true
-- type: dropdown 
-  id: component-and-area
-  validations:
-    required: true
-  attributes:
-    label: Lotus component
-    description: Please select the lotus component you are filing a bug for
-    options:
-    - lotus daemon - chain sync **with** splitstore enabled
-    - lotus daemon - chain sync **without** splitstore enabled
-    - lotus miner - mining and block production
-    - lotus miner/worker - sealing
-    - lotus miner - proving(WindowPoSt)
-    - lotus client
-    - lotus JSON-RPC API
-    - lotus message management (mpool)
-    - Other
-- type: textarea
-  id: version
-  attributes:
-    label: Lotus Tag and  Version
-    description: Enter the  lotus tag, output of `lotus version` and `lotus-miner version`.
-  validations:
-    reuiqred: true
-- type: textarea
-  id: Description
-  attributes:
-    label: Describe the Bug
-    description: |
-      This is where you get to tell us what went wrong, when doing so, please try to provide a clear and concise description of the bug with all related information:
-      * What you were doding when you experienced the bug?
-      * Any *error* messages you saw, *where* you saw them, and what you believe may have caused them (if you have any ideas).
-      * What is the expected behaviour?
-      * For sealing issues, include the output of `lotus-miner sectors status --log <sectorId>` for the failed sector(s).
-      * For proving issues, include the output of `lotus-miner proving` info.
-    render: bash
-  validations:
-    required: true
-- type: textarea
-  id: extraInfo
-  attributes:
-    label: Logging Information
-    description: |
-      Please provide debug logs of the problem, remember you can get set log level control for:
-      * lotus: use `lotus log list` to get all log systems available and set level by `lotus log set-level`. An example can be found [here](https://docs.filecoin.io/get-started/lotus/configuration-and-advanced-usage/#log-level-control).
-      * lotus-miner:`lotus-miner log list` to get all log systems available and set level by `lotus-miner log set-level
-      If you don't provide detailed logs when you raise the issue it will almost certainly be the first request I make before furthur diagnosing the problem.
-    render: bash
-  validations:
-    required: true
-- type: textarea
-  id: RepoSteps
-  attributes:
-    label: Repo Steps
-    description: "Steps to reproduce the behavior"
-    value: |
-      1. Run '...'
-      2. Do '...'
-      3. See error '...'
-      ...
-    render: bash
-  validations:
-    required: false

.github/ISSUE_TEMPLATE/mining-issues.md

@@ -0,0 +1,35 @@
+---
+name: Mining Issues
+about: Create a report for help with mining failures.
+title: "[Mining Issue]"
+labels: hint/needs-triaging, area/mining
+assignees: ''
+
+---
+
+> Note: For security-related bugs/issues, please follow the [security policy](https://github.com/filecoin-project/lotus/security/policy).
+
+Please provide all the information requested here to help us troubleshoot "mining/WinningPoSt failed" issues.
+If the information requested is missing, you may be asked you to provide it.
+
+**Describe the problem**
+A brief description of the problem you encountered while mining new blocks.
+
+**Version**
+
+The output of `lotus --version`.
+
+**Setup**
+
+You miner and daemon setup, including what hardware do you use, your environment variable settings, how do you run your miner and worker, do you use GPU and etc.
+
+**Lotus daemon and miner logs**
+
+Please go through the logs of your daemon and miner, and include screenshots of any error/warning-like messages you find, highlighting the one has "winning post" in it.
+
+Alternatively please upload full log files and share a link here
+
+** Code modifications **
+
+If you have modified parts of lotus, please describe which areas were modified,
+and the scope of those modifications

.github/ISSUE_TEMPLATE/proving-issues.md

@@ -0,0 +1,46 @@
+---
+name: Proving Issues
+about: Create a report for help with proving failures.
+title: "[Proving Issue]"
+labels: area/proving, hint/needs-triaging
+assignees: ''
+
+---
+
+> Note: For security-related bugs/issues, please follow the [security policy](https://github.com/filecoin-project/lotus/security/policy).
+
+Please provide all the information requested here to help us troubleshoot "proving/window PoSt failed" issues.
+If the information requested is missing, we will probably have to just ask you to provide it anyway,
+before we can help debug.
+
+**Describe the problem**
+A brief description of the problem you encountered while proving the storage.
+
+**Version**
+
+The output of `lotus --version`.
+
+**Setup**
+
+You miner and daemon setup, including what hardware do you use, your environment variable settings, how do you run your miner and worker, do you use GPU and etc.
+
+**Proving status**
+
+The output of `lotus-miner proving` info.
+
+**Lotus miner logs**
+
+Please go through the logs of your miner, and include screenshots of any error-like messages you find, highlighting the one has "window post" in it.
+
+Alternatively please upload full log files and share a link here
+
+**Lotus miner diagnostic info**
+
+Please collect the following diagnostic information, and share a link here
+
+* lotus-miner diagnostic info `lotus-miner info all > allinfo.txt`
+
+** Code modifications **
+
+If you have modified parts of lotus, please describe which areas were modified,
+and the scope of those modifications

.github/ISSUE_TEMPLATE/sealing-issues.md

@@ -0,0 +1,50 @@
+---
+name: Sealing Issues
+about: Create a report for help with sealing (commit) failures.
+title: "[Sealing Issue]"
+labels: hint/needs-triaging, area/sealing
+assignees: ''
+
+---
+
+> Note: For security-related bugs/issues, please follow the [security policy](https://github.com/filecoin-project/lotus/security/policy).
+
+Please provide all the information requested here to help us troubleshoot "commit failed" issues.
+If the information requested is missing, we will probably have to just ask you to provide it anyway,
+before we can help debug.
+
+**Describe the problem**
+A brief description of the problem you encountered while sealing a sector.
+
+**Version**
+
+The output of `lotus --version`.
+
+**Setup**
+
+You miner and daemon setup, including what hardware do you use, your environment variable settings, how do you run your miner and worker, do you use GPU and etc.
+
+**Commands**
+
+Commands you ran.
+
+**Sectors status**
+
+The output of `lotus-miner sectors status --log <sectorId>` for the failed sector(s).
+
+**Lotus miner logs**
+
+Please go through the logs of your miner, and include screenshots of any error-like messages you find.
+
+Alternatively please upload full log files and share a link here
+
+**Lotus miner diagnostic info**
+
+Please collect the following diagnostic information, and share a link here
+
+* lotus-miner diagnostic info `lotus-miner info all > allinfo`
+
+** Code modifications **
+
+If you have modified parts of lotus, please describe which areas were modified,
+and the scope of those modifications

.github/workflows/stale.yml

@@ -2,7 +2,7 @@ name: Close and mark stale issue
 
 on:
   schedule:
-  - cron: '0 12 * * *'
+  - cron: '0 0 * * *'
 
 jobs:
   stale:
@@ -18,16 +18,10 @@ jobs:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'Oops, seems like we needed more information for this issue, please comment with more details or this issue will be closed in 24 hours.'
         close-issue-message: 'This issue was closed because it is missing author input.'
-        stale-pr-message: 'Thank you for submitting the PR and contributing to lotus! Lotus maintainers need more of your input before merging it, please address the suggested changes or reply to the comments or this PR will be closed in 48 hours. You are always more than welcome to reopen the PR later as well!'
-        close-pr-message: 'This PR was closed because it is missing author input. Please feel free to reopen the PR when you get to it! Thank you for your interest in contributing to lotus!'
         stale-issue-label: 'kind/stale'
-        stale-pr-label: 'kind/stale'
-        any-of-labels: 'need/author-input '
-        days-before-issue-stale: 3
+        any-of-labels: 'hint/needs-author-input'
+        days-before-issue-stale: 5
         days-before-issue-close: 1
-        days-before-pr-stale: 5
-        days-before-pr-close: 2
-        remove-stale-when-updated: true
         enable-statistics: true
        
 

CHANGELOG.md

@@ -1,441 +1,5 @@
 # Lotus changelog
 
-# 1.11.1 / 2021-08-16
-
-> Note: for discussion about this release, please comment [here](https://github.com/filecoin-project/lotus/discussions/6904)
-
-This is a  **highly recommended** but optional Lotus v1.11.1 release that introduces many deal making and datastore improvements and new features along with other bug fixes. 
-
-## Highlights
-- ⭐️⭐️⭐️[**lotus-miner market subsystem**](https://docs.filecoin.io/mine/lotus/split-markets-miners/#frontmatter-title) is introduced in this release! It is **highly recommended** for storage providers to run markets processes on a separate machine! Doing so, only this machine needs to exposes public ports for deal making. This also means that the other miner operations can now be completely isolated by from the deal making processes and storage providers can stop and restarts the markets process without affecting an ongoing Winning/Window PoSt!
-  - More details on the concepts, architecture and how to split the market process can be found [here](https://docs.filecoin.io/mine/lotus/split-markets-miners/#concepts). 
-  - Base on your system setup(running on separate machines, same machine and so on), please see the suggested practice by community members [here](https://github.com/filecoin-project/lotus/discussions/7047#discussion-3515335).
-    - Note: if you are running lotus-worker on a different machine, you will need to set `MARKETS_API_INFO` for certain CLI to work properly. This will be improved by #7072.
-  - Huge thanks to MinerX fellows for [helping testing the implementation, reporting the issues so they were fixed by now and providing feedbacks](https://github.com/filecoin-project/lotus/discussions/6861) to user docs in the past three weeks!
-- Config for collateral from miner available balance ([filecoin-project/lotus#6629](https://github.com/filecoin-project/lotus/pull/6629)) 
-  - Better control your sector collateral payment by setting `CollateralFromMinerBalance`, `AvailableBalanceBuffer` and `DisableCollateralFallback`.
-    - `CollateralFromMinerBalance`:  whether to use available miner balance for sector collateral instead of sending it with each message, default is `false`.
-    - `AvailableBalanceBuffer`: minimum available balance to keep in the miner actor before sending it with messages, default is 0FIL.
-    - `DisableCollateralFallback`: whether to send collateral with messages even if there is no available balance in the miner actor, default is `false`.
-- Config for deal publishing control addresses ([filecoin-project/lotus#6697](https://github.com/filecoin-project/lotus/pull/6697))
-  - Set `DealPublishControl` to set the wallet used for sending `PublishStorageDeals` messages, instructions [here](https://docs.filecoin.io/mine/lotus/miner-addresses/#control-addresses).
-- Config UX improvements ([filecoin-project/lotus#6848](https://github.com/filecoin-project/lotus/pull/6848))
-  - You can now preview the the default and updated node config by running `lotus/lotus-miner config default/updated`  
-  
-## New Features
-  - ⭐️⭐️⭐️ Support standalone miner-market process ([filecoin-project/lotus#6356](https://github.com/filecoin-project/lotus/pull/6356))
-  - **⭐️⭐️ Experimental** [Splitstore]((https://github.com/filecoin-project/lotus/blob/master/blockstore/splitstore/README.md)) (more details coming in v1.11.2! Stay tuned! Join the discussion [here](https://github.com/filecoin-project/lotus/discussions/5788) if you have questions!) :
-    - Improve splitstore warmup ([filecoin-project/lotus#6867](https://github.com/filecoin-project/lotus/pull/6867))
-    - Moving GC for badger ([filecoin-project/lotus#6854](https://github.com/filecoin-project/lotus/pull/6854))
-    - splitstore shed utils ([filecoin-project/lotus#6811](https://github.com/filecoin-project/lotus/pull/6811))
-    - fix warmup by decoupling state from message receipt walk ([filecoin-project/lotus#6841](https://github.com/filecoin-project/lotus/pull/6841))
-    - Splitstore: support on-disk marksets using badger ([filecoin-project/lotus#6833](https://github.com/filecoin-project/lotus/pull/6833)) 
-    - cache loaded block messages ([filecoin-project/lotus#6760](https://github.com/filecoin-project/lotus/pull/6760))
-    - Splitstore: add retention policy option for keeping messages in the hotstore ([filecoin-project/lotus#6775](https://github.com/filecoin-project/lotus/pull/6775))
-    - Introduce the LOTUS_CHAIN_BADGERSTORE_DISABLE_FSYNC envvar ([filecoin-project/lotus#6817](https://github.com/filecoin-project/lotus/pull/6817))
-    - Splitstore: add support for protecting out of chain references in the blockstore ([filecoin-project/lotus#6777](https://github.com/filecoin-project/lotus/pull/6777))
-    - Implement exposed splitstore ([filecoin-project/lotus#6762](https://github.com/filecoin-project/lotus/pull/6762))
-    - Splitstore code reorg ([filecoin-project/lotus#6756](https://github.com/filecoin-project/lotus/pull/6756))
-    - Splitstore: Some small fixes ([filecoin-project/lotus#6754](https://github.com/filecoin-project/lotus/pull/6754))
-    - Splitstore Enhanchements ([filecoin-project/lotus#6474](https://github.com/filecoin-project/lotus/pull/6474))
-  - lotus-shed: initial export cmd for markets related metadata ([filecoin-project/lotus#6840](https://github.com/filecoin-project/lotus/pull/6840))
-  - add a very verbose -vv flag to lotus and lotus-miner. ([filecoin-project/lotus#6888](https://github.com/filecoin-project/lotus/pull/6888))
-  - Add allocated sectorid vis ([filecoin-project/lotus#4638](https://github.com/filecoin-project/lotus/pull/4638))
-  - add a command for compacting sector numbers bitfield ([filecoin-project/lotus#4640](https://github.com/filecoin-project/lotus/pull/4640))  
-    - Run `lotus-miner actor compact-allocated` to compact sector number allocations to reduce the size of the allocated sector number bitfield.
-  - Add ChainGetMessagesInTipset API ([filecoin-project/lotus#6642](https://github.com/filecoin-project/lotus/pull/6642))
-  - Handle the --color flag via proper global state ([filecoin-project/lotus#6743](https://github.com/filecoin-project/lotus/pull/6743))
-     - Enable color by default only if os.Stdout is a TTY ([filecoin-project/lotus#6696](https://github.com/filecoin-project/lotus/pull/6696))
-     - Stop outputing ANSI color on non-TTY ([filecoin-project/lotus#6694](https://github.com/filecoin-project/lotus/pull/6694))
-  - Envvar to disable slash filter ([filecoin-project/lotus#6620](https://github.com/filecoin-project/lotus/pull/6620))
-  - commit batch: AggregateAboveBaseFee config ([filecoin-project/lotus#6650](https://github.com/filecoin-project/lotus/pull/6650))
-  - shed tool to estimate aggregate network fees ([filecoin-project/lotus#6631](https://github.com/filecoin-project/lotus/pull/6631))
-  
-## Bug Fixes
-  - Fix padding of deals, which only partially shipped in #5988 ([filecoin-project/lotus#6683](https://github.com/filecoin-project/lotus/pull/6683))
-  - fix deal concurrency test failures by upgrading graphsync and others ([filecoin-project/lotus#6724](https://github.com/filecoin-project/lotus/pull/6724))
-  - fix: on randomness change, use new rand ([filecoin-project/lotus#6805](https://github.com/filecoin-project/lotus/pull/6805))  - fix: always check if StateSearchMessage returns nil ([filecoin-project/lotus#6802](https://github.com/filecoin-project/lotus/pull/6802))  
-  - test: fix flaky window post tests ([filecoin-project/lotus#6804](https://github.com/filecoin-project/lotus/pull/6804))
-  -  wrap close(wait) with sync.Once to avoid panic ([filecoin-project/lotus#6800](https://github.com/filecoin-project/lotus/pull/6800))
-  - fixes #6786 segfault ([filecoin-project/lotus#6787](https://github.com/filecoin-project/lotus/pull/6787))
-  -  ClientRetrieve stops on cancel([filecoin-project/lotus#6739](https://github.com/filecoin-project/lotus/pull/6739))
-  - Fix bugs in sectors extend --v1-sectors ([filecoin-project/lotus#6066](https://github.com/filecoin-project/lotus/pull/6066))
-  - fix "lotus-seed genesis car" error "merkledag: not found" ([filecoin-project/lotus#6688](https://github.com/filecoin-project/lotus/pull/6688))
-  - Get retrieval pricing input should not error out on a deal state fetch ([filecoin-project/lotus#6679](https://github.com/filecoin-project/lotus/pull/6679))
-  - Fix more CID double-encoding as hex ([filecoin-project/lotus#6680](https://github.com/filecoin-project/lotus/pull/6680))  
-  - storage: Fix FinalizeSector with sectors in stoage paths ([filecoin-project/lotus#6653](https://github.com/filecoin-project/lotus/pull/6653))
-  - Fix tiny error in check-client-datacap ([filecoin-project/lotus#6664](https://github.com/filecoin-project/lotus/pull/6664))
-  - Fix: precommit_batch method used the wrong cfg.CommitBatchWait ([filecoin-project/lotus#6658](https://github.com/filecoin-project/lotus/pull/6658))
-  - fix ticket expiration check ([filecoin-project/lotus#6635](https://github.com/filecoin-project/lotus/pull/6635))
-  - remove precommit check in handleCommitFailed ([filecoin-project/lotus#6634](https://github.com/filecoin-project/lotus/pull/6634))
-  - fix prove commit aggregate send token amount ([filecoin-project/lotus#6625](https://github.com/filecoin-project/lotus/pull/6625))
-  
-## Improvements
-  - Eliminate inefficiency in markets logging ([filecoin-project/lotus#6895](https://github.com/filecoin-project/lotus/pull/6895))
-  - rename `cmd/lotus{-storage=>}-miner` to match binary. ([filecoin-project/lotus#6886](https://github.com/filecoin-project/lotus/pull/6886))
-  - fix racy TestSimultanenousTransferLimit. ([filecoin-project/lotus#6862](https://github.com/filecoin-project/lotus/pull/6862))
-  - ValidateBlock: Assert that block header height's are greater than parents ([filecoin-project/lotus#6872](https://github.com/filecoin-project/lotus/pull/6872))
-  - feat: Don't panic when api impl is nil ([filecoin-project/lotus#6857](https://github.com/filecoin-project/lotus/pull/6857))
-  - add docker-compose file ([filecoin-project/lotus#6544](https://github.com/filecoin-project/lotus/pull/6544))
-  - easy way to make install app ([filecoin-project/lotus#5183](https://github.com/filecoin-project/lotus/pull/5183))
-  - api: Separate the Net interface from Common ([filecoin-project/lotus#6627](https://github.com/filecoin-project/lotus/pull/6627))  - add StateReadState to gateway api ([filecoin-project/lotus#6818](https://github.com/filecoin-project/lotus/pull/6818))  
-  - add SealProof in SectorBuilder ([filecoin-project/lotus#6815](https://github.com/filecoin-project/lotus/pull/6815))
-  - sealing: Handle preCommitParams errors more correctly ([filecoin-project/lotus#6763](https://github.com/filecoin-project/lotus/pull/6763)) 
-  - ClientFindData: always fetch peer id from chain ([filecoin-project/lotus#6807](https://github.com/filecoin-project/lotus/pull/6807))
-  - test: handle null blocks in TestForkRefuseCall ([filecoin-project/lotus#6758](https://github.com/filecoin-project/lotus/pull/6758))
-  - Add more deal details to lotus-miner info ([filecoin-project/lotus#6708](https://github.com/filecoin-project/lotus/pull/6708))
-  - add election backtest ([filecoin-project/lotus#5950](https://github.com/filecoin-project/lotus/pull/5950))
-  - add dollar sign ([filecoin-project/lotus#6690](https://github.com/filecoin-project/lotus/pull/6690))
-  - get-actor cli spelling fix ([filecoin-project/lotus#6681](https://github.com/filecoin-project/lotus/pull/6681))
-  - polish(statetree): accept a context in statetree diff for timeouts ([filecoin-project/lotus#6639](https://github.com/filecoin-project/lotus/pull/6639))
-  - Add helptext to lotus chain export ([filecoin-project/lotus#6672](https://github.com/filecoin-project/lotus/pull/6672))
-  - add an incremental nonce itest. ([filecoin-project/lotus#6663](https://github.com/filecoin-project/lotus/pull/6663))
-  - commit batch: Initialize the FailedSectors map ([filecoin-project/lotus#6647](https://github.com/filecoin-project/lotus/pull/6647))
-  - Fast-path retry submitting commit aggregate if commit is still valid  ([filecoin-project/lotus#6638](https://github.com/filecoin-project/lotus/pull/6638))
-  - Reuse timers in sealing batch logic ([filecoin-project/lotus#6636](https://github.com/filecoin-project/lotus/pull/6636))
-  
-## Dependency Updates
-  - Update to proof v8.0.3 ([filecoin-project/lotus#6890](https://github.com/filecoin-project/lotus/pull/6890))
-  - update to go-fil-market v1.6.0 ([filecoin-project/lotus#6885](https://github.com/filecoin-project/lotus/pull/6885)) 
-  - Bump go-multihash, adjust test for supported version ([filecoin-project/lotus#6674](https://github.com/filecoin-project/lotus/pull/6674))
-  - github.com/filecoin-project/go-data-transfer (v1.6.0 -> v1.7.2):
-  - github.com/filecoin-project/go-fil-markets (v1.5.0 -> v1.6.2):
-  - github.com/filecoin-project/go-padreader (v0.0.0-20200903213702-ed5fae088b20 -> v0.0.0-20210723183308-812a16dc01b1)
-  - github.com/filecoin-project/go-state-types (v0.1.1-0.20210506134452-99b279731c48 -> v0.1.1-0.20210810190654-139e0e79e69e)
-  - github.com/filecoin-project/go-statemachine (v0.0.0-20200925024713-05bd7c71fbfe -> v1.0.1)
-  - update go-libp2p-pubsub to v0.5.0 ([filecoin-project/lotus#6764](https://github.com/filecoin-project/lotus/pull/6764))
-  
-## Others
-  - Master->v1.11.1 ([filecoin-project/lotus#7051](https://github.com/filecoin-project/lotus/pull/7051))
-  - v1.11.1-rc2 ([filecoin-project/lotus#6966](https://github.com/filecoin-project/lotus/pull/6966))
-  - Backport master -> v1.11.1 ([filecoin-project/lotus#6965](https://github.com/filecoin-project/lotus/pull/6965))
-  - Fixes in master -> release ([filecoin-project/lotus#6933](https://github.com/filecoin-project/lotus/pull/6933))
-  - Add changelog  for v1.11.1-rc1 and bump the version ([filecoin-project/lotus#6900](https://github.com/filecoin-project/lotus/pull/6900))
-  - Fix  merge release -> v1.11.1 ([filecoin-project/lotus#6897](https://github.com/filecoin-project/lotus/pull/6897)) 
-  - Update RELEASE_ISSUE_TEMPLATE.md ([filecoin-project/lotus#6880](https://github.com/filecoin-project/lotus/pull/6880))
-  - Add github actions for staled pr ([filecoin-project/lotus#6879](https://github.com/filecoin-project/lotus/pull/6879))
-  - Update issue templates and add templates for M1 ([filecoin-project/lotus#6856](https://github.com/filecoin-project/lotus/pull/6856))
-  - Fix links in issue templates
-  - Update issue templates to forms ([filecoin-project/lotus#6798](https://github.com/filecoin-project/lotus/pull/6798)
-  - Nerpa v13 upgrade ([filecoin-project/lotus#6837](https://github.com/filecoin-project/lotus/pull/6837))
-  - add docker-compose file ([filecoin-project/lotus#6544](https://github.com/filecoin-project/lotus/pull/6544))
-  - release -> master ([filecoin-project/lotus#6828](https://github.com/filecoin-project/lotus/pull/6828))
-  - Resurrect CODEOWNERS, but for maintainers group ([filecoin-project/lotus#6773](https://github.com/filecoin-project/lotus/pull/6773))
-  - Master disclaimer  ([filecoin-project/lotus#6757](https://github.com/filecoin-project/lotus/pull/6757))
-  - Create stale.yml ([filecoin-project/lotus#6747](https://github.com/filecoin-project/lotus/pull/6747))
-  - Release template: Update all testnet infra at once ([filecoin-project/lotus#6710](https://github.com/filecoin-project/lotus/pull/6710))
-  - Release Template: remove binary validation step ([filecoin-project/lotus#6709](https://github.com/filecoin-project/lotus/pull/6709))
-  - Reset of the interop network ([filecoin-project/lotus#6689](https://github.com/filecoin-project/lotus/pull/6689))  
-  - Update version.go to 1.11.1 ([filecoin-project/lotus#6621](https://github.com/filecoin-project/lotus/pull/6621))
-  
-## Contributors
-
-| Contributor | Commits | Lines ± | Files Changed |
-|-------------|---------|---------|---------------|
-| @vyzo | 313 | +8928/-6010 | 415 |
-| @nonsense | 103 | +6041/-4041 | 304 |
-| @magik6k | 37 | +3851/-1611 | 146 |
-| @ZenGround0 | 24 | +1693/-1394 | 95 |
-| @placer14 | 1 | +2310/-578 | 8 |
-| @dirkmc | 7 | +1154/-726 | 29 |
-| @raulk | 44 | +969/-616 | 141 |
-| @jennijuju | 15 | +682/-354 | 47 |
-| @ribasushi | 18 | +469/-273 | 64 |
-| @coryschwartz | 5 | +576/-135 | 14 |
-| @hunjixin | 7 | +404/-82 | 19 |
-| @dirkmc | 17 | +348/-47 | 17 |
-| @tchardin | 2 | +262/-34 | 5 |
-| @aarshkshah1992 | 9 | +233/-63 | 44 |
-| @Kubuxu | 4 | +254/-16 | 4 |
-| @hannahhoward | 6 | +163/-75 | 8 |
-| @whyrusleeping | 4 | +157/-16 | 9 |
-| @Whyrusleeping | 2 | +87/-66 | 10 |
-| @arajasek | 10 | +81/-53 | 13 |
-| @zgfzgf | 2 | +104/-4 | 2 |
-| @aarshkshah1992 | 6 | +85/-19 | 10 |
-| @llifezou | 4 | +59/-20 | 4 |
-| @Stebalien | 7 | +47/-17 | 9 |
-| @johnli-helloworld | 3 | +46/-15 | 5 |
-| @frrist | 1 | +28/-23 | 2 |
-| @hannahhoward | 4 | +46/-5 | 11 |
-| @Jennifer | 4 | +31/-2 | 4 |
-| @wangchao | 1 | +1/-27 | 1 |
-| @jennijuju | 2 | +7/-21 | 2 |
-| @chadwick2143 | 1 | +15/-1 | 1 |
-| @Jerry | 2 | +9/-4 | 2 |
-| Steve Loeppky | 2 | +12/-0 | 2 |
-| David Dias | 1 | +9/-0 | 1 |
-| dependabot[bot] | 1 | +3/-3 | 1 |
-| zhoutian527 | 1 | +2/-2 | 1 |
-| xloem | 1 | +4/-0 | 1 |
-| @travisperson| 2 | +2/-2 | 3 |
-| Liviu Damian | 2 | +2/-2 | 2 |
-| @jimpick | 2 | +2/-2 | 2 |
-| Frank | 1 | +3/-0 | 1 |
-| turuslan | 1 | +1/-1 | 1 |
-| Kirk Baird | 1 | +0/-0 | 1 |
-
-
-# 1.11.0 / 2021-07-22
-
-This is a **highly recommended** release of Lotus that have many bug fixes, improvements and new features. 
-
-## Highlights
-- Miner SimultaneousTransfers config ([filecoin-project/lotus#6612](https://github.com/filecoin-project/lotus/pull/6612))
-  - Set `SimultaneousTransfers` in lotus miner config to configure the maximum number of parallel online data transfers, including both storage and retrieval deals.
-- Dynamic Retrieval pricing ([filecoin-project/lotus#6175](https://github.com/filecoin-project/lotus/pull/6175))
-  - Customize your retrieval ask price, see a quick tutorial [here](https://github.com/filecoin-project/lotus/discussions/6780).
-- Robust message management  ([filecoin-project/lotus#5822](https://github.com/filecoin-project/lotus/pull/5822))
-  - run `lotus mpool manage and follow the instructions!
-  - Demo available at https://www.youtube.com/watch?v=QDocpLQjZgQ.
-- Add utils to use multisigs as miner owners ([filecoin-project/lotus#6490](https://github.com/filecoin-project/lotus/pull/6490))
-  
-## More New Features
--  feat: implement lotus-sim ([filecoin-project/lotus#6406](https://github.com/filecoin-project/lotus/pull/6406))
-- implement a command to export a car ([filecoin-project/lotus#6405](https://github.com/filecoin-project/lotus/pull/6405))
-- Add a command to get the fees of a deal ([filecoin-project/lotus#5307](https://github.com/filecoin-project/lotus/pull/5307))
-  - run `lotus-shed market get-deal-fees`
-- Add a command to list retrievals ([filecoin-project/lotus#6337](https://github.com/filecoin-project/lotus/pull/6337))
-  - run `lotus client list-retrievals`
-- lotus-gateway: add check command ([filecoin-project/lotus#6373](https://github.com/filecoin-project/lotus/pull/6373))
-- lotus-wallet: JWT Support ([filecoin-project/lotus#6360](https://github.com/filecoin-project/lotus/pull/6360))
-- Allow starting networks from arbitrary actor versions ([filecoin-project/lotus#6305](https://github.com/filecoin-project/lotus/pull/6305))
-- oh, snap! ([filecoin-project/lotus#6202](https://github.com/filecoin-project/lotus/pull/6202))
-- Add a shed util to count 64 GiB miner stats ([filecoin-project/lotus#6290](https://github.com/filecoin-project/lotus/pull/6290))
-- Introduce stateless offline dealflow, bypassing the FSM/deallists ([filecoin-project/lotus#5961](https://github.com/filecoin-project/lotus/pull/5961))
-- Transplant some useful commands to lotus-shed actor ([filecoin-project/lotus#5913](https://github.com/filecoin-project/lotus/pull/5913))
-  - run `lotus-shed actor`
-- actor wrapper codegen ([filecoin-project/lotus#6108](https://github.com/filecoin-project/lotus/pull/6108))
-- Add a shed util to count miners by post type ([filecoin-project/lotus#6169](https://github.com/filecoin-project/lotus/pull/6169))  
-- shed: command to list duplicate messages in tipsets (steb) ([filecoin-project/lotus#5847](https://github.com/filecoin-project/lotus/pull/5847))
-- feat: allow checkpointing to forks ([filecoin-project/lotus#6107](https://github.com/filecoin-project/lotus/pull/6107))
-- Add a CLI tool for miner proving deadline ([filecoin-project/lotus#6132](https://github.com/filecoin-project/lotus/pull/6132))   
-  - run `lotus state miner-proving-deadline` 
-
-
-## Bug Fixes
-- Fix wallet error messages ([filecoin-project/lotus#6594](https://github.com/filecoin-project/lotus/pull/6594))
-- Fix CircleCI gen ([filecoin-project/lotus#6589](https://github.com/filecoin-project/lotus/pull/6589))
-- Make query-ask CLI more graceful ([filecoin-project/lotus#6590](https://github.com/filecoin-project/lotus/pull/6590))
-- scale up sector expiration to avoid sector expire in batch-pre-commit waitting ([filecoin-project/lotus#6566](https://github.com/filecoin-project/lotus/pull/6566))
--  Fix an error in msigLockCancel ([filecoin-project/lotus#6582](https://github.com/filecoin-project/lotus/pull/6582)
-- fix circleci being out of sync. ([filecoin-project/lotus#6573](https://github.com/filecoin-project/lotus/pull/6573))  
-- Fix helptext for ask price([filecoin-project/lotus#6560](https://github.com/filecoin-project/lotus/pull/6560))
-- fix commit finalize failed ([filecoin-project/lotus#6521](https://github.com/filecoin-project/lotus/pull/6521))
-- Fix soup ([filecoin-project/lotus#6501](https://github.com/filecoin-project/lotus/pull/6501))
-- fix: pick the correct partitions-per-post limit ([filecoin-project/lotus#6502](https://github.com/filecoin-project/lotus/pull/6502))
-- sealing: Fix restartSectors race ([filecoin-project/lotus#6495](https://github.com/filecoin-project/lotus/pull/6495))
-- Fix: correct the change of message size limit ([filecoin-project/lotus#6430](https://github.com/filecoin-project/lotus/pull/6430))
-- Fix logging of stringified CIDs double-encoded in hex ([filecoin-project/lotus#6413](https://github.com/filecoin-project/lotus/pull/6413))
-- Fix success handling in Retreival ([filecoin-project/lotus#5921](https://github.com/filecoin-project/lotus/pull/5921))
-- storagefsm: Fix batch deal packing behavior ([filecoin-project/lotus#6041](https://github.com/filecoin-project/lotus/pull/6041))
-- events: Fix handling of multiple matched events per epoch ([filecoin-project/lotus#6355](https://github.com/filecoin-project/lotus/pull/6355))
-- Fix logging around mineOne ([filecoin-project/lotus#6310](https://github.com/filecoin-project/lotus/pull/6310))
-- Fix shell completions ([filecoin-project/lotus#6316](https://github.com/filecoin-project/lotus/pull/6316))
-- Allow 8MB sectors in devnet ([filecoin-project/lotus#6312](https://github.com/filecoin-project/lotus/pull/6312))
-- fix ticket expired ([filecoin-project/lotus#6304](https://github.com/filecoin-project/lotus/pull/6304))
-- Revert "chore: update go-libp2p" ([filecoin-project/lotus#6306](https://github.com/filecoin-project/lotus/pull/6306))
-- fix: wait-api should use GetAPI to acquire binary specific API ([filecoin-project/lotus#6246](https://github.com/filecoin-project/lotus/pull/6246))
-- fix(ci): Updates to lotus CI build process ([filecoin-project/lotus#6256](https://github.com/filecoin-project/lotus/pull/6256))
-- fix: use a consistent tipset in commands ([filecoin-project/lotus#6142](https://github.com/filecoin-project/lotus/pull/6142))
-- go mod tidy for lotus-soup testplans ([filecoin-project/lotus#6124](https://github.com/filecoin-project/lotus/pull/6124))
-- fix testground payment channel tests: use 1 miner ([filecoin-project/lotus#6126](https://github.com/filecoin-project/lotus/pull/6126))
-- fix: use the parent state when listing actors ([filecoin-project/lotus#6143](https://github.com/filecoin-project/lotus/pull/6143))
-- Speed up StateListMessages in some cases ([filecoin-project/lotus#6007](https://github.com/filecoin-project/lotus/pull/6007))
-- fix(splitstore): fix a panic on revert-only head changes ([filecoin-project/lotus#6133](https://github.com/filecoin-project/lotus/pull/6133))
-- drand: fix beacon cache ([filecoin-project/lotus#6164](https://github.com/filecoin-project/lotus/pull/6164))
- 
-## Improvements
-- gateway: Add support for Version method ([filecoin-project/lotus#6618](https://github.com/filecoin-project/lotus/pull/6618))
-- revamped integration test kit (aka. Operation Sparks Joy) ([filecoin-project/lotus#6329](https://github.com/filecoin-project/lotus/pull/6329))
-- move with changed name ([filecoin-project/lotus#6587](https://github.com/filecoin-project/lotus/pull/6587))
-- dynamic circleci config for streamlining test execution ([filecoin-project/lotus#6561](https://github.com/filecoin-project/lotus/pull/6561))
-- extern/storage: add ability to ignore worker resources when scheduling. ([filecoin-project/lotus#6542](https://github.com/filecoin-project/lotus/pull/6542))
-- Adjust various CLI display ratios to arbitrary precision ([filecoin-project/lotus#6309](https://github.com/filecoin-project/lotus/pull/6309))
-- Test multicore SDR support ([filecoin-project/lotus#6479](https://github.com/filecoin-project/lotus/pull/6479))
-- Unit tests for sector batchers ([filecoin-project/lotus#6432](https://github.com/filecoin-project/lotus/pull/6432))
-- Update chain list with correct help instructions ([filecoin-project/lotus#6465](https://github.com/filecoin-project/lotus/pull/6465))
-- clean failed sectors in batch commit ([filecoin-project/lotus#6451](https://github.com/filecoin-project/lotus/pull/6451))
-- itests/kit: add guard to ensure imports from tests only. ([filecoin-project/lotus#6445](https://github.com/filecoin-project/lotus/pull/6445))
-- consolidate integration tests into `itests` package; create test kit; cleanup ([filecoin-project/lotus#6311](https://github.com/filecoin-project/lotus/pull/6311))
-- Fee config for sector batching ([filecoin-project/lotus#6420](https://github.com/filecoin-project/lotus/pull/6420))
-- UX: lotus state power CLI should fail if called with a not-miner ([filecoin-project/lotus#6425](https://github.com/filecoin-project/lotus/pull/6425))
-- Increase message size limit ([filecoin-project/lotus#6419](https://github.com/filecoin-project/lotus/pull/6419))
-- polish(stmgr): define ExecMonitor for message application callback ([filecoin-project/lotus#6389](https://github.com/filecoin-project/lotus/pull/6389))
-- upgrade testground action version ([filecoin-project/lotus#6403](https://github.com/filecoin-project/lotus/pull/6403))
-- Bypass task scheduler for reading unsealed pieces ([filecoin-project/lotus#6280](https://github.com/filecoin-project/lotus/pull/6280))
-- testplans: lotus-soup: use default WPoStChallengeWindow ([filecoin-project/lotus#6400](https://github.com/filecoin-project/lotus/pull/6400))
-- Integration tests for offline deals ([filecoin-project/lotus#6081](https://github.com/filecoin-project/lotus/pull/6081))
-- Fix some flaky tests ([filecoin-project/lotus#6397](https://github.com/filecoin-project/lotus/pull/6397))
-- build appimage in CI ([filecoin-project/lotus#6384](https://github.com/filecoin-project/lotus/pull/6384))
-- Generate AppImage ([filecoin-project/lotus#6208](https://github.com/filecoin-project/lotus/pull/6208))
-- Add test for AddVerifiedClient ([filecoin-project/lotus#6317](https://github.com/filecoin-project/lotus/pull/6317))
-- Typo fix in error message: "pubusb" -> "pubsub" ([filecoin-project/lotus#6365](https://github.com/filecoin-project/lotus/pull/6365))
-- Improve the cli state call command  ([filecoin-project/lotus#6226](https://github.com/filecoin-project/lotus/pull/6226))
-- Upscale mineOne message to a WARN on unexpected ineligibility ([filecoin-project/lotus#6358](https://github.com/filecoin-project/lotus/pull/6358))
-- Remove few useless variable assignments ([filecoin-project/lotus#6359](https://github.com/filecoin-project/lotus/pull/6359))
-- Reduce noise from 'peer has different genesis' messages ([filecoin-project/lotus#6357](https://github.com/filecoin-project/lotus/pull/6357))
-- Get current seal proof when necessary ([filecoin-project/lotus#6339](https://github.com/filecoin-project/lotus/pull/6339))
-- Remove log line when tracing is not configured ([filecoin-project/lotus#6334](https://github.com/filecoin-project/lotus/pull/6334))
-- separate tracing environment variables ([filecoin-project/lotus#6323](https://github.com/filecoin-project/lotus/pull/6323))
-- feat: log dispute rate ([filecoin-project/lotus#6322](https://github.com/filecoin-project/lotus/pull/6322))
-- Move verifreg shed utils to CLI ([filecoin-project/lotus#6135](https://github.com/filecoin-project/lotus/pull/6135))  
-- consider storiface.PathStorage when calculating storage requirements ([filecoin-project/lotus#6233](https://github.com/filecoin-project/lotus/pull/6233))
-- `storage` module: add go docs and minor code quality refactors ([filecoin-project/lotus#6259](https://github.com/filecoin-project/lotus/pull/6259))
-- Increase data transfer timeouts ([filecoin-project/lotus#6300](https://github.com/filecoin-project/lotus/pull/6300))
-- gateway: spin off from cmd to package ([filecoin-project/lotus#6294](https://github.com/filecoin-project/lotus/pull/6294))
-- Return total power when GetPowerRaw doesn't find miner claim ([filecoin-project/lotus#4938](https://github.com/filecoin-project/lotus/pull/4938))
-- add flags to control gateway lookback parameters ([filecoin-project/lotus#6247](https://github.com/filecoin-project/lotus/pull/6247))
-- chore(ci): Enable build on RC tags ([filecoin-project/lotus#6238](https://github.com/filecoin-project/lotus/pull/6238))
-- cron-wc ([filecoin-project/lotus#6178](https://github.com/filecoin-project/lotus/pull/6178))
-- Allow creation of state tree v3s ([filecoin-project/lotus#6167](https://github.com/filecoin-project/lotus/pull/6167))
-- mpool: Cleanup pre-nv12 selection logic ([filecoin-project/lotus#6148](https://github.com/filecoin-project/lotus/pull/6148))
-- attempt to do better padding on pieces being written into sectors ([filecoin-project/lotus#5988](https://github.com/filecoin-project/lotus/pull/5988))
-- remove duplicate ask and calculate ping before lock ([filecoin-project/lotus#5968](https://github.com/filecoin-project/lotus/pull/5968))
-- flaky tests improvement: separate TestBatchDealInput from TestAPIDealFlow ([filecoin-project/lotus#6141](https://github.com/filecoin-project/lotus/pull/6141))
-- Testground checks on push ([filecoin-project/lotus#5887](https://github.com/filecoin-project/lotus/pull/5887))
-- Use EmptyTSK where appropriate ([filecoin-project/lotus#6134](https://github.com/filecoin-project/lotus/pull/6134))
-- upgrade `lotus-soup` testplans and reduce deals concurrency to a single miner ([filecoin-project/lotus#6122](https://github.com/filecoin-project/lotus/pull/6122)
-  
-## Dependency Updates
-- downgrade libp2p/go-libp2p-yamux to v0.5.1. ([filecoin-project/lotus#6605](https://github.com/filecoin-project/lotus/pull/6605))
-- Update libp2p to 0.14.2 ([filecoin-project/lotus#6404](https://github.com/filecoin-project/lotus/pull/6404))
-- update to markets-v1.4.0 ([filecoin-project/lotus#6369](https://github.com/filecoin-project/lotus/pull/6369))
-- Use new actor tags ([filecoin-project/lotus#6291](https://github.com/filecoin-project/lotus/pull/6291))
-- chore: update go-libp2p ([filecoin-project/lotus#6231](https://github.com/filecoin-project/lotus/pull/6231))
-- Update ffi to proofs v7 ([filecoin-project/lotus#6150](https://github.com/filecoin-project/lotus/pull/6150))
-  
-## Others
-- Initial draft: basic build instructions on Readme ([filecoin-project/lotus#6498](https://github.com/filecoin-project/lotus/pull/6498))
-- Remove rc changelog, compile the new changelog for final release only ([filecoin-project/lotus#6444](https://github.com/filecoin-project/lotus/pull/6444))
-- updated configuration comments for docs ([filecoin-project/lotus#6440](https://github.com/filecoin-project/lotus/pull/6440))
-- Set ntwk v13 HyperDrive Calibration upgrade epoch ([filecoin-project/lotus#6441](https://github.com/filecoin-project/lotus/pull/6441))
-- build snapcraft ([filecoin-project/lotus#6388](https://github.com/filecoin-project/lotus/pull/6388))
-- Fix the doc errors of the sealing config funcs ([filecoin-project/lotus#6399](https://github.com/filecoin-project/lotus/pull/6399))
-- Add doc on gas balancing ([filecoin-project/lotus#6392](https://github.com/filecoin-project/lotus/pull/6392))
-- Add interop network ([filecoin-project/lotus#6387](https://github.com/filecoin-project/lotus/pull/6387))
-- Network version 13 (v1.11) ([filecoin-project/lotus#6342](https://github.com/filecoin-project/lotus/pull/6342))
-- Add a warning to the release issue template ([filecoin-project/lotus#6374](https://github.com/filecoin-project/lotus/pull/6374))
-- Update RELEASE_ISSUE_TEMPLATE.md ([filecoin-project/lotus#6236](https://github.com/filecoin-project/lotus/pull/6236))
-- Delete CODEOWNERS ([filecoin-project/lotus#6289](https://github.com/filecoin-project/lotus/pull/6289))
-- Feat/nerpa v4 ([filecoin-project/lotus#6248](https://github.com/filecoin-project/lotus/pull/6248))
-- Introduce a release issue template ([filecoin-project/lotus#5826](https://github.com/filecoin-project/lotus/pull/5826))
-- This is a 1:1 forward-port of PR#6183 from 1.9.x to master ([filecoin-project/lotus#6196](https://github.com/filecoin-project/lotus/pull/6196))
-- Update cli gen ([filecoin-project/lotus#6155](https://github.com/filecoin-project/lotus/pull/6155))
-- Generate CLI docs ([filecoin-project/lotus#6145](https://github.com/filecoin-project/lotus/pull/6145))  
-  
-## Contributors
-
-| Contributor | Commits | Lines ± | Files Changed |
-|-------------|---------|---------|---------------|
-| @raulk | 118 | +11972/-10860 | 472 |
-| @magik6k | 65 | +10824/-4158 | 353 |
-| @aarshkshah1992 | 59 | +8057/-3355 | 224 |
-| @arajasek | 41 | +8786/-1691 | 331 |
-| @Stebalien | 106 | +7653/-2718 | 273 |
-| dirkmc | 11 | +2580/-1371 | 77 |
-| @dirkmc | 39 | +1865/-1194 | 79 |
-| @Kubuxu | 19 | +1973/-485 | 81 |
-| @vyzo | 4 | +1748/-330 | 50 |
-| @aarshkshah1992 | 5 | +1462/-213 | 27 |
-| @coryschwartz | 35 | +568/-206 | 59 |
-| @chadwick2143 | 3 | +739/-1 | 4 |
-| @ribasushi | 21 | +487/-164 | 36 |
-| @hannahhoward | 5 | +544/-5 | 19 |
-| @jennijuju | 9 | +241/-174 | 19 |
-| @frrist | 1 | +137/-88 | 7 |
-| @travisperson | 3 | +175/-6 | 7 |
-| @wadeAlexC | 1 | +48/-129 | 1 |
-| @whyrusleeping | 8 | +161/-13 | 11 |
-| lotus | 1 | +114/-46 | 1 |
-| @nonsense | 8 | +107/-53 | 20 |
-| @rjan90 | 4 | +115/-33 | 4 |
-| @ZenGround0 | 3 | +114/-1 | 4 |
-| @Aloxaf | 1 | +43/-61 | 7 |
-| @yaohcn | 4 | +89/-9 | 5 |
-| @mitchellsoo | 1 | +51/-0 | 1 |
-| @placer14 | 3 | +28/-18 | 4 |
-| @jennijuju | 6 | +9/-14 | 6 |
-| @Frank | 2 | +11/-10 | 2 |
-| @wangchao | 3 | +5/-4 | 4 |
-| @Steve Loeppky | 1 | +7/-1 | 1 |
-| @Lion | 1 | +4/-2 | 1 |
-| @Mimir | 1 | +2/-2 | 1 |
-| @raulk | 1 | +1/-1 | 1 |
-| @Jack Yao | 1 | +1/-1 | 1 |
-| @IPFSUnion | 1 | +1/-1 | 1 |
-
-# 1.10.1 / 2021-07-05
-
-This is an optional but **highly recommended** release of Lotus for lotus miners that has many bug fixes and improvements based on the feedback we got from the community since HyperDrive.
-
-## New Features
-- commit batch: AggregateAboveBaseFee config #6650
-  - `AggregateAboveBaseFee` is added to miner sealing configuration for setting the network base fee to start aggregating proofs. When the network base fee is lower than this value, the prove commits will be submitted individually via `ProveCommitSector`. According to the [Batch Incentive Alignment](https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0013.md#batch-incentive-alignment) introduced in FIP-0013, we recommend miners to set this value to 0.15 nanoFIL(which is the default value) to avoid unexpected aggregation fee in burn and enjoy the most benefits of aggregation!
-    
-## Bug Fixes
-- storage: Fix FinalizeSector with sectors in storage paths #6652
-- Fix tiny error in check-client-datacap #6664  
-- Fix: precommit_batch method used the wrong cfg.PreCommitBatchWait #6658
-- to optimize the batchwait #6636
-- fix getTicket: sector precommitted but expired case #6635
-- handleSubmitCommitAggregate() exception handling #6595
-- remove precommit check in handleCommitFailed #6634
-- ensure agg fee is adequate
-- fix: miner balance is not enough, so that ProveCommitAggregate msg exec failed #6623
-- commit batch: Initialize the FailedSectors map #6647
-
-Contributors
-
-| Contributor | Commits | Lines ± | Files Changed |
-|-------------|---------|---------|---------------|
-| @magik6k| 7 | +151/-56 | 21 |
-| @llifezou | 4 | +59/-20 | 4 |
-| @johnli-helloworld | 2 | +45/-14 | 4 |
-| @wangchao | 1 | +1/-27 | 1 |
-| Jerry | 2 | +9/-4 | 2 |
-| @zhoutian527 | 1 | +2/-2 | 1 |
-| @ribasushi| 1 | +1/-1 | 1 |
-
-# 1.10.1 / 2021-07-05
-
-This is an optional but **highly recommended** release of Lotus for lotus miners that has many bug fixes and improvements based on the feedback we got from the community since HyperDrive.
-
-## New Features
-- commit batch: AggregateAboveBaseFee config #6650
-  - `AggregateAboveBaseFee` is added to miner sealing configuration for setting the network base fee to start aggregating proofs. When the network base fee is lower than this value, the prove commits will be submitted individually via `ProveCommitSector`. According to the [Batch Incentive Alignment](https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0013.md#batch-incentive-alignment) introduced in FIP-0013, we recommend miners to set this value to 0.15 nanoFIL(which is the default value) to avoid unexpected aggregation fee in burn and enjoy the most benefits of aggregation!
-    
-## Bug Fixes
-- storage: Fix FinalizeSector with sectors in storage paths #6652
-- Fix tiny error in check-client-datacap #6664  
-- Fix: precommit_batch method used the wrong cfg.PreCommitBatchWait #6658
-- to optimize the batchwait #6636
-- fix getTicket: sector precommitted but expired case #6635
-- handleSubmitCommitAggregate() exception handling #6595
-- remove precommit check in handleCommitFailed #6634
-- ensure agg fee is adequate
-- fix: miner balance is not enough, so that ProveCommitAggregate msg exec failed #6623
-- commit batch: Initialize the FailedSectors map #6647
-
-Contributors
-
-| Contributor | Commits | Lines ± | Files Changed |
-|-------------|---------|---------|---------------|
-| @magik6k| 7 | +151/-56 | 21 |
-| @llifezou | 4 | +59/-20 | 4 |
-| @johnli-helloworld | 2 | +45/-14 | 4 |
-| @wangchao | 1 | +1/-27 | 1 |
-| Jerry | 2 | +9/-4 | 2 |
-| @zhoutian527 | 1 | +2/-2 | 1 |
-| @ribasushi| 1 | +1/-1 | 1 |
-
-
-<<<<<<< HEAD
-||||||| merged common ancestors
->>>>>>>>> Temporary merge branch 2
-=======
->>>>>>> releases
->>>>>>> releases
 # 1.10.0 / 2021-06-23
 
 This is a mandatory release of Lotus that introduces Filecoin network v13, codenamed the HyperDrive upgrade. The

Dockerfile.lotus

@@ -36,7 +36,7 @@ WORKDIR /opt/filecoin
 ARG RUSTFLAGS=""
 ARG GOFLAGS=""
 
-RUN make lotus lotus-miner lotus-worker lotus-shed lotus-wallet lotus-gateway
+RUN make deps lotus lotus-miner lotus-worker lotus-shed lotus-chainwatch lotus-stats
 
 
 FROM ubuntu:20.04 AS base
@@ -56,173 +56,19 @@ COPY --from=builder /usr/lib/x86_64-linux-gnu/libOpenCL.so.1 /lib/
 RUN useradd -r -u 532 -U fc
 
 
-###
 FROM base AS lotus
 MAINTAINER Lotus Development Team
 
-COPY --from=builder /opt/filecoin/lotus /usr/local/bin/
-COPY --from=builder /opt/filecoin/lotus-shed /usr/local/bin/
-COPY scripts/docker-lotus-entrypoint.sh /
-
-ENV FILECOIN_PARAMETER_CACHE /var/tmp/filecoin-proof-parameters
-ENV LOTUS_PATH /var/lib/lotus
-ENV LOTUS_JAEGER_AGENT_HOST 127.0.0.1
-ENV LOTUS_JAEGER_AGENT_PORT 6831
-ENV DOCKER_LOTUS_IMPORT_SNAPSHOT https://fil-chain-snapshots-fallback.s3.amazonaws.com/mainnet/minimal_finality_stateroots_latest.car
-ENV DOCKER_LOTUS_IMPORT_WALLET ""
-
-RUN mkdir /var/lib/lotus /var/tmp/filecoin-proof-parameters
-RUN chown fc: /var/lib/lotus /var/tmp/filecoin-proof-parameters
-
-VOLUME /var/lib/lotus
-VOLUME /var/tmp/filecoin-proof-parameters
-
-USER fc
-
-EXPOSE 1234
-
-ENTRYPOINT ["/docker-lotus-entrypoint.sh"]
-
-CMD ["-help"]
-
-###
-FROM base AS lotus-wallet
-MAINTAINER Lotus Development Team
-
-COPY --from=builder /opt/filecoin/lotus-wallet /usr/local/bin/
-
-ENV WALLET_PATH /var/lib/lotus-wallet
-ENV LOTUS_JAEGER_AGENT_HOST 127.0.0.1
-ENV LOTUS_JAEGER_AGENT_PORT 6831
-
-RUN mkdir /var/lib/lotus-wallet
-RUN chown fc: /var/lib/lotus-wallet
-
-VOLUME /var/lib/lotus-wallet
-
-USER fc
-
-EXPOSE 1777
-
-ENTRYPOINT ["/usr/local/bin/lotus-wallet"]
-
-CMD ["-help"]
-
-###
-FROM base AS lotus-gateway
-MAINTAINER Lotus Development Team
-
-COPY --from=builder /opt/filecoin/lotus-gateway /usr/local/bin/
-
-ENV LOTUS_JAEGER_AGENT_HOST 127.0.0.1
-ENV LOTUS_JAEGER_AGENT_PORT 6831
-ENV FULLNODE_API_INFO /ip4/127.0.0.1/tcp/1234/http
-
-USER fc
-
-EXPOSE 1234
-
-ENTRYPOINT ["/usr/local/bin/lotus-gateway"]
-
-CMD ["-help"]
-
-
-###
-FROM base AS lotus-miner
-MAINTAINER Lotus Development Team
-
-COPY --from=builder /opt/filecoin/lotus-miner /usr/local/bin/
-COPY scripts/docker-lotus-miner-entrypoint.sh /
-
-ENV FILECOIN_PARAMETER_CACHE /var/tmp/filecoin-proof-parameters
-ENV FULLNODE_API_INFO /ip4/127.0.0.1/tcp/1234/http
-ENV LOTUS_MINER_PATH /var/lib/lotus-miner
-ENV LOTUS_JAEGER_AGENT_HOST 127.0.0.1
-ENV LOTUS_JAEGER_AGENT_PORT 6831
-ENV DOCKER_LOTUS_MINER_INIT true
-
-RUN mkdir /var/lib/lotus-miner /var/tmp/filecoin-proof-parameters
-RUN chown fc: /var/lib/lotus-miner /var/tmp/filecoin-proof-parameters
-
-VOLUME /var/lib/lotus-miner
-VOLUME /var/tmp/filecoin-proof-parameters
-
-USER fc
-
-EXPOSE 2345
-
-ENTRYPOINT ["/docker-lotus-miner-entrypoint.sh"]
-
-CMD ["-help"]
-
-
-###
-FROM base AS lotus-worker
-MAINTAINER Lotus Development Team
-
-COPY --from=builder /opt/filecoin/lotus-worker /usr/local/bin/
-
-ENV FILECOIN_PARAMETER_CACHE /var/tmp/filecoin-proof-parameters
-ENV MINER_API_INFO /ip4/127.0.0.1/tcp/2345/http
-ENV LOTUS_WORKER_PATH /var/lib/lotus-worker
-ENV LOTUS_JAEGER_AGENT_HOST 127.0.0.1
-ENV LOTUS_JAEGER_AGENT_PORT 6831
-
-RUN mkdir /var/lib/lotus-worker
-RUN chown fc: /var/lib/lotus-worker
-
-VOLUME /var/lib/lotus-worker
-
-USER fc
-
-EXPOSE 3456
-
-ENTRYPOINT ["/usr/local/bin/lotus-worker"]
-
-CMD ["-help"]
-
-
-###
-from base as lotus-all-in-one
-
-ENV FILECOIN_PARAMETER_CACHE /var/tmp/filecoin-proof-parameters
-ENV FULLNODE_API_INFO /ip4/127.0.0.1/tcp/1234/http
-ENV LOTUS_JAEGER_AGENT_HOST 127.0.0.1
-ENV LOTUS_JAEGER_AGENT_PORT 6831
-ENV LOTUS_MINER_PATH /var/lib/lotus-miner
-ENV LOTUS_PATH /var/lib/lotus
-ENV LOTUS_WORKER_PATH /var/lib/lotus-worker
-ENV MINER_API_INFO /ip4/127.0.0.1/tcp/2345/http
-ENV WALLET_PATH /var/lib/lotus-wallet
-ENV DOCKER_LOTUS_IMPORT_SNAPSHOT https://fil-chain-snapshots-fallback.s3.amazonaws.com/mainnet/minimal_finality_stateroots_latest.car
-ENV DOCKER_LOTUS_MINER_INIT true
-
 COPY --from=builder /opt/filecoin/lotus      /usr/local/bin/
 COPY --from=builder /opt/filecoin/lotus-shed /usr/local/bin/
-COPY --from=builder /opt/filecoin/lotus-wallet /usr/local/bin/
-COPY --from=builder /opt/filecoin/lotus-gateway /usr/local/bin/
-COPY --from=builder /opt/filecoin/lotus-miner /usr/local/bin/
-COPY --from=builder /opt/filecoin/lotus-worker /usr/local/bin/
 
-RUN mkdir /var/tmp/filecoin-proof-parameters
-RUN mkdir /var/lib/lotus
-RUN mkdir /var/lib/lotus-miner
-RUN mkdir /var/lib/lotus-worker
-RUN mkdir /var/lib/lotus-wallet
-RUN chown fc: /var/tmp/filecoin-proof-parameters
-RUN chown fc: /var/lib/lotus
-RUN chown fc: /var/lib/lotus-miner
-RUN chown fc: /var/lib/lotus-worker
-RUN chown fc: /var/lib/lotus-wallet
+ENV FILECOIN_PARAMETER_CACHE /var/tmp/filecoin-proof-parameters
+ENV LOTUS_PATH /var/lib/lotus
 
+RUN mkdir /var/lib/lotus /var/tmp/filecoin-proof-parameters && chown fc /var/lib/lotus /var/tmp/filecoin-proof-parameters
 
-VOLUME /var/tmp/filecoin-proof-parameters
-VOLUME /var/lib/lotus
-VOLUME /var/lib/lotus-miner
-VOLUME /var/lib/lotus-worker
-VOLUME /var/lib/lotus-wallet
+USER fc
 
-EXPOSE 1234
-EXPOSE 2345
-EXPOSE 3456
-EXPOSE 1777
+ENTRYPOINT ["/usr/local/bin/lotus"]
+
+CMD ["-help"]

Makefile

@@ -92,7 +92,7 @@ BINS+=lotus
 
 lotus-miner: $(BUILD_DEPS)
 	rm -f lotus-miner
-	go build $(GOFLAGS) -o lotus-miner ./cmd/lotus-miner
+	go build $(GOFLAGS) -o lotus-miner ./cmd/lotus-storage-miner
 .PHONY: lotus-miner
 BINS+=lotus-miner
 
@@ -131,9 +131,6 @@ install-miner:
 install-worker:
 	install -C ./lotus-worker /usr/local/bin/lotus-worker
 
-install-app:
-	install -C ./$(APP) /usr/local/bin/$(APP)
-
 # TOOLS
 
 lotus-seed: $(BUILD_DEPS)
@@ -336,9 +333,6 @@ api-gen:
 	goimports -w api
 .PHONY: api-gen
 
-cfgdoc-gen:
-	go run ./node/config/cfgdocgen > ./node/config/doc_gen.go
-
 appimage: lotus
 	rm -rf appimage-builder-cache || true
 	rm AppDir/io.filecoin.lotus.desktop || true
@@ -376,7 +370,7 @@ docsgen-openrpc-worker: docsgen-openrpc-bin
 
 .PHONY: docsgen docsgen-md-bin docsgen-openrpc-bin
 
-gen: actors-gen type-gen method-gen cfgdoc-gen docsgen api-gen circleci
+gen: actors-gen type-gen method-gen docsgen api-gen circleci
 	@echo ">>> IF YOU'VE MODIFIED THE CLI, REMEMBER TO ALSO MAKE docsgen-cli"
 .PHONY: gen
 

api/api_common.go

@@ -4,11 +4,15 @@ import (
 	"context"
 	"fmt"
 
-	apitypes "github.com/filecoin-project/lotus/api/types"
-
 	"github.com/google/uuid"
 
 	"github.com/filecoin-project/go-jsonrpc/auth"
+	metrics "github.com/libp2p/go-libp2p-core/metrics"
+	"github.com/libp2p/go-libp2p-core/network"
+	"github.com/libp2p/go-libp2p-core/peer"
+	protocol "github.com/libp2p/go-libp2p-core/protocol"
+
+	apitypes "github.com/filecoin-project/lotus/api/types"
 )
 
 //                       MODIFYING THE API INTERFACE
@@ -23,23 +27,55 @@ import (
 //  * Generate openrpc blobs
 
 type Common interface {
+
 	// MethodGroup: Auth
 
 	AuthVerify(ctx context.Context, token string) ([]auth.Permission, error) //perm:read
 	AuthNew(ctx context.Context, perms []auth.Permission) ([]byte, error)    //perm:admin
 
-	// MethodGroup: Log
+	// MethodGroup: Net
 
-	LogList(context.Context) ([]string, error)         //perm:write
-	LogSetLevel(context.Context, string, string) error //perm:write
+	NetConnectedness(context.Context, peer.ID) (network.Connectedness, error) //perm:read
+	NetPeers(context.Context) ([]peer.AddrInfo, error)                        //perm:read
+	NetConnect(context.Context, peer.AddrInfo) error                          //perm:write
+	NetAddrsListen(context.Context) (peer.AddrInfo, error)                    //perm:read
+	NetDisconnect(context.Context, peer.ID) error                             //perm:write
+	NetFindPeer(context.Context, peer.ID) (peer.AddrInfo, error)              //perm:read
+	NetPubsubScores(context.Context) ([]PubsubScore, error)                   //perm:read
+	NetAutoNatStatus(context.Context) (NatInfo, error)                        //perm:read
+	NetAgentVersion(ctx context.Context, p peer.ID) (string, error)           //perm:read
+	NetPeerInfo(context.Context, peer.ID) (*ExtendedPeerInfo, error)          //perm:read
+
+	// NetBandwidthStats returns statistics about the nodes total bandwidth
+	// usage and current rate across all peers and protocols.
+	NetBandwidthStats(ctx context.Context) (metrics.Stats, error) //perm:read
+
+	// NetBandwidthStatsByPeer returns statistics about the nodes bandwidth
+	// usage and current rate per peer
+	NetBandwidthStatsByPeer(ctx context.Context) (map[string]metrics.Stats, error) //perm:read
+
+	// NetBandwidthStatsByProtocol returns statistics about the nodes bandwidth
+	// usage and current rate per protocol
+	NetBandwidthStatsByProtocol(ctx context.Context) (map[protocol.ID]metrics.Stats, error) //perm:read
+
+	// ConnectionGater API
+	NetBlockAdd(ctx context.Context, acl NetBlockList) error    //perm:admin
+	NetBlockRemove(ctx context.Context, acl NetBlockList) error //perm:admin
+	NetBlockList(ctx context.Context) (NetBlockList, error)     //perm:read
 
 	// MethodGroup: Common
 
+	// Discover returns an OpenRPC document describing an RPC API.
+	Discover(ctx context.Context) (apitypes.OpenRPCDocument, error) //perm:read
+
+	// ID returns peerID of libp2p node backing this API
+	ID(context.Context) (peer.ID, error) //perm:read
+
 	// Version provides information about API provider
 	Version(context.Context) (APIVersion, error) //perm:read
 
-	// Discover returns an OpenRPC document describing an RPC API.
-	Discover(ctx context.Context) (apitypes.OpenRPCDocument, error) //perm:read
+	LogList(context.Context) ([]string, error)         //perm:write
+	LogSetLevel(context.Context, string, string) error //perm:write
 
 	// trigger graceful shutdown
 	Shutdown(context.Context) error //perm:admin
@@ -69,3 +105,8 @@ type APIVersion struct {
 func (v APIVersion) String() string {
 	return fmt.Sprintf("%s+api%s", v.Version, v.APIVersion.String())
 }
+
+type NatInfo struct {
+	Reachability network.Reachability
+	PublicAddr   string
+}

api/api_full.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/filecoin-project/lotus/node/repo/importmgr"
 	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p-core/peer"
 
@@ -14,7 +15,6 @@ import (
 	datatransfer "github.com/filecoin-project/go-data-transfer"
 	"github.com/filecoin-project/go-fil-markets/retrievalmarket"
 	"github.com/filecoin-project/go-fil-markets/storagemarket"
-	"github.com/filecoin-project/go-multistore"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/big"
 	"github.com/filecoin-project/go-state-types/crypto"
@@ -58,7 +58,6 @@ const LookbackNoLimit = abi.ChainEpoch(-1)
 // FullNode API is a low-level interface to the Filecoin network full node
 type FullNode interface {
 	Common
-	Net
 
 	// MethodGroup: Chain
 	// The Chain method group contains methods for interacting with the
@@ -164,13 +163,6 @@ type FullNode interface {
 	// If oldmsgskip is set, messages from before the requested roots are also not included.
 	ChainExport(ctx context.Context, nroots abi.ChainEpoch, oldmsgskip bool, tsk types.TipSetKey) (<-chan []byte, error) //perm:read
 
-	// ChainCheckBlockstore performs an (asynchronous) health check on the chain/state blockstore
-	// if supported by the underlying implementation.
-	ChainCheckBlockstore(context.Context) error //perm:admin
-
-	// ChainBlockstoreInfo returns some basic information about the blockstore
-	ChainBlockstoreInfo(context.Context) (map[string]interface{}, error) //perm:read
-
 	// MethodGroup: Beacon
 	// The Beacon method group contains methods for interacting with the random beacon (DRAND)
 
@@ -331,7 +323,7 @@ type FullNode interface {
 	// ClientImport imports file under the specified path into filestore.
 	ClientImport(ctx context.Context, ref FileRef) (*ImportRes, error) //perm:admin
 	// ClientRemoveImport removes file import
-	ClientRemoveImport(ctx context.Context, importID multistore.StoreID) error //perm:admin
+	ClientRemoveImport(ctx context.Context, importID importmgr.ImportID) error //perm:admin
 	// ClientStartDeal proposes a deal with a miner.
 	ClientStartDeal(ctx context.Context, params *StartDealParams) (*cid.Cid, error) //perm:admin
 	// ClientStatelessDeal fire-and-forget-proposes an offline deal to a miner without subsequent tracking.
@@ -723,16 +715,17 @@ type MinerSectors struct {
 
 type ImportRes struct {
 	Root     cid.Cid
-	ImportID multistore.StoreID
+	ImportID importmgr.ImportID
 }
 
 type Import struct {
-	Key multistore.StoreID
+	Key importmgr.ImportID
 	Err string
 
-	Root     *cid.Cid
-	Source   string
-	FilePath string
+	Root          *cid.Cid
+	Source        string
+	FilePath      string
+	CARv2FilePath string
 }
 
 type DealInfo struct {
@@ -915,7 +908,7 @@ type RetrievalOrder struct {
 	Piece *cid.Cid
 	Size  uint64
 
-	LocalStore *multistore.StoreID // if specified, get data from local store
+	LocalCARV2FilePath string // if specified, get data from a local CARv2 file.
 	// TODO: support offset
 	Total                   types.BigInt
 	UnsealPrice             types.BigInt

api/api_gateway.go

@@ -45,7 +45,6 @@ type Gateway interface {
 	StateAccountKey(ctx context.Context, addr address.Address, tsk types.TipSetKey) (address.Address, error)
 	StateDealProviderCollateralBounds(ctx context.Context, size abi.PaddedPieceSize, verified bool, tsk types.TipSetKey) (DealCollateralBounds, error)
 	StateGetActor(ctx context.Context, actor address.Address, ts types.TipSetKey) (*types.Actor, error)
-	StateReadState(ctx context.Context, actor address.Address, tsk types.TipSetKey) (*ActorState, error) //perm:read
 	StateListMiners(ctx context.Context, tsk types.TipSetKey) ([]address.Address, error)
 	StateLookupID(ctx context.Context, addr address.Address, tsk types.TipSetKey) (address.Address, error)
 	StateMarketBalance(ctx context.Context, addr address.Address, tsk types.TipSetKey) (MarketBalance, error)

api/api_net.go

@@ -1,66 +0,0 @@
-package api
-
-import (
-	"context"
-
-	metrics "github.com/libp2p/go-libp2p-core/metrics"
-	"github.com/libp2p/go-libp2p-core/network"
-	"github.com/libp2p/go-libp2p-core/peer"
-	"github.com/libp2p/go-libp2p-core/protocol"
-)
-
-//                       MODIFYING THE API INTERFACE
-//
-// When adding / changing methods in this file:
-// * Do the change here
-// * Adjust implementation in `node/impl/`
-// * Run `make gen` - this will:
-//  * Generate proxy structs
-//  * Generate mocks
-//  * Generate markdown docs
-//  * Generate openrpc blobs
-
-type Net interface {
-	// MethodGroup: Net
-
-	NetConnectedness(context.Context, peer.ID) (network.Connectedness, error) //perm:read
-	NetPeers(context.Context) ([]peer.AddrInfo, error)                        //perm:read
-	NetConnect(context.Context, peer.AddrInfo) error                          //perm:write
-	NetAddrsListen(context.Context) (peer.AddrInfo, error)                    //perm:read
-	NetDisconnect(context.Context, peer.ID) error                             //perm:write
-	NetFindPeer(context.Context, peer.ID) (peer.AddrInfo, error)              //perm:read
-	NetPubsubScores(context.Context) ([]PubsubScore, error)                   //perm:read
-	NetAutoNatStatus(context.Context) (NatInfo, error)                        //perm:read
-	NetAgentVersion(ctx context.Context, p peer.ID) (string, error)           //perm:read
-	NetPeerInfo(context.Context, peer.ID) (*ExtendedPeerInfo, error)          //perm:read
-
-	// NetBandwidthStats returns statistics about the nodes total bandwidth
-	// usage and current rate across all peers and protocols.
-	NetBandwidthStats(ctx context.Context) (metrics.Stats, error) //perm:read
-
-	// NetBandwidthStatsByPeer returns statistics about the nodes bandwidth
-	// usage and current rate per peer
-	NetBandwidthStatsByPeer(ctx context.Context) (map[string]metrics.Stats, error) //perm:read
-
-	// NetBandwidthStatsByProtocol returns statistics about the nodes bandwidth
-	// usage and current rate per protocol
-	NetBandwidthStatsByProtocol(ctx context.Context) (map[protocol.ID]metrics.Stats, error) //perm:read
-
-	// ConnectionGater API
-	NetBlockAdd(ctx context.Context, acl NetBlockList) error    //perm:admin
-	NetBlockRemove(ctx context.Context, acl NetBlockList) error //perm:admin
-	NetBlockList(ctx context.Context) (NetBlockList, error)     //perm:read
-
-	// ID returns peerID of libp2p node backing this API
-	ID(context.Context) (peer.ID, error) //perm:read
-}
-
-type CommonNet interface {
-	Common
-	Net
-}
-
-type NatInfo struct {
-	Reachability network.Reachability
-	PublicAddr   string
-}

api/api_storage.go

@@ -41,7 +41,6 @@ import (
 // StorageMiner is a low-level interface to the Filecoin network storage miner node
 type StorageMiner interface {
 	Common
-	Net
 
 	ActorAddress(context.Context) (address.Address, error) //perm:read
 
@@ -166,10 +165,6 @@ type StorageMiner interface {
 	MarketPendingDeals(ctx context.Context) (PendingDealInfo, error)                                                             //perm:write
 	MarketPublishPendingDeals(ctx context.Context) error                                                                         //perm:admin
 
-	// RuntimeSubsystems returns the subsystems that are enabled
-	// in this instance.
-	RuntimeSubsystems(ctx context.Context) (MinerSubsystems, error) //perm:read
-
 	DealsImportData(ctx context.Context, dealPropCid cid.Cid, file string) error //perm:admin
 	DealsList(ctx context.Context) ([]MarketDeal, error)                         //perm:admin
 	DealsConsiderOnlineStorageDeals(context.Context) (bool, error)               //perm:admin

api/client/client.go

@@ -16,10 +16,14 @@ import (
 )
 
 // NewCommonRPCV0 creates a new http jsonrpc client.
-func NewCommonRPCV0(ctx context.Context, addr string, requestHeader http.Header) (api.CommonNet, jsonrpc.ClientCloser, error) {
-	var res v0api.CommonNetStruct
+func NewCommonRPCV0(ctx context.Context, addr string, requestHeader http.Header) (api.Common, jsonrpc.ClientCloser, error) {
+	var res v0api.CommonStruct
 	closer, err := jsonrpc.NewMergeClient(ctx, addr, "Filecoin",
-		api.GetInternalStructs(&res), requestHeader)
+		[]interface{}{
+			&res.Internal,
+		},
+		requestHeader,
+	)
 
 	return &res, closer, err
 }
@@ -27,9 +31,11 @@ func NewCommonRPCV0(ctx context.Context, addr string, requestHeader http.Header)
 // NewFullNodeRPCV0 creates a new http jsonrpc client.
 func NewFullNodeRPCV0(ctx context.Context, addr string, requestHeader http.Header) (v0api.FullNode, jsonrpc.ClientCloser, error) {
 	var res v0api.FullNodeStruct
-
 	closer, err := jsonrpc.NewMergeClient(ctx, addr, "Filecoin",
-		api.GetInternalStructs(&res), requestHeader)
+		[]interface{}{
+			&res.CommonStruct.Internal,
+			&res.Internal,
+		}, requestHeader)
 
 	return &res, closer, err
 }
@@ -38,7 +44,10 @@ func NewFullNodeRPCV0(ctx context.Context, addr string, requestHeader http.Heade
 func NewFullNodeRPCV1(ctx context.Context, addr string, requestHeader http.Header) (api.FullNode, jsonrpc.ClientCloser, error) {
 	var res v1api.FullNodeStruct
 	closer, err := jsonrpc.NewMergeClient(ctx, addr, "Filecoin",
-		api.GetInternalStructs(&res), requestHeader)
+		[]interface{}{
+			&res.CommonStruct.Internal,
+			&res.Internal,
+		}, requestHeader)
 
 	return &res, closer, err
 }
@@ -69,10 +78,15 @@ func NewStorageMinerRPCV0(ctx context.Context, addr string, requestHeader http.H
 
 	var res v0api.StorageMinerStruct
 	closer, err := jsonrpc.NewMergeClient(ctx, addr, "Filecoin",
-		api.GetInternalStructs(&res), requestHeader,
+		[]interface{}{
+			&res.CommonStruct.Internal,
+			&res.Internal,
+		},
+		requestHeader,
 		append([]jsonrpc.Option{
 			rpcenc.ReaderParamEncoder(pushUrl),
-		}, opts...)...)
+		}, opts...)...,
+	)
 
 	return &res, closer, err
 }
@@ -85,7 +99,9 @@ func NewWorkerRPCV0(ctx context.Context, addr string, requestHeader http.Header)
 
 	var res api.WorkerStruct
 	closer, err := jsonrpc.NewMergeClient(ctx, addr, "Filecoin",
-		api.GetInternalStructs(&res),
+		[]interface{}{
+			&res.Internal,
+		},
 		requestHeader,
 		rpcenc.ReaderParamEncoder(pushUrl),
 		jsonrpc.WithNoReconnect(),
@@ -99,7 +115,9 @@ func NewWorkerRPCV0(ctx context.Context, addr string, requestHeader http.Header)
 func NewGatewayRPCV1(ctx context.Context, addr string, requestHeader http.Header, opts ...jsonrpc.Option) (api.Gateway, jsonrpc.ClientCloser, error) {
 	var res api.GatewayStruct
 	closer, err := jsonrpc.NewMergeClient(ctx, addr, "Filecoin",
-		api.GetInternalStructs(&res),
+		[]interface{}{
+			&res.Internal,
+		},
 		requestHeader,
 		opts...,
 	)
@@ -111,7 +129,9 @@ func NewGatewayRPCV1(ctx context.Context, addr string, requestHeader http.Header
 func NewGatewayRPCV0(ctx context.Context, addr string, requestHeader http.Header, opts ...jsonrpc.Option) (v0api.Gateway, jsonrpc.ClientCloser, error) {
 	var res v0api.GatewayStruct
 	closer, err := jsonrpc.NewMergeClient(ctx, addr, "Filecoin",
-		api.GetInternalStructs(&res),
+		[]interface{}{
+			&res.Internal,
+		},
 		requestHeader,
 		opts...,
 	)
@@ -122,7 +142,9 @@ func NewGatewayRPCV0(ctx context.Context, addr string, requestHeader http.Header
 func NewWalletRPCV0(ctx context.Context, addr string, requestHeader http.Header) (api.Wallet, jsonrpc.ClientCloser, error) {
 	var res api.WalletStruct
 	closer, err := jsonrpc.NewMergeClient(ctx, addr, "Filecoin",
-		api.GetInternalStructs(&res),
+		[]interface{}{
+			&res.Internal,
+		},
 		requestHeader,
 	)
 

api/docgen-openrpc/cmd/docgen_openrpc.go

@@ -34,7 +34,7 @@ func main() {
 
 	doc := docgen_openrpc.NewLotusOpenRPCDocument(Comments, GroupDocs)
 
-	i, _, _ := docgen.GetAPIType(os.Args[2], os.Args[3])
+	i, _, _, _ := docgen.GetAPIType(os.Args[2], os.Args[3])
 	doc.RegisterReceiverName("Filecoin", i)
 
 	out, err := doc.Discover()

api/docgen/cmd/docgen.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
-	"reflect"
 	"sort"
 	"strings"
 
@@ -16,7 +15,7 @@ func main() {
 
 	groups := make(map[string]*docgen.MethodGroup)
 
-	_, t, permStruct := docgen.GetAPIType(os.Args[2], os.Args[3])
+	_, t, permStruct, commonPermStruct := docgen.GetAPIType(os.Args[2], os.Args[3])
 
 	for i := 0; i < t.NumMethod(); i++ {
 		m := t.Method(i)
@@ -89,16 +88,12 @@ func main() {
 			fmt.Printf("### %s\n", m.Name)
 			fmt.Printf("%s\n\n", m.Comment)
 
-			var meth reflect.StructField
-			var ok bool
-			for _, ps := range permStruct {
-				meth, ok = ps.FieldByName(m.Name)
-				if ok {
-					break
-				}
-			}
+			meth, ok := permStruct.FieldByName(m.Name)
 			if !ok {
-				panic("no perms for method: " + m.Name)
+				meth, ok = commonPermStruct.FieldByName(m.Name)
+				if !ok {
+					panic("no perms for method: " + m.Name)
+				}
 			}
 
 			perms := meth.Tag.Get("perm")

api/docgen/docgen.go

@@ -13,13 +13,15 @@ import (
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-bitfield"
+	"github.com/filecoin-project/go-multistore"
+	"github.com/filecoin-project/lotus/node/repo/importmgr"
 	"github.com/google/uuid"
 	"github.com/ipfs/go-cid"
 	"github.com/ipfs/go-filestore"
-	"github.com/libp2p/go-libp2p-core/metrics"
+	metrics "github.com/libp2p/go-libp2p-core/metrics"
 	"github.com/libp2p/go-libp2p-core/network"
 	"github.com/libp2p/go-libp2p-core/peer"
-	"github.com/libp2p/go-libp2p-core/protocol"
+	protocol "github.com/libp2p/go-libp2p-core/protocol"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	"github.com/multiformats/go-multiaddr"
 
@@ -27,7 +29,6 @@ import (
 	filestore2 "github.com/filecoin-project/go-fil-markets/filestore"
 	"github.com/filecoin-project/go-fil-markets/retrievalmarket"
 	"github.com/filecoin-project/go-jsonrpc/auth"
-	"github.com/filecoin-project/go-multistore"
 
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/crypto"
@@ -46,12 +47,11 @@ import (
 )
 
 var ExampleValues = map[reflect.Type]interface{}{
-	reflect.TypeOf(api.MinerSubsystem(0)): api.MinerSubsystem(1),
-	reflect.TypeOf(auth.Permission("")):   auth.Permission("write"),
-	reflect.TypeOf(""):                    "string value",
-	reflect.TypeOf(uint64(42)):            uint64(42),
-	reflect.TypeOf(byte(7)):               byte(7),
-	reflect.TypeOf([]byte{}):              []byte("byte array"),
+	reflect.TypeOf(auth.Permission("")): auth.Permission("write"),
+	reflect.TypeOf(""):                  "string value",
+	reflect.TypeOf(uint64(42)):          uint64(42),
+	reflect.TypeOf(byte(7)):             byte(7),
+	reflect.TypeOf([]byte{}):            []byte("byte array"),
 }
 
 func addExample(v interface{}) {
@@ -90,6 +90,7 @@ func init() {
 	addExample(&pid)
 
 	multistoreIDExample := multistore.StoreID(50)
+	storeIDExample := importmgr.ImportID(50)
 
 	addExample(bitfield.NewFromSet([]uint64{5}))
 	addExample(abi.RegisteredSealProof_StackedDrg32GiBV1_1)
@@ -120,6 +121,8 @@ func init() {
 	addExample(time.Minute)
 	addExample(datatransfer.TransferID(3))
 	addExample(datatransfer.Ongoing)
+	addExample(storeIDExample)
+	addExample(&storeIDExample)
 	addExample(multistoreIDExample)
 	addExample(&multistoreIDExample)
 	addExample(retrievalmarket.ClientEventDealAccepted)
@@ -176,7 +179,7 @@ func init() {
 
 	// miner specific
 	addExample(filestore2.Path(".lotusminer/fstmp123"))
-	si := multistore.StoreID(12)
+	si := uint64(12)
 	addExample(&si)
 	addExample(retrievalmarket.DealID(5))
 	addExample(abi.ActorID(1000))
@@ -265,35 +268,27 @@ func init() {
 
 	addExample(api.CheckStatusCode(0))
 	addExample(map[string]interface{}{"abc": 123})
-	addExample(api.MinerSubsystems{
-		api.SubsystemMining,
-		api.SubsystemSealing,
-		api.SubsystemSectorStorage,
-		api.SubsystemMarkets,
-	})
 }
 
-func GetAPIType(name, pkg string) (i interface{}, t reflect.Type, permStruct []reflect.Type) {
-
+func GetAPIType(name, pkg string) (i interface{}, t, permStruct, commonPermStruct reflect.Type) {
 	switch pkg {
 	case "api": // latest
 		switch name {
 		case "FullNode":
 			i = &api.FullNodeStruct{}
 			t = reflect.TypeOf(new(struct{ api.FullNode })).Elem()
-			permStruct = append(permStruct, reflect.TypeOf(api.FullNodeStruct{}.Internal))
-			permStruct = append(permStruct, reflect.TypeOf(api.CommonStruct{}.Internal))
-			permStruct = append(permStruct, reflect.TypeOf(api.NetStruct{}.Internal))
+			permStruct = reflect.TypeOf(api.FullNodeStruct{}.Internal)
+			commonPermStruct = reflect.TypeOf(api.CommonStruct{}.Internal)
 		case "StorageMiner":
 			i = &api.StorageMinerStruct{}
 			t = reflect.TypeOf(new(struct{ api.StorageMiner })).Elem()
-			permStruct = append(permStruct, reflect.TypeOf(api.StorageMinerStruct{}.Internal))
-			permStruct = append(permStruct, reflect.TypeOf(api.CommonStruct{}.Internal))
-			permStruct = append(permStruct, reflect.TypeOf(api.NetStruct{}.Internal))
+			permStruct = reflect.TypeOf(api.StorageMinerStruct{}.Internal)
+			commonPermStruct = reflect.TypeOf(api.CommonStruct{}.Internal)
 		case "Worker":
 			i = &api.WorkerStruct{}
 			t = reflect.TypeOf(new(struct{ api.Worker })).Elem()
-			permStruct = append(permStruct, reflect.TypeOf(api.WorkerStruct{}.Internal))
+			permStruct = reflect.TypeOf(api.WorkerStruct{}.Internal)
+			commonPermStruct = reflect.TypeOf(api.WorkerStruct{}.Internal)
 		default:
 			panic("unknown type")
 		}
@@ -302,9 +297,8 @@ func GetAPIType(name, pkg string) (i interface{}, t reflect.Type, permStruct []r
 		case "FullNode":
 			i = v0api.FullNodeStruct{}
 			t = reflect.TypeOf(new(struct{ v0api.FullNode })).Elem()
-			permStruct = append(permStruct, reflect.TypeOf(v0api.FullNodeStruct{}.Internal))
-			permStruct = append(permStruct, reflect.TypeOf(v0api.CommonStruct{}.Internal))
-			permStruct = append(permStruct, reflect.TypeOf(v0api.NetStruct{}.Internal))
+			permStruct = reflect.TypeOf(v0api.FullNodeStruct{}.Internal)
+			commonPermStruct = reflect.TypeOf(v0api.CommonStruct{}.Internal)
 		default:
 			panic("unknown type")
 		}

api/miner_subsystems.go

@@ -1,79 +0,0 @@
-package api
-
-import (
-	"encoding/json"
-)
-
-// MinerSubsystem represents a miner subsystem. Int and string values are not
-// guaranteed to be stable over time  is not
-// guaranteed to be stable over time.
-type MinerSubsystem int
-
-const (
-	// SubsystemUnknown is a placeholder for the zero value. It should never
-	// be used.
-	SubsystemUnknown MinerSubsystem = iota
-	// SubsystemMarkets signifies the storage and retrieval
-	// deal-making subsystem.
-	SubsystemMarkets
-	// SubsystemMining signifies the mining subsystem.
-	SubsystemMining
-	// SubsystemSealing signifies the sealing subsystem.
-	SubsystemSealing
-	// SubsystemSectorStorage signifies the sector storage subsystem.
-	SubsystemSectorStorage
-)
-
-var MinerSubsystemToString = map[MinerSubsystem]string{
-	SubsystemUnknown:       "Unknown",
-	SubsystemMarkets:       "Markets",
-	SubsystemMining:        "Mining",
-	SubsystemSealing:       "Sealing",
-	SubsystemSectorStorage: "SectorStorage",
-}
-
-var MinerSubsystemToID = map[string]MinerSubsystem{
-	"Unknown":       SubsystemUnknown,
-	"Markets":       SubsystemMarkets,
-	"Mining":        SubsystemMining,
-	"Sealing":       SubsystemSealing,
-	"SectorStorage": SubsystemSectorStorage,
-}
-
-func (ms MinerSubsystem) MarshalJSON() ([]byte, error) {
-	return json.Marshal(MinerSubsystemToString[ms])
-}
-
-func (ms *MinerSubsystem) UnmarshalJSON(b []byte) error {
-	var j string
-	err := json.Unmarshal(b, &j)
-	if err != nil {
-		return err
-	}
-	s, ok := MinerSubsystemToID[j]
-	if !ok {
-		*ms = SubsystemUnknown
-	} else {
-		*ms = s
-	}
-	return nil
-}
-
-type MinerSubsystems []MinerSubsystem
-
-func (ms MinerSubsystems) Has(entry MinerSubsystem) bool {
-	for _, v := range ms {
-		if v == entry {
-			return true
-		}
-	}
-	return false
-}
-
-func (ms MinerSubsystem) String() string {
-	s, ok := MinerSubsystemToString[ms]
-	if !ok {
-		return MinerSubsystemToString[SubsystemUnknown]
-	}
-	return s
-}

api/mocks/mock_full.go

@@ -14,7 +14,6 @@ import (
 	retrievalmarket "github.com/filecoin-project/go-fil-markets/retrievalmarket"
 	storagemarket "github.com/filecoin-project/go-fil-markets/storagemarket"
 	auth "github.com/filecoin-project/go-jsonrpc/auth"
-	multistore "github.com/filecoin-project/go-multistore"
 	abi "github.com/filecoin-project/go-state-types/abi"
 	big "github.com/filecoin-project/go-state-types/big"
 	crypto "github.com/filecoin-project/go-state-types/crypto"
@@ -26,6 +25,7 @@ import (
 	types "github.com/filecoin-project/lotus/chain/types"
 	marketevents "github.com/filecoin-project/lotus/markets/loggers"
 	dtypes "github.com/filecoin-project/lotus/node/modules/dtypes"
+	importmgr "github.com/filecoin-project/lotus/node/repo/importmgr"
 	miner0 "github.com/filecoin-project/specs-actors/actors/builtin/miner"
 	paych "github.com/filecoin-project/specs-actors/actors/builtin/paych"
 	gomock "github.com/golang/mock/gomock"
@@ -105,35 +105,6 @@ func (mr *MockFullNodeMockRecorder) BeaconGetEntry(arg0, arg1 interface{}) *gomo
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BeaconGetEntry", reflect.TypeOf((*MockFullNode)(nil).BeaconGetEntry), arg0, arg1)
 }
 
-// ChainBlockstoreInfo mocks base method.
-func (m *MockFullNode) ChainBlockstoreInfo(arg0 context.Context) (map[string]interface{}, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ChainBlockstoreInfo", arg0)
-	ret0, _ := ret[0].(map[string]interface{})
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// ChainBlockstoreInfo indicates an expected call of ChainBlockstoreInfo.
-func (mr *MockFullNodeMockRecorder) ChainBlockstoreInfo(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ChainBlockstoreInfo", reflect.TypeOf((*MockFullNode)(nil).ChainBlockstoreInfo), arg0)
-}
-
-// ChainCheckBlockstore mocks base method.
-func (m *MockFullNode) ChainCheckBlockstore(arg0 context.Context) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ChainCheckBlockstore", arg0)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// ChainCheckBlockstore indicates an expected call of ChainCheckBlockstore.
-func (mr *MockFullNodeMockRecorder) ChainCheckBlockstore(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ChainCheckBlockstore", reflect.TypeOf((*MockFullNode)(nil).ChainCheckBlockstore), arg0)
-}
-
 // ChainDeleteObj mocks base method.
 func (m *MockFullNode) ChainDeleteObj(arg0 context.Context, arg1 cid.Cid) error {
 	m.ctrl.T.Helper()
@@ -760,7 +731,7 @@ func (mr *MockFullNodeMockRecorder) ClientQueryAsk(arg0, arg1, arg2 interface{})
 }
 
 // ClientRemoveImport mocks base method.
-func (m *MockFullNode) ClientRemoveImport(arg0 context.Context, arg1 multistore.StoreID) error {
+func (m *MockFullNode) ClientRemoveImport(arg0 context.Context, arg1 importmgr.ImportID) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "ClientRemoveImport", arg0, arg1)
 	ret0, _ := ret[0].(error)

api/permissioned.go

@@ -16,33 +16,28 @@ const (
 var AllPermissions = []auth.Permission{PermRead, PermWrite, PermSign, PermAdmin}
 var DefaultPerms = []auth.Permission{PermRead}
 
-func permissionedProxies(in, out interface{}) {
-	outs := GetInternalStructs(out)
-	for _, o := range outs {
-		auth.PermissionedProxy(AllPermissions, DefaultPerms, in, o)
-	}
-}
-
 func PermissionedStorMinerAPI(a StorageMiner) StorageMiner {
 	var out StorageMinerStruct
-	permissionedProxies(a, &out)
+	auth.PermissionedProxy(AllPermissions, DefaultPerms, a, &out.Internal)
+	auth.PermissionedProxy(AllPermissions, DefaultPerms, a, &out.CommonStruct.Internal)
 	return &out
 }
 
 func PermissionedFullAPI(a FullNode) FullNode {
 	var out FullNodeStruct
-	permissionedProxies(a, &out)
+	auth.PermissionedProxy(AllPermissions, DefaultPerms, a, &out.Internal)
+	auth.PermissionedProxy(AllPermissions, DefaultPerms, a, &out.CommonStruct.Internal)
 	return &out
 }
 
 func PermissionedWorkerAPI(a Worker) Worker {
 	var out WorkerStruct
-	permissionedProxies(a, &out)
+	auth.PermissionedProxy(AllPermissions, DefaultPerms, a, &out.Internal)
 	return &out
 }
 
 func PermissionedWalletAPI(a Wallet) Wallet {
 	var out WalletStruct
-	permissionedProxies(a, &out)
+	auth.PermissionedProxy(AllPermissions, DefaultPerms, a, &out.Internal)
 	return &out
 }

api/proxy_util.go

@@ -1,30 +0,0 @@
-package api
-
-import "reflect"
-
-var _internalField = "Internal"
-
-// GetInternalStructs extracts all pointers to 'Internal' sub-structs from the provided pointer to a proxy struct
-func GetInternalStructs(in interface{}) []interface{} {
-	return getInternalStructs(reflect.ValueOf(in).Elem())
-}
-
-func getInternalStructs(rv reflect.Value) []interface{} {
-	var out []interface{}
-
-	internal := rv.FieldByName(_internalField)
-	ii := internal.Addr().Interface()
-	out = append(out, ii)
-
-	for i := 0; i < rv.NumField(); i++ {
-		if rv.Type().Field(i).Name == _internalField {
-			continue
-		}
-
-		sub := getInternalStructs(rv.Field(i))
-
-		out = append(out, sub...)
-	}
-
-	return out
-}

api/proxy_util_test.go

@@ -1,62 +0,0 @@
-package api
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-type StrA struct {
-	StrB
-
-	Internal struct {
-		A int
-	}
-}
-
-type StrB struct {
-	Internal struct {
-		B int
-	}
-}
-
-type StrC struct {
-	Internal struct {
-		Internal struct {
-			C int
-		}
-	}
-}
-
-func TestGetInternalStructs(t *testing.T) {
-	var proxy StrA
-
-	sts := GetInternalStructs(&proxy)
-	require.Len(t, sts, 2)
-
-	sa := sts[0].(*struct{ A int })
-	sa.A = 3
-	sb := sts[1].(*struct{ B int })
-	sb.B = 4
-
-	require.Equal(t, 3, proxy.Internal.A)
-	require.Equal(t, 4, proxy.StrB.Internal.B)
-}
-
-func TestNestedInternalStructs(t *testing.T) {
-	var proxy StrC
-
-	// check that only the top-level internal struct gets picked up
-
-	sts := GetInternalStructs(&proxy)
-	require.Len(t, sts, 1)
-
-	sa := sts[0].(*struct {
-		Internal struct {
-			C int
-		}
-	})
-	sa.Internal.C = 5
-
-	require.Equal(t, 5, proxy.Internal.Internal.C)
-}

api/v0api/full.go

@@ -8,10 +8,10 @@ import (
 	datatransfer "github.com/filecoin-project/go-data-transfer"
 	"github.com/filecoin-project/go-fil-markets/retrievalmarket"
 	"github.com/filecoin-project/go-fil-markets/storagemarket"
-	"github.com/filecoin-project/go-multistore"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/crypto"
 	"github.com/filecoin-project/go-state-types/dline"
+	"github.com/filecoin-project/lotus/node/repo/importmgr"
 	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p-core/peer"
 
@@ -46,7 +46,6 @@ import (
 // FullNode API is a low-level interface to the Filecoin network full node
 type FullNode interface {
 	Common
-	Net
 
 	// MethodGroup: Chain
 	// The Chain method group contains methods for interacting with the
@@ -305,7 +304,7 @@ type FullNode interface {
 	// ClientImport imports file under the specified path into filestore.
 	ClientImport(ctx context.Context, ref api.FileRef) (*api.ImportRes, error) //perm:admin
 	// ClientRemoveImport removes file import
-	ClientRemoveImport(ctx context.Context, importID multistore.StoreID) error //perm:admin
+	ClientRemoveImport(ctx context.Context, importID importmgr.ImportID) error //perm:admin
 	// ClientStartDeal proposes a deal with a miner.
 	ClientStartDeal(ctx context.Context, params *api.StartDealParams) (*cid.Cid, error) //perm:admin
 	// ClientStatelessDeal fire-and-forget-proposes an offline deal to a miner without subsequent tracking.

api/v0api/latest.go

@@ -5,15 +5,8 @@ import (
 )
 
 type Common = api.Common
-type Net = api.Net
-type CommonNet = api.CommonNet
-
 type CommonStruct = api.CommonStruct
 type CommonStub = api.CommonStub
-type NetStruct = api.NetStruct
-type NetStub = api.NetStub
-type CommonNetStruct = api.CommonNetStruct
-type CommonNetStub = api.CommonNetStub
 
 type StorageMiner = api.StorageMiner
 type StorageMinerStruct = api.StorageMinerStruct

api/v0api/v0mocks/mock_full.go

@@ -14,7 +14,6 @@ import (
 	retrievalmarket "github.com/filecoin-project/go-fil-markets/retrievalmarket"
 	storagemarket "github.com/filecoin-project/go-fil-markets/storagemarket"
 	auth "github.com/filecoin-project/go-jsonrpc/auth"
-	multistore "github.com/filecoin-project/go-multistore"
 	abi "github.com/filecoin-project/go-state-types/abi"
 	big "github.com/filecoin-project/go-state-types/big"
 	crypto "github.com/filecoin-project/go-state-types/crypto"
@@ -26,6 +25,7 @@ import (
 	types "github.com/filecoin-project/lotus/chain/types"
 	marketevents "github.com/filecoin-project/lotus/markets/loggers"
 	dtypes "github.com/filecoin-project/lotus/node/modules/dtypes"
+	importmgr "github.com/filecoin-project/lotus/node/repo/importmgr"
 	miner0 "github.com/filecoin-project/specs-actors/actors/builtin/miner"
 	paych "github.com/filecoin-project/specs-actors/actors/builtin/paych"
 	gomock "github.com/golang/mock/gomock"
@@ -731,7 +731,7 @@ func (mr *MockFullNodeMockRecorder) ClientQueryAsk(arg0, arg1, arg2 interface{})
 }
 
 // ClientRemoveImport mocks base method.
-func (m *MockFullNode) ClientRemoveImport(arg0 context.Context, arg1 multistore.StoreID) error {
+func (m *MockFullNode) ClientRemoveImport(arg0 context.Context, arg1 importmgr.ImportID) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "ClientRemoveImport", arg0, arg1)
 	ret0, _ := ret[0].(error)

blockstore/badger/blockstore.go

@@ -4,15 +4,11 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"os"
-	"path/filepath"
 	"runtime"
 	"sync"
-	"time"
 
 	"github.com/dgraph-io/badger/v2"
 	"github.com/dgraph-io/badger/v2/options"
-	"github.com/dgraph-io/badger/v2/pb"
 	"github.com/multiformats/go-base32"
 	"go.uber.org/zap"
 
@@ -76,45 +72,19 @@ func (b *badgerLogger) Warningf(format string, args ...interface{}) {
 	b.skip2.Warnf(format, args...)
 }
 
-// bsState is the current blockstore state
-type bsState int
-
 const (
-	// stateOpen signifies an open blockstore
-	stateOpen bsState = iota
-	// stateClosing signifies a blockstore that is currently closing
+	stateOpen = iota
 	stateClosing
-	// stateClosed signifies a blockstore that has been colosed
 	stateClosed
 )
 
-type bsMoveState int
-
-const (
-	// moveStateNone signifies that there is no move in progress
-	moveStateNone bsMoveState = iota
-	// moveStateMoving signifies that there is a move  in a progress
-	moveStateMoving
-	// moveStateCleanup signifies that a move has completed or aborted and we are cleaning up
-	moveStateCleanup
-	// moveStateLock signifies that an exclusive lock has been acquired
-	moveStateLock
-)
-
 // Blockstore is a badger-backed IPLD blockstore.
 type Blockstore struct {
 	stateLk sync.RWMutex
-	state   bsState
+	state   int
 	viewers sync.WaitGroup
 
-	moveMx    sync.Mutex
-	moveCond  sync.Cond
-	moveState bsMoveState
-	rlock     int
-
-	db     *badger.DB
-	dbNext *badger.DB // when moving
-	opts   Options
+	DB *badger.DB
 
 	prefixing bool
 	prefix    []byte
@@ -125,7 +95,6 @@ var _ blockstore.Blockstore = (*Blockstore)(nil)
 var _ blockstore.Viewer = (*Blockstore)(nil)
 var _ blockstore.BlockstoreIterator = (*Blockstore)(nil)
 var _ blockstore.BlockstoreGC = (*Blockstore)(nil)
-var _ blockstore.BlockstoreSize = (*Blockstore)(nil)
 var _ io.Closer = (*Blockstore)(nil)
 
 // Open creates a new badger-backed blockstore, with the supplied options.
@@ -140,15 +109,13 @@ func Open(opts Options) (*Blockstore, error) {
 		return nil, fmt.Errorf("failed to open badger blockstore: %w", err)
 	}
 
-	bs := &Blockstore{db: db, opts: opts}
+	bs := &Blockstore{DB: db}
 	if p := opts.Prefix; p != "" {
 		bs.prefixing = true
 		bs.prefix = []byte(p)
 		bs.prefixLen = len(bs.prefix)
 	}
 
-	bs.moveCond.L = &bs.moveMx
-
 	return bs, nil
 }
 
@@ -172,7 +139,7 @@ func (b *Blockstore) Close() error {
 	// wait for all accesses to complete
 	b.viewers.Wait()
 
-	return b.db.Close()
+	return b.DB.Close()
 }
 
 func (b *Blockstore) access() error {
@@ -194,254 +161,12 @@ func (b *Blockstore) isOpen() bool {
 	return b.state == stateOpen
 }
 
-// lockDB/unlockDB implement a recursive lock contingent on move state
-func (b *Blockstore) lockDB() {
-	b.moveMx.Lock()
-	defer b.moveMx.Unlock()
-
-	if b.rlock == 0 {
-		for b.moveState == moveStateLock {
-			b.moveCond.Wait()
-		}
+// CollectGarbage runs garbage collection on the value log
+func (b *Blockstore) CollectGarbage() error {
+	if err := b.access(); err != nil {
+		return err
 	}
-
-	b.rlock++
-}
-
-func (b *Blockstore) unlockDB() {
-	b.moveMx.Lock()
-	defer b.moveMx.Unlock()
-
-	b.rlock--
-	if b.rlock == 0 && b.moveState == moveStateLock {
-		b.moveCond.Broadcast()
-	}
-}
-
-// lockMove/unlockMove implement an exclusive lock of move state
-func (b *Blockstore) lockMove() {
-	b.moveMx.Lock()
-	b.moveState = moveStateLock
-	for b.rlock > 0 {
-		b.moveCond.Wait()
-	}
-}
-
-func (b *Blockstore) unlockMove(state bsMoveState) {
-	b.moveState = state
-	b.moveCond.Broadcast()
-	b.moveMx.Unlock()
-}
-
-// movingGC moves the blockstore to a new path, adjacent to the current path, and creates
-// a symlink from the current path to the new path; the old blockstore is deleted.
-//
-// The blockstore MUST accept new writes during the move and ensure that these
-// are persisted to the new blockstore; if a failure occurs aboring the move,
-// then they must be peristed to the old blockstore.
-// In short, the blockstore must not lose data from new writes during the move.
-func (b *Blockstore) movingGC() error {
-	// this inlines moveLock/moveUnlock for the initial state check to prevent a second move
-	// while one is in progress without clobbering state
-	b.moveMx.Lock()
-	if b.moveState != moveStateNone {
-		b.moveMx.Unlock()
-		return fmt.Errorf("move in progress")
-	}
-
-	b.moveState = moveStateLock
-	for b.rlock > 0 {
-		b.moveCond.Wait()
-	}
-
-	b.moveState = moveStateMoving
-	b.moveCond.Broadcast()
-	b.moveMx.Unlock()
-
-	var newPath string
-
-	defer func() {
-		b.lockMove()
-
-		dbNext := b.dbNext
-		b.dbNext = nil
-
-		var state bsMoveState
-		if dbNext != nil {
-			state = moveStateCleanup
-		} else {
-			state = moveStateNone
-		}
-
-		b.unlockMove(state)
-
-		if dbNext != nil {
-			// the move failed and we have a left-over db; delete it.
-			err := dbNext.Close()
-			if err != nil {
-				log.Warnf("error closing badger db: %s", err)
-			}
-			b.deleteDB(newPath)
-
-			b.lockMove()
-			b.unlockMove(moveStateNone)
-		}
-	}()
-
-	// we resolve symlinks to create the new path in the adjacent to the old path.
-	// this allows the user to symlink the db directory into a separate filesystem.
-	basePath := b.opts.Dir
-	linkPath, err := filepath.EvalSymlinks(basePath)
-	if err != nil {
-		return fmt.Errorf("error resolving symlink %s: %w", basePath, err)
-	}
-
-	if basePath == linkPath {
-		newPath = basePath
-	} else {
-		// we do this dance to create a name adjacent to the current one, while avoiding clown
-		// shoes with multiple moves (i.e. we can't just take the basename of the linkPath, as it
-		// could have been created in a previous move and have the timestamp suffix, which would then
-		// perpetuate itself.
-		name := filepath.Base(basePath)
-		dir := filepath.Dir(linkPath)
-		newPath = filepath.Join(dir, name)
-	}
-	newPath = fmt.Sprintf("%s.%d", newPath, time.Now().UnixNano())
-
-	log.Infof("moving blockstore from %s to %s", b.opts.Dir, newPath)
-
-	opts := b.opts
-	opts.Dir = newPath
-	opts.ValueDir = newPath
-
-	dbNew, err := badger.Open(opts.Options)
-	if err != nil {
-		return fmt.Errorf("failed to open badger blockstore in %s: %w", newPath, err)
-	}
-
-	b.lockMove()
-	b.dbNext = dbNew
-	b.unlockMove(moveStateMoving)
-
-	log.Info("copying blockstore")
-	err = b.doCopy(b.db, b.dbNext)
-	if err != nil {
-		return fmt.Errorf("error moving badger blockstore to %s: %w", newPath, err)
-	}
-
-	b.lockMove()
-	dbOld := b.db
-	b.db = b.dbNext
-	b.dbNext = nil
-	b.unlockMove(moveStateCleanup)
-
-	err = dbOld.Close()
-	if err != nil {
-		log.Warnf("error closing old badger db: %s", err)
-	}
-
-	// this is the canonical db path; this is where our db lives.
-	dbPath := b.opts.Dir
-
-	// we first move the existing db out of the way, and only delete it after we have symlinked the
-	// new db to the canonical path
-	backupPath := fmt.Sprintf("%s.old.%d", dbPath, time.Now().Unix())
-	if err = os.Rename(dbPath, backupPath); err != nil {
-		// this is not catastrophic in the sense that we have not lost any data.
-		// but it is pretty bad, as the db path points to the old db, while we are now using to the new
-		// db; we can't continue and leave a ticking bomb for the next restart.
-		// so a panic is appropriate and user can fix.
-		panic(fmt.Errorf("error renaming old badger db dir from %s to %s: %w; USER ACTION REQUIRED", dbPath, backupPath, err)) //nolint
-	}
-
-	if err = symlink(newPath, dbPath); err != nil {
-		// same here; the db path is pointing to the void. panic and let the user fix.
-		panic(fmt.Errorf("error symlinking new badger db dir from %s to %s: %w; USER ACTION REQUIRED", newPath, dbPath, err)) //nolint
-	}
-
-	// the delete follows symlinks
-	b.deleteDB(backupPath)
-
-	log.Info("moving blockstore done")
-	return nil
-}
-
-// symlink creates a symlink from path to linkTo; the link is relative if the two are
-// in the same directory
-func symlink(path, linkTo string) error {
-	resolvedPathDir, err := filepath.EvalSymlinks(filepath.Dir(path))
-	if err != nil {
-		return fmt.Errorf("error resolving links in %s: %w", path, err)
-	}
-
-	resolvedLinkDir, err := filepath.EvalSymlinks(filepath.Dir(linkTo))
-	if err != nil {
-		return fmt.Errorf("error resolving links in %s: %w", linkTo, err)
-	}
-
-	if resolvedPathDir == resolvedLinkDir {
-		path = filepath.Base(path)
-	}
-
-	return os.Symlink(path, linkTo)
-}
-
-// doCopy copies a badger blockstore to another, with an optional filter; if the filter
-// is not nil, then only cids that satisfy the filter will be copied.
-func (b *Blockstore) doCopy(from, to *badger.DB) error {
-	workers := runtime.NumCPU() / 2
-	if workers < 2 {
-		workers = 2
-	}
-
-	stream := from.NewStream()
-	stream.NumGo = workers
-	stream.LogPrefix = "doCopy"
-	stream.Send = func(list *pb.KVList) error {
-		batch := to.NewWriteBatch()
-		defer batch.Cancel()
-
-		for _, kv := range list.Kv {
-			if kv.Key == nil || kv.Value == nil {
-				continue
-			}
-			if err := batch.Set(kv.Key, kv.Value); err != nil {
-				return err
-			}
-		}
-
-		return batch.Flush()
-	}
-
-	return stream.Orchestrate(context.Background())
-}
-
-func (b *Blockstore) deleteDB(path string) {
-	// follow symbolic links, otherwise the data wil be left behind
-	linkPath, err := filepath.EvalSymlinks(path)
-	if err != nil {
-		log.Warnf("error resolving symlinks in %s", path)
-		return
-	}
-
-	log.Infof("removing data directory %s", linkPath)
-	if err := os.RemoveAll(linkPath); err != nil {
-		log.Warnf("error deleting db at %s: %s", linkPath, err)
-		return
-	}
-
-	if path != linkPath {
-		log.Infof("removing link %s", path)
-		if err := os.Remove(path); err != nil {
-			log.Warnf("error removing symbolic link %s", err)
-		}
-	}
-}
-
-func (b *Blockstore) onlineGC() error {
-	b.lockDB()
-	defer b.unlockDB()
+	defer b.viewers.Done()
 
 	// compact first to gather the necessary statistics for GC
 	nworkers := runtime.NumCPU() / 2
@@ -449,13 +174,13 @@ func (b *Blockstore) onlineGC() error {
 		nworkers = 2
 	}
 
-	err := b.db.Flatten(nworkers)
+	err := b.DB.Flatten(nworkers)
 	if err != nil {
 		return err
 	}
 
 	for err == nil {
-		err = b.db.RunValueLogGC(0.125)
+		err = b.DB.RunValueLogGC(0.125)
 	}
 
 	if err == badger.ErrNoRewrite {
@@ -466,63 +191,6 @@ func (b *Blockstore) onlineGC() error {
 	return err
 }
 
-// CollectGarbage compacts and runs garbage collection on the value log;
-// implements the BlockstoreGC trait
-func (b *Blockstore) CollectGarbage(opts ...blockstore.BlockstoreGCOption) error {
-	if err := b.access(); err != nil {
-		return err
-	}
-	defer b.viewers.Done()
-
-	var options blockstore.BlockstoreGCOptions
-	for _, opt := range opts {
-		err := opt(&options)
-		if err != nil {
-			return err
-		}
-	}
-
-	if options.FullGC {
-		return b.movingGC()
-	}
-
-	return b.onlineGC()
-}
-
-// Size returns the aggregate size of the blockstore
-func (b *Blockstore) Size() (int64, error) {
-	if err := b.access(); err != nil {
-		return 0, err
-	}
-	defer b.viewers.Done()
-
-	b.lockDB()
-	defer b.unlockDB()
-
-	lsm, vlog := b.db.Size()
-	size := lsm + vlog
-
-	if size == 0 {
-		// badger reports a 0 size on symlinked directories... sigh
-		dir := b.opts.Dir
-		entries, err := os.ReadDir(dir)
-		if err != nil {
-			return 0, err
-		}
-
-		for _, e := range entries {
-			path := filepath.Join(dir, e.Name())
-			finfo, err := os.Stat(path)
-			if err != nil {
-				return 0, err
-			}
-			size += finfo.Size()
-		}
-	}
-
-	return size, nil
-}
-
 // View implements blockstore.Viewer, which leverages zero-copy read-only
 // access to values.
 func (b *Blockstore) View(cid cid.Cid, fn func([]byte) error) error {
@@ -531,15 +199,12 @@ func (b *Blockstore) View(cid cid.Cid, fn func([]byte) error) error {
 	}
 	defer b.viewers.Done()
 
-	b.lockDB()
-	defer b.unlockDB()
-
 	k, pooled := b.PooledStorageKey(cid)
 	if pooled {
 		defer KeyPool.Put(k)
 	}
 
-	return b.db.View(func(txn *badger.Txn) error {
+	return b.DB.View(func(txn *badger.Txn) error {
 		switch item, err := txn.Get(k); err {
 		case nil:
 			return item.Value(fn)
@@ -558,15 +223,12 @@ func (b *Blockstore) Has(cid cid.Cid) (bool, error) {
 	}
 	defer b.viewers.Done()
 
-	b.lockDB()
-	defer b.unlockDB()
-
 	k, pooled := b.PooledStorageKey(cid)
 	if pooled {
 		defer KeyPool.Put(k)
 	}
 
-	err := b.db.View(func(txn *badger.Txn) error {
+	err := b.DB.View(func(txn *badger.Txn) error {
 		_, err := txn.Get(k)
 		return err
 	})
@@ -592,16 +254,13 @@ func (b *Blockstore) Get(cid cid.Cid) (blocks.Block, error) {
 	}
 	defer b.viewers.Done()
 
-	b.lockDB()
-	defer b.unlockDB()
-
 	k, pooled := b.PooledStorageKey(cid)
 	if pooled {
 		defer KeyPool.Put(k)
 	}
 
 	var val []byte
-	err := b.db.View(func(txn *badger.Txn) error {
+	err := b.DB.View(func(txn *badger.Txn) error {
 		switch item, err := txn.Get(k); err {
 		case nil:
 			val, err = item.ValueCopy(nil)
@@ -625,16 +284,13 @@ func (b *Blockstore) GetSize(cid cid.Cid) (int, error) {
 	}
 	defer b.viewers.Done()
 
-	b.lockDB()
-	defer b.unlockDB()
-
 	k, pooled := b.PooledStorageKey(cid)
 	if pooled {
 		defer KeyPool.Put(k)
 	}
 
 	var size int
-	err := b.db.View(func(txn *badger.Txn) error {
+	err := b.DB.View(func(txn *badger.Txn) error {
 		switch item, err := txn.Get(k); err {
 		case nil:
 			size = int(item.ValueSize())
@@ -658,36 +314,18 @@ func (b *Blockstore) Put(block blocks.Block) error {
 	}
 	defer b.viewers.Done()
 
-	b.lockDB()
-	defer b.unlockDB()
-
 	k, pooled := b.PooledStorageKey(block.Cid())
 	if pooled {
 		defer KeyPool.Put(k)
 	}
 
-	put := func(db *badger.DB) error {
-		err := db.Update(func(txn *badger.Txn) error {
-			return txn.Set(k, block.RawData())
-		})
-		if err != nil {
-			return fmt.Errorf("failed to put block in badger blockstore: %w", err)
-		}
-
-		return nil
+	err := b.DB.Update(func(txn *badger.Txn) error {
+		return txn.Set(k, block.RawData())
+	})
+	if err != nil {
+		err = fmt.Errorf("failed to put block in badger blockstore: %w", err)
 	}
-
-	if err := put(b.db); err != nil {
-		return err
-	}
-
-	if b.dbNext != nil {
-		if err := put(b.dbNext); err != nil {
-			return err
-		}
-	}
-
-	return nil
+	return err
 }
 
 // PutMany implements Blockstore.PutMany.
@@ -697,9 +335,6 @@ func (b *Blockstore) PutMany(blocks []blocks.Block) error {
 	}
 	defer b.viewers.Done()
 
-	b.lockDB()
-	defer b.unlockDB()
-
 	// toReturn tracks the byte slices to return to the pool, if we're using key
 	// prefixing. we can't return each slice to the pool after each Set, because
 	// badger holds on to the slice.
@@ -713,45 +348,24 @@ func (b *Blockstore) PutMany(blocks []blocks.Block) error {
 		}()
 	}
 
-	keys := make([][]byte, 0, len(blocks))
+	batch := b.DB.NewWriteBatch()
+	defer batch.Cancel()
+
 	for _, block := range blocks {
 		k, pooled := b.PooledStorageKey(block.Cid())
 		if pooled {
 			toReturn = append(toReturn, k)
 		}
-		keys = append(keys, k)
-	}
-
-	put := func(db *badger.DB) error {
-		batch := db.NewWriteBatch()
-		defer batch.Cancel()
-
-		for i, block := range blocks {
-			k := keys[i]
-			if err := batch.Set(k, block.RawData()); err != nil {
-				return err
-			}
-		}
-
-		err := batch.Flush()
-		if err != nil {
-			return fmt.Errorf("failed to put blocks in badger blockstore: %w", err)
-		}
-
-		return nil
-	}
-
-	if err := put(b.db); err != nil {
-		return err
-	}
-
-	if b.dbNext != nil {
-		if err := put(b.dbNext); err != nil {
+		if err := batch.Set(k, block.RawData()); err != nil {
 			return err
 		}
 	}
 
-	return nil
+	err := batch.Flush()
+	if err != nil {
+		err = fmt.Errorf("failed to put blocks in badger blockstore: %w", err)
+	}
+	return err
 }
 
 // DeleteBlock implements Blockstore.DeleteBlock.
@@ -761,15 +375,12 @@ func (b *Blockstore) DeleteBlock(cid cid.Cid) error {
 	}
 	defer b.viewers.Done()
 
-	b.lockDB()
-	defer b.unlockDB()
-
 	k, pooled := b.PooledStorageKey(cid)
 	if pooled {
 		defer KeyPool.Put(k)
 	}
 
-	return b.db.Update(func(txn *badger.Txn) error {
+	return b.DB.Update(func(txn *badger.Txn) error {
 		return txn.Delete(k)
 	})
 }
@@ -780,9 +391,6 @@ func (b *Blockstore) DeleteMany(cids []cid.Cid) error {
 	}
 	defer b.viewers.Done()
 
-	b.lockDB()
-	defer b.unlockDB()
-
 	// toReturn tracks the byte slices to return to the pool, if we're using key
 	// prefixing. we can't return each slice to the pool after each Set, because
 	// badger holds on to the slice.
@@ -796,7 +404,7 @@ func (b *Blockstore) DeleteMany(cids []cid.Cid) error {
 		}()
 	}
 
-	batch := b.db.NewWriteBatch()
+	batch := b.DB.NewWriteBatch()
 	defer batch.Cancel()
 
 	for _, cid := range cids {
@@ -822,10 +430,7 @@ func (b *Blockstore) AllKeysChan(ctx context.Context) (<-chan cid.Cid, error) {
 		return nil, err
 	}
 
-	b.lockDB()
-	defer b.unlockDB()
-
-	txn := b.db.NewTransaction(false)
+	txn := b.DB.NewTransaction(false)
 	opts := badger.IteratorOptions{PrefetchSize: 100}
 	if b.prefixing {
 		opts.Prefix = b.prefix
@@ -879,10 +484,7 @@ func (b *Blockstore) ForEachKey(f func(cid.Cid) error) error {
 	}
 	defer b.viewers.Done()
 
-	b.lockDB()
-	defer b.unlockDB()
-
-	txn := b.db.NewTransaction(false)
+	txn := b.DB.NewTransaction(false)
 	defer txn.Discard()
 
 	opts := badger.IteratorOptions{PrefetchSize: 100}
@@ -977,9 +579,3 @@ func (b *Blockstore) StorageKey(dst []byte, cid cid.Cid) []byte {
 	}
 	return dst[:reqsize]
 }
-
-// this method is added for lotus-shed needs
-// WARNING: THIS IS COMPLETELY UNSAFE; DONT USE THIS IN PRODUCTION CODE
-func (b *Blockstore) DB() *badger.DB {
-	return b.db
-}

blockstore/badger/blockstore_test.go

@@ -1,19 +1,12 @@
 package badgerbs
 
 import (
-	"bytes"
-	"fmt"
 	"io/ioutil"
 	"os"
-	"path/filepath"
-	"strings"
 	"testing"
 
-	"github.com/stretchr/testify/require"
-	"golang.org/x/sync/errgroup"
-
 	blocks "github.com/ipfs/go-block-format"
-	cid "github.com/ipfs/go-cid"
+	"github.com/stretchr/testify/require"
 
 	"github.com/filecoin-project/lotus/blockstore"
 )
@@ -96,180 +89,3 @@ func openBlockstore(optsSupplier func(path string) Options) func(tb testing.TB,
 		return Open(optsSupplier(path))
 	}
 }
-
-func testMove(t *testing.T, optsF func(string) Options) {
-	basePath, err := ioutil.TempDir("", "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	dbPath := filepath.Join(basePath, "db")
-
-	t.Cleanup(func() {
-		_ = os.RemoveAll(basePath)
-	})
-
-	db, err := Open(optsF(dbPath))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	defer db.Close() //nolint
-
-	var have []blocks.Block
-	var deleted []cid.Cid
-
-	// add some blocks
-	for i := 0; i < 10; i++ {
-		blk := blocks.NewBlock([]byte(fmt.Sprintf("some data %d", i)))
-		err := db.Put(blk)
-		if err != nil {
-			t.Fatal(err)
-		}
-		have = append(have, blk)
-	}
-
-	// delete some of them
-	for i := 5; i < 10; i++ {
-		c := have[i].Cid()
-		err := db.DeleteBlock(c)
-		if err != nil {
-			t.Fatal(err)
-		}
-		deleted = append(deleted, c)
-	}
-	have = have[:5]
-
-	// start a move concurrent with some more puts
-	g := new(errgroup.Group)
-	g.Go(func() error {
-		for i := 10; i < 1000; i++ {
-			blk := blocks.NewBlock([]byte(fmt.Sprintf("some data %d", i)))
-			err := db.Put(blk)
-			if err != nil {
-				return err
-			}
-			have = append(have, blk)
-		}
-		return nil
-	})
-	g.Go(func() error {
-		return db.CollectGarbage(blockstore.WithFullGC(true))
-	})
-
-	err = g.Wait()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// now check that we have all the blocks in have and none in the deleted lists
-	checkBlocks := func() {
-		for _, blk := range have {
-			has, err := db.Has(blk.Cid())
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			if !has {
-				t.Fatal("missing block")
-			}
-
-			blk2, err := db.Get(blk.Cid())
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			if !bytes.Equal(blk.RawData(), blk2.RawData()) {
-				t.Fatal("data mismatch")
-			}
-		}
-
-		for _, c := range deleted {
-			has, err := db.Has(c)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			if has {
-				t.Fatal("resurrected block")
-			}
-		}
-	}
-
-	checkBlocks()
-
-	// check the basePath -- it should contain a directory with name db.{timestamp}, soft-linked
-	// to db and nothing else
-	checkPath := func() {
-		entries, err := os.ReadDir(basePath)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if len(entries) != 2 {
-			t.Fatalf("too many entries; expected %d but got %d", 2, len(entries))
-		}
-
-		var haveDB, haveDBLink bool
-		for _, e := range entries {
-			if e.Name() == "db" {
-				if (e.Type() & os.ModeSymlink) == 0 {
-					t.Fatal("found db, but it's not a symlink")
-				}
-				haveDBLink = true
-				continue
-			}
-			if strings.HasPrefix(e.Name(), "db.") {
-				if !e.Type().IsDir() {
-					t.Fatal("found db prefix, but it's not a directory")
-				}
-				haveDB = true
-				continue
-			}
-		}
-
-		if !haveDB {
-			t.Fatal("db directory is missing")
-		}
-		if !haveDBLink {
-			t.Fatal("db link is missing")
-		}
-	}
-
-	checkPath()
-
-	// now do another FullGC to test the double move and following of symlinks
-	if err := db.CollectGarbage(blockstore.WithFullGC(true)); err != nil {
-		t.Fatal(err)
-	}
-
-	checkBlocks()
-	checkPath()
-
-	// reopen the db to make sure our relative link works:
-	err = db.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	db, err = Open(optsF(dbPath))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// db.Close() is already deferred
-
-	checkBlocks()
-}
-
-func TestMoveNoPrefix(t *testing.T) {
-	testMove(t, DefaultOptions)
-}
-
-func TestMoveWithPrefix(t *testing.T) {
-	testMove(t, func(path string) Options {
-		opts := DefaultOptions(path)
-		opts.Prefix = "/prefixed/"
-		return opts
-	})
-}

blockstore/blockstore.go

@@ -37,27 +37,7 @@ type BlockstoreIterator interface {
 
 // BlockstoreGC is a trait for blockstores that support online garbage collection
 type BlockstoreGC interface {
-	CollectGarbage(options ...BlockstoreGCOption) error
-}
-
-// BlockstoreGCOption is a functional interface for controlling blockstore GC options
-type BlockstoreGCOption = func(*BlockstoreGCOptions) error
-
-// BlockstoreGCOptions is a struct with GC options
-type BlockstoreGCOptions struct {
-	FullGC bool
-}
-
-func WithFullGC(fullgc bool) BlockstoreGCOption {
-	return func(opts *BlockstoreGCOptions) error {
-		opts.FullGC = fullgc
-		return nil
-	}
-}
-
-// BlockstoreSize is a trait for on-disk blockstores that can report their size
-type BlockstoreSize interface {
-	Size() (int64, error)
+	CollectGarbage() error
 }
 
 // WrapIDStore wraps the underlying blockstore in an "identity" blockstore.

blockstore/splitstore/README.md

@@ -27,47 +27,9 @@ If you intend to use the discard coldstore, your also need to add the following:
     ColdStoreType = "discard"
 ```
 In general you _should not_ have to use the discard store, unless you
-are running a network assistive node (like a bootstrapper or booster)
-or have very constrained hardware with not enough disk space to
-maintain a coldstore, even with garbage collection. It is also appropriate
-for small nodes that are simply watching the chain.
-
-*Warning:* Using the discard store for a general purpose node is discouraged, unless
-you really know what you are doing. Use it at your own risk.
-
-## Configuration Options
-
-These are options in the `[Chainstore.Splitstore]` section of the configuration:
-
-- `HotStoreType` -- specifies the type of hotstore to use.
-  The only currently supported option is `"badger"`.
-- `ColdStoreType` -- specifies the type of coldstore to use.
-  The default value is `"universal"`, which will use the initial monolith blockstore
-  as the coldstore.
-  The other possible value is `"discard"`, as outlined above, which is specialized for
-  running without a coldstore. Note that the discard store wraps the initial monolith
-  blockstore and discards writes; this is necessary to support syncing from a snapshot.
-- `MarkSetType` -- specifies the type of markset to use during compaction.
-  The markset is the data structure used by compaction/gc to track live objects.
-  The default value is `"map"`, which will use an in-memory map; if you are limited
-  in memory (or indeed see compaction run out of memory), you can also specify
-  `"badger"` which will use an disk backed markset, using badger. This will use
-  much less memory, but will also make compaction slower.
-- `HotStoreMessageRetention` -- specifies how many finalities, beyond the 4
-  finalities maintained by default, to maintain messages and message receipts in the
-  hotstore. This is useful for assistive nodes that want to support syncing for other
-  nodes beyond 4 finalities, while running with the discard coldstore option.
-  It is also useful for miners who accept deals and need to lookback messages beyond
-  the 4 finalities, which would otherwise hit the coldstore.
-- `HotStoreFullGCFrequency` -- specifies how frequenty to garbage collect the hotstore
-  using full (moving) GC.
-  The default value is 20, which uses full GC every 20 compactions (about once a week);
-  set to 0 to disable full GC altogether.
-  Rationale: badger supports online GC, and this is used by default. However it has proven to
-  be ineffective in practice with the hotstore size slowly creeping up. In order to address this,
-  we have added moving GC support in our badger wrapper, which can effectively reclaim all space.
-  The downside is that it takes a bit longer to perform a moving GC and you also need enough
-  space to house the new hotstore while the old one is still live.
+are running a network booster or have very constrained hardware with
+not enough disk space to maintain a coldstore, even with garbage
+collection.
 
 
 ## Operation
@@ -105,21 +67,6 @@ Compaction works transactionally with the following algorithm:
   - We delete in small batches taking a lock; each batch is checked again for marks, from the concurrent transactional mark, so as to never delete anything live
 - We then end the transaction and compact/gc the hotstore.
 
-## Garbage Collection
+## Coldstore Garbage Collection
 
 TBD -- see [#6577](https://github.com/filecoin-project/lotus/issues/6577)
-
-## Utilities
-
-`lotus-shed` has a `splitstore` command which provides some utilities:
-
-- `rollback` -- rolls back a splitstore installation.
-  This command copies the hotstore on top of the coldstore, and then deletes the splitstore
-  directory and associated metadata keys.
-  It can also optionally compact/gc the coldstore after the copy (with the `--gc-coldstore` flag)
-  and automatically rewrite the lotus config to disable splitstore (with the `--rewrite-config` flag).
-  Note: the node *must be stopped* before running this command.
-- `clear` -- clears a splitstore installation for restart from snapshot.
-- `check` -- asynchronously runs a basic healthcheck on the splitstore.
-  The results are appended to `<lotus-repo>/datastore/splitstore/check.txt`.
-- `info` -- prints some basic information about the splitstore.

blockstore/splitstore/markset.go

@@ -32,8 +32,6 @@ func OpenMarkSetEnv(path string, mtype string) (MarkSetEnv, error) {
 		return NewBloomMarkSetEnv()
 	case "map":
 		return NewMapMarkSetEnv()
-	case "badger":
-		return NewBadgerMarkSetEnv(path)
 	default:
 		return nil, xerrors.Errorf("unknown mark set type %s", mtype)
 	}

blockstore/splitstore/markset_badger.go

@@ -1,230 +0,0 @@
-package splitstore
-
-import (
-	"os"
-	"path/filepath"
-	"sync"
-
-	"golang.org/x/xerrors"
-
-	"github.com/dgraph-io/badger/v2"
-	"github.com/dgraph-io/badger/v2/options"
-	"go.uber.org/zap"
-
-	cid "github.com/ipfs/go-cid"
-)
-
-type BadgerMarkSetEnv struct {
-	path string
-}
-
-var _ MarkSetEnv = (*BadgerMarkSetEnv)(nil)
-
-type BadgerMarkSet struct {
-	mx      sync.RWMutex
-	cond    sync.Cond
-	pend    map[string]struct{}
-	writing map[int]map[string]struct{}
-	writers int
-	seqno   int
-
-	db   *badger.DB
-	path string
-}
-
-var _ MarkSet = (*BadgerMarkSet)(nil)
-
-var badgerMarkSetBatchSize = 16384
-
-func NewBadgerMarkSetEnv(path string) (MarkSetEnv, error) {
-	msPath := filepath.Join(path, "markset.badger")
-	err := os.MkdirAll(msPath, 0755) //nolint:gosec
-	if err != nil {
-		return nil, xerrors.Errorf("error creating markset directory: %w", err)
-	}
-
-	return &BadgerMarkSetEnv{path: msPath}, nil
-}
-
-func (e *BadgerMarkSetEnv) Create(name string, sizeHint int64) (MarkSet, error) {
-	path := filepath.Join(e.path, name)
-
-	// clean up first
-	err := os.RemoveAll(path)
-	if err != nil {
-		return nil, xerrors.Errorf("error clearing markset directory: %w", err)
-	}
-
-	err = os.MkdirAll(path, 0755) //nolint:gosec
-	if err != nil {
-		return nil, xerrors.Errorf("error creating markset directory: %w", err)
-	}
-
-	opts := badger.DefaultOptions(path)
-	opts.SyncWrites = false
-	opts.CompactL0OnClose = false
-	opts.Compression = options.None
-	// Note: We use FileIO for loading modes to avoid memory thrashing and interference
-	//       between the system blockstore and the markset.
-	//       It was observed that using the default memory mapped option resulted in
-	//       significant interference and unacceptably high block validation times once the markset
-	//       exceeded 1GB in size.
-	opts.TableLoadingMode = options.FileIO
-	opts.ValueLogLoadingMode = options.FileIO
-	opts.Logger = &badgerLogger{
-		SugaredLogger: log.Desugar().WithOptions(zap.AddCallerSkip(1)).Sugar(),
-		skip2:         log.Desugar().WithOptions(zap.AddCallerSkip(2)).Sugar(),
-	}
-
-	db, err := badger.Open(opts)
-	if err != nil {
-		return nil, xerrors.Errorf("error creating badger markset: %w", err)
-	}
-
-	ms := &BadgerMarkSet{
-		pend:    make(map[string]struct{}),
-		writing: make(map[int]map[string]struct{}),
-		db:      db,
-		path:    path,
-	}
-	ms.cond.L = &ms.mx
-
-	return ms, nil
-}
-
-func (e *BadgerMarkSetEnv) Close() error {
-	return os.RemoveAll(e.path)
-}
-
-func (s *BadgerMarkSet) Mark(c cid.Cid) error {
-	s.mx.Lock()
-
-	if s.pend == nil {
-		s.mx.Unlock()
-		return errMarkSetClosed
-	}
-
-	s.pend[string(c.Hash())] = struct{}{}
-
-	if len(s.pend) < badgerMarkSetBatchSize {
-		s.mx.Unlock()
-		return nil
-	}
-
-	pend := s.pend
-	seqno := s.seqno
-	s.seqno++
-	s.writing[seqno] = pend
-	s.pend = make(map[string]struct{})
-	s.writers++
-	s.mx.Unlock()
-
-	defer func() {
-		s.mx.Lock()
-		defer s.mx.Unlock()
-
-		delete(s.writing, seqno)
-		s.writers--
-		if s.writers == 0 {
-			s.cond.Broadcast()
-		}
-	}()
-
-	empty := []byte{} // not nil
-
-	batch := s.db.NewWriteBatch()
-	defer batch.Cancel()
-
-	for k := range pend {
-		if err := batch.Set([]byte(k), empty); err != nil {
-			return err
-		}
-	}
-
-	err := batch.Flush()
-	if err != nil {
-		return xerrors.Errorf("error flushing batch to badger markset: %w", err)
-	}
-
-	return nil
-}
-
-func (s *BadgerMarkSet) Has(c cid.Cid) (bool, error) {
-	s.mx.RLock()
-	defer s.mx.RUnlock()
-
-	if s.pend == nil {
-		return false, errMarkSetClosed
-	}
-
-	key := c.Hash()
-	pendKey := string(key)
-	_, ok := s.pend[pendKey]
-	if ok {
-		return true, nil
-	}
-
-	for _, wr := range s.writing {
-		_, ok := wr[pendKey]
-		if ok {
-			return true, nil
-		}
-	}
-
-	err := s.db.View(func(txn *badger.Txn) error {
-		_, err := txn.Get(key)
-		return err
-	})
-
-	switch err {
-	case nil:
-		return true, nil
-
-	case badger.ErrKeyNotFound:
-		return false, nil
-
-	default:
-		return false, xerrors.Errorf("error checking badger markset: %w", err)
-	}
-}
-
-func (s *BadgerMarkSet) Close() error {
-	s.mx.Lock()
-	defer s.mx.Unlock()
-
-	if s.pend == nil {
-		return nil
-	}
-
-	for s.writers > 0 {
-		s.cond.Wait()
-	}
-
-	s.pend = nil
-	db := s.db
-	s.db = nil
-
-	err := db.Close()
-	if err != nil {
-		return xerrors.Errorf("error closing badger markset: %w", err)
-	}
-
-	err = os.RemoveAll(s.path)
-	if err != nil {
-		return xerrors.Errorf("error deleting badger markset: %w", err)
-	}
-
-	return nil
-}
-
-func (s *BadgerMarkSet) SetConcurrent() {}
-
-// badger logging through go-log
-type badgerLogger struct {
-	*zap.SugaredLogger
-	skip2 *zap.SugaredLogger
-}
-
-func (b *badgerLogger) Warningf(format string, args ...interface{}) {}
-func (b *badgerLogger) Infof(format string, args ...interface{})    {}
-func (b *badgerLogger) Debugf(format string, args ...interface{})   {}

blockstore/splitstore/markset_test.go

@@ -16,15 +16,6 @@ func TestBloomMarkSet(t *testing.T) {
 	testMarkSet(t, "bloom")
 }
 
-func TestBadgerMarkSet(t *testing.T) {
-	bs := badgerMarkSetBatchSize
-	badgerMarkSetBatchSize = 1
-	t.Cleanup(func() {
-		badgerMarkSetBatchSize = bs
-	})
-	testMarkSet(t, "badger")
-}
-
 func testMarkSet(t *testing.T, lsType string) {
 	t.Helper()
 

blockstore/splitstore/splitstore.go

@@ -62,11 +62,8 @@ func init() {
 type Config struct {
 	// MarkSetType is the type of mark set to use.
 	//
-	// The default value is "map", which uses an in-memory map-backed markset.
-	// If you are constrained in memory (i.e. compaction runs out of memory), you
-	// can use "badger", which will use a disk-backed markset using badger.
-	// Note that compaction will take quite a bit longer when using the "badger" option,
-	// but that shouldn't really matter (as long as it is under 7.5hrs).
+	// Only current sane value is "map", but we may add an option for a disk-backed
+	// markset for memory-constrained situations.
 	MarkSetType string
 
 	// DiscardColdBlocks indicates whether to skip moving cold blocks to the coldstore.
@@ -74,20 +71,6 @@ type Config struct {
 	// which skips moving (as it is a noop, but still takes time to read all the cold objects)
 	// and directly purges cold blocks.
 	DiscardColdBlocks bool
-
-	// HotstoreMessageRetention indicates the hotstore retention policy for messages.
-	// It has the following semantics:
-	// - a value of 0 will only retain messages within the compaction boundary (4 finalities)
-	// - a positive integer indicates the number of finalities, outside the compaction boundary,
-	//   for which messages will be retained in the hotstore.
-	HotStoreMessageRetention uint64
-
-	// HotstoreFullGCFrequency indicates how frequently (in terms of compactions) to garbage collect
-	// the hotstore using full (moving) GC if supported by the hotstore.
-	// A value of 0 disables full GC entirely.
-	// A positive value is the number of compactions before a full GC is performed;
-	// a value of 1 will perform full GC in every compaction.
-	HotStoreFullGCFrequency uint64
 }
 
 // ChainAccessor allows the Splitstore to access the chain. It will most likely
@@ -109,8 +92,7 @@ type SplitStore struct {
 	compacting int32 // compaction/prune/warmup in progress
 	closing    int32 // the splitstore is closing
 
-	cfg  *Config
-	path string
+	cfg *Config
 
 	mx          sync.Mutex
 	warmupEpoch abi.ChainEpoch // protected by mx
@@ -146,9 +128,6 @@ type SplitStore struct {
 	txnRefsMx       sync.Mutex
 	txnRefs         map[cid.Cid]struct{}
 	txnMissing      map[cid.Cid]struct{}
-
-	// registered protectors
-	protectors []func(func(cid.Cid) error) error
 }
 
 var _ bstore.Blockstore = (*SplitStore)(nil)
@@ -177,7 +156,6 @@ func Open(path string, ds dstore.Datastore, hot, cold bstore.Blockstore, cfg *Co
 	// and now we can make a SplitStore
 	ss := &SplitStore{
 		cfg:        cfg,
-		path:       path,
 		ds:         ds,
 		cold:       cold,
 		hot:        hots,
@@ -542,13 +520,6 @@ func (s *SplitStore) Start(chain ChainAccessor) error {
 	return nil
 }
 
-func (s *SplitStore) AddProtector(protector func(func(cid.Cid) error) error) {
-	s.mx.Lock()
-	defer s.mx.Unlock()
-
-	s.protectors = append(s.protectors, protector)
-}
-
 func (s *SplitStore) Close() error {
 	if !atomic.CompareAndSwapInt32(&s.closing, 0, 1) {
 		// already closing

blockstore/splitstore/splitstore_check.go

@@ -1,150 +0,0 @@
-package splitstore
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"sync/atomic"
-	"time"
-
-	"golang.org/x/xerrors"
-
-	cid "github.com/ipfs/go-cid"
-
-	bstore "github.com/filecoin-project/lotus/blockstore"
-	"github.com/filecoin-project/lotus/chain/types"
-)
-
-// performs an asynchronous health-check on the splitstore; results are appended to
-// <splitstore-path>/check.txt
-func (s *SplitStore) Check() error {
-	s.headChangeMx.Lock()
-	defer s.headChangeMx.Unlock()
-
-	// try to take compaction lock and inhibit compaction while the health-check is running
-	if !atomic.CompareAndSwapInt32(&s.compacting, 0, 1) {
-		return xerrors.Errorf("can't acquire compaction lock; compacting operation in progress")
-	}
-
-	if s.compactionIndex == 0 {
-		atomic.StoreInt32(&s.compacting, 0)
-		return xerrors.Errorf("splitstore hasn't compacted yet; health check is not meaningful")
-	}
-
-	// check if we are actually closing first
-	if err := s.checkClosing(); err != nil {
-		atomic.StoreInt32(&s.compacting, 0)
-		return err
-	}
-
-	curTs := s.chain.GetHeaviestTipSet()
-	go func() {
-		defer atomic.StoreInt32(&s.compacting, 0)
-
-		log.Info("checking splitstore health")
-		start := time.Now()
-
-		err := s.doCheck(curTs)
-		if err != nil {
-			log.Errorf("error checking splitstore health: %s", err)
-			return
-		}
-
-		log.Infow("health check done", "took", time.Since(start))
-	}()
-
-	return nil
-}
-
-func (s *SplitStore) doCheck(curTs *types.TipSet) error {
-	currentEpoch := curTs.Height()
-	boundaryEpoch := currentEpoch - CompactionBoundary
-
-	outputPath := filepath.Join(s.path, "check.txt")
-	output, err := os.OpenFile(outputPath, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644)
-	if err != nil {
-		return xerrors.Errorf("error opening check output file %s: %w", outputPath, err)
-	}
-	defer output.Close() //nolint:errcheck
-
-	write := func(format string, args ...interface{}) {
-		_, err := fmt.Fprintf(output, format+"\n", args...)
-		if err != nil {
-			log.Warnf("error writing check output: %s", err)
-		}
-	}
-
-	ts, _ := time.Now().MarshalText()
-	write("---------------------------------------------")
-	write("start check at %s", ts)
-	write("current epoch: %d", currentEpoch)
-	write("boundary epoch: %d", boundaryEpoch)
-	write("compaction index: %d", s.compactionIndex)
-	write("--")
-
-	var coldCnt, missingCnt int64
-	err = s.walkChain(curTs, boundaryEpoch, boundaryEpoch,
-		func(c cid.Cid) error {
-			if isUnitaryObject(c) {
-				return errStopWalk
-			}
-
-			has, err := s.hot.Has(c)
-			if err != nil {
-				return xerrors.Errorf("error checking hotstore: %w", err)
-			}
-
-			if has {
-				return nil
-			}
-
-			has, err = s.cold.Has(c)
-			if err != nil {
-				return xerrors.Errorf("error checking coldstore: %w", err)
-			}
-
-			if has {
-				coldCnt++
-				write("cold object reference: %s", c)
-			} else {
-				missingCnt++
-				write("missing object reference: %s", c)
-				return errStopWalk
-			}
-
-			return nil
-		})
-
-	if err != nil {
-		err = xerrors.Errorf("error walking chain: %w", err)
-		write("ERROR: %s", err)
-		return err
-	}
-
-	log.Infow("check done", "cold", coldCnt, "missing", missingCnt)
-	write("--")
-	write("cold: %d missing: %d", coldCnt, missingCnt)
-	write("DONE")
-
-	return nil
-}
-
-// provides some basic information about the splitstore
-func (s *SplitStore) Info() map[string]interface{} {
-	info := make(map[string]interface{})
-	info["base epoch"] = s.baseEpoch
-	info["warmup epoch"] = s.warmupEpoch
-	info["compactions"] = s.compactionIndex
-
-	sizer, ok := s.hot.(bstore.BlockstoreSize)
-	if ok {
-		size, err := sizer.Size()
-		if err != nil {
-			log.Warnf("error getting hotstore size: %s", err)
-		} else {
-			info["hotstore size"] = size
-		}
-	}
-
-	return info
-}

blockstore/splitstore/splitstore_compact.go

@@ -184,6 +184,16 @@ func (s *SplitStore) trackTxnRef(c cid.Cid) {
 		return
 	}
 
+	if s.txnProtect != nil {
+		mark, err := s.txnProtect.Has(c)
+		if err != nil {
+			log.Warnf("error checking markset: %s", err)
+			// track it anyways
+		} else if mark {
+			return
+		}
+	}
+
 	s.txnRefsMx.Lock()
 	s.txnRefs[c] = struct{}{}
 	s.txnRefsMx.Unlock()
@@ -199,11 +209,27 @@ func (s *SplitStore) trackTxnRefMany(cids []cid.Cid) {
 	s.txnRefsMx.Lock()
 	defer s.txnRefsMx.Unlock()
 
+	quiet := false
 	for _, c := range cids {
 		if isUnitaryObject(c) {
 			continue
 		}
 
+		if s.txnProtect != nil {
+			mark, err := s.txnProtect.Has(c)
+			if err != nil {
+				if !quiet {
+					quiet = true
+					log.Warnf("error checking markset: %s", err)
+				}
+				// track it anyways
+			}
+
+			if mark {
+				continue
+			}
+		}
+
 		s.txnRefs[c] = struct{}{}
 	}
 
@@ -319,30 +345,6 @@ func (s *SplitStore) doTxnProtect(root cid.Cid, markSet MarkSet) error {
 		})
 }
 
-func (s *SplitStore) applyProtectors() error {
-	s.mx.Lock()
-	defer s.mx.Unlock()
-
-	count := 0
-	for _, protect := range s.protectors {
-		err := protect(func(c cid.Cid) error {
-			s.trackTxnRef(c)
-			count++
-			return nil
-		})
-
-		if err != nil {
-			return xerrors.Errorf("error applynig protector: %w", err)
-		}
-	}
-
-	if count > 0 {
-		log.Infof("protected %d references through %d protectors", count, len(s.protectors))
-	}
-
-	return nil
-}
-
 // --- Compaction ---
 // Compaction works transactionally with the following algorithm:
 // - We prepare a transaction, whereby all i/o referenced objects through the API are tracked.
@@ -374,13 +376,7 @@ func (s *SplitStore) doCompact(curTs *types.TipSet) error {
 	currentEpoch := curTs.Height()
 	boundaryEpoch := currentEpoch - CompactionBoundary
 
-	var inclMsgsEpoch abi.ChainEpoch
-	inclMsgsRange := abi.ChainEpoch(s.cfg.HotStoreMessageRetention) * build.Finality
-	if inclMsgsRange < boundaryEpoch {
-		inclMsgsEpoch = boundaryEpoch - inclMsgsRange
-	}
-
-	log.Infow("running compaction", "currentEpoch", currentEpoch, "baseEpoch", s.baseEpoch, "boundaryEpoch", boundaryEpoch, "inclMsgsEpoch", inclMsgsEpoch, "compactionIndex", s.compactionIndex)
+	log.Infow("running compaction", "currentEpoch", currentEpoch, "baseEpoch", s.baseEpoch, "boundaryEpoch", boundaryEpoch, "compactionIndex", s.compactionIndex)
 
 	markSet, err := s.markSetEnv.Create("live", s.markSetSize)
 	if err != nil {
@@ -396,21 +392,13 @@ func (s *SplitStore) doCompact(curTs *types.TipSet) error {
 	// we are ready for concurrent marking
 	s.beginTxnMarking(markSet)
 
-	// 0. track all protected references at beginning of compaction; anything added later should
-	//    be transactionally protected by the write
-	log.Info("protecting references with registered protectors")
-	err = s.applyProtectors()
-	if err != nil {
-		return err
-	}
-
 	// 1. mark reachable objects by walking the chain from the current epoch; we keep state roots
 	//   and messages until the boundary epoch.
 	log.Info("marking reachable objects")
 	startMark := time.Now()
 
 	var count int64
-	err = s.walkChain(curTs, boundaryEpoch, inclMsgsEpoch,
+	err = s.walkChain(curTs, boundaryEpoch, true,
 		func(c cid.Cid) error {
 			if isUnitaryObject(c) {
 				return errStopWalk
@@ -605,7 +593,7 @@ func (s *SplitStore) endTxnProtect() {
 	s.txnMissing = nil
 }
 
-func (s *SplitStore) walkChain(ts *types.TipSet, inclState, inclMsgs abi.ChainEpoch,
+func (s *SplitStore) walkChain(ts *types.TipSet, boundary abi.ChainEpoch, inclMsgs bool,
 	f func(cid.Cid) error) error {
 	visited := cid.NewSet()
 	walked := cid.NewSet()
@@ -613,8 +601,6 @@ func (s *SplitStore) walkChain(ts *types.TipSet, inclState, inclMsgs abi.ChainEp
 	walkCnt := 0
 	scanCnt := 0
 
-	stopWalk := func(_ cid.Cid) error { return errStopWalk }
-
 	walkBlock := func(c cid.Cid) error {
 		if !visited.Visit(c) {
 			return nil
@@ -635,19 +621,10 @@ func (s *SplitStore) walkChain(ts *types.TipSet, inclState, inclMsgs abi.ChainEp
 			return xerrors.Errorf("error unmarshaling block header (cid: %s): %w", c, err)
 		}
 
-		// message are retained if within the inclMsgs boundary
-		if hdr.Height >= inclMsgs && hdr.Height > 0 {
-			if inclMsgs < inclState {
-				// we need to use walkObjectIncomplete here, as messages/receipts may be missing early on if we
-				// synced from snapshot and have a long HotStoreMessageRetentionPolicy.
-				if err := s.walkObjectIncomplete(hdr.Messages, walked, f, stopWalk); err != nil {
-					return xerrors.Errorf("error walking messages (cid: %s): %w", hdr.Messages, err)
-				}
-
-				if err := s.walkObjectIncomplete(hdr.ParentMessageReceipts, walked, f, stopWalk); err != nil {
-					return xerrors.Errorf("error walking messages receipts (cid: %s): %w", hdr.ParentMessageReceipts, err)
-				}
-			} else {
+		// we only scan the block if it is at or above the boundary
+		if hdr.Height >= boundary || hdr.Height == 0 {
+			scanCnt++
+			if inclMsgs && hdr.Height > 0 {
 				if err := s.walkObject(hdr.Messages, walked, f); err != nil {
 					return xerrors.Errorf("error walking messages (cid: %s): %w", hdr.Messages, err)
 				}
@@ -656,14 +633,10 @@ func (s *SplitStore) walkChain(ts *types.TipSet, inclState, inclMsgs abi.ChainEp
 					return xerrors.Errorf("error walking message receipts (cid: %s): %w", hdr.ParentMessageReceipts, err)
 				}
 			}
-		}
 
-		// state is only retained if within the inclState boundary, with the exception of genesis
-		if hdr.Height >= inclState || hdr.Height == 0 {
 			if err := s.walkObject(hdr.ParentStateRoot, walked, f); err != nil {
 				return xerrors.Errorf("error walking state root (cid: %s): %w", hdr.ParentStateRoot, err)
 			}
-			scanCnt++
 		}
 
 		if hdr.Height > 0 {

blockstore/splitstore/splitstore_gc.go

@@ -8,22 +8,17 @@ import (
 )
 
 func (s *SplitStore) gcHotstore() {
-	var opts []bstore.BlockstoreGCOption
-	if s.cfg.HotStoreFullGCFrequency > 0 && s.compactionIndex%int64(s.cfg.HotStoreFullGCFrequency) == 0 {
-		opts = append(opts, bstore.WithFullGC(true))
-	}
-
-	if err := s.gcBlockstore(s.hot, opts); err != nil {
+	if err := s.gcBlockstoreOnline(s.hot); err != nil {
 		log.Warnf("error garbage collecting hostore: %s", err)
 	}
 }
 
-func (s *SplitStore) gcBlockstore(b bstore.Blockstore, opts []bstore.BlockstoreGCOption) error {
+func (s *SplitStore) gcBlockstoreOnline(b bstore.Blockstore) error {
 	if gc, ok := b.(bstore.BlockstoreGC); ok {
 		log.Info("garbage collecting blockstore")
 		startGC := time.Now()
 
-		if err := gc.CollectGarbage(opts...); err != nil {
+		if err := gc.CollectGarbage(); err != nil {
 			return err
 		}
 
@@ -31,5 +26,5 @@ func (s *SplitStore) gcBlockstore(b bstore.Blockstore, opts []bstore.BlockstoreG
 		return nil
 	}
 
-	return fmt.Errorf("blockstore doesn't support garbage collection: %T", b)
+	return fmt.Errorf("blockstore doesn't support online gc: %T", b)
 }

blockstore/splitstore/splitstore_test.go

@@ -24,7 +24,6 @@ import (
 func init() {
 	CompactionThreshold = 5
 	CompactionBoundary = 2
-	WarmupBoundary = 0
 	logging.SetLogLevel("splitstore", "DEBUG")
 }
 
@@ -64,20 +63,6 @@ func testSplitStore(t *testing.T, cfg *Config) {
 		t.Fatal(err)
 	}
 
-	// create a garbage block that is protected with a rgistered protector
-	protected := blocks.NewBlock([]byte("protected!"))
-	err = hot.Put(protected)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// and another one that is not protected
-	unprotected := blocks.NewBlock([]byte("unprotected!"))
-	err = hot.Put(unprotected)
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	// open the splitstore
 	ss, err := Open("", ds, hot, cold, cfg)
 	if err != nil {
@@ -85,11 +70,6 @@ func testSplitStore(t *testing.T, cfg *Config) {
 	}
 	defer ss.Close() //nolint
 
-	// register our protector
-	ss.AddProtector(func(protect func(cid.Cid) error) error {
-		return protect(protected.Cid())
-	})
-
 	err = ss.Start(chain)
 	if err != nil {
 		t.Fatal(err)
@@ -152,8 +132,8 @@ func testSplitStore(t *testing.T, cfg *Config) {
 		t.Errorf("expected %d blocks, but got %d", 2, coldCnt)
 	}
 
-	if hotCnt != 12 {
-		t.Errorf("expected %d blocks, but got %d", 12, hotCnt)
+	if hotCnt != 10 {
+		t.Errorf("expected %d blocks, but got %d", 10, hotCnt)
 	}
 
 	// trigger a compaction
@@ -166,41 +146,12 @@ func testSplitStore(t *testing.T, cfg *Config) {
 	coldCnt = countBlocks(cold)
 	hotCnt = countBlocks(hot)
 
-	if coldCnt != 6 {
-		t.Errorf("expected %d cold blocks, but got %d", 6, coldCnt)
+	if coldCnt != 5 {
+		t.Errorf("expected %d cold blocks, but got %d", 5, coldCnt)
 	}
 
-	if hotCnt != 18 {
-		t.Errorf("expected %d hot blocks, but got %d", 18, hotCnt)
-	}
-
-	// ensure our protected block is still there
-	has, err := hot.Has(protected.Cid())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if !has {
-		t.Fatal("protected block is missing from hotstore")
-	}
-
-	// ensure our unprotected block is in the coldstore now
-	has, err = hot.Has(unprotected.Cid())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if has {
-		t.Fatal("unprotected block is still in hotstore")
-	}
-
-	has, err = cold.Has(unprotected.Cid())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if !has {
-		t.Fatal("unprotected block is missing from coldstore")
+	if hotCnt != 17 {
+		t.Errorf("expected %d hot blocks, but got %d", 17, hotCnt)
 	}
 
 	// Make sure we can revert without panicking.
@@ -211,15 +162,6 @@ func TestSplitStoreCompaction(t *testing.T) {
 	testSplitStore(t, &Config{MarkSetType: "map"})
 }
 
-func TestSplitStoreCompactionWithBadger(t *testing.T) {
-	bs := badgerMarkSetBatchSize
-	badgerMarkSetBatchSize = 1
-	t.Cleanup(func() {
-		badgerMarkSetBatchSize = bs
-	})
-	testSplitStore(t, &Config{MarkSetType: "badger"})
-}
-
 type mockChain struct {
 	t testing.TB
 

blockstore/splitstore/splitstore_warmup.go

@@ -9,17 +9,10 @@ import (
 	blocks "github.com/ipfs/go-block-format"
 	cid "github.com/ipfs/go-cid"
 
-	"github.com/filecoin-project/go-state-types/abi"
 	bstore "github.com/filecoin-project/lotus/blockstore"
-	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/types"
 )
 
-var (
-	// WarmupBoundary is the number of epochs to load state during warmup.
-	WarmupBoundary = build.Finality
-)
-
 // warmup acuiqres the compaction lock and spawns a goroutine to warm up the hotstore;
 // this is necessary when we sync from a snapshot or when we enable the splitstore
 // on top of an existing blockstore (which becomes the coldstore).
@@ -50,16 +43,12 @@ func (s *SplitStore) warmup(curTs *types.TipSet) error {
 // and headers all the way up to genesis.
 // objects are written in batches so as to minimize overhead.
 func (s *SplitStore) doWarmup(curTs *types.TipSet) error {
-	var boundaryEpoch abi.ChainEpoch
 	epoch := curTs.Height()
-	if WarmupBoundary < epoch {
-		boundaryEpoch = epoch - WarmupBoundary
-	}
 	batchHot := make([]blocks.Block, 0, batchSize)
 	count := int64(0)
 	xcount := int64(0)
 	missing := int64(0)
-	err := s.walkChain(curTs, boundaryEpoch, epoch+1, // we don't load messages/receipts in warmup
+	err := s.walkChain(curTs, epoch, false,
 		func(c cid.Cid) error {
 			if isUnitaryObject(c) {
 				return errStopWalk
@@ -80,7 +69,7 @@ func (s *SplitStore) doWarmup(curTs *types.TipSet) error {
 			if err != nil {
 				if err == bstore.ErrNotFound {
 					missing++
-					return errStopWalk
+					return nil
 				}
 				return err
 			}

build/params_2k.go

@@ -28,18 +28,18 @@ var UpgradeAssemblyHeight = abi.ChainEpoch(-5)
 var UpgradeLiftoffHeight = abi.ChainEpoch(-6)
 
 var UpgradeKumquatHeight = abi.ChainEpoch(-7)
-var UpgradeCalicoHeight = abi.ChainEpoch(-9)
-var UpgradePersianHeight = abi.ChainEpoch(-10)
-var UpgradeOrangeHeight = abi.ChainEpoch(-11)
-var UpgradeClausHeight = abi.ChainEpoch(-12)
+var UpgradeCalicoHeight = abi.ChainEpoch(-8)
+var UpgradePersianHeight = abi.ChainEpoch(-9)
+var UpgradeOrangeHeight = abi.ChainEpoch(-10)
+var UpgradeClausHeight = abi.ChainEpoch(-11)
 
-var UpgradeTrustHeight = abi.ChainEpoch(-13)
+var UpgradeTrustHeight = abi.ChainEpoch(-12)
 
-var UpgradeNorwegianHeight = abi.ChainEpoch(-14)
+var UpgradeNorwegianHeight = abi.ChainEpoch(-13)
 
-var UpgradeTurboHeight = abi.ChainEpoch(-15)
+var UpgradeTurboHeight = abi.ChainEpoch(-14)
 
-var UpgradeHyperdriveHeight = abi.ChainEpoch(-16)
+var UpgradeHyperdriveHeight = abi.ChainEpoch(-15)
 
 var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0: DrandMainnet,

build/params_interop.go

@@ -31,18 +31,18 @@ var UpgradeAssemblyHeight = abi.ChainEpoch(-5)
 var UpgradeLiftoffHeight = abi.ChainEpoch(-6)
 
 var UpgradeKumquatHeight = abi.ChainEpoch(-7)
-var UpgradeCalicoHeight = abi.ChainEpoch(-9)
-var UpgradePersianHeight = abi.ChainEpoch(-10)
-var UpgradeOrangeHeight = abi.ChainEpoch(-11)
-var UpgradeClausHeight = abi.ChainEpoch(-12)
+var UpgradeCalicoHeight = abi.ChainEpoch(-8)
+var UpgradePersianHeight = abi.ChainEpoch(-9)
+var UpgradeOrangeHeight = abi.ChainEpoch(-10)
+var UpgradeClausHeight = abi.ChainEpoch(-11)
 
-var UpgradeTrustHeight = abi.ChainEpoch(-13)
+var UpgradeTrustHeight = abi.ChainEpoch(-12)
 
-var UpgradeNorwegianHeight = abi.ChainEpoch(-14)
+var UpgradeNorwegianHeight = abi.ChainEpoch(-13)
 
-var UpgradeTurboHeight = abi.ChainEpoch(-15)
+var UpgradeTurboHeight = abi.ChainEpoch(-14)
 
-var UpgradeHyperdriveHeight = abi.ChainEpoch(-16)
+var UpgradeHyperdriveHeight = abi.ChainEpoch(-15)
 
 var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0: DrandMainnet,

build/params_nerpanet.go

@@ -42,7 +42,7 @@ const UpgradeOrangeHeight = 300
 const UpgradeTrustHeight = 600
 const UpgradeNorwegianHeight = 201000
 const UpgradeTurboHeight = 203000
-const UpgradeHyperdriveHeight = 379178
+const UpgradeHyperdriveHeight = 999999999
 
 func init() {
 	// Minimum block production power is set to 4 TiB

build/params_testground.go

@@ -89,14 +89,14 @@ var (
 	UpgradeAssemblyHeight   abi.ChainEpoch = 10
 	UpgradeLiftoffHeight    abi.ChainEpoch = -5
 	UpgradeKumquatHeight    abi.ChainEpoch = -6
-	UpgradeCalicoHeight     abi.ChainEpoch = -8
-	UpgradePersianHeight    abi.ChainEpoch = -9
-	UpgradeOrangeHeight     abi.ChainEpoch = -10
-	UpgradeClausHeight      abi.ChainEpoch = -11
-	UpgradeTrustHeight      abi.ChainEpoch = -12
-	UpgradeNorwegianHeight  abi.ChainEpoch = -13
-	UpgradeTurboHeight      abi.ChainEpoch = -14
-	UpgradeHyperdriveHeight abi.ChainEpoch = -15
+	UpgradeCalicoHeight     abi.ChainEpoch = -7
+	UpgradePersianHeight    abi.ChainEpoch = -8
+	UpgradeOrangeHeight     abi.ChainEpoch = -9
+	UpgradeClausHeight      abi.ChainEpoch = -10
+	UpgradeTrustHeight      abi.ChainEpoch = -11
+	UpgradeNorwegianHeight  abi.ChainEpoch = -12
+	UpgradeTurboHeight      abi.ChainEpoch = -13
+	UpgradeHyperdriveHeight abi.ChainEpoch = -13
 
 	DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 		0: DrandMainnet,

build/version.go

@@ -33,8 +33,8 @@ func buildType() string {
 	}
 }
 
-// BuildVersion is the local build version
-const BuildVersion = "1.11.1"
+// BuildVersion is the local build version, set by build system
+const BuildVersion = "1.11.1-dev"
 
 func UserVersion() string {
 	if os.Getenv("LOTUS_VERSION_IGNORE_COMMIT") == "1" {

chain/actors/builtin/miner/actor.go.template

@@ -105,7 +105,6 @@ type State interface {
         // UnallocatedSectorNumbers returns up to count unallocated sector numbers (or less than
         // count if there aren't enough).
 	UnallocatedSectorNumbers(count int) ([]abi.SectorNumber, error)
-	GetAllocatedSectors() (*bitfield.BitField, error)
 
 	// Note that ProvingPeriodStart is deprecated and will be renamed / removed in a future version of actors
 	GetProvingPeriodStart() (abi.ChainEpoch, error)

chain/actors/builtin/miner/miner.go

@@ -164,7 +164,6 @@ type State interface {
 	// UnallocatedSectorNumbers returns up to count unallocated sector numbers (or less than
 	// count if there aren't enough).
 	UnallocatedSectorNumbers(count int) ([]abi.SectorNumber, error)
-	GetAllocatedSectors() (*bitfield.BitField, error)
 
 	// Note that ProvingPeriodStart is deprecated and will be renamed / removed in a future version of actors
 	GetProvingPeriodStart() (abi.ChainEpoch, error)

chain/actors/builtin/miner/state.go.template

@@ -318,15 +318,6 @@ func (s *state{{.v}}) UnallocatedSectorNumbers(count int) ([]abi.SectorNumber, e
 	return sectors, nil
 }
 
-func (s *state{{.v}}) GetAllocatedSectors() (*bitfield.BitField, error) {
-	var allocatedSectors bitfield.BitField
-	if err := s.store.Get(s.store.Context(), s.State.AllocatedSectors, &allocatedSectors); err != nil {
-		return nil, err
-	}
-
-	return &allocatedSectors, nil
-}
-
 func (s *state{{.v}}) LoadDeadline(idx uint64) (Deadline, error) {
 	dls, err := s.State.LoadDeadlines(s.store)
 	if err != nil {

chain/actors/builtin/miner/v0.go

@@ -311,15 +311,6 @@ func (s *state0) UnallocatedSectorNumbers(count int) ([]abi.SectorNumber, error)
 	return sectors, nil
 }
 
-func (s *state0) GetAllocatedSectors() (*bitfield.BitField, error) {
-	var allocatedSectors bitfield.BitField
-	if err := s.store.Get(s.store.Context(), s.State.AllocatedSectors, &allocatedSectors); err != nil {
-		return nil, err
-	}
-
-	return &allocatedSectors, nil
-}
-
 func (s *state0) LoadDeadline(idx uint64) (Deadline, error) {
 	dls, err := s.State.LoadDeadlines(s.store)
 	if err != nil {

chain/actors/builtin/miner/v2.go

@@ -309,15 +309,6 @@ func (s *state2) UnallocatedSectorNumbers(count int) ([]abi.SectorNumber, error)
 	return sectors, nil
 }
 
-func (s *state2) GetAllocatedSectors() (*bitfield.BitField, error) {
-	var allocatedSectors bitfield.BitField
-	if err := s.store.Get(s.store.Context(), s.State.AllocatedSectors, &allocatedSectors); err != nil {
-		return nil, err
-	}
-
-	return &allocatedSectors, nil
-}
-
 func (s *state2) LoadDeadline(idx uint64) (Deadline, error) {
 	dls, err := s.State.LoadDeadlines(s.store)
 	if err != nil {

chain/actors/builtin/miner/v3.go

@@ -311,15 +311,6 @@ func (s *state3) UnallocatedSectorNumbers(count int) ([]abi.SectorNumber, error)
 	return sectors, nil
 }
 
-func (s *state3) GetAllocatedSectors() (*bitfield.BitField, error) {
-	var allocatedSectors bitfield.BitField
-	if err := s.store.Get(s.store.Context(), s.State.AllocatedSectors, &allocatedSectors); err != nil {
-		return nil, err
-	}
-
-	return &allocatedSectors, nil
-}
-
 func (s *state3) LoadDeadline(idx uint64) (Deadline, error) {
 	dls, err := s.State.LoadDeadlines(s.store)
 	if err != nil {

chain/actors/builtin/miner/v4.go

@@ -311,15 +311,6 @@ func (s *state4) UnallocatedSectorNumbers(count int) ([]abi.SectorNumber, error)
 	return sectors, nil
 }
 
-func (s *state4) GetAllocatedSectors() (*bitfield.BitField, error) {
-	var allocatedSectors bitfield.BitField
-	if err := s.store.Get(s.store.Context(), s.State.AllocatedSectors, &allocatedSectors); err != nil {
-		return nil, err
-	}
-
-	return &allocatedSectors, nil
-}
-
 func (s *state4) LoadDeadline(idx uint64) (Deadline, error) {
 	dls, err := s.State.LoadDeadlines(s.store)
 	if err != nil {

chain/actors/builtin/miner/v5.go

@@ -311,15 +311,6 @@ func (s *state5) UnallocatedSectorNumbers(count int) ([]abi.SectorNumber, error)
 	return sectors, nil
 }
 
-func (s *state5) GetAllocatedSectors() (*bitfield.BitField, error) {
-	var allocatedSectors bitfield.BitField
-	if err := s.store.Get(s.store.Context(), s.State.AllocatedSectors, &allocatedSectors); err != nil {
-		return nil, err
-	}
-
-	return &allocatedSectors, nil
-}
-
 func (s *state5) LoadDeadline(idx uint64) (Deadline, error) {
 	dls, err := s.State.LoadDeadlines(s.store)
 	if err != nil {

chain/actors/policy/policy.go

@@ -4,7 +4,6 @@ import (
 	"sort"
 
 	"github.com/filecoin-project/go-state-types/big"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/network"
@@ -169,31 +168,31 @@ func SetMinVerifiedDealSize(size abi.StoragePower) {
 
 }
 
-func GetMaxProveCommitDuration(ver actors.Version, t abi.RegisteredSealProof) (abi.ChainEpoch, error) {
+func GetMaxProveCommitDuration(ver actors.Version, t abi.RegisteredSealProof) abi.ChainEpoch {
 	switch ver {
 
 	case actors.Version0:
 
-		return miner0.MaxSealDuration[t], nil
+		return miner0.MaxSealDuration[t]
 
 	case actors.Version2:
 
-		return miner2.MaxProveCommitDuration[t], nil
+		return miner2.MaxProveCommitDuration[t]
 
 	case actors.Version3:
 
-		return miner3.MaxProveCommitDuration[t], nil
+		return miner3.MaxProveCommitDuration[t]
 
 	case actors.Version4:
 
-		return miner4.MaxProveCommitDuration[t], nil
+		return miner4.MaxProveCommitDuration[t]
 
 	case actors.Version5:
 
-		return miner5.MaxProveCommitDuration[t], nil
+		return miner5.MaxProveCommitDuration[t]
 
 	default:
-		return 0, xerrors.Errorf("unsupported actors version")
+		panic("unsupported actors version")
 	}
 }
 
@@ -228,40 +227,31 @@ func DealProviderCollateralBounds(
 	size abi.PaddedPieceSize, verified bool,
 	rawBytePower, qaPower, baselinePower abi.StoragePower,
 	circulatingFil abi.TokenAmount, nwVer network.Version,
-) (min, max abi.TokenAmount, err error) {
-	v, err := actors.VersionForNetwork(nwVer)
-	if err != nil {
-		return big.Zero(), big.Zero(), err
-	}
-	switch v {
+) (min, max abi.TokenAmount) {
+	switch actors.VersionForNetwork(nwVer) {
 
 	case actors.Version0:
 
-		min, max := market0.DealProviderCollateralBounds(size, verified, rawBytePower, qaPower, baselinePower, circulatingFil, nwVer)
-		return min, max, nil
+		return market0.DealProviderCollateralBounds(size, verified, rawBytePower, qaPower, baselinePower, circulatingFil, nwVer)
 
 	case actors.Version2:
 
-		min, max := market2.DealProviderCollateralBounds(size, verified, rawBytePower, qaPower, baselinePower, circulatingFil)
-		return min, max, nil
+		return market2.DealProviderCollateralBounds(size, verified, rawBytePower, qaPower, baselinePower, circulatingFil)
 
 	case actors.Version3:
 
-		min, max := market3.DealProviderCollateralBounds(size, verified, rawBytePower, qaPower, baselinePower, circulatingFil)
-		return min, max, nil
+		return market3.DealProviderCollateralBounds(size, verified, rawBytePower, qaPower, baselinePower, circulatingFil)
 
 	case actors.Version4:
 
-		min, max := market4.DealProviderCollateralBounds(size, verified, rawBytePower, qaPower, baselinePower, circulatingFil)
-		return min, max, nil
+		return market4.DealProviderCollateralBounds(size, verified, rawBytePower, qaPower, baselinePower, circulatingFil)
 
 	case actors.Version5:
 
-		min, max := market5.DealProviderCollateralBounds(size, verified, rawBytePower, qaPower, baselinePower, circulatingFil)
-		return min, max, nil
+		return market5.DealProviderCollateralBounds(size, verified, rawBytePower, qaPower, baselinePower, circulatingFil)
 
 	default:
-		return big.Zero(), big.Zero(), xerrors.Errorf("unsupported actors version")
+		panic("unsupported actors version")
 	}
 }
 
@@ -320,11 +310,8 @@ func GetMaxPoStPartitions(nv network.Version, p abi.RegisteredPoStProof) (int, e
 	if err != nil {
 		return 0, err
 	}
-	maxSectors, err := GetAddressedSectorsMax(nv)
-	if err != nil {
-		return 0, err
-	}
-	return int(uint64(maxSectors) / sectorsPerPart), nil
+	maxSectors := uint64(GetAddressedSectorsMax(nv))
+	return int(maxSectors / sectorsPerPart), nil
 }
 
 func GetDefaultSectorSize() abi.SectorSize {
@@ -358,94 +345,82 @@ func GetSectorMaxLifetime(proof abi.RegisteredSealProof, nwVer network.Version)
 	return builtin5.SealProofPoliciesV11[proof].SectorMaxLifetime
 }
 
-func GetAddressedSectorsMax(nwVer network.Version) (int, error) {
-	v, err := actors.VersionForNetwork(nwVer)
-	if err != nil {
-		return 0, err
-	}
-	switch v {
+func GetAddressedSectorsMax(nwVer network.Version) int {
+	switch actors.VersionForNetwork(nwVer) {
 
 	case actors.Version0:
-		return miner0.AddressedSectorsMax, nil
+		return miner0.AddressedSectorsMax
 
 	case actors.Version2:
-		return miner2.AddressedSectorsMax, nil
+		return miner2.AddressedSectorsMax
 
 	case actors.Version3:
-		return miner3.AddressedSectorsMax, nil
+		return miner3.AddressedSectorsMax
 
 	case actors.Version4:
-		return miner4.AddressedSectorsMax, nil
+		return miner4.AddressedSectorsMax
 
 	case actors.Version5:
-		return miner5.AddressedSectorsMax, nil
+		return miner5.AddressedSectorsMax
 
 	default:
-		return 0, xerrors.Errorf("unsupported network version")
+		panic("unsupported network version")
 	}
 }
 
-func GetDeclarationsMax(nwVer network.Version) (int, error) {
-	v, err := actors.VersionForNetwork(nwVer)
-	if err != nil {
-		return 0, err
-	}
-	switch v {
+func GetDeclarationsMax(nwVer network.Version) int {
+	switch actors.VersionForNetwork(nwVer) {
 
 	case actors.Version0:
 
-		// TODO: Should we instead error here since the concept doesn't exist yet?
-		return miner0.AddressedPartitionsMax, nil
+		// TODO: Should we instead panic here since the concept doesn't exist yet?
+		return miner0.AddressedPartitionsMax
 
 	case actors.Version2:
 
-		return miner2.DeclarationsMax, nil
+		return miner2.DeclarationsMax
 
 	case actors.Version3:
 
-		return miner3.DeclarationsMax, nil
+		return miner3.DeclarationsMax
 
 	case actors.Version4:
 
-		return miner4.DeclarationsMax, nil
+		return miner4.DeclarationsMax
 
 	case actors.Version5:
 
-		return miner5.DeclarationsMax, nil
+		return miner5.DeclarationsMax
 
 	default:
-		return 0, xerrors.Errorf("unsupported network version")
+		panic("unsupported network version")
 	}
 }
 
-func AggregateNetworkFee(nwVer network.Version, aggregateSize int, baseFee abi.TokenAmount) (abi.TokenAmount, error) {
-	v, err := actors.VersionForNetwork(nwVer)
-	if err != nil {
-		return big.Zero(), err
-	}
-	switch v {
+func AggregateNetworkFee(nwVer network.Version, aggregateSize int, baseFee abi.TokenAmount) abi.TokenAmount {
+	switch actors.VersionForNetwork(nwVer) {
 
 	case actors.Version0:
 
-		return big.Zero(), nil
+		return big.Zero()
 
 	case actors.Version2:
 
-		return big.Zero(), nil
+		return big.Zero()
 
 	case actors.Version3:
 
-		return big.Zero(), nil
+		return big.Zero()
 
 	case actors.Version4:
 
-		return big.Zero(), nil
+		return big.Zero()
 
 	case actors.Version5:
 
-		return miner5.AggregateNetworkFee(aggregateSize, baseFee), nil
+		return miner5.AggregateNetworkFee(aggregateSize, baseFee)
 
 	default:
-		return big.Zero(), xerrors.Errorf("unsupported network version")
+		panic("unsupported network version")
 	}
 }

chain/actors/policy/policy.go.template

@@ -4,7 +4,6 @@ import (
 	"sort"
 
 	"github.com/filecoin-project/go-state-types/big"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/network"
@@ -118,18 +117,18 @@ func SetMinVerifiedDealSize(size abi.StoragePower) {
 	{{end}}
 }
 
-func GetMaxProveCommitDuration(ver actors.Version, t abi.RegisteredSealProof) (abi.ChainEpoch, error) {
+func GetMaxProveCommitDuration(ver actors.Version, t abi.RegisteredSealProof) abi.ChainEpoch {
 	switch ver {
 		{{range .versions}}
 			case actors.Version{{.}}:
 				{{if (eq . 0)}}
-					return miner{{.}}.MaxSealDuration[t], nil
+					return miner{{.}}.MaxSealDuration[t]
 				{{else}}
-					return miner{{.}}.MaxProveCommitDuration[t], nil
+					return miner{{.}}.MaxProveCommitDuration[t]
 				{{end}}
 		{{end}}
 	default:
-		return 0, xerrors.Errorf("unsupported actors version")
+		panic("unsupported actors version")
 	}
 }
 
@@ -151,24 +150,18 @@ func DealProviderCollateralBounds(
 	size abi.PaddedPieceSize, verified bool,
 	rawBytePower, qaPower, baselinePower abi.StoragePower,
 	circulatingFil abi.TokenAmount, nwVer network.Version,
-) (min, max abi.TokenAmount, err error) {
-	v, err := actors.VersionForNetwork(nwVer)
-	if err != nil {
-		return big.Zero(), big.Zero(), err
-	}
-	switch v {
+) (min, max abi.TokenAmount) {
+	switch actors.VersionForNetwork(nwVer) {
 		{{range .versions}}
 			case actors.Version{{.}}:
 				{{if (eq . 0)}}
-					min, max := market{{.}}.DealProviderCollateralBounds(size, verified, rawBytePower, qaPower, baselinePower, circulatingFil, nwVer)
-					return min, max, nil
+					return market{{.}}.DealProviderCollateralBounds(size, verified, rawBytePower, qaPower, baselinePower, circulatingFil, nwVer)
 				{{else}}
-					min, max := market{{.}}.DealProviderCollateralBounds(size, verified, rawBytePower, qaPower, baselinePower, circulatingFil)
-					return min, max, nil
+					return market{{.}}.DealProviderCollateralBounds(size, verified, rawBytePower, qaPower, baselinePower, circulatingFil)
 				{{end}}
 		{{end}}
 	default:
-		return big.Zero(), big.Zero(), xerrors.Errorf("unsupported actors version")
+		panic("unsupported actors version")
 	}
 }
 
@@ -208,11 +201,8 @@ func GetMaxPoStPartitions(nv network.Version, p abi.RegisteredPoStProof) (int, e
 	if err != nil {
 		return 0, err
 	}
-	maxSectors, err := GetAddressedSectorsMax(nv)
-	if err != nil {
-		return 0, err
-	}
-	return int(uint64(maxSectors) / sectorsPerPart), nil
+	maxSectors := uint64(GetAddressedSectorsMax(nv))
+	return int(maxSectors / sectorsPerPart), nil
 }
 
 func GetDefaultSectorSize() abi.SectorSize {
@@ -246,56 +236,44 @@ func GetSectorMaxLifetime(proof abi.RegisteredSealProof, nwVer network.Version)
 	return builtin{{.latestVersion}}.SealProofPoliciesV11[proof].SectorMaxLifetime
 }
 
-func GetAddressedSectorsMax(nwVer network.Version) (int, error) {
-	v, err := actors.VersionForNetwork(nwVer)
-	if err != nil {
-		return 0, err
-	}
-	switch v {
+func GetAddressedSectorsMax(nwVer network.Version) int {
+	switch actors.VersionForNetwork(nwVer) {
 		{{range .versions}}
 			case actors.Version{{.}}:
-				return miner{{.}}.AddressedSectorsMax, nil
+				return miner{{.}}.AddressedSectorsMax
 		{{end}}
 	default:
-		return 0, xerrors.Errorf("unsupported network version")
+		panic("unsupported network version")
 	}
 }
 
-func GetDeclarationsMax(nwVer network.Version) (int, error) {
-	v, err := actors.VersionForNetwork(nwVer)
-	if err != nil {
-		return 0, err
-	}
-	switch v {
+func GetDeclarationsMax(nwVer network.Version) int {
+	switch actors.VersionForNetwork(nwVer) {
 		{{range .versions}}
 		case actors.Version{{.}}:
 			{{if (eq . 0)}}
-				// TODO: Should we instead error here since the concept doesn't exist yet?
-				return miner{{.}}.AddressedPartitionsMax, nil
+				// TODO: Should we instead panic here since the concept doesn't exist yet?
+				return miner{{.}}.AddressedPartitionsMax
 			{{else}}
-				return miner{{.}}.DeclarationsMax, nil
+				return miner{{.}}.DeclarationsMax
 			{{end}}
 		{{end}}
 	default:
-		return 0, xerrors.Errorf("unsupported network version")
+		panic("unsupported network version")
 	}
 }
 
-func AggregateNetworkFee(nwVer network.Version, aggregateSize int, baseFee abi.TokenAmount) (abi.TokenAmount, error) {
-   v, err := actors.VersionForNetwork(nwVer)
-	if err != nil {
-		return big.Zero(), err
-	}
-	switch v {
+func AggregateNetworkFee(nwVer network.Version, aggregateSize int, baseFee abi.TokenAmount) abi.TokenAmount {
+    switch actors.VersionForNetwork(nwVer) {
 	    {{range .versions}}
 	    case actors.Version{{.}}:
             {{if (le . 4)}}
-                return big.Zero(), nil
+                return big.Zero()
             {{else}}
-                return miner{{.}}.AggregateNetworkFee(aggregateSize, baseFee), nil
+                return miner{{.}}.AggregateNetworkFee(aggregateSize, baseFee)
             {{end}}
         {{end}}
 	default:
-		return big.Zero(), xerrors.Errorf("unsupported network version")
+		panic("unsupported network version")
 	}
 }

chain/actors/version.go

@@ -21,19 +21,19 @@ const (
 )
 
 // Converts a network version into an actors adt version.
-func VersionForNetwork(version network.Version) (Version, error) {
+func VersionForNetwork(version network.Version) Version {
 	switch version {
 	case network.Version0, network.Version1, network.Version2, network.Version3:
-		return Version0, nil
+		return Version0
 	case network.Version4, network.Version5, network.Version6, network.Version7, network.Version8, network.Version9:
-		return Version2, nil
+		return Version2
 	case network.Version10, network.Version11:
-		return Version3, nil
+		return Version3
 	case network.Version12:
-		return Version4, nil
+		return Version4
 	case network.Version13:
-		return Version5, nil
+		return Version5
 	default:
-		return -1, fmt.Errorf("unsupported network version %d", version)
+		panic(fmt.Sprintf("unsupported network version %d", version))
 	}
 }

chain/events/events_called.go

@@ -5,9 +5,6 @@ import (
 	"math"
 	"sync"
 
-	"github.com/filecoin-project/lotus/api"
-	lru "github.com/hashicorp/golang-lru"
-
 	"github.com/filecoin-project/lotus/chain/stmgr"
 
 	"github.com/filecoin-project/go-state-types/abi"
@@ -467,20 +464,14 @@ type messageEvents struct {
 
 	lk       sync.RWMutex
 	matchers map[triggerID]MsgMatchFunc
-
-	blockMsgLk    sync.Mutex
-	blockMsgCache *lru.ARCCache
 }
 
 func newMessageEvents(ctx context.Context, hcAPI headChangeAPI, cs EventAPI) messageEvents {
-	blsMsgCache, _ := lru.NewARC(500)
 	return messageEvents{
-		ctx:           ctx,
-		cs:            cs,
-		hcAPI:         hcAPI,
-		matchers:      make(map[triggerID]MsgMatchFunc),
-		blockMsgLk:    sync.Mutex{},
-		blockMsgCache: blsMsgCache,
+		ctx:      ctx,
+		cs:       cs,
+		hcAPI:    hcAPI,
+		matchers: make(map[triggerID]MsgMatchFunc),
 	}
 }
 
@@ -524,21 +515,14 @@ func (me *messageEvents) messagesForTs(ts *types.TipSet, consume func(*types.Mes
 	seen := map[cid.Cid]struct{}{}
 
 	for _, tsb := range ts.Blocks() {
-		me.blockMsgLk.Lock()
-		msgsI, ok := me.blockMsgCache.Get(tsb.Cid())
-		var err error
-		if !ok {
-			msgsI, err = me.cs.ChainGetBlockMessages(context.TODO(), tsb.Cid())
-			if err != nil {
-				log.Errorf("messagesForTs MessagesForBlock failed (ts.H=%d, Bcid:%s, B.Mcid:%s): %s", ts.Height(), tsb.Cid(), tsb.Messages, err)
-				// this is quite bad, but probably better than missing all the other updates
-				me.blockMsgLk.Unlock()
-				continue
-			}
-			me.blockMsgCache.Add(tsb.Cid(), msgsI)
+
+		msgs, err := me.cs.ChainGetBlockMessages(context.TODO(), tsb.Cid())
+		if err != nil {
+			log.Errorf("messagesForTs MessagesForBlock failed (ts.H=%d, Bcid:%s, B.Mcid:%s): %s", ts.Height(), tsb.Cid(), tsb.Messages, err)
+			// this is quite bad, but probably better than missing all the other updates
+			continue
 		}
-		me.blockMsgLk.Unlock()
-		msgs := msgsI.(*api.BlockMessages)
+
 		for _, m := range msgs.BlsMessages {
 			_, ok := seen[m.Cid()]
 			if ok {

chain/events/events_test.go

@@ -6,8 +6,6 @@ import (
 	"sync"
 	"testing"
 
-	"gotest.tools/assert"
-
 	"github.com/ipfs/go-cid"
 	"github.com/multiformats/go-multihash"
 	"github.com/stretchr/testify/require"
@@ -46,43 +44,25 @@ type fakeCS struct {
 	tipsets map[types.TipSetKey]*types.TipSet
 
 	sub func(rev, app []*types.TipSet)
-
-	callNumberLk sync.Mutex
-	callNumber   map[string]int
 }
 
 func (fcs *fakeCS) ChainHead(ctx context.Context) (*types.TipSet, error) {
-	fcs.callNumberLk.Lock()
-	defer fcs.callNumberLk.Unlock()
-	fcs.callNumber["ChainHead"] = fcs.callNumber["ChainHead"] + 1
 	panic("implement me")
 }
 
 func (fcs *fakeCS) ChainGetTipSet(ctx context.Context, key types.TipSetKey) (*types.TipSet, error) {
-	fcs.callNumberLk.Lock()
-	defer fcs.callNumberLk.Unlock()
-	fcs.callNumber["ChainGetTipSet"] = fcs.callNumber["ChainGetTipSet"] + 1
 	return fcs.tipsets[key], nil
 }
 
 func (fcs *fakeCS) StateSearchMsg(ctx context.Context, from types.TipSetKey, msg cid.Cid, limit abi.ChainEpoch, allowReplaced bool) (*api.MsgLookup, error) {
-	fcs.callNumberLk.Lock()
-	defer fcs.callNumberLk.Unlock()
-	fcs.callNumber["StateSearchMsg"] = fcs.callNumber["StateSearchMsg"] + 1
 	return nil, nil
 }
 
 func (fcs *fakeCS) StateGetActor(ctx context.Context, actor address.Address, tsk types.TipSetKey) (*types.Actor, error) {
-	fcs.callNumberLk.Lock()
-	defer fcs.callNumberLk.Unlock()
-	fcs.callNumber["StateGetActor"] = fcs.callNumber["StateGetActor"] + 1
 	panic("Not Implemented")
 }
 
 func (fcs *fakeCS) ChainGetTipSetByHeight(context.Context, abi.ChainEpoch, types.TipSetKey) (*types.TipSet, error) {
-	fcs.callNumberLk.Lock()
-	defer fcs.callNumberLk.Unlock()
-	fcs.callNumber["ChainGetTipSetByHeight"] = fcs.callNumber["ChainGetTipSetByHeight"] + 1
 	panic("Not Implemented")
 }
 
@@ -133,10 +113,6 @@ func (fcs *fakeCS) makeTs(t *testing.T, parents []cid.Cid, h abi.ChainEpoch, msg
 }
 
 func (fcs *fakeCS) ChainNotify(context.Context) (<-chan []*api.HeadChange, error) {
-	fcs.callNumberLk.Lock()
-	defer fcs.callNumberLk.Unlock()
-	fcs.callNumber["ChainNotify"] = fcs.callNumber["ChainNotify"] + 1
-
 	out := make(chan []*api.HeadChange, 1)
 	best, err := fcs.tsc.best()
 	if err != nil {
@@ -167,9 +143,6 @@ func (fcs *fakeCS) ChainNotify(context.Context) (<-chan []*api.HeadChange, error
 }
 
 func (fcs *fakeCS) ChainGetBlockMessages(ctx context.Context, blk cid.Cid) (*api.BlockMessages, error) {
-	fcs.callNumberLk.Lock()
-	defer fcs.callNumberLk.Unlock()
-	fcs.callNumber["ChainGetBlockMessages"] = fcs.callNumber["ChainGetBlockMessages"] + 1
 	messages, ok := fcs.blkMsgs[blk]
 	if !ok {
 		return &api.BlockMessages{}, nil
@@ -179,8 +152,8 @@ func (fcs *fakeCS) ChainGetBlockMessages(ctx context.Context, blk cid.Cid) (*api
 	if !ok {
 		return &api.BlockMessages{}, nil
 	}
-
 	return &api.BlockMessages{BlsMessages: ms.bmsgs, SecpkMessages: ms.smsgs}, nil
+
 }
 
 func (fcs *fakeCS) fakeMsgs(m fakeMsg) cid.Cid {
@@ -260,10 +233,9 @@ var _ EventAPI = &fakeCS{}
 
 func TestAt(t *testing.T) {
 	fcs := &fakeCS{
-		t:          t,
-		h:          1,
-		tsc:        newTSCache(2*build.ForkLengthThreshold, nil),
-		callNumber: map[string]int{},
+		t:   t,
+		h:   1,
+		tsc: newTSCache(2*build.ForkLengthThreshold, nil),
 	}
 	require.NoError(t, fcs.tsc.add(fcs.makeTs(t, nil, 1, dummyCid)))
 
@@ -326,10 +298,9 @@ func TestAt(t *testing.T) {
 
 func TestAtDoubleTrigger(t *testing.T) {
 	fcs := &fakeCS{
-		t:          t,
-		h:          1,
-		tsc:        newTSCache(2*build.ForkLengthThreshold, nil),
-		callNumber: map[string]int{},
+		t:   t,
+		h:   1,
+		tsc: newTSCache(2*build.ForkLengthThreshold, nil),
 	}
 	require.NoError(t, fcs.tsc.add(fcs.makeTs(t, nil, 1, dummyCid)))
 
@@ -369,10 +340,9 @@ func TestAtDoubleTrigger(t *testing.T) {
 
 func TestAtNullTrigger(t *testing.T) {
 	fcs := &fakeCS{
-		t:          t,
-		h:          1,
-		tsc:        newTSCache(2*build.ForkLengthThreshold, nil),
-		callNumber: map[string]int{},
+		t:   t,
+		h:   1,
+		tsc: newTSCache(2*build.ForkLengthThreshold, nil),
 	}
 	require.NoError(t, fcs.tsc.add(fcs.makeTs(t, nil, 1, dummyCid)))
 
@@ -404,10 +374,9 @@ func TestAtNullTrigger(t *testing.T) {
 
 func TestAtNullConf(t *testing.T) {
 	fcs := &fakeCS{
-		t:          t,
-		h:          1,
-		tsc:        newTSCache(2*build.ForkLengthThreshold, nil),
-		callNumber: map[string]int{},
+		t:   t,
+		h:   1,
+		tsc: newTSCache(2*build.ForkLengthThreshold, nil),
 	}
 	require.NoError(t, fcs.tsc.add(fcs.makeTs(t, nil, 1, dummyCid)))
 
@@ -444,10 +413,9 @@ func TestAtNullConf(t *testing.T) {
 
 func TestAtStart(t *testing.T) {
 	fcs := &fakeCS{
-		t:          t,
-		h:          1,
-		tsc:        newTSCache(2*build.ForkLengthThreshold, nil),
-		callNumber: map[string]int{},
+		t:   t,
+		h:   1,
+		tsc: newTSCache(2*build.ForkLengthThreshold, nil),
 	}
 	require.NoError(t, fcs.tsc.add(fcs.makeTs(t, nil, 1, dummyCid)))
 
@@ -479,10 +447,9 @@ func TestAtStart(t *testing.T) {
 
 func TestAtStartConfidence(t *testing.T) {
 	fcs := &fakeCS{
-		t:          t,
-		h:          1,
-		tsc:        newTSCache(2*build.ForkLengthThreshold, nil),
-		callNumber: map[string]int{},
+		t:   t,
+		h:   1,
+		tsc: newTSCache(2*build.ForkLengthThreshold, nil),
 	}
 	require.NoError(t, fcs.tsc.add(fcs.makeTs(t, nil, 1, dummyCid)))
 
@@ -510,10 +477,9 @@ func TestAtStartConfidence(t *testing.T) {
 
 func TestAtChained(t *testing.T) {
 	fcs := &fakeCS{
-		t:          t,
-		h:          1,
-		tsc:        newTSCache(2*build.ForkLengthThreshold, nil),
-		callNumber: map[string]int{},
+		t:   t,
+		h:   1,
+		tsc: newTSCache(2*build.ForkLengthThreshold, nil),
 	}
 	require.NoError(t, fcs.tsc.add(fcs.makeTs(t, nil, 1, dummyCid)))
 
@@ -545,10 +511,9 @@ func TestAtChained(t *testing.T) {
 
 func TestAtChainedConfidence(t *testing.T) {
 	fcs := &fakeCS{
-		t:          t,
-		h:          1,
-		tsc:        newTSCache(2*build.ForkLengthThreshold, nil),
-		callNumber: map[string]int{},
+		t:   t,
+		h:   1,
+		tsc: newTSCache(2*build.ForkLengthThreshold, nil),
 	}
 	require.NoError(t, fcs.tsc.add(fcs.makeTs(t, nil, 1, dummyCid)))
 
@@ -580,10 +545,9 @@ func TestAtChainedConfidence(t *testing.T) {
 
 func TestAtChainedConfidenceNull(t *testing.T) {
 	fcs := &fakeCS{
-		t:          t,
-		h:          1,
-		tsc:        newTSCache(2*build.ForkLengthThreshold, nil),
-		callNumber: map[string]int{},
+		t:   t,
+		h:   1,
+		tsc: newTSCache(2*build.ForkLengthThreshold, nil),
 	}
 	require.NoError(t, fcs.tsc.add(fcs.makeTs(t, nil, 1, dummyCid)))
 
@@ -619,10 +583,9 @@ func TestCalled(t *testing.T) {
 		t: t,
 		h: 1,
 
-		msgs:       map[cid.Cid]fakeMsg{},
-		blkMsgs:    map[cid.Cid]cid.Cid{},
-		tsc:        newTSCache(2*build.ForkLengthThreshold, nil),
-		callNumber: map[string]int{},
+		msgs:    map[cid.Cid]fakeMsg{},
+		blkMsgs: map[cid.Cid]cid.Cid{},
+		tsc:     newTSCache(2*build.ForkLengthThreshold, nil),
 	}
 	require.NoError(t, fcs.tsc.add(fcs.makeTs(t, nil, 1, dummyCid)))
 
@@ -832,10 +795,9 @@ func TestCalledTimeout(t *testing.T) {
 		t: t,
 		h: 1,
 
-		msgs:       map[cid.Cid]fakeMsg{},
-		blkMsgs:    map[cid.Cid]cid.Cid{},
-		tsc:        newTSCache(2*build.ForkLengthThreshold, nil),
-		callNumber: map[string]int{},
+		msgs:    map[cid.Cid]fakeMsg{},
+		blkMsgs: map[cid.Cid]cid.Cid{},
+		tsc:     newTSCache(2*build.ForkLengthThreshold, nil),
 	}
 	require.NoError(t, fcs.tsc.add(fcs.makeTs(t, nil, 1, dummyCid)))
 
@@ -873,10 +835,9 @@ func TestCalledTimeout(t *testing.T) {
 		t: t,
 		h: 1,
 
-		msgs:       map[cid.Cid]fakeMsg{},
-		blkMsgs:    map[cid.Cid]cid.Cid{},
-		callNumber: map[string]int{},
-		tsc:        newTSCache(2*build.ForkLengthThreshold, nil),
+		msgs:    map[cid.Cid]fakeMsg{},
+		blkMsgs: map[cid.Cid]cid.Cid{},
+		tsc:     newTSCache(2*build.ForkLengthThreshold, nil),
 	}
 	require.NoError(t, fcs.tsc.add(fcs.makeTs(t, nil, 1, dummyCid)))
 
@@ -908,10 +869,9 @@ func TestCalledOrder(t *testing.T) {
 		t: t,
 		h: 1,
 
-		msgs:       map[cid.Cid]fakeMsg{},
-		blkMsgs:    map[cid.Cid]cid.Cid{},
-		tsc:        newTSCache(2*build.ForkLengthThreshold, nil),
-		callNumber: map[string]int{},
+		msgs:    map[cid.Cid]fakeMsg{},
+		blkMsgs: map[cid.Cid]cid.Cid{},
+		tsc:     newTSCache(2*build.ForkLengthThreshold, nil),
 	}
 	require.NoError(t, fcs.tsc.add(fcs.makeTs(t, nil, 1, dummyCid)))
 
@@ -972,10 +932,9 @@ func TestCalledNull(t *testing.T) {
 		t: t,
 		h: 1,
 
-		msgs:       map[cid.Cid]fakeMsg{},
-		blkMsgs:    map[cid.Cid]cid.Cid{},
-		tsc:        newTSCache(2*build.ForkLengthThreshold, nil),
-		callNumber: map[string]int{},
+		msgs:    map[cid.Cid]fakeMsg{},
+		blkMsgs: map[cid.Cid]cid.Cid{},
+		tsc:     newTSCache(2*build.ForkLengthThreshold, nil),
 	}
 	require.NoError(t, fcs.tsc.add(fcs.makeTs(t, nil, 1, dummyCid)))
 
@@ -1038,10 +997,9 @@ func TestRemoveTriggersOnMessage(t *testing.T) {
 		t: t,
 		h: 1,
 
-		msgs:       map[cid.Cid]fakeMsg{},
-		blkMsgs:    map[cid.Cid]cid.Cid{},
-		tsc:        newTSCache(2*build.ForkLengthThreshold, nil),
-		callNumber: map[string]int{},
+		msgs:    map[cid.Cid]fakeMsg{},
+		blkMsgs: map[cid.Cid]cid.Cid{},
+		tsc:     newTSCache(2*build.ForkLengthThreshold, nil),
 	}
 	require.NoError(t, fcs.tsc.add(fcs.makeTs(t, nil, 1, dummyCid)))
 
@@ -1129,10 +1087,9 @@ func TestStateChanged(t *testing.T) {
 		t: t,
 		h: 1,
 
-		msgs:       map[cid.Cid]fakeMsg{},
-		blkMsgs:    map[cid.Cid]cid.Cid{},
-		tsc:        newTSCache(2*build.ForkLengthThreshold, nil),
-		callNumber: map[string]int{},
+		msgs:    map[cid.Cid]fakeMsg{},
+		blkMsgs: map[cid.Cid]cid.Cid{},
+		tsc:     newTSCache(2*build.ForkLengthThreshold, nil),
 	}
 	require.NoError(t, fcs.tsc.add(fcs.makeTs(t, nil, 1, dummyCid)))
 
@@ -1218,10 +1175,9 @@ func TestStateChangedRevert(t *testing.T) {
 		t: t,
 		h: 1,
 
-		msgs:       map[cid.Cid]fakeMsg{},
-		blkMsgs:    map[cid.Cid]cid.Cid{},
-		tsc:        newTSCache(2*build.ForkLengthThreshold, nil),
-		callNumber: map[string]int{},
+		msgs:    map[cid.Cid]fakeMsg{},
+		blkMsgs: map[cid.Cid]cid.Cid{},
+		tsc:     newTSCache(2*build.ForkLengthThreshold, nil),
 	}
 	require.NoError(t, fcs.tsc.add(fcs.makeTs(t, nil, 1, dummyCid)))
 
@@ -1297,10 +1253,9 @@ func TestStateChangedTimeout(t *testing.T) {
 		t: t,
 		h: 1,
 
-		msgs:       map[cid.Cid]fakeMsg{},
-		blkMsgs:    map[cid.Cid]cid.Cid{},
-		tsc:        newTSCache(2*build.ForkLengthThreshold, nil),
-		callNumber: map[string]int{},
+		msgs:    map[cid.Cid]fakeMsg{},
+		blkMsgs: map[cid.Cid]cid.Cid{},
+		tsc:     newTSCache(2*build.ForkLengthThreshold, nil),
 	}
 	require.NoError(t, fcs.tsc.add(fcs.makeTs(t, nil, 1, dummyCid)))
 
@@ -1338,10 +1293,9 @@ func TestStateChangedTimeout(t *testing.T) {
 		t: t,
 		h: 1,
 
-		msgs:       map[cid.Cid]fakeMsg{},
-		blkMsgs:    map[cid.Cid]cid.Cid{},
-		callNumber: map[string]int{},
-		tsc:        newTSCache(2*build.ForkLengthThreshold, nil),
+		msgs:    map[cid.Cid]fakeMsg{},
+		blkMsgs: map[cid.Cid]cid.Cid{},
+		tsc:     newTSCache(2*build.ForkLengthThreshold, nil),
 	}
 	require.NoError(t, fcs.tsc.add(fcs.makeTs(t, nil, 1, dummyCid)))
 
@@ -1375,10 +1329,9 @@ func TestCalledMultiplePerEpoch(t *testing.T) {
 		t: t,
 		h: 1,
 
-		msgs:       map[cid.Cid]fakeMsg{},
-		blkMsgs:    map[cid.Cid]cid.Cid{},
-		callNumber: map[string]int{},
-		tsc:        newTSCache(2*build.ForkLengthThreshold, nil),
+		msgs:    map[cid.Cid]fakeMsg{},
+		blkMsgs: map[cid.Cid]cid.Cid{},
+		tsc:     newTSCache(2*build.ForkLengthThreshold, nil),
 	}
 	require.NoError(t, fcs.tsc.add(fcs.makeTs(t, nil, 1, dummyCid)))
 
@@ -1429,24 +1382,3 @@ func TestCalledMultiplePerEpoch(t *testing.T) {
 
 	fcs.advance(9, 1, nil)
 }
-
-func TestCachedSameBlock(t *testing.T) {
-	fcs := &fakeCS{
-		t: t,
-		h: 1,
-
-		msgs:       map[cid.Cid]fakeMsg{},
-		blkMsgs:    map[cid.Cid]cid.Cid{},
-		callNumber: map[string]int{},
-		tsc:        newTSCache(2*build.ForkLengthThreshold, nil),
-	}
-	require.NoError(t, fcs.tsc.add(fcs.makeTs(t, nil, 1, dummyCid)))
-
-	_ = NewEvents(context.Background(), fcs)
-
-	fcs.advance(0, 10, map[int]cid.Cid{})
-	assert.Assert(t, fcs.callNumber["ChainGetBlockMessages"] == 20, "expect call ChainGetBlockMessages %d but got ", 20, fcs.callNumber["ChainGetBlockMessages"])
-
-	fcs.advance(5, 10, map[int]cid.Cid{})
-	assert.Assert(t, fcs.callNumber["ChainGetBlockMessages"] == 30, "expect call ChainGetBlockMessages %d but got ", 30, fcs.callNumber["ChainGetBlockMessages"])
-}

chain/events/state/predicates_test.go

@@ -21,7 +21,7 @@ import (
 	market2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/market"
 	miner2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/miner"
 	adt2 "github.com/filecoin-project/specs-actors/v2/actors/util/adt"
-	tutils "github.com/filecoin-project/specs-actors/v5/support/testing"
+	tutils "github.com/filecoin-project/specs-actors/v2/support/testing"
 
 	bstore "github.com/filecoin-project/lotus/blockstore"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/market"

chain/gen/genesis/genesis.go

@@ -149,10 +149,7 @@ func MakeInitialStateTree(ctx context.Context, bs bstore.Blockstore, template ge
 		return nil, nil, xerrors.Errorf("making new state tree: %w", err)
 	}
 
-	av, err := actors.VersionForNetwork(template.NetworkVersion)
-	if err != nil {
-		return nil, nil, xerrors.Errorf("getting network version: %w", err)
-	}
+	av := actors.VersionForNetwork(template.NetworkVersion)
 
 	// Create system actor
 

chain/gen/genesis/miners.go

@@ -81,10 +81,7 @@ func mkFakedSigSyscalls(base vm.SyscallBuilder) vm.SyscallBuilder {
 func SetupStorageMiners(ctx context.Context, cs *store.ChainStore, sroot cid.Cid, miners []genesis.Miner, nv network.Version) (cid.Cid, error) {
 
 	cst := cbor.NewCborStore(cs.StateBlockstore())
-	av, err := actors.VersionForNetwork(nv)
-	if err != nil {
-		return cid.Undef, xerrors.Errorf("failed to get network version: %w", err)
-	}
+	av := actors.VersionForNetwork(nv)
 
 	csc := func(context.Context, abi.ChainEpoch, *state.StateTree) (abi.TokenAmount, error) {
 		return big.Zero(), nil
@@ -294,7 +291,7 @@ func SetupStorageMiners(ctx context.Context, cs *store.ChainStore, sroot cid.Cid
 			return cid.Undef, xerrors.Errorf("setting power state: %w", err)
 		}
 
-		rewact, err := SetupRewardActor(ctx, cs.StateBlockstore(), big.Zero(), av)
+		rewact, err := SetupRewardActor(ctx, cs.StateBlockstore(), big.Zero(), actors.VersionForNetwork(nv))
 		if err != nil {
 			return cid.Undef, xerrors.Errorf("setup reward actor: %w", err)
 		}

chain/messagepool/check.go

@@ -11,6 +11,7 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/big"
 	"github.com/filecoin-project/lotus/api"
+	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/lotus/chain/vm"
 )
@@ -258,14 +259,8 @@ func (mp *MessagePool) checkMessages(ctx context.Context, msgs []*types.Message,
 				Code: api.CheckStatusMessageValidity,
 			},
 		}
-		nv, err := mp.getNtwkVersion(epoch)
-		if err != nil {
-			check.OK = false
-			check.Err = fmt.Sprintf("error retrieving network version: %s", err.Error())
-		} else {
-			check.OK = true
-		}
-		if err := m.ValidForBlockInclusion(0, nv); err != nil {
+
+		if err := m.ValidForBlockInclusion(0, build.NewestNetworkVersion); err != nil {
 			check.OK = false
 			check.Err = fmt.Sprintf("syntactically invalid message: %s", err.Error())
 		} else {

chain/messagepool/messagepool.go

@@ -14,7 +14,6 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/big"
 	"github.com/filecoin-project/go-state-types/crypto"
-	"github.com/filecoin-project/go-state-types/network"
 	"github.com/hashicorp/go-multierror"
 	lru "github.com/hashicorp/golang-lru"
 	"github.com/ipfs/go-cid"
@@ -30,7 +29,6 @@ import (
 
 	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/build"
-	"github.com/filecoin-project/lotus/chain/stmgr"
 	"github.com/filecoin-project/lotus/chain/store"
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/lotus/chain/vm"
@@ -149,8 +147,6 @@ type MessagePool struct {
 
 	minGasPrice types.BigInt
 
-	getNtwkVersion func(abi.ChainEpoch) (network.Version, error)
-
 	currentSize int
 
 	// pruneTrigger is a channel used to trigger a mempool pruning
@@ -366,28 +362,26 @@ func New(api Provider, ds dtypes.MetadataDS, netName dtypes.NetworkName, j journ
 	if j == nil {
 		j = journal.NilJournal()
 	}
-	us := stmgr.DefaultUpgradeSchedule()
 
 	mp := &MessagePool{
-		ds:             ds,
-		addSema:        make(chan struct{}, 1),
-		closer:         make(chan struct{}),
-		repubTk:        build.Clock.Ticker(RepublishInterval),
-		repubTrigger:   make(chan struct{}, 1),
-		localAddrs:     make(map[address.Address]struct{}),
-		pending:        make(map[address.Address]*msgSet),
-		keyCache:       make(map[address.Address]address.Address),
-		minGasPrice:    types.NewInt(0),
-		getNtwkVersion: us.GetNtwkVersion,
-		pruneTrigger:   make(chan struct{}, 1),
-		pruneCooldown:  make(chan struct{}, 1),
-		blsSigCache:    cache,
-		sigValCache:    verifcache,
-		changes:        lps.New(50),
-		localMsgs:      namespace.Wrap(ds, datastore.NewKey(localMsgsDs)),
-		api:            api,
-		netName:        netName,
-		cfg:            cfg,
+		ds:            ds,
+		addSema:       make(chan struct{}, 1),
+		closer:        make(chan struct{}),
+		repubTk:       build.Clock.Ticker(RepublishInterval),
+		repubTrigger:  make(chan struct{}, 1),
+		localAddrs:    make(map[address.Address]struct{}),
+		pending:       make(map[address.Address]*msgSet),
+		keyCache:      make(map[address.Address]address.Address),
+		minGasPrice:   types.NewInt(0),
+		pruneTrigger:  make(chan struct{}, 1),
+		pruneCooldown: make(chan struct{}, 1),
+		blsSigCache:   cache,
+		sigValCache:   verifcache,
+		changes:       lps.New(50),
+		localMsgs:     namespace.Wrap(ds, datastore.NewKey(localMsgsDs)),
+		api:           api,
+		netName:       netName,
+		cfg:           cfg,
 		evtTypes: [...]journal.EventType{
 			evtTypeMpoolAdd:    j.RegisterEventType("mpool", "add"),
 			evtTypeMpoolRemove: j.RegisterEventType("mpool", "remove"),
@@ -432,27 +426,6 @@ func New(api Provider, ds dtypes.MetadataDS, netName dtypes.NetworkName, j journ
 	return mp, nil
 }
 
-func (mp *MessagePool) ForEachPendingMessage(f func(cid.Cid) error) error {
-	mp.lk.Lock()
-	defer mp.lk.Unlock()
-
-	for _, mset := range mp.pending {
-		for _, m := range mset.msgs {
-			err := f(m.Cid())
-			if err != nil {
-				return err
-			}
-
-			err = f(m.Message.Cid())
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
 func (mp *MessagePool) resolveToKey(ctx context.Context, addr address.Address) (address.Address, error) {
 	// check the cache
 	a, f := mp.keyCache[addr]

chain/messagepool/messagepool_test.go

@@ -105,7 +105,6 @@ func (tma *testMpoolAPI) SubscribeHeadChanges(cb func(rev, app []*types.TipSet)
 func (tma *testMpoolAPI) PutMessage(m types.ChainMsg) (cid.Cid, error) {
 	return cid.Undef, nil
 }
-
 func (tma *testMpoolAPI) IsLite() bool {
 	return false
 }
@@ -287,7 +286,7 @@ func TestCheckMessageBig(t *testing.T) {
 			From:       from,
 			Value:      types.NewInt(1),
 			Nonce:      0,
-			GasLimit:   60000000,
+			GasLimit:   50000000,
 			GasFeeCap:  types.NewInt(100),
 			GasPremium: types.NewInt(1),
 			Params:     make([]byte, 41<<10), // 41KiB payload

chain/stmgr/forks_test.go

@@ -17,7 +17,6 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/cbor"
-	"github.com/filecoin-project/go-state-types/network"
 
 	builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
 	init2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/init"
@@ -122,7 +121,7 @@ func TestForkHeightTriggers(t *testing.T) {
 
 	sm, err := NewStateManagerWithUpgradeSchedule(
 		cg.ChainStore(), UpgradeSchedule{{
-			Network: network.Version1,
+			Network: 1,
 			Height:  testForkHeight,
 			Migration: func(ctx context.Context, sm *StateManager, cache MigrationCache, cb ExecMonitor,
 				root cid.Cid, height abi.ChainEpoch, ts *types.TipSet) (cid.Cid, error) {
@@ -251,7 +250,7 @@ func TestForkRefuseCall(t *testing.T) {
 
 	sm, err := NewStateManagerWithUpgradeSchedule(
 		cg.ChainStore(), UpgradeSchedule{{
-			Network:   network.Version1,
+			Network:   1,
 			Expensive: true,
 			Height:    testForkHeight,
 			Migration: func(ctx context.Context, sm *StateManager, cache MigrationCache, cb ExecMonitor,
@@ -366,7 +365,7 @@ func TestForkPreMigration(t *testing.T) {
 
 	sm, err := NewStateManagerWithUpgradeSchedule(
 		cg.ChainStore(), UpgradeSchedule{{
-			Network: network.Version1,
+			Network: 1,
 			Height:  testForkHeight,
 			Migration: func(ctx context.Context, sm *StateManager, cache MigrationCache, cb ExecMonitor,
 				root cid.Cid, height abi.ChainEpoch, ts *types.TipSet) (cid.Cid, error) {

chain/sync.go

@@ -727,11 +727,6 @@ func (syncer *Syncer) ValidateBlock(ctx context.Context, b *types.FullBlock, use
 	}
 
 	// fast checks first
-
-	if h.Height <= baseTs.Height() {
-		return xerrors.Errorf("block height not greater than parent height: %d != %d", h.Height, baseTs.Height())
-	}
-
 	nulls := h.Height - (baseTs.Height() + 1)
 	if tgtTs := baseTs.MinTimestamp() + build.BlockDelaySecs*uint64(nulls+1); h.Timestamp != tgtTs {
 		return xerrors.Errorf("block has wrong timestamp: %d != %d", h.Timestamp, tgtTs)
@@ -1059,7 +1054,6 @@ func (syncer *Syncer) checkBlockMessages(ctx context.Context, b *types.FullBlock
 		return xerrors.Errorf("failed to load base state tree: %w", err)
 	}
 
-	nv := syncer.sm.GetNtwkVersion(ctx, b.Header.Height)
 	pl := vm.PricelistByEpoch(baseTs.Height())
 	var sumGasLimit int64
 	checkMsg := func(msg types.ChainMsg) error {
@@ -1067,7 +1061,7 @@ func (syncer *Syncer) checkBlockMessages(ctx context.Context, b *types.FullBlock
 
 		// Phase 1: syntactic validation, as defined in the spec
 		minGas := pl.OnChainMessage(msg.ChainLength())
-		if err := m.ValidForBlockInclusion(minGas.Total(), nv); err != nil {
+		if err := m.ValidForBlockInclusion(minGas.Total(), syncer.sm.GetNtwkVersion(ctx, b.Header.Height)); err != nil {
 			return err
 		}
 
@@ -1081,7 +1075,7 @@ func (syncer *Syncer) checkBlockMessages(ctx context.Context, b *types.FullBlock
 		// Phase 2: (Partial) semantic validation:
 		// the sender exists and is an account actor, and the nonces make sense
 		var sender address.Address
-		if nv >= network.Version13 {
+		if syncer.sm.GetNtwkVersion(ctx, b.Header.Height) >= network.Version13 {
 			sender, err = st.LookupID(m.From)
 			if err != nil {
 				return err

chain/sync_test.go

@@ -230,7 +230,7 @@ func (tu *syncTestUtil) pushTsExpectErr(to int, fts *store.FullTipSet, experr bo
 	}
 }
 
-func (tu *syncTestUtil) mineOnBlock(blk *store.FullTipSet, to int, miners []int, wait, fail bool, msgs [][]*types.SignedMessage, nulls abi.ChainEpoch, push bool) *store.FullTipSet {
+func (tu *syncTestUtil) mineOnBlock(blk *store.FullTipSet, to int, miners []int, wait, fail bool, msgs [][]*types.SignedMessage, nulls abi.ChainEpoch) *store.FullTipSet {
 	if miners == nil {
 		for i := range tu.g.Miners {
 			miners = append(miners, i)
@@ -247,7 +247,7 @@ func (tu *syncTestUtil) mineOnBlock(blk *store.FullTipSet, to int, miners []int,
 	var nts *store.FullTipSet
 	var err error
 	if msgs != nil {
-		nts, err = tu.g.NextTipSetFromMinersWithMessagesAndNulls(blk.TipSet(), maddrs, msgs, nulls)
+		nts, err = tu.g.NextTipSetFromMinersWithMessagesAndNulls(blk.TipSet(), maddrs, msgs, 0)
 		require.NoError(tu.t, err)
 	} else {
 		mt, err := tu.g.NextTipSetFromMiners(blk.TipSet(), maddrs, nulls)
@@ -255,19 +255,17 @@ func (tu *syncTestUtil) mineOnBlock(blk *store.FullTipSet, to int, miners []int,
 		nts = mt.TipSet
 	}
 
-	if push {
-		if fail {
-			tu.pushTsExpectErr(to, nts, true)
-		} else {
-			tu.pushFtsAndWait(to, nts, wait)
-		}
+	if fail {
+		tu.pushTsExpectErr(to, nts, true)
+	} else {
+		tu.pushFtsAndWait(to, nts, wait)
 	}
 
 	return nts
 }
 
 func (tu *syncTestUtil) mineNewBlock(src int, miners []int) {
-	mts := tu.mineOnBlock(tu.g.CurTipset, src, miners, true, false, nil, 0, true)
+	mts := tu.mineOnBlock(tu.g.CurTipset, src, miners, true, false, nil, 0)
 	tu.g.CurTipset = mts
 }
 
@@ -512,7 +510,7 @@ func TestSyncBadTimestamp(t *testing.T) {
 	fmt.Println("BASE: ", base.Cids())
 	tu.printHeads()
 
-	a1 := tu.mineOnBlock(base, 0, nil, false, true, nil, 0, true)
+	a1 := tu.mineOnBlock(base, 0, nil, false, true, nil, 0)
 
 	tu.g.Timestamper = nil
 	require.NoError(t, tu.g.ResyncBankerNonce(a1.TipSet()))
@@ -521,7 +519,7 @@ func TestSyncBadTimestamp(t *testing.T) {
 
 	fmt.Println("After mine bad block!")
 	tu.printHeads()
-	a2 := tu.mineOnBlock(base, 0, nil, true, false, nil, 0, true)
+	a2 := tu.mineOnBlock(base, 0, nil, true, false, nil, 0)
 
 	tu.waitUntilSync(0, client)
 
@@ -565,7 +563,7 @@ func TestSyncBadWinningPoSt(t *testing.T) {
 	tu.g.SetWinningPoStProver(tu.g.Miners[1], &badWpp{})
 
 	// now ensure that new blocks are not accepted
-	tu.mineOnBlock(base, client, nil, false, true, nil, 0, true)
+	tu.mineOnBlock(base, client, nil, false, true, nil, 0)
 }
 
 func (tu *syncTestUtil) loadChainToNode(to int) {
@@ -615,16 +613,16 @@ func TestSyncFork(t *testing.T) {
 	fmt.Println("Mining base: ", base.TipSet().Cids(), base.TipSet().Height())
 
 	// The two nodes fork at this point into 'a' and 'b'
-	a1 := tu.mineOnBlock(base, p1, []int{0}, true, false, nil, 0, true)
-	a := tu.mineOnBlock(a1, p1, []int{0}, true, false, nil, 0, true)
-	a = tu.mineOnBlock(a, p1, []int{0}, true, false, nil, 0, true)
+	a1 := tu.mineOnBlock(base, p1, []int{0}, true, false, nil, 0)
+	a := tu.mineOnBlock(a1, p1, []int{0}, true, false, nil, 0)
+	a = tu.mineOnBlock(a, p1, []int{0}, true, false, nil, 0)
 
 	require.NoError(t, tu.g.ResyncBankerNonce(a1.TipSet()))
 	// chain B will now be heaviest
-	b := tu.mineOnBlock(base, p2, []int{1}, true, false, nil, 0, true)
-	b = tu.mineOnBlock(b, p2, []int{1}, true, false, nil, 0, true)
-	b = tu.mineOnBlock(b, p2, []int{1}, true, false, nil, 0, true)
-	b = tu.mineOnBlock(b, p2, []int{1}, true, false, nil, 0, true)
+	b := tu.mineOnBlock(base, p2, []int{1}, true, false, nil, 0)
+	b = tu.mineOnBlock(b, p2, []int{1}, true, false, nil, 0)
+	b = tu.mineOnBlock(b, p2, []int{1}, true, false, nil, 0)
+	b = tu.mineOnBlock(b, p2, []int{1}, true, false, nil, 0)
 
 	fmt.Println("A: ", a.Cids(), a.TipSet().Height())
 	fmt.Println("B: ", b.Cids(), b.TipSet().Height())
@@ -688,13 +686,13 @@ func TestDuplicateNonce(t *testing.T) {
 		msgs[k] = []*types.SignedMessage{makeMsg(tu.g.Miners[k])}
 	}
 
-	ts1 := tu.mineOnBlock(base, 0, []int{0, 1}, true, false, msgs, 0, true)
+	ts1 := tu.mineOnBlock(base, 0, []int{0, 1}, true, false, msgs, 0)
 
 	tu.waitUntilSyncTarget(0, ts1.TipSet())
 
 	// mine another tipset
 
-	ts2 := tu.mineOnBlock(ts1, 0, []int{0, 1}, true, false, make([][]*types.SignedMessage, 2), 0, true)
+	ts2 := tu.mineOnBlock(ts1, 0, []int{0, 1}, true, false, make([][]*types.SignedMessage, 2), 0)
 	tu.waitUntilSyncTarget(0, ts2.TipSet())
 
 	var includedMsg cid.Cid
@@ -780,7 +778,7 @@ func TestBadNonce(t *testing.T) {
 	msgs := make([][]*types.SignedMessage, 1)
 	msgs[0] = []*types.SignedMessage{makeBadMsg()}
 
-	tu.mineOnBlock(base, 0, []int{0}, true, true, msgs, 0, true)
+	tu.mineOnBlock(base, 0, []int{0}, true, true, msgs, 0)
 }
 
 // This test introduces a block that has 2 messages, with the same sender, and same nonce.
@@ -834,7 +832,7 @@ func TestMismatchedNoncesRobustID(t *testing.T) {
 	msgs := make([][]*types.SignedMessage, 1)
 	msgs[0] = []*types.SignedMessage{makeMsg(false), makeMsg(true)}
 
-	tu.mineOnBlock(base, 0, []int{0}, true, true, msgs, 0, true)
+	tu.mineOnBlock(base, 0, []int{0}, true, true, msgs, 0)
 }
 
 // This test introduces a block that has 2 messages, with the same sender, and nonces N and N+1 (so both can be included in a block)
@@ -888,7 +886,7 @@ func TestMatchedNoncesRobustID(t *testing.T) {
 	msgs := make([][]*types.SignedMessage, 1)
 	msgs[0] = []*types.SignedMessage{makeMsg(ba.Nonce, false), makeMsg(ba.Nonce+1, true)}
 
-	tu.mineOnBlock(base, 0, []int{0}, true, false, msgs, 0, true)
+	tu.mineOnBlock(base, 0, []int{0}, true, false, msgs, 0)
 }
 
 func BenchmarkSyncBasic(b *testing.B) {
@@ -953,19 +951,19 @@ func TestSyncCheckpointHead(t *testing.T) {
 	fmt.Println("Mining base: ", base.TipSet().Cids(), base.TipSet().Height())
 
 	// The two nodes fork at this point into 'a' and 'b'
-	a1 := tu.mineOnBlock(base, p1, []int{0}, true, false, nil, 0, true)
-	a := tu.mineOnBlock(a1, p1, []int{0}, true, false, nil, 0, true)
-	a = tu.mineOnBlock(a, p1, []int{0}, true, false, nil, 0, true)
+	a1 := tu.mineOnBlock(base, p1, []int{0}, true, false, nil, 0)
+	a := tu.mineOnBlock(a1, p1, []int{0}, true, false, nil, 0)
+	a = tu.mineOnBlock(a, p1, []int{0}, true, false, nil, 0)
 
 	tu.waitUntilSyncTarget(p1, a.TipSet())
 	tu.checkpointTs(p1, a.TipSet().Key())
 
 	require.NoError(t, tu.g.ResyncBankerNonce(a1.TipSet()))
 	// chain B will now be heaviest
-	b := tu.mineOnBlock(base, p2, []int{1}, true, false, nil, 0, true)
-	b = tu.mineOnBlock(b, p2, []int{1}, true, false, nil, 0, true)
-	b = tu.mineOnBlock(b, p2, []int{1}, true, false, nil, 0, true)
-	b = tu.mineOnBlock(b, p2, []int{1}, true, false, nil, 0, true)
+	b := tu.mineOnBlock(base, p2, []int{1}, true, false, nil, 0)
+	b = tu.mineOnBlock(b, p2, []int{1}, true, false, nil, 0)
+	b = tu.mineOnBlock(b, p2, []int{1}, true, false, nil, 0)
+	b = tu.mineOnBlock(b, p2, []int{1}, true, false, nil, 0)
 
 	fmt.Println("A: ", a.Cids(), a.TipSet().Height())
 	fmt.Println("B: ", b.Cids(), b.TipSet().Height())
@@ -1000,19 +998,19 @@ func TestSyncCheckpointEarlierThanHead(t *testing.T) {
 	fmt.Println("Mining base: ", base.TipSet().Cids(), base.TipSet().Height())
 
 	// The two nodes fork at this point into 'a' and 'b'
-	a1 := tu.mineOnBlock(base, p1, []int{0}, true, false, nil, 0, true)
-	a := tu.mineOnBlock(a1, p1, []int{0}, true, false, nil, 0, true)
-	a = tu.mineOnBlock(a, p1, []int{0}, true, false, nil, 0, true)
+	a1 := tu.mineOnBlock(base, p1, []int{0}, true, false, nil, 0)
+	a := tu.mineOnBlock(a1, p1, []int{0}, true, false, nil, 0)
+	a = tu.mineOnBlock(a, p1, []int{0}, true, false, nil, 0)
 
 	tu.waitUntilSyncTarget(p1, a.TipSet())
 	tu.checkpointTs(p1, a1.TipSet().Key())
 
 	require.NoError(t, tu.g.ResyncBankerNonce(a1.TipSet()))
 	// chain B will now be heaviest
-	b := tu.mineOnBlock(base, p2, []int{1}, true, false, nil, 0, true)
-	b = tu.mineOnBlock(b, p2, []int{1}, true, false, nil, 0, true)
-	b = tu.mineOnBlock(b, p2, []int{1}, true, false, nil, 0, true)
-	b = tu.mineOnBlock(b, p2, []int{1}, true, false, nil, 0, true)
+	b := tu.mineOnBlock(base, p2, []int{1}, true, false, nil, 0)
+	b = tu.mineOnBlock(b, p2, []int{1}, true, false, nil, 0)
+	b = tu.mineOnBlock(b, p2, []int{1}, true, false, nil, 0)
+	b = tu.mineOnBlock(b, p2, []int{1}, true, false, nil, 0)
 
 	fmt.Println("A: ", a.Cids(), a.TipSet().Height())
 	fmt.Println("B: ", b.Cids(), b.TipSet().Height())
@@ -1050,7 +1048,7 @@ func TestDrandNull(t *testing.T) {
 	pers := crypto.DomainSeparationTag_WinningPoStChallengeSeed
 
 	beforeNull := tu.g.CurTipset
-	afterNull := tu.mineOnBlock(beforeNull, p0, nil, false, false, nil, 2, true)
+	afterNull := tu.mineOnBlock(beforeNull, p0, nil, false, false, nil, 2)
 	nullHeight := beforeNull.TipSet().Height() + 1
 	if afterNull.TipSet().Height() == nullHeight {
 		t.Fatal("didn't inject nulls as expected")
@@ -1067,14 +1065,14 @@ func TestDrandNull(t *testing.T) {
 	require.Equal(t, []byte(rand), expectedRand)
 
 	// zoom zoom to past the v5 upgrade by injecting many many nulls
-	postUpgrade := tu.mineOnBlock(afterNull, p0, nil, false, false, nil, v5h, true)
+	postUpgrade := tu.mineOnBlock(afterNull, p0, nil, false, false, nil, v5h)
 	nv, err := tu.nds[p0].StateNetworkVersion(tu.ctx, postUpgrade.TipSet().Key())
 	require.NoError(t, err)
 	if nv != network.Version13 {
 		t.Fatal("expect to be v13 by now")
 	}
 
-	afterNull = tu.mineOnBlock(postUpgrade, p0, nil, false, false, nil, 2, true)
+	afterNull = tu.mineOnBlock(postUpgrade, p0, nil, false, false, nil, 2)
 	nullHeight = postUpgrade.TipSet().Height() + 1
 	if afterNull.TipSet().Height() == nullHeight {
 		t.Fatal("didn't inject nulls as expected")
@@ -1106,22 +1104,3 @@ func TestDrandNull(t *testing.T) {
 
 	build.UpgradeHyperdriveHeight = ov5h
 }
-
-func TestInvalidHeight(t *testing.T) {
-	H := 50
-	tu := prepSyncTest(t, H)
-
-	client := tu.addClientNode()
-
-	require.NoError(t, tu.mn.LinkAll())
-	tu.connect(client, 0)
-	tu.waitUntilSync(0, client)
-
-	base := tu.g.CurTipset
-
-	for i := 0; i < 5; i++ {
-		base = tu.mineOnBlock(base, 0, nil, false, false, nil, 0, false)
-	}
-
-	tu.mineOnBlock(base, 0, nil, false, true, nil, -1, true)
-}

chain/vm/gas.go

@@ -3,11 +3,12 @@ package vm
 import (
 	"fmt"
 
+	"github.com/filecoin-project/lotus/build"
+
 	"github.com/filecoin-project/go-address"
 	addr "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/build"
 	vmr5 "github.com/filecoin-project/specs-actors/v5/actors/runtime"
 	proof5 "github.com/filecoin-project/specs-actors/v5/actors/runtime/proof"
 	"github.com/ipfs/go-cid"

chain/vm/invoker.go

@@ -39,10 +39,7 @@ type ActorPredicate func(vmr.Runtime, rtt.VMActor) error
 
 func ActorsVersionPredicate(ver actors.Version) ActorPredicate {
 	return func(rt vmr.Runtime, v rtt.VMActor) error {
-		aver, err := actors.VersionForNetwork(rt.NetworkVersion())
-		if err != nil {
-			return xerrors.Errorf("unsupported network version: %w", err)
-		}
+		aver := actors.VersionForNetwork(rt.NetworkVersion())
 		if aver != ver {
 			return xerrors.Errorf("actor %s is a version %d actor; chain only supports actor version %d at height %d and nver %d", v.Code(), ver, aver, rt.CurrEpoch(), rt.NetworkVersion())
 		}

chain/vm/mkactor.go

@@ -54,12 +54,7 @@ func TryCreateAccountActor(rt *Runtime, addr address.Address) (*types.Actor, add
 		return nil, address.Undef, aerrors.Escalate(err, "registering actor address")
 	}
 
-	av, err := actors.VersionForNetwork(rt.NetworkVersion())
-	if err != nil {
-		return nil, address.Undef, aerrors.Escalate(err, "unsupported network version")
-	}
-
-	act, aerr := makeActor(av, addr)
+	act, aerr := makeActor(actors.VersionForNetwork(rt.NetworkVersion()), addr)
 	if aerr != nil {
 		return nil, address.Undef, aerr
 	}

cli/auth.go

@@ -113,7 +113,7 @@ var AuthApiInfoToken = &cli.Command{
 
 		ti, ok := cctx.App.Metadata["repoType"]
 		if !ok {
-			log.Errorf("unknown repo type, are you sure you want to use GetCommonAPI?")
+			log.Errorf("unknown repo type, are you sure you want to use GetAPI?")
 			ti = repo.FullNode
 		}
 		t, ok := ti.(repo.RepoType)
@@ -128,8 +128,7 @@ var AuthApiInfoToken = &cli.Command{
 
 		// TODO: Log in audit log when it is implemented
 
-		currentEnv, _, _ := cliutil.EnvsForAPIInfos(t)
-		fmt.Printf("%s=%s:%s\n", currentEnv, string(token), ainfo.Addr)
+		fmt.Printf("%s=%s:%s\n", cliutil.EnvForRepo(t), string(token), ainfo.Addr)
 		return nil
 	},
 }

cli/client.go

@@ -25,6 +25,7 @@ import (
 	"github.com/fatih/color"
 	datatransfer "github.com/filecoin-project/go-data-transfer"
 	"github.com/filecoin-project/go-fil-markets/retrievalmarket"
+	"github.com/filecoin-project/lotus/node/repo/importmgr"
 	"github.com/ipfs/go-cid"
 	"github.com/ipfs/go-cidutil/cidenc"
 	"github.com/libp2p/go-libp2p-core/peer"
@@ -34,7 +35,6 @@ import (
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-fil-markets/storagemarket"
-	"github.com/filecoin-project/go-multistore"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/big"
 
@@ -174,18 +174,18 @@ var clientDropCmd = &cli.Command{
 		defer closer()
 		ctx := ReqContext(cctx)
 
-		var ids []multistore.StoreID
+		var ids []uint64
 		for i, s := range cctx.Args().Slice() {
-			id, err := strconv.ParseInt(s, 10, 0)
+			id, err := strconv.ParseUint(s, 10, 64)
 			if err != nil {
 				return xerrors.Errorf("parsing %d-th import ID: %w", i, err)
 			}
 
-			ids = append(ids, multistore.StoreID(id))
+			ids = append(ids, id)
 		}
 
 		for _, id := range ids {
-			if err := api.ClientRemoveImport(ctx, id); err != nil {
+			if err := api.ClientRemoveImport(ctx, importmgr.ImportID(id)); err != nil {
 				return xerrors.Errorf("removing import %d: %w", id, err)
 			}
 		}
@@ -1104,8 +1104,8 @@ var clientRetrieveCmd = &cli.Command{
 			for _, i := range imports {
 				if i.Root != nil && i.Root.Equals(file) {
 					order = &lapi.RetrievalOrder{
-						Root:       file,
-						LocalStore: &i.Key,
+						Root:               file,
+						LocalCARV2FilePath: i.CARv2FilePath,
 
 						Total:       big.Zero(),
 						UnsealPrice: big.Zero(),

cli/cmd.go

@@ -44,7 +44,7 @@ func GetFullNodeServices(ctx *cli.Context) (ServicesAPI, error) {
 
 var GetAPIInfo = cliutil.GetAPIInfo
 var GetRawAPI = cliutil.GetRawAPI
-var GetAPI = cliutil.GetCommonAPI
+var GetAPI = cliutil.GetAPI
 
 var DaemonContext = cliutil.DaemonContext
 var ReqContext = cliutil.ReqContext
@@ -54,10 +54,10 @@ var GetFullNodeAPIV1 = cliutil.GetFullNodeAPIV1
 var GetGatewayAPI = cliutil.GetGatewayAPI
 
 var GetStorageMinerAPI = cliutil.GetStorageMinerAPI
-var GetMarketsAPI = cliutil.GetMarketsAPI
 var GetWorkerAPI = cliutil.GetWorkerAPI
 
 var CommonCommands = []*cli.Command{
+	NetCmd,
 	AuthCmd,
 	LogCmd,
 	WaitApiCmd,

cli/state.go

@@ -446,9 +446,6 @@ var StateExecTraceCmd = &cli.Command{
 		if err != nil {
 			return err
 		}
-		if lookup == nil {
-			return fmt.Errorf("failed to find message: %s", mcid)
-		}
 
 		ts, err := capi.ChainGetTipSet(ctx, lookup.TipSet)
 		if err != nil {
@@ -1494,10 +1491,6 @@ var StateSearchMsgCmd = &cli.Command{
 			return err
 		}
 
-		if mw == nil {
-			return fmt.Errorf("failed to find message: %s", msg)
-		}
-
 		m, err := api.ChainGetMessage(ctx, msg)
 		if err != nil {
 			return err

cli/util/api.go

@@ -27,145 +27,112 @@ const (
 	metadataTraceContext = "traceContext"
 )
 
-// flagsForAPI returns flags passed on the command line with the listen address
-// of the API server (only used by the tests), in the order of precedence they
-// should be applied for the requested kind of node.
-func flagsForAPI(t repo.RepoType) []string {
+// The flag passed on the command line with the listen address of the API
+// server (only used by the tests)
+func flagForAPI(t repo.RepoType) string {
 	switch t {
 	case repo.FullNode:
-		return []string{"api-url"}
+		return "api-url"
 	case repo.StorageMiner:
-		return []string{"miner-api-url"}
+		return "miner-api-url"
 	case repo.Worker:
-		return []string{"worker-api-url"}
-	case repo.Markets:
-		// support split markets-miner and monolith deployments.
-		return []string{"markets-api-url", "miner-api-url"}
+		return "worker-api-url"
 	default:
 		panic(fmt.Sprintf("Unknown repo type: %v", t))
 	}
 }
 
-func flagsForRepo(t repo.RepoType) []string {
+func flagForRepo(t repo.RepoType) string {
 	switch t {
 	case repo.FullNode:
-		return []string{"repo"}
+		return "repo"
 	case repo.StorageMiner:
-		return []string{"miner-repo"}
+		return "miner-repo"
 	case repo.Worker:
-		return []string{"worker-repo"}
-	case repo.Markets:
-		// support split markets-miner and monolith deployments.
-		return []string{"markets-repo", "miner-repo"}
+		return "worker-repo"
 	default:
 		panic(fmt.Sprintf("Unknown repo type: %v", t))
 	}
 }
 
-// EnvsForAPIInfos returns the environment variables to use in order of precedence
-// to determine the API endpoint of the specified node type.
-//
-// It returns the current variables and deprecated ones separately, so that
-// the user can log a warning when deprecated ones are found to be in use.
-func EnvsForAPIInfos(t repo.RepoType) (primary string, fallbacks []string, deprecated []string) {
+func EnvForRepo(t repo.RepoType) string {
 	switch t {
 	case repo.FullNode:
-		return "FULLNODE_API_INFO", nil, nil
+		return "FULLNODE_API_INFO"
 	case repo.StorageMiner:
-		// TODO remove deprecated deprecation period
-		return "MINER_API_INFO", nil, []string{"STORAGE_API_INFO"}
+		return "MINER_API_INFO"
 	case repo.Worker:
-		return "WORKER_API_INFO", nil, nil
-	case repo.Markets:
-		// support split markets-miner and monolith deployments.
-		return "MARKETS_API_INFO", []string{"MINER_API_INFO"}, nil
+		return "WORKER_API_INFO"
+	default:
+		panic(fmt.Sprintf("Unknown repo type: %v", t))
+	}
+}
+
+// TODO remove after deprecation period
+func envForRepoDeprecation(t repo.RepoType) string {
+	switch t {
+	case repo.FullNode:
+		return "FULLNODE_API_INFO"
+	case repo.StorageMiner:
+		return "STORAGE_API_INFO"
+	case repo.Worker:
+		return "WORKER_API_INFO"
 	default:
 		panic(fmt.Sprintf("Unknown repo type: %v", t))
 	}
 }
 
-// GetAPIInfo returns the API endpoint to use for the specified kind of repo.
-//
-// The order of precedence is as follows:
-//
-//  1. *-api-url command line flags.
-//  2. *_API_INFO environment variables
-//  3. deprecated *_API_INFO environment variables
-//  4. *-repo command line flags.
 func GetAPIInfo(ctx *cli.Context, t repo.RepoType) (APIInfo, error) {
 	// Check if there was a flag passed with the listen address of the API
 	// server (only used by the tests)
-	apiFlags := flagsForAPI(t)
-	for _, f := range apiFlags {
-		if !ctx.IsSet(f) {
-			continue
-		}
-		strma := ctx.String(f)
+	apiFlag := flagForAPI(t)
+	if ctx.IsSet(apiFlag) {
+		strma := ctx.String(apiFlag)
 		strma = strings.TrimSpace(strma)
 
 		return APIInfo{Addr: strma}, nil
 	}
 
-	//
-	// Note: it is not correct/intuitive to prefer environment variables over
-	// CLI flags (repo flags below).
-	//
-	primaryEnv, fallbacksEnvs, deprecatedEnvs := EnvsForAPIInfos(t)
-	env, ok := os.LookupEnv(primaryEnv)
+	envKey := EnvForRepo(t)
+	env, ok := os.LookupEnv(envKey)
+	if !ok {
+		// TODO remove after deprecation period
+		envKey = envForRepoDeprecation(t)
+		env, ok = os.LookupEnv(envKey)
+		if ok {
+			log.Warnf("Use deprecation env(%s) value, please use env(%s) instead.", envKey, EnvForRepo(t))
+		}
+	}
 	if ok {
 		return ParseApiInfo(env), nil
 	}
 
-	for _, env := range deprecatedEnvs {
-		env, ok := os.LookupEnv(env)
-		if ok {
-			log.Warnf("Using deprecated env(%s) value, please use env(%s) instead.", env, primaryEnv)
-			return ParseApiInfo(env), nil
-		}
+	repoFlag := flagForRepo(t)
+
+	p, err := homedir.Expand(ctx.String(repoFlag))
+	if err != nil {
+		return APIInfo{}, xerrors.Errorf("could not expand home dir (%s): %w", repoFlag, err)
 	}
 
-	repoFlags := flagsForRepo(t)
-	for _, f := range repoFlags {
-		// cannot use ctx.IsSet because it ignores default values
-		path := ctx.String(f)
-		if path == "" {
-			continue
-		}
-
-		p, err := homedir.Expand(path)
-		if err != nil {
-			return APIInfo{}, xerrors.Errorf("could not expand home dir (%s): %w", f, err)
-		}
-
-		r, err := repo.NewFS(p)
-		if err != nil {
-			return APIInfo{}, xerrors.Errorf("could not open repo at path: %s; %w", p, err)
-		}
-
-		ma, err := r.APIEndpoint()
-		if err != nil {
-			return APIInfo{}, xerrors.Errorf("could not get api endpoint: %w", err)
-		}
-
-		token, err := r.APIToken()
-		if err != nil {
-			log.Warnf("Couldn't load CLI token, capabilities may be limited: %v", err)
-		}
-
-		return APIInfo{
-			Addr:  ma.String(),
-			Token: token,
-		}, nil
+	r, err := repo.NewFS(p)
+	if err != nil {
+		return APIInfo{}, xerrors.Errorf("could not open repo at path: %s; %w", p, err)
 	}
 
-	for _, env := range fallbacksEnvs {
-		env, ok := os.LookupEnv(env)
-		if ok {
-			return ParseApiInfo(env), nil
-		}
+	ma, err := r.APIEndpoint()
+	if err != nil {
+		return APIInfo{}, xerrors.Errorf("could not get api endpoint: %w", err)
 	}
 
-	return APIInfo{}, fmt.Errorf("could not determine API endpoint for node type: %v", t)
+	token, err := r.APIToken()
+	if err != nil {
+		log.Warnf("Couldn't load CLI token, capabilities may be limited: %v", err)
+	}
+
+	return APIInfo{
+		Addr:  ma.String(),
+		Token: token,
+	}, nil
 }
 
 func GetRawAPI(ctx *cli.Context, t repo.RepoType, version string) (string, http.Header, error) {
@@ -179,17 +146,13 @@ func GetRawAPI(ctx *cli.Context, t repo.RepoType, version string) (string, http.
 		return "", nil, xerrors.Errorf("could not get DialArgs: %w", err)
 	}
 
-	if IsVeryVerbose {
-		_, _ = fmt.Fprintf(ctx.App.Writer, "using raw API %s endpoint: %s\n", version, addr)
-	}
-
 	return addr, ainfo.AuthHeader(), nil
 }
 
-func GetCommonAPI(ctx *cli.Context) (api.CommonNet, jsonrpc.ClientCloser, error) {
+func GetAPI(ctx *cli.Context) (api.Common, jsonrpc.ClientCloser, error) {
 	ti, ok := ctx.App.Metadata["repoType"]
 	if !ok {
-		log.Errorf("unknown repo type, are you sure you want to use GetCommonAPI?")
+		log.Errorf("unknown repo type, are you sure you want to use GetAPI?")
 		ti = repo.FullNode
 	}
 	t, ok := ti.(repo.RepoType)
@@ -222,10 +185,6 @@ func GetFullNodeAPI(ctx *cli.Context) (v0api.FullNode, jsonrpc.ClientCloser, err
 		return nil, nil, err
 	}
 
-	if IsVeryVerbose {
-		_, _ = fmt.Fprintln(ctx.App.Writer, "using full node API v0 endpoint:", addr)
-	}
-
 	return client.NewFullNodeRPCV0(ctx.Context, addr, headers)
 }
 
@@ -239,10 +198,6 @@ func GetFullNodeAPIV1(ctx *cli.Context) (v1api.FullNode, jsonrpc.ClientCloser, e
 		return nil, nil, err
 	}
 
-	if IsVeryVerbose {
-		_, _ = fmt.Fprintln(ctx.App.Writer, "using full node API v1 endpoint:", addr)
-	}
-
 	return client.NewFullNodeRPCV1(ctx.Context, addr, headers)
 }
 
@@ -287,10 +242,6 @@ func GetStorageMinerAPI(ctx *cli.Context, opts ...GetStorageMinerOption) (api.St
 		addr = u.String()
 	}
 
-	if IsVeryVerbose {
-		_, _ = fmt.Fprintln(ctx.App.Writer, "using miner API v0 endpoint:", addr)
-	}
-
 	return client.NewStorageMinerRPCV0(ctx.Context, addr, headers)
 }
 
@@ -300,44 +251,15 @@ func GetWorkerAPI(ctx *cli.Context) (api.Worker, jsonrpc.ClientCloser, error) {
 		return nil, nil, err
 	}
 
-	if IsVeryVerbose {
-		_, _ = fmt.Fprintln(ctx.App.Writer, "using worker API v0 endpoint:", addr)
-	}
-
 	return client.NewWorkerRPCV0(ctx.Context, addr, headers)
 }
 
-func GetMarketsAPI(ctx *cli.Context) (api.StorageMiner, jsonrpc.ClientCloser, error) {
-	// to support lotus-miner cli tests.
-	if tn, ok := ctx.App.Metadata["testnode-storage"]; ok {
-		return tn.(api.StorageMiner), func() {}, nil
-	}
-
-	addr, headers, err := GetRawAPI(ctx, repo.Markets, "v0")
-	if err != nil {
-		return nil, nil, err
-	}
-
-	if IsVeryVerbose {
-		_, _ = fmt.Fprintln(ctx.App.Writer, "using markets API v0 endpoint:", addr)
-	}
-
-	// the markets node is a specialised miner's node, supporting only the
-	// markets API, which is a subset of the miner API. All non-markets
-	// operations will error out with "unsupported".
-	return client.NewStorageMinerRPCV0(ctx.Context, addr, headers)
-}
-
 func GetGatewayAPI(ctx *cli.Context) (api.Gateway, jsonrpc.ClientCloser, error) {
 	addr, headers, err := GetRawAPI(ctx, repo.FullNode, "v1")
 	if err != nil {
 		return nil, nil, err
 	}
 
-	if IsVeryVerbose {
-		_, _ = fmt.Fprintln(ctx.App.Writer, "using gateway API v1 endpoint:", addr)
-	}
-
 	return client.NewGatewayRPCV1(ctx.Context, addr, headers)
 }
 
@@ -347,10 +269,6 @@ func GetGatewayAPIV0(ctx *cli.Context) (v0api.Gateway, jsonrpc.ClientCloser, err
 		return nil, nil, err
 	}
 
-	if IsVeryVerbose {
-		_, _ = fmt.Fprintln(ctx.App.Writer, "using gateway API v0 endpoint:", addr)
-	}
-
 	return client.NewGatewayRPCV0(ctx.Context, addr, headers)
 }
 

cli/util/verbose.go

@@ -1,16 +0,0 @@
-package cliutil
-
-import "github.com/urfave/cli/v2"
-
-// IsVeryVerbose is a global var signalling if the CLI is running in very
-// verbose mode or not (default: false).
-var IsVeryVerbose bool
-
-// FlagVeryVerbose enables very verbose mode, which is useful when debugging
-// the CLI itself. It should be included as a flag on the top-level command
-// (e.g. lotus -vv, lotus-miner -vv).
-var FlagVeryVerbose = &cli.BoolFlag{
-	Name:        "vv",
-	Usage:       "enables very verbose mode, useful for debugging the CLI",
-	Destination: &IsVeryVerbose,
-}

cmd/lotus-miner/config.go

@@ -1,94 +0,0 @@
-package main
-
-import (
-	"fmt"
-
-	"github.com/urfave/cli/v2"
-	"golang.org/x/xerrors"
-
-	"github.com/filecoin-project/lotus/node/config"
-	"github.com/filecoin-project/lotus/node/repo"
-)
-
-var configCmd = &cli.Command{
-	Name:  "config",
-	Usage: "Manage node config",
-	Subcommands: []*cli.Command{
-		configDefaultCmd,
-		configUpdateCmd,
-	},
-}
-
-var configDefaultCmd = &cli.Command{
-	Name:  "default",
-	Usage: "Print default node config",
-	Flags: []cli.Flag{
-		&cli.BoolFlag{
-			Name:  "no-comment",
-			Usage: "don't comment default values",
-		},
-	},
-	Action: func(cctx *cli.Context) error {
-		c := config.DefaultStorageMiner()
-
-		cb, err := config.ConfigUpdate(c, nil, !cctx.Bool("no-comment"))
-		if err != nil {
-			return err
-		}
-
-		fmt.Println(string(cb))
-
-		return nil
-	},
-}
-
-var configUpdateCmd = &cli.Command{
-	Name:  "updated",
-	Usage: "Print updated node config",
-	Flags: []cli.Flag{
-		&cli.BoolFlag{
-			Name:  "no-comment",
-			Usage: "don't comment default values",
-		},
-	},
-	Action: func(cctx *cli.Context) error {
-		r, err := repo.NewFS(cctx.String(FlagMinerRepo))
-		if err != nil {
-			return err
-		}
-
-		ok, err := r.Exists()
-		if err != nil {
-			return err
-		}
-
-		if !ok {
-			return xerrors.Errorf("repo not initialized")
-		}
-
-		lr, err := r.LockRO(repo.StorageMiner)
-		if err != nil {
-			return xerrors.Errorf("locking repo: %w", err)
-		}
-
-		cfgNode, err := lr.Config()
-		if err != nil {
-			_ = lr.Close()
-			return xerrors.Errorf("getting node config: %w", err)
-		}
-
-		if err := lr.Close(); err != nil {
-			return err
-		}
-
-		cfgDef := config.DefaultStorageMiner()
-
-		updated, err := config.ConfigUpdate(cfgNode, cfgDef, !cctx.Bool("no-comment"))
-		if err != nil {
-			return err
-		}
-
-		fmt.Print(string(updated))
-		return nil
-	},
-}

cmd/lotus-shed/main.go

@@ -60,7 +60,6 @@ func main() {
 		actorCmd,
 		minerTypesCmd,
 		minerMultisigsCmd,
-		splitstoreCmd,
 	}
 
 	app := &cli.App{

cmd/lotus-shed/market.go

@@ -2,18 +2,6 @@ package main
 
 import (
 	"fmt"
-	"os"
-	"path"
-
-	levelds "github.com/ipfs/go-ds-leveldb"
-	ldbopts "github.com/syndtr/goleveldb/leveldb/opt"
-
-	"github.com/filecoin-project/lotus/lib/backupds"
-
-	"github.com/filecoin-project/lotus/node/repo"
-	"github.com/ipfs/go-datastore"
-	dsq "github.com/ipfs/go-datastore/query"
-	logging "github.com/ipfs/go-log/v2"
 
 	lcli "github.com/filecoin-project/lotus/cli"
 
@@ -30,8 +18,6 @@ var marketCmd = &cli.Command{
 	Flags: []cli.Flag{},
 	Subcommands: []*cli.Command{
 		marketDealFeesCmd,
-		marketExportDatastoreCmd,
-		marketImportDatastoreCmd,
 	},
 }
 
@@ -114,196 +100,3 @@ var marketDealFeesCmd = &cli.Command{
 		return xerrors.New("must provide either --provider or --dealId flag")
 	},
 }
-
-const mktsMetadataNamespace = "metadata"
-
-var marketExportDatastoreCmd = &cli.Command{
-	Name:        "export-datastore",
-	Description: "export markets datastore key/values to a file",
-	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:  "repo",
-			Usage: "path to the repo",
-		},
-		&cli.StringFlag{
-			Name:  "backup-dir",
-			Usage: "path to the backup directory",
-		},
-	},
-	Action: func(cctx *cli.Context) error {
-		logging.SetLogLevel("badger", "ERROR") // nolint:errcheck
-
-		// If the backup dir is not specified, just use the OS temp dir
-		backupDir := cctx.String("backup-dir")
-		if backupDir == "" {
-			backupDir = os.TempDir()
-		}
-
-		// Open the repo at the repo path
-		repoPath := cctx.String("repo")
-		lr, err := openLockedRepo(repoPath)
-		if err != nil {
-			return err
-		}
-		defer lr.Close() //nolint:errcheck
-
-		// Open the metadata datastore on the repo
-		ds, err := lr.Datastore(cctx.Context, datastore.NewKey(mktsMetadataNamespace).String())
-		if err != nil {
-			return xerrors.Errorf("opening datastore %s on repo %s: %w", mktsMetadataNamespace, repoPath, err)
-		}
-
-		// Create a tmp datastore that we'll add the exported key / values to
-		// and then backup
-		backupDsDir := path.Join(backupDir, "markets-backup-datastore")
-		if err := os.MkdirAll(backupDsDir, 0775); err != nil { //nolint:gosec
-			return xerrors.Errorf("creating tmp datastore directory: %w", err)
-		}
-		defer os.RemoveAll(backupDsDir) //nolint:errcheck
-
-		backupDs, err := levelds.NewDatastore(backupDsDir, &levelds.Options{
-			Compression: ldbopts.NoCompression,
-			NoSync:      false,
-			Strict:      ldbopts.StrictAll,
-			ReadOnly:    false,
-		})
-		if err != nil {
-			return xerrors.Errorf("opening backup datastore at %s: %w", backupDir, err)
-		}
-
-		// Export the key / values
-		prefixes := []string{
-			"/deals/provider",
-			"/retrievals/provider",
-			"/storagemarket",
-		}
-		for _, prefix := range prefixes {
-			err := exportPrefix(prefix, ds, backupDs)
-			if err != nil {
-				return err
-			}
-		}
-
-		// Wrap the datastore in a backup datastore
-		bds, err := backupds.Wrap(backupDs, "")
-		if err != nil {
-			return xerrors.Errorf("opening backupds: %w", err)
-		}
-
-		// Create a file for the backup
-		fpath := path.Join(backupDir, "markets.datastore.backup")
-		out, err := os.OpenFile(fpath, os.O_CREATE|os.O_WRONLY, 0644)
-		if err != nil {
-			return xerrors.Errorf("opening backup file %s: %w", fpath, err)
-		}
-
-		// Write the backup to the file
-		if err := bds.Backup(out); err != nil {
-			if cerr := out.Close(); cerr != nil {
-				log.Errorw("error closing backup file while handling backup error", "closeErr", cerr, "backupErr", err)
-			}
-			return xerrors.Errorf("backup error: %w", err)
-		}
-		if err := out.Close(); err != nil {
-			return xerrors.Errorf("closing backup file: %w", err)
-		}
-
-		fmt.Println("Wrote backup file to " + fpath)
-
-		return nil
-	},
-}
-
-func exportPrefix(prefix string, ds datastore.Batching, backupDs datastore.Batching) error {
-	q, err := ds.Query(dsq.Query{
-		Prefix: prefix,
-	})
-	if err != nil {
-		return xerrors.Errorf("datastore query: %w", err)
-	}
-	defer q.Close() //nolint:errcheck
-
-	for res := range q.Next() {
-		fmt.Println("Exporting key " + res.Key)
-		err := backupDs.Put(datastore.NewKey(res.Key), res.Value)
-		if err != nil {
-			return xerrors.Errorf("putting %s to backup datastore: %w", res.Key, err)
-		}
-	}
-
-	return nil
-}
-
-var marketImportDatastoreCmd = &cli.Command{
-	Name:        "import-datastore",
-	Description: "import markets datastore key/values from a backup file",
-	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:  "repo",
-			Usage: "path to the repo",
-		},
-		&cli.StringFlag{
-			Name:     "backup-path",
-			Usage:    "path to the backup file",
-			Required: true,
-		},
-	},
-	Action: func(cctx *cli.Context) error {
-		logging.SetLogLevel("badger", "ERROR") // nolint:errcheck
-
-		backupPath := cctx.String("backup-path")
-
-		// Open the repo at the repo path
-		lr, err := openLockedRepo(cctx.String("repo"))
-		if err != nil {
-			return err
-		}
-		defer lr.Close() //nolint:errcheck
-
-		// Open the metadata datastore on the repo
-		repoDs, err := lr.Datastore(cctx.Context, datastore.NewKey(mktsMetadataNamespace).String())
-		if err != nil {
-			return err
-		}
-
-		r, err := os.Open(backupPath)
-		if err != nil {
-			return xerrors.Errorf("opening backup path %s: %w", backupPath, err)
-		}
-
-		fmt.Println("Importing from backup file " + backupPath)
-		err = backupds.RestoreInto(r, repoDs)
-		if err != nil {
-			return xerrors.Errorf("restoring backup from path %s: %w", backupPath, err)
-		}
-
-		fmt.Println("Completed importing from backup file " + backupPath)
-
-		return nil
-	},
-}
-
-func openLockedRepo(path string) (repo.LockedRepo, error) {
-	// Open the repo at the repo path
-	rpo, err := repo.NewFS(path)
-	if err != nil {
-		return nil, xerrors.Errorf("could not open repo %s: %w", path, err)
-	}
-
-	// Make sure the repo exists
-	exists, err := rpo.Exists()
-	if err != nil {
-		return nil, xerrors.Errorf("checking repo %s exists: %w", path, err)
-	}
-	if !exists {
-		return nil, xerrors.Errorf("repo does not exist: %s", path)
-	}
-
-	// Lock the repo
-	lr, err := rpo.Lock(repo.StorageMiner)
-	if err != nil {
-		return nil, xerrors.Errorf("locking repo %s: %w", path, err)
-	}
-
-	return lr, nil
-}

cmd/lotus-shed/pruning.go

@@ -161,7 +161,7 @@ var stateTreePruneCmd = &cli.Command{
 		if cctx.Bool("only-ds-gc") {
 			fmt.Println("running datastore gc....")
 			for i := 0; i < cctx.Int("gc-count"); i++ {
-				if err := badgbs.DB().RunValueLogGC(DiscardRatio); err != nil {
+				if err := badgbs.DB.RunValueLogGC(DiscardRatio); err != nil {
 					return xerrors.Errorf("datastore GC failed: %w", err)
 				}
 			}
@@ -208,7 +208,7 @@ var stateTreePruneCmd = &cli.Command{
 			return nil
 		}
 
-		b := badgbs.DB().NewWriteBatch()
+		b := badgbs.DB.NewWriteBatch()
 		defer b.Cancel()
 
 		markForRemoval := func(c cid.Cid) error {
@@ -249,7 +249,7 @@ var stateTreePruneCmd = &cli.Command{
 
 		fmt.Println("running datastore gc....")
 		for i := 0; i < cctx.Int("gc-count"); i++ {
-			if err := badgbs.DB().RunValueLogGC(DiscardRatio); err != nil {
+			if err := badgbs.DB.RunValueLogGC(DiscardRatio); err != nil {
 				return xerrors.Errorf("datastore GC failed: %w", err)
 			}
 		}

cmd/lotus-shed/sectors.go

@@ -1,16 +1,8 @@
 package main
 
 import (
-	"bytes"
-	"encoding/base64"
 	"fmt"
-	"image"
-	"image/color"
-	"image/png"
-	"os"
-	"sort"
 	"strconv"
-	"sync"
 
 	"golang.org/x/xerrors"
 
@@ -18,7 +10,6 @@ import (
 	"github.com/filecoin-project/go-bitfield"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/big"
-	"github.com/ipfs/go-cid"
 	"github.com/urfave/cli/v2"
 
 	miner2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/miner"
@@ -27,7 +18,6 @@ import (
 	"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
 	"github.com/filecoin-project/lotus/chain/types"
 	lcli "github.com/filecoin-project/lotus/cli"
-	"github.com/filecoin-project/lotus/lib/parmap"
 )
 
 var sectorsCmd = &cli.Command{
@@ -37,7 +27,6 @@ var sectorsCmd = &cli.Command{
 	Subcommands: []*cli.Command{
 		terminateSectorCmd,
 		terminateSectorPenaltyEstimationCmd,
-		visAllocatedSectorsCmd,
 	},
 }
 
@@ -274,188 +263,3 @@ var terminateSectorPenaltyEstimationCmd = &cli.Command{
 		return nil
 	},
 }
-
-var visAllocatedSectorsCmd = &cli.Command{
-	Name:  "vis-allocated",
-	Usage: "Produces a html with visualisation of allocated sectors",
-	Action: func(cctx *cli.Context) error {
-		api, closer, err := lcli.GetFullNodeAPI(cctx)
-		if err != nil {
-			return err
-		}
-		defer closer()
-		ctx := lcli.ReqContext(cctx)
-		var miners []address.Address
-		if cctx.NArg() == 0 {
-			miners, err = api.StateListMiners(ctx, types.EmptyTSK)
-			if err != nil {
-				return err
-			}
-			powCache := make(map[address.Address]types.BigInt)
-			var lk sync.Mutex
-			parmap.Par(32, miners, func(a address.Address) {
-				pow, err := api.StateMinerPower(ctx, a, types.EmptyTSK)
-
-				lk.Lock()
-				if err == nil {
-					powCache[a] = pow.MinerPower.QualityAdjPower
-				} else {
-					powCache[a] = types.NewInt(0)
-				}
-				lk.Unlock()
-			})
-			sort.Slice(miners, func(i, j int) bool {
-				return powCache[miners[i]].GreaterThan(powCache[miners[j]])
-			})
-			n := sort.Search(len(miners), func(i int) bool {
-				pow := powCache[miners[i]]
-				log.Infof("pow @%d = %s", i, pow)
-				return pow.IsZero()
-			})
-			miners = miners[:n]
-		} else {
-			for _, mS := range cctx.Args().Slice() {
-				mA, err := address.NewFromString(mS)
-				if err != nil {
-					return xerrors.Errorf("parsing address '%s': %w", mS, err)
-				}
-				miners = append(miners, mA)
-			}
-		}
-
-		pngs := make([][]byte, len(miners))
-		for i := 0; i < len(miners); i++ {
-			func() {
-				state, err := api.StateReadState(ctx, miners[i], types.EmptyTSK)
-				if err != nil {
-					log.Errorf("getting state: %+v", err)
-					return
-				}
-				allocSString := state.State.(map[string]interface{})["AllocatedSectors"].(map[string]interface{})["/"].(string)
-
-				allocCid, err := cid.Decode(allocSString)
-				if err != nil {
-					log.Errorf("decoding cid: %+v", err)
-					return
-				}
-				rle, err := api.ChainReadObj(ctx, allocCid)
-				if err != nil {
-					log.Errorf("reading AllocatedSectors: %+v", err)
-					return
-				}
-				png, err := rleToPng(rle)
-				if err != nil {
-					log.Errorf("converting to png: %+v", err)
-					return
-				}
-				pngs[i] = png
-				encoded := base64.StdEncoding.EncodeToString(pngs[i])
-				fmt.Printf(`%s:</br><img src="data:image/png;base64,%s"></br>`+"\n", miners[i], encoded)
-				_ = os.Stdout.Sync()
-			}()
-		}
-
-		return nil
-	},
-}
-
-func rleToPng(rleBytes []byte) ([]byte, error) {
-	var bf bitfield.BitField
-	err := bf.UnmarshalCBOR(bytes.NewReader(rleBytes))
-	if err != nil {
-		return nil, xerrors.Errorf("decoding bitfield: %w", err)
-	}
-	{
-		last, err := bf.Last()
-		if err != nil {
-			return nil, xerrors.Errorf("getting last: %w", err)
-		}
-		if last == 0 {
-			return nil, nil
-		}
-	}
-	ri, err := bf.RunIterator()
-	if err != nil {
-		return nil, xerrors.Errorf("creating interator: %w", err)
-	}
-
-	const width = 1024
-	const skipTh = 64
-	const skipSize = 32
-
-	var size uint64
-	for ri.HasNext() {
-		run, err := ri.NextRun()
-		if err != nil {
-			return nil, xerrors.Errorf("getting next run: %w", err)
-		}
-		if run.Len > skipTh*width {
-			size += run.Len%(2*width) + skipSize*width
-		} else {
-			size += run.Len
-		}
-	}
-
-	img := image.NewRGBA(image.Rect(0, 0, width, int((size+width-1)/width)))
-	for i := range img.Pix {
-		img.Pix[i] = 255
-	}
-
-	ri, err = bf.RunIterator()
-	if err != nil {
-		return nil, xerrors.Errorf("creating interator: %w", err)
-	}
-
-	const shade = 15
-	idx := uint64(0)
-	realIdx := uint64(0)
-	for ri.HasNext() {
-		run, err := ri.NextRun()
-		if err != nil {
-			return nil, xerrors.Errorf("getting next run: %w", err)
-		}
-		var cut = false
-		var oldLen uint64
-		if run.Len > skipTh*width {
-			oldLen = run.Len
-			run.Len = run.Len%(2*width) + skipSize*width
-			cut = true
-		}
-		for i := uint64(0); i < run.Len; i++ {
-			col := color.Gray{0}
-			stripe := (realIdx+i)/width%256 >= 128
-			if cut && i > skipSize*width/2 {
-				stripe = (realIdx+i+(skipSize/2*width))/width%256 >= 128
-			}
-			if !run.Val {
-				col.Y = 255
-				if stripe {
-					col.Y -= shade
-				}
-			} else if stripe {
-				col.Y += shade
-			}
-			img.Set(int((idx+i)%width), int((idx+i)/width), col)
-		}
-		if cut {
-			i := (idx + run.Len/2 + width) &^ (width - 1)
-			iend := i + width
-			col := color.RGBA{255, 0, 0, 255}
-			for ; i < iend; i++ {
-				img.Set(int(i)%width, int(i)/width, col)
-			}
-			realIdx += oldLen
-			idx += run.Len
-		} else {
-			realIdx += run.Len
-			idx += run.Len
-		}
-	}
-	buf := &bytes.Buffer{}
-	err = png.Encode(buf, img)
-	if err != nil {
-		return nil, xerrors.Errorf("encoding png: %w", err)
-	}
-
-	return buf.Bytes(), nil
-}

cmd/lotus-shed/splitstore.go

@@ -1,407 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"context"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"runtime"
-
-	"github.com/dgraph-io/badger/v2"
-	"github.com/urfave/cli/v2"
-	"go.uber.org/multierr"
-	"golang.org/x/sync/errgroup"
-	"golang.org/x/xerrors"
-
-	"go.uber.org/zap"
-
-	"github.com/ipfs/go-datastore"
-	"github.com/ipfs/go-datastore/query"
-
-	lcli "github.com/filecoin-project/lotus/cli"
-	"github.com/filecoin-project/lotus/node/config"
-	"github.com/filecoin-project/lotus/node/repo"
-)
-
-var splitstoreCmd = &cli.Command{
-	Name:        "splitstore",
-	Description: "splitstore utilities",
-	Subcommands: []*cli.Command{
-		splitstoreRollbackCmd,
-		splitstoreClearCmd,
-		splitstoreCheckCmd,
-		splitstoreInfoCmd,
-	},
-}
-
-var splitstoreRollbackCmd = &cli.Command{
-	Name:        "rollback",
-	Description: "rollbacks a splitstore installation",
-	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:  "repo",
-			Value: "~/.lotus",
-		},
-		&cli.BoolFlag{
-			Name:  "gc-coldstore",
-			Usage: "compact and garbage collect the coldstore after copying the hotstore",
-		},
-		&cli.BoolFlag{
-			Name:  "rewrite-config",
-			Usage: "rewrite the lotus configuration to disable splitstore",
-		},
-	},
-	Action: func(cctx *cli.Context) error {
-		r, err := repo.NewFS(cctx.String("repo"))
-		if err != nil {
-			return xerrors.Errorf("error opening fs repo: %w", err)
-		}
-
-		exists, err := r.Exists()
-		if err != nil {
-			return err
-		}
-		if !exists {
-			return xerrors.Errorf("lotus repo doesn't exist")
-		}
-
-		lr, err := r.Lock(repo.FullNode)
-		if err != nil {
-			return xerrors.Errorf("error locking repo: %w", err)
-		}
-		defer lr.Close() //nolint:errcheck
-
-		cfg, err := lr.Config()
-		if err != nil {
-			return xerrors.Errorf("error getting config: %w", err)
-		}
-
-		fncfg, ok := cfg.(*config.FullNode)
-		if !ok {
-			return xerrors.Errorf("wrong config type: %T", cfg)
-		}
-
-		if !fncfg.Chainstore.EnableSplitstore {
-			return xerrors.Errorf("splitstore is not enabled")
-		}
-
-		fmt.Println("copying hotstore to coldstore...")
-		err = copyHotstoreToColdstore(lr, cctx.Bool("gc-coldstore"))
-		if err != nil {
-			return xerrors.Errorf("error copying hotstore to coldstore: %w", err)
-		}
-
-		fmt.Println("clearing splitstore directory...")
-		err = clearSplitstoreDir(lr)
-		if err != nil {
-			return xerrors.Errorf("error clearing splitstore directory: %w", err)
-		}
-
-		fmt.Println("deleting splitstore directory...")
-		err = deleteSplitstoreDir(lr)
-		if err != nil {
-			log.Warnf("error deleting splitstore directory: %s", err)
-		}
-
-		fmt.Println("deleting splitstore keys from metadata datastore...")
-		err = deleteSplitstoreKeys(lr)
-		if err != nil {
-			return xerrors.Errorf("error deleting splitstore keys: %w", err)
-		}
-
-		if cctx.Bool("rewrite-config") {
-			fmt.Println("disabling splitstore in config...")
-			err = lr.SetConfig(func(cfg interface{}) {
-				cfg.(*config.FullNode).Chainstore.EnableSplitstore = false
-			})
-			if err != nil {
-				return xerrors.Errorf("error disabling splitstore in config: %w", err)
-			}
-		}
-
-		fmt.Println("splitstore has been rolled back.")
-		return nil
-	},
-}
-
-var splitstoreClearCmd = &cli.Command{
-	Name:        "clear",
-	Description: "clears a splitstore installation for restart from snapshot",
-	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:  "repo",
-			Value: "~/.lotus",
-		},
-		&cli.BoolFlag{
-			Name:  "keys-only",
-			Usage: "only delete splitstore keys",
-		},
-	},
-	Action: func(cctx *cli.Context) error {
-		r, err := repo.NewFS(cctx.String("repo"))
-		if err != nil {
-			return xerrors.Errorf("error opening fs repo: %w", err)
-		}
-
-		exists, err := r.Exists()
-		if err != nil {
-			return err
-		}
-		if !exists {
-			return xerrors.Errorf("lotus repo doesn't exist")
-		}
-
-		lr, err := r.Lock(repo.FullNode)
-		if err != nil {
-			return xerrors.Errorf("error locking repo: %w", err)
-		}
-		defer lr.Close() //nolint:errcheck
-
-		cfg, err := lr.Config()
-		if err != nil {
-			return xerrors.Errorf("error getting config: %w", err)
-		}
-
-		fncfg, ok := cfg.(*config.FullNode)
-		if !ok {
-			return xerrors.Errorf("wrong config type: %T", cfg)
-		}
-
-		if !fncfg.Chainstore.EnableSplitstore {
-			return xerrors.Errorf("splitstore is not enabled")
-		}
-
-		if !cctx.Bool("keys-only") {
-			fmt.Println("clearing splitstore directory...")
-			err = clearSplitstoreDir(lr)
-			if err != nil {
-				return xerrors.Errorf("error clearing splitstore directory: %w", err)
-			}
-		}
-
-		fmt.Println("deleting splitstore keys from metadata datastore...")
-		err = deleteSplitstoreKeys(lr)
-		if err != nil {
-			return xerrors.Errorf("error deleting splitstore keys: %w", err)
-		}
-
-		return nil
-	},
-}
-
-func copyHotstoreToColdstore(lr repo.LockedRepo, gcColdstore bool) error {
-	repoPath := lr.Path()
-	dataPath := filepath.Join(repoPath, "datastore")
-	coldPath := filepath.Join(dataPath, "chain")
-	hotPath := filepath.Join(dataPath, "splitstore", "hot.badger")
-
-	blog := &badgerLogger{
-		SugaredLogger: log.Desugar().WithOptions(zap.AddCallerSkip(1)).Sugar(),
-		skip2:         log.Desugar().WithOptions(zap.AddCallerSkip(2)).Sugar(),
-	}
-
-	coldOpts, err := repo.BadgerBlockstoreOptions(repo.UniversalBlockstore, coldPath, false)
-	if err != nil {
-		return xerrors.Errorf("error getting coldstore badger options: %w", err)
-	}
-	coldOpts.SyncWrites = false
-	coldOpts.Logger = blog
-
-	hotOpts, err := repo.BadgerBlockstoreOptions(repo.HotBlockstore, hotPath, true)
-	if err != nil {
-		return xerrors.Errorf("error getting hotstore badger options: %w", err)
-	}
-	hotOpts.Logger = blog
-
-	cold, err := badger.Open(coldOpts.Options)
-	if err != nil {
-		return xerrors.Errorf("error opening coldstore: %w", err)
-	}
-	defer cold.Close() //nolint
-
-	hot, err := badger.Open(hotOpts.Options)
-	if err != nil {
-		return xerrors.Errorf("error opening hotstore: %w", err)
-	}
-	defer hot.Close() //nolint
-
-	rd, wr := io.Pipe()
-	g := new(errgroup.Group)
-
-	g.Go(func() error {
-		bwr := bufio.NewWriterSize(wr, 64<<20)
-
-		_, err := hot.Backup(bwr, 0)
-		if err != nil {
-			_ = wr.CloseWithError(err)
-			return err
-		}
-
-		err = bwr.Flush()
-		if err != nil {
-			_ = wr.CloseWithError(err)
-			return err
-		}
-
-		return wr.Close()
-	})
-
-	g.Go(func() error {
-		err := cold.Load(rd, 1024)
-		if err != nil {
-			return err
-		}
-
-		return cold.Sync()
-	})
-
-	err = g.Wait()
-	if err != nil {
-		return err
-	}
-
-	// compact + gc the coldstore if so requested
-	if gcColdstore {
-		fmt.Println("compacting coldstore...")
-		nworkers := runtime.NumCPU()
-		if nworkers < 2 {
-			nworkers = 2
-		}
-
-		err = cold.Flatten(nworkers)
-		if err != nil {
-			return xerrors.Errorf("error compacting coldstore: %w", err)
-		}
-
-		fmt.Println("garbage collecting coldstore...")
-		for err == nil {
-			err = cold.RunValueLogGC(0.0625)
-		}
-
-		if err != badger.ErrNoRewrite {
-			return xerrors.Errorf("error garbage collecting coldstore: %w", err)
-		}
-	}
-
-	return nil
-}
-
-func deleteSplitstoreDir(lr repo.LockedRepo) error {
-	path, err := lr.SplitstorePath()
-	if err != nil {
-		return xerrors.Errorf("error getting splitstore path: %w", err)
-	}
-
-	return os.RemoveAll(path)
-}
-
-func clearSplitstoreDir(lr repo.LockedRepo) error {
-	path, err := lr.SplitstorePath()
-	if err != nil {
-		return xerrors.Errorf("error getting splitstore path: %w", err)
-	}
-
-	entries, err := os.ReadDir(path)
-	if err != nil {
-		return xerrors.Errorf("error reading splitstore directory %s: %W", path, err)
-	}
-
-	var result error
-	for _, e := range entries {
-		target := filepath.Join(path, e.Name())
-		err = os.RemoveAll(target)
-		if err != nil {
-			log.Errorf("error removing %s: %s", target, err)
-			result = multierr.Append(result, err)
-		}
-	}
-
-	return result
-}
-
-func deleteSplitstoreKeys(lr repo.LockedRepo) error {
-	ds, err := lr.Datastore(context.TODO(), "/metadata")
-	if err != nil {
-		return xerrors.Errorf("error opening datastore: %w", err)
-	}
-	if closer, ok := ds.(io.Closer); ok {
-		defer closer.Close() //nolint
-	}
-
-	var keys []datastore.Key
-	res, err := ds.Query(query.Query{Prefix: "/splitstore"})
-	if err != nil {
-		return xerrors.Errorf("error querying datastore for splitstore keys: %w", err)
-	}
-
-	for r := range res.Next() {
-		if r.Error != nil {
-			return xerrors.Errorf("datastore query error: %w", r.Error)
-		}
-
-		keys = append(keys, datastore.NewKey(r.Key))
-	}
-
-	for _, k := range keys {
-		fmt.Printf("deleting %s from datastore...\n", k)
-		err = ds.Delete(k)
-		if err != nil {
-			return xerrors.Errorf("error deleting key %s from datastore: %w", k, err)
-		}
-	}
-
-	return nil
-}
-
-// badger logging through go-log
-type badgerLogger struct {
-	*zap.SugaredLogger
-	skip2 *zap.SugaredLogger
-}
-
-func (b *badgerLogger) Warningf(format string, args ...interface{}) {}
-func (b *badgerLogger) Infof(format string, args ...interface{})    {}
-func (b *badgerLogger) Debugf(format string, args ...interface{})   {}
-
-var splitstoreCheckCmd = &cli.Command{
-	Name:        "check",
-	Description: "runs a healthcheck on a splitstore installation",
-	Action: func(cctx *cli.Context) error {
-		api, closer, err := lcli.GetFullNodeAPIV1(cctx)
-		if err != nil {
-			return err
-		}
-		defer closer()
-
-		ctx := lcli.ReqContext(cctx)
-		return api.ChainCheckBlockstore(ctx)
-	},
-}
-
-var splitstoreInfoCmd = &cli.Command{
-	Name:        "info",
-	Description: "prints some basic splitstore information",
-	Action: func(cctx *cli.Context) error {
-		api, closer, err := lcli.GetFullNodeAPIV1(cctx)
-		if err != nil {
-			return err
-		}
-		defer closer()
-
-		ctx := lcli.ReqContext(cctx)
-		info, err := api.ChainBlockstoreInfo(ctx)
-		if err != nil {
-			return err
-		}
-
-		for k, v := range info {
-			fmt.Print(k)
-			fmt.Print(": ")
-			fmt.Println(v)
-		}
-
-		return nil
-	},
-}

cmd/lotus-sim/simulation/blockbuilder/blockbuilder.go

@@ -271,7 +271,7 @@ func (bb *BlockBuilder) StateManager() *stmgr.StateManager {
 }
 
 // ActorsVersion returns the actors version for the target block.
-func (bb *BlockBuilder) ActorsVersion() (actors.Version, error) {
+func (bb *BlockBuilder) ActorsVersion() actors.Version {
 	return actors.VersionForNetwork(bb.NetworkVersion())
 }
 

cmd/lotus-sim/simulation/stages/funding_stage.go

@@ -145,10 +145,7 @@ func (fs *FundingStage) PackMessages(ctx context.Context, bb *blockbuilder.Block
 
 	store := bb.ActorStore()
 	epoch := bb.Height()
-	actorsVersion, err := bb.ActorsVersion()
-	if err != nil {
-		return err
-	}
+	actorsVersion := bb.ActorsVersion()
 
 	var accounts, multisigs int
 	defer func() {

cmd/lotus-sim/simulation/stages/provecommit_stage.go

@@ -280,11 +280,7 @@ func (stage *ProveCommitStage) packProveCommitsMiner(
 // It will drop any pre-commits that have already expired.
 func (stage *ProveCommitStage) loadMiner(ctx context.Context, bb *blockbuilder.BlockBuilder, addr address.Address) error {
 	epoch := bb.Height()
-	av, err := bb.ActorsVersion()
-	if err != nil {
-		return err
-	}
-
+	av := bb.ActorsVersion()
 	minerState, err := loadMiner(bb.ActorStore(), bb.ParentStateTree(), addr)
 	if err != nil {
 		return err
@@ -295,10 +291,7 @@ func (stage *ProveCommitStage) loadMiner(ctx context.Context, bb *blockbuilder.B
 	var total, dropped int
 	err = minerState.ForEachPrecommittedSector(func(info miner.SectorPreCommitOnChainInfo) error {
 		total++
-		msd, err := policy.GetMaxProveCommitDuration(av, info.Info.SealProof)
-		if err != nil {
-			return err
-		}
+		msd := policy.GetMaxProveCommitDuration(av, info.Info.SealProof)
 		if epoch > info.PreCommitEpoch+msd {
 			dropped++
 			return nil
@@ -334,10 +327,7 @@ func (stage *ProveCommitStage) filterProveCommits(
 	}
 
 	nextEpoch := bb.Height()
-	av, err := bb.ActorsVersion()
-	if err != nil {
-		return nil, err
-	}
+	av := bb.ActorsVersion()
 
 	good := make([]abi.SectorNumber, 0, len(snos))
 	for _, sno := range snos {
@@ -348,10 +338,7 @@ func (stage *ProveCommitStage) filterProveCommits(
 		if info == nil {
 			continue
 		}
-		msd, err := policy.GetMaxProveCommitDuration(av, info.Info.SealProof)
-		if err != nil {
-			return nil, err
-		}
+		msd := policy.GetMaxProveCommitDuration(av, info.Info.SealProof)
 		if nextEpoch > info.PreCommitEpoch+msd {
 			continue
 		}

cmd/lotus-storage-miner/actor.go

@@ -5,7 +5,6 @@ import (
 	"os"
 	"strings"
 
-	rlepluslazy "github.com/filecoin-project/go-bitfield/rle"
 	cbor "github.com/ipfs/go-ipld-cbor"
 
 	"github.com/fatih/color"
@@ -15,7 +14,6 @@ import (
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-bitfield"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/big"
 
@@ -43,7 +41,6 @@ var actorCmd = &cli.Command{
 		actorControl,
 		actorProposeChangeWorker,
 		actorConfirmChangeWorker,
-		actorCompactAllocatedCmd,
 	},
 }
 
@@ -990,154 +987,3 @@ var actorConfirmChangeWorker = &cli.Command{
 		return nil
 	},
 }
-
-var actorCompactAllocatedCmd = &cli.Command{
-	Name:  "compact-allocated",
-	Usage: "compact allocated sectors bitfield",
-	Flags: []cli.Flag{
-		&cli.Uint64Flag{
-			Name:  "mask-last-offset",
-			Usage: "Mask sector IDs from 0 to 'higest_allocated - offset'",
-		},
-		&cli.Uint64Flag{
-			Name:  "mask-upto-n",
-			Usage: "Mask sector IDs from 0 to 'n'",
-		},
-		&cli.BoolFlag{
-			Name:  "really-do-it",
-			Usage: "Actually send transaction performing the action",
-			Value: false,
-		},
-	},
-	Action: func(cctx *cli.Context) error {
-		if !cctx.Bool("really-do-it") {
-			fmt.Println("Pass --really-do-it to actually execute this action")
-			return nil
-		}
-
-		if !cctx.Args().Present() {
-			return fmt.Errorf("must pass address of new owner address")
-		}
-
-		nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
-		if err != nil {
-			return err
-		}
-		defer closer()
-
-		api, acloser, err := lcli.GetFullNodeAPI(cctx)
-		if err != nil {
-			return err
-		}
-		defer acloser()
-
-		ctx := lcli.ReqContext(cctx)
-
-		maddr, err := nodeApi.ActorAddress(ctx)
-		if err != nil {
-			return err
-		}
-
-		mact, err := api.StateGetActor(ctx, maddr, types.EmptyTSK)
-		if err != nil {
-			return err
-		}
-
-		store := adt.WrapStore(ctx, cbor.NewCborStore(blockstore.NewAPIBlockstore(api)))
-
-		mst, err := miner.Load(store, mact)
-		if err != nil {
-			return err
-		}
-
-		allocs, err := mst.GetAllocatedSectors()
-		if err != nil {
-			return err
-		}
-
-		var maskBf bitfield.BitField
-
-		{
-			exclusiveFlags := []string{"mask-last-offset", "mask-upto-n"}
-			hasFlag := false
-			for _, f := range exclusiveFlags {
-				if hasFlag && cctx.IsSet(f) {
-					return xerrors.Errorf("more than one 'mask` flag set")
-				}
-				hasFlag = hasFlag || cctx.IsSet(f)
-			}
-		}
-		switch {
-		case cctx.IsSet("mask-last-offset"):
-			last, err := allocs.Last()
-			if err != nil {
-				return err
-			}
-
-			m := cctx.Uint64("mask-last-offset")
-			if last <= m+1 {
-				return xerrors.Errorf("highest allocated sector lower than mask offset %d: %d", m+1, last)
-			}
-			// securty to not brick a miner
-			if last > 1<<60 {
-				return xerrors.Errorf("very high last sector number, refusing to mask: %d", last)
-			}
-
-			maskBf, err = bitfield.NewFromIter(&rlepluslazy.RunSliceIterator{
-				Runs: []rlepluslazy.Run{{Val: true, Len: last - m}}})
-			if err != nil {
-				return xerrors.Errorf("forming bitfield: %w", err)
-			}
-		case cctx.IsSet("mask-upto-n"):
-			n := cctx.Uint64("mask-upto-n")
-			maskBf, err = bitfield.NewFromIter(&rlepluslazy.RunSliceIterator{
-				Runs: []rlepluslazy.Run{{Val: true, Len: n}}})
-			if err != nil {
-				return xerrors.Errorf("forming bitfield: %w", err)
-			}
-		default:
-			return xerrors.Errorf("no 'mask' flags set")
-		}
-
-		mi, err := api.StateMinerInfo(ctx, maddr, types.EmptyTSK)
-		if err != nil {
-			return err
-		}
-
-		params := &miner2.CompactSectorNumbersParams{
-			MaskSectorNumbers: maskBf,
-		}
-
-		sp, err := actors.SerializeParams(params)
-		if err != nil {
-			return xerrors.Errorf("serializing params: %w", err)
-		}
-
-		smsg, err := api.MpoolPushMessage(ctx, &types.Message{
-			From:   mi.Worker,
-			To:     maddr,
-			Method: miner.Methods.CompactSectorNumbers,
-			Value:  big.Zero(),
-			Params: sp,
-		}, nil)
-		if err != nil {
-			return xerrors.Errorf("mpool push: %w", err)
-		}
-
-		fmt.Println("CompactSectorNumbers Message CID:", smsg.Cid())
-
-		// wait for it to get mined into a block
-		wait, err := api.StateWaitMsg(ctx, smsg.Cid(), build.MessageConfidence)
-		if err != nil {
-			return err
-		}
-
-		// check it executed successfully
-		if wait.Receipt.ExitCode != 0 {
-			fmt.Println("Propose owner change failed!")
-			return err
-		}
-
-		return nil
-	},
-}