build binaries

.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,6 +340,10 @@ 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
@@ -351,6 +367,11 @@ jobs:
           name: Install Rust
           command: |
             curl https://sh.rustup.rs -sSf | sh -s -- -y
+      - run:
+          name: Install jq
+          command: |
+            sudo curl --location https://github.com/stedolan/jq/releases/download/jq-1.6/jq-osx-amd64 --output /usr/local/bin/jq
+            sudo 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:
@@ -417,6 +435,8 @@ jobs:
           command: |
             mkdir appimage
             mv Lotus-*.AppImage appimage
+      - store_artifacts:
+          path: appimage
       - persist_to_workspace:
           root: "."
           paths:
@@ -705,6 +725,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,21 +812,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_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
@@ -805,16 +827,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
@@ -830,11 +842,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
@@ -945,18 +952,14 @@ workflows:
           codecov-upload: false
           suite: conformance-bleeding-edge
           target: "./conformance"
-          vectors-branch: specs-actors-v7
+          vectors-branch: master
       - trigger-testplans:
           filters:
             branches:
               only:
                 - master
       - build-debug
-      - build-all:
-          filters:
-            tags:
-              only:
-                - /^v\d+\.\d+\.\d+(-rc\d+)?$/
+      - build-all
       - build-ntwk-calibration:
           filters:
             tags:
@@ -967,19 +970,19 @@ workflows:
             tags:
               only:
                 - /^v\d+\.\d+\.\d+(-rc\d+)?$/
-      - build-lotus-soup
-      - build-macos:
+      - build-ntwk-nerpa:
           filters:
-            branches:
-              ignore:
-                - /.*/
             tags:
               only:
                 - /^v\d+\.\d+\.\d+(-rc\d+)?$/
+      - build-lotus-soup
+      - build-macos
+      - build-appimage
       - publish:
           requires:
             - build-all
             - build-macos
+            - build-appimage
           filters:
             branches:
               ignore:
@@ -1022,6 +1025,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,25 +1,9 @@
-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%
+        threshold: 0.5%
         informational: true
         paths:
           - "testplans"
@@ -33,27 +17,27 @@ coverage:
           - "build"
       markets: 
         target: auto
-        threshold: 1%
+        threshold: 0.5%
         informational: false        
         paths: 
           - "markets"
           - "paychmgr"
       miner: 
         target: auto
-        threshold: 1.5%
+        threshold: 0.5%
         informational: false       
         paths: 
           - "miner"
           - "storage"
       chain:
         target: auto
-        threshold: 1%
+        threshold: 0.5%
         informational: false
         paths:
           - "chain"
-      node:
+      node: 
         target: auto
-        threshold: 1%
+        threshold: 0.5%
         informational: false
         paths: 
           - "node"
@@ -66,8 +50,8 @@ coverage:
           - "journal"
       cli: 
         target: auto
-        threshold: 1%
+        threshold: 0.5%
         informational: true
         paths: 
           - "cli"
-          - "cmd"
+          - "cmd"

.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,465 +1,5 @@
 # Lotus changelog
 
-# v1.13.2 /  2022-01-09
-
-Lotus v1.13.2 is a *highly recommended* feature release with remarkable retrieval improvements, new features like 
-worker management, schedule enhancements and so on. 
-
-## 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, 

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

Makefile

@@ -76,6 +76,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
 
@@ -291,7 +294,6 @@ method-gen: api-gen
 	(cd ./lotuspond/front/src/chain && $(GOCC) run ./methodgen.go)
 
 actors-gen:
-	$(GOCC) run ./gen/inline-gen . gen/inlinegen-data.json
 	$(GOCC) run ./chain/actors/agen
 	$(GOCC) fmt ./...
 
@@ -342,7 +344,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 +354,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

@@ -27,6 +27,7 @@ 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"
 )
@@ -71,6 +72,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.
@@ -289,7 +296,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
@@ -350,11 +357,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
@@ -585,11 +591,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 +630,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>,
@@ -933,14 +930,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
 
+	FromLocalCAR string // if specified, get data from a local CARv2 file.
+	// TODO: support offset
+	Total                   types.BigInt
 	UnsealPrice             types.BigInt
 	PaymentInterval         uint64
 	PaymentIntervalIncrease uint64

api/api_gateway.go

@@ -31,17 +31,13 @@ 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_storage.go

@@ -166,7 +166,6 @@ type StorageMiner interface {
 	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.
@@ -268,11 +267,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
@@ -280,7 +274,6 @@ type SectorInfo struct {
 	CommR        *cid.Cid
 	Proof        []byte
 	Deals        []abi.DealID
-	Pieces       []SectorPiece
 	Ticket       SealTicket
 	Seed         SealSeed
 	PreCommitMsg *cid.Cid

api/docgen/docgen.go

@@ -13,8 +13,10 @@ import (
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-bitfield"
+	"github.com/filecoin-project/go-multistore"
 	"github.com/google/uuid"
 	"github.com/ipfs/go-cid"
+	"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"
@@ -23,10 +25,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"
@@ -89,10 +90,8 @@ func init() {
 	addExample(pid)
 	addExample(&pid)
 
+	multistoreIDExample := multistore.StoreID(50)
 	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
 
 	addExample(bitfield.NewFromSet([]uint64{5}))
 	addExample(abi.RegisteredSealProof_StackedDrg32GiBV1_1)
@@ -111,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))
@@ -124,12 +124,10 @@ func init() {
 	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})
@@ -181,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))
@@ -231,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,
 		},
 	})
@@ -288,7 +284,6 @@ func init() {
 		State: "ShardStateAvailable",
 		Error: "<error>",
 	})
-	addExample(storiface.ResourceTable)
 }
 
 func GetAPIType(name, pkg string) (i interface{}, t reflect.Type, permStruct []reflect.Type) {

api/mocks/mock_full.go

@@ -24,7 +24,7 @@ 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"
 	miner0 "github.com/filecoin-project/specs-actors/actors/builtin/miner"
@@ -299,6 +299,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()
@@ -536,20 +566,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()
@@ -788,18 +804,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 +831,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 +995,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 +1442,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.
@@ -2289,36 +2275,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

@@ -27,7 +27,7 @@ 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/specs-storage/storage"
@@ -63,8 +63,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"`
@@ -129,6 +127,10 @@ type FullNodeStruct struct {
 
 		ChainGetPath func(p0 context.Context, p1 types.TipSetKey, p2 types.TipSetKey) ([]*HeadChange, error) `perm:"read"`
 
+		ChainGetRandomnessFromBeacon func(p0 context.Context, p1 types.TipSetKey, p2 crypto.DomainSeparationTag, p3 abi.ChainEpoch, p4 []byte) (abi.Randomness, 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"`
 
 		ChainGetTipSetAfterHeight func(p0 context.Context, p1 abi.ChainEpoch, p2 types.TipSetKey) (*types.TipSet, error) `perm:"read"`
@@ -161,8 +163,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"`
@@ -195,11 +195,11 @@ type FullNodeStruct struct {
 
 		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"`
 
@@ -271,9 +271,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"`
 
@@ -349,10 +347,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"`
-
 		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"`
@@ -481,16 +475,8 @@ 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) ``
@@ -692,8 +678,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"`
@@ -962,17 +946,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
@@ -1182,6 +1155,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
@@ -1358,17 +1353,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
@@ -1545,15 +1529,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 {
@@ -1567,15 +1551,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) {
@@ -1963,25 +1947,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
 }
 
@@ -2392,28 +2365,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
@@ -3063,17 +3014,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
@@ -3085,39 +3025,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
@@ -4086,17 +3993,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

api/types.go

@@ -5,10 +5,11 @@ 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"
+
+	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"
@@ -193,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

@@ -12,7 +12,6 @@ import (
 	"github.com/filecoin-project/go-state-types/crypto"
 	"github.com/filecoin-project/go-state-types/dline"
 	"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"
@@ -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/proxy_gen.go

@@ -125,11 +125,11 @@ type FullNodeStruct struct {
 
 		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"`
@@ -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

api/v0api/v0mocks/mock_full.go

@@ -21,10 +21,8 @@ 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"
@@ -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()
@@ -2172,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, 4, 0)
+	FullAPIVersion0 = newVer(1, 3, 0)
 	FullAPIVersion1 = newVer(2, 1, 0)
 
 	MinerAPIVersion0  = newVer(1, 2, 0)
-	WorkerAPIVersion0 = newVer(1, 5, 0)
+	WorkerAPIVersion0 = newVer(1, 1, 0)
 )
 
 //nolint:varcheck,deadcode

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 {

build/bootstrap/butterflynet.pi

@@ -1,2 +1,2 @@
-/dns4/bootstrap-0.butterfly.fildev.network/tcp/1347/p2p/12D3KooWBzv5sf4eTyo8cjJGfGnpxo6QkEPkRShG9GqjE2A5QaW5
-/dns4/bootstrap-1.butterfly.fildev.network/tcp/1347/p2p/12D3KooWBo9TSD4XXRFtu6snv6QNYvXgRaSaVb116YiYEsDWgKtq
+/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.Version14
-
 var UpgradeBreezeHeight = abi.ChainEpoch(-1)
 
 const BreezeGasTampingDuration = 0
@@ -45,8 +41,6 @@ var UpgradeTurboHeight = abi.ChainEpoch(-15)
 
 var UpgradeHyperdriveHeight = abi.ChainEpoch(-16)
 
-var UpgradeChocolateHeight = abi.ChainEpoch(-17)
-
 var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0: DrandMainnet,
 }
@@ -87,10 +81,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)
 
 	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.Version13
-
 const BootstrappersFile = "butterflynet.pi"
 const GenesisFile = "butterflynet.car"
 
@@ -27,20 +23,19 @@ 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 = 6360
+const UpgradeTapeHeight = 60
+const UpgradeLiftoffHeight = -5
+const UpgradeKumquatHeight = 90
+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))

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"
 
@@ -52,8 +48,6 @@ const UpgradeTurboHeight = 390
 
 const UpgradeHyperdriveHeight = 420
 
-const UpgradeChocolateHeight = 312746
-
 func init() {
 	policy.SetConsensusMinerMinPower(abi.NewStoragePower(32 << 30))
 	policy.SetSupportedProofTypes(
@@ -66,7 +60,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
@@ -46,7 +43,6 @@ var UpgradeNorwegianHeight = abi.ChainEpoch(-14)
 var UpgradeTurboHeight = abi.ChainEpoch(-15)
 
 var UpgradeHyperdriveHeight = abi.ChainEpoch(-16)
-var UpgradeChocolateHeight = abi.ChainEpoch(-17)
 
 var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0: DrandMainnet,
@@ -96,7 +92,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"
 
@@ -64,16 +65,13 @@ const UpgradeTurboHeight = 712320
 // 2021-06-30T22:00:00Z
 var UpgradeHyperdriveHeight = abi.ChainEpoch(892800)
 
-// 2021-10-26T13:30:00Z
-var UpgradeChocolateHeight = abi.ChainEpoch(1231620)
-
 func init() {
 	if os.Getenv("LOTUS_USE_TEST_ADDRESSES") != "1" {
 		SetAddressNetwork(address.Mainnet)
 	}
 
-	if os.Getenv("LOTUS_DISABLE_CHOCOLATE") == "1" {
-		UpgradeChocolateHeight = 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"
 
@@ -48,8 +44,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
@@ -74,7 +68,6 @@ func init() {
 	Devnet = false
 
 	BuildType = BuildNerpanet
-
 }
 
 const BlockDelaySecs = uint64(builtin2.EpochDurationSeconds)

build/params_shared_vals.go

@@ -1,4 +1,3 @@
-//go:build !testground
 // +build !testground
 
 package build
@@ -26,17 +25,7 @@ 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.Version14
-
-/* inline-gen end */
+const NewestNetworkVersion = network.Version13
 
 // 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.
@@ -98,15 +97,12 @@ var (
 	UpgradeNorwegianHeight  abi.ChainEpoch = -13
 	UpgradeTurboHeight      abi.ChainEpoch = -14
 	UpgradeHyperdriveHeight abi.ChainEpoch = -15
-	UpgradeChocolateHeight  abi.ChainEpoch = -16
 
 	DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 		0: DrandMainnet,
 	}
 
-	GenesisNetworkVersion = network.Version0
-
-	NewestNetworkVersion       = network.Version14
+	NewestNetworkVersion       = network.Version11
 	ActorUpgradeNetworkVersion = network.Version4
 
 	Devnet      = true

build/tools.go

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

build/version.go

@@ -12,10 +12,11 @@ const (
 	BuildDebug        = 0x3
 	BuildCalibnet     = 0x4
 	BuildInteropnet   = 0x5
+	BuildNerpanet     = 0x6
 	BuildButterflynet = 0x7
 )
 
-func BuildTypeString() string {
+func buildType() string {
 	switch BuildType {
 	case BuildDefault:
 		return ""
@@ -29,6 +30,8 @@ func BuildTypeString() string {
 		return "+calibnet"
 	case BuildInteropnet:
 		return "+interopnet"
+	case BuildNerpanet:
+		return "+nerpanet"
 	case BuildButterflynet:
 		return "+butterflynet"
 	default:
@@ -37,12 +40,12 @@ func BuildTypeString() string {
 }
 
 // BuildVersion is the local build version
-const BuildVersion = "1.13.2"
+const BuildVersion = "1.11.2"
 
 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,8 +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"
 )
 
 func init() {
@@ -46,10 +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)
-	})
 }
 
 var Methods = builtin4.MethodsAccount
@@ -72,9 +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)
-
 	}
 	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
 }
@@ -97,9 +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)
-
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -122,9 +110,6 @@ func GetActorCodeID(av actors.Version) (cid.Cid, error) {
 	case actors.Version5:
 		return builtin5.AccountActorCodeID, nil
 
-	case actors.Version6:
-		return builtin6.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/builtin.go

@@ -20,49 +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"
-
 	"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"
 
-	miner6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner"
-	proof6 "github.com/filecoin-project/specs-actors/v6/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 = builtin6.SystemActorAddr
-var BurntFundsActorAddr = builtin6.BurntFundsActorAddr
-var CronActorAddr = builtin6.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 = builtin6.ExpectedLeadersPerEpoch
+	ExpectedLeadersPerEpoch = builtin5.ExpectedLeadersPerEpoch
 )
 
 const (
-	EpochDurationSeconds = builtin6.EpochDurationSeconds
-	EpochsInDay          = builtin6.EpochsInDay
-	SecondsInDay         = builtin6.SecondsInDay
+	EpochDurationSeconds = builtin5.EpochDurationSeconds
+	EpochsInDay          = builtin5.EpochsInDay
+	SecondsInDay         = builtin5.SecondsInDay
 )
 
 const (
-	MethodSend        = builtin6.MethodSend
-	MethodConstructor = builtin6.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 = proof6.SectorInfo
-type PoStProof = proof6.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 miner6.QAPowerForWeight(size, duration, dealWeight, verifiedWeight)
+	return miner5.QAPowerForWeight(size, duration, dealWeight, verifiedWeight)
 }
 
 func FromV0FilterEstimate(v0 smoothing0.FilterEstimate) FilterEstimate {
@@ -95,12 +92,6 @@ func FromV5FilterEstimate(v5 smoothing5.FilterEstimate) FilterEstimate {
 
 }
 
-func FromV6FilterEstimate(v6 smoothing6.FilterEstimate) FilterEstimate {
-
-	return (FilterEstimate)(v6)
-
-}
-
 type ActorStateLoader func(store adt.Store, root cid.Cid) (cbor.Marshaler, error)
 
 var ActorStateLoaders = make(map[cid.Cid]ActorStateLoader)
@@ -135,9 +126,6 @@ func ActorNameByCode(c cid.Cid) string {
 	case builtin5.IsBuiltinActor(c):
 		return builtin5.ActorNameByCode(c)
 
-	case builtin6.IsBuiltinActor(c):
-		return builtin6.ActorNameByCode(c)
-
 	default:
 		return "<unknown>"
 	}
@@ -165,10 +153,6 @@ func IsBuiltinActor(c cid.Cid) bool {
 		return true
 	}
 
-	if builtin6.IsBuiltinActor(c) {
-		return true
-	}
-
 	return false
 }
 
@@ -194,10 +178,6 @@ func IsAccountActor(c cid.Cid) bool {
 		return true
 	}
 
-	if c == builtin6.AccountActorCodeID {
-		return true
-	}
-
 	return false
 }
 
@@ -223,10 +203,6 @@ func IsStorageMinerActor(c cid.Cid) bool {
 		return true
 	}
 
-	if c == builtin6.StorageMinerActorCodeID {
-		return true
-	}
-
 	return false
 }
 
@@ -252,10 +228,6 @@ func IsMultisigActor(c cid.Cid) bool {
 		return true
 	}
 
-	if c == builtin6.MultisigActorCodeID {
-		return true
-	}
-
 	return false
 }
 
@@ -281,10 +253,6 @@ func IsPaymentChannelActor(c cid.Cid) bool {
 		return true
 	}
 
-	if c == builtin6.PaymentChannelActorCodeID {
-		return true
-	}
-
 	return false
 }
 

chain/actors/builtin/cron/cron.go

@@ -15,8 +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"
 )
 
 func MakeState(store adt.Store, av actors.Version) (State, error) {
@@ -37,9 +35,6 @@ func MakeState(store adt.Store, av actors.Version) (State, error) {
 	case actors.Version5:
 		return make5(store)
 
-	case actors.Version6:
-		return make6(store)
-
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -62,17 +57,14 @@ func GetActorCodeID(av actors.Version) (cid.Cid, error) {
 	case actors.Version5:
 		return builtin5.CronActorCodeID, nil
 
-	case actors.Version6:
-		return builtin6.CronActorCodeID, nil
-
 	}
 
 	return cid.Undef, xerrors.Errorf("unknown actor version %d", av)
 }
 
 var (
-	Address = builtin6.CronActorAddr
-	Methods = builtin6.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/init/init.go

@@ -23,8 +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"
 )
 
 func init() {
@@ -48,15 +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)
-	})
 }
 
 var (
-	Address = builtin6.InitActorAddr
-	Methods = builtin6.MethodsInit
+	Address = builtin5.InitActorAddr
+	Methods = builtin5.MethodsInit
 )
 
 func Load(store adt.Store, act *types.Actor) (State, error) {
@@ -77,9 +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)
-
 	}
 	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
 }
@@ -102,9 +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)
-
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -127,9 +115,6 @@ func GetActorCodeID(av actors.Version) (cid.Cid, error) {
 	case actors.Version5:
 		return builtin5.InitActorCodeID, nil
 
-	case actors.Version6:
-		return builtin6.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/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,8 +22,6 @@ import (
 
 	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
 
-	builtin6 "github.com/filecoin-project/specs-actors/v6/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"
@@ -52,15 +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)
-	})
 }
 
 var (
-	Address = builtin6.StorageMarketActorAddr
-	Methods = builtin6.MethodsMarket
+	Address = builtin5.StorageMarketActorAddr
+	Methods = builtin5.MethodsMarket
 )
 
 func Load(store adt.Store, act *types.Actor) (State, error) {
@@ -81,9 +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)
-
 	}
 	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
 }
@@ -106,9 +96,6 @@ func MakeState(store adt.Store, av actors.Version) (State, error) {
 	case actors.Version5:
 		return make5(store)
 
-	case actors.Version6:
-		return make6(store)
-
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -131,9 +118,6 @@ func GetActorCodeID(av actors.Version) (cid.Cid, error) {
 	case actors.Version5:
 		return builtin5.StorageMarketActorCodeID, nil
 
-	case actors.Version6:
-		return builtin6.StorageMarketActorCodeID, nil
-
 	}
 
 	return cid.Undef, xerrors.Errorf("unknown actor version %d", av)
@@ -178,43 +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)
-
-	}
-	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
-}

chain/actors/builtin/market/v2.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 fromV2DealProposal(v2 market2.DealProposal) DealProposal {
 func (s *state2) GetState() interface{} {
 	return &s.State
 }
-
-var _ PublishStorageDealsReturn = (*publishStorageDealsReturn2)(nil)
-
-func decodePublishStorageDealsReturn2(b []byte) (PublishStorageDealsReturn, error) {
-	var retval market2.PublishStorageDealsReturn
-	if err := retval.UnmarshalCBOR(bytes.NewReader(b)); err != nil {
-		return nil, xerrors.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err)
-	}
-
-	return &publishStorageDealsReturn2{retval}, nil
-}
-
-type publishStorageDealsReturn2 struct {
-	market2.PublishStorageDealsReturn
-}
-
-func (r *publishStorageDealsReturn2) IsDealValid(index uint64) (bool, error) {
-
-	// PublishStorageDeals only succeeded if all deals were valid in this version of actors
-	return true, nil
-
-}
-
-func (r *publishStorageDealsReturn2) DealIDs() ([]abi.DealID, error) {
-	return r.IDs, nil
-}

chain/actors/builtin/market/v3.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"
@@ -225,29 +224,3 @@ func fromV3DealProposal(v3 market3.DealProposal) DealProposal {
 func (s *state3) GetState() interface{} {
 	return &s.State
 }
-
-var _ PublishStorageDealsReturn = (*publishStorageDealsReturn3)(nil)
-
-func decodePublishStorageDealsReturn3(b []byte) (PublishStorageDealsReturn, error) {
-	var retval market3.PublishStorageDealsReturn
-	if err := retval.UnmarshalCBOR(bytes.NewReader(b)); err != nil {
-		return nil, xerrors.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err)
-	}
-
-	return &publishStorageDealsReturn3{retval}, nil
-}
-
-type publishStorageDealsReturn3 struct {
-	market3.PublishStorageDealsReturn
-}
-
-func (r *publishStorageDealsReturn3) IsDealValid(index uint64) (bool, error) {
-
-	// PublishStorageDeals only succeeded if all deals were valid in this version of actors
-	return true, nil
-
-}
-
-func (r *publishStorageDealsReturn3) DealIDs() ([]abi.DealID, error) {
-	return r.IDs, nil
-}

chain/actors/builtin/market/v4.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"
@@ -225,29 +224,3 @@ func fromV4DealProposal(v4 market4.DealProposal) DealProposal {
 func (s *state4) GetState() interface{} {
 	return &s.State
 }
-
-var _ PublishStorageDealsReturn = (*publishStorageDealsReturn4)(nil)
-
-func decodePublishStorageDealsReturn4(b []byte) (PublishStorageDealsReturn, error) {
-	var retval market4.PublishStorageDealsReturn
-	if err := retval.UnmarshalCBOR(bytes.NewReader(b)); err != nil {
-		return nil, xerrors.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err)
-	}
-
-	return &publishStorageDealsReturn4{retval}, nil
-}
-
-type publishStorageDealsReturn4 struct {
-	market4.PublishStorageDealsReturn
-}
-
-func (r *publishStorageDealsReturn4) IsDealValid(index uint64) (bool, error) {
-
-	// PublishStorageDeals only succeeded if all deals were valid in this version of actors
-	return true, nil
-
-}
-
-func (r *publishStorageDealsReturn4) DealIDs() ([]abi.DealID, error) {
-	return r.IDs, nil
-}

chain/actors/builtin/market/v5.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"
@@ -225,29 +224,3 @@ func fromV5DealProposal(v5 market5.DealProposal) DealProposal {
 func (s *state5) GetState() interface{} {
 	return &s.State
 }
-
-var _ PublishStorageDealsReturn = (*publishStorageDealsReturn5)(nil)
-
-func decodePublishStorageDealsReturn5(b []byte) (PublishStorageDealsReturn, error) {
-	var retval market5.PublishStorageDealsReturn
-	if err := retval.UnmarshalCBOR(bytes.NewReader(b)); err != nil {
-		return nil, xerrors.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err)
-	}
-
-	return &publishStorageDealsReturn5{retval}, nil
-}
-
-type publishStorageDealsReturn5 struct {
-	market5.PublishStorageDealsReturn
-}
-
-func (r *publishStorageDealsReturn5) IsDealValid(index uint64) (bool, error) {
-
-	// PublishStorageDeals only succeeded if all deals were valid in this version of actors
-	return true, nil
-
-}
-
-func (r *publishStorageDealsReturn5) DealIDs() ([]abi.DealID, error) {
-	return r.IDs, nil
-}

chain/actors/builtin/market/v6.go

@@ -1,252 +0,0 @@
-package market
-
-import (
-	"bytes"
-
-	"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/chain/types"
-
-	market6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/market"
-	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) (State, error) {
-	out := state6{store: store}
-
-	s, err := market6.ConstructState(store)
-	if err != nil {
-		return nil, err
-	}
-
-	out.State = *s
-
-	return &out, nil
-}
-
-type state6 struct {
-	market6.State
-	store adt.Store
-}
-
-func (s *state6) TotalLocked() (abi.TokenAmount, error) {
-	fml := types.BigAdd(s.TotalClientLockedCollateral, s.TotalProviderLockedCollateral)
-	fml = types.BigAdd(fml, s.TotalClientStorageFee)
-	return fml, nil
-}
-
-func (s *state6) BalancesChanged(otherState State) (bool, error) {
-	otherState6, ok := otherState.(*state6)
-	if !ok {
-		// there's no way to compare different versions of the state, so let's
-		// just say that means the state of balances has changed
-		return true, nil
-	}
-	return !s.State.EscrowTable.Equals(otherState6.State.EscrowTable) || !s.State.LockedTable.Equals(otherState6.State.LockedTable), nil
-}
-
-func (s *state6) StatesChanged(otherState State) (bool, error) {
-	otherState6, ok := otherState.(*state6)
-	if !ok {
-		// there's no way to compare different versions of the state, so let's
-		// just say that means the state of balances has changed
-		return true, nil
-	}
-	return !s.State.States.Equals(otherState6.State.States), nil
-}
-
-func (s *state6) States() (DealStates, error) {
-	stateArray, err := adt6.AsArray(s.store, s.State.States, market6.StatesAmtBitwidth)
-	if err != nil {
-		return nil, err
-	}
-	return &dealStates6{stateArray}, nil
-}
-
-func (s *state6) ProposalsChanged(otherState State) (bool, error) {
-	otherState6, ok := otherState.(*state6)
-	if !ok {
-		// there's no way to compare different versions of the state, so let's
-		// just say that means the state of balances has changed
-		return true, nil
-	}
-	return !s.State.Proposals.Equals(otherState6.State.Proposals), nil
-}
-
-func (s *state6) Proposals() (DealProposals, error) {
-	proposalArray, err := adt6.AsArray(s.store, s.State.Proposals, market6.ProposalsAmtBitwidth)
-	if err != nil {
-		return nil, err
-	}
-	return &dealProposals6{proposalArray}, nil
-}
-
-func (s *state6) EscrowTable() (BalanceTable, error) {
-	bt, err := adt6.AsBalanceTable(s.store, s.State.EscrowTable)
-	if err != nil {
-		return nil, err
-	}
-	return &balanceTable6{bt}, nil
-}
-
-func (s *state6) LockedTable() (BalanceTable, error) {
-	bt, err := adt6.AsBalanceTable(s.store, s.State.LockedTable)
-	if err != nil {
-		return nil, err
-	}
-	return &balanceTable6{bt}, nil
-}
-
-func (s *state6) VerifyDealsForActivation(
-	minerAddr address.Address, deals []abi.DealID, currEpoch, sectorExpiry abi.ChainEpoch,
-) (weight, verifiedWeight abi.DealWeight, err error) {
-	w, vw, _, err := market6.ValidateDealsForActivation(&s.State, s.store, deals, minerAddr, sectorExpiry, currEpoch)
-	return w, vw, err
-}
-
-func (s *state6) NextID() (abi.DealID, error) {
-	return s.State.NextID, nil
-}
-
-type balanceTable6 struct {
-	*adt6.BalanceTable
-}
-
-func (bt *balanceTable6) ForEach(cb func(address.Address, abi.TokenAmount) error) error {
-	asMap := (*adt6.Map)(bt.BalanceTable)
-	var ta abi.TokenAmount
-	return asMap.ForEach(&ta, func(key string) error {
-		a, err := address.NewFromBytes([]byte(key))
-		if err != nil {
-			return err
-		}
-		return cb(a, ta)
-	})
-}
-
-type dealStates6 struct {
-	adt.Array
-}
-
-func (s *dealStates6) Get(dealID abi.DealID) (*DealState, bool, error) {
-	var deal6 market6.DealState
-	found, err := s.Array.Get(uint64(dealID), &deal6)
-	if err != nil {
-		return nil, false, err
-	}
-	if !found {
-		return nil, false, nil
-	}
-	deal := fromV6DealState(deal6)
-	return &deal, true, nil
-}
-
-func (s *dealStates6) ForEach(cb func(dealID abi.DealID, ds DealState) error) error {
-	var ds6 market6.DealState
-	return s.Array.ForEach(&ds6, func(idx int64) error {
-		return cb(abi.DealID(idx), fromV6DealState(ds6))
-	})
-}
-
-func (s *dealStates6) decode(val *cbg.Deferred) (*DealState, error) {
-	var ds6 market6.DealState
-	if err := ds6.UnmarshalCBOR(bytes.NewReader(val.Raw)); err != nil {
-		return nil, err
-	}
-	ds := fromV6DealState(ds6)
-	return &ds, nil
-}
-
-func (s *dealStates6) array() adt.Array {
-	return s.Array
-}
-
-func fromV6DealState(v6 market6.DealState) DealState {
-	return (DealState)(v6)
-}
-
-type dealProposals6 struct {
-	adt.Array
-}
-
-func (s *dealProposals6) Get(dealID abi.DealID) (*DealProposal, bool, error) {
-	var proposal6 market6.DealProposal
-	found, err := s.Array.Get(uint64(dealID), &proposal6)
-	if err != nil {
-		return nil, false, err
-	}
-	if !found {
-		return nil, false, nil
-	}
-	proposal := fromV6DealProposal(proposal6)
-	return &proposal, true, nil
-}
-
-func (s *dealProposals6) ForEach(cb func(dealID abi.DealID, dp DealProposal) error) error {
-	var dp6 market6.DealProposal
-	return s.Array.ForEach(&dp6, func(idx int64) error {
-		return cb(abi.DealID(idx), fromV6DealProposal(dp6))
-	})
-}
-
-func (s *dealProposals6) decode(val *cbg.Deferred) (*DealProposal, error) {
-	var dp6 market6.DealProposal
-	if err := dp6.UnmarshalCBOR(bytes.NewReader(val.Raw)); err != nil {
-		return nil, err
-	}
-	dp := fromV6DealProposal(dp6)
-	return &dp, nil
-}
-
-func (s *dealProposals6) array() adt.Array {
-	return s.Array
-}
-
-func fromV6DealProposal(v6 market6.DealProposal) DealProposal {
-	return (DealProposal)(v6)
-}
-
-func (s *state6) GetState() interface{} {
-	return &s.State
-}
-
-var _ PublishStorageDealsReturn = (*publishStorageDealsReturn6)(nil)
-
-func decodePublishStorageDealsReturn6(b []byte) (PublishStorageDealsReturn, error) {
-	var retval market6.PublishStorageDealsReturn
-	if err := retval.UnmarshalCBOR(bytes.NewReader(b)); err != nil {
-		return nil, xerrors.Errorf("failed to unmarshal PublishStorageDealsReturn: %w", err)
-	}
-
-	return &publishStorageDealsReturn6{retval}, nil
-}
-
-type publishStorageDealsReturn6 struct {
-	market6.PublishStorageDealsReturn
-}
-
-func (r *publishStorageDealsReturn6) IsDealValid(index uint64) (bool, error) {
-
-	return r.ValidDeals.IsSet(index)
-
-}
-
-func (r *publishStorageDealsReturn6) DealIDs() ([]abi.DealID, error) {
-	return r.IDs, nil
-}

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

