go fmt

dagstore: throttle calls to storage except actual unseals.

.circleci/config.yml

@@ -92,9 +92,6 @@ jobs:
       - run: sudo apt-get install npm
       - run:
           command: make buildall
-      - run:
-          name: check tag and version output match
-          command: ./scripts/version-check.sh ./lotus
       - store_artifacts:
           path: lotus
       - store_artifacts:
@@ -285,6 +282,21 @@ jobs:
           root: "."
           paths:
             - linux-butterflynet
+  build-ntwk-nerpa:
+    description: |
+      Compile lotus binaries for the nerpa network
+    parameters:
+      <<: *test-params
+    executor: << parameters.executor >>
+    steps:
+      - install-deps
+      - prepare
+      - run: make nerpanet
+      - run: mkdir linux-nerpanet && mv lotus lotus-miner lotus-worker linux-nerpanet
+      - persist_to_workspace:
+          root: "."
+          paths:
+            - linux-nerpanet
   build-lotus-soup:
     description: |
       Compile `lotus-soup` Testground test plan
@@ -318,7 +330,7 @@ jobs:
           command: pushd testplans/lotus-soup && mkdir -p $HOME/testground && cp env-ci.toml $HOME/testground/.env.toml && echo 'endpoint="https://ci.testground.ipfs.team"' >> $HOME/testground/.env.toml && echo 'user="circleci"' >> $HOME/testground/.env.toml
       - run:
           name: "prepare testground home dir and link test plans"
-          command: mkdir -p $HOME/testground/plans && ln -s $(pwd)/testplans/lotus-soup $HOME/testground/plans/lotus-soup
+          command: mkdir -p $HOME/testground/plans && ln -s $(pwd)/testplans/lotus-soup $HOME/testground/plans/lotus-soup && ln -s $(pwd)/testplans/graphsync $HOME/testground/plans/graphsync
       - run:
           name: "go get lotus@master"
           command: cd testplans/lotus-soup && go get github.com/filecoin-project/lotus@master
@@ -328,11 +340,15 @@ jobs:
       - run:
           name: "trigger payment channel stress testplan on taas"
           command: ~/testground-cli run composition -f $HOME/testground/plans/lotus-soup/_compositions/paych-stress-k8s.toml --metadata-commit=$CIRCLE_SHA1 --metadata-repo=filecoin-project/lotus --metadata-branch=$CIRCLE_BRANCH
+      - run:
+          name: "trigger graphsync testplan on taas"
+          command: ~/testground-cli run composition -f $HOME/testground/plans/graphsync/_compositions/stress-k8s.toml --metadata-commit=$CIRCLE_SHA1 --metadata-repo=filecoin-project/lotus --metadata-branch=$CIRCLE_BRANCH
+
 
   build-macos:
     description: build darwin lotus binary
     macos:
-      xcode: "12.5.0"
+      xcode: "10.0.0"
     working_directory: ~/go/src/github.com/filecoin-project/lotus
     steps:
       - prepare:
@@ -351,6 +367,11 @@ jobs:
           name: Install Rust
           command: |
             curl https://sh.rustup.rs -sSf | sh -s -- -y
+      - run:
+          name: Install jq
+          command: |
+            curl --location https://github.com/stedolan/jq/releases/download/jq-1.6/jq-osx-amd64 --output /usr/local/bin/jq
+            chmod +x /usr/local/bin/jq
       - run:
           name: Install hwloc
           command: |
@@ -367,9 +388,6 @@ jobs:
       - run:
           command: make build
           no_output_timeout: 30m
-      - run:
-          name: check tag and version output match
-          command: ./scripts/version-check.sh ./lotus
       - store_artifacts:
           path: lotus
       - store_artifacts:
@@ -705,6 +723,18 @@ jobs:
       - packer/build:
           template: tools/packer/lotus.pkr.hcl
           args: "-var ci_workspace_bins=./linux-butterflynet -var lotus_network=butterflynet -var git_tag=$CIRCLE_TAG"
+  publish-packer-nerpanet:
+    description: build and push AWS IAM and DigitalOcean droplet.
+    executor:
+      name: packer/default
+      packer-version: 1.6.6
+    steps:
+      - checkout
+      - attach_workspace:
+          at: "."
+      - 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:
@@ -780,26 +810,11 @@ workflows:
           suite: itest-deadlines
           target: "./itests/deadlines_test.go"
       
-      - test:
-          name: test-itest-deals_512mb
-          suite: itest-deals_512mb
-          target: "./itests/deals_512mb_test.go"
-      
-      - test:
-          name: test-itest-deals_anycid
-          suite: itest-deals_anycid
-          target: "./itests/deals_anycid_test.go"
-      
       - test:
           name: test-itest-deals_concurrent
           suite: itest-deals_concurrent
           target: "./itests/deals_concurrent_test.go"
       
-      - test:
-          name: test-itest-deals_max_staging_deals
-          suite: itest-deals_max_staging_deals
-          target: "./itests/deals_max_staging_deals_test.go"
-      
       - test:
           name: test-itest-deals_offline
           suite: itest-deals_offline
@@ -810,16 +825,6 @@ workflows:
           suite: itest-deals_padding
           target: "./itests/deals_padding_test.go"
       
-      - test:
-          name: test-itest-deals_partial_retrieval_dm-level
-          suite: itest-deals_partial_retrieval_dm-level
-          target: "./itests/deals_partial_retrieval_dm-level_test.go"
-      
-      - test:
-          name: test-itest-deals_partial_retrieval
-          suite: itest-deals_partial_retrieval
-          target: "./itests/deals_partial_retrieval_test.go"
-      
       - test:
           name: test-itest-deals_power
           suite: itest-deals_power
@@ -835,11 +840,6 @@ workflows:
           suite: itest-deals_publish
           target: "./itests/deals_publish_test.go"
       
-      - test:
-          name: test-itest-deals_retry_deal_no_funds
-          suite: itest-deals_retry_deal_no_funds
-          target: "./itests/deals_retry_deal_no_funds_test.go"
-      
       - test:
           name: test-itest-deals
           suite: itest-deals
@@ -900,11 +900,6 @@ workflows:
           suite: itest-sector_terminate
           target: "./itests/sector_terminate_test.go"
       
-      - test:
-          name: test-itest-self_sent_txn
-          suite: itest-self_sent_txn
-          target: "./itests/self_sent_txn_test.go"
-      
       - test:
           name: test-itest-tape
           suite: itest-tape
@@ -955,7 +950,7 @@ workflows:
           codecov-upload: false
           suite: conformance-bleeding-edge
           target: "./conformance"
-          vectors-branch: specs-actors-v7
+          vectors-branch: master
       - trigger-testplans:
           filters:
             branches:
@@ -977,6 +972,11 @@ workflows:
             tags:
               only:
                 - /^v\d+\.\d+\.\d+(-rc\d+)?$/
+      - build-ntwk-nerpa:
+          filters:
+            tags:
+              only:
+                - /^v\d+\.\d+\.\d+(-rc\d+)?$/
       - build-lotus-soup
       - build-macos:
           filters:
@@ -986,10 +986,19 @@ workflows:
             tags:
               only:
                 - /^v\d+\.\d+\.\d+(-rc\d+)?$/
+      - build-appimage:
+          filters:
+            branches:
+              ignore:
+                - /.*/
+            tags:
+              only:
+                - /^v\d+\.\d+\.\d+(-rc\d+)?$/
       - publish:
           requires:
             - build-all
             - build-macos
+            - build-appimage
           filters:
             branches:
               ignore:
@@ -1032,6 +1041,16 @@ workflows:
             tags:
               only:
                 - /^v\d+\.\d+\.\d+(-rc\d+)?$/
+      - publish-packer-nerpanet:
+          requires:
+            - build-ntwk-nerpa
+          filters:
+            branches:
+              ignore:
+                - /.*/
+            tags:
+              only:
+                - /^v\d+\.\d+\.\d+(-rc\d+)?$/
       - publish-snapcraft:
           name: publish-snapcraft-stable
           channel: stable

.circleci/template.yml

@@ -92,9 +92,6 @@ jobs:
       - run: sudo apt-get install npm
       - run:
           command: make buildall
-      - run:
-          name: check tag and version output match
-          command: ./scripts/version-check.sh ./lotus
       - store_artifacts:
           path: lotus
       - store_artifacts:
@@ -285,6 +282,21 @@ jobs:
           root: "."
           paths:
             - linux-butterflynet
+  build-ntwk-nerpa:
+    description: |
+      Compile lotus binaries for the nerpa network
+    parameters:
+      <<: *test-params
+    executor: << parameters.executor >>
+    steps:
+      - install-deps
+      - prepare
+      - run: make nerpanet
+      - run: mkdir linux-nerpanet && mv lotus lotus-miner lotus-worker linux-nerpanet
+      - persist_to_workspace:
+          root: "."
+          paths:
+            - linux-nerpanet
   build-lotus-soup:
     description: |
       Compile `lotus-soup` Testground test plan
@@ -318,7 +330,7 @@ jobs:
           command: pushd testplans/lotus-soup && mkdir -p $HOME/testground && cp env-ci.toml $HOME/testground/.env.toml && echo 'endpoint="https://ci.testground.ipfs.team"' >> $HOME/testground/.env.toml && echo 'user="circleci"' >> $HOME/testground/.env.toml
       - run:
           name: "prepare testground home dir and link test plans"
-          command: mkdir -p $HOME/testground/plans && ln -s $(pwd)/testplans/lotus-soup $HOME/testground/plans/lotus-soup
+          command: mkdir -p $HOME/testground/plans && ln -s $(pwd)/testplans/lotus-soup $HOME/testground/plans/lotus-soup && ln -s $(pwd)/testplans/graphsync $HOME/testground/plans/graphsync
       - run:
           name: "go get lotus@master"
           command: cd testplans/lotus-soup && go get github.com/filecoin-project/lotus@master
@@ -328,11 +340,15 @@ jobs:
       - run:
           name: "trigger payment channel stress testplan on taas"
           command: ~/testground-cli run composition -f $HOME/testground/plans/lotus-soup/_compositions/paych-stress-k8s.toml --metadata-commit=$CIRCLE_SHA1 --metadata-repo=filecoin-project/lotus --metadata-branch=$CIRCLE_BRANCH
+      - run:
+          name: "trigger graphsync testplan on taas"
+          command: ~/testground-cli run composition -f $HOME/testground/plans/graphsync/_compositions/stress-k8s.toml --metadata-commit=$CIRCLE_SHA1 --metadata-repo=filecoin-project/lotus --metadata-branch=$CIRCLE_BRANCH
+
 
   build-macos:
     description: build darwin lotus binary
     macos:
-      xcode: "12.5.0"
+      xcode: "10.0.0"
     working_directory: ~/go/src/github.com/filecoin-project/lotus
     steps:
       - prepare:
@@ -351,6 +367,11 @@ jobs:
           name: Install Rust
           command: |
             curl https://sh.rustup.rs -sSf | sh -s -- -y
+      - run:
+          name: Install jq
+          command: |
+            curl --location https://github.com/stedolan/jq/releases/download/jq-1.6/jq-osx-amd64 --output /usr/local/bin/jq
+            chmod +x /usr/local/bin/jq
       - run:
           name: Install hwloc
           command: |
@@ -367,9 +388,6 @@ jobs:
       - run:
           command: make build
           no_output_timeout: 30m
-      - run:
-          name: check tag and version output match
-          command: ./scripts/version-check.sh ./lotus
       - store_artifacts:
           path: lotus
       - store_artifacts:
@@ -705,6 +723,18 @@ jobs:
       - packer/build:
           template: tools/packer/lotus.pkr.hcl
           args: "-var ci_workspace_bins=./linux-butterflynet -var lotus_network=butterflynet -var git_tag=$CIRCLE_TAG"
+  publish-packer-nerpanet:
+    description: build and push AWS IAM and DigitalOcean droplet.
+    executor:
+      name: packer/default
+      packer-version: 1.6.6
+    steps:
+      - checkout
+      - attach_workspace:
+          at: "."
+      - 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:
@@ -785,7 +815,7 @@ workflows:
           codecov-upload: false
           suite: conformance-bleeding-edge
           target: "./conformance"
-          vectors-branch: specs-actors-v7
+          vectors-branch: master
       - trigger-testplans:
           filters:
             branches:
@@ -807,6 +837,11 @@ workflows:
             tags:
               only:
                 - /^v\d+\.\d+\.\d+(-rc\d+)?$/
+      - build-ntwk-nerpa:
+          filters:
+            tags:
+              only:
+                - /^v\d+\.\d+\.\d+(-rc\d+)?$/
       - build-lotus-soup
       - build-macos:
           filters:
@@ -816,10 +851,19 @@ workflows:
             tags:
               only:
                 - /^v\d+\.\d+\.\d+(-rc\d+)?$/
+      - build-appimage:
+          filters:
+            branches:
+              ignore:
+                - /.*/
+            tags:
+              only:
+                - /^v\d+\.\d+\.\d+(-rc\d+)?$/
       - publish:
           requires:
             - build-all
             - build-macos
+            - build-appimage
           filters:
             branches:
               ignore:
@@ -862,6 +906,16 @@ workflows:
             tags:
               only:
                 - /^v\d+\.\d+\.\d+(-rc\d+)?$/
+      - publish-packer-nerpanet:
+          requires:
+            - build-ntwk-nerpa
+          filters:
+            branches:
+              ignore:
+                - /.*/
+            tags:
+              only:
+                - /^v\d+\.\d+\.\d+(-rc\d+)?$/
       - publish-snapcraft:
           name: publish-snapcraft-stable
           channel: stable

.codecov.yml

@@ -1,73 +1,19 @@
+comment: off
 ignore:
-  # Auto generated
-  - "^.*_gen.go$"
-  - "^.*/mock_full.go$"
-  # Old actors.
-  - "^chain/actors/builtin/[^/]*/(message|state|v)[0-4]\\.go$" # We test the latest version only.
-  # Tests
-  - "api/test/**"
-  - "conformance/**"
-  # Generators
-  - "gen/**"
-  - "chain/actors/agen/**"
-  # Non-critical utilities
-  - "api/docgen/**"
-  - "api/docgen-openrpc/**"
-coverage:
-  status:
-    patch: off
-    project:
-      tools-and-tests:
-        target: auto
-        threshold: 1%
-        informational: true
-        paths:
-          - "testplans"
-          - "tools"
-          - "system"
-          - "snap"
-          - "lotuspond"
-          - "conformance"
-          - "scripts"
-          - "gen"
-          - "build"
-      markets: 
-        target: auto
-        threshold: 1%
-        informational: false        
-        paths: 
-          - "markets"
-          - "paychmgr"
-      miner: 
-        target: auto
-        threshold: 1.5%
-        informational: false       
-        paths: 
-          - "miner"
-          - "storage"
-      chain:
-        target: auto
-        threshold: 1%
-        informational: false
-        paths:
-          - "chain"
-      node:
-        target: auto
-        threshold: 1%
-        informational: false
-        paths: 
-          - "node"
-          - "blockstore"
-          - "metrics"
-          - "lib"
-          - "genesis"
-          - "gateway"
-          - "api"
-          - "journal"
-      cli: 
-        target: auto
-        threshold: 1%
-        informational: true
-        paths: 
-          - "cli"
-          - "cmd"
+  - "**/cbor_gen.go"
+  - "api/test/**/*"
+  - "api/test/*"
+  - "gen/**/*"
+  - "gen/*"
+  - "cmd/lotus-shed/*"
+  - "cmd/tvx/*"
+  - "cmd/lotus-pcr/*"
+  - "cmd/tvx/*"
+  - "cmd/lotus-chainwatch/*"
+  - "cmd/lotus-health/*"
+  - "cmd/lotus-fountain/*"
+  - "cmd/lotus-townhall/*"
+  - "cmd/lotus-stats/*"
+  - "cmd/lotus-pcr/*"
+github_checks:
+  annotations: false

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -21,45 +21,35 @@ body:
         required: true
       - label: I did not make any code changes to lotus.
         required: false
-- type: checkboxes
+- 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:
-      - label: lotus daemon - chain sync
-        required: false
-      - label: lotus miner - mining and block production
-        required: false
-      - label: lotus miner/worker - sealing
-        required: false
-      - label: lotus miner - proving(WindowPoSt)
-        required: false
-      - label: lotus miner/market - storage deal
-        required: false
-      - label: lotus miner/market - retrieval deal
-        required: false
-      - label: lotus miner/market - data transfer
-        required: false
-      - label: lotus client
-        required: false
-      - label: lotus JSON-RPC API
-        required: false
-      - label: lotus message management (mpool)
-        required: false
-      - label:  Other
-        required: false
+    - 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
-    render: text
     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:
-    required: true
+    reuiqred: true
 - type: textarea
   id: Description
   attributes:
@@ -72,18 +62,19 @@ body:
       * 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
-    render: text
     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
@@ -96,5 +87,6 @@ body:
       2. Do '...'
       3. See error '...'
       ...
+    render: bash
   validations:
-    required: false
+    required: false

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -15,33 +15,24 @@ body:
         required: true
       - label: I **have** a specific, actionable, and well motivated improvement to propose.
         required: true
-- type: checkboxes
+- type: dropdown 
+  id: component
+  validations:
+    required: true
   attributes:
     label: Lotus component
-    description: Please select the lotus component you are filing an improvement request for
+    description: Please select the lotus component you are propoing improvement for
     options:
-      - label: lotus daemon - chain sync
-        required: false
-      - label: lotus miner - mining and block production
-        required: false
-      - label: lotus miner/worker - sealing
-        required: false
-      - label: lotus miner - proving(WindowPoSt)
-        required: false
-      - label: lotus miner/market - storage deal
-        required: false
-      - label: lotus miner/market - retrieval deal
-        required: false
-      - label: lotus miner/market - data transfer
-        required: false
-      - label: lotus client
-        required: false
-      - label: lotus JSON-RPC API
-        required: false
-      - label: lotus message management (mpool)
-        required: false
-      - label:  Other
-        required: false
+      - 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:

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -13,33 +13,24 @@ body:
         required: true
       - label: I **have** a specific, actionable, and well motivated feature request to propose.
         required: true
-- type: checkboxes
+- type: dropdown 
+  id: component
+  validations:
+    required: true
   attributes:
     label: Lotus component
-    description: Please select the lotus component you are filing a new feature request for
+    description: Please select the lotus component you are requesting a new feature for
     options:
-      - label: lotus daemon - chain sync
-        required: false
-      - label: lotus miner - mining and block production
-        required: false
-      - label: lotus miner/worker - sealing
-        required: false
-      - label: lotus miner - proving(WindowPoSt)
-        required: false
-      - label: lotus miner/market - storage deal
-        required: false
-      - label: lotus miner/market - retrieval deal
-        required: false
-      - label: lotus miner/market - data transfer
-        required: false
-      - label: lotus client
-        required: false
-      - label: lotus JSON-RPC API
-        required: false
-      - label: lotus message management (mpool)
-        required: false
-      - label:  Other
-        required: false
+      - 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:

.github/ISSUE_TEMPLATE/m1_bug_report_deal.yml

@@ -0,0 +1,91 @@
+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

@@ -0,0 +1,81 @@
+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/pull_request_template.md

@@ -1,21 +0,0 @@
-## Related Issues
-<!-- link all issues that this PR might resolve/fix. If an issue doesn't exist, include a brief motivation for the change being made.-->
-
-## Proposed Changes
-<!-- provide a clear list of the changes being made-->
-
-
-## Additional Info
-<!-- callouts, links to documentation, and etc-->
-
-## Checklist
-
-Before you mark the PR ready for review, please make sure that:
-- [ ] All commits have a clear commit message.
-- [ ] The PR title is in the form of of `<PR type>: <area>: <change being made>`
-    - example: ` fix: mempool: Introduce a cache for valid signatures`
-    - `PR type`: _fix_, _feat_, _INTERFACE BREAKING CHANGE_, _CONSENSUS BREAKING_, _build_, _chore_, _ci_, _docs_,_perf_, _refactor_, _revert_, _style_, _test_
-    - `area`: _api_, _chain_, _state_, _vm_, _data transfer_, _market_, _mempool_, _message_, _block production_, _multisig_, _networking_, _paychan_, _proving_, _sealing_, _wallet_, _deps_
-- [ ] This PR has tests for new functionality or change in behaviour
-- [ ] If new user-facing features are introduced, clear usage guidelines and / or documentation updates should be included in https://lotus.filecoin.io or [Discussion Tutorials.](https://github.com/filecoin-project/lotus/discussions/categories/tutorials)
-- [ ] CI is green

.github/workflows/stale.yml

@@ -29,5 +29,5 @@ jobs:
         days-before-pr-close: 2
         remove-stale-when-updated: true
         enable-statistics: true
-
+       
 

.github/workflows/sync-master-main.yaml

@@ -1,14 +0,0 @@
-name: sync-master-main
-on:
-  push:
-    branches:
-      - master
-jobs:
-  sync:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: update remote branch main
-        run: |
-          # overrides the remote branch (origin:github) `main`
-          git push origin --force master:main

CHANGELOG.md

@@ -1,789 +1,184 @@
 # Lotus changelog
 
-# v1.13.2 /  2022-01-09
+# 1.11.1-rc1 / 2021-07-27
 
-Lotus v1.13.2 is a *highly recommended* feature release with remarkable retrieval improvements, new features like 
-worker management, schedule enhancements and so on. 
+This is the first release candidate for the **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. A more organized and detailed release note will be shared in the next few days with future RCs, highlights are:
+- [lotus-miner market subsystem](https://docs.filecoin.io/mine/lotus/split-markets-miners/#frontmatter-title)
+- [splistore](https://github.com/filecoin-project/lotus/blob/master/blockstore/splitstore/README.md)
 
-## Highlights
-- 🚀🚀🚀Improve retrieval deal experience
-  - Testing result with MinerX.3 shows the retrieval deal success rate has increased dramatically with faster transfer 
-    speed, you can join or follow along furthur performance testings [here](https://github.com/filecoin-project/lotus/discussions/7874). We recommend application developers to integrate with the new 
-    retrieval APIs to provide a better client experience.
-  - 🌟🌟🌟 Reduce retrieval Time-To-First-Byte over 100x ([#7693](https://github.com/filecoin-project/lotus/pull/7693))
-    - This change makes most free, small retrievals sub-second
-  - 🌟🌟🌟 Partial retrieval ux improvements ([#7610](https://github.com/filecoin-project/lotus/pull/7610))
-    - New retrieval commands for clients:
-      - `lotus client ls`: retrieve and list desired object links
-      - `lotus client cat`: retrieve and print the data from the network
-    - 🌟🌟 The monolith `ClientRetrieve` method was broken into:
-      - `ClientRetrieve` which retrieves data into the local repo (or into an IPFS node if ipfs integration is enabled)
-      - `ClientRetrieveWait` which will wait for the retrieval to complete
-      - `ClientExport` which will export data from the local node
-      - Note: this change only applies to v1 API. v0 API remains unchanged.
-    - 🌟 Support for full ipld selectors was added (for example making it possible to only retrieve list of directories in a deal, without fetching any file data)
-      - To learn more, see [here](https://github.com/filecoin-project/lotus/blob/0523c946f984b22b3f5de8cc3003cc791389527e/api/types.go#L230-L264)
-- 🚀🚀 Sealing scheduler enhancements ([#7703](https://github.com/filecoin-project/lotus/pull/7703),
-  [#7269](https://github.com/filecoin-project/lotus/pull/7269)), [#7714](https://github.com/filecoin-project/lotus/pull/7714)
-  - Workers are now aware of cgroup memory limits
-  - Multiple tasks which use a GPU can be scheduled on a single worker
-  - Workers can override default resource table through env vars
-    - Default value list: https://gist.github.com/magik6k/c0e1c7cd73c1241a9acabc30bf469a43
-- 🚀🚀 Sector storage groups ([#7453](https://github.com/filecoin-project/lotus/pull/7453))
-  - Storage groups allow for better control of data flow between workers, for example, it makes it possible to define that data from PC1 on a given worker has to have it's PC2 step executed on the same worker
-  - To set it up, follow the instructions under the `Sector Storage Group` section [here](https://lotus.filecoin.io/docs/storage-providers/seal-workers/#lotus-worker-co-location)
-
-## New Features
-- Add RLE dump code ([#7691](https://github.com/filecoin-project/lotus/pull/7691))
-- Shed: Add a util to list miner faults ([#7605](https://github.com/filecoin-project/lotus/pull/7605))
-- lotus-shed msg: Decode submessages/msig proposals ([#7639](https://github.com/filecoin-project/lotus/pull/7639))
-- CLI: Add a lotus multisig cancel command ([#7645](https://github.com/filecoin-project/lotus/pull/7645))
-- shed: simple wallet balancer util ([#7414](https://github.com/filecoin-project/lotus/pull/7414))
-  - balancing token balance between multiple accounts
-
-## Improvements
-- Add verbose mode to `lotus-miner pieces list-cids` ([#7699](https://github.com/filecoin-project/lotus/pull/7699))
-- retrieval: Only output matching nodes, MatchPath dagspec ([#7706](https://github.com/filecoin-project/lotus/pull/7706))
-- Cleanup partial retrieval codepaths ( zero functional changes ) ([#7688](https://github.com/filecoin-project/lotus/pull/7688))
-- storage: Use 1M buffers for Tar transfers ([#7681](https://github.com/filecoin-project/lotus/pull/7681))
-- Chore/dm level tests plus merkle proof cars ([#7673](https://github.com/filecoin-project/lotus/pull/7673))
-- Shed: Add a util to create miners more easily ([#7595](https://github.com/filecoin-project/lotus/pull/7595))
-- add timeout flag to wait-api command ([#7592](https://github.com/filecoin-project/lotus/pull/7592))
-- add log for restart windows post scheduler ([#7613](https://github.com/filecoin-project/lotus/pull/7613))
-- remove jaeger envvars ([#7631](https://github.com/filecoin-project/lotus/pull/7631))
-- remove api and jaeger env from docker file ([#7624](https://github.com/filecoin-project/lotus/pull/7624))
-- Wdpost worker: Reduce challenge confidence to 1 epoch ([#7572](https://github.com/filecoin-project/lotus/pull/7572))
-- add additional methods to lotus gateway ([#7644](https://github.com/filecoin-project/lotus/pull/7644))
-- Add caches to lotus-stats and splitcode ([#7329](https://github.com/filecoin-project/lotus/pull/7329))
-- remote store: Remove debug printf ([#7664](https://github.com/filecoin-project/lotus/pull/7664))
-- docsgen-cli: Handle commands with no description correctly ([#7659](https://github.com/filecoin-project/lotus/pull/7659))
-
-## Bug Fixes
-- fix docker logic error ([#7709](https://github.com/filecoin-project/lotus/pull/7709))
-- add missing NodeType tag ([#7559](https://github.com/filecoin-project/lotus/pull/7559))
-- checkCommit should return SectorCommitFailed ([#7555](https://github.com/filecoin-project/lotus/pull/7555))
-- ffiwrapper: Validate PC2 by calling C1 with random seeds ([#7710](https://github.com/filecoin-project/lotus/pull/7710))
-
-## Dependency Updates
-- Update go-graphsync v0.10.6 ([#7708](https://github.com/filecoin-project/lotus/pull/7708))
-- update go-libp2p-pubsub to v0.5.6 ([#7581](https://github.com/filecoin-project/lotus/pull/7581))
-- Update go-state-types ([#7591](https://github.com/filecoin-project/lotus/pull/7591))
-- disable mplex stream muxer ([#7689](https://github.com/filecoin-project/lotus/pull/7689))
-- Bump ws from 5.2.2 to 5.2.3 in /lotuspond/front ([#7660](https://github.com/filecoin-project/lotus/pull/7660))
-- Bump color-string from 1.5.3 to 1.6.0 in /lotuspond/front ([#7658](https://github.com/filecoin-project/lotus/pull/7658))
-- Bump postcss from 7.0.17 to 7.0.39 in /lotuspond/front ([#7657](https://github.com/filecoin-project/lotus/pull/7657))
-- Bump path-parse from 1.0.6 to 1.0.7 in /lotuspond/front ([#7656](https://github.com/filecoin-project/lotus/pull/7656))
-- Bump tmpl from 1.0.4 to 1.0.5 in /lotuspond/front ([#7655](https://github.com/filecoin-project/lotus/pull/7655))
-- Bump url-parse from 1.4.7 to 1.5.3 in /lotuspond/front ([#7654](https://github.com/filecoin-project/lotus/pull/7654))
-- github.com/filecoin-project/go-state-types (v0.1.1-0.20210915140513-d354ccf10379 -> v0.1.1):
-
-## Others
-- Update archive script ([#7690](https://github.com/filecoin-project/lotus/pull/7690))
-
-## Contributors
-
-| Contributor | Commits | Lines ± | Files Changed |
-|-------------|---------|---------|---------------|
-| @magik6k | 89 | +5200/-1818 | 232 |
-| Travis Person | 5 | +1473/-953 | 38 |
-| @arajasek | 6 | +550/-38 | 19 |
-| @clinta | 4 | +393/-123 | 26 |
-| @ribasushi | 3 | +334/-68 | 7 |
-| @jennijuju| 13 | +197/-120 | 67 |
-| @Kubuxu | 10 | +153/-30 | 10 |
-| @coryschwartz | 6 | +18/-26 | 6 |
-| Marten Seemann | 2 | +6/-34 | 5 |
-| @vyzo | 1 | +3/-3 | 2 |
-| @hannahhoward | 1 | +3/-3 | 2 |
-| @zenground0 | 2 | +2/-2 | 2 |
-| @yaohcn | 2 | +2/-2 | 2 |
-| @jennijuju | 1 | +1/-1 | 1 |
-| @hunjixin | 1 | +1/-0 | 1 |
-
-    
-
-# v1.13.1 / 2021-11-26
-
-This is an optional Lotus v1.13.1 release.
-
-## New Features
-- Shed: Add a util to find miner based on peerid ([filecoin-project/lotus#7544](https://github.com/filecoin-project/lotus/pull/7544))
-- Collect and expose graphsync metrics  ([filecoin-project/lotus#7542](https://github.com/filecoin-project/lotus/pull/7542))
-- Shed: Add a util to find the most recent null tipset ([filecoin-project/lotus#7456](https://github.com/filecoin-project/lotus/pull/7456))
-
-## Improvements
-- Show prepared tasks in sealing jobs ([filecoin-project/lotus#7527](https://github.com/filecoin-project/lotus/pull/7527))
-- To make Deep happy ([filecoin-project/lotus#7546](https://github.com/filecoin-project/lotus/pull/7546))
-- Expose per-state sector counts on the prometheus endpoint ([filecoin-project/lotus#7541](https://github.com/filecoin-project/lotus/pull/7541))
-- Add storage-id flag to proving check ([filecoin-project/lotus#7479](https://github.com/filecoin-project/lotus/pull/7479))
-- FilecoinEC: Improve a log message ([filecoin-project/lotus#7499](https://github.com/filecoin-project/lotus/pull/7499))
-- itests: retry deal when control addr is out of funds ([filecoin-project/lotus#7454](https://github.com/filecoin-project/lotus/pull/7454))
-- Normlize selector use within lotus ([filecoin-project/lotus#7467](https://github.com/filecoin-project/lotus/pull/7467))
-- sealing: Improve scheduling of ready work ([filecoin-project/lotus#7335](https://github.com/filecoin-project/lotus/pull/7335))
-- Remove dead example code + dep ([filecoin-project/lotus#7466](https://github.com/filecoin-project/lotus/pull/7466))
-
-## Bug Fixes
-- fix  the withdrawn amount unit ([filecoin-project/lotus#7563](https://github.com/filecoin-project/lotus/pull/7563))
-- rename vm#make{=>Account}Actor(). ([filecoin-project/lotus#7562](https://github.com/filecoin-project/lotus/pull/7562))
-- Fix used sector space accounting after AddPieceFailed ([filecoin-project/lotus#7530](https://github.com/filecoin-project/lotus/pull/7530))
-- Don't remove sector data when moving data into a shared path ([filecoin-project/lotus#7494](https://github.com/filecoin-project/lotus/pull/7494))
-- fix: support node instantiation in external packages ([filecoin-project/lotus#7511](https://github.com/filecoin-project/lotus/pull/7511))
-- Stop adding Jennifer's $HOME to lotus docs ([filecoin-project/lotus#7477](https://github.com/filecoin-project/lotus/pull/7477))
-- Bugfix: Use correct startup network versions ([filecoin-project/lotus#7486](https://github.com/filecoin-project/lotus/pull/7486))
-- Dep upgrade pass ([filecoin-project/lotus#7478](https://github.com/filecoin-project/lotus/pull/7478))
-- Remove obsolete GS testplan - it now lives in go-graphsync ([filecoin-project/lotus#7469](https://github.com/filecoin-project/lotus/pull/7469))
-- sealing: Recover sectors after failed AddPiece ([filecoin-project/lotus#7444](https://github.com/filecoin-project/lotus/pull/7444))
-
-## Dependency Updates
-- Update go-graphsync v0.10.1 ([filecoin-project/lotus#7457](https://github.com/filecoin-project/lotus/pull/7457))
-- update to proof v10.1.0 ([filecoin-project/lotus#7564](https://github.com/filecoin-project/lotus/pull/7564))
-- github.com/filecoin-project/specs-actors/v6 (v6.0.0 -> v6.0.1):
-- github.com/filecoin-project/go-jsonrpc (v0.1.4-0.20210217175800-45ea43ac2bec -> v0.1.5):
-- github.com/filecoin-project/go-fil-markets (v1.13.1 -> v1.13.3):
-- github.com/filecoin-project/go-data-transfer (v1.11.1 -> v1.11.4):
-- github.com/filecoin-project/go-crypto (v0.0.0-20191218222705-effae4ea9f03 -> v0.0.1):
-- github.com/filecoin-project/go-commp-utils (v0.1.1-0.20210427191551-70bf140d31c7 -> v0.1.2):
-- github.com/filecoin-project/go-cbor-util (v0.0.0-20191219014500-08c40a1e63a2 -> v0.0.1):
-- github.com/filecoin-project/go-address (v0.0.5 -> v0.0.6):
-- unpin the yamux dependency ([filecoin-project/lotus#7532](https://github.com/filecoin-project/lotus/pull/7532)
-- peerstore@v0.2.9 was withdrawn, let's not depend on it directly ([filecoin-project/lotus#7481](https://github.com/filecoin-project/lotus/pull/7481))
-- chore(deps): use tagged github.com/ipld/go-ipld-selector-text-lite ([filecoin-project/lotus#7464](https://github.com/filecoin-project/lotus/pull/7464))
-- Stop indirectly depending on deprecated github.com/prometheus/common ([filecoin-project/lotus#7473](https://github.com/filecoin-project/lotus/pull/7473))
-
-## Others
-- fix the changelog ([filecoin-project/lotus#7594](https://github.com/filecoin-project/lotus/pull/7594))
-- v1.13.1-rc2 prep ([filecoin-project/lotus#7593](https://github.com/filecoin-project/lotus/pull/7593))
-- lotus v1.13.1-rc1 ([filecoin-project/lotus#7569](https://github.com/filecoin-project/lotus/pull/7569))
-- misc: back-port v1.13.0 back to master ([filecoin-project/lotus#7537](https://github.com/filecoin-project/lotus/pull/7537))
-- Inline codegen ([filecoin-project/lotus#7495](https://github.com/filecoin-project/lotus/pull/7495))
-- releases -> master ([filecoin-project/lotus#7507](https://github.com/filecoin-project/lotus/pull/7507))
-- Make chocolate back to master ([filecoin-project/lotus#7493](https://github.com/filecoin-project/lotus/pull/7493))
-- restore filters for the build-macos job ([filecoin-project/lotus#7455](https://github.com/filecoin-project/lotus/pull/7455))
-- bump master to v1.13.1-dev ([filecoin-project/lotus#7451](https://github.com/filecoin-project/lotus/pull/7451))
-
-Contributors
-
-| Contributor | Commits | Lines ± | Files Changed |
-|-------------|---------|---------|---------------|
-| @magik6k | 27 | +1285/-531 | 76 |
-| @ribasushi | 7 | +265/-1635 | 21 |
-| @raulk | 2 | +2/-737 | 13 |
-| @nonsens | 4 | +391/-21 | 19 |
-| @arajasek | 6 | +216/-23 | 14 |
-| @jennijuju| 8 | +102/-37 | 29 |
-| Steven Allen | 2 | +77/-29 | 6 |
-| @jennijuju | 4 | +19/-18 | 11 |
-| @dirkmc | 2 | +9/-9 | 4 |
-| @@coryschwartz | 1 | +16/-2 | 2 |
-| @frrist | 1 | +12/-0 | 2 |
-| @Kubuxu | 5 | +5/-5 | 5 |
-| @hunjixin | 2 | +6/-3 | 2 |
-| @vyzo | 1 | +3/-3 | 2 |
-| @@rvagg | 1 | +3/-3 | 2 |
-| @hannahhoward | 1 | +3/-2 | 2 |
-| Marten Seemann | 1 | +3/-0 | 1 |
-| @ZenGround0 | 1 | +1/-1 | 1 |
- 
-
-# v1.13.0 / 2021-10-18
-
-Lotus v1.13.0 is a *highly recommended* feature release for all lotus users(i.e: storage providers, data brokers, application developers and so on) that supports the upcoming 
-[Network v14 Chocolate upgrade](https://github.com/filecoin-project/lotus/discussions/7431).
-This feature release includes the latest functionalities and improvements, like data transfer rate-limiting for both storage and retrieval deals, proof v10 with CUDA support, etc. You can find more details in the Changelog below.
-
-## Highlights
-- Enable separate storage and retrieval transfer limits ([filecoin-project/lotus#7405](https://github.com/filecoin-project/lotus/pull/7405))
-    - `SimultaneousTransfer` is now replaced by `SimultaneousTransfersForStorage` and `SimultaneousTransfersForRetrieval`, where users may set the amount of ongoing data transfer for storage and retrieval deals in parallel separately. The default value for both is set to 20. 
-    - If you are using the lotus client, these two configuration variables are under the `Client` section in `./lotus/config.toml`.
-    - If you are a service provider, these two configuration variables should be set under the `Dealmaking` section in `/.lotusminer/config.toml`.
-- Update proofs to v10.0.0 ([filecoin-project/lotus#7420](https://github.com/filecoin-project/lotus/pull/7420))
-    - This version supports CUDA. To enable CUDA instead of openCL, build lotus with `FFI_USE_CUDA=1 FFI_BUILD_FROM_SOURCE=1 ...`.
-    - You can find additional Nvidia driver installation instructions written by MinerX fellows [here](https://github.com/filecoin-project/lotus/discussions/7443#discussioncomment-1425274) and perf improvements result on PC2/C2/WindowPoSt computation on different profiles [here](https://github.com/filecoin-project/lotus/discussions/7443), most people observe a 30-50% decrease in computation time.
-
-## New Features
-- Feat/datamodel selector retrieval ([filecoin-project/lotus#6393](https://github.com/filecoin-project/lotus/pull/66393393))
-    - This introduces a new RetrievalOrder-struct field and a CLI option that takes a string representation as understood by [https://pkg.go.dev/github.com/ipld/go-ipld-selector-text-lite#SelectorSpecFromPath](https://pkg.go.dev/github.com/ipld/go-ipld-selector-text-lite#SelectorSpecFromPath). This allows for partial retrieval of any sub-DAG of a deal provided the user knows the exact low-level shape of the deal contents.
-        - For example, to retrieve the first entry of a UnixFS directory by executing, run `lotus client retrieve --miner f0XXXXX --datamodel-path-selector 'Links/0/Hash' bafyROOTCID ~/output`
-- Expose storage stats on the metrics endpoint ([filecoin-project/lotus#7418](https://github.com/filecoin-project/lotus/pull/7418))
-- feat: Catch panic to generate report and reraise ([filecoin-project/lotus#7341](https://github.com/filecoin-project/lotus/pull/7341))
-    - Set `LOTUS_PANIC_REPORT_PATH` and `LOTUS_PANIC_JOURNAL_LOOKBACK` to get reports generated when a panic occurs on your daemon miner or workers.
-- Add envconfig docs to the config ([filecoin-project/lotus#7412](https://github.com/filecoin-project/lotus/pull/7412))
-    - You can now find supported env vars in [default-lotus-miner-config.toml](https://github.com/filecoin-project/lotus/blob/master/documentation/en/default-lotus-miner-config.toml).
-- lotus shed: fr32 utils ([filecoin-project/lotus#7355](https://github.com/filecoin-project/lotus/pull/7355))
-- Miner CLI: Allow trying to change owners of any miner actor ([filecoin-project/lotus#7328](https://github.com/filecoin-project/lotus/pull/7328))
-- Add --unproven flag to the sectors list command ([filecoin-project/lotus#7308](https://github.com/filecoin-project/lotus/pull/7308))
-
-## Improvements
-- check for deal start epoch on SectorAddPieceToAny ([filecoin-project/lotus#7407](https://github.com/filecoin-project/lotus/pull/7407))
-- Verify Voucher locks in VoucherValidUnlocked ([filecoin-project/lotus#5609](https://github.com/filecoin-project/lotus/pull/5609))
-- Add more info to miner allinfo command ([filecoin-project/lotus#7384](https://github.com/filecoin-project/lotus/pull/7384))
-- add `lotus-miner storage-deals list --format=json` with transfers ([filecoin-project/lotus#7312](https://github.com/filecoin-project/lotus/pull/7312))
-- Fix formatting ([filecoin-project/lotus#7383](https://github.com/filecoin-project/lotus/pull/7383))
-- GetCurrentDealInfo err: handle correctly err case ([filecoin-project/lotus#7346](https://github.com/filecoin-project/lotus/pull/7346))
-- fix: Enforce verification key integrity check regardless of TRUST_PARAMS=1 ([filecoin-project/lotus#7327](https://github.com/filecoin-project/lotus/pull/7327))
-- Show more deal states in miner info ([filecoin-project/lotus#7311](https://github.com/filecoin-project/lotus/pull/7311))
-- Prep retrieval for selectors: no functional changes ([filecoin-project/lotus#7306](https://github.com/filecoin-project/lotus/pull/7306))
-- Seed: improve helptext ([filecoin-project/lotus#7304](https://github.com/filecoin-project/lotus/pull/7304))
-- Mempool: reduce size of sigValCache ([filecoin-project/lotus#7305](https://github.com/filecoin-project/lotus/pull/7305))
- - Stop indirectly depending on deprecated github.com/prometheus/common ([filecoin-project/lotus#7474](https://github.com/filecoin-project/lotus/pull/7474))
-
-## Bug Fixes
-- StateSearchMsg: Correct usage of the allowReplaced flag ([filecoin-project/lotus#7450](https://github.com/filecoin-project/lotus/pull/7450))
-- fix staging area path buildup ([filecoin-project/lotus#7363](https://github.com/filecoin-project/lotus/pull/7363))
-- storagemgr: Cleanup workerLk around worker resources ([filecoin-project/lotus#7334](https://github.com/filecoin-project/lotus/pull/7334))
-- fix: check padSector Cid ([filecoin-project/lotus#7310](https://github.com/filecoin-project/lotus/pull/7310))
-- sealing: Recover sectors after failed AddPiece ([filecoin-project/lotus#7492](https://github.com/filecoin-project/lotus/pull/7492))
-- fix: support node instantiation in external packages ([filecoin-project/lotus#7511](https://github.com/filecoin-project/lotus/pull/7511))
-- Chore/backport cleanup withdrawn dependency ([filecoin-project/lotus#7482](https://github.com/filecoin-project/lotus/pull/7482))
-
-## Dependency Updates
-- github.com/filecoin-project/go-data-transfer (v1.10.1 -> v1.11.1):
-- github.com/filecoin-project/go-fil-markets (v1.12.0 -> v1.13.1):
-- github.com/filecoin-project/go-paramfetch (v0.0.2-0.20210614165157-25a6c7769498 -> v0.0.2):
-- update go-libp2p to v0.15.0 ([filecoin-project/lotus#7362](https://github.com/filecoin-project/lotus/pull/7362))
-- update to go-graphsync v0.10.1 ([filecoin-project/lotus#7359](https://github.com/filecoin-project/lotus/pull/7359))
-
-## Others
-- Chocolate to master ([filecoin-project/lotus#7440](https://github.com/filecoin-project/lotus/pull/7440))
-- releases -> master ([filecoin-project/lotus#7403](https://github.com/filecoin-project/lotus/pull/7403))
-- remove nerpanet related code  ([filecoin-project/lotus#7373](https://github.com/filecoin-project/lotus/pull/7373))
-- sync branch main with master on updates ([filecoin-project/lotus#7366](https://github.com/filecoin-project/lotus/pull/7366))
-- remove job to install jq ([filecoin-project/lotus#7309](https://github.com/filecoin-project/lotus/pull/7309))
-- restore filters for the build-macos job ([filecoin-project/lotus#7455](https://github.com/filecoin-project/lotus/pull/7455))
-- v1.13.0-rc2 ([filecoin-project/lotus#7458](https://github.com/filecoin-project/lotus/pull/7458))
-- v1.13.0-rc1 ([filecoin-project/lotus#7452](https://github.com/filecoin-project/lotus/pull/7452))
-
-## Contributors
-
-| Contributor | Commits | Lines ± | Files Changed |
-|-------------|---------|---------|---------------|
-| @dirkmc | 8 | +845/-375 | 55 |
-| @magik6k | 10 | +1056/-60 | 26 |
-| @aarshkshah1992 | 6 | +813/-259 | 16 |
-| @arajasek | 10 | +552/-251 | 43 |
-| @ribasushi | 6 | +505/-78 | 22 |
-| @jennijuju | 7 | +212/-323 | 34 |
-| @nonsense | 10 | +335/-139 | 19 |
-| @dirkmc | 8 | +149/-55 | 16 |
-| @hannahhoward | 4 | +56/-32 | 17 |
-| @rvagg | 4 | +61/-13 | 9 |
-| @jennijuju | 2 | +0/-57 | 2 |
-| @hannahhoward | 1 | +33/-18 | 7 |
-| @Kubuxu | 8 | +27/-16 | 9 |
-| @coryschwartz | 1 | +16/-2 | 2 |
-| @travisperson | 1 | +14/-0 | 1 |
-| @frrist | 1 | +12/-0 | 2 |
-| @ognots | 1 | +0/-10 | 2 |
-| @lanzafame  | 1 | +3/-3 | 1 |
-| @jennijuju | 1 | +2/-2 | 1 |
-| @swift-mx | 1 | +1/-1 | 1 |
-
-# v1.12.0 / 2021-10-12
-
-This is a mandatory release of Lotus that introduces [Filecoin Network v14](https://github.com/filecoin-project/community/discussions/74#discussioncomment-1398542), codenamed the Chocolate upgrade. The Filecoin mainnet will upgrade at epoch 1231620, on 2021-10-26T13:30:00Z. 
-
-The Chocolate upgrade introduces the following FIPs, delivered in [v6 actors](https://github.com/filecoin-project/specs-actors/releases/tag/v6.0.0)
-
-- [FIP-0020](https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0020.md): Add return value to `WithdrawBalance`
-- [FIP-0021](https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0021.md): Correct quality calculation on expiration
-- [FIP-0022](https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0022.md): Bad deals don't fail PublishStorageDeals
-- [FIP-0023](https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0023.md): Break ties between tipsets of equal weight
-- [FIP-0024](https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0024.md): BatchBalancer & BatchDiscount Post-HyperDrive Adjustment
-- [FIP-0026](https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0026.md): Extend sector faulty period from 2 weeks to 6 weeks
-
-Note that this release is built on top of lotus v1.11.3. Enterprising users like storage providers, data brokers and others are recommended to use lotus v1.13.0 for latest new features, improvements and bug fixes.
-
-## New Features and Changes
-- Implement and support [FIP-0024](https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0024.md) BatchBalancer & BatchDiscount Post-HyperDrive Adjustment: 
-  - Precommit batch balancer support/config ([filecoin-project/lotus#7410](https://github.com/filecoin-project/lotus/pull/7410))
-    - Set `BatchPreCommitAboveBaseFee` to decide whether sending out a PreCommits in individual messages or in a batch.
-    - The default value of `BatchPreCommitAboveBaseFee` and `AggregateAboveBaseFee` are now updated to 0.32nanoFIL.
-- The amount of FIL withdrawn from `WithdrawBalance` from miner or market via lotus CLI is now printed out upon message landing on the chain.
-
-## Improvements
-- Implement [FIP-0023](https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0023.md) (Break ties between tipsets of equal weight)
-  - ChainStore: Add a tiebreaker rule for tipsets of equal weight ([filecoin-project/lotus#7378](https://github.com/filecoin-project/lotus/pull/7378))
-- Randomness: Move getters from ChainAPI to StateAPI ([filecoin-project/lotus#7322](https://github.com/filecoin-project/lotus/pull/7322))
-
-## Bug Fixes
-- Fix Drand fetching around null tipsets ([filecoin-project/lotus#7376](https://github.com/filecoin-project/lotus/pull/7376))
-
-## Dependency Updates
-- Add [v6 actors](https://github.com/filecoin-project/specs-actors/releases/tag/v6.0.0)
-  - **Protocol changes**
-     - Multisig Approve only hashes when hash in params
-     - FIP 0020 WithdrawBalance methods return withdrawn value
-     - FIP 0021 Fix bug in power calculation when extending verified deals sectors
-     - FIP 0022 PublishStorageDeals drops errors in batch
-     - FIP 0024 BatchBalancer update and burn added to PreCommitBatch
-     - FIP 0026 Add FaultMaxAge extension
-     - Reduce calls to power and reward actors by passing values from power cron
-     - Defensive programming hardening power cron against programmer error
-  - **Implementation changes**
-     - Move to xerrors
-     - Improved logging: burn events are not logged with reasons and burned value.
-- github.com/filecoin-project/go-state-types (v0.1.1-0.20210810190654-139e0e79e69e -> v0.1.1-0.20210915140513-d354ccf10379):
-
-## Others
-- v1.12.0-rc1 prep ([filecoin-project/lotus#7426](https://github.com/filecoin-project/lotus/pull/7426)
-- Extend FaultMaxAge to 6 weeks for actors v6 on test networks only ([filecoin-project/lotus#7421](https://github.com/filecoin-project/lotus/pull/7421))
-
-## Contributors
-
-| Contributor | Commits | Lines ± | Files Changed |
-|-------------|---------|---------|---------------|
-| @ZenGround0 | 12 | +4202/-2752 | 187 |
-| @arajasek | 25 | +4567/-854 | 190 |
-| @laudiacay | 4 | +1276/-435 | 37 |
-| @laudiacay | 12 | +1350/-209 | 43 |
-| @magik6k |  1 | +171/-13 | 8 |
-| @Stebalien | 2 | +115/-12 | 6 |
-| @jennijuju | 7 | +73/-34 | 26 |
-| @travisperson | 2 | +19/-19 | 7 |
-| @coryschwartz | 1 | +16/-2 | 2 |
-| @Kubuxu | 5 | +5/-5 | 5 |
-| @ribasushi | 1 | +5/-3 | 1 |
-
-# v1.11.3 / 2021-09-29
-
-lotus v1.11.3 is a feature release that's **highly recommended to ALL lotus users to upgrade**, including node 
-operators, storage providers and clients. It includes many improvements and bug fixes that result in perf 
-improvements in different area, like deal making, sealing and so on.
-
-## Highlights
-
-- 🌟🌟Introduce `MaxStagingDealsBytes - reject new deals if our staging deals area is full ([filecoin-project/lotus#7276](https://github.com/filecoin-project/lotus/pull/7276))
-    - Set `MaxStagingDealsBytes` under the [Dealmaking] section of the markets' subsystem's `config.toml` to reject new incoming deals when the `deal-staging` directory of market subsystem's repo gets too large. 
-- 🌟🌟miner: Command to list/remove expired sectors locally ([filecoin-project/lotus#7140](https://github.com/filecoin-project/lotus/pull/7140))
-    - run `./lotus-miner sectors expired -h` for more details.
-- 🚀update to ffi to update-bellperson-proofs-v9-0-2 ([filecoin-project/lotus#7369](https://github.com/filecoin-project/lotus/pull/7369))
-    - MinerX fellows(early testers of lotus releases) have reported faster WindowPoSt computation!
-- 🌟dealpublisher: Fully validate deals before publishing ([filecoin-project/lotus#7234](https://github.com/filecoin-project/lotus/pull/7234))
-    - This excludes the expired deals before sending out a PSD message which reduces the chances of PSD message failure due to invalid deals. 
-- 🌟Simple alert system; FD limit alerts ([filecoin-project/lotus#7108](https://github.com/filecoin-project/lotus/pull/7108))
-
-## New Features
-
-- feat(ci): include version/cli checks in tagged releases ([filecoin-project/lotus#7331](https://github.com/filecoin-project/lotus/pull/7331))
-- Show deal sizes is sealing sectors ([filecoin-project/lotus#7261](https://github.com/filecoin-project/lotus/pull/7261))
-- config for disabling NAT port mapping ([filecoin-project/lotus#7204](https://github.com/filecoin-project/lotus/pull/7204))
-- Add optional mined block list to miner info ([filecoin-project/lotus#7202](https://github.com/filecoin-project/lotus/pull/7202))
-- Shed: Create a verifreg command for when VRK isn't a multisig ([filecoin-project/lotus#7099](https://github.com/filecoin-project/lotus/pull/7099))
-
-## Improvements
-
-- build macOS CI ([filecoin-project/lotus#7307](https://github.com/filecoin-project/lotus/pull/7307))
-- itests: remove cid equality comparison ([filecoin-project/lotus#7292](https://github.com/filecoin-project/lotus/pull/7292))
-- Add partition info to the 'sectors status' command ([filecoin-project/lotus#7246](https://github.com/filecoin-project/lotus/pull/7246))
-- chain: Cleanup consensus logic ([filecoin-project/lotus#7255](https://github.com/filecoin-project/lotus/pull/7255))
-- builder: Handle chainstore config in ConfigFullNode ([filecoin-project/lotus#7232](https://github.com/filecoin-project/lotus/pull/7232))
-- gateway: check tipsets in ChainGetPath ([filecoin-project/lotus#7230](https://github.com/filecoin-project/lotus/pull/7230))
-- Refactor events subsystem ([filecoin-project/lotus#7000](https://github.com/filecoin-project/lotus/pull/7000))
-- test: re-enable disabled tests ([filecoin-project/lotus#7211](https://github.com/filecoin-project/lotus/pull/7211))
-- Reduce lotus-miner startup spam ([filecoin-project/lotus#7205](https://github.com/filecoin-project/lotus/pull/7205))
-- Catch deal slashed because sector was terminated ([filecoin-project/lotus#7201](https://github.com/filecoin-project/lotus/pull/7201))
-- Insert miner and network power data as gibibytes to avoid int64 overflows ([filecoin-project/lotus#7194](https://github.com/filecoin-project/lotus/pull/7194))
-- sealing: Check piece CIDs after AddPiece ([filecoin-project/lotus#7185](https://github.com/filecoin-project/lotus/pull/7185))
-- markets: OnDealExpiredOrSlashed - get deal by proposal instead of deal ID ([filecoin-project/lotus#5431](https://github.com/filecoin-project/lotus/pull/5431))
-- Incoming: improve a log message ([filecoin-project/lotus#7181](https://github.com/filecoin-project/lotus/pull/7181))
-- journal: make current log file have a fixed named (#7112) ([filecoin-project/lotus#7112](https://github.com/filecoin-project/lotus/pull/7112))
-- call string.Repeat always with positive int ([filecoin-project/lotus#7104](https://github. com/filecoin-project/lotus/pull/7104))
-- itests: support larger sector sizes; add large deal test. ([filecoin-project/lotus#7148](https://github.com/filecoin-project/lotus/pull/7148))
-- Ignore nil throttler ([filecoin-project/lotus#7169](https://github.com/filecoin-project/lotus/pull/7169))
-
-## Bug Fixes
-
-- fix: escape periods to match actual periods in version
-- fix bug for CommittedCapacitySectorLifetime ([filecoin-project/lotus#7337](https://github.com/filecoin-project/lotus/pull/7337))
-- fix a panic in HandleRecoverDealIDs ([filecoin-project/lotus#7336](https://github.com/filecoin-project/lotus/pull/7336))
-- fix index out of range ([filecoin-project/lotus#7273](https://github.com/filecoin-project/lotus/pull/7273))
-- fix: correctly handle null blocks when detecting an expensive fork ([filecoin-project/lotus#7210](https://github.com/filecoin-project/lotus/pull/7210))
-- fix: make lotus soup use the correct dependencies ([filecoin-project/lotus#7221](https://github.com/filecoin-project/lotus/pull/7221))
-- fix: init restore adds empty storage.json ([filecoin-project/lotus#7025](https://github.com/filecoin-project/lotus/pull/7025))
-- fix: disable broken testground integration test ([filecoin-project/lotus#7187](https://github.com/filecoin-project/lotus/pull/7187))
-- fix TestDealPublisher ([filecoin-project/lotus#7173](https://github.com/filecoin-project/lotus/pull/7173))
-- fix: make TestTimedCacheBlockstoreSimple pass reliably ([filecoin-project/lotus#7174](https://github.com/filecoin-project/lotus/pull/7174))
-- Fix throttling bug ([filecoin-project/lotus#7177](https://github.com/filecoin-project/lotus/pull/7177))
-- sealing: Fix sector state accounting with FinalizeEarly ([filecoin-project/lotus#7256](https://github.com/filecoin-project/lotus/pull/7256))
-- docker entrypoint.sh missing variable escape character ([filecoin-project/lotus#7291](https://github.com/filecoin-project/lotus/pull/7291))
-- sealing: Fix retry loop in SubmitCommitAggregate ([filecoin-project/lotus#7245](https://github.com/filecoin-project/lotus/pull/7245))
-- sectors expired: Handle precomitted and unproven sectors correctly ([filecoin-project/lotus#7236](https://github.com/filecoin-project/lotus/pull/7236))
-- stores: Fix reserved disk usage log spam ([filecoin-project/lotus#7233](https://github.com/filecoin-project/lotus/pull/7233))
-
-
-## Dependency Updates
-
-- github.com/filecoin-project/go-fil-markets (v1.8.1 -> v1.12.0):
-- github.com/filecoin-project/go-data-transfer (v1.7.8 -> v1.10.1):
-- update to ffi to update-bellperson-proofs-v9-0-2 ([filecoin-project/lotus#7369](https://github.com/filecoin-project/lotus/pull/7369))
-- fix(deps): use go-graphsync v0.9.3 with hotfix
-- Update to unified go-graphsync v0.9.0 ([filecoin-project/lotus#7197](https://github.com/filecoin-project/lotus/pull/7197))
-
-## Others
-
-- v1.11.3-rc2 ([filecoin-project/lotus#7371](https://github.com/filecoin-project/lotus/pull/7371))
-- v1.11.3-rc1 ([filecoin-project/lotus#7299](https://github.com/filecoin-project/lotus/pull/7299))
-- Increase threshold from 0.5% to 1% ([filecoin-project/lotus#7262](https://github.com/filecoin-project/lotus/pull/7262))
-- ci: exclude cruft from code coverage ([filecoin-project/lotus#7189](https://github.com/filecoin-project/lotus/pull/7189))
-- Bump version to v1.11.3-dev ([filecoin-project/lotus#7180](https://github.com/filecoin-project/lotus/pull/7180))
-- test: disable flaky TestBatchDealInput ([filecoin-project/lotus#7176](https://github.com/filecoin-project/lotus/pull/7176))
-- Turn off patch ([filecoin-project/lotus#7172](https://github.com/filecoin-project/lotus/pull/7172))
-- test: disable flaky TestSimultaneousTransferLimit ([filecoin-project/lotus#7153](https://github.com/filecoin-project/lotus/pull/7153))
-
- 
-## Contributors
-
-| Contributor | Commits | Lines ± | Files Changed |
-|-------------|---------|---------|---------------|
-| @magik6k | 39 | +3311/-1825 | 179 |
-| @Stebalien | 23 | +1935/-1417 | 84 |
-| @dirkmc | 12 | +921/-732 | 111 |
-| @dirkmc | 12 | +663/-790 | 30 |
-| @hannahhoward | 3 | +482/-275 | 46 |
-| @travisperson | 1 | +317/-65 | 5 |
-| @jennijuju | 11 | +223/-126 | 24 |
-| @hannahhoward | 7 | +257/-55 | 16 |
-| @nonsense| 9 | +258/-37 | 19 |
-| @raulk | 4 | +127/-36 | 13 |
-| @raulk | 1 | +43/-60 | 15 |
-| @arajasek | 4 | +74/-8 | 10 |
-| @Frank | 2 | +68/-8 | 3 |
-| @placer14|  2 | +52/-1 | 4 |
-| @ldoublewood | 2 | +15/-13 | 3 |
-| @lanzafame | 1 | +16/-2 | 1 |
-| @aarshkshah1992 | 2 | +11/-6 | 2 |
-| @ZenGround0 | 2 | +7/-6 | 2 |
-| @ognots | 1 | +0/-10 | 2 |
-| @KAYUII | 2 | +4/-4 | 2 |
-| @lanzafame | 1 | +6/-0 | 1 |
-| @jacobheun | 1 | +3/-3 | 1 |
-| @frank | 1 | +4/-0 | 1 |
-
-
-# v1.11.2 / 2021-09-06
-
-lotus v1.11.2 is a feature release that's **highly recommended ALL lotus users to upgrade**, including node operators, 
-storage providers and clients. 
-
-## Highlights
-- 🌟🌟🌟 Introduce Dagstore and CARv2 for deal-making (#6671) ([filecoin-project/lotus#6671](https://github.com/filecoin-project/lotus/pull/6671))
-  - **[lotus miner markets' Dagstore](https://docs.filecoin.io/mine/lotus/dagstore/#conceptual-overview)** is a 
-    component of the `markets` subsystem in lotus-miner. It is a sharded store to hold large IPLD graphs efficiently,
-    packaged as  location-transparent attachable CAR files and it replaces the former Badger staging blockstore. It 
-    is designed to provide high efficiency and throughput, and minimize resource utilization during deal-making operations.  
-    The dagstore also leverages the indexing features of [CARv2](https://github.com/ipld/ipld/blob/master/specs/transport/car/carv2/index.md) to enable plan CAR files to act as read and write 
-    blockstores, which are served as the direct medium for data exchanges in markets for both storage and retrieval 
-    deal making without requiring intermediate buffers.
-  - In the future, lotus will leverage and interact with Dagstore a lot for new features and improvements for deal 
-    making, therefore, it's highly recommended to lotus users to go through [Lotus Miner: About the markets dagstore](https://docs.filecoin.io/mine/lotus/dagstore/#conceptual-overview) thoroughly to learn more about Dagstore's 
-    conceptual overview, terminology, directory structure, configuration and so on.
-  - **Note**: 
-    - When you first start your lotus-miner or market subsystem with this release, a one-time/first-time **dagstore migration** will be triggered which replaces the former Badger staging blockstore with dagstore. We highly 
-      recommend storage providers to read this [section](https://docs.filecoin.io/mine/lotus/dagstore/#first-time-migration) to learn more about
-      what the process does, what to expect and how monitor it.
-    - It is highly recommended to **wait all ongoing data transfer to finish or cancel inbound storage deals that 
-      are still transferring**, using the `lotus-miner data-transfers cancel` command before upgrade your market nodes. Reason being that the new dagstore changes attributes in the internal deal state objects, and the paths to the staging CARs where the deal data was being placed will be lost.
-    - ‼️Having your dags initialized will become important in the near feature for you to provide a better storage
-          and retrieval service. We'd suggest you to start [forced bulk initialization] soon if possible as this process
-          places relatively high IP workload on your storage system and is better to be carried out gradually and over a
-          longer timeframe. Read how to do properly perform a force bulk initialization [here](https://docs.filecoin.io/mine/lotus/dagstore/#forcing-bulk-initialization).
-    - ⏮ Rollback Alert(from v1.11.2-rcX to any version lower): If a storages deal is initiated with M1/v1.11.2(-rcX)
-      release, it needs to get to the `StorageDealAwaitingPrecommit` state before you can do a version rollback or the markets process may panic.
-  - 💙 **Special thanks to [MinerX fellows for testing and providing valuable feedbacks](https://github.com/filecoin-project/lotus/discussions/6852) for Dagstore in the past month!** 
-- 🌟🌟 rpcenc: Support reader redirect ([filecoin-project/lotus#6952](https://github.com/filecoin-project/lotus/pull/6952))
-  - This allows market processes to send piece bytes directly to workers involved on `AddPiece`.
-- Extending sectors: more practical and flexible tools ([filecoin-project/lotus#6097](https://github.com/filecoin-project/lotus/pull/6097))
-    - `lotus-miner sectors check-expire` to inspect expiring sectors.
-    - `lotus-miner sectors renew` for renewing expiring sectors, see the command help menu for customizable option 
-      like `extension`, `new-expiration` and so on.
-- ‼️ MpoolReplaceCmd ( lotus mpool replace`) now takes FIL for fee-limit ([filecoin-project/lotus#6927](https://github.com/filecoin-project/lotus/pull/6927))
-- Drop townhall/chainwatch ([filecoin-project/lotus#6912](https://github.com/filecoin-project/lotus/pull/6912))
-    - ChainWatch is no longer supported by lotus.
-- Configurable CC Sector Expiration ([filecoin-project/lotus#6803](https://github.com/filecoin-project/lotus/pull/6803))
-    - Set `CommittedCapacitySectorLifetime` in lotus-miner/config.toml to specify the default expiration for a new CC 
-      sector, value must be between 180-540 days inclusive.
-
-## New Features
-- api/command for encoding actor params ([filecoin-project/lotus#7150](https://github.com/filecoin-project/lotus/pull/7150))
-- shed: Support raw encoding in cid id ([filecoin-project/lotus#7149](https://github.com/filecoin-project/lotus/pull/7149))
-- feat(miner deals): create subdir to miner repo for staged deals ([filecoin-project/lotus#6853](https://github.com/filecoin-project/lotus/pull/6853))
-- Support --actor in miner actor control list ([filecoin-project/lotus#7027](https://github.com/filecoin-project/lotus/pull/7027))
-- Shed: Include network name in genesis-verify ([filecoin-project/lotus#7019](https://github.com/filecoin-project/lotus/pull/7019))
-- feat: add ChainGetTipSetAfterHeight ([filecoin-project/lotus#6990](https://github.com/filecoin-project/lotus/pull/6990))
-- lotus-shed splitstore clear command ([filecoin-project/lotus#6967](https://github.com/filecoin-project/lotus/pull/6967))
-
-## Improvements
-- improve get api error messages ([filecoin-project/lotus#7088](https://github.com/filecoin-project/lotus/pull/7088))
-- Strict major minor version checking on v0 and v1 apis ([filecoin-project/lotus#7038](https://github.com/filecoin-project/lotus/pull/7038))
-- make lotus-miner net commands hit markets subsystem. ([filecoin-project/lotus#7042](https://github.com/filecoin-project/lotus/pull/7042))
-- Test with latest actors version ([filecoin-project/lotus#6998](https://github.com/filecoin-project/lotus/pull/6998))
-- Reduce splitstore memory usage during chain walks ([filecoin-project/lotus#6949](https://github.com/filecoin-project/lotus/pull/6949))
-- Remove forgotten non-functioning config from the pre-mainnet days ([filecoin-project/lotus#6970](https://github.com/filecoin-project/lotus/pull/6970))
-- add explicit error msg if repo dir does not exist ([filecoin-project/lotus#6909](https://github.com/filecoin-project/lotus/pull/6909))
-- Test/pledge batching msg prop ([filecoin-project/lotus#6537](https://github.com/filecoin-project/lotus/pull/6537))
-- reasonable max value for initial sector expiration ([filecoin-project/lotus#6099](https://github.com/filecoin-project/lotus/pull/6099))
-- support MARKETS_API_INFO env var, and markets-repo, markets-api-url CLI flags. ([filecoin-project/lotus#6936](https://github.com/filecoin-project/lotus/pull/6936))
-- Improve formatting of workers CLI ([filecoin-project/lotus#6942](https://github.com/filecoin-project/lotus/pull/6942))
-- make: set default GOCC earlier ([filecoin-project/lotus#6932](https://github.com/filecoin-project/lotus/pull/6932))
-- Moving GC Followup ([filecoin-project/lotus#6905](https://github.com/filecoin-project/lotus/pull/6905))
-- Log more call context during errors ([filecoin-project/lotus#6918](https://github.com/filecoin-project/lotus/pull/6918))
-- polish(errors): better state tree errors ([filecoin-project/lotus#6923](https://github.com/filecoin-project/lotus/pull/6923))
-- adding an RuntimeSubsystems API to storage miner; fix `lotus-miner info` ([filecoin-project/lotus#6906](https://github.com/filecoin-project/lotus/pull/6906))
-- Reduce entropy in the chain package ([filecoin-project/lotus#6889](https://github.com/filecoin-project/lotus/pull/6889))
-- make: Allow setting Go compiler with GOCC ([filecoin-project/lotus#6911](https://github.com/filecoin-project/lotus/pull/6911))
-
-## Bug Fixes
-- sealing: Fix RecoverDealIDs loop with changed PieceCID ([filecoin-project/lotus#7117](https://github.com/filecoin-project/lotus/pull/7117))
-- Fix error handling in SectorAddPieceToAny api impl ([filecoin-project/lotus#7135](https://github.com/filecoin-project/lotus/pull/7135))
-- add rice box to required binaries ([filecoin-project/lotus#7125](https://github.com/filecoin-project/lotus/pull/7125))
-- fix(miner): always create miner deal staging directory (#7098) ([filecoin-project/lotus#7098](https://github.com/filecoin-project/lotus/pull/7098))
-- fix build after merging #6097. (#7096) ([filecoin-project/lotus#7096](https://github.com/filecoin-project/lotus/pull/7096))
-- fix: don't check for t_aux when proving ([filecoin-project/lotus#7011](https://github.com/filecoin-project/lotus/pull/7011))
-- fix: vet actors shims ([filecoin-project/lotus#6999](https://github.com/filecoin-project/lotus/pull/6999))
-- fix: more logging in maybeStartBatch error ([filecoin-project/lotus#6996](https://github.com/filecoin-project/lotus/pull/6996))
-- fix flaky TestDealPublisher and re-enable ([filecoin-project/lotus#6991](https://github.com/filecoin-project/lotus/pull/6991))
-- fix skipCount ([filecoin-project/lotus#6940](https://github.com/filecoin-project/lotus/pull/6940))
-- fix bug in MpoolPending message exclusion ([filecoin-project/lotus#6945](https://github.com/filecoin-project/lotus/pull/6945))
-- PreCommitPolicy: Don't try to align expirations on proving period boundaries ([filecoin-project/lotus#7018](https://github.com/filecoin-project/lotus/pull/7018))
-- make: fix version check when using gotip ([filecoin-project/lotus#6916](https://github.com/filecoin-project/lotus/pull/6916))
-- fix ticket check ([filecoin-project/lotus#6882](https://github.com/filecoin-project/lotus/pull/6882))
-
-## Dependency Updates
-- github.com/filecoin-project/go-data-transfer (v1.7.2 -> v1.7.8):
-- github.com/filecoin-project/go-fil-markets (v1.6.2 -> v1.8.1):
-- update go-libp2p-pubsub to v0.5.4 ([filecoin-project/lotus#6958](https://github.com/filecoin-project/lotus/pull/6958))
-- integrate the proof patch: tag proofs-v9-revert-deps-hotfix
-- Update markets, dt and graphsync ([filecoin-project/lotus#7160](https://github.com/filecoin-project/lotus/pull/7160))
-- Remove replace directive for multihash dep (#7113) ([filecoin-project/lotus#7113](https://github.com/filecoin-project/lotus/pull/7113))
-- upgrade upstream dependencies. ([filecoin-project/lotus#7115](https://github.com/filecoin-project/lotus/pull/7115))
-- Update to latest FFI ([filecoin-project/lotus#7110](https://github.com/filecoin-project/lotus/pull/7110))
-- Update state machine deps for logging ([filecoin-project/lotus#6941](https://github.com/filecoin-project/lotus/pull/6941))
-- Update deps for more logging in data transfer and markets ([filecoin-project/lotus#6937](https://github.com/filecoin-project/lotus/pull/6937))
-- Update to branches with improved logging ([filecoin-project/lotus#6919](https://github.com/filecoin-project/lotus/pull/6919))
-- update go-libp2p-pubsub to v0.5.3 ([filecoin-project/lotus#6907](https://github.com/filecoin-project/lotus/pull/6907))
-
-## Others
-- Fix nits and see if codecov works now with auto ([filecoin-project/lotus#7151](https://github.com/filecoin-project/lotus/pull/7151))
-- Codecov Projects ([filecoin-project/lotus#7147](https://github.com/filecoin-project/lotus/pull/7147))
-- remove m1 templates and make area selection multi-optionable ([filecoin-project/lotus#7121](https://github.com/filecoin-project/lotus/pull/7121))
-- release -> master ([filecoin-project/lotus#7105](https://github.com/filecoin-project/lotus/pull/7105))
-- Lotus release process  - how we make releases ([filecoin-project/lotus#6944](https://github.com/filecoin-project/lotus/pull/6944))
-- codecov: fix mock name ([filecoin-project/lotus#7039](https://github.com/filecoin-project/lotus/pull/7039))  
-- codecov: fix regexes ([filecoin-project/lotus#7037](https://github.com/filecoin-project/lotus/pull/7037))
-- chore: disable flaky test ([filecoin-project/lotus#6957](https://github.com/filecoin-project/lotus/pull/6957))  
-- set buildtype in nerpa and butterfly ([filecoin-project/lotus#6085](https://github.com/filecoin-project/lotus/pull/6085))  
-- release v1.11.1 backport -> master ([filecoin-project/lotus#6929](https://github.com/filecoin-project/lotus/pull/6929))
-- chore: fixup issue templates ([filecoin-project/lotus#6899](https://github.com/filecoin-project/lotus/pull/6899))
-- bump master version to v1.11.2-dev ([filecoin-project/lotus#6903](https://github.com/filecoin-project/lotus/pull/6903))
-- releases -> master for v1.11.0 ([filecoin-project/lotus#6894](https://github.com/filecoin-project/lotus/pull/6894))
-
-
-Contributors
-
-| Contributor | Commits | Lines ± | Files Changed |
-|-------------|---------|---------|---------------|
-| @magik6k | 23 | +5040/-8389 | 114 |
-| @aarshkshah1992 | 11 | +4859/-1078 | 101 |
-| @raulk | 5 | +4170/-1662 | 104 |
-| @vyzo | 30 | +1092/-702 | 49 |
-| @nonsense | 6 | +630/-472 | 19 |
-| @ZenGround0 | 31 | +556/-274 | 74 |
-| @He Weidong | 16 | +680/-128 | 16 |
-| @raulk | 16 | +444/-277 | 49 |
-| @Stebalien | 11 | +403/-259 | 48 |
-| @jennijuju| 17 | +276/-281 | 42 |
-| @dirkmc | 5 | +204/-138 | 20 |
-| @placer14 | 7 | +178/-77 | 17 |
-| @BlocksOnAChain | 1 | +138/-0 | 1 |
-| @Frrist | 1 | +63/-56 | 2 |
-| @arajasek | 7 | +74/-42 | 13 |
-| @frrist | 2 | +67/-6 | 6 |
-| @hannahhoward | 2 | +13/-11 | 3 |
-| @coryschwartz | 1 | +16/-6 | 3 |
-| @whyrusleeping | 1 | +7/-7 | 1 |
-| @hunjixin | 1 | +8/-6 | 1 |
-| @aarshkshah1992 | 1 | +6/-6 | 2 |
-| @dirkmc | 2 | +8/-0 | 2 |
-| @mx | 2 | +6/-1 | 2 |
-| @travisperson | 1 | +3/-2 | 1 |
-| @jennijuju | 2 | +2/-2 | 2 |
-| @ribasushi | 1 | +1/-2 | 2 |
-
-# 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))
+- github.com/filecoin-project/lotus:
+  - Merge branch 'releases' into release/v1.11.1
+  - Update to proof v8.0.3 ([filecoin-project/lotus#6890](https://github.com/filecoin-project/lotus/pull/6890))
   - 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))
+  - Update RELEASE_ISSUE_TEMPLATE.md ([filecoin-project/lotus#6880](https://github.com/filecoin-project/lotus/pull/6880))
+  - Moving GC for badger ([filecoin-project/lotus#6854](https://github.com/filecoin-project/lotus/pull/6854))
+  - Add github actions for staled pr ([filecoin-project/lotus#6879](https://github.com/filecoin-project/lotus/pull/6879))
   - 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
+  - rename `cmd/lotus{-storage=>}-miner` to match binary. ([filecoin-project/lotus#6886](https://github.com/filecoin-project/lotus/pull/6886))
+  - 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))
   - Fix padding of deals, which only partially shipped in #5988 ([filecoin-project/lotus#6683](https://github.com/filecoin-project/lotus/pull/6683))
+  - fix racy TestSimultanenousTransferLimit. ([filecoin-project/lotus#6862](https://github.com/filecoin-project/lotus/pull/6862))
+  - Improve splitstore warmup ([filecoin-project/lotus#6867](https://github.com/filecoin-project/lotus/pull/6867))
+  - 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))
+  - splitstore shed utils ([filecoin-project/lotus#6811](https://github.com/filecoin-project/lotus/pull/6811))
+  - Fix links in issue templates
+  - Update issue templates and add templates for M1 ([filecoin-project/lotus#6856](https://github.com/filecoin-project/lotus/pull/6856))
+  - Splitstore: support on-disk marksets using badger ([filecoin-project/lotus#6833](https://github.com/filecoin-project/lotus/pull/6833))
+  - Config UX improvements ([filecoin-project/lotus#6848](https://github.com/filecoin-project/lotus/pull/6848))
   - 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))  
+  - 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))
+  - fix warmup by decoupling state from message receipt walk ([filecoin-project/lotus#6841](https://github.com/filecoin-project/lotus/pull/6841))
+  - add a command for compacting sector numbers bitfield ([filecoin-project/lotus#4640](https://github.com/filecoin-project/lotus/pull/4640))
+  - PriceListByVersion ([filecoin-project/lotus#6766](https://github.com/filecoin-project/lotus/pull/6766))
+  - 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))
+  - cache loaded block messages ([filecoin-project/lotus#6760](https://github.com/filecoin-project/lotus/pull/6760))
+  - fix: on randomness change, use new rand ([filecoin-project/lotus#6805](https://github.com/filecoin-project/lotus/pull/6805))
+  - 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))
+  - 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))
+  - release -> master ([filecoin-project/lotus#6828](https://github.com/filecoin-project/lotus/pull/6828))
+  - sealing: Handle preCommitParams errors more correctly ([filecoin-project/lotus#6763](https://github.com/filecoin-project/lotus/pull/6763))
+  - fix: always check if StateSearchMessage returns nil ([filecoin-project/lotus#6802](https://github.com/filecoin-project/lotus/pull/6802))
+  - ClientFindData: always fetch peer id from chain ([filecoin-project/lotus#6807](https://github.com/filecoin-project/lotus/pull/6807))
   - 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))
+  -  ([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))
+  - Splitstore: add support for protecting out of chain references in the blockstore ([filecoin-project/lotus#6777](https://github.com/filecoin-project/lotus/pull/6777))
+  - Resurrect CODEOWNERS, but for maintainers group ([filecoin-project/lotus#6773](https://github.com/filecoin-project/lotus/pull/6773))
+  - update go-libp2p-pubsub to v0.5.0 ([filecoin-project/lotus#6764](https://github.com/filecoin-project/lotus/pull/6764))
+  - Implement exposed splitstore ([filecoin-project/lotus#6762](https://github.com/filecoin-project/lotus/pull/6762))
+  - Add ChainGetMessagesInTipset API ([filecoin-project/lotus#6642](https://github.com/filecoin-project/lotus/pull/6642))
+  - test: handle null blocks in TestForkRefuseCall ([filecoin-project/lotus#6758](https://github.com/filecoin-project/lotus/pull/6758))
+  - Master disclaimer  ([filecoin-project/lotus#6757](https://github.com/filecoin-project/lotus/pull/6757))
+  - Splitstore code reorg ([filecoin-project/lotus#6756](https://github.com/filecoin-project/lotus/pull/6756))
+  - Create stale.yml ([filecoin-project/lotus#6747](https://github.com/filecoin-project/lotus/pull/6747))
+  - Splitstore: Some small fixes ([filecoin-project/lotus#6754](https://github.com/filecoin-project/lotus/pull/6754))
+  -  ([filecoin-project/lotus#6746](https://github.com/filecoin-project/lotus/pull/6746))
+  - Handle the --color flag via proper global state ([filecoin-project/lotus#6743](https://github.com/filecoin-project/lotus/pull/6743))
+  - Config for collateral from miner available balance ([filecoin-project/lotus#6629](https://github.com/filecoin-project/lotus/pull/6629))
+  - Support standalone miner-market process ([filecoin-project/lotus#6356](https://github.com/filecoin-project/lotus/pull/6356))
+  - Splitstore Enhanchements ([filecoin-project/lotus#6474](https://github.com/filecoin-project/lotus/pull/6474))
+  -  ([filecoin-project/lotus#6739](https://github.com/filecoin-project/lotus/pull/6739))
+  - Add more deal details to lotus-miner info ([filecoin-project/lotus#6708](https://github.com/filecoin-project/lotus/pull/6708))
+  - Release template: Update all testnet infra at once ([filecoin-project/lotus#6710](https://github.com/filecoin-project/lotus/pull/6710))
+  - Fix Lotus shed
   - Fix bugs in sectors extend --v1-sectors ([filecoin-project/lotus#6066](https://github.com/filecoin-project/lotus/pull/6066))
+  - add election backtest ([filecoin-project/lotus#5950](https://github.com/filecoin-project/lotus/pull/5950))
+  - Envvar to disable slash filter ([filecoin-project/lotus#6620](https://github.com/filecoin-project/lotus/pull/6620))
+  - Release Template: remove binary validation step ([filecoin-project/lotus#6709](https://github.com/filecoin-project/lotus/pull/6709))
+  - Config for deal publishing control addresses ([filecoin-project/lotus#6697](https://github.com/filecoin-project/lotus/pull/6697))
+  - Reset of the interop network ([filecoin-project/lotus#6689](https://github.com/filecoin-project/lotus/pull/6689))
+  - 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))
+  - 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))
   - fix "lotus-seed genesis car" error "merkledag: not found" ([filecoin-project/lotus#6688](https://github.com/filecoin-project/lotus/pull/6688))
+  - 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))
   - 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))  
+  - Fix more CID double-encoding as hex ([filecoin-project/lotus#6680](https://github.com/filecoin-project/lotus/pull/6680))
+  - add an incremental nonce itest. ([filecoin-project/lotus#6663](https://github.com/filecoin-project/lotus/pull/6663))
   - 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: AggregateAboveBaseFee config ([filecoin-project/lotus#6650](https://github.com/filecoin-project/lotus/pull/6650))
   - 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))
+  - remove precommit check in handleCommitFailed ([filecoin-project/lotus#6634](https://github.com/filecoin-project/lotus/pull/6634))
   - 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))  
+  - shed tool to estimate aggregate network fees ([filecoin-project/lotus#6631](https://github.com/filecoin-project/lotus/pull/6631))
+  - fix prove commit aggregate send token amount ([filecoin-project/lotus#6625](https://github.com/filecoin-project/lotus/pull/6625))
   - Update version.go to 1.11.1 ([filecoin-project/lotus#6621](https://github.com/filecoin-project/lotus/pull/6621))
-  
-## Contributors
+- github.com/filecoin-project/go-data-transfer (v1.6.0 -> v1.7.0):
+  - release: v1.7.0
+  - Fire a transfer queued event when a transfer is queued in Graphsync (#221) ([filecoin-project/go-data-transfer#221](https://github.com/filecoin-project/go-data-transfer/pull/221))
+  - feat: pass ChannelID to ValidatePush & ValidatePull (#220) ([filecoin-project/go-data-transfer#220](https://github.com/filecoin-project/go-data-transfer/pull/220))
+  - release: v1.6.1 ([filecoin-project/go-data-transfer#218](https://github.com/filecoin-project/go-data-transfer/pull/218))
+  - Remove CID lists (#217) ([filecoin-project/go-data-transfer#217](https://github.com/filecoin-project/go-data-transfer/pull/217))
+  - Merge v1.6.0 ([filecoin-project/go-data-transfer#214](https://github.com/filecoin-project/go-data-transfer/pull/214))
+  - Remove restart ack timeout (#211) ([filecoin-project/go-data-transfer#211](https://github.com/filecoin-project/go-data-transfer/pull/211))
+  - feat: use different extension names to fit multiple hooks data in same graphsync message (#204) ([filecoin-project/go-data-transfer#204](https://github.com/filecoin-project/go-data-transfer/pull/204))
+  - fix: map race in GS transport (#208) ([filecoin-project/go-data-transfer#208](https://github.com/filecoin-project/go-data-transfer/pull/208))
+  - refactor: simplify graphsync transport (#203) ([filecoin-project/go-data-transfer#203](https://github.com/filecoin-project/go-data-transfer/pull/203))
+  - release: v1.5.0 (#200) ([filecoin-project/go-data-transfer#200](https://github.com/filecoin-project/go-data-transfer/pull/200))
+- github.com/filecoin-project/go-fil-markets (v1.5.0 -> v1.6.0):
+  - release: v1.6.0
+  - support padding out smaller files (#536) ([filecoin-project/go-fil-markets#536](https://github.com/filecoin-project/go-fil-markets/pull/536))
+  - On overloaded CI 10 seconds just isn't enough (#587) ([filecoin-project/go-fil-markets#587](https://github.com/filecoin-project/go-fil-markets/pull/587))
+  - Do not hex-encode CIDs in logs (#561) ([filecoin-project/go-fil-markets#561](https://github.com/filecoin-project/go-fil-markets/pull/561))
+  - remove wrong peer check in push deal validation (#585) ([filecoin-project/go-fil-markets#585](https://github.com/filecoin-project/go-fil-markets/pull/585))
+  - fix: circleci docs-gen task (#574) ([filecoin-project/go-fil-markets#574](https://github.com/filecoin-project/go-fil-markets/pull/574))
+  - Storage market request queued event and validation interface changes (#555) ([filecoin-project/go-fil-markets#555](https://github.com/filecoin-project/go-fil-markets/pull/555))
+  - build(deps): bump ws from 6.2.1 to 6.2.2 (#554) ([filecoin-project/go-fil-markets#554](https://github.com/filecoin-project/go-fil-markets/pull/554))
+  - release: v1.5.0 ([filecoin-project/go-fil-markets#553](https://github.com/filecoin-project/go-fil-markets/pull/553))
+- github.com/filecoin-project/go-padreader (v0.0.0-20200903213702-ed5fae088b20 -> v0.0.0-20210723183308-812a16dc01b1):
+  - New method to pad harder (#6) ([filecoin-project/go-padreader#6](https://github.com/filecoin-project/go-padreader/pull/6))
+  - Create SECURITY.md (#5) ([filecoin-project/go-padreader#5](https://github.com/filecoin-project/go-padreader/pull/5))
+- github.com/filecoin-project/go-state-types (v0.1.1-0.20210506134452-99b279731c48 -> v0.1.1-0.20210722133031-ad9bfe54c124):
+  - Add version 6.5 (#30) ([filecoin-project/go-state-types#30](https://github.com/filecoin-project/go-state-types/pull/30))
+  - rename file
+- github.com/filecoin-project/specs-actors/v5 (v5.0.1 -> v5.0.3):
+  - Adjust code for subtle change in go-multihash 0.0.15 (#1463) ([filecoin-project/specs-actors#1463](https://github.com/filecoin-project/specs-actors/pull/1463))
+  - Bump go state types (#1464) ([filecoin-project/specs-actors#1464](https://github.com/filecoin-project/specs-actors/pull/1464))
+  - Create CODEOWNERS (#1465) ([filecoin-project/specs-actors#1465](https://github.com/filecoin-project/specs-actors/pull/1465))
+  - Test deterministic offset (#1462) ([filecoin-project/specs-actors#1462](https://github.com/filecoin-project/specs-actors/pull/1462))
+
+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 |
+| vyzo | 295 | +8700/-5936 | 397 |
+| Anton Evangelatov | 94 | +4680/-2965 | 277 |
+| Łukasz Magiera | 37 | +3851/-1611 | 146 |
+| Mike Greenberg | 1 | +2310/-578 | 8 |
+| dirkmc | 7 | +1154/-726 | 29 |
+| Jennifer Wang | 9 | +485/-341 | 26 |
+| Peter Rabbitson | 18 | +469/-273 | 64 |
+| Cory Schwartz | 5 | +576/-135 | 14 |
+| hunjixin | 7 | +404/-82 | 19 |
+| ZenGround0 | 17 | +284/-135 | 44 |
+| Dirk McCormick | 17 | +348/-47 | 17 |
+| Raúl Kripalani | 18 | +254/-97 | 62 |
+| tchardin | 1 | +261/-33 | 4 |
+| Jakub Sztandera | 4 | +254/-16 | 4 |
+| Aarsh Shah | 2 | +196/-40 | 28 |
+| whyrusleeping | 3 | +150/-9 | 8 |
+| Whyrusleeping | 2 | +87/-66 | 10 |
+| Aayush Rajasekaran | 10 | +81/-53 | 13 |
+| zgfzgf | 2 | +104/-4 | 2 |
+| aarshkshah1992 | 4 | +73/-7 | 6 |
+| llifezou | 4 | +59/-20 | 4 |
+| Steven Allen | 7 | +47/-17 | 9 |
+| johnli-helloworld | 3 | +46/-15 | 5 |
+| frrist | 1 | +28/-23 | 2 |
+| Jennifer | 4 | +31/-2 | 4 |
+| wangchao | 1 | +1/-27 | 1 |
+| Jiaying Wang | 2 | +7/-21 | 2 |
+| hannahhoward | 3 | +21/-2 | 3 |
+| 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 |
+| Travis Person | 2 | +2/-2 | 3 |
 | Liviu Damian | 2 | +2/-2 | 2 |
-| @jimpick | 2 | +2/-2 | 2 |
+| Jim Pick | 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. 
@@ -1037,6 +432,13 @@ Contributors
 | @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 lotus-stats
+RUN make lotus lotus-miner lotus-worker lotus-shed lotus-wallet lotus-gateway
 
 
 FROM ubuntu:20.04 AS base
@@ -66,6 +66,8 @@ 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 ""
 
@@ -90,6 +92,8 @@ 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
@@ -110,6 +114,10 @@ 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
@@ -127,7 +135,11 @@ 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
@@ -151,7 +163,10 @@ 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
@@ -171,11 +186,16 @@ 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/
@@ -183,7 +203,6 @@ 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/
-COPY --from=builder /opt/filecoin/lotus-stats /usr/local/bin/
 
 RUN mkdir /var/tmp/filecoin-proof-parameters
 RUN mkdir /var/lib/lotus

LOTUS_RELEASE_FLOW.md

@@ -1,142 +0,0 @@
-
-<!-- TOC -->
-
-- [`lotus` Release Flow](#lotus-release-flow)
-  - [Purpose](#purpose)
-  - [High-level Summary](#high-level-summary)
-  - [Motivation and Requirements](#motivation-and-requirements)
-  - [Adopted Conventions](#adopted-conventions)
-    - [Major Releases](#major-releases)
-    - [Mandatory Releases](#mandatory-releases)
-    - [Feature Releases](#feature-releases)
-    - [Examples Scenarios](#examples-scenarios)
-  - [Release Cycle](#release-cycle)
-    - [Patch Releases](#patch-releases)
-    - [Performing a Release](#performing-a-release)
-    - [Security Fix Policy](#security-fix-policy)
-  - [FAQ](#faq)
-    - [Why aren't Go major versions used more?](#why-arent-go-major-versions-used-more)
-  - [Related Items](#related-items)
-
-<!-- /TOC -->
-
-# `lotus` Release Flow
-
-## Purpose
-
-This document aims to describe how the Lotus team plans to ship releases of the Lotus implementation of Filecoin network. Interested parties can expect new releases to come out as described in this document.
-
-## High-level Summary
-
-- **Major releases** (1.0.0, 2.0.0, etc.) are reserved for significant changes to the Filecoin protocol that transform the network and its usecases. Such changes could include the addition of new Virtual Machines to the protocol, major upgrades to the Proofs of Replication used by Filecoin, etc.
-- Even minor releases (1.2.0, 1.4.0, etc.) of the Lotus software correspond to **mandatory releases** as they ship Filecoin network upgrades. Users **must** upgrade to these releases before a certain time in order to keep in sync with the Filecoin network. We aim to ensure there is at least one week before the upgrade deadline.
-- Patch versions of even minor releases (1.2.1, 1.4.2, etc.) correspond to **hotfix releases**. Such releases will only be shipped when a critical fix is needed to be applied on top of a mandatory release.
-- Odd minor releases (1.3.0, 1.5.0, etc.), as well as patch releases in these series (1.3.1, 1.5.2, etc.) correspond to **feature releases** with new development and bugfixes. These releases are not mandatory, but still highly recommended, **as they may contain critical security fixes**.
-- We aim to ship a new feature release of the Lotus software every 3 weeks, so users can expect a regular cadence of Lotus feature releases. Note that mandatory releases for network upgrades may disrupt this schedule.
-
-## Motivation and Requirements
-
-Our primary motivation is for users of the Lotus software (storage providers, storage clients, developers, etc.) to have a clear idea about when they can expect Lotus releases, and what they can expect in a release.
-
-In order to achieve this, we need the following from our release process and conventions:
-
-- Lotus version conventions make it immediately obvious whether a new Lotus release is mandatory or not. A release is mandatory if it ships a network upgrade to the Filecoin protocol.
-- The ability to ship critical fixes on top of mandatory releases, so as to avoid forcing users to consume larger unrelated changes.
-- A regular cadence of feature releases, so that users can know when a new Lotus release will be available for consumption.
-- The ability to ship any number of feature releases between two mandatory releases.
-- A clear description of the various stages of testing that a Lotus Release Candidate (RC) goes through.
-- Lotus Release issues will present a single source of truth for what may be contained in Lotus releases, including security fixes, and how they will be disclosed.
-
-## Adopted Conventions
-
-This section describes the conventions we have adopted. Users of Lotus are encouraged to review this in detail so as to be informed when new Lotus releases are shipped.
-
-### Major Releases
-
-Bumps to the Lotus major version number (1.0.0, 2.0.0, etc.) are reserved for significant changes to the Filecoin protocol that dramatically transform the network itself. Such changes could include the addition of new Virtual Machines to the protocol, major upgrades to the Proofs of Replication used by Filecoin, etc. These releases are expected to take lots of time to develop and will be rare.  See also "Why aren't Go major versions used more?" below.
-
-### Mandatory Releases
-
-Even bumps to the Lotus minor version number (1.2.0, 1.4.0, etc.) are reserved for **mandatory releases** that ship Filecoin network upgrades. Users **must** upgrade to these releases before a certain time in order to keep in sync with the Filecoin network.
-
-Depending on the scope of the upgrade, these releases may take up to several weeks to fully develop and test. We aim to ensure there are at least 2 weeks between the publication of the final Lotus release and the Filecoin network upgrade deadline.
-
-These releases do not follow a regular cadence, as they are developed in lockstep with the other implementations of the Filecoin protocol. As of August 2021, the developers aim to ship 3-4 Filecoin network upgrades a year, though smaller security-critical upgrades may occur unpredictably.
-
-Mandatory releases are somewhat sensitive since all Lotus users are forced to upgrade to them at the same time. As a result, they will be shipped on top of the most recent stable release of Lotus, which will generally be the latest Lotus release that has been in production for more than 2 weeks. (Note: given this rule, the basis of a mandatory release could be a mandatory release or a feature release depending on timing).  Mandatory releases will not include any new feature development or bugfixes that haven't already baked in production for 2+ weeks, except for the changes needed for the network upgrade itself. Further, any critical fixes that are needed after the network upgrade will be shipped as patch version bumps to the mandatory release (1.2.1, 1.2.2, etc.) This prevents users from being forced to quickly digest unnecessary changes.
-
-Users should generally aim to always upgrade to a new even minor version release since they either introduce a mandatory network upgrade or a critical fix.
-
-### Feature Releases
-
-All releases under an odd minor version number indicate **feature releases**. These could include releases such as 1.3.0, 1.3.1, 1.5.2, etc. 
-
-Feature releases include new development and bug fixes. They are not mandatory, but still highly recommended, **as they may contain critical security fixes**. Note that some of these releases may be very small patch releases that include critical hotfixes.  There is no way to distinguish between a bug fix release and a feature release on the "feature" version. Both cases will use the "patch" version number.
-
-We aim to ship a new feature release of the Lotus software from our development (master) branch every 3 weeks, so users can expect a regular cadence of Lotus feature releases. Note that mandatory releases for network upgrades may disrupt this schedule. For more, see the Release Cycle section (TODO: Link).
-
-### Examples Scenarios
-
-- **Scenario 1**: **Lotus 1.12.0 shipped a network upgrade, and no network upgrades are needed for a long while.**
-
-    In this case, the next feature release will be Lotus 1.13.0. In three-week intervals, we will ship Lotus 1.13.1, 1.13.2, and 1.13.3, all containing new features and bug fixes.
-
-    Let us assume that after the release of 1.13.3, a critical issue is discovered and a hotfix quickly developed. This hotfix will then be shipped in **both** 1.12.1 and 1.13.4. Users who have already upgrade to the 1.13 series can simply upgrade to 1.13.4. Users who have chosen to still be on 1.12.0, however, can use 1.12.1 to patch the critical issue without being forced to consume all the changes in the 1.13 series.
-
-- **Scenario 2**: **Lotus 1.12.0 shipped a network upgrade, but the need for an unexpected network upgrade soon arises**
-
-    In this case, the Lotus 1.13 series will be dropped entirely, including any RCs that may have been undergoing testing. Instead, the network upgrade will be shipped as Lotus 1.14.0, built on top of Lotus 1.12.0. It will thus include no unnecessary changes, only the work needed to support the new network upgrade.
-
-    Any changes that were being worked on in the 1.13.0 series will then get applied on top of Lotus 1.14.0 and get shipped as Lotus 1.15.0.
-
-## Release Cycle
-
-A mandatory release process should take about 3-6 weeks, depending on the amount and the overall complexity of new features being introduced to the network protocol. It may also be shorter if there is a network incident that requires an emergency upgrade.  A feature release process should take about 2-3 weeks. 
-
-The start time of the mandatory release process is subject to the network upgrade timeline. We will start a new feature release process every 3 weeks on Tuesdays, regardless of when the previous release landed unless it's still ongoing.
-
-### Patch Releases
-
-**Mandatory Release**
-
-If we encounter a serious bug in a mandatory release post a network upgrade, we will create a patch release based on this release. Strictly only the fix to the bug will be included in the patch, and the bug fix will be backported to the master (dev) branch, and any ongoing feature release branch if applicable.
-
-Patch release process for the mandatory releases will follow a compressed release cycle from hours to days depending on the severity and the impact to the network of the bug. In a patch release:
-
-1. Automated and internal testing (stage 0 and 1) will be compressed into a few hours.
-2. Stage 2-3 will be skipped or shortened case by case.
-
-Some patch releases, especially ones fixing one or more complex bugs that doesn't require a follow-up mandatory upgrade, may undergo the full release process.
-
-**Feature Release**
-
-Patch releases in odd minor releases (1.3.0, 1.5.0, etc.) like 1.3.1, 1.5.2 and etc are corresponding to another **feature releases** with new development and bugfixes. These releases are not mandatory, but still **highly** recommended, **as they may contain critical security fixes**.
-
----
-
-### Performing a Release
-
-At the beginning of each release cycle, we will generate our "Release tracking issue", which is populated with the content at [https://github.com/filecoin-project/lotus/blob/master/documentation/misc/RELEASE_ISSUE_TEMPLATE.md](https://github.com/filecoin-project/lotus/blob/master/documentation/misc/RELEASE_ISSUE_TEMPLATE.md) 
-
-This template will be used to track major goals we have, a planned shipping date, and a complete release checklist tied to a specific release.
-
-### Security Fix Policy
-
-Any release may contain security fixes. Unless the fix addresses a bug being exploited in the wild, the fix will *not* be called out in the release notes. Please make sure to update ASAP.
-
-By policy, the team will usually wait until about 3 weeks after the final release to announce any fixed security issues. However, depending on the impact and ease of discovery of the issue, the team may wait more or less time.
-
- It is important to always update to the latest version ASAP and file issues if you're unable to update for some reason.
-
-Finally, unless a security issue is actively being exploited or a significant number of users are unable to update to the latest version (e.g., due to a difficult migration, breaking changes, etc.), security fixes will *not* be backported to previous releases.
-
-## FAQ
-
-### Why aren't Go major versions used more?
-
-Golang tightly couples source code with versioning (major versions beyond v1 leak into import paths).  This poses logistical difficulties to using major versions here.  Concretely, if we were to pick a policy that bumped the major version on every network upgrade, we would disrupt every single downstream library/application that consumed the native Lotus API (e.g., libraries depending on the JSON-RPC client, testground tests). They would need to update their code every single time that we released a network breaking change, even if it brought on zero expectation of breakage for the Golang APIs that they depend on. In this scenario, we are signaling breakage on the wrong API surface! We're signaling breakage on the Go level, when what breaks is the network protocol.
-
-## Related Items
-
-1. [Release Issue template](https://github.com/filecoin-project/lotus/blob/master/documentation/misc/RELEASE_ISSUE_TEMPLATE.md)
-2. [Lotus Release Flow Discussion](https://github.com/filecoin-project/lotus/discussions/7053): Leave a comment if you have any questions or feedbacks with regard to the lotus release flow.

Makefile

@@ -5,9 +5,7 @@ all: build
 
 unexport GOFLAGS
 
-GOCC?=go
-
-GOVERSION:=$(shell $(GOCC) version | tr ' ' '\n' | grep go1 | sed 's/^go//' | awk -F. '{printf "%d%03d%03d", $$1, $$2, $$3}')
+GOVERSION:=$(shell go version | cut -d' ' -f 3 | sed 's/^go//' | awk -F. '{printf "%d%03d%03d", $$1, $$2, $$3}')
 ifeq ($(shell expr $(GOVERSION) \< 1016000), 1)
 $(warning Your Golang version is go$(shell expr $(GOVERSION) / 1000000).$(shell expr $(GOVERSION) % 1000000 / 1000).$(shell expr $(GOVERSION) % 1000))
 $(error Update Golang to version to at least 1.16.0)
@@ -76,6 +74,9 @@ debug: build-devnets
 calibnet: GOFLAGS+=-tags=calibnet
 calibnet: build-devnets
 
+nerpanet: GOFLAGS+=-tags=nerpanet
+nerpanet: build-devnets
+
 butterflynet: GOFLAGS+=-tags=butterflynet
 butterflynet: build-devnets
 
@@ -84,32 +85,32 @@ interopnet: build-devnets
 
 lotus: $(BUILD_DEPS)
 	rm -f lotus
-	$(GOCC) build $(GOFLAGS) -o lotus ./cmd/lotus
+	go build $(GOFLAGS) -o lotus ./cmd/lotus
 
 .PHONY: lotus
 BINS+=lotus
 
 lotus-miner: $(BUILD_DEPS)
 	rm -f lotus-miner
-	$(GOCC) build $(GOFLAGS) -o lotus-miner ./cmd/lotus-miner
+	go build $(GOFLAGS) -o lotus-miner ./cmd/lotus-miner
 .PHONY: lotus-miner
 BINS+=lotus-miner
 
 lotus-worker: $(BUILD_DEPS)
 	rm -f lotus-worker
-	$(GOCC) build $(GOFLAGS) -o lotus-worker ./cmd/lotus-seal-worker
+	go build $(GOFLAGS) -o lotus-worker ./cmd/lotus-seal-worker
 .PHONY: lotus-worker
 BINS+=lotus-worker
 
 lotus-shed: $(BUILD_DEPS)
 	rm -f lotus-shed
-	$(GOCC) build $(GOFLAGS) -o lotus-shed ./cmd/lotus-shed
+	go build $(GOFLAGS) -o lotus-shed ./cmd/lotus-shed
 .PHONY: lotus-shed
 BINS+=lotus-shed
 
 lotus-gateway: $(BUILD_DEPS)
 	rm -f lotus-gateway
-	$(GOCC) build $(GOFLAGS) -o lotus-gateway ./cmd/lotus-gateway
+	go build $(GOFLAGS) -o lotus-gateway ./cmd/lotus-gateway
 .PHONY: lotus-gateway
 BINS+=lotus-gateway
 
@@ -137,19 +138,19 @@ install-app:
 
 lotus-seed: $(BUILD_DEPS)
 	rm -f lotus-seed
-	$(GOCC) build $(GOFLAGS) -o lotus-seed ./cmd/lotus-seed
+	go build $(GOFLAGS) -o lotus-seed ./cmd/lotus-seed
 
 .PHONY: lotus-seed
 BINS+=lotus-seed
 
 benchmarks:
-	$(GOCC) run github.com/whyrusleeping/bencher ./... > bench.json
+	go run github.com/whyrusleeping/bencher ./... > bench.json
 	@echo Submitting results
 	@curl -X POST 'http://benchmark.kittyhawk.wtf/benchmark' -d '@bench.json' -u "${benchmark_http_cred}"
 .PHONY: benchmarks
 
 lotus-pond: 2k
-	$(GOCC) build -o lotus-pond ./lotuspond
+	go build -o lotus-pond ./lotuspond
 .PHONY: lotus-pond
 BINS+=lotus-pond
 
@@ -160,64 +161,85 @@ lotus-pond-front:
 lotus-pond-app: lotus-pond-front lotus-pond
 .PHONY: lotus-pond-app
 
+lotus-townhall:
+	rm -f lotus-townhall
+	go build -o lotus-townhall ./cmd/lotus-townhall
+.PHONY: lotus-townhall
+BINS+=lotus-townhall
+
+lotus-townhall-front:
+	(cd ./cmd/lotus-townhall/townhall && npm i && npm run build)
+.PHONY: lotus-townhall-front
+
+lotus-townhall-app: lotus-touch lotus-townhall-front
+.PHONY: lotus-townhall-app
+
 lotus-fountain:
 	rm -f lotus-fountain
-	go build $(GOFLAGS) -o lotus-fountain ./cmd/lotus-fountain
-	go run github.com/GeertJohan/go.rice/rice append --exec lotus-fountain -i ./cmd/lotus-fountain -i ./build
+	go build -o lotus-fountain ./cmd/lotus-fountain
 .PHONY: lotus-fountain
 BINS+=lotus-fountain
 
+lotus-chainwatch:
+	rm -f lotus-chainwatch
+	go build $(GOFLAGS) -o lotus-chainwatch ./cmd/lotus-chainwatch
+.PHONY: lotus-chainwatch
+BINS+=lotus-chainwatch
+
 lotus-bench:
 	rm -f lotus-bench
-	$(GOCC) build -o lotus-bench ./cmd/lotus-bench
+	go build -o lotus-bench ./cmd/lotus-bench
 .PHONY: lotus-bench
 BINS+=lotus-bench
 
 lotus-stats:
 	rm -f lotus-stats
-	$(GOCC) build $(GOFLAGS) -o lotus-stats ./cmd/lotus-stats
+	go build $(GOFLAGS) -o lotus-stats ./cmd/lotus-stats
 .PHONY: lotus-stats
 BINS+=lotus-stats
 
 lotus-pcr:
 	rm -f lotus-pcr
-	$(GOCC) build $(GOFLAGS) -o lotus-pcr ./cmd/lotus-pcr
+	go build $(GOFLAGS) -o lotus-pcr ./cmd/lotus-pcr
 .PHONY: lotus-pcr
 BINS+=lotus-pcr
 
 lotus-health:
 	rm -f lotus-health
-	$(GOCC) build -o lotus-health ./cmd/lotus-health
+	go build -o lotus-health ./cmd/lotus-health
 .PHONY: lotus-health
 BINS+=lotus-health
 
 lotus-wallet:
 	rm -f lotus-wallet
-	$(GOCC) build -o lotus-wallet ./cmd/lotus-wallet
+	go build -o lotus-wallet ./cmd/lotus-wallet
 .PHONY: lotus-wallet
 BINS+=lotus-wallet
 
 lotus-keygen:
 	rm -f lotus-keygen
-	$(GOCC) build -o lotus-keygen ./cmd/lotus-keygen
+	go build -o lotus-keygen ./cmd/lotus-keygen
 .PHONY: lotus-keygen
 BINS+=lotus-keygen
 
 testground:
-	$(GOCC) build -tags testground -o /dev/null ./cmd/lotus
+	go build -tags testground -o /dev/null ./cmd/lotus
 .PHONY: testground
 BINS+=testground
 
 
 tvx:
 	rm -f tvx
-	$(GOCC) build -o tvx ./cmd/tvx
+	go build -o tvx ./cmd/tvx
 .PHONY: tvx
 BINS+=tvx
 
+install-chainwatch: lotus-chainwatch
+	install -C ./lotus-chainwatch /usr/local/bin/lotus-chainwatch
+
 lotus-sim: $(BUILD_DEPS)
 	rm -f lotus-sim
-	$(GOCC) build $(GOFLAGS) -o lotus-sim ./cmd/lotus-sim
+	go build $(GOFLAGS) -o lotus-sim ./cmd/lotus-sim
 .PHONY: lotus-sim
 BINS+=lotus-sim
 
@@ -239,13 +261,21 @@ install-miner-service: install-miner install-daemon-service
 	@echo
 	@echo "lotus-miner service installed. Don't forget to run 'sudo systemctl start lotus-miner' to start it and 'sudo systemctl enable lotus-miner' for it to be enabled on startup."
 
+install-chainwatch-service: install-chainwatch install-daemon-service
+	mkdir -p /etc/systemd/system
+	mkdir -p /var/log/lotus
+	install -C -m 0644 ./scripts/lotus-chainwatch.service /etc/systemd/system/lotus-chainwatch.service
+	systemctl daemon-reload
+	@echo
+	@echo "chainwatch service installed. Don't forget to run 'sudo systemctl start lotus-chainwatch' to start it and 'sudo systemctl enable lotus-chainwatch' for it to be enabled on startup."
+
 install-main-services: install-miner-service
 
-install-all-services: install-main-services
+install-all-services: install-main-services install-chainwatch-service
 
 install-services: install-main-services
 
-clean-daemon-service: clean-miner-service
+clean-daemon-service: clean-miner-service clean-chainwatch-service
 	-systemctl stop lotus-daemon
 	-systemctl disable lotus-daemon
 	rm -f /etc/systemd/system/lotus-daemon.service
@@ -257,6 +287,12 @@ clean-miner-service:
 	rm -f /etc/systemd/system/lotus-miner.service
 	systemctl daemon-reload
 
+clean-chainwatch-service:
+	-systemctl stop lotus-chainwatch
+	-systemctl disable lotus-chainwatch
+	rm -f /etc/systemd/system/lotus-chainwatch.service
+	systemctl daemon-reload
+
 clean-main-services: clean-daemon-service
 
 clean-all-services: clean-main-services
@@ -283,26 +319,25 @@ dist-clean:
 .PHONY: dist-clean
 
 type-gen: api-gen
-	$(GOCC) run ./gen/main.go
-	$(GOCC) generate -x ./...
+	go run ./gen/main.go
+	go generate -x ./...
 	goimports -w api/
 
 method-gen: api-gen
-	(cd ./lotuspond/front/src/chain && $(GOCC) run ./methodgen.go)
+	(cd ./lotuspond/front/src/chain && go run ./methodgen.go)
 
 actors-gen:
-	$(GOCC) run ./gen/inline-gen . gen/inlinegen-data.json
-	$(GOCC) run ./chain/actors/agen
-	$(GOCC) fmt ./...
+	go run ./chain/actors/agen
+	go fmt ./...
 
 api-gen:
-	$(GOCC) run ./gen/api
+	go run ./gen/api
 	goimports -w api
 	goimports -w api
 .PHONY: api-gen
 
 cfgdoc-gen:
-	$(GOCC) run ./node/config/cfgdocgen > ./node/config/doc_gen.go
+	go run ./node/config/cfgdocgen > ./node/config/doc_gen.go
 
 appimage: lotus
 	rm -rf appimage-builder-cache || true
@@ -316,9 +351,9 @@ appimage: lotus
 docsgen: docsgen-md docsgen-openrpc
 
 docsgen-md-bin: api-gen actors-gen
-	$(GOCC) build $(GOFLAGS) -o docgen-md ./api/docgen/cmd
+	go build $(GOFLAGS) -o docgen-md ./api/docgen/cmd
 docsgen-openrpc-bin: api-gen actors-gen
-	$(GOCC) build $(GOFLAGS) -o docgen-openrpc ./api/docgen-openrpc/cmd
+	go build $(GOFLAGS) -o docgen-openrpc ./api/docgen-openrpc/cmd
 
 docsgen-md: docsgen-md-full docsgen-md-storage docsgen-md-worker
 
@@ -342,7 +377,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
-	@echo ">>> IF YOU'VE MODIFIED THE CLI OR CONFIG, REMEMBER TO ALSO MAKE docsgen-cli"
+	@echo ">>> IF YOU'VE MODIFIED THE CLI, REMEMBER TO ALSO MAKE docsgen-cli"
 .PHONY: gen
 
 snap: lotus lotus-miner lotus-worker
@@ -352,8 +387,6 @@ snap: lotus lotus-miner lotus-worker
 # separate from gen because it needs binaries
 docsgen-cli: lotus lotus-miner lotus-worker
 	python ./scripts/generate-lotus-cli.py
-	./lotus config default > documentation/en/default-lotus-config.toml
-	./lotus-miner config default > documentation/en/default-lotus-miner-config.toml
 .PHONY: docsgen-cli
 
 print-%:

README.md

@@ -123,6 +123,7 @@ Note: The default branch `master` is the dev branch where the latest new feature
 
    # Or to join a testnet or devnet:
    make clean calibnet # Calibration with min 32GiB sectors
+   make clean nerpanet # Nerpa with min 512MiB sectors
 
    sudo make install
    ```

api/api_common.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	apitypes "github.com/filecoin-project/lotus/api/types"
-	"github.com/filecoin-project/lotus/journal/alerting"
 
 	"github.com/google/uuid"
 
@@ -34,10 +33,6 @@ type Common interface {
 	LogList(context.Context) ([]string, error)         //perm:write
 	LogSetLevel(context.Context, string, string) error //perm:write
 
-	// LogAlerts returns list of all, active and inactive alerts tracked by the
-	// node
-	LogAlerts(ctx context.Context) ([]alerting.Alert, error) //perm:admin
-
 	// MethodGroup: Common
 
 	// Version provides information about API provider

api/api_full.go

@@ -6,20 +6,20 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/filecoin-project/lotus/node/repo/importmgr"
 	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p-core/peer"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-bitfield"
 	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-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/dline"
 
-	"github.com/filecoin-project/go-fil-markets/retrievalmarket"
-	"github.com/filecoin-project/go-fil-markets/storagemarket"
-
 	apitypes "github.com/filecoin-project/lotus/api/types"
 	"github.com/filecoin-project/lotus/chain/actors/builtin"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/market"
@@ -27,8 +27,8 @@ import (
 	"github.com/filecoin-project/lotus/chain/actors/builtin/paych"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/power"
 	"github.com/filecoin-project/lotus/chain/types"
+	marketevents "github.com/filecoin-project/lotus/markets/loggers"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
-	"github.com/filecoin-project/lotus/node/repo/imports"
 )
 
 //go:generate go run github.com/golang/mock/mockgen -destination=mocks/mock_full.go -package=mocks . FullNode
@@ -71,6 +71,12 @@ type FullNode interface {
 	// ChainHead returns the current head of the chain.
 	ChainHead(context.Context) (*types.TipSet, error) //perm:read
 
+	// ChainGetRandomnessFromTickets is used to sample the chain for randomness.
+	ChainGetRandomnessFromTickets(ctx context.Context, tsk types.TipSetKey, personalization crypto.DomainSeparationTag, randEpoch abi.ChainEpoch, entropy []byte) (abi.Randomness, error) //perm:read
+
+	// ChainGetRandomnessFromBeacon is used to sample the beacon for randomness.
+	ChainGetRandomnessFromBeacon(ctx context.Context, tsk types.TipSetKey, personalization crypto.DomainSeparationTag, randEpoch abi.ChainEpoch, entropy []byte) (abi.Randomness, error) //perm:read
+
 	// ChainGetBlock returns the block specified by the given CID.
 	ChainGetBlock(context.Context, cid.Cid) (*types.BlockHeader, error) //perm:read
 	// ChainGetTipSet returns the tipset specified by the given TipSetKey.
@@ -107,11 +113,6 @@ type FullNode interface {
 	// will be returned.
 	ChainGetTipSetByHeight(context.Context, abi.ChainEpoch, types.TipSetKey) (*types.TipSet, error) //perm:read
 
-	// ChainGetTipSetAfterHeight looks back for a tipset at the specified epoch.
-	// If there are no blocks at the specified epoch, the first non-nil tipset at a later epoch
-	// will be returned.
-	ChainGetTipSetAfterHeight(context.Context, abi.ChainEpoch, types.TipSetKey) (*types.TipSet, error) //perm:read
-
 	// ChainReadObj reads ipld nodes referenced by the specified CID from chain
 	// blockstore and returns raw bytes.
 	ChainReadObj(context.Context, cid.Cid) ([]byte, error) //perm:read
@@ -289,7 +290,7 @@ type FullNode interface {
 
 	// // UX ?
 
-	// MethodGroup: WalletF
+	// MethodGroup: Wallet
 
 	// WalletNew creates a new address in the wallet with the given sigType.
 	// Available key types: bls, secp256k1, secp256k1-ledger
@@ -330,7 +331,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 imports.ID) 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.
@@ -350,11 +351,10 @@ type FullNode interface {
 	// ClientMinerQueryOffer returns a QueryOffer for the specific miner and file.
 	ClientMinerQueryOffer(ctx context.Context, miner address.Address, root cid.Cid, piece *cid.Cid) (QueryOffer, error) //perm:read
 	// ClientRetrieve initiates the retrieval of a file, as specified in the order.
-	ClientRetrieve(ctx context.Context, params RetrievalOrder) (*RestrievalRes, error) //perm:admin
-	// ClientRetrieveWait waits for retrieval to be complete
-	ClientRetrieveWait(ctx context.Context, deal retrievalmarket.DealID) error //perm:admin
-	// ClientExport exports a file stored in the local filestore to a system file
-	ClientExport(ctx context.Context, exportRef ExportRef, fileRef FileRef) error //perm:admin
+	ClientRetrieve(ctx context.Context, order RetrievalOrder, ref *FileRef) error //perm:admin
+	// ClientRetrieveWithEvents initiates the retrieval of a file, as specified in the order, and provides a channel
+	// of status updates.
+	ClientRetrieveWithEvents(ctx context.Context, order RetrievalOrder, ref *FileRef) (<-chan marketevents.RetrievalEvent, error) //perm:admin
 	// ClientListRetrievals returns information about retrievals made by the local client
 	ClientListRetrievals(ctx context.Context) ([]RetrievalInfo, error) //perm:write
 	// ClientGetRetrievalUpdates returns status of updated retrieval deals
@@ -428,8 +428,6 @@ type FullNode interface {
 	StateListMessages(ctx context.Context, match *MessageMatch, tsk types.TipSetKey, toht abi.ChainEpoch) ([]cid.Cid, error) //perm:read
 	// StateDecodeParams attempts to decode the provided params, based on the recipient actor address and method number.
 	StateDecodeParams(ctx context.Context, toAddr address.Address, method abi.MethodNum, params []byte, tsk types.TipSetKey) (interface{}, error) //perm:read
-	// StateEncodeParams attempts to encode the provided json params to the binary from
-	StateEncodeParams(ctx context.Context, toActCode cid.Cid, method abi.MethodNum, params json.RawMessage) ([]byte, error) //perm:read
 
 	// StateNetworkName returns the name of the network the node is synced to
 	StateNetworkName(context.Context) (dtypes.NetworkName, error) //perm:read
@@ -585,11 +583,6 @@ type FullNode interface {
 	// StateNetworkVersion returns the network version at the given tipset
 	StateNetworkVersion(context.Context, types.TipSetKey) (apitypes.NetworkVersion, error) //perm:read
 
-	// StateGetRandomnessFromTickets is used to sample the chain for randomness.
-	StateGetRandomnessFromTickets(ctx context.Context, personalization crypto.DomainSeparationTag, randEpoch abi.ChainEpoch, entropy []byte, tsk types.TipSetKey) (abi.Randomness, error) //perm:read
-	// StateGetRandomnessFromBeacon is used to sample the beacon for randomness.
-	StateGetRandomnessFromBeacon(ctx context.Context, personalization crypto.DomainSeparationTag, randEpoch abi.ChainEpoch, entropy []byte, tsk types.TipSetKey) (abi.Randomness, error) //perm:read
-
 	// MethodGroup: Msig
 	// The Msig methods are used to interact with multisig wallets on the
 	// filecoin network
@@ -629,14 +622,10 @@ type FullNode interface {
 	// <sender address of the approve msg>, <method to call in the proposed message>, <params to include in the proposed message>
 	MsigApproveTxnHash(context.Context, address.Address, uint64, address.Address, address.Address, types.BigInt, address.Address, uint64, []byte) (*MessagePrototype, error) //perm:sign
 
-	// MsigCancel cancels a previously-proposed multisig message
-	// It takes the following params: <multisig address>, <proposed transaction ID> <signer address>
-	MsigCancel(context.Context, address.Address, uint64, address.Address) (*MessagePrototype, error) //perm:sign
-
 	// MsigCancel cancels a previously-proposed multisig message
 	// It takes the following params: <multisig address>, <proposed transaction ID>, <recipient address>, <value to transfer>,
 	// <sender address of the cancel msg>, <method to call in the proposed message>, <params to include in the proposed message>
-	MsigCancelTxnHash(context.Context, address.Address, uint64, address.Address, types.BigInt, address.Address, uint64, []byte) (*MessagePrototype, error) //perm:sign
+	MsigCancel(context.Context, address.Address, uint64, address.Address, types.BigInt, address.Address, uint64, []byte) (*MessagePrototype, error) //perm:sign
 
 	// MsigAddPropose proposes adding a signer in the multisig
 	// It takes the following params: <multisig address>, <sender address of the propose msg>,
@@ -734,28 +723,17 @@ type MinerSectors struct {
 
 type ImportRes struct {
 	Root     cid.Cid
-	ImportID imports.ID
+	ImportID importmgr.ImportID
 }
 
 type Import struct {
-	Key imports.ID
+	Key importmgr.ImportID
 	Err string
 
-	Root *cid.Cid
-
-	// Source is the provenance of the import, e.g. "import", "unknown", else.
-	// Currently useless but may be used in the future.
-	Source string
-
-	// FilePath is the path of the original file. It is important that the file
-	// is retained at this path, because it will be referenced during
-	// the transfer (when we do the UnixFS chunking, we don't duplicate the
-	// leaves, but rather point to chunks of the original data through
-	// positional references).
-	FilePath string
-
-	// CARPath is the path of the CAR file containing the DAG for this import.
-	CARPath string
+	Root          *cid.Cid
+	Source        string
+	FilePath      string
+	CARv2FilePath string
 }
 
 type DealInfo struct {
@@ -900,7 +878,6 @@ type QueryOffer struct {
 	Size                    uint64
 	MinPrice                types.BigInt
 	UnsealPrice             types.BigInt
-	PricePerByte            abi.TokenAmount
 	PaymentInterval         uint64
 	PaymentIntervalIncrease uint64
 	Miner                   address.Address
@@ -934,14 +911,14 @@ type MarketDeal struct {
 }
 
 type RetrievalOrder struct {
-	Root         cid.Cid
-	Piece        *cid.Cid
-	DataSelector *Selector
-
-	// todo: Size/Total are only used for calculating price per byte; we should let users just pass that
+	// TODO: make this less unixfs specific
+	Root  cid.Cid
+	Piece *cid.Cid
 	Size  uint64
-	Total types.BigInt
 
+	LocalCARV2FilePath string // if specified, get data from a local CARv2 file.
+	// TODO: support offset
+	Total                   types.BigInt
 	UnsealPrice             types.BigInt
 	PaymentInterval         uint64
 	PaymentIntervalIncrease uint64
@@ -1084,7 +1061,7 @@ type CirculatingSupply struct {
 type MiningBaseInfo struct {
 	MinerPower        types.BigInt
 	NetworkPower      types.BigInt
-	Sectors           []builtin.ExtendedSectorInfo
+	Sectors           []builtin.SectorInfo
 	WorkerKey         address.Address
 	SectorSize        abi.SectorSize
 	PrevBeaconEntry   types.BeaconEntry

api/api_gateway.go

@@ -31,17 +31,12 @@ import (
 type Gateway interface {
 	ChainHasObj(context.Context, cid.Cid) (bool, error)
 	ChainHead(ctx context.Context) (*types.TipSet, error)
-	ChainGetParentMessages(context.Context, cid.Cid) ([]Message, error)
-	ChainGetParentReceipts(context.Context, cid.Cid) ([]*types.MessageReceipt, error)
 	ChainGetBlockMessages(context.Context, cid.Cid) (*BlockMessages, error)
 	ChainGetMessage(ctx context.Context, mc cid.Cid) (*types.Message, error)
-	ChainGetPath(ctx context.Context, from, to types.TipSetKey) ([]*HeadChange, error)
 	ChainGetTipSet(ctx context.Context, tsk types.TipSetKey) (*types.TipSet, error)
 	ChainGetTipSetByHeight(ctx context.Context, h abi.ChainEpoch, tsk types.TipSetKey) (*types.TipSet, error)
-	ChainGetTipSetAfterHeight(ctx context.Context, h abi.ChainEpoch, tsk types.TipSetKey) (*types.TipSet, error)
 	ChainNotify(context.Context) (<-chan []*HeadChange, error)
 	ChainReadObj(context.Context, cid.Cid) ([]byte, error)
-	ChainGetGenesis(context.Context) (*types.TipSet, error)
 	GasEstimateMessageGas(ctx context.Context, msg *types.Message, spec *MessageSendSpec, tsk types.TipSetKey) (*types.Message, error)
 	MpoolPush(ctx context.Context, sm *types.SignedMessage) (cid.Cid, error)
 	MsigGetAvailableBalance(ctx context.Context, addr address.Address, tsk types.TipSetKey) (types.BigInt, error)

api/api_net.go

@@ -51,15 +51,6 @@ type Net interface {
 	NetBlockRemove(ctx context.Context, acl NetBlockList) error //perm:admin
 	NetBlockList(ctx context.Context) (NetBlockList, error)     //perm:read
 
-	NetProtectAdd(ctx context.Context, acl []peer.ID) error    //perm:admin
-	NetProtectRemove(ctx context.Context, acl []peer.ID) error //perm:admin
-	NetProtectList(ctx context.Context) ([]peer.ID, error)     //perm:read
-
-	// ResourceManager API
-	NetStat(ctx context.Context, scope string) (NetStat, error)          //perm:read
-	NetLimit(ctx context.Context, scope string) (NetLimit, error)        //perm:read
-	NetSetLimit(ctx context.Context, scope string, limit NetLimit) error //perm:admin
-
 	// ID returns peerID of libp2p node backing this API
 	ID(context.Context) (peer.ID, error) //perm:read
 }

api/api_storage.go

@@ -13,14 +13,12 @@ import (
 
 	"github.com/filecoin-project/go-address"
 	datatransfer "github.com/filecoin-project/go-data-transfer"
-	"github.com/filecoin-project/go-state-types/abi"
-	abinetwork "github.com/filecoin-project/go-state-types/network"
-	"github.com/filecoin-project/specs-actors/v2/actors/builtin/market"
-	"github.com/filecoin-project/specs-storage/storage"
-
 	"github.com/filecoin-project/go-fil-markets/piecestore"
 	"github.com/filecoin-project/go-fil-markets/retrievalmarket"
 	"github.com/filecoin-project/go-fil-markets/storagemarket"
+	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/specs-actors/v2/actors/builtin/market"
+	"github.com/filecoin-project/specs-storage/storage"
 
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/lotus/extern/sector-storage/fsutil"
@@ -100,8 +98,8 @@ type StorageMiner interface {
 	// Returns null if message wasn't sent
 	SectorTerminateFlush(ctx context.Context) (*cid.Cid, error) //perm:admin
 	// SectorTerminatePending returns a list of pending sector terminations to be sent in the next batch message
-	SectorTerminatePending(ctx context.Context) ([]abi.SectorID, error)             //perm:admin
-	SectorMarkForUpgrade(ctx context.Context, id abi.SectorNumber, snap bool) error //perm:admin
+	SectorTerminatePending(ctx context.Context) ([]abi.SectorID, error)  //perm:admin
+	SectorMarkForUpgrade(ctx context.Context, id abi.SectorNumber) error //perm:admin
 	// SectorPreCommitFlush immediately sends a PreCommit message with sectors batched for PreCommit.
 	// Returns null if message wasn't sent
 	SectorPreCommitFlush(ctx context.Context) ([]sealiface.PreCommitBatchRes, error) //perm:admin
@@ -112,7 +110,6 @@ type StorageMiner interface {
 	SectorCommitFlush(ctx context.Context) ([]sealiface.CommitBatchRes, error) //perm:admin
 	// SectorCommitPending returns a list of pending Commit sectors to be sent in the next aggregate message
 	SectorCommitPending(ctx context.Context) ([]abi.SectorID, error) //perm:admin
-	SectorMatchPendingPiecesToOpenSectors(ctx context.Context) error //perm:admin
 
 	// WorkerConnect tells the node to connect to workers RPC
 	WorkerConnect(context.Context, string) error                              //perm:admin retry:true
@@ -120,21 +117,17 @@ type StorageMiner interface {
 	WorkerJobs(context.Context) (map[uuid.UUID][]storiface.WorkerJob, error)  //perm:admin
 
 	//storiface.WorkerReturn
-	ReturnAddPiece(ctx context.Context, callID storiface.CallID, pi abi.PieceInfo, err *storiface.CallError) error                                      //perm:admin retry:true
-	ReturnSealPreCommit1(ctx context.Context, callID storiface.CallID, p1o storage.PreCommit1Out, err *storiface.CallError) error                       //perm:admin retry:true
-	ReturnSealPreCommit2(ctx context.Context, callID storiface.CallID, sealed storage.SectorCids, err *storiface.CallError) error                       //perm:admin retry:true
-	ReturnSealCommit1(ctx context.Context, callID storiface.CallID, out storage.Commit1Out, err *storiface.CallError) error                             //perm:admin retry:true
-	ReturnSealCommit2(ctx context.Context, callID storiface.CallID, proof storage.Proof, err *storiface.CallError) error                                //perm:admin retry:true
-	ReturnFinalizeSector(ctx context.Context, callID storiface.CallID, err *storiface.CallError) error                                                  //perm:admin retry:true
-	ReturnReplicaUpdate(ctx context.Context, callID storiface.CallID, out storage.ReplicaUpdateOut, err *storiface.CallError) error                     //perm:admin retry:true
-	ReturnProveReplicaUpdate1(ctx context.Context, callID storiface.CallID, vanillaProofs storage.ReplicaVanillaProofs, err *storiface.CallError) error //perm:admin retry:true
-	ReturnProveReplicaUpdate2(ctx context.Context, callID storiface.CallID, proof storage.ReplicaUpdateProof, err *storiface.CallError) error           //perm:admin retry:true
-	ReturnGenerateSectorKeyFromData(ctx context.Context, callID storiface.CallID, err *storiface.CallError) error                                       //perm:admin retry:true
-	ReturnReleaseUnsealed(ctx context.Context, callID storiface.CallID, err *storiface.CallError) error                                                 //perm:admin retry:true
-	ReturnMoveStorage(ctx context.Context, callID storiface.CallID, err *storiface.CallError) error                                                     //perm:admin retry:true
-	ReturnUnsealPiece(ctx context.Context, callID storiface.CallID, err *storiface.CallError) error                                                     //perm:admin retry:true
-	ReturnReadPiece(ctx context.Context, callID storiface.CallID, ok bool, err *storiface.CallError) error                                              //perm:admin retry:true
-	ReturnFetch(ctx context.Context, callID storiface.CallID, err *storiface.CallError) error                                                           //perm:admin retry:true
+	ReturnAddPiece(ctx context.Context, callID storiface.CallID, pi abi.PieceInfo, err *storiface.CallError) error                //perm:admin retry:true
+	ReturnSealPreCommit1(ctx context.Context, callID storiface.CallID, p1o storage.PreCommit1Out, err *storiface.CallError) error //perm:admin retry:true
+	ReturnSealPreCommit2(ctx context.Context, callID storiface.CallID, sealed storage.SectorCids, err *storiface.CallError) error //perm:admin retry:true
+	ReturnSealCommit1(ctx context.Context, callID storiface.CallID, out storage.Commit1Out, err *storiface.CallError) error       //perm:admin retry:true
+	ReturnSealCommit2(ctx context.Context, callID storiface.CallID, proof storage.Proof, err *storiface.CallError) error          //perm:admin retry:true
+	ReturnFinalizeSector(ctx context.Context, callID storiface.CallID, err *storiface.CallError) error                            //perm:admin retry:true
+	ReturnReleaseUnsealed(ctx context.Context, callID storiface.CallID, err *storiface.CallError) error                           //perm:admin retry:true
+	ReturnMoveStorage(ctx context.Context, callID storiface.CallID, err *storiface.CallError) error                               //perm:admin retry:true
+	ReturnUnsealPiece(ctx context.Context, callID storiface.CallID, err *storiface.CallError) error                               //perm:admin retry:true
+	ReturnReadPiece(ctx context.Context, callID storiface.CallID, ok bool, err *storiface.CallError) error                        //perm:admin retry:true
+	ReturnFetch(ctx context.Context, callID storiface.CallID, err *storiface.CallError) error                                     //perm:admin retry:true
 
 	// SealingSchedDiag dumps internal sealing scheduler state
 	SealingSchedDiag(ctx context.Context, doSched bool) (interface{}, error) //perm:admin
@@ -151,7 +144,6 @@ type StorageMiner interface {
 	StorageLock(ctx context.Context, sector abi.SectorID, read storiface.SectorFileType, write storiface.SectorFileType) error                                          //perm:admin
 	StorageTryLock(ctx context.Context, sector abi.SectorID, read storiface.SectorFileType, write storiface.SectorFileType) (bool, error)                               //perm:admin
 	StorageList(ctx context.Context) (map[stores.ID][]stores.Decl, error)                                                                                               //perm:admin
-	StorageGetLocks(ctx context.Context) (storiface.SectorLocks, error)                                                                                                 //perm:admin
 
 	StorageLocal(ctx context.Context) (map[stores.ID]string, error)       //perm:admin
 	StorageStat(ctx context.Context, id stores.ID) (fsutil.FsStat, error) //perm:admin
@@ -167,70 +159,12 @@ type StorageMiner interface {
 	MarketGetRetrievalAsk(ctx context.Context) (*retrievalmarket.Ask, error)                                                                                                             //perm:read
 	MarketListDataTransfers(ctx context.Context) ([]DataTransferChannel, error)                                                                                                          //perm:write
 	MarketDataTransferUpdates(ctx context.Context) (<-chan DataTransferChannel, error)                                                                                                   //perm:write
-	// MarketDataTransferDiagnostics generates debugging information about current data transfers over graphsync
-	MarketDataTransferDiagnostics(ctx context.Context, p peer.ID) (*TransferDiagnostics, error) //perm:write
 	// MarketRestartDataTransfer attempts to restart a data transfer with the given transfer ID and other peer
 	MarketRestartDataTransfer(ctx context.Context, transferID datatransfer.TransferID, otherPeer peer.ID, isInitiator bool) error //perm:write
 	// MarketCancelDataTransfer cancels a data transfer with the given transfer ID and other peer
 	MarketCancelDataTransfer(ctx context.Context, transferID datatransfer.TransferID, otherPeer peer.ID, isInitiator bool) error //perm:write
 	MarketPendingDeals(ctx context.Context) (PendingDealInfo, error)                                                             //perm:write
 	MarketPublishPendingDeals(ctx context.Context) error                                                                         //perm:admin
-	MarketRetryPublishDeal(ctx context.Context, propcid cid.Cid) error                                                           //perm:admin
-
-	// DagstoreListShards returns information about all shards known to the
-	// DAG store. Only available on nodes running the markets subsystem.
-	DagstoreListShards(ctx context.Context) ([]DagstoreShardInfo, error) //perm:read
-
-	// DagstoreInitializeShard initializes an uninitialized shard.
-	//
-	// Initialization consists of fetching the shard's data (deal payload) from
-	// the storage subsystem, generating an index, and persisting the index
-	// to facilitate later retrievals, and/or to publish to external sources.
-	//
-	// This operation is intended to complement the initial migration. The
-	// migration registers a shard for every unique piece CID, with lazy
-	// initialization. Thus, shards are not initialized immediately to avoid
-	// IO activity competing with proving. Instead, shard are initialized
-	// when first accessed. This method forces the initialization of a shard by
-	// accessing it and immediately releasing it. This is useful to warm up the
-	// cache to facilitate subsequent retrievals, and to generate the indexes
-	// to publish them externally.
-	//
-	// This operation fails if the shard is not in ShardStateNew state.
-	// It blocks until initialization finishes.
-	DagstoreInitializeShard(ctx context.Context, key string) error //perm:write
-
-	// DagstoreRecoverShard attempts to recover a failed shard.
-	//
-	// This operation fails if the shard is not in ShardStateErrored state.
-	// It blocks until recovery finishes. If recovery failed, it returns the
-	// error.
-	DagstoreRecoverShard(ctx context.Context, key string) error //perm:write
-
-	// DagstoreInitializeAll initializes all uninitialized shards in bulk,
-	// according to the policy passed in the parameters.
-	//
-	// It is recommended to set a maximum concurrency to avoid extreme
-	// IO pressure if the storage subsystem has a large amount of deals.
-	//
-	// It returns a stream of events to report progress.
-	DagstoreInitializeAll(ctx context.Context, params DagstoreInitializeAllParams) (<-chan DagstoreInitializeAllEvent, error) //perm:write
-
-	// DagstoreGC runs garbage collection on the DAG store.
-	DagstoreGC(ctx context.Context) ([]DagstoreShardResult, error) //perm:admin
-
-	// IndexerAnnounceDeal informs indexer nodes that a new deal was received,
-	// so they can download its index
-	IndexerAnnounceDeal(ctx context.Context, proposalCid cid.Cid) error //perm:admin
-
-	// IndexerAnnounceAllDeals informs the indexer nodes aboutall active deals.
-	IndexerAnnounceAllDeals(ctx context.Context) error //perm:admin
-
-	// DagstorePieceIndexSize returns the size of the piece index.
-	DagstorePieceIndexSize(ctx context.Context) (int64, error) //perm:admin
-
-	// DagstoreLookupPieces returns information about shards that contain the given CID.
-	DagstoreLookupPieces(ctx context.Context, cid cid.Cid) ([]DagstoreShardInfo, error) //perm:admin
 
 	// RuntimeSubsystems returns the subsystems that are enabled
 	// in this instance.
@@ -268,7 +202,7 @@ type StorageMiner interface {
 
 	CheckProvable(ctx context.Context, pp abi.RegisteredPoStProof, sectors []storage.SectorRef, expensive bool) (map[abi.SectorNumber]string, error) //perm:admin
 
-	ComputeProof(ctx context.Context, ssi []builtin.ExtendedSectorInfo, rand abi.PoStRandomness, poStEpoch abi.ChainEpoch, nv abinetwork.Version) ([]builtin.PoStProof, error) //perm:read
+	ComputeProof(ctx context.Context, ssi []builtin.SectorInfo, rand abi.PoStRandomness) ([]builtin.PoStProof, error) //perm:read
 }
 
 var _ storiface.WorkerReturn = *new(StorageMiner)
@@ -290,11 +224,6 @@ type SectorLog struct {
 	Message string
 }
 
-type SectorPiece struct {
-	Piece    abi.PieceInfo
-	DealInfo *PieceDealInfo // nil for pieces which do not appear in deals (e.g. filler pieces)
-}
-
 type SectorInfo struct {
 	SectorID     abi.SectorNumber
 	State        SectorState
@@ -302,7 +231,6 @@ type SectorInfo struct {
 	CommR        *cid.Cid
 	Proof        []byte
 	Deals        []abi.DealID
-	Pieces       []SectorPiece
 	Ticket       SealTicket
 	Seed         SealSeed
 	PreCommitMsg *cid.Cid
@@ -408,34 +336,3 @@ type DealSchedule struct {
 	StartEpoch abi.ChainEpoch
 	EndEpoch   abi.ChainEpoch
 }
-
-// DagstoreShardInfo is the serialized form of dagstore.DagstoreShardInfo that
-// we expose through JSON-RPC to avoid clients having to depend on the
-// dagstore lib.
-type DagstoreShardInfo struct {
-	Key   string
-	State string
-	Error string
-}
-
-// DagstoreShardResult enumerates results per shard.
-type DagstoreShardResult struct {
-	Key     string
-	Success bool
-	Error   string
-}
-
-type DagstoreInitializeAllParams struct {
-	MaxConcurrency int
-	IncludeSealed  bool
-}
-
-// DagstoreInitializeAllEvent represents an initialization event.
-type DagstoreInitializeAllEvent struct {
-	Key     string
-	Event   string // "start", "end"
-	Success bool
-	Error   string
-	Total   int
-	Current int
-}

api/api_test.go

@@ -76,7 +76,7 @@ func TestReturnTypes(t *testing.T) {
 						seen[typ] = struct{}{}
 
 						if typ.Kind() == reflect.Interface && typ != bareIface && !typ.Implements(jmarsh) {
-							t.Error("methods can't return interfaces or struct types not implementing json.Marshaller", m.Name)
+							t.Error("methods can't return interfaces", m.Name)
 						}
 
 						switch typ.Kind() {

api/api_worker.go

@@ -39,10 +39,6 @@ type Worker interface {
 	SealCommit1(ctx context.Context, sector storage.SectorRef, ticket abi.SealRandomness, seed abi.InteractiveSealRandomness, pieces []abi.PieceInfo, cids storage.SectorCids) (storiface.CallID, error) //perm:admin
 	SealCommit2(ctx context.Context, sector storage.SectorRef, c1o storage.Commit1Out) (storiface.CallID, error)                                                                                         //perm:admin
 	FinalizeSector(ctx context.Context, sector storage.SectorRef, keepUnsealed []storage.Range) (storiface.CallID, error)                                                                                //perm:admin
-	ReplicaUpdate(ctx context.Context, sector storage.SectorRef, pieces []abi.PieceInfo) (storiface.CallID, error)                                                                                       //perm:admin
-	ProveReplicaUpdate1(ctx context.Context, sector storage.SectorRef, sectorKey, newSealed, newUnsealed cid.Cid) (storiface.CallID, error)                                                              //perm:admin
-	ProveReplicaUpdate2(ctx context.Context, sector storage.SectorRef, sectorKey, newSealed, newUnsealed cid.Cid, vanillaProofs storage.ReplicaVanillaProofs) (storiface.CallID, error)                  //perm:admin
-	GenerateSectorKeyFromData(ctx context.Context, sector storage.SectorRef, commD cid.Cid) (storiface.CallID, error)                                                                                    //perm:admin
 	ReleaseUnsealed(ctx context.Context, sector storage.SectorRef, safeToFree []storage.Range) (storiface.CallID, error)                                                                                 //perm:admin
 	MoveStorage(ctx context.Context, sector storage.SectorRef, types storiface.SectorFileType) (storiface.CallID, error)                                                                                 //perm:admin
 	UnsealPiece(context.Context, storage.SectorRef, storiface.UnpaddedByteIndex, abi.UnpaddedPieceSize, abi.SealRandomness, cid.Cid) (storiface.CallID, error)                                           //perm:admin

api/docgen/docgen.go

@@ -1,7 +1,6 @@
 package docgen
 
 import (
-	"encoding/json"
 	"fmt"
 	"go/ast"
 	"go/parser"
@@ -14,9 +13,11 @@ 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-graphsync"
+	"github.com/ipfs/go-filestore"
 	"github.com/libp2p/go-libp2p-core/metrics"
 	"github.com/libp2p/go-libp2p-core/network"
 	"github.com/libp2p/go-libp2p-core/peer"
@@ -25,10 +26,9 @@ import (
 	"github.com/multiformats/go-multiaddr"
 
 	datatransfer "github.com/filecoin-project/go-data-transfer"
-	filestore "github.com/filecoin-project/go-fil-markets/filestore"
+	filestore2 "github.com/filecoin-project/go-fil-markets/filestore"
 	"github.com/filecoin-project/go-fil-markets/retrievalmarket"
 	"github.com/filecoin-project/go-jsonrpc/auth"
-	textselector "github.com/ipld/go-ipld-selector-text-lite"
 
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/crypto"
@@ -44,7 +44,6 @@ import (
 	"github.com/filecoin-project/lotus/extern/sector-storage/storiface"
 	sealing "github.com/filecoin-project/lotus/extern/storage-sealing"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
-	"github.com/filecoin-project/lotus/node/repo/imports"
 )
 
 var ExampleValues = map[reflect.Type]interface{}{
@@ -91,10 +90,8 @@ func init() {
 	addExample(pid)
 	addExample(&pid)
 
-	storeIDExample := imports.ID(50)
-	textSelExample := textselector.Expression("Links/21/Hash/Links/42/Hash")
-	apiSelExample := api.Selector("Links/21/Hash/Links/42/Hash")
-	clientEvent := retrievalmarket.ClientEventDealAccepted
+	multistoreIDExample := multistore.StoreID(50)
+	storeIDExample := importmgr.ImportID(50)
 
 	addExample(bitfield.NewFromSet([]uint64{5}))
 	addExample(abi.RegisteredSealProof_StackedDrg32GiBV1_1)
@@ -113,6 +110,7 @@ func init() {
 	addExample(abi.UnpaddedPieceSize(1024))
 	addExample(abi.UnpaddedPieceSize(1024).Padded())
 	addExample(abi.DealID(5432))
+	addExample(filestore.StatusFileChanged)
 	addExample(abi.SectorNumber(9))
 	addExample(abi.SectorSize(32 * 1024 * 1024 * 1024))
 	addExample(api.MpoolChange(0))
@@ -122,17 +120,14 @@ func init() {
 	addExample(api.FullAPIVersion1)
 	addExample(api.PCHInbound)
 	addExample(time.Minute)
-	addExample(graphsync.RequestID(4))
 	addExample(datatransfer.TransferID(3))
 	addExample(datatransfer.Ongoing)
 	addExample(storeIDExample)
 	addExample(&storeIDExample)
-	addExample(clientEvent)
-	addExample(&clientEvent)
+	addExample(multistoreIDExample)
+	addExample(&multistoreIDExample)
 	addExample(retrievalmarket.ClientEventDealAccepted)
 	addExample(retrievalmarket.DealStatusNew)
-	addExample(&textSelExample)
-	addExample(&apiSelExample)
 	addExample(network.ReachabilityPublic)
 	addExample(build.NewestNetworkVersion)
 	addExample(map[string]int{"name": 42})
@@ -184,7 +179,7 @@ func init() {
 	ExampleValues[reflect.TypeOf(struct{ A multiaddr.Multiaddr }{}).Field(0).Type] = maddr
 
 	// miner specific
-	addExample(filestore.Path(".lotusminer/fstmp123"))
+	addExample(filestore2.Path(".lotusminer/fstmp123"))
 	si := uint64(12)
 	addExample(&si)
 	addExample(retrievalmarket.DealID(5))
@@ -234,18 +229,16 @@ func init() {
 				Hostname: "host",
 				Resources: storiface.WorkerResources{
 					MemPhysical: 256 << 30,
-					MemUsed:     2 << 30,
 					MemSwap:     120 << 30,
-					MemSwapUsed: 2 << 30,
+					MemReserved: 2 << 30,
 					CPUs:        64,
 					GPUs:        []string{"aGPU 1337"},
-					Resources:   storiface.ResourceTable,
 				},
 			},
 			Enabled:    true,
 			MemUsedMin: 0,
 			MemUsedMax: 0,
-			GpuUsed:    0,
+			GpuUsed:    false,
 			CpuUse:     0,
 		},
 	})
@@ -253,18 +246,10 @@ func init() {
 	addExample(map[abi.SectorNumber]string{
 		123: "can't acquire read lock",
 	})
-	addExample(json.RawMessage(`"json raw message"`))
 	addExample(map[api.SectorState]int{
 		api.SectorState(sealing.Proving): 120,
 	})
 	addExample([]abi.SectorNumber{123, 124})
-	addExample([]storiface.SectorLock{
-		{
-			Sector: abi.SectorID{Number: 123, Miner: 1000},
-			Write:  [storiface.FileTypes]uint{0, 0, 1},
-			Read:   [storiface.FileTypes]uint{2, 3, 0},
-		},
-	})
 
 	// worker specific
 	addExample(storiface.AcquireMove)
@@ -290,44 +275,6 @@ func init() {
 		api.SubsystemSectorStorage,
 		api.SubsystemMarkets,
 	})
-	addExample(api.DagstoreShardResult{
-		Key:   "baga6ea4seaqecmtz7iak33dsfshi627abz4i4665dfuzr3qfs4bmad6dx3iigdq",
-		Error: "<error>",
-	})
-	addExample(api.DagstoreShardInfo{
-		Key:   "baga6ea4seaqecmtz7iak33dsfshi627abz4i4665dfuzr3qfs4bmad6dx3iigdq",
-		State: "ShardStateAvailable",
-		Error: "<error>",
-	})
-	addExample(storiface.ResourceTable)
-	addExample(network.ScopeStat{
-		Memory:             123,
-		NumStreamsInbound:  1,
-		NumStreamsOutbound: 2,
-		NumConnsInbound:    3,
-		NumConnsOutbound:   4,
-		NumFD:              5,
-	})
-	addExample(map[string]network.ScopeStat{
-		"abc": {
-			Memory:             123,
-			NumStreamsInbound:  1,
-			NumStreamsOutbound: 2,
-			NumConnsInbound:    3,
-			NumConnsOutbound:   4,
-			NumFD:              5,
-		}})
-	addExample(api.NetLimit{
-		Memory:          123,
-		StreamsInbound:  1,
-		StreamsOutbound: 2,
-		Streams:         3,
-		ConnsInbound:    3,
-		ConnsOutbound:   4,
-		Conns:           4,
-		FD:              5,
-	})
-
 }
 
 func GetAPIType(name, pkg string) (i interface{}, t reflect.Type, permStruct []reflect.Type) {
@@ -378,7 +325,7 @@ func ExampleValue(method string, t, parent reflect.Type) interface{} {
 	switch t.Kind() {
 	case reflect.Slice:
 		out := reflect.New(t).Elem()
-		out = reflect.Append(out, reflect.ValueOf(ExampleValue(method, t.Elem(), t)))
+		reflect.Append(out, reflect.ValueOf(ExampleValue(method, t.Elem(), t)))
 		return out.Interface()
 	case reflect.Chan:
 		return ExampleValue(method, t.Elem(), nil)

api/mocks/mock_full.go

@@ -6,7 +6,6 @@ package mocks
 
 import (
 	context "context"
-	json "encoding/json"
 	reflect "reflect"
 
 	address "github.com/filecoin-project/go-address"
@@ -24,9 +23,9 @@ import (
 	apitypes "github.com/filecoin-project/lotus/api/types"
 	miner "github.com/filecoin-project/lotus/chain/actors/builtin/miner"
 	types "github.com/filecoin-project/lotus/chain/types"
-	alerting "github.com/filecoin-project/lotus/journal/alerting"
+	marketevents "github.com/filecoin-project/lotus/markets/loggers"
 	dtypes "github.com/filecoin-project/lotus/node/modules/dtypes"
-	imports "github.com/filecoin-project/lotus/node/repo/imports"
+	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"
@@ -299,6 +298,36 @@ func (mr *MockFullNodeMockRecorder) ChainGetPath(arg0, arg1, arg2 interface{}) *
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ChainGetPath", reflect.TypeOf((*MockFullNode)(nil).ChainGetPath), arg0, arg1, arg2)
 }
 
+// ChainGetRandomnessFromBeacon mocks base method.
+func (m *MockFullNode) ChainGetRandomnessFromBeacon(arg0 context.Context, arg1 types.TipSetKey, arg2 crypto.DomainSeparationTag, arg3 abi.ChainEpoch, arg4 []byte) (abi.Randomness, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "ChainGetRandomnessFromBeacon", arg0, arg1, arg2, arg3, arg4)
+	ret0, _ := ret[0].(abi.Randomness)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// ChainGetRandomnessFromBeacon indicates an expected call of ChainGetRandomnessFromBeacon.
+func (mr *MockFullNodeMockRecorder) ChainGetRandomnessFromBeacon(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ChainGetRandomnessFromBeacon", reflect.TypeOf((*MockFullNode)(nil).ChainGetRandomnessFromBeacon), arg0, arg1, arg2, arg3, arg4)
+}
+
+// ChainGetRandomnessFromTickets mocks base method.
+func (m *MockFullNode) ChainGetRandomnessFromTickets(arg0 context.Context, arg1 types.TipSetKey, arg2 crypto.DomainSeparationTag, arg3 abi.ChainEpoch, arg4 []byte) (abi.Randomness, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "ChainGetRandomnessFromTickets", arg0, arg1, arg2, arg3, arg4)
+	ret0, _ := ret[0].(abi.Randomness)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// ChainGetRandomnessFromTickets indicates an expected call of ChainGetRandomnessFromTickets.
+func (mr *MockFullNodeMockRecorder) ChainGetRandomnessFromTickets(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ChainGetRandomnessFromTickets", reflect.TypeOf((*MockFullNode)(nil).ChainGetRandomnessFromTickets), arg0, arg1, arg2, arg3, arg4)
+}
+
 // ChainGetTipSet mocks base method.
 func (m *MockFullNode) ChainGetTipSet(arg0 context.Context, arg1 types.TipSetKey) (*types.TipSet, error) {
 	m.ctrl.T.Helper()
@@ -314,21 +343,6 @@ func (mr *MockFullNodeMockRecorder) ChainGetTipSet(arg0, arg1 interface{}) *gomo
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ChainGetTipSet", reflect.TypeOf((*MockFullNode)(nil).ChainGetTipSet), arg0, arg1)
 }
 
-// ChainGetTipSetAfterHeight mocks base method.
-func (m *MockFullNode) ChainGetTipSetAfterHeight(arg0 context.Context, arg1 abi.ChainEpoch, arg2 types.TipSetKey) (*types.TipSet, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ChainGetTipSetAfterHeight", arg0, arg1, arg2)
-	ret0, _ := ret[0].(*types.TipSet)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// ChainGetTipSetAfterHeight indicates an expected call of ChainGetTipSetAfterHeight.
-func (mr *MockFullNodeMockRecorder) ChainGetTipSetAfterHeight(arg0, arg1, arg2 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ChainGetTipSetAfterHeight", reflect.TypeOf((*MockFullNode)(nil).ChainGetTipSetAfterHeight), arg0, arg1, arg2)
-}
-
 // ChainGetTipSetByHeight mocks base method.
 func (m *MockFullNode) ChainGetTipSetByHeight(arg0 context.Context, arg1 abi.ChainEpoch, arg2 types.TipSetKey) (*types.TipSet, error) {
 	m.ctrl.T.Helper()
@@ -536,20 +550,6 @@ func (mr *MockFullNodeMockRecorder) ClientDealSize(arg0, arg1 interface{}) *gomo
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ClientDealSize", reflect.TypeOf((*MockFullNode)(nil).ClientDealSize), arg0, arg1)
 }
 
-// ClientExport mocks base method.
-func (m *MockFullNode) ClientExport(arg0 context.Context, arg1 api.ExportRef, arg2 api.FileRef) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ClientExport", arg0, arg1, arg2)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// ClientExport indicates an expected call of ClientExport.
-func (mr *MockFullNodeMockRecorder) ClientExport(arg0, arg1, arg2 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ClientExport", reflect.TypeOf((*MockFullNode)(nil).ClientExport), arg0, arg1, arg2)
-}
-
 // ClientFindData mocks base method.
 func (m *MockFullNode) ClientFindData(arg0 context.Context, arg1 cid.Cid, arg2 *cid.Cid) ([]api.QueryOffer, error) {
 	m.ctrl.T.Helper()
@@ -760,7 +760,7 @@ func (mr *MockFullNodeMockRecorder) ClientQueryAsk(arg0, arg1, arg2 interface{})
 }
 
 // ClientRemoveImport mocks base method.
-func (m *MockFullNode) ClientRemoveImport(arg0 context.Context, arg1 imports.ID) 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)
@@ -788,18 +788,17 @@ func (mr *MockFullNodeMockRecorder) ClientRestartDataTransfer(arg0, arg1, arg2,
 }
 
 // ClientRetrieve mocks base method.
-func (m *MockFullNode) ClientRetrieve(arg0 context.Context, arg1 api.RetrievalOrder) (*api.RestrievalRes, error) {
+func (m *MockFullNode) ClientRetrieve(arg0 context.Context, arg1 api.RetrievalOrder, arg2 *api.FileRef) error {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ClientRetrieve", arg0, arg1)
-	ret0, _ := ret[0].(*api.RestrievalRes)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
+	ret := m.ctrl.Call(m, "ClientRetrieve", arg0, arg1, arg2)
+	ret0, _ := ret[0].(error)
+	return ret0
 }
 
 // ClientRetrieve indicates an expected call of ClientRetrieve.
-func (mr *MockFullNodeMockRecorder) ClientRetrieve(arg0, arg1 interface{}) *gomock.Call {
+func (mr *MockFullNodeMockRecorder) ClientRetrieve(arg0, arg1, arg2 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ClientRetrieve", reflect.TypeOf((*MockFullNode)(nil).ClientRetrieve), arg0, arg1)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ClientRetrieve", reflect.TypeOf((*MockFullNode)(nil).ClientRetrieve), arg0, arg1, arg2)
 }
 
 // ClientRetrieveTryRestartInsufficientFunds mocks base method.
@@ -816,18 +815,19 @@ func (mr *MockFullNodeMockRecorder) ClientRetrieveTryRestartInsufficientFunds(ar
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ClientRetrieveTryRestartInsufficientFunds", reflect.TypeOf((*MockFullNode)(nil).ClientRetrieveTryRestartInsufficientFunds), arg0, arg1)
 }
 
-// ClientRetrieveWait mocks base method.
-func (m *MockFullNode) ClientRetrieveWait(arg0 context.Context, arg1 retrievalmarket.DealID) error {
+// ClientRetrieveWithEvents mocks base method.
+func (m *MockFullNode) ClientRetrieveWithEvents(arg0 context.Context, arg1 api.RetrievalOrder, arg2 *api.FileRef) (<-chan marketevents.RetrievalEvent, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ClientRetrieveWait", arg0, arg1)
-	ret0, _ := ret[0].(error)
-	return ret0
+	ret := m.ctrl.Call(m, "ClientRetrieveWithEvents", arg0, arg1, arg2)
+	ret0, _ := ret[0].(<-chan marketevents.RetrievalEvent)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
 }
 
-// ClientRetrieveWait indicates an expected call of ClientRetrieveWait.
-func (mr *MockFullNodeMockRecorder) ClientRetrieveWait(arg0, arg1 interface{}) *gomock.Call {
+// ClientRetrieveWithEvents indicates an expected call of ClientRetrieveWithEvents.
+func (mr *MockFullNodeMockRecorder) ClientRetrieveWithEvents(arg0, arg1, arg2 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ClientRetrieveWait", reflect.TypeOf((*MockFullNode)(nil).ClientRetrieveWait), arg0, arg1)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ClientRetrieveWithEvents", reflect.TypeOf((*MockFullNode)(nil).ClientRetrieveWithEvents), arg0, arg1, arg2)
 }
 
 // ClientStartDeal mocks base method.
@@ -979,21 +979,6 @@ func (mr *MockFullNodeMockRecorder) ID(arg0 interface{}) *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ID", reflect.TypeOf((*MockFullNode)(nil).ID), arg0)
 }
 
-// LogAlerts mocks base method.
-func (m *MockFullNode) LogAlerts(arg0 context.Context) ([]alerting.Alert, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "LogAlerts", arg0)
-	ret0, _ := ret[0].([]alerting.Alert)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// LogAlerts indicates an expected call of LogAlerts.
-func (mr *MockFullNodeMockRecorder) LogAlerts(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LogAlerts", reflect.TypeOf((*MockFullNode)(nil).LogAlerts), arg0)
-}
-
 // LogList mocks base method.
 func (m *MockFullNode) LogList(arg0 context.Context) ([]string, error) {
 	m.ctrl.T.Helper()
@@ -1441,33 +1426,18 @@ func (mr *MockFullNodeMockRecorder) MsigApproveTxnHash(arg0, arg1, arg2, arg3, a
 }
 
 // MsigCancel mocks base method.
-func (m *MockFullNode) MsigCancel(arg0 context.Context, arg1 address.Address, arg2 uint64, arg3 address.Address) (*api.MessagePrototype, error) {
+func (m *MockFullNode) MsigCancel(arg0 context.Context, arg1 address.Address, arg2 uint64, arg3 address.Address, arg4 big.Int, arg5 address.Address, arg6 uint64, arg7 []byte) (*api.MessagePrototype, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "MsigCancel", arg0, arg1, arg2, arg3)
+	ret := m.ctrl.Call(m, "MsigCancel", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7)
 	ret0, _ := ret[0].(*api.MessagePrototype)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
 // MsigCancel indicates an expected call of MsigCancel.
-func (mr *MockFullNodeMockRecorder) MsigCancel(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
+func (mr *MockFullNodeMockRecorder) MsigCancel(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MsigCancel", reflect.TypeOf((*MockFullNode)(nil).MsigCancel), arg0, arg1, arg2, arg3)
-}
-
-// MsigCancelTxnHash mocks base method.
-func (m *MockFullNode) MsigCancelTxnHash(arg0 context.Context, arg1 address.Address, arg2 uint64, arg3 address.Address, arg4 big.Int, arg5 address.Address, arg6 uint64, arg7 []byte) (*api.MessagePrototype, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "MsigCancelTxnHash", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7)
-	ret0, _ := ret[0].(*api.MessagePrototype)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// MsigCancelTxnHash indicates an expected call of MsigCancelTxnHash.
-func (mr *MockFullNodeMockRecorder) MsigCancelTxnHash(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MsigCancelTxnHash", reflect.TypeOf((*MockFullNode)(nil).MsigCancelTxnHash), arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MsigCancel", reflect.TypeOf((*MockFullNode)(nil).MsigCancel), arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7)
 }
 
 // MsigCreate mocks base method.
@@ -1811,21 +1781,6 @@ func (mr *MockFullNodeMockRecorder) NetFindPeer(arg0, arg1 interface{}) *gomock.
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NetFindPeer", reflect.TypeOf((*MockFullNode)(nil).NetFindPeer), arg0, arg1)
 }
 
-// NetLimit mocks base method.
-func (m *MockFullNode) NetLimit(arg0 context.Context, arg1 string) (api.NetLimit, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "NetLimit", arg0, arg1)
-	ret0, _ := ret[0].(api.NetLimit)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// NetLimit indicates an expected call of NetLimit.
-func (mr *MockFullNodeMockRecorder) NetLimit(arg0, arg1 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NetLimit", reflect.TypeOf((*MockFullNode)(nil).NetLimit), arg0, arg1)
-}
-
 // NetPeerInfo mocks base method.
 func (m *MockFullNode) NetPeerInfo(arg0 context.Context, arg1 peer.ID) (*api.ExtendedPeerInfo, error) {
 	m.ctrl.T.Helper()
@@ -1856,49 +1811,6 @@ func (mr *MockFullNodeMockRecorder) NetPeers(arg0 interface{}) *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NetPeers", reflect.TypeOf((*MockFullNode)(nil).NetPeers), arg0)
 }
 
-// NetProtectAdd mocks base method.
-func (m *MockFullNode) NetProtectAdd(arg0 context.Context, arg1 []peer.ID) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "NetProtectAdd", arg0, arg1)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// NetProtectAdd indicates an expected call of NetProtectAdd.
-func (mr *MockFullNodeMockRecorder) NetProtectAdd(arg0, arg1 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NetProtectAdd", reflect.TypeOf((*MockFullNode)(nil).NetProtectAdd), arg0, arg1)
-}
-
-// NetProtectList mocks base method.
-func (m *MockFullNode) NetProtectList(arg0 context.Context) ([]peer.ID, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "NetProtectList", arg0)
-	ret0, _ := ret[0].([]peer.ID)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// NetProtectList indicates an expected call of NetProtectList.
-func (mr *MockFullNodeMockRecorder) NetProtectList(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NetProtectList", reflect.TypeOf((*MockFullNode)(nil).NetProtectList), arg0)
-}
-
-// NetProtectRemove mocks base method.
-func (m *MockFullNode) NetProtectRemove(arg0 context.Context, arg1 []peer.ID) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "NetProtectRemove", arg0, arg1)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// NetProtectRemove indicates an expected call of NetProtectRemove.
-func (mr *MockFullNodeMockRecorder) NetProtectRemove(arg0, arg1 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NetProtectRemove", reflect.TypeOf((*MockFullNode)(nil).NetProtectRemove), arg0, arg1)
-}
-
 // NetPubsubScores mocks base method.
 func (m *MockFullNode) NetPubsubScores(arg0 context.Context) ([]api.PubsubScore, error) {
 	m.ctrl.T.Helper()
@@ -1914,35 +1826,6 @@ func (mr *MockFullNodeMockRecorder) NetPubsubScores(arg0 interface{}) *gomock.Ca
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NetPubsubScores", reflect.TypeOf((*MockFullNode)(nil).NetPubsubScores), arg0)
 }
 
-// NetSetLimit mocks base method.
-func (m *MockFullNode) NetSetLimit(arg0 context.Context, arg1 string, arg2 api.NetLimit) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "NetSetLimit", arg0, arg1, arg2)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// NetSetLimit indicates an expected call of NetSetLimit.
-func (mr *MockFullNodeMockRecorder) NetSetLimit(arg0, arg1, arg2 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NetSetLimit", reflect.TypeOf((*MockFullNode)(nil).NetSetLimit), arg0, arg1, arg2)
-}
-
-// NetStat mocks base method.
-func (m *MockFullNode) NetStat(arg0 context.Context, arg1 string) (api.NetStat, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "NetStat", arg0, arg1)
-	ret0, _ := ret[0].(api.NetStat)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// NetStat indicates an expected call of NetStat.
-func (mr *MockFullNodeMockRecorder) NetStat(arg0, arg1 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NetStat", reflect.TypeOf((*MockFullNode)(nil).NetStat), arg0, arg1)
-}
-
 // NodeStatus mocks base method.
 func (m *MockFullNode) NodeStatus(arg0 context.Context, arg1 bool) (api.NodeStatus, error) {
 	m.ctrl.T.Helper()
@@ -2346,21 +2229,6 @@ func (mr *MockFullNodeMockRecorder) StateDecodeParams(arg0, arg1, arg2, arg3, ar
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StateDecodeParams", reflect.TypeOf((*MockFullNode)(nil).StateDecodeParams), arg0, arg1, arg2, arg3, arg4)
 }
 
-// StateEncodeParams mocks base method.
-func (m *MockFullNode) StateEncodeParams(arg0 context.Context, arg1 cid.Cid, arg2 abi.MethodNum, arg3 json.RawMessage) ([]byte, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "StateEncodeParams", arg0, arg1, arg2, arg3)
-	ret0, _ := ret[0].([]byte)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// StateEncodeParams indicates an expected call of StateEncodeParams.
-func (mr *MockFullNodeMockRecorder) StateEncodeParams(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StateEncodeParams", reflect.TypeOf((*MockFullNode)(nil).StateEncodeParams), arg0, arg1, arg2, arg3)
-}
-
 // StateGetActor mocks base method.
 func (m *MockFullNode) StateGetActor(arg0 context.Context, arg1 address.Address, arg2 types.TipSetKey) (*types.Actor, error) {
 	m.ctrl.T.Helper()
@@ -2376,36 +2244,6 @@ func (mr *MockFullNodeMockRecorder) StateGetActor(arg0, arg1, arg2 interface{})
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StateGetActor", reflect.TypeOf((*MockFullNode)(nil).StateGetActor), arg0, arg1, arg2)
 }
 
-// StateGetRandomnessFromBeacon mocks base method.
-func (m *MockFullNode) StateGetRandomnessFromBeacon(arg0 context.Context, arg1 crypto.DomainSeparationTag, arg2 abi.ChainEpoch, arg3 []byte, arg4 types.TipSetKey) (abi.Randomness, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "StateGetRandomnessFromBeacon", arg0, arg1, arg2, arg3, arg4)
-	ret0, _ := ret[0].(abi.Randomness)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// StateGetRandomnessFromBeacon indicates an expected call of StateGetRandomnessFromBeacon.
-func (mr *MockFullNodeMockRecorder) StateGetRandomnessFromBeacon(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StateGetRandomnessFromBeacon", reflect.TypeOf((*MockFullNode)(nil).StateGetRandomnessFromBeacon), arg0, arg1, arg2, arg3, arg4)
-}
-
-// StateGetRandomnessFromTickets mocks base method.
-func (m *MockFullNode) StateGetRandomnessFromTickets(arg0 context.Context, arg1 crypto.DomainSeparationTag, arg2 abi.ChainEpoch, arg3 []byte, arg4 types.TipSetKey) (abi.Randomness, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "StateGetRandomnessFromTickets", arg0, arg1, arg2, arg3, arg4)
-	ret0, _ := ret[0].(abi.Randomness)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// StateGetRandomnessFromTickets indicates an expected call of StateGetRandomnessFromTickets.
-func (mr *MockFullNodeMockRecorder) StateGetRandomnessFromTickets(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StateGetRandomnessFromTickets", reflect.TypeOf((*MockFullNode)(nil).StateGetRandomnessFromTickets), arg0, arg1, arg2, arg3, arg4)
-}
-
 // StateListActors mocks base method.
 func (m *MockFullNode) StateListActors(arg0 context.Context, arg1 types.TipSetKey) ([]address.Address, error) {
 	m.ctrl.T.Helper()

api/proxy_gen.go

@@ -4,7 +4,6 @@ package api
 
 import (
 	"context"
-	"encoding/json"
 	"time"
 
 	"github.com/filecoin-project/go-address"
@@ -17,7 +16,6 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/crypto"
 	"github.com/filecoin-project/go-state-types/dline"
-	abinetwork "github.com/filecoin-project/go-state-types/network"
 	apitypes "github.com/filecoin-project/lotus/api/types"
 	"github.com/filecoin-project/lotus/chain/actors/builtin"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
@@ -28,9 +26,9 @@ import (
 	"github.com/filecoin-project/lotus/extern/sector-storage/stores"
 	"github.com/filecoin-project/lotus/extern/sector-storage/storiface"
 	"github.com/filecoin-project/lotus/extern/storage-sealing/sealiface"
-	"github.com/filecoin-project/lotus/journal/alerting"
+	marketevents "github.com/filecoin-project/lotus/markets/loggers"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
-	"github.com/filecoin-project/lotus/node/repo/imports"
+	"github.com/filecoin-project/lotus/node/repo/importmgr"
 	"github.com/filecoin-project/specs-storage/storage"
 	"github.com/google/uuid"
 	"github.com/ipfs/go-cid"
@@ -64,8 +62,6 @@ type CommonStruct struct {
 
 		Discover func(p0 context.Context) (apitypes.OpenRPCDocument, error) `perm:"read"`
 
-		LogAlerts func(p0 context.Context) ([]alerting.Alert, error) `perm:"admin"`
-
 		LogList func(p0 context.Context) ([]string, error) `perm:"write"`
 
 		LogSetLevel func(p0 context.Context, p1 string, p2 string) error `perm:"write"`
@@ -130,9 +126,11 @@ type FullNodeStruct struct {
 
 		ChainGetPath func(p0 context.Context, p1 types.TipSetKey, p2 types.TipSetKey) ([]*HeadChange, error) `perm:"read"`
 
-		ChainGetTipSet func(p0 context.Context, p1 types.TipSetKey) (*types.TipSet, error) `perm:"read"`
+		ChainGetRandomnessFromBeacon func(p0 context.Context, p1 types.TipSetKey, p2 crypto.DomainSeparationTag, p3 abi.ChainEpoch, p4 []byte) (abi.Randomness, error) `perm:"read"`
 
-		ChainGetTipSetAfterHeight func(p0 context.Context, p1 abi.ChainEpoch, p2 types.TipSetKey) (*types.TipSet, error) `perm:"read"`
+		ChainGetRandomnessFromTickets func(p0 context.Context, p1 types.TipSetKey, p2 crypto.DomainSeparationTag, p3 abi.ChainEpoch, p4 []byte) (abi.Randomness, error) `perm:"read"`
+
+		ChainGetTipSet func(p0 context.Context, p1 types.TipSetKey) (*types.TipSet, error) `perm:"read"`
 
 		ChainGetTipSetByHeight func(p0 context.Context, p1 abi.ChainEpoch, p2 types.TipSetKey) (*types.TipSet, error) `perm:"read"`
 
@@ -162,8 +160,6 @@ type FullNodeStruct struct {
 
 		ClientDealSize func(p0 context.Context, p1 cid.Cid) (DataSize, error) `perm:"read"`
 
-		ClientExport func(p0 context.Context, p1 ExportRef, p2 FileRef) error `perm:"admin"`
-
 		ClientFindData func(p0 context.Context, p1 cid.Cid, p2 *cid.Cid) ([]QueryOffer, error) `perm:"read"`
 
 		ClientGenCar func(p0 context.Context, p1 FileRef, p2 string) error `perm:"write"`
@@ -192,15 +188,15 @@ type FullNodeStruct struct {
 
 		ClientQueryAsk func(p0 context.Context, p1 peer.ID, p2 address.Address) (*storagemarket.StorageAsk, error) `perm:"read"`
 
-		ClientRemoveImport func(p0 context.Context, p1 imports.ID) error `perm:"admin"`
+		ClientRemoveImport func(p0 context.Context, p1 importmgr.ImportID) error `perm:"admin"`
 
 		ClientRestartDataTransfer func(p0 context.Context, p1 datatransfer.TransferID, p2 peer.ID, p3 bool) error `perm:"write"`
 
-		ClientRetrieve func(p0 context.Context, p1 RetrievalOrder) (*RestrievalRes, error) `perm:"admin"`
+		ClientRetrieve func(p0 context.Context, p1 RetrievalOrder, p2 *FileRef) error `perm:"admin"`
 
 		ClientRetrieveTryRestartInsufficientFunds func(p0 context.Context, p1 address.Address) error `perm:"write"`
 
-		ClientRetrieveWait func(p0 context.Context, p1 retrievalmarket.DealID) error `perm:"admin"`
+		ClientRetrieveWithEvents func(p0 context.Context, p1 RetrievalOrder, p2 *FileRef) (<-chan marketevents.RetrievalEvent, error) `perm:"admin"`
 
 		ClientStartDeal func(p0 context.Context, p1 *StartDealParams) (*cid.Cid, error) `perm:"admin"`
 
@@ -272,9 +268,7 @@ type FullNodeStruct struct {
 
 		MsigApproveTxnHash func(p0 context.Context, p1 address.Address, p2 uint64, p3 address.Address, p4 address.Address, p5 types.BigInt, p6 address.Address, p7 uint64, p8 []byte) (*MessagePrototype, error) `perm:"sign"`
 
-		MsigCancel func(p0 context.Context, p1 address.Address, p2 uint64, p3 address.Address) (*MessagePrototype, error) `perm:"sign"`
-
-		MsigCancelTxnHash func(p0 context.Context, p1 address.Address, p2 uint64, p3 address.Address, p4 types.BigInt, p5 address.Address, p6 uint64, p7 []byte) (*MessagePrototype, error) `perm:"sign"`
+		MsigCancel func(p0 context.Context, p1 address.Address, p2 uint64, p3 address.Address, p4 types.BigInt, p5 address.Address, p6 uint64, p7 []byte) (*MessagePrototype, error) `perm:"sign"`
 
 		MsigCreate func(p0 context.Context, p1 uint64, p2 []address.Address, p3 abi.ChainEpoch, p4 types.BigInt, p5 address.Address, p6 types.BigInt) (*MessagePrototype, error) `perm:"sign"`
 
@@ -346,14 +340,8 @@ type FullNodeStruct struct {
 
 		StateDecodeParams func(p0 context.Context, p1 address.Address, p2 abi.MethodNum, p3 []byte, p4 types.TipSetKey) (interface{}, error) `perm:"read"`
 
-		StateEncodeParams func(p0 context.Context, p1 cid.Cid, p2 abi.MethodNum, p3 json.RawMessage) ([]byte, error) `perm:"read"`
-
 		StateGetActor func(p0 context.Context, p1 address.Address, p2 types.TipSetKey) (*types.Actor, error) `perm:"read"`
 
-		StateGetRandomnessFromBeacon func(p0 context.Context, p1 crypto.DomainSeparationTag, p2 abi.ChainEpoch, p3 []byte, p4 types.TipSetKey) (abi.Randomness, error) `perm:"read"`
-
-		StateGetRandomnessFromTickets func(p0 context.Context, p1 crypto.DomainSeparationTag, p2 abi.ChainEpoch, p3 []byte, p4 types.TipSetKey) (abi.Randomness, error) `perm:"read"`
-
 		StateListActors func(p0 context.Context, p1 types.TipSetKey) ([]address.Address, error) `perm:"read"`
 
 		StateListMessages func(p0 context.Context, p1 *MessageMatch, p2 types.TipSetKey, p3 abi.ChainEpoch) ([]cid.Cid, error) `perm:"read"`
@@ -482,20 +470,10 @@ type GatewayStruct struct {
 	Internal struct {
 		ChainGetBlockMessages func(p0 context.Context, p1 cid.Cid) (*BlockMessages, error) ``
 
-		ChainGetGenesis func(p0 context.Context) (*types.TipSet, error) ``
-
 		ChainGetMessage func(p0 context.Context, p1 cid.Cid) (*types.Message, error) ``
 
-		ChainGetParentMessages func(p0 context.Context, p1 cid.Cid) ([]Message, error) ``
-
-		ChainGetParentReceipts func(p0 context.Context, p1 cid.Cid) ([]*types.MessageReceipt, error) ``
-
-		ChainGetPath func(p0 context.Context, p1 types.TipSetKey, p2 types.TipSetKey) ([]*HeadChange, error) ``
-
 		ChainGetTipSet func(p0 context.Context, p1 types.TipSetKey) (*types.TipSet, error) ``
 
-		ChainGetTipSetAfterHeight func(p0 context.Context, p1 abi.ChainEpoch, p2 types.TipSetKey) (*types.TipSet, error) ``
-
 		ChainGetTipSetByHeight func(p0 context.Context, p1 abi.ChainEpoch, p2 types.TipSetKey) (*types.TipSet, error) ``
 
 		ChainHasObj func(p0 context.Context, p1 cid.Cid) (bool, error) ``
@@ -587,23 +565,11 @@ type NetStruct struct {
 
 		NetFindPeer func(p0 context.Context, p1 peer.ID) (peer.AddrInfo, error) `perm:"read"`
 
-		NetLimit func(p0 context.Context, p1 string) (NetLimit, error) `perm:"read"`
-
 		NetPeerInfo func(p0 context.Context, p1 peer.ID) (*ExtendedPeerInfo, error) `perm:"read"`
 
 		NetPeers func(p0 context.Context) ([]peer.AddrInfo, error) `perm:"read"`
 
-		NetProtectAdd func(p0 context.Context, p1 []peer.ID) error `perm:"admin"`
-
-		NetProtectList func(p0 context.Context) ([]peer.ID, error) `perm:"read"`
-
-		NetProtectRemove func(p0 context.Context, p1 []peer.ID) error `perm:"admin"`
-
 		NetPubsubScores func(p0 context.Context) ([]PubsubScore, error) `perm:"read"`
-
-		NetSetLimit func(p0 context.Context, p1 string, p2 NetLimit) error `perm:"admin"`
-
-		NetStat func(p0 context.Context, p1 string) (NetStat, error) `perm:"read"`
 	}
 }
 
@@ -633,24 +599,10 @@ type StorageMinerStruct struct {
 
 		CheckProvable func(p0 context.Context, p1 abi.RegisteredPoStProof, p2 []storage.SectorRef, p3 bool) (map[abi.SectorNumber]string, error) `perm:"admin"`
 
-		ComputeProof func(p0 context.Context, p1 []builtin.ExtendedSectorInfo, p2 abi.PoStRandomness, p3 abi.ChainEpoch, p4 abinetwork.Version) ([]builtin.PoStProof, error) `perm:"read"`
+		ComputeProof func(p0 context.Context, p1 []builtin.SectorInfo, p2 abi.PoStRandomness) ([]builtin.PoStProof, error) `perm:"read"`
 
 		CreateBackup func(p0 context.Context, p1 string) error `perm:"admin"`
 
-		DagstoreGC func(p0 context.Context) ([]DagstoreShardResult, error) `perm:"admin"`
-
-		DagstoreInitializeAll func(p0 context.Context, p1 DagstoreInitializeAllParams) (<-chan DagstoreInitializeAllEvent, error) `perm:"write"`
-
-		DagstoreInitializeShard func(p0 context.Context, p1 string) error `perm:"write"`
-
-		DagstoreListShards func(p0 context.Context) ([]DagstoreShardInfo, error) `perm:"read"`
-
-		DagstoreLookupPieces func(p0 context.Context, p1 cid.Cid) ([]DagstoreShardInfo, error) `perm:"admin"`
-
-		DagstorePieceIndexSize func(p0 context.Context) (int64, error) `perm:"admin"`
-
-		DagstoreRecoverShard func(p0 context.Context, p1 string) error `perm:"write"`
-
 		DealsConsiderOfflineRetrievalDeals func(p0 context.Context) (bool, error) `perm:"admin"`
 
 		DealsConsiderOfflineStorageDeals func(p0 context.Context) (bool, error) `perm:"admin"`
@@ -683,14 +635,8 @@ type StorageMinerStruct struct {
 
 		DealsSetPieceCidBlocklist func(p0 context.Context, p1 []cid.Cid) error `perm:"admin"`
 
-		IndexerAnnounceAllDeals func(p0 context.Context) error `perm:"admin"`
-
-		IndexerAnnounceDeal func(p0 context.Context, p1 cid.Cid) error `perm:"admin"`
-
 		MarketCancelDataTransfer func(p0 context.Context, p1 datatransfer.TransferID, p2 peer.ID, p3 bool) error `perm:"write"`
 
-		MarketDataTransferDiagnostics func(p0 context.Context, p1 peer.ID) (*TransferDiagnostics, error) `perm:"write"`
-
 		MarketDataTransferUpdates func(p0 context.Context) (<-chan DataTransferChannel, error) `perm:"write"`
 
 		MarketGetAsk func(p0 context.Context) (*storagemarket.SignedStorageAsk, error) `perm:"read"`
@@ -715,8 +661,6 @@ type StorageMinerStruct struct {
 
 		MarketRestartDataTransfer func(p0 context.Context, p1 datatransfer.TransferID, p2 peer.ID, p3 bool) error `perm:"write"`
 
-		MarketRetryPublishDeal func(p0 context.Context, p1 cid.Cid) error `perm:"admin"`
-
 		MarketSetAsk func(p0 context.Context, p1 types.BigInt, p2 types.BigInt, p3 abi.ChainEpoch, p4 abi.PaddedPieceSize, p5 abi.PaddedPieceSize) error `perm:"admin"`
 
 		MarketSetRetrievalAsk func(p0 context.Context, p1 *retrievalmarket.Ask) error `perm:"admin"`
@@ -739,20 +683,12 @@ type StorageMinerStruct struct {
 
 		ReturnFinalizeSector func(p0 context.Context, p1 storiface.CallID, p2 *storiface.CallError) error `perm:"admin"`
 
-		ReturnGenerateSectorKeyFromData func(p0 context.Context, p1 storiface.CallID, p2 *storiface.CallError) error `perm:"admin"`
-
 		ReturnMoveStorage func(p0 context.Context, p1 storiface.CallID, p2 *storiface.CallError) error `perm:"admin"`
 
-		ReturnProveReplicaUpdate1 func(p0 context.Context, p1 storiface.CallID, p2 storage.ReplicaVanillaProofs, p3 *storiface.CallError) error `perm:"admin"`
-
-		ReturnProveReplicaUpdate2 func(p0 context.Context, p1 storiface.CallID, p2 storage.ReplicaUpdateProof, p3 *storiface.CallError) error `perm:"admin"`
-
 		ReturnReadPiece func(p0 context.Context, p1 storiface.CallID, p2 bool, p3 *storiface.CallError) error `perm:"admin"`
 
 		ReturnReleaseUnsealed func(p0 context.Context, p1 storiface.CallID, p2 *storiface.CallError) error `perm:"admin"`
 
-		ReturnReplicaUpdate func(p0 context.Context, p1 storiface.CallID, p2 storage.ReplicaUpdateOut, p3 *storiface.CallError) error `perm:"admin"`
-
 		ReturnSealCommit1 func(p0 context.Context, p1 storiface.CallID, p2 storage.Commit1Out, p3 *storiface.CallError) error `perm:"admin"`
 
 		ReturnSealCommit2 func(p0 context.Context, p1 storiface.CallID, p2 storage.Proof, p3 *storiface.CallError) error `perm:"admin"`
@@ -779,9 +715,7 @@ type StorageMinerStruct struct {
 
 		SectorGetSealDelay func(p0 context.Context) (time.Duration, error) `perm:"read"`
 
-		SectorMarkForUpgrade func(p0 context.Context, p1 abi.SectorNumber, p2 bool) error `perm:"admin"`
-
-		SectorMatchPendingPiecesToOpenSectors func(p0 context.Context) error `perm:"admin"`
+		SectorMarkForUpgrade func(p0 context.Context, p1 abi.SectorNumber) error `perm:"admin"`
 
 		SectorPreCommitFlush func(p0 context.Context) ([]sealiface.PreCommitBatchRes, error) `perm:"admin"`
 
@@ -827,8 +761,6 @@ type StorageMinerStruct struct {
 
 		StorageFindSector func(p0 context.Context, p1 abi.SectorID, p2 storiface.SectorFileType, p3 abi.SectorSize, p4 bool) ([]stores.SectorStorageInfo, error) `perm:"admin"`
 
-		StorageGetLocks func(p0 context.Context) (storiface.SectorLocks, error) `perm:"admin"`
-
 		StorageInfo func(p0 context.Context, p1 stores.ID) (stores.StorageInfo, error) `perm:"admin"`
 
 		StorageList func(p0 context.Context) (map[stores.ID][]stores.Decl, error) `perm:"admin"`
@@ -888,8 +820,6 @@ type WorkerStruct struct {
 
 		FinalizeSector func(p0 context.Context, p1 storage.SectorRef, p2 []storage.Range) (storiface.CallID, error) `perm:"admin"`
 
-		GenerateSectorKeyFromData func(p0 context.Context, p1 storage.SectorRef, p2 cid.Cid) (storiface.CallID, error) `perm:"admin"`
-
 		Info func(p0 context.Context) (storiface.WorkerInfo, error) `perm:"admin"`
 
 		MoveStorage func(p0 context.Context, p1 storage.SectorRef, p2 storiface.SectorFileType) (storiface.CallID, error) `perm:"admin"`
@@ -898,16 +828,10 @@ type WorkerStruct struct {
 
 		ProcessSession func(p0 context.Context) (uuid.UUID, error) `perm:"admin"`
 
-		ProveReplicaUpdate1 func(p0 context.Context, p1 storage.SectorRef, p2 cid.Cid, p3 cid.Cid, p4 cid.Cid) (storiface.CallID, error) `perm:"admin"`
-
-		ProveReplicaUpdate2 func(p0 context.Context, p1 storage.SectorRef, p2 cid.Cid, p3 cid.Cid, p4 cid.Cid, p5 storage.ReplicaVanillaProofs) (storiface.CallID, error) `perm:"admin"`
-
 		ReleaseUnsealed func(p0 context.Context, p1 storage.SectorRef, p2 []storage.Range) (storiface.CallID, error) `perm:"admin"`
 
 		Remove func(p0 context.Context, p1 abi.SectorID) error `perm:"admin"`
 
-		ReplicaUpdate func(p0 context.Context, p1 storage.SectorRef, p2 []abi.PieceInfo) (storiface.CallID, error) `perm:"admin"`
-
 		SealCommit1 func(p0 context.Context, p1 storage.SectorRef, p2 abi.SealRandomness, p3 abi.InteractiveSealRandomness, p4 []abi.PieceInfo, p5 storage.SectorCids) (storiface.CallID, error) `perm:"admin"`
 
 		SealCommit2 func(p0 context.Context, p1 storage.SectorRef, p2 storage.Commit1Out) (storiface.CallID, error) `perm:"admin"`
@@ -1005,17 +929,6 @@ func (s *CommonStub) Discover(p0 context.Context) (apitypes.OpenRPCDocument, err
 	return *new(apitypes.OpenRPCDocument), ErrNotSupported
 }
 
-func (s *CommonStruct) LogAlerts(p0 context.Context) ([]alerting.Alert, error) {
-	if s.Internal.LogAlerts == nil {
-		return *new([]alerting.Alert), ErrNotSupported
-	}
-	return s.Internal.LogAlerts(p0)
-}
-
-func (s *CommonStub) LogAlerts(p0 context.Context) ([]alerting.Alert, error) {
-	return *new([]alerting.Alert), ErrNotSupported
-}
-
 func (s *CommonStruct) LogList(p0 context.Context) ([]string, error) {
 	if s.Internal.LogList == nil {
 		return *new([]string), ErrNotSupported
@@ -1225,6 +1138,28 @@ func (s *FullNodeStub) ChainGetPath(p0 context.Context, p1 types.TipSetKey, p2 t
 	return *new([]*HeadChange), ErrNotSupported
 }
 
+func (s *FullNodeStruct) ChainGetRandomnessFromBeacon(p0 context.Context, p1 types.TipSetKey, p2 crypto.DomainSeparationTag, p3 abi.ChainEpoch, p4 []byte) (abi.Randomness, error) {
+	if s.Internal.ChainGetRandomnessFromBeacon == nil {
+		return *new(abi.Randomness), ErrNotSupported
+	}
+	return s.Internal.ChainGetRandomnessFromBeacon(p0, p1, p2, p3, p4)
+}
+
+func (s *FullNodeStub) ChainGetRandomnessFromBeacon(p0 context.Context, p1 types.TipSetKey, p2 crypto.DomainSeparationTag, p3 abi.ChainEpoch, p4 []byte) (abi.Randomness, error) {
+	return *new(abi.Randomness), ErrNotSupported
+}
+
+func (s *FullNodeStruct) ChainGetRandomnessFromTickets(p0 context.Context, p1 types.TipSetKey, p2 crypto.DomainSeparationTag, p3 abi.ChainEpoch, p4 []byte) (abi.Randomness, error) {
+	if s.Internal.ChainGetRandomnessFromTickets == nil {
+		return *new(abi.Randomness), ErrNotSupported
+	}
+	return s.Internal.ChainGetRandomnessFromTickets(p0, p1, p2, p3, p4)
+}
+
+func (s *FullNodeStub) ChainGetRandomnessFromTickets(p0 context.Context, p1 types.TipSetKey, p2 crypto.DomainSeparationTag, p3 abi.ChainEpoch, p4 []byte) (abi.Randomness, error) {
+	return *new(abi.Randomness), ErrNotSupported
+}
+
 func (s *FullNodeStruct) ChainGetTipSet(p0 context.Context, p1 types.TipSetKey) (*types.TipSet, error) {
 	if s.Internal.ChainGetTipSet == nil {
 		return nil, ErrNotSupported
@@ -1236,17 +1171,6 @@ func (s *FullNodeStub) ChainGetTipSet(p0 context.Context, p1 types.TipSetKey) (*
 	return nil, ErrNotSupported
 }
 
-func (s *FullNodeStruct) ChainGetTipSetAfterHeight(p0 context.Context, p1 abi.ChainEpoch, p2 types.TipSetKey) (*types.TipSet, error) {
-	if s.Internal.ChainGetTipSetAfterHeight == nil {
-		return nil, ErrNotSupported
-	}
-	return s.Internal.ChainGetTipSetAfterHeight(p0, p1, p2)
-}
-
-func (s *FullNodeStub) ChainGetTipSetAfterHeight(p0 context.Context, p1 abi.ChainEpoch, p2 types.TipSetKey) (*types.TipSet, error) {
-	return nil, ErrNotSupported
-}
-
 func (s *FullNodeStruct) ChainGetTipSetByHeight(p0 context.Context, p1 abi.ChainEpoch, p2 types.TipSetKey) (*types.TipSet, error) {
 	if s.Internal.ChainGetTipSetByHeight == nil {
 		return nil, ErrNotSupported
@@ -1401,17 +1325,6 @@ func (s *FullNodeStub) ClientDealSize(p0 context.Context, p1 cid.Cid) (DataSize,
 	return *new(DataSize), ErrNotSupported
 }
 
-func (s *FullNodeStruct) ClientExport(p0 context.Context, p1 ExportRef, p2 FileRef) error {
-	if s.Internal.ClientExport == nil {
-		return ErrNotSupported
-	}
-	return s.Internal.ClientExport(p0, p1, p2)
-}
-
-func (s *FullNodeStub) ClientExport(p0 context.Context, p1 ExportRef, p2 FileRef) error {
-	return ErrNotSupported
-}
-
 func (s *FullNodeStruct) ClientFindData(p0 context.Context, p1 cid.Cid, p2 *cid.Cid) ([]QueryOffer, error) {
 	if s.Internal.ClientFindData == nil {
 		return *new([]QueryOffer), ErrNotSupported
@@ -1566,14 +1479,14 @@ func (s *FullNodeStub) ClientQueryAsk(p0 context.Context, p1 peer.ID, p2 address
 	return nil, ErrNotSupported
 }
 
-func (s *FullNodeStruct) ClientRemoveImport(p0 context.Context, p1 imports.ID) error {
+func (s *FullNodeStruct) ClientRemoveImport(p0 context.Context, p1 importmgr.ImportID) error {
 	if s.Internal.ClientRemoveImport == nil {
 		return ErrNotSupported
 	}
 	return s.Internal.ClientRemoveImport(p0, p1)
 }
 
-func (s *FullNodeStub) ClientRemoveImport(p0 context.Context, p1 imports.ID) error {
+func (s *FullNodeStub) ClientRemoveImport(p0 context.Context, p1 importmgr.ImportID) error {
 	return ErrNotSupported
 }
 
@@ -1588,15 +1501,15 @@ func (s *FullNodeStub) ClientRestartDataTransfer(p0 context.Context, p1 datatran
 	return ErrNotSupported
 }
 
-func (s *FullNodeStruct) ClientRetrieve(p0 context.Context, p1 RetrievalOrder) (*RestrievalRes, error) {
+func (s *FullNodeStruct) ClientRetrieve(p0 context.Context, p1 RetrievalOrder, p2 *FileRef) error {
 	if s.Internal.ClientRetrieve == nil {
-		return nil, ErrNotSupported
+		return ErrNotSupported
 	}
-	return s.Internal.ClientRetrieve(p0, p1)
+	return s.Internal.ClientRetrieve(p0, p1, p2)
 }
 
-func (s *FullNodeStub) ClientRetrieve(p0 context.Context, p1 RetrievalOrder) (*RestrievalRes, error) {
-	return nil, ErrNotSupported
+func (s *FullNodeStub) ClientRetrieve(p0 context.Context, p1 RetrievalOrder, p2 *FileRef) error {
+	return ErrNotSupported
 }
 
 func (s *FullNodeStruct) ClientRetrieveTryRestartInsufficientFunds(p0 context.Context, p1 address.Address) error {
@@ -1610,15 +1523,15 @@ func (s *FullNodeStub) ClientRetrieveTryRestartInsufficientFunds(p0 context.Cont
 	return ErrNotSupported
 }
 
-func (s *FullNodeStruct) ClientRetrieveWait(p0 context.Context, p1 retrievalmarket.DealID) error {
-	if s.Internal.ClientRetrieveWait == nil {
-		return ErrNotSupported
+func (s *FullNodeStruct) ClientRetrieveWithEvents(p0 context.Context, p1 RetrievalOrder, p2 *FileRef) (<-chan marketevents.RetrievalEvent, error) {
+	if s.Internal.ClientRetrieveWithEvents == nil {
+		return nil, ErrNotSupported
 	}
-	return s.Internal.ClientRetrieveWait(p0, p1)
+	return s.Internal.ClientRetrieveWithEvents(p0, p1, p2)
 }
 
-func (s *FullNodeStub) ClientRetrieveWait(p0 context.Context, p1 retrievalmarket.DealID) error {
-	return ErrNotSupported
+func (s *FullNodeStub) ClientRetrieveWithEvents(p0 context.Context, p1 RetrievalOrder, p2 *FileRef) (<-chan marketevents.RetrievalEvent, error) {
+	return nil, ErrNotSupported
 }
 
 func (s *FullNodeStruct) ClientStartDeal(p0 context.Context, p1 *StartDealParams) (*cid.Cid, error) {
@@ -2006,25 +1919,14 @@ func (s *FullNodeStub) MsigApproveTxnHash(p0 context.Context, p1 address.Address
 	return nil, ErrNotSupported
 }
 
-func (s *FullNodeStruct) MsigCancel(p0 context.Context, p1 address.Address, p2 uint64, p3 address.Address) (*MessagePrototype, error) {
+func (s *FullNodeStruct) MsigCancel(p0 context.Context, p1 address.Address, p2 uint64, p3 address.Address, p4 types.BigInt, p5 address.Address, p6 uint64, p7 []byte) (*MessagePrototype, error) {
 	if s.Internal.MsigCancel == nil {
 		return nil, ErrNotSupported
 	}
-	return s.Internal.MsigCancel(p0, p1, p2, p3)
+	return s.Internal.MsigCancel(p0, p1, p2, p3, p4, p5, p6, p7)
 }
 
-func (s *FullNodeStub) MsigCancel(p0 context.Context, p1 address.Address, p2 uint64, p3 address.Address) (*MessagePrototype, error) {
-	return nil, ErrNotSupported
-}
-
-func (s *FullNodeStruct) MsigCancelTxnHash(p0 context.Context, p1 address.Address, p2 uint64, p3 address.Address, p4 types.BigInt, p5 address.Address, p6 uint64, p7 []byte) (*MessagePrototype, error) {
-	if s.Internal.MsigCancelTxnHash == nil {
-		return nil, ErrNotSupported
-	}
-	return s.Internal.MsigCancelTxnHash(p0, p1, p2, p3, p4, p5, p6, p7)
-}
-
-func (s *FullNodeStub) MsigCancelTxnHash(p0 context.Context, p1 address.Address, p2 uint64, p3 address.Address, p4 types.BigInt, p5 address.Address, p6 uint64, p7 []byte) (*MessagePrototype, error) {
+func (s *FullNodeStub) MsigCancel(p0 context.Context, p1 address.Address, p2 uint64, p3 address.Address, p4 types.BigInt, p5 address.Address, p6 uint64, p7 []byte) (*MessagePrototype, error) {
 	return nil, ErrNotSupported
 }
 
@@ -2413,17 +2315,6 @@ func (s *FullNodeStub) StateDecodeParams(p0 context.Context, p1 address.Address,
 	return nil, ErrNotSupported
 }
 
-func (s *FullNodeStruct) StateEncodeParams(p0 context.Context, p1 cid.Cid, p2 abi.MethodNum, p3 json.RawMessage) ([]byte, error) {
-	if s.Internal.StateEncodeParams == nil {
-		return *new([]byte), ErrNotSupported
-	}
-	return s.Internal.StateEncodeParams(p0, p1, p2, p3)
-}
-
-func (s *FullNodeStub) StateEncodeParams(p0 context.Context, p1 cid.Cid, p2 abi.MethodNum, p3 json.RawMessage) ([]byte, error) {
-	return *new([]byte), ErrNotSupported
-}
-
 func (s *FullNodeStruct) StateGetActor(p0 context.Context, p1 address.Address, p2 types.TipSetKey) (*types.Actor, error) {
 	if s.Internal.StateGetActor == nil {
 		return nil, ErrNotSupported
@@ -2435,28 +2326,6 @@ func (s *FullNodeStub) StateGetActor(p0 context.Context, p1 address.Address, p2
 	return nil, ErrNotSupported
 }
 
-func (s *FullNodeStruct) StateGetRandomnessFromBeacon(p0 context.Context, p1 crypto.DomainSeparationTag, p2 abi.ChainEpoch, p3 []byte, p4 types.TipSetKey) (abi.Randomness, error) {
-	if s.Internal.StateGetRandomnessFromBeacon == nil {
-		return *new(abi.Randomness), ErrNotSupported
-	}
-	return s.Internal.StateGetRandomnessFromBeacon(p0, p1, p2, p3, p4)
-}
-
-func (s *FullNodeStub) StateGetRandomnessFromBeacon(p0 context.Context, p1 crypto.DomainSeparationTag, p2 abi.ChainEpoch, p3 []byte, p4 types.TipSetKey) (abi.Randomness, error) {
-	return *new(abi.Randomness), ErrNotSupported
-}
-
-func (s *FullNodeStruct) StateGetRandomnessFromTickets(p0 context.Context, p1 crypto.DomainSeparationTag, p2 abi.ChainEpoch, p3 []byte, p4 types.TipSetKey) (abi.Randomness, error) {
-	if s.Internal.StateGetRandomnessFromTickets == nil {
-		return *new(abi.Randomness), ErrNotSupported
-	}
-	return s.Internal.StateGetRandomnessFromTickets(p0, p1, p2, p3, p4)
-}
-
-func (s *FullNodeStub) StateGetRandomnessFromTickets(p0 context.Context, p1 crypto.DomainSeparationTag, p2 abi.ChainEpoch, p3 []byte, p4 types.TipSetKey) (abi.Randomness, error) {
-	return *new(abi.Randomness), ErrNotSupported
-}
-
 func (s *FullNodeStruct) StateListActors(p0 context.Context, p1 types.TipSetKey) ([]address.Address, error) {
 	if s.Internal.StateListActors == nil {
 		return *new([]address.Address), ErrNotSupported
@@ -3106,17 +2975,6 @@ func (s *GatewayStub) ChainGetBlockMessages(p0 context.Context, p1 cid.Cid) (*Bl
 	return nil, ErrNotSupported
 }
 
-func (s *GatewayStruct) ChainGetGenesis(p0 context.Context) (*types.TipSet, error) {
-	if s.Internal.ChainGetGenesis == nil {
-		return nil, ErrNotSupported
-	}
-	return s.Internal.ChainGetGenesis(p0)
-}
-
-func (s *GatewayStub) ChainGetGenesis(p0 context.Context) (*types.TipSet, error) {
-	return nil, ErrNotSupported
-}
-
 func (s *GatewayStruct) ChainGetMessage(p0 context.Context, p1 cid.Cid) (*types.Message, error) {
 	if s.Internal.ChainGetMessage == nil {
 		return nil, ErrNotSupported
@@ -3128,39 +2986,6 @@ func (s *GatewayStub) ChainGetMessage(p0 context.Context, p1 cid.Cid) (*types.Me
 	return nil, ErrNotSupported
 }
 
-func (s *GatewayStruct) ChainGetParentMessages(p0 context.Context, p1 cid.Cid) ([]Message, error) {
-	if s.Internal.ChainGetParentMessages == nil {
-		return *new([]Message), ErrNotSupported
-	}
-	return s.Internal.ChainGetParentMessages(p0, p1)
-}
-
-func (s *GatewayStub) ChainGetParentMessages(p0 context.Context, p1 cid.Cid) ([]Message, error) {
-	return *new([]Message), ErrNotSupported
-}
-
-func (s *GatewayStruct) ChainGetParentReceipts(p0 context.Context, p1 cid.Cid) ([]*types.MessageReceipt, error) {
-	if s.Internal.ChainGetParentReceipts == nil {
-		return *new([]*types.MessageReceipt), ErrNotSupported
-	}
-	return s.Internal.ChainGetParentReceipts(p0, p1)
-}
-
-func (s *GatewayStub) ChainGetParentReceipts(p0 context.Context, p1 cid.Cid) ([]*types.MessageReceipt, error) {
-	return *new([]*types.MessageReceipt), ErrNotSupported
-}
-
-func (s *GatewayStruct) ChainGetPath(p0 context.Context, p1 types.TipSetKey, p2 types.TipSetKey) ([]*HeadChange, error) {
-	if s.Internal.ChainGetPath == nil {
-		return *new([]*HeadChange), ErrNotSupported
-	}
-	return s.Internal.ChainGetPath(p0, p1, p2)
-}
-
-func (s *GatewayStub) ChainGetPath(p0 context.Context, p1 types.TipSetKey, p2 types.TipSetKey) ([]*HeadChange, error) {
-	return *new([]*HeadChange), ErrNotSupported
-}
-
 func (s *GatewayStruct) ChainGetTipSet(p0 context.Context, p1 types.TipSetKey) (*types.TipSet, error) {
 	if s.Internal.ChainGetTipSet == nil {
 		return nil, ErrNotSupported
@@ -3172,17 +2997,6 @@ func (s *GatewayStub) ChainGetTipSet(p0 context.Context, p1 types.TipSetKey) (*t
 	return nil, ErrNotSupported
 }
 
-func (s *GatewayStruct) ChainGetTipSetAfterHeight(p0 context.Context, p1 abi.ChainEpoch, p2 types.TipSetKey) (*types.TipSet, error) {
-	if s.Internal.ChainGetTipSetAfterHeight == nil {
-		return nil, ErrNotSupported
-	}
-	return s.Internal.ChainGetTipSetAfterHeight(p0, p1, p2)
-}
-
-func (s *GatewayStub) ChainGetTipSetAfterHeight(p0 context.Context, p1 abi.ChainEpoch, p2 types.TipSetKey) (*types.TipSet, error) {
-	return nil, ErrNotSupported
-}
-
 func (s *GatewayStruct) ChainGetTipSetByHeight(p0 context.Context, p1 abi.ChainEpoch, p2 types.TipSetKey) (*types.TipSet, error) {
 	if s.Internal.ChainGetTipSetByHeight == nil {
 		return nil, ErrNotSupported
@@ -3645,17 +3459,6 @@ func (s *NetStub) NetFindPeer(p0 context.Context, p1 peer.ID) (peer.AddrInfo, er
 	return *new(peer.AddrInfo), ErrNotSupported
 }
 
-func (s *NetStruct) NetLimit(p0 context.Context, p1 string) (NetLimit, error) {
-	if s.Internal.NetLimit == nil {
-		return *new(NetLimit), ErrNotSupported
-	}
-	return s.Internal.NetLimit(p0, p1)
-}
-
-func (s *NetStub) NetLimit(p0 context.Context, p1 string) (NetLimit, error) {
-	return *new(NetLimit), ErrNotSupported
-}
-
 func (s *NetStruct) NetPeerInfo(p0 context.Context, p1 peer.ID) (*ExtendedPeerInfo, error) {
 	if s.Internal.NetPeerInfo == nil {
 		return nil, ErrNotSupported
@@ -3678,39 +3481,6 @@ func (s *NetStub) NetPeers(p0 context.Context) ([]peer.AddrInfo, error) {
 	return *new([]peer.AddrInfo), ErrNotSupported
 }
 
-func (s *NetStruct) NetProtectAdd(p0 context.Context, p1 []peer.ID) error {
-	if s.Internal.NetProtectAdd == nil {
-		return ErrNotSupported
-	}
-	return s.Internal.NetProtectAdd(p0, p1)
-}
-
-func (s *NetStub) NetProtectAdd(p0 context.Context, p1 []peer.ID) error {
-	return ErrNotSupported
-}
-
-func (s *NetStruct) NetProtectList(p0 context.Context) ([]peer.ID, error) {
-	if s.Internal.NetProtectList == nil {
-		return *new([]peer.ID), ErrNotSupported
-	}
-	return s.Internal.NetProtectList(p0)
-}
-
-func (s *NetStub) NetProtectList(p0 context.Context) ([]peer.ID, error) {
-	return *new([]peer.ID), ErrNotSupported
-}
-
-func (s *NetStruct) NetProtectRemove(p0 context.Context, p1 []peer.ID) error {
-	if s.Internal.NetProtectRemove == nil {
-		return ErrNotSupported
-	}
-	return s.Internal.NetProtectRemove(p0, p1)
-}
-
-func (s *NetStub) NetProtectRemove(p0 context.Context, p1 []peer.ID) error {
-	return ErrNotSupported
-}
-
 func (s *NetStruct) NetPubsubScores(p0 context.Context) ([]PubsubScore, error) {
 	if s.Internal.NetPubsubScores == nil {
 		return *new([]PubsubScore), ErrNotSupported
@@ -3722,28 +3492,6 @@ func (s *NetStub) NetPubsubScores(p0 context.Context) ([]PubsubScore, error) {
 	return *new([]PubsubScore), ErrNotSupported
 }
 
-func (s *NetStruct) NetSetLimit(p0 context.Context, p1 string, p2 NetLimit) error {
-	if s.Internal.NetSetLimit == nil {
-		return ErrNotSupported
-	}
-	return s.Internal.NetSetLimit(p0, p1, p2)
-}
-
-func (s *NetStub) NetSetLimit(p0 context.Context, p1 string, p2 NetLimit) error {
-	return ErrNotSupported
-}
-
-func (s *NetStruct) NetStat(p0 context.Context, p1 string) (NetStat, error) {
-	if s.Internal.NetStat == nil {
-		return *new(NetStat), ErrNotSupported
-	}
-	return s.Internal.NetStat(p0, p1)
-}
-
-func (s *NetStub) NetStat(p0 context.Context, p1 string) (NetStat, error) {
-	return *new(NetStat), ErrNotSupported
-}
-
 func (s *SignableStruct) Sign(p0 context.Context, p1 SignFunc) error {
 	if s.Internal.Sign == nil {
 		return ErrNotSupported
@@ -3799,14 +3547,14 @@ func (s *StorageMinerStub) CheckProvable(p0 context.Context, p1 abi.RegisteredPo
 	return *new(map[abi.SectorNumber]string), ErrNotSupported
 }
 
-func (s *StorageMinerStruct) ComputeProof(p0 context.Context, p1 []builtin.ExtendedSectorInfo, p2 abi.PoStRandomness, p3 abi.ChainEpoch, p4 abinetwork.Version) ([]builtin.PoStProof, error) {
+func (s *StorageMinerStruct) ComputeProof(p0 context.Context, p1 []builtin.SectorInfo, p2 abi.PoStRandomness) ([]builtin.PoStProof, error) {
 	if s.Internal.ComputeProof == nil {
 		return *new([]builtin.PoStProof), ErrNotSupported
 	}
-	return s.Internal.ComputeProof(p0, p1, p2, p3, p4)
+	return s.Internal.ComputeProof(p0, p1, p2)
 }
 
-func (s *StorageMinerStub) ComputeProof(p0 context.Context, p1 []builtin.ExtendedSectorInfo, p2 abi.PoStRandomness, p3 abi.ChainEpoch, p4 abinetwork.Version) ([]builtin.PoStProof, error) {
+func (s *StorageMinerStub) ComputeProof(p0 context.Context, p1 []builtin.SectorInfo, p2 abi.PoStRandomness) ([]builtin.PoStProof, error) {
 	return *new([]builtin.PoStProof), ErrNotSupported
 }
 
@@ -3821,83 +3569,6 @@ func (s *StorageMinerStub) CreateBackup(p0 context.Context, p1 string) error {
 	return ErrNotSupported
 }
 
-func (s *StorageMinerStruct) DagstoreGC(p0 context.Context) ([]DagstoreShardResult, error) {
-	if s.Internal.DagstoreGC == nil {
-		return *new([]DagstoreShardResult), ErrNotSupported
-	}
-	return s.Internal.DagstoreGC(p0)
-}
-
-func (s *StorageMinerStub) DagstoreGC(p0 context.Context) ([]DagstoreShardResult, error) {
-	return *new([]DagstoreShardResult), ErrNotSupported
-}
-
-func (s *StorageMinerStruct) DagstoreInitializeAll(p0 context.Context, p1 DagstoreInitializeAllParams) (<-chan DagstoreInitializeAllEvent, error) {
-	if s.Internal.DagstoreInitializeAll == nil {
-		return nil, ErrNotSupported
-	}
-	return s.Internal.DagstoreInitializeAll(p0, p1)
-}
-
-func (s *StorageMinerStub) DagstoreInitializeAll(p0 context.Context, p1 DagstoreInitializeAllParams) (<-chan DagstoreInitializeAllEvent, error) {
-	return nil, ErrNotSupported
-}
-
-func (s *StorageMinerStruct) DagstoreInitializeShard(p0 context.Context, p1 string) error {
-	if s.Internal.DagstoreInitializeShard == nil {
-		return ErrNotSupported
-	}
-	return s.Internal.DagstoreInitializeShard(p0, p1)
-}
-
-func (s *StorageMinerStub) DagstoreInitializeShard(p0 context.Context, p1 string) error {
-	return ErrNotSupported
-}
-
-func (s *StorageMinerStruct) DagstoreListShards(p0 context.Context) ([]DagstoreShardInfo, error) {
-	if s.Internal.DagstoreListShards == nil {
-		return *new([]DagstoreShardInfo), ErrNotSupported
-	}
-	return s.Internal.DagstoreListShards(p0)
-}
-
-func (s *StorageMinerStub) DagstoreListShards(p0 context.Context) ([]DagstoreShardInfo, error) {
-	return *new([]DagstoreShardInfo), ErrNotSupported
-}
-
-func (s *StorageMinerStruct) DagstoreLookupPieces(p0 context.Context, p1 cid.Cid) ([]DagstoreShardInfo, error) {
-	if s.Internal.DagstoreLookupPieces == nil {
-		return *new([]DagstoreShardInfo), ErrNotSupported
-	}
-	return s.Internal.DagstoreLookupPieces(p0, p1)
-}
-
-func (s *StorageMinerStub) DagstoreLookupPieces(p0 context.Context, p1 cid.Cid) ([]DagstoreShardInfo, error) {
-	return *new([]DagstoreShardInfo), ErrNotSupported
-}
-
-func (s *StorageMinerStruct) DagstorePieceIndexSize(p0 context.Context) (int64, error) {
-	if s.Internal.DagstorePieceIndexSize == nil {
-		return 0, ErrNotSupported
-	}
-	return s.Internal.DagstorePieceIndexSize(p0)
-}
-
-func (s *StorageMinerStub) DagstorePieceIndexSize(p0 context.Context) (int64, error) {
-	return 0, ErrNotSupported
-}
-
-func (s *StorageMinerStruct) DagstoreRecoverShard(p0 context.Context, p1 string) error {
-	if s.Internal.DagstoreRecoverShard == nil {
-		return ErrNotSupported
-	}
-	return s.Internal.DagstoreRecoverShard(p0, p1)
-}
-
-func (s *StorageMinerStub) DagstoreRecoverShard(p0 context.Context, p1 string) error {
-	return ErrNotSupported
-}
-
 func (s *StorageMinerStruct) DealsConsiderOfflineRetrievalDeals(p0 context.Context) (bool, error) {
 	if s.Internal.DealsConsiderOfflineRetrievalDeals == nil {
 		return false, ErrNotSupported
@@ -4074,28 +3745,6 @@ func (s *StorageMinerStub) DealsSetPieceCidBlocklist(p0 context.Context, p1 []ci
 	return ErrNotSupported
 }
 
-func (s *StorageMinerStruct) IndexerAnnounceAllDeals(p0 context.Context) error {
-	if s.Internal.IndexerAnnounceAllDeals == nil {
-		return ErrNotSupported
-	}
-	return s.Internal.IndexerAnnounceAllDeals(p0)
-}
-
-func (s *StorageMinerStub) IndexerAnnounceAllDeals(p0 context.Context) error {
-	return ErrNotSupported
-}
-
-func (s *StorageMinerStruct) IndexerAnnounceDeal(p0 context.Context, p1 cid.Cid) error {
-	if s.Internal.IndexerAnnounceDeal == nil {
-		return ErrNotSupported
-	}
-	return s.Internal.IndexerAnnounceDeal(p0, p1)
-}
-
-func (s *StorageMinerStub) IndexerAnnounceDeal(p0 context.Context, p1 cid.Cid) error {
-	return ErrNotSupported
-}
-
 func (s *StorageMinerStruct) MarketCancelDataTransfer(p0 context.Context, p1 datatransfer.TransferID, p2 peer.ID, p3 bool) error {
 	if s.Internal.MarketCancelDataTransfer == nil {
 		return ErrNotSupported
@@ -4107,17 +3756,6 @@ func (s *StorageMinerStub) MarketCancelDataTransfer(p0 context.Context, p1 datat
 	return ErrNotSupported
 }
 
-func (s *StorageMinerStruct) MarketDataTransferDiagnostics(p0 context.Context, p1 peer.ID) (*TransferDiagnostics, error) {
-	if s.Internal.MarketDataTransferDiagnostics == nil {
-		return nil, ErrNotSupported
-	}
-	return s.Internal.MarketDataTransferDiagnostics(p0, p1)
-}
-
-func (s *StorageMinerStub) MarketDataTransferDiagnostics(p0 context.Context, p1 peer.ID) (*TransferDiagnostics, error) {
-	return nil, ErrNotSupported
-}
-
 func (s *StorageMinerStruct) MarketDataTransferUpdates(p0 context.Context) (<-chan DataTransferChannel, error) {
 	if s.Internal.MarketDataTransferUpdates == nil {
 		return nil, ErrNotSupported
@@ -4250,17 +3888,6 @@ func (s *StorageMinerStub) MarketRestartDataTransfer(p0 context.Context, p1 data
 	return ErrNotSupported
 }
 
-func (s *StorageMinerStruct) MarketRetryPublishDeal(p0 context.Context, p1 cid.Cid) error {
-	if s.Internal.MarketRetryPublishDeal == nil {
-		return ErrNotSupported
-	}
-	return s.Internal.MarketRetryPublishDeal(p0, p1)
-}
-
-func (s *StorageMinerStub) MarketRetryPublishDeal(p0 context.Context, p1 cid.Cid) error {
-	return ErrNotSupported
-}
-
 func (s *StorageMinerStruct) MarketSetAsk(p0 context.Context, p1 types.BigInt, p2 types.BigInt, p3 abi.ChainEpoch, p4 abi.PaddedPieceSize, p5 abi.PaddedPieceSize) error {
 	if s.Internal.MarketSetAsk == nil {
 		return ErrNotSupported
@@ -4382,17 +4009,6 @@ func (s *StorageMinerStub) ReturnFinalizeSector(p0 context.Context, p1 storiface
 	return ErrNotSupported
 }
 
-func (s *StorageMinerStruct) ReturnGenerateSectorKeyFromData(p0 context.Context, p1 storiface.CallID, p2 *storiface.CallError) error {
-	if s.Internal.ReturnGenerateSectorKeyFromData == nil {
-		return ErrNotSupported
-	}
-	return s.Internal.ReturnGenerateSectorKeyFromData(p0, p1, p2)
-}
-
-func (s *StorageMinerStub) ReturnGenerateSectorKeyFromData(p0 context.Context, p1 storiface.CallID, p2 *storiface.CallError) error {
-	return ErrNotSupported
-}
-
 func (s *StorageMinerStruct) ReturnMoveStorage(p0 context.Context, p1 storiface.CallID, p2 *storiface.CallError) error {
 	if s.Internal.ReturnMoveStorage == nil {
 		return ErrNotSupported
@@ -4404,28 +4020,6 @@ func (s *StorageMinerStub) ReturnMoveStorage(p0 context.Context, p1 storiface.Ca
 	return ErrNotSupported
 }
 
-func (s *StorageMinerStruct) ReturnProveReplicaUpdate1(p0 context.Context, p1 storiface.CallID, p2 storage.ReplicaVanillaProofs, p3 *storiface.CallError) error {
-	if s.Internal.ReturnProveReplicaUpdate1 == nil {
-		return ErrNotSupported
-	}
-	return s.Internal.ReturnProveReplicaUpdate1(p0, p1, p2, p3)
-}
-
-func (s *StorageMinerStub) ReturnProveReplicaUpdate1(p0 context.Context, p1 storiface.CallID, p2 storage.ReplicaVanillaProofs, p3 *storiface.CallError) error {
-	return ErrNotSupported
-}
-
-func (s *StorageMinerStruct) ReturnProveReplicaUpdate2(p0 context.Context, p1 storiface.CallID, p2 storage.ReplicaUpdateProof, p3 *storiface.CallError) error {
-	if s.Internal.ReturnProveReplicaUpdate2 == nil {
-		return ErrNotSupported
-	}
-	return s.Internal.ReturnProveReplicaUpdate2(p0, p1, p2, p3)
-}
-
-func (s *StorageMinerStub) ReturnProveReplicaUpdate2(p0 context.Context, p1 storiface.CallID, p2 storage.ReplicaUpdateProof, p3 *storiface.CallError) error {
-	return ErrNotSupported
-}
-
 func (s *StorageMinerStruct) ReturnReadPiece(p0 context.Context, p1 storiface.CallID, p2 bool, p3 *storiface.CallError) error {
 	if s.Internal.ReturnReadPiece == nil {
 		return ErrNotSupported
@@ -4448,17 +4042,6 @@ func (s *StorageMinerStub) ReturnReleaseUnsealed(p0 context.Context, p1 storifac
 	return ErrNotSupported
 }
 
-func (s *StorageMinerStruct) ReturnReplicaUpdate(p0 context.Context, p1 storiface.CallID, p2 storage.ReplicaUpdateOut, p3 *storiface.CallError) error {
-	if s.Internal.ReturnReplicaUpdate == nil {
-		return ErrNotSupported
-	}
-	return s.Internal.ReturnReplicaUpdate(p0, p1, p2, p3)
-}
-
-func (s *StorageMinerStub) ReturnReplicaUpdate(p0 context.Context, p1 storiface.CallID, p2 storage.ReplicaUpdateOut, p3 *storiface.CallError) error {
-	return ErrNotSupported
-}
-
 func (s *StorageMinerStruct) ReturnSealCommit1(p0 context.Context, p1 storiface.CallID, p2 storage.Commit1Out, p3 *storiface.CallError) error {
 	if s.Internal.ReturnSealCommit1 == nil {
 		return ErrNotSupported
@@ -4602,25 +4185,14 @@ func (s *StorageMinerStub) SectorGetSealDelay(p0 context.Context) (time.Duration
 	return *new(time.Duration), ErrNotSupported
 }
 
-func (s *StorageMinerStruct) SectorMarkForUpgrade(p0 context.Context, p1 abi.SectorNumber, p2 bool) error {
+func (s *StorageMinerStruct) SectorMarkForUpgrade(p0 context.Context, p1 abi.SectorNumber) error {
 	if s.Internal.SectorMarkForUpgrade == nil {
 		return ErrNotSupported
 	}
-	return s.Internal.SectorMarkForUpgrade(p0, p1, p2)
+	return s.Internal.SectorMarkForUpgrade(p0, p1)
 }
 
-func (s *StorageMinerStub) SectorMarkForUpgrade(p0 context.Context, p1 abi.SectorNumber, p2 bool) error {
-	return ErrNotSupported
-}
-
-func (s *StorageMinerStruct) SectorMatchPendingPiecesToOpenSectors(p0 context.Context) error {
-	if s.Internal.SectorMatchPendingPiecesToOpenSectors == nil {
-		return ErrNotSupported
-	}
-	return s.Internal.SectorMatchPendingPiecesToOpenSectors(p0)
-}
-
-func (s *StorageMinerStub) SectorMatchPendingPiecesToOpenSectors(p0 context.Context) error {
+func (s *StorageMinerStub) SectorMarkForUpgrade(p0 context.Context, p1 abi.SectorNumber) error {
 	return ErrNotSupported
 }
 
@@ -4866,17 +4438,6 @@ func (s *StorageMinerStub) StorageFindSector(p0 context.Context, p1 abi.SectorID
 	return *new([]stores.SectorStorageInfo), ErrNotSupported
 }
 
-func (s *StorageMinerStruct) StorageGetLocks(p0 context.Context) (storiface.SectorLocks, error) {
-	if s.Internal.StorageGetLocks == nil {
-		return *new(storiface.SectorLocks), ErrNotSupported
-	}
-	return s.Internal.StorageGetLocks(p0)
-}
-
-func (s *StorageMinerStub) StorageGetLocks(p0 context.Context) (storiface.SectorLocks, error) {
-	return *new(storiface.SectorLocks), ErrNotSupported
-}
-
 func (s *StorageMinerStruct) StorageInfo(p0 context.Context, p1 stores.ID) (stores.StorageInfo, error) {
 	if s.Internal.StorageInfo == nil {
 		return *new(stores.StorageInfo), ErrNotSupported
@@ -5108,17 +4669,6 @@ func (s *WorkerStub) FinalizeSector(p0 context.Context, p1 storage.SectorRef, p2
 	return *new(storiface.CallID), ErrNotSupported
 }
 
-func (s *WorkerStruct) GenerateSectorKeyFromData(p0 context.Context, p1 storage.SectorRef, p2 cid.Cid) (storiface.CallID, error) {
-	if s.Internal.GenerateSectorKeyFromData == nil {
-		return *new(storiface.CallID), ErrNotSupported
-	}
-	return s.Internal.GenerateSectorKeyFromData(p0, p1, p2)
-}
-
-func (s *WorkerStub) GenerateSectorKeyFromData(p0 context.Context, p1 storage.SectorRef, p2 cid.Cid) (storiface.CallID, error) {
-	return *new(storiface.CallID), ErrNotSupported
-}
-
 func (s *WorkerStruct) Info(p0 context.Context) (storiface.WorkerInfo, error) {
 	if s.Internal.Info == nil {
 		return *new(storiface.WorkerInfo), ErrNotSupported
@@ -5163,28 +4713,6 @@ func (s *WorkerStub) ProcessSession(p0 context.Context) (uuid.UUID, error) {
 	return *new(uuid.UUID), ErrNotSupported
 }
 
-func (s *WorkerStruct) ProveReplicaUpdate1(p0 context.Context, p1 storage.SectorRef, p2 cid.Cid, p3 cid.Cid, p4 cid.Cid) (storiface.CallID, error) {
-	if s.Internal.ProveReplicaUpdate1 == nil {
-		return *new(storiface.CallID), ErrNotSupported
-	}
-	return s.Internal.ProveReplicaUpdate1(p0, p1, p2, p3, p4)
-}
-
-func (s *WorkerStub) ProveReplicaUpdate1(p0 context.Context, p1 storage.SectorRef, p2 cid.Cid, p3 cid.Cid, p4 cid.Cid) (storiface.CallID, error) {
-	return *new(storiface.CallID), ErrNotSupported
-}
-
-func (s *WorkerStruct) ProveReplicaUpdate2(p0 context.Context, p1 storage.SectorRef, p2 cid.Cid, p3 cid.Cid, p4 cid.Cid, p5 storage.ReplicaVanillaProofs) (storiface.CallID, error) {
-	if s.Internal.ProveReplicaUpdate2 == nil {
-		return *new(storiface.CallID), ErrNotSupported
-	}
-	return s.Internal.ProveReplicaUpdate2(p0, p1, p2, p3, p4, p5)
-}
-
-func (s *WorkerStub) ProveReplicaUpdate2(p0 context.Context, p1 storage.SectorRef, p2 cid.Cid, p3 cid.Cid, p4 cid.Cid, p5 storage.ReplicaVanillaProofs) (storiface.CallID, error) {
-	return *new(storiface.CallID), ErrNotSupported
-}
-
 func (s *WorkerStruct) ReleaseUnsealed(p0 context.Context, p1 storage.SectorRef, p2 []storage.Range) (storiface.CallID, error) {
 	if s.Internal.ReleaseUnsealed == nil {
 		return *new(storiface.CallID), ErrNotSupported
@@ -5207,17 +4735,6 @@ func (s *WorkerStub) Remove(p0 context.Context, p1 abi.SectorID) error {
 	return ErrNotSupported
 }
 
-func (s *WorkerStruct) ReplicaUpdate(p0 context.Context, p1 storage.SectorRef, p2 []abi.PieceInfo) (storiface.CallID, error) {
-	if s.Internal.ReplicaUpdate == nil {
-		return *new(storiface.CallID), ErrNotSupported
-	}
-	return s.Internal.ReplicaUpdate(p0, p1, p2)
-}
-
-func (s *WorkerStub) ReplicaUpdate(p0 context.Context, p1 storage.SectorRef, p2 []abi.PieceInfo) (storiface.CallID, error) {
-	return *new(storiface.CallID), ErrNotSupported
-}
-
 func (s *WorkerStruct) SealCommit1(p0 context.Context, p1 storage.SectorRef, p2 abi.SealRandomness, p3 abi.InteractiveSealRandomness, p4 []abi.PieceInfo, p5 storage.SectorCids) (storiface.CallID, error) {
 	if s.Internal.SealCommit1 == nil {
 		return *new(storiface.CallID), ErrNotSupported

api/types.go

@@ -5,14 +5,13 @@ import (
 	"fmt"
 	"time"
 
-	datatransfer "github.com/filecoin-project/go-data-transfer"
 	"github.com/filecoin-project/go-fil-markets/retrievalmarket"
-	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/lotus/chain/types"
-	"github.com/ipfs/go-cid"
-	"github.com/ipfs/go-graphsync"
 
-	"github.com/libp2p/go-libp2p-core/network"
+	datatransfer "github.com/filecoin-project/go-data-transfer"
+	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/ipfs/go-cid"
+
 	"github.com/libp2p/go-libp2p-core/peer"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	ma "github.com/multiformats/go-multiaddr"
@@ -55,30 +54,6 @@ type MessageSendSpec struct {
 	MaxFee abi.TokenAmount
 }
 
-// GraphSyncDataTransfer provides diagnostics on a data transfer happening over graphsync
-type GraphSyncDataTransfer struct {
-	// GraphSync request id for this transfer
-	RequestID graphsync.RequestID
-	// Graphsync state for this transfer
-	RequestState string
-	// If a channel ID is present, indicates whether this is the current graphsync request for this channel
-	// (could have changed in a restart)
-	IsCurrentChannelRequest bool
-	// Data transfer channel ID for this transfer
-	ChannelID *datatransfer.ChannelID
-	// Data transfer state for this transfer
-	ChannelState *DataTransferChannel
-	// Diagnostic information about this request -- and unexpected inconsistencies in
-	// request state
-	Diagnostics []string
-}
-
-// TransferDiagnostics give current information about transfers going over graphsync that may be helpful for debugging
-type TransferDiagnostics struct {
-	ReceivingTransfers []*GraphSyncDataTransfer
-	SendingTransfers   []*GraphSyncDataTransfer
-}
-
 type DataTransferChannel struct {
 	TransferID  datatransfer.TransferID
 	Status      datatransfer.Status
@@ -130,28 +105,6 @@ type NetBlockList struct {
 	IPSubnets []string
 }
 
-type NetStat struct {
-	System    *network.ScopeStat           `json:",omitempty"`
-	Transient *network.ScopeStat           `json:",omitempty"`
-	Services  map[string]network.ScopeStat `json:",omitempty"`
-	Protocols map[string]network.ScopeStat `json:",omitempty"`
-	Peers     map[string]network.ScopeStat `json:",omitempty"`
-}
-
-type NetLimit struct {
-	Dynamic bool `json:",omitempty"`
-	// set if Dynamic is false
-	Memory int64 `json:",omitempty"`
-	// set if Dynamic is true
-	MemoryFraction float64 `json:",omitempty"`
-	MinMemory      int64   `json:",omitempty"`
-	MaxMemory      int64   `json:",omitempty"`
-
-	Streams, StreamsInbound, StreamsOutbound int
-	Conns, ConnsInbound, ConnsOutbound       int
-	FD                                       int
-}
-
 type ExtendedPeerInfo struct {
 	ID          peer.ID
 	Agent       string
@@ -241,47 +194,4 @@ type RetrievalInfo struct {
 
 	TransferChannelID *datatransfer.ChannelID
 	DataTransfer      *DataTransferChannel
-
-	// optional event if part of ClientGetRetrievalUpdates
-	Event *retrievalmarket.ClientEvent
-}
-
-type RestrievalRes struct {
-	DealID retrievalmarket.DealID
-}
-
-// Selector specifies ipld selector string
-// - if the string starts with '{', it's interpreted as json selector string
-//   see https://ipld.io/specs/selectors/ and https://ipld.io/specs/selectors/fixtures/selector-fixtures-1/
-// - otherwise the string is interpreted as ipld-selector-text-lite (simple ipld path)
-//   see https://github.com/ipld/go-ipld-selector-text-lite
-type Selector string
-
-type DagSpec struct {
-	// DataSelector matches data to be retrieved
-	// - when using textselector, the path specifies subtree
-	// - the matched graph must have a single root
-	DataSelector *Selector
-
-	// ExportMerkleProof is applicable only when exporting to a CAR file via a path textselector
-	// When true, in addition to the selection target, the resulting CAR will contain every block along the
-	// path back to, and including the original root
-	// When false the resulting CAR contains only the blocks of the target subdag
-	ExportMerkleProof bool
-}
-
-type ExportRef struct {
-	Root cid.Cid
-
-	// DAGs array specifies a list of DAGs to export
-	// - If exporting into unixfs files, only one DAG is supported, DataSelector is only used to find the targeted root node
-	// - If exporting into a car file
-	//   - When exactly one text-path DataSelector is specified exports the subgraph and its full merkle-path from the original root
-	//   - Otherwise ( multiple paths and/or JSON selector specs) determines each individual subroot and exports the subtrees as a multi-root car
-	// - When not specified defaults to a single DAG:
-	//   - Data - the entire DAG: `{"R":{"l":{"none":{}},":>":{"a":{">":{"@":{}}}}}}`
-	DAGs []DagSpec
-
-	FromLocalCAR string // if specified, get data from a local CARv2 file.
-	DealID       retrievalmarket.DealID
 }

api/v0api/full.go

@@ -11,8 +11,8 @@ import (
 	"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"
-	textselector "github.com/ipld/go-ipld-selector-text-lite"
 	"github.com/libp2p/go-libp2p-core/peer"
 
 	"github.com/filecoin-project/lotus/api"
@@ -22,7 +22,6 @@ import (
 	"github.com/filecoin-project/lotus/chain/types"
 	marketevents "github.com/filecoin-project/lotus/markets/loggers"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
-	"github.com/filecoin-project/lotus/node/repo/imports"
 )
 
 //go:generate go run github.com/golang/mock/mockgen -destination=v0mocks/mock_full.go -package=v0mocks . FullNode
@@ -306,7 +305,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 imports.ID) 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.
@@ -326,10 +325,10 @@ type FullNode interface {
 	// ClientMinerQueryOffer returns a QueryOffer for the specific miner and file.
 	ClientMinerQueryOffer(ctx context.Context, miner address.Address, root cid.Cid, piece *cid.Cid) (api.QueryOffer, error) //perm:read
 	// ClientRetrieve initiates the retrieval of a file, as specified in the order.
-	ClientRetrieve(ctx context.Context, order RetrievalOrder, ref *api.FileRef) error //perm:admin
+	ClientRetrieve(ctx context.Context, order api.RetrievalOrder, ref *api.FileRef) error //perm:admin
 	// ClientRetrieveWithEvents initiates the retrieval of a file, as specified in the order, and provides a channel
 	// of status updates.
-	ClientRetrieveWithEvents(ctx context.Context, order RetrievalOrder, ref *api.FileRef) (<-chan marketevents.RetrievalEvent, error) //perm:admin
+	ClientRetrieveWithEvents(ctx context.Context, order api.RetrievalOrder, ref *api.FileRef) (<-chan marketevents.RetrievalEvent, error) //perm:admin
 	// ClientQueryAsk returns a signed StorageAsk from the specified miner.
 	// ClientListRetrievals returns information about retrievals made by the local client
 	ClientListRetrievals(ctx context.Context) ([]api.RetrievalInfo, error) //perm:write
@@ -599,11 +598,6 @@ type FullNode interface {
 	// StateNetworkVersion returns the network version at the given tipset
 	StateNetworkVersion(context.Context, types.TipSetKey) (apitypes.NetworkVersion, error) //perm:read
 
-	// StateGetRandomnessFromTickets is used to sample the chain for randomness.
-	StateGetRandomnessFromTickets(ctx context.Context, personalization crypto.DomainSeparationTag, randEpoch abi.ChainEpoch, entropy []byte, tsk types.TipSetKey) (abi.Randomness, error) //perm:read
-	// StateGetRandomnessFromBeacon is used to sample the beacon for randomness.
-	StateGetRandomnessFromBeacon(ctx context.Context, personalization crypto.DomainSeparationTag, randEpoch abi.ChainEpoch, entropy []byte, tsk types.TipSetKey) (abi.Randomness, error) //perm:read
-
 	// MethodGroup: Msig
 	// The Msig methods are used to interact with multisig wallets on the
 	// filecoin network
@@ -715,37 +709,3 @@ type FullNode interface {
 	// the path specified when calling CreateBackup is within the base path
 	CreateBackup(ctx context.Context, fpath string) error //perm:admin
 }
-
-func OfferOrder(o api.QueryOffer, client address.Address) RetrievalOrder {
-	return RetrievalOrder{
-		Root:                    o.Root,
-		Piece:                   o.Piece,
-		Size:                    o.Size,
-		Total:                   o.MinPrice,
-		UnsealPrice:             o.UnsealPrice,
-		PaymentInterval:         o.PaymentInterval,
-		PaymentIntervalIncrease: o.PaymentIntervalIncrease,
-		Client:                  client,
-
-		Miner:     o.Miner,
-		MinerPeer: &o.MinerPeer,
-	}
-}
-
-type RetrievalOrder struct {
-	// TODO: make this less unixfs specific
-	Root                  cid.Cid
-	Piece                 *cid.Cid
-	DatamodelPathSelector *textselector.Expression
-	Size                  uint64
-
-	FromLocalCAR string // if specified, get data from a local CARv2 file.
-	// TODO: support offset
-	Total                   types.BigInt
-	UnsealPrice             types.BigInt
-	PaymentInterval         uint64
-	PaymentIntervalIncrease uint64
-	Client                  address.Address
-	Miner                   address.Address
-	MinerPeer               *retrievalmarket.RetrievalPeer
-}

api/v0api/gateway.go

@@ -8,7 +8,7 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/dline"
-	abinetwork "github.com/filecoin-project/go-state-types/network"
+	"github.com/filecoin-project/go-state-types/network"
 
 	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
@@ -57,7 +57,7 @@ type Gateway interface {
 	StateMinerInfo(ctx context.Context, actor address.Address, tsk types.TipSetKey) (miner.MinerInfo, error)
 	StateMinerProvingDeadline(ctx context.Context, addr address.Address, tsk types.TipSetKey) (*dline.Info, error)
 	StateMinerPower(context.Context, address.Address, types.TipSetKey) (*api.MinerPower, error)
-	StateNetworkVersion(context.Context, types.TipSetKey) (abinetwork.Version, error)
+	StateNetworkVersion(context.Context, types.TipSetKey) (network.Version, error)
 	StateSearchMsg(ctx context.Context, msg cid.Cid) (*api.MsgLookup, error)
 	StateSectorGetInfo(ctx context.Context, maddr address.Address, n abi.SectorNumber, tsk types.TipSetKey) (*miner.SectorOnChainInfo, error)
 	StateVerifiedClientStatus(ctx context.Context, addr address.Address, tsk types.TipSetKey) (*abi.StoragePower, error)

api/v0api/proxy_gen.go

@@ -13,7 +13,7 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/crypto"
 	"github.com/filecoin-project/go-state-types/dline"
-	abinetwork "github.com/filecoin-project/go-state-types/network"
+	"github.com/filecoin-project/go-state-types/network"
 	"github.com/filecoin-project/lotus/api"
 	apitypes "github.com/filecoin-project/lotus/api/types"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
@@ -21,7 +21,7 @@ import (
 	"github.com/filecoin-project/lotus/chain/types"
 	marketevents "github.com/filecoin-project/lotus/markets/loggers"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
-	"github.com/filecoin-project/lotus/node/repo/imports"
+	"github.com/filecoin-project/lotus/node/repo/importmgr"
 	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p-core/peer"
 	"golang.org/x/xerrors"
@@ -121,15 +121,15 @@ type FullNodeStruct struct {
 
 		ClientQueryAsk func(p0 context.Context, p1 peer.ID, p2 address.Address) (*storagemarket.StorageAsk, error) `perm:"read"`
 
-		ClientRemoveImport func(p0 context.Context, p1 imports.ID) error `perm:"admin"`
+		ClientRemoveImport func(p0 context.Context, p1 importmgr.ImportID) error `perm:"admin"`
 
 		ClientRestartDataTransfer func(p0 context.Context, p1 datatransfer.TransferID, p2 peer.ID, p3 bool) error `perm:"write"`
 
-		ClientRetrieve func(p0 context.Context, p1 RetrievalOrder, p2 *api.FileRef) error `perm:"admin"`
+		ClientRetrieve func(p0 context.Context, p1 api.RetrievalOrder, p2 *api.FileRef) error `perm:"admin"`
 
 		ClientRetrieveTryRestartInsufficientFunds func(p0 context.Context, p1 address.Address) error `perm:"write"`
 
-		ClientRetrieveWithEvents func(p0 context.Context, p1 RetrievalOrder, p2 *api.FileRef) (<-chan marketevents.RetrievalEvent, error) `perm:"admin"`
+		ClientRetrieveWithEvents func(p0 context.Context, p1 api.RetrievalOrder, p2 *api.FileRef) (<-chan marketevents.RetrievalEvent, error) `perm:"admin"`
 
 		ClientStartDeal func(p0 context.Context, p1 *api.StartDealParams) (*cid.Cid, error) `perm:"admin"`
 
@@ -267,10 +267,6 @@ type FullNodeStruct struct {
 
 		StateGetActor func(p0 context.Context, p1 address.Address, p2 types.TipSetKey) (*types.Actor, error) `perm:"read"`
 
-		StateGetRandomnessFromBeacon func(p0 context.Context, p1 crypto.DomainSeparationTag, p2 abi.ChainEpoch, p3 []byte, p4 types.TipSetKey) (abi.Randomness, error) `perm:"read"`
-
-		StateGetRandomnessFromTickets func(p0 context.Context, p1 crypto.DomainSeparationTag, p2 abi.ChainEpoch, p3 []byte, p4 types.TipSetKey) (abi.Randomness, error) `perm:"read"`
-
 		StateGetReceipt func(p0 context.Context, p1 cid.Cid, p2 types.TipSetKey) (*types.MessageReceipt, error) `perm:"read"`
 
 		StateListActors func(p0 context.Context, p1 types.TipSetKey) ([]address.Address, error) `perm:"read"`
@@ -451,7 +447,7 @@ type GatewayStruct struct {
 
 		StateMinerProvingDeadline func(p0 context.Context, p1 address.Address, p2 types.TipSetKey) (*dline.Info, error) ``
 
-		StateNetworkVersion func(p0 context.Context, p1 types.TipSetKey) (abinetwork.Version, error) ``
+		StateNetworkVersion func(p0 context.Context, p1 types.TipSetKey) (network.Version, error) ``
 
 		StateSearchMsg func(p0 context.Context, p1 cid.Cid) (*api.MsgLookup, error) ``
 
@@ -943,14 +939,14 @@ func (s *FullNodeStub) ClientQueryAsk(p0 context.Context, p1 peer.ID, p2 address
 	return nil, ErrNotSupported
 }
 
-func (s *FullNodeStruct) ClientRemoveImport(p0 context.Context, p1 imports.ID) error {
+func (s *FullNodeStruct) ClientRemoveImport(p0 context.Context, p1 importmgr.ImportID) error {
 	if s.Internal.ClientRemoveImport == nil {
 		return ErrNotSupported
 	}
 	return s.Internal.ClientRemoveImport(p0, p1)
 }
 
-func (s *FullNodeStub) ClientRemoveImport(p0 context.Context, p1 imports.ID) error {
+func (s *FullNodeStub) ClientRemoveImport(p0 context.Context, p1 importmgr.ImportID) error {
 	return ErrNotSupported
 }
 
@@ -965,14 +961,14 @@ func (s *FullNodeStub) ClientRestartDataTransfer(p0 context.Context, p1 datatran
 	return ErrNotSupported
 }
 
-func (s *FullNodeStruct) ClientRetrieve(p0 context.Context, p1 RetrievalOrder, p2 *api.FileRef) error {
+func (s *FullNodeStruct) ClientRetrieve(p0 context.Context, p1 api.RetrievalOrder, p2 *api.FileRef) error {
 	if s.Internal.ClientRetrieve == nil {
 		return ErrNotSupported
 	}
 	return s.Internal.ClientRetrieve(p0, p1, p2)
 }
 
-func (s *FullNodeStub) ClientRetrieve(p0 context.Context, p1 RetrievalOrder, p2 *api.FileRef) error {
+func (s *FullNodeStub) ClientRetrieve(p0 context.Context, p1 api.RetrievalOrder, p2 *api.FileRef) error {
 	return ErrNotSupported
 }
 
@@ -987,14 +983,14 @@ func (s *FullNodeStub) ClientRetrieveTryRestartInsufficientFunds(p0 context.Cont
 	return ErrNotSupported
 }
 
-func (s *FullNodeStruct) ClientRetrieveWithEvents(p0 context.Context, p1 RetrievalOrder, p2 *api.FileRef) (<-chan marketevents.RetrievalEvent, error) {
+func (s *FullNodeStruct) ClientRetrieveWithEvents(p0 context.Context, p1 api.RetrievalOrder, p2 *api.FileRef) (<-chan marketevents.RetrievalEvent, error) {
 	if s.Internal.ClientRetrieveWithEvents == nil {
 		return nil, ErrNotSupported
 	}
 	return s.Internal.ClientRetrieveWithEvents(p0, p1, p2)
 }
 
-func (s *FullNodeStub) ClientRetrieveWithEvents(p0 context.Context, p1 RetrievalOrder, p2 *api.FileRef) (<-chan marketevents.RetrievalEvent, error) {
+func (s *FullNodeStub) ClientRetrieveWithEvents(p0 context.Context, p1 api.RetrievalOrder, p2 *api.FileRef) (<-chan marketevents.RetrievalEvent, error) {
 	return nil, ErrNotSupported
 }
 
@@ -1746,28 +1742,6 @@ func (s *FullNodeStub) StateGetActor(p0 context.Context, p1 address.Address, p2
 	return nil, ErrNotSupported
 }
 
-func (s *FullNodeStruct) StateGetRandomnessFromBeacon(p0 context.Context, p1 crypto.DomainSeparationTag, p2 abi.ChainEpoch, p3 []byte, p4 types.TipSetKey) (abi.Randomness, error) {
-	if s.Internal.StateGetRandomnessFromBeacon == nil {
-		return *new(abi.Randomness), ErrNotSupported
-	}
-	return s.Internal.StateGetRandomnessFromBeacon(p0, p1, p2, p3, p4)
-}
-
-func (s *FullNodeStub) StateGetRandomnessFromBeacon(p0 context.Context, p1 crypto.DomainSeparationTag, p2 abi.ChainEpoch, p3 []byte, p4 types.TipSetKey) (abi.Randomness, error) {
-	return *new(abi.Randomness), ErrNotSupported
-}
-
-func (s *FullNodeStruct) StateGetRandomnessFromTickets(p0 context.Context, p1 crypto.DomainSeparationTag, p2 abi.ChainEpoch, p3 []byte, p4 types.TipSetKey) (abi.Randomness, error) {
-	if s.Internal.StateGetRandomnessFromTickets == nil {
-		return *new(abi.Randomness), ErrNotSupported
-	}
-	return s.Internal.StateGetRandomnessFromTickets(p0, p1, p2, p3, p4)
-}
-
-func (s *FullNodeStub) StateGetRandomnessFromTickets(p0 context.Context, p1 crypto.DomainSeparationTag, p2 abi.ChainEpoch, p3 []byte, p4 types.TipSetKey) (abi.Randomness, error) {
-	return *new(abi.Randomness), ErrNotSupported
-}
-
 func (s *FullNodeStruct) StateGetReceipt(p0 context.Context, p1 cid.Cid, p2 types.TipSetKey) (*types.MessageReceipt, error) {
 	if s.Internal.StateGetReceipt == nil {
 		return nil, ErrNotSupported
@@ -2703,15 +2677,15 @@ func (s *GatewayStub) StateMinerProvingDeadline(p0 context.Context, p1 address.A
 	return nil, ErrNotSupported
 }
 
-func (s *GatewayStruct) StateNetworkVersion(p0 context.Context, p1 types.TipSetKey) (abinetwork.Version, error) {
+func (s *GatewayStruct) StateNetworkVersion(p0 context.Context, p1 types.TipSetKey) (network.Version, error) {
 	if s.Internal.StateNetworkVersion == nil {
-		return *new(abinetwork.Version), ErrNotSupported
+		return *new(network.Version), ErrNotSupported
 	}
 	return s.Internal.StateNetworkVersion(p0, p1)
 }
 
-func (s *GatewayStub) StateNetworkVersion(p0 context.Context, p1 types.TipSetKey) (abinetwork.Version, error) {
-	return *new(abinetwork.Version), ErrNotSupported
+func (s *GatewayStub) StateNetworkVersion(p0 context.Context, p1 types.TipSetKey) (network.Version, error) {
+	return *new(network.Version), ErrNotSupported
 }
 
 func (s *GatewayStruct) StateSearchMsg(p0 context.Context, p1 cid.Cid) (*api.MsgLookup, error) {

api/v0api/v0mocks/mock_full.go

@@ -21,13 +21,11 @@ import (
 	network "github.com/filecoin-project/go-state-types/network"
 	api "github.com/filecoin-project/lotus/api"
 	apitypes "github.com/filecoin-project/lotus/api/types"
-	v0api "github.com/filecoin-project/lotus/api/v0api"
 	miner "github.com/filecoin-project/lotus/chain/actors/builtin/miner"
 	types "github.com/filecoin-project/lotus/chain/types"
-	alerting "github.com/filecoin-project/lotus/journal/alerting"
 	marketevents "github.com/filecoin-project/lotus/markets/loggers"
 	dtypes "github.com/filecoin-project/lotus/node/modules/dtypes"
-	imports "github.com/filecoin-project/lotus/node/repo/imports"
+	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"
@@ -733,7 +731,7 @@ func (mr *MockFullNodeMockRecorder) ClientQueryAsk(arg0, arg1, arg2 interface{})
 }
 
 // ClientRemoveImport mocks base method.
-func (m *MockFullNode) ClientRemoveImport(arg0 context.Context, arg1 imports.ID) 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)
@@ -761,7 +759,7 @@ func (mr *MockFullNodeMockRecorder) ClientRestartDataTransfer(arg0, arg1, arg2,
 }
 
 // ClientRetrieve mocks base method.
-func (m *MockFullNode) ClientRetrieve(arg0 context.Context, arg1 v0api.RetrievalOrder, arg2 *api.FileRef) error {
+func (m *MockFullNode) ClientRetrieve(arg0 context.Context, arg1 api.RetrievalOrder, arg2 *api.FileRef) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "ClientRetrieve", arg0, arg1, arg2)
 	ret0, _ := ret[0].(error)
@@ -789,7 +787,7 @@ func (mr *MockFullNodeMockRecorder) ClientRetrieveTryRestartInsufficientFunds(ar
 }
 
 // ClientRetrieveWithEvents mocks base method.
-func (m *MockFullNode) ClientRetrieveWithEvents(arg0 context.Context, arg1 v0api.RetrievalOrder, arg2 *api.FileRef) (<-chan marketevents.RetrievalEvent, error) {
+func (m *MockFullNode) ClientRetrieveWithEvents(arg0 context.Context, arg1 api.RetrievalOrder, arg2 *api.FileRef) (<-chan marketevents.RetrievalEvent, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "ClientRetrieveWithEvents", arg0, arg1, arg2)
 	ret0, _ := ret[0].(<-chan marketevents.RetrievalEvent)
@@ -952,21 +950,6 @@ func (mr *MockFullNodeMockRecorder) ID(arg0 interface{}) *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ID", reflect.TypeOf((*MockFullNode)(nil).ID), arg0)
 }
 
-// LogAlerts mocks base method.
-func (m *MockFullNode) LogAlerts(arg0 context.Context) ([]alerting.Alert, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "LogAlerts", arg0)
-	ret0, _ := ret[0].([]alerting.Alert)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// LogAlerts indicates an expected call of LogAlerts.
-func (mr *MockFullNodeMockRecorder) LogAlerts(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LogAlerts", reflect.TypeOf((*MockFullNode)(nil).LogAlerts), arg0)
-}
-
 // LogList mocks base method.
 func (m *MockFullNode) LogList(arg0 context.Context) ([]string, error) {
 	m.ctrl.T.Helper()
@@ -1724,21 +1707,6 @@ func (mr *MockFullNodeMockRecorder) NetFindPeer(arg0, arg1 interface{}) *gomock.
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NetFindPeer", reflect.TypeOf((*MockFullNode)(nil).NetFindPeer), arg0, arg1)
 }
 
-// NetLimit mocks base method.
-func (m *MockFullNode) NetLimit(arg0 context.Context, arg1 string) (api.NetLimit, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "NetLimit", arg0, arg1)
-	ret0, _ := ret[0].(api.NetLimit)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// NetLimit indicates an expected call of NetLimit.
-func (mr *MockFullNodeMockRecorder) NetLimit(arg0, arg1 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NetLimit", reflect.TypeOf((*MockFullNode)(nil).NetLimit), arg0, arg1)
-}
-
 // NetPeerInfo mocks base method.
 func (m *MockFullNode) NetPeerInfo(arg0 context.Context, arg1 peer.ID) (*api.ExtendedPeerInfo, error) {
 	m.ctrl.T.Helper()
@@ -1769,49 +1737,6 @@ func (mr *MockFullNodeMockRecorder) NetPeers(arg0 interface{}) *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NetPeers", reflect.TypeOf((*MockFullNode)(nil).NetPeers), arg0)
 }
 
-// NetProtectAdd mocks base method.
-func (m *MockFullNode) NetProtectAdd(arg0 context.Context, arg1 []peer.ID) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "NetProtectAdd", arg0, arg1)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// NetProtectAdd indicates an expected call of NetProtectAdd.
-func (mr *MockFullNodeMockRecorder) NetProtectAdd(arg0, arg1 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NetProtectAdd", reflect.TypeOf((*MockFullNode)(nil).NetProtectAdd), arg0, arg1)
-}
-
-// NetProtectList mocks base method.
-func (m *MockFullNode) NetProtectList(arg0 context.Context) ([]peer.ID, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "NetProtectList", arg0)
-	ret0, _ := ret[0].([]peer.ID)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// NetProtectList indicates an expected call of NetProtectList.
-func (mr *MockFullNodeMockRecorder) NetProtectList(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NetProtectList", reflect.TypeOf((*MockFullNode)(nil).NetProtectList), arg0)
-}
-
-// NetProtectRemove mocks base method.
-func (m *MockFullNode) NetProtectRemove(arg0 context.Context, arg1 []peer.ID) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "NetProtectRemove", arg0, arg1)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// NetProtectRemove indicates an expected call of NetProtectRemove.
-func (mr *MockFullNodeMockRecorder) NetProtectRemove(arg0, arg1 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NetProtectRemove", reflect.TypeOf((*MockFullNode)(nil).NetProtectRemove), arg0, arg1)
-}
-
 // NetPubsubScores mocks base method.
 func (m *MockFullNode) NetPubsubScores(arg0 context.Context) ([]api.PubsubScore, error) {
 	m.ctrl.T.Helper()
@@ -1827,35 +1752,6 @@ func (mr *MockFullNodeMockRecorder) NetPubsubScores(arg0 interface{}) *gomock.Ca
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NetPubsubScores", reflect.TypeOf((*MockFullNode)(nil).NetPubsubScores), arg0)
 }
 
-// NetSetLimit mocks base method.
-func (m *MockFullNode) NetSetLimit(arg0 context.Context, arg1 string, arg2 api.NetLimit) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "NetSetLimit", arg0, arg1, arg2)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// NetSetLimit indicates an expected call of NetSetLimit.
-func (mr *MockFullNodeMockRecorder) NetSetLimit(arg0, arg1, arg2 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NetSetLimit", reflect.TypeOf((*MockFullNode)(nil).NetSetLimit), arg0, arg1, arg2)
-}
-
-// NetStat mocks base method.
-func (m *MockFullNode) NetStat(arg0 context.Context, arg1 string) (api.NetStat, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "NetStat", arg0, arg1)
-	ret0, _ := ret[0].(api.NetStat)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// NetStat indicates an expected call of NetStat.
-func (mr *MockFullNodeMockRecorder) NetStat(arg0, arg1 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NetStat", reflect.TypeOf((*MockFullNode)(nil).NetStat), arg0, arg1)
-}
-
 // PaychAllocateLane mocks base method.
 func (m *MockFullNode) PaychAllocateLane(arg0 context.Context, arg1 address.Address) (uint64, error) {
 	m.ctrl.T.Helper()
@@ -2259,36 +2155,6 @@ func (mr *MockFullNodeMockRecorder) StateGetActor(arg0, arg1, arg2 interface{})
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StateGetActor", reflect.TypeOf((*MockFullNode)(nil).StateGetActor), arg0, arg1, arg2)
 }
 
-// StateGetRandomnessFromBeacon mocks base method.
-func (m *MockFullNode) StateGetRandomnessFromBeacon(arg0 context.Context, arg1 crypto.DomainSeparationTag, arg2 abi.ChainEpoch, arg3 []byte, arg4 types.TipSetKey) (abi.Randomness, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "StateGetRandomnessFromBeacon", arg0, arg1, arg2, arg3, arg4)
-	ret0, _ := ret[0].(abi.Randomness)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// StateGetRandomnessFromBeacon indicates an expected call of StateGetRandomnessFromBeacon.
-func (mr *MockFullNodeMockRecorder) StateGetRandomnessFromBeacon(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StateGetRandomnessFromBeacon", reflect.TypeOf((*MockFullNode)(nil).StateGetRandomnessFromBeacon), arg0, arg1, arg2, arg3, arg4)
-}
-
-// StateGetRandomnessFromTickets mocks base method.
-func (m *MockFullNode) StateGetRandomnessFromTickets(arg0 context.Context, arg1 crypto.DomainSeparationTag, arg2 abi.ChainEpoch, arg3 []byte, arg4 types.TipSetKey) (abi.Randomness, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "StateGetRandomnessFromTickets", arg0, arg1, arg2, arg3, arg4)
-	ret0, _ := ret[0].(abi.Randomness)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// StateGetRandomnessFromTickets indicates an expected call of StateGetRandomnessFromTickets.
-func (mr *MockFullNodeMockRecorder) StateGetRandomnessFromTickets(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StateGetRandomnessFromTickets", reflect.TypeOf((*MockFullNode)(nil).StateGetRandomnessFromTickets), arg0, arg1, arg2, arg3, arg4)
-}
-
 // StateGetReceipt mocks base method.
 func (m *MockFullNode) StateGetReceipt(arg0 context.Context, arg1 cid.Cid, arg2 types.TipSetKey) (*types.MessageReceipt, error) {
 	m.ctrl.T.Helper()

api/v0api/v1_wrapper.go

@@ -3,11 +3,6 @@ package v0api
 import (
 	"context"
 
-	"github.com/filecoin-project/go-fil-markets/retrievalmarket"
-	"github.com/filecoin-project/go-state-types/big"
-	"github.com/filecoin-project/go-state-types/crypto"
-	marketevents "github.com/filecoin-project/lotus/markets/loggers"
-
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/lotus/chain/types"
 	"golang.org/x/xerrors"
@@ -111,7 +106,7 @@ func (w *WrapperV1Full) MsigApproveTxnHash(ctx context.Context, msig address.Add
 }
 
 func (w *WrapperV1Full) MsigCancel(ctx context.Context, msig address.Address, txID uint64, to address.Address, amt types.BigInt, src address.Address, method uint64, params []byte) (cid.Cid, error) {
-	p, err := w.FullNode.MsigCancelTxnHash(ctx, msig, txID, to, amt, src, method, params)
+	p, err := w.FullNode.MsigCancel(ctx, msig, txID, to, amt, src, method, params)
 	if err != nil {
 		return cid.Undef, xerrors.Errorf("creating prototype: %w", err)
 	}
@@ -189,152 +184,4 @@ func (w *WrapperV1Full) MsigRemoveSigner(ctx context.Context, msig address.Addre
 	return w.executePrototype(ctx, p)
 }
 
-func (w *WrapperV1Full) ChainGetRandomnessFromTickets(ctx context.Context, tsk types.TipSetKey, personalization crypto.DomainSeparationTag, randEpoch abi.ChainEpoch, entropy []byte) (abi.Randomness, error) {
-	return w.StateGetRandomnessFromTickets(ctx, personalization, randEpoch, entropy, tsk)
-}
-
-func (w *WrapperV1Full) ChainGetRandomnessFromBeacon(ctx context.Context, tsk types.TipSetKey, personalization crypto.DomainSeparationTag, randEpoch abi.ChainEpoch, entropy []byte) (abi.Randomness, error) {
-	return w.StateGetRandomnessFromBeacon(ctx, personalization, randEpoch, entropy, tsk)
-}
-
-func (w *WrapperV1Full) ClientRetrieve(ctx context.Context, order RetrievalOrder, ref *api.FileRef) error {
-	events := make(chan marketevents.RetrievalEvent)
-	go w.clientRetrieve(ctx, order, ref, events)
-
-	for {
-		select {
-		case evt, ok := <-events:
-			if !ok { // done successfully
-				return nil
-			}
-
-			if evt.Err != "" {
-				return xerrors.Errorf("retrieval failed: %s", evt.Err)
-			}
-		case <-ctx.Done():
-			return xerrors.Errorf("retrieval timed out")
-		}
-	}
-}
-
-func (w *WrapperV1Full) ClientRetrieveWithEvents(ctx context.Context, order RetrievalOrder, ref *api.FileRef) (<-chan marketevents.RetrievalEvent, error) {
-	events := make(chan marketevents.RetrievalEvent)
-	go w.clientRetrieve(ctx, order, ref, events)
-	return events, nil
-}
-
-func readSubscribeEvents(ctx context.Context, dealID retrievalmarket.DealID, subscribeEvents <-chan api.RetrievalInfo, events chan marketevents.RetrievalEvent) error {
-	for {
-		var subscribeEvent api.RetrievalInfo
-		var evt retrievalmarket.ClientEvent
-		select {
-		case <-ctx.Done():
-			return xerrors.New("Retrieval Timed Out")
-		case subscribeEvent = <-subscribeEvents:
-			if subscribeEvent.ID != dealID {
-				// we can't check the deal ID ahead of time because:
-				// 1. We need to subscribe before retrieving.
-				// 2. We won't know the deal ID until after retrieving.
-				continue
-			}
-			if subscribeEvent.Event != nil {
-				evt = *subscribeEvent.Event
-			}
-		}
-
-		select {
-		case <-ctx.Done():
-			return xerrors.New("Retrieval Timed Out")
-		case events <- marketevents.RetrievalEvent{
-			Event:         evt,
-			Status:        subscribeEvent.Status,
-			BytesReceived: subscribeEvent.BytesReceived,
-			FundsSpent:    subscribeEvent.TotalPaid,
-		}:
-		}
-
-		switch subscribeEvent.Status {
-		case retrievalmarket.DealStatusCompleted:
-			return nil
-		case retrievalmarket.DealStatusRejected:
-			return xerrors.Errorf("Retrieval Proposal Rejected: %s", subscribeEvent.Message)
-		case
-			retrievalmarket.DealStatusDealNotFound,
-			retrievalmarket.DealStatusErrored:
-			return xerrors.Errorf("Retrieval Error: %s", subscribeEvent.Message)
-		}
-	}
-}
-
-func (w *WrapperV1Full) clientRetrieve(ctx context.Context, order RetrievalOrder, ref *api.FileRef, events chan marketevents.RetrievalEvent) {
-	defer close(events)
-
-	finish := func(e error) {
-		if e != nil {
-			events <- marketevents.RetrievalEvent{Err: e.Error(), FundsSpent: big.Zero()}
-		}
-	}
-
-	var dealID retrievalmarket.DealID
-	if order.FromLocalCAR == "" {
-		// Subscribe to events before retrieving to avoid losing events.
-		subscribeCtx, cancel := context.WithCancel(ctx)
-		defer cancel()
-		retrievalEvents, err := w.ClientGetRetrievalUpdates(subscribeCtx)
-
-		if err != nil {
-			finish(xerrors.Errorf("GetRetrievalUpdates failed: %w", err))
-			return
-		}
-
-		retrievalRes, err := w.FullNode.ClientRetrieve(ctx, api.RetrievalOrder{
-			Root:                    order.Root,
-			Piece:                   order.Piece,
-			Size:                    order.Size,
-			Total:                   order.Total,
-			UnsealPrice:             order.UnsealPrice,
-			PaymentInterval:         order.PaymentInterval,
-			PaymentIntervalIncrease: order.PaymentIntervalIncrease,
-			Client:                  order.Client,
-			Miner:                   order.Miner,
-			MinerPeer:               order.MinerPeer,
-		})
-
-		if err != nil {
-			finish(xerrors.Errorf("Retrieve failed: %w", err))
-			return
-		}
-
-		dealID = retrievalRes.DealID
-
-		err = readSubscribeEvents(ctx, retrievalRes.DealID, retrievalEvents, events)
-		if err != nil {
-			finish(xerrors.Errorf("Retrieve: %w", err))
-			return
-		}
-	}
-
-	// If ref is nil, it only fetches the data into the configured blockstore.
-	if ref == nil {
-		finish(nil)
-		return
-	}
-
-	eref := api.ExportRef{
-		Root:         order.Root,
-		FromLocalCAR: order.FromLocalCAR,
-		DealID:       dealID,
-	}
-
-	if order.DatamodelPathSelector != nil {
-		s := api.Selector(*order.DatamodelPathSelector)
-		eref.DAGs = append(eref.DAGs, api.DagSpec{
-			DataSelector:      &s,
-			ExportMerkleProof: true,
-		})
-	}
-
-	finish(w.ClientExport(ctx, eref, *ref))
-}
-
 var _ FullNode = &WrapperV1Full{}

api/version.go

@@ -54,11 +54,11 @@ func VersionForType(nodeType NodeType) (Version, error) {
 
 // semver versions of the rpc api exposed
 var (
-	FullAPIVersion0 = newVer(1, 5, 0)
-	FullAPIVersion1 = newVer(2, 2, 0)
+	FullAPIVersion0 = newVer(1, 3, 1)
+	FullAPIVersion1 = newVer(2, 1, 1)
 
-	MinerAPIVersion0  = newVer(1, 3, 0)
-	WorkerAPIVersion0 = newVer(1, 5, 0)
+	MinerAPIVersion0  = newVer(1, 2, 0)
+	WorkerAPIVersion0 = newVer(1, 1, 0)
 )
 
 //nolint:varcheck,deadcode

blockstore/api.go

@@ -25,35 +25,35 @@ func NewAPIBlockstore(cio ChainIO) Blockstore {
 	return Adapt(bs) // return an adapted blockstore.
 }
 
-func (a *apiBlockstore) DeleteBlock(context.Context, cid.Cid) error {
+func (a *apiBlockstore) DeleteBlock(cid.Cid) error {
 	return xerrors.New("not supported")
 }
 
-func (a *apiBlockstore) Has(ctx context.Context, c cid.Cid) (bool, error) {
-	return a.api.ChainHasObj(ctx, c)
+func (a *apiBlockstore) Has(c cid.Cid) (bool, error) {
+	return a.api.ChainHasObj(context.TODO(), c)
 }
 
-func (a *apiBlockstore) Get(ctx context.Context, c cid.Cid) (blocks.Block, error) {
-	bb, err := a.api.ChainReadObj(ctx, c)
+func (a *apiBlockstore) Get(c cid.Cid) (blocks.Block, error) {
+	bb, err := a.api.ChainReadObj(context.TODO(), c)
 	if err != nil {
 		return nil, err
 	}
 	return blocks.NewBlockWithCid(bb, c)
 }
 
-func (a *apiBlockstore) GetSize(ctx context.Context, c cid.Cid) (int, error) {
-	bb, err := a.api.ChainReadObj(ctx, c)
+func (a *apiBlockstore) GetSize(c cid.Cid) (int, error) {
+	bb, err := a.api.ChainReadObj(context.TODO(), c)
 	if err != nil {
 		return 0, err
 	}
 	return len(bb), nil
 }
 
-func (a *apiBlockstore) Put(context.Context, blocks.Block) error {
+func (a *apiBlockstore) Put(blocks.Block) error {
 	return xerrors.New("not supported")
 }
 
-func (a *apiBlockstore) PutMany(context.Context, []blocks.Block) error {
+func (a *apiBlockstore) PutMany([]blocks.Block) error {
 	return xerrors.New("not supported")
 }
 

blockstore/autobatch.go

@@ -1,262 +0,0 @@
-package blockstore
-
-import (
-	"context"
-	"sync"
-	"time"
-
-	"golang.org/x/xerrors"
-
-	block "github.com/ipfs/go-block-format"
-	"github.com/ipfs/go-cid"
-)
-
-// autolog is a logger for the autobatching blockstore. It is subscoped from the
-// blockstore logger.
-var autolog = log.Named("auto")
-
-// contains the same set of blocks twice, once as an ordered list for flushing, and as a map for fast access
-type blockBatch struct {
-	blockList []block.Block
-	blockMap  map[cid.Cid]block.Block
-}
-
-type AutobatchBlockstore struct {
-	// TODO: drop if memory consumption is too high
-	addedCids map[cid.Cid]struct{}
-
-	stateLock     sync.Mutex
-	bufferedBatch blockBatch
-
-	flushingBatch blockBatch
-	flushErr      error
-
-	flushCh chan struct{}
-
-	doFlushLock     sync.Mutex
-	flushRetryDelay time.Duration
-	doneCh          chan struct{}
-	shutdown        context.CancelFunc
-
-	backingBs Blockstore
-
-	bufferCapacity int
-	bufferSize     int
-}
-
-func NewAutobatch(ctx context.Context, backingBs Blockstore, bufferCapacity int) *AutobatchBlockstore {
-	ctx, cancel := context.WithCancel(ctx)
-	bs := &AutobatchBlockstore{
-		addedCids:      make(map[cid.Cid]struct{}),
-		backingBs:      backingBs,
-		bufferCapacity: bufferCapacity,
-		flushCh:        make(chan struct{}, 1),
-		doneCh:         make(chan struct{}),
-		// could be made configable
-		flushRetryDelay: time.Millisecond * 100,
-		shutdown:        cancel,
-	}
-
-	bs.bufferedBatch.blockMap = make(map[cid.Cid]block.Block)
-
-	go bs.flushWorker(ctx)
-
-	return bs
-}
-
-func (bs *AutobatchBlockstore) Put(ctx context.Context, blk block.Block) error {
-	bs.stateLock.Lock()
-	defer bs.stateLock.Unlock()
-
-	_, ok := bs.addedCids[blk.Cid()]
-	if !ok {
-		bs.addedCids[blk.Cid()] = struct{}{}
-		bs.bufferedBatch.blockList = append(bs.bufferedBatch.blockList, blk)
-		bs.bufferedBatch.blockMap[blk.Cid()] = blk
-		bs.bufferSize += len(blk.RawData())
-		if bs.bufferSize >= bs.bufferCapacity {
-			// signal that a flush is appropriate, may be ignored
-			select {
-			case bs.flushCh <- struct{}{}:
-			default:
-				// do nothing
-			}
-		}
-	}
-
-	return nil
-}
-
-func (bs *AutobatchBlockstore) flushWorker(ctx context.Context) {
-	defer close(bs.doneCh)
-	for {
-		select {
-		case <-bs.flushCh:
-			// TODO: check if we _should_ actually flush. We could get a spurious wakeup
-			// here.
-			putErr := bs.doFlush(ctx, false)
-			for putErr != nil {
-				select {
-				case <-ctx.Done():
-					return
-				case <-time.After(bs.flushRetryDelay):
-					autolog.Errorf("FLUSH ERRORED: %w, retrying after %v", putErr, bs.flushRetryDelay)
-					putErr = bs.doFlush(ctx, true)
-				}
-			}
-		case <-ctx.Done():
-			// Do one last flush.
-			_ = bs.doFlush(ctx, false)
-			return
-		}
-	}
-}
-
-// caller must NOT hold stateLock
-// set retryOnly to true to only retry a failed flush and not flush anything new.
-func (bs *AutobatchBlockstore) doFlush(ctx context.Context, retryOnly bool) error {
-	bs.doFlushLock.Lock()
-	defer bs.doFlushLock.Unlock()
-
-	// If we failed to flush last time, try flushing again.
-	if bs.flushErr != nil {
-		bs.flushErr = bs.backingBs.PutMany(ctx, bs.flushingBatch.blockList)
-	}
-
-	// If we failed, or we're _only_ retrying, bail.
-	if retryOnly || bs.flushErr != nil {
-		return bs.flushErr
-	}
-
-	// Then take the current batch...
-	bs.stateLock.Lock()
-	// We do NOT clear addedCids here, because its purpose is to expedite Puts
-	bs.flushingBatch = bs.bufferedBatch
-	bs.bufferedBatch.blockList = make([]block.Block, 0, len(bs.flushingBatch.blockList))
-	bs.bufferedBatch.blockMap = make(map[cid.Cid]block.Block, len(bs.flushingBatch.blockMap))
-	bs.stateLock.Unlock()
-
-	// And try to flush it.
-	bs.flushErr = bs.backingBs.PutMany(ctx, bs.flushingBatch.blockList)
-
-	// If we succeeded, reset the batch. Otherwise, we'll try again next time.
-	if bs.flushErr == nil {
-		bs.stateLock.Lock()
-		bs.flushingBatch = blockBatch{}
-		bs.stateLock.Unlock()
-	}
-
-	return bs.flushErr
-}
-
-// caller must NOT hold stateLock
-func (bs *AutobatchBlockstore) Flush(ctx context.Context) error {
-	return bs.doFlush(ctx, false)
-}
-
-func (bs *AutobatchBlockstore) Shutdown(ctx context.Context) error {
-	// TODO: Prevent puts after we call this to avoid losing data.
-	bs.shutdown()
-	select {
-	case <-bs.doneCh:
-	case <-ctx.Done():
-		return ctx.Err()
-	}
-
-	bs.doFlushLock.Lock()
-	defer bs.doFlushLock.Unlock()
-
-	return bs.flushErr
-}
-
-func (bs *AutobatchBlockstore) Get(ctx context.Context, c cid.Cid) (block.Block, error) {
-	// may seem backward to check the backingBs first, but that is the likeliest case
-	blk, err := bs.backingBs.Get(ctx, c)
-	if err == nil {
-		return blk, nil
-	}
-
-	if err != ErrNotFound {
-		return blk, err
-	}
-
-	bs.stateLock.Lock()
-	defer bs.stateLock.Unlock()
-	v, ok := bs.flushingBatch.blockMap[c]
-	if ok {
-		return v, nil
-	}
-
-	v, ok = bs.bufferedBatch.blockMap[c]
-	if ok {
-		return v, nil
-	}
-
-	return bs.Get(ctx, c)
-}
-
-func (bs *AutobatchBlockstore) DeleteBlock(context.Context, cid.Cid) error {
-	// if we wanted to support this, we would have to:
-	// - flush
-	// - delete from the backingBs (if present)
-	// - remove from addedCids (if present)
-	// - if present in addedCids, also walk the ordered lists and remove if present
-	return xerrors.New("deletion is unsupported")
-}
-
-func (bs *AutobatchBlockstore) DeleteMany(ctx context.Context, cids []cid.Cid) error {
-	// see note in DeleteBlock()
-	return xerrors.New("deletion is unsupported")
-}
-
-func (bs *AutobatchBlockstore) Has(ctx context.Context, c cid.Cid) (bool, error) {
-	_, err := bs.Get(ctx, c)
-	if err == nil {
-		return true, nil
-	}
-	if err == ErrNotFound {
-		return false, nil
-	}
-
-	return false, err
-}
-
-func (bs *AutobatchBlockstore) GetSize(ctx context.Context, c cid.Cid) (int, error) {
-	blk, err := bs.Get(ctx, c)
-	if err != nil {
-		return 0, err
-	}
-
-	return len(blk.RawData()), nil
-}
-
-func (bs *AutobatchBlockstore) PutMany(ctx context.Context, blks []block.Block) error {
-	for _, blk := range blks {
-		if err := bs.Put(ctx, blk); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (bs *AutobatchBlockstore) AllKeysChan(ctx context.Context) (<-chan cid.Cid, error) {
-	if err := bs.Flush(ctx); err != nil {
-		return nil, err
-	}
-
-	return bs.backingBs.AllKeysChan(ctx)
-}
-
-func (bs *AutobatchBlockstore) HashOnRead(enabled bool) {
-	bs.backingBs.HashOnRead(enabled)
-}
-
-func (bs *AutobatchBlockstore) View(ctx context.Context, cid cid.Cid, callback func([]byte) error) error {
-	blk, err := bs.Get(ctx, cid)
-	if err != nil {
-		return err
-	}
-
-	return callback(blk.RawData())
-}

blockstore/autobatch_test.go

@@ -1,34 +0,0 @@
-package blockstore
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestAutobatchBlockstore(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	ab := NewAutobatch(ctx, NewMemory(), len(b0.RawData())+len(b1.RawData())-1)
-
-	require.NoError(t, ab.Put(ctx, b0))
-	require.NoError(t, ab.Put(ctx, b1))
-	require.NoError(t, ab.Put(ctx, b2))
-
-	v0, err := ab.Get(ctx, b0.Cid())
-	require.NoError(t, err)
-	require.Equal(t, b0.RawData(), v0.RawData())
-
-	v1, err := ab.Get(ctx, b1.Cid())
-	require.NoError(t, err)
-	require.Equal(t, b1.RawData(), v1.RawData())
-
-	v2, err := ab.Get(ctx, b2.Cid())
-	require.NoError(t, err)
-	require.Equal(t, b2.RawData(), v2.RawData())
-
-	require.NoError(t, ab.Flush(ctx))
-	require.NoError(t, ab.Shutdown(ctx))
-}

blockstore/badger/blockstore.go

@@ -525,7 +525,7 @@ func (b *Blockstore) Size() (int64, error) {
 
 // View implements blockstore.Viewer, which leverages zero-copy read-only
 // access to values.
-func (b *Blockstore) View(ctx context.Context, cid cid.Cid, fn func([]byte) error) error {
+func (b *Blockstore) View(cid cid.Cid, fn func([]byte) error) error {
 	if err := b.access(); err != nil {
 		return err
 	}
@@ -552,7 +552,7 @@ func (b *Blockstore) View(ctx context.Context, cid cid.Cid, fn func([]byte) erro
 }
 
 // Has implements Blockstore.Has.
-func (b *Blockstore) Has(ctx context.Context, cid cid.Cid) (bool, error) {
+func (b *Blockstore) Has(cid cid.Cid) (bool, error) {
 	if err := b.access(); err != nil {
 		return false, err
 	}
@@ -582,7 +582,7 @@ func (b *Blockstore) Has(ctx context.Context, cid cid.Cid) (bool, error) {
 }
 
 // Get implements Blockstore.Get.
-func (b *Blockstore) Get(ctx context.Context, cid cid.Cid) (blocks.Block, error) {
+func (b *Blockstore) Get(cid cid.Cid) (blocks.Block, error) {
 	if !cid.Defined() {
 		return nil, blockstore.ErrNotFound
 	}
@@ -619,7 +619,7 @@ func (b *Blockstore) Get(ctx context.Context, cid cid.Cid) (blocks.Block, error)
 }
 
 // GetSize implements Blockstore.GetSize.
-func (b *Blockstore) GetSize(ctx context.Context, cid cid.Cid) (int, error) {
+func (b *Blockstore) GetSize(cid cid.Cid) (int, error) {
 	if err := b.access(); err != nil {
 		return 0, err
 	}
@@ -652,7 +652,7 @@ func (b *Blockstore) GetSize(ctx context.Context, cid cid.Cid) (int, error) {
 }
 
 // Put implements Blockstore.Put.
-func (b *Blockstore) Put(ctx context.Context, block blocks.Block) error {
+func (b *Blockstore) Put(block blocks.Block) error {
 	if err := b.access(); err != nil {
 		return err
 	}
@@ -691,7 +691,7 @@ func (b *Blockstore) Put(ctx context.Context, block blocks.Block) error {
 }
 
 // PutMany implements Blockstore.PutMany.
-func (b *Blockstore) PutMany(ctx context.Context, blocks []blocks.Block) error {
+func (b *Blockstore) PutMany(blocks []blocks.Block) error {
 	if err := b.access(); err != nil {
 		return err
 	}
@@ -755,7 +755,7 @@ func (b *Blockstore) PutMany(ctx context.Context, blocks []blocks.Block) error {
 }
 
 // DeleteBlock implements Blockstore.DeleteBlock.
-func (b *Blockstore) DeleteBlock(ctx context.Context, cid cid.Cid) error {
+func (b *Blockstore) DeleteBlock(cid cid.Cid) error {
 	if err := b.access(); err != nil {
 		return err
 	}
@@ -774,7 +774,7 @@ func (b *Blockstore) DeleteBlock(ctx context.Context, cid cid.Cid) error {
 	})
 }
 
-func (b *Blockstore) DeleteMany(ctx context.Context, cids []cid.Cid) error {
+func (b *Blockstore) DeleteMany(cids []cid.Cid) error {
 	if err := b.access(); err != nil {
 		return err
 	}

blockstore/badger/blockstore_test.go

@@ -2,7 +2,6 @@ package badgerbs
 
 import (
 	"bytes"
-	"context"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -99,7 +98,6 @@ func openBlockstore(optsSupplier func(path string) Options) func(tb testing.TB,
 }
 
 func testMove(t *testing.T, optsF func(string) Options) {
-	ctx := context.Background()
 	basePath, err := ioutil.TempDir("", "")
 	if err != nil {
 		t.Fatal(err)
@@ -124,7 +122,7 @@ func testMove(t *testing.T, optsF func(string) Options) {
 	// add some blocks
 	for i := 0; i < 10; i++ {
 		blk := blocks.NewBlock([]byte(fmt.Sprintf("some data %d", i)))
-		err := db.Put(ctx, blk)
+		err := db.Put(blk)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -134,7 +132,7 @@ func testMove(t *testing.T, optsF func(string) Options) {
 	// delete some of them
 	for i := 5; i < 10; i++ {
 		c := have[i].Cid()
-		err := db.DeleteBlock(ctx, c)
+		err := db.DeleteBlock(c)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -147,7 +145,7 @@ func testMove(t *testing.T, optsF func(string) Options) {
 	g.Go(func() error {
 		for i := 10; i < 1000; i++ {
 			blk := blocks.NewBlock([]byte(fmt.Sprintf("some data %d", i)))
-			err := db.Put(ctx, blk)
+			err := db.Put(blk)
 			if err != nil {
 				return err
 			}
@@ -167,7 +165,7 @@ func testMove(t *testing.T, optsF func(string) Options) {
 	// 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(ctx, blk.Cid())
+			has, err := db.Has(blk.Cid())
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -176,7 +174,7 @@ func testMove(t *testing.T, optsF func(string) Options) {
 				t.Fatal("missing block")
 			}
 
-			blk2, err := db.Get(ctx, blk.Cid())
+			blk2, err := db.Get(blk.Cid())
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -187,7 +185,7 @@ func testMove(t *testing.T, optsF func(string) Options) {
 		}
 
 		for _, c := range deleted {
-			has, err := db.Has(ctx, c)
+			has, err := db.Has(c)
 			if err != nil {
 				t.Fatal(err)
 			}

blockstore/badger/blockstore_test_suite.go

@@ -44,31 +44,28 @@ func (s *Suite) RunTests(t *testing.T, prefix string) {
 }
 
 func (s *Suite) TestGetWhenKeyNotPresent(t *testing.T) {
-	ctx := context.Background()
 	bs, _ := s.NewBlockstore(t)
 	if c, ok := bs.(io.Closer); ok {
 		defer func() { require.NoError(t, c.Close()) }()
 	}
 
 	c := cid.NewCidV0(u.Hash([]byte("stuff")))
-	bl, err := bs.Get(ctx, c)
+	bl, err := bs.Get(c)
 	require.Nil(t, bl)
 	require.Equal(t, blockstore.ErrNotFound, err)
 }
 
 func (s *Suite) TestGetWhenKeyIsNil(t *testing.T) {
-	ctx := context.Background()
 	bs, _ := s.NewBlockstore(t)
 	if c, ok := bs.(io.Closer); ok {
 		defer func() { require.NoError(t, c.Close()) }()
 	}
 
-	_, err := bs.Get(ctx, cid.Undef)
+	_, err := bs.Get(cid.Undef)
 	require.Equal(t, blockstore.ErrNotFound, err)
 }
 
 func (s *Suite) TestPutThenGetBlock(t *testing.T) {
-	ctx := context.Background()
 	bs, _ := s.NewBlockstore(t)
 	if c, ok := bs.(io.Closer); ok {
 		defer func() { require.NoError(t, c.Close()) }()
@@ -76,16 +73,15 @@ func (s *Suite) TestPutThenGetBlock(t *testing.T) {
 
 	orig := blocks.NewBlock([]byte("some data"))
 
-	err := bs.Put(ctx, orig)
+	err := bs.Put(orig)
 	require.NoError(t, err)
 
-	fetched, err := bs.Get(ctx, orig.Cid())
+	fetched, err := bs.Get(orig.Cid())
 	require.NoError(t, err)
 	require.Equal(t, orig.RawData(), fetched.RawData())
 }
 
 func (s *Suite) TestHas(t *testing.T) {
-	ctx := context.Background()
 	bs, _ := s.NewBlockstore(t)
 	if c, ok := bs.(io.Closer); ok {
 		defer func() { require.NoError(t, c.Close()) }()
@@ -93,20 +89,19 @@ func (s *Suite) TestHas(t *testing.T) {
 
 	orig := blocks.NewBlock([]byte("some data"))
 
-	err := bs.Put(ctx, orig)
+	err := bs.Put(orig)
 	require.NoError(t, err)
 
-	ok, err := bs.Has(ctx, orig.Cid())
+	ok, err := bs.Has(orig.Cid())
 	require.NoError(t, err)
 	require.True(t, ok)
 
-	ok, err = bs.Has(ctx, blocks.NewBlock([]byte("another thing")).Cid())
+	ok, err = bs.Has(blocks.NewBlock([]byte("another thing")).Cid())
 	require.NoError(t, err)
 	require.False(t, ok)
 }
 
 func (s *Suite) TestCidv0v1(t *testing.T) {
-	ctx := context.Background()
 	bs, _ := s.NewBlockstore(t)
 	if c, ok := bs.(io.Closer); ok {
 		defer func() { require.NoError(t, c.Close()) }()
@@ -114,17 +109,15 @@ func (s *Suite) TestCidv0v1(t *testing.T) {
 
 	orig := blocks.NewBlock([]byte("some data"))
 
-	err := bs.Put(ctx, orig)
+	err := bs.Put(orig)
 	require.NoError(t, err)
 
-	fetched, err := bs.Get(ctx, cid.NewCidV1(cid.DagProtobuf, orig.Cid().Hash()))
+	fetched, err := bs.Get(cid.NewCidV1(cid.DagProtobuf, orig.Cid().Hash()))
 	require.NoError(t, err)
 	require.Equal(t, orig.RawData(), fetched.RawData())
 }
 
 func (s *Suite) TestPutThenGetSizeBlock(t *testing.T) {
-	ctx := context.Background()
-
 	bs, _ := s.NewBlockstore(t)
 	if c, ok := bs.(io.Closer); ok {
 		defer func() { require.NoError(t, c.Close()) }()
@@ -134,21 +127,21 @@ func (s *Suite) TestPutThenGetSizeBlock(t *testing.T) {
 	missingBlock := blocks.NewBlock([]byte("missingBlock"))
 	emptyBlock := blocks.NewBlock([]byte{})
 
-	err := bs.Put(ctx, block)
+	err := bs.Put(block)
 	require.NoError(t, err)
 
-	blockSize, err := bs.GetSize(ctx, block.Cid())
+	blockSize, err := bs.GetSize(block.Cid())
 	require.NoError(t, err)
 	require.Len(t, block.RawData(), blockSize)
 
-	err = bs.Put(ctx, emptyBlock)
+	err = bs.Put(emptyBlock)
 	require.NoError(t, err)
 
-	emptySize, err := bs.GetSize(ctx, emptyBlock.Cid())
+	emptySize, err := bs.GetSize(emptyBlock.Cid())
 	require.NoError(t, err)
 	require.Zero(t, emptySize)
 
-	missingSize, err := bs.GetSize(ctx, missingBlock.Cid())
+	missingSize, err := bs.GetSize(missingBlock.Cid())
 	require.Equal(t, blockstore.ErrNotFound, err)
 	require.Equal(t, -1, missingSize)
 }
@@ -210,7 +203,6 @@ func (s *Suite) TestDoubleClose(t *testing.T) {
 }
 
 func (s *Suite) TestReopenPutGet(t *testing.T) {
-	ctx := context.Background()
 	bs, path := s.NewBlockstore(t)
 	c, ok := bs.(io.Closer)
 	if !ok {
@@ -218,7 +210,7 @@ func (s *Suite) TestReopenPutGet(t *testing.T) {
 	}
 
 	orig := blocks.NewBlock([]byte("some data"))
-	err := bs.Put(ctx, orig)
+	err := bs.Put(orig)
 	require.NoError(t, err)
 
 	err = c.Close()
@@ -227,7 +219,7 @@ func (s *Suite) TestReopenPutGet(t *testing.T) {
 	bs, err = s.OpenBlockstore(t, path)
 	require.NoError(t, err)
 
-	fetched, err := bs.Get(ctx, orig.Cid())
+	fetched, err := bs.Get(orig.Cid())
 	require.NoError(t, err)
 	require.Equal(t, orig.RawData(), fetched.RawData())
 
@@ -236,7 +228,6 @@ func (s *Suite) TestReopenPutGet(t *testing.T) {
 }
 
 func (s *Suite) TestPutMany(t *testing.T) {
-	ctx := context.Background()
 	bs, _ := s.NewBlockstore(t)
 	if c, ok := bs.(io.Closer); ok {
 		defer func() { require.NoError(t, c.Close()) }()
@@ -247,15 +238,15 @@ func (s *Suite) TestPutMany(t *testing.T) {
 		blocks.NewBlock([]byte("foo2")),
 		blocks.NewBlock([]byte("foo3")),
 	}
-	err := bs.PutMany(ctx, blks)
+	err := bs.PutMany(blks)
 	require.NoError(t, err)
 
 	for _, blk := range blks {
-		fetched, err := bs.Get(ctx, blk.Cid())
+		fetched, err := bs.Get(blk.Cid())
 		require.NoError(t, err)
 		require.Equal(t, blk.RawData(), fetched.RawData())
 
-		ok, err := bs.Has(ctx, blk.Cid())
+		ok, err := bs.Has(blk.Cid())
 		require.NoError(t, err)
 		require.True(t, ok)
 	}
@@ -268,7 +259,6 @@ func (s *Suite) TestPutMany(t *testing.T) {
 }
 
 func (s *Suite) TestDelete(t *testing.T) {
-	ctx := context.Background()
 	bs, _ := s.NewBlockstore(t)
 	if c, ok := bs.(io.Closer); ok {
 		defer func() { require.NoError(t, c.Close()) }()
@@ -279,10 +269,10 @@ func (s *Suite) TestDelete(t *testing.T) {
 		blocks.NewBlock([]byte("foo2")),
 		blocks.NewBlock([]byte("foo3")),
 	}
-	err := bs.PutMany(ctx, blks)
+	err := bs.PutMany(blks)
 	require.NoError(t, err)
 
-	err = bs.DeleteBlock(ctx, blks[1].Cid())
+	err = bs.DeleteBlock(blks[1].Cid())
 	require.NoError(t, err)
 
 	ch, err := bs.AllKeysChan(context.Background())
@@ -295,17 +285,17 @@ func (s *Suite) TestDelete(t *testing.T) {
 		cid.NewCidV1(cid.Raw, blks[2].Cid().Hash()),
 	})
 
-	has, err := bs.Has(ctx, blks[1].Cid())
+	has, err := bs.Has(blks[1].Cid())
 	require.NoError(t, err)
 	require.False(t, has)
+
 }
 
 func insertBlocks(t *testing.T, bs blockstore.BasicBlockstore, count int) []cid.Cid {
-	ctx := context.Background()
 	keys := make([]cid.Cid, count)
 	for i := 0; i < count; i++ {
 		block := blocks.NewBlock([]byte(fmt.Sprintf("some data %d", i)))
-		err := bs.Put(ctx, block)
+		err := bs.Put(block)
 		require.NoError(t, err)
 		// NewBlock assigns a CIDv0; we convert it to CIDv1 because that's what
 		// the store returns.

blockstore/blockstore.go

@@ -1,8 +1,6 @@
 package blockstore
 
 import (
-	"context"
-
 	cid "github.com/ipfs/go-cid"
 	ds "github.com/ipfs/go-datastore"
 	logging "github.com/ipfs/go-log/v2"
@@ -29,7 +27,7 @@ type BasicBlockstore = blockstore.Blockstore
 type Viewer = blockstore.Viewer
 
 type BatchDeleter interface {
-	DeleteMany(ctx context.Context, cids []cid.Cid) error
+	DeleteMany(cids []cid.Cid) error
 }
 
 // BlockstoreIterator is a trait for efficient iteration
@@ -95,17 +93,17 @@ type adaptedBlockstore struct {
 
 var _ Blockstore = (*adaptedBlockstore)(nil)
 
-func (a *adaptedBlockstore) View(ctx context.Context, cid cid.Cid, callback func([]byte) error) error {
-	blk, err := a.Get(ctx, cid)
+func (a *adaptedBlockstore) View(cid cid.Cid, callback func([]byte) error) error {
+	blk, err := a.Get(cid)
 	if err != nil {
 		return err
 	}
 	return callback(blk.RawData())
 }
 
-func (a *adaptedBlockstore) DeleteMany(ctx context.Context, cids []cid.Cid) error {
+func (a *adaptedBlockstore) DeleteMany(cids []cid.Cid) error {
 	for _, cid := range cids {
-		err := a.DeleteBlock(ctx, cid)
+		err := a.DeleteBlock(cid)
 		if err != nil {
 			return err
 		}

blockstore/buffered.go

@@ -88,34 +88,34 @@ func (bs *BufferedBlockstore) AllKeysChan(ctx context.Context) (<-chan cid.Cid,
 	return out, nil
 }
 
-func (bs *BufferedBlockstore) DeleteBlock(ctx context.Context, c cid.Cid) error {
-	if err := bs.read.DeleteBlock(ctx, c); err != nil {
+func (bs *BufferedBlockstore) DeleteBlock(c cid.Cid) error {
+	if err := bs.read.DeleteBlock(c); err != nil {
 		return err
 	}
 
-	return bs.write.DeleteBlock(ctx, c)
+	return bs.write.DeleteBlock(c)
 }
 
-func (bs *BufferedBlockstore) DeleteMany(ctx context.Context, cids []cid.Cid) error {
-	if err := bs.read.DeleteMany(ctx, cids); err != nil {
+func (bs *BufferedBlockstore) DeleteMany(cids []cid.Cid) error {
+	if err := bs.read.DeleteMany(cids); err != nil {
 		return err
 	}
 
-	return bs.write.DeleteMany(ctx, cids)
+	return bs.write.DeleteMany(cids)
 }
 
-func (bs *BufferedBlockstore) View(ctx context.Context, c cid.Cid, callback func([]byte) error) error {
+func (bs *BufferedBlockstore) View(c cid.Cid, callback func([]byte) error) error {
 	// both stores are viewable.
-	if err := bs.write.View(ctx, c, callback); err == ErrNotFound {
+	if err := bs.write.View(c, callback); err == ErrNotFound {
 		// not found in write blockstore; fall through.
 	} else {
 		return err // propagate errors, or nil, i.e. found.
 	}
-	return bs.read.View(ctx, c, callback)
+	return bs.read.View(c, callback)
 }
 
-func (bs *BufferedBlockstore) Get(ctx context.Context, c cid.Cid) (block.Block, error) {
-	if out, err := bs.write.Get(ctx, c); err != nil {
+func (bs *BufferedBlockstore) Get(c cid.Cid) (block.Block, error) {
+	if out, err := bs.write.Get(c); err != nil {
 		if err != ErrNotFound {
 			return nil, err
 		}
@@ -123,20 +123,20 @@ func (bs *BufferedBlockstore) Get(ctx context.Context, c cid.Cid) (block.Block,
 		return out, nil
 	}
 
-	return bs.read.Get(ctx, c)
+	return bs.read.Get(c)
 }
 
-func (bs *BufferedBlockstore) GetSize(ctx context.Context, c cid.Cid) (int, error) {
-	s, err := bs.read.GetSize(ctx, c)
+func (bs *BufferedBlockstore) GetSize(c cid.Cid) (int, error) {
+	s, err := bs.read.GetSize(c)
 	if err == ErrNotFound || s == 0 {
-		return bs.write.GetSize(ctx, c)
+		return bs.write.GetSize(c)
 	}
 
 	return s, err
 }
 
-func (bs *BufferedBlockstore) Put(ctx context.Context, blk block.Block) error {
-	has, err := bs.read.Has(ctx, blk.Cid()) // TODO: consider dropping this check
+func (bs *BufferedBlockstore) Put(blk block.Block) error {
+	has, err := bs.read.Has(blk.Cid()) // TODO: consider dropping this check
 	if err != nil {
 		return err
 	}
@@ -145,11 +145,11 @@ func (bs *BufferedBlockstore) Put(ctx context.Context, blk block.Block) error {
 		return nil
 	}
 
-	return bs.write.Put(ctx, blk)
+	return bs.write.Put(blk)
 }
 
-func (bs *BufferedBlockstore) Has(ctx context.Context, c cid.Cid) (bool, error) {
-	has, err := bs.write.Has(ctx, c)
+func (bs *BufferedBlockstore) Has(c cid.Cid) (bool, error) {
+	has, err := bs.write.Has(c)
 	if err != nil {
 		return false, err
 	}
@@ -157,7 +157,7 @@ func (bs *BufferedBlockstore) Has(ctx context.Context, c cid.Cid) (bool, error)
 		return true, nil
 	}
 
-	return bs.read.Has(ctx, c)
+	return bs.read.Has(c)
 }
 
 func (bs *BufferedBlockstore) HashOnRead(hor bool) {
@@ -165,8 +165,8 @@ func (bs *BufferedBlockstore) HashOnRead(hor bool) {
 	bs.write.HashOnRead(hor)
 }
 
-func (bs *BufferedBlockstore) PutMany(ctx context.Context, blks []block.Block) error {
-	return bs.write.PutMany(ctx, blks)
+func (bs *BufferedBlockstore) PutMany(blks []block.Block) error {
+	return bs.write.PutMany(blks)
 }
 
 func (bs *BufferedBlockstore) Read() Blockstore {

blockstore/discard.go

@@ -18,39 +18,39 @@ func NewDiscardStore(bs Blockstore) Blockstore {
 	return &discardstore{bs: bs}
 }
 
-func (b *discardstore) Has(ctx context.Context, cid cid.Cid) (bool, error) {
-	return b.bs.Has(ctx, cid)
+func (b *discardstore) Has(cid cid.Cid) (bool, error) {
+	return b.bs.Has(cid)
 }
 
 func (b *discardstore) HashOnRead(hor bool) {
 	b.bs.HashOnRead(hor)
 }
 
-func (b *discardstore) Get(ctx context.Context, cid cid.Cid) (blocks.Block, error) {
-	return b.bs.Get(ctx, cid)
+func (b *discardstore) Get(cid cid.Cid) (blocks.Block, error) {
+	return b.bs.Get(cid)
 }
 
-func (b *discardstore) GetSize(ctx context.Context, cid cid.Cid) (int, error) {
-	return b.bs.GetSize(ctx, cid)
+func (b *discardstore) GetSize(cid cid.Cid) (int, error) {
+	return b.bs.GetSize(cid)
 }
 
-func (b *discardstore) View(ctx context.Context, cid cid.Cid, f func([]byte) error) error {
-	return b.bs.View(ctx, cid, f)
+func (b *discardstore) View(cid cid.Cid, f func([]byte) error) error {
+	return b.bs.View(cid, f)
 }
 
-func (b *discardstore) Put(ctx context.Context, blk blocks.Block) error {
+func (b *discardstore) Put(blk blocks.Block) error {
 	return nil
 }
 
-func (b *discardstore) PutMany(ctx context.Context, blks []blocks.Block) error {
+func (b *discardstore) PutMany(blks []blocks.Block) error {
 	return nil
 }
 
-func (b *discardstore) DeleteBlock(ctx context.Context, cid cid.Cid) error {
+func (b *discardstore) DeleteBlock(cid cid.Cid) error {
 	return nil
 }
 
-func (b *discardstore) DeleteMany(ctx context.Context, cids []cid.Cid) error {
+func (b *discardstore) DeleteMany(cids []cid.Cid) error {
 	return nil
 }
 

blockstore/fallback.go

@@ -71,14 +71,14 @@ func (fbs *FallbackStore) getFallback(c cid.Cid) (blocks.Block, error) {
 	// chain bitswap puts blocks in temp blockstore which is cleaned up
 	// every few min (to drop any messages we fetched but don't want)
 	// in this case we want to keep this block around
-	if err := fbs.Put(ctx, b); err != nil {
+	if err := fbs.Put(b); err != nil {
 		return nil, xerrors.Errorf("persisting fallback-fetched block: %w", err)
 	}
 	return b, nil
 }
 
-func (fbs *FallbackStore) Get(ctx context.Context, c cid.Cid) (blocks.Block, error) {
-	b, err := fbs.Blockstore.Get(ctx, c)
+func (fbs *FallbackStore) Get(c cid.Cid) (blocks.Block, error) {
+	b, err := fbs.Blockstore.Get(c)
 	switch err {
 	case nil:
 		return b, nil
@@ -89,8 +89,8 @@ func (fbs *FallbackStore) Get(ctx context.Context, c cid.Cid) (blocks.Block, err
 	}
 }
 
-func (fbs *FallbackStore) GetSize(ctx context.Context, c cid.Cid) (int, error) {
-	sz, err := fbs.Blockstore.GetSize(ctx, c)
+func (fbs *FallbackStore) GetSize(c cid.Cid) (int, error) {
+	sz, err := fbs.Blockstore.GetSize(c)
 	switch err {
 	case nil:
 		return sz, nil

blockstore/idstore.go

@@ -38,7 +38,7 @@ func decodeCid(cid cid.Cid) (inline bool, data []byte, err error) {
 	return false, nil, err
 }
 
-func (b *idstore) Has(ctx context.Context, cid cid.Cid) (bool, error) {
+func (b *idstore) Has(cid cid.Cid) (bool, error) {
 	inline, _, err := decodeCid(cid)
 	if err != nil {
 		return false, xerrors.Errorf("error decoding Cid: %w", err)
@@ -48,10 +48,10 @@ func (b *idstore) Has(ctx context.Context, cid cid.Cid) (bool, error) {
 		return true, nil
 	}
 
-	return b.bs.Has(ctx, cid)
+	return b.bs.Has(cid)
 }
 
-func (b *idstore) Get(ctx context.Context, cid cid.Cid) (blocks.Block, error) {
+func (b *idstore) Get(cid cid.Cid) (blocks.Block, error) {
 	inline, data, err := decodeCid(cid)
 	if err != nil {
 		return nil, xerrors.Errorf("error decoding Cid: %w", err)
@@ -61,10 +61,10 @@ func (b *idstore) Get(ctx context.Context, cid cid.Cid) (blocks.Block, error) {
 		return blocks.NewBlockWithCid(data, cid)
 	}
 
-	return b.bs.Get(ctx, cid)
+	return b.bs.Get(cid)
 }
 
-func (b *idstore) GetSize(ctx context.Context, cid cid.Cid) (int, error) {
+func (b *idstore) GetSize(cid cid.Cid) (int, error) {
 	inline, data, err := decodeCid(cid)
 	if err != nil {
 		return 0, xerrors.Errorf("error decoding Cid: %w", err)
@@ -74,10 +74,10 @@ func (b *idstore) GetSize(ctx context.Context, cid cid.Cid) (int, error) {
 		return len(data), err
 	}
 
-	return b.bs.GetSize(ctx, cid)
+	return b.bs.GetSize(cid)
 }
 
-func (b *idstore) View(ctx context.Context, cid cid.Cid, cb func([]byte) error) error {
+func (b *idstore) View(cid cid.Cid, cb func([]byte) error) error {
 	inline, data, err := decodeCid(cid)
 	if err != nil {
 		return xerrors.Errorf("error decoding Cid: %w", err)
@@ -87,10 +87,10 @@ func (b *idstore) View(ctx context.Context, cid cid.Cid, cb func([]byte) error)
 		return cb(data)
 	}
 
-	return b.bs.View(ctx, cid, cb)
+	return b.bs.View(cid, cb)
 }
 
-func (b *idstore) Put(ctx context.Context, blk blocks.Block) error {
+func (b *idstore) Put(blk blocks.Block) error {
 	inline, _, err := decodeCid(blk.Cid())
 	if err != nil {
 		return xerrors.Errorf("error decoding Cid: %w", err)
@@ -100,10 +100,10 @@ func (b *idstore) Put(ctx context.Context, blk blocks.Block) error {
 		return nil
 	}
 
-	return b.bs.Put(ctx, blk)
+	return b.bs.Put(blk)
 }
 
-func (b *idstore) PutMany(ctx context.Context, blks []blocks.Block) error {
+func (b *idstore) PutMany(blks []blocks.Block) error {
 	toPut := make([]blocks.Block, 0, len(blks))
 	for _, blk := range blks {
 		inline, _, err := decodeCid(blk.Cid())
@@ -118,13 +118,13 @@ func (b *idstore) PutMany(ctx context.Context, blks []blocks.Block) error {
 	}
 
 	if len(toPut) > 0 {
-		return b.bs.PutMany(ctx, toPut)
+		return b.bs.PutMany(toPut)
 	}
 
 	return nil
 }
 
-func (b *idstore) DeleteBlock(ctx context.Context, cid cid.Cid) error {
+func (b *idstore) DeleteBlock(cid cid.Cid) error {
 	inline, _, err := decodeCid(cid)
 	if err != nil {
 		return xerrors.Errorf("error decoding Cid: %w", err)
@@ -134,10 +134,10 @@ func (b *idstore) DeleteBlock(ctx context.Context, cid cid.Cid) error {
 		return nil
 	}
 
-	return b.bs.DeleteBlock(ctx, cid)
+	return b.bs.DeleteBlock(cid)
 }
 
-func (b *idstore) DeleteMany(ctx context.Context, cids []cid.Cid) error {
+func (b *idstore) DeleteMany(cids []cid.Cid) error {
 	toDelete := make([]cid.Cid, 0, len(cids))
 	for _, cid := range cids {
 		inline, _, err := decodeCid(cid)
@@ -152,7 +152,7 @@ func (b *idstore) DeleteMany(ctx context.Context, cids []cid.Cid) error {
 	}
 
 	if len(toDelete) > 0 {
-		return b.bs.DeleteMany(ctx, toDelete)
+		return b.bs.DeleteMany(toDelete)
 	}
 
 	return nil

blockstore/ipfs.go

@@ -79,12 +79,12 @@ func NewRemoteIPFSBlockstore(ctx context.Context, maddr multiaddr.Multiaddr, onl
 	return Adapt(bs), nil
 }
 
-func (i *IPFSBlockstore) DeleteBlock(ctx context.Context, cid cid.Cid) error {
+func (i *IPFSBlockstore) DeleteBlock(cid cid.Cid) error {
 	return xerrors.Errorf("not supported")
 }
 
-func (i *IPFSBlockstore) Has(ctx context.Context, cid cid.Cid) (bool, error) {
-	_, err := i.offlineAPI.Block().Stat(ctx, path.IpldPath(cid))
+func (i *IPFSBlockstore) Has(cid cid.Cid) (bool, error) {
+	_, err := i.offlineAPI.Block().Stat(i.ctx, path.IpldPath(cid))
 	if err != nil {
 		// The underlying client is running in Offline mode.
 		// Stat() will fail with an err if the block isn't in the
@@ -99,8 +99,8 @@ func (i *IPFSBlockstore) Has(ctx context.Context, cid cid.Cid) (bool, error) {
 	return true, nil
 }
 
-func (i *IPFSBlockstore) Get(ctx context.Context, cid cid.Cid) (blocks.Block, error) {
-	rd, err := i.api.Block().Get(ctx, path.IpldPath(cid))
+func (i *IPFSBlockstore) Get(cid cid.Cid) (blocks.Block, error) {
+	rd, err := i.api.Block().Get(i.ctx, path.IpldPath(cid))
 	if err != nil {
 		return nil, xerrors.Errorf("getting ipfs block: %w", err)
 	}
@@ -113,8 +113,8 @@ func (i *IPFSBlockstore) Get(ctx context.Context, cid cid.Cid) (blocks.Block, er
 	return blocks.NewBlockWithCid(data, cid)
 }
 
-func (i *IPFSBlockstore) GetSize(ctx context.Context, cid cid.Cid) (int, error) {
-	st, err := i.api.Block().Stat(ctx, path.IpldPath(cid))
+func (i *IPFSBlockstore) GetSize(cid cid.Cid) (int, error) {
+	st, err := i.api.Block().Stat(i.ctx, path.IpldPath(cid))
 	if err != nil {
 		return 0, xerrors.Errorf("getting ipfs block: %w", err)
 	}
@@ -122,23 +122,23 @@ func (i *IPFSBlockstore) GetSize(ctx context.Context, cid cid.Cid) (int, error)
 	return st.Size(), nil
 }
 
-func (i *IPFSBlockstore) Put(ctx context.Context, block blocks.Block) error {
+func (i *IPFSBlockstore) Put(block blocks.Block) error {
 	mhd, err := multihash.Decode(block.Cid().Hash())
 	if err != nil {
 		return err
 	}
 
-	_, err = i.api.Block().Put(ctx, bytes.NewReader(block.RawData()),
+	_, err = i.api.Block().Put(i.ctx, bytes.NewReader(block.RawData()),
 		options.Block.Hash(mhd.Code, mhd.Length),
 		options.Block.Format(cid.CodecToStr[block.Cid().Type()]))
 	return err
 }
 
-func (i *IPFSBlockstore) PutMany(ctx context.Context, blocks []blocks.Block) error {
+func (i *IPFSBlockstore) PutMany(blocks []blocks.Block) error {
 	// TODO: could be done in parallel
 
 	for _, block := range blocks {
-		if err := i.Put(ctx, block); err != nil {
+		if err := i.Put(block); err != nil {
 			return err
 		}
 	}

blockstore/mem.go

@@ -15,24 +15,24 @@ func NewMemory() MemBlockstore {
 // MemBlockstore is a terminal blockstore that keeps blocks in memory.
 type MemBlockstore map[cid.Cid]blocks.Block
 
-func (m MemBlockstore) DeleteBlock(ctx context.Context, k cid.Cid) error {
+func (m MemBlockstore) DeleteBlock(k cid.Cid) error {
 	delete(m, k)
 	return nil
 }
 
-func (m MemBlockstore) DeleteMany(ctx context.Context, ks []cid.Cid) error {
+func (m MemBlockstore) DeleteMany(ks []cid.Cid) error {
 	for _, k := range ks {
 		delete(m, k)
 	}
 	return nil
 }
 
-func (m MemBlockstore) Has(ctx context.Context, k cid.Cid) (bool, error) {
+func (m MemBlockstore) Has(k cid.Cid) (bool, error) {
 	_, ok := m[k]
 	return ok, nil
 }
 
-func (m MemBlockstore) View(ctx context.Context, k cid.Cid, callback func([]byte) error) error {
+func (m MemBlockstore) View(k cid.Cid, callback func([]byte) error) error {
 	b, ok := m[k]
 	if !ok {
 		return ErrNotFound
@@ -40,7 +40,7 @@ func (m MemBlockstore) View(ctx context.Context, k cid.Cid, callback func([]byte
 	return callback(b.RawData())
 }
 
-func (m MemBlockstore) Get(ctx context.Context, k cid.Cid) (blocks.Block, error) {
+func (m MemBlockstore) Get(k cid.Cid) (blocks.Block, error) {
 	b, ok := m[k]
 	if !ok {
 		return nil, ErrNotFound
@@ -49,7 +49,7 @@ func (m MemBlockstore) Get(ctx context.Context, k cid.Cid) (blocks.Block, error)
 }
 
 // GetSize returns the CIDs mapped BlockSize
-func (m MemBlockstore) GetSize(ctx context.Context, k cid.Cid) (int, error) {
+func (m MemBlockstore) GetSize(k cid.Cid) (int, error) {
 	b, ok := m[k]
 	if !ok {
 		return 0, ErrNotFound
@@ -58,7 +58,7 @@ func (m MemBlockstore) GetSize(ctx context.Context, k cid.Cid) (int, error) {
 }
 
 // Put puts a given block to the underlying datastore
-func (m MemBlockstore) Put(ctx context.Context, b blocks.Block) error {
+func (m MemBlockstore) Put(b blocks.Block) error {
 	// Convert to a basic block for safety, but try to reuse the existing
 	// block if it's already a basic block.
 	k := b.Cid()
@@ -76,9 +76,9 @@ func (m MemBlockstore) Put(ctx context.Context, b blocks.Block) error {
 
 // PutMany puts a slice of blocks at the same time using batching
 // capabilities of the underlying datastore whenever possible.
-func (m MemBlockstore) PutMany(ctx context.Context, bs []blocks.Block) error {
+func (m MemBlockstore) PutMany(bs []blocks.Block) error {
 	for _, b := range bs {
-		_ = m.Put(ctx, b) // can't fail
+		_ = m.Put(b) // can't fail
 	}
 	return nil
 }

blockstore/splitstore/README.md

@@ -119,7 +119,6 @@ TBD -- see [#6577](https://github.com/filecoin-project/lotus/issues/6577)
   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

@@ -10,25 +10,26 @@ import (
 
 var errMarkSetClosed = errors.New("markset closed")
 
-// MarkSet is an interface for tracking CIDs during chain and object walks
+// MarkSet is a utility to keep track of seen CID, and later query for them.
+//
+// * If the expected dataset is large, it can be backed by a datastore (e.g. bbolt).
+// * If a probabilistic result is acceptable, it can be backed by a bloom filter
 type MarkSet interface {
-	ObjectVisitor
 	Mark(cid.Cid) error
 	Has(cid.Cid) (bool, error)
 	Close() error
+	SetConcurrent()
 }
 
 type MarkSetEnv interface {
-	// Create creates a new markset within the environment.
-	// name is a unique name for this markset, mapped to the filesystem in disk-backed environments
-	// sizeHint is a hint about the expected size of the markset
 	Create(name string, sizeHint int64) (MarkSet, error)
-	// Close closes the markset
 	Close() error
 }
 
 func OpenMarkSetEnv(path string, mtype string) (MarkSetEnv, error) {
 	switch mtype {
+	case "bloom":
+		return NewBloomMarkSetEnv()
 	case "map":
 		return NewMapMarkSetEnv()
 	case "badger":

blockstore/splitstore/markset_badger.go

@@ -27,7 +27,6 @@ type BadgerMarkSet struct {
 	writing map[int]map[string]struct{}
 	writers int
 	seqno   int
-	version int
 
 	db   *badger.DB
 	path string
@@ -48,230 +47,8 @@ func NewBadgerMarkSetEnv(path string) (MarkSetEnv, error) {
 }
 
 func (e *BadgerMarkSetEnv) Create(name string, sizeHint int64) (MarkSet, error) {
-	name += ".tmp"
 	path := filepath.Join(e.path, name)
 
-	db, err := openTransientBadgerDB(path)
-	if err != nil {
-		return nil, xerrors.Errorf("error creating badger db: %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
-	}
-
-	write, seqno := s.put(string(c.Hash()))
-	s.mx.Unlock()
-
-	if write {
-		return s.write(seqno)
-	}
-
-	return nil
-}
-
-func (s *BadgerMarkSet) Has(c cid.Cid) (bool, error) {
-	s.mx.RLock()
-	defer s.mx.RUnlock()
-
-	key := c.Hash()
-	pendKey := string(key)
-
-	has, err := s.tryPending(pendKey)
-	if has || err != nil {
-		return has, err
-	}
-
-	return s.tryDB(key)
-}
-
-func (s *BadgerMarkSet) Visit(c cid.Cid) (bool, error) {
-	key := c.Hash()
-	pendKey := string(key)
-
-	s.mx.RLock()
-
-	has, err := s.tryPending(pendKey)
-	if has || err != nil {
-		s.mx.RUnlock()
-		return false, err
-	}
-
-	has, err = s.tryDB(key)
-	if has || err != nil {
-		s.mx.RUnlock()
-		return false, err
-	}
-
-	// we need to upgrade the lock to exclusive in order to write; take the version count to see
-	// if there was another write while we were upgrading
-	version := s.version
-	s.mx.RUnlock()
-
-	s.mx.Lock()
-	// we have to do the check dance again
-	has, err = s.tryPending(pendKey)
-	if has || err != nil {
-		s.mx.Unlock()
-		return false, err
-	}
-
-	if version != s.version {
-		// something was written to the db, we need to check it
-		has, err = s.tryDB(key)
-		if has || err != nil {
-			s.mx.Unlock()
-			return false, err
-		}
-	}
-
-	write, seqno := s.put(pendKey)
-	s.mx.Unlock()
-
-	if write {
-		err = s.write(seqno)
-	}
-
-	return true, err
-}
-
-// reader holds the (r)lock
-func (s *BadgerMarkSet) tryPending(key string) (has bool, err error) {
-	if s.pend == nil {
-		return false, errMarkSetClosed
-	}
-
-	if _, ok := s.pend[key]; ok {
-		return true, nil
-	}
-
-	for _, wr := range s.writing {
-		if _, ok := wr[key]; ok {
-			return true, nil
-		}
-	}
-
-	return false, nil
-}
-
-func (s *BadgerMarkSet) tryDB(key []byte) (has bool, err error) {
-	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, err
-	}
-}
-
-// writer holds the exclusive lock
-func (s *BadgerMarkSet) put(key string) (write bool, seqno int) {
-	s.pend[key] = struct{}{}
-	if len(s.pend) < badgerMarkSetBatchSize {
-		return false, 0
-	}
-
-	seqno = s.seqno
-	s.seqno++
-	s.writing[seqno] = s.pend
-	s.pend = make(map[string]struct{})
-
-	return true, seqno
-}
-
-func (s *BadgerMarkSet) write(seqno int) (err error) {
-	s.mx.Lock()
-	if s.pend == nil {
-		s.mx.Unlock()
-		return errMarkSetClosed
-	}
-
-	pend := s.writing[seqno]
-	s.writers++
-	s.mx.Unlock()
-
-	defer func() {
-		s.mx.Lock()
-		defer s.mx.Unlock()
-
-		if err == nil {
-			delete(s.writing, seqno)
-			s.version++
-		}
-
-		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 xerrors.Errorf("error setting batch: %w", err)
-		}
-	}
-
-	err = batch.Flush()
-	if err != nil {
-		return xerrors.Errorf("error flushing batch to badger markset: %w", err)
-	}
-
-	return nil
-}
-
-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
-
-	return closeTransientBadgerDB(db, s.path)
-}
-
-func (s *BadgerMarkSet) SetConcurrent() {}
-
-func openTransientBadgerDB(path string) (*badger.DB, error) {
 	// clean up first
 	err := os.RemoveAll(path)
 	if err != nil {
@@ -299,16 +76,140 @@ func openTransientBadgerDB(path string) (*badger.DB, error) {
 		skip2:         log.Desugar().WithOptions(zap.AddCallerSkip(2)).Sugar(),
 	}
 
-	return badger.Open(opts)
+	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 closeTransientBadgerDB(db *badger.DB, path string) error {
+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(path)
+	err = os.RemoveAll(s.path)
 	if err != nil {
 		return xerrors.Errorf("error deleting badger markset: %w", err)
 	}
@@ -316,6 +217,8 @@ func closeTransientBadgerDB(db *badger.DB, path string) error {
 	return nil
 }
 
+func (s *BadgerMarkSet) SetConcurrent() {}
+
 // badger logging through go-log
 type badgerLogger struct {
 	*zap.SugaredLogger

blockstore/splitstore/markset_bloom.go

@@ -0,0 +1,107 @@
+package splitstore
+
+import (
+	"crypto/rand"
+	"crypto/sha256"
+	"sync"
+
+	"golang.org/x/xerrors"
+
+	bbloom "github.com/ipfs/bbloom"
+	cid "github.com/ipfs/go-cid"
+)
+
+const (
+	BloomFilterMinSize     = 10_000_000
+	BloomFilterProbability = 0.01
+)
+
+type BloomMarkSetEnv struct{}
+
+var _ MarkSetEnv = (*BloomMarkSetEnv)(nil)
+
+type BloomMarkSet struct {
+	salt []byte
+	mx   sync.RWMutex
+	bf   *bbloom.Bloom
+	ts   bool
+}
+
+var _ MarkSet = (*BloomMarkSet)(nil)
+
+func NewBloomMarkSetEnv() (*BloomMarkSetEnv, error) {
+	return &BloomMarkSetEnv{}, nil
+}
+
+func (e *BloomMarkSetEnv) Create(name string, sizeHint int64) (MarkSet, error) {
+	size := int64(BloomFilterMinSize)
+	for size < sizeHint {
+		size += BloomFilterMinSize
+	}
+
+	salt := make([]byte, 4)
+	_, err := rand.Read(salt)
+	if err != nil {
+		return nil, xerrors.Errorf("error reading salt: %w", err)
+	}
+
+	bf, err := bbloom.New(float64(size), BloomFilterProbability)
+	if err != nil {
+		return nil, xerrors.Errorf("error creating bloom filter: %w", err)
+	}
+
+	return &BloomMarkSet{salt: salt, bf: bf}, nil
+}
+
+func (e *BloomMarkSetEnv) Close() error {
+	return nil
+}
+
+func (s *BloomMarkSet) saltedKey(cid cid.Cid) []byte {
+	hash := cid.Hash()
+	key := make([]byte, len(s.salt)+len(hash))
+	n := copy(key, s.salt)
+	copy(key[n:], hash)
+	rehash := sha256.Sum256(key)
+	return rehash[:]
+}
+
+func (s *BloomMarkSet) Mark(cid cid.Cid) error {
+	if s.ts {
+		s.mx.Lock()
+		defer s.mx.Unlock()
+	}
+
+	if s.bf == nil {
+		return errMarkSetClosed
+	}
+
+	s.bf.Add(s.saltedKey(cid))
+	return nil
+}
+
+func (s *BloomMarkSet) Has(cid cid.Cid) (bool, error) {
+	if s.ts {
+		s.mx.RLock()
+		defer s.mx.RUnlock()
+	}
+
+	if s.bf == nil {
+		return false, errMarkSetClosed
+	}
+
+	return s.bf.Has(s.saltedKey(cid)), nil
+}
+
+func (s *BloomMarkSet) Close() error {
+	if s.ts {
+		s.mx.Lock()
+		defer s.mx.Unlock()
+	}
+	s.bf = nil
+	return nil
+}
+
+func (s *BloomMarkSet) SetConcurrent() {
+	s.ts = true
+}

blockstore/splitstore/markset_map.go

@@ -13,6 +13,8 @@ var _ MarkSetEnv = (*MapMarkSetEnv)(nil)
 type MapMarkSet struct {
 	mx  sync.RWMutex
 	set map[string]struct{}
+
+	ts bool
 }
 
 var _ MarkSet = (*MapMarkSet)(nil)
@@ -32,8 +34,10 @@ func (e *MapMarkSetEnv) Close() error {
 }
 
 func (s *MapMarkSet) Mark(cid cid.Cid) error {
-	s.mx.Lock()
-	defer s.mx.Unlock()
+	if s.ts {
+		s.mx.Lock()
+		defer s.mx.Unlock()
+	}
 
 	if s.set == nil {
 		return errMarkSetClosed
@@ -44,8 +48,10 @@ func (s *MapMarkSet) Mark(cid cid.Cid) error {
 }
 
 func (s *MapMarkSet) Has(cid cid.Cid) (bool, error) {
-	s.mx.RLock()
-	defer s.mx.RUnlock()
+	if s.ts {
+		s.mx.RLock()
+		defer s.mx.RUnlock()
+	}
 
 	if s.set == nil {
 		return false, errMarkSetClosed
@@ -55,27 +61,15 @@ func (s *MapMarkSet) Has(cid cid.Cid) (bool, error) {
 	return ok, nil
 }
 
-func (s *MapMarkSet) Visit(c cid.Cid) (bool, error) {
-	s.mx.Lock()
-	defer s.mx.Unlock()
-
-	if s.set == nil {
-		return false, errMarkSetClosed
-	}
-
-	key := string(c.Hash())
-	if _, ok := s.set[key]; ok {
-		return false, nil
-	}
-
-	s.set[key] = struct{}{}
-	return true, nil
-}
-
 func (s *MapMarkSet) Close() error {
-	s.mx.Lock()
-	defer s.mx.Unlock()
-
+	if s.ts {
+		s.mx.Lock()
+		defer s.mx.Unlock()
+	}
 	s.set = nil
 	return nil
 }
+
+func (s *MapMarkSet) SetConcurrent() {
+	s.ts = true
+}

blockstore/splitstore/markset_test.go

@@ -2,7 +2,6 @@ package splitstore
 
 import (
 	"io/ioutil"
-	"os"
 	"testing"
 
 	cid "github.com/ipfs/go-cid"
@@ -11,7 +10,10 @@ import (
 
 func TestMapMarkSet(t *testing.T) {
 	testMarkSet(t, "map")
-	testMarkSetVisitor(t, "map")
+}
+
+func TestBloomMarkSet(t *testing.T) {
+	testMarkSet(t, "bloom")
 }
 
 func TestBadgerMarkSet(t *testing.T) {
@@ -21,21 +23,16 @@ func TestBadgerMarkSet(t *testing.T) {
 		badgerMarkSetBatchSize = bs
 	})
 	testMarkSet(t, "badger")
-	testMarkSetVisitor(t, "badger")
 }
 
 func testMarkSet(t *testing.T, lsType string) {
 	t.Helper()
 
-	path, err := ioutil.TempDir("", "markset.*")
+	path, err := ioutil.TempDir("", "sweep-test.*")
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	t.Cleanup(func() {
-		_ = os.RemoveAll(path)
-	})
-
 	env, err := OpenMarkSetEnv(path, lsType)
 	if err != nil {
 		t.Fatal(err)
@@ -148,74 +145,3 @@ func testMarkSet(t *testing.T, lsType string) {
 		t.Fatal(err)
 	}
 }
-
-func testMarkSetVisitor(t *testing.T, lsType string) {
-	t.Helper()
-
-	path, err := ioutil.TempDir("", "markset.*")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	t.Cleanup(func() {
-		_ = os.RemoveAll(path)
-	})
-
-	env, err := OpenMarkSetEnv(path, lsType)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer env.Close() //nolint:errcheck
-
-	visitor, err := env.Create("test", 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer visitor.Close() //nolint:errcheck
-
-	makeCid := func(key string) cid.Cid {
-		h, err := multihash.Sum([]byte(key), multihash.SHA2_256, -1)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		return cid.NewCidV1(cid.Raw, h)
-	}
-
-	mustVisit := func(v ObjectVisitor, cid cid.Cid) {
-		visit, err := v.Visit(cid)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if !visit {
-			t.Fatal("object should be visited")
-		}
-	}
-
-	mustNotVisit := func(v ObjectVisitor, cid cid.Cid) {
-		visit, err := v.Visit(cid)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if visit {
-			t.Fatal("unexpected visit")
-		}
-	}
-
-	k1 := makeCid("a")
-	k2 := makeCid("b")
-	k3 := makeCid("c")
-	k4 := makeCid("d")
-
-	mustVisit(visitor, k1)
-	mustVisit(visitor, k2)
-	mustVisit(visitor, k3)
-	mustVisit(visitor, k4)
-
-	mustNotVisit(visitor, k1)
-	mustNotVisit(visitor, k2)
-	mustNotVisit(visitor, k3)
-	mustNotVisit(visitor, k4)
-}

blockstore/splitstore/splitstore.go

@@ -18,8 +18,6 @@ import (
 
 	"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/stmgr"
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/lotus/metrics"
 
@@ -49,9 +47,6 @@ var (
 	enableDebugLog = false
 	// set this to true if you want to track origin stack traces in the write log
 	enableDebugLogWriteTraces = false
-
-	// upgradeBoundary is the boundary before and after an upgrade where we suppress compaction
-	upgradeBoundary = build.Finality
 )
 
 func init() {
@@ -103,12 +98,6 @@ type ChainAccessor interface {
 	SubscribeHeadChanges(change func(revert []*types.TipSet, apply []*types.TipSet) error)
 }
 
-// upgradeRange is a precomputed epoch range during which we shouldn't compact so as to not
-// interfere with an upgrade
-type upgradeRange struct {
-	start, end abi.ChainEpoch
-}
-
 // hotstore is the interface that must be satisfied by the hot blockstore; it is an extension
 // of the Blockstore interface with the traits we need for compaction.
 type hotstore interface {
@@ -136,8 +125,6 @@ type SplitStore struct {
 	cold  bstore.Blockstore
 	hot   hotstore
 
-	upgrades []upgradeRange
-
 	markSetEnv  MarkSetEnv
 	markSetSize int64
 
@@ -155,6 +142,7 @@ type SplitStore struct {
 	txnViews        int
 	txnViewsWaiting bool
 	txnActive       bool
+	txnProtect      MarkSet
 	txnRefsMx       sync.Mutex
 	txnRefs         map[cid.Cid]struct{}
 	txnMissing      map[cid.Cid]struct{}
@@ -212,17 +200,17 @@ func Open(path string, ds dstore.Datastore, hot, cold bstore.Blockstore, cfg *Co
 }
 
 // Blockstore interface
-func (s *SplitStore) DeleteBlock(_ context.Context, _ cid.Cid) error {
+func (s *SplitStore) DeleteBlock(_ cid.Cid) error {
 	// afaict we don't seem to be using this method, so it's not implemented
 	return errors.New("DeleteBlock not implemented on SplitStore; don't do this Luke!") //nolint
 }
 
-func (s *SplitStore) DeleteMany(_ context.Context, _ []cid.Cid) error {
+func (s *SplitStore) DeleteMany(_ []cid.Cid) error {
 	// afaict we don't seem to be using this method, so it's not implemented
 	return errors.New("DeleteMany not implemented on SplitStore; don't do this Luke!") //nolint
 }
 
-func (s *SplitStore) Has(ctx context.Context, cid cid.Cid) (bool, error) {
+func (s *SplitStore) Has(cid cid.Cid) (bool, error) {
 	if isIdentiyCid(cid) {
 		return true, nil
 	}
@@ -230,7 +218,7 @@ func (s *SplitStore) Has(ctx context.Context, cid cid.Cid) (bool, error) {
 	s.txnLk.RLock()
 	defer s.txnLk.RUnlock()
 
-	has, err := s.hot.Has(ctx, cid)
+	has, err := s.hot.Has(cid)
 
 	if err != nil {
 		return has, err
@@ -241,10 +229,10 @@ func (s *SplitStore) Has(ctx context.Context, cid cid.Cid) (bool, error) {
 		return true, nil
 	}
 
-	return s.cold.Has(ctx, cid)
+	return s.cold.Has(cid)
 }
 
-func (s *SplitStore) Get(ctx context.Context, cid cid.Cid) (blocks.Block, error) {
+func (s *SplitStore) Get(cid cid.Cid) (blocks.Block, error) {
 	if isIdentiyCid(cid) {
 		data, err := decodeIdentityCid(cid)
 		if err != nil {
@@ -257,7 +245,7 @@ func (s *SplitStore) Get(ctx context.Context, cid cid.Cid) (blocks.Block, error)
 	s.txnLk.RLock()
 	defer s.txnLk.RUnlock()
 
-	blk, err := s.hot.Get(ctx, cid)
+	blk, err := s.hot.Get(cid)
 
 	switch err {
 	case nil:
@@ -269,7 +257,7 @@ func (s *SplitStore) Get(ctx context.Context, cid cid.Cid) (blocks.Block, error)
 			s.debug.LogReadMiss(cid)
 		}
 
-		blk, err = s.cold.Get(ctx, cid)
+		blk, err = s.cold.Get(cid)
 		if err == nil {
 			stats.Record(s.ctx, metrics.SplitstoreMiss.M(1))
 
@@ -281,7 +269,7 @@ func (s *SplitStore) Get(ctx context.Context, cid cid.Cid) (blocks.Block, error)
 	}
 }
 
-func (s *SplitStore) GetSize(ctx context.Context, cid cid.Cid) (int, error) {
+func (s *SplitStore) GetSize(cid cid.Cid) (int, error) {
 	if isIdentiyCid(cid) {
 		data, err := decodeIdentityCid(cid)
 		if err != nil {
@@ -294,7 +282,7 @@ func (s *SplitStore) GetSize(ctx context.Context, cid cid.Cid) (int, error) {
 	s.txnLk.RLock()
 	defer s.txnLk.RUnlock()
 
-	size, err := s.hot.GetSize(ctx, cid)
+	size, err := s.hot.GetSize(cid)
 
 	switch err {
 	case nil:
@@ -306,7 +294,7 @@ func (s *SplitStore) GetSize(ctx context.Context, cid cid.Cid) (int, error) {
 			s.debug.LogReadMiss(cid)
 		}
 
-		size, err = s.cold.GetSize(ctx, cid)
+		size, err = s.cold.GetSize(cid)
 		if err == nil {
 			stats.Record(s.ctx, metrics.SplitstoreMiss.M(1))
 		}
@@ -317,7 +305,7 @@ func (s *SplitStore) GetSize(ctx context.Context, cid cid.Cid) (int, error) {
 	}
 }
 
-func (s *SplitStore) Put(ctx context.Context, blk blocks.Block) error {
+func (s *SplitStore) Put(blk blocks.Block) error {
 	if isIdentiyCid(blk.Cid()) {
 		return nil
 	}
@@ -325,7 +313,7 @@ func (s *SplitStore) Put(ctx context.Context, blk blocks.Block) error {
 	s.txnLk.RLock()
 	defer s.txnLk.RUnlock()
 
-	err := s.hot.Put(ctx, blk)
+	err := s.hot.Put(blk)
 	if err != nil {
 		return err
 	}
@@ -336,7 +324,7 @@ func (s *SplitStore) Put(ctx context.Context, blk blocks.Block) error {
 	return nil
 }
 
-func (s *SplitStore) PutMany(ctx context.Context, blks []blocks.Block) error {
+func (s *SplitStore) PutMany(blks []blocks.Block) error {
 	// filter identites
 	idcids := 0
 	for _, blk := range blks {
@@ -370,7 +358,7 @@ func (s *SplitStore) PutMany(ctx context.Context, blks []blocks.Block) error {
 	s.txnLk.RLock()
 	defer s.txnLk.RUnlock()
 
-	err := s.hot.PutMany(ctx, blks)
+	err := s.hot.PutMany(blks)
 	if err != nil {
 		return err
 	}
@@ -426,7 +414,7 @@ func (s *SplitStore) HashOnRead(enabled bool) {
 	s.cold.HashOnRead(enabled)
 }
 
-func (s *SplitStore) View(ctx context.Context, cid cid.Cid, cb func([]byte) error) error {
+func (s *SplitStore) View(cid cid.Cid, cb func([]byte) error) error {
 	if isIdentiyCid(cid) {
 		data, err := decodeIdentityCid(cid)
 		if err != nil {
@@ -447,14 +435,14 @@ func (s *SplitStore) View(ctx context.Context, cid cid.Cid, cb func([]byte) erro
 	s.protectView(cid)
 	defer s.viewDone()
 
-	err := s.hot.View(ctx, cid, cb)
+	err := s.hot.View(cid, cb)
 	switch err {
 	case bstore.ErrNotFound:
 		if s.isWarm() {
 			s.debug.LogReadMiss(cid)
 		}
 
-		err = s.cold.View(ctx, cid, cb)
+		err = s.cold.View(cid, cb)
 		if err == nil {
 			stats.Record(s.ctx, metrics.SplitstoreMiss.M(1))
 		}
@@ -472,33 +460,16 @@ func (s *SplitStore) isWarm() bool {
 }
 
 // State tracking
-func (s *SplitStore) Start(chain ChainAccessor, us stmgr.UpgradeSchedule) error {
+func (s *SplitStore) Start(chain ChainAccessor) error {
 	s.chain = chain
 	curTs := chain.GetHeaviestTipSet()
 
-	// precompute the upgrade boundaries
-	s.upgrades = make([]upgradeRange, 0, len(us))
-	for _, upgrade := range us {
-		boundary := upgrade.Height
-		for _, pre := range upgrade.PreMigrations {
-			preMigrationBoundary := upgrade.Height - pre.StartWithin
-			if preMigrationBoundary < boundary {
-				boundary = preMigrationBoundary
-			}
-		}
-
-		upgradeStart := boundary - upgradeBoundary
-		upgradeEnd := upgrade.Height + upgradeBoundary
-
-		s.upgrades = append(s.upgrades, upgradeRange{start: upgradeStart, end: upgradeEnd})
-	}
-
 	// should we warmup
 	warmup := false
 
 	// load base epoch from metadata ds
 	// if none, then use current epoch because it's a fresh start
-	bs, err := s.ds.Get(s.ctx, baseEpochKey)
+	bs, err := s.ds.Get(baseEpochKey)
 	switch err {
 	case nil:
 		s.baseEpoch = bytesToEpoch(bs)
@@ -519,7 +490,7 @@ func (s *SplitStore) Start(chain ChainAccessor, us stmgr.UpgradeSchedule) error
 	}
 
 	// load warmup epoch from metadata ds
-	bs, err = s.ds.Get(s.ctx, warmupEpochKey)
+	bs, err = s.ds.Get(warmupEpochKey)
 	switch err {
 	case nil:
 		s.warmupEpoch = bytesToEpoch(bs)
@@ -532,7 +503,7 @@ func (s *SplitStore) Start(chain ChainAccessor, us stmgr.UpgradeSchedule) error
 	}
 
 	// load markSetSize from metadata ds to provide a size hint for marksets
-	bs, err = s.ds.Get(s.ctx, markSetSizeKey)
+	bs, err = s.ds.Get(markSetSizeKey)
 	switch err {
 	case nil:
 		s.markSetSize = bytesToInt64(bs)
@@ -543,7 +514,7 @@ func (s *SplitStore) Start(chain ChainAccessor, us stmgr.UpgradeSchedule) error
 	}
 
 	// load compactionIndex from metadata ds to provide a hint as to when to perform moving gc
-	bs, err = s.ds.Get(s.ctx, compactionIndexKey)
+	bs, err = s.ds.Get(compactionIndexKey)
 	switch err {
 	case nil:
 		s.compactionIndex = bytesToInt64(bs)
@@ -605,5 +576,5 @@ func (s *SplitStore) checkClosing() error {
 
 func (s *SplitStore) setBaseEpoch(epoch abi.ChainEpoch) error {
 	s.baseEpoch = epoch
-	return s.ds.Put(s.ctx, baseEpochKey, epochToBytes(epoch))
+	return s.ds.Put(baseEpochKey, epochToBytes(epoch))
 }

blockstore/splitstore/splitstore_check.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"sync"
 	"sync/atomic"
 	"time"
 
@@ -68,10 +67,7 @@ func (s *SplitStore) doCheck(curTs *types.TipSet) error {
 	}
 	defer output.Close() //nolint:errcheck
 
-	var mx sync.Mutex
 	write := func(format string, args ...interface{}) {
-		mx.Lock()
-		defer mx.Unlock()
 		_, err := fmt.Fprintf(output, format+"\n", args...)
 		if err != nil {
 			log.Warnf("error writing check output: %s", err)
@@ -86,22 +82,14 @@ func (s *SplitStore) doCheck(curTs *types.TipSet) error {
 	write("compaction index: %d", s.compactionIndex)
 	write("--")
 
-	coldCnt := new(int64)
-	missingCnt := new(int64)
-
-	visitor, err := s.markSetEnv.Create("check", 0)
-	if err != nil {
-		return xerrors.Errorf("error creating visitor: %w", err)
-	}
-	defer visitor.Close() //nolint
-
-	err = s.walkChain(curTs, boundaryEpoch, boundaryEpoch, visitor,
+	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(s.ctx, c)
+			has, err := s.hot.Has(c)
 			if err != nil {
 				return xerrors.Errorf("error checking hotstore: %w", err)
 			}
@@ -110,16 +98,16 @@ func (s *SplitStore) doCheck(curTs *types.TipSet) error {
 				return nil
 			}
 
-			has, err = s.cold.Has(s.ctx, c)
+			has, err = s.cold.Has(c)
 			if err != nil {
 				return xerrors.Errorf("error checking coldstore: %w", err)
 			}
 
 			if has {
-				atomic.AddInt64(coldCnt, 1)
+				coldCnt++
 				write("cold object reference: %s", c)
 			} else {
-				atomic.AddInt64(missingCnt, 1)
+				missingCnt++
 				write("missing object reference: %s", c)
 				return errStopWalk
 			}
@@ -133,9 +121,9 @@ func (s *SplitStore) doCheck(curTs *types.TipSet) error {
 		return err
 	}
 
-	log.Infow("check done", "cold", *coldCnt, "missing", *missingCnt)
+	log.Infow("check done", "cold", coldCnt, "missing", missingCnt)
 	write("--")
-	write("cold: %d missing: %d", *coldCnt, *missingCnt)
+	write("cold: %d missing: %d", coldCnt, missingCnt)
 	write("DONE")
 
 	return nil

blockstore/splitstore/splitstore_compact.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"runtime"
 	"sort"
-	"sync"
 	"sync/atomic"
 	"time"
 
@@ -100,12 +99,6 @@ func (s *SplitStore) HeadChange(_, apply []*types.TipSet) error {
 		return nil
 	}
 
-	if s.isNearUpgrade(epoch) {
-		// we are near an upgrade epoch, suppress compaction
-		atomic.StoreInt32(&s.compacting, 0)
-		return nil
-	}
-
 	if epoch-s.baseEpoch > CompactionThreshold {
 		// it's time to compact -- prepare the transaction and go!
 		s.beginTxnProtect()
@@ -128,16 +121,6 @@ func (s *SplitStore) HeadChange(_, apply []*types.TipSet) error {
 	return nil
 }
 
-func (s *SplitStore) isNearUpgrade(epoch abi.ChainEpoch) bool {
-	for _, upgrade := range s.upgrades {
-		if epoch >= upgrade.start && epoch <= upgrade.end {
-			return true
-		}
-	}
-
-	return false
-}
-
 // transactionally protect incoming tipsets
 func (s *SplitStore) protectTipSets(apply []*types.TipSet) {
 	s.txnLk.RLock()
@@ -307,22 +290,23 @@ func (s *SplitStore) doTxnProtect(root cid.Cid, markSet MarkSet) error {
 
 	// Note: cold objects are deleted heaviest first, so the consituents of an object
 	// cannot be deleted before the object itself.
-	return s.walkObjectIncomplete(root, newTmpVisitor(),
+	return s.walkObjectIncomplete(root, cid.NewSet(),
 		func(c cid.Cid) error {
 			if isUnitaryObject(c) {
 				return errStopWalk
 			}
 
-			visit, err := markSet.Visit(c)
+			mark, err := markSet.Has(c)
 			if err != nil {
-				return xerrors.Errorf("error visiting object: %w", err)
+				return xerrors.Errorf("error checking markset: %w", err)
 			}
 
-			if !visit {
+			// it's marked, nothing to do
+			if mark {
 				return errStopWalk
 			}
 
-			return nil
+			return markSet.Mark(c)
 		},
 		func(c cid.Cid) error {
 			if s.txnMissing != nil {
@@ -426,23 +410,14 @@ func (s *SplitStore) doCompact(curTs *types.TipSet) error {
 	startMark := time.Now()
 
 	var count int64
-	err = s.walkChain(curTs, boundaryEpoch, inclMsgsEpoch, &noopVisitor{},
+	err = s.walkChain(curTs, boundaryEpoch, inclMsgsEpoch,
 		func(c cid.Cid) error {
 			if isUnitaryObject(c) {
 				return errStopWalk
 			}
 
-			visit, err := markSet.Visit(c)
-			if err != nil {
-				return xerrors.Errorf("error visiting object: %w", err)
-			}
-
-			if !visit {
-				return errStopWalk
-			}
-
 			count++
-			return nil
+			return markSet.Mark(c)
 		})
 
 	if err != nil {
@@ -578,13 +553,13 @@ func (s *SplitStore) doCompact(curTs *types.TipSet) error {
 		return xerrors.Errorf("error saving base epoch: %w", err)
 	}
 
-	err = s.ds.Put(s.ctx, markSetSizeKey, int64ToBytes(s.markSetSize))
+	err = s.ds.Put(markSetSizeKey, int64ToBytes(s.markSetSize))
 	if err != nil {
 		return xerrors.Errorf("error saving mark set size: %w", err)
 	}
 
 	s.compactionIndex++
-	err = s.ds.Put(s.ctx, compactionIndexKey, int64ToBytes(s.compactionIndex))
+	err = s.ds.Put(compactionIndexKey, int64ToBytes(s.compactionIndex))
 	if err != nil {
 		return xerrors.Errorf("error saving compaction index: %w", err)
 	}
@@ -604,7 +579,11 @@ func (s *SplitStore) beginTxnProtect() {
 }
 
 func (s *SplitStore) beginTxnMarking(markSet MarkSet) {
-	log.Info("beginning transactional marking")
+	markSet.SetConcurrent()
+
+	s.txnLk.Lock()
+	s.txnProtect = markSet
+	s.txnLk.Unlock()
 }
 
 func (s *SplitStore) endTxnProtect() {
@@ -615,40 +594,40 @@ func (s *SplitStore) endTxnProtect() {
 		return
 	}
 
+	// release markset memory
+	if s.txnProtect != nil {
+		_ = s.txnProtect.Close()
+	}
+
 	s.txnActive = false
+	s.txnProtect = nil
 	s.txnRefs = nil
 	s.txnMissing = nil
 }
 
 func (s *SplitStore) walkChain(ts *types.TipSet, inclState, inclMsgs abi.ChainEpoch,
-	visitor ObjectVisitor, f func(cid.Cid) error) error {
-	var walked ObjectVisitor
-	var mx sync.Mutex
-	// we copy the tipset first into a new slice, which allows us to reuse it in every epoch.
-	toWalk := make([]cid.Cid, len(ts.Cids()))
-	copy(toWalk, ts.Cids())
-	walkCnt := new(int64)
-	scanCnt := new(int64)
+	f func(cid.Cid) error) error {
+	visited := cid.NewSet()
+	walked := cid.NewSet()
+	toWalk := ts.Cids()
+	walkCnt := 0
+	scanCnt := 0
 
 	stopWalk := func(_ cid.Cid) error { return errStopWalk }
 
 	walkBlock := func(c cid.Cid) error {
-		visit, err := walked.Visit(c)
-		if err != nil {
-			return err
-		}
-		if !visit {
+		if !visited.Visit(c) {
 			return nil
 		}
 
-		atomic.AddInt64(walkCnt, 1)
+		walkCnt++
 
 		if err := f(c); err != nil {
 			return err
 		}
 
 		var hdr types.BlockHeader
-		err = s.view(c, func(data []byte) error {
+		err := s.view(c, func(data []byte) error {
 			return hdr.UnmarshalCBOR(bytes.NewBuffer(data))
 		})
 
@@ -661,19 +640,19 @@ func (s *SplitStore) walkChain(ts *types.TipSet, inclState, inclMsgs abi.ChainEp
 			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, visitor, f, stopWalk); err != nil {
+				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, visitor, f, stopWalk); err != nil {
+				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 {
-				if err := s.walkObject(hdr.Messages, visitor, f); err != nil {
+				if err := s.walkObject(hdr.Messages, walked, f); err != nil {
 					return xerrors.Errorf("error walking messages (cid: %s): %w", hdr.Messages, err)
 				}
 
-				if err := s.walkObject(hdr.ParentMessageReceipts, visitor, f); err != nil {
+				if err := s.walkObject(hdr.ParentMessageReceipts, walked, f); err != nil {
 					return xerrors.Errorf("error walking message receipts (cid: %s): %w", hdr.ParentMessageReceipts, err)
 				}
 			}
@@ -681,16 +660,14 @@ func (s *SplitStore) walkChain(ts *types.TipSet, inclState, inclMsgs abi.ChainEp
 
 		// 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, visitor, f); err != nil {
+			if err := s.walkObject(hdr.ParentStateRoot, walked, f); err != nil {
 				return xerrors.Errorf("error walking state root (cid: %s): %w", hdr.ParentStateRoot, err)
 			}
-			atomic.AddInt64(scanCnt, 1)
+			scanCnt++
 		}
 
 		if hdr.Height > 0 {
-			mx.Lock()
 			toWalk = append(toWalk, hdr.Parents...)
-			mx.Unlock()
 		}
 
 		return nil
@@ -702,54 +679,22 @@ func (s *SplitStore) walkChain(ts *types.TipSet, inclState, inclMsgs abi.ChainEp
 			return err
 		}
 
-		workers := len(toWalk)
-		if workers > runtime.NumCPU()/2 {
-			workers = runtime.NumCPU() / 2
-		}
-		if workers < 2 {
-			workers = 2
-		}
-
-		// the walk is BFS, so we can reset the walked set in every iteration and avoid building up
-		// a set that contains all blocks (1M epochs -> 5M blocks -> 200MB worth of memory and growing
-		// over time)
-		walked = newConcurrentVisitor()
-		workch := make(chan cid.Cid, len(toWalk))
-		for _, c := range toWalk {
-			workch <- c
-		}
-		close(workch)
-		toWalk = toWalk[:0]
-
-		g := new(errgroup.Group)
-		for i := 0; i < workers; i++ {
-			g.Go(func() error {
-				for c := range workch {
-					if err := walkBlock(c); err != nil {
-						return xerrors.Errorf("error walking block (cid: %s): %w", c, err)
-					}
-				}
-				return nil
-			})
-		}
-
-		if err := g.Wait(); err != nil {
-			return err
+		walking := toWalk
+		toWalk = nil
+		for _, c := range walking {
+			if err := walkBlock(c); err != nil {
+				return xerrors.Errorf("error walking block (cid: %s): %w", c, err)
+			}
 		}
 	}
 
-	log.Infow("chain walk done", "walked", *walkCnt, "scanned", *scanCnt)
+	log.Infow("chain walk done", "walked", walkCnt, "scanned", scanCnt)
 
 	return nil
 }
 
-func (s *SplitStore) walkObject(c cid.Cid, visitor ObjectVisitor, f func(cid.Cid) error) error {
-	visit, err := visitor.Visit(c)
-	if err != nil {
-		return xerrors.Errorf("error visiting object: %w", err)
-	}
-
-	if !visit {
+func (s *SplitStore) walkObject(c cid.Cid, walked *cid.Set, f func(cid.Cid) error) error {
+	if !walked.Visit(c) {
 		return nil
 	}
 
@@ -771,7 +716,7 @@ func (s *SplitStore) walkObject(c cid.Cid, visitor ObjectVisitor, f func(cid.Cid
 	}
 
 	var links []cid.Cid
-	err = s.view(c, func(data []byte) error {
+	err := s.view(c, func(data []byte) error {
 		return cbg.ScanForLinks(bytes.NewReader(data), func(c cid.Cid) {
 			links = append(links, c)
 		})
@@ -782,7 +727,7 @@ func (s *SplitStore) walkObject(c cid.Cid, visitor ObjectVisitor, f func(cid.Cid
 	}
 
 	for _, c := range links {
-		err := s.walkObject(c, visitor, f)
+		err := s.walkObject(c, walked, f)
 		if err != nil {
 			return xerrors.Errorf("error walking link (cid: %s): %w", c, err)
 		}
@@ -792,13 +737,8 @@ func (s *SplitStore) walkObject(c cid.Cid, visitor ObjectVisitor, f func(cid.Cid
 }
 
 // like walkObject, but the object may be potentially incomplete (references missing)
-func (s *SplitStore) walkObjectIncomplete(c cid.Cid, visitor ObjectVisitor, f, missing func(cid.Cid) error) error {
-	visit, err := visitor.Visit(c)
-	if err != nil {
-		return xerrors.Errorf("error visiting object: %w", err)
-	}
-
-	if !visit {
+func (s *SplitStore) walkObjectIncomplete(c cid.Cid, walked *cid.Set, f, missing func(cid.Cid) error) error {
+	if !walked.Visit(c) {
 		return nil
 	}
 
@@ -837,7 +777,7 @@ func (s *SplitStore) walkObjectIncomplete(c cid.Cid, visitor ObjectVisitor, f, m
 	}
 
 	var links []cid.Cid
-	err = s.view(c, func(data []byte) error {
+	err := s.view(c, func(data []byte) error {
 		return cbg.ScanForLinks(bytes.NewReader(data), func(c cid.Cid) {
 			links = append(links, c)
 		})
@@ -848,7 +788,7 @@ func (s *SplitStore) walkObjectIncomplete(c cid.Cid, visitor ObjectVisitor, f, m
 	}
 
 	for _, c := range links {
-		err := s.walkObjectIncomplete(c, visitor, f, missing)
+		err := s.walkObjectIncomplete(c, walked, f, missing)
 		if err != nil {
 			return xerrors.Errorf("error walking link (cid: %s): %w", c, err)
 		}
@@ -868,10 +808,10 @@ func (s *SplitStore) view(c cid.Cid, cb func([]byte) error) error {
 		return cb(data)
 	}
 
-	err := s.hot.View(s.ctx, c, cb)
+	err := s.hot.View(c, cb)
 	switch err {
 	case bstore.ErrNotFound:
-		return s.cold.View(s.ctx, c, cb)
+		return s.cold.View(c, cb)
 
 	default:
 		return err
@@ -883,13 +823,13 @@ func (s *SplitStore) has(c cid.Cid) (bool, error) {
 		return true, nil
 	}
 
-	has, err := s.hot.Has(s.ctx, c)
+	has, err := s.hot.Has(c)
 
 	if has || err != nil {
 		return has, err
 	}
 
-	return s.cold.Has(s.ctx, c)
+	return s.cold.Has(c)
 }
 
 func (s *SplitStore) moveColdBlocks(cold []cid.Cid) error {
@@ -900,7 +840,7 @@ func (s *SplitStore) moveColdBlocks(cold []cid.Cid) error {
 			return err
 		}
 
-		blk, err := s.hot.Get(s.ctx, c)
+		blk, err := s.hot.Get(c)
 		if err != nil {
 			if err == bstore.ErrNotFound {
 				log.Warnf("hotstore missing block %s", c)
@@ -912,7 +852,7 @@ func (s *SplitStore) moveColdBlocks(cold []cid.Cid) error {
 
 		batch = append(batch, blk)
 		if len(batch) == batchSize {
-			err = s.cold.PutMany(s.ctx, batch)
+			err = s.cold.PutMany(batch)
 			if err != nil {
 				return xerrors.Errorf("error putting batch to coldstore: %w", err)
 			}
@@ -921,7 +861,7 @@ func (s *SplitStore) moveColdBlocks(cold []cid.Cid) error {
 	}
 
 	if len(batch) > 0 {
-		err := s.cold.PutMany(s.ctx, batch)
+		err := s.cold.PutMany(batch)
 		if err != nil {
 			return xerrors.Errorf("error putting batch to coldstore: %w", err)
 		}
@@ -1091,7 +1031,7 @@ func (s *SplitStore) purge(cids []cid.Cid, markSet MarkSet) error {
 				deadCids = append(deadCids, c)
 			}
 
-			err := s.hot.DeleteMany(s.ctx, deadCids)
+			err := s.hot.DeleteMany(deadCids)
 			if err != nil {
 				return xerrors.Errorf("error purging cold objects: %w", err)
 			}
@@ -1139,27 +1079,27 @@ func (s *SplitStore) waitForMissingRefs(markSet MarkSet) {
 		}
 
 		towalk := missing
-		visitor := newTmpVisitor()
+		walked := cid.NewSet()
 		missing = make(map[cid.Cid]struct{})
 
 		for c := range towalk {
-			err := s.walkObjectIncomplete(c, visitor,
+			err := s.walkObjectIncomplete(c, walked,
 				func(c cid.Cid) error {
 					if isUnitaryObject(c) {
 						return errStopWalk
 					}
 
-					visit, err := markSet.Visit(c)
+					mark, err := markSet.Has(c)
 					if err != nil {
-						return xerrors.Errorf("error visiting object: %w", err)
+						return xerrors.Errorf("error checking markset for %s: %w", c, err)
 					}
 
-					if !visit {
+					if mark {
 						return errStopWalk
 					}
 
 					count++
-					return nil
+					return markSet.Mark(c)
 				},
 				func(c cid.Cid) error {
 					missing[c] = struct{}{}

blockstore/splitstore/splitstore_expose.go

@@ -20,28 +20,28 @@ func (s *SplitStore) Expose() bstore.Blockstore {
 	return &exposedSplitStore{s: s}
 }
 
-func (es *exposedSplitStore) DeleteBlock(_ context.Context, _ cid.Cid) error {
+func (es *exposedSplitStore) DeleteBlock(_ cid.Cid) error {
 	return errors.New("DeleteBlock: operation not supported")
 }
 
-func (es *exposedSplitStore) DeleteMany(_ context.Context, _ []cid.Cid) error {
+func (es *exposedSplitStore) DeleteMany(_ []cid.Cid) error {
 	return errors.New("DeleteMany: operation not supported")
 }
 
-func (es *exposedSplitStore) Has(ctx context.Context, c cid.Cid) (bool, error) {
+func (es *exposedSplitStore) Has(c cid.Cid) (bool, error) {
 	if isIdentiyCid(c) {
 		return true, nil
 	}
 
-	has, err := es.s.hot.Has(ctx, c)
+	has, err := es.s.hot.Has(c)
 	if has || err != nil {
 		return has, err
 	}
 
-	return es.s.cold.Has(ctx, c)
+	return es.s.cold.Has(c)
 }
 
-func (es *exposedSplitStore) Get(ctx context.Context, c cid.Cid) (blocks.Block, error) {
+func (es *exposedSplitStore) Get(c cid.Cid) (blocks.Block, error) {
 	if isIdentiyCid(c) {
 		data, err := decodeIdentityCid(c)
 		if err != nil {
@@ -51,16 +51,16 @@ func (es *exposedSplitStore) Get(ctx context.Context, c cid.Cid) (blocks.Block,
 		return blocks.NewBlockWithCid(data, c)
 	}
 
-	blk, err := es.s.hot.Get(ctx, c)
+	blk, err := es.s.hot.Get(c)
 	switch err {
 	case bstore.ErrNotFound:
-		return es.s.cold.Get(ctx, c)
+		return es.s.cold.Get(c)
 	default:
 		return blk, err
 	}
 }
 
-func (es *exposedSplitStore) GetSize(ctx context.Context, c cid.Cid) (int, error) {
+func (es *exposedSplitStore) GetSize(c cid.Cid) (int, error) {
 	if isIdentiyCid(c) {
 		data, err := decodeIdentityCid(c)
 		if err != nil {
@@ -70,21 +70,21 @@ func (es *exposedSplitStore) GetSize(ctx context.Context, c cid.Cid) (int, error
 		return len(data), nil
 	}
 
-	size, err := es.s.hot.GetSize(ctx, c)
+	size, err := es.s.hot.GetSize(c)
 	switch err {
 	case bstore.ErrNotFound:
-		return es.s.cold.GetSize(ctx, c)
+		return es.s.cold.GetSize(c)
 	default:
 		return size, err
 	}
 }
 
-func (es *exposedSplitStore) Put(ctx context.Context, blk blocks.Block) error {
-	return es.s.Put(ctx, blk)
+func (es *exposedSplitStore) Put(blk blocks.Block) error {
+	return es.s.Put(blk)
 }
 
-func (es *exposedSplitStore) PutMany(ctx context.Context, blks []blocks.Block) error {
-	return es.s.PutMany(ctx, blks)
+func (es *exposedSplitStore) PutMany(blks []blocks.Block) error {
+	return es.s.PutMany(blks)
 }
 
 func (es *exposedSplitStore) AllKeysChan(ctx context.Context) (<-chan cid.Cid, error) {
@@ -93,7 +93,7 @@ func (es *exposedSplitStore) AllKeysChan(ctx context.Context) (<-chan cid.Cid, e
 
 func (es *exposedSplitStore) HashOnRead(enabled bool) {}
 
-func (es *exposedSplitStore) View(ctx context.Context, c cid.Cid, f func([]byte) error) error {
+func (es *exposedSplitStore) View(c cid.Cid, f func([]byte) error) error {
 	if isIdentiyCid(c) {
 		data, err := decodeIdentityCid(c)
 		if err != nil {
@@ -103,10 +103,10 @@ func (es *exposedSplitStore) View(ctx context.Context, c cid.Cid, f func([]byte)
 		return f(data)
 	}
 
-	err := es.s.hot.View(ctx, c, f)
+	err := es.s.hot.View(c, f)
 	switch err {
 	case bstore.ErrNotFound:
-		return es.s.cold.View(ctx, c, f)
+		return es.s.cold.View(c, f)
 
 	default:
 		return err

blockstore/splitstore/splitstore_test.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/lotus/blockstore"
-	"github.com/filecoin-project/lotus/chain/stmgr"
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/lotus/chain/types/mock"
 
@@ -30,7 +29,6 @@ func init() {
 }
 
 func testSplitStore(t *testing.T, cfg *Config) {
-	ctx := context.Background()
 	chain := &mockChain{t: t}
 
 	// the myriads of stores
@@ -40,7 +38,7 @@ func testSplitStore(t *testing.T, cfg *Config) {
 
 	// this is necessary to avoid the garbage mock puts in the blocks
 	garbage := blocks.NewBlock([]byte{1, 2, 3})
-	err := cold.Put(ctx, garbage)
+	err := cold.Put(garbage)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -61,21 +59,21 @@ func testSplitStore(t *testing.T, cfg *Config) {
 		t.Fatal(err)
 	}
 
-	err = cold.Put(ctx, blk)
+	err = cold.Put(blk)
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	// create a garbage block that is protected with a rgistered protector
 	protected := blocks.NewBlock([]byte("protected!"))
-	err = hot.Put(ctx, 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(ctx, unprotected)
+	err = hot.Put(unprotected)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -92,7 +90,7 @@ func testSplitStore(t *testing.T, cfg *Config) {
 		return protect(protected.Cid())
 	})
 
-	err = ss.Start(chain, nil)
+	err = ss.Start(chain)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -110,11 +108,11 @@ func testSplitStore(t *testing.T, cfg *Config) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		err = ss.Put(ctx, stateRoot)
+		err = ss.Put(stateRoot)
 		if err != nil {
 			t.Fatal(err)
 		}
-		err = ss.Put(ctx, sblk)
+		err = ss.Put(sblk)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -177,7 +175,7 @@ func testSplitStore(t *testing.T, cfg *Config) {
 	}
 
 	// ensure our protected block is still there
-	has, err := hot.Has(ctx, protected.Cid())
+	has, err := hot.Has(protected.Cid())
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -187,7 +185,7 @@ func testSplitStore(t *testing.T, cfg *Config) {
 	}
 
 	// ensure our unprotected block is in the coldstore now
-	has, err = hot.Has(ctx, unprotected.Cid())
+	has, err = hot.Has(unprotected.Cid())
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -196,7 +194,7 @@ func testSplitStore(t *testing.T, cfg *Config) {
 		t.Fatal("unprotected block is still in hotstore")
 	}
 
-	has, err = cold.Has(ctx, unprotected.Cid())
+	has, err = cold.Has(unprotected.Cid())
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -222,141 +220,6 @@ func TestSplitStoreCompactionWithBadger(t *testing.T) {
 	testSplitStore(t, &Config{MarkSetType: "badger"})
 }
 
-func TestSplitStoreSuppressCompactionNearUpgrade(t *testing.T) {
-	ctx := context.Background()
-	chain := &mockChain{t: t}
-
-	// the myriads of stores
-	ds := dssync.MutexWrap(datastore.NewMapDatastore())
-	hot := newMockStore()
-	cold := newMockStore()
-
-	// this is necessary to avoid the garbage mock puts in the blocks
-	garbage := blocks.NewBlock([]byte{1, 2, 3})
-	err := cold.Put(ctx, garbage)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// genesis
-	genBlock := mock.MkBlock(nil, 0, 0)
-	genBlock.Messages = garbage.Cid()
-	genBlock.ParentMessageReceipts = garbage.Cid()
-	genBlock.ParentStateRoot = garbage.Cid()
-	genBlock.Timestamp = uint64(time.Now().Unix())
-
-	genTs := mock.TipSet(genBlock)
-	chain.push(genTs)
-
-	// put the genesis block to cold store
-	blk, err := genBlock.ToStorageBlock()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = cold.Put(ctx, blk)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// open the splitstore
-	ss, err := Open("", ds, hot, cold, &Config{MarkSetType: "map"})
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ss.Close() //nolint
-
-	// create an upgrade schedule that will suppress compaction during the test
-	upgradeBoundary = 0
-	upgrade := stmgr.Upgrade{
-		Height:        10,
-		PreMigrations: []stmgr.PreMigration{{StartWithin: 10}},
-	}
-
-	err = ss.Start(chain, []stmgr.Upgrade{upgrade})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	mkBlock := func(curTs *types.TipSet, i int, stateRoot blocks.Block) *types.TipSet {
-		blk := mock.MkBlock(curTs, uint64(i), uint64(i))
-
-		blk.Messages = garbage.Cid()
-		blk.ParentMessageReceipts = garbage.Cid()
-		blk.ParentStateRoot = stateRoot.Cid()
-		blk.Timestamp = uint64(time.Now().Unix())
-
-		sblk, err := blk.ToStorageBlock()
-		if err != nil {
-			t.Fatal(err)
-		}
-		err = ss.Put(ctx, stateRoot)
-		if err != nil {
-			t.Fatal(err)
-		}
-		err = ss.Put(ctx, sblk)
-		if err != nil {
-			t.Fatal(err)
-		}
-		ts := mock.TipSet(blk)
-		chain.push(ts)
-
-		return ts
-	}
-
-	waitForCompaction := func() {
-		for atomic.LoadInt32(&ss.compacting) == 1 {
-			time.Sleep(100 * time.Millisecond)
-		}
-	}
-
-	curTs := genTs
-	for i := 1; i < 10; i++ {
-		stateRoot := blocks.NewBlock([]byte{byte(i), 3, 3, 7})
-		curTs = mkBlock(curTs, i, stateRoot)
-		waitForCompaction()
-	}
-
-	countBlocks := func(bs blockstore.Blockstore) int {
-		count := 0
-		_ = bs.(blockstore.BlockstoreIterator).ForEachKey(func(_ cid.Cid) error {
-			count++
-			return nil
-		})
-		return count
-	}
-
-	// we should not have compacted due to suppression and everything should still be hot
-	hotCnt := countBlocks(hot)
-	coldCnt := countBlocks(cold)
-
-	if hotCnt != 20 {
-		t.Errorf("expected %d blocks, but got %d", 20, hotCnt)
-	}
-
-	if coldCnt != 2 {
-		t.Errorf("expected %d blocks, but got %d", 2, coldCnt)
-	}
-
-	// put some more blocks, now we should compact
-	for i := 10; i < 20; i++ {
-		stateRoot := blocks.NewBlock([]byte{byte(i), 3, 3, 7})
-		curTs = mkBlock(curTs, i, stateRoot)
-		waitForCompaction()
-	}
-
-	hotCnt = countBlocks(hot)
-	coldCnt = countBlocks(cold)
-
-	if hotCnt != 24 {
-		t.Errorf("expected %d blocks, but got %d", 24, hotCnt)
-	}
-
-	if coldCnt != 18 {
-		t.Errorf("expected %d blocks, but got %d", 18, coldCnt)
-	}
-}
-
 type mockChain struct {
 	t testing.TB
 
@@ -433,7 +296,7 @@ func newMockStore() *mockStore {
 	return &mockStore{set: make(map[cid.Cid]blocks.Block)}
 }
 
-func (b *mockStore) Has(_ context.Context, cid cid.Cid) (bool, error) {
+func (b *mockStore) Has(cid cid.Cid) (bool, error) {
 	b.mx.Lock()
 	defer b.mx.Unlock()
 	_, ok := b.set[cid]
@@ -442,7 +305,7 @@ func (b *mockStore) Has(_ context.Context, cid cid.Cid) (bool, error) {
 
 func (b *mockStore) HashOnRead(hor bool) {}
 
-func (b *mockStore) Get(_ context.Context, cid cid.Cid) (blocks.Block, error) {
+func (b *mockStore) Get(cid cid.Cid) (blocks.Block, error) {
 	b.mx.Lock()
 	defer b.mx.Unlock()
 
@@ -453,8 +316,8 @@ func (b *mockStore) Get(_ context.Context, cid cid.Cid) (blocks.Block, error) {
 	return blk, nil
 }
 
-func (b *mockStore) GetSize(ctx context.Context, cid cid.Cid) (int, error) {
-	blk, err := b.Get(ctx, cid)
+func (b *mockStore) GetSize(cid cid.Cid) (int, error) {
+	blk, err := b.Get(cid)
 	if err != nil {
 		return 0, err
 	}
@@ -462,15 +325,15 @@ func (b *mockStore) GetSize(ctx context.Context, cid cid.Cid) (int, error) {
 	return len(blk.RawData()), nil
 }
 
-func (b *mockStore) View(ctx context.Context, cid cid.Cid, f func([]byte) error) error {
-	blk, err := b.Get(ctx, cid)
+func (b *mockStore) View(cid cid.Cid, f func([]byte) error) error {
+	blk, err := b.Get(cid)
 	if err != nil {
 		return err
 	}
 	return f(blk.RawData())
 }
 
-func (b *mockStore) Put(_ context.Context, blk blocks.Block) error {
+func (b *mockStore) Put(blk blocks.Block) error {
 	b.mx.Lock()
 	defer b.mx.Unlock()
 
@@ -478,7 +341,7 @@ func (b *mockStore) Put(_ context.Context, blk blocks.Block) error {
 	return nil
 }
 
-func (b *mockStore) PutMany(_ context.Context, blks []blocks.Block) error {
+func (b *mockStore) PutMany(blks []blocks.Block) error {
 	b.mx.Lock()
 	defer b.mx.Unlock()
 
@@ -488,7 +351,7 @@ func (b *mockStore) PutMany(_ context.Context, blks []blocks.Block) error {
 	return nil
 }
 
-func (b *mockStore) DeleteBlock(_ context.Context, cid cid.Cid) error {
+func (b *mockStore) DeleteBlock(cid cid.Cid) error {
 	b.mx.Lock()
 	defer b.mx.Unlock()
 
@@ -496,7 +359,7 @@ func (b *mockStore) DeleteBlock(_ context.Context, cid cid.Cid) error {
 	return nil
 }
 
-func (b *mockStore) DeleteMany(_ context.Context, cids []cid.Cid) error {
+func (b *mockStore) DeleteMany(cids []cid.Cid) error {
 	b.mx.Lock()
 	defer b.mx.Unlock()
 

blockstore/splitstore/splitstore_warmup.go

@@ -1,7 +1,6 @@
 package splitstore
 
 import (
-	"sync"
 	"sync/atomic"
 	"time"
 
@@ -56,28 +55,19 @@ func (s *SplitStore) doWarmup(curTs *types.TipSet) error {
 	if WarmupBoundary < epoch {
 		boundaryEpoch = epoch - WarmupBoundary
 	}
-	var mx sync.Mutex
 	batchHot := make([]blocks.Block, 0, batchSize)
-	count := new(int64)
-	xcount := new(int64)
-	missing := new(int64)
-
-	visitor, err := s.markSetEnv.Create("warmup", 0)
-	if err != nil {
-		return xerrors.Errorf("error creating visitor: %w", err)
-	}
-	defer visitor.Close() //nolint
-
-	err = s.walkChain(curTs, boundaryEpoch, epoch+1, // we don't load messages/receipts in warmup
-		visitor,
+	count := int64(0)
+	xcount := int64(0)
+	missing := int64(0)
+	err := s.walkChain(curTs, boundaryEpoch, epoch+1, // we don't load messages/receipts in warmup
 		func(c cid.Cid) error {
 			if isUnitaryObject(c) {
 				return errStopWalk
 			}
 
-			atomic.AddInt64(count, 1)
+			count++
 
-			has, err := s.hot.Has(s.ctx, c)
+			has, err := s.hot.Has(c)
 			if err != nil {
 				return err
 			}
@@ -86,28 +76,25 @@ func (s *SplitStore) doWarmup(curTs *types.TipSet) error {
 				return nil
 			}
 
-			blk, err := s.cold.Get(s.ctx, c)
+			blk, err := s.cold.Get(c)
 			if err != nil {
 				if err == bstore.ErrNotFound {
-					atomic.AddInt64(missing, 1)
+					missing++
 					return errStopWalk
 				}
 				return err
 			}
 
-			atomic.AddInt64(xcount, 1)
+			xcount++
 
-			mx.Lock()
 			batchHot = append(batchHot, blk)
 			if len(batchHot) == batchSize {
-				err = s.hot.PutMany(s.ctx, batchHot)
+				err = s.hot.PutMany(batchHot)
 				if err != nil {
-					mx.Unlock()
 					return err
 				}
 				batchHot = batchHot[:0]
 			}
-			mx.Unlock()
 
 			return nil
 		})
@@ -117,22 +104,22 @@ func (s *SplitStore) doWarmup(curTs *types.TipSet) error {
 	}
 
 	if len(batchHot) > 0 {
-		err = s.hot.PutMany(s.ctx, batchHot)
+		err = s.hot.PutMany(batchHot)
 		if err != nil {
 			return err
 		}
 	}
 
-	log.Infow("warmup stats", "visited", *count, "warm", *xcount, "missing", *missing)
+	log.Infow("warmup stats", "visited", count, "warm", xcount, "missing", missing)
 
-	s.markSetSize = *count + *count>>2 // overestimate a bit
-	err = s.ds.Put(s.ctx, markSetSizeKey, int64ToBytes(s.markSetSize))
+	s.markSetSize = count + count>>2 // overestimate a bit
+	err = s.ds.Put(markSetSizeKey, int64ToBytes(s.markSetSize))
 	if err != nil {
 		log.Warnf("error saving mark set size: %s", err)
 	}
 
 	// save the warmup epoch
-	err = s.ds.Put(s.ctx, warmupEpochKey, epochToBytes(epoch))
+	err = s.ds.Put(warmupEpochKey, epochToBytes(epoch))
 	if err != nil {
 		return xerrors.Errorf("error saving warm up epoch: %w", err)
 	}
@@ -141,7 +128,7 @@ func (s *SplitStore) doWarmup(curTs *types.TipSet) error {
 	s.mx.Unlock()
 
 	// also save the compactionIndex, as this is used as an indicator of warmup for upgraded nodes
-	err = s.ds.Put(s.ctx, compactionIndexKey, int64ToBytes(s.compactionIndex))
+	err = s.ds.Put(compactionIndexKey, int64ToBytes(s.compactionIndex))
 	if err != nil {
 		return xerrors.Errorf("error saving compaction index: %w", err)
 	}

blockstore/splitstore/visitor.go

@@ -1,52 +0,0 @@
-package splitstore
-
-import (
-	"sync"
-
-	cid "github.com/ipfs/go-cid"
-)
-
-// ObjectVisitor is an interface for deduplicating objects during walks
-type ObjectVisitor interface {
-	Visit(cid.Cid) (bool, error)
-}
-
-type noopVisitor struct{}
-
-var _ ObjectVisitor = (*noopVisitor)(nil)
-
-func (v *noopVisitor) Visit(_ cid.Cid) (bool, error) {
-	return true, nil
-}
-
-type tmpVisitor struct {
-	set *cid.Set
-}
-
-var _ ObjectVisitor = (*tmpVisitor)(nil)
-
-func (v *tmpVisitor) Visit(c cid.Cid) (bool, error) {
-	return v.set.Visit(c), nil
-}
-
-func newTmpVisitor() ObjectVisitor {
-	return &tmpVisitor{set: cid.NewSet()}
-}
-
-type concurrentVisitor struct {
-	mx  sync.Mutex
-	set *cid.Set
-}
-
-var _ ObjectVisitor = (*concurrentVisitor)(nil)
-
-func newConcurrentVisitor() *concurrentVisitor {
-	return &concurrentVisitor{set: cid.NewSet()}
-}
-
-func (v *concurrentVisitor) Visit(c cid.Cid) (bool, error) {
-	v.mx.Lock()
-	defer v.mx.Unlock()
-
-	return v.set.Visit(c), nil
-}

blockstore/sync.go

@@ -20,53 +20,53 @@ type SyncBlockstore struct {
 	bs MemBlockstore // specifically use a memStore to save indirection overhead.
 }
 
-func (m *SyncBlockstore) DeleteBlock(ctx context.Context, k cid.Cid) error {
+func (m *SyncBlockstore) DeleteBlock(k cid.Cid) error {
 	m.mu.Lock()
 	defer m.mu.Unlock()
-	return m.bs.DeleteBlock(ctx, k)
+	return m.bs.DeleteBlock(k)
 }
 
-func (m *SyncBlockstore) DeleteMany(ctx context.Context, ks []cid.Cid) error {
+func (m *SyncBlockstore) DeleteMany(ks []cid.Cid) error {
 	m.mu.Lock()
 	defer m.mu.Unlock()
-	return m.bs.DeleteMany(ctx, ks)
+	return m.bs.DeleteMany(ks)
 }
 
-func (m *SyncBlockstore) Has(ctx context.Context, k cid.Cid) (bool, error) {
+func (m *SyncBlockstore) Has(k cid.Cid) (bool, error) {
 	m.mu.RLock()
 	defer m.mu.RUnlock()
-	return m.bs.Has(ctx, k)
+	return m.bs.Has(k)
 }
 
-func (m *SyncBlockstore) View(ctx context.Context, k cid.Cid, callback func([]byte) error) error {
+func (m *SyncBlockstore) View(k cid.Cid, callback func([]byte) error) error {
 	m.mu.RLock()
 	defer m.mu.RUnlock()
 
-	return m.bs.View(ctx, k, callback)
+	return m.bs.View(k, callback)
 }
 
-func (m *SyncBlockstore) Get(ctx context.Context, k cid.Cid) (blocks.Block, error) {
+func (m *SyncBlockstore) Get(k cid.Cid) (blocks.Block, error) {
 	m.mu.RLock()
 	defer m.mu.RUnlock()
-	return m.bs.Get(ctx, k)
+	return m.bs.Get(k)
 }
 
-func (m *SyncBlockstore) GetSize(ctx context.Context, k cid.Cid) (int, error) {
+func (m *SyncBlockstore) GetSize(k cid.Cid) (int, error) {
 	m.mu.RLock()
 	defer m.mu.RUnlock()
-	return m.bs.GetSize(ctx, k)
+	return m.bs.GetSize(k)
 }
 
-func (m *SyncBlockstore) Put(ctx context.Context, b blocks.Block) error {
+func (m *SyncBlockstore) Put(b blocks.Block) error {
 	m.mu.Lock()
 	defer m.mu.Unlock()
-	return m.bs.Put(ctx, b)
+	return m.bs.Put(b)
 }
 
-func (m *SyncBlockstore) PutMany(ctx context.Context, bs []blocks.Block) error {
+func (m *SyncBlockstore) PutMany(bs []blocks.Block) error {
 	m.mu.Lock()
 	defer m.mu.Unlock()
-	return m.bs.PutMany(ctx, bs)
+	return m.bs.PutMany(bs)
 }
 
 func (m *SyncBlockstore) AllKeysChan(ctx context.Context) (<-chan cid.Cid, error) {

blockstore/timed.go

@@ -47,12 +47,8 @@ func (t *TimedCacheBlockstore) Start(_ context.Context) error {
 		return fmt.Errorf("already started")
 	}
 	t.closeCh = make(chan struct{})
-
-	// Create this timer before starting the goroutine. Otherwise, creating the timer will race
-	// with adding time to the mock clock, and we could add time _first_, then stall waiting for
-	// a timer that'll never fire.
-	ticker := t.clock.Ticker(t.interval)
 	go func() {
+		ticker := t.clock.Ticker(t.interval)
 		defer ticker.Stop()
 		for {
 			select {
@@ -92,28 +88,28 @@ func (t *TimedCacheBlockstore) rotate() {
 	t.mu.Unlock()
 }
 
-func (t *TimedCacheBlockstore) Put(ctx context.Context, b blocks.Block) error {
+func (t *TimedCacheBlockstore) Put(b blocks.Block) error {
 	// Don't check the inactive set here. We want to keep this block for at
 	// least one interval.
 	t.mu.Lock()
 	defer t.mu.Unlock()
-	return t.active.Put(ctx, b)
+	return t.active.Put(b)
 }
 
-func (t *TimedCacheBlockstore) PutMany(ctx context.Context, bs []blocks.Block) error {
+func (t *TimedCacheBlockstore) PutMany(bs []blocks.Block) error {
 	t.mu.Lock()
 	defer t.mu.Unlock()
-	return t.active.PutMany(ctx, bs)
+	return t.active.PutMany(bs)
 }
 
-func (t *TimedCacheBlockstore) View(ctx context.Context, k cid.Cid, callback func([]byte) error) error {
+func (t *TimedCacheBlockstore) View(k cid.Cid, callback func([]byte) error) error {
 	// The underlying blockstore is always a "mem" blockstore so there's no difference,
 	// from a performance perspective, between view & get. So we call Get to avoid
 	// calling an arbitrary callback while holding a lock.
 	t.mu.RLock()
-	block, err := t.active.Get(ctx, k)
+	block, err := t.active.Get(k)
 	if err == ErrNotFound {
-		block, err = t.inactive.Get(ctx, k)
+		block, err = t.inactive.Get(k)
 	}
 	t.mu.RUnlock()
 
@@ -123,51 +119,51 @@ func (t *TimedCacheBlockstore) View(ctx context.Context, k cid.Cid, callback fun
 	return callback(block.RawData())
 }
 
-func (t *TimedCacheBlockstore) Get(ctx context.Context, k cid.Cid) (blocks.Block, error) {
+func (t *TimedCacheBlockstore) Get(k cid.Cid) (blocks.Block, error) {
 	t.mu.RLock()
 	defer t.mu.RUnlock()
-	b, err := t.active.Get(ctx, k)
+	b, err := t.active.Get(k)
 	if err == ErrNotFound {
-		b, err = t.inactive.Get(ctx, k)
+		b, err = t.inactive.Get(k)
 	}
 	return b, err
 }
 
-func (t *TimedCacheBlockstore) GetSize(ctx context.Context, k cid.Cid) (int, error) {
+func (t *TimedCacheBlockstore) GetSize(k cid.Cid) (int, error) {
 	t.mu.RLock()
 	defer t.mu.RUnlock()
-	size, err := t.active.GetSize(ctx, k)
+	size, err := t.active.GetSize(k)
 	if err == ErrNotFound {
-		size, err = t.inactive.GetSize(ctx, k)
+		size, err = t.inactive.GetSize(k)
 	}
 	return size, err
 }
 
-func (t *TimedCacheBlockstore) Has(ctx context.Context, k cid.Cid) (bool, error) {
+func (t *TimedCacheBlockstore) Has(k cid.Cid) (bool, error) {
 	t.mu.RLock()
 	defer t.mu.RUnlock()
-	if has, err := t.active.Has(ctx, k); err != nil {
+	if has, err := t.active.Has(k); err != nil {
 		return false, err
 	} else if has {
 		return true, nil
 	}
-	return t.inactive.Has(ctx, k)
+	return t.inactive.Has(k)
 }
 
 func (t *TimedCacheBlockstore) HashOnRead(_ bool) {
 	// no-op
 }
 
-func (t *TimedCacheBlockstore) DeleteBlock(ctx context.Context, k cid.Cid) error {
+func (t *TimedCacheBlockstore) DeleteBlock(k cid.Cid) error {
 	t.mu.Lock()
 	defer t.mu.Unlock()
-	return multierr.Combine(t.active.DeleteBlock(ctx, k), t.inactive.DeleteBlock(ctx, k))
+	return multierr.Combine(t.active.DeleteBlock(k), t.inactive.DeleteBlock(k))
 }
 
-func (t *TimedCacheBlockstore) DeleteMany(ctx context.Context, ks []cid.Cid) error {
+func (t *TimedCacheBlockstore) DeleteMany(ks []cid.Cid) error {
 	t.mu.Lock()
 	defer t.mu.Unlock()
-	return multierr.Combine(t.active.DeleteMany(ctx, ks), t.inactive.DeleteMany(ctx, ks))
+	return multierr.Combine(t.active.DeleteMany(ks), t.inactive.DeleteMany(ks))
 }
 
 func (t *TimedCacheBlockstore) AllKeysChan(_ context.Context) (<-chan cid.Cid, error) {

blockstore/timed_test.go

@@ -19,8 +19,6 @@ func TestTimedCacheBlockstoreSimple(t *testing.T) {
 	tc.clock = mClock
 	tc.doneRotatingCh = make(chan struct{})
 
-	ctx := context.Background()
-
 	_ = tc.Start(context.Background())
 	mClock.Add(1) // IDK why it is needed but it makes it work
 
@@ -29,18 +27,18 @@ func TestTimedCacheBlockstoreSimple(t *testing.T) {
 	}()
 
 	b1 := blocks.NewBlock([]byte("foo"))
-	require.NoError(t, tc.Put(ctx, b1))
+	require.NoError(t, tc.Put(b1))
 
 	b2 := blocks.NewBlock([]byte("bar"))
-	require.NoError(t, tc.Put(ctx, b2))
+	require.NoError(t, tc.Put(b2))
 
 	b3 := blocks.NewBlock([]byte("baz"))
 
-	b1out, err := tc.Get(ctx, b1.Cid())
+	b1out, err := tc.Get(b1.Cid())
 	require.NoError(t, err)
 	require.Equal(t, b1.RawData(), b1out.RawData())
 
-	has, err := tc.Has(ctx, b1.Cid())
+	has, err := tc.Has(b1.Cid())
 	require.NoError(t, err)
 	require.True(t, has)
 
@@ -48,17 +46,17 @@ func TestTimedCacheBlockstoreSimple(t *testing.T) {
 	<-tc.doneRotatingCh
 
 	// We should still have everything.
-	has, err = tc.Has(ctx, b1.Cid())
+	has, err = tc.Has(b1.Cid())
 	require.NoError(t, err)
 	require.True(t, has)
 
-	has, err = tc.Has(ctx, b2.Cid())
+	has, err = tc.Has(b2.Cid())
 	require.NoError(t, err)
 	require.True(t, has)
 
 	// extend b2, add b3.
-	require.NoError(t, tc.Put(ctx, b2))
-	require.NoError(t, tc.Put(ctx, b3))
+	require.NoError(t, tc.Put(b2))
+	require.NoError(t, tc.Put(b3))
 
 	// all keys once.
 	allKeys, err := tc.AllKeysChan(context.Background())
@@ -73,15 +71,15 @@ func TestTimedCacheBlockstoreSimple(t *testing.T) {
 	<-tc.doneRotatingCh
 	// should still have b2, and b3, but not b1
 
-	has, err = tc.Has(ctx, b1.Cid())
+	has, err = tc.Has(b1.Cid())
 	require.NoError(t, err)
 	require.False(t, has)
 
-	has, err = tc.Has(ctx, b2.Cid())
+	has, err = tc.Has(b2.Cid())
 	require.NoError(t, err)
 	require.True(t, has)
 
-	has, err = tc.Has(ctx, b3.Cid())
+	has, err = tc.Has(b3.Cid())
 	require.NoError(t, err)
 	require.True(t, has)
 }

blockstore/union.go

@@ -19,72 +19,72 @@ func Union(stores ...Blockstore) Blockstore {
 	return unionBlockstore(stores)
 }
 
-func (m unionBlockstore) Has(ctx context.Context, cid cid.Cid) (has bool, err error) {
+func (m unionBlockstore) Has(cid cid.Cid) (has bool, err error) {
 	for _, bs := range m {
-		if has, err = bs.Has(ctx, cid); has || err != nil {
+		if has, err = bs.Has(cid); has || err != nil {
 			break
 		}
 	}
 	return has, err
 }
 
-func (m unionBlockstore) Get(ctx context.Context, cid cid.Cid) (blk blocks.Block, err error) {
+func (m unionBlockstore) Get(cid cid.Cid) (blk blocks.Block, err error) {
 	for _, bs := range m {
-		if blk, err = bs.Get(ctx, cid); err == nil || err != ErrNotFound {
+		if blk, err = bs.Get(cid); err == nil || err != ErrNotFound {
 			break
 		}
 	}
 	return blk, err
 }
 
-func (m unionBlockstore) View(ctx context.Context, cid cid.Cid, callback func([]byte) error) (err error) {
+func (m unionBlockstore) View(cid cid.Cid, callback func([]byte) error) (err error) {
 	for _, bs := range m {
-		if err = bs.View(ctx, cid, callback); err == nil || err != ErrNotFound {
+		if err = bs.View(cid, callback); err == nil || err != ErrNotFound {
 			break
 		}
 	}
 	return err
 }
 
-func (m unionBlockstore) GetSize(ctx context.Context, cid cid.Cid) (size int, err error) {
+func (m unionBlockstore) GetSize(cid cid.Cid) (size int, err error) {
 	for _, bs := range m {
-		if size, err = bs.GetSize(ctx, cid); err == nil || err != ErrNotFound {
+		if size, err = bs.GetSize(cid); err == nil || err != ErrNotFound {
 			break
 		}
 	}
 	return size, err
 }
 
-func (m unionBlockstore) Put(ctx context.Context, block blocks.Block) (err error) {
+func (m unionBlockstore) Put(block blocks.Block) (err error) {
 	for _, bs := range m {
-		if err = bs.Put(ctx, block); err != nil {
+		if err = bs.Put(block); err != nil {
 			break
 		}
 	}
 	return err
 }
 
-func (m unionBlockstore) PutMany(ctx context.Context, blks []blocks.Block) (err error) {
+func (m unionBlockstore) PutMany(blks []blocks.Block) (err error) {
 	for _, bs := range m {
-		if err = bs.PutMany(ctx, blks); err != nil {
+		if err = bs.PutMany(blks); err != nil {
 			break
 		}
 	}
 	return err
 }
 
-func (m unionBlockstore) DeleteBlock(ctx context.Context, cid cid.Cid) (err error) {
+func (m unionBlockstore) DeleteBlock(cid cid.Cid) (err error) {
 	for _, bs := range m {
-		if err = bs.DeleteBlock(ctx, cid); err != nil {
+		if err = bs.DeleteBlock(cid); err != nil {
 			break
 		}
 	}
 	return err
 }
 
-func (m unionBlockstore) DeleteMany(ctx context.Context, cids []cid.Cid) (err error) {
+func (m unionBlockstore) DeleteMany(cids []cid.Cid) (err error) {
 	for _, bs := range m {
-		if err = bs.DeleteMany(ctx, cids); err != nil {
+		if err = bs.DeleteMany(cids); err != nil {
 			break
 		}
 	}

blockstore/union_test.go

@@ -15,81 +15,79 @@ var (
 )
 
 func TestUnionBlockstore_Get(t *testing.T) {
-	ctx := context.Background()
 	m1 := NewMemory()
 	m2 := NewMemory()
 
-	_ = m1.Put(ctx, b1)
-	_ = m2.Put(ctx, b2)
+	_ = m1.Put(b1)
+	_ = m2.Put(b2)
 
 	u := Union(m1, m2)
 
-	v1, err := u.Get(ctx, b1.Cid())
+	v1, err := u.Get(b1.Cid())
 	require.NoError(t, err)
 	require.Equal(t, b1.RawData(), v1.RawData())
 
-	v2, err := u.Get(ctx, b2.Cid())
+	v2, err := u.Get(b2.Cid())
 	require.NoError(t, err)
 	require.Equal(t, b2.RawData(), v2.RawData())
 }
 
 func TestUnionBlockstore_Put_PutMany_Delete_AllKeysChan(t *testing.T) {
-	ctx := context.Background()
 	m1 := NewMemory()
 	m2 := NewMemory()
 
 	u := Union(m1, m2)
 
-	err := u.Put(ctx, b0)
+	err := u.Put(b0)
 	require.NoError(t, err)
 
 	var has bool
 
 	// write was broadcasted to all stores.
-	has, _ = m1.Has(ctx, b0.Cid())
+	has, _ = m1.Has(b0.Cid())
 	require.True(t, has)
 
-	has, _ = m2.Has(ctx, b0.Cid())
+	has, _ = m2.Has(b0.Cid())
 	require.True(t, has)
 
-	has, _ = u.Has(ctx, b0.Cid())
+	has, _ = u.Has(b0.Cid())
 	require.True(t, has)
 
 	// put many.
-	err = u.PutMany(ctx, []blocks.Block{b1, b2})
+	err = u.PutMany([]blocks.Block{b1, b2})
 	require.NoError(t, err)
 
 	// write was broadcasted to all stores.
-	has, _ = m1.Has(ctx, b1.Cid())
+	has, _ = m1.Has(b1.Cid())
 	require.True(t, has)
 
-	has, _ = m1.Has(ctx, b2.Cid())
+	has, _ = m1.Has(b2.Cid())
 	require.True(t, has)
 
-	has, _ = m2.Has(ctx, b1.Cid())
+	has, _ = m2.Has(b1.Cid())
 	require.True(t, has)
 
-	has, _ = m2.Has(ctx, b2.Cid())
+	has, _ = m2.Has(b2.Cid())
 	require.True(t, has)
 
 	// also in the union store.
-	has, _ = u.Has(ctx, b1.Cid())
+	has, _ = u.Has(b1.Cid())
 	require.True(t, has)
 
-	has, _ = u.Has(ctx, b2.Cid())
+	has, _ = u.Has(b2.Cid())
 	require.True(t, has)
 
 	// deleted from all stores.
-	err = u.DeleteBlock(ctx, b1.Cid())
+	err = u.DeleteBlock(b1.Cid())
 	require.NoError(t, err)
 
-	has, _ = u.Has(ctx, b1.Cid())
+	has, _ = u.Has(b1.Cid())
 	require.False(t, has)
 
-	has, _ = m1.Has(ctx, b1.Cid())
+	has, _ = m1.Has(b1.Cid())
 	require.False(t, has)
 
-	has, _ = m2.Has(ctx, b1.Cid())
+	has, _ = m2.Has(b1.Cid())
 	require.False(t, has)
 
 	// check that AllKeysChan returns b0 and b2, twice (once per backing store)

build/bootstrap/butterflynet.pi

@@ -1,2 +1,2 @@
-/dns4/bootstrap-0.butterfly.fildev.network/tcp/1347/p2p/12D3KooWBdRCBLUeKvoy22u5DcXs61adFn31v8WWCZgmBjDCjbsC
-/dns4/bootstrap-1.butterfly.fildev.network/tcp/1347/p2p/12D3KooWDUQJBA18njjXnG9RtLxoN3muvdU7PEy55QorUEsdAqdy
+/dns4/bootstrap-0.butterfly.fildev.network/tcp/1347/p2p/12D3KooWBbZd7Su9XfLUQ12RynGQ3ZmGY1nGqFntmqop9pLNJE6g
+/dns4/bootstrap-1.butterfly.fildev.network/tcp/1347/p2p/12D3KooWGKRzEY4tJFTmAmrYUpa1CVVohmV9YjJbC9v5XWY2gUji

build/bootstrap/nerpanet.pi

@@ -0,0 +1,4 @@
+/dns4/bootstrap-2.nerpa.interplanetary.dev/tcp/1347/p2p/12D3KooWQcL6ReWmR6ASWx4iT7EiAmxKDQpvgq1MKNTQZp5NPnWW
+/dns4/bootstrap-0.nerpa.interplanetary.dev/tcp/1347/p2p/12D3KooWGyJCwCm7EfupM15CFPXM4c7zRVHwwwjcuy9umaGeztMX
+/dns4/bootstrap-3.nerpa.interplanetary.dev/tcp/1347/p2p/12D3KooWNK9RmfksKXSCQj7ZwAM7L6roqbN4kwJteihq7yPvSgPs
+/dns4/bootstrap-1.nerpa.interplanetary.dev/tcp/1347/p2p/12D3KooWCWSaH6iUyXYspYxELjDfzToBsyVGVz3QvC7ysXv7wESo

build/limits.go

@@ -1,6 +0,0 @@
-package build
-
-var (
-	DefaultFDLimit uint64 = 16 << 10
-	MinerFDLimit   uint64 = 100_000
-)

build/panic_reporter.go

@@ -1,183 +0,0 @@
-package build
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"runtime/debug"
-	"runtime/pprof"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/icza/backscanner"
-	logging "github.com/ipfs/go-log/v2"
-)
-
-var (
-	panicLog           = logging.Logger("panic-reporter")
-	defaultJournalTail = 500
-)
-
-// PanicReportingPath is the name of the subdir created within the repoPath
-// path provided to GeneratePanicReport
-var PanicReportingPath = "panic-reports"
-
-// PanicReportJournalTail is the number of lines captured from the end of
-// the lotus journal to be included in the panic report.
-var PanicReportJournalTail = defaultJournalTail
-
-// GeneratePanicReport produces a timestamped dump of the application state
-// for inspection and debugging purposes. Call this function from any place
-// where a panic or severe error needs to be examined. `persistPath` is the
-// path where the reports should be saved. `repoPath` is the path where the
-// journal should be read from. `label` is an optional string to include
-// next to the report timestamp.
-func GeneratePanicReport(persistPath, repoPath, label string) {
-	// make sure we always dump the latest logs on the way out
-	// especially since we're probably panicking
-	defer panicLog.Sync() //nolint:errcheck
-
-	if persistPath == "" && repoPath == "" {
-		panicLog.Warn("missing persist and repo paths, aborting panic report creation")
-		return
-	}
-
-	reportPath := filepath.Join(repoPath, PanicReportingPath, generateReportName(label))
-	if persistPath != "" {
-		reportPath = filepath.Join(persistPath, generateReportName(label))
-	}
-	panicLog.Warnf("generating panic report at %s", reportPath)
-
-	tl := os.Getenv("LOTUS_PANIC_JOURNAL_LOOKBACK")
-	if tl != "" && PanicReportJournalTail == defaultJournalTail {
-		i, err := strconv.Atoi(tl)
-		if err == nil {
-			PanicReportJournalTail = i
-		}
-	}
-
-	err := os.MkdirAll(reportPath, 0755)
-	if err != nil {
-		panicLog.Error(err.Error())
-		return
-	}
-
-	writeAppVersion(filepath.Join(reportPath, "version"))
-	writeStackTrace(filepath.Join(reportPath, "stacktrace.dump"))
-	writeProfile("goroutines", filepath.Join(reportPath, "goroutines.pprof.gz"))
-	writeProfile("heap", filepath.Join(reportPath, "heap.pprof.gz"))
-	writeJournalTail(PanicReportJournalTail, repoPath, filepath.Join(reportPath, "journal.ndjson"))
-}
-
-func writeAppVersion(file string) {
-	f, err := os.Create(file)
-	if err != nil {
-		panicLog.Error(err.Error())
-	}
-	defer f.Close() //nolint:errcheck
-
-	versionString := []byte(BuildVersion + BuildTypeString() + CurrentCommit + "\n")
-	if _, err := f.Write(versionString); err != nil {
-		panicLog.Error(err.Error())
-	}
-}
-
-func writeStackTrace(file string) {
-	f, err := os.Create(file)
-	if err != nil {
-		panicLog.Error(err.Error())
-	}
-	defer f.Close() //nolint:errcheck
-
-	if _, err := f.Write(debug.Stack()); err != nil {
-		panicLog.Error(err.Error())
-	}
-
-}
-
-func writeProfile(profileType string, file string) {
-	p := pprof.Lookup(profileType)
-	if p == nil {
-		panicLog.Warnf("%s profile not available", profileType)
-		return
-	}
-	f, err := os.Create(file)
-	if err != nil {
-		panicLog.Error(err.Error())
-		return
-	}
-	defer f.Close() //nolint:errcheck
-
-	if err := p.WriteTo(f, 0); err != nil {
-		panicLog.Error(err.Error())
-	}
-}
-
-func writeJournalTail(tailLen int, repoPath, file string) {
-	if repoPath == "" {
-		panicLog.Warn("repo path is empty, aborting copy of journal log")
-		return
-	}
-
-	f, err := os.Create(file)
-	if err != nil {
-		panicLog.Error(err.Error())
-		return
-	}
-	defer f.Close() //nolint:errcheck
-
-	jPath, err := getLatestJournalFilePath(repoPath)
-	if err != nil {
-		panicLog.Warnf("failed getting latest journal: %s", err.Error())
-		return
-	}
-	j, err := os.OpenFile(jPath, os.O_RDONLY, 0400)
-	if err != nil {
-		panicLog.Error(err.Error())
-		return
-	}
-	js, err := j.Stat()
-	if err != nil {
-		panicLog.Error(err.Error())
-		return
-	}
-	jScan := backscanner.New(j, int(js.Size()))
-	linesWritten := 0
-	for {
-		if linesWritten > tailLen {
-			break
-		}
-		line, _, err := jScan.LineBytes()
-		if err != nil {
-			if err != io.EOF {
-				panicLog.Error(err.Error())
-			}
-			break
-		}
-		if _, err := f.Write(line); err != nil {
-			panicLog.Error(err.Error())
-			break
-		}
-		if _, err := f.Write([]byte("\n")); err != nil {
-			panicLog.Error(err.Error())
-			break
-		}
-		linesWritten++
-	}
-}
-
-func getLatestJournalFilePath(repoPath string) (string, error) {
-	journalPath := filepath.Join(repoPath, "journal")
-	entries, err := os.ReadDir(journalPath)
-	if err != nil {
-		return "", err
-	}
-	return filepath.Join(journalPath, entries[len(entries)-1].Name()), nil
-}
-
-func generateReportName(label string) string {
-	label = strings.ReplaceAll(label, " ", "")
-	return fmt.Sprintf("report_%s_%s", label, time.Now().Format("2006-01-02T150405"))
-}

build/params_2k.go

@@ -1,4 +1,3 @@
-//go:build debug || 2k
 // +build debug 2k
 
 package build
@@ -10,15 +9,12 @@ import (
 	"github.com/ipfs/go-cid"
 
 	"github.com/filecoin-project/go-state-types/abi"
-	"github.com/filecoin-project/go-state-types/network"
 	"github.com/filecoin-project/lotus/chain/actors/policy"
 )
 
 const BootstrappersFile = ""
 const GenesisFile = ""
 
-const GenesisNetworkVersion = network.Version15
-
 var UpgradeBreezeHeight = abi.ChainEpoch(-1)
 
 const BreezeGasTampingDuration = 0
@@ -32,6 +28,7 @@ var UpgradeAssemblyHeight = abi.ChainEpoch(-5)
 var UpgradeLiftoffHeight = abi.ChainEpoch(-6)
 
 var UpgradeKumquatHeight = abi.ChainEpoch(-7)
+var UpgradePricelistOopsHeight = abi.ChainEpoch(-8)
 var UpgradeCalicoHeight = abi.ChainEpoch(-9)
 var UpgradePersianHeight = abi.ChainEpoch(-10)
 var UpgradeOrangeHeight = abi.ChainEpoch(-11)
@@ -45,10 +42,6 @@ var UpgradeTurboHeight = abi.ChainEpoch(-15)
 
 var UpgradeHyperdriveHeight = abi.ChainEpoch(-16)
 
-var UpgradeChocolateHeight = abi.ChainEpoch(-17)
-
-var UpgradeOhSnapHeight = abi.ChainEpoch(-18)
-
 var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0: DrandMainnet,
 }
@@ -89,11 +82,8 @@ func init() {
 	UpgradeNorwegianHeight = getUpgradeHeight("LOTUS_NORWEGIAN_HEIGHT", UpgradeNorwegianHeight)
 	UpgradeTurboHeight = getUpgradeHeight("LOTUS_ACTORSV4_HEIGHT", UpgradeTurboHeight)
 	UpgradeHyperdriveHeight = getUpgradeHeight("LOTUS_HYPERDRIVE_HEIGHT", UpgradeHyperdriveHeight)
-	UpgradeChocolateHeight = getUpgradeHeight("LOTUS_CHOCOLATE_HEIGHT", UpgradeChocolateHeight)
-	UpgradeOhSnapHeight = getUpgradeHeight("LOTUS_OHSNAP_HEIGHT", UpgradeOhSnapHeight)
 
 	BuildType |= Build2k
-
 }
 
 const BlockDelaySecs = uint64(4)

build/params_butterfly.go

@@ -1,4 +1,3 @@
-//go:build butterflynet
 // +build butterflynet
 
 package build
@@ -6,7 +5,6 @@ package build
 import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
-	"github.com/filecoin-project/go-state-types/network"
 	"github.com/filecoin-project/lotus/chain/actors/policy"
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
 	"github.com/ipfs/go-cid"
@@ -16,8 +14,6 @@ var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0: DrandMainnet,
 }
 
-const GenesisNetworkVersion = network.Version14
-
 const BootstrappersFile = "butterflynet.pi"
 const GenesisFile = "butterflynet.car"
 
@@ -27,37 +23,30 @@ const UpgradeSmokeHeight = -2
 const UpgradeIgnitionHeight = -3
 const UpgradeRefuelHeight = -4
 
-var UpgradeAssemblyHeight = abi.ChainEpoch(-5)
+var UpgradeAssemblyHeight = abi.ChainEpoch(30)
 
-const UpgradeTapeHeight = -6
-const UpgradeLiftoffHeight = -7
-const UpgradeKumquatHeight = -8
-const UpgradeCalicoHeight = -9
-const UpgradePersianHeight = -10
-const UpgradeClausHeight = -11
-const UpgradeOrangeHeight = -12
-const UpgradeTrustHeight = -13
-const UpgradeNorwegianHeight = -14
-const UpgradeTurboHeight = -15
-const UpgradeHyperdriveHeight = -16
-const UpgradeChocolateHeight = -17
-
-// 2022-01-17T19:00:00Z
-const UpgradeOhSnapHeight = 30262
+const UpgradeTapeHeight = 60
+const UpgradeLiftoffHeight = -5
+const UpgradeKumquatHeight = 90
+const UpgradePricelistOopsHeight = 119
+const UpgradeCalicoHeight = 120
+const UpgradePersianHeight = 150
+const UpgradeClausHeight = 180
+const UpgradeOrangeHeight = 210
+const UpgradeTrustHeight = 240
+const UpgradeNorwegianHeight = UpgradeTrustHeight + (builtin2.EpochsInHour * 12)
+const UpgradeTurboHeight = 8922
+const UpgradeHyperdriveHeight = 9999999
 
 func init() {
 	policy.SetConsensusMinerMinPower(abi.NewStoragePower(2 << 30))
 	policy.SetSupportedProofTypes(
 		abi.RegisteredSealProof_StackedDrg512MiBV1,
-		abi.RegisteredSealProof_StackedDrg32GiBV1,
-		abi.RegisteredSealProof_StackedDrg64GiBV1,
 	)
 
 	SetAddressNetwork(address.Testnet)
 
 	Devnet = true
-
-	BuildType = BuildButterflynet
 }
 
 const BlockDelaySecs = uint64(builtin2.EpochDurationSeconds)

build/params_calibnet.go

@@ -1,4 +1,3 @@
-//go:build calibnet
 // +build calibnet
 
 package build
@@ -6,7 +5,6 @@ package build
 import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
-	"github.com/filecoin-project/go-state-types/network"
 	"github.com/filecoin-project/lotus/chain/actors/policy"
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
 	"github.com/ipfs/go-cid"
@@ -16,8 +14,6 @@ var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0: DrandMainnet,
 }
 
-const GenesisNetworkVersion = network.Version0
-
 const BootstrappersFile = "calibnet.pi"
 const GenesisFile = "calibnet.car"
 
@@ -37,6 +33,8 @@ const UpgradeLiftoffHeight = -5
 
 const UpgradeKumquatHeight = 90
 
+const UpgradePricelistOopsHeight = 119
+
 const UpgradeCalicoHeight = 120
 const UpgradePersianHeight = UpgradeCalicoHeight + (builtin2.EpochsInHour * 1)
 
@@ -52,10 +50,6 @@ const UpgradeTurboHeight = 390
 
 const UpgradeHyperdriveHeight = 420
 
-const UpgradeChocolateHeight = 312746
-
-const UpgradeOhSnapHeight = 99999999
-
 func init() {
 	policy.SetConsensusMinerMinPower(abi.NewStoragePower(32 << 30))
 	policy.SetSupportedProofTypes(
@@ -68,7 +62,6 @@ func init() {
 	Devnet = true
 
 	BuildType = BuildCalibnet
-
 }
 
 const BlockDelaySecs = uint64(builtin2.EpochDurationSeconds)

build/params_debug.go

@@ -1,4 +1,3 @@
-//go:build debug
 // +build debug
 
 package build

build/params_interop.go

@@ -1,4 +1,3 @@
-//go:build interopnet
 // +build interopnet
 
 package build
@@ -11,16 +10,14 @@ import (
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
-	"github.com/filecoin-project/go-state-types/network"
-	"github.com/filecoin-project/lotus/chain/actors/policy"
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
+
+	"github.com/filecoin-project/lotus/chain/actors/policy"
 )
 
 const BootstrappersFile = "interopnet.pi"
 const GenesisFile = "interopnet.car"
 
-const GenesisNetworkVersion = network.Version13
-
 var UpgradeBreezeHeight = abi.ChainEpoch(-1)
 
 const BreezeGasTampingDuration = 0
@@ -34,6 +31,7 @@ var UpgradeAssemblyHeight = abi.ChainEpoch(-5)
 var UpgradeLiftoffHeight = abi.ChainEpoch(-6)
 
 var UpgradeKumquatHeight = abi.ChainEpoch(-7)
+var UpgradePricelistOopsHeight = abi.ChainEpoch(-8)
 var UpgradeCalicoHeight = abi.ChainEpoch(-9)
 var UpgradePersianHeight = abi.ChainEpoch(-10)
 var UpgradeOrangeHeight = abi.ChainEpoch(-11)
@@ -46,8 +44,6 @@ var UpgradeNorwegianHeight = abi.ChainEpoch(-14)
 var UpgradeTurboHeight = abi.ChainEpoch(-15)
 
 var UpgradeHyperdriveHeight = abi.ChainEpoch(-16)
-var UpgradeChocolateHeight = abi.ChainEpoch(-17)
-var UpgradeOhSnapHeight = abi.ChainEpoch(-18)
 
 var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0: DrandMainnet,
@@ -97,7 +93,6 @@ func init() {
 	BuildType |= BuildInteropnet
 	SetAddressNetwork(address.Testnet)
 	Devnet = true
-
 }
 
 const BlockDelaySecs = uint64(builtin2.EpochDurationSeconds)

build/params_mainnet.go

@@ -1,5 +1,10 @@
-//go:build !debug && !2k && !testground && !calibnet && !nerpanet && !butterflynet && !interopnet
-// +build !debug,!2k,!testground,!calibnet,!nerpanet,!butterflynet,!interopnet
+// +build !debug
+// +build !2k
+// +build !testground
+// +build !calibnet
+// +build !nerpanet
+// +build !butterflynet
+// +build !interopnet
 
 package build
 
@@ -7,8 +12,6 @@ import (
 	"math"
 	"os"
 
-	"github.com/filecoin-project/go-state-types/network"
-
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
@@ -19,8 +22,6 @@ var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	UpgradeSmokeHeight: DrandMainnet,
 }
 
-const GenesisNetworkVersion = network.Version0
-
 const BootstrappersFile = "mainnet.pi"
 const GenesisFile = "mainnet.car"
 
@@ -44,6 +45,7 @@ const UpgradeLiftoffHeight = 148888
 
 const UpgradeKumquatHeight = 170000
 
+const UpgradePricelistOopsHeight = 265199
 const UpgradeCalicoHeight = 265200
 const UpgradePersianHeight = UpgradeCalicoHeight + (builtin2.EpochsInHour * 60)
 
@@ -62,20 +64,15 @@ const UpgradeNorwegianHeight = 665280
 const UpgradeTurboHeight = 712320
 
 // 2021-06-30T22:00:00Z
-const UpgradeHyperdriveHeight = 892800
-
-// 2021-10-26T13:30:00Z
-const UpgradeChocolateHeight = 1231620
-
-var UpgradeOhSnapHeight = abi.ChainEpoch(999999999999)
+var UpgradeHyperdriveHeight = abi.ChainEpoch(892800)
 
 func init() {
 	if os.Getenv("LOTUS_USE_TEST_ADDRESSES") != "1" {
 		SetAddressNetwork(address.Mainnet)
 	}
 
-	if os.Getenv("LOTUS_DISABLE_SNAPDEALS") == "1" {
-		UpgradeOhSnapHeight = math.MaxInt64
+	if os.Getenv("LOTUS_DISABLE_HYPERDRIVE") == "1" {
+		UpgradeHyperdriveHeight = math.MaxInt64
 	}
 
 	Devnet = false

build/params_nerpanet.go

@@ -1,11 +1,9 @@
-//go:build nerpanet
 // +build nerpanet
 
 package build
 
 import (
 	"github.com/filecoin-project/go-state-types/abi"
-	"github.com/filecoin-project/go-state-types/network"
 	"github.com/filecoin-project/lotus/chain/actors/policy"
 	"github.com/ipfs/go-cid"
 
@@ -16,8 +14,6 @@ var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0: DrandMainnet,
 }
 
-const GenesisNetworkVersion = network.Version0
-
 const BootstrappersFile = "nerpanet.pi"
 const GenesisFile = "nerpanet.car"
 
@@ -36,6 +32,7 @@ const UpgradeTapeHeight = 60
 
 const UpgradeKumquatHeight = 90
 
+const UpgradePricelistOopsHeight = 99
 const UpgradeCalicoHeight = 100
 const UpgradePersianHeight = UpgradeCalicoHeight + (builtin2.EpochsInHour * 1)
 
@@ -48,8 +45,6 @@ const UpgradeNorwegianHeight = 201000
 const UpgradeTurboHeight = 203000
 const UpgradeHyperdriveHeight = 379178
 
-const UpgradeChocolateHeight = 999999999
-
 func init() {
 	// Minimum block production power is set to 4 TiB
 	// Rationale is to discourage small-scale miners from trying to take over the network
@@ -72,9 +67,6 @@ func init() {
 	//miner.WPoStChallengeLookback = abi.ChainEpoch(2)
 
 	Devnet = false
-
-	BuildType = BuildNerpanet
-
 }
 
 const BlockDelaySecs = uint64(builtin2.EpochDurationSeconds)

build/params_shared_funcs.go

@@ -13,17 +13,6 @@ import (
 
 func BlocksTopic(netName dtypes.NetworkName) string   { return "/fil/blocks/" + string(netName) }
 func MessagesTopic(netName dtypes.NetworkName) string { return "/fil/msgs/" + string(netName) }
-func IndexerIngestTopic(netName dtypes.NetworkName) string {
-
-	nn := string(netName)
-	// The network name testnetnet is here for historical reasons.
-	// Going forward we aim to use the name `mainnet` where possible.
-	if nn == "testnetnet" {
-		nn = "mainnet"
-	}
-
-	return "/indexer/ingest/" + nn
-}
 func DhtProtocolName(netName dtypes.NetworkName) protocol.ID {
 	return protocol.ID("/fil/kad/" + string(netName))
 }

build/params_shared_vals.go

@@ -1,4 +1,3 @@
-//go:build !testground
 // +build !testground
 
 package build
@@ -26,17 +25,8 @@ const UnixfsLinksPerLevel = 1024
 // Consensus / Network
 
 const AllowableClockDriftSecs = uint64(1)
-
-// TODO: This is still terrible...What's the impact of updating this before mainnet actually upgrades
-/* inline-gen template
-
-const NewestNetworkVersion = network.Version{{.latestNetworkVersion}}
-
-/* inline-gen start */
-
-const NewestNetworkVersion = network.Version15
-
-/* inline-gen end */
+const NewestNetworkVersion = network.Version13
+const ActorUpgradeNetworkVersion = network.Version4
 
 // Epochs
 const ForkLengthThreshold = Finality

build/params_testground.go

@@ -1,4 +1,3 @@
-//go:build testground
 // +build testground
 
 // This file makes hardcoded parameters (const) configurable as vars.
@@ -83,32 +82,29 @@ var (
 	UpgradeBreezeHeight      abi.ChainEpoch = -1
 	BreezeGasTampingDuration abi.ChainEpoch = 0
 
-	UpgradeSmokeHeight      abi.ChainEpoch = -1
-	UpgradeIgnitionHeight   abi.ChainEpoch = -2
-	UpgradeRefuelHeight     abi.ChainEpoch = -3
-	UpgradeTapeHeight       abi.ChainEpoch = -4
-	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
-	UpgradeChocolateHeight  abi.ChainEpoch = -16
-	UpgradeOhSnapHeight     abi.ChainEpoch = -17
+	UpgradeSmokeHeight         abi.ChainEpoch = -1
+	UpgradeIgnitionHeight      abi.ChainEpoch = -2
+	UpgradeRefuelHeight        abi.ChainEpoch = -3
+	UpgradeTapeHeight          abi.ChainEpoch = -4
+	UpgradeAssemblyHeight      abi.ChainEpoch = 10
+	UpgradeLiftoffHeight       abi.ChainEpoch = -5
+	UpgradeKumquatHeight       abi.ChainEpoch = -6
+	UpgradePricelistOopsHeight abi.ChainEpoch = -7
+	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
 
 	DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 		0: DrandMainnet,
 	}
 
-	GenesisNetworkVersion = network.Version0
-
-	NewestNetworkVersion       = network.Version15
-	ActorUpgradeNetworkVersion = network.Version15
+	NewestNetworkVersion       = network.Version11
+	ActorUpgradeNetworkVersion = network.Version4
 
 	Devnet      = true
 	ZeroAddress = MustParseAddress("f3yaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaby2smx7a")

build/tools.go

@@ -1,5 +1,4 @@
-//go:build tools
-// +build tools
+//+build tools
 
 package build
 

build/version.go

@@ -6,16 +6,15 @@ var CurrentCommit string
 var BuildType int
 
 const (
-	BuildDefault      = 0
-	BuildMainnet      = 0x1
-	Build2k           = 0x2
-	BuildDebug        = 0x3
-	BuildCalibnet     = 0x4
-	BuildInteropnet   = 0x5
-	BuildButterflynet = 0x7
+	BuildDefault    = 0
+	BuildMainnet    = 0x1
+	Build2k         = 0x2
+	BuildDebug      = 0x3
+	BuildCalibnet   = 0x4
+	BuildInteropnet = 0x5
 )
 
-func BuildTypeString() string {
+func buildType() string {
 	switch BuildType {
 	case BuildDefault:
 		return ""
@@ -29,20 +28,18 @@ func BuildTypeString() string {
 		return "+calibnet"
 	case BuildInteropnet:
 		return "+interopnet"
-	case BuildButterflynet:
-		return "+butterflynet"
 	default:
 		return "+huh?"
 	}
 }
 
-// BuildVersion is the local build version
-const BuildVersion = "1.15.0-dev"
+// BuildVersion is the local build version, set by build system
+const BuildVersion = "1.11.1-rc1"
 
 func UserVersion() string {
 	if os.Getenv("LOTUS_VERSION_IGNORE_COMMIT") == "1" {
 		return BuildVersion
 	}
 
-	return BuildVersion + BuildTypeString() + CurrentCommit
+	return BuildVersion + buildType() + CurrentCommit
 }

chain/actors/builtin/account/account.go

@@ -21,10 +21,6 @@ import (
 	builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin"
 
 	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
-
-	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
-
-	builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
 )
 
 func init() {
@@ -48,14 +44,6 @@ func init() {
 	builtin.RegisterActorState(builtin5.AccountActorCodeID, func(store adt.Store, root cid.Cid) (cbor.Marshaler, error) {
 		return load5(store, root)
 	})
-
-	builtin.RegisterActorState(builtin6.AccountActorCodeID, func(store adt.Store, root cid.Cid) (cbor.Marshaler, error) {
-		return load6(store, root)
-	})
-
-	builtin.RegisterActorState(builtin7.AccountActorCodeID, func(store adt.Store, root cid.Cid) (cbor.Marshaler, error) {
-		return load7(store, root)
-	})
 }
 
 var Methods = builtin4.MethodsAccount
@@ -78,12 +66,6 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 	case builtin5.AccountActorCodeID:
 		return load5(store, act.Head)
 
-	case builtin6.AccountActorCodeID:
-		return load6(store, act.Head)
-
-	case builtin7.AccountActorCodeID:
-		return load7(store, act.Head)
-
 	}
 	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
 }
@@ -106,12 +88,6 @@ func MakeState(store adt.Store, av actors.Version, addr address.Address) (State,
 	case actors.Version5:
 		return make5(store, addr)
 
-	case actors.Version6:
-		return make6(store, addr)
-
-	case actors.Version7:
-		return make7(store, addr)
-
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -134,12 +110,6 @@ func GetActorCodeID(av actors.Version) (cid.Cid, error) {
 	case actors.Version5:
 		return builtin5.AccountActorCodeID, nil
 
-	case actors.Version6:
-		return builtin6.AccountActorCodeID, nil
-
-	case actors.Version7:
-		return builtin7.AccountActorCodeID, nil
-
 	}
 
 	return cid.Undef, xerrors.Errorf("unknown actor version %d", av)

chain/actors/builtin/account/v6.go

@@ -1,40 +0,0 @@
-package account
-
-import (
-	"github.com/filecoin-project/go-address"
-	"github.com/ipfs/go-cid"
-
-	"github.com/filecoin-project/lotus/chain/actors/adt"
-
-	account6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/account"
-)
-
-var _ State = (*state6)(nil)
-
-func load6(store adt.Store, root cid.Cid) (State, error) {
-	out := state6{store: store}
-	err := store.Get(store.Context(), root, &out)
-	if err != nil {
-		return nil, err
-	}
-	return &out, nil
-}
-
-func make6(store adt.Store, addr address.Address) (State, error) {
-	out := state6{store: store}
-	out.State = account6.State{Address: addr}
-	return &out, nil
-}
-
-type state6 struct {
-	account6.State
-	store adt.Store
-}
-
-func (s *state6) PubkeyAddress() (address.Address, error) {
-	return s.Address, nil
-}
-
-func (s *state6) GetState() interface{} {
-	return &s.State
-}

chain/actors/builtin/account/v7.go

@@ -1,40 +0,0 @@
-package account
-
-import (
-	"github.com/filecoin-project/go-address"
-	"github.com/ipfs/go-cid"
-
-	"github.com/filecoin-project/lotus/chain/actors/adt"
-
-	account7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/account"
-)
-
-var _ State = (*state7)(nil)
-
-func load7(store adt.Store, root cid.Cid) (State, error) {
-	out := state7{store: store}
-	err := store.Get(store.Context(), root, &out)
-	if err != nil {
-		return nil, err
-	}
-	return &out, nil
-}
-
-func make7(store adt.Store, addr address.Address) (State, error) {
-	out := state7{store: store}
-	out.State = account7.State{Address: addr}
-	return &out, nil
-}
-
-type state7 struct {
-	account7.State
-	store adt.Store
-}
-
-func (s *state7) PubkeyAddress() (address.Address, error) {
-	return s.Address, nil
-}
-
-func (s *state7) GetState() interface{} {
-	return &s.State
-}

chain/actors/builtin/builtin.go

@@ -20,53 +20,46 @@ import (
 	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
 	smoothing5 "github.com/filecoin-project/specs-actors/v5/actors/util/smoothing"
 
-	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
-	smoothing6 "github.com/filecoin-project/specs-actors/v6/actors/util/smoothing"
-
-	builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
-	smoothing7 "github.com/filecoin-project/specs-actors/v7/actors/util/smoothing"
-
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/cbor"
 
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/types"
 
-	miner7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/miner"
-	proof7 "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof"
+	miner5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/miner"
+	proof5 "github.com/filecoin-project/specs-actors/v5/actors/runtime/proof"
 )
 
-var SystemActorAddr = builtin7.SystemActorAddr
-var BurntFundsActorAddr = builtin7.BurntFundsActorAddr
-var CronActorAddr = builtin7.CronActorAddr
+var SystemActorAddr = builtin5.SystemActorAddr
+var BurntFundsActorAddr = builtin5.BurntFundsActorAddr
+var CronActorAddr = builtin5.CronActorAddr
 var SaftAddress = makeAddress("t0122")
 var ReserveAddress = makeAddress("t090")
 var RootVerifierAddress = makeAddress("t080")
 
 var (
-	ExpectedLeadersPerEpoch = builtin7.ExpectedLeadersPerEpoch
+	ExpectedLeadersPerEpoch = builtin5.ExpectedLeadersPerEpoch
 )
 
 const (
-	EpochDurationSeconds = builtin7.EpochDurationSeconds
-	EpochsInDay          = builtin7.EpochsInDay
-	SecondsInDay         = builtin7.SecondsInDay
+	EpochDurationSeconds = builtin5.EpochDurationSeconds
+	EpochsInDay          = builtin5.EpochsInDay
+	SecondsInDay         = builtin5.SecondsInDay
 )
 
 const (
-	MethodSend        = builtin7.MethodSend
-	MethodConstructor = builtin7.MethodConstructor
+	MethodSend        = builtin5.MethodSend
+	MethodConstructor = builtin5.MethodConstructor
 )
 
 // These are all just type aliases across actor versions. In the future, that might change
 // and we might need to do something fancier.
-type SectorInfo = proof7.SectorInfo
-type ExtendedSectorInfo = proof7.ExtendedSectorInfo
-type PoStProof = proof7.PoStProof
+type SectorInfo = proof5.SectorInfo
+type PoStProof = proof5.PoStProof
 type FilterEstimate = smoothing0.FilterEstimate
 
 func QAPowerForWeight(size abi.SectorSize, duration abi.ChainEpoch, dealWeight, verifiedWeight abi.DealWeight) abi.StoragePower {
-	return miner7.QAPowerForWeight(size, duration, dealWeight, verifiedWeight)
+	return miner5.QAPowerForWeight(size, duration, dealWeight, verifiedWeight)
 }
 
 func FromV0FilterEstimate(v0 smoothing0.FilterEstimate) FilterEstimate {
@@ -99,18 +92,6 @@ func FromV5FilterEstimate(v5 smoothing5.FilterEstimate) FilterEstimate {
 
 }
 
-func FromV6FilterEstimate(v6 smoothing6.FilterEstimate) FilterEstimate {
-
-	return (FilterEstimate)(v6)
-
-}
-
-func FromV7FilterEstimate(v7 smoothing7.FilterEstimate) FilterEstimate {
-
-	return (FilterEstimate)(v7)
-
-}
-
 type ActorStateLoader func(store adt.Store, root cid.Cid) (cbor.Marshaler, error)
 
 var ActorStateLoaders = make(map[cid.Cid]ActorStateLoader)
@@ -145,12 +126,6 @@ func ActorNameByCode(c cid.Cid) string {
 	case builtin5.IsBuiltinActor(c):
 		return builtin5.ActorNameByCode(c)
 
-	case builtin6.IsBuiltinActor(c):
-		return builtin6.ActorNameByCode(c)
-
-	case builtin7.IsBuiltinActor(c):
-		return builtin7.ActorNameByCode(c)
-
 	default:
 		return "<unknown>"
 	}
@@ -178,14 +153,6 @@ func IsBuiltinActor(c cid.Cid) bool {
 		return true
 	}
 
-	if builtin6.IsBuiltinActor(c) {
-		return true
-	}
-
-	if builtin7.IsBuiltinActor(c) {
-		return true
-	}
-
 	return false
 }
 
@@ -211,14 +178,6 @@ func IsAccountActor(c cid.Cid) bool {
 		return true
 	}
 
-	if c == builtin6.AccountActorCodeID {
-		return true
-	}
-
-	if c == builtin7.AccountActorCodeID {
-		return true
-	}
-
 	return false
 }
 
@@ -244,14 +203,6 @@ func IsStorageMinerActor(c cid.Cid) bool {
 		return true
 	}
 
-	if c == builtin6.StorageMinerActorCodeID {
-		return true
-	}
-
-	if c == builtin7.StorageMinerActorCodeID {
-		return true
-	}
-
 	return false
 }
 
@@ -277,14 +228,6 @@ func IsMultisigActor(c cid.Cid) bool {
 		return true
 	}
 
-	if c == builtin6.MultisigActorCodeID {
-		return true
-	}
-
-	if c == builtin7.MultisigActorCodeID {
-		return true
-	}
-
 	return false
 }
 
@@ -310,14 +253,6 @@ func IsPaymentChannelActor(c cid.Cid) bool {
 		return true
 	}
 
-	if c == builtin6.PaymentChannelActorCodeID {
-		return true
-	}
-
-	if c == builtin7.PaymentChannelActorCodeID {
-		return true
-	}
-
 	return false
 }
 

chain/actors/builtin/builtin.go.template

@@ -45,7 +45,6 @@ const (
 // These are all just type aliases across actor versions. In the future, that might change
 // and we might need to do something fancier.
 type SectorInfo = proof{{.latestVersion}}.SectorInfo
-type ExtendedSectorInfo = proof{{.latestVersion}}.ExtendedSectorInfo
 type PoStProof = proof{{.latestVersion}}.PoStProof
 type FilterEstimate = smoothing0.FilterEstimate
 

chain/actors/builtin/cron/cron.go

@@ -15,10 +15,6 @@ import (
 	builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin"
 
 	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
-
-	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
-
-	builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
 )
 
 func MakeState(store adt.Store, av actors.Version) (State, error) {
@@ -39,12 +35,6 @@ func MakeState(store adt.Store, av actors.Version) (State, error) {
 	case actors.Version5:
 		return make5(store)
 
-	case actors.Version6:
-		return make6(store)
-
-	case actors.Version7:
-		return make7(store)
-
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -67,20 +57,14 @@ func GetActorCodeID(av actors.Version) (cid.Cid, error) {
 	case actors.Version5:
 		return builtin5.CronActorCodeID, nil
 
-	case actors.Version6:
-		return builtin6.CronActorCodeID, nil
-
-	case actors.Version7:
-		return builtin7.CronActorCodeID, nil
-
 	}
 
 	return cid.Undef, xerrors.Errorf("unknown actor version %d", av)
 }
 
 var (
-	Address = builtin7.CronActorAddr
-	Methods = builtin7.MethodsCron
+	Address = builtin5.CronActorAddr
+	Methods = builtin5.MethodsCron
 )
 
 type State interface {

chain/actors/builtin/cron/v6.go

@@ -1,35 +0,0 @@
-package cron
-
-import (
-	"github.com/ipfs/go-cid"
-
-	"github.com/filecoin-project/lotus/chain/actors/adt"
-
-	cron6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/cron"
-)
-
-var _ State = (*state6)(nil)
-
-func load6(store adt.Store, root cid.Cid) (State, error) {
-	out := state6{store: store}
-	err := store.Get(store.Context(), root, &out)
-	if err != nil {
-		return nil, err
-	}
-	return &out, nil
-}
-
-func make6(store adt.Store) (State, error) {
-	out := state6{store: store}
-	out.State = *cron6.ConstructState(cron6.BuiltInEntries())
-	return &out, nil
-}
-
-type state6 struct {
-	cron6.State
-	store adt.Store
-}
-
-func (s *state6) GetState() interface{} {
-	return &s.State
-}

chain/actors/builtin/cron/v7.go

@@ -1,35 +0,0 @@
-package cron
-
-import (
-	"github.com/ipfs/go-cid"
-
-	"github.com/filecoin-project/lotus/chain/actors/adt"
-
-	cron7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/cron"
-)
-
-var _ State = (*state7)(nil)
-
-func load7(store adt.Store, root cid.Cid) (State, error) {
-	out := state7{store: store}
-	err := store.Get(store.Context(), root, &out)
-	if err != nil {
-		return nil, err
-	}
-	return &out, nil
-}
-
-func make7(store adt.Store) (State, error) {
-	out := state7{store: store}
-	out.State = *cron7.ConstructState(cron7.BuiltInEntries())
-	return &out, nil
-}
-
-type state7 struct {
-	cron7.State
-	store adt.Store
-}
-
-func (s *state7) GetState() interface{} {
-	return &s.State
-}

chain/actors/builtin/init/init.go

@@ -23,10 +23,6 @@ import (
 	builtin4 "github.com/filecoin-project/specs-actors/v4/actors/builtin"
 
 	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
-
-	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
-
-	builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
 )
 
 func init() {
@@ -50,19 +46,11 @@ func init() {
 	builtin.RegisterActorState(builtin5.InitActorCodeID, func(store adt.Store, root cid.Cid) (cbor.Marshaler, error) {
 		return load5(store, root)
 	})
-
-	builtin.RegisterActorState(builtin6.InitActorCodeID, func(store adt.Store, root cid.Cid) (cbor.Marshaler, error) {
-		return load6(store, root)
-	})
-
-	builtin.RegisterActorState(builtin7.InitActorCodeID, func(store adt.Store, root cid.Cid) (cbor.Marshaler, error) {
-		return load7(store, root)
-	})
 }
 
 var (
-	Address = builtin7.InitActorAddr
-	Methods = builtin7.MethodsInit
+	Address = builtin5.InitActorAddr
+	Methods = builtin5.MethodsInit
 )
 
 func Load(store adt.Store, act *types.Actor) (State, error) {
@@ -83,12 +71,6 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 	case builtin5.InitActorCodeID:
 		return load5(store, act.Head)
 
-	case builtin6.InitActorCodeID:
-		return load6(store, act.Head)
-
-	case builtin7.InitActorCodeID:
-		return load7(store, act.Head)
-
 	}
 	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
 }
@@ -111,12 +93,6 @@ func MakeState(store adt.Store, av actors.Version, networkName string) (State, e
 	case actors.Version5:
 		return make5(store, networkName)
 
-	case actors.Version6:
-		return make6(store, networkName)
-
-	case actors.Version7:
-		return make7(store, networkName)
-
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -139,12 +115,6 @@ func GetActorCodeID(av actors.Version) (cid.Cid, error) {
 	case actors.Version5:
 		return builtin5.InitActorCodeID, nil
 
-	case actors.Version6:
-		return builtin6.InitActorCodeID, nil
-
-	case actors.Version7:
-		return builtin7.InitActorCodeID, nil
-
 	}
 
 	return cid.Undef, xerrors.Errorf("unknown actor version %d", av)

chain/actors/builtin/init/v6.go

@@ -1,114 +0,0 @@
-package init
-
-import (
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
-	"github.com/ipfs/go-cid"
-	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
-
-	"github.com/filecoin-project/lotus/chain/actors/adt"
-	"github.com/filecoin-project/lotus/node/modules/dtypes"
-
-	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
-
-	init6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/init"
-	adt6 "github.com/filecoin-project/specs-actors/v6/actors/util/adt"
-)
-
-var _ State = (*state6)(nil)
-
-func load6(store adt.Store, root cid.Cid) (State, error) {
-	out := state6{store: store}
-	err := store.Get(store.Context(), root, &out)
-	if err != nil {
-		return nil, err
-	}
-	return &out, nil
-}
-
-func make6(store adt.Store, networkName string) (State, error) {
-	out := state6{store: store}
-
-	s, err := init6.ConstructState(store, networkName)
-	if err != nil {
-		return nil, err
-	}
-
-	out.State = *s
-
-	return &out, nil
-}
-
-type state6 struct {
-	init6.State
-	store adt.Store
-}
-
-func (s *state6) ResolveAddress(address address.Address) (address.Address, bool, error) {
-	return s.State.ResolveAddress(s.store, address)
-}
-
-func (s *state6) MapAddressToNewID(address address.Address) (address.Address, error) {
-	return s.State.MapAddressToNewID(s.store, address)
-}
-
-func (s *state6) ForEachActor(cb func(id abi.ActorID, address address.Address) error) error {
-	addrs, err := adt6.AsMap(s.store, s.State.AddressMap, builtin6.DefaultHamtBitwidth)
-	if err != nil {
-		return err
-	}
-	var actorID cbg.CborInt
-	return addrs.ForEach(&actorID, func(key string) error {
-		addr, err := address.NewFromBytes([]byte(key))
-		if err != nil {
-			return err
-		}
-		return cb(abi.ActorID(actorID), addr)
-	})
-}
-
-func (s *state6) NetworkName() (dtypes.NetworkName, error) {
-	return dtypes.NetworkName(s.State.NetworkName), nil
-}
-
-func (s *state6) SetNetworkName(name string) error {
-	s.State.NetworkName = name
-	return nil
-}
-
-func (s *state6) SetNextID(id abi.ActorID) error {
-	s.State.NextID = id
-	return nil
-}
-
-func (s *state6) Remove(addrs ...address.Address) (err error) {
-	m, err := adt6.AsMap(s.store, s.State.AddressMap, builtin6.DefaultHamtBitwidth)
-	if err != nil {
-		return err
-	}
-	for _, addr := range addrs {
-		if err = m.Delete(abi.AddrKey(addr)); err != nil {
-			return xerrors.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
-		}
-	}
-	amr, err := m.Root()
-	if err != nil {
-		return xerrors.Errorf("failed to get address map root: %w", err)
-	}
-	s.State.AddressMap = amr
-	return nil
-}
-
-func (s *state6) SetAddressMap(mcid cid.Cid) error {
-	s.State.AddressMap = mcid
-	return nil
-}
-
-func (s *state6) AddressMap() (adt.Map, error) {
-	return adt6.AsMap(s.store, s.State.AddressMap, builtin6.DefaultHamtBitwidth)
-}
-
-func (s *state6) GetState() interface{} {
-	return &s.State
-}

chain/actors/builtin/init/v7.go

@@ -1,114 +0,0 @@
-package init
-
-import (
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
-	"github.com/ipfs/go-cid"
-	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
-
-	"github.com/filecoin-project/lotus/chain/actors/adt"
-	"github.com/filecoin-project/lotus/node/modules/dtypes"
-
-	builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
-
-	init7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/init"
-	adt7 "github.com/filecoin-project/specs-actors/v7/actors/util/adt"
-)
-
-var _ State = (*state7)(nil)
-
-func load7(store adt.Store, root cid.Cid) (State, error) {
-	out := state7{store: store}
-	err := store.Get(store.Context(), root, &out)
-	if err != nil {
-		return nil, err
-	}
-	return &out, nil
-}
-
-func make7(store adt.Store, networkName string) (State, error) {
-	out := state7{store: store}
-
-	s, err := init7.ConstructState(store, networkName)
-	if err != nil {
-		return nil, err
-	}
-
-	out.State = *s
-
-	return &out, nil
-}
-
-type state7 struct {
-	init7.State
-	store adt.Store
-}
-
-func (s *state7) ResolveAddress(address address.Address) (address.Address, bool, error) {
-	return s.State.ResolveAddress(s.store, address)
-}
-
-func (s *state7) MapAddressToNewID(address address.Address) (address.Address, error) {
-	return s.State.MapAddressToNewID(s.store, address)
-}
-
-func (s *state7) ForEachActor(cb func(id abi.ActorID, address address.Address) error) error {
-	addrs, err := adt7.AsMap(s.store, s.State.AddressMap, builtin7.DefaultHamtBitwidth)
-	if err != nil {
-		return err
-	}
-	var actorID cbg.CborInt
-	return addrs.ForEach(&actorID, func(key string) error {
-		addr, err := address.NewFromBytes([]byte(key))
-		if err != nil {
-			return err
-		}
-		return cb(abi.ActorID(actorID), addr)
-	})
-}
-
-func (s *state7) NetworkName() (dtypes.NetworkName, error) {
-	return dtypes.NetworkName(s.State.NetworkName), nil
-}
-
-func (s *state7) SetNetworkName(name string) error {
-	s.State.NetworkName = name
-	return nil
-}
-
-func (s *state7) SetNextID(id abi.ActorID) error {
-	s.State.NextID = id
-	return nil
-}
-
-func (s *state7) Remove(addrs ...address.Address) (err error) {
-	m, err := adt7.AsMap(s.store, s.State.AddressMap, builtin7.DefaultHamtBitwidth)
-	if err != nil {
-		return err
-	}
-	for _, addr := range addrs {
-		if err = m.Delete(abi.AddrKey(addr)); err != nil {
-			return xerrors.Errorf("failed to delete entry for address: %s; err: %w", addr, err)
-		}
-	}
-	amr, err := m.Root()
-	if err != nil {
-		return xerrors.Errorf("failed to get address map root: %w", err)
-	}
-	s.State.AddressMap = amr
-	return nil
-}
-
-func (s *state7) SetAddressMap(mcid cid.Cid) error {
-	s.State.AddressMap = mcid
-	return nil
-}
-
-func (s *state7) AddressMap() (adt.Map, error) {
-	return adt7.AsMap(s.store, s.State.AddressMap, builtin7.DefaultHamtBitwidth)
-}
-
-func (s *state7) GetState() interface{} {
-	return &s.State
-}

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

@@ -1,7 +1,6 @@
 package market
 
 import (
-	"github.com/filecoin-project/go-state-types/network"
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"
@@ -104,28 +103,7 @@ type DealProposals interface {
 }
 
 type PublishStorageDealsParams = market0.PublishStorageDealsParams
-
-type PublishStorageDealsReturn interface {
-    DealIDs() ([]abi.DealID, error)
-	// Note that this index is based on the batch of deals that were published, NOT the DealID
-	IsDealValid(index uint64) (bool, error)
-}
-
-func DecodePublishStorageDealsReturn(b []byte, nv network.Version) (PublishStorageDealsReturn, error) {
-	av, err := actors.VersionForNetwork(nv)
-	if err != nil {
-		return nil, err
-	}
-
-	switch av {
-{{range .versions}}
-	case actors.Version{{.}}:
-		return decodePublishStorageDealsReturn{{.}}(b)
-{{end}}
-}
-	return nil, xerrors.Errorf("unknown actor version %d", av)
-}
-
+type PublishStorageDealsReturn = market0.PublishStorageDealsReturn
 type VerifyDealsForActivationParams = market0.VerifyDealsForActivationParams
 type WithdrawBalanceParams = market0.WithdrawBalanceParams
 

chain/actors/builtin/market/market.go

@@ -1,7 +1,6 @@
 package market
 
 import (
-	"github.com/filecoin-project/go-state-types/network"
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"
@@ -23,10 +22,6 @@ import (
 
 	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
 
-	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
-
-	builtin7 "github.com/filecoin-project/specs-actors/v7/actors/builtin"
-
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/actors/builtin"
@@ -54,19 +49,11 @@ func init() {
 	builtin.RegisterActorState(builtin5.StorageMarketActorCodeID, func(store adt.Store, root cid.Cid) (cbor.Marshaler, error) {
 		return load5(store, root)
 	})
-
-	builtin.RegisterActorState(builtin6.StorageMarketActorCodeID, func(store adt.Store, root cid.Cid) (cbor.Marshaler, error) {
-		return load6(store, root)
-	})
-
-	builtin.RegisterActorState(builtin7.StorageMarketActorCodeID, func(store adt.Store, root cid.Cid) (cbor.Marshaler, error) {
-		return load7(store, root)
-	})
 }
 
 var (
-	Address = builtin7.StorageMarketActorAddr
-	Methods = builtin7.MethodsMarket
+	Address = builtin5.StorageMarketActorAddr
+	Methods = builtin5.MethodsMarket
 )
 
 func Load(store adt.Store, act *types.Actor) (State, error) {
@@ -87,12 +74,6 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 	case builtin5.StorageMarketActorCodeID:
 		return load5(store, act.Head)
 
-	case builtin6.StorageMarketActorCodeID:
-		return load6(store, act.Head)
-
-	case builtin7.StorageMarketActorCodeID:
-		return load7(store, act.Head)
-
 	}
 	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
 }
@@ -115,12 +96,6 @@ func MakeState(store adt.Store, av actors.Version) (State, error) {
 	case actors.Version5:
 		return make5(store)
 
-	case actors.Version6:
-		return make6(store)
-
-	case actors.Version7:
-		return make7(store)
-
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -143,12 +118,6 @@ func GetActorCodeID(av actors.Version) (cid.Cid, error) {
 	case actors.Version5:
 		return builtin5.StorageMarketActorCodeID, nil
 
-	case actors.Version6:
-		return builtin6.StorageMarketActorCodeID, nil
-
-	case actors.Version7:
-		return builtin7.StorageMarketActorCodeID, nil
-
 	}
 
 	return cid.Undef, xerrors.Errorf("unknown actor version %d", av)
@@ -193,46 +162,7 @@ type DealProposals interface {
 }
 
 type PublishStorageDealsParams = market0.PublishStorageDealsParams
-
-type PublishStorageDealsReturn interface {
-	DealIDs() ([]abi.DealID, error)
-	// Note that this index is based on the batch of deals that were published, NOT the DealID
-	IsDealValid(index uint64) (bool, error)
-}
-
-func DecodePublishStorageDealsReturn(b []byte, nv network.Version) (PublishStorageDealsReturn, error) {
-	av, err := actors.VersionForNetwork(nv)
-	if err != nil {
-		return nil, err
-	}
-
-	switch av {
-
-	case actors.Version0:
-		return decodePublishStorageDealsReturn0(b)
-
-	case actors.Version2:
-		return decodePublishStorageDealsReturn2(b)
-
-	case actors.Version3:
-		return decodePublishStorageDealsReturn3(b)
-
-	case actors.Version4:
-		return decodePublishStorageDealsReturn4(b)
-
-	case actors.Version5:
-		return decodePublishStorageDealsReturn5(b)
-
-	case actors.Version6:
-		return decodePublishStorageDealsReturn6(b)
-
-	case actors.Version7:
-		return decodePublishStorageDealsReturn7(b)
-
-	}
-	return nil, xerrors.Errorf("unknown actor version %d", av)
-}
-
+type PublishStorageDealsReturn = market0.PublishStorageDealsReturn
 type VerifyDealsForActivationParams = market0.VerifyDealsForActivationParams
 type WithdrawBalanceParams = market0.WithdrawBalanceParams
 

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

@@ -7,7 +7,6 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/types"
@@ -237,31 +236,3 @@ func fromV{{.v}}DealProposal(v{{.v}} market{{.v}}.DealProposal) DealProposal {
 func (s *state{{.v}}) GetState() interface{} {
 	return &s.State
 }
-
-var _ PublishStorageDealsReturn = (*publishStorageDealsReturn{{.v}})(nil)
-
-func decodePublishStorageDealsReturn{{.v}}(b []byte) (PublishStorageDealsReturn, error) {
-	var retval market{{.v}}.PublishStorageDealsReturn
-	if err := retval.UnmarshalCBOR(bytes.NewReader(b)); err != nil {
-		return nil, xerrors.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err)
-	}
-
-	return &publishStorageDealsReturn{{.v}}{retval}, nil
-}
-
-type publishStorageDealsReturn{{.v}} struct {
-	market{{.v}}.PublishStorageDealsReturn
-}
-
-func (r *publishStorageDealsReturn{{.v}}) IsDealValid(index uint64) (bool, error) {
-	{{if (ge .v 6)}}
-	    return r.ValidDeals.IsSet(index)
-	{{else}}
-	    // PublishStorageDeals only succeeded if all deals were valid in this version of actors
-	    return true, nil
-	{{end}}
-}
-
-func (r *publishStorageDealsReturn{{.v}}) DealIDs() ([]abi.DealID, error) {
-    return r.IDs, nil
-}

chain/actors/builtin/market/v0.go

@@ -7,7 +7,6 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/types"
@@ -230,29 +229,3 @@ func fromV0DealProposal(v0 market0.DealProposal) DealProposal {
 func (s *state0) GetState() interface{} {
 	return &s.State
 }
-
-var _ PublishStorageDealsReturn = (*publishStorageDealsReturn0)(nil)
-
-func decodePublishStorageDealsReturn0(b []byte) (PublishStorageDealsReturn, error) {
-	var retval market0.PublishStorageDealsReturn
-	if err := retval.UnmarshalCBOR(bytes.NewReader(b)); err != nil {
-		return nil, xerrors.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err)
-	}
-
-	return &publishStorageDealsReturn0{retval}, nil
-}
-
-type publishStorageDealsReturn0 struct {
-	market0.PublishStorageDealsReturn
-}
-
-func (r *publishStorageDealsReturn0) IsDealValid(index uint64) (bool, error) {
-
-	// PublishStorageDeals only succeeded if all deals were valid in this version of actors
-	return true, nil
-
-}
-
-func (r *publishStorageDealsReturn0) DealIDs() ([]abi.DealID, error) {
-	return r.IDs, nil
-}