@@ -141,28 +141,11 @@ type Deadline interface {
 }
 
 type Partition interface {
-	// AllSectors returns all sector numbers in this partition, including faulty, unproven, and terminated sectors
 	AllSectors() (bitfield.BitField, error)
-
-	// Subset of sectors detected/declared faulty and not yet recovered (excl. from PoSt).
-	// Faults ∩ Terminated = ∅
 	FaultySectors() (bitfield.BitField, error)
-
-	// Subset of faulty sectors expected to recover on next PoSt
-	// Recoveries ∩ Terminated = ∅
 	RecoveringSectors() (bitfield.BitField, error)
-
-	// Live sectors are those that are not terminated (but may be faulty).
 	LiveSectors() (bitfield.BitField, error)
-
-	// Active sectors are those that are neither terminated nor faulty nor unproven, i.e. actively contributing power.
 	ActiveSectors() (bitfield.BitField, error)
-
-	// Unproven sectors in this partition. This bitfield will be cleared on
-	// a successful window post (or at the end of the partition's next
-	// deadline). At that time, any still unproven sectors will be added to
-	// the faulty sector bitfield.
-	UnprovenSectors() (bitfield.BitField, error)
 }
 
 type SectorOnChainInfo struct {

chain/actors/builtin/miner/miner.go

@@ -33,8 +33,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"
 )
 
 func init() {
@@ -59,13 +57,9 @@ func init() {
 		return load5(store, root)
 	})
 
-	builtin.RegisterActorState(builtin6.StorageMinerActorCodeID, func(store adt.Store, root cid.Cid) (cbor.Marshaler, error) {
-		return load6(store, root)
-	})
-
 }
 
-var Methods = builtin6.MethodsMiner
+var Methods = builtin5.MethodsMiner
 
 // Unchanged between v0, v2, v3, v4, and v5 actors
 var WPoStProvingPeriod = miner0.WPoStProvingPeriod
@@ -99,9 +93,6 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 	case builtin5.StorageMinerActorCodeID:
 		return load5(store, act.Head)
 
-	case builtin6.StorageMinerActorCodeID:
-		return load6(store, act.Head)
-
 	}
 	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
 }
@@ -124,9 +115,6 @@ func MakeState(store adt.Store, av actors.Version) (State, error) {
 	case actors.Version5:
 		return make5(store)
 
-	case actors.Version6:
-		return make6(store)
-
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -149,9 +137,6 @@ func GetActorCodeID(av actors.Version) (cid.Cid, error) {
 	case actors.Version5:
 		return builtin5.StorageMinerActorCodeID, nil
 
-	case actors.Version6:
-		return builtin6.StorageMinerActorCodeID, nil
-
 	}
 
 	return cid.Undef, xerrors.Errorf("unknown actor version %d", av)
@@ -215,28 +200,11 @@ type Deadline interface {
 }
 
 type Partition interface {
-	// AllSectors returns all sector numbers in this partition, including faulty, unproven, and terminated sectors
 	AllSectors() (bitfield.BitField, error)
-
-	// Subset of sectors detected/declared faulty and not yet recovered (excl. from PoSt).
-	// Faults ∩ Terminated = ∅
 	FaultySectors() (bitfield.BitField, error)
-
-	// Subset of faulty sectors expected to recover on next PoSt
-	// Recoveries ∩ Terminated = ∅
 	RecoveringSectors() (bitfield.BitField, error)
-
-	// Live sectors are those that are not terminated (but may be faulty).
 	LiveSectors() (bitfield.BitField, error)
-
-	// Active sectors are those that are neither terminated nor faulty nor unproven, i.e. actively contributing power.
 	ActiveSectors() (bitfield.BitField, error)
-
-	// Unproven sectors in this partition. This bitfield will be cleared on
-	// a successful window post (or at the end of the partition's next
-	// deadline). At that time, any still unproven sectors will be added to
-	// the faulty sector bitfield.
-	UnprovenSectors() (bitfield.BitField, error)
 }
 
 type SectorOnChainInfo struct {

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

@@ -549,10 +549,6 @@ func (p *partition{{.v}}) RecoveringSectors() (bitfield.BitField, error) {
 	return p.Partition.Recoveries, nil
 }
 
-func (p *partition{{.v}}) UnprovenSectors() (bitfield.BitField, error) {
-	return {{if (ge .v 2)}}p.Partition.Unproven{{else}}bitfield.New(){{end}}, nil
-}
-
 func fromV{{.v}}SectorOnChainInfo(v{{.v}} miner{{.v}}.SectorOnChainInfo) SectorOnChainInfo {
 {{if (ge .v 2)}}
 	return SectorOnChainInfo{

chain/actors/builtin/miner/utils.go

@@ -67,22 +67,3 @@ func SealProofTypeFromSectorSize(ssize abi.SectorSize, nv network.Version) (abi.
 
 	return 0, xerrors.Errorf("unsupported network version")
 }
-
-// WindowPoStProofTypeFromSectorSize returns preferred post proof type for creating
-// new miner actors and new sectors
-func WindowPoStProofTypeFromSectorSize(ssize abi.SectorSize) (abi.RegisteredPoStProof, error) {
-	switch ssize {
-	case 2 << 10:
-		return abi.RegisteredPoStProof_StackedDrgWindow2KiBV1, nil
-	case 8 << 20:
-		return abi.RegisteredPoStProof_StackedDrgWindow8MiBV1, nil
-	case 512 << 20:
-		return abi.RegisteredPoStProof_StackedDrgWindow512MiBV1, nil
-	case 32 << 30:
-		return abi.RegisteredPoStProof_StackedDrgWindow32GiBV1, nil
-	case 64 << 30:
-		return abi.RegisteredPoStProof_StackedDrgWindow64GiBV1, nil
-	default:
-		return 0, xerrors.Errorf("unsupported sector size for miner: %v", ssize)
-	}
-}

chain/actors/builtin/miner/v0.go

@@ -500,10 +500,6 @@ func (p *partition0) RecoveringSectors() (bitfield.BitField, error) {
 	return p.Partition.Recoveries, nil
 }
 
-func (p *partition0) UnprovenSectors() (bitfield.BitField, error) {
-	return bitfield.New(), nil
-}
-
 func fromV0SectorOnChainInfo(v0 miner0.SectorOnChainInfo) SectorOnChainInfo {
 
 	return (SectorOnChainInfo)(v0)

chain/actors/builtin/miner/v2.go

@@ -530,10 +530,6 @@ func (p *partition2) RecoveringSectors() (bitfield.BitField, error) {
 	return p.Partition.Recoveries, nil
 }
 
-func (p *partition2) UnprovenSectors() (bitfield.BitField, error) {
-	return p.Partition.Unproven, nil
-}
-
 func fromV2SectorOnChainInfo(v2 miner2.SectorOnChainInfo) SectorOnChainInfo {
 
 	return SectorOnChainInfo{

chain/actors/builtin/miner/v3.go

@@ -531,10 +531,6 @@ func (p *partition3) RecoveringSectors() (bitfield.BitField, error) {
 	return p.Partition.Recoveries, nil
 }
 
-func (p *partition3) UnprovenSectors() (bitfield.BitField, error) {
-	return p.Partition.Unproven, nil
-}
-
 func fromV3SectorOnChainInfo(v3 miner3.SectorOnChainInfo) SectorOnChainInfo {
 
 	return SectorOnChainInfo{

chain/actors/builtin/miner/v4.go

@@ -531,10 +531,6 @@ func (p *partition4) RecoveringSectors() (bitfield.BitField, error) {
 	return p.Partition.Recoveries, nil
 }
 
-func (p *partition4) UnprovenSectors() (bitfield.BitField, error) {
-	return p.Partition.Unproven, nil
-}
-
 func fromV4SectorOnChainInfo(v4 miner4.SectorOnChainInfo) SectorOnChainInfo {
 
 	return SectorOnChainInfo{

chain/actors/builtin/miner/v5.go

@@ -531,10 +531,6 @@ func (p *partition5) RecoveringSectors() (bitfield.BitField, error) {
 	return p.Partition.Recoveries, nil
 }
 
-func (p *partition5) UnprovenSectors() (bitfield.BitField, error) {
-	return p.Partition.Unproven, nil
-}
-
 func fromV5SectorOnChainInfo(v5 miner5.SectorOnChainInfo) SectorOnChainInfo {
 
 	return SectorOnChainInfo{

chain/actors/builtin/miner/v6.go

@@ -1,570 +0,0 @@
-package miner
-
-import (
-	"bytes"
-	"errors"
-
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-bitfield"
-	rle "github.com/filecoin-project/go-bitfield/rle"
-	"github.com/filecoin-project/go-state-types/abi"
-	"github.com/filecoin-project/go-state-types/dline"
-	"github.com/ipfs/go-cid"
-	"github.com/libp2p/go-libp2p-core/peer"
-	cbg "github.com/whyrusleeping/cbor-gen"
-	"golang.org/x/xerrors"
-
-	"github.com/filecoin-project/lotus/chain/actors/adt"
-
-	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
-
-	miner6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner"
-	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) (State, error) {
-	out := state6{store: store}
-	out.State = miner6.State{}
-	return &out, nil
-}
-
-type state6 struct {
-	miner6.State
-	store adt.Store
-}
-
-type deadline6 struct {
-	miner6.Deadline
-	store adt.Store
-}
-
-type partition6 struct {
-	miner6.Partition
-	store adt.Store
-}
-
-func (s *state6) AvailableBalance(bal abi.TokenAmount) (available abi.TokenAmount, err error) {
-	defer func() {
-		if r := recover(); r != nil {
-			err = xerrors.Errorf("failed to get available balance: %w", r)
-			available = abi.NewTokenAmount(0)
-		}
-	}()
-	// this panics if the miner doesnt have enough funds to cover their locked pledge
-	available, err = s.GetAvailableBalance(bal)
-	return available, err
-}
-
-func (s *state6) VestedFunds(epoch abi.ChainEpoch) (abi.TokenAmount, error) {
-	return s.CheckVestedFunds(s.store, epoch)
-}
-
-func (s *state6) LockedFunds() (LockedFunds, error) {
-	return LockedFunds{
-		VestingFunds:             s.State.LockedFunds,
-		InitialPledgeRequirement: s.State.InitialPledge,
-		PreCommitDeposits:        s.State.PreCommitDeposits,
-	}, nil
-}
-
-func (s *state6) FeeDebt() (abi.TokenAmount, error) {
-	return s.State.FeeDebt, nil
-}
-
-func (s *state6) InitialPledge() (abi.TokenAmount, error) {
-	return s.State.InitialPledge, nil
-}
-
-func (s *state6) PreCommitDeposits() (abi.TokenAmount, error) {
-	return s.State.PreCommitDeposits, nil
-}
-
-func (s *state6) GetSector(num abi.SectorNumber) (*SectorOnChainInfo, error) {
-	info, ok, err := s.State.GetSector(s.store, num)
-	if !ok || err != nil {
-		return nil, err
-	}
-
-	ret := fromV6SectorOnChainInfo(*info)
-	return &ret, nil
-}
-
-func (s *state6) FindSector(num abi.SectorNumber) (*SectorLocation, error) {
-	dlIdx, partIdx, err := s.State.FindSector(s.store, num)
-	if err != nil {
-		return nil, err
-	}
-	return &SectorLocation{
-		Deadline:  dlIdx,
-		Partition: partIdx,
-	}, nil
-}
-
-func (s *state6) NumLiveSectors() (uint64, error) {
-	dls, err := s.State.LoadDeadlines(s.store)
-	if err != nil {
-		return 0, err
-	}
-	var total uint64
-	if err := dls.ForEach(s.store, func(dlIdx uint64, dl *miner6.Deadline) error {
-		total += dl.LiveSectors
-		return nil
-	}); err != nil {
-		return 0, err
-	}
-	return total, nil
-}
-
-// GetSectorExpiration returns the effective expiration of the given sector.
-//
-// If the sector does not expire early, the Early expiration field is 0.
-func (s *state6) GetSectorExpiration(num abi.SectorNumber) (*SectorExpiration, error) {
-	dls, err := s.State.LoadDeadlines(s.store)
-	if err != nil {
-		return nil, err
-	}
-	// NOTE: this can be optimized significantly.
-	// 1. If the sector is non-faulty, it will either expire on-time (can be
-	// learned from the sector info), or in the next quantized expiration
-	// epoch (i.e., the first element in the partition's expiration queue.
-	// 2. If it's faulty, it will expire early within the first 14 entries
-	// of the expiration queue.
-	stopErr := errors.New("stop")
-	out := SectorExpiration{}
-	err = dls.ForEach(s.store, func(dlIdx uint64, dl *miner6.Deadline) error {
-		partitions, err := dl.PartitionsArray(s.store)
-		if err != nil {
-			return err
-		}
-		quant := s.State.QuantSpecForDeadline(dlIdx)
-		var part miner6.Partition
-		return partitions.ForEach(&part, func(partIdx int64) error {
-			if found, err := part.Sectors.IsSet(uint64(num)); err != nil {
-				return err
-			} else if !found {
-				return nil
-			}
-			if found, err := part.Terminated.IsSet(uint64(num)); err != nil {
-				return err
-			} else if found {
-				// already terminated
-				return stopErr
-			}
-
-			q, err := miner6.LoadExpirationQueue(s.store, part.ExpirationsEpochs, quant, miner6.PartitionExpirationAmtBitwidth)
-			if err != nil {
-				return err
-			}
-			var exp miner6.ExpirationSet
-			return q.ForEach(&exp, func(epoch int64) error {
-				if early, err := exp.EarlySectors.IsSet(uint64(num)); err != nil {
-					return err
-				} else if early {
-					out.Early = abi.ChainEpoch(epoch)
-					return nil
-				}
-				if onTime, err := exp.OnTimeSectors.IsSet(uint64(num)); err != nil {
-					return err
-				} else if onTime {
-					out.OnTime = abi.ChainEpoch(epoch)
-					return stopErr
-				}
-				return nil
-			})
-		})
-	})
-	if err == stopErr {
-		err = nil
-	}
-	if err != nil {
-		return nil, err
-	}
-	if out.Early == 0 && out.OnTime == 0 {
-		return nil, xerrors.Errorf("failed to find sector %d", num)
-	}
-	return &out, nil
-}
-
-func (s *state6) GetPrecommittedSector(num abi.SectorNumber) (*SectorPreCommitOnChainInfo, error) {
-	info, ok, err := s.State.GetPrecommittedSector(s.store, num)
-	if !ok || err != nil {
-		return nil, err
-	}
-
-	ret := fromV6SectorPreCommitOnChainInfo(*info)
-
-	return &ret, nil
-}
-
-func (s *state6) ForEachPrecommittedSector(cb func(SectorPreCommitOnChainInfo) error) error {
-	precommitted, err := adt6.AsMap(s.store, s.State.PreCommittedSectors, builtin6.DefaultHamtBitwidth)
-	if err != nil {
-		return err
-	}
-
-	var info miner6.SectorPreCommitOnChainInfo
-	if err := precommitted.ForEach(&info, func(_ string) error {
-		return cb(fromV6SectorPreCommitOnChainInfo(info))
-	}); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (s *state6) LoadSectors(snos *bitfield.BitField) ([]*SectorOnChainInfo, error) {
-	sectors, err := miner6.LoadSectors(s.store, s.State.Sectors)
-	if err != nil {
-		return nil, err
-	}
-
-	// If no sector numbers are specified, load all.
-	if snos == nil {
-		infos := make([]*SectorOnChainInfo, 0, sectors.Length())
-		var info6 miner6.SectorOnChainInfo
-		if err := sectors.ForEach(&info6, func(_ int64) error {
-			info := fromV6SectorOnChainInfo(info6)
-			infos = append(infos, &info)
-			return nil
-		}); err != nil {
-			return nil, err
-		}
-		return infos, nil
-	}
-
-	// Otherwise, load selected.
-	infos6, err := sectors.Load(*snos)
-	if err != nil {
-		return nil, err
-	}
-	infos := make([]*SectorOnChainInfo, len(infos6))
-	for i, info6 := range infos6 {
-		info := fromV6SectorOnChainInfo(*info6)
-		infos[i] = &info
-	}
-	return infos, nil
-}
-
-func (s *state6) loadAllocatedSectorNumbers() (bitfield.BitField, error) {
-	var allocatedSectors bitfield.BitField
-	err := s.store.Get(s.store.Context(), s.State.AllocatedSectors, &allocatedSectors)
-	return allocatedSectors, err
-}
-
-func (s *state6) IsAllocated(num abi.SectorNumber) (bool, error) {
-	allocatedSectors, err := s.loadAllocatedSectorNumbers()
-	if err != nil {
-		return false, err
-	}
-
-	return allocatedSectors.IsSet(uint64(num))
-}
-
-func (s *state6) GetProvingPeriodStart() (abi.ChainEpoch, error) {
-	return s.State.ProvingPeriodStart, nil
-}
-
-func (s *state6) UnallocatedSectorNumbers(count int) ([]abi.SectorNumber, error) {
-	allocatedSectors, err := s.loadAllocatedSectorNumbers()
-	if err != nil {
-		return nil, err
-	}
-
-	allocatedRuns, err := allocatedSectors.RunIterator()
-	if err != nil {
-		return nil, err
-	}
-
-	unallocatedRuns, err := rle.Subtract(
-		&rle.RunSliceIterator{Runs: []rle.Run{{Val: true, Len: abi.MaxSectorNumber}}},
-		allocatedRuns,
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	iter, err := rle.BitsFromRuns(unallocatedRuns)
-	if err != nil {
-		return nil, err
-	}
-
-	sectors := make([]abi.SectorNumber, 0, count)
-	for iter.HasNext() && len(sectors) < count {
-		nextNo, err := iter.Next()
-		if err != nil {
-			return nil, err
-		}
-		sectors = append(sectors, abi.SectorNumber(nextNo))
-	}
-
-	return sectors, nil
-}
-
-func (s *state6) GetAllocatedSectors() (*bitfield.BitField, error) {
-	var allocatedSectors bitfield.BitField
-	if err := s.store.Get(s.store.Context(), s.State.AllocatedSectors, &allocatedSectors); err != nil {
-		return nil, err
-	}
-
-	return &allocatedSectors, nil
-}
-
-func (s *state6) LoadDeadline(idx uint64) (Deadline, error) {
-	dls, err := s.State.LoadDeadlines(s.store)
-	if err != nil {
-		return nil, err
-	}
-	dl, err := dls.LoadDeadline(s.store, idx)
-	if err != nil {
-		return nil, err
-	}
-	return &deadline6{*dl, s.store}, nil
-}
-
-func (s *state6) ForEachDeadline(cb func(uint64, Deadline) error) error {
-	dls, err := s.State.LoadDeadlines(s.store)
-	if err != nil {
-		return err
-	}
-	return dls.ForEach(s.store, func(i uint64, dl *miner6.Deadline) error {
-		return cb(i, &deadline6{*dl, s.store})
-	})
-}
-
-func (s *state6) NumDeadlines() (uint64, error) {
-	return miner6.WPoStPeriodDeadlines, nil
-}
-
-func (s *state6) DeadlinesChanged(other State) (bool, error) {
-	other6, ok := other.(*state6)
-	if !ok {
-		// treat an upgrade as a change, always
-		return true, nil
-	}
-
-	return !s.State.Deadlines.Equals(other6.Deadlines), nil
-}
-
-func (s *state6) MinerInfoChanged(other State) (bool, error) {
-	other0, ok := other.(*state6)
-	if !ok {
-		// treat an upgrade as a change, always
-		return true, nil
-	}
-	return !s.State.Info.Equals(other0.State.Info), nil
-}
-
-func (s *state6) Info() (MinerInfo, error) {
-	info, err := s.State.GetInfo(s.store)
-	if err != nil {
-		return MinerInfo{}, err
-	}
-
-	var pid *peer.ID
-	if peerID, err := peer.IDFromBytes(info.PeerId); err == nil {
-		pid = &peerID
-	}
-
-	mi := MinerInfo{
-		Owner:            info.Owner,
-		Worker:           info.Worker,
-		ControlAddresses: info.ControlAddresses,
-
-		NewWorker:         address.Undef,
-		WorkerChangeEpoch: -1,
-
-		PeerId:                     pid,
-		Multiaddrs:                 info.Multiaddrs,
-		WindowPoStProofType:        info.WindowPoStProofType,
-		SectorSize:                 info.SectorSize,
-		WindowPoStPartitionSectors: info.WindowPoStPartitionSectors,
-		ConsensusFaultElapsed:      info.ConsensusFaultElapsed,
-	}
-
-	if info.PendingWorkerKey != nil {
-		mi.NewWorker = info.PendingWorkerKey.NewWorker
-		mi.WorkerChangeEpoch = info.PendingWorkerKey.EffectiveAt
-	}
-
-	return mi, nil
-}
-
-func (s *state6) DeadlineInfo(epoch abi.ChainEpoch) (*dline.Info, error) {
-	return s.State.RecordedDeadlineInfo(epoch), nil
-}
-
-func (s *state6) DeadlineCronActive() (bool, error) {
-	return s.State.DeadlineCronActive, nil
-}
-
-func (s *state6) sectors() (adt.Array, error) {
-	return adt6.AsArray(s.store, s.Sectors, miner6.SectorsAmtBitwidth)
-}
-
-func (s *state6) decodeSectorOnChainInfo(val *cbg.Deferred) (SectorOnChainInfo, error) {
-	var si miner6.SectorOnChainInfo
-	err := si.UnmarshalCBOR(bytes.NewReader(val.Raw))
-	if err != nil {
-		return SectorOnChainInfo{}, err
-	}
-
-	return fromV6SectorOnChainInfo(si), nil
-}
-
-func (s *state6) precommits() (adt.Map, error) {
-	return adt6.AsMap(s.store, s.PreCommittedSectors, builtin6.DefaultHamtBitwidth)
-}
-
-func (s *state6) decodeSectorPreCommitOnChainInfo(val *cbg.Deferred) (SectorPreCommitOnChainInfo, error) {
-	var sp miner6.SectorPreCommitOnChainInfo
-	err := sp.UnmarshalCBOR(bytes.NewReader(val.Raw))
-	if err != nil {
-		return SectorPreCommitOnChainInfo{}, err
-	}
-
-	return fromV6SectorPreCommitOnChainInfo(sp), nil
-}
-
-func (s *state6) EraseAllUnproven() error {
-
-	dls, err := s.State.LoadDeadlines(s.store)
-	if err != nil {
-		return err
-	}
-
-	err = dls.ForEach(s.store, func(dindx uint64, dl *miner6.Deadline) error {
-		ps, err := dl.PartitionsArray(s.store)
-		if err != nil {
-			return err
-		}
-
-		var part miner6.Partition
-		err = ps.ForEach(&part, func(pindx int64) error {
-			_ = part.ActivateUnproven()
-			err = ps.Set(uint64(pindx), &part)
-			return nil
-		})
-
-		if err != nil {
-			return err
-		}
-
-		dl.Partitions, err = ps.Root()
-		if err != nil {
-			return err
-		}
-
-		return dls.UpdateDeadline(s.store, dindx, dl)
-	})
-	if err != nil {
-		return err
-	}
-
-	return s.State.SaveDeadlines(s.store, dls)
-
-}
-
-func (d *deadline6) LoadPartition(idx uint64) (Partition, error) {
-	p, err := d.Deadline.LoadPartition(d.store, idx)
-	if err != nil {
-		return nil, err
-	}
-	return &partition6{*p, d.store}, nil
-}
-
-func (d *deadline6) ForEachPartition(cb func(uint64, Partition) error) error {
-	ps, err := d.Deadline.PartitionsArray(d.store)
-	if err != nil {
-		return err
-	}
-	var part miner6.Partition
-	return ps.ForEach(&part, func(i int64) error {
-		return cb(uint64(i), &partition6{part, d.store})
-	})
-}
-
-func (d *deadline6) PartitionsChanged(other Deadline) (bool, error) {
-	other6, ok := other.(*deadline6)
-	if !ok {
-		// treat an upgrade as a change, always
-		return true, nil
-	}
-
-	return !d.Deadline.Partitions.Equals(other6.Deadline.Partitions), nil
-}
-
-func (d *deadline6) PartitionsPoSted() (bitfield.BitField, error) {
-	return d.Deadline.PartitionsPoSted, nil
-}
-
-func (d *deadline6) DisputableProofCount() (uint64, error) {
-
-	ops, err := d.OptimisticProofsSnapshotArray(d.store)
-	if err != nil {
-		return 0, err
-	}
-
-	return ops.Length(), nil
-
-}
-
-func (p *partition6) AllSectors() (bitfield.BitField, error) {
-	return p.Partition.Sectors, nil
-}
-
-func (p *partition6) FaultySectors() (bitfield.BitField, error) {
-	return p.Partition.Faults, nil
-}
-
-func (p *partition6) RecoveringSectors() (bitfield.BitField, error) {
-	return p.Partition.Recoveries, nil
-}
-
-func (p *partition6) UnprovenSectors() (bitfield.BitField, error) {
-	return p.Partition.Unproven, nil
-}
-
-func fromV6SectorOnChainInfo(v6 miner6.SectorOnChainInfo) SectorOnChainInfo {
-
-	return SectorOnChainInfo{
-		SectorNumber:          v6.SectorNumber,
-		SealProof:             v6.SealProof,
-		SealedCID:             v6.SealedCID,
-		DealIDs:               v6.DealIDs,
-		Activation:            v6.Activation,
-		Expiration:            v6.Expiration,
-		DealWeight:            v6.DealWeight,
-		VerifiedDealWeight:    v6.VerifiedDealWeight,
-		InitialPledge:         v6.InitialPledge,
-		ExpectedDayReward:     v6.ExpectedDayReward,
-		ExpectedStoragePledge: v6.ExpectedStoragePledge,
-	}
-
-}
-
-func fromV6SectorPreCommitOnChainInfo(v6 miner6.SectorPreCommitOnChainInfo) SectorPreCommitOnChainInfo {
-
-	return SectorPreCommitOnChainInfo{
-		Info:               (SectorPreCommitInfo)(v6.Info),
-		PreCommitDeposit:   v6.PreCommitDeposit,
-		PreCommitEpoch:     v6.PreCommitEpoch,
-		DealWeight:         v6.DealWeight,
-		VerifiedDealWeight: v6.VerifiedDealWeight,
-	}
-
-}
-
-func (s *state6) GetState() interface{} {
-	return &s.State
-}

chain/actors/builtin/multisig/message6.go

@@ -1,71 +0,0 @@
-package multisig
-
-import (
-	"golang.org/x/xerrors"
-
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
-
-	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
-	init6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/init"
-	multisig6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/multisig"
-
-	"github.com/filecoin-project/lotus/chain/actors"
-	init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init"
-	"github.com/filecoin-project/lotus/chain/types"
-)
-
-type message6 struct{ message0 }
-
-func (m message6) Create(
-	signers []address.Address, threshold uint64,
-	unlockStart, unlockDuration abi.ChainEpoch,
-	initialAmount abi.TokenAmount,
-) (*types.Message, error) {
-
-	lenAddrs := uint64(len(signers))
-
-	if lenAddrs < threshold {
-		return nil, xerrors.Errorf("cannot require signing of more addresses than provided for multisig")
-	}
-
-	if threshold == 0 {
-		threshold = lenAddrs
-	}
-
-	if m.from == address.Undef {
-		return nil, xerrors.Errorf("must provide source address")
-	}
-
-	// Set up constructor parameters for multisig
-	msigParams := &multisig6.ConstructorParams{
-		Signers:               signers,
-		NumApprovalsThreshold: threshold,
-		UnlockDuration:        unlockDuration,
-		StartEpoch:            unlockStart,
-	}
-
-	enc, actErr := actors.SerializeParams(msigParams)
-	if actErr != nil {
-		return nil, actErr
-	}
-
-	// new actors are created by invoking 'exec' on the init actor with the constructor params
-	execParams := &init6.ExecParams{
-		CodeCID:           builtin6.MultisigActorCodeID,
-		ConstructorParams: enc,
-	}
-
-	enc, actErr = actors.SerializeParams(execParams)
-	if actErr != nil {
-		return nil, actErr
-	}
-
-	return &types.Message{
-		To:     init_.Address,
-		From:   m.from,
-		Method: builtin6.MethodsInit.Exec,
-		Params: enc,
-		Value:  initialAmount,
-	}, nil
-}

chain/actors/builtin/multisig/multisig.go

@@ -13,7 +13,7 @@ import (
 	"github.com/ipfs/go-cid"
 
 	msig0 "github.com/filecoin-project/specs-actors/actors/builtin/multisig"
-	msig6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/multisig"
+	msig5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/multisig"
 
 	builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
 
@@ -25,8 +25,6 @@ import (
 
 	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
 
-	builtin6 "github.com/filecoin-project/specs-actors/v6/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,10 +52,6 @@ func init() {
 	builtin.RegisterActorState(builtin5.MultisigActorCodeID, func(store adt.Store, root cid.Cid) (cbor.Marshaler, error) {
 		return load5(store, root)
 	})
-
-	builtin.RegisterActorState(builtin6.MultisigActorCodeID, func(store adt.Store, root cid.Cid) (cbor.Marshaler, error) {
-		return load6(store, root)
-	})
 }
 
 func Load(store adt.Store, act *types.Actor) (State, error) {
@@ -78,9 +72,6 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 	case builtin5.MultisigActorCodeID:
 		return load5(store, act.Head)
 
-	case builtin6.MultisigActorCodeID:
-		return load6(store, act.Head)
-
 	}
 	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
 }
@@ -103,9 +94,6 @@ func MakeState(store adt.Store, av actors.Version, signers []address.Address, th
 	case actors.Version5:
 		return make5(store, signers, threshold, startEpoch, unlockDuration, initialBalance)
 
-	case actors.Version6:
-		return make6(store, signers, threshold, startEpoch, unlockDuration, initialBalance)
-
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -128,9 +116,6 @@ func GetActorCodeID(av actors.Version) (cid.Cid, error) {
 	case actors.Version5:
 		return builtin5.MultisigActorCodeID, nil
 
-	case actors.Version6:
-		return builtin6.MultisigActorCodeID, nil
-
 	}
 
 	return cid.Undef, xerrors.Errorf("unknown actor version %d", av)
@@ -156,7 +141,7 @@ type State interface {
 
 type Transaction = msig0.Transaction
 
-var Methods = builtin6.MethodsMultisig
+var Methods = builtin5.MethodsMultisig
 
 func Message(version actors.Version, from address.Address) MessageBuilder {
 	switch version {
@@ -175,9 +160,6 @@ func Message(version actors.Version, from address.Address) MessageBuilder {
 
 	case actors.Version5:
 		return message5{message0{from}}
-
-	case actors.Version6:
-		return message6{message0{from}}
 	default:
 		panic(fmt.Sprintf("unsupported actors version: %d", version))
 	}
@@ -201,13 +183,13 @@ type MessageBuilder interface {
 }
 
 // this type is the same between v0 and v2
-type ProposalHashData = msig6.ProposalHashData
-type ProposeReturn = msig6.ProposeReturn
-type ProposeParams = msig6.ProposeParams
-type ApproveReturn = msig6.ApproveReturn
+type ProposalHashData = msig5.ProposalHashData
+type ProposeReturn = msig5.ProposeReturn
+type ProposeParams = msig5.ProposeParams
+type ApproveReturn = msig5.ApproveReturn
 
 func txnParams(id uint64, data *ProposalHashData) ([]byte, error) {
-	params := msig6.TxnIDParams{ID: msig6.TxnID(id)}
+	params := msig5.TxnIDParams{ID: msig5.TxnID(id)}
 	if data != nil {
 		if data.Requester.Protocol() != address.ID {
 			return nil, xerrors.Errorf("proposer address must be an ID address, was %s", data.Requester)

chain/actors/builtin/multisig/v6.go

@@ -1,119 +0,0 @@
-package multisig
-
-import (
-	"bytes"
-	"encoding/binary"
-
-	adt6 "github.com/filecoin-project/specs-actors/v6/actors/util/adt"
-
-	"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"
-
-	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
-
-	msig6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/multisig"
-)
-
-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, signers []address.Address, threshold uint64, startEpoch abi.ChainEpoch, unlockDuration abi.ChainEpoch, initialBalance abi.TokenAmount) (State, error) {
-	out := state6{store: store}
-	out.State = msig6.State{}
-	out.State.Signers = signers
-	out.State.NumApprovalsThreshold = threshold
-	out.State.StartEpoch = startEpoch
-	out.State.UnlockDuration = unlockDuration
-	out.State.InitialBalance = initialBalance
-
-	em, err := adt6.StoreEmptyMap(store, builtin6.DefaultHamtBitwidth)
-	if err != nil {
-		return nil, err
-	}
-
-	out.State.PendingTxns = em
-
-	return &out, nil
-}
-
-type state6 struct {
-	msig6.State
-	store adt.Store
-}
-
-func (s *state6) LockedBalance(currEpoch abi.ChainEpoch) (abi.TokenAmount, error) {
-	return s.State.AmountLocked(currEpoch - s.State.StartEpoch), nil
-}
-
-func (s *state6) StartEpoch() (abi.ChainEpoch, error) {
-	return s.State.StartEpoch, nil
-}
-
-func (s *state6) UnlockDuration() (abi.ChainEpoch, error) {
-	return s.State.UnlockDuration, nil
-}
-
-func (s *state6) InitialBalance() (abi.TokenAmount, error) {
-	return s.State.InitialBalance, nil
-}
-
-func (s *state6) Threshold() (uint64, error) {
-	return s.State.NumApprovalsThreshold, nil
-}
-
-func (s *state6) Signers() ([]address.Address, error) {
-	return s.State.Signers, nil
-}
-
-func (s *state6) ForEachPendingTxn(cb func(id int64, txn Transaction) error) error {
-	arr, err := adt6.AsMap(s.store, s.State.PendingTxns, builtin6.DefaultHamtBitwidth)
-	if err != nil {
-		return err
-	}
-	var out msig6.Transaction
-	return arr.ForEach(&out, func(key string) error {
-		txid, n := binary.Varint([]byte(key))
-		if n <= 0 {
-			return xerrors.Errorf("invalid pending transaction key: %v", key)
-		}
-		return cb(txid, (Transaction)(out)) //nolint:unconvert
-	})
-}
-
-func (s *state6) PendingTxnChanged(other State) (bool, error) {
-	other6, ok := other.(*state6)
-	if !ok {
-		// treat an upgrade as a change, always
-		return true, nil
-	}
-	return !s.State.PendingTxns.Equals(other6.PendingTxns), nil
-}
-
-func (s *state6) transactions() (adt.Map, error) {
-	return adt6.AsMap(s.store, s.PendingTxns, builtin6.DefaultHamtBitwidth)
-}
-
-func (s *state6) decodeTransaction(val *cbg.Deferred) (Transaction, error) {
-	var tx msig6.Transaction
-	if err := tx.UnmarshalCBOR(bytes.NewReader(val.Raw)); err != nil {
-		return Transaction{}, err
-	}
-	return tx, nil
-}
-
-func (s *state6) GetState() interface{} {
-	return &s.State
-}

chain/actors/builtin/paych/message6.go

@@ -1,74 +0,0 @@
-package paych
-
-import (
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
-
-	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
-	init6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/init"
-	paych6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/paych"
-
-	"github.com/filecoin-project/lotus/chain/actors"
-	init_ "github.com/filecoin-project/lotus/chain/actors/builtin/init"
-	"github.com/filecoin-project/lotus/chain/types"
-)
-
-type message6 struct{ from address.Address }
-
-func (m message6) Create(to address.Address, initialAmount abi.TokenAmount) (*types.Message, error) {
-	params, aerr := actors.SerializeParams(&paych6.ConstructorParams{From: m.from, To: to})
-	if aerr != nil {
-		return nil, aerr
-	}
-	enc, aerr := actors.SerializeParams(&init6.ExecParams{
-		CodeCID:           builtin6.PaymentChannelActorCodeID,
-		ConstructorParams: params,
-	})
-	if aerr != nil {
-		return nil, aerr
-	}
-
-	return &types.Message{
-		To:     init_.Address,
-		From:   m.from,
-		Value:  initialAmount,
-		Method: builtin6.MethodsInit.Exec,
-		Params: enc,
-	}, nil
-}
-
-func (m message6) Update(paych address.Address, sv *SignedVoucher, secret []byte) (*types.Message, error) {
-	params, aerr := actors.SerializeParams(&paych6.UpdateChannelStateParams{
-		Sv:     *sv,
-		Secret: secret,
-	})
-	if aerr != nil {
-		return nil, aerr
-	}
-
-	return &types.Message{
-		To:     paych,
-		From:   m.from,
-		Value:  abi.NewTokenAmount(0),
-		Method: builtin6.MethodsPaych.UpdateChannelState,
-		Params: params,
-	}, nil
-}
-
-func (m message6) Settle(paych address.Address) (*types.Message, error) {
-	return &types.Message{
-		To:     paych,
-		From:   m.from,
-		Value:  abi.NewTokenAmount(0),
-		Method: builtin6.MethodsPaych.Settle,
-	}, nil
-}
-
-func (m message6) Collect(paych address.Address) (*types.Message, error) {
-	return &types.Message{
-		To:     paych,
-		From:   m.from,
-		Value:  abi.NewTokenAmount(0),
-		Method: builtin6.MethodsPaych.Collect,
-	}, nil
-}

chain/actors/builtin/paych/paych.go

@@ -25,8 +25,6 @@ import (
 
 	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
 
-	builtin6 "github.com/filecoin-project/specs-actors/v6/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,10 +52,6 @@ func init() {
 	builtin.RegisterActorState(builtin5.PaymentChannelActorCodeID, func(store adt.Store, root cid.Cid) (cbor.Marshaler, error) {
 		return load5(store, root)
 	})
-
-	builtin.RegisterActorState(builtin6.PaymentChannelActorCodeID, func(store adt.Store, root cid.Cid) (cbor.Marshaler, error) {
-		return load6(store, root)
-	})
 }
 
 // Load returns an abstract copy of payment channel state, irregardless of actor version
@@ -79,9 +73,6 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 	case builtin5.PaymentChannelActorCodeID:
 		return load5(store, act.Head)
 
-	case builtin6.PaymentChannelActorCodeID:
-		return load6(store, act.Head)
-
 	}
 	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
 }
@@ -104,9 +95,6 @@ func MakeState(store adt.Store, av actors.Version) (State, error) {
 	case actors.Version5:
 		return make5(store)
 
-	case actors.Version6:
-		return make6(store)
-
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -129,9 +117,6 @@ func GetActorCodeID(av actors.Version) (cid.Cid, error) {
 	case actors.Version5:
 		return builtin5.PaymentChannelActorCodeID, nil
 
-	case actors.Version6:
-		return builtin6.PaymentChannelActorCodeID, nil
-
 	}
 
 	return cid.Undef, xerrors.Errorf("unknown actor version %d", av)
@@ -185,7 +170,7 @@ func DecodeSignedVoucher(s string) (*SignedVoucher, error) {
 	return &sv, nil
 }
 
-var Methods = builtin6.MethodsPaych
+var Methods = builtin5.MethodsPaych
 
 func Message(version actors.Version, from address.Address) MessageBuilder {
 	switch version {
@@ -205,9 +190,6 @@ func Message(version actors.Version, from address.Address) MessageBuilder {
 	case actors.Version5:
 		return message5{from}
 
-	case actors.Version6:
-		return message6{from}
-
 	default:
 		panic(fmt.Sprintf("unsupported actors version: %d", version))
 	}

chain/actors/builtin/paych/v6.go

@@ -1,114 +0,0 @@
-package paych
-
-import (
-	"github.com/ipfs/go-cid"
-
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
-	"github.com/filecoin-project/go-state-types/big"
-
-	"github.com/filecoin-project/lotus/chain/actors/adt"
-
-	paych6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/paych"
-	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) (State, error) {
-	out := state6{store: store}
-	out.State = paych6.State{}
-	return &out, nil
-}
-
-type state6 struct {
-	paych6.State
-	store adt.Store
-	lsAmt *adt6.Array
-}
-
-// Channel owner, who has funded the actor
-func (s *state6) From() (address.Address, error) {
-	return s.State.From, nil
-}
-
-// Recipient of payouts from channel
-func (s *state6) To() (address.Address, error) {
-	return s.State.To, nil
-}
-
-// Height at which the channel can be `Collected`
-func (s *state6) SettlingAt() (abi.ChainEpoch, error) {
-	return s.State.SettlingAt, nil
-}
-
-// Amount successfully redeemed through the payment channel, paid out on `Collect()`
-func (s *state6) ToSend() (abi.TokenAmount, error) {
-	return s.State.ToSend, nil
-}
-
-func (s *state6) getOrLoadLsAmt() (*adt6.Array, error) {
-	if s.lsAmt != nil {
-		return s.lsAmt, nil
-	}
-
-	// Get the lane state from the chain
-	lsamt, err := adt6.AsArray(s.store, s.State.LaneStates, paych6.LaneStatesAmtBitwidth)
-	if err != nil {
-		return nil, err
-	}
-
-	s.lsAmt = lsamt
-	return lsamt, nil
-}
-
-// Get total number of lanes
-func (s *state6) LaneCount() (uint64, error) {
-	lsamt, err := s.getOrLoadLsAmt()
-	if err != nil {
-		return 0, err
-	}
-	return lsamt.Length(), nil
-}
-
-func (s *state6) GetState() interface{} {
-	return &s.State
-}
-
-// Iterate lane states
-func (s *state6) ForEachLaneState(cb func(idx uint64, dl LaneState) error) error {
-	// Get the lane state from the chain
-	lsamt, err := s.getOrLoadLsAmt()
-	if err != nil {
-		return err
-	}
-
-	// Note: we use a map instead of an array to store laneStates because the
-	// client sets the lane ID (the index) and potentially they could use a
-	// very large index.
-	var ls paych6.LaneState
-	return lsamt.ForEach(&ls, func(i int64) error {
-		return cb(uint64(i), &laneState6{ls})
-	})
-}
-
-type laneState6 struct {
-	paych6.LaneState
-}
-
-func (ls *laneState6) Redeemed() (big.Int, error) {
-	return ls.LaneState.Redeemed, nil
-}
-
-func (ls *laneState6) Nonce() (uint64, error) {
-	return ls.LaneState.Nonce, nil
-}

chain/actors/builtin/power/power.go

@@ -24,8 +24,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"
 )
 
 func init() {
@@ -49,15 +47,11 @@ func init() {
 	builtin.RegisterActorState(builtin5.StoragePowerActorCodeID, func(store adt.Store, root cid.Cid) (cbor.Marshaler, error) {
 		return load5(store, root)
 	})
-
-	builtin.RegisterActorState(builtin6.StoragePowerActorCodeID, func(store adt.Store, root cid.Cid) (cbor.Marshaler, error) {
-		return load6(store, root)
-	})
 }
 
 var (
-	Address = builtin6.StoragePowerActorAddr
-	Methods = builtin6.MethodsPower
+	Address = builtin5.StoragePowerActorAddr
+	Methods = builtin5.MethodsPower
 )
 
 func Load(store adt.Store, act *types.Actor) (State, error) {
@@ -78,9 +72,6 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 	case builtin5.StoragePowerActorCodeID:
 		return load5(store, act.Head)
 
-	case builtin6.StoragePowerActorCodeID:
-		return load6(store, act.Head)
-
 	}
 	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
 }
@@ -103,9 +94,6 @@ func MakeState(store adt.Store, av actors.Version) (State, error) {
 	case actors.Version5:
 		return make5(store)
 
-	case actors.Version6:
-		return make6(store)
-
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -128,9 +116,6 @@ func GetActorCodeID(av actors.Version) (cid.Cid, error) {
 	case actors.Version5:
 		return builtin5.StoragePowerActorCodeID, nil
 
-	case actors.Version6:
-		return builtin6.StoragePowerActorCodeID, nil
-
 	}
 
 	return cid.Undef, xerrors.Errorf("unknown actor version %d", av)

chain/actors/builtin/power/v6.go

@@ -1,187 +0,0 @@
-package power
-
-import (
-	"bytes"
-
-	"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"
-
-	"github.com/filecoin-project/lotus/chain/actors/adt"
-	"github.com/filecoin-project/lotus/chain/actors/builtin"
-
-	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
-
-	power6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/power"
-	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) (State, error) {
-	out := state6{store: store}
-
-	s, err := power6.ConstructState(store)
-	if err != nil {
-		return nil, err
-	}
-
-	out.State = *s
-
-	return &out, nil
-}
-
-type state6 struct {
-	power6.State
-	store adt.Store
-}
-
-func (s *state6) TotalLocked() (abi.TokenAmount, error) {
-	return s.TotalPledgeCollateral, nil
-}
-
-func (s *state6) TotalPower() (Claim, error) {
-	return Claim{
-		RawBytePower:    s.TotalRawBytePower,
-		QualityAdjPower: s.TotalQualityAdjPower,
-	}, nil
-}
-
-// Committed power to the network. Includes miners below the minimum threshold.
-func (s *state6) TotalCommitted() (Claim, error) {
-	return Claim{
-		RawBytePower:    s.TotalBytesCommitted,
-		QualityAdjPower: s.TotalQABytesCommitted,
-	}, nil
-}
-
-func (s *state6) MinerPower(addr address.Address) (Claim, bool, error) {
-	claims, err := s.claims()
-	if err != nil {
-		return Claim{}, false, err
-	}
-	var claim power6.Claim
-	ok, err := claims.Get(abi.AddrKey(addr), &claim)
-	if err != nil {
-		return Claim{}, false, err
-	}
-	return Claim{
-		RawBytePower:    claim.RawBytePower,
-		QualityAdjPower: claim.QualityAdjPower,
-	}, ok, nil
-}
-
-func (s *state6) MinerNominalPowerMeetsConsensusMinimum(a address.Address) (bool, error) {
-	return s.State.MinerNominalPowerMeetsConsensusMinimum(s.store, a)
-}
-
-func (s *state6) TotalPowerSmoothed() (builtin.FilterEstimate, error) {
-	return builtin.FromV6FilterEstimate(s.State.ThisEpochQAPowerSmoothed), nil
-}
-
-func (s *state6) MinerCounts() (uint64, uint64, error) {
-	return uint64(s.State.MinerAboveMinPowerCount), uint64(s.State.MinerCount), nil
-}
-
-func (s *state6) ListAllMiners() ([]address.Address, error) {
-	claims, err := s.claims()
-	if err != nil {
-		return nil, err
-	}
-
-	var miners []address.Address
-	err = claims.ForEach(nil, func(k string) error {
-		a, err := address.NewFromBytes([]byte(k))
-		if err != nil {
-			return err
-		}
-		miners = append(miners, a)
-		return nil
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	return miners, nil
-}
-
-func (s *state6) ForEachClaim(cb func(miner address.Address, claim Claim) error) error {
-	claims, err := s.claims()
-	if err != nil {
-		return err
-	}
-
-	var claim power6.Claim
-	return claims.ForEach(&claim, func(k string) error {
-		a, err := address.NewFromBytes([]byte(k))
-		if err != nil {
-			return err
-		}
-		return cb(a, Claim{
-			RawBytePower:    claim.RawBytePower,
-			QualityAdjPower: claim.QualityAdjPower,
-		})
-	})
-}
-
-func (s *state6) ClaimsChanged(other State) (bool, error) {
-	other6, ok := other.(*state6)
-	if !ok {
-		// treat an upgrade as a change, always
-		return true, nil
-	}
-	return !s.State.Claims.Equals(other6.State.Claims), nil
-}
-
-func (s *state6) SetTotalQualityAdjPower(p abi.StoragePower) error {
-	s.State.TotalQualityAdjPower = p
-	return nil
-}
-
-func (s *state6) SetTotalRawBytePower(p abi.StoragePower) error {
-	s.State.TotalRawBytePower = p
-	return nil
-}
-
-func (s *state6) SetThisEpochQualityAdjPower(p abi.StoragePower) error {
-	s.State.ThisEpochQualityAdjPower = p
-	return nil
-}
-
-func (s *state6) SetThisEpochRawBytePower(p abi.StoragePower) error {
-	s.State.ThisEpochRawBytePower = p
-	return nil
-}
-
-func (s *state6) GetState() interface{} {
-	return &s.State
-}
-
-func (s *state6) claims() (adt.Map, error) {
-	return adt6.AsMap(s.store, s.Claims, builtin6.DefaultHamtBitwidth)
-}
-
-func (s *state6) decodeClaim(val *cbg.Deferred) (Claim, error) {
-	var ci power6.Claim
-	if err := ci.UnmarshalCBOR(bytes.NewReader(val.Raw)); err != nil {
-		return Claim{}, err
-	}
-	return fromV6Claim(ci), nil
-}
-
-func fromV6Claim(v6 power6.Claim) Claim {
-	return Claim{
-		RawBytePower:    v6.RawBytePower,
-		QualityAdjPower: v6.QualityAdjPower,
-	}
-}

chain/actors/builtin/reward/reward.go

@@ -19,8 +19,6 @@ import (
 
 	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
 
-	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
-
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/actors/builtin"
 	"github.com/filecoin-project/lotus/chain/types"
@@ -47,15 +45,11 @@ func init() {
 	builtin.RegisterActorState(builtin5.RewardActorCodeID, func(store adt.Store, root cid.Cid) (cbor.Marshaler, error) {
 		return load5(store, root)
 	})
-
-	builtin.RegisterActorState(builtin6.RewardActorCodeID, func(store adt.Store, root cid.Cid) (cbor.Marshaler, error) {
-		return load6(store, root)
-	})
 }
 
 var (
-	Address = builtin6.RewardActorAddr
-	Methods = builtin6.MethodsReward
+	Address = builtin5.RewardActorAddr
+	Methods = builtin5.MethodsReward
 )
 
 func Load(store adt.Store, act *types.Actor) (State, error) {
@@ -76,9 +70,6 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 	case builtin5.RewardActorCodeID:
 		return load5(store, act.Head)
 
-	case builtin6.RewardActorCodeID:
-		return load6(store, act.Head)
-
 	}
 	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
 }
@@ -101,9 +92,6 @@ func MakeState(store adt.Store, av actors.Version, currRealizedPower abi.Storage
 	case actors.Version5:
 		return make5(store, currRealizedPower)
 
-	case actors.Version6:
-		return make6(store, currRealizedPower)
-
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -126,9 +114,6 @@ func GetActorCodeID(av actors.Version) (cid.Cid, error) {
 	case actors.Version5:
 		return builtin5.RewardActorCodeID, nil
 
-	case actors.Version6:
-		return builtin6.RewardActorCodeID, nil
-
 	}
 
 	return cid.Undef, xerrors.Errorf("unknown actor version %d", av)

chain/actors/builtin/reward/v6.go

@@ -1,98 +0,0 @@
-package reward
-
-import (
-	"github.com/filecoin-project/go-state-types/abi"
-	"github.com/ipfs/go-cid"
-
-	"github.com/filecoin-project/lotus/chain/actors/adt"
-	"github.com/filecoin-project/lotus/chain/actors/builtin"
-
-	miner6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner"
-	reward6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/reward"
-	smoothing6 "github.com/filecoin-project/specs-actors/v6/actors/util/smoothing"
-)
-
-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, currRealizedPower abi.StoragePower) (State, error) {
-	out := state6{store: store}
-	out.State = *reward6.ConstructState(currRealizedPower)
-	return &out, nil
-}
-
-type state6 struct {
-	reward6.State
-	store adt.Store
-}
-
-func (s *state6) ThisEpochReward() (abi.TokenAmount, error) {
-	return s.State.ThisEpochReward, nil
-}
-
-func (s *state6) ThisEpochRewardSmoothed() (builtin.FilterEstimate, error) {
-
-	return builtin.FilterEstimate{
-		PositionEstimate: s.State.ThisEpochRewardSmoothed.PositionEstimate,
-		VelocityEstimate: s.State.ThisEpochRewardSmoothed.VelocityEstimate,
-	}, nil
-
-}
-
-func (s *state6) ThisEpochBaselinePower() (abi.StoragePower, error) {
-	return s.State.ThisEpochBaselinePower, nil
-}
-
-func (s *state6) TotalStoragePowerReward() (abi.TokenAmount, error) {
-	return s.State.TotalStoragePowerReward, nil
-}
-
-func (s *state6) EffectiveBaselinePower() (abi.StoragePower, error) {
-	return s.State.EffectiveBaselinePower, nil
-}
-
-func (s *state6) EffectiveNetworkTime() (abi.ChainEpoch, error) {
-	return s.State.EffectiveNetworkTime, nil
-}
-
-func (s *state6) CumsumBaseline() (reward6.Spacetime, error) {
-	return s.State.CumsumBaseline, nil
-}
-
-func (s *state6) CumsumRealized() (reward6.Spacetime, error) {
-	return s.State.CumsumRealized, nil
-}
-
-func (s *state6) InitialPledgeForPower(qaPower abi.StoragePower, networkTotalPledge abi.TokenAmount, networkQAPower *builtin.FilterEstimate, circSupply abi.TokenAmount) (abi.TokenAmount, error) {
-	return miner6.InitialPledgeForPower(
-		qaPower,
-		s.State.ThisEpochBaselinePower,
-		s.State.ThisEpochRewardSmoothed,
-		smoothing6.FilterEstimate{
-			PositionEstimate: networkQAPower.PositionEstimate,
-			VelocityEstimate: networkQAPower.VelocityEstimate,
-		},
-		circSupply,
-	), nil
-}
-
-func (s *state6) PreCommitDepositForPower(networkQAPower builtin.FilterEstimate, sectorWeight abi.StoragePower) (abi.TokenAmount, error) {
-	return miner6.PreCommitDepositForPower(s.State.ThisEpochRewardSmoothed,
-		smoothing6.FilterEstimate{
-			PositionEstimate: networkQAPower.PositionEstimate,
-			VelocityEstimate: networkQAPower.VelocityEstimate,
-		},
-		sectorWeight), nil
-}
-
-func (s *state6) GetState() interface{} {
-	return &s.State
-}

chain/actors/builtin/system/system.go

@@ -15,12 +15,10 @@ 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"
 )
 
 var (
-	Address = builtin6.SystemActorAddr
+	Address = builtin5.SystemActorAddr
 )
 
 func MakeState(store adt.Store, av actors.Version) (State, error) {
@@ -41,9 +39,6 @@ func MakeState(store adt.Store, av actors.Version) (State, error) {
 	case actors.Version5:
 		return make5(store)
 
-	case actors.Version6:
-		return make6(store)
-
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -66,9 +61,6 @@ func GetActorCodeID(av actors.Version) (cid.Cid, error) {
 	case actors.Version5:
 		return builtin5.SystemActorCodeID, nil
 
-	case actors.Version6:
-		return builtin6.SystemActorCodeID, nil
-
 	}
 
 	return cid.Undef, xerrors.Errorf("unknown actor version %d", av)

chain/actors/builtin/system/v6.go

@@ -1,35 +0,0 @@
-package system
-
-import (
-	"github.com/ipfs/go-cid"
-
-	"github.com/filecoin-project/lotus/chain/actors/adt"
-
-	system6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/system"
-)
-
-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 = system6.State{}
-	return &out, nil
-}
-
-type state6 struct {
-	system6.State
-	store adt.Store
-}
-
-func (s *state6) GetState() interface{} {
-	return &s.State
-}

chain/actors/builtin/verifreg/v6.go

@@ -1,75 +0,0 @@
-package verifreg
-
-import (
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
-	"github.com/ipfs/go-cid"
-
-	"github.com/filecoin-project/lotus/chain/actors"
-	"github.com/filecoin-project/lotus/chain/actors/adt"
-
-	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
-	verifreg6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/verifreg"
-	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, rootKeyAddress address.Address) (State, error) {
-	out := state6{store: store}
-
-	s, err := verifreg6.ConstructState(store, rootKeyAddress)
-	if err != nil {
-		return nil, err
-	}
-
-	out.State = *s
-
-	return &out, nil
-}
-
-type state6 struct {
-	verifreg6.State
-	store adt.Store
-}
-
-func (s *state6) RootKey() (address.Address, error) {
-	return s.State.RootKey, nil
-}
-
-func (s *state6) VerifiedClientDataCap(addr address.Address) (bool, abi.StoragePower, error) {
-	return getDataCap(s.store, actors.Version6, s.verifiedClients, addr)
-}
-
-func (s *state6) VerifierDataCap(addr address.Address) (bool, abi.StoragePower, error) {
-	return getDataCap(s.store, actors.Version6, s.verifiers, addr)
-}
-
-func (s *state6) ForEachVerifier(cb func(addr address.Address, dcap abi.StoragePower) error) error {
-	return forEachCap(s.store, actors.Version6, s.verifiers, cb)
-}
-
-func (s *state6) ForEachClient(cb func(addr address.Address, dcap abi.StoragePower) error) error {
-	return forEachCap(s.store, actors.Version6, s.verifiedClients, cb)
-}
-
-func (s *state6) verifiedClients() (adt.Map, error) {
-	return adt6.AsMap(s.store, s.VerifiedClients, builtin6.DefaultHamtBitwidth)
-}
-
-func (s *state6) verifiers() (adt.Map, error) {
-	return adt6.AsMap(s.store, s.Verifiers, builtin6.DefaultHamtBitwidth)
-}
-
-func (s *state6) GetState() interface{} {
-	return &s.State
-}

chain/actors/builtin/verifreg/verifreg.go

@@ -19,8 +19,6 @@ import (
 
 	builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin"
 
-	builtin6 "github.com/filecoin-project/specs-actors/v6/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"
@@ -49,15 +47,11 @@ func init() {
 		return load5(store, root)
 	})
 
-	builtin.RegisterActorState(builtin6.VerifiedRegistryActorCodeID, func(store adt.Store, root cid.Cid) (cbor.Marshaler, error) {
-		return load6(store, root)
-	})
-
 }
 
 var (
-	Address = builtin6.VerifiedRegistryActorAddr
-	Methods = builtin6.MethodsVerifiedRegistry
+	Address = builtin5.VerifiedRegistryActorAddr
+	Methods = builtin5.MethodsVerifiedRegistry
 )
 
 func Load(store adt.Store, act *types.Actor) (State, error) {
@@ -78,9 +72,6 @@ func Load(store adt.Store, act *types.Actor) (State, error) {
 	case builtin5.VerifiedRegistryActorCodeID:
 		return load5(store, act.Head)
 
-	case builtin6.VerifiedRegistryActorCodeID:
-		return load6(store, act.Head)
-
 	}
 	return nil, xerrors.Errorf("unknown actor code %s", act.Code)
 }
@@ -103,9 +94,6 @@ func MakeState(store adt.Store, av actors.Version, rootKeyAddress address.Addres
 	case actors.Version5:
 		return make5(store, rootKeyAddress)
 
-	case actors.Version6:
-		return make6(store, rootKeyAddress)
-
 	}
 	return nil, xerrors.Errorf("unknown actor version %d", av)
 }
@@ -128,9 +116,6 @@ func GetActorCodeID(av actors.Version) (cid.Cid, error) {
 	case actors.Version5:
 		return builtin5.VerifiedRegistryActorCodeID, nil
 
-	case actors.Version6:
-		return builtin6.VerifiedRegistryActorCodeID, nil
-
 	}
 
 	return cid.Undef, xerrors.Errorf("unknown actor version %d", av)

chain/actors/policy/policy.go

@@ -35,19 +35,14 @@ import (
 	miner5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/miner"
 	verifreg5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/verifreg"
 
-	builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin"
-	market6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/market"
-	miner6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/miner"
-	verifreg6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/verifreg"
-
-	paych6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/paych"
+	paych5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/paych"
 )
 
 const (
-	ChainFinality                  = miner6.ChainFinality
+	ChainFinality                  = miner5.ChainFinality
 	SealRandomnessLookback         = ChainFinality
-	PaychSettleDelay               = paych6.SettleDelay
-	MaxPreCommitRandomnessLookback = builtin6.EpochsInDay + SealRandomnessLookback
+	PaychSettleDelay               = paych5.SettleDelay
+	MaxPreCommitRandomnessLookback = builtin5.EpochsInDay + SealRandomnessLookback
 )
 
 // SetSupportedProofTypes sets supported proof types, across all actor versions.
@@ -70,8 +65,6 @@ func SetSupportedProofTypes(types ...abi.RegisteredSealProof) {
 
 	miner5.PreCommitSealProofTypesV8 = make(map[abi.RegisteredSealProof]struct{}, len(types))
 
-	miner6.PreCommitSealProofTypesV8 = make(map[abi.RegisteredSealProof]struct{}, len(types))
-
 	AddSupportedProofTypes(types...)
 }
 
@@ -110,15 +103,6 @@ func AddSupportedProofTypes(types ...abi.RegisteredSealProof) {
 
 		miner5.WindowPoStProofTypes[wpp] = struct{}{}
 
-		miner6.PreCommitSealProofTypesV8[t+abi.RegisteredSealProof_StackedDrg2KiBV1_1] = struct{}{}
-		wpp, err = t.RegisteredWindowPoStProof()
-		if err != nil {
-			// Fine to panic, this is a test-only method
-			panic(err)
-		}
-
-		miner6.WindowPoStProofTypes[wpp] = struct{}{}
-
 	}
 }
 
@@ -137,13 +121,11 @@ func SetPreCommitChallengeDelay(delay abi.ChainEpoch) {
 
 	miner5.PreCommitChallengeDelay = delay
 
-	miner6.PreCommitChallengeDelay = delay
-
 }
 
 // TODO: this function shouldn't really exist. Instead, the API should expose the precommit delay.
 func GetPreCommitChallengeDelay() abi.ChainEpoch {
-	return miner6.PreCommitChallengeDelay
+	return miner5.PreCommitChallengeDelay
 }
 
 // SetConsensusMinerMinPower sets the minimum power of an individual miner must
@@ -169,10 +151,6 @@ func SetConsensusMinerMinPower(p abi.StoragePower) {
 		policy.ConsensusMinerMinPower = p
 	}
 
-	for _, policy := range builtin6.PoStProofPolicies {
-		policy.ConsensusMinerMinPower = p
-	}
-
 }
 
 // SetMinVerifiedDealSize sets the minimum size of a verified deal. This should
@@ -189,8 +167,6 @@ func SetMinVerifiedDealSize(size abi.StoragePower) {
 
 	verifreg5.MinVerifiedDealSize = size
 
-	verifreg6.MinVerifiedDealSize = size
-
 }
 
 func GetMaxProveCommitDuration(ver actors.Version, t abi.RegisteredSealProof) (abi.ChainEpoch, error) {
@@ -216,10 +192,6 @@ func GetMaxProveCommitDuration(ver actors.Version, t abi.RegisteredSealProof) (a
 
 		return miner5.MaxProveCommitDuration[t], nil
 
-	case actors.Version6:
-
-		return miner6.MaxProveCommitDuration[t], nil
-
 	default:
 		return 0, xerrors.Errorf("unsupported actors version")
 	}
@@ -250,11 +222,6 @@ func SetProviderCollateralSupplyTarget(num, denom big.Int) {
 		Denominator: denom,
 	}
 
-	market6.ProviderCollateralSupplyTarget = builtin6.BigFrac{
-		Numerator:   num,
-		Denominator: denom,
-	}
-
 }
 
 func DealProviderCollateralBounds(
@@ -293,18 +260,13 @@ func DealProviderCollateralBounds(
 		min, max := market5.DealProviderCollateralBounds(size, verified, rawBytePower, qaPower, baselinePower, circulatingFil)
 		return min, max, nil
 
-	case actors.Version6:
-
-		min, max := market6.DealProviderCollateralBounds(size, verified, rawBytePower, qaPower, baselinePower, circulatingFil)
-		return min, max, nil
-
 	default:
 		return big.Zero(), big.Zero(), xerrors.Errorf("unsupported actors version")
 	}
 }
 
 func DealDurationBounds(pieceSize abi.PaddedPieceSize) (min, max abi.ChainEpoch) {
-	return market6.DealDurationBounds(pieceSize)
+	return market5.DealDurationBounds(pieceSize)
 }
 
 // Sets the challenge window and scales the proving period to match (such that
@@ -338,13 +300,6 @@ func SetWPoStChallengeWindow(period abi.ChainEpoch) {
 	// scale it if we're scaling the challenge period.
 	miner5.WPoStDisputeWindow = period * 30
 
-	miner6.WPoStChallengeWindow = period
-	miner6.WPoStProvingPeriod = period * abi.ChainEpoch(miner6.WPoStPeriodDeadlines)
-
-	// by default, this is 2x finality which is 30 periods.
-	// scale it if we're scaling the challenge period.
-	miner6.WPoStDisputeWindow = period * 30
-
 }
 
 func GetWinningPoStSectorSetLookback(nwVer network.Version) abi.ChainEpoch {
@@ -357,15 +312,15 @@ func GetWinningPoStSectorSetLookback(nwVer network.Version) abi.ChainEpoch {
 }
 
 func GetMaxSectorExpirationExtension() abi.ChainEpoch {
-	return miner6.MaxSectorExpirationExtension
+	return miner5.MaxSectorExpirationExtension
 }
 
 func GetMinSectorExpiration() abi.ChainEpoch {
-	return miner6.MinSectorExpiration
+	return miner5.MinSectorExpiration
 }
 
 func GetMaxPoStPartitions(nv network.Version, p abi.RegisteredPoStProof) (int, error) {
-	sectorsPerPart, err := builtin6.PoStProofWindowPoStPartitionSectors(p)
+	sectorsPerPart, err := builtin5.PoStProofWindowPoStPartitionSectors(p)
 	if err != nil {
 		return 0, err
 	}
@@ -378,8 +333,8 @@ func GetMaxPoStPartitions(nv network.Version, p abi.RegisteredPoStProof) (int, e
 
 func GetDefaultSectorSize() abi.SectorSize {
 	// supported sector sizes are the same across versions.
-	szs := make([]abi.SectorSize, 0, len(miner6.PreCommitSealProofTypesV8))
-	for spt := range miner6.PreCommitSealProofTypesV8 {
+	szs := make([]abi.SectorSize, 0, len(miner5.PreCommitSealProofTypesV8))
+	for spt := range miner5.PreCommitSealProofTypesV8 {
 		ss, err := spt.SectorSize()
 		if err != nil {
 			panic(err)
@@ -404,7 +359,7 @@ func GetSectorMaxLifetime(proof abi.RegisteredSealProof, nwVer network.Version)
 		return builtin4.SealProofPoliciesV0[proof].SectorMaxLifetime
 	}
 
-	return builtin6.SealProofPoliciesV11[proof].SectorMaxLifetime
+	return builtin5.SealProofPoliciesV11[proof].SectorMaxLifetime
 }
 
 func GetAddressedSectorsMax(nwVer network.Version) (int, error) {
@@ -429,9 +384,6 @@ func GetAddressedSectorsMax(nwVer network.Version) (int, error) {
 	case actors.Version5:
 		return miner5.AddressedSectorsMax, nil
 
-	case actors.Version6:
-		return miner6.AddressedSectorsMax, nil
-
 	default:
 		return 0, xerrors.Errorf("unsupported network version")
 	}
@@ -465,16 +417,12 @@ func GetDeclarationsMax(nwVer network.Version) (int, error) {
 
 		return miner5.DeclarationsMax, nil
 
-	case actors.Version6:
-
-		return miner6.DeclarationsMax, nil
-
 	default:
 		return 0, xerrors.Errorf("unsupported network version")
 	}
 }
 
-func AggregateProveCommitNetworkFee(nwVer network.Version, aggregateSize int, baseFee abi.TokenAmount) (abi.TokenAmount, error) {
+func AggregateNetworkFee(nwVer network.Version, aggregateSize int, baseFee abi.TokenAmount) (abi.TokenAmount, error) {
 	v, err := actors.VersionForNetwork(nwVer)
 	if err != nil {
 		return big.Zero(), err
@@ -501,46 +449,6 @@ func AggregateProveCommitNetworkFee(nwVer network.Version, aggregateSize int, ba
 
 		return miner5.AggregateNetworkFee(aggregateSize, baseFee), nil
 
-	case actors.Version6:
-
-		return miner6.AggregateProveCommitNetworkFee(aggregateSize, baseFee), nil
-
-	default:
-		return big.Zero(), xerrors.Errorf("unsupported network version")
-	}
-}
-
-func AggregatePreCommitNetworkFee(nwVer network.Version, aggregateSize int, baseFee abi.TokenAmount) (abi.TokenAmount, error) {
-	v, err := actors.VersionForNetwork(nwVer)
-	if err != nil {
-		return big.Zero(), err
-	}
-	switch v {
-
-	case actors.Version0:
-
-		return big.Zero(), nil
-
-	case actors.Version2:
-
-		return big.Zero(), nil
-
-	case actors.Version3:
-
-		return big.Zero(), nil
-
-	case actors.Version4:
-
-		return big.Zero(), nil
-
-	case actors.Version5:
-
-		return big.Zero(), nil
-
-	case actors.Version6:
-
-		return miner6.AggregatePreCommitNetworkFee(aggregateSize, baseFee), nil
-
 	default:
 		return big.Zero(), xerrors.Errorf("unsupported network version")
 	}

chain/actors/policy/policy.go.template

@@ -63,18 +63,9 @@ func AddSupportedProofTypes(types ...abi.RegisteredSealProof) {
                 miner{{.}}.PreCommitSealProofTypesV7[t] = struct{}{}
                 miner{{.}}.PreCommitSealProofTypesV7[t+abi.RegisteredSealProof_StackedDrg2KiBV1_1] = struct{}{}
                 miner{{.}}.PreCommitSealProofTypesV8[t+abi.RegisteredSealProof_StackedDrg2KiBV1_1] = struct{}{}
-            {{else if (eq . 5)}}
-                miner{{.}}.PreCommitSealProofTypesV8[t+abi.RegisteredSealProof_StackedDrg2KiBV1_1] = struct{}{}
-                wpp, err := t.RegisteredWindowPoStProof()
-                if err != nil {
-                    // Fine to panic, this is a test-only method
-                    panic(err)
-                }
-
-                miner{{.}}.WindowPoStProofTypes[wpp] = struct{}{}
             {{else}}
                 miner{{.}}.PreCommitSealProofTypesV8[t+abi.RegisteredSealProof_StackedDrg2KiBV1_1] = struct{}{}
-                wpp, err = t.RegisteredWindowPoStProof()
+                wpp, err := t.RegisteredWindowPoStProof()
                 if err != nil {
                     // Fine to panic, this is a test-only method
                     panic(err)
@@ -294,7 +285,7 @@ func GetDeclarationsMax(nwVer network.Version) (int, error) {
 	}
 }
 
-func AggregateProveCommitNetworkFee(nwVer network.Version, aggregateSize int, baseFee abi.TokenAmount) (abi.TokenAmount, error) {
+func AggregateNetworkFee(nwVer network.Version, aggregateSize int, baseFee abi.TokenAmount) (abi.TokenAmount, error) {
    v, err := actors.VersionForNetwork(nwVer)
 	if err != nil {
 		return big.Zero(), err
@@ -302,31 +293,10 @@ func AggregateProveCommitNetworkFee(nwVer network.Version, aggregateSize int, ba
 	switch v {
 	    {{range .versions}}
 	    case actors.Version{{.}}:
-            {{if (ge . 6)}}
-                return miner{{.}}.AggregateProveCommitNetworkFee(aggregateSize, baseFee), nil
-            {{else if (eq . 5)}}
+            {{if (le . 4)}}
+                return big.Zero(), nil
+            {{else}}
                 return miner{{.}}.AggregateNetworkFee(aggregateSize, baseFee), nil
-            {{else}}
-                return big.Zero(), nil
-            {{end}}
-        {{end}}
-	default:
-		return big.Zero(), xerrors.Errorf("unsupported network version")
-	}
-}
-
-func AggregatePreCommitNetworkFee(nwVer network.Version, aggregateSize int, baseFee abi.TokenAmount) (abi.TokenAmount, error) {
-   v, err := actors.VersionForNetwork(nwVer)
-	if err != nil {
-		return big.Zero(), err
-	}
-	switch v {
-	    {{range .versions}}
-	    case actors.Version{{.}}:
-            {{if (ge . 6)}}
-                return miner{{.}}.AggregatePreCommitNetworkFee(aggregateSize, baseFee), nil
-            {{else}}
-                return big.Zero(), nil
             {{end}}
         {{end}}
 	default:

chain/actors/version.go

@@ -8,21 +8,9 @@ import (
 
 type Version int
 
-/* inline-gen template
+var LatestVersion = 5
 
-var LatestVersion = {{.latestActorsVersion}}
-
-var Versions = []int{ {{range .actorVersions}} {{.}}, {{end}} }
-
-const ({{range .actorVersions}}
-	Version{{.}} Version = {{.}}{{end}}
-)
-
-/* inline-gen start */
-
-var LatestVersion = 6
-
-var Versions = []int{0, 2, 3, 4, 5, 6}
+var Versions = []int{0, 2, 3, 4, LatestVersion}
 
 const (
 	Version0 Version = 0
@@ -30,11 +18,8 @@ const (
 	Version3 Version = 3
 	Version4 Version = 4
 	Version5 Version = 5
-	Version6 Version = 6
 )
 
-/* inline-gen end */
-
 // Converts a network version into an actors adt version.
 func VersionForNetwork(version network.Version) (Version, error) {
 	switch version {
@@ -48,8 +33,6 @@ func VersionForNetwork(version network.Version) (Version, error) {
 		return Version4, nil
 	case network.Version13:
 		return Version5, nil
-	case network.Version14:
-		return Version6, nil
 	default:
 		return -1, fmt.Errorf("unsupported network version %d", version)
 	}

chain/beacon/drand/drand.go

@@ -177,11 +177,6 @@ func (db *DrandBeacon) VerifyEntry(curr types.BeaconEntry, prev types.BeaconEntr
 		// TODO handle genesis better
 		return nil
 	}
-
-	if curr.Round != prev.Round+1 {
-		return xerrors.Errorf("invalid beacon entry: cur (%d) != prev (%d) + 1", curr.Round, prev.Round)
-	}
-
 	if be := db.getCachedValue(curr.Round); be != nil {
 		if !bytes.Equal(curr.Data, be.Data) {
 			return xerrors.New("invalid beacon value, does not match cached good value")

chain/beacon/mock.go

@@ -54,8 +54,7 @@ func (mb *mockBeacon) VerifyEntry(from types.BeaconEntry, to types.BeaconEntry)
 }
 
 func (mb *mockBeacon) MaxBeaconRoundForEpoch(epoch abi.ChainEpoch) uint64 {
-	// offset for better testing
-	return uint64(epoch + 100)
+	return uint64(epoch)
 }
 
 var _ RandomBeacon = (*mockBeacon)(nil)

chain/consensus/filcns/compute_state.go

@@ -1,316 +0,0 @@
-package filcns
-
-import (
-	"context"
-	"sync/atomic"
-
-	"github.com/filecoin-project/lotus/chain/rand"
-
-	"github.com/ipfs/go-cid"
-	cbg "github.com/whyrusleeping/cbor-gen"
-	"go.opencensus.io/stats"
-	"go.opencensus.io/trace"
-	"golang.org/x/xerrors"
-
-	"github.com/filecoin-project/go-state-types/abi"
-	"github.com/filecoin-project/go-state-types/big"
-	blockadt "github.com/filecoin-project/specs-actors/actors/util/adt"
-
-	/* inline-gen template
-	   {{range .actorVersions}}
-	   	exported{{.}} "github.com/filecoin-project/specs-actors{{import .}}actors/builtin/exported"{{end}}
-
-	/* inline-gen start */
-
-	exported0 "github.com/filecoin-project/specs-actors/actors/builtin/exported"
-	exported2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/exported"
-	exported3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/exported"
-	exported4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/exported"
-	exported5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/exported"
-	exported6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/exported"
-
-	/* inline-gen end */
-
-	"github.com/filecoin-project/lotus/build"
-	"github.com/filecoin-project/lotus/chain/actors"
-	"github.com/filecoin-project/lotus/chain/actors/builtin"
-	"github.com/filecoin-project/lotus/chain/actors/builtin/cron"
-	"github.com/filecoin-project/lotus/chain/actors/builtin/reward"
-	"github.com/filecoin-project/lotus/chain/stmgr"
-	"github.com/filecoin-project/lotus/chain/store"
-	"github.com/filecoin-project/lotus/chain/types"
-	"github.com/filecoin-project/lotus/chain/vm"
-	"github.com/filecoin-project/lotus/metrics"
-)
-
-func NewActorRegistry() *vm.ActorRegistry {
-	inv := vm.NewActorRegistry()
-
-	// TODO: define all these properties on the actors themselves, in specs-actors.
-	/* inline-gen template
-	{{range .actorVersions}}
-	inv.Register(vm.ActorsVersionPredicate(actors.Version{{.}}), exported{{.}}.BuiltinActors()...){{end}}
-
-	/* inline-gen start */
-
-	inv.Register(vm.ActorsVersionPredicate(actors.Version0), exported0.BuiltinActors()...)
-	inv.Register(vm.ActorsVersionPredicate(actors.Version2), exported2.BuiltinActors()...)
-	inv.Register(vm.ActorsVersionPredicate(actors.Version3), exported3.BuiltinActors()...)
-	inv.Register(vm.ActorsVersionPredicate(actors.Version4), exported4.BuiltinActors()...)
-	inv.Register(vm.ActorsVersionPredicate(actors.Version5), exported5.BuiltinActors()...)
-	inv.Register(vm.ActorsVersionPredicate(actors.Version6), exported6.BuiltinActors()...)
-
-	/* inline-gen end */
-
-	return inv
-}
-
-type TipSetExecutor struct{}
-
-func NewTipSetExecutor() *TipSetExecutor {
-	return &TipSetExecutor{}
-}
-
-func (t *TipSetExecutor) NewActorRegistry() *vm.ActorRegistry {
-	return NewActorRegistry()
-}
-
-type FilecoinBlockMessages struct {
-	store.BlockMessages
-
-	WinCount int64
-}
-
-func (t *TipSetExecutor) ApplyBlocks(ctx context.Context, sm *stmgr.StateManager, parentEpoch abi.ChainEpoch, pstate cid.Cid, bms []FilecoinBlockMessages, epoch abi.ChainEpoch, r vm.Rand, em stmgr.ExecMonitor, baseFee abi.TokenAmount, ts *types.TipSet) (cid.Cid, cid.Cid, error) {
-	done := metrics.Timer(ctx, metrics.VMApplyBlocksTotal)
-	defer done()
-
-	partDone := metrics.Timer(ctx, metrics.VMApplyEarly)
-	defer func() {
-		partDone()
-	}()
-
-	makeVmWithBaseState := func(base cid.Cid) (*vm.VM, error) {
-		vmopt := &vm.VMOpts{
-			StateBase:      base,
-			Epoch:          epoch,
-			Rand:           r,
-			Bstore:         sm.ChainStore().StateBlockstore(),
-			Actors:         NewActorRegistry(),
-			Syscalls:       sm.Syscalls,
-			CircSupplyCalc: sm.GetVMCirculatingSupply,
-			NtwkVersion:    sm.GetNtwkVersion,
-			BaseFee:        baseFee,
-			LookbackState:  stmgr.LookbackStateGetterForTipset(sm, ts),
-		}
-
-		return sm.VMConstructor()(ctx, vmopt)
-	}
-
-	vmi, err := makeVmWithBaseState(pstate)
-	if err != nil {
-		return cid.Undef, cid.Undef, xerrors.Errorf("making vm: %w", err)
-	}
-
-	runCron := func(epoch abi.ChainEpoch) error {
-		cronMsg := &types.Message{
-			To:         cron.Address,
-			From:       builtin.SystemActorAddr,
-			Nonce:      uint64(epoch),
-			Value:      types.NewInt(0),
-			GasFeeCap:  types.NewInt(0),
-			GasPremium: types.NewInt(0),
-			GasLimit:   build.BlockGasLimit * 10000, // Make super sure this is never too little
-			Method:     cron.Methods.EpochTick,
-			Params:     nil,
-		}
-		ret, err := vmi.ApplyImplicitMessage(ctx, cronMsg)
-		if err != nil {
-			return err
-		}
-		if em != nil {
-			if err := em.MessageApplied(ctx, ts, cronMsg.Cid(), cronMsg, ret, true); err != nil {
-				return xerrors.Errorf("callback failed on cron message: %w", err)
-			}
-		}
-		if ret.ExitCode != 0 {
-			return xerrors.Errorf("CheckProofSubmissions exit was non-zero: %d", ret.ExitCode)
-		}
-
-		return nil
-	}
-
-	for i := parentEpoch; i < epoch; i++ {
-		if i > parentEpoch {
-			// run cron for null rounds if any
-			if err := runCron(i); err != nil {
-				return cid.Undef, cid.Undef, err
-			}
-
-			pstate, err = vmi.Flush(ctx)
-			if err != nil {
-				return cid.Undef, cid.Undef, xerrors.Errorf("flushing vm: %w", err)
-			}
-		}
-
-		// handle state forks
-		// XXX: The state tree
-		newState, err := sm.HandleStateForks(ctx, pstate, i, em, ts)
-		if err != nil {
-			return cid.Undef, cid.Undef, xerrors.Errorf("error handling state forks: %w", err)
-		}
-
-		if pstate != newState {
-			vmi, err = makeVmWithBaseState(newState)
-			if err != nil {
-				return cid.Undef, cid.Undef, xerrors.Errorf("making vm: %w", err)
-			}
-		}
-
-		vmi.SetBlockHeight(i + 1)
-		pstate = newState
-	}
-
-	partDone()
-	partDone = metrics.Timer(ctx, metrics.VMApplyMessages)
-
-	var receipts []cbg.CBORMarshaler
-	processedMsgs := make(map[cid.Cid]struct{})
-	for _, b := range bms {
-		penalty := types.NewInt(0)
-		gasReward := big.Zero()
-
-		for _, cm := range append(b.BlsMessages, b.SecpkMessages...) {
-			m := cm.VMMessage()
-			if _, found := processedMsgs[m.Cid()]; found {
-				continue
-			}
-			r, err := vmi.ApplyMessage(ctx, cm)
-			if err != nil {
-				return cid.Undef, cid.Undef, err
-			}
-
-			receipts = append(receipts, &r.MessageReceipt)
-			gasReward = big.Add(gasReward, r.GasCosts.MinerTip)
-			penalty = big.Add(penalty, r.GasCosts.MinerPenalty)
-
-			if em != nil {
-				if err := em.MessageApplied(ctx, ts, cm.Cid(), m, r, false); err != nil {
-					return cid.Undef, cid.Undef, err
-				}
-			}
-			processedMsgs[m.Cid()] = struct{}{}
-		}
-
-		params, err := actors.SerializeParams(&reward.AwardBlockRewardParams{
-			Miner:     b.Miner,
-			Penalty:   penalty,
-			GasReward: gasReward,
-			WinCount:  b.WinCount,
-		})
-		if err != nil {
-			return cid.Undef, cid.Undef, xerrors.Errorf("failed to serialize award params: %w", err)
-		}
-
-		rwMsg := &types.Message{
-			From:       builtin.SystemActorAddr,
-			To:         reward.Address,
-			Nonce:      uint64(epoch),
-			Value:      types.NewInt(0),
-			GasFeeCap:  types.NewInt(0),
-			GasPremium: types.NewInt(0),
-			GasLimit:   1 << 30,
-			Method:     reward.Methods.AwardBlockReward,
-			Params:     params,
-		}
-		ret, actErr := vmi.ApplyImplicitMessage(ctx, rwMsg)
-		if actErr != nil {
-			return cid.Undef, cid.Undef, xerrors.Errorf("failed to apply reward message for miner %s: %w", b.Miner, actErr)
-		}
-		if em != nil {
-			if err := em.MessageApplied(ctx, ts, rwMsg.Cid(), rwMsg, ret, true); err != nil {
-				return cid.Undef, cid.Undef, xerrors.Errorf("callback failed on reward message: %w", err)
-			}
-		}
-
-		if ret.ExitCode != 0 {
-			return cid.Undef, cid.Undef, xerrors.Errorf("reward application message failed (exit %d): %s", ret.ExitCode, ret.ActorErr)
-		}
-	}
-
-	partDone()
-	partDone = metrics.Timer(ctx, metrics.VMApplyCron)
-
-	if err := runCron(epoch); err != nil {
-		return cid.Cid{}, cid.Cid{}, err
-	}
-
-	partDone()
-	partDone = metrics.Timer(ctx, metrics.VMApplyFlush)
-
-	rectarr := blockadt.MakeEmptyArray(sm.ChainStore().ActorStore(ctx))
-	for i, receipt := range receipts {
-		if err := rectarr.Set(uint64(i), receipt); err != nil {
-			return cid.Undef, cid.Undef, xerrors.Errorf("failed to build receipts amt: %w", err)
-		}
-	}
-	rectroot, err := rectarr.Root()
-	if err != nil {
-		return cid.Undef, cid.Undef, xerrors.Errorf("failed to build receipts amt: %w", err)
-	}
-
-	st, err := vmi.Flush(ctx)
-	if err != nil {
-		return cid.Undef, cid.Undef, xerrors.Errorf("vm flush failed: %w", err)
-	}
-
-	stats.Record(ctx, metrics.VMSends.M(int64(atomic.LoadUint64(&vm.StatSends))),
-		metrics.VMApplied.M(int64(atomic.LoadUint64(&vm.StatApplied))))
-
-	return st, rectroot, nil
-}
-
-func (t *TipSetExecutor) ExecuteTipSet(ctx context.Context, sm *stmgr.StateManager, ts *types.TipSet, em stmgr.ExecMonitor) (stateroot cid.Cid, rectsroot cid.Cid, err error) {
-	ctx, span := trace.StartSpan(ctx, "computeTipSetState")
-	defer span.End()
-
-	blks := ts.Blocks()
-
-	for i := 0; i < len(blks); i++ {
-		for j := i + 1; j < len(blks); j++ {
-			if blks[i].Miner == blks[j].Miner {
-				return cid.Undef, cid.Undef,
-					xerrors.Errorf("duplicate miner in a tipset (%s %s)",
-						blks[i].Miner, blks[j].Miner)
-			}
-		}
-	}
-
-	var parentEpoch abi.ChainEpoch
-	pstate := blks[0].ParentStateRoot
-	if blks[0].Height > 0 {
-		parent, err := sm.ChainStore().GetBlock(blks[0].Parents[0])
-		if err != nil {
-			return cid.Undef, cid.Undef, xerrors.Errorf("getting parent block: %w", err)
-		}
-
-		parentEpoch = parent.Height
-	}
-
-	r := rand.NewStateRand(sm.ChainStore(), ts.Cids(), sm.Beacon())
-
-	blkmsgs, err := sm.ChainStore().BlockMsgsForTipset(ts)
-	if err != nil {
-		return cid.Undef, cid.Undef, xerrors.Errorf("getting block messages for tipset: %w", err)
-	}
-	fbmsgs := make([]FilecoinBlockMessages, len(blkmsgs))
-	for i := range fbmsgs {
-		fbmsgs[i].BlockMessages = blkmsgs[i]
-		fbmsgs[i].WinCount = ts.Blocks()[i].ElectionProof.WinCount
-	}
-	baseFee := blks[0].ParentBaseFee
-
-	return t.ApplyBlocks(ctx, sm, parentEpoch, pstate, fbmsgs, blks[0].Height, r, em, baseFee, ts)
-}
-
-var _ stmgr.Executor = &TipSetExecutor{}

chain/consensus/filcns/filecoin.go

@@ -1,855 +0,0 @@
-package filcns
-
-import (
-	"bytes"
-	"context"
-	"errors"
-	"fmt"
-	"os"
-	"strings"
-	"time"
-
-	"github.com/filecoin-project/lotus/chain/rand"
-
-	"github.com/hashicorp/go-multierror"
-	"github.com/ipfs/go-cid"
-	cbor "github.com/ipfs/go-ipld-cbor"
-	logging "github.com/ipfs/go-log/v2"
-	pubsub "github.com/libp2p/go-libp2p-pubsub"
-	cbg "github.com/whyrusleeping/cbor-gen"
-	"go.opencensus.io/stats"
-	"go.opencensus.io/trace"
-	"golang.org/x/xerrors"
-
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
-	"github.com/filecoin-project/go-state-types/crypto"
-	"github.com/filecoin-project/go-state-types/network"
-	blockadt "github.com/filecoin-project/specs-actors/actors/util/adt"
-	proof2 "github.com/filecoin-project/specs-actors/v2/actors/runtime/proof"
-
-	bstore "github.com/filecoin-project/lotus/blockstore"
-	"github.com/filecoin-project/lotus/build"
-	"github.com/filecoin-project/lotus/chain"
-	"github.com/filecoin-project/lotus/chain/actors/builtin"
-	"github.com/filecoin-project/lotus/chain/actors/builtin/power"
-	"github.com/filecoin-project/lotus/chain/beacon"
-	"github.com/filecoin-project/lotus/chain/consensus"
-	"github.com/filecoin-project/lotus/chain/state"
-	"github.com/filecoin-project/lotus/chain/stmgr"
-	"github.com/filecoin-project/lotus/chain/store"
-	"github.com/filecoin-project/lotus/chain/types"
-	"github.com/filecoin-project/lotus/chain/vm"
-	"github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper"
-	"github.com/filecoin-project/lotus/lib/async"
-	"github.com/filecoin-project/lotus/lib/sigs"
-	"github.com/filecoin-project/lotus/metrics"
-)
-
-var log = logging.Logger("fil-consensus")
-
-type FilecoinEC struct {
-	// The interface for accessing and putting tipsets into local storage
-	store *store.ChainStore
-
-	// handle to the random beacon for verification
-	beacon beacon.Schedule
-
-	// the state manager handles making state queries
-	sm *stmgr.StateManager
-
-	verifier ffiwrapper.Verifier
-
-	genesis *types.TipSet
-}
-
-// Blocks that are more than MaxHeightDrift epochs above
-// the theoretical max height based on systime are quickly rejected
-const MaxHeightDrift = 5
-
-func NewFilecoinExpectedConsensus(sm *stmgr.StateManager, beacon beacon.Schedule, verifier ffiwrapper.Verifier, genesis chain.Genesis) consensus.Consensus {
-	if build.InsecurePoStValidation {
-		log.Warn("*********************************************************************************************")
-		log.Warn(" [INSECURE-POST-VALIDATION] Insecure test validation is enabled. If you see this outside of a test, it is a severe bug! ")
-		log.Warn("*********************************************************************************************")
-	}
-
-	return &FilecoinEC{
-		store:    sm.ChainStore(),
-		beacon:   beacon,
-		sm:       sm,
-		verifier: verifier,
-		genesis:  genesis,
-	}
-}
-
-func (filec *FilecoinEC) ValidateBlock(ctx context.Context, b *types.FullBlock) (err error) {
-	if err := blockSanityChecks(b.Header); err != nil {
-		return xerrors.Errorf("incoming header failed basic sanity checks: %w", err)
-	}
-
-	h := b.Header
-
-	baseTs, err := filec.store.LoadTipSet(types.NewTipSetKey(h.Parents...))
-	if err != nil {
-		return xerrors.Errorf("load parent tipset failed (%s): %w", h.Parents, err)
-	}
-
-	winPoStNv := filec.sm.GetNtwkVersion(ctx, baseTs.Height())
-
-	lbts, lbst, err := stmgr.GetLookbackTipSetForRound(ctx, filec.sm, baseTs, h.Height)
-	if err != nil {
-		return xerrors.Errorf("failed to get lookback tipset for block: %w", err)
-	}
-
-	prevBeacon, err := filec.store.GetLatestBeaconEntry(baseTs)
-	if err != nil {
-		return xerrors.Errorf("failed to get latest beacon entry: %w", err)
-	}
-
-	// fast checks first
-	if h.Height <= baseTs.Height() {
-		return xerrors.Errorf("block height not greater than parent height: %d != %d", h.Height, baseTs.Height())
-	}
-
-	nulls := h.Height - (baseTs.Height() + 1)
-	if tgtTs := baseTs.MinTimestamp() + build.BlockDelaySecs*uint64(nulls+1); h.Timestamp != tgtTs {
-		return xerrors.Errorf("block has wrong timestamp: %d != %d", h.Timestamp, tgtTs)
-	}
-
-	now := uint64(build.Clock.Now().Unix())
-	if h.Timestamp > now+build.AllowableClockDriftSecs {
-		return xerrors.Errorf("block was from the future (now=%d, blk=%d): %w", now, h.Timestamp, consensus.ErrTemporal)
-	}
-	if h.Timestamp > now {
-		log.Warn("Got block from the future, but within threshold", h.Timestamp, build.Clock.Now().Unix())
-	}
-
-	msgsCheck := async.Err(func() error {
-		if b.Cid() == build.WhitelistedBlock {
-			return nil
-		}
-
-		if err := filec.checkBlockMessages(ctx, b, baseTs); err != nil {
-			return xerrors.Errorf("block had invalid messages: %w", err)
-		}
-		return nil
-	})
-
-	minerCheck := async.Err(func() error {
-		if err := filec.minerIsValid(ctx, h.Miner, baseTs); err != nil {
-			return xerrors.Errorf("minerIsValid failed: %w", err)
-		}
-		return nil
-	})
-
-	baseFeeCheck := async.Err(func() error {
-		baseFee, err := filec.store.ComputeBaseFee(ctx, baseTs)
-		if err != nil {
-			return xerrors.Errorf("computing base fee: %w", err)
-		}
-		if types.BigCmp(baseFee, b.Header.ParentBaseFee) != 0 {
-			return xerrors.Errorf("base fee doesn't match: %s (header) != %s (computed)",
-				b.Header.ParentBaseFee, baseFee)
-		}
-		return nil
-	})
-	pweight, err := filec.store.Weight(ctx, baseTs)
-	if err != nil {
-		return xerrors.Errorf("getting parent weight: %w", err)
-	}
-
-	if types.BigCmp(pweight, b.Header.ParentWeight) != 0 {
-		return xerrors.Errorf("parrent weight different: %s (header) != %s (computed)",
-			b.Header.ParentWeight, pweight)
-	}
-
-	stateRootCheck := async.Err(func() error {
-		stateroot, precp, err := filec.sm.TipSetState(ctx, baseTs)
-		if err != nil {
-			return xerrors.Errorf("get tipsetstate(%d, %s) failed: %w", h.Height, h.Parents, err)
-		}
-
-		if stateroot != h.ParentStateRoot {
-			msgs, err := filec.store.MessagesForTipset(baseTs)
-			if err != nil {
-				log.Error("failed to load messages for tipset during tipset state mismatch error: ", err)
-			} else {
-				log.Warn("Messages for tipset with mismatching state:")
-				for i, m := range msgs {
-					mm := m.VMMessage()
-					log.Warnf("Message[%d]: from=%s to=%s method=%d params=%x", i, mm.From, mm.To, mm.Method, mm.Params)
-				}
-			}
-
-			return xerrors.Errorf("parent state root did not match computed state (%s != %s)", stateroot, h.ParentStateRoot)
-		}
-
-		if precp != h.ParentMessageReceipts {
-			return xerrors.Errorf("parent receipts root did not match computed value (%s != %s)", precp, h.ParentMessageReceipts)
-		}
-
-		return nil
-	})
-
-	// Stuff that needs worker address
-	waddr, err := stmgr.GetMinerWorkerRaw(ctx, filec.sm, lbst, h.Miner)
-	if err != nil {
-		return xerrors.Errorf("GetMinerWorkerRaw failed: %w", err)
-	}
-
-	winnerCheck := async.Err(func() error {
-		if h.ElectionProof.WinCount < 1 {
-			return xerrors.Errorf("block is not claiming to be a winner")
-		}
-
-		eligible, err := stmgr.MinerEligibleToMine(ctx, filec.sm, h.Miner, baseTs, lbts)
-		if err != nil {
-			return xerrors.Errorf("determining if miner has min power failed: %w", err)
-		}
-
-		if !eligible {
-			return xerrors.New("block's miner is ineligible to mine")
-		}
-
-		rBeacon := *prevBeacon
-		if len(h.BeaconEntries) != 0 {
-			rBeacon = h.BeaconEntries[len(h.BeaconEntries)-1]
-		}
-		buf := new(bytes.Buffer)
-		if err := h.Miner.MarshalCBOR(buf); err != nil {
-			return xerrors.Errorf("failed to marshal miner address to cbor: %w", err)
-		}
-
-		vrfBase, err := rand.DrawRandomness(rBeacon.Data, crypto.DomainSeparationTag_ElectionProofProduction, h.Height, buf.Bytes())
-		if err != nil {
-			return xerrors.Errorf("could not draw randomness: %w", err)
-		}
-
-		if err := VerifyElectionPoStVRF(ctx, waddr, vrfBase, h.ElectionProof.VRFProof); err != nil {
-			return xerrors.Errorf("validating block election proof failed: %w", err)
-		}
-
-		slashed, err := stmgr.GetMinerSlashed(ctx, filec.sm, baseTs, h.Miner)
-		if err != nil {
-			return xerrors.Errorf("failed to check if block miner was slashed: %w", err)
-		}
-
-		if slashed {
-			return xerrors.Errorf("received block was from slashed or invalid miner")
-		}
-
-		mpow, tpow, _, err := stmgr.GetPowerRaw(ctx, filec.sm, lbst, h.Miner)
-		if err != nil {
-			return xerrors.Errorf("failed getting power: %w", err)
-		}
-
-		j := h.ElectionProof.ComputeWinCount(mpow.QualityAdjPower, tpow.QualityAdjPower)
-		if h.ElectionProof.WinCount != j {
-			return xerrors.Errorf("miner claims wrong number of wins: miner: %d, computed: %d", h.ElectionProof.WinCount, j)
-		}
-
-		return nil
-	})
-
-	blockSigCheck := async.Err(func() error {
-		if err := sigs.CheckBlockSignature(ctx, h, waddr); err != nil {
-			return xerrors.Errorf("check block signature failed: %w", err)
-		}
-		return nil
-	})
-
-	beaconValuesCheck := async.Err(func() error {
-		if os.Getenv("LOTUS_IGNORE_DRAND") == "_yes_" {
-			return nil
-		}
-
-		if err := beacon.ValidateBlockValues(filec.beacon, h, baseTs.Height(), *prevBeacon); err != nil {
-			return xerrors.Errorf("failed to validate blocks random beacon values: %w", err)
-		}
-		return nil
-	})
-
-	tktsCheck := async.Err(func() error {
-		buf := new(bytes.Buffer)
-		if err := h.Miner.MarshalCBOR(buf); err != nil {
-			return xerrors.Errorf("failed to marshal miner address to cbor: %w", err)
-		}
-
-		if h.Height > build.UpgradeSmokeHeight {
-			buf.Write(baseTs.MinTicket().VRFProof)
-		}
-
-		beaconBase := *prevBeacon
-		if len(h.BeaconEntries) != 0 {
-			beaconBase = h.BeaconEntries[len(h.BeaconEntries)-1]
-		}
-
-		vrfBase, err := rand.DrawRandomness(beaconBase.Data, crypto.DomainSeparationTag_TicketProduction, h.Height-build.TicketRandomnessLookback, buf.Bytes())
-		if err != nil {
-			return xerrors.Errorf("failed to compute vrf base for ticket: %w", err)
-		}
-
-		err = VerifyElectionPoStVRF(ctx, waddr, vrfBase, h.Ticket.VRFProof)
-		if err != nil {
-			return xerrors.Errorf("validating block tickets failed: %w", err)
-		}
-		return nil
-	})
-
-	wproofCheck := async.Err(func() error {
-		if err := filec.VerifyWinningPoStProof(ctx, winPoStNv, h, *prevBeacon, lbst, waddr); err != nil {
-			return xerrors.Errorf("invalid election post: %w", err)
-		}
-		return nil
-	})
-
-	await := []async.ErrorFuture{
-		minerCheck,
-		tktsCheck,
-		blockSigCheck,
-		beaconValuesCheck,
-		wproofCheck,
-		winnerCheck,
-		msgsCheck,
-		baseFeeCheck,
-		stateRootCheck,
-	}
-
-	var merr error
-	for _, fut := range await {
-		if err := fut.AwaitContext(ctx); err != nil {
-			merr = multierror.Append(merr, err)
-		}
-	}
-	if merr != nil {
-		mulErr := merr.(*multierror.Error)
-		mulErr.ErrorFormat = func(es []error) string {
-			if len(es) == 1 {
-				return fmt.Sprintf("1 error occurred:\n\t* %+v\n\n", es[0])
-			}
-
-			points := make([]string, len(es))
-			for i, err := range es {
-				points[i] = fmt.Sprintf("* %+v", err)
-			}
-
-			return fmt.Sprintf(
-				"%d errors occurred:\n\t%s\n\n",
-				len(es), strings.Join(points, "\n\t"))
-		}
-		return mulErr
-	}
-
-	return nil
-}
-
-func blockSanityChecks(h *types.BlockHeader) error {
-	if h.ElectionProof == nil {
-		return xerrors.Errorf("block cannot have nil election proof")
-	}
-
-	if h.Ticket == nil {
-		return xerrors.Errorf("block cannot have nil ticket")
-	}
-
-	if h.BlockSig == nil {
-		return xerrors.Errorf("block had nil signature")
-	}
-
-	if h.BLSAggregate == nil {
-		return xerrors.Errorf("block had nil bls aggregate signature")
-	}
-
-	if h.Miner.Protocol() != address.ID {
-		return xerrors.Errorf("block had non-ID miner address")
-	}
-
-	return nil
-}
-
-func (filec *FilecoinEC) VerifyWinningPoStProof(ctx context.Context, nv network.Version, h *types.BlockHeader, prevBeacon types.BeaconEntry, lbst cid.Cid, waddr address.Address) error {
-	if build.InsecurePoStValidation {
-		if len(h.WinPoStProof) == 0 {
-			return xerrors.Errorf("[INSECURE-POST-VALIDATION] No winning post proof given")
-		}
-
-		if string(h.WinPoStProof[0].ProofBytes) == "valid proof" {
-			return nil
-		}
-		return xerrors.Errorf("[INSECURE-POST-VALIDATION] winning post was invalid")
-	}
-
-	buf := new(bytes.Buffer)
-	if err := h.Miner.MarshalCBOR(buf); err != nil {
-		return xerrors.Errorf("failed to marshal miner address: %w", err)
-	}
-
-	rbase := prevBeacon
-	if len(h.BeaconEntries) > 0 {
-		rbase = h.BeaconEntries[len(h.BeaconEntries)-1]
-	}
-
-	rand, err := rand.DrawRandomness(rbase.Data, crypto.DomainSeparationTag_WinningPoStChallengeSeed, h.Height, buf.Bytes())
-	if err != nil {
-		return xerrors.Errorf("failed to get randomness for verifying winning post proof: %w", err)
-	}
-
-	mid, err := address.IDFromAddress(h.Miner)
-	if err != nil {
-		return xerrors.Errorf("failed to get ID from miner address %s: %w", h.Miner, err)
-	}
-
-	sectors, err := stmgr.GetSectorsForWinningPoSt(ctx, nv, filec.verifier, filec.sm, lbst, h.Miner, rand)
-	if err != nil {
-		return xerrors.Errorf("getting winning post sector set: %w", err)
-	}
-
-	ok, err := ffiwrapper.ProofVerifier.VerifyWinningPoSt(ctx, proof2.WinningPoStVerifyInfo{
-		Randomness:        rand,
-		Proofs:            h.WinPoStProof,
-		ChallengedSectors: sectors,
-		Prover:            abi.ActorID(mid),
-	})
-	if err != nil {
-		return xerrors.Errorf("failed to verify election post: %w", err)
-	}
-
-	if !ok {
-		log.Errorf("invalid winning post (block: %s, %x; %v)", h.Cid(), rand, sectors)
-		return xerrors.Errorf("winning post was invalid")
-	}
-
-	return nil
-}
-
-// TODO: We should extract this somewhere else and make the message pool and miner use the same logic
-func (filec *FilecoinEC) checkBlockMessages(ctx context.Context, b *types.FullBlock, baseTs *types.TipSet) error {
-	{
-		var sigCids []cid.Cid // this is what we get for people not wanting the marshalcbor method on the cid type
-		var pubks [][]byte
-
-		for _, m := range b.BlsMessages {
-			sigCids = append(sigCids, m.Cid())
-
-			pubk, err := filec.sm.GetBlsPublicKey(ctx, m.From, baseTs)
-			if err != nil {
-				return xerrors.Errorf("failed to load bls public to validate block: %w", err)
-			}
-
-			pubks = append(pubks, pubk)
-		}
-
-		if err := consensus.VerifyBlsAggregate(ctx, b.Header.BLSAggregate, sigCids, pubks); err != nil {
-			return xerrors.Errorf("bls aggregate signature was invalid: %w", err)
-		}
-	}
-
-	nonces := make(map[address.Address]uint64)
-
-	stateroot, _, err := filec.sm.TipSetState(ctx, baseTs)
-	if err != nil {
-		return err
-	}
-
-	st, err := state.LoadStateTree(filec.store.ActorStore(ctx), stateroot)
-	if err != nil {
-		return xerrors.Errorf("failed to load base state tree: %w", err)
-	}
-
-	nv := filec.sm.GetNtwkVersion(ctx, b.Header.Height)
-	pl := vm.PricelistByEpoch(baseTs.Height())
-	var sumGasLimit int64
-	checkMsg := func(msg types.ChainMsg) error {
-		m := msg.VMMessage()
-
-		// Phase 1: syntactic validation, as defined in the spec
-		minGas := pl.OnChainMessage(msg.ChainLength())
-		if err := m.ValidForBlockInclusion(minGas.Total(), nv); err != nil {
-			return err
-		}
-
-		// ValidForBlockInclusion checks if any single message does not exceed BlockGasLimit
-		// So below is overflow safe
-		sumGasLimit += m.GasLimit
-		if sumGasLimit > build.BlockGasLimit {
-			return xerrors.Errorf("block gas limit exceeded")
-		}
-
-		// Phase 2: (Partial) semantic validation:
-		// the sender exists and is an account actor, and the nonces make sense
-		var sender address.Address
-		if filec.sm.GetNtwkVersion(ctx, b.Header.Height) >= network.Version13 {
-			sender, err = st.LookupID(m.From)
-			if err != nil {
-				return err
-			}
-		} else {
-			sender = m.From
-		}
-
-		if _, ok := nonces[sender]; !ok {
-			// `GetActor` does not validate that this is an account actor.
-			act, err := st.GetActor(sender)
-			if err != nil {
-				return xerrors.Errorf("failed to get actor: %w", err)
-			}
-
-			if !builtin.IsAccountActor(act.Code) {
-				return xerrors.New("Sender must be an account actor")
-			}
-			nonces[sender] = act.Nonce
-		}
-
-		if nonces[sender] != m.Nonce {
-			return xerrors.Errorf("wrong nonce (exp: %d, got: %d)", nonces[sender], m.Nonce)
-		}
-		nonces[sender]++
-
-		return nil
-	}
-
-	// Validate message arrays in a temporary blockstore.
-	tmpbs := bstore.NewMemory()
-	tmpstore := blockadt.WrapStore(ctx, cbor.NewCborStore(tmpbs))
-
-	bmArr := blockadt.MakeEmptyArray(tmpstore)
-	for i, m := range b.BlsMessages {
-		if err := checkMsg(m); err != nil {
-			return xerrors.Errorf("block had invalid bls message at index %d: %w", i, err)
-		}
-
-		c, err := store.PutMessage(tmpbs, m)
-		if err != nil {
-			return xerrors.Errorf("failed to store message %s: %w", m.Cid(), err)
-		}
-
-		k := cbg.CborCid(c)
-		if err := bmArr.Set(uint64(i), &k); err != nil {
-			return xerrors.Errorf("failed to put bls message at index %d: %w", i, err)
-		}
-	}
-
-	smArr := blockadt.MakeEmptyArray(tmpstore)
-	for i, m := range b.SecpkMessages {
-		if filec.sm.GetNtwkVersion(ctx, b.Header.Height) >= network.Version14 {
-			if m.Signature.Type != crypto.SigTypeSecp256k1 {
-				return xerrors.Errorf("block had invalid secpk message at index %d: %w", i, err)
-			}
-		}
-
-		if err := checkMsg(m); err != nil {
-			return xerrors.Errorf("block had invalid secpk message at index %d: %w", i, err)
-		}
-
-		// `From` being an account actor is only validated inside the `vm.ResolveToKeyAddr` call
-		// in `StateManager.ResolveToKeyAddress` here (and not in `checkMsg`).
-		kaddr, err := filec.sm.ResolveToKeyAddress(ctx, m.Message.From, baseTs)
-		if err != nil {
-			return xerrors.Errorf("failed to resolve key addr: %w", err)
-		}
-
-		if err := sigs.Verify(&m.Signature, kaddr, m.Message.Cid().Bytes()); err != nil {
-			return xerrors.Errorf("secpk message %s has invalid signature: %w", m.Cid(), err)
-		}
-
-		c, err := store.PutMessage(tmpbs, m)
-		if err != nil {
-			return xerrors.Errorf("failed to store message %s: %w", m.Cid(), err)
-		}
-		k := cbg.CborCid(c)
-		if err := smArr.Set(uint64(i), &k); err != nil {
-			return xerrors.Errorf("failed to put secpk message at index %d: %w", i, err)
-		}
-	}
-
-	bmroot, err := bmArr.Root()
-	if err != nil {
-		return err
-	}
-
-	smroot, err := smArr.Root()
-	if err != nil {
-		return err
-	}
-
-	mrcid, err := tmpstore.Put(ctx, &types.MsgMeta{
-		BlsMessages:   bmroot,
-		SecpkMessages: smroot,
-	})
-	if err != nil {
-		return err
-	}
-
-	if b.Header.Messages != mrcid {
-		return fmt.Errorf("messages didnt match message root in header")
-	}
-
-	// Finally, flush.
-	return vm.Copy(ctx, tmpbs, filec.store.ChainBlockstore(), mrcid)
-}
-
-func (filec *FilecoinEC) IsEpochBeyondCurrMax(epoch abi.ChainEpoch) bool {
-	if filec.genesis == nil {
-		return false
-	}
-
-	now := uint64(build.Clock.Now().Unix())
-	return epoch > (abi.ChainEpoch((now-filec.genesis.MinTimestamp())/build.BlockDelaySecs) + MaxHeightDrift)
-}
-
-func (filec *FilecoinEC) minerIsValid(ctx context.Context, maddr address.Address, baseTs *types.TipSet) error {
-	act, err := filec.sm.LoadActor(ctx, power.Address, baseTs)
-	if err != nil {
-		return xerrors.Errorf("failed to load power actor: %w", err)
-	}
-
-	powState, err := power.Load(filec.store.ActorStore(ctx), act)
-	if err != nil {
-		return xerrors.Errorf("failed to load power actor state: %w", err)
-	}
-
-	_, exist, err := powState.MinerPower(maddr)
-	if err != nil {
-		return xerrors.Errorf("failed to look up miner's claim: %w", err)
-	}
-
-	if !exist {
-		return xerrors.New("miner isn't valid")
-	}
-
-	return nil
-}
-
-func VerifyElectionPoStVRF(ctx context.Context, worker address.Address, rand []byte, evrf []byte) error {
-	return VerifyVRF(ctx, worker, rand, evrf)
-}
-
-func VerifyVRF(ctx context.Context, worker address.Address, vrfBase, vrfproof []byte) error {
-	_, span := trace.StartSpan(ctx, "VerifyVRF")
-	defer span.End()
-
-	sig := &crypto.Signature{
-		Type: crypto.SigTypeBLS,
-		Data: vrfproof,
-	}
-
-	if err := sigs.Verify(sig, worker, vrfBase); err != nil {
-		return xerrors.Errorf("vrf was invalid: %w", err)
-	}
-
-	return nil
-}
-
-var ErrSoftFailure = errors.New("soft validation failure")
-var ErrInsufficientPower = errors.New("incoming block's miner does not have minimum power")
-
-func (filec *FilecoinEC) ValidateBlockPubsub(ctx context.Context, self bool, msg *pubsub.Message) (pubsub.ValidationResult, string) {
-	if self {
-		return filec.validateLocalBlock(ctx, msg)
-	}
-
-	// track validation time
-	begin := build.Clock.Now()
-	defer func() {
-		log.Debugf("block validation time: %s", build.Clock.Since(begin))
-	}()
-
-	stats.Record(ctx, metrics.BlockReceived.M(1))
-
-	recordFailureFlagPeer := func(what string) {
-		// bv.Validate will flag the peer in that case
-		panic(what)
-	}
-
-	blk, what, err := filec.decodeAndCheckBlock(msg)
-	if err != nil {
-		log.Error("got invalid block over pubsub: ", err)
-		recordFailureFlagPeer(what)
-		return pubsub.ValidationReject, what
-	}
-
-	// validate the block meta: the Message CID in the header must match the included messages
-	err = filec.validateMsgMeta(ctx, blk)
-	if err != nil {
-		log.Warnf("error validating message metadata: %s", err)
-		recordFailureFlagPeer("invalid_block_meta")
-		return pubsub.ValidationReject, "invalid_block_meta"
-	}
-
-	reject, err := filec.validateBlockHeader(ctx, blk.Header)
-	if err != nil {
-		if reject == "" {
-			log.Warn("ignoring block msg: ", err)
-			return pubsub.ValidationIgnore, reject
-		}
-		recordFailureFlagPeer(reject)
-		return pubsub.ValidationReject, reject
-	}
-
-	// all good, accept the block
-	msg.ValidatorData = blk
-	stats.Record(ctx, metrics.BlockValidationSuccess.M(1))
-	return pubsub.ValidationAccept, ""
-}
-
-func (filec *FilecoinEC) validateLocalBlock(ctx context.Context, msg *pubsub.Message) (pubsub.ValidationResult, string) {
-	stats.Record(ctx, metrics.BlockPublished.M(1))
-
-	if size := msg.Size(); size > 1<<20-1<<15 {
-		log.Errorf("ignoring oversize block (%dB)", size)
-		return pubsub.ValidationIgnore, "oversize_block"
-	}
-
-	blk, what, err := filec.decodeAndCheckBlock(msg)
-	if err != nil {
-		log.Errorf("got invalid local block: %s", err)
-		return pubsub.ValidationIgnore, what
-	}
-
-	msg.ValidatorData = blk
-	stats.Record(ctx, metrics.BlockValidationSuccess.M(1))
-	return pubsub.ValidationAccept, ""
-}
-
-func (filec *FilecoinEC) decodeAndCheckBlock(msg *pubsub.Message) (*types.BlockMsg, string, error) {
-	blk, err := types.DecodeBlockMsg(msg.GetData())
-	if err != nil {
-		return nil, "invalid", xerrors.Errorf("error decoding block: %w", err)
-	}
-
-	if count := len(blk.BlsMessages) + len(blk.SecpkMessages); count > build.BlockMessageLimit {
-		return nil, "too_many_messages", fmt.Errorf("block contains too many messages (%d)", count)
-	}
-
-	// make sure we have a signature
-	if blk.Header.BlockSig == nil {
-		return nil, "missing_signature", fmt.Errorf("block without a signature")
-	}
-
-	return blk, "", nil
-}
-
-func (filec *FilecoinEC) validateMsgMeta(ctx context.Context, msg *types.BlockMsg) error {
-	// TODO there has to be a simpler way to do this without the blockstore dance
-	// block headers use adt0
-	store := blockadt.WrapStore(ctx, cbor.NewCborStore(bstore.NewMemory()))
-	bmArr := blockadt.MakeEmptyArray(store)
-	smArr := blockadt.MakeEmptyArray(store)
-
-	for i, m := range msg.BlsMessages {
-		c := cbg.CborCid(m)
-		if err := bmArr.Set(uint64(i), &c); err != nil {
-			return err
-		}
-	}
-
-	for i, m := range msg.SecpkMessages {
-		c := cbg.CborCid(m)
-		if err := smArr.Set(uint64(i), &c); err != nil {
-			return err
-		}
-	}
-
-	bmroot, err := bmArr.Root()
-	if err != nil {
-		return err
-	}
-
-	smroot, err := smArr.Root()
-	if err != nil {
-		return err
-	}
-
-	mrcid, err := store.Put(store.Context(), &types.MsgMeta{
-		BlsMessages:   bmroot,
-		SecpkMessages: smroot,
-	})
-
-	if err != nil {
-		return err
-	}
-
-	if msg.Header.Messages != mrcid {
-		return fmt.Errorf("messages didn't match root cid in header")
-	}
-
-	return nil
-}
-
-func (filec *FilecoinEC) validateBlockHeader(ctx context.Context, b *types.BlockHeader) (rejectReason string, err error) {
-
-	// we want to ensure that it is a block from a known miner; we reject blocks from unknown miners
-	// to prevent spam attacks.
-	// the logic works as follows: we lookup the miner in the chain for its key.
-	// if we can find it then it's a known miner and we can validate the signature.
-	// if we can't find it, we check whether we are (near) synced in the chain.
-	// if we are not synced we cannot validate the block and we must ignore it.
-	// if we are synced and the miner is unknown, then the block is rejcected.
-	key, err := filec.checkPowerAndGetWorkerKey(ctx, b)
-	if err != nil {
-		if err != ErrSoftFailure && filec.isChainNearSynced() {
-			log.Warnf("received block from unknown miner or miner that doesn't meet min power over pubsub; rejecting message")
-			return "unknown_miner", err
-		}
-
-		log.Warnf("cannot validate block message; unknown miner or miner that doesn't meet min power in unsynced chain: %s", b.Cid())
-		return "", err // ignore
-	}
-
-	if b.ElectionProof.WinCount < 1 {
-		log.Errorf("block is not claiming to be winning")
-		return "not_winning", xerrors.Errorf("block not winning")
-	}
-
-	err = sigs.CheckBlockSignature(ctx, b, key)
-	if err != nil {
-		log.Errorf("block signature verification failed: %s", err)
-		return "signature_verification_failed", err
-	}
-
-	return "", nil
-}
-
-func (filec *FilecoinEC) checkPowerAndGetWorkerKey(ctx context.Context, bh *types.BlockHeader) (address.Address, error) {
-	// we check that the miner met the minimum power at the lookback tipset
-
-	baseTs := filec.store.GetHeaviestTipSet()
-	lbts, lbst, err := stmgr.GetLookbackTipSetForRound(ctx, filec.sm, baseTs, bh.Height)
-	if err != nil {
-		log.Warnf("failed to load lookback tipset for incoming block: %s", err)
-		return address.Undef, ErrSoftFailure
-	}
-
-	key, err := stmgr.GetMinerWorkerRaw(ctx, filec.sm, lbst, bh.Miner)
-	if err != nil {
-		log.Warnf("failed to resolve worker key for miner %s and block height %d: %s", bh.Miner, bh.Height, err)
-		return address.Undef, ErrSoftFailure
-	}
-
-	// NOTE: we check to see if the miner was eligible in the lookback
-	// tipset - 1 for historical reasons. DO NOT use the lookback state
-	// returned by GetLookbackTipSetForRound.
-
-	eligible, err := stmgr.MinerEligibleToMine(ctx, filec.sm, bh.Miner, baseTs, lbts)
-	if err != nil {
-		log.Warnf("failed to determine if incoming block's miner has minimum power: %s", err)
-		return address.Undef, ErrSoftFailure
-	}
-
-	if !eligible {
-		log.Warnf("incoming block's miner is ineligible")
-		return address.Undef, ErrInsufficientPower
-	}
-
-	return key, nil
-}
-
-func (filec *FilecoinEC) isChainNearSynced() bool {
-	ts := filec.store.GetHeaviestTipSet()
-	timestamp := ts.MinTimestamp()
-	timestampTime := time.Unix(int64(timestamp), 0)
-	return build.Clock.Since(timestampTime) < 6*time.Hour
-}
-
-var _ consensus.Consensus = &FilecoinEC{}

chain/consensus/iface.go

@@ -1,19 +0,0 @@
-package consensus
-
-import (
-	"context"
-
-	pubsub "github.com/libp2p/go-libp2p-pubsub"
-
-	"github.com/filecoin-project/go-state-types/abi"
-	"github.com/filecoin-project/lotus/api"
-	"github.com/filecoin-project/lotus/chain/types"
-)
-
-type Consensus interface {
-	ValidateBlock(ctx context.Context, b *types.FullBlock) (err error)
-	ValidateBlockPubsub(ctx context.Context, self bool, msg *pubsub.Message) (pubsub.ValidationResult, string)
-	IsEpochBeyondCurrMax(epoch abi.ChainEpoch) bool
-
-	CreateBlock(ctx context.Context, w api.Wallet, bt *api.BlockTemplate) (*types.FullBlock, error)
-}

chain/consensus/utils.go

@@ -1,83 +0,0 @@
-package consensus
-
-import (
-	"context"
-	"errors"
-
-	blockadt "github.com/filecoin-project/specs-actors/actors/util/adt"
-	"github.com/ipfs/go-cid"
-	cbg "github.com/whyrusleeping/cbor-gen"
-	"go.opencensus.io/trace"
-	"golang.org/x/xerrors"
-
-	ffi "github.com/filecoin-project/filecoin-ffi"
-	"github.com/filecoin-project/go-state-types/crypto"
-)
-
-var ErrTemporal = errors.New("temporal error")
-
-func VerifyBlsAggregate(ctx context.Context, sig *crypto.Signature, msgs []cid.Cid, pubks [][]byte) error {
-	_, span := trace.StartSpan(ctx, "syncer.VerifyBlsAggregate")
-	defer span.End()
-	span.AddAttributes(
-		trace.Int64Attribute("msgCount", int64(len(msgs))),
-	)
-
-	msgsS := make([]ffi.Message, len(msgs))
-	pubksS := make([]ffi.PublicKey, len(msgs))
-	for i := 0; i < len(msgs); i++ {
-		msgsS[i] = msgs[i].Bytes()
-		copy(pubksS[i][:], pubks[i][:ffi.PublicKeyBytes])
-	}
-
-	sigS := new(ffi.Signature)
-	copy(sigS[:], sig.Data[:ffi.SignatureBytes])
-
-	if len(msgs) == 0 {
-		return nil
-	}
-
-	valid := ffi.HashVerify(sigS, msgsS, pubksS)
-	if !valid {
-		return xerrors.New("bls aggregate signature failed to verify")
-	}
-	return nil
-}
-
-func AggregateSignatures(sigs []crypto.Signature) (*crypto.Signature, error) {
-	sigsS := make([]ffi.Signature, len(sigs))
-	for i := 0; i < len(sigs); i++ {
-		copy(sigsS[i][:], sigs[i].Data[:ffi.SignatureBytes])
-	}
-
-	aggSig := ffi.Aggregate(sigsS)
-	if aggSig == nil {
-		if len(sigs) > 0 {
-			return nil, xerrors.Errorf("bls.Aggregate returned nil with %d signatures", len(sigs))
-		}
-
-		zeroSig := ffi.CreateZeroSignature()
-
-		// Note: for blst this condition should not happen - nil should not
-		// be returned
-		return &crypto.Signature{
-			Type: crypto.SigTypeBLS,
-			Data: zeroSig[:],
-		}, nil
-	}
-	return &crypto.Signature{
-		Type: crypto.SigTypeBLS,
-		Data: aggSig[:],
-	}, nil
-}
-
-func ToMessagesArray(store blockadt.Store, cids []cid.Cid) (cid.Cid, error) {
-	arr := blockadt.MakeEmptyArray(store)
-	for i, c := range cids {
-		oc := cbg.CborCid(c)
-		if err := arr.Set(uint64(i), &oc); err != nil {
-			return cid.Undef, err
-		}
-	}
-	return arr.Root()
-}

chain/events/cache.go

@@ -1,33 +0,0 @@
-package events
-
-import (
-	"context"
-
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/go-state-types/abi"
-	"github.com/filecoin-project/lotus/api"
-	"github.com/filecoin-project/lotus/chain/types"
-	"github.com/ipfs/go-cid"
-)
-
-type uncachedAPI interface {
-	ChainNotify(context.Context) (<-chan []*api.HeadChange, error)
-	ChainGetPath(ctx context.Context, from, to types.TipSetKey) ([]*api.HeadChange, error)
-	StateSearchMsg(ctx context.Context, from types.TipSetKey, msg cid.Cid, limit abi.ChainEpoch, allowReplaced bool) (*api.MsgLookup, error)
-
-	StateGetActor(ctx context.Context, actor address.Address, tsk types.TipSetKey) (*types.Actor, error) // optional / for CalledMsg
-}
-
-type cache struct {
-	*tipSetCache
-	*messageCache
-	uncachedAPI
-}
-
-func newCache(api EventAPI, gcConfidence abi.ChainEpoch) *cache {
-	return &cache{
-		newTSCache(api, gcConfidence),
-		newMessageCache(api),
-		api,
-	}
-}

chain/events/events.go

@@ -2,14 +2,18 @@ package events
 
 import (
 	"context"
+	"sync"
+	"time"
 
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/ipfs/go-cid"
 	logging "github.com/ipfs/go-log/v2"
+	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/build"
+	"github.com/filecoin-project/lotus/chain/store"
 	"github.com/filecoin-project/lotus/chain/types"
 )
 
@@ -21,46 +25,209 @@ type (
 	RevertHandler func(ctx context.Context, ts *types.TipSet) error
 )
 
-// A TipSetObserver receives notifications of tipsets
-type TipSetObserver interface {
-	Apply(ctx context.Context, from, to *types.TipSet) error
-	Revert(ctx context.Context, from, to *types.TipSet) error
+type heightHandler struct {
+	confidence int
+	called     bool
+
+	handle HeightHandler
+	revert RevertHandler
 }
 
 type EventAPI interface {
 	ChainNotify(context.Context) (<-chan []*api.HeadChange, error)
 	ChainGetBlockMessages(context.Context, cid.Cid) (*api.BlockMessages, error)
 	ChainGetTipSetByHeight(context.Context, abi.ChainEpoch, types.TipSetKey) (*types.TipSet, error)
-	ChainGetTipSetAfterHeight(context.Context, abi.ChainEpoch, types.TipSetKey) (*types.TipSet, error)
 	ChainHead(context.Context) (*types.TipSet, error)
 	StateSearchMsg(ctx context.Context, from types.TipSetKey, msg cid.Cid, limit abi.ChainEpoch, allowReplaced bool) (*api.MsgLookup, error)
 	ChainGetTipSet(context.Context, types.TipSetKey) (*types.TipSet, error)
-	ChainGetPath(ctx context.Context, from, to types.TipSetKey) ([]*api.HeadChange, error)
 
 	StateGetActor(ctx context.Context, actor address.Address, tsk types.TipSetKey) (*types.Actor, error) // optional / for CalledMsg
 }
 
 type Events struct {
-	*observer
-	*heightEvents
+	api EventAPI
+
+	tsc *tipSetCache
+	lk  sync.Mutex
+
+	ready     chan struct{}
+	readyOnce sync.Once
+
+	heightEvents
 	*hcEvents
+
+	observers []TipSetObserver
 }
 
-func NewEventsWithConfidence(ctx context.Context, api EventAPI, gcConfidence abi.ChainEpoch) (*Events, error) {
-	cache := newCache(api, gcConfidence)
+func NewEventsWithConfidence(ctx context.Context, api EventAPI, gcConfidence abi.ChainEpoch) *Events {
+	tsc := newTSCache(gcConfidence, api)
 
-	ob := newObserver(cache, gcConfidence)
-	if err := ob.start(ctx); err != nil {
-		return nil, err
+	e := &Events{
+		api: api,
+
+		tsc: tsc,
+
+		heightEvents: heightEvents{
+			tsc:          tsc,
+			ctx:          ctx,
+			gcConfidence: gcConfidence,
+
+			heightTriggers:   map[uint64]*heightHandler{},
+			htTriggerHeights: map[abi.ChainEpoch][]uint64{},
+			htHeights:        map[abi.ChainEpoch][]uint64{},
+		},
+
+		hcEvents:  newHCEvents(ctx, api, tsc, uint64(gcConfidence)),
+		ready:     make(chan struct{}),
+		observers: []TipSetObserver{},
 	}
 
-	he := newHeightEvents(cache, ob, gcConfidence)
-	headChange := newHCEvents(cache, ob)
+	go e.listenHeadChanges(ctx)
 
-	return &Events{ob, he, headChange}, nil
+	// Wait for the first tipset to be seen or bail if shutting down
+	select {
+	case <-e.ready:
+	case <-ctx.Done():
+	}
+
+	return e
 }
 
-func NewEvents(ctx context.Context, api EventAPI) (*Events, error) {
+func NewEvents(ctx context.Context, api EventAPI) *Events {
 	gcConfidence := 2 * build.ForkLengthThreshold
 	return NewEventsWithConfidence(ctx, api, gcConfidence)
 }
+
+func (e *Events) listenHeadChanges(ctx context.Context) {
+	for {
+		if err := e.listenHeadChangesOnce(ctx); err != nil {
+			log.Errorf("listen head changes errored: %s", err)
+		} else {
+			log.Warn("listenHeadChanges quit")
+		}
+		select {
+		case <-build.Clock.After(time.Second):
+		case <-ctx.Done():
+			log.Warnf("not restarting listenHeadChanges: context error: %s", ctx.Err())
+			return
+		}
+
+		log.Info("restarting listenHeadChanges")
+	}
+}
+
+func (e *Events) listenHeadChangesOnce(ctx context.Context) error {
+	ctx, cancel := context.WithCancel(ctx)
+	defer cancel()
+
+	notifs, err := e.api.ChainNotify(ctx)
+	if err != nil {
+		// Retry is handled by caller
+		return xerrors.Errorf("listenHeadChanges ChainNotify call failed: %w", err)
+	}
+
+	var cur []*api.HeadChange
+	var ok bool
+
+	// Wait for first tipset or bail
+	select {
+	case cur, ok = <-notifs:
+		if !ok {
+			return xerrors.Errorf("notification channel closed")
+		}
+	case <-ctx.Done():
+		return ctx.Err()
+	}
+
+	if len(cur) != 1 {
+		return xerrors.Errorf("unexpected initial head notification length: %d", len(cur))
+	}
+
+	if cur[0].Type != store.HCCurrent {
+		return xerrors.Errorf("expected first head notification type to be 'current', was '%s'", cur[0].Type)
+	}
+
+	if err := e.tsc.add(cur[0].Val); err != nil {
+		log.Warnf("tsc.add: adding current tipset failed: %v", err)
+	}
+
+	e.readyOnce.Do(func() {
+		e.lastTs = cur[0].Val
+		// Signal that we have seen first tipset
+		close(e.ready)
+	})
+
+	for notif := range notifs {
+		var rev, app []*types.TipSet
+		for _, notif := range notif {
+			switch notif.Type {
+			case store.HCRevert:
+				rev = append(rev, notif.Val)
+			case store.HCApply:
+				app = append(app, notif.Val)
+			default:
+				log.Warnf("unexpected head change notification type: '%s'", notif.Type)
+			}
+		}
+
+		if err := e.headChange(ctx, rev, app); err != nil {
+			log.Warnf("headChange failed: %s", err)
+		}
+
+		// sync with fake chainstore (for tests)
+		if fcs, ok := e.api.(interface{ notifDone() }); ok {
+			fcs.notifDone()
+		}
+	}
+
+	return nil
+}
+
+func (e *Events) headChange(ctx context.Context, rev, app []*types.TipSet) error {
+	if len(app) == 0 {
+		return xerrors.New("events.headChange expected at least one applied tipset")
+	}
+
+	e.lk.Lock()
+	defer e.lk.Unlock()
+
+	if err := e.headChangeAt(rev, app); err != nil {
+		return err
+	}
+
+	if err := e.observeChanges(ctx, rev, app); err != nil {
+		return err
+	}
+	return e.processHeadChangeEvent(rev, app)
+}
+
+// A TipSetObserver receives notifications of tipsets
+type TipSetObserver interface {
+	Apply(ctx context.Context, ts *types.TipSet) error
+	Revert(ctx context.Context, ts *types.TipSet) error
+}
+
+// TODO: add a confidence level so we can have observers with difference levels of confidence
+func (e *Events) Observe(obs TipSetObserver) error {
+	e.lk.Lock()
+	defer e.lk.Unlock()
+	e.observers = append(e.observers, obs)
+	return nil
+}
+
+// observeChanges expects caller to hold e.lk
+func (e *Events) observeChanges(ctx context.Context, rev, app []*types.TipSet) error {
+	for _, ts := range rev {
+		for _, o := range e.observers {
+			_ = o.Revert(ctx, ts)
+		}
+	}
+
+	for _, ts := range app {
+		for _, o := range e.observers {
+			_ = o.Apply(ctx, ts)
+		}
+	}
+
+	return nil
+}

chain/events/events_called.go

@@ -5,6 +5,9 @@ import (
 	"math"
 	"sync"
 
+	"github.com/filecoin-project/lotus/api"
+	lru "github.com/hashicorp/golang-lru"
+
 	"github.com/filecoin-project/lotus/chain/stmgr"
 
 	"github.com/filecoin-project/go-state-types/abi"
@@ -32,7 +35,7 @@ type eventData interface{}
 // `prevTs` is the previous tipset, eg the "from" tipset for a state change.
 // `ts` is the event tipset, eg the tipset in which the `msg` is included.
 // `curH`-`ts.Height` = `confidence`
-type EventHandler func(ctx context.Context, data eventData, prevTs, ts *types.TipSet, curH abi.ChainEpoch) (more bool, err error)
+type EventHandler func(data eventData, prevTs, ts *types.TipSet, curH abi.ChainEpoch) (more bool, err error)
 
 // CheckFunc is used for atomicity guarantees. If the condition the callbacks
 // wait for has already happened in tipset `ts`
@@ -40,7 +43,7 @@ type EventHandler func(ctx context.Context, data eventData, prevTs, ts *types.Ti
 // If `done` is true, timeout won't be triggered
 // If `more` is false, no messages will be sent to EventHandler (RevertHandler
 //  may still be called)
-type CheckFunc func(ctx context.Context, ts *types.TipSet) (done bool, more bool, err error)
+type CheckFunc func(ts *types.TipSet) (done bool, more bool, err error)
 
 // Keep track of information for an event handler
 type handlerInfo struct {
@@ -57,9 +60,10 @@ type handlerInfo struct {
 // until the required confidence is reached
 type queuedEvent struct {
 	trigger triggerID
-	data    eventData
 
-	prevTipset, tipset *types.TipSet
+	prevH abi.ChainEpoch
+	h     abi.ChainEpoch
+	data  eventData
 
 	called bool
 }
@@ -67,17 +71,19 @@ type queuedEvent struct {
 // Manages chain head change events, which may be forward (new tipset added to
 // chain) or backward (chain branch discarded in favour of heavier branch)
 type hcEvents struct {
-	cs EventAPI
+	cs           EventAPI
+	tsc          *tipSetCache
+	ctx          context.Context
+	gcConfidence uint64
 
-	lk     sync.Mutex
 	lastTs *types.TipSet
 
+	lk sync.Mutex
+
 	ctr triggerID
 
-	// TODO: get rid of trigger IDs and just use pointers as keys.
 	triggers map[triggerID]*handlerInfo
 
-	// TODO: instead of scheduling events in the future, look at the chain in the past. We can sip the "confidence" queue entirely.
 	// maps block heights to events
 	// [triggerH][msgH][event]
 	confQueue map[triggerH]map[msgH][]*queuedEvent
@@ -92,77 +98,83 @@ type hcEvents struct {
 	watcherEvents
 }
 
-func newHCEvents(api EventAPI, obs *observer) *hcEvents {
-	e := &hcEvents{
-		cs:          api,
+func newHCEvents(ctx context.Context, cs EventAPI, tsc *tipSetCache, gcConfidence uint64) *hcEvents {
+	e := hcEvents{
+		ctx:          ctx,
+		cs:           cs,
+		tsc:          tsc,
+		gcConfidence: gcConfidence,
+
 		confQueue:   map[triggerH]map[msgH][]*queuedEvent{},
 		revertQueue: map[msgH][]triggerH{},
 		triggers:    map[triggerID]*handlerInfo{},
 		timeouts:    map[abi.ChainEpoch]map[triggerID]int{},
 	}
 
-	e.messageEvents = newMessageEvents(e, api)
-	e.watcherEvents = newWatcherEvents(e, api)
+	e.messageEvents = newMessageEvents(ctx, &e, cs)
+	e.watcherEvents = newWatcherEvents(ctx, &e, cs)
 
-	// We need to take the lock as the observer could immediately try calling us.
-	e.lk.Lock()
-	e.lastTs = obs.Observe((*hcEventsObserver)(e))
-	e.lk.Unlock()
-
-	return e
+	return &e
 }
 
-type hcEventsObserver hcEvents
-
-func (e *hcEventsObserver) Apply(ctx context.Context, from, to *types.TipSet) error {
+// Called when there is a change to the head with tipsets to be
+// reverted / applied
+func (e *hcEvents) processHeadChangeEvent(rev, app []*types.TipSet) error {
 	e.lk.Lock()
 	defer e.lk.Unlock()
 
-	defer func() { e.lastTs = to }()
-
-	// Check if the head change caused any state changes that we were
-	// waiting for
-	stateChanges := e.checkStateChanges(from, to)
-
-	// Queue up calls until there have been enough blocks to reach
-	// confidence on the state changes
-	for tid, data := range stateChanges {
-		e.queueForConfidence(tid, data, from, to)
+	for _, ts := range rev {
+		e.handleReverts(ts)
+		e.lastTs = ts
 	}
 
-	// Check if the head change included any new message calls
-	newCalls := e.checkNewCalls(ctx, from, to)
+	for _, ts := range app {
+		// Check if the head change caused any state changes that we were
+		// waiting for
+		stateChanges := e.watcherEvents.checkStateChanges(e.lastTs, ts)
 
-	// Queue up calls until there have been enough blocks to reach
-	// confidence on the message calls
-	for tid, calls := range newCalls {
-		for _, data := range calls {
-			e.queueForConfidence(tid, data, nil, to)
+		// Queue up calls until there have been enough blocks to reach
+		// confidence on the state changes
+		for tid, data := range stateChanges {
+			e.queueForConfidence(tid, data, e.lastTs, ts)
 		}
+
+		// Check if the head change included any new message calls
+		newCalls, err := e.messageEvents.checkNewCalls(ts)
+		if err != nil {
+			return err
+		}
+
+		// Queue up calls until there have been enough blocks to reach
+		// confidence on the message calls
+		for tid, calls := range newCalls {
+			for _, data := range calls {
+				e.queueForConfidence(tid, data, nil, ts)
+			}
+		}
+
+		for at := e.lastTs.Height(); at <= ts.Height(); at++ {
+			// Apply any queued events and timeouts that were targeted at the
+			// current chain height
+			e.applyWithConfidence(ts, at)
+			e.applyTimeouts(ts)
+		}
+
+		// Update the latest known tipset
+		e.lastTs = ts
 	}
 
-	for at := from.Height() + 1; at <= to.Height(); at++ {
-		// Apply any queued events and timeouts that were targeted at the
-		// current chain height
-		e.applyWithConfidence(ctx, at)
-		e.applyTimeouts(ctx, at, to)
-	}
 	return nil
 }
 
-func (e *hcEventsObserver) Revert(ctx context.Context, from, to *types.TipSet) error {
-	e.lk.Lock()
-	defer e.lk.Unlock()
-
-	defer func() { e.lastTs = to }()
-
-	reverts, ok := e.revertQueue[from.Height()]
+func (e *hcEvents) handleReverts(ts *types.TipSet) {
+	reverts, ok := e.revertQueue[ts.Height()]
 	if !ok {
-		return nil // nothing to do
+		return // nothing to do
 	}
 
 	for _, triggerH := range reverts {
-		toRevert := e.confQueue[triggerH][from.Height()]
+		toRevert := e.confQueue[triggerH][ts.Height()]
 		for _, event := range toRevert {
 			if !event.called {
 				continue // event wasn't apply()-ied yet
@@ -170,21 +182,24 @@ func (e *hcEventsObserver) Revert(ctx context.Context, from, to *types.TipSet) e
 
 			trigger := e.triggers[event.trigger]
 
-			if err := trigger.revert(ctx, from); err != nil {
-				log.Errorf("reverting chain trigger (@H %d, triggered @ %d) failed: %s", from.Height(), triggerH, err)
+			if err := trigger.revert(e.ctx, ts); err != nil {
+				log.Errorf("reverting chain trigger (@H %d, triggered @ %d) failed: %s", ts.Height(), triggerH, err)
 			}
 		}
-		delete(e.confQueue[triggerH], from.Height())
+		delete(e.confQueue[triggerH], ts.Height())
 	}
-	delete(e.revertQueue, from.Height())
-	return nil
+	delete(e.revertQueue, ts.Height())
 }
 
 // Queue up events until the chain has reached a height that reflects the
 // desired confidence
-func (e *hcEventsObserver) queueForConfidence(trigID uint64, data eventData, prevTs, ts *types.TipSet) {
+func (e *hcEvents) queueForConfidence(trigID uint64, data eventData, prevTs, ts *types.TipSet) {
 	trigger := e.triggers[trigID]
 
+	prevH := NoHeight
+	if prevTs != nil {
+		prevH = prevTs.Height()
+	}
 	appliedH := ts.Height()
 
 	triggerH := appliedH + abi.ChainEpoch(trigger.confidence)
@@ -196,23 +211,28 @@ func (e *hcEventsObserver) queueForConfidence(trigID uint64, data eventData, pre
 	}
 
 	byOrigH[appliedH] = append(byOrigH[appliedH], &queuedEvent{
-		trigger:    trigID,
-		data:       data,
-		tipset:     ts,
-		prevTipset: prevTs,
+		trigger: trigID,
+		prevH:   prevH,
+		h:       appliedH,
+		data:    data,
 	})
 
 	e.revertQueue[appliedH] = append(e.revertQueue[appliedH], triggerH)
 }
 
 // Apply any events that were waiting for this chain height for confidence
-func (e *hcEventsObserver) applyWithConfidence(ctx context.Context, height abi.ChainEpoch) {
+func (e *hcEvents) applyWithConfidence(ts *types.TipSet, height abi.ChainEpoch) {
 	byOrigH, ok := e.confQueue[height]
 	if !ok {
 		return // no triggers at this height
 	}
 
 	for origH, events := range byOrigH {
+		triggerTs, err := e.tsc.get(origH)
+		if err != nil {
+			log.Errorf("events: applyWithConfidence didn't find tipset for event; wanted %d; current %d", origH, height)
+		}
+
 		for _, event := range events {
 			if event.called {
 				continue
@@ -223,7 +243,18 @@ func (e *hcEventsObserver) applyWithConfidence(ctx context.Context, height abi.C
 				continue
 			}
 
-			more, err := trigger.handle(ctx, event.data, event.prevTipset, event.tipset, height)
+			// Previous tipset - this is relevant for example in a state change
+			// from one tipset to another
+			var prevTs *types.TipSet
+			if event.prevH != NoHeight {
+				prevTs, err = e.tsc.get(event.prevH)
+				if err != nil {
+					log.Errorf("events: applyWithConfidence didn't find tipset for previous event; wanted %d; current %d", event.prevH, height)
+					continue
+				}
+			}
+
+			more, err := trigger.handle(event.data, prevTs, triggerTs, height)
 			if err != nil {
 				log.Errorf("chain trigger (@H %d, triggered @ %d) failed: %s", origH, height, err)
 				continue // don't revert failed calls
@@ -242,8 +273,8 @@ func (e *hcEventsObserver) applyWithConfidence(ctx context.Context, height abi.C
 }
 
 // Apply any timeouts that expire at this height
-func (e *hcEventsObserver) applyTimeouts(ctx context.Context, at abi.ChainEpoch, ts *types.TipSet) {
-	triggers, ok := e.timeouts[at]
+func (e *hcEvents) applyTimeouts(ts *types.TipSet) {
+	triggers, ok := e.timeouts[ts.Height()]
 	if !ok {
 		return // nothing to do
 	}
@@ -257,15 +288,14 @@ func (e *hcEventsObserver) applyTimeouts(ctx context.Context, at abi.ChainEpoch,
 			continue
 		}
 
-		// This should be cached.
-		timeoutTs, err := e.cs.ChainGetTipSetAfterHeight(ctx, at-abi.ChainEpoch(trigger.confidence), ts.Key())
+		timeoutTs, err := e.tsc.get(ts.Height() - abi.ChainEpoch(trigger.confidence))
 		if err != nil {
-			log.Errorf("events: applyTimeouts didn't find tipset for event; wanted %d; current %d", at-abi.ChainEpoch(trigger.confidence), at)
+			log.Errorf("events: applyTimeouts didn't find tipset for event; wanted %d; current %d", ts.Height()-abi.ChainEpoch(trigger.confidence), ts.Height())
 		}
 
-		more, err := trigger.handle(ctx, nil, nil, timeoutTs, at)
+		more, err := trigger.handle(nil, nil, timeoutTs, ts.Height())
 		if err != nil {
-			log.Errorf("chain trigger (call @H %d, called @ %d) failed: %s", timeoutTs.Height(), at, err)
+			log.Errorf("chain trigger (call @H %d, called @ %d) failed: %s", timeoutTs.Height(), ts.Height(), err)
 			continue // don't revert failed calls
 		}
 
@@ -279,19 +309,24 @@ func (e *hcEventsObserver) applyTimeouts(ctx context.Context, at abi.ChainEpoch,
 // - RevertHandler: called if the chain head changes causing the event to revert
 // - confidence: wait this many tipsets before calling EventHandler
 // - timeout: at this chain height, timeout on waiting for this event
-func (e *hcEvents) onHeadChanged(ctx context.Context, check CheckFunc, hnd EventHandler, rev RevertHandler, confidence int, timeout abi.ChainEpoch) (triggerID, error) {
+func (e *hcEvents) onHeadChanged(check CheckFunc, hnd EventHandler, rev RevertHandler, confidence int, timeout abi.ChainEpoch) (triggerID, error) {
 	e.lk.Lock()
 	defer e.lk.Unlock()
 
 	// Check if the event has already occurred
-	done, more, err := check(ctx, e.lastTs)
+	ts, err := e.tsc.best()
 	if err != nil {
-		return 0, xerrors.Errorf("called check error (h: %d): %w", e.lastTs.Height(), err)
+		return 0, xerrors.Errorf("error getting best tipset: %w", err)
+	}
+	done, more, err := check(ts)
+	if err != nil {
+		return 0, xerrors.Errorf("called check error (h: %d): %w", ts.Height(), err)
 	}
 	if done {
 		timeout = NoTimeout
 	}
 
+	// Create a trigger for the event
 	id := e.ctr
 	e.ctr++
 
@@ -319,11 +354,12 @@ func (e *hcEvents) onHeadChanged(ctx context.Context, check CheckFunc, hnd Event
 // headChangeAPI is used to allow the composed event APIs to call back to hcEvents
 // to listen for changes
 type headChangeAPI interface {
-	onHeadChanged(ctx context.Context, check CheckFunc, hnd EventHandler, rev RevertHandler, confidence int, timeout abi.ChainEpoch) (triggerID, error)
+	onHeadChanged(check CheckFunc, hnd EventHandler, rev RevertHandler, confidence int, timeout abi.ChainEpoch) (triggerID, error)
 }
 
 // watcherEvents watches for a state change
 type watcherEvents struct {
+	ctx   context.Context
 	cs    EventAPI
 	hcAPI headChangeAPI
 
@@ -331,8 +367,9 @@ type watcherEvents struct {
 	matchers map[triggerID]StateMatchFunc
 }
 
-func newWatcherEvents(hcAPI headChangeAPI, cs EventAPI) watcherEvents {
+func newWatcherEvents(ctx context.Context, hcAPI headChangeAPI, cs EventAPI) watcherEvents {
 	return watcherEvents{
+		ctx:      ctx,
 		cs:       cs,
 		hcAPI:    hcAPI,
 		matchers: make(map[triggerID]StateMatchFunc),
@@ -388,7 +425,7 @@ type StateMatchFunc func(oldTs, newTs *types.TipSet) (bool, StateChange, error)
 // * `StateChangeHandler` is called when the specified state change was observed
 //    on-chain, and a confidence threshold was reached, or the specified `timeout`
 //    height was reached with no state change observed. When this callback is
-//    invoked on a timeout, `oldTs` and `states are set to nil.
+//    invoked on a timeout, `oldState` and `newState` are set to nil.
 //    This callback returns a boolean specifying whether further notifications
 //    should be sent, like `more` return param from `CheckFunc` above.
 //
@@ -401,7 +438,7 @@ type StateMatchFunc func(oldTs, newTs *types.TipSet) (bool, StateChange, error)
 //   the state change is queued up until the confidence interval has elapsed (and
 //   `StateChangeHandler` is called)
 func (we *watcherEvents) StateChanged(check CheckFunc, scHnd StateChangeHandler, rev RevertHandler, confidence int, timeout abi.ChainEpoch, mf StateMatchFunc) error {
-	hnd := func(ctx context.Context, data eventData, prevTs, ts *types.TipSet, height abi.ChainEpoch) (bool, error) {
+	hnd := func(data eventData, prevTs, ts *types.TipSet, height abi.ChainEpoch) (bool, error) {
 		states, ok := data.(StateChange)
 		if data != nil && !ok {
 			panic("expected StateChange")
@@ -410,7 +447,7 @@ func (we *watcherEvents) StateChanged(check CheckFunc, scHnd StateChangeHandler,
 		return scHnd(prevTs, ts, states, height)
 	}
 
-	id, err := we.hcAPI.onHeadChanged(context.TODO(), check, hnd, rev, confidence, timeout)
+	id, err := we.hcAPI.onHeadChanged(check, hnd, rev, confidence, timeout)
 	if err != nil {
 		return err
 	}
@@ -424,29 +461,43 @@ func (we *watcherEvents) StateChanged(check CheckFunc, scHnd StateChangeHandler,
 
 // messageEvents watches for message calls to actors
 type messageEvents struct {
+	ctx   context.Context
 	cs    EventAPI
 	hcAPI headChangeAPI
 
 	lk       sync.RWMutex
 	matchers map[triggerID]MsgMatchFunc
+
+	blockMsgLk    sync.Mutex
+	blockMsgCache *lru.ARCCache
 }
 
-func newMessageEvents(hcAPI headChangeAPI, cs EventAPI) messageEvents {
+func newMessageEvents(ctx context.Context, hcAPI headChangeAPI, cs EventAPI) messageEvents {
+	blsMsgCache, _ := lru.NewARC(500)
 	return messageEvents{
-		cs:       cs,
-		hcAPI:    hcAPI,
-		matchers: make(map[triggerID]MsgMatchFunc),
+		ctx:           ctx,
+		cs:            cs,
+		hcAPI:         hcAPI,
+		matchers:      make(map[triggerID]MsgMatchFunc),
+		blockMsgLk:    sync.Mutex{},
+		blockMsgCache: blsMsgCache,
 	}
 }
 
 // Check if there are any new actor calls
-func (me *messageEvents) checkNewCalls(ctx context.Context, from, to *types.TipSet) map[triggerID][]eventData {
+func (me *messageEvents) checkNewCalls(ts *types.TipSet) (map[triggerID][]eventData, error) {
+	pts, err := me.cs.ChainGetTipSet(me.ctx, ts.Parents()) // we actually care about messages in the parent tipset here
+	if err != nil {
+		log.Errorf("getting parent tipset in checkNewCalls: %s", err)
+		return nil, err
+	}
+
 	me.lk.RLock()
 	defer me.lk.RUnlock()
 
 	// For each message in the tipset
 	res := make(map[triggerID][]eventData)
-	me.messagesForTs(from, func(msg *types.Message) {
+	me.messagesForTs(pts, func(msg *types.Message) {
 		// TODO: provide receipts
 
 		// Run each trigger's matcher against the message
@@ -465,32 +516,47 @@ func (me *messageEvents) checkNewCalls(ctx context.Context, from, to *types.TipS
 		}
 	})
 
-	return res
+	return res, nil
 }
 
 // Get the messages in a tipset
 func (me *messageEvents) messagesForTs(ts *types.TipSet, consume func(*types.Message)) {
 	seen := map[cid.Cid]struct{}{}
 
-	for i, tsb := range ts.Cids() {
-		msgs, err := me.cs.ChainGetBlockMessages(context.TODO(), tsb)
-		if err != nil {
-			log.Errorf("messagesForTs MessagesForBlock failed (ts.H=%d, Bcid:%s, B.Mcid:%s): %s",
-				ts.Height(), tsb, ts.Blocks()[i].Messages, err)
-			continue
+	for _, tsb := range ts.Blocks() {
+		me.blockMsgLk.Lock()
+		msgsI, ok := me.blockMsgCache.Get(tsb.Cid())
+		var err error
+		if !ok {
+			msgsI, err = me.cs.ChainGetBlockMessages(context.TODO(), tsb.Cid())
+			if err != nil {
+				log.Errorf("messagesForTs MessagesForBlock failed (ts.H=%d, Bcid:%s, B.Mcid:%s): %s", ts.Height(), tsb.Cid(), tsb.Messages, err)
+				// this is quite bad, but probably better than missing all the other updates
+				me.blockMsgLk.Unlock()
+				continue
+			}
+			me.blockMsgCache.Add(tsb.Cid(), msgsI)
 		}
-		for i, c := range msgs.Cids {
-			// We iterate over the CIDs to avoid having to recompute them.
-			_, ok := seen[c]
+		me.blockMsgLk.Unlock()
+		msgs := msgsI.(*api.BlockMessages)
+		for _, m := range msgs.BlsMessages {
+			_, ok := seen[m.Cid()]
 			if ok {
 				continue
 			}
-			seen[c] = struct{}{}
-			if i < len(msgs.BlsMessages) {
-				consume(msgs.BlsMessages[i])
-			} else {
-				consume(&msgs.SecpkMessages[i-len(msgs.BlsMessages)].Message)
+			seen[m.Cid()] = struct{}{}
+
+			consume(m)
+		}
+
+		for _, m := range msgs.SecpkMessages {
+			_, ok := seen[m.Message.Cid()]
+			if ok {
+				continue
 			}
+			seen[m.Message.Cid()] = struct{}{}
+
+			consume(&m.Message)
 		}
 	}
 }
@@ -530,14 +596,14 @@ type MsgMatchFunc func(msg *types.Message) (matched bool, err error)
 // * `MsgMatchFunc` is called against each message. If there is a match, the
 //   message is queued up until the confidence interval has elapsed (and
 //   `MsgHandler` is called)
-func (me *messageEvents) Called(ctx context.Context, check CheckFunc, msgHnd MsgHandler, rev RevertHandler, confidence int, timeout abi.ChainEpoch, mf MsgMatchFunc) error {
-	hnd := func(ctx context.Context, data eventData, prevTs, ts *types.TipSet, height abi.ChainEpoch) (bool, error) {
+func (me *messageEvents) Called(check CheckFunc, msgHnd MsgHandler, rev RevertHandler, confidence int, timeout abi.ChainEpoch, mf MsgMatchFunc) error {
+	hnd := func(data eventData, prevTs, ts *types.TipSet, height abi.ChainEpoch) (bool, error) {
 		msg, ok := data.(*types.Message)
 		if data != nil && !ok {
 			panic("expected msg")
 		}
 
-		ml, err := me.cs.StateSearchMsg(ctx, ts.Key(), msg.Cid(), stmgr.LookbackNoLimit, true)
+		ml, err := me.cs.StateSearchMsg(me.ctx, ts.Key(), msg.Cid(), stmgr.LookbackNoLimit, true)
 		if err != nil {
 			return false, err
 		}
@@ -549,7 +615,7 @@ func (me *messageEvents) Called(ctx context.Context, check CheckFunc, msgHnd Msg
 		return msgHnd(msg, &ml.Receipt, ts, height)
 	}
 
-	id, err := me.hcAPI.onHeadChanged(ctx, check, hnd, rev, confidence, timeout)
+	id, err := me.hcAPI.onHeadChanged(check, hnd, rev, confidence, timeout)
 	if err != nil {
 		return err
 	}
@@ -563,5 +629,5 @@ func (me *messageEvents) Called(ctx context.Context, check CheckFunc, msgHnd Msg
 
 // Convenience function for checking and matching messages
 func (me *messageEvents) CalledMsg(ctx context.Context, hnd MsgHandler, rev RevertHandler, confidence int, timeout abi.ChainEpoch, msg types.ChainMsg) error {
-	return me.Called(ctx, me.CheckMsg(msg, hnd), hnd, rev, confidence, timeout, me.MatchMsg(msg.VMMessage()))
+	return me.Called(me.CheckMsg(ctx, msg, hnd), hnd, rev, confidence, timeout, me.MatchMsg(msg.VMMessage()))
 }

chain/events/events_height.go

@@ -11,235 +11,199 @@ import (
 	"github.com/filecoin-project/lotus/chain/types"
 )
 
-type heightHandler struct {
-	ts     *types.TipSet
-	height abi.ChainEpoch
-	called bool
-
-	handle HeightHandler
-	revert RevertHandler
-}
-
 type heightEvents struct {
-	api          EventAPI
+	lk           sync.Mutex
+	tsc          *tipSetCache
 	gcConfidence abi.ChainEpoch
 
-	lk                        sync.Mutex
-	head                      *types.TipSet
-	tsHeights, triggerHeights map[abi.ChainEpoch][]*heightHandler
-	lastGc                    abi.ChainEpoch //nolint:structcheck
+	ctr triggerID
+
+	heightTriggers map[triggerID]*heightHandler
+
+	htTriggerHeights map[triggerH][]triggerID
+	htHeights        map[msgH][]triggerID
+
+	ctx context.Context
 }
 
-func newHeightEvents(api EventAPI, obs *observer, gcConfidence abi.ChainEpoch) *heightEvents {
-	he := &heightEvents{
-		api:            api,
-		gcConfidence:   gcConfidence,
-		tsHeights:      map[abi.ChainEpoch][]*heightHandler{},
-		triggerHeights: map[abi.ChainEpoch][]*heightHandler{},
+func (e *heightEvents) headChangeAt(rev, app []*types.TipSet) error {
+	ctx, span := trace.StartSpan(e.ctx, "events.HeightHeadChange")
+	defer span.End()
+	span.AddAttributes(trace.Int64Attribute("endHeight", int64(app[0].Height())))
+	span.AddAttributes(trace.Int64Attribute("reverts", int64(len(rev))))
+	span.AddAttributes(trace.Int64Attribute("applies", int64(len(app))))
+
+	e.lk.Lock()
+	defer e.lk.Unlock()
+	for _, ts := range rev {
+		// TODO: log error if h below gcconfidence
+		// revert height-based triggers
+
+		revert := func(h abi.ChainEpoch, ts *types.TipSet) {
+			for _, tid := range e.htHeights[h] {
+				ctx, span := trace.StartSpan(ctx, "events.HeightRevert")
+
+				rev := e.heightTriggers[tid].revert
+				e.lk.Unlock()
+				err := rev(ctx, ts)
+				e.lk.Lock()
+				e.heightTriggers[tid].called = false
+
+				span.End()
+
+				if err != nil {
+					log.Errorf("reverting chain trigger (@H %d): %s", h, err)
+				}
+			}
+		}
+		revert(ts.Height(), ts)
+
+		subh := ts.Height() - 1
+		for {
+			cts, err := e.tsc.get(subh)
+			if err != nil {
+				return err
+			}
+
+			if cts != nil {
+				break
+			}
+
+			revert(subh, ts)
+			subh--
+		}
+
+		if err := e.tsc.revert(ts); err != nil {
+			return err
+		}
 	}
-	he.lk.Lock()
-	he.head = obs.Observe((*heightEventsObserver)(he))
-	he.lk.Unlock()
-	return he
+
+	for i := range app {
+		ts := app[i]
+
+		if err := e.tsc.add(ts); err != nil {
+			return err
+		}
+
+		// height triggers
+
+		apply := func(h abi.ChainEpoch, ts *types.TipSet) error {
+			for _, tid := range e.htTriggerHeights[h] {
+				hnd := e.heightTriggers[tid]
+				if hnd.called {
+					return nil
+				}
+
+				triggerH := h - abi.ChainEpoch(hnd.confidence)
+
+				incTs, err := e.tsc.getNonNull(triggerH)
+				if err != nil {
+					return err
+				}
+
+				ctx, span := trace.StartSpan(ctx, "events.HeightApply")
+				span.AddAttributes(trace.BoolAttribute("immediate", false))
+				handle := hnd.handle
+				e.lk.Unlock()
+				err = handle(ctx, incTs, h)
+				e.lk.Lock()
+				hnd.called = true
+				span.End()
+
+				if err != nil {
+					log.Errorf("chain trigger (@H %d, called @ %d) failed: %+v", triggerH, ts.Height(), err)
+				}
+			}
+			return nil
+		}
+
+		if err := apply(ts.Height(), ts); err != nil {
+			return err
+		}
+		subh := ts.Height() - 1
+		for {
+			cts, err := e.tsc.get(subh)
+			if err != nil {
+				return err
+			}
+
+			if cts != nil {
+				break
+			}
+
+			if err := apply(subh, ts); err != nil {
+				return err
+			}
+
+			subh--
+		}
+
+	}
+
+	return nil
 }
 
 // ChainAt invokes the specified `HeightHandler` when the chain reaches the
 // specified height+confidence threshold. If the chain is rolled-back under the
 // specified height, `RevertHandler` will be called.
 //
-// ts passed to handlers is the tipset at the specified epoch, or above if lower tipsets were null.
-//
-// The context governs cancellations of this call, it won't cancel the event handler.
-func (e *heightEvents) ChainAt(ctx context.Context, hnd HeightHandler, rev RevertHandler, confidence int, h abi.ChainEpoch) error {
-	if abi.ChainEpoch(confidence) > e.gcConfidence {
-		// Need this to be able to GC effectively.
-		return xerrors.Errorf("confidence cannot be greater than gcConfidence: %d > %d", confidence, e.gcConfidence)
+// ts passed to handlers is the tipset at the specified, or above, if lower tipsets were null
+func (e *heightEvents) ChainAt(hnd HeightHandler, rev RevertHandler, confidence int, h abi.ChainEpoch) error {
+	e.lk.Lock() // Tricky locking, check your locks if you modify this function!
+
+	best, err := e.tsc.best()
+	if err != nil {
+		e.lk.Unlock()
+		return xerrors.Errorf("error getting best tipset: %w", err)
 	}
-	handler := &heightHandler{
-		height: h,
+
+	bestH := best.Height()
+	if bestH >= h+abi.ChainEpoch(confidence) {
+		ts, err := e.tsc.getNonNull(h)
+		if err != nil {
+			log.Warnf("events.ChainAt: calling HandleFunc with nil tipset, not found in cache: %s", err)
+		}
+
+		e.lk.Unlock()
+		ctx, span := trace.StartSpan(e.ctx, "events.HeightApply")
+		span.AddAttributes(trace.BoolAttribute("immediate", true))
+
+		err = hnd(ctx, ts, bestH)
+		span.End()
+
+		if err != nil {
+			return err
+		}
+
+		e.lk.Lock()
+		best, err = e.tsc.best()
+		if err != nil {
+			e.lk.Unlock()
+			return xerrors.Errorf("error getting best tipset: %w", err)
+		}
+		bestH = best.Height()
+	}
+
+	defer e.lk.Unlock()
+
+	if bestH >= h+abi.ChainEpoch(confidence)+e.gcConfidence {
+		return nil
+	}
+
+	triggerAt := h + abi.ChainEpoch(confidence)
+
+	id := e.ctr
+	e.ctr++
+
+	e.heightTriggers[id] = &heightHandler{
+		confidence: confidence,
+
 		handle: hnd,
 		revert: rev,
 	}
-	triggerAt := h + abi.ChainEpoch(confidence)
 
-	// Here we try to jump onto a moving train. To avoid stopping the train, we release the lock
-	// while calling the API and/or the trigger functions. Unfortunately, it's entirely possible
-	// (although unlikely) to go back and forth across the trigger heights, so we need to keep
-	// going back and forth here till we're synced.
-	//
-	// TODO: Consider using a worker goroutine so we can just drop the handler in a channel? The
-	// downside is that we'd either need a tipset cache, or we'd need to potentially fetch
-	// tipsets in-line inside the event loop.
-	e.lk.Lock()
-	for {
-		head := e.head
-		if head.Height() >= h {
-			// Head is past the handler height. We at least need to stash the tipset to
-			// avoid doing this from the main event loop.
-			e.lk.Unlock()
+	e.htHeights[h] = append(e.htHeights[h], id)
+	e.htTriggerHeights[triggerAt] = append(e.htTriggerHeights[triggerAt], id)
 
-			var ts *types.TipSet
-			if head.Height() == h {
-				ts = head
-			} else {
-				var err error
-				ts, err = e.api.ChainGetTipSetAfterHeight(ctx, handler.height, head.Key())
-				if err != nil {
-					return xerrors.Errorf("events.ChainAt: failed to get tipset: %s", err)
-				}
-			}
-
-			// If we've applied the handler on the wrong tipset, revert.
-			if handler.called && !ts.Equals(handler.ts) {
-				ctx, span := trace.StartSpan(ctx, "events.HeightRevert")
-				span.AddAttributes(trace.BoolAttribute("immediate", true))
-				err := handler.revert(ctx, handler.ts)
-				span.End()
-				if err != nil {
-					return err
-				}
-				handler.called = false
-			}
-
-			// Save the tipset.
-			handler.ts = ts
-
-			// If we've reached confidence and haven't called, call.
-			if !handler.called && head.Height() >= triggerAt {
-				ctx, span := trace.StartSpan(ctx, "events.HeightApply")
-				span.AddAttributes(trace.BoolAttribute("immediate", true))
-				err := handler.handle(ctx, handler.ts, head.Height())
-				span.End()
-				if err != nil {
-					return err
-				}
-
-				handler.called = true
-
-				// If we've reached gcConfidence, return without saving anything.
-				if head.Height() >= h+e.gcConfidence {
-					return nil
-				}
-			}
-
-			e.lk.Lock()
-		} else if handler.called {
-			// We're not passed the head (anymore) but have applied the handler. Revert, try again.
-			e.lk.Unlock()
-			ctx, span := trace.StartSpan(ctx, "events.HeightRevert")
-			span.AddAttributes(trace.BoolAttribute("immediate", true))
-			err := handler.revert(ctx, handler.ts)
-			span.End()
-			if err != nil {
-				return err
-			}
-			handler.called = false
-			e.lk.Lock()
-		} // otherwise, we changed heads but the change didn't matter.
-
-		// If we managed to get through this without the head changing, we're finally done.
-		if head.Equals(e.head) {
-			e.triggerHeights[triggerAt] = append(e.triggerHeights[triggerAt], handler)
-			e.tsHeights[h] = append(e.tsHeights[h], handler)
-			e.lk.Unlock()
-			return nil
-		}
-	}
-}
-
-// Updates the head and garbage collects if we're 2x over our garbage collection confidence period.
-func (e *heightEventsObserver) updateHead(h *types.TipSet) {
-	e.lk.Lock()
-	defer e.lk.Unlock()
-	e.head = h
-
-	if e.head.Height() < e.lastGc+e.gcConfidence*2 {
-		return
-	}
-	e.lastGc = h.Height()
-
-	targetGcHeight := e.head.Height() - e.gcConfidence
-	for h := range e.tsHeights {
-		if h >= targetGcHeight {
-			continue
-		}
-		delete(e.tsHeights, h)
-	}
-	for h := range e.triggerHeights {
-		if h >= targetGcHeight {
-			continue
-		}
-		delete(e.triggerHeights, h)
-	}
-}
-
-type heightEventsObserver heightEvents
-
-func (e *heightEventsObserver) Revert(ctx context.Context, from, to *types.TipSet) error {
-	// Update the head first so we don't accidental skip reverting a concurrent call to ChainAt.
-	e.updateHead(to)
-
-	// Call revert on all hights between the two tipsets, handling empty tipsets.
-	for h := from.Height(); h > to.Height(); h-- {
-		e.lk.Lock()
-		triggers := e.tsHeights[h]
-		e.lk.Unlock()
-
-		// 1. Triggers are only invoked from the global event loop, we don't need to hold the lock while calling.
-		// 2. We only ever append to or replace the trigger slice, so it's safe to iterate over it without the lock.
-		for _, handler := range triggers {
-			handler.ts = nil // invalidate
-			if !handler.called {
-				// We haven't triggered this yet, or there has been a concurrent call to ChainAt.
-				continue
-			}
-			ctx, span := trace.StartSpan(ctx, "events.HeightRevert")
-			err := handler.revert(ctx, from)
-			span.End()
-
-			if err != nil {
-				log.Errorf("reverting chain trigger (@H %d): %s", h, err)
-			}
-			handler.called = false
-		}
-	}
-	return nil
-}
-
-func (e *heightEventsObserver) Apply(ctx context.Context, from, to *types.TipSet) error {
-	// Update the head first so we don't accidental skip applying a concurrent call to ChainAt.
-	e.updateHead(to)
-
-	for h := from.Height() + 1; h <= to.Height(); h++ {
-		e.lk.Lock()
-		triggers := e.triggerHeights[h]
-		tipsets := e.tsHeights[h]
-		e.lk.Unlock()
-
-		// Stash the tipset for future triggers.
-		for _, handler := range tipsets {
-			handler.ts = to
-		}
-
-		// Trigger the ready triggers.
-		for _, handler := range triggers {
-			if handler.called {
-				// We may have reverted past the trigger point, but not past the call point.
-				// Or there has been a concurrent call to ChainAt.
-				continue
-			}
-
-			ctx, span := trace.StartSpan(ctx, "events.HeightApply")
-			span.AddAttributes(trace.BoolAttribute("immediate", false))
-			err := handler.handle(ctx, handler.ts, h)
-			span.End()
-
-			if err != nil {
-				log.Errorf("chain trigger (@H %d, called @ %d) failed: %+v", h, to.Height(), err)
-			}
-
-			handler.called = true
-		}
-	}
 	return nil
 }

chain/events/message_cache.go

@@ -1,42 +0,0 @@
-package events
-
-import (
-	"context"
-	"sync"
-
-	"github.com/filecoin-project/lotus/api"
-	lru "github.com/hashicorp/golang-lru"
-	"github.com/ipfs/go-cid"
-)
-
-type messageCache struct {
-	api EventAPI
-
-	blockMsgLk    sync.Mutex
-	blockMsgCache *lru.ARCCache
-}
-
-func newMessageCache(api EventAPI) *messageCache {
-	blsMsgCache, _ := lru.NewARC(500)
-
-	return &messageCache{
-		api:           api,
-		blockMsgCache: blsMsgCache,
-	}
-}
-
-func (c *messageCache) ChainGetBlockMessages(ctx context.Context, blkCid cid.Cid) (*api.BlockMessages, error) {
-	c.blockMsgLk.Lock()
-	defer c.blockMsgLk.Unlock()
-
-	msgsI, ok := c.blockMsgCache.Get(blkCid)
-	var err error
-	if !ok {
-		msgsI, err = c.api.ChainGetBlockMessages(ctx, blkCid)
-		if err != nil {
-			return nil, err
-		}
-		c.blockMsgCache.Add(blkCid, msgsI)
-	}
-	return msgsI.(*api.BlockMessages), nil
-}

chain/events/observer.go

@@ -1,255 +0,0 @@
-package events
-
-import (
-	"context"
-	"sync"
-	"time"
-
-	"github.com/filecoin-project/go-state-types/abi"
-	"go.opencensus.io/trace"
-	"golang.org/x/xerrors"
-
-	"github.com/filecoin-project/lotus/api"
-	"github.com/filecoin-project/lotus/build"
-	"github.com/filecoin-project/lotus/chain/store"
-	"github.com/filecoin-project/lotus/chain/types"
-)
-
-type observer struct {
-	api EventAPI
-
-	gcConfidence abi.ChainEpoch
-
-	ready chan struct{}
-
-	lk        sync.Mutex
-	head      *types.TipSet
-	maxHeight abi.ChainEpoch
-	observers []TipSetObserver
-}
-
-func newObserver(api *cache, gcConfidence abi.ChainEpoch) *observer {
-	obs := &observer{
-		api:          api,
-		gcConfidence: gcConfidence,
-
-		ready:     make(chan struct{}),
-		observers: []TipSetObserver{},
-	}
-	obs.Observe(api.observer())
-	return obs
-}
-
-func (o *observer) start(ctx context.Context) error {
-	go o.listenHeadChanges(ctx)
-
-	// Wait for the first tipset to be seen or bail if shutting down
-	select {
-	case <-o.ready:
-		return nil
-	case <-ctx.Done():
-		return ctx.Err()
-	}
-}
-
-func (o *observer) listenHeadChanges(ctx context.Context) {
-	for {
-		if err := o.listenHeadChangesOnce(ctx); err != nil {
-			log.Errorf("listen head changes errored: %s", err)
-		} else {
-			log.Warn("listenHeadChanges quit")
-		}
-		select {
-		case <-build.Clock.After(time.Second):
-		case <-ctx.Done():
-			log.Warnf("not restarting listenHeadChanges: context error: %s", ctx.Err())
-			return
-		}
-
-		log.Info("restarting listenHeadChanges")
-	}
-}
-
-func (o *observer) listenHeadChangesOnce(ctx context.Context) error {
-	ctx, cancel := context.WithCancel(ctx)
-	defer cancel()
-
-	notifs, err := o.api.ChainNotify(ctx)
-	if err != nil {
-		// Retry is handled by caller
-		return xerrors.Errorf("listenHeadChanges ChainNotify call failed: %w", err)
-	}
-
-	var cur []*api.HeadChange
-	var ok bool
-
-	// Wait for first tipset or bail
-	select {
-	case cur, ok = <-notifs:
-		if !ok {
-			return xerrors.Errorf("notification channel closed")
-		}
-	case <-ctx.Done():
-		return ctx.Err()
-	}
-
-	if len(cur) != 1 {
-		return xerrors.Errorf("unexpected initial head notification length: %d", len(cur))
-	}
-
-	if cur[0].Type != store.HCCurrent {
-		return xerrors.Errorf("expected first head notification type to be 'current', was '%s'", cur[0].Type)
-	}
-
-	curHead := cur[0].Val
-
-	o.lk.Lock()
-	if o.head == nil {
-		o.head = curHead
-		close(o.ready)
-	}
-	startHead := o.head
-	o.lk.Unlock()
-
-	if !startHead.Equals(curHead) {
-		changes, err := o.api.ChainGetPath(ctx, startHead.Key(), curHead.Key())
-		if err != nil {
-			return xerrors.Errorf("failed to get path from last applied tipset to head: %w", err)
-		}
-
-		if err := o.applyChanges(ctx, changes); err != nil {
-			return xerrors.Errorf("failed catch-up head changes: %w", err)
-		}
-	}
-
-	for changes := range notifs {
-		if err := o.applyChanges(ctx, changes); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (o *observer) applyChanges(ctx context.Context, changes []*api.HeadChange) error {
-	// Used to wait for a prior notification round to finish (by tests)
-	if len(changes) == 0 {
-		return nil
-	}
-
-	var rev, app []*types.TipSet
-	for _, changes := range changes {
-		switch changes.Type {
-		case store.HCRevert:
-			rev = append(rev, changes.Val)
-		case store.HCApply:
-			app = append(app, changes.Val)
-		default:
-			log.Errorf("unexpected head change notification type: '%s'", changes.Type)
-		}
-	}
-
-	if err := o.headChange(ctx, rev, app); err != nil {
-		return xerrors.Errorf("failed to apply head changes: %w", err)
-	}
-	return nil
-}
-
-func (o *observer) headChange(ctx context.Context, rev, app []*types.TipSet) error {
-	ctx, span := trace.StartSpan(ctx, "events.HeadChange")
-	span.AddAttributes(trace.Int64Attribute("reverts", int64(len(rev))))
-	span.AddAttributes(trace.Int64Attribute("applies", int64(len(app))))
-
-	o.lk.Lock()
-	head := o.head
-	o.lk.Unlock()
-
-	defer func() {
-		span.AddAttributes(trace.Int64Attribute("endHeight", int64(head.Height())))
-		span.End()
-	}()
-
-	// NOTE: bailing out here if the head isn't what we expected is fine. We'll re-start the
-	// entire process and handle any strange reorgs.
-	for i, from := range rev {
-		if !from.Equals(head) {
-			return xerrors.Errorf(
-				"expected to revert %s (%d), reverting %s (%d)",
-				head.Key(), head.Height(), from.Key(), from.Height(),
-			)
-		}
-		var to *types.TipSet
-		if i+1 < len(rev) {
-			// If we have more reverts, the next revert is the next head.
-			to = rev[i+1]
-		} else {
-			// At the end of the revert sequenece, we need to lookup the joint tipset
-			// between the revert sequence and the apply sequence.
-			var err error
-			to, err = o.api.ChainGetTipSet(ctx, from.Parents())
-			if err != nil {
-				// Well, this sucks. We'll bail and restart.
-				return xerrors.Errorf("failed to get tipset when reverting due to a SetHeead: %w", err)
-			}
-		}
-
-		// Get the current observers and atomically set the head.
-		//
-		// 1. We need to get the observers every time in case some registered/deregistered.
-		// 2. We need to atomically set the head so new observers don't see events twice or
-		// skip them.
-		o.lk.Lock()
-		observers := o.observers
-		o.head = to
-		o.lk.Unlock()
-
-		for _, obs := range observers {
-			if err := obs.Revert(ctx, from, to); err != nil {
-				log.Errorf("observer %T failed to apply tipset %s (%d) with: %s", obs, from.Key(), from.Height(), err)
-			}
-		}
-
-		if to.Height() < o.maxHeight-o.gcConfidence {
-			log.Errorf("reverted past finality, from %d to %d", o.maxHeight, to.Height())
-		}
-
-		head = to
-	}
-
-	for _, to := range app {
-		if to.Parents() != head.Key() {
-			return xerrors.Errorf(
-				"cannot apply %s (%d) with parents %s on top of %s (%d)",
-				to.Key(), to.Height(), to.Parents(), head.Key(), head.Height(),
-			)
-		}
-
-		o.lk.Lock()
-		observers := o.observers
-		o.head = to
-		o.lk.Unlock()
-
-		for _, obs := range observers {
-			if err := obs.Apply(ctx, head, to); err != nil {
-				log.Errorf("observer %T failed to revert tipset %s (%d) with: %s", obs, to.Key(), to.Height(), err)
-			}
-		}
-		if to.Height() > o.maxHeight {
-			o.maxHeight = to.Height()
-		}
-
-		head = to
-	}
-	return nil
-}
-
-// Observe registers the observer, and returns the current tipset. The observer is guaranteed to
-// observe events starting at this tipset.
-//
-// Returns nil if the observer hasn't started yet (but still registers).
-func (o *observer) Observe(obs TipSetObserver) *types.TipSet {
-	o.lk.Lock()
-	defer o.lk.Unlock()
-	o.observers = append(o.observers, obs)
-	return o.head
-}

chain/events/tscache.go

@@ -11,9 +11,7 @@ import (
 )
 
 type tsCacheAPI interface {
-	ChainGetTipSetAfterHeight(context.Context, abi.ChainEpoch, types.TipSetKey) (*types.TipSet, error)
 	ChainGetTipSetByHeight(context.Context, abi.ChainEpoch, types.TipSetKey) (*types.TipSet, error)
-	ChainGetTipSet(context.Context, types.TipSetKey) (*types.TipSet, error)
 	ChainHead(context.Context) (*types.TipSet, error)
 }
 
@@ -22,157 +20,61 @@ type tsCacheAPI interface {
 type tipSetCache struct {
 	mu sync.RWMutex
 
-	byKey    map[types.TipSetKey]*types.TipSet
-	byHeight []*types.TipSet
-	start    int // chain head (end)
-	len      int
+	cache []*types.TipSet
+	start int
+	len   int
 
 	storage tsCacheAPI
 }
 
-func newTSCache(storage tsCacheAPI, cap abi.ChainEpoch) *tipSetCache {
+func newTSCache(cap abi.ChainEpoch, storage tsCacheAPI) *tipSetCache {
 	return &tipSetCache{
-		byKey:    make(map[types.TipSetKey]*types.TipSet, cap),
-		byHeight: make([]*types.TipSet, cap),
-		start:    0,
-		len:      0,
+		cache: make([]*types.TipSet, cap),
+		start: 0,
+		len:   0,
 
 		storage: storage,
 	}
 }
-func (tsc *tipSetCache) ChainGetTipSet(ctx context.Context, tsk types.TipSetKey) (*types.TipSet, error) {
-	if ts, ok := tsc.byKey[tsk]; ok {
-		return ts, nil
-	}
-	return tsc.storage.ChainGetTipSet(ctx, tsk)
-}
 
-func (tsc *tipSetCache) ChainGetTipSetByHeight(ctx context.Context, height abi.ChainEpoch, tsk types.TipSetKey) (*types.TipSet, error) {
-	return tsc.get(ctx, height, tsk, true)
-}
-
-func (tsc *tipSetCache) ChainGetTipSetAfterHeight(ctx context.Context, height abi.ChainEpoch, tsk types.TipSetKey) (*types.TipSet, error) {
-	return tsc.get(ctx, height, tsk, false)
-}
-
-func (tsc *tipSetCache) get(ctx context.Context, height abi.ChainEpoch, tsk types.TipSetKey, prev bool) (*types.TipSet, error) {
-	fallback := tsc.storage.ChainGetTipSetAfterHeight
-	if prev {
-		fallback = tsc.storage.ChainGetTipSetByHeight
-	}
-	tsc.mu.RLock()
-
-	// Nothing in the cache?
-	if tsc.len == 0 {
-		tsc.mu.RUnlock()
-		log.Warnf("tipSetCache.get: cache is empty, requesting from storage (h=%d)", height)
-		return fallback(ctx, height, tsk)
-	}
-
-	// Resolve the head.
-	head := tsc.byHeight[tsc.start]
-	if !tsk.IsEmpty() {
-		// Not on this chain?
-		var ok bool
-		head, ok = tsc.byKey[tsk]
-		if !ok {
-			tsc.mu.RUnlock()
-			return fallback(ctx, height, tsk)
-		}
-	}
-
-	headH := head.Height()
-	tailH := headH - abi.ChainEpoch(tsc.len)
-
-	if headH == height {
-		tsc.mu.RUnlock()
-		return head, nil
-	} else if headH < height {
-		tsc.mu.RUnlock()
-		// If the user doesn't pass a tsk, we assume "head" is the last tipset we processed.
-		return nil, xerrors.Errorf("requested epoch is in the future")
-	} else if height < tailH {
-		log.Warnf("tipSetCache.get: requested tipset not in cache, requesting from storage (h=%d; tail=%d)", height, tailH)
-		tsc.mu.RUnlock()
-		return fallback(ctx, height, head.Key())
-	}
-
-	direction := 1
-	if prev {
-		direction = -1
-	}
-	var ts *types.TipSet
-	for i := 0; i < tsc.len && ts == nil; i += direction {
-		ts = tsc.byHeight[normalModulo(tsc.start-int(headH-height)+i, len(tsc.byHeight))]
-	}
-	tsc.mu.RUnlock()
-	return ts, nil
-}
-
-func (tsc *tipSetCache) ChainHead(ctx context.Context) (*types.TipSet, error) {
-	tsc.mu.RLock()
-	best := tsc.byHeight[tsc.start]
-	tsc.mu.RUnlock()
-	if best == nil {
-		return tsc.storage.ChainHead(ctx)
-	}
-	return best, nil
-}
-
-func (tsc *tipSetCache) add(to *types.TipSet) error {
+func (tsc *tipSetCache) add(ts *types.TipSet) error {
 	tsc.mu.Lock()
 	defer tsc.mu.Unlock()
 
 	if tsc.len > 0 {
-		best := tsc.byHeight[tsc.start]
-		if best.Height() >= to.Height() {
-			return xerrors.Errorf("tipSetCache.add: expected new tipset height to be at least %d, was %d", tsc.byHeight[tsc.start].Height()+1, to.Height())
-		}
-		if best.Key() != to.Parents() {
-			return xerrors.Errorf(
-				"tipSetCache.add: expected new tipset %s (%d) to follow %s (%d), its parents are %s",
-				to.Key(), to.Height(), best.Key(), best.Height(), best.Parents(),
-			)
+		if tsc.cache[tsc.start].Height() >= ts.Height() {
+			return xerrors.Errorf("tipSetCache.add: expected new tipset height to be at least %d, was %d", tsc.cache[tsc.start].Height()+1, ts.Height())
 		}
 	}
 
-	nextH := to.Height()
+	nextH := ts.Height()
 	if tsc.len > 0 {
-		nextH = tsc.byHeight[tsc.start].Height() + 1
+		nextH = tsc.cache[tsc.start].Height() + 1
 	}
 
 	// fill null blocks
-	for nextH != to.Height() {
-		tsc.start = normalModulo(tsc.start+1, len(tsc.byHeight))
-		was := tsc.byHeight[tsc.start]
-		if was != nil {
-			tsc.byHeight[tsc.start] = nil
-			delete(tsc.byKey, was.Key())
-		}
-		if tsc.len < len(tsc.byHeight) {
+	for nextH != ts.Height() {
+		tsc.start = normalModulo(tsc.start+1, len(tsc.cache))
+		tsc.cache[tsc.start] = nil
+		if tsc.len < len(tsc.cache) {
 			tsc.len++
 		}
 		nextH++
 	}
 
-	tsc.start = normalModulo(tsc.start+1, len(tsc.byHeight))
-	was := tsc.byHeight[tsc.start]
-	if was != nil {
-		delete(tsc.byKey, was.Key())
-	}
-	tsc.byHeight[tsc.start] = to
-	if tsc.len < len(tsc.byHeight) {
+	tsc.start = normalModulo(tsc.start+1, len(tsc.cache))
+	tsc.cache[tsc.start] = ts
+	if tsc.len < len(tsc.cache) {
 		tsc.len++
 	}
-	tsc.byKey[to.Key()] = to
 	return nil
 }
 
-func (tsc *tipSetCache) revert(from *types.TipSet) error {
+func (tsc *tipSetCache) revert(ts *types.TipSet) error {
 	tsc.mu.Lock()
 	defer tsc.mu.Unlock()
 
-	return tsc.revertUnlocked(from)
+	return tsc.revertUnlocked(ts)
 }
 
 func (tsc *tipSetCache) revertUnlocked(ts *types.TipSet) error {
@@ -180,35 +82,75 @@ func (tsc *tipSetCache) revertUnlocked(ts *types.TipSet) error {
 		return nil // this can happen, and it's fine
 	}
 
-	was := tsc.byHeight[tsc.start]
-
-	if !was.Equals(ts) {
+	if !tsc.cache[tsc.start].Equals(ts) {
 		return xerrors.New("tipSetCache.revert: revert tipset didn't match cache head")
 	}
-	delete(tsc.byKey, was.Key())
 
-	tsc.byHeight[tsc.start] = nil
-	tsc.start = normalModulo(tsc.start-1, len(tsc.byHeight))
+	tsc.cache[tsc.start] = nil
+	tsc.start = normalModulo(tsc.start-1, len(tsc.cache))
 	tsc.len--
 
 	_ = tsc.revertUnlocked(nil) // revert null block gap
 	return nil
 }
 
-func (tsc *tipSetCache) observer() TipSetObserver {
-	return (*tipSetCacheObserver)(tsc)
+func (tsc *tipSetCache) getNonNull(height abi.ChainEpoch) (*types.TipSet, error) {
+	for {
+		ts, err := tsc.get(height)
+		if err != nil {
+			return nil, err
+		}
+		if ts != nil {
+			return ts, nil
+		}
+		height++
+	}
 }
 
-type tipSetCacheObserver tipSetCache
+func (tsc *tipSetCache) get(height abi.ChainEpoch) (*types.TipSet, error) {
+	tsc.mu.RLock()
 
-var _ TipSetObserver = new(tipSetCacheObserver)
+	if tsc.len == 0 {
+		tsc.mu.RUnlock()
+		log.Warnf("tipSetCache.get: cache is empty, requesting from storage (h=%d)", height)
+		return tsc.storage.ChainGetTipSetByHeight(context.TODO(), height, types.EmptyTSK)
+	}
 
-func (tsc *tipSetCacheObserver) Apply(_ context.Context, _, to *types.TipSet) error {
-	return (*tipSetCache)(tsc).add(to)
+	headH := tsc.cache[tsc.start].Height()
+
+	if height > headH {
+		tsc.mu.RUnlock()
+		return nil, xerrors.Errorf("tipSetCache.get: requested tipset not in cache (req: %d, cache head: %d)", height, headH)
+	}
+
+	clen := len(tsc.cache)
+	var tail *types.TipSet
+	for i := 1; i <= tsc.len; i++ {
+		tail = tsc.cache[normalModulo(tsc.start-tsc.len+i, clen)]
+		if tail != nil {
+			break
+		}
+	}
+
+	if height < tail.Height() {
+		tsc.mu.RUnlock()
+		log.Warnf("tipSetCache.get: requested tipset not in cache, requesting from storage (h=%d; tail=%d)", height, tail.Height())
+		return tsc.storage.ChainGetTipSetByHeight(context.TODO(), height, tail.Key())
+	}
+
+	ts := tsc.cache[normalModulo(tsc.start-int(headH-height), clen)]
+	tsc.mu.RUnlock()
+	return ts, nil
 }
 
-func (tsc *tipSetCacheObserver) Revert(ctx context.Context, from, _ *types.TipSet) error {
-	return (*tipSetCache)(tsc).revert(from)
+func (tsc *tipSetCache) best() (*types.TipSet, error) {
+	tsc.mu.RLock()
+	best := tsc.cache[tsc.start]
+	tsc.mu.RUnlock()
+	if best == nil {
+		return tsc.storage.ChainHead(context.TODO())
+	}
+	return best, nil
 }
 
 func normalModulo(n, m int) int {

chain/events/tscache_test.go

@@ -6,20 +6,59 @@ import (
 
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/crypto"
-	"github.com/ipfs/go-cid"
 	"github.com/stretchr/testify/require"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/lotus/chain/types"
 )
 
-type tsCacheAPIFailOnStorageCall struct {
-	t *testing.T
+func TestTsCache(t *testing.T) {
+	tsc := newTSCache(50, &tsCacheAPIFailOnStorageCall{t: t})
+
+	h := abi.ChainEpoch(75)
+
+	a, _ := address.NewFromString("t00")
+
+	add := func() {
+		ts, err := types.NewTipSet([]*types.BlockHeader{{
+			Miner:                 a,
+			Height:                h,
+			ParentStateRoot:       dummyCid,
+			Messages:              dummyCid,
+			ParentMessageReceipts: dummyCid,
+			BlockSig:              &crypto.Signature{Type: crypto.SigTypeBLS},
+			BLSAggregate:          &crypto.Signature{Type: crypto.SigTypeBLS},
+		}})
+		if err != nil {
+			t.Fatal(err)
+		}
+		if err := tsc.add(ts); err != nil {
+			t.Fatal(err)
+		}
+		h++
+	}
+
+	for i := 0; i < 9000; i++ {
+		if i%90 > 60 {
+			best, err := tsc.best()
+			if err != nil {
+				t.Fatal(err, "; i:", i)
+				return
+			}
+			if err := tsc.revert(best); err != nil {
+				t.Fatal(err, "; i:", i)
+				return
+			}
+			h--
+		} else {
+			add()
+		}
+	}
+
 }
 
-func (tc *tsCacheAPIFailOnStorageCall) ChainGetTipSetAfterHeight(ctx context.Context, epoch abi.ChainEpoch, key types.TipSetKey) (*types.TipSet, error) {
-	tc.t.Fatal("storage call")
-	return &types.TipSet{}, nil
+type tsCacheAPIFailOnStorageCall struct {
+	t *testing.T
 }
 
 func (tc *tsCacheAPIFailOnStorageCall) ChainGetTipSetByHeight(ctx context.Context, epoch abi.ChainEpoch, key types.TipSetKey) (*types.TipSet, error) {
@@ -30,181 +69,100 @@ func (tc *tsCacheAPIFailOnStorageCall) ChainHead(ctx context.Context) (*types.Ti
 	tc.t.Fatal("storage call")
 	return &types.TipSet{}, nil
 }
-func (tc *tsCacheAPIFailOnStorageCall) ChainGetTipSet(ctx context.Context, tsk types.TipSetKey) (*types.TipSet, error) {
-	tc.t.Fatal("storage call")
-	return &types.TipSet{}, nil
-}
-
-type cacheHarness struct {
-	t *testing.T
-
-	miner  address.Address
-	tsc    *tipSetCache
-	height abi.ChainEpoch
-}
-
-func newCacheharness(t *testing.T) *cacheHarness {
-	a, err := address.NewFromString("t00")
-	require.NoError(t, err)
-
-	h := &cacheHarness{
-		t:      t,
-		tsc:    newTSCache(&tsCacheAPIFailOnStorageCall{t: t}, 50),
-		height: 75,
-		miner:  a,
-	}
-	h.addWithParents(nil)
-	return h
-}
-
-func (h *cacheHarness) addWithParents(parents []cid.Cid) {
-	ts, err := types.NewTipSet([]*types.BlockHeader{{
-		Miner:                 h.miner,
-		Height:                h.height,
-		ParentStateRoot:       dummyCid,
-		Messages:              dummyCid,
-		ParentMessageReceipts: dummyCid,
-		BlockSig:              &crypto.Signature{Type: crypto.SigTypeBLS},
-		BLSAggregate:          &crypto.Signature{Type: crypto.SigTypeBLS},
-		Parents:               parents,
-	}})
-	require.NoError(h.t, err)
-	require.NoError(h.t, h.tsc.add(ts))
-	h.height++
-}
-
-func (h *cacheHarness) add() {
-	last, err := h.tsc.ChainHead(context.Background())
-	require.NoError(h.t, err)
-	h.addWithParents(last.Cids())
-}
-
-func (h *cacheHarness) revert() {
-	best, err := h.tsc.ChainHead(context.Background())
-	require.NoError(h.t, err)
-	err = h.tsc.revert(best)
-	require.NoError(h.t, err)
-	h.height--
-}
-
-func (h *cacheHarness) skip(n abi.ChainEpoch) {
-	h.height += n
-}
-
-func TestTsCache(t *testing.T) {
-	h := newCacheharness(t)
-
-	for i := 0; i < 9000; i++ {
-		if i%90 > 60 {
-			h.revert()
-		} else {
-			h.add()
-		}
-	}
-}
 
 func TestTsCacheNulls(t *testing.T) {
-	ctx := context.Background()
-	h := newCacheharness(t)
+	tsc := newTSCache(50, &tsCacheAPIFailOnStorageCall{t: t})
 
-	h.add()
-	h.add()
-	h.add()
-	h.skip(5)
+	h := abi.ChainEpoch(75)
 
-	h.add()
-	h.add()
+	a, _ := address.NewFromString("t00")
+	add := func() {
+		ts, err := types.NewTipSet([]*types.BlockHeader{{
+			Miner:                 a,
+			Height:                h,
+			ParentStateRoot:       dummyCid,
+			Messages:              dummyCid,
+			ParentMessageReceipts: dummyCid,
+			BlockSig:              &crypto.Signature{Type: crypto.SigTypeBLS},
+			BLSAggregate:          &crypto.Signature{Type: crypto.SigTypeBLS},
+		}})
+		if err != nil {
+			t.Fatal(err)
+		}
+		if err := tsc.add(ts); err != nil {
+			t.Fatal(err)
+		}
+		h++
+	}
 
-	best, err := h.tsc.ChainHead(ctx)
+	add()
+	add()
+	add()
+	h += 5
+
+	add()
+	add()
+
+	best, err := tsc.best()
 	require.NoError(t, err)
-	require.Equal(t, h.height-1, best.Height())
+	require.Equal(t, h-1, best.Height())
 
-	ts, err := h.tsc.ChainGetTipSetByHeight(ctx, h.height-1, types.EmptyTSK)
+	ts, err := tsc.get(h - 1)
 	require.NoError(t, err)
-	require.Equal(t, h.height-1, ts.Height())
+	require.Equal(t, h-1, ts.Height())
 
-	ts, err = h.tsc.ChainGetTipSetByHeight(ctx, h.height-2, types.EmptyTSK)
+	ts, err = tsc.get(h - 2)
 	require.NoError(t, err)
-	require.Equal(t, h.height-2, ts.Height())
+	require.Equal(t, h-2, ts.Height())
 
-	// Should skip the nulls and walk back to the last tipset.
-	ts, err = h.tsc.ChainGetTipSetByHeight(ctx, h.height-3, types.EmptyTSK)
+	ts, err = tsc.get(h - 3)
 	require.NoError(t, err)
-	require.Equal(t, h.height-8, ts.Height())
+	require.Nil(t, ts)
 
-	ts, err = h.tsc.ChainGetTipSetByHeight(ctx, h.height-8, types.EmptyTSK)
+	ts, err = tsc.get(h - 8)
 	require.NoError(t, err)
-	require.Equal(t, h.height-8, ts.Height())
+	require.Equal(t, h-8, ts.Height())
 
-	best, err = h.tsc.ChainHead(ctx)
+	best, err = tsc.best()
 	require.NoError(t, err)
-	require.NoError(t, h.tsc.revert(best))
+	require.NoError(t, tsc.revert(best))
 
-	best, err = h.tsc.ChainHead(ctx)
+	best, err = tsc.best()
 	require.NoError(t, err)
-	require.NoError(t, h.tsc.revert(best))
+	require.NoError(t, tsc.revert(best))
 
-	best, err = h.tsc.ChainHead(ctx)
+	best, err = tsc.best()
 	require.NoError(t, err)
-	require.Equal(t, h.height-8, best.Height())
+	require.Equal(t, h-8, best.Height())
 
-	h.skip(50)
-	h.add()
+	h += 50
+	add()
 
-	ts, err = h.tsc.ChainGetTipSetByHeight(ctx, h.height-1, types.EmptyTSK)
+	ts, err = tsc.get(h - 1)
 	require.NoError(t, err)
-	require.Equal(t, h.height-1, ts.Height())
+	require.Equal(t, h-1, ts.Height())
 }
 
 type tsCacheAPIStorageCallCounter struct {
-	t                         *testing.T
-	chainGetTipSetByHeight    int
-	chainGetTipSetAfterHeight int
-	chainGetTipSet            int
-	chainHead                 int
+	t                      *testing.T
+	chainGetTipSetByHeight int
+	chainHead              int
 }
 
 func (tc *tsCacheAPIStorageCallCounter) ChainGetTipSetByHeight(ctx context.Context, epoch abi.ChainEpoch, key types.TipSetKey) (*types.TipSet, error) {
 	tc.chainGetTipSetByHeight++
 	return &types.TipSet{}, nil
 }
-func (tc *tsCacheAPIStorageCallCounter) ChainGetTipSetAfterHeight(ctx context.Context, epoch abi.ChainEpoch, key types.TipSetKey) (*types.TipSet, error) {
-	tc.chainGetTipSetAfterHeight++
-	return &types.TipSet{}, nil
-}
 func (tc *tsCacheAPIStorageCallCounter) ChainHead(ctx context.Context) (*types.TipSet, error) {
 	tc.chainHead++
 	return &types.TipSet{}, nil
 }
-func (tc *tsCacheAPIStorageCallCounter) ChainGetTipSet(ctx context.Context, tsk types.TipSetKey) (*types.TipSet, error) {
-	tc.chainGetTipSet++
-	return &types.TipSet{}, nil
-}
 
 func TestTsCacheEmpty(t *testing.T) {
 	// Calling best on an empty cache should just call out to the chain API
 	callCounter := &tsCacheAPIStorageCallCounter{t: t}
-	tsc := newTSCache(callCounter, 50)
-	_, err := tsc.ChainHead(context.Background())
+	tsc := newTSCache(50, callCounter)
+	_, err := tsc.best()
 	require.NoError(t, err)
 	require.Equal(t, 1, callCounter.chainHead)
 }
-
-func TestTsCacheSkip(t *testing.T) {
-	h := newCacheharness(t)
-
-	ts, err := types.NewTipSet([]*types.BlockHeader{{
-		Miner:                 h.miner,
-		Height:                h.height,
-		ParentStateRoot:       dummyCid,
-		Messages:              dummyCid,
-		ParentMessageReceipts: dummyCid,
-		BlockSig:              &crypto.Signature{Type: crypto.SigTypeBLS},
-		BLSAggregate:          &crypto.Signature{Type: crypto.SigTypeBLS},
-		// With parents that don't match the last block.
-		Parents: nil,
-	}})
-	require.NoError(h.t, err)
-	err = h.tsc.add(ts)
-	require.Error(t, err)
-}